Version bump.

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

3 files changed, 30 insertions, 32 deletions

diff --git a/dev-libs/geoip/ChangeLog b/dev-libs/geoip/ChangeLog
index bf6f1c21ad5a..14a6494b3c86 100644
--- a/dev-libs/geoip/ChangeLog
+++ b/dev-libs/geoip/ChangeLog
@@ -1,6 +1,12 @@
 # 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.157 2013/02/24 17:51:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.158 2013/03/09 17:31:47 jer Exp $
+
+*geoip-1.5.0 (09 Mar 2013)
+
+  09 Mar 2013; Jeroen Roovers <jer@gentoo.org> -geoip-1.4.8-r1.ebuild,
+  +geoip-1.5.0.ebuild:
+  Version bump.
 
   24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> geoip-1.4.8-r2.ebuild:
   Stable for sh, wrt bug #453404
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index 48d2a48788b7..e2d4770db954 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -1,32 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX geoipupdate-r1.sh 746 SHA256 fec9ee8ee72c3d8479c0281005543e69b46993a268657c86f271892da0457cfe SHA512 53e88072a7321d969aeb757e83ce996182e58501d6fa3089ef08695d4fd9d43efd5955ef800215fc2e96529b35d66ed82413e70f11bd5e497b6043ad1646e090 WHIRLPOOL b6df41f0ebab45258c6b50fa0ed25588636514e6dcdeb367260519a3703b72ebcdfb9c69dcdb084dc68f49544e3b38bebeeeb007d91ebe49f79ec5d5436b8718
 AUX geoipupdate-r2.sh 845 SHA256 f5a8d5fab597bc4f502916bdff0c945789174b795a07290b176907e56bc53eb7 SHA512 02306fc3f1ab60271dad14a2fee02b00f774a70d41c217cddfb2f8e70fef967bf2a6c508c4655595300fa3738146b2f98c75ce26491d71cf70b8681d28ac4d8d WHIRLPOOL 3298d7cfa3ffa03ea136a340aa95644e16afbf70d140cc85e2a6d5b84091b36bb0c40bf3fa99fa81967f416a18bbedbf5481b387d39b94d586833f186ab882aa
 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 GeoIPASNum.dat.gz 1813588 SHA256 be73dd4dc23b9a6ca7f6fc190821768ff49b396f1708214adb227d1822e7e83a SHA512 30f3f29f16b2100eace892086edba8a3dd64bca24e4d76d8625e12982abc7b026f503fd892a4faab1513b3bdfa4d4db174131a578ffcc5e4cf21dfb7952840ce WHIRLPOOL 9d6051a4e38bbe1ebd9f89dbfb37d4162c28a7a29e8ef1cc1fe11c6981f19a8c32cf6e023fa545a47d0b98f8c49e68cf6f5505c5f9548e5a8a181c6e12e23a74
 DIST GeoIPv6.dat.gz 609340 SHA256 6a4dc4b648578ebb5a8b0ca1a2adc8db6297484caa7c87158116dbb4af328c50 SHA512 9e995c9ab8bbfc2ea5598b66c75340d1d5ca4ca34d70b43d4a79464e738a97c08fe079f4c2b9d1c33bb128e42ffe95d1dcd9e8bdfa97c65520bffd698e1b3a14 WHIRLPOOL 2ec1dd94c933588af77592b2ab80ba9ae5042f70d54e4e578815d8b1409f2233664a1b63abcf3bbaf54b3cfba3c67de358345eb4dd8af2a1c981c1f00f982d3c
 DIST GeoLiteCity.dat.gz 12094575 SHA256 2db87dd2ed665833b71b5f330476ad850cf3b34001f101d581c8e470dba50a5f SHA512 ff598ab09dede9ffea5edfb70ec1c58c0e612b3b30f3a0cbc69afe445e9b78ac428d2d757d11c575a2f497e239ac12d07ddc49435e37d5295af2e97e951fb2fb WHIRLPOOL 644e73a6392a7cd7e0a5d70986fe5c38c3a3035b5a4304a54ddd8df2047a0ba4b3ec0389dbfc637a3396d4627e22d05d2ee3eeb95094f7be147ad27939f1dd49
 DIST GeoLiteCityv6.dat.gz 12259422 SHA256 875847daefc12ac35eea84ae05b8ac71cdaf809753ab6c69d8f01962ea15b550 SHA512 84805f923067b5457f3207373c8325d2074374d4f0202b6b08001c5b67af5ef1eb6786a135f155e67230586ea3d358a4900388cd5fa4dc54bad9a6ec72e56bfe WHIRLPOOL 9e3e5470d0ee1b10c85df03fdff0f2dd57e2a150ab618c60fc03d9c5605fa39ef1efbaadf1d510c7367c1b8a94fcc29142af656441f2b16f27db023e51f325e5
-EBUILD geoip-1.4.8-r1.ebuild 1955 SHA256 8bcdf8db7dc01749b0ad6651f12a43af26f700c2a5bc9052c9adbd1eee6346d0 SHA512 67cdc817e52d7c47f38838bf529252ddd348f313cacf4f594dc8f2590749c90587a92a6e6d5764e3016afb135bcab8fa7e09afaf7462162edde2abe462c14446 WHIRLPOOL ca8428eaa344a5e9a1e1bcb9c25504ea8a1727dafbcd5f8f2c49a9c2b1adb4ac2048597d28351821062c634460454aa3a6265891d67c6d4835907ab1dc075003
 EBUILD geoip-1.4.8-r2.ebuild 1947 SHA256 2185beef9ed787a1de4a5f3958ca247481432e54049d0e90bdfbb810e8a70839 SHA512 2bafa2ba6fcee6e09bbcba914282bddb0fcdc1fd095082899117681bded81b9ede12666d7766a1103260d090529740fd17c9b7e486c24d25b9d1ae74397888d4 WHIRLPOOL 2f955c878827bca7789c64b6a748d950cf7501abb1ec178d59dc8b6700fce692448673a6556ec61d0690e52c598b04c7a90059459da64ac5b4ac9bc93ad5b583
 EBUILD geoip-1.4.8-r3.ebuild 2053 SHA256 ea2fe4b43486241d4437589318b89178e22a066b1bc1e3caa9fcc6c8fcdb4fd5 SHA512 632a4388894457992b10742911137a7a16e04e3d6884d5f0f456bbc51c90a9795e74a992269d333927e5e4908bf0ed3a57ed8e84fe8025f408e992be17195bd7 WHIRLPOOL 823e4edc6f8e0e76106fda9c065440bafbd977c0f9be15b52021237233218a681fc0bcf03ac08dcc2cd453a072d138fbdc34a8497a28aa393270ddeb716f282f
-MISC ChangeLog 19298 SHA256 3d0fd853d0ab088679cae929545c5a76833cec761a0e3d0d3ebc81e1b68665fa SHA512 72e5ad4fcf7e258e146312f31584cb0f11cfd54544aca9168afc457ca11e401e5cdf910283e28a3a2b5b4460eda931ba482c0b8e42f88795fe65d0a81e540769 WHIRLPOOL 045d1edae52eb77576f9b52bfc12eeb57e7338fe6ffcb75e619a107cae20212a26712cebd933a971b4e7fff39263811d5e061f3d645dc30b109a954514830a0c
+EBUILD geoip-1.5.0.ebuild 2013 SHA256 bff944809aa5f3274f9ab724f6ec779ccd494bd297b6886165eab10cb956b169 SHA512 946c1dbcb0518418ac568c71b07c1a81d0dc59c72a75aaf53ef8de48354bb3dea7ca993bf7f1bb2069af67eb6cbd154a9bfdb8b527ac4beed361e66132c46ce7 WHIRLPOOL 31b4222703b9169e8e01d02927cdd437ac9e1b9c513b00dde218c725fb8b95b58ea4e28e85e522cf26112bd36cac9b30fc6cd4f1f6d54d2d984dbbb427555812
+MISC ChangeLog 19437 SHA256 21ca7c8268c13a1cf7807315f9439de724a492afc67af929444eeee039f707f6 SHA512 3ed2d28d855c151d98d1b9eca58c697b1a14ab879a67035b7202180fe55f2779dbc8731fa54ee715d0d219eb476a181f8bd8031c5b7905e04c40e7800e417d59 WHIRLPOOL 3f83e3e998ddb436522ac215e01d6b0669c4dd8e830f2a5d45954cf15c772ee21fd1d72982076f63cc977e17e6f2437056c75550a52b25b082702bd6bb5a0828
 MISC metadata.xml 414 SHA256 1280aa10349cf419f09b873a052d4772b95daf2543c21a29a2d47b327935a551 SHA512 076663380d999ca1bb8c6570b674e150acf39d0b095fabea2a43f1ef1b32c406205eb0c49600fc92791f87d8b8c65fb39e8bd4b76b006a5b7bcef150411bf200 WHIRLPOOL e174135cc0c291d5c38a94f285f1830686d44c380a7d63e6f0b980151bafd91ad952bc44146ae43dbd6e30f967d50c35c49319ec568490eb177ecb0ef8c21bbd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRKlKPAAoJELp701BxlEWf37IQAMW52zGKoyXp8ZiyXmP4jrBJ
-N981Au7k3Gn/oPIhVHRDGDsnMNl4Hl69RL027wWXoL7RKV+I6nlM+42gAzAzSdwK
-JKOy1nCR6g/lfg5nAurxm4RIEfXLQHWFO13AULOar0OAwC+p18o6YgywAFjl731m
-m1W3Rhp5/sndIUKtiCgGdKV4+6wA24tvyvRReqJ0xBDc5+oRbVScURj/ycVkK9rb
-ve0qjRw7oQdFWO7dzXPig+6JmYdY5zhpV0smaaBpO6EM461NqsNgISPKoQgtDw2c
-6M1oeNjG+CE+60R/BuK4bU43G3PzGEymGHFTWF5FlZEbXPoiW+cCOz+eCzwJjRVa
-h8+2OO9n9UEedR2AvAvgM2W0KdobCAg45dnllN6HpY1VsqJICD9Wwun/xQEr0O21
-+nlb5Mslf8gvMDaX+DojmYtqQa4B1ytue60ilp1vue6X/1KTvs1VrCoGU7zfWU0f
-ZJ/viNKGSmy1XnfxCBfyR9hNqwp+uuAcAsAopaDbZ7L3gKcpM1WDamNSrXqJzJyy
-SqPPMQ675fx6fcaI9jF3TZukZk1pMhS7du76u2t0oxFywvORQgmaWqumbmxLqmKf
-aggncAdq5qnR9G/3YMIkmqlchYhZ/IPRj+1PWhoNv7clzYoFmtNCiOmcm8UAurgb
-1ZDId80FP3kubQ0fAeWK
-=XYvr
+iEYEAREIAAYFAlE7cgUACgkQVWmRsqeSphPyHQCffDGfYGiohnpU0gvR3ZIwhB9o
+ccUAn225TV+on125rgFUZhbBgFtZG6pI
+=8v8V
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/geoip/geoip-1.4.8-r1.ebuild b/dev-libs/geoip/geoip-1.5.0.ebuild
index cd1dcf6ead34..379419d2db75 100644
--- a/dev-libs/geoip/geoip-1.4.8-r1.ebuild
+++ b/dev-libs/geoip/geoip-1.5.0.ebuild
@@ -1,27 +1,29 @@
 # 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.4.8-r1.ebuild,v 1.10 2013/01/25 14:54:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.5.0.ebuild,v 1.1 2013/03/09 17:31:47 jer Exp $
 
-EAPI=4
+EAPI=5
 
-inherit autotools
-
-MY_P=${P/geoip/GeoIP}
+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://www.maxmind.com/app/ip-location"
 SRC_URI="
 	http://www.maxmind.com/download/geoip/api/c/${MY_P}.tar.gz
-	http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
-	ipv6? ( http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz
-		http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz )
+	${GEOLITE_URI}asnum/GeoIPASNum.dat.gz
+	city? ( ${GEOLITE_URI}GeoLiteCity.dat.gz )
+	ipv6? (
+		${GEOLITE_URI}GeoIPv6.dat.gz
+		city? ( ${GEOLITE_URI}GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz )
+	)
 "
 
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="ipv6 perl-geoipupdate static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+IUSE="city ipv6 perl-geoipupdate static-libs"
 
 DEPEND="sys-libs/zlib"
 RDEPEND="
@@ -40,8 +42,6 @@ src_prepare() {
 		-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() {
@@ -59,11 +59,12 @@ src_install() {
 
 	insinto /usr/share/GeoIP
 	doins "${WORKDIR}/GeoIPASNum.dat"
+	use city && doins "${WORKDIR}/GeoLiteCity.dat"
 
 	if use ipv6; then
-		doins "${WORKDIR}/GeoIPv6.dat" || die
-		doins "${WORKDIR}/GeoLiteCityv6.dat"
+		doins "${WORKDIR}/GeoIPv6.dat"
+		use city && doins "${WORKDIR}/GeoLiteCityv6.dat"
 	fi
 
-	newsbin "${FILESDIR}/geoipupdate-r1.sh" geoipupdate.sh
+	newsbin "${FILESDIR}/geoipupdate-r2.sh" geoipupdate.sh
 }