summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2011-01-21 14:46:41 +0000
committerJeroen Roovers <jer@gentoo.org>2011-01-21 14:46:41 +0000
commit76f6d1e804c27cd262192450be81e75455615aa9 (patch)
treeb760bcea9bddee62033762d9c80094a8aee4c544 /dev-libs/geoip
parentStable for HPPA (bug #349264). (diff)
downloadgentoo-2-76f6d1e804c27cd262192450be81e75455615aa9.tar.gz
gentoo-2-76f6d1e804c27cd262192450be81e75455615aa9.tar.bz2
gentoo-2-76f6d1e804c27cd262192450be81e75455615aa9.zip
Old.
(Portage version: 2.2.0_alpha18/cvs/Linux i686)
Diffstat (limited to 'dev-libs/geoip')
-rw-r--r--dev-libs/geoip/Manifest5
-rw-r--r--dev-libs/geoip/files/geoip-1.4.4-no-noinst_PROGRAMS.patch69
-rw-r--r--dev-libs/geoip/files/geoip-1.4.4-parallel-build.patch59
-rw-r--r--dev-libs/geoip/files/geoip-1.4.5-ppc-fix.patch35
-rw-r--r--dev-libs/geoip/geoip-1.4.5.ebuild42
5 files changed, 0 insertions, 210 deletions
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index 1b2109e2997b..6c43c46e56b3 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -1,9 +1,4 @@
-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.5.tar.gz 986844 RMD160 70c99570146e8bc3b9cfa68bc8ca25c282666907 SHA1 f8ac0c8ac113a3d8def8f93f7255ef0bbff34814 SHA256 cd62034fe0206be243cbb43723520987978d8e55ee61872f34fd60a31f5c6b18
DIST GeoIP-1.4.6.tar.gz 1045241 RMD160 67097c3f9c6bbdba1a4f7ee796713720dba19b0f SHA1 e692954f447c13270de7860e586696991776d8a3 SHA256 16b429407d7bc7d785d1aace73a390f287cd90200f0f61f5c75818058dec91c4
-EBUILD geoip-1.4.5.ebuild 1218 RMD160 646cb176178b3f152e39ad6aa85ea496288e72fa SHA1 22fa82e05a90e0b56729abf340ec88f9aae4725c SHA256 afad507bc13cdf94321bb558718d9e37c92788fc36e0fe0f12db3f8bde2b2e75
EBUILD geoip-1.4.6.ebuild 1242 RMD160 b2d6619c576c2cf93a5dee84cd6ac2b55992e95f SHA1 e5ba438e4587e062922be4739d974b6333349869 SHA256 a2d497cc0bfcb8f6abd388af3187a11d146c967ebb3ae93e605c18a77c355d81
MISC ChangeLog 13786 RMD160 73cf5972fb5d2766bf2774e4e171529867aa2944 SHA1 e9c0dc2b09915b278a5cfe011bf7aab789ba481a SHA256 c68ccf0ac9abd7df9c69f52236e53751e79e2ff3c94cc9d227c59de0b970df20
MISC metadata.xml 467 RMD160 bae585df5c7d12c765d5fab1b7766b79729f1144 SHA1 dfe6076a08817ef8058f1209c381d61f4aaac998 SHA256 3081b13432bfa3cc218fe7f9ade8fe1cd0fcbea4f3f1de2d51faf8a0acad88f5
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
deleted file mode 100644
index 334147cb62e3..000000000000
--- a/dev-libs/geoip/files/geoip-1.4.4-no-noinst_PROGRAMS.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-=== 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
deleted file mode 100644
index 8672bf7f8cfe..000000000000
--- a/dev-libs/geoip/files/geoip-1.4.4-parallel-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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.5-ppc-fix.patch b/dev-libs/geoip/files/geoip-1.4.5-ppc-fix.patch
deleted file mode 100644
index 423c0712f797..000000000000
--- a/dev-libs/geoip/files/geoip-1.4.5-ppc-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Status of this patch: Reported upstream.
-
-The following assignment in libGeoIP/GeoIP.c is broken on ppc64:
- addr = *((unsigned long *) phe->h_addr_list[0]);
-
-phe->h_addr_list[0] on linux has type in_addr_t which is defined as:
- typedef uint32_t in_addr_t;
-
-On ppc64 sizeof(unsigned long) is 8 (!= 4, sizeof(uint32_t)). This code works
-on amd64 as it's little endian, while it became broken on big endian ppc64
-systems.
-
-
---- libGeoIP/GeoIP.c 2008-12-28 17:36:55 +0000
-+++ libGeoIP/GeoIP.c 2008-12-28 17:37:41 +0000
-@@ -811,8 +811,7 @@
- buflength = buflength * 2;
- buf = realloc(buf,buflength);
- }
--#endif
--#ifndef HAVE_GETHOSTBYNAME_R
-+#else
- /* Some systems do not support gethostbyname_r, such as Mac OS X */
- phe = gethostbyname(host);
- #endif
-@@ -820,7 +819,7 @@
- free(buf);
- return 0;
- }
-- addr = *((unsigned long *) phe->h_addr_list[0]);
-+ addr = *((in_addr_t *) phe->h_addr_list[0]);
- }
- #ifdef HAVE_GETHOSTBYNAME_R
- free(buf);
-
diff --git a/dev-libs/geoip/geoip-1.4.5.ebuild b/dev-libs/geoip/geoip-1.4.5.ebuild
deleted file mode 100644
index 13865969dea3..000000000000
--- a/dev-libs/geoip/geoip-1.4.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.5.ebuild,v 1.9 2010/10/14 18:45:32 jer 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 MaxMind2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${PN}-1.4.4-parallel-build.patch
- epatch "${FILESDIR}"/${PN}-1.4.4-no-noinst_PROGRAMS.patch
- epatch "${FILESDIR}"/${P}-ppc-fix.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"
- dobin apps/geoipupdate-pureperl.pl
- dodoc AUTHORS ChangeLog README TODO
- newdoc data/README README.data
-}