Set symlinks for GeoLite* -> GeoIP* in geoipupdate.sh (bug #525924).

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 63 insertions, 3 deletions

diff --git a/dev-libs/geoip/ChangeLog b/dev-libs/geoip/ChangeLog
index 2186fa7c099e..22af8c37ab62 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.226 2014/10/18 14:17:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.227 2014/10/21 09:09:38 jer Exp $
+
+*geoip-1.6.2-r1 (21 Oct 2014)
+
+  21 Oct 2014; Jeroen Roovers <jer@gentoo.org> geoip-1.6.2.ebuild,
+  +geoip-1.6.2-r1.ebuild, -files/geoipupdate-r4.sh, +files/geoipupdate-r5.sh:
+  Set symlinks for GeoLite* -> GeoIP* in geoipupdate.sh (bug #525924).
 
   18 Oct 2014; Agostino Sarubbo <ago@gentoo.org> geoip-1.6.2.ebuild:
   Stable for ppc, wrt bug #523034
diff --git a/dev-libs/geoip/files/geoipupdate-r4.sh b/dev-libs/geoip/files/geoipupdate-r5.sh
index 3d8c8da5c124..484ff7e2227a 100755..100644
--- a/dev-libs/geoip/files/geoipupdate-r4.sh
+++ b/dev-libs/geoip/files/geoipupdate-r5.sh
@@ -35,6 +35,9 @@ if [ -d "${GEOIPDIR}" ]; then
 					gunzip -fdc "${TMPDIR}/${fname}.dat.gz" > "${TMPDIR}/${fname}.dat"
 					mv "${TMPDIR}/${fname}.dat" "${GEOIPDIR}/${fname}.dat"
 					chmod 0644 "${GEOIPDIR}/${fname}.dat"
+					case ${fname} in
+						GeoLite*) ln -sf ${fname}.dat `echo ${fname} | sed 's/GeoLite/GeoIP/'`.dat ;;
+					esac
 				fi
 			fi
 		done
diff --git a/dev-libs/geoip/geoip-1.6.2-r1.ebuild b/dev-libs/geoip/geoip-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..596d9395579a
--- /dev/null
+++ b/dev-libs/geoip/geoip-1.6.2-r1.ebuild
@@ -0,0 +1,51 @@
+# 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.2-r1.ebuild,v 1.1 2014/10/21 09:09:38 jer Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="easily lookup countries by IP addresses, even when Reverse DNS entries don't exist"
+HOMEPAGE="https://github.com/maxmind/geoip-api-c"
+SRC_URI="
+	https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="net-misc/wget"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-api-c-${PV}"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+	sed -e "s|@PREFIX@|${ROOT}|g" "${FILESDIR}"/geoipupdate-r5.sh > geoipupdate.sh || die
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog README* TODO
+
+	prune_libtool_files
+
+	keepdir /usr/share/GeoIP
+
+	dosbin geoipupdate.sh
+}
+
+pkg_postinst() {
+	elog "Don't forget to run the included geoipupdate.sh or geoipupdate (from"
+	elog "net-misc/geoipupdate) regularly to populate ${ROOT}/usr/share/GeoIP/"
+	elog "with geo-located IP address databases."
+}
diff --git a/dev-libs/geoip/geoip-1.6.2.ebuild b/dev-libs/geoip/geoip-1.6.2.ebuild
index 587079049ace..cb712e771f52 100644
--- a/dev-libs/geoip/geoip-1.6.2.ebuild
+++ b/dev-libs/geoip/geoip-1.6.2.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.2.ebuild,v 1.7 2014/10/18 14:17:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.6.2.ebuild,v 1.8 2014/10/21 09:09:38 jer Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -29,7 +29,7 @@ src_prepare() {
 
 src_configure() {
 	econf $(use_enable static-libs static)
-	sed -e "s|@PREFIX@|${ROOT}|g" "${FILESDIR}"/geoipupdate-r4.sh > geoipupdate.sh || die
+	sed -e "s|@PREFIX@|${ROOT}|g" "${FILESDIR}"/geoipupdate-r5.sh > geoipupdate.sh || die
 }
 
 src_install() {