Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libmaxminddb/
Date: Mon, 03 May 2021 16:49:17
Message-Id: 1620060541.5086d8b803903cfb72af61066a76c23f7a955c92.sam@gentoo
1 commit: 5086d8b803903cfb72af61066a76c23f7a955c92
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 2 07:17:03 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon May 3 16:49:01 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5086d8b8
7
8 dev-libs/libmaxminddb: use live ebuild template
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild | 22 +++++++++++++++++++---
13 dev-libs/libmaxminddb/libmaxminddb-9999.ebuild | 20 ++++++++++++++++----
14 2 files changed, 35 insertions(+), 7 deletions(-)
15
16 diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild
17 index c0672dead58..2428e17f254 100644
18 --- a/dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild
19 +++ b/dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild
20 @@ -7,11 +7,17 @@ inherit toolchain-funcs
21
22 DESCRIPTION="C library for the MaxMind DB file format"
23 HOMEPAGE="https://github.com/maxmind/libmaxminddb"
24 -SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz"
25 +if [[ ${PV} == *9999 ]] ; then
26 + EGIT_REPO_URI="https://github.com/maxmind/libmaxminddb.git"
27 + inherit autotools git-r3
28 +else
29 + SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz"
30 +
31 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
32 +fi
33
34 LICENSE="Apache-2.0"
35 SLOT="0/0.0.7"
36 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
37 IUSE="test"
38 RESTRICT="!test? ( test )"
39
40 @@ -19,12 +25,22 @@ DEPEND="test? ( dev-perl/IPC-Run3 )"
41
42 DOCS=( Changes.md )
43
44 +src_prepare() {
45 + default
46 +
47 + if [[ ${PV} == *9999 ]] ; then
48 + eautoreconf
49 + fi
50 +}
51 +
52 src_configure() {
53 - econf --disable-static
54 tc-export AR CC
55 +
56 + econf --disable-static
57 }
58
59 src_install() {
60 default
61 +
62 find "${ED}" -name '*.la' -delete || die
63 }
64
65 diff --git a/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild b/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild
66 index 455b8716649..2428e17f254 100644
67 --- a/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild
68 +++ b/dev-libs/libmaxminddb/libmaxminddb-9999.ebuild
69 @@ -3,11 +3,18 @@
70
71 EAPI=7
72
73 -inherit autotools toolchain-funcs git-r3
74 +inherit toolchain-funcs
75
76 DESCRIPTION="C library for the MaxMind DB file format"
77 HOMEPAGE="https://github.com/maxmind/libmaxminddb"
78 -EGIT_REPO_URI="https://github.com/maxmind/libmaxminddb.git"
79 +if [[ ${PV} == *9999 ]] ; then
80 + EGIT_REPO_URI="https://github.com/maxmind/libmaxminddb.git"
81 + inherit autotools git-r3
82 +else
83 + SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz"
84 +
85 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
86 +fi
87
88 LICENSE="Apache-2.0"
89 SLOT="0/0.0.7"
90 @@ -20,15 +27,20 @@ DOCS=( Changes.md )
91
92 src_prepare() {
93 default
94 - eautoreconf
95 +
96 + if [[ ${PV} == *9999 ]] ; then
97 + eautoreconf
98 + fi
99 }
100
101 src_configure() {
102 - econf --disable-static
103 tc-export AR CC
104 +
105 + econf --disable-static
106 }
107
108 src_install() {
109 default
110 +
111 find "${ED}" -name '*.la' -delete || die
112 }