Fixed parallel build #180988, build tests with FEATURES=-test #226207, and generaly build cleanup. Putting here for some time to give upstream time to review patches.

svn path=/; revision=192

12 files changed, 833 insertions, 0 deletions

diff --git a/dev-libs/geoip/ChangeLog b/dev-libs/geoip/ChangeLog
new file mode 100644
index 0000000..bb25489
--- /dev/null
+++ b/dev-libs/geoip/ChangeLog
@@ -0,0 +1,342 @@
+# ChangeLog for dev-libs/geoip
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.90 2008/03/15 12:11:14 corsair Exp $
+
+  15 Mar 2008; Markus Rothe <corsair@gentoo.org> geoip-1.4.4.ebuild:
+  Stable on ppc64; bug #212359
+
+  13 Mar 2008; Jeroen Roovers <jer@gentoo.org> geoip-1.4.4.ebuild:
+  Stable for HPPA (bug #212359).
+
+  06 Mar 2008; nixnut <nixnut@gentoo.org> geoip-1.4.4.ebuild:
+  Stable on ppc wrt bug 212359
+
+  05 Mar 2008; Raúl Porcel <armin76@gentoo.org> geoip-1.4.4.ebuild:
+  alpha/ia64/sparc/x86 stable wrt #212359
+
+  05 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> geoip-1.4.4.ebuild:
+  amd64 stable wrt bug #212359
+
+  08 Feb 2008; Santiago M. Mola <coldwind@gentoo.org> geoip-1.4.3.ebuild:
+  amd64 stable wrt bug #208150
+
+  05 Feb 2008; Markus Rothe <corsair@gentoo.org> geoip-1.4.3.ebuild:
+  Stable on ppc64
+
+  31 Jan 2008; nixnut <nixnut@gentoo.org> geoip-1.4.3.ebuild:
+  Stable on ppc wrt bug 208150
+
+  30 Jan 2008; Jeroen Roovers <jer@gentoo.org> geoip-1.4.3.ebuild:
+  Stable for HPPA (bug #208150).
+
+  30 Jan 2008; Raúl Porcel <armin76@gentoo.org> geoip-1.4.3.ebuild:
+  alpha/ia64/sparc stable wrt #208150
+
+  30 Jan 2008; Dawid Węgliński <cla@gentoo.org> geoip-1.4.3.ebuild:
+  Stable on x86 (bug #208150)
+
+*geoip-1.4.4 (30 Jan 2008)
+
+  30 Jan 2008; <pva@gentoo.org> -files/geoip-1.4.0-asneeded.patch,
+  -files/geoip-1.4.0-update-vulnerability.patch, -geoip-1.4.0-r1.ebuild,
+  +geoip-1.4.4.ebuild:
+  Version bump. Removed old.
+
+*geoip-1.4.3 (26 Dec 2007)
+
+  26 Dec 2007; <pva@gentoo.org> +geoip-1.4.3.ebuild:
+  Version bump. Thank armin76 for report.
+
+  10 Dec 2007; Jeroen Roovers <jer@gentoo.org> geoip-1.4.2.ebuild:
+  Stable for HPPA (bug #201263).
+
+  07 Dec 2007; Tobias Scherbaum <dertobi123@gentoo.org> geoip-1.4.2.ebuild:
+  ppc stable, bug #201263
+
+  07 Dec 2007; Markus Rothe <corsair@gentoo.org> geoip-1.4.2.ebuild:
+  Stable on ppc64; bug #201263
+
+  06 Dec 2007; Samuli Suominen <drac@gentoo.org> geoip-1.4.2.ebuild:
+  amd64 stable wrt #201263
+
+  05 Dec 2007; Raúl Porcel <armin76@gentoo.org> geoip-1.4.2.ebuild:
+  alpha/ia64/sparc/x86 stable
+
+  26 Nov 2007; Markus Ullmann <jokey@gentoo.org> geoip-1.4.2.ebuild:
+  even parallel install explodes, see bug #198531
+
+  05 Jun 2007; Markus Ullmann <jokey@gentoo.org> geoip-1.4.0-r1.ebuild,
+  geoip-1.4.2.ebuild:
+  No parallel make atm, see bug #180988
+
+  11 Apr 2007; Roy Marples <uberlord@gentoo.org> geoip-1.4.2.ebuild:
+  elibtoolize for FreeBSD users.
+
+*geoip-1.4.2 (31 Mar 2007)
+
+  31 Mar 2007; Marcelo Goes <vanquirius@gentoo.org> +geoip-1.4.2.ebuild:
+  1.4.2 version bump for bug 172804. Both patches are now in upstream. Thanks
+  to Sergij Borodych <bor at univ.kiev.ua>.
+
+  01 Feb 2007; Markus Ullmann <jokey@gentoo.org> -geoip-1.3.14.ebuild:
+  cleanup
+
+  23 Jan 2007; Steve Dibb <beandog@gentoo.org> geoip-1.4.0-r1.ebuild:
+  amd64 stable, bug 161288
+
+  19 Jan 2007; Alexander H. Færøy <eroyf@gentoo.org>
+  geoip-1.4.0-r1.ebuild:
+  Stable on IA64; bug #161288
+
+  18 Jan 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  geoip-1.4.0-r1.ebuild:
+  Stable on ppc wrt bug #161288.
+
+  18 Jan 2007; Markus Rothe <corsair@gentoo.org> geoip-1.4.0-r1.ebuild:
+  Stable on ppc64; bug #161288
+
+  18 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
+  geoip-1.4.0-r1.ebuild:
+  stable x86, security bug #161288
+
+  18 Jan 2007; Jeroen Roovers <jer@gentoo.org> geoip-1.4.0-r1.ebuild:
+  Stable for HPPA (bug #161288).
+
+  18 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> geoip-1.4.0-r1.ebuild:
+  Stable on Alpha, bug 161288.
+
+  17 Jan 2007; Jason Wever <weeve@gentoo.org> geoip-1.4.0-r1.ebuild:
+  Stable on SPARC wrt security bug #161288.
+
+*geoip-1.4.0-r1 (17 Jan 2007)
+
+  17 Jan 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/geoip-1.4.0-update-vulnerability.patch, -geoip-1.3.12.ebuild,
+  -geoip-1.3.17.ebuild, -geoip-1.4.0.ebuild, +geoip-1.4.0-r1.ebuild:
+  Adding vuln fix wrt bug #161288
+
+  20 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> geoip-1.3.14.ebuild:
+  Stable on Alpha.
+
+  15 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> geoip-1.3.14.ebuild:
+  Stable on ia64.
+
+*geoip-1.4.0 (02 Sep 2006)
+
+  02 Sep 2006; Markus Ullmann <jokey@gentoo.org>
+  +files/geoip-1.4.0-asneeded.patch, +geoip-1.4.0.ebuild:
+  Version bump and applying as-needed patch from flameeyes as reported in bug
+  #145831
+
+  17 Aug 2006; Thomas Cort <tcort@gentoo.org> geoip-1.3.14.ebuild:
+  Stable on amd64 wrt Bug #139664.
+
+  16 Aug 2006; Markus Rothe <corsair@gentoo.org> geoip-1.3.14.ebuild:
+  Stable on ppc64
+
+  04 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org> geoip-1.3.14.ebuild:
+  Stable on hppa & sparc
+
+  30 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org> geoip-1.3.14.ebuild:
+  ppc stable
+
+*geoip-1.3.17 (23 Jul 2006)
+
+  23 Jul 2006; Marcelo Goes <vanquirius@gentoo.org> -geoip-1.3.10.ebuild,
+  -geoip-1.3.13.ebuild, geoip-1.3.14.ebuild, +geoip-1.3.17.ebuild:
+  Mark 1.3.14 x86 stable, 1.3.17 version bump, remove old ebuilds.
+
+  25 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> geoip-1.3.14.ebuild:
+  Add ~x86-fbsd keyword.
+
+  23 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> geoip-1.3.14.ebuild:
+  Run elibtoolize.
+
+  30 Mar 2006; Aron Griffis <agriffis@gentoo.org> geoip-1.3.14.ebuild:
+  Mark 1.3.14 ~ia64
+
+  06 Feb 2006; Simon Stelling <blubb@gentoo.org> geoip-1.3.12.ebuild:
+  stable on amd64
+
+*geoip-1.3.14 (13 Nov 2005)
+
+  13 Nov 2005; Daniel Black <dragonheart@gentoo.org> geoip-1.3.13.ebuild,
+  +geoip-1.3.14.ebuild:
+  version bump. Added -fPIC as per bug #103663
+
+  12 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> geoip-1.3.12.ebuild:
+  Stable on ppc.
+
+  12 Sep 2005; Guy Martin <gmsoft@gentoo.org> geoip-1.3.12.ebuild:
+  Stable on hppa.
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> geoip-1.3.12.ebuild:
+  Mark 1.3.12 stable on alpha
+
+  06 Sep 2005; Markus Rothe <corsair@gentoo.org> geoip-1.3.12.ebuild:
+  Stable on ppc64
+
+  05 Sep 2005; Jason Wever <weeve@gentoo.org> geoip-1.3.12.ebuild:
+  Stable on SPARC.
+
+*geoip-1.3.13 (05 Sep 2005)
+
+  05 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> geoip-1.3.12.ebuild,
+  +geoip-1.3.13.ebuild:
+  1.3.13 version bump, 1.3.12 x86 stable.
+
+*geoip-1.3.12 (24 Jul 2005)
+
+  24 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> -geoip-1.3.6.ebuild,
+  +geoip-1.3.12.ebuild:
+  Version bump.
+
+  07 Jul 2005; Guy Martin <gmsoft@gentoo.org> geoip-1.3.10.ebuild:
+  Stable on hppa.
+
+  26 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> geoip-1.3.10.ebuild:
+  amd64 stable.
+
+  08 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> geoip-1.3.10.ebuild:
+  Stable on sparc
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> geoip-1.3.10.ebuild:
+  Stable on ppc64
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> geoip-1.3.10.ebuild:
+  Stable on ppc.
+
+  03 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> -geoip-1.3.8.ebuild,
+  geoip-1.3.10.ebuild:
+  Marked 1.3.10 x86 stable, removing old 1.3.8 version.
+
+  17 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> geoip-1.3.6.ebuild:
+  Stable on sparc
+
+*geoip-1.3.10 (18 Apr 2005)
+
+  18 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> +geoip-1.3.10.ebuild,
+  -geoip-1.3.2.ebuild:
+  Version bump, fixes bug 89561. Thanks to Dean Hall <dhall@rightmedia.com> for
+  reporting.
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> geoip-1.3.6.ebuild:
+  Stable on ppc64
+
+  05 Apr 2005; Markus Rothe <corsair@gentoo.org> geoip-1.3.6.ebuild,
+  geoip-1.3.8.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #87698
+
+*geoip-1.3.8 (02 Apr 2005)
+
+  02 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -geoip-1.2.1.ebuild,
+  -geoip-1.3.0.ebuild, -geoip-1.3.5.ebuild, geoip-1.3.6.ebuild,
+  +geoip-1.3.8.ebuild:
+  Marked 1.3.6 x86 stable, version bump, old version cleanup.
+
+  17 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> geoip-1.3.6.ebuild:
+  Stable on ppc.
+
+  05 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> geoip-1.3.0.ebuild,
+  geoip-1.3.6.ebuild:
+  Stable on ppc (1.3.0), added to ~ppc (1.3.6).
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> geoip-1.3.5.ebuild,
+  geoip-1.3.6.ebuild:
+  Stable on amd64.
+
+  22 Oct 2004; Jason Wever <weeve@gentoo.org> geoip-1.3.6.ebuild:
+  Added ~sparc keyword.
+
+  11 Oct 2004; Guy Martin <gmsoft@gentoo.org> geoip-1.3.6.ebuild:
+  Marked stable on hppa.
+
+  17 Aug 2004; Eldad Zack <eldad@gentoo.org> geoip-1.3.2.ebuild,
+  geoip-1.3.5.ebuild:
+  x86 stable
+
+*geoip-1.3.6 (16 Aug 2004)
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> -geoip-1.3.1.ebuild,
+  +geoip-1.3.6.ebuild:
+  Version bump
+
+  19 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> geoip-1.3.5.ebuild:
+  Added amd64 keyword, closing #57544.
+
+  17 Jul 2004; Tom Gall <tgall@gentoo.org> geoip-1.3.2.ebuild:
+  stable on ppc64, bug #55677
+
+*geoip-1.3.5 (17 Jul 2004)
+
+  17 Jul 2004; Eldad Zack <eldad@gentoo.org> metadata.xml,
+  +geoip-1.3.5.ebuild:
+  Version bump. Closes #56243.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> geoip-1.2.1.ebuild,
+  geoip-1.3.0.ebuild, geoip-1.3.1.ebuild, geoip-1.3.2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  26 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> geoip-1.3.0.ebuild:
+  Marked stable on amd64.
+
+  24 May 2004; Bryan Østergaard <kloeri@gentoo.org> geoip-1.3.2.ebuild:
+  Keyworded ~alpha, requested in bug #51550.
+
+*geoip-1.3.2 (21 Apr 2004)
+
+  24 Apr 2004; Jon Hood <squinky86@gentoo.org> geoip-1.3.2.ebuild:
+  version bump (#48618)
+
+*geoip-1.3.1 (17 Apr 2004)
+
+  17 Apr 2004; Jon Hood <squinky86@gentoo.org> geoip-1.3.1.ebuild:
+  version bump
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> geoip-1.2.1.ebuild,
+  geoip-1.3.0.ebuild:
+  QA: IUSE variable was missing.
+
+  16 Mar 2004; Michael Boman <mboman@gentoo.org> geoip-1.3.0.ebuild:
+  Marked 1.3.0 stable on x86
+
+  29 Feb 2004; Michael Boman <mboman@gentoo.org> metadata.xml:
+  Moving the package to 'netmon' herd.
+
+  24 Jan 2004; David Holm <dholm@gentoo.org> geoip-1.3.0.ebuild:
+  Added to ~ppc.
+
+  22 Nov 2003; Michael Boman <mboman@gentoo.org> metadata.xml:
+  I'm now the primary maintainer of this package. Please report all bugs to
+  mboman@gentoo.org
+
+*geoip-1.3.0 (15 Oct 2003)
+
+  15 Oct 2003; <solar@gentoo.org> geoip-1.2.1.ebuild, geoip-1.3.0.ebuild:
+  Version bumpage.. Thanks Brian O'Kelley for making me aware of this. API
+  Change for 1.3.x and above users for GeoIP Region database GeoIPRegion.region
+  is no longer a pointer but an in-structure array so test the first byte of
+  region == 0 rather testing if the region pointer is NULL.
+
+*geoip-1.2.1 (01 Aug 2003)
+
+  01 Aug 2003; <solar@gentoo.org> geoip-1.2.1.ebuild:
+  The changes in this release are as follows:
+  This release represents a significant advance progression from the
+  0.2.0 release. It has lots more new features, making the package even
+  more powerful.
+
+  08 Jul 2003; <solar@gentoo.org> metadata.xml:
+  Added metadata.xml
+
+  29 Jun 2003; <solar@gentoo.org> geoip-1.2.0.ebuild:
+  Added ~sparc to keywords after testing on sparc64
+
+*geoip-1.2.0 (29 Jun 2003)
+
+  29 Jun 2003; <solar@gentoo.org> geoip-1.2.0.ebuild:
+  Initial Import of GeoIP to portage
+
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
new file mode 100644
index 0000000..cf183e2
--- /dev/null
+++ b/dev-libs/geoip/Manifest
@@ -0,0 +1,12 @@
+AUX geoip-1.4.4-CITY-NULL-beautifications.patch 1595 RMD160 14100bcf3b49748d3c824d5549833638d436cd93 SHA1 27f8fd8ed64e1e2738c66e44eb85dc977aa1ef86 SHA256 f3863c9cb3e4e868e8c5faed1559349f8953531818cf89126ecece6bdabd9396
+AUX geoip-1.4.4-configure.in-upgrade.patch 528 RMD160 06a9c8811e8dbcc4a09865d9bb5c558091b60b7e SHA1 cbb25cc8c84688b17f9dceae5a7678cba44d827d SHA256 80d383a321a538204a19155ec4edace53d01815b958f94a6b1e1556072813e36
+AUX geoip-1.4.4-distcheck.patch 3706 RMD160 0622afeb14d9359fc07f3a4943e04e199aeaf7de SHA1 8502cda2c3a0aed9354c183d9eb041d648b88b1a SHA256 72a37d9fcc94f8afd2d11cf70fac67b9fa1e998678be20274c763f3046d8840e
+AUX geoip-1.4.4-generate_man_pages_use_dist.patch 1178 RMD160 b69d338ea8a4699299f8668fbca939da9489bc24 SHA1 f00003f2630c7276199f4a51f0836846549685de SHA256 a2739d426e51fcecaf23b2d23ceafdd194accc9ab200731460d0133f05457401
+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.4-redudant-EXTRA_DIST.patch 621 RMD160 9ee2a4a07c000cd7743cb1e383626a87b9414b12 SHA1 6d9118060fe311b280843648560fe01d10386d79 SHA256 57774493a0783182e17056c95985c9628485ae0deb7f02e97a28a98197d51bc9
+AUX geoip-1.4.4-rm-DEFAULT_DBDIR.patch 912 RMD160 fad21ead895c814d5778a21ce8cb578ee5204f6d SHA1 99ef1ba9e163f259bb2dc27662fbece714cd259d SHA256 e8212bef06080a8601639dd03014615eb73c678a4a2182d6e0472180faf5a934
+DIST GeoIP-1.4.4.tar.gz 944698 RMD160 4aa31840ec6496647551c6e12c9c5e32dceed426 SHA1 4a2937e7a8fc7c26aa88c0678791246b58d81d02 SHA256 a5b2ee9298eaf8c160ccab5b3e2ecc1c38cf67d9dd4e97419427f89d08cfb78e
+EBUILD geoip-1.4.4-r1.ebuild 1449 RMD160 ffea6dd15c768ea246747d703a0cff9a5ba2c687 SHA1 dc0b65e0ee57e1e17c7edb0ea54d46c50567639b SHA256 1a46b5166e1b31e4fc51ef656e28a19e293d34d7be3db3fdc12420cc15061aae
+MISC ChangeLog 11077 RMD160 9fafd31eb7b7c78fd64225b1dc9c542fead9eb25 SHA1 6a40d6c7a28f68155d76fffe4975c452f54b5d6f SHA256 78daaf3041f52e9500875548a1846d322f1acd75acb9c5547dec7ff295831371
+MISC metadata.xml 277 RMD160 a6bd0a35777e017f79890c0e0947cba8435b40ea SHA1 fed8c3fe1e00a1388e3df0430d59a75d8721395e SHA256 18a7e85115c3f66c1686d6dca5efed20d16700a57bdd738222976f174d46a508
diff --git a/dev-libs/geoip/files/geoip-1.4.4-CITY-NULL-beautifications.patch b/dev-libs/geoip/files/geoip-1.4.4-CITY-NULL-beautifications.patch
new file mode 100644
index 0000000..c4cc77d
--- /dev/null
+++ b/dev-libs/geoip/files/geoip-1.4.4-CITY-NULL-beautifications.patch
@@ -0,0 +1,60 @@
+=== modified file 'Makefile.am'
+--- Makefile.am	2008-09-02 14:26:04 +0000
++++ Makefile.am	2008-09-08 09:43:00 +0000
+@@ -1,5 +1,3 @@
+-NULL =
+-
+ INCLUDES = -Wall -ansi
+ 
+ SUBDIRS =		\
+@@ -8,7 +6,6 @@
+ 	conf		\
+ 	data		\
+ 	test		\
+-	man		\
+-	$(NULL)
++	man
+ 
+ EXTRA_DIST = READMEwin32.txt GeoIPWinDLL.patch TODO bootstrap GeoIP.spec GeoIP.spec.in Makefile.netware Makefile.win32 get_ver.awk geoip.ico
+
+=== modified file 'configure.in'
+--- configure.in	2008-09-08 09:35:23 +0000
++++ configure.in	2008-09-08 09:42:20 +0000
+@@ -10,16 +10,13 @@
+ AC_PROG_LIBTOOL
+ 
+ AC_ARG_WITH(city,
+-[  --with-city=\"no\"   Enable/disable support for GeoIP City Edition. (yes)])
+-if test "$with_city" = "no" ; then
+-  echo Disabling GeoIP City Edition support
+-  WITH_CITY=1
++AS_HELP_STRING([--without-city],[Disable support for GeoIP City Edition]),[],[with_city=yes])
++if test "x$with_city" != "xno" ; then
++  AC_MSG_NOTICE([Enabling GeoIP City Edition support])
+ else
+-  echo Enabling GeoIP City Edition support
+-  WITH_CITY=0
++  AC_MSG_NOTICE([Disabling GeoIP City Edition support])
+ fi
+-AC_SUBST(WITH_CITY)
+-AM_CONDITIONAL(WITH_CITY, test "$with_city" != "no")
++AM_CONDITIONAL(WITH_CITY, [test "x$with_city" != "xno"])
+ 
+ AC_CHECK_TYPE(byte,[AC_DEFINE(HAVE_BYTE_TYPEDEF)],[])
+ AC_CHECK_TYPE(ushort,[AC_DEFINE(HAVE_USHORT_TYPEDEF)],[])
+
+=== modified file 'test/Makefile.am'
+--- test/Makefile.am	2008-09-02 14:26:04 +0000
++++ test/Makefile.am	2008-09-08 09:42:52 +0000
+@@ -1,9 +1,6 @@
+-NULL =
+-
+ INCLUDES =	\
+ 	-I$(top_srcdir)/libGeoIP		\
+-	-Wall -ansi				\
+-	$(NULL)
++	-Wall -ansi
+ 
+ check_PROGRAMS = test-geoip
+ 
+
diff --git a/dev-libs/geoip/files/geoip-1.4.4-configure.in-upgrade.patch b/dev-libs/geoip/files/geoip-1.4.4-configure.in-upgrade.patch
new file mode 100644
index 0000000..0b5cf8a
--- /dev/null
+++ b/dev-libs/geoip/files/geoip-1.4.4-configure.in-upgrade.patch
@@ -0,0 +1,20 @@
+=== modified file 'configure.in'
+--- configure.in	2008-09-02 14:26:04 +0000
++++ configure.in	2008-09-02 20:24:35 +0000
+@@ -1,12 +1,11 @@
+-AC_INIT(libGeoIP/GeoIP.c)
+ dnl AM_CONFIG_HEADER(config.h)
+ 
+-VERSION=1.4.4
+-PACKAGE=GeoIP
++AC_INIT([GeoIP], [1.4.4],[support@maxmind.com],[GeoIP])
++AM_INIT_AUTOMAKE
++AC_CONFIG_SRCDIR([libGeoIP/GeoIP.c])
+ GEOIP_VERSION_INFO=`echo $VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
+ AC_SUBST(GEOIP_VERSION_INFO)
+ 
+-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ 
+
diff --git a/dev-libs/geoip/files/geoip-1.4.4-distcheck.patch b/dev-libs/geoip/files/geoip-1.4.4-distcheck.patch
new file mode 100644
index 0000000..cf39b3e
--- /dev/null
+++ b/dev-libs/geoip/files/geoip-1.4.4-distcheck.patch
@@ -0,0 +1,116 @@
+=== modified file 'conf/Makefile.am'
+--- conf/Makefile.am	2008-09-03 05:43:01 +0000
++++ conf/Makefile.am	2008-09-11 18:15:49 +0000
+@@ -3,9 +3,14 @@
+ DEFAULT_CONFIG_FILE = $(sysconfdir)/GeoIP.conf
+ 
+ install-exec-hook:
+-	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
++	@if test -f "$(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; then \
+ 	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
+ 	else \
+ 	        echo "$(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
+-	        $(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
++	        $(INSTALL_DATA) "$(srcdir)/GeoIP.conf.default" "$(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
++	fi
++
++uninstall-hook:
++	@if test -f "$(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; then \
++		rm "$(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
+ 	fi
+
+=== modified file 'data/Makefile.am'
+--- data/Makefile.am	2008-09-03 05:05:11 +0000
++++ data/Makefile.am	2008-09-11 18:15:44 +0000
+@@ -1,13 +1,16 @@
+-pkgdata_DATA =
+-
+-EXTRA_DIST = GeoIP.dat
++dist_pkgdata_DATA = GeoIP.dat
+ 
+ DEFAULT_DB_FILE = $(pkgdatadir)/GeoIP.dat
+ 
+ install-data-hook:
+-	@if test -f $(DESTDIR)$(DEFAULT_DB_FILE) ; then \
++	@if test -f "$(DESTDIR)$(DEFAULT_DB_FILE)" ; then \
+ 	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_DB_FILE)" ; \
+ 	else \
+ 	        echo "$(INSTALL_DATA) GeoIP.dat $(DESTDIR)$(DEFAULT_DB_FILE)"; \
+-	        $(INSTALL_DATA) GeoIP.dat $(DESTDIR)$(DEFAULT_DB_FILE); \
++	        $(INSTALL_DATA) "$(srcdir)/GeoIP.dat" "$(DESTDIR)$(DEFAULT_DB_FILE)"; \
++	fi
++
++uninstall-hook:
++	@if test -f "$(DESTDIR)$(DEFAULT_DB_FILE)" ; then \
++		rm "$(DESTDIR)$(DEFAULT_DB_FILE)"; \
+ 	fi
+
+=== modified file 'man/Makefile.am'
+--- man/Makefile.am	2008-09-11 18:49:46 +0000
++++ man/Makefile.am	2008-09-11 18:50:02 +0000
+@@ -2,6 +2,8 @@
+ 
+ EXTRA_DIST = geoipupdate.1.in geoiplookup.1.in
+ 
++CLEANFILES = geoipupdate.1 geoiplookup.1
++
+ edit = sed \
+ 	-e 's|DATADIR|$(pkgdatadir)|g' \
+ 	-e 's|CONF_DIR|$(sysconfdir)|g'
+
+=== modified file 'test/Makefile.am'
+--- test/Makefile.am	2008-09-08 09:45:11 +0000
++++ test/Makefile.am	2008-09-11 16:43:10 +0000
+@@ -13,6 +13,7 @@
+ 		 test-geoip-netspeed
+ 
+ LDADD = $(top_builddir)/libGeoIP/libGeoIP.la
++AM_CPPFLAGS = -DSRCDIR=\"$(top_srcdir)\"
+ 
+ test_geoip_SOURCES = test-geoip.c
+ 
+
+=== modified file 'test/test-geoip.c'
+--- test/test-geoip.c	2008-09-02 14:26:04 +0000
++++ test/test-geoip.c	2008-09-08 13:25:25 +0000
+@@ -34,10 +34,10 @@
+ 	for (i = 0; i < 2; ++i) {
+ 		if (0 == i) {
+ 			/* Read from filesystem, check for updated file */
+-			gi = GeoIP_open("../data/GeoIP.dat", GEOIP_STANDARD | GEOIP_CHECK_CACHE);
++			gi = GeoIP_open(SRCDIR"/data/GeoIP.dat", GEOIP_STANDARD | GEOIP_CHECK_CACHE);
+ 		} else {
+ 			/* Read from memory, faster but takes up more memory */
+-			gi = GeoIP_open("../data/GeoIP.dat", GEOIP_MEMORY_CACHE);
++			gi = GeoIP_open(SRCDIR"/data/GeoIP.dat", GEOIP_MEMORY_CACHE);
+ 		}
+ 
+ 		if (gi == NULL) {
+@@ -58,7 +58,7 @@
+ 			failed = 1;
+ 		}
+ 
+-		f = fopen("country_test.txt","r");
++		f = fopen(SRCDIR"/test/country_test.txt","r");
+ 
+ 		while (fscanf(f, "%s", ipAddress) != EOF) {
+ 			fscanf(f, "%s", expectedCountry);
+@@ -87,7 +87,7 @@
+ 		}
+ 		fclose(f);
+ 
+-		f = fopen("country_test2.txt","r");
++		f = fopen(SRCDIR"/test/country_test2.txt","r");
+ 		while (fscanf(f, "%s", ipAddress) != EOF) {
+ 			fscanf(f, "%s", expectedCountry);
+ 			returnedCountry = GeoIP_country_code_by_addr(gi,ipAddress);
+@@ -99,7 +99,7 @@
+ 		}
+ 		fclose(f);
+ 
+-		f = fopen("country_test_name.txt","r");
++		f = fopen(SRCDIR"/test/country_test_name.txt","r");
+ 		while (fscanf(f, "%s", ipAddress) != EOF) {
+ 			fscanf(f, "%s", expectedCountry);
+ 			returnedCountry = GeoIP_country_code_by_name(gi,ipAddress);
+
diff --git a/dev-libs/geoip/files/geoip-1.4.4-generate_man_pages_use_dist.patch b/dev-libs/geoip/files/geoip-1.4.4-generate_man_pages_use_dist.patch
new file mode 100644
index 0000000..3e83713
--- /dev/null
+++ b/dev-libs/geoip/files/geoip-1.4.4-generate_man_pages_use_dist.patch
@@ -0,0 +1,43 @@
+=== modified file 'conf/Makefile.am'
+--- conf/Makefile.am	2008-09-03 05:05:11 +0000
++++ conf/Makefile.am	2008-09-08 10:08:49 +0000
+@@ -1,6 +1,4 @@
+-sysconf_DATA = GeoIP.conf.default
+-
+-EXTRA_DIST = GeoIP.conf.default
++dist_sysconf_DATA = GeoIP.conf.default
+ 
+ DEFAULT_CONFIG_FILE = $(sysconfdir)/GeoIP.conf
+ 
+
+=== modified file 'man/Makefile.am'
+--- man/Makefile.am	2008-09-03 05:05:11 +0000
++++ man/Makefile.am	2008-09-08 10:52:16 +0000
+@@ -1,10 +1,16 @@
+-man_MANS = geoiplookup.1
+-
+-EXTRA_DIST = geoiplookup.1 geoipupdate.1
+-
+-UPDATE_MAN = $(mandir)/man1/geoipupdate.1
+-LOOKUP_MAN = $(mandir)/man1/geoiplookup.1
+-
+-install-data-hook:
+-	cat geoipupdate.1 | sed s,DATADIR,$(pkgdatadir), | sed s,CONF_DIR,$(sysconfdir), > $(DESTDIR)$(UPDATE_MAN)
+-	cat geoiplookup.1 | sed s,DATADIR,$(pkgdatadir), > $(DESTDIR)$(LOOKUP_MAN)
++man_MANS = geoipupdate.1 geoiplookup.1
++
++EXTRA_DIST = geoipupdate.1.in geoiplookup.1.in
++
++edit = sed \
++	-e 's|DATADIR|$(pkgdatadir)|g' \
++	-e 's|CONF_DIR|$(sysconfdir)|g'
++
++geoipupdate.1 geoiplookup.1: Makefile
++	rm -f $@ $@.tmp
++	$(edit) '$(srcdir)/$@.in' >$@.tmp
++	mv $@.tmp $@
++
++geoipupdate.1: geoipupdate.1.in
++geoiplookup.1: geoiplookup.1.in
++
+
diff --git a/dev-libs/geoip/files/geoip-1.4.4-no-noinst_PROGRAMS.patch b/dev-libs/geoip/files/geoip-1.4.4-no-noinst_PROGRAMS.patch
new file mode 100644
index 0000000..334147c
--- /dev/null
+++ b/dev-libs/geoip/files/geoip-1.4.4-no-noinst_PROGRAMS.patch
@@ -0,0 +1,69 @@
+=== modified file 'test/Makefile.am'
+--- test/Makefile.am	2008-09-08 09:44:05 +0000
++++ test/Makefile.am	2008-09-08 09:44:14 +0000
+@@ -4,56 +4,25 @@
+ 
+ check_PROGRAMS = test-geoip
+ 
+-#if WITH_CITY
+-noinst_PROGRAMS = benchmark test-geoip-region test-geoip-city test-geoip-org test-geoip-asnum test-geoip-isp test-geoip-netspeed
+-#else
+-#noinst_PROGRAMS = benchmark test-geoip-region
+-#endif
++EXTRA_PROGRAMS = benchmark \
++		 test-geoip-region \
++		 test-geoip-city \
++		 test-geoip-org \
++		 test-geoip-asnum \
++		 test-geoip-isp \
++		 test-geoip-netspeed
+ 
+-DEPS = $(top_builddir)/libGeoIP/libGeoIP.la
+-LDADDS = $(top_builddir)/libGeoIP/libGeoIP.la
++LDADD = $(top_builddir)/libGeoIP/libGeoIP.la
+ 
+ test_geoip_SOURCES = test-geoip.c
+-test_geoip_LDFLAGS =
+-test_geoip_DEPENDENCIES = $(DEPS)
+-test_geoip_LDADD = $(LDADDS)
+ 
+ test_geoip_region_SOURCES = test-geoip-region.c
+-test_geoip_region_LDFLAGS =
+-test_geoip_region_DEPENDENCIES = $(DEPS)
+-test_geoip_region_LDADD = $(LDADDS)
+-
+ test_geoip_org_SOURCES = test-geoip-org.c
+-test_geoip_org_LDFLAGS =
+-test_geoip_org_DEPENDENCIES = $(DEPS)
+-test_geoip_org_LDADD = $(LDADDS)
+-
+ test_geoip_isp_SOURCES = test-geoip-isp.c
+-test_geoip_isp_LDFLAGS =
+-test_geoip_isp_DEPENDENCIES = $(DEPS)
+-test_geoip_isp_LDADD = $(LDADDS)
+-
+ test_geoip_asnum_SOURCES = test-geoip-asnum.c
+-test_geoip_asnum_LDFLAGS =
+-test_geoip_asnum_DEPENDENCIES = $(DEPS)
+-test_geoip_asnum_LDADD = $(LDADDS)
+-
+ test_geoip_netspeed_SOURCES = test-geoip-netspeed.c
+-test_geoip_netspeed_LDFLAGS =
+-test_geoip_netspeed_DEPENDENCIES = $(DEPS)
+-test_geoip_netspeed_LDADD = $(LDADDS)
+-
+-if WITH_CITY
+ test_geoip_city_SOURCES = test-geoip-city.c
+-test_geoip_city_LDFLAGS =
+-test_geoip_city_DEPENDENCIES = $(DEPS)
+-test_geoip_city_LDADD = $(LDADDS)
+-endif
+-
+ benchmark_SOURCES = benchmark.c
+-benchmark_LDFLAGS =
+-benchmark_DEPENDENCIES = $(DEPS)
+-benchmark_LDADD = $(LDADDS)
+ 
+ EXTRA_DIST = country_test.txt country_test2.txt country_test_name.txt region_test.txt
+ TESTS = test-geoip
+
diff --git a/dev-libs/geoip/files/geoip-1.4.4-parallel-build.patch b/dev-libs/geoip/files/geoip-1.4.4-parallel-build.patch
new file mode 100644
index 0000000..8672bf7
--- /dev/null
+++ b/dev-libs/geoip/files/geoip-1.4.4-parallel-build.patch
@@ -0,0 +1,59 @@
+Source: Peter Volkov <pva@gentoo.org>
+Upstream: Notified
+Reason: parallel make failed.
+
+From automake info page:
+
+   When writing `install-exec-hook' or `install-data-hook', please bear in mind
+   that the exec/data distinction is based on the installation directory, not
+   on the primary used (*note Install::).  So a `foo_SCRIPTS' will be installed
+   by `install-data', and a `barexec_SCRIPTS' will be installed by
+   `install-exec'.  You should define your hooks consequently.
+
+   Variables using the standard directory prefixes `bin', `sbin', `libexec',
+   `sysconf', `localstate', `lib', or `pkglib' are installed by `install-exec'.
+
+thus change from install-data-hook to install-exec-hook.
+
+   Automake also supports two install hooks, `install-exec-hook' and
+   `install-data-hook'.  These hooks are run after all other install rules of
+   the appropriate type, exec or data, have completed.  So, for instance, it is
+   possible to perform post-installation modifications using an install hook.
+
+thus no need for dependencies.
+
+--- conf/Makefile.am	2008-09-02 14:26:04 +0000
++++ conf/Makefile.am	2008-09-02 17:18:02 +0000
+@@ -4,7 +4,7 @@
+ 
+ DEFAULT_CONFIG_FILE = $(sysconfdir)/GeoIP.conf
+ 
+-install-data-hook: install-sysconfDATA
++install-exec-hook:
+ 	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
+ 	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
+ 	else \
+
+--- data/Makefile.am	2008-09-02 14:26:04 +0000
++++ data/Makefile.am	2008-09-02 17:19:00 +0000
+@@ -4,7 +4,7 @@
+ 
+ DEFAULT_DB_FILE = $(pkgdatadir)/GeoIP.dat
+ 
+-install-data-hook: install-pkgdataDATA
++install-data-hook:
+ 	@if test -f $(DESTDIR)$(DEFAULT_DB_FILE) ; then \
+ 	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_DB_FILE)" ; \
+ 	else \
+
+--- man/Makefile.am	2008-09-02 14:26:04 +0000
++++ man/Makefile.am	2008-09-02 17:19:06 +0000
+@@ -5,6 +5,6 @@
+ UPDATE_MAN = $(mandir)/man1/geoipupdate.1
+ LOOKUP_MAN = $(mandir)/man1/geoiplookup.1
+ 
+-install-data-hook: install-man
++install-data-hook:
+ 	cat geoipupdate.1 | sed s,DATADIR,$(pkgdatadir), | sed s,CONF_DIR,$(sysconfdir), > $(DESTDIR)$(UPDATE_MAN)
+ 	cat geoiplookup.1 | sed s,DATADIR,$(pkgdatadir), > $(DESTDIR)$(LOOKUP_MAN)
+
diff --git a/dev-libs/geoip/files/geoip-1.4.4-redudant-EXTRA_DIST.patch b/dev-libs/geoip/files/geoip-1.4.4-redudant-EXTRA_DIST.patch
new file mode 100644
index 0000000..5caa91d
--- /dev/null
+++ b/dev-libs/geoip/files/geoip-1.4.4-redudant-EXTRA_DIST.patch
@@ -0,0 +1,24 @@
+=== modified file 'conf/Makefile.am'
+--- conf/Makefile.am	2008-09-03 05:05:11 +0000
++++ conf/Makefile.am	2008-09-03 05:08:37 +0000
+@@ -1,7 +1,5 @@
+ sysconf_DATA = GeoIP.conf.default
+ 
+-EXTRA_DIST = GeoIP.conf.default
+-
+ DEFAULT_CONFIG_FILE = $(sysconfdir)/GeoIP.conf
+ 
+ install-exec-hook:
+
+=== modified file 'man/Makefile.am'
+--- man/Makefile.am	2008-09-03 05:05:11 +0000
++++ man/Makefile.am	2008-09-03 05:07:36 +0000
+@@ -1,6 +1,6 @@
+ man_MANS = geoiplookup.1
+ 
+-EXTRA_DIST = geoiplookup.1 geoipupdate.1
++EXTRA_DIST = geoipupdate.1
+ 
+ UPDATE_MAN = $(mandir)/man1/geoipupdate.1
+ LOOKUP_MAN = $(mandir)/man1/geoiplookup.1
+
diff --git a/dev-libs/geoip/files/geoip-1.4.4-rm-DEFAULT_DBDIR.patch b/dev-libs/geoip/files/geoip-1.4.4-rm-DEFAULT_DBDIR.patch
new file mode 100644
index 0000000..ea36ae5
--- /dev/null
+++ b/dev-libs/geoip/files/geoip-1.4.4-rm-DEFAULT_DBDIR.patch
@@ -0,0 +1,35 @@
+=== modified file 'configure.in'
+--- configure.in	2008-09-03 05:05:11 +0000
++++ configure.in	2008-09-08 09:34:00 +0000
+@@ -9,12 +9,6 @@
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ 
+-AC_ARG_WITH(dbdir,
+-[  --with-dbdir=\"dir\"    Default directories to look for Geo-IP Database files.
+-                          (Default: DATADIR/GeoIP)],
+-     [DEFAULT_DBDIR="$with_dbdir"
+-     AC_DEFINE_UNQUOTED(DEFAULT_DBDIR,"$with_dbdir")])
+-
+ AC_ARG_WITH(city,
+ [  --with-city=\"no\"   Enable/disable support for GeoIP City Edition. (yes)])
+ if test "$with_city" = "no" ; then
+@@ -50,17 +44,6 @@
+ 		AC_DEFINE(GETHOSTBYNAME_R_RETURNS_INT)])
+ 	])
+ 
+-GEOIPSHAREPATH=""
+-tmpset="$datadir/GeoIP"
+-while test "x$tmpset" != "x$GEOIPSHAREPATH"; do
+-  GEOIPSHAREPATH="$tmpset"
+-  eval tmpset="$tmpset"
+-done
+-
+-if test "x$DEFAULT_DBDIR" = "x"; then
+-  AC_DEFINE_UNQUOTED(DEFAULT_DBDIR,"$GEOIPSHAREPATH")
+-fi
+-
+ AC_OUTPUT([
+ Makefile
+ GeoIP.spec
+
diff --git a/dev-libs/geoip/geoip-1.4.4-r1.ebuild b/dev-libs/geoip/geoip-1.4.4-r1.ebuild
new file mode 100644
index 0000000..e2315a8
--- /dev/null
+++ b/dev-libs/geoip/geoip-1.4.4-r1.ebuild
@@ -0,0 +1,47 @@
+# 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"
+
+# GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
+LICENSE="LGPL-2.1 GPL-2 MaxMind"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-parallel-build.patch
+	epatch "${FILESDIR}"/${P}-configure.in-upgrade.patch
+	epatch "${FILESDIR}"/${P}-generate_man_pages_use_dist.patch
+	mv man/geoipupdate.1{,.in}
+	mv man/geoiplookup.1{,.in}
+	epatch "${FILESDIR}"/${P}-rm-DEFAULT_DBDIR.patch
+	epatch "${FILESDIR}"/${P}-CITY-NULL-beautifications.patch
+	epatch "${FILESDIR}"/${P}-no-noinst_PROGRAMS.patch
+	epatch "${FILESDIR}"/${P}-distcheck.patch
+	eautoreconf
+	# FreeBSD requires this
+	#elibtoolize
+}
+
+src_compile() {
+	econf --enable-shared
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog README TODO
+	newdoc data/README README.data
+}
diff --git a/dev-libs/geoip/metadata.xml b/dev-libs/geoip/metadata.xml
new file mode 100644
index 0000000..16ab2f7
--- /dev/null
+++ b/dev-libs/geoip/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+<longdescription>easily lookup countries by IP addresses, even when Reverse DNS entries don't exist</longdescription>
+</pkgmetadata>