diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-12-30 12:01:22 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-12-30 12:01:22 +0000 |
| commit | 946096008b17b2eb5c370dabe8dd09ab27ab773f (patch) | |
| tree | 81f02b9adb7cd1b3a52a992ebe2c9e72a2db776d /net-firewall | |
| parent | Version bump, remove old. (diff) | |
| download | gentoo-2-946096008b17b2eb5c370dabe8dd09ab27ab773f.tar.gz gentoo-2-946096008b17b2eb5c370dabe8dd09ab27ab773f.tar.bz2 gentoo-2-946096008b17b2eb5c370dabe8dd09ab27ab773f.zip | |
Do not provide static libs unless requested. Sort the deps to be more straight-forward.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'net-firewall')
| -rw-r--r-- | net-firewall/iptables/ChangeLog | 7 | ||||
| -rw-r--r-- | net-firewall/iptables/iptables-1.4.12.1-r1.ebuild | 21 |
2 files changed, 15 insertions, 13 deletions
diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog index 4569699a087b..4046a4a68310 100644 --- a/net-firewall/iptables/ChangeLog +++ b/net-firewall/iptables/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-firewall/iptables # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.256 2011/12/04 10:15:59 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.257 2011/12/30 12:01:22 scarabeus Exp $ + + 30 Dec 2011; Tomáš Chvátal <scarabeus@gentoo.org> + iptables-1.4.12.1-r1.ebuild: + Do not provide static libs unless requested. Sort the deps to be more + straight-forward. 04 Dec 2011; Sven Wegener <swegener@gentoo.org> files/iptables-1.3.2.init, files/iptables-1.4.11.init: diff --git a/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild b/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild index 3dca4d624dd9..47ee0204c523 100644 --- a/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild +++ b/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild,v 1.1 2011/09/19 07:45:40 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild,v 1.2 2011/12/30 12:01:22 scarabeus Exp $ EAPI="4" @@ -16,23 +16,20 @@ SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="ipv6 netlink" +IUSE="ipv6 netlink static-libs" -COMMON_DEPEND=" +RDEPEND=" netlink? ( net-libs/libnfnetlink ) " -DEPEND=" - ${COMMON_DEPEND} +DEPEND="${RDEPEND} virtual/os-headers sys-devel/automake " -RDEPEND=" - ${COMMON_DEPEND} -" src_prepare() { - epatch "${FILESDIR}/iptables-1.4.12.1-lm.patch" - epatch "${FILESDIR}/iptables-1.4.12.1-conntrack-v2-ranges.patch" + epatch \ + "${FILESDIR}/iptables-1.4.12.1-lm.patch" \ + "${FILESDIR}/iptables-1.4.12.1-conntrack-v2-ranges.patch" eautomake # Only run autotools if user patched something @@ -49,7 +46,7 @@ src_configure() { --enable-devel \ --enable-libipq \ --enable-shared \ - --enable-static \ + $(use-enable static-libs static) \ $(use_enable ipv6) } @@ -58,7 +55,7 @@ src_compile() { } src_install() { - emake install DESTDIR="${D}" + default dodoc INCOMPATIBILITIES iptables/iptables.xslt # all the iptables binaries are in /sbin, so might as well |