[gentoo-commits] gentoo-x86 commit in dev-libs/geoip: ChangeLog geoip-1.5.1.ebuild

[gentoo-commits] gentoo-x86 commit in dev-libs/geoip: ChangeLog geoip-1.5.1.ebuild

[Jeroen Roovers (jer)]

jer         13/07/20 05:15:51

  Modified:             ChangeLog geoip-1.5.1.ebuild
  Log:
  Switch to github based releases. Clean up.
  
  (Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.188                dev-libs/geoip/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/geoip/ChangeLog?rev=1.188&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/geoip/ChangeLog?rev=1.188&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/geoip/ChangeLog?r1=1.187&r2=1.188

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- ChangeLog	10 Jun 2013 18:53:51 -0000	1.187
+++ ChangeLog	20 Jul 2013 05:15:51 -0000	1.188
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/geoip
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.187 2013/06/10 18:53:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.188 2013/07/20 05:15:51 jer Exp $
+
+  20 Jul 2013; Jeroen Roovers <jer@gentoo.org> geoip-1.5.1.ebuild:
+  Switch to github based releases. Clean up.
 
 *geoip-1.5.1 (10 Jun 2013)
 



1.2                  dev-libs/geoip/geoip-1.5.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/geoip/geoip-1.5.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/geoip/geoip-1.5.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/geoip/geoip-1.5.1.ebuild?r1=1.1&r2=1.2

Index: geoip-1.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.5.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geoip-1.5.1.ebuild	10 Jun 2013 18:53:51 -0000	1.1
+++ geoip-1.5.1.ebuild	20 Jul 2013 05:15:51 -0000	1.2
@@ -1,17 +1,17 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.5.1.ebuild,v 1.1 2013/06/10 18:53:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.5.1.ebuild,v 1.2 2013/07/20 05:15:51 jer Exp $
 
 EAPI=5
-inherit eutils
+inherit autotools eutils
 
-MY_P="${P/geoip/GeoIP}"
 GEOLITE_URI="http://geolite.maxmind.com/download/geoip/database/"
 
 DESCRIPTION="easily lookup countries by IP addresses, even when Reverse DNS entries don't exist"
 HOMEPAGE="http://dev.maxmind.com/geoip/legacy/downloadable"
 SRC_URI="
-	http://www.maxmind.com/download/geoip/api/c/${MY_P}.tar.gz
+	https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	http://geolite.maxmind.com/download/${PN}/database/GeoLiteCountry/GeoIP.dat.gz
 	${GEOLITE_URI}asnum/GeoIPASNum.dat.gz
 	city? ( ${GEOLITE_URI}GeoLiteCity.dat.gz )
 	ipv6? (
@@ -35,15 +35,21 @@
 	)
 "
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${PN}-api-c-${PV}"
 
 src_prepare() {
+	mv "${WORKDIR}"/GeoIP.dat data || die
+
 	epatch "${FILESDIR}"/${PN}-1.5.0-pkgconfig.patch
+
 	sed -e "s:usr local share GeoIP:usr share GeoIP:" \
 		-e "s:usr local etc:etc:" \
 		-i apps/geoipupdate-pureperl.pl || die
+
 	sed -e 's|yahoo.com|98.139.183.24|g' \
 		-i test/country_test_name.txt test/region_test.txt || die
+
+	eautoreconf
 }
 
 src_configure() {
@@ -52,12 +58,14 @@
 
 src_install() {
 	default
+
 	use perl-geoipupdate && dobin apps/geoipupdate-pureperl.pl
+
 	dodoc AUTHORS ChangeLog README TODO conf/GeoIP.conf.default
+
 	rm "${ED}/etc/GeoIP.conf.default"
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/lib*/lib*.la
-	fi
+
+	prune_libtool_files
 
 	insinto /usr/share/GeoIP
 	doins "${WORKDIR}/GeoIPASNum.dat"