Add check if libgd is built with png support for bug 115706.

(Portage version: 2.1_pre1)

4 files changed, 22 insertions, 17 deletions

diff --git a/app-admin/analog/ChangeLog b/app-admin/analog/ChangeLog
index be8ca98f4ab0..72aa70b30008 100644
--- a/app-admin/analog/ChangeLog
+++ b/app-admin/analog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/analog
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.32 2005/07/29 21:43:37 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.33 2005/12/21 00:14:28 vanquirius Exp $
+
+  21 Dec 2005; Marcelo Goes <vanquirius@gentoo.org> analog-5.32.ebuild,
+  analog-6.0.ebuild:
+  Add check if libgd is built with png support for bug 115706. Thanks to Simon
+  Matthews <simon+bugzilla at matthews-family dot org dot uk>.
 
   29 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> analog-6.0.ebuild:
   New license is GPL-2, as stated in Licence.txt. Fixes bug 99807. Thanks to
diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest
index 9fedbdd2e3b0..00e72d5af143 100644
--- a/app-admin/analog/Manifest
+++ b/app-admin/analog/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5d5ce301ca0f8c480ea3b9cff9ea892e ChangeLog 3504
-MD5 8a40df477d540c4d17928bd61f663fd0 analog-5.32.ebuild 1607
-MD5 e9c369d52fc7a2c8ef5d6a58ac0baea5 analog-6.0.ebuild 1593
+MD5 8c733bfac1c503b5ae8d96023f6ab87c analog-5.32.ebuild 1815
+MD5 c42330cdc2a2fca3d415abe276d8e11e analog-6.0.ebuild 1801
 MD5 2fb240fa271f7dd72dd56552f60729ab files/analog-5.1-gentoo.diff 888
 MD5 bea5158163ebee10b42f2a008cf660d7 files/analog.cfg 3992
 MD5 680b3d1d4411710fa55b5ec607a66222 files/digest-analog-5.32 64
 MD5 5f205be9a734af5709b5f339ee60b931 files/digest-analog-6.0 63
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDi8aWgIKl8Uu19MoRAlivAJ9NNa/3vcd14vNPXjrtHQGdhs4vGwCeLmiy
-I5yNy5RqFd7ka20YZUgFx1k=
-=XhT6
------END PGP SIGNATURE-----
diff --git a/app-admin/analog/analog-5.32.ebuild b/app-admin/analog/analog-5.32.ebuild
index 4f6d97d8637a..270b37acbb5e 100644
--- a/app-admin/analog/analog-5.32.ebuild
+++ b/app-admin/analog/analog-5.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-5.32.ebuild,v 1.18 2005/02/24 02:14:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-5.32.ebuild,v 1.19 2005/12/21 00:14:28 vanquirius Exp $
 
 inherit eutils
 
@@ -22,9 +22,14 @@ DEPEND=">=dev-libs/libpcre-3.4
 pkg_setup() {
 	if ! built_with_use media-libs/gd jpeg ; then
 		eerror "libgd is missing jpeg support. Please add"
-		eerror "'jpeg' to your USE flags, and re-emerge libgd."
+		eerror "'jpeg' to your USE flags, and re-emerge media-libs/gd."
 		die "libgd needs jpeg support"
 	fi
+	if ! built_with_use media-libs/gd png ; then
+		eerror "libgd is missing jpeg support. Please add"
+		eerror "'png' to your USE flags, and re-emerge media-libs/gd."
+		die "libgd needs png support"
+	fi
 }
 
 src_unpack() {
diff --git a/app-admin/analog/analog-6.0.ebuild b/app-admin/analog/analog-6.0.ebuild
index 81a658c2bbed..9574f94ee2db 100644
--- a/app-admin/analog/analog-6.0.ebuild
+++ b/app-admin/analog/analog-6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0.ebuild,v 1.5 2005/11/29 03:07:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0.ebuild,v 1.6 2005/12/21 00:14:28 vanquirius Exp $
 
 inherit eutils
 
@@ -22,9 +22,14 @@ DEPEND=">=dev-libs/libpcre-3.4
 pkg_setup() {
 	if ! built_with_use media-libs/gd jpeg ; then
 		eerror "libgd is missing jpeg support. Please add"
-		eerror "'jpeg' to your USE flags, and re-emerge libgd."
+		eerror "'jpeg' to your USE flags, and re-emerge media-libs/gd."
 		die "libgd needs jpeg support"
 	fi
+	if ! built_with_use media-libs/gd png ; then
+		eerror "libgd is missing jpeg support. Please add"
+		eerror "'png' to your USE flags, and re-emerge media-libs/gd."
+		die "libgd needs png support"
+	fi
 }
 
 src_unpack() {