Old.

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

6 files changed, 6 insertions, 192 deletions

diff --git a/dev-libs/geoip/ChangeLog b/dev-libs/geoip/ChangeLog
index 79c2e97de71e..2a668732a1d1 100644
--- a/dev-libs/geoip/ChangeLog
+++ b/dev-libs/geoip/ChangeLog
@@ -1,6 +1,11 @@
 # 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.233 2014/11/02 09:02:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.234 2014/11/02 20:19:43 jer Exp $
+
+  02 Nov 2014; Jeroen Roovers <jer@gentoo.org> -geoip-1.6.0-r1.ebuild,
+  -geoip-1.6.0-r3.ebuild, -files/geoipupdate-r2.sh, -files/geoipupdate-r3.sh,
+  metadata.xml:
+  Old.
 
   02 Nov 2014; Agostino Sarubbo <ago@gentoo.org> geoip-1.6.2.ebuild:
   Stable for alpha, wrt bug #523034
diff --git a/dev-libs/geoip/files/geoipupdate-r2.sh b/dev-libs/geoip/files/geoipupdate-r2.sh
deleted file mode 100755
index 5c6a55e10762..000000000000
--- a/dev-libs/geoip/files/geoipupdate-r2.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-GEOIP_MIRROR="https://geolite.maxmind.com/download/geoip/database"
-GEOIPDIR=/usr/share/GeoIP
-TMPDIR=
-
-DATABASES="GeoLiteCity GeoLiteCountry/GeoIP asnum/GeoIPASNum GeoIPv6 GeoLiteCityv6-beta/GeoLiteCityv6"
-
-if [ -d "${GEOIPDIR}" ]; then
-	cd $GEOIPDIR
-	if [ -n "${DATABASES}" ]; then
-		TMPDIR=$(mktemp -d geoipupdate.XXXXXXXXXX)
-
-		echo "Updating GeoIP databases..."
-
-		for db in $DATABASES; do
-			fname=$(basename $db)
-
-			if [ -f "${GEOIPDIR}/${fname}.dat" ]; then
-				wget --no-verbose -t 3 -T 60 \
-					"${GEOIP_MIRROR}/${db}.dat.gz" \
-					-O "${TMPDIR}/${fname}.dat.gz"
-				if [ $? -eq 0 ]; then
-					gunzip -fdc "${TMPDIR}/${fname}.dat.gz" > "${TMPDIR}/${fname}.dat"
-					mv "${TMPDIR}/${fname}.dat" "${GEOIPDIR}/${fname}.dat"
-					chmod 0644 "${GEOIPDIR}/${fname}.dat"
-				fi
-			fi
-		done
-		[ -d "${TMPDIR}" ] && rm -rf $TMPDIR
-	fi
-fi
-
diff --git a/dev-libs/geoip/files/geoipupdate-r3.sh b/dev-libs/geoip/files/geoipupdate-r3.sh
deleted file mode 100755
index 951591616a30..000000000000
--- a/dev-libs/geoip/files/geoipupdate-r3.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-GEOIP_MIRROR="https://geolite.maxmind.com/download/geoip/database"
-GEOIPDIR=@PREFIX@/usr/share/GeoIP
-TMPDIR=
-
-DATABASES="GeoLiteCity GeoLiteCountry/GeoIP asnum/GeoIPASNum GeoIPv6 GeoLiteCityv6-beta/GeoLiteCityv6"
-
-if [ "${1}" = -f ] || [ "${1}" = --force ]; then
-	force=true
-fi
-
-if [ -d "${GEOIPDIR}" ]; then
-	cd $GEOIPDIR
-	if [ -n "${DATABASES}" ]; then
-		TMPDIR=$(mktemp -d geoipupdate.XXXXXXXXXX)
-
-		echo "Updating GeoIP databases..."
-
-		for db in $DATABASES; do
-			fname=$(basename $db)
-
-			if [ -f "${GEOIPDIR}/${fname}.dat" ] || [ ${force} ]; then
-				wget --no-verbose -t 3 -T 60 \
-					"${GEOIP_MIRROR}/${db}.dat.gz" \
-					-O "${TMPDIR}/${fname}.dat.gz"
-				if [ $? -eq 0 ]; then
-					gunzip -fdc "${TMPDIR}/${fname}.dat.gz" > "${TMPDIR}/${fname}.dat"
-					mv "${TMPDIR}/${fname}.dat" "${GEOIPDIR}/${fname}.dat"
-					chmod 0644 "${GEOIPDIR}/${fname}.dat"
-				fi
-			fi
-		done
-		[ -d "${TMPDIR}" ] && rm -rf $TMPDIR
-	fi
-fi
diff --git a/dev-libs/geoip/geoip-1.6.0-r1.ebuild b/dev-libs/geoip/geoip-1.6.0-r1.ebuild
deleted file mode 100644
index d9b4d2701ad4..000000000000
--- a/dev-libs/geoip/geoip-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,66 +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-r1.ebuild,v 1.18 2014/09/04 01:10:13 blueness Exp $
-
-EAPI=5
-inherit autotools eutils
-
-GEOLITE_URI="https://geolite.maxmind.com/download/geoip/database/"
-
-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
-	${GEOLITE_URI}GeoLiteCountry/GeoIP.dat.gz
-	${GEOLITE_URI}asnum/GeoIPASNum.dat.gz
-	city? ( ${GEOLITE_URI}GeoLiteCity.dat.gz )
-	ipv6? (
-		${GEOLITE_URI}GeoIPv6.dat.gz
-		city? ( ${GEOLITE_URI}GeoLiteCityv6-beta/GeoLiteCityv6.dat.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="city ipv6 static-libs"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-api-c-${PV}"
-
-src_prepare() {
-	sed -e 's|yahoo.com|98.139.183.24|g' \
-		-i test/country_test_name.txt test/region_test.txt || die
-
-	# used in src_test() (bug #494650):
-	mkdir data/ || die
-	cp "${WORKDIR}"/GeoIP.dat data/ || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog README* TODO
-
-	prune_libtool_files
-
-	insinto /usr/share/GeoIP
-	doins "${WORKDIR}"/{GeoIP,GeoIPASNum}.dat
-	use city && newins "${WORKDIR}"/GeoLiteCity.dat GeoIPCity.dat
-
-	if use ipv6; then
-		doins "${WORKDIR}/GeoIPv6.dat"
-		use city && newins "${WORKDIR}"/GeoLiteCityv6.dat GeoIPCityv6.dat
-	fi
-
-	newsbin "${FILESDIR}/geoipupdate-r2.sh" geoipupdate.sh
-}
diff --git a/dev-libs/geoip/geoip-1.6.0-r3.ebuild b/dev-libs/geoip/geoip-1.6.0-r3.ebuild
deleted file mode 100644
index d86248d902bd..000000000000
--- a/dev-libs/geoip/geoip-1.6.0-r3.ebuild
+++ /dev/null
@@ -1,53 +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-r3.ebuild,v 1.3 2014/09/04 01:10:13 blueness 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-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
-}
-
-pkg_prerm() {
-	[[ -z "${REPLACED_BY_VERSION}" ]] && rm -f "${ROOT}"/usr/share/GeoIP/*.dat
-}
diff --git a/dev-libs/geoip/metadata.xml b/dev-libs/geoip/metadata.xml
index 4c687978da1d..03aa50bab7e3 100644
--- a/dev-libs/geoip/metadata.xml
+++ b/dev-libs/geoip/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<use>
-	<flag name='city'>Install the city based IP address database</flag>
-</use>
 </pkgmetadata>