| 1 |
commit: 910b07df93db62c0a48ee5cbaa865e7ded05a976 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 8 05:13:09 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 8 05:13:18 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=910b07df |
| 7 |
|
| 8 |
dev-db/postgis: update EAPI 6 -> 7 (sync live ebuild) |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-db/postgis/postgis-9999.ebuild | 22 +++++++++++++--------- |
| 13 |
1 file changed, 13 insertions(+), 9 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-db/postgis/postgis-9999.ebuild b/dev-db/postgis/postgis-9999.ebuild |
| 16 |
index 8325204434e1..298c281eae44 100644 |
| 17 |
--- a/dev-db/postgis/postgis-9999.ebuild |
| 18 |
+++ b/dev-db/postgis/postgis-9999.ebuild |
| 19 |
@@ -1,11 +1,11 @@ |
| 20 |
# Copyright 1999-2021 Gentoo Authors |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
-EAPI=6 |
| 24 |
+EAPI=7 |
| 25 |
|
| 26 |
-POSTGRES_COMPAT=( 9.6 {10..12} ) |
| 27 |
+POSTGRES_COMPAT=( 9.6 {10..14} ) |
| 28 |
POSTGRES_USEDEP="server" |
| 29 |
-inherit autotools eapi7-ver postgres-multi |
| 30 |
+inherit autotools postgres-multi toolchain-funcs |
| 31 |
|
| 32 |
MY_P="${PN}-$(ver_rs 3 '')" |
| 33 |
|
| 34 |
@@ -25,9 +25,9 @@ S="${WORKDIR}/${MY_P}" |
| 35 |
|
| 36 |
LICENSE="GPL-2" |
| 37 |
SLOT="0" |
| 38 |
-IUSE="address-standardizer doc gtk static-libs test topology" |
| 39 |
+IUSE="address-standardizer doc gtk static-libs topology" |
| 40 |
|
| 41 |
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}" |
| 42 |
+REQUIRED_USE="${POSTGRES_REQ_USE}" |
| 43 |
|
| 44 |
# Needs a running psql instance, doesn't work out of the box |
| 45 |
RESTRICT="test" |
| 46 |
@@ -36,7 +36,7 @@ RDEPEND="${POSTGRES_DEP} |
| 47 |
dev-libs/json-c:= |
| 48 |
dev-libs/libxml2:2 |
| 49 |
dev-libs/protobuf-c:= |
| 50 |
- >=sci-libs/geos-3.6.0 |
| 51 |
+ >=sci-libs/geos-3.9.0 |
| 52 |
>=sci-libs/proj-4.9.0:= |
| 53 |
>=sci-libs/gdal-1.10.0:= |
| 54 |
address-standardizer? ( dev-libs/libpcre ) |
| 55 |
@@ -50,10 +50,13 @@ DEPEND="${RDEPEND} |
| 56 |
dev-libs/libxslt |
| 57 |
virtual/imagemagick-tools[png] |
| 58 |
) |
| 59 |
- test? ( dev-util/cunit ) |
| 60 |
" |
| 61 |
|
| 62 |
-PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" ) |
| 63 |
+PATCHES=( |
| 64 |
+ "${FILESDIR}/${PN}-2.2.0-arflags.patch" |
| 65 |
+ "${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch" |
| 66 |
+ "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch" |
| 67 |
+) |
| 68 |
|
| 69 |
src_prepare() { |
| 70 |
default |
| 71 |
@@ -78,8 +81,9 @@ src_prepare() { |
| 72 |
} |
| 73 |
|
| 74 |
src_configure() { |
| 75 |
+ export CPP=$(tc-getCPP) |
| 76 |
+ |
| 77 |
local myeconfargs=( |
| 78 |
- --with-protobuf # funky misdetection if enabled but --without-protobuf |
| 79 |
$(use_with address-standardizer) |
| 80 |
$(use_with gtk gui) |
| 81 |
$(use_with topology) |
Archives