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

(Portage version: 2.1.4.4)

3 files changed, 18 insertions, 13 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/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
 }