From: Jeroen Roovers <jer@gentoo.org>
Date: Sun, 27 Nov 2011 22:33:48 +0000 (+0000)
Subject: Do not use autotools-utils.eclass (bug #392067).
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a0a5dca1ca062cd0a10cfb812f8343987f4f6129;p=gentoo.git

Do not use autotools-utils.eclass (bug #392067).

Package-Manager: portage-2.2.0_alpha78/cvs/Linux x86_64
---

diff --git a/dev-libs/geoip/ChangeLog b/dev-libs/geoip/ChangeLog
index a85b657244a8..defc1491984e 100644
--- a/dev-libs/geoip/ChangeLog
+++ b/dev-libs/geoip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/geoip
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.127 2011/11/27 04:40:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.128 2011/11/27 22:33:48 jer Exp $
+
+  27 Nov 2011; Jeroen Roovers <jer@gentoo.org> geoip-1.4.8.ebuild:
+  Do not use autotools-utils.eclass (bug #392067).
 
   27 Nov 2011; Tim Harder <radhermit@gentoo.org> geoip-1.4.8.ebuild:
   Build in the source tree.
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index 9f524f66bd5e..eec8afe7f19b 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX geoipupdate.sh 713 RMD160 bd0c4d6e4c58bb7a9aba7ec7b61ee8c991ee7de1 SHA1 544f692439aad0c5825f23d9cfbbac751facd1c2 SHA256 a7ba219827a708dcc8288275a9dc27fbf6995d147d09012105bac08586a0c0a3
 DIST GeoIP-1.4.8.tar.gz 1074829 RMD160 51388ff9c738c9e4d60fff790b7d7599a7133bf5 SHA1 7bafb9918e3c35a6ccc71bb14945245d45c4b796 SHA256 cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4
 DIST GeoIPv6.dat.gz 757472 RMD160 178fb259d5fe7158a49c32a9b72d91372cb2d8a5 SHA1 98894197992ef1022bf27d612eda009672ccf46d SHA256 75f63ca4db6909b01ece94e3462048eb2a836f67b9d09548443d45294a938d52
-EBUILD geoip-1.4.8.ebuild 1524 RMD160 a3d346e4fe1b76cba421c88e850f3aaf37fc95c0 SHA1 e37a4d7d661ad7ea4e9de36a5adca2ec191e6d2b SHA256 acbc35c6f0b58dd13a5f607e3826df69ccba4867ad0d60164f63a93bf2e77e66
-MISC ChangeLog 15502 RMD160 ea5da781a0e500801736826d89518a44fe0fb386 SHA1 b216116d7811d549a4de3742d05865b43f047509 SHA256 44532c782d1194b9508f6665900b04ff7022ec28c5d61f42c4e57cb644720945
+EBUILD geoip-1.4.8.ebuild 1496 RMD160 80c3e28af6298b89b7c627338c4dc36d2cc4a121 SHA1 58cbe8c1e46d9deaf585dc6d58a5c5b67835a5e6 SHA256 a13b53714c4ebd420e50da2184c09e31ddbbe6537bdc2778ad7efde7204cb2da
+MISC ChangeLog 15615 RMD160 5d74fa7e4f718a6dff41aa22a89201d27eaa3f25 SHA1 4620437afb5546c5a3322e75820f79b37447162e SHA256 b1dbd62f5e1d95e638503c3db71103a6cfbd5996a06f11bb3b5ac4cc1a623fd1
 MISC metadata.xml 467 RMD160 bae585df5c7d12c765d5fab1b7766b79729f1144 SHA1 dfe6076a08817ef8058f1209c381d61f4aaac998 SHA256 3081b13432bfa3cc218fe7f9ade8fe1cd0fcbea4f3f1de2d51faf8a0acad88f5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO0b9XAAoJEEqz6FtPBkyjtMAIAKyLN68QyubhqpIi5cEhxZTZ
-RMqe+BYRuiXeQOruriJqLI6f4gpBGppglkTojURG4S2grP6UdMAGfN0AweSkan1s
-qOFw+PScUeI6pIoW0Y9SZUXfj5vvs1iCYhrmB6I+lMQ+KCJ8uNrb/MrEGlkdCpER
-uPQRbv2kj5Tg4bBuOU/THsUOq5OsWU5OcMi/cYMV/HvBbcUfoEpLSpTISDctCoZz
-qj4uTQsP3X3zYU795lGMnQxoyv9PHeXPX0eMpBSmzZIyKChwRK4DEs4NKo/QqZvd
-m9kKx3MP3yvIfMMAlTOYYZNatWk0qdVSZixctb26jVi8y8/cyRKBDTSwNvC6Slc=
-=C8iA
+iEYEARECAAYFAk7SutIACgkQVWmRsqeSphOMLwCfZahj9shbvYiHs8KBCbDQ7Ory
+rOoAnitiBFfAPZLjYZt1BcqUYN+tmm+W
+=OrtD
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/geoip/geoip-1.4.8.ebuild b/dev-libs/geoip/geoip-1.4.8.ebuild
index 284156c23351..1372d3a25375 100644
--- a/dev-libs/geoip/geoip-1.4.8.ebuild
+++ b/dev-libs/geoip/geoip-1.4.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.8.ebuild,v 1.8 2011/11/27 04:40:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.8.ebuild,v 1.9 2011/11/27 22:33:48 jer Exp $
 
 EAPI=4
 
-inherit autotools autotools-utils
+inherit autotools
 
 MY_P=${P/geoip/GeoIP}
 
@@ -28,8 +28,6 @@ RDEPEND="
 	)
 "
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
@@ -49,7 +47,9 @@ src_install() {
 	use perl-geoipupdate && dobin apps/geoipupdate-pureperl.pl
 	dodoc AUTHORS ChangeLog README TODO conf/GeoIP.conf.default
 	rm "${ED}/etc/GeoIP.conf.default"
-	use static-libs || remove_libtool_files
+	if ! use static-libs; then
+		rm -f "${D}"/usr/lib*/lib*.la
+	fi
 
 	if use ipv6; then
 		insinto /usr/share/GeoIP