| 1 |
scarabeus 11/12/30 12:01:22 |
| 2 |
|
| 3 |
Modified: ChangeLog iptables-1.4.12.1-r1.ebuild |
| 4 |
Log: |
| 5 |
Do not provide static libs unless requested. Sort the deps to be more straight-forward. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.257 net-firewall/iptables/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.257&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.257&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/ChangeLog?r1=1.256&r2=1.257 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v |
| 19 |
retrieving revision 1.256 |
| 20 |
retrieving revision 1.257 |
| 21 |
diff -u -r1.256 -r1.257 |
| 22 |
--- ChangeLog 4 Dec 2011 10:15:59 -0000 1.256 |
| 23 |
+++ ChangeLog 30 Dec 2011 12:01:22 -0000 1.257 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for net-firewall/iptables |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.256 2011/12/04 10:15:59 swegener Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.257 2011/12/30 12:01:22 scarabeus Exp $ |
| 29 |
+ |
| 30 |
+ 30 Dec 2011; Tomáš Chvátal <scarabeus@g.o> |
| 31 |
+ iptables-1.4.12.1-r1.ebuild: |
| 32 |
+ Do not provide static libs unless requested. Sort the deps to be more |
| 33 |
+ straight-forward. |
| 34 |
|
| 35 |
04 Dec 2011; Sven Wegener <swegener@g.o> files/iptables-1.3.2.init, |
| 36 |
files/iptables-1.4.11.init: |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 net-firewall/iptables/iptables-1.4.12.1-r1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: iptables-1.4.12.1-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- iptables-1.4.12.1-r1.ebuild 19 Sep 2011 07:45:40 -0000 1.1 |
| 53 |
+++ iptables-1.4.12.1-r1.ebuild 30 Dec 2011 12:01:22 -0000 1.2 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $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 $ |
| 58 |
+# $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 $ |
| 59 |
|
| 60 |
EAPI="4" |
| 61 |
|
| 62 |
@@ -16,23 +16,20 @@ |
| 63 |
LICENSE="GPL-2" |
| 64 |
SLOT="0" |
| 65 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 66 |
-IUSE="ipv6 netlink" |
| 67 |
+IUSE="ipv6 netlink static-libs" |
| 68 |
|
| 69 |
-COMMON_DEPEND=" |
| 70 |
+RDEPEND=" |
| 71 |
netlink? ( net-libs/libnfnetlink ) |
| 72 |
" |
| 73 |
-DEPEND=" |
| 74 |
- ${COMMON_DEPEND} |
| 75 |
+DEPEND="${RDEPEND} |
| 76 |
virtual/os-headers |
| 77 |
sys-devel/automake |
| 78 |
" |
| 79 |
-RDEPEND=" |
| 80 |
- ${COMMON_DEPEND} |
| 81 |
-" |
| 82 |
|
| 83 |
src_prepare() { |
| 84 |
- epatch "${FILESDIR}/iptables-1.4.12.1-lm.patch" |
| 85 |
- epatch "${FILESDIR}/iptables-1.4.12.1-conntrack-v2-ranges.patch" |
| 86 |
+ epatch \ |
| 87 |
+ "${FILESDIR}/iptables-1.4.12.1-lm.patch" \ |
| 88 |
+ "${FILESDIR}/iptables-1.4.12.1-conntrack-v2-ranges.patch" |
| 89 |
eautomake |
| 90 |
|
| 91 |
# Only run autotools if user patched something |
| 92 |
@@ -49,7 +46,7 @@ |
| 93 |
--enable-devel \ |
| 94 |
--enable-libipq \ |
| 95 |
--enable-shared \ |
| 96 |
- --enable-static \ |
| 97 |
+ $(use-enable static-libs static) \ |
| 98 |
$(use_enable ipv6) |
| 99 |
} |
| 100 |
|
| 101 |
@@ -58,7 +55,7 @@ |
| 102 |
} |
| 103 |
|
| 104 |
src_install() { |
| 105 |
- emake install DESTDIR="${D}" |
| 106 |
+ default |
| 107 |
dodoc INCOMPATIBILITIES iptables/iptables.xslt |
| 108 |
|
| 109 |
# all the iptables binaries are in /sbin, so might as well |
Archives