summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2008-09-27 13:37:48 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2008-09-27 13:37:48 +0000
commitef36ed7371692d202da2e239ef6c679bf8b82d27 (patch)
tree8832ff8d8fe8e638b86f6232e2b3aeff813389ce /net-firewall
parentUse EAPI 2 use dependencies instead of built_with_use. (diff)
downloadgentoo-2-ef36ed7371692d202da2e239ef6c679bf8b82d27.tar.gz
gentoo-2-ef36ed7371692d202da2e239ef6c679bf8b82d27.tar.bz2
gentoo-2-ef36ed7371692d202da2e239ef6c679bf8b82d27.zip
Use EAPI 2 use dependencies instead of built_with_use.
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686)
Diffstat (limited to 'net-firewall')
-rw-r--r--net-firewall/firehol/ChangeLog14
-rw-r--r--net-firewall/firehol/firehol-1.256-r1.ebuild17
2 files changed, 14 insertions, 17 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...