summaryrefslogtreecommitdiff
path: root/dev-db/postgis
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-12-22 14:08:05 +0000
committerV3n3RiX <venerix@koprulu.sector>2021-12-22 14:08:05 +0000
commit93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
treeb9791a06ab3284e27b568412c59316c66240c682 /dev-db/postgis
parent2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)
gentoo resync : 22.12.2021
Diffstat (limited to 'dev-db/postgis')
-rw-r--r--dev-db/postgis/Manifest16
-rw-r--r--dev-db/postgis/postgis-3.0.3-r3.ebuild (renamed from dev-db/postgis/postgis-3.0.3-r2.ebuild)2
-rw-r--r--dev-db/postgis/postgis-3.0.4-r1.ebuild (renamed from dev-db/postgis/postgis-3.0.4.ebuild)2
-rw-r--r--dev-db/postgis/postgis-3.1.0-r1.ebuild (renamed from dev-db/postgis/postgis-3.1.0.ebuild)2
-rw-r--r--dev-db/postgis/postgis-3.1.1-r1.ebuild (renamed from dev-db/postgis/postgis-3.1.1.ebuild)2
-rw-r--r--dev-db/postgis/postgis-3.1.3.ebuild2
-rw-r--r--dev-db/postgis/postgis-3.2.0.ebuild (renamed from dev-db/postgis/postgis-3.2.0_beta1.ebuild)0
-rw-r--r--dev-db/postgis/postgis-9999.ebuild22
8 files changed, 26 insertions, 22 deletions
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index f6e53855b030..b98ec6bff9e2 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -9,14 +9,14 @@ DIST postgis-3.1.1.tar.gz 17261826 BLAKE2B a14bdce3773f8cc50c72880d9b8158c32b546
DIST postgis-3.1.2.tar.gz 17266501 BLAKE2B acc65e3ab70667c57a71bcb9c7bbfc382f8a6038ceb0e91aac07e36fb6b4cb6365aa968b30af13eda8292410cc1b567d871970e6cb7dfaadb454147224f9b834 SHA512 df9d2fa118987e29acd635912a708e643770ad3df82c098f8129f11ab07a9eafde969302d2d2e59a68fea6fc7312fe768a231dd4cb5de7002c418725da75848a
DIST postgis-3.1.3.tar.gz 17273487 BLAKE2B 603be66476037fca5e75b00079a26b4beaa50f0af0626f89660f17da398576d929574cb363c4177877d9c8db5459f7eac964b85796cd93b0d0c6ff2462d7ad3f SHA512 525c982de6b5888d1f4a4f6d2cca5dfa945d8899d8038b1d62ce222e0149c4ab26a2a3602bb8c85e89ce22b3d5b20d278fc4f841144f4b0d19e6de4f48d819ad
DIST postgis-3.1.4.tar.gz 17269391 BLAKE2B 6070fb72c777f8baf9c520ec51cf436837fffb54f21af5b4cf800940240f2fb9fcee162b2d3817cbfd4e60c2cef37eb4cf902d9e9f065e537d8d9b8ec965bef3 SHA512 afd84b45b146bdae310580fc9f8a878dd658f9e74f99c41f5d143f32974d5f5017ab4190855dcaea915a31ac2a78d34bf5561f206965264de3252f2c2ac57683
-DIST postgis-3.2.0beta1.tar.gz 17061095 BLAKE2B 09f9bef789c45145b95c75aa747fa4bbc5ae93de423ca280c8559a484963272b170b0113e1e55ab3395c26094c1f35848d024326b2eb325ed3e176ddf17b1ab8 SHA512 7dbf2086baae792a80944477afe9d77a4094e2003ba432ab964d6c2e16f36b95a17b1cb4d977e16908245374b3f132ed27fce485b96635440b1ca626189f84be
-EBUILD postgis-3.0.3-r2.ebuild 3373 BLAKE2B f343d54a11b140d87d811337aaba6c2224a7822f158285273d83db7fd7e2e34570760e92efcec9a1220e2e938f3af07f525800406925b5acd51fd2317cc95335 SHA512 6a6e2e25b80a8b4dbc5dd342abcf8ca0af46c6b83d0d6f66f9d30ed01213de5664da47c90cd57a6e2f0985eed4a3a06634e78c94a536d5ca8a04e9e70121e62d
-EBUILD postgis-3.0.4.ebuild 3382 BLAKE2B 5a47a8597294133f9c7448f4af04cc38351c64c7a4ebcaf74e69ed5ad5beb094d79ea269a45171cc7e7a7b21485536c0a237d539979b821f76699543c8840849 SHA512 1813d3a8bff65838e9e2ba7cfcdc460de23311ae6cebf419f30c50a9bec983b933e5e6557e993b8365f19632c67d9d96753dac612f901cb76a7a56705a729e44
-EBUILD postgis-3.1.0.ebuild 3318 BLAKE2B 8433965a9d7536d4909fc18eb09bf74718e94854b272b4ef7d660eb8d5114f28b6aca877c2995f56fb4d3bc0ab71e892f9610bd34dfe9b527338d77ec811f27d SHA512 3e1ddce90bd260bf582844e3464c3a9b926e98d6d584f7b4d52c0351d201c71d71eea87add34b60378ace025f739ed758cc4ea4a75f48a662958ff3ee0d51b7c
-EBUILD postgis-3.1.1.ebuild 3320 BLAKE2B 52426df4505ad116cc33c1122b8b37329a0620d66fda9c8499caaf0571953f775c429a44f8d95a2fbb14b30744e8e761b206a2bd081805b181ffd7716c768351 SHA512 2a02d20a6b63148258cf82936d4d867307c3c527ce8133605e360dfab8166fdf00889b850daff0b7ce0144da2b22b63be792521174ef52967f762bb2352ce487
+DIST postgis-3.2.0.tar.gz 16884722 BLAKE2B 118ae754199521e46508b404275bfe323465e5543ad8351d3dec3582800f6c475c30333b35ad48aac373f9d8e3875790c58858f638ee4ecb7465764703d07d40 SHA512 b49b2fbb88ec07981c0fd05400ad807e85553164023a4b47326c21f48b4e07827a183676c497ad6823dc3a6b97518e1d40906826b8a91739c96966d62858b2b5
+EBUILD postgis-3.0.3-r3.ebuild 3368 BLAKE2B ea576ee75bcd2c934d6f3768d365aae86440cd2b79afb474be3a7d4b4877aabe15a5e9c928cfb86c07c5231fcf0fc3eec5a4af56551c4696e9dad992bd8935d9 SHA512 4c526cfd36822beb4fb022e23081b7571a7d3e74241d53baf70b45f4eeebc667c39aaf4316e9b64bb350e9abe5b78172d569a4a33e27cff86948eb4b24681b05
+EBUILD postgis-3.0.4-r1.ebuild 3377 BLAKE2B d00b0719a80b36b9ed19706b26364ee3baef85d8ad5ae8af9a2ac66915d453c35dac3157a9332f1bc1dcbaa95cd268ae2aeb77d76de9fe57ebf55507fb22ed72 SHA512 398b05fcc04eb7bf1508545e9ab460a52e904ecd3ef4a56482e3f0103e70ca1c8bd239244206a94b24196d1e7104d67bfe64f35724bb4915c0d2f090efdcbf30
+EBUILD postgis-3.1.0-r1.ebuild 3313 BLAKE2B 2be463802b2cae11d7d39d754188df9416a463a2f5d483e6d440f2e58cc48199f42f5c5d320558b83e3a655ac97bc0302b3577c6b82676e9e4a062104d6e2009 SHA512 2e11812e8c9d139f6a881ba1c65ad17064c05bc8808613287053e5bb25659e5f1b3320cdf2369e114b7d96b789a25b5889106df7e04dda543076e5cdbe16f055
+EBUILD postgis-3.1.1-r1.ebuild 3315 BLAKE2B 2e788b56cbcacafdde6779d51a6159fa3e4503db3cb033a3c8ae8fb942a57250e53f91bb686974e369acbd2eed4f9b10696b28c08842674998e5463e9f0bd4a7 SHA512 6c55fbd9dc58b1050c56d663bc74236e89c5ae2ad918b0daa5372f61b6f75dc2d4edd6028b08f016ea43c209d121db4e18d540b6d00a7258f4653c07eec40097
EBUILD postgis-3.1.2.ebuild 3320 BLAKE2B 52426df4505ad116cc33c1122b8b37329a0620d66fda9c8499caaf0571953f775c429a44f8d95a2fbb14b30744e8e761b206a2bd081805b181ffd7716c768351 SHA512 2a02d20a6b63148258cf82936d4d867307c3c527ce8133605e360dfab8166fdf00889b850daff0b7ce0144da2b22b63be792521174ef52967f762bb2352ce487
-EBUILD postgis-3.1.3.ebuild 3320 BLAKE2B 52426df4505ad116cc33c1122b8b37329a0620d66fda9c8499caaf0571953f775c429a44f8d95a2fbb14b30744e8e761b206a2bd081805b181ffd7716c768351 SHA512 2a02d20a6b63148258cf82936d4d867307c3c527ce8133605e360dfab8166fdf00889b850daff0b7ce0144da2b22b63be792521174ef52967f762bb2352ce487
+EBUILD postgis-3.1.3.ebuild 3318 BLAKE2B 8433965a9d7536d4909fc18eb09bf74718e94854b272b4ef7d660eb8d5114f28b6aca877c2995f56fb4d3bc0ab71e892f9610bd34dfe9b527338d77ec811f27d SHA512 3e1ddce90bd260bf582844e3464c3a9b926e98d6d584f7b4d52c0351d201c71d71eea87add34b60378ace025f739ed758cc4ea4a75f48a662958ff3ee0d51b7c
EBUILD postgis-3.1.4.ebuild 3320 BLAKE2B 7a9497215d6a60d732d73fe2926bfcf0d193365d9deb286d0fa873260830bd3aa84fa2d9d2a9cbaaa386a8701c61eb18d6c18e8baccb78c538ea3dfa38b55302 SHA512 21e5f5cf8733619bd8ac97cb6508eafdb9e21131e4d51c6197a7f9067c74de847614a9dba87c7e7e8498a205575978c1a24137c8774ae1f8399336a72c01d7c9
-EBUILD postgis-3.2.0_beta1.ebuild 3235 BLAKE2B e1a0130efa7bb9ae055e9f7a59f42ee888e5cd71a0bb6d5d0d18a1b8f099c48688b44e7400310b019473ed1ca35385f34802afe55a7966023687526ac8930e69 SHA512 620606ead4f1bb8d9e258e802f379ae02295062ee8373ded4d1f9d2e4c6a63c26e1853f8b20d1d33c3197cfcebd554d479ba447b945ed4595be101de300e47a7
-EBUILD postgis-9999.ebuild 3243 BLAKE2B b12d44e623a1d57bc6081b6395b85781dc2751ecaa66b854766329b11122157ceaca8ecb0d95a5924f25daf1b2bc2e28cce3487d98373b3d0e9a508ada0a3c52 SHA512 3faf7598a5f029cffe543371c44d82c0943b6672a04722b47bb4be6c6d6c320138e5a11fef38278e1a12947c9a00aeab68bde1c7e080e5e497540baa5717547e
+EBUILD postgis-3.2.0.ebuild 3235 BLAKE2B e1a0130efa7bb9ae055e9f7a59f42ee888e5cd71a0bb6d5d0d18a1b8f099c48688b44e7400310b019473ed1ca35385f34802afe55a7966023687526ac8930e69 SHA512 620606ead4f1bb8d9e258e802f379ae02295062ee8373ded4d1f9d2e4c6a63c26e1853f8b20d1d33c3197cfcebd554d479ba447b945ed4595be101de300e47a7
+EBUILD postgis-9999.ebuild 3270 BLAKE2B ba496aa8b149415cb09f1920aa3fbaf03158f6a27fb6d3fd4d699995a076f30324eafa5378409af35728e464a8878b63818664be733fdfb0fcb0293c5bda72d0 SHA512 8033a0c133105cf6b90244b984c2b0ea6c947a58c33c4878ee0a66d8677aef832ebbd5c4097197afdef533e1200f6fe17ab5044dab9997d2f628f66d963e1539
MISC metadata.xml 683 BLAKE2B c8f073c0062a603f415def147e6beaa4490bd816a5a1896bd1765495d4458af7fb18a324d22af3a7a0a0769f70b8ee1a3b2c3b9ed24d372b1b40fabccd94bd46 SHA512 1d4048815dfd9283745bda6df457906b1a9a14188de595b5ac13785e2e97158a435ad6996a1248946da9eab12057dbc22b4285c832343cb1a2b6f2a206174920
diff --git a/dev-db/postgis/postgis-3.0.3-r2.ebuild b/dev-db/postgis/postgis-3.0.3-r3.ebuild
index 9fc6b071313d..46ce4ab7088a 100644
--- a/dev-db/postgis/postgis-3.0.3-r2.ebuild
+++ b/dev-db/postgis/postgis-3.0.3-r3.ebuild
@@ -37,7 +37,7 @@ RDEPEND="${POSTGRES_DEP}
dev-libs/libxml2:2
dev-libs/protobuf-c:=
>=sci-libs/geos-3.6.0
- >=sci-libs/proj-4.9.0:=
+ <sci-libs/proj-8:=
>=sci-libs/gdal-1.10.0:=
address-standardizer? ( dev-libs/libpcre )
gtk? ( x11-libs/gtk+:2 )
diff --git a/dev-db/postgis/postgis-3.0.4.ebuild b/dev-db/postgis/postgis-3.0.4-r1.ebuild
index ec0647eb354f..5fe9cead1a13 100644
--- a/dev-db/postgis/postgis-3.0.4.ebuild
+++ b/dev-db/postgis/postgis-3.0.4-r1.ebuild
@@ -37,7 +37,7 @@ RDEPEND="${POSTGRES_DEP}
dev-libs/libxml2:2
dev-libs/protobuf-c:=
>=sci-libs/geos-3.6.0
- >=sci-libs/proj-4.9.0:=
+ <sci-libs/proj-8:=
>=sci-libs/gdal-1.10.0:=
address-standardizer? ( dev-libs/libpcre )
gtk? ( x11-libs/gtk+:2 )
diff --git a/dev-db/postgis/postgis-3.1.0.ebuild b/dev-db/postgis/postgis-3.1.0-r1.ebuild
index 41f7b8feb92f..a51818f23cea 100644
--- a/dev-db/postgis/postgis-3.1.0.ebuild
+++ b/dev-db/postgis/postgis-3.1.0-r1.ebuild
@@ -37,7 +37,7 @@ RDEPEND="${POSTGRES_DEP}
dev-libs/libxml2:2
dev-libs/protobuf-c:=
>=sci-libs/geos-3.9.0
- >=sci-libs/proj-4.9.0:=
+ <sci-libs/proj-8:=
>=sci-libs/gdal-1.10.0:=
address-standardizer? ( dev-libs/libpcre )
gtk? ( x11-libs/gtk+:2 )
diff --git a/dev-db/postgis/postgis-3.1.1.ebuild b/dev-db/postgis/postgis-3.1.1-r1.ebuild
index a81f3e9072c3..718c94942b1d 100644
--- a/dev-db/postgis/postgis-3.1.1.ebuild
+++ b/dev-db/postgis/postgis-3.1.1-r1.ebuild
@@ -37,7 +37,7 @@ RDEPEND="${POSTGRES_DEP}
dev-libs/libxml2:2
dev-libs/protobuf-c:=
>=sci-libs/geos-3.9.0
- >=sci-libs/proj-4.9.0:=
+ <sci-libs/proj-8:=
>=sci-libs/gdal-1.10.0:=
address-standardizer? ( dev-libs/libpcre )
gtk? ( x11-libs/gtk+:2 )
diff --git a/dev-db/postgis/postgis-3.1.3.ebuild b/dev-db/postgis/postgis-3.1.3.ebuild
index a81f3e9072c3..41f7b8feb92f 100644
--- a/dev-db/postgis/postgis-3.1.3.ebuild
+++ b/dev-db/postgis/postgis-3.1.3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]] ; then
else
PGIS="$(ver_cut 1-2)"
SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Geographic Objects for PostgreSQL"
diff --git a/dev-db/postgis/postgis-3.2.0_beta1.ebuild b/dev-db/postgis/postgis-3.2.0.ebuild
index 7c34c0fb50f6..7c34c0fb50f6 100644
--- a/dev-db/postgis/postgis-3.2.0_beta1.ebuild
+++ b/dev-db/postgis/postgis-3.2.0.ebuild
diff --git a/dev-db/postgis/postgis-9999.ebuild b/dev-db/postgis/postgis-9999.ebuild
index 8325204434e1..298c281eae44 100644
--- a/dev-db/postgis/postgis-9999.ebuild
+++ b/dev-db/postgis/postgis-9999.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-POSTGRES_COMPAT=( 9.6 {10..12} )
+POSTGRES_COMPAT=( 9.6 {10..14} )
POSTGRES_USEDEP="server"
-inherit autotools eapi7-ver postgres-multi
+inherit autotools postgres-multi toolchain-funcs
MY_P="${PN}-$(ver_rs 3 '')"
@@ -25,9 +25,9 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
SLOT="0"
-IUSE="address-standardizer doc gtk static-libs test topology"
+IUSE="address-standardizer doc gtk static-libs topology"
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+REQUIRED_USE="${POSTGRES_REQ_USE}"
# Needs a running psql instance, doesn't work out of the box
RESTRICT="test"
@@ -36,7 +36,7 @@ RDEPEND="${POSTGRES_DEP}
dev-libs/json-c:=
dev-libs/libxml2:2
dev-libs/protobuf-c:=
- >=sci-libs/geos-3.6.0
+ >=sci-libs/geos-3.9.0
>=sci-libs/proj-4.9.0:=
>=sci-libs/gdal-1.10.0:=
address-standardizer? ( dev-libs/libpcre )
@@ -50,10 +50,13 @@ DEPEND="${RDEPEND}
dev-libs/libxslt
virtual/imagemagick-tools[png]
)
- test? ( dev-util/cunit )
"
-PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+ "${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
+ "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+)
src_prepare() {
default
@@ -78,8 +81,9 @@ src_prepare() {
}
src_configure() {
+ export CPP=$(tc-getCPP)
+
local myeconfargs=(
- --with-protobuf # funky misdetection if enabled but --without-protobuf
$(use_with address-standardizer)
$(use_with gtk gui)
$(use_with topology)