diff options
author | Jeroen Roovers <jer@gentoo.org> | 2014-06-14 01:27:30 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2014-06-14 01:27:30 +0000 |
commit | 95b87afd17564bbf4939fb48be8b5478b45bd930 (patch) | |
tree | 0fc00c6d5c4f9d2d051e1b335907bd48cef41902 /dev-libs/geoip | |
parent | bump; set Django dep to 1.6 (diff) | |
download | gentoo-2-95b87afd17564bbf4939fb48be8b5478b45bd930.tar.gz gentoo-2-95b87afd17564bbf4939fb48be8b5478b45bd930.tar.bz2 gentoo-2-95b87afd17564bbf4939fb48be8b5478b45bd930.zip |
Add a prefix to the GeoIP datadir.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'dev-libs/geoip')
-rw-r--r-- | dev-libs/geoip/ChangeLog | 8 | ||||
-rwxr-xr-x | dev-libs/geoip/files/geoipupdate-r3.sh | 2 | ||||
-rw-r--r-- | dev-libs/geoip/geoip-1.6.0-r3.ebuild (renamed from dev-libs/geoip/geoip-1.6.0-r2.ebuild) | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/dev-libs/geoip/ChangeLog b/dev-libs/geoip/ChangeLog index 3d13b66cc8cb..ab79732cc8ca 100644 --- a/dev-libs/geoip/ChangeLog +++ b/dev-libs/geoip/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/geoip # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.216 2014/06/14 00:54:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.217 2014/06/14 01:27:30 jer Exp $ + +*geoip-1.6.0-r3 (14 Jun 2014) + + 14 Jun 2014; Jeroen Roovers <jer@gentoo.org> -geoip-1.6.0-r2.ebuild, + +geoip-1.6.0-r3.ebuild, files/geoipupdate-r3.sh: + Add a prefix to the GeoIP datadir. 14 Jun 2014; Jeroen Roovers <jer@gentoo.org> geoip-1.6.0-r2.ebuild: Remove unused USE flags. diff --git a/dev-libs/geoip/files/geoipupdate-r3.sh b/dev-libs/geoip/files/geoipupdate-r3.sh index 3fabf8348469..951591616a30 100755 --- a/dev-libs/geoip/files/geoipupdate-r3.sh +++ b/dev-libs/geoip/files/geoipupdate-r3.sh @@ -1,7 +1,7 @@ #!/bin/sh GEOIP_MIRROR="https://geolite.maxmind.com/download/geoip/database" -GEOIPDIR=/usr/share/GeoIP +GEOIPDIR=@PREFIX@/usr/share/GeoIP TMPDIR= DATABASES="GeoLiteCity GeoLiteCountry/GeoIP asnum/GeoIPASNum GeoIPv6 GeoLiteCityv6-beta/GeoLiteCityv6" diff --git a/dev-libs/geoip/geoip-1.6.0-r2.ebuild b/dev-libs/geoip/geoip-1.6.0-r3.ebuild index 1c3ac48854ad..a77b9a2278c2 100644 --- a/dev-libs/geoip/geoip-1.6.0-r2.ebuild +++ b/dev-libs/geoip/geoip-1.6.0-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.6.0-r2.ebuild,v 1.4 2014/06/14 00:54:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.6.0-r3.ebuild,v 1.1 2014/06/14 01:27:30 jer Exp $ EAPI=5 inherit autotools eutils @@ -29,6 +29,7 @@ src_prepare() { src_configure() { econf $(use_enable static-libs static) + sed -e "s|@PREFIX@|${ROOT}|g" "${FILESDIR}"/geoipupdate-r3.sh > geoipupdate.sh || die } src_install() { @@ -40,7 +41,7 @@ src_install() { keepdir /usr/share/GeoIP - newsbin "${FILESDIR}"/geoipupdate-r3.sh geoipupdate.sh + dosbin geoipupdate.sh } pkg_postinst() { |