sanitize built_with_use checks for media-libs/gd, thanks jakub in bug #204153

Package-Manager: portage-2.1.4_rc14

3 files changed, 27 insertions, 22 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 46a98f157f92..cd75fe2614eb 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/graphviz
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.133 2007/12/29 00:28:42 maekke Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.134 2008/01/03 11:31:45 maekke Exp $
+
+  03 Jan 2008; Markus Meier <maekke@gentoo.org> graphviz-2.16.1-r2.ebuild:
+  sanitize built_with_use checks for media-libs/gd, thanks jakub in bug #204153
 
   29 Dec 2007; Markus Meier <maekke@gentoo.org>
   +files/graphviz-2.16.1-tcltk.patch, graphviz-2.16.1-r2.ebuild:
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index cbf0e83812c6..c21621e441ab 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -51,18 +51,18 @@ EBUILD graphviz-2.16.1-r1.ebuild 6015 RMD160 6d5e2b87d9e9cd0bafbca8d07f0179f2290
 MD5 5d8b58185f72567675d657c0e8fbe29b graphviz-2.16.1-r1.ebuild 6015
 RMD160 6d5e2b87d9e9cd0bafbca8d07f0179f2290346e5 graphviz-2.16.1-r1.ebuild 6015
 SHA256 fb8b699b05865d7edf1450f37b9c2157e173e770b0e6520eae7164d299277abd graphviz-2.16.1-r1.ebuild 6015
-EBUILD graphviz-2.16.1-r2.ebuild 6160 RMD160 74d783d9ebf257cf719588f918b42f84b316ad7c SHA1 60b6b43de4af32ef381455e1d72800f642c36a60 SHA256 814d469b7d305e603ddc919d0404eacb8cd50017ca842b2b2ddbd00cbf735678
-MD5 c0216476d8b5e1c13d580f9bf8df1ead graphviz-2.16.1-r2.ebuild 6160
-RMD160 74d783d9ebf257cf719588f918b42f84b316ad7c graphviz-2.16.1-r2.ebuild 6160
-SHA256 814d469b7d305e603ddc919d0404eacb8cd50017ca842b2b2ddbd00cbf735678 graphviz-2.16.1-r2.ebuild 6160
+EBUILD graphviz-2.16.1-r2.ebuild 6090 RMD160 c342a50a5b31a66d51ff8af4138f88590bc98a28 SHA1 8891f299b9eb901ed2324c97c80d6c9b5a9beb01 SHA256 d78bf7fa23d8d3eb6550a5d467a2f93f3ab0bdbc93b3c7716648b0ad403fafd1
+MD5 d204f3b0a67ed291efd796c3a26e9efe graphviz-2.16.1-r2.ebuild 6090
+RMD160 c342a50a5b31a66d51ff8af4138f88590bc98a28 graphviz-2.16.1-r2.ebuild 6090
+SHA256 d78bf7fa23d8d3eb6550a5d467a2f93f3ab0bdbc93b3c7716648b0ad403fafd1 graphviz-2.16.1-r2.ebuild 6090
 EBUILD graphviz-2.16.1.ebuild 5978 RMD160 01fe950a684fb11e79b5386e3c9c4b34b3179f71 SHA1 5b3039c8765ad367c4479907ddca14f72b6b3057 SHA256 21bb381d34054f500f023798e00a4f739fce67bba326469e2e6babef31b22c68
 MD5 cfa85a52a1e4f78fdab83cbfce9a756a graphviz-2.16.1.ebuild 5978
 RMD160 01fe950a684fb11e79b5386e3c9c4b34b3179f71 graphviz-2.16.1.ebuild 5978
 SHA256 21bb381d34054f500f023798e00a4f739fce67bba326469e2e6babef31b22c68 graphviz-2.16.1.ebuild 5978
-MISC ChangeLog 20678 RMD160 4024d86599e8e529e113e99a3a7799190baec1bf SHA1 7ce2941d74aa2be6f8c51ec53d9a83c574beba96 SHA256 a54e83842c496cb7630c5a866adf1e89ce613349b81a08961c1f7bcbe9bbb1c8
-MD5 34c042851068c9ef640c2623a4d66577 ChangeLog 20678
-RMD160 4024d86599e8e529e113e99a3a7799190baec1bf ChangeLog 20678
-SHA256 a54e83842c496cb7630c5a866adf1e89ce613349b81a08961c1f7bcbe9bbb1c8 ChangeLog 20678
+MISC ChangeLog 20834 RMD160 b2e3967c27b82f4a2ac5033718c47493a10c7b78 SHA1 acb6c7e0701527dd3dab832dca38bbd0717f2bcf SHA256 42fb524c3abda8e6df8dbae85ff244d54a011abfc8f36a8186be59e4a89d1ba3
+MD5 5971b246baaf9d5d5d6061bd896bb77e ChangeLog 20834
+RMD160 b2e3967c27b82f4a2ac5033718c47493a10c7b78 ChangeLog 20834
+SHA256 42fb524c3abda8e6df8dbae85ff244d54a011abfc8f36a8186be59e4a89d1ba3 ChangeLog 20834
 MISC metadata.xml 1540 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 SHA1 b493bbaade7ae395c87ada0bbef0b0f0e7f7fb08 SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 metadata.xml 1540
@@ -82,7 +82,7 @@ SHA256 474d5692610481a65602801a914c2e589dd2fbcbc277519f7c4660bc7e157aa2 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkd1lQcACgkQkKaRLQcq0GJ1KACfYOvd72Oe9BQykFgsnrMB9RYZ
-CrAAoIuIgcSMIEd4snRrtkaOew1S9eA2
-=1v2o
+iEYEARECAAYFAkd8x/EACgkQkKaRLQcq0GKyhQCgkl3e7SNN8kw0/xfPwznZoewe
+UysAnjz0iIxpvQ/UyDiikw2emRDzlW0k
+=huf0
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/graphviz-2.16.1-r2.ebuild b/media-gfx/graphviz/graphviz-2.16.1-r2.ebuild
index e991a938dba3..7a83e57848c5 100644
--- a/media-gfx/graphviz/graphviz-2.16.1-r2.ebuild
+++ b/media-gfx/graphviz/graphviz-2.16.1-r2.ebuild
@@ -1,6 +1,6 @@
-# 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/media-gfx/graphviz/graphviz-2.16.1-r2.ebuild,v 1.4 2007/12/29 00:28:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.16.1-r2.ebuild,v 1.5 2008/01/03 11:31:45 maekke Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -95,15 +95,17 @@ pkg_setup() {
 		eerror "SWIG has to be built with tcl support."
 		die "Missing tcl USE-flag for dev-lang/swig"
 	fi
+
 	# bug 181147
-	if use png && ! built_with_use media-libs/gd png ; then
-		eerror "media-libs/gd has to be built with png support"
-		die "remerge media-libs/gd with USE=\"png\""
-	fi
-	if use jpeg && ! built_with_use media-libs/gd jpeg ; then
-		eerror "media-libs/gd has to be built with jpeg support"
-		die "remerge media-libs/gd with USE=\"jpeg\""
+	local gdflags
+	use png && gdflags="png"
+	use jpeg && gdflags="${gdflags} jpeg"
+	if [[ -n ${gdflags} ]] && ! built_with_use media-libs/gd ${gdflags} ; then
+		local diemsg="Re-emerge media-libs/gd with USE=\"${gdflags}\""
+		eerror "${diemsg}"
+		die "${diemsg}"
 	fi
+
 	# bug 202781
 	if use cairo && ! built_with_use x11-libs/cairo svg ; then
 		eerror "x11-libs/cairo has to be built with svg support"