Version bump, bug #262525, thank Allen Parker for report.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

5 files changed, 54 insertions, 44 deletions

diff --git a/dev-libs/geoip/ChangeLog b/dev-libs/geoip/ChangeLog
index bf939d251218..f46b7bf8d721 100644
--- a/dev-libs/geoip/ChangeLog
+++ b/dev-libs/geoip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/geoip
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.97 2009/02/24 18:40:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.98 2009/03/15 11:07:29 pva Exp $
+
+*geoip-1.4.6 (15 Mar 2009)
+
+  15 Mar 2009; Peter Volkov <pva@gentoo.org> metadata.xml,
+  -geoip-1.4.4.ebuild, +geoip-1.4.6.ebuild:
+  Version bump, bug #262525, thank Allen Parker for report.
 
   24 Feb 2009; Raúl Porcel <armin76@gentoo.org> geoip-1.4.5.ebuild:
   Add ~arm/~s390/~sh
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index ac02f6ce0186..04358ba2c1dc 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -1,9 +1,9 @@
 AUX geoip-1.4.4-no-noinst_PROGRAMS.patch 1988 RMD160 41102282753cb980f17d382e8cd66902c33361d7 SHA1 9f4d36ab6d608c34aaffcc36b8c7ff9d934cc5e3 SHA256 3e2f0eaacdc6bf50b333270f977453cd751f13ebfc21b60d6266a85e9c432506
 AUX geoip-1.4.4-parallel-build.patch 2205 RMD160 81f95433811d8d4b90ab3d04572352aa173413eb SHA1 6386bdde567cd2468efec8c70388a147f8549745 SHA256 3bfdc6b64ed48164ef8ff73e4c330f56685d592abf05710174f6da8b9002a987
 AUX geoip-1.4.5-ppc-fix.patch 962 RMD160 734c9a07d9124173a7f18e89ad8418e24b3b5304 SHA1 9068810dfa2478235105e1b3e359ba6d2780d765 SHA256 600ee9897140adc27a08ac1daa2631aad5ffb622c319468027070f6d095976cd
-DIST GeoIP-1.4.4.tar.gz 944698 RMD160 4aa31840ec6496647551c6e12c9c5e32dceed426 SHA1 4a2937e7a8fc7c26aa88c0678791246b58d81d02 SHA256 a5b2ee9298eaf8c160ccab5b3e2ecc1c38cf67d9dd4e97419427f89d08cfb78e
 DIST GeoIP-1.4.5.tar.gz 986844 RMD160 70c99570146e8bc3b9cfa68bc8ca25c282666907 SHA1 f8ac0c8ac113a3d8def8f93f7255ef0bbff34814 SHA256 cd62034fe0206be243cbb43723520987978d8e55ee61872f34fd60a31f5c6b18
-EBUILD geoip-1.4.4.ebuild 996 RMD160 90033aec261f93916f9f716705d01927debabb77 SHA1 c5098db9f72fc15abea4c5900bf5acfcf171f255 SHA256 ce98245548edc3e4b133232ba381def99b5d4750905106f3981f807e85eb254f
+DIST GeoIP-1.4.6.tar.gz 1045241 RMD160 67097c3f9c6bbdba1a4f7ee796713720dba19b0f SHA1 e692954f447c13270de7860e586696991776d8a3 SHA256 16b429407d7bc7d785d1aace73a390f287cd90200f0f61f5c75818058dec91c4
 EBUILD geoip-1.4.5.ebuild 1224 RMD160 79218f918b368efafdec43ecb498e3037702aca3 SHA1 d27ee4c19c35944883c57892e50b333b35d6c3b6 SHA256 a0852d1d38351714b5167b3b7ee5669b7e26624d2deff11003cc50340cdc3cbc
-MISC ChangeLog 12196 RMD160 c203220a03cb8d96bdf93b7cd07514c6ef595abf SHA1 2623fcf1924dc72885bff96da2d8fb051516c55a SHA256 42b587fbed74ba87e1e175d2a6efac9f2579714cfa0de3970a115f8987819b4c
-MISC metadata.xml 277 RMD160 a6bd0a35777e017f79890c0e0947cba8435b40ea SHA1 fed8c3fe1e00a1388e3df0430d59a75d8721395e SHA256 18a7e85115c3f66c1686d6dca5efed20d16700a57bdd738222976f174d46a508
+EBUILD geoip-1.4.6.ebuild 1188 RMD160 a5827164257b5d60a84e88a33799c8e14abce0c0 SHA1 62e421e362e3dcdcbbb97a906b41b922b1fd10f4 SHA256 ff9e32ecef4ebe667e966690a8f37971351ebb413a1e87cc4284febe3bebffc3
+MISC ChangeLog 12384 RMD160 86197dcbc46772aa7bcda376993acd112a154f85 SHA1 83116b8063c16dfe1e685b88db85c67a10367fb0 SHA256 965c12aff31920f1de7d7e616f0ca6bdcf676776613aeaaa1025431c9058acc4
+MISC metadata.xml 467 RMD160 bae585df5c7d12c765d5fab1b7766b79729f1144 SHA1 dfe6076a08817ef8058f1209c381d61f4aaac998 SHA256 3081b13432bfa3cc218fe7f9ade8fe1cd0fcbea4f3f1de2d51faf8a0acad88f5
diff --git a/dev-libs/geoip/geoip-1.4.4.ebuild b/dev-libs/geoip/geoip-1.4.4.ebuild
deleted file mode 100644
index 71f1be1a86d9..000000000000
--- a/dev-libs/geoip/geoip-1.4.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.4.ebuild,v 1.6 2008/03/15 12:11:14 corsair Exp $
-
-inherit autotools eutils libtool
-
-MY_P="${P/geoip/GeoIP}"
-DESCRIPTION="easily lookup countries by IP addresses, even when Reverse DNS entries don't exist"
-HOMEPAGE="http://www.maxmind.com/geoip/api/c.shtml"
-SRC_URI="http://www.maxmind.com/download/geoip/api/c/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# FreeBSD requires this
-	elibtoolize
-}
-
-src_compile() {
-	econf --enable-shared || die "econf failed"
-	# both parallel make and parallel make install explodes atm
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/dev-libs/geoip/geoip-1.4.6.ebuild b/dev-libs/geoip/geoip-1.4.6.ebuild
new file mode 100644
index 000000000000..64b0221498fb
--- /dev/null
+++ b/dev-libs/geoip/geoip-1.4.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.6.ebuild,v 1.1 2009/03/15 11:07:29 pva Exp $
+
+EAPI=2
+inherit libtool
+
+MY_P=${P/geoip/GeoIP}
+MY_P=${MY_P/_}
+DESCRIPTION="easily lookup countries by IP addresses, even when Reverse DNS entries don't exist"
+HOMEPAGE="http://www.maxmind.com/geoip/api/c.shtml"
+SRC_URI="http://www.maxmind.com/download/geoip/api/c/${MY_P}.tar.gz"
+
+# GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
+LICENSE="LGPL-2.1 GPL-2 MaxMind"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="perl-geoipupdate"
+
+DEPEND=""
+RDEPEND="perl-geoipupdate? ( dev-perl/PerlIO-gzip
+	dev-perl/libwww-perl )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -e "s:usr local share GeoIP:usr share GeoIP:" \
+		-e "s:usr local etc:etc:" -i apps/geoipupdate-pureperl.pl
+
+	elibtoolize # FreeBSD requires this
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	use perl-geoipupdate && { dobin apps/geoipupdate-pureperl.pl || die; }
+	dodoc AUTHORS ChangeLog README TODO conf/GeoIP.conf.default || die
+	rm "${D}/etc/GeoIP.conf.default"
+}
diff --git a/dev-libs/geoip/metadata.xml b/dev-libs/geoip/metadata.xml
index 16ab2f74500b..36f1dfb119bc 100644
--- a/dev-libs/geoip/metadata.xml
+++ b/dev-libs/geoip/metadata.xml
@@ -2,5 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
+<use>
+	<flag name="perl-geoipupdate">Install pure perl version of geoipupdate, with
+	Proxy Server support via via the "http_proxy" environment variable and easy to
+	customize.</flag>
+</use>
 <longdescription>easily lookup countries by IP addresses, even when Reverse DNS entries don't exist</longdescription>
 </pkgmetadata>