Only force autotools on people using epatch_user, and clean up the lib move from /usr to / #332175.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 26 insertions, 13 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index d1a3cbe9c4fe..1bfc03338d59 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.222 2010/08/12 13:22:33 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.223 2010/08/19 21:36:51 vapier Exp $
+
+  19 Aug 2010; Mike Frysinger <vapier@gentoo.org> iptables-1.4.9.1-r2.ebuild:
+  Only force autotools on people using epatch_user, and clean up the lib move
+  from /usr to / #332175.
 
 *iptables-1.4.9.1-r2 (12 Aug 2010)
 
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 197f2d10846a..34c4d4821c49 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ip6tables-1.3.2.confd 293 RMD160 2e5399355a930ab3c804c9cc46fe37763555a97e SHA1 0e82dbe8538f9168bb97939a03b73dd291e82760 SHA256 c93827ac2b8fdd83e2c36788053ee7567ceb13b3cbc5fcf40d186500e05c8104
 AUX iptables-1.3.2.confd 290 RMD160 cb180068f86a608b16d850635ae909ea7b9cc059 SHA1 cb56dba4799eb3998b28e492c61265574c37d522 SHA256 351e123ba9e0ec7db2bcff42849aa627d29a3b2e77a47b82386f5e3a7e21bd30
 AUX iptables-1.3.2.init 2570 RMD160 84d06807fae0455009476cfa63dfcda9fe016dc3 SHA1 da7c4fca4049c4d3f45e32d29403c8bb05047f15 SHA256 1137517483c0d312e3d396d953e9ee197b84f64ed17adfd48f25dbb60e114697
@@ -11,7 +14,14 @@ EBUILD iptables-1.4.3.2.ebuild 1325 RMD160 46c2121e30c3bb1cc1065ffda130531ae87cd
 EBUILD iptables-1.4.6.ebuild 1434 RMD160 3af7e252de3a4a30aa76b7d55bf6ffba200b7b2b SHA1 80fa07843b530456dc3839074a2af7953c2962ce SHA256 9b734900a90073ec9a3554f1183b4dc27c839b8e94ed89b8aef8a484f5c8c402
 EBUILD iptables-1.4.7.ebuild 1508 RMD160 6893caabf8179547030981bf6bb7814d8ff605b7 SHA1 84abcb6ab8d48dc995b71838779c82e0c9e8cc58 SHA256 72962815748eb80eeffd6562800783ee0439f6564922cf9a433b55ea9c38934c
 EBUILD iptables-1.4.8-r1.ebuild 1585 RMD160 3441580e6c3ce1bd8fec196826197c415dd6f28a SHA1 e9f54a5a0ab4e41943093ef13a9a1da1583200a0 SHA256 6230e5ae3a57eec76d98cdc7156afad10f0bccdb7698cbe3b30cc68174d0e396
-EBUILD iptables-1.4.9.1-r2.ebuild 1987 RMD160 95b5951341240c54422bf80e790fadb4c10da2cf SHA1 3f9e26d0bc9613254877a4f12b032fae1887b612 SHA256 d5dd7e387039179cc1a1047da06c176bfb91cbe7e2ebd9a11634282209ad8597
+EBUILD iptables-1.4.9.1-r2.ebuild 1780 RMD160 a2aeadfb85fc6e06c00a8a8c60878b2d83865929 SHA1 7acf6440d7735912ac66cd881919e137b8e5cd71 SHA256 1edfc1af5318fd6a0c657ba2eeb404be69d1c760136ab298a8b6762b5b750978
 EBUILD iptables-1.4.9.1.ebuild 1537 RMD160 967a74ea537ec8caf04a0a2ed2a8681bea424749 SHA1 0ff8afc9f4787a928093dc977df0f9c9d7abeb90 SHA256 9917ead6366866df723a39afd33853c600dd660a57671b9499ae9b8f9d33c8ca
-MISC ChangeLog 40250 RMD160 0834c583954d5ac21f8c53792b7c2e84805ad8a7 SHA1 67f4e055aa249c2a2a52ad6b59049a2bb923aa06 SHA256 9bc8aee0cf807acf22a7996827fe671b87fff13d6026aaa17d6ebd51cde0f825
+MISC ChangeLog 40436 RMD160 4ed253ad9633cb9d93e4daa626e326799c539123 SHA1 549515efc47150651f2dba8dafc6192fc047b813 SHA256 f5ae6d3298718123cbcd9347920afe8a781916396a427bbd30fdd0a8a5bc7dc4
 MISC metadata.xml 932 RMD160 9fa7b0149bae1514716bc386607938017f4fe0a4 SHA1 b0f2555a2bf413de7d92a219339215cc66921e3a SHA256 5267377b7e871cb78d7a974cab7c842e152bda22d598102c3487b9039cc16c48
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAkxtpJUACgkQTwhj9JtAlp55LAEAqawJbudRCRmmCJJ2jy/+fo7+
+Ee55HaJCeML2u55RwJQA/RT8v/EVF8kv0qEmMSAe+fLNndppwFtkl8V/sHs9So/l
+=UAqy
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/iptables-1.4.9.1-r2.ebuild b/net-firewall/iptables/iptables-1.4.9.1-r2.ebuild
index 0519c5278c39..602860205e4d 100644
--- a/net-firewall/iptables/iptables-1.4.9.1-r2.ebuild
+++ b/net-firewall/iptables/iptables-1.4.9.1-r2.ebuild
@@ -1,8 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 EAPI="2"
+
+# Force users doing their own patches to install their own tools
+AUTOTOOLS_AUTO_DEPEND=no
+
 inherit eutils toolchain-funcs autotools
 
 DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
@@ -18,14 +22,13 @@ DEPEND="virtual/os-headers"
 RDEPEND=""
 
 src_prepare() {
-	epatch_user
-	eautoreconf
+	# Only run autotools if user patched something
+	epatch_user && eautoreconf || elibtoolize
 }
 
 src_configure() {
 	econf \
 		--sbindir=/sbin \
-		--libdir=/$(get_libdir) \
 		--libexecdir=/$(get_libdir) \
 		--enable-devel \
 		--enable-libipq \
@@ -58,10 +61,6 @@ src_install() {
 		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables || die
 	fi
 
-	# Remove .la from /lib, keep static archives in /usr/lib
-	find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-	dodir /usr/$(get_libdir)/
-	mv "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ || die "failed to mv static libs"
-	mv "${D}"{/,/usr/}"$(get_libdir)"/pkgconfig || die "failed to mv pkg-config files"
-	gen_usr_ldscript libip4tc.so libip6tc.so libipq.so libiptc.so libxtables.so
+	# Move important libs to /lib
+	gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
 }