diff options
| -rw-r--r-- | dev-libs/geoip/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/geoip/geoip-1.4.7.ebuild | 29 |
2 files changed, 21 insertions, 13 deletions
diff --git a/dev-libs/geoip/ChangeLog b/dev-libs/geoip/ChangeLog index d6e0f32c8ee7..2c97bbeb502d 100644 --- a/dev-libs/geoip/ChangeLog +++ b/dev-libs/geoip/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/geoip # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.112 2011/04/19 22:33:53 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.113 2011/05/20 12:12:25 scarabeus Exp $ + + 20 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> geoip-1.4.7.ebuild: + Bump eapi and drop useless inherit. Punt the .la file. *geoip-1.4.7 (19 Apr 2011) diff --git a/dev-libs/geoip/geoip-1.4.7.ebuild b/dev-libs/geoip/geoip-1.4.7.ebuild index 98813522d30c..52f7fff483ae 100644 --- a/dev-libs/geoip/geoip-1.4.7.ebuild +++ b/dev-libs/geoip/geoip-1.4.7.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.7.ebuild,v 1.1 2011/04/19 22:33:53 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.7.ebuild,v 1.2 2011/05/20 12:12:25 scarabeus Exp $ -EAPI=2 +EAPI=4 -inherit autotools-utils libtool +inherit libtool MY_P=${P/geoip/GeoIP} -MY_P=${MY_P/_} + DESCRIPTION="easily lookup countries by IP addresses, even when Reverse DNS entries don't exist" HOMEPAGE="http://www.maxmind.com/geoip/api/c.shtml" SRC_URI="http://www.maxmind.com/download/geoip/api/c/${MY_P}.tar.gz" @@ -19,14 +19,19 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86- IUSE="perl-geoipupdate static-libs" DEPEND="" -RDEPEND="perl-geoipupdate? ( dev-perl/PerlIO-gzip - dev-perl/libwww-perl )" +RDEPEND=" + perl-geoipupdate? ( + dev-perl/PerlIO-gzip + dev-perl/libwww-perl + ) +" S=${WORKDIR}/${MY_P} src_prepare() { sed -e "s:usr local share GeoIP:usr share GeoIP:" \ - -e "s:usr local etc:etc:" -i apps/geoipupdate-pureperl.pl + -e "s:usr local etc:etc:" \ + -i apps/geoipupdate-pureperl.pl || die elibtoolize # FreeBSD requires this } @@ -36,9 +41,9 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - use perl-geoipupdate && { dobin apps/geoipupdate-pureperl.pl || die; } - dodoc AUTHORS ChangeLog README TODO conf/GeoIP.conf.default || die - rm "${D}/etc/GeoIP.conf.default" - use static-libs || remove_libtool_files + default + use perl-geoipupdate && dobin apps/geoipupdate-pureperl.pl + dodoc AUTHORS ChangeLog README TODO conf/GeoIP.conf.default + rm "${ED}/etc/GeoIP.conf.default" + find "${ED}" -name '*.la' -delete } |