From 95b87afd17564bbf4939fb48be8b5478b45bd930 Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Sat, 14 Jun 2014 01:27:30 +0000
Subject: Add a prefix to the GeoIP datadir.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
---
 dev-libs/geoip/ChangeLog               |  8 +++++-
 dev-libs/geoip/files/geoipupdate-r3.sh |  2 +-
 dev-libs/geoip/geoip-1.6.0-r2.ebuild   | 48 ---------------------------------
 dev-libs/geoip/geoip-1.6.0-r3.ebuild   | 49 ++++++++++++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 50 deletions(-)
 delete mode 100644 dev-libs/geoip/geoip-1.6.0-r2.ebuild
 create mode 100644 dev-libs/geoip/geoip-1.6.0-r3.ebuild

(limited to 'dev-libs')

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-r2.ebuild
deleted file mode 100644
index 1c3ac48854ad..000000000000
--- a/dev-libs/geoip/geoip-1.6.0-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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 $
-
-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 ~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)
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog README* TODO
-
-	prune_libtool_files
-
-	keepdir /usr/share/GeoIP
-
-	newsbin "${FILESDIR}"/geoipupdate-r3.sh geoipupdate.sh
-}
-
-pkg_postinst() {
-	"${ROOT}"/usr/sbin/geoipupdate.sh --force
-}
diff --git a/dev-libs/geoip/geoip-1.6.0-r3.ebuild b/dev-libs/geoip/geoip-1.6.0-r3.ebuild
new file mode 100644
index 000000000000..a77b9a2278c2
--- /dev/null
+++ b/dev-libs/geoip/geoip-1.6.0-r3.ebuild
@@ -0,0 +1,49 @@
+# 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-r3.ebuild,v 1.1 2014/06/14 01:27:30 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 ~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-r3.sh > geoipupdate.sh || die
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog README* TODO
+
+	prune_libtool_files
+
+	keepdir /usr/share/GeoIP
+
+	dosbin geoipupdate.sh
+}
+
+pkg_postinst() {
+	"${ROOT}"/usr/sbin/geoipupdate.sh --force
+}
-- 
cgit v1.2.3-65-gdbad