Use EAPI 2 use dependencies instead of built_with_use.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 24 insertions, 29 deletions

diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog
index c24100ca463a..c54921f3e75c 100644
--- a/net-firewall/firehol/ChangeLog
+++ b/net-firewall/firehol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/firehol
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.36 2008/05/28 19:18:28 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.37 2008/09/27 13:37:48 betelgeuse Exp $
+
+  27 Sep 2008; Petteri Räty <betelgeuse@gentoo.org>
+  firehol-1.256-r1.ebuild:
+  Use EAPI 2 use dependencies instead of built_with_use.
 
   28 May 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Dominik Stadler (centic) from metadata.xml (as per #40994).
@@ -171,15 +175,15 @@
   14 Oct 2003; Martin Holzer <mholzer@gentoo.org> firehol-1.159.ebuild:
   Version bumped. closes #31052.
 
-*firehol-1.120 (06 April 2003)
+*firehol-1.120 (06 Apr 2003)
 
-  06 April 2003; Sascha Schwabbauer <cybersystem@gentoo.org> firehol-1.120.ebuild, files/digest-firehol-1.120 :
+  06 Apr 2003; Sascha Schwabbauer <cybersystem@gentoo.org> firehol-1.120.ebuild, files/digest-firehol-1.120 :
 
   Version bump, again thanks to Maik Schreiber <blizzy@blizzy.de> in bug #18837
 
-*firehol-1.91 (05 April 2003)
+*firehol-1.91 (05 Apr 2003)
 
-  05 April 2003; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, firehol-1.91.ebuild, files/digest-firehol-1.91 :
+  05 Apr 2003; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, firehol-1.91.ebuild, files/digest-firehol-1.91 :
 
   Initial commit, made by Maik Schreiber <blizzy@blizzy.de> in bug #18808
 
diff --git a/net-firewall/firehol/firehol-1.256-r1.ebuild b/net-firewall/firehol/firehol-1.256-r1.ebuild
index ec6a640cd355..1aab7d563745 100644
--- a/net-firewall/firehol/firehol-1.256-r1.ebuild
+++ b/net-firewall/firehol/firehol-1.256-r1.ebuild
@@ -1,6 +1,8 @@
-# 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/firehol/firehol-1.256-r1.ebuild,v 1.2 2007/11/06 10:22:03 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.256-r1.ebuild,v 1.3 2008/09/27 13:37:48 betelgeuse Exp $
+
+EAPI=2
 
 inherit eutils linux-info
 
@@ -15,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND="sys-apps/iproute2"
 RDEPEND="net-firewall/iptables
-	sys-apps/iproute2
+	sys-apps/iproute2[-minimal]
 	virtual/modutils
 	|| (
 		net-misc/wget
@@ -25,15 +27,6 @@ RDEPEND="net-firewall/iptables
 #S="${WORKDIR}/${PN}-1.226"
 
 pkg_setup() {
-	# Bug 81600 fail if iproute2 is built with minimal
-	if built_with_use sys-apps/iproute2 minimal; then
-		eerror "Firehol requires iproute2 to be emerged without"
-		eerror "the USE-Flag \"minimal\"."
-		eerror "Re-emerge iproute2 with"
-		eerror "USE=\"-minimal\" emerge sys-apps/iproute2"
-		die "sys-apps/iproute2 without USE=\"minimal\" needed"
-	fi
-
 	# perform checks for kernel config from eclass linux-info
 	# for now we just print warnings as I am not sure if these
 	# are required always...
diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index dfdeed7980c2..8d383b42790d 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,10 @@
 # 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.70 2008/06/09 01:55:32 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.71 2008/09/27 13:35:33 betelgeuse Exp $
+
+  27 Sep 2008; Petteri Räty <betelgeuse@gentoo.org>
+  fwbuilder-2.1.18.ebuild:
+  Use EAPI 2 use dependencies instead of built_with_use.
 
 *fwbuilder-2.1.18 (09 Jun 2008)
 
@@ -318,7 +322,7 @@
   03 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> fwbuilder-1.0.3-r1.ebuild:
   Added dependency to iproute2, closes #5645.  
 
-*fwbuilder-1.0.3 (10 July 2002)
+*fwbuilder-1.0.3 (10 Jul 2002)
 
   10 Jul 2002; phoen][x <phoenix@gentoo.org> fwbuilder-1.0.3.ebuild :
   Bumped to new version. Thanks to Artur Wanzel <t1ck@bonetmail.com>
diff --git a/net-firewall/fwbuilder/fwbuilder-2.1.18.ebuild b/net-firewall/fwbuilder/fwbuilder-2.1.18.ebuild
index eb1771583cae..8873a057c61a 100644
--- a/net-firewall/fwbuilder/fwbuilder-2.1.18.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-2.1.18.ebuild
@@ -1,6 +1,8 @@
 # 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.18.ebuild,v 1.1 2008/06/09 01:55:32 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.1.18.ebuild,v 1.2 2008/09/27 13:35:33 betelgeuse Exp $
+
+EAPI=2
 
 inherit eutils qt3 autotools
 
@@ -15,17 +17,9 @@ IUSE="nls"
 
 DEPEND="~net-libs/libfwbuilder-${PV}
 	nls? ( >=sys-devel/gettext-0.11.4 )
-	~dev-java/antlr-2.7.7
+	~dev-java/antlr-2.7.7[cxx]
 	>=dev-libs/libxslt-1.0.7"
 
-pkg_setup() {
-	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
-}
-
 src_compile() {
 	# we'll use our eqmake instead of bundled script to process qmake files
 	sed -i -e 's:^. ./runqmake.sh$:echo:' configure \