From 280734e62c15509371b04abd4821958a5669ae1a Mon Sep 17 00:00:00 2001 From: Petteri Räty Date: Sun, 8 Mar 2009 14:27:33 +0000 Subject: Migrate to EAPI 2. (Portage version: 2.2_rc20/cvs/Linux 2.6.29-rc6 i686) --- net-firewall/shorewall/ChangeLog | 5 ++++- net-firewall/shorewall/shorewall-3.4.8.ebuild | 15 ++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'net-firewall') diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog index 22497f7b86ce..8b58af587b38 100644 --- a/net-firewall/shorewall/ChangeLog +++ b/net-firewall/shorewall/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-firewall/shorewall # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.168 2009/02/28 18:50:03 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.169 2009/03/08 14:27:33 betelgeuse Exp $ + + 08 Mar 2009; Petteri Räty shorewall-3.4.8.ebuild: + Migrate to EAPI 2. 28 Feb 2009; Peter Volkov -shorewall-3.0.8.ebuild, -shorewall-3.2.9.ebuild, -shorewall-3.4.6.ebuild, -shorewall-3.4.7.ebuild, diff --git a/net-firewall/shorewall/shorewall-3.4.8.ebuild b/net-firewall/shorewall/shorewall-3.4.8.ebuild index 466ee1b1a29f..ea554463066b 100644 --- a/net-firewall/shorewall/shorewall-3.4.8.ebuild +++ b/net-firewall/shorewall/shorewall-3.4.8.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.4.8.ebuild,v 1.8 2009/02/28 18:50:03 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.4.8.ebuild,v 1.9 2009/03/08 14:27:33 betelgeuse Exp $ + +EAPI="2" inherit eutils @@ -19,7 +21,7 @@ KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86" IUSE="doc" DEPEND=">=net-firewall/iptables-1.2.4 - sys-apps/iproute2" + sys-apps/iproute2[-minimal]" RDEPEND="${DEPEND}" # When we're ready for 3.9.x... @@ -28,12 +30,6 @@ RDEPEND="${DEPEND}" # >=net-firewall/shorewall-perl-3.9.1 # )" -pkg_setup() { - if built_with_use sys-apps/iproute2 minimal; then - die "Shorewall requires sys-apps/iproute2 to be built without the \"minimal\" USE flag." - fi -} - src_compile() { einfo "Nothing to compile." } @@ -44,7 +40,8 @@ src_install() { PREFIX="${D}" ./install.sh || die "install.sh failed" newinitd "${FILESDIR}"/shorewall-r2 shorewall || die "doinitd failed" - dodoc changelog.txt releasenotes.txt + dodoc changelog.txt releasenotes.txt || die + if use doc; then cd "${WORKDIR}/${MY_P_DOCS}" # install documentation -- cgit v1.2.3-65-gdbad