From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C615E1382C5 for ; Wed, 10 Mar 2021 01:24:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53B3CE086F; Wed, 10 Mar 2021 01:24:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3DFE0E086F for ; Wed, 10 Mar 2021 01:24:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4BC2D340D33 for ; Wed, 10 Mar 2021 01:24:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C2865B9 for ; Wed, 10 Mar 2021 01:24:25 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1615338892.3e4b6af2825b3d18187474d53890a0ccba72bce6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/geoip/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/geoip/geoip-1.6.12.ebuild X-VCS-Directories: dev-libs/geoip/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3e4b6af2825b3d18187474d53890a0ccba72bce6 X-VCS-Branch: master Date: Wed, 10 Mar 2021 01:24:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 25c98eda-0147-442a-88f1-8e313dafc9a6 X-Archives-Hash: e875ac14a0924c63e4007afad5aa071e commit: 3e4b6af2825b3d18187474d53890a0ccba72bce6 Author: Sam James gentoo org> AuthorDate: Wed Mar 10 01:14:29 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Mar 10 01:14:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e4b6af2 dev-libs/geoip: update EAPI 6 -> 7, fix invalid ROOT usage Signed-off-by: Sam James gentoo.org> dev-libs/geoip/geoip-1.6.12.ebuild | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dev-libs/geoip/geoip-1.6.12.ebuild b/dev-libs/geoip/geoip-1.6.12.ebuild index 2f5ee8e5606..8d3acd5e9c6 100644 --- a/dev-libs/geoip/geoip-1.6.12.ebuild +++ b/dev-libs/geoip/geoip-1.6.12.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils ltprune +EAPI=7 + +inherit autotools DESCRIPTION="GeoIP Legacy C API" 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 -" +SRC_URI="https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-api-c-${PV}" # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db LICENSE="LGPL-2.1 GPL-2 MaxMind2" @@ -17,24 +17,17 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd IUSE="static-libs" RESTRICT="test" -DEPEND=" - net-misc/wget -" -RDEPEND=" - ${DEPEND} -" - -S="${WORKDIR}/${PN}-api-c-${PV}" +DEPEND="net-misc/wget" +RDEPEND="${DEPEND}" src_prepare() { default - eautoreconf } src_configure() { econf $(use_enable static-libs static) - sed -e "s|@PREFIX@|${ROOT}|g" "${FILESDIR}"/geoipupdate-r6.sh > geoipupdate.sh || die + sed -e "s|@PREFIX@|${EPREFIX}|g" "${FILESDIR}"/geoipupdate-r6.sh > geoipupdate.sh || die } src_install() { @@ -42,7 +35,7 @@ src_install() { dodoc AUTHORS ChangeLog NEWS.md README* - prune_libtool_files + find "${ED}" -name '*.la' -delete || die keepdir /usr/share/GeoIP @@ -52,6 +45,6 @@ src_install() { pkg_postinst() { ewarn "WARNING: Databases are no longer installed by this ebuild." elog "Don't forget to run 'geoipupdate.sh -f' (or geoipupdate from" - elog "net-misc/geoipupdate) to populate ${ROOT}/usr/share/GeoIP/" + elog "net-misc/geoipupdate) to populate ${EROOT}/usr/share/GeoIP/" elog "with geo-located IP address databases." }