fix built_with_use issues. bug #193661

Package-Manager: portage-2.1.4.4

3 files changed, 54 insertions, 7 deletions

diff --git a/dev-perl/GD/ChangeLog b/dev-perl/GD/ChangeLog
index c3c23eff0cb3..c9ce78239ecf 100644
--- a/dev-perl/GD/ChangeLog
+++ b/dev-perl/GD/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-perl/GD
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/ChangeLog,v 1.74 2007/07/22 07:56:29 graaff Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/ChangeLog,v 1.75 2008/02/27 20:18:19 cardoe Exp $
+
+  27 Feb 2008; Doug Klima <cardoe@gentoo.org> GD-2.35-r1.ebuild:
+  fix built_with_use issues. bug #193661
 
   22 Jul 2007; Hans de Graaff <graaff@gentoo.org> GD-2.30.ebuild,
   GD-2.32.ebuild, GD-2.34.ebuild, GD-2.35.ebuild, GD-2.35-r1.ebuild:
diff --git a/dev-perl/GD/GD-2.35-r1.ebuild b/dev-perl/GD/GD-2.35-r1.ebuild
index e0a8f6433684..e5c2ea9ba286 100644
--- a/dev-perl/GD/GD-2.35-r1.ebuild
+++ b/dev-perl/GD/GD-2.35-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/GD-2.35-r1.ebuild,v 1.11 2007/07/22 07:56:29 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/GD-2.35-r1.ebuild,v 1.12 2008/02/27 20:18:19 cardoe Exp $
 
 inherit eutils perl-module
 
 DESCRIPTION="interface to Thomas Boutell's gd library"
-HOMEPAGE="http://www.cpan.org/modules/by-module/GD/${P}.readme"
+HOMEPAGE="http://www.cpan.org/modules/by-module/GD/"
 SRC_URI="mirror://cpan/authors/id/L/LD/LDS/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
@@ -21,6 +21,40 @@ DEPEND=">=media-libs/gd-2.0.33
 	gif? ( media-libs/giflib )
 	dev-lang/perl"
 
+pkg_setup() {
+	local i_can_has_die=0
+
+	if use jpeg && ! built_with_use media-libs/gd jpeg; then
+		echo
+		eerror "If you want to compile dev-perl/GD with USE=jpeg, you must first"
+		eerror "compile media-libs/gd with USE=jpeg"
+		i_can_has_die=1
+	fi
+
+	if use truetype && ! built_with_use media-libs/gd truetype; then
+		echo
+		eerror "If you want to compile dev-perl/GD with USE=truetype, you must first"
+		eerror "compile media-libs/gd with USE=truetype"
+		i_can_has_die=1
+	fi
+
+	if use png && ! built_with_use media-libs/gd png; then
+		echo
+		eerror "If you want to compile dev-perl/GD with USE=png, you must first"
+		eerror "compile media-libs/gd with USE=png"
+		i_can_has_die=1
+	fi
+
+	if use xpm && ! built_with_use media-libs/gd xpm; then
+		echo
+		eerror "If you want to compile dev-perl/GD with USE=xpm, you must first"
+		eerror "compile media-libs/gd with USE=xpm"
+		i_can_has_die=1
+	fi
+
+	[[ ${i_can_has_die} -ne 0 ]] && die "Please fix the errors above before continuing"
+}
+
 src_compile() {
 	myconf=""
 	use gif && use animgif && myconf="${myconf},ANIMGIF"
diff --git a/dev-perl/GD/Manifest b/dev-perl/GD/Manifest
index 82a8399e16fb..fcdc9709f88f 100644
--- a/dev-perl/GD/Manifest
+++ b/dev-perl/GD/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST GD-2.30.tar.gz 253655 RMD160 e4378b5f699e76f0e1bfaa9f8c66a0b7a8ad24bf SHA1 5cb325960a963c53979639922abcbe51f8759231 SHA256 e6b7d2b61f08e13dc42b14135a95d2ca75a77f3f6b6505d3b38c7b561180259c
 DIST GD-2.32.tar.gz 254693 RMD160 7da448b05be2fe52fe43b4e2ab0c90f5aabbefc3 SHA1 fe5542d78e700a048d9a23a99e7543dff09d460b SHA256 bf350020b43eee720d023df112744b47bd42f6c948d1c71c71d8fb5f886b1b7a
 DIST GD-2.34.tar.gz 255522 RMD160 6f09744b4dc086226ebec921cbe5b3e625cbc95f SHA1 5f4b5e924fb7a0281d4fc1208682b8ee35afbe22 SHA256 522eb6a2521d175053cf34f10402b4fb6aaf1a0dc8e4365a7a28db23133824df
@@ -5,7 +8,14 @@ DIST GD-2.35.tar.gz 256671 RMD160 a1e8a1b521f578a9ea435cc9ed9eae0430f44d7a SHA1
 EBUILD GD-2.30.ebuild 1060 RMD160 e653160c7fddf7422e8013b664fbcb75acf78855 SHA1 879774658510f5d9bf2e016624201d58bd814f8f SHA256 8b380d054650bc068e3ebfd151e5cf3dd1e216f610a2b2367fe29d1d3e3d7e18
 EBUILD GD-2.32.ebuild 1068 RMD160 d4f0addee45f65ddb3dd77b872f48bc7fd78d6dd SHA1 6e434e246055095342ea36c385f1e42ead4ca76b SHA256 c4cc03af999d1df0a9808bc453095884ce24d46b83627adfd1b96022a0e7085b
 EBUILD GD-2.34.ebuild 1064 RMD160 0a0f8a4a1178b570fa2d55dca2d53c9551d72726 SHA1 85e1091a0aa11581cbf5fb96ba6b3f76effa7d62 SHA256 be0d42ccce995469d9b9e4c2663466f73a00a4de78c6497249cbd4d95ba0d1ea
-EBUILD GD-2.35-r1.ebuild 1126 RMD160 94da171d3c0ed4832c0c903604536f1474c2f7e9 SHA1 05d99bda1acd75339e1715502b5f752da24fd263 SHA256 1155ac9ddab728c15de118bb12740cc4b281339e80f2206b27963d73a028e275
+EBUILD GD-2.35-r1.ebuild 2093 RMD160 3321f251cf0ffaaf07309f2beb9b72535a351c8f SHA1 e95a73d215382aff4afa31c001f0a38917ad4824 SHA256 12f25c12e6413a072d1bbb3ae64f067e8154e15969b133c89b76529ee65f8b68
 EBUILD GD-2.35.ebuild 1062 RMD160 78094cd93d8e6b004384a34a1b26a33d66bc55d0 SHA1 98c36bca745880a8cf247febe667ead6d306f8dc SHA256 9b61d9d804ed707b17a2bbfd725e5794392fa4f1cdd3b3aa1b274bd91e77b587
-MISC ChangeLog 8425 RMD160 9a966a99493ba22cedc67e50908dd2b66f5b5c85 SHA1 1747b5294fdd9e2ab0ca3e63ec028395e0b1ab67 SHA256 8442329b56b7660921649468352ede25e5e97d6d7d3800bc54a100b227256438
+MISC ChangeLog 8532 RMD160 0eb4fb1798f66391366c3f327e9374c765390e05 SHA1 32c5c7d9c9bb75b98a50b5dd3411b72868a81d73 SHA256 26bb3a4a513873119f22ac1be99a21f16e107784f1a36e7f22541a1dac1915ab
 MISC metadata.xml 157 RMD160 20eb42c177eede01b15cb26692a3cdf9d09dbebb SHA1 c0abc66887e1c41278649d0c0a75716a20f1ffd5 SHA256 6a11fd41a2a210a9760849de398ef8c62cf46cc742d09b2e1781def7848fa1ec
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHxcWWoeSe8B0zEfwRApk3AJ9lY8uSWLPTmxXAuVUKrV9fwwL5lwCfZho0
+YG+Qta9jMkAMotElfZMFJ00=
+=F9Fu
+-----END PGP SIGNATURE-----