commit: 4f396e0698cdabf1aa28da1bede5faa93c8e7aa0
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 26 12:43:32 2024 +0000
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Thu Sep 26 13:21:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f396e06
dev-db/postgis: Add 3.5.0, 3.4.3, 3.3.7, remove 3.5.0_beta1
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>
dev-db/postgis/Manifest | 4 +++-
.../{postgis-3.5.0_beta1.ebuild => postgis-3.3.7.ebuild} | 15 ++++++++++-----
.../{postgis-3.5.0_beta1.ebuild => postgis-3.4.3.ebuild} | 5 ++++-
.../{postgis-3.5.0_beta1.ebuild => postgis-3.5.0.ebuild} | 2 +-
4 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index c5498c19768e..d643393cb990 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -3,6 +3,8 @@ DIST postgis-3.1.8.tar.gz 17285335 BLAKE2B
212a74866de5b8788b91cfa6d8b3a064df293
DIST postgis-3.2.6.tar.gz 16886873 BLAKE2B
9bf8375c08d434c0eace1807154c041d0638446385ed67a68c734fa4f5d4e0938bbc1d0761e22db497bc9379e380e6ff8b1e42476b78530f0351f7d242720120
SHA512
30e8a5b9af8a1bb12ed90daa89c71471193142dd7876b7618f237c1dab97a3f5941181cd159a6f33e34b62e6526da4e778f76b658de6fc6861d26e0dd96d10a0
DIST postgis-3.3.2.tar.gz 17793976 BLAKE2B
40dc7636f04e0d5cfd734b175da1ce49c32e4b8f5750059e79e03a7395fb8b9241c1f479815794b46dee81704d7c392fe7693c9f0180323d1ca21812c37d36b5
SHA512
4dd129057598b032ba322c42888bb8ce14b9423bd450ef7a42fa22162f6b48e34b226f38480aa67fe2da85be2529b0822655855f9846b657bdd32f50256f4305
DIST postgis-3.3.6.tar.gz 17803608 BLAKE2B
01b3a789df0af8716beefe027a46b59dfcbcee4a8a92f9e067ca1955992fa24a3e890efeb9f83200071f7d267f541444884dd7f76b225d43dbf8961376eff1da
SHA512
643527d80bbc0fc29f4639b24634090b2b9a042a3f0d8224afcd7fe4a149e65dba1015c29d08ff0a53da5eb95cb6b37cf544ada36005284eccdd58de3c791419
+DIST postgis-3.3.7.tar.gz 17782849 BLAKE2B
8f9b1f27c33727a9a24a53972dee67057c4230d0f1f01af352ff6b740d880b9acb7fccbacb5c2cc614c58adadace2cd6be9a1f52a7ce12cc20dbc2a99aa808d7
SHA512
007f0f6fc9b1256f3e7c4536d5d37c0b715fe285613804805567a4000d1ec9a132650b44f585ed184f5ad5209459e11a9464c5caf3ca285b2b230cf89ccf7709
DIST postgis-3.4.1.tar.gz 14942851 BLAKE2B
98ef490b08438c5ee35409a1c5c63d985d3024325d607a7a150b197aabb8baaaa70ec8c4bd5134136f92a106e6b1c885e3adb99aa325282122bc37d84db0d83f
SHA512
66f460077066372276783d8e7acefb0d61ae5fbf7e2d3bbb7008d9289a65adfe78eb8431eee4bbdd3f8e5a9e37653e396d659f46bb285edab00ed57277fae2c7
DIST postgis-3.4.2.tar.gz 14957647 BLAKE2B
30951950ae24ae0e0432658ef09ec95ffcf0ef377f79e45fb302f20b40d773c9d551d4ac2a07eab4f743ebeff2aae4730c8b7c2516c36a17f44a1410fbdc3069
SHA512
9dc3b78d9b4bd3d48e7eed96fc8da460177d33df2ec5bfef631b7ef39e056a243499732c9cc19274796b522bef83486eac2cea583a92a2cb18d6d329040c5ef0
-DIST postgis-3.5.0beta1.tar.gz 15021134 BLAKE2B
0c2c8dbef1bac3b9361267e0a85e0ac83e411221b307282d3f2bb187308b7e29ff0791eff4cccdd1b7612c2fe81898544fba635de62608593eee063cab6dcbcf
SHA512
08ed3745d461af976a94b451782705654ed422e9b6b4d51b482da3e410d593cec9b7f4e3d66952e776ef5693f3439a343055913cbad4b7785a2ec5d2f1e8e624
+DIST postgis-3.4.3.tar.gz 14957514 BLAKE2B
2c472a66d6063c70a2a5b7d42953233c9d24ee4f283e5837f74b231e0c034ba395e6f84dda9b14a46766ef6f1196c39aa7795d99b50ada106a66b2569ffdd6b4
SHA512
92da910fa87a618e49ab16bcb3d9b4403dc4e08bdfd599631f5b7c7a4955258a1a9e4efb1d982c30ef3a395631f52d055f321a1c17b1b7fe22403580671a2dab
+DIST postgis-3.5.0.tar.gz 15031829 BLAKE2B
a641eaa7b0407108e332bf6f244fef0d22d21ed34c16c2f3cb718f49acf9a0bb3b1bf8b1ec3d7eb4f731beeb652f37f666ff4b8d44c5a66db7da4a9a555caa38
SHA512
baf81b9133db34c87ecb5e019497df89fba9faf293ae2f2e4fa5578dbe608ff5310b5ca718a7bf94e76af51bf7b8ec4b1f69fad91412017d70cdcd70492ae9e5
diff --git a/dev-db/postgis/postgis-3.5.0_beta1.ebuild
b/dev-db/postgis/postgis-3.3.7.ebuild
similarity index 90%
copy from dev-db/postgis/postgis-3.5.0_beta1.ebuild
copy to dev-db/postgis/postgis-3.3.7.ebuild
index c6635830012f..55ecc49ccb7c 100644
--- a/dev-db/postgis/postgis-3.5.0_beta1.ebuild
+++ b/dev-db/postgis/postgis-3.3.7.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-POSTGRES_COMPAT=( {12..16} )
+POSTGRES_COMPAT=( {11..16} )
POSTGRES_USEDEP="server"
inherit autotools postgres-multi toolchain-funcs
@@ -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=""
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Geographic Objects for PostgreSQL"
@@ -37,7 +37,7 @@ RDEPEND="${POSTGRES_DEP}
dev-libs/libxml2:2
dev-libs/protobuf-c:=
>=sci-libs/geos-3.9.0
- >=sci-libs/proj-6.1.0:=
+ >=sci-libs/proj-4.9.0:=
>=sci-libs/gdal-1.10.0:=
address-standardizer? ( dev-libs/libpcre2 )
gtk? ( x11-libs/gtk+:2 )
@@ -95,7 +95,7 @@ src_compile() {
if use doc ; then
postgres-multi_foreach emake comments
- postgres-multi_forbest emake cheatsheets
+ postgres-multi_foreach emake cheatsheets
postgres-multi_forbest emake -C doc html
fi
}
@@ -112,7 +112,12 @@ src_install() {
if use doc ; then
postgres-multi_foreach emake DESTDIR="${D}" comments-install
- postgres-multi_forbest emake DESTDIR="${D}" -C doc
cheatsheet-install html-install html-assets-install
+
+ docinto html
+ postgres-multi_forbest dodoc doc/html/{postgis.html,style.css}
+
+ docinto html/images
+ postgres-multi_forbest dodoc doc/html/images/*
fi
use static-libs || find "${ED}" -name '*.a' -delete
diff --git a/dev-db/postgis/postgis-3.5.0_beta1.ebuild
b/dev-db/postgis/postgis-3.4.3.ebuild
similarity index 93%
copy from dev-db/postgis/postgis-3.5.0_beta1.ebuild
copy to dev-db/postgis/postgis-3.4.3.ebuild
index c6635830012f..c4edb0ce080a 100644
--- a/dev-db/postgis/postgis-3.5.0_beta1.ebuild
+++ b/dev-db/postgis/postgis-3.4.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=""
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Geographic Objects for PostgreSQL"
@@ -54,6 +54,9 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+ "${FILESDIR}/${PN}-3.4.0-without-gui.patch"
+ # source: https://github.com/google/flatbuffers/pull/7897
+ #"${FILESDIR}/${PN}-3.3.2-flatbuffers-abseil-2023.patch" # bug 905378
)
src_prepare() {
diff --git a/dev-db/postgis/postgis-3.5.0_beta1.ebuild
b/dev-db/postgis/postgis-3.5.0.ebuild
similarity index 98%
rename from dev-db/postgis/postgis-3.5.0_beta1.ebuild
rename to dev-db/postgis/postgis-3.5.0.ebuild
index c6635830012f..ba333881c02d 100644
--- a/dev-db/postgis/postgis-3.5.0_beta1.ebuild
+++ b/dev-db/postgis/postgis-3.5.0.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=""
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Geographic Objects for PostgreSQL"
