diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-06-14 01:27:31 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-06-14 01:27:31 +0000 |
| commit | 315934384d50d1623b97343b2207e9eb04610c33 (patch) | |
| tree | bd24bf7f6304a9e2c9ce9dd94e87d630ceadbe27 /dev-libs/geoip | |
| parent | bump; set Django dep to 1.6 (diff) | |
| download | historical-315934384d50d1623b97343b2207e9eb04610c33.tar.gz historical-315934384d50d1623b97343b2207e9eb04610c33.tar.bz2 historical-315934384d50d1623b97343b2207e9eb04610c33.zip | |
Add a prefix to the GeoIP datadir.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'dev-libs/geoip')
| -rw-r--r-- | dev-libs/geoip/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/geoip/Manifest | 12 | ||||
| -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 |
4 files changed, 17 insertions, 10 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/Manifest b/dev-libs/geoip/Manifest index 0bfedb0c0e4e..0e6bd8898188 100644 --- a/dev-libs/geoip/Manifest +++ b/dev-libs/geoip/Manifest @@ -2,7 +2,7 @@ Hash: SHA256 AUX geoipupdate-r2.sh 853 SHA256 0db50d206cffa000c42f2f22fce02e990f5383ac1ca00faafc81e6e24f49b8d7 SHA512 9af29239e5e439e98651ea4640a06bf88c1968dd3cef58e36fdf197b99da45404dd571514234d0a4d708719e37473fc582b6a59c1559659ed47017061d578303 WHIRLPOOL 46451c31cf0d1c170dbbd4ad9660639da851ede7c9757a28769f4314fd63ea350118a29656b14b6d14b587d703c8eeb7dc2a2a4119cc1a5e5f7bebc33e0c6c43 -AUX geoipupdate-r3.sh 933 SHA256 f1c6685061e2709b5b5a5973520cd6622a4efb81c41c1e6740a8e52076c9f3b8 SHA512 65d0be2bed9b0885786d35eb0ebb838ca46088447e0ed1252f818dad1ba986c7a79cd66f61cbf938614ebe4ccf63ddfcfe14dee4a1b69958c22fbc7be13fb006 WHIRLPOOL fd9dd3f231241bb91210f1467d3312d8e4e5c71a3b43afd55b1a87fa3cb411b89e95b6267f7d32590f27dd54738c3d5a2ed9123e34abcb682c9b9f95280c2563 +AUX geoipupdate-r3.sh 941 SHA256 34ea9c1f55bf71507e96eba03b8a9ce436894cb446a0d726875bccd8789c4709 SHA512 c828ac656aa6d078fda68dcc7edf02d285a22641c677503d3d88be6abe9b8d69ade5cd0ae4cbffd5798b4a6bab04fe4d8995c5ce34660858af4b38e8521d51e9 WHIRLPOOL be81155f8be7d3e30a86830fbbf0b4271cfd49ce890505c5d082a178c508902b9b910fc5d4593a76acc5d77f0fcdcdf94f21006f32bebef8dbaa157794415f47 DIST GeoIP.dat.gz 393946 SHA256 fc7f90a8236b958d3fdbcc333f657651b1680a3083fc398828c88b67500241a0 SHA512 00bc54ad6ec92f3fe963041dc0d714649b9df1a43fee217a56cebbb9cccb289d49510bfee98315d31003c75e7aad9603e05ce089776b699eb56fafebbda4e4ae WHIRLPOOL 19915f5d2ede5bcb4160a5a39ea48dbb8ed400b1983bbfef9fe43ee5007d87f3ba5b18a1fa6438fc183f5855312184cbb176676dbd6f5462d6531fba4ecdd1bd DIST GeoIPASNum.dat.gz 1966360 SHA256 499cee393bb524a12feafeb78f28cb076e43b793f3c9d2d3928d7f1afa706284 SHA512 7f5d86dedf175134d975fe28d60f1946727b16d983de3c9cabe4e86884f1ad5fdaf77a4e39fa39804f08f573dbc2d8923db6cc21268e6143fb3d3f34a32696f5 WHIRLPOOL fd0394d9ea35a3c4135fc2b60ca4d86d8aef3ed03299c251e493fbe2a3a15b12338c133a1d919d23b9fec5addd6a260dd6c3bbc0b1ea7aa614caa0d457b1cdf0 DIST GeoIPv6.dat.gz 613971 SHA256 ba76c683d525a7119c3e588ea0ed97ec0dbb52c93d506a355d67bc6a88caef52 SHA512 7c63426caee53c851c141b52175156fca916bf7a075093f4deb2160471fdbdd305821760aba354f5f44a6154e8739fbe0e95442d555ba9794a331acceb64e124 WHIRLPOOL c00cb796c2555c7710f42ea0b0b5fe37b0bad1d63da167e2f555366519a126f737d3361ecec4c8a351bc64f1dbbe1d869a97f0bb5a542161c2ecf42184119eb4 @@ -10,13 +10,13 @@ DIST GeoLiteCity.dat.gz 11312286 SHA256 998b3a90122807b003c21d714b1114d6c4f882b4 DIST GeoLiteCityv6.dat.gz 11538424 SHA256 520ac5834cc1b060ee071f55f280348098bd0315a8607cd58fabd954e2931cd6 SHA512 c40f5781c69201c9a0cda9b6fbd80ccc234be21158a754501303df153da1ac82a4d562d0138076121584928ec63be69fac24ebc100c66d6e16a92879bec058a1 WHIRLPOOL c165a26a29a8b171bc2b9e005587e6cfc14849fd092af8c24c64d685115ba98699c3796abbd2f69b0c5a31b9165f03e699dad0b986b3103461978d2b9ee10b4a DIST geoip-1.6.0.tar.gz 160178 SHA256 61bed5907e9544d5b1071ea962a55154dd0827c04bd8a5814fb5863897c9a024 SHA512 b8cb2fff83ebf5a96981aa91d8d1d54e421ca290116ec4ecbf799c67c77524a245316db67fa538ae17a4e123338a1414e85c641ee156fb385887647c31a1a9e9 WHIRLPOOL 3689ffd74fec7e59afbe5db470cb15457b3dfd9c36a93577e4126425fcd64cdec59c51fa09b30e14cea31994f1f372c41c5d1bae45b9356448a4cc280220cad1 EBUILD geoip-1.6.0-r1.ebuild 1869 SHA256 07f82a801ede649ba1e11192a25fd431aa31479bcae4270aa7692fde0512f260 SHA512 d2ea46b981e5d28fc1ce2ee416451c708a8edb4e8b9f7c8f90a497daddd22c9d5747144763b4f717ceea524b2c562a86fcfdb86f66237a6de0d4f47bdfcd2325 WHIRLPOOL 2a9bf693a11b5742f2bdc317046e2c9b00c2fba3c9bad7006237ea38fae9d1722cd199712381f7a7d5c79fa384166912b03ab6d564c2a8df5bce8275bcf00641 -EBUILD geoip-1.6.0-r2.ebuild 1217 SHA256 7d3b92bd34d4587ec9d19bbe940bce702c62d2fa90212ef4f73629c69a519478 SHA512 8448abca0be1b461924199950c1979a1ff93309ada22692831df52192ab87398b4f39a4e10cedac4f4fdd511b3f38e5f8756d7d0c92445ff72aaf76da06120b0 WHIRLPOOL f7fbdf23e34024fbdc8e7eec22f867099d097df2e6ee77bf0ab36290649afec645d2399d4f67e824c5ba542496cfceb871dfe801e9643533a8f164fa623f4c62 -MISC ChangeLog 26224 SHA256 3e5465c2eea522431b5b45dbb8909172d39a546f2f7785a15ee07acd6e0a8e43 SHA512 5c02132d486785123b7f3d38b57166f5a924025ea2acd10b1b59ed98b04ebcbc495d35b28d03f5a09bc45c4be8f92e1f4475a9f36d3f72bceaf78d3352d6ed32 WHIRLPOOL 0387bafa179da1f2a7b43131ee003d52fae85935a463ef821f189b545384584d945f9b7509cdace678b80e57473a787532e936515fbeb754c90852116df43d09 +EBUILD geoip-1.6.0-r3.ebuild 1271 SHA256 5e7560982b0afad1c128a76f322d83d611cfbba81ef856c636366de8fbc146e0 SHA512 0243f3d9e8c1272873bd79e4f56ffcd5a790ab35f0f6e3489a9a5a5771c072a9e0e88ea647bfb4e6c657ca6aaa1e4772af4a8cd7ddfd1521043beb29b5c54a0f WHIRLPOOL e914c09085740796b432356f009fcabb3d01d0feca050d579bc01f84afadd331f19b75bc3a96051e7537808d048e971cfcb3ba943cf6fb1ec798375bf04f94a4 +MISC ChangeLog 26415 SHA256 c26c4237b69ad9f5739195fcf7adc0c504d5c92ca662ba1b901c6702691b21c4 SHA512 b40cf0e35dc869b7e44bffa19809b0a2fad0efed8dba8598e460809930f9fcc9bb5d42f792fe6c47d6f2cdf11c48458dde0054b37226dc1afc24169ca17b40a0 WHIRLPOOL 1b034ad93c0bf8ecdf4208834f69f86ccc6deb76c959a988e438b5775de86e39eef44acf27018ed4c702ed2adbe7c8cc51f956f73eb925665ff315f0ec3bd657 MISC metadata.xml 241 SHA256 3d42196a34024a717e8521954e6be11f030735fe0fb86c7827cf047b8c7802e1 SHA512 88ff9c4b327d2972284a4354a38145fc154830c5ffb86912f3149214944ad72b930b3362da04f3fd1fc376e46a38c2d93fe3a67e5f3ed72b0a15d2692d208d49 WHIRLPOOL d239cc85487a236466ee0cf2cfbc35a1b19571fbccd598ee0f558f3068326f6b9a88bfc8942b769c1f93a6c47a83abd4f687768ac0e9bfae74a4023491d8f5b4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlObnTsACgkQVWmRsqeSphOitACeOPCU/U6rK/4r8B4KwU7LEcaC -8GMAn26bmcT1BhnJ7dAJ7i6Ib4PDozFk -=Jwzr +iEYEAREIAAYFAlObpQMACgkQVWmRsqeSphPzLwCfcfZJuDbbl9diLvJKAqaV6+Yx +a0oAn2Q9DN+1XNoFDDYJaOAxSkeupiHT +=F4xN -----END PGP SIGNATURE----- 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() { |