Switch to github based releases. Clean up.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 27 insertions, 15 deletions

diff --git a/dev-libs/geoip/ChangeLog b/dev-libs/geoip/ChangeLog
index bc340b44ac45..c43008985b16 100644
--- a/dev-libs/geoip/ChangeLog
+++ b/dev-libs/geoip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/geoip
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.187 2013/06/10 18:53:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.188 2013/07/20 05:15:51 jer Exp $
+
+  20 Jul 2013; Jeroen Roovers <jer@gentoo.org> geoip-1.5.1.ebuild:
+  Switch to github based releases. Clean up.
 
 *geoip-1.5.1 (10 Jun 2013)
 
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index 0d248d0fa29f..7ae0e168d66d 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -6,20 +6,21 @@ AUX geoipupdate-r1.sh 746 SHA256 fec9ee8ee72c3d8479c0281005543e69b46993a268657c8
 AUX geoipupdate-r2.sh 852 SHA256 aacd1e2ad31e6dae8b57190db221cf12aacfe9f41be83a3fbdd5f8146b3e5870 SHA512 adabb01dc89e26fd1f3f00a0463ddfca47e27823916edf618fc662faa8244fab477006280d579dcc48a651130fd7ee68669e04c8bf300426e9f7a12687da4b82 WHIRLPOOL 36e8a28013bda0aa1d23726e0177f6cb0757f4ff8d175098313e3f5280f68c821e3de181b9adea92b166f9ac7148268ed9fba0de91e261f3b50d69646f6bb19a
 DIST GeoIP-1.4.8.tar.gz 1074829 SHA256 cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4 SHA512 aec70bdf002f1041ecb14f091e32206af033dc6ed89d20dffcc80e4c4edad993c9dfab7810576cb75f07d356ef34529ca3f2613e43e7f97c2b7ae099ce3be317 WHIRLPOOL 3dcaa7ef9610ede593b64a7a0f111adc0b2f9c4bf64054ef4f690d284a8c7ba45083d2739585047db18e3c22b50b026c9b5fee26142a4611af7b4092e907ffdf
 DIST GeoIP-1.5.0.tar.gz 1232688 SHA256 d1dbd4f27bcf0e760329f0f9c67a5fc81b4c56efbe0666159934c2bcd38caea2 SHA512 87bc4972ae438f3f37a1f05e55377862a72437195e0241b7fa1ddf4ebaeb1da50a07a387ae13481dd1ff2a5ec39b9830a808618bb8c825417d25068684540b3f WHIRLPOOL 11ea882d6fd77426a2ffa05632dfc7ef9c16dc323bb01738ce9b0fa67a181d380e6c80f3a0f1065e12b95537e21ceeab817db2acf25492388fe6878bdf9ed6fa
-DIST GeoIP-1.5.1.tar.gz 1195457 SHA256 ec35ee73fcc54c493f4252565d1c81d022b398dd16de3af1522c8cab016f8731 SHA512 aacb59ac7ced106ed420d320ffe6ffbec0d0e49ef3af8c2380c731824413386b6979e13f7a4ba81ba5b8d5ab4792830da232a02caa263752302acf55ac9bcae5 WHIRLPOOL 3a9761c30694b64d46727bc0da7620ab9db394a688017f48aa24be7d81b81e6d2fbb82e8b44bd350a58076c607fdfadca8e85695775904e05d774e3ea505dda0
+DIST GeoIP.dat.gz 339117 SHA256 ca087bc539609f89c5f1588e09d14a96ba6a64f891929852d12df0e0d38a87fc SHA512 8a1bc6d442bff4ca53292e0dae63b619d20a1b66045245f4128821bdb38d477e7abf284ce31b2dfd72412ab36ada1faf9e721010ddbb3b84b0e266f67c15ab79 WHIRLPOOL 2f1d35ff94870edd496f294ec52cbb8b21d91f0532d3e32a2c11442ffa0458a5ecfc07ce90857505700b4c839ae38ce7300a0d6e56e31423998a6e38cecd5836
 DIST GeoIPASNum.dat.gz 1848800 SHA256 4c4ea1243e7dcbef6067de7c4b7447be635d60c4b5a02174e878898fb54b8de1 SHA512 741541170506dc516af331e467906d0066c9b9a4fd8b50f17aa55a7d4a78134d37d3499bae09f8d95089d7003068f43dcecb11a985be2cde91fa630a459f1967 WHIRLPOOL 960da0748348ba6455acb59af5ab262279960b2c46c047b9dcdb2f6694accc8e140d41b06f75cdd82534d171512666b337ce4044b0a2f99d906e0dd0a3c115d8
 DIST GeoIPv6.dat.gz 932782 SHA256 3e83499214f44105c84989fe19fddba1208ed756443835064ffa69eafb5c74f8 SHA512 211d6035f2f7a5cc3f362395c9f66b21574ef6a2ee0d19da7e7dccc4484b75ff9d86dce5ced85824a0da3a29e8f39a51e32cc275d0735e9d2bde4a4bf0b1b5d1 WHIRLPOOL 2e7c17dc52c7f33b072b911e40b0a947b5e38bdbab342dd15f5470a143590d6be6df2da9a08243719bdb344e937db41a34a4ae20536e7a4c63459dc16ecefb8d
 DIST GeoLiteCity.dat.gz 12108586 SHA256 e322104ed00676102da1b5e66788a51bfd386447d2422b9cb770bbeb4e36954a SHA512 2503514df4908c1f0ed7a5d43b7f9d58fa25e2e6d6cd984e122a8bf3733f4b9372a4147a1c8678f70b83e518fd0b69a7e162643613a77ccd93d68af201a1497c WHIRLPOOL 12baea7c0a55122dfb72185896c71790f8d1e7b4023bab3594b02ee1ca9781a19bb8ee62b751d69ad6a55186caf6504845d9039598e35a877e200748476e04fa
 DIST GeoLiteCityv6.dat.gz 12962880 SHA256 ab9c4deee7b3ef8bd665db67f2ba312b61d3aeb0233e8b2277f8cfbb9d7f2e6e SHA512 c8b5fde5fc5513ab4f5149e8babe2f1c59a5ff94cb69b8b60eb347ddee42d89b5e93919128240578c2ea263d80191f8afebb21159d5d8dc6c372bb872b8e2cbe WHIRLPOOL b2253e0193b8a47b8a6d9d0fac887a9410d5e361d4be5636c2e5e63fe5123f998f71dbaa89ff7d4bd82dc47f771705878a342598c926b0130585bedeb00e6490
+DIST geoip-1.5.1.tar.gz 254157 SHA256 e0fa12ee0eaa3f851e0610071f8153c72baa95b9ac0fd9b663da7d637f78bd02 SHA512 ad8348f8e6d12a582da13052d7f0040a0792d7f3ef3b5f0508182b56437b885a73a6a08b6bb485e9aa903f2b664b23f982235be92456739c01d83f13596b02c2 WHIRLPOOL b32931a63f1f58fe5a32443997aad4776960da1346b583e6bf08092ee0c7d4ea4bbf06d51ddca228cc1f798151a0a8249b8e40a458b46eeb27aa792760ae3af6
 EBUILD geoip-1.4.8-r3.ebuild 2070 SHA256 1c20af8e8d4e4eae22845dc8aa8c64c9f70bbb5af0b35e3a2a21de942e89c049 SHA512 8d656bed1398cbcfd584bd71ecf552066208d89287fc9e89d8cccba32dbf948f6dff096f414f6fe8ac098e2ff688afe1af1975d8ff42aa186d9c170a07197553 WHIRLPOOL 8f5c09c81255accfc798a6b31fcd764bed0eddc930b51c76b087bc03bb55e3a05e80491a787d50fd09c97108f602a6adfe855ac77c34ef4c808a433ecaba6f07
 EBUILD geoip-1.5.0.ebuild 2103 SHA256 e1becf968d211a7cd7735e2b4ad0307af5625b78ff1dda76c1142686ab50d19c SHA512 f68642dbb8b26bbcaea7b8b9ad99b9e20dd4e1da245611300967bfea8513fee0331dae5b9ff2de50420816af98edd67d1508f8d0f5f3fb1f090163fd440de6e2 WHIRLPOOL e1dd22cfe141955f8b47e4a6f23f244c5d2eb0fb3f396682e741a00cad097093993dee088b61844ff8913b42b04ebba4054804141ceb534eb772908c4a80d0ab
-EBUILD geoip-1.5.1.ebuild 2120 SHA256 7e864d38ff97880e7d7f6edc579c81978dbed71dc45e43ccd590e74fa9e3f20c SHA512 402680cf1294397e6fbcedb9440bcf594e2173b7c3e743698d4dca3ce1abeb68cc80257f82443b98513d4dae22416c4c4ce0421eb98f7cf0239c47486fa931e9 WHIRLPOOL 15fb4f57ecb3d27881583dd0afbcb8da941a9c5e98d8c62c96780f4f2daf39ca55e0456c13b6690e3b4723897be60b49e4123f92342ce450cdfb0e30f85f67a5
-MISC ChangeLog 22637 SHA256 39e477c16b65b254fba0323de553e834caecb333cd72bef5083e82c4703094d8 SHA512 a0c203df618d431a7a02a203f79b22700b32effb479f3f392eb6482063b5d1c22806b3a47ec62a6c98e87f6250a7eca811f50e0919ab4fa35d51e931100601ae WHIRLPOOL 1e4e5a4996c40729a0b48edcd1bb16411e529686db3d9f0adf3df047148a284397e107244857e595dbea4fe91317f15259d0e3d353d3782f2ecddc924dc7a12d
+EBUILD geoip-1.5.1.ebuild 2231 SHA256 892751e88c5d273875f05194d50caf49ebcc646957b24c7fd0247ae23e186d3d SHA512 b31dd30ac048cfc00d978e151e5bdea87a14949f5e74076ea9682884d8f6ff8039667d22c475c99dc0d0427503fa396525f9a4b79741b33ec665d28475e5064f WHIRLPOOL c4589b6eb327cf49149bec254ee898206d46efd63e78884cca044db94204d623607919d6565cc0ebfcd5b0e9e62966293d310e6317123148da39cf0625f1947d
+MISC ChangeLog 22750 SHA256 7a08ad5a798b7866dd3da0114af573c7b83ed3c827bc7c5692e2bbcaace946a2 SHA512 ae21db2e4fbaa1efb67cbdf5875310ed29170ccf6597b4b5ac2d394bc9ac7c454a5571034ad2339f32ff3eec744f5f6fc3c7dad5fc9338d539de1b73ee47bb74 WHIRLPOOL 3f36cb1ffe9210314158cf75c26ecf53d0a89048c9cba1cad26d35f5d6365a0579b61f99de94e301167be0b64b8a3e3df782e8b70a37c62498e80c0d953a224f
 MISC metadata.xml 414 SHA256 1280aa10349cf419f09b873a052d4772b95daf2543c21a29a2d47b327935a551 SHA512 076663380d999ca1bb8c6570b674e150acf39d0b095fabea2a43f1ef1b32c406205eb0c49600fc92791f87d8b8c65fb39e8bd4b76b006a5b7bcef150411bf200 WHIRLPOOL e174135cc0c291d5c38a94f285f1830686d44c380a7d63e6f0b980151bafd91ad952bc44146ae43dbd6e30f967d50c35c49319ec568490eb177ecb0ef8c21bbd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG2IMAACgkQVWmRsqeSphODLACffO8e8z1g2Q0nKCL/51lt2FrE
-cVkAoIFJY35fRaoB10zl/NpYZztIzAPK
-=Pk/T
+iEYEAREIAAYFAlHqHQ4ACgkQVWmRsqeSphP8jwCdHoN0VmVhvdtkiSV+s6aEwn90
+mo4An0q7PL3o1S9RHtV2HCzm/wmBOvmn
+=6dyu
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/geoip/geoip-1.5.1.ebuild b/dev-libs/geoip/geoip-1.5.1.ebuild
index fa0223d9f05b..4938d292f7cc 100644
--- a/dev-libs/geoip/geoip-1.5.1.ebuild
+++ b/dev-libs/geoip/geoip-1.5.1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.5.1.ebuild,v 1.1 2013/06/10 18:53:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.5.1.ebuild,v 1.2 2013/07/20 05:15:51 jer Exp $
 
 EAPI=5
-inherit eutils
+inherit autotools eutils
 
-MY_P="${P/geoip/GeoIP}"
 GEOLITE_URI="http://geolite.maxmind.com/download/geoip/database/"
 
 DESCRIPTION="easily lookup countries by IP addresses, even when Reverse DNS entries don't exist"
 HOMEPAGE="http://dev.maxmind.com/geoip/legacy/downloadable"
 SRC_URI="
-	http://www.maxmind.com/download/geoip/api/c/${MY_P}.tar.gz
+	https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	http://geolite.maxmind.com/download/${PN}/database/GeoLiteCountry/GeoIP.dat.gz
 	${GEOLITE_URI}asnum/GeoIPASNum.dat.gz
 	city? ( ${GEOLITE_URI}GeoLiteCity.dat.gz )
 	ipv6? (
@@ -35,15 +35,21 @@ RDEPEND="
 	)
 "
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${PN}-api-c-${PV}"
 
 src_prepare() {
+	mv "${WORKDIR}"/GeoIP.dat data || die
+
 	epatch "${FILESDIR}"/${PN}-1.5.0-pkgconfig.patch
+
 	sed -e "s:usr local share GeoIP:usr share GeoIP:" \
 		-e "s:usr local etc:etc:" \
 		-i apps/geoipupdate-pureperl.pl || die
+
 	sed -e 's|yahoo.com|98.139.183.24|g' \
 		-i test/country_test_name.txt test/region_test.txt || die
+
+	eautoreconf
 }
 
 src_configure() {
@@ -52,12 +58,14 @@ src_configure() {
 
 src_install() {
 	default
+
 	use perl-geoipupdate && dobin apps/geoipupdate-pureperl.pl
+
 	dodoc AUTHORS ChangeLog README TODO conf/GeoIP.conf.default
+
 	rm "${ED}/etc/GeoIP.conf.default"
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/lib*/lib*.la
-	fi
+
+	prune_libtool_files
 
 	insinto /usr/share/GeoIP
 	doins "${WORKDIR}/GeoIPASNum.dat"