Fix up USE flag check on a dependency, default behavior changed. Thanks to Daniel Kerwin for reporting, bug #215920

Package-Manager: portage-2.1.4.4

4 files changed, 21 insertions, 16 deletions

diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index f05d93602274..c7a73a721f79 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/fwbuilder
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.68 2008/06/09 00:48:32 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.69 2008/06/09 00:55:17 darkside Exp $
+
+  09 Jun 2008; Jeremy Olexa <darkside@gentoo.org>
+  fwbuilder-2.1.13-r2.ebuild, fwbuilder-2.1.14.ebuild:
+  Fix up USE flag check on a dependency, default behavior changed. Thanks to
+  Daniel Kerwin for reporting, bug #215920
 
   09 Jun 2008; Jeremy Olexa <darkside@gentoo.org> fwbuilder-2.0.12.ebuild:
   Fixed QA issue regarding pre-stripped files. bug #198635.
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index f9a2b65eb7e0..790306c6c3f6 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -3,7 +3,7 @@ DIST fwbuilder-2.0.12.tar.gz 1389953 RMD160 7d3ae613ac015650333d2e9f980c8d688e32
 DIST fwbuilder-2.1.13.tar.gz 1703948 RMD160 56ce94c774605f37fc709ac7ce229c64c7fe4c0c SHA1 00d9b1993224464dfa49581b059c103d11bb16ac SHA256 2060d413fba4b883bfaaa2af29766c6220057be368f7feb6bc3e292dfb5bf316
 DIST fwbuilder-2.1.14.tar.gz 1708015 RMD160 909996b212170ce50bf224c2cb1a256aae7cdee4 SHA1 a7ec59cfa3c4a3546421996e15607bae367df970 SHA256 a99d847699ed522b9a64124bf5dd3519a132613da72990ae9fb6ed2fa673d2e7
 EBUILD fwbuilder-2.0.12.ebuild 1250 RMD160 3720a41610dc2919e34d2b0dc7bb1bf482c6fb0c SHA1 9f797123486424b65ed4ab935d6b9c5304e37386 SHA256 68408d9eda61b0f88756e731e3e4770deedba8ad07ae6973a5715162445ac9e1
-EBUILD fwbuilder-2.1.13-r2.ebuild 2334 RMD160 313a8f1ad1b126c23c3effc7c0f1db1c976b06a2 SHA1 4f72ab59473073b6dd100390fd18193d4c5a86b9 SHA256 5142114f0abc13f4464d91fdee9a7ebc74f8b54e7062319b7a6a364471da43a1
-EBUILD fwbuilder-2.1.14.ebuild 2208 RMD160 3a6b9b24237ec6640d603ae51cfad3530baf430d SHA1 88632eee13825fd1c96b6d175707cb04ac03a57c SHA256 794d9c5773bb4cdd5ccebb4df6ecf4c9d87a0286bb82e06f3bfc6d87d1ef5321
-MISC ChangeLog 11361 RMD160 a88b4652346b31a1e018b11caeed90a37cefb148 SHA1 f86fa2be09aacdc968ad6a6edb2049508afa1bab SHA256 b96215c60171187bb7635817a7f5d69fa113b71bbb9251adabf145117354beca
+EBUILD fwbuilder-2.1.13-r2.ebuild 2326 RMD160 c9a5a50cc361b24c2c10e7a810b9f7b65bd007a2 SHA1 41d452fff2762909dcf190bd0a2a22dc64ac2426 SHA256 6eac02cf0d086b927ab8bf5b8411385752e2650d66eb62284c2842721f4dbd78
+EBUILD fwbuilder-2.1.14.ebuild 2200 RMD160 3981110b38e9f6a94a7496c4920cd07f52cb4eeb SHA1 ab37cef4d05eca18a01927fdbde548441c477483 SHA256 b5f6c7f0b235e840b646546f986256b052deec5a62f68b31461d36cf7bd3323e
+MISC ChangeLog 11587 RMD160 9d7ff706c35ca26a0da74d450c1120b210ebd91e SHA1 ff2f402f2f4aa074634154ea1ba39dfa758b1e7b SHA256 d92486c7f969b88c2dd0586a0d447e0cc98c76e1924c5db3bde7c691beb2755a
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
diff --git a/net-firewall/fwbuilder/fwbuilder-2.1.13-r2.ebuild b/net-firewall/fwbuilder/fwbuilder-2.1.13-r2.ebuild
index 2a6b813f579b..9b25dccef08a 100644
--- a/net-firewall/fwbuilder/fwbuilder-2.1.13-r2.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-2.1.13-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/net-firewall/fwbuilder/fwbuilder-2.1.13-r2.ebuild,v 1.1 2007/09/07 01:26:17 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.1.13-r2.ebuild,v 1.2 2008/06/09 00:55:17 darkside Exp $
 
 inherit eutils qt3 autotools
 
@@ -19,10 +19,10 @@ DEPEND="~net-libs/libfwbuilder-${PV}
 	>=dev-libs/libxslt-1.0.7"
 
 pkg_setup() {
-	if built_with_use dev-java/antlr nocxx; then
-		eerror "dev-java/antlr can't be compiled with nocxx."
-		eerror "recompile it without that use flag set."
-		die "Need dev-java/antlr compiled without the nocxx use flag set"
+	if ! built_with_use dev-java/antlr cxx; then
+		eerror "dev-java/antlr must be compiled with cxx."
+		eerror "recompile it with that use flag set."
+		die "Need dev-java/antlr compiled with the cxx use flag set"
 	fi
 }
 
diff --git a/net-firewall/fwbuilder/fwbuilder-2.1.14.ebuild b/net-firewall/fwbuilder/fwbuilder-2.1.14.ebuild
index 9754bdaa5ac0..c9899f27e7dc 100644
--- a/net-firewall/fwbuilder/fwbuilder-2.1.14.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-2.1.14.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/net-firewall/fwbuilder/fwbuilder-2.1.14.ebuild,v 1.1 2007/09/29 23:04:46 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.1.14.ebuild,v 1.2 2008/06/09 00:55:17 darkside Exp $
 
 inherit eutils qt3 autotools
 
@@ -19,10 +19,10 @@ DEPEND="~net-libs/libfwbuilder-${PV}
 	>=dev-libs/libxslt-1.0.7"
 
 pkg_setup() {
-	if built_with_use dev-java/antlr nocxx; then
-		eerror "dev-java/antlr can't be compiled with nocxx."
-		eerror "recompile it without that use flag set."
-		die "Need dev-java/antlr compiled without the nocxx use flag set"
+	if ! built_with_use dev-java/antlr cxx; then
+		eerror "dev-java/antlr must be compiled with cxx."
+		eerror "recompile it with that use flag set."
+		die "Need dev-java/antlr compiled with the cxx use flag set"
 	fi
 }