Add USE=city, fix the update script so it only updates what is installed (bug #455340).

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

5 files changed, 35 insertions, 23 deletions

diff --git a/dev-libs/geoip/ChangeLog b/dev-libs/geoip/ChangeLog
index 4762ab9a3ae0..8e1842075f24 100644
--- a/dev-libs/geoip/ChangeLog
+++ b/dev-libs/geoip/ChangeLog
@@ -1,6 +1,11 @@
 # 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.152 2013/02/04 13:07:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.153 2013/02/04 19:44:59 jer Exp $
+
+  04 Feb 2013; Jeroen Roovers <jer@gentoo.org> files/geoipupdate-r2.sh,
+  geoip-1.4.8-r3.ebuild, metadata.xml:
+  Add USE=city, fix the update script so it only updates what is installed (bug
+  #455340).
 
 *geoip-1.4.8-r3 (04 Feb 2013)
 
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index 6bb696e88efc..292a73caa15a 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA256
 
 AUX geoipupdate-r1.sh 746 SHA256 fec9ee8ee72c3d8479c0281005543e69b46993a268657c86f271892da0457cfe SHA512 53e88072a7321d969aeb757e83ce996182e58501d6fa3089ef08695d4fd9d43efd5955ef800215fc2e96529b35d66ed82413e70f11bd5e497b6043ad1646e090 WHIRLPOOL b6df41f0ebab45258c6b50fa0ed25588636514e6dcdeb367260519a3703b72ebcdfb9c69dcdb084dc68f49544e3b38bebeeeb007d91ebe49f79ec5d5436b8718
-AUX geoipupdate-r2.sh 780 SHA256 a6f38ba414225a14a615e32367a84c18670e96f669cc55ec183eeec5d641ee57 SHA512 5614b1530420ba0fb7ec26762e0ee15d0cc84837d96c068e3ef45d3b08b111fd59c307251da3497ea1136f42398c58cd749f63a01ed71314af241e87cada3fa0 WHIRLPOOL 02aa4949ae06be35a27c65b562d6defbc2329d848c38fb279cdefaa945c5dba9de61ad7573af6f5637d5e05da829faf79831b10983661a4ed262cea3f688e313
+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 GeoIPASNum.dat.gz 1813588 SHA256 be73dd4dc23b9a6ca7f6fc190821768ff49b396f1708214adb227d1822e7e83a SHA512 30f3f29f16b2100eace892086edba8a3dd64bca24e4d76d8625e12982abc7b026f503fd892a4faab1513b3bdfa4d4db174131a578ffcc5e4cf21dfb7952840ce WHIRLPOOL 9d6051a4e38bbe1ebd9f89dbfb37d4162c28a7a29e8ef1cc1fe11c6981f19a8c32cf6e023fa545a47d0b98f8c49e68cf6f5505c5f9548e5a8a181c6e12e23a74
 DIST GeoIPv6.dat.gz 609340 SHA256 6a4dc4b648578ebb5a8b0ca1a2adc8db6297484caa7c87158116dbb4af328c50 SHA512 9e995c9ab8bbfc2ea5598b66c75340d1d5ca4ca34d70b43d4a79464e738a97c08fe079f4c2b9d1c33bb128e42ffe95d1dcd9e8bdfa97c65520bffd698e1b3a14 WHIRLPOOL 2ec1dd94c933588af77592b2ab80ba9ae5042f70d54e4e578815d8b1409f2233664a1b63abcf3bbaf54b3cfba3c67de358345eb4dd8af2a1c981c1f00f982d3c
@@ -10,13 +10,13 @@ DIST GeoLiteCity.dat.gz 12094575 SHA256 2db87dd2ed665833b71b5f330476ad850cf3b340
 DIST GeoLiteCityv6.dat.gz 12265416 SHA256 c09c3f9140ffb85f3b05fc7820fd1eb708f65e9ba93a07a2c2849e9cdd7a4631 SHA512 4096f3d90e1442c2cb75964cc6af824ced0a647b54a9f422fe5a7a3b9d41693598d587282ac9dac1bc7f36cf4c1761efce86c4ca3ecaebfe25a1b9b7af5c4ec3 WHIRLPOOL eef284562c9d586a95278ab33e897ab50457e79b6a62aa70cb6352540072aabbdf44263a98856094a77760c2792970ee092f8545145f6870fb294c322c8b324b
 EBUILD geoip-1.4.8-r1.ebuild 1955 SHA256 8bcdf8db7dc01749b0ad6651f12a43af26f700c2a5bc9052c9adbd1eee6346d0 SHA512 67cdc817e52d7c47f38838bf529252ddd348f313cacf4f594dc8f2590749c90587a92a6e6d5764e3016afb135bcab8fa7e09afaf7462162edde2abe462c14446 WHIRLPOOL ca8428eaa344a5e9a1e1bcb9c25504ea8a1727dafbcd5f8f2c49a9c2b1adb4ac2048597d28351821062c634460454aa3a6265891d67c6d4835907ab1dc075003
 EBUILD geoip-1.4.8-r2.ebuild 1950 SHA256 825eb8861a9aba3d12688156d5c4cec4c2bc8af6f2abea754a40d5f7af8cf9b0 SHA512 2c4764281880c90274aa227da712f867efc468ebc0265ec3becb983f6fb77cdc69281548f29031cda10fa7f7d54658473556c4181b890cbfc0763c0c3d759c02 WHIRLPOOL 1d022eefb0c7b13f6d4831cdb74e18048a8f4b11eb60a8fcca489b732f81b4d44531a75d590e385ec97d52abbcb6eb63e7a0bb67860cdb7b43ec80e59ada54db
-EBUILD geoip-1.4.8-r3.ebuild 2064 SHA256 60a68d225f43321c55b4dfb493ac508d54534244c0104fbabc57149680ca8157 SHA512 ff5e381b443161b595428dc10f0ac4ebcb9c749da0f7e2de495b91bbbc2222f53ec90a6c5565c1488d15d942b02d2fa1b37d592e0f23e6d5c4fe65ad6f5111ea WHIRLPOOL 90cfa7c64acae91b6484d2f641f56d285bd039890a54eb39858345f6754e3d564a745d0f876199765beaaac2401c6ec2d5dc2a363fc9410156b04c6d99440a45
-MISC ChangeLog 18673 SHA256 a9e6f72b4880359c93fb8a3e78fae1106281203b025350f829fd421e7c6f31ea SHA512 962cc388268c4647a2dde89abe61a86f6f8c70f1fc07d4d9c3636d38fb604b23a2f0da7020405cc3472515287ece2a16dba36eada681e14017ed0acdf6c1c105 WHIRLPOOL 37b4f753b6aaac3366bb6f378ebcab5a85b07d568b718a4037f0547eef5bef82111901f9deca2052ea278654ce5736b0621b3a4d975480093d48bc40e88a23b5
-MISC metadata.xml 463 SHA256 ace545d814258ed64e3ad659a0dd0c8f4afb82d5bc76c124fee8f0b70dd4cf7b SHA512 0172b45a1ce45a60be1f2d1929745aa496db2ae01410d5c4d176fee186a5da876663cd9c73120ac94580418a94b0ac9837e98fd7ebaa0b04e9995cda249c24f4 WHIRLPOOL ffa4fade120d298edf0a03742e06d4c27093959b5ebd0e1f4277a25d6ad62f7e080ee67e38e9cfa0b629ecee61e528eeef5a57774303e6862736a289044d8999
+EBUILD geoip-1.4.8-r3.ebuild 2036 SHA256 fd746053b5e9365fb3d88d24147b44c99d1f12e9fed5f505994e65e222bb79b5 SHA512 38733f9c735e9495e8f5d41a80b17ea72225425ecab66e1aac92cedde9d3f5dd9dc20737f441b356170a1684849e8a6cf2d9485f4259dfbe9d99197f7c10e028 WHIRLPOOL 49a100a5766065477c681fb346977a85238871de269693a57c95d5f73ed08733af8fa358def8609158e84ea8cee9efe17e0361d11b3e2ea379c142ad55f690e1
+MISC ChangeLog 18877 SHA256 9fbf1c1e5bf3c8f6ba283e155c185b7d6f9c2f8ca747b884112e95956376b468 SHA512 2c9036276a83535f211f27b7b72725bd95840e45ea7d10725cfd21e5ba5a9054cdd6071029e965c78f594e3bb5f78ed5501e8620dc16f073de4f46231df7cbba WHIRLPOOL d42c48dd786b1d4cbdf13a5c9a0fd6ded25fa58e78a16d18a6c3c0c5d14d01b48d9eb651365c56d56976d5cab43ceb2e366fd7991b554d306689d2a35c5d9417
+MISC metadata.xml 414 SHA256 1280aa10349cf419f09b873a052d4772b95daf2543c21a29a2d47b327935a551 SHA512 076663380d999ca1bb8c6570b674e150acf39d0b095fabea2a43f1ef1b32c406205eb0c49600fc92791f87d8b8c65fb39e8bd4b76b006a5b7bcef150411bf200 WHIRLPOOL e174135cc0c291d5c38a94f285f1830686d44c380a7d63e6f0b980151bafd91ad952bc44146ae43dbd6e30f967d50c35c49319ec568490eb177ecb0ef8c21bbd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEPsocACgkQVWmRsqeSphPoSACdEnOS7QA9bk/WU2LQZGNE6aJk
-gzEAmwQuf51TJYviNquaZ4n1ODXPBTo9
-=2xAx
+iEYEAREIAAYFAlEQD70ACgkQVWmRsqeSphOcvQCfUlLZHmQ4CoOYDUxw+88FcUB5
+rrIAnRHiF9oBNaomW00U69IlXsyze/K1
+=kbZg
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/geoip/files/geoipupdate-r2.sh b/dev-libs/geoip/files/geoipupdate-r2.sh
index 7812bb50285f..a85fa160627f 100755
--- a/dev-libs/geoip/files/geoipupdate-r2.sh
+++ b/dev-libs/geoip/files/geoipupdate-r2.sh
@@ -16,11 +16,15 @@ if [ -d "${GEOIPDIR}" ]; then
 		for db in $DATABASES; do
 			fname=$(basename $db)
 
-			wget --no-verbose -t 3 -T 60 "${GEOIP_MIRROR}/${db}.dat.gz" -O "${TMPDIR}/${fname}.dat.gz"
-			if [ $? -eq 0 ]; then
-				gunzip -fdc "${TMPDIR}/${fname}.dat.gz" > "${TMPDIR}/${fname}.dat"
-				mv "${TMPDIR}/${fname}.dat" "${GEOIPDIR}/${fname}.dat"
-				chmod 0644 "${GEOIPDIR}/${fname}.dat"
+			if [ -f ${GEOPDIR}/${fname} ]; then
+				wget --no-verbose -t 3 -T 60 \
+					"${GEOIP_MIRROR}/${db}.dat.gz" \
+					-O "${TMPDIR}/${fname}.dat.gz"
+				if [ $? -eq 0 ]; then
+					gunzip -fdc "${TMPDIR}/${fname}.dat.gz" > "${TMPDIR}/${fname}.dat"
+					mv "${TMPDIR}/${fname}.dat" "${GEOIPDIR}/${fname}.dat"
+					chmod 0644 "${GEOIPDIR}/${fname}.dat"
+				fi
 			fi
 		done
 		[ -d "${TMPDIR}" ] && rm -rf $TMPDIR
diff --git a/dev-libs/geoip/geoip-1.4.8-r3.ebuild b/dev-libs/geoip/geoip-1.4.8-r3.ebuild
index 667f72d9283b..709a2baee9ed 100644
--- a/dev-libs/geoip/geoip-1.4.8-r3.ebuild
+++ b/dev-libs/geoip/geoip-1.4.8-r3.ebuild
@@ -1,27 +1,30 @@
 # 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-r3.ebuild,v 1.1 2013/02/04 13:07:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.8-r3.ebuild,v 1.2 2013/02/04 19:44:59 jer Exp $
 
 EAPI=4
 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
-	http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.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"
+IUSE="city ipv6 perl-geoipupdate static-libs"
 
 DEPEND="sys-libs/zlib"
 RDEPEND="
@@ -59,11 +62,11 @@ src_install() {
 
 	insinto /usr/share/GeoIP
 	doins "${WORKDIR}/GeoIPASNum.dat"
-	doins "${WORKDIR}/GeoLiteCity.dat"
+	use city && doins "${WORKDIR}/GeoLiteCity.dat"
 
 	if use ipv6; then
 		doins "${WORKDIR}/GeoIPv6.dat"
-		doins "${WORKDIR}/GeoLiteCityv6.dat"
+		use city && doins "${WORKDIR}/GeoLiteCityv6.dat"
 	fi
 
 	newsbin "${FILESDIR}/geoipupdate-r2.sh" geoipupdate.sh
diff --git a/dev-libs/geoip/metadata.xml b/dev-libs/geoip/metadata.xml
index b2d17ed113ec..06a43dce8240 100644
--- a/dev-libs/geoip/metadata.xml
+++ b/dev-libs/geoip/metadata.xml
@@ -6,6 +6,6 @@
 	<flag name="perl-geoipupdate">Install pure perl version of geoipupdate, with
 	Proxy Server support via the "http_proxy" environment variable and easy to
 	customize.</flag>
+	<flag name='city'>Install the city based IP address database</flag>
 </use>
-<longdescription>easily lookup countries by IP addresses, even when Reverse DNS entries don't exist</longdescription>
 </pkgmetadata>