| 1 |
commit: 4a4e58cd2b9afd8e1281abeb4d2c5cce18ec1e13 |
| 2 |
Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Jan 7 00:19:20 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 7 01:33:25 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a4e58cd |
| 7 |
|
| 8 |
dev-libs/libmaxminddb: revert to autoconf, add test dep |
| 9 |
|
| 10 |
cmake build is incomplete (lacks man pages, pkgconfig, .so.0 symlink) |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/764167 |
| 13 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
| 14 |
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com> |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
dev-libs/libmaxminddb/Manifest | 1 - |
| 18 |
...b-1.5.0.ebuild => libmaxminddb-1.5.0-r1.ebuild} | 22 ++++++++++++---------- |
| 19 |
2 files changed, 12 insertions(+), 11 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest |
| 22 |
index 7e4e6a3fe44..099eafa997e 100644 |
| 23 |
--- a/dev-libs/libmaxminddb/Manifest |
| 24 |
+++ b/dev-libs/libmaxminddb/Manifest |
| 25 |
@@ -1,3 +1,2 @@ |
| 26 |
DIST libmaxminddb-1.4.3.tar.gz 602272 BLAKE2B 2974d7268201a906c1c478ee36d4ef61e5f7483fd4f91bfcc5bf92f5bc698e8dd9eef256cceeb8c3217054481827d6fbf075f479e76c6506cc1f31d707a7d9dd SHA512 7fd97678ea6ca41cc4530864276b0233acbb16208571dc4694902943b3aa7e97c683c5676ea3f2de948c67aebd083f5d073b9ae36b7e89059c17f797ffddf65e |
| 27 |
-DIST libmaxminddb-1.5.0-test-data.tar.gz 244033 BLAKE2B b4d138ef8eb4b8eb78fcc42bf99eccb0336736ce27a8c639458b2f089d5fb6cbeb429860eae35333672ec7f9073db3843461f6470574035d9f7dc115e0ee3c26 SHA512 0c0773dde72e37955239e1f160ad22f60779e4752a10e0df0ab7697b7ca6df83547a85bc440e6643867055db0bbcbc9bbbf056e66fc688d24eb09ee1a1688c73 |
| 28 |
DIST libmaxminddb-1.5.0.tar.gz 603923 BLAKE2B 07c18f759a2d437d95be513d6dc3aaddd5dcd6f7201fdd7eba0f035c5a3221344f1e5e44253c0efdc2690cfffc5cecdaa9befed8d69f6f0ebd33588b3805443d SHA512 68c769f247156869b84a8ad0f9deec3cb79d39c0a6b8f1458461c223b9cf9967dd9d697ff4e92ac28216ef9e9f5a94908e03f76a5f70ab17636b163c17d2d432 |
| 29 |
|
| 30 |
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.5.0.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.5.0-r1.ebuild |
| 31 |
similarity index 58% |
| 32 |
rename from dev-libs/libmaxminddb/libmaxminddb-1.5.0.ebuild |
| 33 |
rename to dev-libs/libmaxminddb/libmaxminddb-1.5.0-r1.ebuild |
| 34 |
index ef1cc58dee2..45742bc23d7 100644 |
| 35 |
--- a/dev-libs/libmaxminddb/libmaxminddb-1.5.0.ebuild |
| 36 |
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.5.0-r1.ebuild |
| 37 |
@@ -3,28 +3,30 @@ |
| 38 |
|
| 39 |
EAPI=7 |
| 40 |
|
| 41 |
-inherit cmake |
| 42 |
+inherit toolchain-funcs |
| 43 |
|
| 44 |
-TEST_COMMIT="39431da7fb6834c0cbe0c70a81074e65299dece7" |
| 45 |
DESCRIPTION="C library for the MaxMind DB file format" |
| 46 |
HOMEPAGE="https://github.com/maxmind/libmaxminddb" |
| 47 |
SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz" |
| 48 |
-SRC_URI+=" test? ( https://github.com/maxmind/MaxMind-DB/archive/${TEST_COMMIT}.tar.gz -> ${P}-test-data.tar.gz )" |
| 49 |
|
| 50 |
LICENSE="Apache-2.0" |
| 51 |
SLOT="0/0.0.7" |
| 52 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" |
| 53 |
IUSE="test" |
| 54 |
-# Out of date test data shipped |
| 55 |
-RESTRICT="test" |
| 56 |
+RESTRICT="!test? ( test )" |
| 57 |
+ |
| 58 |
+DEPEND=" |
| 59 |
+ test? ( dev-perl/IPC-Run3 ) |
| 60 |
+" |
| 61 |
|
| 62 |
DOCS=( Changes.md ) |
| 63 |
|
| 64 |
src_configure() { |
| 65 |
- local mycmakeargs=( |
| 66 |
- -DBUILD_SHARED_LIBS=ON |
| 67 |
- -DBUILD_TESTING=$(usex test) |
| 68 |
- ) |
| 69 |
+ econf --disable-static |
| 70 |
+ tc-export AR CC |
| 71 |
+} |
| 72 |
|
| 73 |
- cmake_src_configure |
| 74 |
+src_install() { |
| 75 |
+ default |
| 76 |
+ find "${ED}" -name '*.la' -delete || die |
| 77 |
} |
Archives