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 | 66ba37c1108fe5a0fcf6e3858680c6c263936f4f (patch) | |
| tree | 91e7a817eb055ac8e6acb8330358d1a111068a21 /net-firewall | |
| parent | Version bump, remove old. (diff) | |
| download | historical-66ba37c1108fe5a0fcf6e3858680c6c263936f4f.tar.gz historical-66ba37c1108fe5a0fcf6e3858680c6c263936f4f.tar.bz2 historical-66ba37c1108fe5a0fcf6e3858680c6c263936f4f.zip | |
Do not provide static libs unless requested. Sort the deps to be more straight-forward.
Package-Manager: portage-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/Manifest | 22 | ||||
| -rw-r--r-- | net-firewall/iptables/iptables-1.4.12.1-r1.ebuild | 21 |
3 files changed, 31 insertions, 19 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/Manifest b/net-firewall/iptables/Manifest index 1f4cf95380ac..1bf340511c2e 100644 --- a/net-firewall/iptables/Manifest +++ b/net-firewall/iptables/Manifest @@ -16,16 +16,26 @@ DIST iptables-1.4.6.tar.bz2 463758 RMD160 05e2e46f71f04e7675ed6f1d9f43b1142bcb14 EBUILD iptables-1.4.10-r1.ebuild 2211 RMD160 08b184f51e106040be081664af0d0571a664229b SHA1 9cd5c0bb8414baae57fa954f60833df8f1c41152 SHA256 9e252a50a818104753102a48216ed3f67c524ab2866ffb752e0fd985ca61434c EBUILD iptables-1.4.10.ebuild 1847 RMD160 e6679bf4f78d1fd02e2f804d4c9fb708068927d1 SHA1 b5d309d92fd2ab38755e749994805f599cd7edc9 SHA256 59b3e9be75d0d4c13694692d36fc8e96a2a775e5a4809c300864c63a0b184376 EBUILD iptables-1.4.11.1-r2.ebuild 2226 RMD160 1164d66cde2b975c35e5f84532a41947bf618d98 SHA1 fc798d54e6ada0e2bc1cec4926329e1faeaa6417 SHA256 7cca07bca62a6bc5f5fd0c78abc237594d6fd1e69d03664deaddad16276e12b2 -EBUILD iptables-1.4.12.1-r1.ebuild 2313 RMD160 905ffc04fb9bf2db0b8be59093e79df5a8cd3bf7 SHA1 54c3783520c50a73aad64f4491bb67d1fe9d0c3f SHA256 ff4f3490fa76cc1a2fee091de250a9674e5b3347cdb8d56ee1adf97e05d5fd1a +EBUILD iptables-1.4.12.1-r1.ebuild 2283 RMD160 82c27e75726c3cff77e2ab5e7672e6357823e803 SHA1 5eb3238a1a476a14f204ab3387b6bf1586721fb5 SHA256 aff35080e0fc87c88f40fbe0cca953165a6dab2a58d203e1bdf211740a5fe71e EBUILD iptables-1.4.12.1.ebuild 2236 RMD160 6071e077a7c9191de8f24cc7f38cb25c42218717 SHA1 6c01e4fc3913b9016b2171def62b16f23fcc4cc9 SHA256 361587d09c71eb469f7011f8ba96a1c64ad70aef3a3a949287268c9745cd747b EBUILD iptables-1.4.12.ebuild 2181 RMD160 ac5dca50c3fc903d0a9466503f0dea3f65af7635 SHA1 8e7aa3bc786b5c805ac32015d2cd59ecb59feaf1 SHA256 28ddb17b1b0cfaddd290ee8f850075368082df0029f3a6949b5b87505779316b EBUILD iptables-1.4.6.ebuild 1433 RMD160 9dbfa44e5cd29a505a7095f122154061cef1d969 SHA1 788fc9f2ad8aa814821b43aa89933a8e281401c3 SHA256 c3808c683e4f286e40989133c80ad898aaa8e00eac635ec115652acb974e302f -MISC ChangeLog 45043 RMD160 ad361c244a08ec91d6774a396b17a131238a80eb SHA1 be164966d8cf978a05c64da352a0d280cf933bbf SHA256 aa6a278a9fc8b32dccb2bcffd08f6fe0bf3413b1f53426e73bfad6b0e77b369a +MISC ChangeLog 45223 RMD160 27b4574b96393367c42f53f943223601d9691596 SHA1 f60beac9334a80473ba143771197e9046cee1860 SHA256 7d863df3af754c056f292362ce6f1719ec401682a324f0f226283b93c5737c11 MISC metadata.xml 1033 RMD160 e99b7b4ea8b981347a7fcadb549d122e23af4fd7 SHA1 4feab39d5a63d9ead6d389eae639bcbfd7fff197 SHA256 6972ae7bad5c0025564a15429579f046ab4c365929aa175b1e84c1586872bdc9 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7bSGQACgkQI1lqEGTUzySfUwCg03JS/FkPntli9EumhJybwQyh -jeUAn2/ENBfOVkdQKEZUGesKLgJL8bru -=QYLc +iQIcBAEBAgAGBQJO/ahWAAoJEOSiRoyO7jvoKngQAJR0mLkgVN1X55KP/HTHcs5S +GF44rXRJKdptxvoc/miXme9ur2FTsKPQ5hjKKRKzknN5UgJSMvBM9WPqH6dGwx8m +Z+qBCdWYm/UI0cm4PbB4SRqM0peGiMid6UKSg0GUsT/457aIJ0K360d9enA6879p +vo3FggjT6FeJdnQujqLfOUEwy130SHRB6XVnAmAxwMGFvsRI+VMc9GdWUmSVZl3H +/g+Z+NxyHaTdNQwTxyTK07YBOv8X1UxJCYRPKk3mbCHGRARbxDV2on8WG7PAOrQo +Bm4kYCWPwB9Ux+TXBObDkTu597qTNhUDTrqjuloqko6kMhMi1Bp4ZDQ5SbfPKDtG +bcO4XsnMKmGWoi0APmkqMzn4D4EyJquiKUe3kBC1yn2gdj/CFNyHv2eEJnqLW+8A +fGoKLJ7oONiXvaI4MyHMGB0jaEV3fEZq3cOYy0QLoQfB+A2h6mFPHXjorrnZz8ZX +7KWPs1XPBGB3humPHsfGvBMbsB6YhelHygKJ3Me49pzLccEZoxDgzPM55uyulRp/ +m9+tIRS1m7BM/FeQn772Yf27AgoOGatEpENMTWFhsmHOsvF6VbVtPVcEa1ke1m+4 +5T3uKQHDxynoATUOMjhqoQsgraj71w9q1Bt/BtJauUPdkPV6LEZBGaT8FeLRJsup +wUAZ2dP27gCVFo0X7psg +=AkJT -----END PGP SIGNATURE----- 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 |