| 1 |
vapier 10/08/19 21:36:51 |
| 2 |
|
| 3 |
Modified: ChangeLog iptables-1.4.9.1-r2.ebuild |
| 4 |
Log: |
| 5 |
Only force autotools on people using epatch_user, and clean up the lib move from /usr to / #332175. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.223 net-firewall/iptables/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.223&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.223&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/ChangeLog?r1=1.222&r2=1.223 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v |
| 18 |
retrieving revision 1.222 |
| 19 |
retrieving revision 1.223 |
| 20 |
diff -u -r1.222 -r1.223 |
| 21 |
--- ChangeLog 12 Aug 2010 13:22:33 -0000 1.222 |
| 22 |
+++ ChangeLog 19 Aug 2010 21:36:51 -0000 1.223 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for net-firewall/iptables |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.222 2010/08/12 13:22:33 pva Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.223 2010/08/19 21:36:51 vapier Exp $ |
| 28 |
+ |
| 29 |
+ 19 Aug 2010; Mike Frysinger <vapier@g.o> iptables-1.4.9.1-r2.ebuild: |
| 30 |
+ Only force autotools on people using epatch_user, and clean up the lib move |
| 31 |
+ from /usr to / #332175. |
| 32 |
|
| 33 |
*iptables-1.4.9.1-r2 (12 Aug 2010) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 net-firewall/iptables/iptables-1.4.9.1-r2.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/iptables-1.4.9.1-r2.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/iptables-1.4.9.1-r2.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/iptables-1.4.9.1-r2.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: iptables-1.4.9.1-r2.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.9.1-r2.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- iptables-1.4.9.1-r2.ebuild 12 Aug 2010 13:22:33 -0000 1.1 |
| 51 |
+++ iptables-1.4.9.1-r2.ebuild 19 Aug 2010 21:36:51 -0000 1.2 |
| 52 |
@@ -1,8 +1,12 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.9.1-r2.ebuild,v 1.1 2010/08/12 13:22:33 pva Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.9.1-r2.ebuild,v 1.2 2010/08/19 21:36:51 vapier Exp $ |
| 57 |
|
| 58 |
EAPI="2" |
| 59 |
+ |
| 60 |
+# Force users doing their own patches to install their own tools |
| 61 |
+AUTOTOOLS_AUTO_DEPEND=no |
| 62 |
+ |
| 63 |
inherit eutils toolchain-funcs autotools |
| 64 |
|
| 65 |
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools" |
| 66 |
@@ -18,14 +22,13 @@ |
| 67 |
RDEPEND="" |
| 68 |
|
| 69 |
src_prepare() { |
| 70 |
- epatch_user |
| 71 |
- eautoreconf |
| 72 |
+ # Only run autotools if user patched something |
| 73 |
+ epatch_user && eautoreconf || elibtoolize |
| 74 |
} |
| 75 |
|
| 76 |
src_configure() { |
| 77 |
econf \ |
| 78 |
--sbindir=/sbin \ |
| 79 |
- --libdir=/$(get_libdir) \ |
| 80 |
--libexecdir=/$(get_libdir) \ |
| 81 |
--enable-devel \ |
| 82 |
--enable-libipq \ |
| 83 |
@@ -58,10 +61,6 @@ |
| 84 |
newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables || die |
| 85 |
fi |
| 86 |
|
| 87 |
- # Remove .la from /lib, keep static archives in /usr/lib |
| 88 |
- find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed" |
| 89 |
- dodir /usr/$(get_libdir)/ |
| 90 |
- mv "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ || die "failed to mv static libs" |
| 91 |
- mv "${D}"{/,/usr/}"$(get_libdir)"/pkgconfig || die "failed to mv pkg-config files" |
| 92 |
- gen_usr_ldscript libip4tc.so libip6tc.so libipq.so libiptc.so libxtables.so |
| 93 |
+ # Move important libs to /lib |
| 94 |
+ gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables |
| 95 |
} |
Archives