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 5450B13835A for ; Mon, 3 May 2021 16:49:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8ECD4E0876; Mon, 3 May 2021 16:49:16 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 780AEE0876 for ; Mon, 3 May 2021 16:49:16 +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 258ED340B53 for ; Mon, 3 May 2021 16:49:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B2708743 for ; Mon, 3 May 2021 16:49:13 +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: <1620060541.5086d8b803903cfb72af61066a76c23f7a955c92.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libmaxminddb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild dev-libs/libmaxminddb/libmaxminddb-9999.ebuild X-VCS-Directories: dev-libs/libmaxminddb/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5086d8b803903cfb72af61066a76c23f7a955c92 X-VCS-Branch: master Date: Mon, 3 May 2021 16:49:13 +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: 3a0e14d2-5b54-4fad-a1e2-e22edf01b243 X-Archives-Hash: b1613281a651e5daa36c4c5a52d46577 commit: 5086d8b803903cfb72af61066a76c23f7a955c92 Author: Sam James gentoo org> AuthorDate: Sun May 2 07:17:03 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon May 3 16:49:01 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5086d8b8 dev-libs/libmaxminddb: use live ebuild template Signed-off-by: Sam James gentoo.org> dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild | 22 +++++++++++++++++++--- dev-libs/libmaxminddb/libmaxminddb-9999.ebuild | 20 ++++++++++++++++---- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild index c0672dead58..2428e17f254 100644 --- a/dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild +++ b/dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild @@ -7,11 +7,17 @@ inherit toolchain-funcs DESCRIPTION="C library for the MaxMind DB file format" HOMEPAGE="https://github.com/maxmind/libmaxminddb" -SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz" +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/maxmind/libmaxminddb.git" + inherit autotools git-r3 +else + SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +fi LICENSE="Apache-2.0" SLOT="0/0.0.7" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" @@ -19,12 +25,22 @@ DEPEND="test? ( dev-perl/IPC-Run3 )" DOCS=( Changes.md ) +src_prepare() { + default + + if [[ ${PV} == *9999 ]] ; then + eautoreconf + fi +} + src_configure() { - econf --disable-static tc-export AR CC + + econf --disable-static } src_install() { default + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild b/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild index 455b8716649..2428e17f254 100644 --- a/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild +++ b/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild @@ -3,11 +3,18 @@ EAPI=7 -inherit autotools toolchain-funcs git-r3 +inherit toolchain-funcs DESCRIPTION="C library for the MaxMind DB file format" HOMEPAGE="https://github.com/maxmind/libmaxminddb" -EGIT_REPO_URI="https://github.com/maxmind/libmaxminddb.git" +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/maxmind/libmaxminddb.git" + inherit autotools git-r3 +else + SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +fi LICENSE="Apache-2.0" SLOT="0/0.0.7" @@ -20,15 +27,20 @@ DOCS=( Changes.md ) src_prepare() { default - eautoreconf + + if [[ ${PV} == *9999 ]] ; then + eautoreconf + fi } src_configure() { - econf --disable-static tc-export AR CC + + econf --disable-static } src_install() { default + find "${ED}" -name '*.la' -delete || die }