diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2011-06-07 11:14:34 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2011-06-07 11:14:34 +0000 |
| commit | 86b7ab2c723db91465a7b58103556df389a42006 (patch) | |
| tree | 342668feebc930468bf3c291e4a9d3385d0875b3 /dev-libs | |
| parent | Fix documentation dir - bug #298102 (diff) | |
| download | gentoo-2-86b7ab2c723db91465a7b58103556df389a42006.tar.gz gentoo-2-86b7ab2c723db91465a7b58103556df389a42006.tar.bz2 gentoo-2-86b7ab2c723db91465a7b58103556df389a42006.zip | |
Install the IPv6 database with USE=ipv6. Use remove_libtool_files instead of find. Remove empty DEPEND.
(Portage version: 2.2.0_alpha37/cvs/Linux i686)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/geoip/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/geoip/geoip-1.4.7.ebuild | 19 |
2 files changed, 18 insertions, 7 deletions
diff --git a/dev-libs/geoip/ChangeLog b/dev-libs/geoip/ChangeLog index 2c97bbeb502d..f6f1e07b890e 100644 --- a/dev-libs/geoip/ChangeLog +++ b/dev-libs/geoip/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/geoip # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.113 2011/05/20 12:12:25 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.114 2011/06/07 11:14:34 jer Exp $ + + 07 Jun 2011; Jeroen Roovers <jer@gentoo.org> geoip-1.4.7.ebuild: + Install the IPv6 database with USE=ipv6. Use remove_libtool_files instead of + find. Remove empty DEPEND. 20 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> geoip-1.4.7.ebuild: Bump eapi and drop useless inherit. Punt the .la file. diff --git a/dev-libs/geoip/geoip-1.4.7.ebuild b/dev-libs/geoip/geoip-1.4.7.ebuild index 52f7fff483ae..8a004a973043 100644 --- a/dev-libs/geoip/geoip-1.4.7.ebuild +++ b/dev-libs/geoip/geoip-1.4.7.ebuild @@ -1,24 +1,26 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.7.ebuild,v 1.2 2011/05/20 12:12:25 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.7.ebuild,v 1.3 2011/06/07 11:14:34 jer Exp $ EAPI=4 -inherit libtool +inherit autotools-utils 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" +SRC_URI=" + http://www.maxmind.com/download/geoip/api/c/${MY_P}.tar.gz + ipv6? ( http://geolite.maxmind.com/download/geoip/database/GeoIPv6.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" -IUSE="perl-geoipupdate static-libs" +IUSE="ipv6 perl-geoipupdate static-libs" -DEPEND="" RDEPEND=" perl-geoipupdate? ( dev-perl/PerlIO-gzip @@ -45,5 +47,10 @@ src_install() { use perl-geoipupdate && dobin apps/geoipupdate-pureperl.pl dodoc AUTHORS ChangeLog README TODO conf/GeoIP.conf.default rm "${ED}/etc/GeoIP.conf.default" - find "${ED}" -name '*.la' -delete + use static-libs || remove_libtool_files + + if use ipv6; then + insinto /usr/share/GeoIP + doins "${WORKDIR}/GeoIPv6.dat" || die + fi } |