[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2024-09-17 Thread Patrick Lauer
commit: 2d93830219d84eaff10bcca2e756d2334e7afb0a
Author: Patrick Lauer  gentoo  org>
AuthorDate: Tue Sep 17 09:24:15 2024 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Tue Sep 17 09:25:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d938302

dev-db/postgis: add 3.5.0_beta1, drop 3.5.0_alpha2

Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest | 2 +-
 .../postgis/{postgis-3.5.0_alpha2.ebuild => postgis-3.5.0_beta1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 2406e2d7976a..c5498c19768e 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -5,4 +5,4 @@ DIST postgis-3.3.2.tar.gz 17793976 BLAKE2B 
40dc7636f04e0d5cfd734b175da1ce49c32e4
 DIST postgis-3.3.6.tar.gz 17803608 BLAKE2B 
01b3a789df0af8716beefe027a46b59dfcbcee4a8a92f9e067ca1955992fa24a3e890efeb9f83200071f7d267f541444884dd7f76b225d43dbf8961376eff1da
 SHA512 
643527d80bbc0fc29f4639b24634090b2b9a042a3f0d8224afcd7fe4a149e65dba1015c29d08ff0a53da5eb95cb6b37cf544ada36005284eccdd58de3c791419
 DIST postgis-3.4.1.tar.gz 14942851 BLAKE2B 
98ef490b08438c5ee35409a1c5c63d985d3024325d607a7a150b197aabb8b70ec8c4bd5134136f92a106e6b1c885e3adb99aa325282122bc37d84db0d83f
 SHA512 
66f460077066372276783d8e7acefb0d61ae5fbf7e2d3bbb7008d9289a65adfe78eb8431eee4bbdd3f8e5a9e37653e396d659f46bb285edab00ed57277fae2c7
 DIST postgis-3.4.2.tar.gz 14957647 BLAKE2B 
30951950ae24ae0e0432658ef09ec95ffcf0ef377f79e45fb302f20b40d773c9d551d4ac2a07eab4f743ebeff2aae4730c8b7c2516c36a17f44a1410fbdc3069
 SHA512 
9dc3b78d9b4bd3d48e7eed96fc8da460177d33df2ec5bfef631b7ef39e056a243499732c9cc19274796b522bef83486eac2cea583a92a2cb18d6d329040c5ef0
-DIST postgis-3.5.0alpha2.tar.gz 15014794 BLAKE2B 
7268b5e0820687bb3b3a92cc6f419d14e8a7a48d8d9ea456c020e6ddb080d7b9aff044b894c52db8c013146dcbfc2cf042d24c1508118567ce33c03bc2213b73
 SHA512 
aa51d7ce2b4d0d64a30f527698e551e40dfc8752e83ff2028924a7da13394aa97de9a7e67612afbb890fcde651b2140a0379d61c7e29681014a191701dc8693d
+DIST postgis-3.5.0beta1.tar.gz 15021134 BLAKE2B 
0c2c8dbef1bac3b9361267e0a85e0ac83e411221b307282d3f2bb187308b7e29ff0791eff4cccdd1b7612c2fe81898544fba635de62608593eee063cab6dcbcf
 SHA512 
08ed3745d461af976a94b451782705654ed422e9b6b4d51b482da3e410d593cec9b7f4e3d66952e776ef5693f3439a343055913cbad4b7785a2ec5d2f1e8e624

diff --git a/dev-db/postgis/postgis-3.5.0_alpha2.ebuild 
b/dev-db/postgis/postgis-3.5.0_beta1.ebuild
similarity index 100%
rename from dev-db/postgis/postgis-3.5.0_alpha2.ebuild
rename to dev-db/postgis/postgis-3.5.0_beta1.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2024-07-07 Thread Patrick Lauer
commit: ad5b1ae12aacd43a26a45d59e99048f6cf7dca1c
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sun Jul  7 13:31:34 2024 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Sun Jul  7 13:31:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad5b1ae1

dev-db/postgis: add 3.5.0_alpha2

Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest|   1 +
 dev-db/postgis/postgis-3.5.0_alpha2.ebuild | 135 +
 2 files changed, 136 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 3d10a43d4e7d..2406e2d7976a 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -5,3 +5,4 @@ DIST postgis-3.3.2.tar.gz 17793976 BLAKE2B 
40dc7636f04e0d5cfd734b175da1ce49c32e4
 DIST postgis-3.3.6.tar.gz 17803608 BLAKE2B 
01b3a789df0af8716beefe027a46b59dfcbcee4a8a92f9e067ca1955992fa24a3e890efeb9f83200071f7d267f541444884dd7f76b225d43dbf8961376eff1da
 SHA512 
643527d80bbc0fc29f4639b24634090b2b9a042a3f0d8224afcd7fe4a149e65dba1015c29d08ff0a53da5eb95cb6b37cf544ada36005284eccdd58de3c791419
 DIST postgis-3.4.1.tar.gz 14942851 BLAKE2B 
98ef490b08438c5ee35409a1c5c63d985d3024325d607a7a150b197aabb8b70ec8c4bd5134136f92a106e6b1c885e3adb99aa325282122bc37d84db0d83f
 SHA512 
66f460077066372276783d8e7acefb0d61ae5fbf7e2d3bbb7008d9289a65adfe78eb8431eee4bbdd3f8e5a9e37653e396d659f46bb285edab00ed57277fae2c7
 DIST postgis-3.4.2.tar.gz 14957647 BLAKE2B 
30951950ae24ae0e0432658ef09ec95ffcf0ef377f79e45fb302f20b40d773c9d551d4ac2a07eab4f743ebeff2aae4730c8b7c2516c36a17f44a1410fbdc3069
 SHA512 
9dc3b78d9b4bd3d48e7eed96fc8da460177d33df2ec5bfef631b7ef39e056a243499732c9cc19274796b522bef83486eac2cea583a92a2cb18d6d329040c5ef0
+DIST postgis-3.5.0alpha2.tar.gz 15014794 BLAKE2B 
7268b5e0820687bb3b3a92cc6f419d14e8a7a48d8d9ea456c020e6ddb080d7b9aff044b894c52db8c013146dcbfc2cf042d24c1508118567ce33c03bc2213b73
 SHA512 
aa51d7ce2b4d0d64a30f527698e551e40dfc8752e83ff2028924a7da13394aa97de9a7e67612afbb890fcde651b2140a0379d61c7e29681014a191701dc8693d

diff --git a/dev-db/postgis/postgis-3.5.0_alpha2.ebuild 
b/dev-db/postgis/postgis-3.5.0_alpha2.ebuild
new file mode 100644
index ..c6635830012f
--- /dev/null
+++ b/dev-db/postgis/postgis-3.5.0_alpha2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+POSTGRES_COMPAT=( {12..16} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+else
+   PGIS="$(ver_cut 1-2)"
+   SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
+   KEYWORDS=""
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs topology"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.9.0
+   >=sci-libs/proj-6.1.0:=
+   >=sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre2 )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+)
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   # bug #775968
+   touch build-aux/ar-lib || die
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   export CPP=$(tc-getCPP)
+
+   local myeconfargs=(
+   $(use_with address-standardizer)
+   $(use_with gtk gui)
+   $(use_with topology)
+   )
+   postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_forbest emake cheatsheets
+   postgres-multi_forbest emake -C doc html
+   fi
+}
+
+src_install() {
+   postgres-multi_foreach 

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2024-06-13 Thread Patrick Lauer
commit: 91a75c2b0957212985fc8baf5ce55e3410cdce0c
Author: Patrick Lauer  gentoo  org>
AuthorDate: Thu Jun 13 09:18:02 2024 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Thu Jun 13 09:18:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91a75c2b

dev-db/postgis: drop 

Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/postgis-.ebuild | 142 -
 1 file changed, 142 deletions(-)

diff --git a/dev-db/postgis/postgis-.ebuild 
b/dev-db/postgis/postgis-.ebuild
deleted file mode 100644
index 82013b188b93..
--- a/dev-db/postgis/postgis-.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 9.6 {10..14} )
-POSTGRES_USEDEP="server"
-inherit autotools postgres-multi toolchain-funcs
-
-MY_P="${PN}-$(ver_rs 3 '')"
-
-if [[ ${PV} = ** ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
-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"
-fi
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="https://postgis.net";
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="address-standardizer doc gtk static-libs topology"
-
-REQUIRED_USE="${POSTGRES_REQ_USE}"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-RDEPEND="${POSTGRES_DEP}
-   dev-libs/json-c:=
-   dev-libs/libxml2:2
-   dev-libs/protobuf-c:=
-   >=sci-libs/geos-3.9.0
-   >=sci-libs/proj-4.9.0:=
-   >=sci-libs/gdal-1.10.0:=
-   address-standardizer? ( dev-libs/libpcre2 )
-   gtk? ( x11-libs/gtk+:2 )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   doc? (
-   app-text/docbook-xsl-stylesheets
-   app-text/docbook-xml-dtd:4.5
-   dev-libs/libxslt
-   virtual/imagemagick-tools[png]
-   )
-"
-
-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
-
-   if [[ ${PV} = ** ]] ; then
-   source "${S}"/Version.config
-   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
-   fi
-
-   # These modules are built using the same *FLAGS that were used to build
-   # dev-db/postgresql. The right thing to do is to ignore the current
-   # *FLAGS settings.
-   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-   # bug #775968
-   touch build-aux/ar-lib || die
-
-   local AT_M4DIR="macros"
-   eautoreconf
-
-   postgres-multi_src_prepare
-}
-
-src_configure() {
-   export CPP=$(tc-getCPP)
-
-   local myeconfargs=(
-   $(use_with address-standardizer)
-   $(use_with gtk gui)
-   $(use_with topology)
-   )
-   postgres-multi_foreach econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-   postgres-multi_foreach emake
-   postgres-multi_foreach emake -C topology
-
-   if use doc ; then
-   postgres-multi_foreach emake comments
-   postgres-multi_foreach emake cheatsheets
-   postgres-multi_forbest emake -C doc html
-   fi
-}
-
-src_install() {
-   postgres-multi_foreach emake DESTDIR="${D}" install
-   postgres-multi_foreach emake -C topology DESTDIR="${D}" install
-   postgres-multi_forbest dobin ./utils/postgis_restore.pl
-
-   dodoc CREDITS TODO loader/README.* doc/*txt
-
-   docinto topology
-   dodoc topology/{TODO,README}
-
-   if use doc ; then
-   postgres-multi_foreach emake DESTDIR="${D}" comments-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
-}
-
-pkg_postinst() {
-   ebegin "Refreshing PostgreSQL symlinks"
-   postgresql-config update
-   eend $?
-
-   local base_uri="https://postgis.net/docs/manual-";
-   if [[ ${PV} = ** ]] ; then
-   base_uri+="dev"
-   else
-   base_uri+="${PGIS}"
-   fi
-
-   elog "To finish installing PostGIS, follow the directions detailed at:"
-   elog "${base_uri}/postgis_installation.html#create_new_db_extensions"
-}



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2024-06-13 Thread Patrick Lauer
commit: 387c81820f1d189693a8016da64c4579b8d4b525
Author: Patrick Lauer  gentoo  org>
AuthorDate: Thu Jun 13 07:18:06 2024 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Thu Jun 13 07:18:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=387c8182

dev-db/postgis: add 3.1.11

Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/postgis-3.1.11.ebuild | 143 +++
 1 file changed, 143 insertions(+)

diff --git a/dev-db/postgis/postgis-3.1.11.ebuild 
b/dev-db/postgis/postgis-3.1.11.ebuild
new file mode 100644
index ..2d2522b17ba2
--- /dev/null
+++ b/dev-db/postgis/postgis-3.1.11.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+POSTGRES_COMPAT=( 9.6 {10..14} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs topology"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.9.0
+   >=sci-libs/proj-4.9.0:=
+   >=sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre2 )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+   "${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
+   "${FILESDIR}/${PN}-3.0.3-detect-only-stdc.patch"
+   "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+)
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   # bug #775968
+   touch build-aux/ar-lib || die
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   export CPP=$(tc-getCPP)
+
+   local myeconfargs=(
+   $(use_with address-standardizer)
+   $(use_with gtk gui)
+   $(use_with topology)
+   )
+   postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_foreach emake cheatsheets
+   postgres-multi_forbest emake -C doc html
+   fi
+}
+
+src_install() {
+   postgres-multi_foreach emake DESTDIR="${D}" install
+   postgres-multi_foreach emake -C topology DESTDIR="${D}" install
+   postgres-multi_forbest dobin ./utils/postgis_restore.pl
+
+   dodoc CREDITS TODO loader/README.* doc/*txt
+
+   docinto topology
+   dodoc topology/{TODO,README}
+
+   if use doc ; then
+   postgres-multi_foreach emake DESTDIR="${D}" comments-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
+}
+
+pkg_postinst() {
+   ebegin "Refreshing PostgreSQL symlinks"
+   postgresql-config update
+   eend $?
+
+   local base_uri="https://postgis.net/docs/manual-";
+   if [[ ${PV} = ** ]] ; then
+   base_uri+="dev"
+   else
+   base_uri+="${PGIS}"
+   fi
+
+   elog "To finish installing PostGIS, follow the directions detailed at:"
+   elog "${base_uri}/postgis_installation.html#create_new_db_extensions"
+}



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2024-06-13 Thread Patrick Lauer
commit: 674c2e214aa8716381486dbeb5cde907e89b645e
Author: Patrick Lauer  gentoo  org>
AuthorDate: Thu Jun 13 07:13:42 2024 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Thu Jun 13 07:18:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=674c2e21

dev-db/postgis: add 3.3.6, 3.4.2

Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   3 +
 dev-db/postgis/postgis-3.3.6.ebuild | 140 
 dev-db/postgis/postgis-3.4.2.ebuild | 138 +++
 3 files changed, 281 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index fce28441144b..2e418d628d90 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,4 +1,5 @@
 DIST postgis-3.1.10.tar.gz 17302899 BLAKE2B 
735a7ea27b07fe6bc7fb712a33015e230b498e362e83b91777de37c15df4564eb07fe88f3402a135c6a3ef9e300e5fa4569ed0ffa325fb94cd4b82291138857e
 SHA512 
872de412792e5b237e2e60d1b3ffb739186839754286e608485dffa89ab9e58c4237c289b0a8420c9bc448b19f0983a2c32be7f72ccb5b7a7c4096adf9f93d87
+DIST postgis-3.1.11.tar.gz 17283655 BLAKE2B 
237bb80ab4e38f0c6f70e6c445b3fbf0d1d547fafb1b7fd7259ace9df7775c6f01f0b9f6c6e74a9a811c5c7e3e6484c9b99b48a5e4753da807e6e05fce4c024e
 SHA512 
0a91e1b1ce336cdc4763bafaf01f98b1bcb80f6e786feb5156fd8841ea8273df28735bf6f185108b27a30dd4a841f414f4400feaf5ebd3684d5a3272ef805715
 DIST postgis-3.1.8.tar.gz 17285335 BLAKE2B 
212a74866de5b8788b91cfa6d8b3a064df2933c76c8930e3c7bba310b36b4e7249de2d7481e852679da59bb9bdb3315752b62ad70176601b7110401f368200bc
 SHA512 
c28befe1f77e7f36d63b39d027024d3f8abe8496c64c4b3c05eb7c32c3a885e824cabdda5bf0f9f320b9fe15bb97f21d5dfb65a193c64b1e27be95badefe3b37
 DIST postgis-3.1.9.tar.gz 17289185 BLAKE2B 
a331df130aa8becb4a25e84751f9fcdd494816d8287ade8983bc429eff42c1b98037d07358c4b7e3b9e3daee63aa59ea36f0ae49c5d00bdae9b993526544014a
 SHA512 
b0fd0e7311c7a7672f23d4dc1732c884c7d0766f0f1c0a7e53750bd5fc4d39872dca08f5a5dfc58745fe4c80bb42b2420b63a4cbe76cac02f8e36d8cc9771623
 DIST postgis-3.2.4.tar.gz 16885605 BLAKE2B 
341bf09bf5adffc6c48b0fdc6930bac25e43184357895bb90adf000f4fdf52e5c198a530722d46d8b3207e7faffe840de53a9494f3119bb56c3a8e11a4d693f0
 SHA512 
46bb88ebcf7697e42194e55ef1c323a94222e2870a98aa058d62e1d253c8ad15b14da268eece43b0cdb71d8cdbd2ff393ca451c45998245aaf1726bdffcc563f
@@ -8,5 +9,7 @@ DIST postgis-3.3.2.tar.gz 17793976 BLAKE2B 
40dc7636f04e0d5cfd734b175da1ce49c32e4
 DIST postgis-3.3.3.tar.gz 17790503 BLAKE2B 
d5390e3e0713b2f74db0c6d7f953681b49611937442f89cd316b43315257db0e0734b6cd23b750a88d9fe503c5348c98578e12cfe6fd8a382fc7817d641e89cf
 SHA512 
0025a8a5c6be7e18dfb97a6a04c468a9da2d6e99462d20eec7bddf4048b8f2fa1e8029be9f819950c910a6f89190e8295f10e8dab9b4885d03d3dbcce41380c2
 DIST postgis-3.3.4.tar.gz 18591029 BLAKE2B 
5aae3804b8abcaf8436cc57c53e288f68e317b5ab930a0651f2f55fc825f9c3d6cdf43b74cb7a845de385d019737759e6ef127587015f28851734ffeedbc64da
 SHA512 
b35811ffcb7fdddbe5d4714216f714b687f92e6984614f20c6bfd4a498e6422a3035fd0de9a0afd0a04c6999d8b8a68e0f93a5bb75f893fcb6d3c3f64fe65726
 DIST postgis-3.3.5.tar.gz 17785894 BLAKE2B 
9c710430adb68d92e8326caef6c5a1117a398f04f31bb58f3b38818f3194866eb4906b843e82e4b8e4790717f778690c27f2c856263431e5051412c79c50fc55
 SHA512 
f9d400d7e9db0acd12ada051922e6baf566ae9ad182af937873765a64bd4e1b4948951da4a173efe7d1f85b3ead0065c6ea9b05860a78cf9942c523bacd2d351
+DIST postgis-3.3.6.tar.gz 17803608 BLAKE2B 
01b3a789df0af8716beefe027a46b59dfcbcee4a8a92f9e067ca1955992fa24a3e890efeb9f83200071f7d267f541444884dd7f76b225d43dbf8961376eff1da
 SHA512 
643527d80bbc0fc29f4639b24634090b2b9a042a3f0d8224afcd7fe4a149e65dba1015c29d08ff0a53da5eb95cb6b37cf544ada36005284eccdd58de3c791419
 DIST postgis-3.4.0.tar.gz 14693348 BLAKE2B 
a7ae007edb12a796f58b24ec8f72264e154900335a2da8c9358dcf0455a4ff183bb77036f45a77aa3533913ab2a802a4995ce17913ef355c52e5c1d8132c04a6
 SHA512 
d8c5329e5394bfe1d77a207d35cf8100217d39236cfeb228e268c796e16e24068df2191403830bf190b7ae9fabb21003675a091a8cc6dbfeed9b4b02cbbb9d33
 DIST postgis-3.4.1.tar.gz 14942851 BLAKE2B 
98ef490b08438c5ee35409a1c5c63d985d3024325d607a7a150b197aabb8b70ec8c4bd5134136f92a106e6b1c885e3adb99aa325282122bc37d84db0d83f
 SHA512 
66f460077066372276783d8e7acefb0d61ae5fbf7e2d3bbb7008d9289a65adfe78eb8431eee4bbdd3f8e5a9e37653e396d659f46bb285edab00ed57277fae2c7
+DIST postgis-3.4.2.tar.gz 14957647 BLAKE2B 
30951950ae24ae0e0432658ef09ec95ffcf0ef377f79e45fb302f20b40d773c9d551d4ac2a07eab4f743ebeff2aae4730c8b7c2516c36a17f44a1410fbdc3069
 SHA512 
9dc3b78d9b4bd3d48e7eed96fc8da460177d33df2ec5bfef631b7ef39e056a243499732c9cc19274796b522bef83486eac2cea583a92a2cb18d6d329040c5ef0

diff --git a/dev-db/postgis/postgis-3.3.6.ebuild 
b/dev-db/postgis/postgis-3.3.6.ebuild
new file mode 100644
index ..55ecc49ccb7c
--- /dev/null
+++ b/dev-db/postgis/postgis-3.3.6.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+POSTGRES_COMPAT=( {11..16} )

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2024-06-13 Thread Patrick Lauer
commit: aad86d6cfc4cce126d349dcd63dd56dbbe5c46fb
Author: Patrick Lauer  gentoo  org>
AuthorDate: Thu Jun 13 07:17:16 2024 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Thu Jun 13 07:18:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aad86d6c

dev-db/postgis: drop versions

Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest|   8 --
 dev-db/postgis/postgis-3.1.10.ebuild   | 143 -
 dev-db/postgis/postgis-3.1.9.ebuild| 143 -
 dev-db/postgis/postgis-3.2.4-r1.ebuild | 142 
 dev-db/postgis/postgis-3.2.5.ebuild| 142 
 dev-db/postgis/postgis-3.3.3.ebuild| 142 
 dev-db/postgis/postgis-3.3.4.ebuild| 142 
 dev-db/postgis/postgis-3.3.5.ebuild| 142 
 dev-db/postgis/postgis-3.4.0-r1.ebuild | 142 
 dev-db/postgis/postgis-3.4.0-r2.ebuild | 138 ---
 10 files changed, 1284 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 2e418d628d90..3d10a43d4e7d 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,15 +1,7 @@
-DIST postgis-3.1.10.tar.gz 17302899 BLAKE2B 
735a7ea27b07fe6bc7fb712a33015e230b498e362e83b91777de37c15df4564eb07fe88f3402a135c6a3ef9e300e5fa4569ed0ffa325fb94cd4b82291138857e
 SHA512 
872de412792e5b237e2e60d1b3ffb739186839754286e608485dffa89ab9e58c4237c289b0a8420c9bc448b19f0983a2c32be7f72ccb5b7a7c4096adf9f93d87
 DIST postgis-3.1.11.tar.gz 17283655 BLAKE2B 
237bb80ab4e38f0c6f70e6c445b3fbf0d1d547fafb1b7fd7259ace9df7775c6f01f0b9f6c6e74a9a811c5c7e3e6484c9b99b48a5e4753da807e6e05fce4c024e
 SHA512 
0a91e1b1ce336cdc4763bafaf01f98b1bcb80f6e786feb5156fd8841ea8273df28735bf6f185108b27a30dd4a841f414f4400feaf5ebd3684d5a3272ef805715
 DIST postgis-3.1.8.tar.gz 17285335 BLAKE2B 
212a74866de5b8788b91cfa6d8b3a064df2933c76c8930e3c7bba310b36b4e7249de2d7481e852679da59bb9bdb3315752b62ad70176601b7110401f368200bc
 SHA512 
c28befe1f77e7f36d63b39d027024d3f8abe8496c64c4b3c05eb7c32c3a885e824cabdda5bf0f9f320b9fe15bb97f21d5dfb65a193c64b1e27be95badefe3b37
-DIST postgis-3.1.9.tar.gz 17289185 BLAKE2B 
a331df130aa8becb4a25e84751f9fcdd494816d8287ade8983bc429eff42c1b98037d07358c4b7e3b9e3daee63aa59ea36f0ae49c5d00bdae9b993526544014a
 SHA512 
b0fd0e7311c7a7672f23d4dc1732c884c7d0766f0f1c0a7e53750bd5fc4d39872dca08f5a5dfc58745fe4c80bb42b2420b63a4cbe76cac02f8e36d8cc9771623
-DIST postgis-3.2.4.tar.gz 16885605 BLAKE2B 
341bf09bf5adffc6c48b0fdc6930bac25e43184357895bb90adf000f4fdf52e5c198a530722d46d8b3207e7faffe840de53a9494f3119bb56c3a8e11a4d693f0
 SHA512 
46bb88ebcf7697e42194e55ef1c323a94222e2870a98aa058d62e1d253c8ad15b14da268eece43b0cdb71d8cdbd2ff393ca451c45998245aaf1726bdffcc563f
-DIST postgis-3.2.5.tar.gz 16888933 BLAKE2B 
7d3deb984d7f7ee202abe5deff326debe20ff449f1712abafa2b8bbfd0e56bfbea69a6c16cd10694afd4831c1a0b8e1b9fca89c2748faf092b5402e830714a97
 SHA512 
7d9f3242aacfc0c071454550ed8683daa211cf29e4b60cf4c7e68fb59ef6e037ff6b53c1a8f5577d224b16cb04e430c47839d9b67097dc4c642312d2f5e485f7
 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.3.tar.gz 17790503 BLAKE2B 
d5390e3e0713b2f74db0c6d7f953681b49611937442f89cd316b43315257db0e0734b6cd23b750a88d9fe503c5348c98578e12cfe6fd8a382fc7817d641e89cf
 SHA512 
0025a8a5c6be7e18dfb97a6a04c468a9da2d6e99462d20eec7bddf4048b8f2fa1e8029be9f819950c910a6f89190e8295f10e8dab9b4885d03d3dbcce41380c2
-DIST postgis-3.3.4.tar.gz 18591029 BLAKE2B 
5aae3804b8abcaf8436cc57c53e288f68e317b5ab930a0651f2f55fc825f9c3d6cdf43b74cb7a845de385d019737759e6ef127587015f28851734ffeedbc64da
 SHA512 
b35811ffcb7fdddbe5d4714216f714b687f92e6984614f20c6bfd4a498e6422a3035fd0de9a0afd0a04c6999d8b8a68e0f93a5bb75f893fcb6d3c3f64fe65726
-DIST postgis-3.3.5.tar.gz 17785894 BLAKE2B 
9c710430adb68d92e8326caef6c5a1117a398f04f31bb58f3b38818f3194866eb4906b843e82e4b8e4790717f778690c27f2c856263431e5051412c79c50fc55
 SHA512 
f9d400d7e9db0acd12ada051922e6baf566ae9ad182af937873765a64bd4e1b4948951da4a173efe7d1f85b3ead0065c6ea9b05860a78cf9942c523bacd2d351
 DIST postgis-3.3.6.tar.gz 17803608 BLAKE2B 
01b3a789df0af8716beefe027a46b59dfcbcee4a8a92f9e067ca1955992fa24a3e890efeb9f83200071f7d267f541444884dd7f76b225d43dbf8961376eff1da
 SHA512 
643527d80bbc0fc29f4639b24634090b2b9

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2024-01-19 Thread 罗百科
commit: 64ca765a36633487569cb4c69809337bd547c3f3
Author: Patrick Lauer  gentoo  org>
AuthorDate: Fri Jan 19 14:05:32 2024 +
Commit: 罗百科  gentoo  org>
CommitDate: Fri Jan 19 14:05:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64ca765a

dev-db/postgis: add 3.3.5

Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   1 +
 dev-db/postgis/postgis-3.3.5.ebuild | 142 
 2 files changed, 143 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 70fa437c20ca..fce28441144b 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -7,5 +7,6 @@ DIST postgis-3.2.6.tar.gz 16886873 BLAKE2B 
9bf8375c08d434c0eace1807154c041d06384
 DIST postgis-3.3.2.tar.gz 17793976 BLAKE2B 
40dc7636f04e0d5cfd734b175da1ce49c32e4b8f5750059e79e03a7395fb8b9241c1f479815794b46dee81704d7c392fe7693c9f0180323d1ca21812c37d36b5
 SHA512 
4dd129057598b032ba322c42888bb8ce14b9423bd450ef7a42fa22162f6b48e34b226f38480aa67fe2da85be2529b0822655855f9846b657bdd32f50256f4305
 DIST postgis-3.3.3.tar.gz 17790503 BLAKE2B 
d5390e3e0713b2f74db0c6d7f953681b49611937442f89cd316b43315257db0e0734b6cd23b750a88d9fe503c5348c98578e12cfe6fd8a382fc7817d641e89cf
 SHA512 
0025a8a5c6be7e18dfb97a6a04c468a9da2d6e99462d20eec7bddf4048b8f2fa1e8029be9f819950c910a6f89190e8295f10e8dab9b4885d03d3dbcce41380c2
 DIST postgis-3.3.4.tar.gz 18591029 BLAKE2B 
5aae3804b8abcaf8436cc57c53e288f68e317b5ab930a0651f2f55fc825f9c3d6cdf43b74cb7a845de385d019737759e6ef127587015f28851734ffeedbc64da
 SHA512 
b35811ffcb7fdddbe5d4714216f714b687f92e6984614f20c6bfd4a498e6422a3035fd0de9a0afd0a04c6999d8b8a68e0f93a5bb75f893fcb6d3c3f64fe65726
+DIST postgis-3.3.5.tar.gz 17785894 BLAKE2B 
9c710430adb68d92e8326caef6c5a1117a398f04f31bb58f3b38818f3194866eb4906b843e82e4b8e4790717f778690c27f2c856263431e5051412c79c50fc55
 SHA512 
f9d400d7e9db0acd12ada051922e6baf566ae9ad182af937873765a64bd4e1b4948951da4a173efe7d1f85b3ead0065c6ea9b05860a78cf9942c523bacd2d351
 DIST postgis-3.4.0.tar.gz 14693348 BLAKE2B 
a7ae007edb12a796f58b24ec8f72264e154900335a2da8c9358dcf0455a4ff183bb77036f45a77aa3533913ab2a802a4995ce17913ef355c52e5c1d8132c04a6
 SHA512 
d8c5329e5394bfe1d77a207d35cf8100217d39236cfeb228e268c796e16e24068df2191403830bf190b7ae9fabb21003675a091a8cc6dbfeed9b4b02cbbb9d33
 DIST postgis-3.4.1.tar.gz 14942851 BLAKE2B 
98ef490b08438c5ee35409a1c5c63d985d3024325d607a7a150b197aabb8b70ec8c4bd5134136f92a106e6b1c885e3adb99aa325282122bc37d84db0d83f
 SHA512 
66f460077066372276783d8e7acefb0d61ae5fbf7e2d3bbb7008d9289a65adfe78eb8431eee4bbdd3f8e5a9e37653e396d659f46bb285edab00ed57277fae2c7

diff --git a/dev-db/postgis/postgis-3.3.5.ebuild 
b/dev-db/postgis/postgis-3.3.5.ebuild
new file mode 100644
index ..6f4f58e24ace
--- /dev/null
+++ b/dev-db/postgis/postgis-3.3.5.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( {11..16} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs topology"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.9.0
+   >=sci-libs/proj-4.9.0:=
+   >=sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre2 )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+   # source: https://github.com/google/flatbuffers/pull/7897
+   "${FILESDIR}/${PN}-3.3.2-flatbuffers-abseil-2023.patch" # bug 905378
+)
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   # bug #775968
+   touch build-a

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2023-11-23 Thread 罗百科
commit: a331d8318174c5c2a2303e014ab7450c65a798b4
Author: Patrick Lauer  gentoo  org>
AuthorDate: Fri Nov 24 06:34:25 2023 +
Commit: 罗百科  gentoo  org>
CommitDate: Fri Nov 24 06:34:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a331d831

dev-db/postgis: add 3.1.10, 3.2.6, 3.3.4, 3.4.1

Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest  |   4 +
 dev-db/postgis/postgis-3.1.10.ebuild | 143 +++
 dev-db/postgis/postgis-3.2.6.ebuild  | 143 +++
 dev-db/postgis/postgis-3.3.4.ebuild  | 142 ++
 dev-db/postgis/postgis-3.4.1.ebuild  | 138 +
 5 files changed, 570 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 52ca3f2abb36..70fa437c20ca 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,7 +1,11 @@
+DIST postgis-3.1.10.tar.gz 17302899 BLAKE2B 
735a7ea27b07fe6bc7fb712a33015e230b498e362e83b91777de37c15df4564eb07fe88f3402a135c6a3ef9e300e5fa4569ed0ffa325fb94cd4b82291138857e
 SHA512 
872de412792e5b237e2e60d1b3ffb739186839754286e608485dffa89ab9e58c4237c289b0a8420c9bc448b19f0983a2c32be7f72ccb5b7a7c4096adf9f93d87
 DIST postgis-3.1.8.tar.gz 17285335 BLAKE2B 
212a74866de5b8788b91cfa6d8b3a064df2933c76c8930e3c7bba310b36b4e7249de2d7481e852679da59bb9bdb3315752b62ad70176601b7110401f368200bc
 SHA512 
c28befe1f77e7f36d63b39d027024d3f8abe8496c64c4b3c05eb7c32c3a885e824cabdda5bf0f9f320b9fe15bb97f21d5dfb65a193c64b1e27be95badefe3b37
 DIST postgis-3.1.9.tar.gz 17289185 BLAKE2B 
a331df130aa8becb4a25e84751f9fcdd494816d8287ade8983bc429eff42c1b98037d07358c4b7e3b9e3daee63aa59ea36f0ae49c5d00bdae9b993526544014a
 SHA512 
b0fd0e7311c7a7672f23d4dc1732c884c7d0766f0f1c0a7e53750bd5fc4d39872dca08f5a5dfc58745fe4c80bb42b2420b63a4cbe76cac02f8e36d8cc9771623
 DIST postgis-3.2.4.tar.gz 16885605 BLAKE2B 
341bf09bf5adffc6c48b0fdc6930bac25e43184357895bb90adf000f4fdf52e5c198a530722d46d8b3207e7faffe840de53a9494f3119bb56c3a8e11a4d693f0
 SHA512 
46bb88ebcf7697e42194e55ef1c323a94222e2870a98aa058d62e1d253c8ad15b14da268eece43b0cdb71d8cdbd2ff393ca451c45998245aaf1726bdffcc563f
 DIST postgis-3.2.5.tar.gz 16888933 BLAKE2B 
7d3deb984d7f7ee202abe5deff326debe20ff449f1712abafa2b8bbfd0e56bfbea69a6c16cd10694afd4831c1a0b8e1b9fca89c2748faf092b5402e830714a97
 SHA512 
7d9f3242aacfc0c071454550ed8683daa211cf29e4b60cf4c7e68fb59ef6e037ff6b53c1a8f5577d224b16cb04e430c47839d9b67097dc4c642312d2f5e485f7
+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.3.tar.gz 17790503 BLAKE2B 
d5390e3e0713b2f74db0c6d7f953681b49611937442f89cd316b43315257db0e0734b6cd23b750a88d9fe503c5348c98578e12cfe6fd8a382fc7817d641e89cf
 SHA512 
0025a8a5c6be7e18dfb97a6a04c468a9da2d6e99462d20eec7bddf4048b8f2fa1e8029be9f819950c910a6f89190e8295f10e8dab9b4885d03d3dbcce41380c2
+DIST postgis-3.3.4.tar.gz 18591029 BLAKE2B 
5aae3804b8abcaf8436cc57c53e288f68e317b5ab930a0651f2f55fc825f9c3d6cdf43b74cb7a845de385d019737759e6ef127587015f28851734ffeedbc64da
 SHA512 
b35811ffcb7fdddbe5d4714216f714b687f92e6984614f20c6bfd4a498e6422a3035fd0de9a0afd0a04c6999d8b8a68e0f93a5bb75f893fcb6d3c3f64fe65726
 DIST postgis-3.4.0.tar.gz 14693348 BLAKE2B 
a7ae007edb12a796f58b24ec8f72264e154900335a2da8c9358dcf0455a4ff183bb77036f45a77aa3533913ab2a802a4995ce17913ef355c52e5c1d8132c04a6
 SHA512 
d8c5329e5394bfe1d77a207d35cf8100217d39236cfeb228e268c796e16e24068df2191403830bf190b7ae9fabb21003675a091a8cc6dbfeed9b4b02cbbb9d33
+DIST postgis-3.4.1.tar.gz 14942851 BLAKE2B 
98ef490b08438c5ee35409a1c5c63d985d3024325d607a7a150b197aabb8b70ec8c4bd5134136f92a106e6b1c885e3adb99aa325282122bc37d84db0d83f
 SHA512 
66f460077066372276783d8e7acefb0d61ae5fbf7e2d3bbb7008d9289a65adfe78eb8431eee4bbdd3f8e5a9e37653e396d659f46bb285edab00ed57277fae2c7

diff --git a/dev-db/postgis/postgis-3.1.10.ebuild 
b/dev-db/postgis/postgis-3.1.10.ebuild
new file mode 100644
index ..d1478aa5d62d
--- /dev/null
+++ b/dev-db/postgis/postgis-3.1.10.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.6 {10..14} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/, dev-db/postgis/files/

2023-09-18 Thread Aaron W. Swenson
commit: 434e1dda744fed161cee7fa6c3a23060d152db4b
Author: Chris Mayo  gmail  com>
AuthorDate: Sat Sep 16 16:44:03 2023 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Mon Sep 18 10:42:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=434e1dda

dev-db/postgis: Fix --without-gui being ignored

Signed-off-by: Chris Mayo  gmail.com>
Signed-off-by: Aaron W. Swenson  gentoo.org>

 .../postgis/files/postgis-3.4.0-without-gui.patch  |  13 ++
 dev-db/postgis/postgis-3.4.0-r2.ebuild | 143 +
 2 files changed, 156 insertions(+)

diff --git a/dev-db/postgis/files/postgis-3.4.0-without-gui.patch 
b/dev-db/postgis/files/postgis-3.4.0-without-gui.patch
new file mode 100644
index ..80a6d59be323
--- /dev/null
+++ b/dev-db/postgis/files/postgis-3.4.0-without-gui.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 0fd6d5d6b..4ea8330ef 100644
+--- a/configure.ac
 b/configure.ac
+@@ -1161,7 +1161,7 @@ dnl 
===
+ 
+ AC_ARG_WITH([gui],
+   [AS_HELP_STRING([--with-gui], [compile the data import GUI (requires 
GTK+2.0)])],
+-  [GUI="yes"], [GUI="no"])
++  [GUI="$withval"], [GUI="no"])
+ 
+ if test "x$GUI" = "xyes"; then
+   AC_MSG_RESULT([GUI: Build requested, checking for dependencies 
(GTK+2.0)])

diff --git a/dev-db/postgis/postgis-3.4.0-r2.ebuild 
b/dev-db/postgis/postgis-3.4.0-r2.ebuild
new file mode 100644
index ..b9539be3fb62
--- /dev/null
+++ b/dev-db/postgis/postgis-3.4.0-r2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( {12..16} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs topology"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.9.0
+   >=sci-libs/proj-6.1.0:=
+   >=sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre2 )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+"
+
+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() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   # bug #775968
+   touch build-aux/ar-lib || die
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   export CPP=$(tc-getCPP)
+
+   local myeconfargs=(
+   $(use_with address-standardizer)
+   $(use_with gtk gui)
+   $(use_with topology)
+   )
+   postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_foreach emake cheatsheets
+   postgres-multi_forbest emake -C doc html
+   fi
+}
+
+src_install() {
+   postgres-multi_foreach emake DESTDIR="${D}" install
+   postgres-multi_foreach emake -C topology DESTDIR="${D}" install
+   postgres-multi_forbest dobin ./utils/postgis_restore.pl
+
+   dodoc CREDITS TODO loader/README.* doc/*txt
+
+   docinto topology
+   dodoc topology/{TODO,README}
+
+   if use doc ; then
+   postgres-multi_foreach emake DESTDIR="${D}" comments-install
+
+   docinto html
+   post

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2023-09-18 Thread Aaron W. Swenson
commit: af53d4638808515ea0e55ce4a1dc86ee592ead00
Author: Chris Mayo  gmail  com>
AuthorDate: Sat Sep 16 16:44:03 2023 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Mon Sep 18 10:42:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af53d463

dev-db/postgis: Install missing images and cheatsheets

Closes: https://bugs.gentoo.org/832939
Signed-off-by: Chris Mayo  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32843
Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/postgis/postgis-3.4.0-r2.ebuild | 9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/dev-db/postgis/postgis-3.4.0-r2.ebuild 
b/dev-db/postgis/postgis-3.4.0-r2.ebuild
index b9539be3fb62..515b220b2b43 100644
--- a/dev-db/postgis/postgis-3.4.0-r2.ebuild
+++ b/dev-db/postgis/postgis-3.4.0-r2.ebuild
@@ -98,7 +98,7 @@ src_compile() {
 
if use doc ; then
postgres-multi_foreach emake comments
-   postgres-multi_foreach emake cheatsheets
+   postgres-multi_forbest emake cheatsheets
postgres-multi_forbest emake -C doc html
fi
 }
@@ -115,12 +115,7 @@ src_install() {
 
if use doc ; then
postgres-multi_foreach emake DESTDIR="${D}" comments-install
-
-   docinto html
-   postgres-multi_forbest dodoc 
doc/html/{postgis-en.html,style.css}
-
-   docinto html/images
-   postgres-multi_forbest dodoc -r doc/html/images/*
+   postgres-multi_forbest emake DESTDIR="${D}" -C doc 
cheatsheet-install html-install html-assets-install
fi
 
use static-libs || find "${ED}" -name '*.a' -delete



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2023-09-14 Thread 罗百科
commit: f8a6f514995e106fd0e2bcc2d05d57602ba8d74e
Author: Patrick Lauer  gentoo  org>
AuthorDate: Thu Sep 14 15:11:32 2023 +
Commit: 罗百科  gentoo  org>
CommitDate: Thu Sep 14 16:37:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8a6f514

dev-db/postgis: Support postgres-16

Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/postgis-3.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/postgis-3.4.0-r1.ebuild 
b/dev-db/postgis/postgis-3.4.0-r1.ebuild
index 8fb5dce4704e..380ebb720957 100644
--- a/dev-db/postgis/postgis-3.4.0-r1.ebuild
+++ b/dev-db/postgis/postgis-3.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-POSTGRES_COMPAT=( {12..15} )
+POSTGRES_COMPAT=( {12..16} )
 POSTGRES_USEDEP="server"
 inherit autotools postgres-multi toolchain-funcs
 



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2023-09-04 Thread 罗百科
commit: 83938f1565bfde088a781be9e5479c86ad363b3f
Author: Patrick Lauer  gentoo  org>
AuthorDate: Mon Sep  4 10:55:46 2023 +
Commit: 罗百科  gentoo  org>
CommitDate: Mon Sep  4 10:56:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83938f15

dev-db/postgis: Fix doc handling

Closes: https://bugs.gentoo.org/913611
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/{postgis-3.4.0.ebuild => postgis-3.4.0-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/postgis/postgis-3.4.0.ebuild 
b/dev-db/postgis/postgis-3.4.0-r1.ebuild
similarity index 96%
rename from dev-db/postgis/postgis-3.4.0.ebuild
rename to dev-db/postgis/postgis-3.4.0-r1.ebuild
index 71073376f6c7..8fb5dce4704e 100644
--- a/dev-db/postgis/postgis-3.4.0.ebuild
+++ b/dev-db/postgis/postgis-3.4.0-r1.ebuild
@@ -116,10 +116,10 @@ src_install() {
postgres-multi_foreach emake DESTDIR="${D}" comments-install
 
docinto html
-   postgres-multi_forbest dodoc doc/html/{postgis.html,style.css}
+   postgres-multi_forbest dodoc 
doc/html/{postgis-en.html,style.css}
 
docinto html/images
-   postgres-multi_forbest dodoc doc/html/images/*
+   postgres-multi_forbest dodoc -r doc/html/images/*
fi
 
use static-libs || find "${ED}" -name '*.a' -delete



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2023-09-04 Thread 罗百科
commit: abb9e2e02510515f19c690f8d8fed26d085ee6c0
Author: Patrick Lauer  gentoo  org>
AuthorDate: Mon Sep  4 07:54:22 2023 +
Commit: 罗百科  gentoo  org>
CommitDate: Mon Sep  4 07:55:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abb9e2e0

dev-db/postgis: add 3.4.0, drop 3.4.0_rc1

Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest   | 2 +-
 dev-db/postgis/{postgis-3.4.0_rc1.ebuild => postgis-3.4.0.ebuild} | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 726c864d1bc6..52ca3f2abb36 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -4,4 +4,4 @@ DIST postgis-3.2.4.tar.gz 16885605 BLAKE2B 
341bf09bf5adffc6c48b0fdc6930bac25e431
 DIST postgis-3.2.5.tar.gz 16888933 BLAKE2B 
7d3deb984d7f7ee202abe5deff326debe20ff449f1712abafa2b8bbfd0e56bfbea69a6c16cd10694afd4831c1a0b8e1b9fca89c2748faf092b5402e830714a97
 SHA512 
7d9f3242aacfc0c071454550ed8683daa211cf29e4b60cf4c7e68fb59ef6e037ff6b53c1a8f5577d224b16cb04e430c47839d9b67097dc4c642312d2f5e485f7
 DIST postgis-3.3.2.tar.gz 17793976 BLAKE2B 
40dc7636f04e0d5cfd734b175da1ce49c32e4b8f5750059e79e03a7395fb8b9241c1f479815794b46dee81704d7c392fe7693c9f0180323d1ca21812c37d36b5
 SHA512 
4dd129057598b032ba322c42888bb8ce14b9423bd450ef7a42fa22162f6b48e34b226f38480aa67fe2da85be2529b0822655855f9846b657bdd32f50256f4305
 DIST postgis-3.3.3.tar.gz 17790503 BLAKE2B 
d5390e3e0713b2f74db0c6d7f953681b49611937442f89cd316b43315257db0e0734b6cd23b750a88d9fe503c5348c98578e12cfe6fd8a382fc7817d641e89cf
 SHA512 
0025a8a5c6be7e18dfb97a6a04c468a9da2d6e99462d20eec7bddf4048b8f2fa1e8029be9f819950c910a6f89190e8295f10e8dab9b4885d03d3dbcce41380c2
-DIST postgis-3.4.0rc1.tar.gz 14694968 BLAKE2B 
31e5189906a24c4a5f3fa4906021ef02fbc0d1ca799134744d35be11f29fd465df403411ef047e48fe81931a2b67b792ebb2e34e40e0b8850be88e8cdc264b56
 SHA512 
ea6755ae28840c0088eed7736d3af8b6e91a1332a14d3ebf63a2710bc414b5d0484981bf97e9d63fad497addaafbad30bd7775e853e3c2cbad2d1663f12c07a6
+DIST postgis-3.4.0.tar.gz 14693348 BLAKE2B 
a7ae007edb12a796f58b24ec8f72264e154900335a2da8c9358dcf0455a4ff183bb77036f45a77aa3533913ab2a802a4995ce17913ef355c52e5c1d8132c04a6
 SHA512 
d8c5329e5394bfe1d77a207d35cf8100217d39236cfeb228e268c796e16e24068df2191403830bf190b7ae9fabb21003675a091a8cc6dbfeed9b4b02cbbb9d33

diff --git a/dev-db/postgis/postgis-3.4.0_rc1.ebuild 
b/dev-db/postgis/postgis-3.4.0.ebuild
similarity index 97%
rename from dev-db/postgis/postgis-3.4.0_rc1.ebuild
rename to dev-db/postgis/postgis-3.4.0.ebuild
index 70077d7465ab..71073376f6c7 100644
--- a/dev-db/postgis/postgis-3.4.0_rc1.ebuild
+++ b/dev-db/postgis/postgis-3.4.0.ebuild
@@ -15,8 +15,7 @@ if [[ ${PV} = ** ]] ; 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=""
+   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Geographic Objects for PostgreSQL"
@@ -38,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-6.1.0:=
>=sci-libs/gdal-1.10.0:=
address-standardizer? ( dev-libs/libpcre2 )
gtk? ( x11-libs/gtk+:2 )



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2023-08-07 Thread 罗百科
commit: f1c707f3c8ff831c1bda5382adcb0e75dbdd949d
Author: Patrick Lauer  gentoo  org>
AuthorDate: Mon Aug  7 10:24:55 2023 +
Commit: 罗百科  gentoo  org>
CommitDate: Mon Aug  7 10:27:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1c707f3

dev-db/postgis: add 3.4.0_rc1

Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   1 +
 dev-db/postgis/postgis-3.4.0_rc1.ebuild | 143 
 2 files changed, 144 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 1f85dd3a7524..726c864d1bc6 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -4,3 +4,4 @@ DIST postgis-3.2.4.tar.gz 16885605 BLAKE2B 
341bf09bf5adffc6c48b0fdc6930bac25e431
 DIST postgis-3.2.5.tar.gz 16888933 BLAKE2B 
7d3deb984d7f7ee202abe5deff326debe20ff449f1712abafa2b8bbfd0e56bfbea69a6c16cd10694afd4831c1a0b8e1b9fca89c2748faf092b5402e830714a97
 SHA512 
7d9f3242aacfc0c071454550ed8683daa211cf29e4b60cf4c7e68fb59ef6e037ff6b53c1a8f5577d224b16cb04e430c47839d9b67097dc4c642312d2f5e485f7
 DIST postgis-3.3.2.tar.gz 17793976 BLAKE2B 
40dc7636f04e0d5cfd734b175da1ce49c32e4b8f5750059e79e03a7395fb8b9241c1f479815794b46dee81704d7c392fe7693c9f0180323d1ca21812c37d36b5
 SHA512 
4dd129057598b032ba322c42888bb8ce14b9423bd450ef7a42fa22162f6b48e34b226f38480aa67fe2da85be2529b0822655855f9846b657bdd32f50256f4305
 DIST postgis-3.3.3.tar.gz 17790503 BLAKE2B 
d5390e3e0713b2f74db0c6d7f953681b49611937442f89cd316b43315257db0e0734b6cd23b750a88d9fe503c5348c98578e12cfe6fd8a382fc7817d641e89cf
 SHA512 
0025a8a5c6be7e18dfb97a6a04c468a9da2d6e99462d20eec7bddf4048b8f2fa1e8029be9f819950c910a6f89190e8295f10e8dab9b4885d03d3dbcce41380c2
+DIST postgis-3.4.0rc1.tar.gz 14694968 BLAKE2B 
31e5189906a24c4a5f3fa4906021ef02fbc0d1ca799134744d35be11f29fd465df403411ef047e48fe81931a2b67b792ebb2e34e40e0b8850be88e8cdc264b56
 SHA512 
ea6755ae28840c0088eed7736d3af8b6e91a1332a14d3ebf63a2710bc414b5d0484981bf97e9d63fad497addaafbad30bd7775e853e3c2cbad2d1663f12c07a6

diff --git a/dev-db/postgis/postgis-3.4.0_rc1.ebuild 
b/dev-db/postgis/postgis-3.4.0_rc1.ebuild
new file mode 100644
index ..70077d7465ab
--- /dev/null
+++ b/dev-db/postgis/postgis-3.4.0_rc1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( {12..15} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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=""
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs topology"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.9.0
+   >=sci-libs/proj-4.9.0:=
+   >=sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre2 )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+   # source: https://github.com/google/flatbuffers/pull/7897
+   #"${FILESDIR}/${PN}-3.3.2-flatbuffers-abseil-2023.patch" # bug 905378
+)
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   # bug #775968
+   touch build-aux/ar-lib || die
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   export CPP=$(tc-getCPP)
+
+   local myeconfargs=(
+   $(use_with address-standardizer)
+   $(use_with gtk gui)
+   $(use_with topology)
+   )
+   postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+ 

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2023-06-02 Thread 罗百科
commit: 93c67253fdc54d485979931a9df03402ed118399
Author: Patrick Lauer  gentoo  org>
AuthorDate: Fri Jun  2 15:20:09 2023 +
Commit: 罗百科  gentoo  org>
CommitDate: Fri Jun  2 15:20:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93c67253

dev-db/postgis: add 3.1.9, 3.2.5, 3.3.3

Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   3 +
 dev-db/postgis/postgis-3.1.9.ebuild | 143 
 dev-db/postgis/postgis-3.2.5.ebuild | 142 +++
 dev-db/postgis/postgis-3.3.3.ebuild | 142 +++
 4 files changed, 430 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index e77fd811fa62..1f85dd3a7524 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,3 +1,6 @@
 DIST postgis-3.1.8.tar.gz 17285335 BLAKE2B 
212a74866de5b8788b91cfa6d8b3a064df2933c76c8930e3c7bba310b36b4e7249de2d7481e852679da59bb9bdb3315752b62ad70176601b7110401f368200bc
 SHA512 
c28befe1f77e7f36d63b39d027024d3f8abe8496c64c4b3c05eb7c32c3a885e824cabdda5bf0f9f320b9fe15bb97f21d5dfb65a193c64b1e27be95badefe3b37
+DIST postgis-3.1.9.tar.gz 17289185 BLAKE2B 
a331df130aa8becb4a25e84751f9fcdd494816d8287ade8983bc429eff42c1b98037d07358c4b7e3b9e3daee63aa59ea36f0ae49c5d00bdae9b993526544014a
 SHA512 
b0fd0e7311c7a7672f23d4dc1732c884c7d0766f0f1c0a7e53750bd5fc4d39872dca08f5a5dfc58745fe4c80bb42b2420b63a4cbe76cac02f8e36d8cc9771623
 DIST postgis-3.2.4.tar.gz 16885605 BLAKE2B 
341bf09bf5adffc6c48b0fdc6930bac25e43184357895bb90adf000f4fdf52e5c198a530722d46d8b3207e7faffe840de53a9494f3119bb56c3a8e11a4d693f0
 SHA512 
46bb88ebcf7697e42194e55ef1c323a94222e2870a98aa058d62e1d253c8ad15b14da268eece43b0cdb71d8cdbd2ff393ca451c45998245aaf1726bdffcc563f
+DIST postgis-3.2.5.tar.gz 16888933 BLAKE2B 
7d3deb984d7f7ee202abe5deff326debe20ff449f1712abafa2b8bbfd0e56bfbea69a6c16cd10694afd4831c1a0b8e1b9fca89c2748faf092b5402e830714a97
 SHA512 
7d9f3242aacfc0c071454550ed8683daa211cf29e4b60cf4c7e68fb59ef6e037ff6b53c1a8f5577d224b16cb04e430c47839d9b67097dc4c642312d2f5e485f7
 DIST postgis-3.3.2.tar.gz 17793976 BLAKE2B 
40dc7636f04e0d5cfd734b175da1ce49c32e4b8f5750059e79e03a7395fb8b9241c1f479815794b46dee81704d7c392fe7693c9f0180323d1ca21812c37d36b5
 SHA512 
4dd129057598b032ba322c42888bb8ce14b9423bd450ef7a42fa22162f6b48e34b226f38480aa67fe2da85be2529b0822655855f9846b657bdd32f50256f4305
+DIST postgis-3.3.3.tar.gz 17790503 BLAKE2B 
d5390e3e0713b2f74db0c6d7f953681b49611937442f89cd316b43315257db0e0734b6cd23b750a88d9fe503c5348c98578e12cfe6fd8a382fc7817d641e89cf
 SHA512 
0025a8a5c6be7e18dfb97a6a04c468a9da2d6e99462d20eec7bddf4048b8f2fa1e8029be9f819950c910a6f89190e8295f10e8dab9b4885d03d3dbcce41380c2

diff --git a/dev-db/postgis/postgis-3.1.9.ebuild 
b/dev-db/postgis/postgis-3.1.9.ebuild
new file mode 100644
index ..d1478aa5d62d
--- /dev/null
+++ b/dev-db/postgis/postgis-3.1.9.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.6 {10..14} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs topology"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.9.0
+   >=sci-libs/proj-4.9.0:=
+   >=sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre2 )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+   "${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
+   "${FILESDIR}/${PN}-3.0.3-detect-only-stdc.patch"
+   "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+)
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAG

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/files/, dev-db/postgis/

2023-05-29 Thread Andreas Sturmlechner
commit: dc10ecae76251e05914bdd47a9728a42ef0cc853
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon May 29 18:50:28 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon May 29 19:09:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc10ecae

dev-db/postgis: Fix build with dev-cpp/abseil-cpp-20230125.2

Closes: https://bugs.gentoo.org/905378
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../postgis-3.3.2-flatbuffers-abseil-2023.patch| 39 ++
 dev-db/postgis/postgis-3.3.2-r1.ebuild |  2 ++
 2 files changed, 41 insertions(+)

diff --git a/dev-db/postgis/files/postgis-3.3.2-flatbuffers-abseil-2023.patch 
b/dev-db/postgis/files/postgis-3.3.2-flatbuffers-abseil-2023.patch
new file mode 100644
index ..670361b5b29e
--- /dev/null
+++ b/dev-db/postgis/files/postgis-3.3.2-flatbuffers-abseil-2023.patch
@@ -0,0 +1,39 @@
+From 411abb7014b05b809c0644f196425af1028e7ad3 Mon Sep 17 00:00:00 2001
+From: Berke 
+Date: Fri, 7 Apr 2023 22:05:45 +0300
+Subject: [PATCH] additional check for absl::string_view availability
+
+absl::string_view is uses std::string_view when available. It already checks 
if std::string_view is available in the earlier code.
+It should only use absl::string_view implementation.
+---
+ deps/flatgeobuf/include/flatbuffers/base.h | 17 +++--
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/deps/flatgeobuf/include/flatbuffers/base.h 
b/deps/flatgeobuf/include/flatbuffers/base.h
+index bc64f18ad93..98a02262c2b 100644
+--- a/deps/flatgeobuf/include/flatbuffers/base.h
 b/deps/flatgeobuf/include/flatbuffers/base.h
+@@ -233,12 +233,17 @@ namespace flatbuffers {
+   }
+   #define FLATBUFFERS_HAS_STRING_VIEW 1
+ // Check for absl::string_view
+-#elif __has_include("absl/strings/string_view.h")
+-  #include "absl/strings/string_view.h"
+-  namespace flatbuffers {
+-typedef absl::string_view string_view;
+-  }
+-  #define FLATBUFFERS_HAS_STRING_VIEW 1
++#elif __has_include("absl/strings/string_view.h") && \
++  __has_include("absl/base/config.h") && \
++  (__cplusplus >= 201411)
++  #include "absl/base/config.h"
++  #if !defined(ABSL_USES_STD_STRING_VIEW)
++#include "absl/strings/string_view.h"
++namespace flatbuffers {
++  typedef absl::string_view string_view;
++}
++#define FLATBUFFERS_HAS_STRING_VIEW 1
++  #endif
+ #endif
+   #endif // __has_include
+ #endif // !FLATBUFFERS_HAS_STRING_VIEW

diff --git a/dev-db/postgis/postgis-3.3.2-r1.ebuild 
b/dev-db/postgis/postgis-3.3.2-r1.ebuild
index 40199711aa2c..5e948c1a6828 100644
--- a/dev-db/postgis/postgis-3.3.2-r1.ebuild
+++ b/dev-db/postgis/postgis-3.3.2-r1.ebuild
@@ -54,6 +54,8 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+   # source: https://github.com/google/flatbuffers/pull/7897
+   "${FILESDIR}/${P}-flatbuffers-abseil-2023.patch" # bug 905378
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2023-05-28 Thread Sam James
commit: ebda79b9dd5dd0fb064597d5f09572134781bdbd
Author: Sam James  gentoo  org>
AuthorDate: Sun May 28 23:32:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 28 23:32:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebda79b9

dev-db/postgis: Stabilize 3.3.2-r1 amd64, #906324

Signed-off-by: Sam James  gentoo.org>

 dev-db/postgis/postgis-3.3.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/postgis-3.3.2-r1.ebuild 
b/dev-db/postgis/postgis-3.3.2-r1.ebuild
index e17b85ed46fe..31d2db59a3f6 100644
--- a/dev-db/postgis/postgis-3.3.2-r1.ebuild
+++ b/dev-db/postgis/postgis-3.3.2-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = ** ]] ; 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"



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2023-05-18 Thread Andreas Sturmlechner
commit: b51d24c7aa427677f11e46f535539e6c2ad4a899
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 18 14:06:45 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 18 15:41:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b51d24c7

dev-db/postgis: drop 3.1.3

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/postgis/Manifest |   1 -
 dev-db/postgis/postgis-3.1.3.ebuild | 143 
 2 files changed, 144 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 7cc0641ef87b..e77fd811fa62 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,4 +1,3 @@
-DIST postgis-3.1.3.tar.gz 17273487 BLAKE2B 
603be66476037fca5e75b00079a26b4beaa50f0af0626f89660f17da398576d929574cb363c4177877d9c8db5459f7eac964b85796cd93b0d0c6ff2462d7ad3f
 SHA512 
525c982de6b5888d1f4a4f6d2cca5dfa945d8899d8038b1d62ce222e0149c4ab26a2a3602bb8c85e89ce22b3d5b20d278fc4f841144f4b0d19e6de4f48d819ad
 DIST postgis-3.1.8.tar.gz 17285335 BLAKE2B 
212a74866de5b8788b91cfa6d8b3a064df2933c76c8930e3c7bba310b36b4e7249de2d7481e852679da59bb9bdb3315752b62ad70176601b7110401f368200bc
 SHA512 
c28befe1f77e7f36d63b39d027024d3f8abe8496c64c4b3c05eb7c32c3a885e824cabdda5bf0f9f320b9fe15bb97f21d5dfb65a193c64b1e27be95badefe3b37
 DIST postgis-3.2.4.tar.gz 16885605 BLAKE2B 
341bf09bf5adffc6c48b0fdc6930bac25e43184357895bb90adf000f4fdf52e5c198a530722d46d8b3207e7faffe840de53a9494f3119bb56c3a8e11a4d693f0
 SHA512 
46bb88ebcf7697e42194e55ef1c323a94222e2870a98aa058d62e1d253c8ad15b14da268eece43b0cdb71d8cdbd2ff393ca451c45998245aaf1726bdffcc563f
 DIST postgis-3.3.2.tar.gz 17793976 BLAKE2B 
40dc7636f04e0d5cfd734b175da1ce49c32e4b8f5750059e79e03a7395fb8b9241c1f479815794b46dee81704d7c392fe7693c9f0180323d1ca21812c37d36b5
 SHA512 
4dd129057598b032ba322c42888bb8ce14b9423bd450ef7a42fa22162f6b48e34b226f38480aa67fe2da85be2529b0822655855f9846b657bdd32f50256f4305

diff --git a/dev-db/postgis/postgis-3.1.3.ebuild 
b/dev-db/postgis/postgis-3.1.3.ebuild
deleted file mode 100644
index 41f7b8feb92f..
--- a/dev-db/postgis/postgis-3.1.3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 9.6 {10..13} )
-POSTGRES_USEDEP="server"
-inherit autotools postgres-multi toolchain-funcs
-
-MY_P="${PN}-$(ver_rs 3 '')"
-
-if [[ ${PV} = ** ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
-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"
-fi
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="https://postgis.net";
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="address-standardizer doc gtk static-libs topology"
-
-REQUIRED_USE="${POSTGRES_REQ_USE}"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-RDEPEND="${POSTGRES_DEP}
-   dev-libs/json-c:=
-   dev-libs/libxml2:2
-   dev-libs/protobuf-c:=
-   >=sci-libs/geos-3.9.0
-   >=sci-libs/proj-4.9.0:=
-   >=sci-libs/gdal-1.10.0:=
-   address-standardizer? ( dev-libs/libpcre )
-   gtk? ( x11-libs/gtk+:2 )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   doc? (
-   app-text/docbook-xsl-stylesheets
-   app-text/docbook-xml-dtd:4.5
-   dev-libs/libxslt
-   virtual/imagemagick-tools[png]
-   )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.2.0-arflags.patch"
-   "${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
-   "${FILESDIR}/${PN}-3.0.3-detect-only-stdc.patch"
-   "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
-)
-
-src_prepare() {
-   default
-
-   if [[ ${PV} = ** ]] ; then
-   source "${S}"/Version.config
-   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
-   fi
-
-   # These modules are built using the same *FLAGS that were used to build
-   # dev-db/postgresql. The right thing to do is to ignore the current
-   # *FLAGS settings.
-   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-   # bug #775968
-   touch build-aux/ar-lib || die
-
-   local AT_M4DIR="macros"
-   eautoreconf
-
-   postgres-multi_src_prepare
-}
-
-src_configure() {
-   export CPP=$(tc-getCPP)
-
-   local myeconfargs=(
-   $(use_with address-standardizer)
-   $(use_with gtk gui)
-   $(use_with topology)
-   )
-   postgres-multi_foreach econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-   postgres-multi_foreach emake
-   postgres-multi_foreach emake -C topology
-
-   if use doc ; then
-   postgres-multi_foreach emake comments
-   postgres-multi_foreach emake cheatsheets
-   

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2023-05-01 Thread David Seifert
commit: 5a74f524709ca1ca6cc43cd627a88ccebad9bd81
Author: David Seifert  gentoo  org>
AuthorDate: Mon May  1 15:55:40 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon May  1 15:55:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a74f524

Reverts: [QA] 8b443b6 (dev-db/postgis: Add blocker for dev-cpp/abseil-cpp)

* Hard blockers are terrible UX and are a sin unto our users.
* This is a lazy fix instead of porting the package to a more recent
  version of C++.

Bug: https://bugs.gentoo.org/905378
Signed-off-by: David Seifert  gentoo.org>

 dev-db/postgis/postgis-3.1.3.ebuild| 3 +--
 dev-db/postgis/postgis-3.1.8-r1.ebuild | 1 -
 dev-db/postgis/postgis-3.2.4-r1.ebuild | 1 -
 dev-db/postgis/postgis-3.3.2-r1.ebuild | 1 -
 dev-db/postgis/postgis-.ebuild | 1 -
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/dev-db/postgis/postgis-3.1.3.ebuild 
b/dev-db/postgis/postgis-3.1.3.ebuild
index ab7bb727bd5a..41f7b8feb92f 100644
--- a/dev-db/postgis/postgis-3.1.3.ebuild
+++ b/dev-db/postgis/postgis-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,7 +43,6 @@ RDEPEND="${POSTGRES_DEP}
gtk? ( x11-libs/gtk+:2 )
 "
 DEPEND="${RDEPEND}
-   !!dev-cpp/abseil-cpp
virtual/pkgconfig
doc? (
app-text/docbook-xsl-stylesheets

diff --git a/dev-db/postgis/postgis-3.1.8-r1.ebuild 
b/dev-db/postgis/postgis-3.1.8-r1.ebuild
index 29ee2f8be6e0..ad3b284701bd 100644
--- a/dev-db/postgis/postgis-3.1.8-r1.ebuild
+++ b/dev-db/postgis/postgis-3.1.8-r1.ebuild
@@ -43,7 +43,6 @@ RDEPEND="${POSTGRES_DEP}
gtk? ( x11-libs/gtk+:2 )
 "
 DEPEND="${RDEPEND}
-   !!dev-cpp/abseil-cpp
virtual/pkgconfig
doc? (
app-text/docbook-xsl-stylesheets

diff --git a/dev-db/postgis/postgis-3.2.4-r1.ebuild 
b/dev-db/postgis/postgis-3.2.4-r1.ebuild
index 87ae6847aa3c..82013b188b93 100644
--- a/dev-db/postgis/postgis-3.2.4-r1.ebuild
+++ b/dev-db/postgis/postgis-3.2.4-r1.ebuild
@@ -43,7 +43,6 @@ RDEPEND="${POSTGRES_DEP}
gtk? ( x11-libs/gtk+:2 )
 "
 DEPEND="${RDEPEND}
-   !!dev-cpp/abseil-cpp
virtual/pkgconfig
doc? (
app-text/docbook-xsl-stylesheets

diff --git a/dev-db/postgis/postgis-3.3.2-r1.ebuild 
b/dev-db/postgis/postgis-3.3.2-r1.ebuild
index 5b2e0e68b16f..e17b85ed46fe 100644
--- a/dev-db/postgis/postgis-3.3.2-r1.ebuild
+++ b/dev-db/postgis/postgis-3.3.2-r1.ebuild
@@ -43,7 +43,6 @@ RDEPEND="${POSTGRES_DEP}
gtk? ( x11-libs/gtk+:2 )
 "
 DEPEND="${RDEPEND}
-   !!dev-cpp/abseil-cpp
virtual/pkgconfig
doc? (
app-text/docbook-xsl-stylesheets

diff --git a/dev-db/postgis/postgis-.ebuild 
b/dev-db/postgis/postgis-.ebuild
index 87ae6847aa3c..82013b188b93 100644
--- a/dev-db/postgis/postgis-.ebuild
+++ b/dev-db/postgis/postgis-.ebuild
@@ -43,7 +43,6 @@ RDEPEND="${POSTGRES_DEP}
gtk? ( x11-libs/gtk+:2 )
 "
 DEPEND="${RDEPEND}
-   !!dev-cpp/abseil-cpp
virtual/pkgconfig
doc? (
app-text/docbook-xsl-stylesheets



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2023-05-01 Thread 罗百科
commit: 8b443b69f39a883db7fecda54e216f578c0e0ae6
Author: Patrick Lauer  gentoo  org>
AuthorDate: Mon May  1 15:19:03 2023 +
Commit: 罗百科  gentoo  org>
CommitDate: Mon May  1 15:19:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b443b69

dev-db/postgis: Add blocker for dev-cpp/abseil-cpp

Closes: https://bugs.gentoo.org/905378
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/postgis-3.1.3.ebuild| 3 ++-
 dev-db/postgis/postgis-3.1.8-r1.ebuild | 1 +
 dev-db/postgis/postgis-3.2.4-r1.ebuild | 1 +
 dev-db/postgis/postgis-3.3.2-r1.ebuild | 1 +
 dev-db/postgis/postgis-.ebuild | 1 +
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev-db/postgis/postgis-3.1.3.ebuild 
b/dev-db/postgis/postgis-3.1.3.ebuild
index 41f7b8feb92f..ab7bb727bd5a 100644
--- a/dev-db/postgis/postgis-3.1.3.ebuild
+++ b/dev-db/postgis/postgis-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,6 +43,7 @@ RDEPEND="${POSTGRES_DEP}
gtk? ( x11-libs/gtk+:2 )
 "
 DEPEND="${RDEPEND}
+   !!dev-cpp/abseil-cpp
virtual/pkgconfig
doc? (
app-text/docbook-xsl-stylesheets

diff --git a/dev-db/postgis/postgis-3.1.8-r1.ebuild 
b/dev-db/postgis/postgis-3.1.8-r1.ebuild
index ad3b284701bd..29ee2f8be6e0 100644
--- a/dev-db/postgis/postgis-3.1.8-r1.ebuild
+++ b/dev-db/postgis/postgis-3.1.8-r1.ebuild
@@ -43,6 +43,7 @@ RDEPEND="${POSTGRES_DEP}
gtk? ( x11-libs/gtk+:2 )
 "
 DEPEND="${RDEPEND}
+   !!dev-cpp/abseil-cpp
virtual/pkgconfig
doc? (
app-text/docbook-xsl-stylesheets

diff --git a/dev-db/postgis/postgis-3.2.4-r1.ebuild 
b/dev-db/postgis/postgis-3.2.4-r1.ebuild
index 82013b188b93..87ae6847aa3c 100644
--- a/dev-db/postgis/postgis-3.2.4-r1.ebuild
+++ b/dev-db/postgis/postgis-3.2.4-r1.ebuild
@@ -43,6 +43,7 @@ RDEPEND="${POSTGRES_DEP}
gtk? ( x11-libs/gtk+:2 )
 "
 DEPEND="${RDEPEND}
+   !!dev-cpp/abseil-cpp
virtual/pkgconfig
doc? (
app-text/docbook-xsl-stylesheets

diff --git a/dev-db/postgis/postgis-3.3.2-r1.ebuild 
b/dev-db/postgis/postgis-3.3.2-r1.ebuild
index e17b85ed46fe..5b2e0e68b16f 100644
--- a/dev-db/postgis/postgis-3.3.2-r1.ebuild
+++ b/dev-db/postgis/postgis-3.3.2-r1.ebuild
@@ -43,6 +43,7 @@ RDEPEND="${POSTGRES_DEP}
gtk? ( x11-libs/gtk+:2 )
 "
 DEPEND="${RDEPEND}
+   !!dev-cpp/abseil-cpp
virtual/pkgconfig
doc? (
app-text/docbook-xsl-stylesheets

diff --git a/dev-db/postgis/postgis-.ebuild 
b/dev-db/postgis/postgis-.ebuild
index 82013b188b93..87ae6847aa3c 100644
--- a/dev-db/postgis/postgis-.ebuild
+++ b/dev-db/postgis/postgis-.ebuild
@@ -43,6 +43,7 @@ RDEPEND="${POSTGRES_DEP}
gtk? ( x11-libs/gtk+:2 )
 "
 DEPEND="${RDEPEND}
+   !!dev-cpp/abseil-cpp
virtual/pkgconfig
doc? (
app-text/docbook-xsl-stylesheets



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2023-01-21 Thread Sam James
commit: a97112906db96e0c7a6c6d4ba3cb78d4aa45620c
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 22 06:37:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 22 06:37:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9711290

dev-db/postgis: Stabilize 3.1.8-r1 x86, #886565

Signed-off-by: Sam James  gentoo.org>

 dev-db/postgis/postgis-3.1.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/postgis-3.1.8-r1.ebuild 
b/dev-db/postgis/postgis-3.1.8-r1.ebuild
index d1478aa5d62d..3162c974e83e 100644
--- a/dev-db/postgis/postgis-3.1.8-r1.ebuild
+++ b/dev-db/postgis/postgis-3.1.8-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = ** ]] ; 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"



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2023-01-21 Thread Sam James
commit: 060cd3f9e1e720e71d4a23cc48598a7f18c43331
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 22 06:37:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 22 06:37:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=060cd3f9

dev-db/postgis: Stabilize 3.1.8-r1 amd64, #886565

Signed-off-by: Sam James  gentoo.org>

 dev-db/postgis/postgis-3.1.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/postgis-3.1.8-r1.ebuild 
b/dev-db/postgis/postgis-3.1.8-r1.ebuild
index 3162c974e83e..ad3b284701bd 100644
--- a/dev-db/postgis/postgis-3.1.8-r1.ebuild
+++ b/dev-db/postgis/postgis-3.1.8-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = ** ]] ; 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"



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2023-01-09 Thread Sam James
commit: de5f60847e1099d09d68887157b74e682eb78ca5
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  9 08:24:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  9 09:45:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de5f6084

dev-db/postgis: use libpcre2

Closes: https://bugs.gentoo.org/838007
Signed-off-by: Sam James  gentoo.org>

 dev-db/postgis/{postgis-3.1.8.ebuild => postgis-3.1.8-r1.ebuild} | 4 ++--
 dev-db/postgis/{postgis-3.2.4.ebuild => postgis-3.2.4-r1.ebuild} | 4 ++--
 dev-db/postgis/{postgis-3.3.2.ebuild => postgis-3.3.2-r1.ebuild} | 4 ++--
 dev-db/postgis/postgis-.ebuild   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-db/postgis/postgis-3.1.8.ebuild 
b/dev-db/postgis/postgis-3.1.8-r1.ebuild
similarity index 97%
rename from dev-db/postgis/postgis-3.1.8.ebuild
rename to dev-db/postgis/postgis-3.1.8-r1.ebuild
index a5c0c0e58438..d1478aa5d62d 100644
--- a/dev-db/postgis/postgis-3.1.8.ebuild
+++ b/dev-db/postgis/postgis-3.1.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,7 @@ RDEPEND="${POSTGRES_DEP}
>=sci-libs/geos-3.9.0
>=sci-libs/proj-4.9.0:=
>=sci-libs/gdal-1.10.0:=
-   address-standardizer? ( dev-libs/libpcre )
+   address-standardizer? ( dev-libs/libpcre2 )
gtk? ( x11-libs/gtk+:2 )
 "
 DEPEND="${RDEPEND}

diff --git a/dev-db/postgis/postgis-3.2.4.ebuild 
b/dev-db/postgis/postgis-3.2.4-r1.ebuild
similarity index 97%
rename from dev-db/postgis/postgis-3.2.4.ebuild
rename to dev-db/postgis/postgis-3.2.4-r1.ebuild
index e3a71e39141c..82013b188b93 100644
--- a/dev-db/postgis/postgis-3.2.4.ebuild
+++ b/dev-db/postgis/postgis-3.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,7 @@ RDEPEND="${POSTGRES_DEP}
>=sci-libs/geos-3.9.0
>=sci-libs/proj-4.9.0:=
>=sci-libs/gdal-1.10.0:=
-   address-standardizer? ( dev-libs/libpcre )
+   address-standardizer? ( dev-libs/libpcre2 )
gtk? ( x11-libs/gtk+:2 )
 "
 DEPEND="${RDEPEND}

diff --git a/dev-db/postgis/postgis-3.3.2.ebuild 
b/dev-db/postgis/postgis-3.3.2-r1.ebuild
similarity index 97%
rename from dev-db/postgis/postgis-3.3.2.ebuild
rename to dev-db/postgis/postgis-3.3.2-r1.ebuild
index 94b626598275..e17b85ed46fe 100644
--- a/dev-db/postgis/postgis-3.3.2.ebuild
+++ b/dev-db/postgis/postgis-3.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,7 @@ RDEPEND="${POSTGRES_DEP}
>=sci-libs/geos-3.9.0
>=sci-libs/proj-4.9.0:=
>=sci-libs/gdal-1.10.0:=
-   address-standardizer? ( dev-libs/libpcre )
+   address-standardizer? ( dev-libs/libpcre2 )
gtk? ( x11-libs/gtk+:2 )
 "
 DEPEND="${RDEPEND}

diff --git a/dev-db/postgis/postgis-.ebuild 
b/dev-db/postgis/postgis-.ebuild
index 298c281eae44..82013b188b93 100644
--- a/dev-db/postgis/postgis-.ebuild
+++ b/dev-db/postgis/postgis-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,7 @@ RDEPEND="${POSTGRES_DEP}
>=sci-libs/geos-3.9.0
>=sci-libs/proj-4.9.0:=
>=sci-libs/gdal-1.10.0:=
-   address-standardizer? ( dev-libs/libpcre )
+   address-standardizer? ( dev-libs/libpcre2 )
gtk? ( x11-libs/gtk+:2 )
 "
 DEPEND="${RDEPEND}



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2022-12-18 Thread Sam James
commit: 1dca83bddf6570eba85578421ef3a3126a595386
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 18 08:29:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 18 08:30:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dca83bd

dev-db/postgis: drop 3.1.7, 3.2.3, 3.3.1

Signed-off-by: Sam James  gentoo.org>

 dev-db/postgis/Manifest |   3 -
 dev-db/postgis/postgis-3.1.7.ebuild | 143 
 dev-db/postgis/postgis-3.2.3.ebuild | 142 ---
 dev-db/postgis/postgis-3.3.1.ebuild | 140 ---
 4 files changed, 428 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index d449fd39a39b..7cc0641ef87b 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,7 +1,4 @@
 DIST postgis-3.1.3.tar.gz 17273487 BLAKE2B 
603be66476037fca5e75b00079a26b4beaa50f0af0626f89660f17da398576d929574cb363c4177877d9c8db5459f7eac964b85796cd93b0d0c6ff2462d7ad3f
 SHA512 
525c982de6b5888d1f4a4f6d2cca5dfa945d8899d8038b1d62ce222e0149c4ab26a2a3602bb8c85e89ce22b3d5b20d278fc4f841144f4b0d19e6de4f48d819ad
-DIST postgis-3.1.7.tar.gz 17286464 BLAKE2B 
b4611179f3e0dd9bd5f433773c39665698b38977d15baa4bbde7a6a4df96d37b72d13bfa1a62b639187c57a658c7b31d48a1b5dccfd4b08650749dfc832213d7
 SHA512 
2ae30e09cf1408e63fd5db24ff0360f0acb2277e9ad89486cb4e611bbb7e3912ae89235c4a045a6ddb3af55143693d13ed943db16e42c2ed5acb633bc163ee14
 DIST postgis-3.1.8.tar.gz 17285335 BLAKE2B 
212a74866de5b8788b91cfa6d8b3a064df2933c76c8930e3c7bba310b36b4e7249de2d7481e852679da59bb9bdb3315752b62ad70176601b7110401f368200bc
 SHA512 
c28befe1f77e7f36d63b39d027024d3f8abe8496c64c4b3c05eb7c32c3a885e824cabdda5bf0f9f320b9fe15bb97f21d5dfb65a193c64b1e27be95badefe3b37
-DIST postgis-3.2.3.tar.gz 16882282 BLAKE2B 
1f482f4411f3989bb7e389ae19b7c8e8d9f8b2c1689979d919d20feaa5c0dc46c009034fd06e89e2198e0f2234aaf2970f6f87303bde34dafbd78f818a880288
 SHA512 
f58b30af6d107578cb66de55bbeedc9ba503f85e5ead3f104e25a9d95a410e8c1a857936d805355a22185d5658e5908605fa9b317ed58497c29d752b70b4483e
 DIST postgis-3.2.4.tar.gz 16885605 BLAKE2B 
341bf09bf5adffc6c48b0fdc6930bac25e43184357895bb90adf000f4fdf52e5c198a530722d46d8b3207e7faffe840de53a9494f3119bb56c3a8e11a4d693f0
 SHA512 
46bb88ebcf7697e42194e55ef1c323a94222e2870a98aa058d62e1d253c8ad15b14da268eece43b0cdb71d8cdbd2ff393ca451c45998245aaf1726bdffcc563f
-DIST postgis-3.3.1.tar.gz 17750909 BLAKE2B 
b24bbddae8ecad21525d3542cce409803b5e4f33e18d17d1e5b6cd04d99b64340720d9e60602af2cce6f6c9636c9943d6a14d5a2e34b0d5c32f6e3d87e6590f8
 SHA512 
1d4cfff6e34bc6f790f1ea209ba4d7b2a7633bdc0a1d57bb7c8ef9850b4f08c2926116d2fdfe97379c7431c0ec1559002166cebc0074041e9ae1fad03301bdd8
 DIST postgis-3.3.2.tar.gz 17793976 BLAKE2B 
40dc7636f04e0d5cfd734b175da1ce49c32e4b8f5750059e79e03a7395fb8b9241c1f479815794b46dee81704d7c392fe7693c9f0180323d1ca21812c37d36b5
 SHA512 
4dd129057598b032ba322c42888bb8ce14b9423bd450ef7a42fa22162f6b48e34b226f38480aa67fe2da85be2529b0822655855f9846b657bdd32f50256f4305

diff --git a/dev-db/postgis/postgis-3.1.7.ebuild 
b/dev-db/postgis/postgis-3.1.7.ebuild
deleted file mode 100644
index a5c0c0e58438..
--- a/dev-db/postgis/postgis-3.1.7.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 9.6 {10..14} )
-POSTGRES_USEDEP="server"
-inherit autotools postgres-multi toolchain-funcs
-
-MY_P="${PN}-$(ver_rs 3 '')"
-
-if [[ ${PV} = ** ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
-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"
-fi
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="https://postgis.net";
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="address-standardizer doc gtk static-libs topology"
-
-REQUIRED_USE="${POSTGRES_REQ_USE}"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-RDEPEND="${POSTGRES_DEP}
-   dev-libs/json-c:=
-   dev-libs/libxml2:2
-   dev-libs/protobuf-c:=
-   >=sci-libs/geos-3.9.0
-   >=sci-libs/proj-4.9.0:=
-   >=sci-libs/gdal-1.10.0:=
-   address-standardizer? ( dev-libs/libpcre )
-   gtk? ( x11-libs/gtk+:2 )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   doc? (
-   app-text/docbook-xsl-stylesheets
-   app-text/docbook-xml-dtd:4.5
-   dev-libs/libxslt
-   virtual/imagemagick-tools[png]
-   )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.2.0-arflags.patch"
-   "${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
-   "${FILESDIR}/${PN}-3.0.3-detect-only-stdc.patch"
-   "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
-)
-
-src_prepare() {
-   default
-
-   if [[ ${PV} = **

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2022-12-18 Thread Sam James
commit: c372de9f5a2915d077362297b6f76333471cda6d
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 18 08:29:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 18 08:30:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c372de9f

dev-db/postgis: drop 3.0.3-r3, 3.0.7, 3.0.8

Signed-off-by: Sam James  gentoo.org>

 dev-db/postgis/Manifest|   3 -
 dev-db/postgis/postgis-3.0.3-r3.ebuild | 144 -
 dev-db/postgis/postgis-3.0.7.ebuild| 144 -
 dev-db/postgis/postgis-3.0.8.ebuild| 144 -
 4 files changed, 435 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index ebed60eed0f8..d449fd39a39b 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,6 +1,3 @@
-DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B 
891f814271de9193cd17013d6d971a752d2e984cb0f68b05510450adef97fc96827e3d1a1c7e4fa4cf79a5d15eb3f74b32e6e9a8db1947f7bad7c2b23656bc8f
 SHA512 
478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
-DIST postgis-3.0.7.tar.gz 16876819 BLAKE2B 
81f521cfc0b4f8af59c098f3aad1d5e9bf6692de4c5b6195e69f7610276822e39f8cf476d97744ec92acb733ba372e772af6aa7aa3fba868094e9322a83db256
 SHA512 
53978967d2f1a3f82e440040897eab8e8e5cf132e2e2ac7af82bbcfb893960bdd7c5b8583f167c0fe41820c517acd378344668a1c18a07077fd46526dfacb8c2
-DIST postgis-3.0.8.tar.gz 16872652 BLAKE2B 
19c008215d32237080b7b0067cf107c6434fc7f511b531ea98317b6edd1a1abb4af95708f3b43f47f1a9e008176e3fddcac4361deac5e3d9e8d215c5581d4924
 SHA512 
5c93e90b182c0d138760780bd8e07bcbd0326496d68b25af1cb3c05d5afd63fa0371eef5d1c2baebb5ff95e04297ee3b2e0bf7afffcdbc2064af5900e8f896ac
 DIST postgis-3.1.3.tar.gz 17273487 BLAKE2B 
603be66476037fca5e75b00079a26b4beaa50f0af0626f89660f17da398576d929574cb363c4177877d9c8db5459f7eac964b85796cd93b0d0c6ff2462d7ad3f
 SHA512 
525c982de6b5888d1f4a4f6d2cca5dfa945d8899d8038b1d62ce222e0149c4ab26a2a3602bb8c85e89ce22b3d5b20d278fc4f841144f4b0d19e6de4f48d819ad
 DIST postgis-3.1.7.tar.gz 17286464 BLAKE2B 
b4611179f3e0dd9bd5f433773c39665698b38977d15baa4bbde7a6a4df96d37b72d13bfa1a62b639187c57a658c7b31d48a1b5dccfd4b08650749dfc832213d7
 SHA512 
2ae30e09cf1408e63fd5db24ff0360f0acb2277e9ad89486cb4e611bbb7e3912ae89235c4a045a6ddb3af55143693d13ed943db16e42c2ed5acb633bc163ee14
 DIST postgis-3.1.8.tar.gz 17285335 BLAKE2B 
212a74866de5b8788b91cfa6d8b3a064df2933c76c8930e3c7bba310b36b4e7249de2d7481e852679da59bb9bdb3315752b62ad70176601b7110401f368200bc
 SHA512 
c28befe1f77e7f36d63b39d027024d3f8abe8496c64c4b3c05eb7c32c3a885e824cabdda5bf0f9f320b9fe15bb97f21d5dfb65a193c64b1e27be95badefe3b37

diff --git a/dev-db/postgis/postgis-3.0.3-r3.ebuild 
b/dev-db/postgis/postgis-3.0.3-r3.ebuild
deleted file mode 100644
index 46ce4ab7088a..
--- a/dev-db/postgis/postgis-3.0.3-r3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 9.6 {10..13} )
-POSTGRES_USEDEP="server"
-inherit autotools postgres-multi
-
-MY_P="${PN}-$(ver_rs 3 '')"
-
-if [[ ${PV} = ** ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
-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"
-fi
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="https://postgis.net";
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="address-standardizer doc gtk static-libs test topology"
-
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-RDEPEND="${POSTGRES_DEP}
-   dev-libs/json-c:=
-   dev-libs/libxml2:2
-   dev-libs/protobuf-c:=
-   >=sci-libs/geos-3.6.0
-   =sci-libs/gdal-1.10.0:=
-   address-standardizer? ( dev-libs/libpcre )
-   gtk? ( x11-libs/gtk+:2 )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   doc? (
-   app-text/docbook-xsl-stylesheets
-   app-text/docbook-xml-dtd:4.5
-   dev-libs/libxslt
-   virtual/imagemagick-tools[png]
-   )
-   test? ( dev-util/cunit )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.2.0-arflags.patch"
-   "${FILESDIR}/${P}-avoid-calling-ar-directly.patch"
-   "${FILESDIR}/${PN}-3.0.3-detect-only-stdc.patch"
-   "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
-)
-
-src_prepare() {
-   default
-
-   if [[ ${PV} = ** ]] ; then
-   source "${S}"/Version.config
-   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
-   fi
-
-   # These modules are built using the same *FLAGS that were used to build
-   # dev-db/postgresql. The right thing to do is to ignore the current
-  

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2022-11-13 Thread 罗百科
commit: 723d88536d6ab8d3cb563ebdb24e8707c7cddae6
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sun Nov 13 14:30:33 2022 +
Commit: 罗百科  gentoo  org>
CommitDate: Sun Nov 13 14:30:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=723d8853

dev-db/postgis: drop 3.0.5, 3.1.5, 3.2.0, 3.2.1, 3.3.0

Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   5 --
 dev-db/postgis/postgis-3.0.5.ebuild | 144 
 dev-db/postgis/postgis-3.1.5.ebuild | 143 ---
 dev-db/postgis/postgis-3.2.0.ebuild | 142 ---
 dev-db/postgis/postgis-3.2.1.ebuild | 142 ---
 dev-db/postgis/postgis-3.3.0.ebuild | 140 ---
 6 files changed, 716 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 2e03ac553a9a..ebed60eed0f8 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,15 +1,10 @@
 DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B 
891f814271de9193cd17013d6d971a752d2e984cb0f68b05510450adef97fc96827e3d1a1c7e4fa4cf79a5d15eb3f74b32e6e9a8db1947f7bad7c2b23656bc8f
 SHA512 
478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
-DIST postgis-3.0.5.tar.gz 16887694 BLAKE2B 
dba646308f93730399f9976547bbe1bb872eb02b2004f730541575ae26f2f8e28b8180b47ddcd62aa5033a0dd864b051763135289fd3ba4486bf47fbb11ee967
 SHA512 
85eeb8e1258ce19e96c695272deffd22ae4bfad4f550ec42aa0f2b39c35bca7eb03c7332cffc7e9b14b9fd5629487ad9593e34077fe1de3ae9d5f8970730d5eb
 DIST postgis-3.0.7.tar.gz 16876819 BLAKE2B 
81f521cfc0b4f8af59c098f3aad1d5e9bf6692de4c5b6195e69f7610276822e39f8cf476d97744ec92acb733ba372e772af6aa7aa3fba868094e9322a83db256
 SHA512 
53978967d2f1a3f82e440040897eab8e8e5cf132e2e2ac7af82bbcfb893960bdd7c5b8583f167c0fe41820c517acd378344668a1c18a07077fd46526dfacb8c2
 DIST postgis-3.0.8.tar.gz 16872652 BLAKE2B 
19c008215d32237080b7b0067cf107c6434fc7f511b531ea98317b6edd1a1abb4af95708f3b43f47f1a9e008176e3fddcac4361deac5e3d9e8d215c5581d4924
 SHA512 
5c93e90b182c0d138760780bd8e07bcbd0326496d68b25af1cb3c05d5afd63fa0371eef5d1c2baebb5ff95e04297ee3b2e0bf7afffcdbc2064af5900e8f896ac
 DIST postgis-3.1.3.tar.gz 17273487 BLAKE2B 
603be66476037fca5e75b00079a26b4beaa50f0af0626f89660f17da398576d929574cb363c4177877d9c8db5459f7eac964b85796cd93b0d0c6ff2462d7ad3f
 SHA512 
525c982de6b5888d1f4a4f6d2cca5dfa945d8899d8038b1d62ce222e0149c4ab26a2a3602bb8c85e89ce22b3d5b20d278fc4f841144f4b0d19e6de4f48d819ad
-DIST postgis-3.1.5.tar.gz 17282333 BLAKE2B 
3abe3b24ad0b8a9621c206f881a920ec4e37aa75ccc68ab8e4a43a372bb9047613c81d375051a948999068595de04f14bf4f0b7921b3f3894ff77a9d8c1c3063
 SHA512 
640196f4c983aeb1d661d98e099f4e2a47f32b15bfde21479b8fdb2aa5d12b4c564b0962973ec1a8dd64fbfac7cd7bc94d84376935294f23ba31d7501fe64a06
 DIST postgis-3.1.7.tar.gz 17286464 BLAKE2B 
b4611179f3e0dd9bd5f433773c39665698b38977d15baa4bbde7a6a4df96d37b72d13bfa1a62b639187c57a658c7b31d48a1b5dccfd4b08650749dfc832213d7
 SHA512 
2ae30e09cf1408e63fd5db24ff0360f0acb2277e9ad89486cb4e611bbb7e3912ae89235c4a045a6ddb3af55143693d13ed943db16e42c2ed5acb633bc163ee14
 DIST postgis-3.1.8.tar.gz 17285335 BLAKE2B 
212a74866de5b8788b91cfa6d8b3a064df2933c76c8930e3c7bba310b36b4e7249de2d7481e852679da59bb9bdb3315752b62ad70176601b7110401f368200bc
 SHA512 
c28befe1f77e7f36d63b39d027024d3f8abe8496c64c4b3c05eb7c32c3a885e824cabdda5bf0f9f320b9fe15bb97f21d5dfb65a193c64b1e27be95badefe3b37
-DIST postgis-3.2.0.tar.gz 16884722 BLAKE2B 
118ae754199521e46508b404275bfe323465e5543ad8351d3dec3582800f6c475c30333b35ad48aac373f9d8e3875790c58858f638ee4ecb7465764703d07d40
 SHA512 
b49b2fbb88ec07981c0fd05400ad807e85553164023a4b47326c21f48b4e07827a183676c497ad6823dc3a6b97518e1d40906826b8a91739c96966d62858b2b5
-DIST postgis-3.2.1.tar.gz 16883824 BLAKE2B 
9c49ad518fb968dc4787bedf6480af29c3e70f986df8233ef034f117b8a8920ff6e39dab57813390b813a3d856476634b18e6ce324795839d019a11559155ff5
 SHA512 
e0ea3d2304e71c98dd045a8031946235d9c26a1310e1ffa556db10dfd18378957ee3d88608fba7ff482835d8c8b41d7f7bddaff1279ce0b50cd7634237465b31
 DIST postgis-3.2.3.tar.gz 16882282 BLAKE2B 
1f482f4411f3989bb7e389ae19b7c8e8d9f8b2c1689979d919d20feaa5c0dc46c009034fd06e89e2198e0f2234aaf2970f6f87303bde34dafbd78f818a880288
 SHA512 
f58b30af6d107578cb66de55bbeedc9ba503f85e5ead3f104e25a9d95a410e8c1a857936d805355a22185d5658e5908605fa9b317ed58497c29d752b70b4483e
 DIST postgis-3.2.4.tar.gz 16885605 BLAKE2B 
341bf09bf5adffc6c48b0fdc6930bac25e43184357895bb90adf000f4fdf52e5c198a530722d46d8b3207e7faffe840de53a9494f3119bb56c3a8e11a4d693f0
 SHA512 
46bb88ebcf7697e42194e55ef1c323a94222e2870a98aa058d62e1d253c8ad15b14da268eece43b0cdb71d8cdbd2ff393ca451c45998245aaf1726bdffcc563f
-DIST postgis-3.3.0.tar.gz 17718971 BLAKE2B 
f4fbd58ea4a815ea27d4611a8feb86346a695da7f443f16da330c780b0e0a36150d7f455c33ce0a5c6cda6931c8ed75f26eefe1d927aecddcf2d656fd6770194
 SHA512 
38da1c3a43eeeaf0eaa526db1036c0

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2022-11-13 Thread 罗百科
commit: fd387e1f784c6764e1ad7b934f104300e40ee3e5
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sun Nov 13 14:29:18 2022 +
Commit: 罗百科  gentoo  org>
CommitDate: Sun Nov 13 14:30:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd387e1f

dev-db/postgis: add 3.0.8, 3.1.8, 3.2.4, 3.3.2

Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   4 +
 dev-db/postgis/postgis-3.0.8.ebuild | 144 
 dev-db/postgis/postgis-3.1.8.ebuild | 143 +++
 dev-db/postgis/postgis-3.2.4.ebuild | 142 +++
 dev-db/postgis/postgis-3.3.2.ebuild | 140 +++
 5 files changed, 573 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index d409bad8a69f..2e03ac553a9a 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,11 +1,15 @@
 DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B 
891f814271de9193cd17013d6d971a752d2e984cb0f68b05510450adef97fc96827e3d1a1c7e4fa4cf79a5d15eb3f74b32e6e9a8db1947f7bad7c2b23656bc8f
 SHA512 
478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
 DIST postgis-3.0.5.tar.gz 16887694 BLAKE2B 
dba646308f93730399f9976547bbe1bb872eb02b2004f730541575ae26f2f8e28b8180b47ddcd62aa5033a0dd864b051763135289fd3ba4486bf47fbb11ee967
 SHA512 
85eeb8e1258ce19e96c695272deffd22ae4bfad4f550ec42aa0f2b39c35bca7eb03c7332cffc7e9b14b9fd5629487ad9593e34077fe1de3ae9d5f8970730d5eb
 DIST postgis-3.0.7.tar.gz 16876819 BLAKE2B 
81f521cfc0b4f8af59c098f3aad1d5e9bf6692de4c5b6195e69f7610276822e39f8cf476d97744ec92acb733ba372e772af6aa7aa3fba868094e9322a83db256
 SHA512 
53978967d2f1a3f82e440040897eab8e8e5cf132e2e2ac7af82bbcfb893960bdd7c5b8583f167c0fe41820c517acd378344668a1c18a07077fd46526dfacb8c2
+DIST postgis-3.0.8.tar.gz 16872652 BLAKE2B 
19c008215d32237080b7b0067cf107c6434fc7f511b531ea98317b6edd1a1abb4af95708f3b43f47f1a9e008176e3fddcac4361deac5e3d9e8d215c5581d4924
 SHA512 
5c93e90b182c0d138760780bd8e07bcbd0326496d68b25af1cb3c05d5afd63fa0371eef5d1c2baebb5ff95e04297ee3b2e0bf7afffcdbc2064af5900e8f896ac
 DIST postgis-3.1.3.tar.gz 17273487 BLAKE2B 
603be66476037fca5e75b00079a26b4beaa50f0af0626f89660f17da398576d929574cb363c4177877d9c8db5459f7eac964b85796cd93b0d0c6ff2462d7ad3f
 SHA512 
525c982de6b5888d1f4a4f6d2cca5dfa945d8899d8038b1d62ce222e0149c4ab26a2a3602bb8c85e89ce22b3d5b20d278fc4f841144f4b0d19e6de4f48d819ad
 DIST postgis-3.1.5.tar.gz 17282333 BLAKE2B 
3abe3b24ad0b8a9621c206f881a920ec4e37aa75ccc68ab8e4a43a372bb9047613c81d375051a948999068595de04f14bf4f0b7921b3f3894ff77a9d8c1c3063
 SHA512 
640196f4c983aeb1d661d98e099f4e2a47f32b15bfde21479b8fdb2aa5d12b4c564b0962973ec1a8dd64fbfac7cd7bc94d84376935294f23ba31d7501fe64a06
 DIST postgis-3.1.7.tar.gz 17286464 BLAKE2B 
b4611179f3e0dd9bd5f433773c39665698b38977d15baa4bbde7a6a4df96d37b72d13bfa1a62b639187c57a658c7b31d48a1b5dccfd4b08650749dfc832213d7
 SHA512 
2ae30e09cf1408e63fd5db24ff0360f0acb2277e9ad89486cb4e611bbb7e3912ae89235c4a045a6ddb3af55143693d13ed943db16e42c2ed5acb633bc163ee14
+DIST postgis-3.1.8.tar.gz 17285335 BLAKE2B 
212a74866de5b8788b91cfa6d8b3a064df2933c76c8930e3c7bba310b36b4e7249de2d7481e852679da59bb9bdb3315752b62ad70176601b7110401f368200bc
 SHA512 
c28befe1f77e7f36d63b39d027024d3f8abe8496c64c4b3c05eb7c32c3a885e824cabdda5bf0f9f320b9fe15bb97f21d5dfb65a193c64b1e27be95badefe3b37
 DIST postgis-3.2.0.tar.gz 16884722 BLAKE2B 
118ae754199521e46508b404275bfe323465e5543ad8351d3dec3582800f6c475c30333b35ad48aac373f9d8e3875790c58858f638ee4ecb7465764703d07d40
 SHA512 
b49b2fbb88ec07981c0fd05400ad807e85553164023a4b47326c21f48b4e07827a183676c497ad6823dc3a6b97518e1d40906826b8a91739c96966d62858b2b5
 DIST postgis-3.2.1.tar.gz 16883824 BLAKE2B 
9c49ad518fb968dc4787bedf6480af29c3e70f986df8233ef034f117b8a8920ff6e39dab57813390b813a3d856476634b18e6ce324795839d019a11559155ff5
 SHA512 
e0ea3d2304e71c98dd045a8031946235d9c26a1310e1ffa556db10dfd18378957ee3d88608fba7ff482835d8c8b41d7f7bddaff1279ce0b50cd7634237465b31
 DIST postgis-3.2.3.tar.gz 16882282 BLAKE2B 
1f482f4411f3989bb7e389ae19b7c8e8d9f8b2c1689979d919d20feaa5c0dc46c009034fd06e89e2198e0f2234aaf2970f6f87303bde34dafbd78f818a880288
 SHA512 
f58b30af6d107578cb66de55bbeedc9ba503f85e5ead3f104e25a9d95a410e8c1a857936d805355a22185d5658e5908605fa9b317ed58497c29d752b70b4483e
+DIST postgis-3.2.4.tar.gz 16885605 BLAKE2B 
341bf09bf5adffc6c48b0fdc6930bac25e43184357895bb90adf000f4fdf52e5c198a530722d46d8b3207e7faffe840de53a9494f3119bb56c3a8e11a4d693f0
 SHA512 
46bb88ebcf7697e42194e55ef1c323a94222e2870a98aa058d62e1d253c8ad15b14da268eece43b0cdb71d8cdbd2ff393ca451c45998245aaf1726bdffcc563f
 DIST postgis-3.3.0.tar.gz 17718971 BLAKE2B 
f4fbd58ea4a815ea27d4611a8feb86346a695da7f443f16da330c780b0e0a36150d7f455c33ce0a5c6cda6931c8ed75f26eefe1d927aecddcf2d656fd6770194
 SHA512 
38da1c3a43eeeaf0eaa526db1036c0861c0cc3a5586b7d942d3d50296e85904aec80eb7f3689aa1ef854fbb979aafe8237cc4c0a71024b05f5cd7

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2022-09-11 Thread 罗百科
commit: 1aca2ebe8f657c6a8ca0d87a66458787ae8fd987
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sun Sep 11 07:15:21 2022 +
Commit: 罗百科  gentoo  org>
CommitDate: Sun Sep 11 07:15:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aca2ebe

dev-db/postgis: Bump to 3.3.1

Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   1 +
 dev-db/postgis/postgis-3.3.1.ebuild | 140 
 2 files changed, 141 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 50076850456f..d409bad8a69f 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -8,3 +8,4 @@ DIST postgis-3.2.0.tar.gz 16884722 BLAKE2B 
118ae754199521e46508b404275bfe323465e
 DIST postgis-3.2.1.tar.gz 16883824 BLAKE2B 
9c49ad518fb968dc4787bedf6480af29c3e70f986df8233ef034f117b8a8920ff6e39dab57813390b813a3d856476634b18e6ce324795839d019a11559155ff5
 SHA512 
e0ea3d2304e71c98dd045a8031946235d9c26a1310e1ffa556db10dfd18378957ee3d88608fba7ff482835d8c8b41d7f7bddaff1279ce0b50cd7634237465b31
 DIST postgis-3.2.3.tar.gz 16882282 BLAKE2B 
1f482f4411f3989bb7e389ae19b7c8e8d9f8b2c1689979d919d20feaa5c0dc46c009034fd06e89e2198e0f2234aaf2970f6f87303bde34dafbd78f818a880288
 SHA512 
f58b30af6d107578cb66de55bbeedc9ba503f85e5ead3f104e25a9d95a410e8c1a857936d805355a22185d5658e5908605fa9b317ed58497c29d752b70b4483e
 DIST postgis-3.3.0.tar.gz 17718971 BLAKE2B 
f4fbd58ea4a815ea27d4611a8feb86346a695da7f443f16da330c780b0e0a36150d7f455c33ce0a5c6cda6931c8ed75f26eefe1d927aecddcf2d656fd6770194
 SHA512 
38da1c3a43eeeaf0eaa526db1036c0861c0cc3a5586b7d942d3d50296e85904aec80eb7f3689aa1ef854fbb979aafe8237cc4c0a71024b05f5cd7f5ea20722e3
+DIST postgis-3.3.1.tar.gz 17750909 BLAKE2B 
b24bbddae8ecad21525d3542cce409803b5e4f33e18d17d1e5b6cd04d99b64340720d9e60602af2cce6f6c9636c9943d6a14d5a2e34b0d5c32f6e3d87e6590f8
 SHA512 
1d4cfff6e34bc6f790f1ea209ba4d7b2a7633bdc0a1d57bb7c8ef9850b4f08c2926116d2fdfe97379c7431c0ec1559002166cebc0074041e9ae1fad03301bdd8

diff --git a/dev-db/postgis/postgis-3.3.1.ebuild 
b/dev-db/postgis/postgis-3.3.1.ebuild
new file mode 100644
index ..94b626598275
--- /dev/null
+++ b/dev-db/postgis/postgis-3.3.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( {11..15} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs topology"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.9.0
+   >=sci-libs/proj-4.9.0:=
+   >=sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+)
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   # bug #775968
+   touch build-aux/ar-lib || die
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   export CPP=$(tc-getCPP)
+
+   local myeconfargs=(
+   $(use_with address-standardizer)
+   $(use_with gtk gui)
+   $(use_with topology)
+   )
+   postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_foreach emake cheatsheets
+   postgres-multi_forbest emake -C doc html
+   fi
+}
+
+src_install() {
+   postgres-multi_foreach emake DESTDIR

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2022-08-28 Thread 罗百科
commit: b8996018e4d4ab9d8476d63a7d752ac737440761
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sun Aug 28 08:27:37 2022 +
Commit: 罗百科  gentoo  org>
CommitDate: Sun Aug 28 08:27:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8996018

dev-db/postgis: Bump to 3.3.0

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest   | 2 +-
 dev-db/postgis/{postgis-3.3.0_rc2.ebuild => postgis-3.3.0.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index aebd76f23139..50076850456f 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -7,4 +7,4 @@ DIST postgis-3.1.7.tar.gz 17286464 BLAKE2B 
b4611179f3e0dd9bd5f433773c39665698b38
 DIST postgis-3.2.0.tar.gz 16884722 BLAKE2B 
118ae754199521e46508b404275bfe323465e5543ad8351d3dec3582800f6c475c30333b35ad48aac373f9d8e3875790c58858f638ee4ecb7465764703d07d40
 SHA512 
b49b2fbb88ec07981c0fd05400ad807e85553164023a4b47326c21f48b4e07827a183676c497ad6823dc3a6b97518e1d40906826b8a91739c96966d62858b2b5
 DIST postgis-3.2.1.tar.gz 16883824 BLAKE2B 
9c49ad518fb968dc4787bedf6480af29c3e70f986df8233ef034f117b8a8920ff6e39dab57813390b813a3d856476634b18e6ce324795839d019a11559155ff5
 SHA512 
e0ea3d2304e71c98dd045a8031946235d9c26a1310e1ffa556db10dfd18378957ee3d88608fba7ff482835d8c8b41d7f7bddaff1279ce0b50cd7634237465b31
 DIST postgis-3.2.3.tar.gz 16882282 BLAKE2B 
1f482f4411f3989bb7e389ae19b7c8e8d9f8b2c1689979d919d20feaa5c0dc46c009034fd06e89e2198e0f2234aaf2970f6f87303bde34dafbd78f818a880288
 SHA512 
f58b30af6d107578cb66de55bbeedc9ba503f85e5ead3f104e25a9d95a410e8c1a857936d805355a22185d5658e5908605fa9b317ed58497c29d752b70b4483e
-DIST postgis-3.3.0rc2.tar.gz 17691023 BLAKE2B 
944855de8e7819840b90df438812f16dc54f6a3472898ba46a9f647c0f31c085b735809d7ab23ceb69683bc1740930b3762df598eddc099b1e42429e1d424528
 SHA512 
2c776a6bb05a646b824078a126615e356e5d1f98d99d256b97b3ed1ac159ff14ac49d7953aace97eaa417e209dad2bde77efe10904db83943422546531443371
+DIST postgis-3.3.0.tar.gz 17718971 BLAKE2B 
f4fbd58ea4a815ea27d4611a8feb86346a695da7f443f16da330c780b0e0a36150d7f455c33ce0a5c6cda6931c8ed75f26eefe1d927aecddcf2d656fd6770194
 SHA512 
38da1c3a43eeeaf0eaa526db1036c0861c0cc3a5586b7d942d3d50296e85904aec80eb7f3689aa1ef854fbb979aafe8237cc4c0a71024b05f5cd7f5ea20722e3

diff --git a/dev-db/postgis/postgis-3.3.0_rc2.ebuild 
b/dev-db/postgis/postgis-3.3.0.ebuild
similarity index 98%
rename from dev-db/postgis/postgis-3.3.0_rc2.ebuild
rename to dev-db/postgis/postgis-3.3.0.ebuild
index d98f7c40d8e6..94b626598275 100644
--- a/dev-db/postgis/postgis-3.3.0_rc2.ebuild
+++ b/dev-db/postgis/postgis-3.3.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = ** ]] ; 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"



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2022-08-23 Thread 罗百科
commit: 01faa0523089e21444d8d238bab3648f9d274890
Author: Patrick Lauer  gentoo  org>
AuthorDate: Tue Aug 23 13:40:47 2022 +
Commit: 罗百科  gentoo  org>
CommitDate: Tue Aug 23 13:54:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01faa052

dev-db/postgis: Bump to 3.3.0_rc2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest   | 2 +-
 dev-db/postgis/{postgis-3.3.0_rc1.ebuild => postgis-3.3.0_rc2.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 8673ce79585d..aebd76f23139 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -7,4 +7,4 @@ DIST postgis-3.1.7.tar.gz 17286464 BLAKE2B 
b4611179f3e0dd9bd5f433773c39665698b38
 DIST postgis-3.2.0.tar.gz 16884722 BLAKE2B 
118ae754199521e46508b404275bfe323465e5543ad8351d3dec3582800f6c475c30333b35ad48aac373f9d8e3875790c58858f638ee4ecb7465764703d07d40
 SHA512 
b49b2fbb88ec07981c0fd05400ad807e85553164023a4b47326c21f48b4e07827a183676c497ad6823dc3a6b97518e1d40906826b8a91739c96966d62858b2b5
 DIST postgis-3.2.1.tar.gz 16883824 BLAKE2B 
9c49ad518fb968dc4787bedf6480af29c3e70f986df8233ef034f117b8a8920ff6e39dab57813390b813a3d856476634b18e6ce324795839d019a11559155ff5
 SHA512 
e0ea3d2304e71c98dd045a8031946235d9c26a1310e1ffa556db10dfd18378957ee3d88608fba7ff482835d8c8b41d7f7bddaff1279ce0b50cd7634237465b31
 DIST postgis-3.2.3.tar.gz 16882282 BLAKE2B 
1f482f4411f3989bb7e389ae19b7c8e8d9f8b2c1689979d919d20feaa5c0dc46c009034fd06e89e2198e0f2234aaf2970f6f87303bde34dafbd78f818a880288
 SHA512 
f58b30af6d107578cb66de55bbeedc9ba503f85e5ead3f104e25a9d95a410e8c1a857936d805355a22185d5658e5908605fa9b317ed58497c29d752b70b4483e
-DIST postgis-3.3.0rc1.tar.gz 17668167 BLAKE2B 
0b90ab5a18e3c21b222d1763cca56c1e830d56042783747278d49e1206e57fcee8edb69bd724d41294490df5e1ef290b423c7c165d195bed834fd21174c82f6e
 SHA512 
5742485f10cd617c8069f5c5f1378a0435c6e93c1a74822e7bfd6d885e98fbc723c419ea8facb78f3a1ddb6bada9ddcb1df184d7a1d6035277e2013ece2f
+DIST postgis-3.3.0rc2.tar.gz 17691023 BLAKE2B 
944855de8e7819840b90df438812f16dc54f6a3472898ba46a9f647c0f31c085b735809d7ab23ceb69683bc1740930b3762df598eddc099b1e42429e1d424528
 SHA512 
2c776a6bb05a646b824078a126615e356e5d1f98d99d256b97b3ed1ac159ff14ac49d7953aace97eaa417e209dad2bde77efe10904db83943422546531443371

diff --git a/dev-db/postgis/postgis-3.3.0_rc1.ebuild 
b/dev-db/postgis/postgis-3.3.0_rc2.ebuild
similarity index 100%
rename from dev-db/postgis/postgis-3.3.0_rc1.ebuild
rename to dev-db/postgis/postgis-3.3.0_rc2.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2022-08-23 Thread 罗百科
commit: d73ea46c0aa50be4838befc2943039a3eb097905
Author: Patrick Lauer  gentoo  org>
AuthorDate: Tue Aug 23 07:53:32 2022 +
Commit: 罗百科  gentoo  org>
CommitDate: Tue Aug 23 07:53:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d73ea46c

dev-db/postgis: Bump to 3.3.0_rc1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest | 2 +-
 .../postgis/{postgis-3.3.0_alpha1.ebuild => postgis-3.3.0_rc1.ebuild}   | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 478e48cd5e9d..8673ce79585d 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -7,4 +7,4 @@ DIST postgis-3.1.7.tar.gz 17286464 BLAKE2B 
b4611179f3e0dd9bd5f433773c39665698b38
 DIST postgis-3.2.0.tar.gz 16884722 BLAKE2B 
118ae754199521e46508b404275bfe323465e5543ad8351d3dec3582800f6c475c30333b35ad48aac373f9d8e3875790c58858f638ee4ecb7465764703d07d40
 SHA512 
b49b2fbb88ec07981c0fd05400ad807e85553164023a4b47326c21f48b4e07827a183676c497ad6823dc3a6b97518e1d40906826b8a91739c96966d62858b2b5
 DIST postgis-3.2.1.tar.gz 16883824 BLAKE2B 
9c49ad518fb968dc4787bedf6480af29c3e70f986df8233ef034f117b8a8920ff6e39dab57813390b813a3d856476634b18e6ce324795839d019a11559155ff5
 SHA512 
e0ea3d2304e71c98dd045a8031946235d9c26a1310e1ffa556db10dfd18378957ee3d88608fba7ff482835d8c8b41d7f7bddaff1279ce0b50cd7634237465b31
 DIST postgis-3.2.3.tar.gz 16882282 BLAKE2B 
1f482f4411f3989bb7e389ae19b7c8e8d9f8b2c1689979d919d20feaa5c0dc46c009034fd06e89e2198e0f2234aaf2970f6f87303bde34dafbd78f818a880288
 SHA512 
f58b30af6d107578cb66de55bbeedc9ba503f85e5ead3f104e25a9d95a410e8c1a857936d805355a22185d5658e5908605fa9b317ed58497c29d752b70b4483e
-DIST postgis-3.3.0alpha1.tar.gz 17608824 BLAKE2B 
fd9bf2a7b081634e63ba6bd949bea950c7568d619cdd1b5ebecf825236cfac98cde949f7473e22d42916b2b9a41420d443ef33c1e8ba5a427714ab13635a0d5a
 SHA512 
e3c2c9b27cb5c212c61f4fb591af4eb1e22ac0e4c3c3ca50ff0f6aa726cdb83f3d151efa1036042d1e1c336057964106e309f0723fc7136210b021ddcb0169ff
+DIST postgis-3.3.0rc1.tar.gz 17668167 BLAKE2B 
0b90ab5a18e3c21b222d1763cca56c1e830d56042783747278d49e1206e57fcee8edb69bd724d41294490df5e1ef290b423c7c165d195bed834fd21174c82f6e
 SHA512 
5742485f10cd617c8069f5c5f1378a0435c6e93c1a74822e7bfd6d885e98fbc723c419ea8facb78f3a1ddb6bada9ddcb1df184d7a1d6035277e2013ece2f

diff --git a/dev-db/postgis/postgis-3.3.0_alpha1.ebuild 
b/dev-db/postgis/postgis-3.3.0_rc1.ebuild
similarity index 100%
rename from dev-db/postgis/postgis-3.3.0_alpha1.ebuild
rename to dev-db/postgis/postgis-3.3.0_rc1.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2022-08-19 Thread 罗百科
commit: 6655b80cf973852506ca396168767c6556ac4157
Author: Patrick Lauer  gentoo  org>
AuthorDate: Fri Aug 19 09:14:24 2022 +
Commit: 罗百科  gentoo  org>
CommitDate: Fri Aug 19 09:14:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6655b80c

dev-db/postgis: Add 3.0.7 3.1.7 3.2.3

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   3 +
 dev-db/postgis/postgis-3.0.7.ebuild | 144 
 dev-db/postgis/postgis-3.1.7.ebuild | 143 +++
 dev-db/postgis/postgis-3.2.3.ebuild | 142 +++
 4 files changed, 432 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 951b373e17c2..478e48cd5e9d 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,7 +1,10 @@
 DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B 
891f814271de9193cd17013d6d971a752d2e984cb0f68b05510450adef97fc96827e3d1a1c7e4fa4cf79a5d15eb3f74b32e6e9a8db1947f7bad7c2b23656bc8f
 SHA512 
478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
 DIST postgis-3.0.5.tar.gz 16887694 BLAKE2B 
dba646308f93730399f9976547bbe1bb872eb02b2004f730541575ae26f2f8e28b8180b47ddcd62aa5033a0dd864b051763135289fd3ba4486bf47fbb11ee967
 SHA512 
85eeb8e1258ce19e96c695272deffd22ae4bfad4f550ec42aa0f2b39c35bca7eb03c7332cffc7e9b14b9fd5629487ad9593e34077fe1de3ae9d5f8970730d5eb
+DIST postgis-3.0.7.tar.gz 16876819 BLAKE2B 
81f521cfc0b4f8af59c098f3aad1d5e9bf6692de4c5b6195e69f7610276822e39f8cf476d97744ec92acb733ba372e772af6aa7aa3fba868094e9322a83db256
 SHA512 
53978967d2f1a3f82e440040897eab8e8e5cf132e2e2ac7af82bbcfb893960bdd7c5b8583f167c0fe41820c517acd378344668a1c18a07077fd46526dfacb8c2
 DIST postgis-3.1.3.tar.gz 17273487 BLAKE2B 
603be66476037fca5e75b00079a26b4beaa50f0af0626f89660f17da398576d929574cb363c4177877d9c8db5459f7eac964b85796cd93b0d0c6ff2462d7ad3f
 SHA512 
525c982de6b5888d1f4a4f6d2cca5dfa945d8899d8038b1d62ce222e0149c4ab26a2a3602bb8c85e89ce22b3d5b20d278fc4f841144f4b0d19e6de4f48d819ad
 DIST postgis-3.1.5.tar.gz 17282333 BLAKE2B 
3abe3b24ad0b8a9621c206f881a920ec4e37aa75ccc68ab8e4a43a372bb9047613c81d375051a948999068595de04f14bf4f0b7921b3f3894ff77a9d8c1c3063
 SHA512 
640196f4c983aeb1d661d98e099f4e2a47f32b15bfde21479b8fdb2aa5d12b4c564b0962973ec1a8dd64fbfac7cd7bc94d84376935294f23ba31d7501fe64a06
+DIST postgis-3.1.7.tar.gz 17286464 BLAKE2B 
b4611179f3e0dd9bd5f433773c39665698b38977d15baa4bbde7a6a4df96d37b72d13bfa1a62b639187c57a658c7b31d48a1b5dccfd4b08650749dfc832213d7
 SHA512 
2ae30e09cf1408e63fd5db24ff0360f0acb2277e9ad89486cb4e611bbb7e3912ae89235c4a045a6ddb3af55143693d13ed943db16e42c2ed5acb633bc163ee14
 DIST postgis-3.2.0.tar.gz 16884722 BLAKE2B 
118ae754199521e46508b404275bfe323465e5543ad8351d3dec3582800f6c475c30333b35ad48aac373f9d8e3875790c58858f638ee4ecb7465764703d07d40
 SHA512 
b49b2fbb88ec07981c0fd05400ad807e85553164023a4b47326c21f48b4e07827a183676c497ad6823dc3a6b97518e1d40906826b8a91739c96966d62858b2b5
 DIST postgis-3.2.1.tar.gz 16883824 BLAKE2B 
9c49ad518fb968dc4787bedf6480af29c3e70f986df8233ef034f117b8a8920ff6e39dab57813390b813a3d856476634b18e6ce324795839d019a11559155ff5
 SHA512 
e0ea3d2304e71c98dd045a8031946235d9c26a1310e1ffa556db10dfd18378957ee3d88608fba7ff482835d8c8b41d7f7bddaff1279ce0b50cd7634237465b31
+DIST postgis-3.2.3.tar.gz 16882282 BLAKE2B 
1f482f4411f3989bb7e389ae19b7c8e8d9f8b2c1689979d919d20feaa5c0dc46c009034fd06e89e2198e0f2234aaf2970f6f87303bde34dafbd78f818a880288
 SHA512 
f58b30af6d107578cb66de55bbeedc9ba503f85e5ead3f104e25a9d95a410e8c1a857936d805355a22185d5658e5908605fa9b317ed58497c29d752b70b4483e
 DIST postgis-3.3.0alpha1.tar.gz 17608824 BLAKE2B 
fd9bf2a7b081634e63ba6bd949bea950c7568d619cdd1b5ebecf825236cfac98cde949f7473e22d42916b2b9a41420d443ef33c1e8ba5a427714ab13635a0d5a
 SHA512 
e3c2c9b27cb5c212c61f4fb591af4eb1e22ac0e4c3c3ca50ff0f6aa726cdb83f3d151efa1036042d1e1c336057964106e309f0723fc7136210b021ddcb0169ff

diff --git a/dev-db/postgis/postgis-3.0.7.ebuild 
b/dev-db/postgis/postgis-3.0.7.ebuild
new file mode 100644
index ..ff0f551a2cde
--- /dev/null
+++ b/dev-db/postgis/postgis-3.0.7.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.6 {10..13} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs test topolog

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2022-07-28 Thread Sam James
commit: 5dfb9f3025b82b8bff8b88c3a5d4cba8e71f7abb
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 29 02:41:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 29 02:42:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dfb9f30

dev-db/postgis: add github, gitlab upstream metadata

Signed-off-by: Sam James  gentoo.org>

 dev-db/postgis/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/dev-db/postgis/metadata.xml b/dev-db/postgis/metadata.xml
index 522613858a1e..8f42ee9fd433 100644
--- a/dev-db/postgis/metadata.xml
+++ b/dev-db/postgis/metadata.xml
@@ -20,4 +20,8 @@
Build topology spatial types and functions


+   
+   postgis/postgis
+   postgis/postgis
+   
 



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2022-05-25 Thread 罗百科
commit: f2dc8b75c2d37aadf13143c455cfabb9aa9103f1
Author: Patrick Lauer  gentoo  org>
AuthorDate: Wed May 25 08:08:00 2022 +
Commit: 罗百科  gentoo  org>
CommitDate: Wed May 25 08:08:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2dc8b75

dev-db/postgis: Add 3.3.0_alpha1 (unkeyworded)

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest|   1 +
 dev-db/postgis/postgis-3.3.0_alpha1.ebuild | 140 +
 2 files changed, 141 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 2b9229447ddf..951b373e17c2 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -4,3 +4,4 @@ DIST postgis-3.1.3.tar.gz 17273487 BLAKE2B 
603be66476037fca5e75b00079a26b4beaa50
 DIST postgis-3.1.5.tar.gz 17282333 BLAKE2B 
3abe3b24ad0b8a9621c206f881a920ec4e37aa75ccc68ab8e4a43a372bb9047613c81d375051a948999068595de04f14bf4f0b7921b3f3894ff77a9d8c1c3063
 SHA512 
640196f4c983aeb1d661d98e099f4e2a47f32b15bfde21479b8fdb2aa5d12b4c564b0962973ec1a8dd64fbfac7cd7bc94d84376935294f23ba31d7501fe64a06
 DIST postgis-3.2.0.tar.gz 16884722 BLAKE2B 
118ae754199521e46508b404275bfe323465e5543ad8351d3dec3582800f6c475c30333b35ad48aac373f9d8e3875790c58858f638ee4ecb7465764703d07d40
 SHA512 
b49b2fbb88ec07981c0fd05400ad807e85553164023a4b47326c21f48b4e07827a183676c497ad6823dc3a6b97518e1d40906826b8a91739c96966d62858b2b5
 DIST postgis-3.2.1.tar.gz 16883824 BLAKE2B 
9c49ad518fb968dc4787bedf6480af29c3e70f986df8233ef034f117b8a8920ff6e39dab57813390b813a3d856476634b18e6ce324795839d019a11559155ff5
 SHA512 
e0ea3d2304e71c98dd045a8031946235d9c26a1310e1ffa556db10dfd18378957ee3d88608fba7ff482835d8c8b41d7f7bddaff1279ce0b50cd7634237465b31
+DIST postgis-3.3.0alpha1.tar.gz 17608824 BLAKE2B 
fd9bf2a7b081634e63ba6bd949bea950c7568d619cdd1b5ebecf825236cfac98cde949f7473e22d42916b2b9a41420d443ef33c1e8ba5a427714ab13635a0d5a
 SHA512 
e3c2c9b27cb5c212c61f4fb591af4eb1e22ac0e4c3c3ca50ff0f6aa726cdb83f3d151efa1036042d1e1c336057964106e309f0723fc7136210b021ddcb0169ff

diff --git a/dev-db/postgis/postgis-3.3.0_alpha1.ebuild 
b/dev-db/postgis/postgis-3.3.0_alpha1.ebuild
new file mode 100644
index ..d98f7c40d8e6
--- /dev/null
+++ b/dev-db/postgis/postgis-3.3.0_alpha1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( {11..15} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+else
+   PGIS="$(ver_cut 1-2)"
+   SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
+   KEYWORDS=""
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs topology"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.9.0
+   >=sci-libs/proj-4.9.0:=
+   >=sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+)
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   # bug #775968
+   touch build-aux/ar-lib || die
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   export CPP=$(tc-getCPP)
+
+   local myeconfargs=(
+   $(use_with address-standardizer)
+   $(use_with gtk gui)
+   $(use_with topology)
+   )
+   postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_foreach emake cheatsheets
+   postgres-multi_forbest emake -C doc html
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2022-02-13 Thread 罗百科
commit: e91dae6316469fd88028acc1b53151e7b859ce8e
Author: Patrick Lauer  gentoo  org>
AuthorDate: Mon Feb 14 06:34:22 2022 +
Commit: 罗百科  gentoo  org>
CommitDate: Mon Feb 14 06:34:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e91dae63

dev-db/postgis: Bump to 3.2.1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   1 +
 dev-db/postgis/postgis-3.2.1.ebuild | 142 
 2 files changed, 143 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index f547e1214682..2b9229447ddf 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -3,3 +3,4 @@ DIST postgis-3.0.5.tar.gz 16887694 BLAKE2B 
dba646308f93730399f9976547bbe1bb872eb
 DIST postgis-3.1.3.tar.gz 17273487 BLAKE2B 
603be66476037fca5e75b00079a26b4beaa50f0af0626f89660f17da398576d929574cb363c4177877d9c8db5459f7eac964b85796cd93b0d0c6ff2462d7ad3f
 SHA512 
525c982de6b5888d1f4a4f6d2cca5dfa945d8899d8038b1d62ce222e0149c4ab26a2a3602bb8c85e89ce22b3d5b20d278fc4f841144f4b0d19e6de4f48d819ad
 DIST postgis-3.1.5.tar.gz 17282333 BLAKE2B 
3abe3b24ad0b8a9621c206f881a920ec4e37aa75ccc68ab8e4a43a372bb9047613c81d375051a948999068595de04f14bf4f0b7921b3f3894ff77a9d8c1c3063
 SHA512 
640196f4c983aeb1d661d98e099f4e2a47f32b15bfde21479b8fdb2aa5d12b4c564b0962973ec1a8dd64fbfac7cd7bc94d84376935294f23ba31d7501fe64a06
 DIST postgis-3.2.0.tar.gz 16884722 BLAKE2B 
118ae754199521e46508b404275bfe323465e5543ad8351d3dec3582800f6c475c30333b35ad48aac373f9d8e3875790c58858f638ee4ecb7465764703d07d40
 SHA512 
b49b2fbb88ec07981c0fd05400ad807e85553164023a4b47326c21f48b4e07827a183676c497ad6823dc3a6b97518e1d40906826b8a91739c96966d62858b2b5
+DIST postgis-3.2.1.tar.gz 16883824 BLAKE2B 
9c49ad518fb968dc4787bedf6480af29c3e70f986df8233ef034f117b8a8920ff6e39dab57813390b813a3d856476634b18e6ce324795839d019a11559155ff5
 SHA512 
e0ea3d2304e71c98dd045a8031946235d9c26a1310e1ffa556db10dfd18378957ee3d88608fba7ff482835d8c8b41d7f7bddaff1279ce0b50cd7634237465b31

diff --git a/dev-db/postgis/postgis-3.2.1.ebuild 
b/dev-db/postgis/postgis-3.2.1.ebuild
new file mode 100644
index ..e3a71e39141c
--- /dev/null
+++ b/dev-db/postgis/postgis-3.2.1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.6 {10..14} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs topology"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.9.0
+   >=sci-libs/proj-4.9.0:=
+   >=sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+"
+
+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
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   # bug #775968
+   touch build-aux/ar-lib || die
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   export CPP=$(tc-getCPP)
+
+   local myeconfargs=(
+   $(use_with address-standardizer)
+   $(use_with gtk gui)
+   $(use_with topology)
+   )
+   postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-m

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2022-02-04 Thread 罗百科
commit: bb2247f30a6e2c14a311f96ce027ebec42be73e9
Author: Patrick Lauer  gentoo  org>
AuthorDate: Fri Feb  4 11:27:32 2022 +
Commit: 罗百科  gentoo  org>
CommitDate: Fri Feb  4 11:29:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb2247f3

dev-db/postgis: Bump to 3.0.5

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   1 +
 dev-db/postgis/postgis-3.0.5.ebuild | 144 
 2 files changed, 145 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 09362cd0745f..c924505c990c 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,5 +1,6 @@
 DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B 
891f814271de9193cd17013d6d971a752d2e984cb0f68b05510450adef97fc96827e3d1a1c7e4fa4cf79a5d15eb3f74b32e6e9a8db1947f7bad7c2b23656bc8f
 SHA512 
478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
 DIST postgis-3.0.4.tar.gz 16871782 BLAKE2B 
188e9b843526299bb112cb5f9437a9471a1b2cbf51cf85f68094172cfe98101f66cd2a72b2667161a0d40c4719ceed14299c04494e8165716b5dfd4aa84cd5c7
 SHA512 
0b01414433137af2708f5dee3cc054823dd788d311273f9055ab2d7bce5901e18206021381f3705408d6e263f7afc9cfcf6eaa5298b82690efaeac66486f8c0e
+DIST postgis-3.0.5.tar.gz 16887694 BLAKE2B 
dba646308f93730399f9976547bbe1bb872eb02b2004f730541575ae26f2f8e28b8180b47ddcd62aa5033a0dd864b051763135289fd3ba4486bf47fbb11ee967
 SHA512 
85eeb8e1258ce19e96c695272deffd22ae4bfad4f550ec42aa0f2b39c35bca7eb03c7332cffc7e9b14b9fd5629487ad9593e34077fe1de3ae9d5f8970730d5eb
 DIST postgis-3.1.0.tar.gz 17262134 BLAKE2B 
dbc6edde826328b84ca7d6cc9329d648c7874d51528252759499131d7ad5dbc1a7a4ef881054f2fa1fc255810157270dc1c0ae0e2ea24ec702f06b9fd5f6dfed
 SHA512 
c5b063ff7cbe855ab6ce4104d170b27eea04ae632fd6fcb8de38b14699296a8e0c9ce06bfb48ab14cba51b7a1b3f7e0a3996d9377a954dfc39fd68fe3f839e8f
 DIST postgis-3.1.3.tar.gz 17273487 BLAKE2B 
603be66476037fca5e75b00079a26b4beaa50f0af0626f89660f17da398576d929574cb363c4177877d9c8db5459f7eac964b85796cd93b0d0c6ff2462d7ad3f
 SHA512 
525c982de6b5888d1f4a4f6d2cca5dfa945d8899d8038b1d62ce222e0149c4ab26a2a3602bb8c85e89ce22b3d5b20d278fc4f841144f4b0d19e6de4f48d819ad
 DIST postgis-3.1.5.tar.gz 17282333 BLAKE2B 
3abe3b24ad0b8a9621c206f881a920ec4e37aa75ccc68ab8e4a43a372bb9047613c81d375051a948999068595de04f14bf4f0b7921b3f3894ff77a9d8c1c3063
 SHA512 
640196f4c983aeb1d661d98e099f4e2a47f32b15bfde21479b8fdb2aa5d12b4c564b0962973ec1a8dd64fbfac7cd7bc94d84376935294f23ba31d7501fe64a06

diff --git a/dev-db/postgis/postgis-3.0.5.ebuild 
b/dev-db/postgis/postgis-3.0.5.ebuild
new file mode 100644
index ..bcc4e6fcaf37
--- /dev/null
+++ b/dev-db/postgis/postgis-3.0.5.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.6 {10..13} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs test topology"
+
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.6.0
+   =sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+   test? ( dev-util/cunit )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+   "${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
+   "${FILESDIR}/${PN}-3.0.3-detect-only-stdc.patch"
+   "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+)
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   # bug #775968
+   touch buil

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2022-02-04 Thread 罗百科
commit: bb1d616ac3efca0da03f2ce4144e5cfeedb1ffa2
Author: Patrick Lauer  gentoo  org>
AuthorDate: Fri Feb  4 11:29:10 2022 +
Commit: 罗百科  gentoo  org>
CommitDate: Fri Feb  4 11:29:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb1d616a

dev-db/postgis: Remove old

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest|   2 -
 dev-db/postgis/postgis-3.0.4-r1.ebuild | 144 -
 dev-db/postgis/postgis-3.1.0-r1.ebuild | 143 
 3 files changed, 289 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index c924505c990c..f547e1214682 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,7 +1,5 @@
 DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B 
891f814271de9193cd17013d6d971a752d2e984cb0f68b05510450adef97fc96827e3d1a1c7e4fa4cf79a5d15eb3f74b32e6e9a8db1947f7bad7c2b23656bc8f
 SHA512 
478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
-DIST postgis-3.0.4.tar.gz 16871782 BLAKE2B 
188e9b843526299bb112cb5f9437a9471a1b2cbf51cf85f68094172cfe98101f66cd2a72b2667161a0d40c4719ceed14299c04494e8165716b5dfd4aa84cd5c7
 SHA512 
0b01414433137af2708f5dee3cc054823dd788d311273f9055ab2d7bce5901e18206021381f3705408d6e263f7afc9cfcf6eaa5298b82690efaeac66486f8c0e
 DIST postgis-3.0.5.tar.gz 16887694 BLAKE2B 
dba646308f93730399f9976547bbe1bb872eb02b2004f730541575ae26f2f8e28b8180b47ddcd62aa5033a0dd864b051763135289fd3ba4486bf47fbb11ee967
 SHA512 
85eeb8e1258ce19e96c695272deffd22ae4bfad4f550ec42aa0f2b39c35bca7eb03c7332cffc7e9b14b9fd5629487ad9593e34077fe1de3ae9d5f8970730d5eb
-DIST postgis-3.1.0.tar.gz 17262134 BLAKE2B 
dbc6edde826328b84ca7d6cc9329d648c7874d51528252759499131d7ad5dbc1a7a4ef881054f2fa1fc255810157270dc1c0ae0e2ea24ec702f06b9fd5f6dfed
 SHA512 
c5b063ff7cbe855ab6ce4104d170b27eea04ae632fd6fcb8de38b14699296a8e0c9ce06bfb48ab14cba51b7a1b3f7e0a3996d9377a954dfc39fd68fe3f839e8f
 DIST postgis-3.1.3.tar.gz 17273487 BLAKE2B 
603be66476037fca5e75b00079a26b4beaa50f0af0626f89660f17da398576d929574cb363c4177877d9c8db5459f7eac964b85796cd93b0d0c6ff2462d7ad3f
 SHA512 
525c982de6b5888d1f4a4f6d2cca5dfa945d8899d8038b1d62ce222e0149c4ab26a2a3602bb8c85e89ce22b3d5b20d278fc4f841144f4b0d19e6de4f48d819ad
 DIST postgis-3.1.5.tar.gz 17282333 BLAKE2B 
3abe3b24ad0b8a9621c206f881a920ec4e37aa75ccc68ab8e4a43a372bb9047613c81d375051a948999068595de04f14bf4f0b7921b3f3894ff77a9d8c1c3063
 SHA512 
640196f4c983aeb1d661d98e099f4e2a47f32b15bfde21479b8fdb2aa5d12b4c564b0962973ec1a8dd64fbfac7cd7bc94d84376935294f23ba31d7501fe64a06
 DIST postgis-3.2.0.tar.gz 16884722 BLAKE2B 
118ae754199521e46508b404275bfe323465e5543ad8351d3dec3582800f6c475c30333b35ad48aac373f9d8e3875790c58858f638ee4ecb7465764703d07d40
 SHA512 
b49b2fbb88ec07981c0fd05400ad807e85553164023a4b47326c21f48b4e07827a183676c497ad6823dc3a6b97518e1d40906826b8a91739c96966d62858b2b5

diff --git a/dev-db/postgis/postgis-3.0.4-r1.ebuild 
b/dev-db/postgis/postgis-3.0.4-r1.ebuild
deleted file mode 100644
index 5fe9cead1a13..
--- a/dev-db/postgis/postgis-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 9.6 {10..13} )
-POSTGRES_USEDEP="server"
-inherit autotools postgres-multi
-
-MY_P="${PN}-$(ver_rs 3 '')"
-
-if [[ ${PV} = ** ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
-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"
-fi
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="https://postgis.net";
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="address-standardizer doc gtk static-libs test topology"
-
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-RDEPEND="${POSTGRES_DEP}
-   dev-libs/json-c:=
-   dev-libs/libxml2:2
-   dev-libs/protobuf-c:=
-   >=sci-libs/geos-3.6.0
-   =sci-libs/gdal-1.10.0:=
-   address-standardizer? ( dev-libs/libpcre )
-   gtk? ( x11-libs/gtk+:2 )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   doc? (
-   app-text/docbook-xsl-stylesheets
-   app-text/docbook-xml-dtd:4.5
-   dev-libs/libxslt
-   virtual/imagemagick-tools[png]
-   )
-   test? ( dev-util/cunit )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.2.0-arflags.patch"
-   "${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
-   "${FILESDIR}/${PN}-3.0.3-detect-only-stdc.patch"
-   "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
-)
-
-src_prepare() {
-   default
-
-   if [[ ${PV} = ** ]] ; then
-   so

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2022-02-01 Thread 罗百科
commit: 88bedb55c8854da274641b9b6bda9066275c59f6
Author: Patrick Lauer  gentoo  org>
AuthorDate: Wed Feb  2 07:38:36 2022 +
Commit: 罗百科  gentoo  org>
CommitDate: Wed Feb  2 07:38:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88bedb55

dev-db/postgis: Remove old

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest|   3 -
 dev-db/postgis/postgis-3.1.1-r1.ebuild | 143 -
 dev-db/postgis/postgis-3.1.2.ebuild| 143 -
 dev-db/postgis/postgis-3.1.4.ebuild| 143 -
 4 files changed, 432 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index d26a55fc59c9..09362cd0745f 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,9 +1,6 @@
 DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B 
891f814271de9193cd17013d6d971a752d2e984cb0f68b05510450adef97fc96827e3d1a1c7e4fa4cf79a5d15eb3f74b32e6e9a8db1947f7bad7c2b23656bc8f
 SHA512 
478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
 DIST postgis-3.0.4.tar.gz 16871782 BLAKE2B 
188e9b843526299bb112cb5f9437a9471a1b2cbf51cf85f68094172cfe98101f66cd2a72b2667161a0d40c4719ceed14299c04494e8165716b5dfd4aa84cd5c7
 SHA512 
0b01414433137af2708f5dee3cc054823dd788d311273f9055ab2d7bce5901e18206021381f3705408d6e263f7afc9cfcf6eaa5298b82690efaeac66486f8c0e
 DIST postgis-3.1.0.tar.gz 17262134 BLAKE2B 
dbc6edde826328b84ca7d6cc9329d648c7874d51528252759499131d7ad5dbc1a7a4ef881054f2fa1fc255810157270dc1c0ae0e2ea24ec702f06b9fd5f6dfed
 SHA512 
c5b063ff7cbe855ab6ce4104d170b27eea04ae632fd6fcb8de38b14699296a8e0c9ce06bfb48ab14cba51b7a1b3f7e0a3996d9377a954dfc39fd68fe3f839e8f
-DIST postgis-3.1.1.tar.gz 17261826 BLAKE2B 
a14bdce3773f8cc50c72880d9b8158c32b546332884645e91cba539ab9238c3cbcbc9ee60292932c86de67a0134bdab6a2b4e6b1f3c55881afbb36a08d8f138a
 SHA512 
b975d26c1ad01fa6b90b5b3b51fd2b4b33204a380af0f76b98d1bfd6bd95f527d4ac3548f1b822e114be17bb3a133bc88c3d33a17d4effdfa1f90ec0c683e5e5
-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.1.5.tar.gz 17282333 BLAKE2B 
3abe3b24ad0b8a9621c206f881a920ec4e37aa75ccc68ab8e4a43a372bb9047613c81d375051a948999068595de04f14bf4f0b7921b3f3894ff77a9d8c1c3063
 SHA512 
640196f4c983aeb1d661d98e099f4e2a47f32b15bfde21479b8fdb2aa5d12b4c564b0962973ec1a8dd64fbfac7cd7bc94d84376935294f23ba31d7501fe64a06
 DIST postgis-3.2.0.tar.gz 16884722 BLAKE2B 
118ae754199521e46508b404275bfe323465e5543ad8351d3dec3582800f6c475c30333b35ad48aac373f9d8e3875790c58858f638ee4ecb7465764703d07d40
 SHA512 
b49b2fbb88ec07981c0fd05400ad807e85553164023a4b47326c21f48b4e07827a183676c497ad6823dc3a6b97518e1d40906826b8a91739c96966d62858b2b5

diff --git a/dev-db/postgis/postgis-3.1.1-r1.ebuild 
b/dev-db/postgis/postgis-3.1.1-r1.ebuild
deleted file mode 100644
index 718c94942b1d..
--- a/dev-db/postgis/postgis-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 9.6 {10..13} )
-POSTGRES_USEDEP="server"
-inherit autotools postgres-multi toolchain-funcs
-
-MY_P="${PN}-$(ver_rs 3 '')"
-
-if [[ ${PV} = ** ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
-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"
-fi
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="https://postgis.net";
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="address-standardizer doc gtk static-libs topology"
-
-REQUIRED_USE="${POSTGRES_REQ_USE}"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-RDEPEND="${POSTGRES_DEP}
-   dev-libs/json-c:=
-   dev-libs/libxml2:2
-   dev-libs/protobuf-c:=
-   >=sci-libs/geos-3.9.0
-   =sci-libs/gdal-1.10.0:=
-  

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2022-02-01 Thread 罗百科
commit: 8dfd0739801d9066f7c5227e35990ba9d208a701
Author: Patrick Lauer  gentoo  org>
AuthorDate: Wed Feb  2 07:37:43 2022 +
Commit: 罗百科  gentoo  org>
CommitDate: Wed Feb  2 07:38:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dfd0739

dev-db/postgis: Bump to 3.1.5

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   1 +
 dev-db/postgis/postgis-3.1.5.ebuild | 143 
 2 files changed, 144 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 606b0514a749..d26a55fc59c9 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -5,4 +5,5 @@ 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.1.5.tar.gz 17282333 BLAKE2B 
3abe3b24ad0b8a9621c206f881a920ec4e37aa75ccc68ab8e4a43a372bb9047613c81d375051a948999068595de04f14bf4f0b7921b3f3894ff77a9d8c1c3063
 SHA512 
640196f4c983aeb1d661d98e099f4e2a47f32b15bfde21479b8fdb2aa5d12b4c564b0962973ec1a8dd64fbfac7cd7bc94d84376935294f23ba31d7501fe64a06
 DIST postgis-3.2.0.tar.gz 16884722 BLAKE2B 
118ae754199521e46508b404275bfe323465e5543ad8351d3dec3582800f6c475c30333b35ad48aac373f9d8e3875790c58858f638ee4ecb7465764703d07d40
 SHA512 
b49b2fbb88ec07981c0fd05400ad807e85553164023a4b47326c21f48b4e07827a183676c497ad6823dc3a6b97518e1d40906826b8a91739c96966d62858b2b5

diff --git a/dev-db/postgis/postgis-3.1.5.ebuild 
b/dev-db/postgis/postgis-3.1.5.ebuild
new file mode 100644
index ..a5c0c0e58438
--- /dev/null
+++ b/dev-db/postgis/postgis-3.1.5.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.6 {10..14} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs topology"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.9.0
+   >=sci-libs/proj-4.9.0:=
+   >=sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+   "${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
+   "${FILESDIR}/${PN}-3.0.3-detect-only-stdc.patch"
+   "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+)
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   # bug #775968
+   touch build-aux/ar-lib || die
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   export CPP=$(tc-getCPP)
+
+   local myeconfargs=(
+   $(use_with address-s

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2022-01-14 Thread 罗百科
commit: 0e26204ef39c87c8cc9cfc595ff5a9d4fa9e
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sat Jan 15 07:56:01 2022 +
Commit: 罗百科  gentoo  org>
CommitDate: Sat Jan 15 07:56:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e26204e

dev-db/postgis: Restore keywords on 3.2.0

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/postgis-3.2.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/postgis/postgis-3.2.0.ebuild 
b/dev-db/postgis/postgis-3.2.0.ebuild
index 7c34c0fb50f6..e3a71e39141c 100644
--- a/dev-db/postgis/postgis-3.2.0.ebuild
+++ b/dev-db/postgis/postgis-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} = ** ]] ; 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"



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-12-18 Thread 罗百科
commit: 7ffcc57732fbcb00e119ba46f5bc10e657435f4b
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sat Dec 18 09:06:25 2021 +
Commit: 罗百科  gentoo  org>
CommitDate: Sat Dec 18 09:06:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ffcc577

dev-db/postgis: Bump to 3.2.0

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest   | 2 +-
 dev-db/postgis/{postgis-3.2.0_rc1.ebuild => postgis-3.2.0.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index def5d2d3366c..606b0514a749 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -5,4 +5,4 @@ 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.0rc1.tar.gz 16878797 BLAKE2B 
e9fa440c9e0072bd8aaca77c99a52bcd10aea48fdaa3294741ec5919fce720dde108433db28dfd04279a0899eb12661a36c10e727f9c0269716e6cc13a7fdf4a
 SHA512 
69c23ae1fbb90683565f337485b19b477560dc8828fed7b693648a374296f3919e77279ec640a72320a5b497c60f424a2946247f7ce3eafe04ac9014f2b08e7b
+DIST postgis-3.2.0.tar.gz 16884722 BLAKE2B 
118ae754199521e46508b404275bfe323465e5543ad8351d3dec3582800f6c475c30333b35ad48aac373f9d8e3875790c58858f638ee4ecb7465764703d07d40
 SHA512 
b49b2fbb88ec07981c0fd05400ad807e85553164023a4b47326c21f48b4e07827a183676c497ad6823dc3a6b97518e1d40906826b8a91739c96966d62858b2b5

diff --git a/dev-db/postgis/postgis-3.2.0_rc1.ebuild 
b/dev-db/postgis/postgis-3.2.0.ebuild
similarity index 100%
rename from dev-db/postgis/postgis-3.2.0_rc1.ebuild
rename to dev-db/postgis/postgis-3.2.0.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-12-11 Thread 罗百科
commit: 1e7c0cc7cffcf9c163019aefb7be99f3f0fdfe70
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sat Dec 11 18:04:06 2021 +
Commit: 罗百科  gentoo  org>
CommitDate: Sat Dec 11 18:04:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e7c0cc7

dev-db/postgis: Bump to 3.2.0_rc1

Package-Manager: Portage-3.0.29, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest | 2 +-
 dev-db/postgis/{postgis-3.2.0_beta3.ebuild => postgis-3.2.0_rc1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 72a52e114ef6..def5d2d3366c 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -5,4 +5,4 @@ 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.0beta3.tar.gz 16906041 BLAKE2B 
221a36f0aeddb2e10e297ef5778200ebd535ca0b6a876b73ae2fbcadb2576552817526ee9323f0e68c000b7eba9e8d9f79ed8379ad4ecdaa2be3aab477cc3b18
 SHA512 
6a3fdc12cd7247f1afad35b5821ef71aaf99717f759c64b59319d91268423f7ecd542ebd6a972cc15a73fb44a4064809e6149e2efd64a215558eae1ee6acd2b3
+DIST postgis-3.2.0rc1.tar.gz 16878797 BLAKE2B 
e9fa440c9e0072bd8aaca77c99a52bcd10aea48fdaa3294741ec5919fce720dde108433db28dfd04279a0899eb12661a36c10e727f9c0269716e6cc13a7fdf4a
 SHA512 
69c23ae1fbb90683565f337485b19b477560dc8828fed7b693648a374296f3919e77279ec640a72320a5b497c60f424a2946247f7ce3eafe04ac9014f2b08e7b

diff --git a/dev-db/postgis/postgis-3.2.0_beta3.ebuild 
b/dev-db/postgis/postgis-3.2.0_rc1.ebuild
similarity index 100%
rename from dev-db/postgis/postgis-3.2.0_beta3.ebuild
rename to dev-db/postgis/postgis-3.2.0_rc1.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-12-07 Thread Sam James
commit: 9ab727aa8da4d5b239c65682aed3902ef0691370
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  8 06:16:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  8 06:16:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ab727aa

dev-db/postgis: Stabilize 3.1.3 x86, #828494

Signed-off-by: Sam James  gentoo.org>

 dev-db/postgis/postgis-3.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/postgis-3.1.3.ebuild 
b/dev-db/postgis/postgis-3.1.3.ebuild
index af780d1725c7..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} = ** ]] ; 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"



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-12-07 Thread Sam James
commit: f44c45816acdb58bc3d23e6b33a9b5da242ccd15
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  8 06:15:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  8 06:15:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f44c4581

dev-db/postgis: Stabilize 3.1.3 amd64, #828494

Signed-off-by: Sam James  gentoo.org>

 dev-db/postgis/postgis-3.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/postgis-3.1.3.ebuild 
b/dev-db/postgis/postgis-3.1.3.ebuild
index a81f3e9072c3..af780d1725c7 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} = ** ]] ; 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"



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-12-07 Thread Sam James
commit: 910b07df93db62c0a48ee5cbaa865e7ded05a976
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  8 05:13:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  8 05:13:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=910b07df

dev-db/postgis: update EAPI 6 -> 7 (sync live ebuild)

Signed-off-by: Sam James  gentoo.org>

 dev-db/postgis/postgis-.ebuild | 22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/dev-db/postgis/postgis-.ebuild 
b/dev-db/postgis/postgis-.ebuild
index 8325204434e1..298c281eae44 100644
--- a/dev-db/postgis/postgis-.ebuild
+++ b/dev-db/postgis/postgis-.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)



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-12-07 Thread Sam James
commit: 7cb1f899e6f9f904fe9173c9b73abf8799fd2c68
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  8 05:12:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  8 05:12:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb1f899

dev-db/postgis: depend on = 3.1.2 is fine though, which we're stabling.

Bug: https://bugs.gentoo.org/828494
Signed-off-by: Sam James  gentoo.org>

 dev-db/postgis/{postgis-3.0.3-r2.ebuild => postgis-3.0.3-r3.ebuild} | 2 +-
 dev-db/postgis/{postgis-3.0.4.ebuild => postgis-3.0.4-r1.ebuild}| 2 +-
 dev-db/postgis/{postgis-3.1.0.ebuild => postgis-3.1.0-r1.ebuild}| 2 +-
 dev-db/postgis/{postgis-3.1.1.ebuild => postgis-3.1.1-r1.ebuild}| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-db/postgis/postgis-3.0.3-r2.ebuild 
b/dev-db/postgis/postgis-3.0.3-r3.ebuild
similarity index 99%
rename from dev-db/postgis/postgis-3.0.3-r2.ebuild
rename to 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/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
similarity index 99%
rename from dev-db/postgis/postgis-3.0.4.ebuild
rename to 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/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
similarity index 99%
rename from dev-db/postgis/postgis-3.1.0.ebuild
rename to 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/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
similarity index 99%
rename from dev-db/postgis/postgis-3.1.1.ebuild
rename to 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/gdal-1.10.0:=
address-standardizer? ( dev-libs/libpcre )
gtk? ( x11-libs/gtk+:2 )



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-12-06 Thread 罗百科
commit: b09fddefee733220302af4e3b67038376507c185
Author: Patrick Lauer  gentoo  org>
AuthorDate: Mon Dec  6 14:35:08 2021 +
Commit: 罗百科  gentoo  org>
CommitDate: Mon Dec  6 15:29:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b09fddef

dev-db/postgis: Bump to 3.2.0_beta3

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest | 2 +-
 .../postgis/{postgis-3.2.0_beta1.ebuild => postgis-3.2.0_beta3.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index d70fe37a8c73..72a52e114ef6 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -5,4 +5,4 @@ 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
+DIST postgis-3.2.0beta3.tar.gz 16906041 BLAKE2B 
221a36f0aeddb2e10e297ef5778200ebd535ca0b6a876b73ae2fbcadb2576552817526ee9323f0e68c000b7eba9e8d9f79ed8379ad4ecdaa2be3aab477cc3b18
 SHA512 
6a3fdc12cd7247f1afad35b5821ef71aaf99717f759c64b59319d91268423f7ecd542ebd6a972cc15a73fb44a4064809e6149e2efd64a215558eae1ee6acd2b3

diff --git a/dev-db/postgis/postgis-3.2.0_beta1.ebuild 
b/dev-db/postgis/postgis-3.2.0_beta3.ebuild
similarity index 100%
rename from dev-db/postgis/postgis-3.2.0_beta1.ebuild
rename to dev-db/postgis/postgis-3.2.0_beta3.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-10-25 Thread 罗百科
commit: 4023289152f1ca437c8db324f7a239240b9c1b68
Author: Patrick Lauer  gentoo  org>
AuthorDate: Mon Oct 25 15:17:13 2021 +
Commit: 罗百科  gentoo  org>
CommitDate: Mon Oct 25 15:17:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40232891

dev-db/postgis: Add 3.2.0_beta1

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest   |   1 +
 dev-db/postgis/postgis-3.2.0_beta1.ebuild | 142 ++
 2 files changed, 143 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 916ff85d03e..d70fe37a8c7 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -5,3 +5,4 @@ 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

diff --git a/dev-db/postgis/postgis-3.2.0_beta1.ebuild 
b/dev-db/postgis/postgis-3.2.0_beta1.ebuild
new file mode 100644
index 000..7c34c0fb50f
--- /dev/null
+++ b/dev-db/postgis/postgis-3.2.0_beta1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.6 {10..14} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+else
+   PGIS="$(ver_cut 1-2)"
+   SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
+   KEYWORDS=""
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs topology"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.9.0
+   >=sci-libs/proj-4.9.0:=
+   >=sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+"
+
+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
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   # bug #775968
+   touch build-aux/ar-lib || die
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   export CPP=$(tc-getCPP)
+
+   local myeconfargs=(
+   $(use_with address-standardizer)
+   $(use_with gtk gui)
+   $(use_with topology)
+   )
+   postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_for

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-09-30 Thread 罗百科
commit: fede39c8b527696d66639b0121c8aae8ee2dbe2e
Author: Patrick Lauer  gentoo  org>
AuthorDate: Thu Sep 30 18:44:04 2021 +
Commit: 罗百科  gentoo  org>
CommitDate: Thu Sep 30 18:44:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fede39c8

dev-db/postgis: Support postgresql-14

Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/postgis-3.1.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/postgis-3.1.4.ebuild 
b/dev-db/postgis/postgis-3.1.4.ebuild
index a81f3e9072c..098fa4c328c 100644
--- a/dev-db/postgis/postgis-3.1.4.ebuild
+++ b/dev-db/postgis/postgis-3.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-POSTGRES_COMPAT=( 9.6 {10..13} )
+POSTGRES_COMPAT=( 9.6 {10..14} )
 POSTGRES_USEDEP="server"
 inherit autotools postgres-multi toolchain-funcs
 



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-09-05 Thread 罗百科
commit: 78d64ffae470a2efd64402fb83c5f358813518e8
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sun Sep  5 13:28:09 2021 +
Commit: 罗百科  gentoo  org>
CommitDate: Sun Sep  5 13:28:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78d64ffa

dev-db/postgis: Bump

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   2 +
 dev-db/postgis/postgis-3.0.4.ebuild | 144 
 dev-db/postgis/postgis-3.1.4.ebuild | 143 +++
 3 files changed, 289 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index ed8966feab8..916ff85d03e 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,5 +1,7 @@
 DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B 
891f814271de9193cd17013d6d971a752d2e984cb0f68b05510450adef97fc96827e3d1a1c7e4fa4cf79a5d15eb3f74b32e6e9a8db1947f7bad7c2b23656bc8f
 SHA512 
478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
+DIST postgis-3.0.4.tar.gz 16871782 BLAKE2B 
188e9b843526299bb112cb5f9437a9471a1b2cbf51cf85f68094172cfe98101f66cd2a72b2667161a0d40c4719ceed14299c04494e8165716b5dfd4aa84cd5c7
 SHA512 
0b01414433137af2708f5dee3cc054823dd788d311273f9055ab2d7bce5901e18206021381f3705408d6e263f7afc9cfcf6eaa5298b82690efaeac66486f8c0e
 DIST postgis-3.1.0.tar.gz 17262134 BLAKE2B 
dbc6edde826328b84ca7d6cc9329d648c7874d51528252759499131d7ad5dbc1a7a4ef881054f2fa1fc255810157270dc1c0ae0e2ea24ec702f06b9fd5f6dfed
 SHA512 
c5b063ff7cbe855ab6ce4104d170b27eea04ae632fd6fcb8de38b14699296a8e0c9ce06bfb48ab14cba51b7a1b3f7e0a3996d9377a954dfc39fd68fe3f839e8f
 DIST postgis-3.1.1.tar.gz 17261826 BLAKE2B 
a14bdce3773f8cc50c72880d9b8158c32b546332884645e91cba539ab9238c3cbcbc9ee60292932c86de67a0134bdab6a2b4e6b1f3c55881afbb36a08d8f138a
 SHA512 
b975d26c1ad01fa6b90b5b3b51fd2b4b33204a380af0f76b98d1bfd6bd95f527d4ac3548f1b822e114be17bb3a133bc88c3d33a17d4effdfa1f90ec0c683e5e5
 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

diff --git a/dev-db/postgis/postgis-3.0.4.ebuild 
b/dev-db/postgis/postgis-3.0.4.ebuild
new file mode 100644
index 000..ec0647eb354
--- /dev/null
+++ b/dev-db/postgis/postgis-3.0.4.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.6 {10..13} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs test topology"
+
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.6.0
+   >=sci-libs/proj-4.9.0:=
+   >=sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+   test? ( dev-util/cunit )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+   "${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
+   "${FILESDIR}/${PN}-3.0.3-detect-only-stdc.patch"
+   "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+)
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+ 

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-08-22 Thread David Seifert
commit: 35397c72fc13ff268d24e8ff38303846dce4d7e4
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sun Aug 22 21:53:37 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Aug 22 21:53:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35397c72

dev-db/postgis: Remove postgres9_5

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 dev-db/postgis/postgis-3.0.3-r2.ebuild | 2 +-
 dev-db/postgis/postgis-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/postgis/postgis-3.0.3-r2.ebuild 
b/dev-db/postgis/postgis-3.0.3-r2.ebuild
index 24bf24bddc2..9fc6b071313 100644
--- a/dev-db/postgis/postgis-3.0.3-r2.ebuild
+++ b/dev-db/postgis/postgis-3.0.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_COMPAT=( 9.6 {10..13} )
 POSTGRES_USEDEP="server"
 inherit autotools postgres-multi
 

diff --git a/dev-db/postgis/postgis-.ebuild 
b/dev-db/postgis/postgis-.ebuild
index 366152c1f9a..8325204434e 100644
--- a/dev-db/postgis/postgis-.ebuild
+++ b/dev-db/postgis/postgis-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-POSTGRES_COMPAT=( 9.{5..6} {10..12} )
+POSTGRES_COMPAT=( 9.6 {10..12} )
 POSTGRES_USEDEP="server"
 inherit autotools eapi7-ver postgres-multi
 



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-08-18 Thread Sam James
commit: cc3cbcf635f626d2be3cf74e41d117e070ded8d0
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 18 18:51:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 18 19:22:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc3cbcf6

dev-db/postgis: fix build with autoconf 2.71

Thanks-to: Ionen Wolkens  gentoo.org>
Closes: https://bugs.gentoo.org/775968
Signed-off-by: Sam James  gentoo.org>

 dev-db/postgis/postgis-3.0.3-r2.ebuild | 5 +
 dev-db/postgis/postgis-3.1.0.ebuild| 3 +++
 dev-db/postgis/postgis-3.1.1.ebuild| 3 +++
 dev-db/postgis/postgis-3.1.2.ebuild| 3 +++
 dev-db/postgis/postgis-3.1.3.ebuild| 3 +++
 dev-db/postgis/postgis-.ebuild | 5 -
 6 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/dev-db/postgis/postgis-3.0.3-r2.ebuild 
b/dev-db/postgis/postgis-3.0.3-r2.ebuild
index 64033017c76..24bf24bddc2 100644
--- a/dev-db/postgis/postgis-3.0.3-r2.ebuild
+++ b/dev-db/postgis/postgis-3.0.3-r2.ebuild
@@ -73,6 +73,11 @@ src_prepare() {
# *FLAGS settings.
QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
 
+   # bug #775968
+   touch build-aux/ar-lib || die
+   # bug #775968
+   config_rpath_update build-aux/config.rpath
+
local AT_M4DIR="macros"
eautoreconf
 

diff --git a/dev-db/postgis/postgis-3.1.0.ebuild 
b/dev-db/postgis/postgis-3.1.0.ebuild
index 6f1fd1b25a6..41f7b8feb92 100644
--- a/dev-db/postgis/postgis-3.1.0.ebuild
+++ b/dev-db/postgis/postgis-3.1.0.ebuild
@@ -72,6 +72,9 @@ src_prepare() {
# *FLAGS settings.
QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
 
+   # bug #775968
+   touch build-aux/ar-lib || die
+
local AT_M4DIR="macros"
eautoreconf
 

diff --git a/dev-db/postgis/postgis-3.1.1.ebuild 
b/dev-db/postgis/postgis-3.1.1.ebuild
index 7661f499f16..a81f3e9072c 100644
--- a/dev-db/postgis/postgis-3.1.1.ebuild
+++ b/dev-db/postgis/postgis-3.1.1.ebuild
@@ -72,6 +72,9 @@ src_prepare() {
# *FLAGS settings.
QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
 
+   # bug #775968
+   touch build-aux/ar-lib || die
+
local AT_M4DIR="macros"
eautoreconf
 

diff --git a/dev-db/postgis/postgis-3.1.2.ebuild 
b/dev-db/postgis/postgis-3.1.2.ebuild
index 7661f499f16..a81f3e9072c 100644
--- a/dev-db/postgis/postgis-3.1.2.ebuild
+++ b/dev-db/postgis/postgis-3.1.2.ebuild
@@ -72,6 +72,9 @@ src_prepare() {
# *FLAGS settings.
QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
 
+   # bug #775968
+   touch build-aux/ar-lib || die
+
local AT_M4DIR="macros"
eautoreconf
 

diff --git a/dev-db/postgis/postgis-3.1.3.ebuild 
b/dev-db/postgis/postgis-3.1.3.ebuild
index 7661f499f16..a81f3e9072c 100644
--- a/dev-db/postgis/postgis-3.1.3.ebuild
+++ b/dev-db/postgis/postgis-3.1.3.ebuild
@@ -72,6 +72,9 @@ src_prepare() {
# *FLAGS settings.
QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
 
+   # bug #775968
+   touch build-aux/ar-lib || die
+
local AT_M4DIR="macros"
eautoreconf
 

diff --git a/dev-db/postgis/postgis-.ebuild 
b/dev-db/postgis/postgis-.ebuild
index 3a6f01adf2e..366152c1f9a 100644
--- a/dev-db/postgis/postgis-.ebuild
+++ b/dev-db/postgis/postgis-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -68,6 +68,9 @@ src_prepare() {
# *FLAGS settings.
QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
 
+   # bug #775968
+   touch build-aux/ar-lib || die
+
local AT_M4DIR="macros"
eautoreconf
 



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-07-03 Thread 罗百科
commit: 607b9aac2ecc6469f885250ed3b86fae2a6f22b6
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sat Jul  3 16:44:33 2021 +
Commit: 罗百科  gentoo  org>
CommitDate: Sat Jul  3 16:44:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=607b9aac

dev-db/postgis: Bump to 3.1.3

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   1 +
 dev-db/postgis/postgis-3.1.3.ebuild | 140 
 2 files changed, 141 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index f10e55e3433..ed8966feab8 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -2,3 +2,4 @@ DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B 
891f814271de9193cd17013d6d971a752d2e9
 DIST postgis-3.1.0.tar.gz 17262134 BLAKE2B 
dbc6edde826328b84ca7d6cc9329d648c7874d51528252759499131d7ad5dbc1a7a4ef881054f2fa1fc255810157270dc1c0ae0e2ea24ec702f06b9fd5f6dfed
 SHA512 
c5b063ff7cbe855ab6ce4104d170b27eea04ae632fd6fcb8de38b14699296a8e0c9ce06bfb48ab14cba51b7a1b3f7e0a3996d9377a954dfc39fd68fe3f839e8f
 DIST postgis-3.1.1.tar.gz 17261826 BLAKE2B 
a14bdce3773f8cc50c72880d9b8158c32b546332884645e91cba539ab9238c3cbcbc9ee60292932c86de67a0134bdab6a2b4e6b1f3c55881afbb36a08d8f138a
 SHA512 
b975d26c1ad01fa6b90b5b3b51fd2b4b33204a380af0f76b98d1bfd6bd95f527d4ac3548f1b822e114be17bb3a133bc88c3d33a17d4effdfa1f90ec0c683e5e5
 DIST postgis-3.1.2.tar.gz 17266501 BLAKE2B 
acc65e3ab70667c57a71bcb9c7bbfc382f8a6038ceb0e91aac07e36fb6b4cb6365aa968b30af13eda8292410cc1b567d871970e6cb7dfaadb454147224f9b834
 SHA512 
df9d2fa118987e29acd635912a708e643770ad3df82c098f8129f11ab07a9eafde969302d2d2e59a68fea6fc7312fe768a231dd4cb5de7002c418725da75848a
+DIST postgis-3.1.3.tar.gz 17273487 BLAKE2B 
603be66476037fca5e75b00079a26b4beaa50f0af0626f89660f17da398576d929574cb363c4177877d9c8db5459f7eac964b85796cd93b0d0c6ff2462d7ad3f
 SHA512 
525c982de6b5888d1f4a4f6d2cca5dfa945d8899d8038b1d62ce222e0149c4ab26a2a3602bb8c85e89ce22b3d5b20d278fc4f841144f4b0d19e6de4f48d819ad

diff --git a/dev-db/postgis/postgis-3.1.3.ebuild 
b/dev-db/postgis/postgis-3.1.3.ebuild
new file mode 100644
index 000..7661f499f16
--- /dev/null
+++ b/dev-db/postgis/postgis-3.1.3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.6 {10..13} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs topology"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.9.0
+   >=sci-libs/proj-4.9.0:=
+   >=sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+   "${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
+   "${FILESDIR}/${PN}-3.0.3-detect-only-stdc.patch"
+   "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+)
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   export CPP=$(tc-getCPP)
+
+   local myeconfargs=(
+   $(use_with address-standardizer)
+   $(use_with gtk gui)
+   $(use_with topology)
+   )
+   postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_fore

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-06-01 Thread 罗百科
commit: d78bee73d3ffdc05f764993638820da93eb808b3
Author: Patrick Lauer  gentoo  org>
AuthorDate: Tue Jun  1 07:01:34 2021 +
Commit: 罗百科  gentoo  org>
CommitDate: Tue Jun  1 07:01:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d78bee73

dev-db/postgis: Bump to 3.1.2

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   1 +
 dev-db/postgis/postgis-3.1.2.ebuild | 140 
 2 files changed, 141 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 9273d650940..f10e55e3433 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,3 +1,4 @@
 DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B 
891f814271de9193cd17013d6d971a752d2e984cb0f68b05510450adef97fc96827e3d1a1c7e4fa4cf79a5d15eb3f74b32e6e9a8db1947f7bad7c2b23656bc8f
 SHA512 
478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
 DIST postgis-3.1.0.tar.gz 17262134 BLAKE2B 
dbc6edde826328b84ca7d6cc9329d648c7874d51528252759499131d7ad5dbc1a7a4ef881054f2fa1fc255810157270dc1c0ae0e2ea24ec702f06b9fd5f6dfed
 SHA512 
c5b063ff7cbe855ab6ce4104d170b27eea04ae632fd6fcb8de38b14699296a8e0c9ce06bfb48ab14cba51b7a1b3f7e0a3996d9377a954dfc39fd68fe3f839e8f
 DIST postgis-3.1.1.tar.gz 17261826 BLAKE2B 
a14bdce3773f8cc50c72880d9b8158c32b546332884645e91cba539ab9238c3cbcbc9ee60292932c86de67a0134bdab6a2b4e6b1f3c55881afbb36a08d8f138a
 SHA512 
b975d26c1ad01fa6b90b5b3b51fd2b4b33204a380af0f76b98d1bfd6bd95f527d4ac3548f1b822e114be17bb3a133bc88c3d33a17d4effdfa1f90ec0c683e5e5
+DIST postgis-3.1.2.tar.gz 17266501 BLAKE2B 
acc65e3ab70667c57a71bcb9c7bbfc382f8a6038ceb0e91aac07e36fb6b4cb6365aa968b30af13eda8292410cc1b567d871970e6cb7dfaadb454147224f9b834
 SHA512 
df9d2fa118987e29acd635912a708e643770ad3df82c098f8129f11ab07a9eafde969302d2d2e59a68fea6fc7312fe768a231dd4cb5de7002c418725da75848a

diff --git a/dev-db/postgis/postgis-3.1.2.ebuild 
b/dev-db/postgis/postgis-3.1.2.ebuild
new file mode 100644
index 000..7661f499f16
--- /dev/null
+++ b/dev-db/postgis/postgis-3.1.2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.6 {10..13} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs topology"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.9.0
+   >=sci-libs/proj-4.9.0:=
+   >=sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+   "${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
+   "${FILESDIR}/${PN}-3.0.3-detect-only-stdc.patch"
+   "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+)
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   export CPP=$(tc-getCPP)
+
+   local myeconfargs=(
+   $(use_with address-standardizer)
+   $(use_with gtk gui)
+   $(use_with topology)
+   )
+   postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_foreach emake cheatsheets
+   postgres-multi_forbest emake -C doc html
+  

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-03-02 Thread 罗百科
commit: e592096b8b29076f37e772cace906be2699bd94f
Author: Patrick Lauer  gentoo  org>
AuthorDate: Tue Mar  2 09:13:33 2021 +
Commit: 罗百科  gentoo  org>
CommitDate: Tue Mar  2 09:13:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e592096b

dev-db/postgis: Bump

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   1 +
 dev-db/postgis/postgis-3.1.1.ebuild | 140 
 2 files changed, 141 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 31249fe6932..9273d650940 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,2 +1,3 @@
 DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B 
891f814271de9193cd17013d6d971a752d2e984cb0f68b05510450adef97fc96827e3d1a1c7e4fa4cf79a5d15eb3f74b32e6e9a8db1947f7bad7c2b23656bc8f
 SHA512 
478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
 DIST postgis-3.1.0.tar.gz 17262134 BLAKE2B 
dbc6edde826328b84ca7d6cc9329d648c7874d51528252759499131d7ad5dbc1a7a4ef881054f2fa1fc255810157270dc1c0ae0e2ea24ec702f06b9fd5f6dfed
 SHA512 
c5b063ff7cbe855ab6ce4104d170b27eea04ae632fd6fcb8de38b14699296a8e0c9ce06bfb48ab14cba51b7a1b3f7e0a3996d9377a954dfc39fd68fe3f839e8f
+DIST postgis-3.1.1.tar.gz 17261826 BLAKE2B 
a14bdce3773f8cc50c72880d9b8158c32b546332884645e91cba539ab9238c3cbcbc9ee60292932c86de67a0134bdab6a2b4e6b1f3c55881afbb36a08d8f138a
 SHA512 
b975d26c1ad01fa6b90b5b3b51fd2b4b33204a380af0f76b98d1bfd6bd95f527d4ac3548f1b822e114be17bb3a133bc88c3d33a17d4effdfa1f90ec0c683e5e5

diff --git a/dev-db/postgis/postgis-3.1.1.ebuild 
b/dev-db/postgis/postgis-3.1.1.ebuild
new file mode 100644
index 000..7661f499f16
--- /dev/null
+++ b/dev-db/postgis/postgis-3.1.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.6 {10..13} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs topology"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.9.0
+   >=sci-libs/proj-4.9.0:=
+   >=sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+   "${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
+   "${FILESDIR}/${PN}-3.0.3-detect-only-stdc.patch"
+   "${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+)
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   export CPP=$(tc-getCPP)
+
+   local myeconfargs=(
+   $(use_with address-standardizer)
+   $(use_with gtk gui)
+   $(use_with topology)
+   )
+   postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_foreach emake cheatsheets
+   postgres-multi_forbest emake -C doc html
+   fi
+}
+
+src_install() {
+   postgres-multi_foreach emake DESTDIR="${D}" install
+   postgres-multi_foreach emake -C topology DESTDIR="${D}" install
+   postgres-multi_forbest dobin ./utils/postgis_restore.pl
+
+   dodoc CREDITS TODO loader/README.* doc/*txt
+
+   docinto topology
+   dodoc 

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-02-23 Thread Aaron W. Swenson
commit: b1114c7e9c6911a99f1b99c48699e53f465ac15c
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Tue Feb 23 15:28:24 2021 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Tue Feb 23 15:28:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1114c7e

dev-db/postgis: Cleanup

Closes: https://bugs.gentoo.org/731104
Closes: https://bugs.gentoo.org/747544
Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/postgis/Manifest   |   7 --
 dev-db/postgis/metadata.xml   |   3 -
 dev-db/postgis/postgis-2.5.3-r1.ebuild| 135 -
 dev-db/postgis/postgis-2.5.4.ebuild   | 137 -
 dev-db/postgis/postgis-2.5.5.ebuild   | 137 -
 dev-db/postgis/postgis-3.0.0-r1.ebuild| 135 -
 dev-db/postgis/postgis-3.0.1.ebuild   | 135 -
 dev-db/postgis/postgis-3.0.2.ebuild   | 135 -
 dev-db/postgis/postgis-3.0.3-r1.ebuild| 138 --
 dev-db/postgis/postgis-3.1.0_alpha3-r1.ebuild | 138 --
 10 files changed, 1100 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 7d45c2f6ebb..31249fe6932 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,9 +1,2 @@
-DIST postgis-2.5.3.tar.gz 16424752 BLAKE2B 
94c2ccd41eb88a39c6db48ad7f4d142742a1b0791e3abe57adb2c778406dcc8286afc6d55c80067e0b94a1300eff1c76a227d3cfd813e12541c715edeea11a9b
 SHA512 
1c9f873ba8f8ff4aeae248c68c001eb4174416de1e00ce6a0d0c9ea129b475e887a83235027068d52f587ab95c549adbfaa7e5dccdda77855e39c55dac0fdc2d
-DIST postgis-2.5.4.tar.gz 15882033 BLAKE2B 
317e6f3857dce8b1c054b5cdb6c6b215b015b89266aeaa0187803b9355cdc3cbb62be89f36ffe29e2fcbc1e7b693a7f88fb23b5c172fcefea376f6afea3c064d
 SHA512 
767c146245ae11545ce4e0764f9bd313cfdf2eed78c485c5aa5530517edb8e433bcdbaffcf4d92b0c0f3c997de9831b5e3beed7638fc3bc773f264b45e5d8ab4
-DIST postgis-2.5.5.tar.gz 15936193 BLAKE2B 
df5d0e51bb5042a72ecd070273c4a87738b2ba482993d39948137c8ba2da0a47845393023a6b4e45f01a91d37ef8fc9f89302203c639fb32b4451cb905fd08b3
 SHA512 
407c9ddf5b73aaa8d36ec606f974b86c16c9ed4aafbfd4a0b7f96cfc7a9f8a8fa38528cb4787bdd50de479416dbfb09934a85d189463cec549da66863060292e
-DIST postgis-3.0.0.tar.gz 17359802 BLAKE2B 
aa83bdc2d1950c517f99cbdd877eb7261f6c29ce2cbd9f67f1e606c290080fc3d02ab0b7ceb68ce852e0c0d3d4b7753f03cb5b0921da164ab65d68e23d1df538
 SHA512 
82c233681fa6444686f9979768e5d6d3a9b6ca9cbd4fc2b14bd0a5d1269a8d0f45ee067e64984077063407c7abc13fa0e37a29928d7ccbfe3a61b694f592bed2
-DIST postgis-3.0.1.tar.gz 16839923 BLAKE2B 
6888fa49562ab71929e92007de305fd6610c74988faaf08fbeabbf1d13029ebbb5da788826dc63d03ae5c873fbe408ae6c0f108b2975755d2b13bc69bed53558
 SHA512 
5ebce2303d672bb342f7fae6cade08140c8a687fc38e82e5b41eebb8465cdf3dc7bdbeae53b1179df8112a01842dd65f362fc107b381e2a1fa6e161b77a50227
-DIST postgis-3.0.2.tar.gz 16855299 BLAKE2B 
99ee872abf52651ab53e4dd6203d99d428d366f60b949fabcae938980f5c17809872e9b23f7ab1f3480a60242e735c926e54122492e1b8966ed8c748eb7c4fe6
 SHA512 
763d7818d195eca0b07d94a864b13da68e5734ae57b7c93c285dc2d0fa4a155715745e5da67e1a3bca49d8d4f89dc495ed3912c079722290ce9f220afca33f4d
 DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B 
891f814271de9193cd17013d6d971a752d2e984cb0f68b05510450adef97fc96827e3d1a1c7e4fa4cf79a5d15eb3f74b32e6e9a8db1947f7bad7c2b23656bc8f
 SHA512 
478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
 DIST postgis-3.1.0.tar.gz 17262134 BLAKE2B 
dbc6edde826328b84ca7d6cc9329d648c7874d51528252759499131d7ad5dbc1a7a4ef881054f2fa1fc255810157270dc1c0ae0e2ea24ec702f06b9fd5f6dfed
 SHA512 
c5b063ff7cbe855ab6ce4104d170b27eea04ae632fd6fcb8de38b14699296a8e0c9ce06bfb48ab14cba51b7a1b3f7e0a3996d9377a954dfc39fd68fe3f839e8f
-DIST postgis-3.1.0alpha3.tar.gz 17197128 BLAKE2B 
f3b777efa8542b82db6031fa77a5728be94689542b45e4515887306cd0ae42cd9d802eae94b07e5a70f308e82fe6afc49a29f43ad2c302d9913f00797118764c
 SHA512 
758b688aa01babc5ac9cc703d3d64fd751639425df7e1a2aa5bb72f1707a8279f87e7b3d84e23f465a51d08787858e0eb54e0afc38039d69ddfe7668e2dce256

diff --git a/dev-db/postgis/metadata.xml b/dev-db/postgis/metadata.xml
index 079d84079f2..8f4a077086e 100644
--- a/dev-db/postgis/metadata.xml
+++ b/dev-db/postgis/metadata.xml
@@ -16,9 +16,6 @@

Build graphical interface for shp2pgsql (shp2pgsql-gui)

-   
-   Add capability to transform geometry into Mapbox Vector 
Tile
-   

Build topology spatial types and functions


diff --git a/dev-db/postgis/postgis-2.5.3-r1.ebuild 
b/dev-db/postgis/postgis-2.5.3-r1.ebuild
deleted file mode 100644
index 540d66ffadb..000
--- a/dev-db/postgis/postgis-2.5.3-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-02-18 Thread Sam James
commit: c7a1edc9c17ea648cf94a08b8dc3bee15f8e24e4
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 18 21:46:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 18 21:46:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a1edc9

dev-db/postgis: Stabilize 3.0.3-r2 x86, #770094

Signed-off-by: Sam James  gentoo.org>

 dev-db/postgis/postgis-3.0.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/postgis-3.0.3-r2.ebuild 
b/dev-db/postgis/postgis-3.0.3-r2.ebuild
index 8fe8c6170ab..64033017c76 100644
--- a/dev-db/postgis/postgis-3.0.3-r2.ebuild
+++ b/dev-db/postgis/postgis-3.0.3-r2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = ** ]] ; 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"



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-02-18 Thread Sam James
commit: cbd51f2cecc8575401c4e9e84828d114dffcabc0
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 18 21:46:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 18 21:46:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbd51f2c

dev-db/postgis: Stabilize 3.1.0 x86, #770094

Signed-off-by: Sam James  gentoo.org>

 dev-db/postgis/postgis-3.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/postgis-3.1.0.ebuild 
b/dev-db/postgis/postgis-3.1.0.ebuild
index 1cf0f630270..6f1fd1b25a6 100644
--- a/dev-db/postgis/postgis-3.1.0.ebuild
+++ b/dev-db/postgis/postgis-3.1.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = ** ]] ; 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"



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-02-18 Thread Sam James
commit: 8c3d2ee5c36e30d92b7369e32deb2ab3de8cf5cb
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 18 21:44:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 18 21:44:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3d2ee5

dev-db/postgis: Stabilize 3.1.0 amd64, #770094

Signed-off-by: Sam James  gentoo.org>

 dev-db/postgis/postgis-3.1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/postgis/postgis-3.1.0.ebuild 
b/dev-db/postgis/postgis-3.1.0.ebuild
index b7ace852615..1cf0f630270 100644
--- a/dev-db/postgis/postgis-3.1.0.ebuild
+++ b/dev-db/postgis/postgis-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} = ** ]] ; 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"



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2021-02-18 Thread Sam James
commit: f65b746a006db9626a62538b62a3328aef3caac6
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 18 21:44:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 18 21:44:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f65b746a

dev-db/postgis: Stabilize 3.0.3-r2 amd64, #770094

Signed-off-by: Sam James  gentoo.org>

 dev-db/postgis/postgis-3.0.3-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/postgis/postgis-3.0.3-r2.ebuild 
b/dev-db/postgis/postgis-3.0.3-r2.ebuild
index 407f889068d..8fe8c6170ab 100644
--- a/dev-db/postgis/postgis-3.0.3-r2.ebuild
+++ b/dev-db/postgis/postgis-3.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} = ** ]] ; 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"



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/files/, dev-db/postgis/

2020-12-23 Thread Aaron W. Swenson
commit: 0fa80295af29bf426677f4f7fbdb7dc1f0fc1f4e
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Thu Dec 24 03:42:36 2020 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Thu Dec 24 03:42:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fa80295

dev-db/postgis: Version Bump and Fix

Bump to 3.1.0.

No longer auto-magically depend on libcxx, and tries more names for a compatible
CPP interface.

Bug: https://bugs.gentoo.org/731104
Bug: https://bugs.gentoo.org/747544
Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/postgis/Manifest|   1 +
 .../files/postgis-3.0.3-detect-only-stdc.patch |  17 +++
 .../files/postgis-3.0.3-try-other-cpp-names.patch  |  12 ++
 dev-db/postgis/postgis-3.0.3-r2.ebuild | 139 
 dev-db/postgis/postgis-3.1.0.ebuild| 140 +
 5 files changed, 309 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 705f54c7fd9..7d45c2f6ebb 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -5,4 +5,5 @@ DIST postgis-3.0.0.tar.gz 17359802 BLAKE2B 
aa83bdc2d1950c517f99cbdd877eb7261f6c2
 DIST postgis-3.0.1.tar.gz 16839923 BLAKE2B 
6888fa49562ab71929e92007de305fd6610c74988faaf08fbeabbf1d13029ebbb5da788826dc63d03ae5c873fbe408ae6c0f108b2975755d2b13bc69bed53558
 SHA512 
5ebce2303d672bb342f7fae6cade08140c8a687fc38e82e5b41eebb8465cdf3dc7bdbeae53b1179df8112a01842dd65f362fc107b381e2a1fa6e161b77a50227
 DIST postgis-3.0.2.tar.gz 16855299 BLAKE2B 
99ee872abf52651ab53e4dd6203d99d428d366f60b949fabcae938980f5c17809872e9b23f7ab1f3480a60242e735c926e54122492e1b8966ed8c748eb7c4fe6
 SHA512 
763d7818d195eca0b07d94a864b13da68e5734ae57b7c93c285dc2d0fa4a155715745e5da67e1a3bca49d8d4f89dc495ed3912c079722290ce9f220afca33f4d
 DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B 
891f814271de9193cd17013d6d971a752d2e984cb0f68b05510450adef97fc96827e3d1a1c7e4fa4cf79a5d15eb3f74b32e6e9a8db1947f7bad7c2b23656bc8f
 SHA512 
478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
+DIST postgis-3.1.0.tar.gz 17262134 BLAKE2B 
dbc6edde826328b84ca7d6cc9329d648c7874d51528252759499131d7ad5dbc1a7a4ef881054f2fa1fc255810157270dc1c0ae0e2ea24ec702f06b9fd5f6dfed
 SHA512 
c5b063ff7cbe855ab6ce4104d170b27eea04ae632fd6fcb8de38b14699296a8e0c9ce06bfb48ab14cba51b7a1b3f7e0a3996d9377a954dfc39fd68fe3f839e8f
 DIST postgis-3.1.0alpha3.tar.gz 17197128 BLAKE2B 
f3b777efa8542b82db6031fa77a5728be94689542b45e4515887306cd0ae42cd9d802eae94b07e5a70f308e82fe6afc49a29f43ad2c302d9913f00797118764c
 SHA512 
758b688aa01babc5ac9cc703d3d64fd751639425df7e1a2aa5bb72f1707a8279f87e7b3d84e23f465a51d08787858e0eb54e0afc38039d69ddfe7668e2dce256

diff --git a/dev-db/postgis/files/postgis-3.0.3-detect-only-stdc.patch 
b/dev-db/postgis/files/postgis-3.0.3-detect-only-stdc.patch
new file mode 100644
index 000..5b97102bb23
--- /dev/null
+++ b/dev-db/postgis/files/postgis-3.0.3-detect-only-stdc.patch
@@ -0,0 +1,17 @@
+diff -Naruw postgis-3.1.0.orig/configure.ac postgis-3.1.0/configure.ac
+--- postgis-3.1.0.orig/configure.ac2020-12-18 14:39:26.0 -0500
 postgis-3.1.0/configure.ac 2020-12-19 07:35:13.232167083 -0500
+@@ -1501,12 +1501,9 @@
+ dnl 
+ CC="$WAGYU_CXX"
+ 
+-AC_CHECK_LIB(c++, main, [HAVE_CPP=yes], [HAVE_CPP=no])
+ AC_CHECK_LIB(stdc++, main, [HAVE_STDCPP=yes], [HAVE_STDCPP=no])
+ 
+-if test "x$HAVE_CPP" = "xyes"; then
+-WAGYU_LDFLAGS="-lc++"
+-elif test "x$HAVE_STDCPP" = "xyes"; then
++if test "x$HAVE_STDCPP" = "xyes"; then
+ WAGYU_LDFLAGS="-lstdc++"
+ else
+ AC_MSG_WARN("Could not find a C++ standard library")

diff --git a/dev-db/postgis/files/postgis-3.0.3-try-other-cpp-names.patch 
b/dev-db/postgis/files/postgis-3.0.3-try-other-cpp-names.patch
new file mode 100644
index 000..691cf8d1936
--- /dev/null
+++ b/dev-db/postgis/files/postgis-3.0.3-try-other-cpp-names.patch
@@ -0,0 +1,12 @@
+diff -Naruw postgis-3.1.0.orig/configure.ac postgis-3.1.0/configure.ac
+--- postgis-3.1.0.orig/configure.ac2020-12-18 14:39:26.0 -0500
 postgis-3.1.0/configure.ac 2020-12-23 21:44:09.223273050 -0500
+@@ -31,7 +31,7 @@
+ dnl
+ dnl SQL Preprocessor
+ dnl
+-AC_PATH_PROG([CPPBIN], [cpp], [])
++AC_PATH_PROGS([CPPBIN], [cpp x86_64-pc-linux-gnu-cpp x86-pc-linux-gnu-cpp], 
[])
+ if test "x$CPPBIN" != "x"; then
+   SQLPP="${CPPBIN} -traditional-cpp -w -P"
+ else

diff --git a/dev-db/postgis/postgis-3.0.3-r2.ebuild 
b/dev-db/postgis/postgis-3.0.3-r2.ebuild
new file mode 100644
index 000..407f889068d
--- /dev/null
+++ b/dev-db/postgis/postgis-3.0.3-r2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGR

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/, dev-db/postgis/files/

2020-12-18 Thread Aaron W. Swenson
commit: 061acf21495a02e1f2520ae1c3953879ae4fb798
Author: Bernd Waibel  gmail  com>
AuthorDate: Sat Dec  5 14:23:35 2020 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Fri Dec 18 23:17:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=061acf21

dev-db/postgis: fix direct ar call

Fix done during bugday 2020-12-05

Closes: https://bugs.gentoo.org/756046
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Bernd Waibel  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18518
Signed-off-by: Aaron W. Swenson  gentoo.org>

 .../postgis-3.0.3-avoid-calling-ar-directly.patch  | 85 ++
 ...ostgis-3.0.3.ebuild => postgis-3.0.3-r1.ebuild} |  5 +-
 2 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/dev-db/postgis/files/postgis-3.0.3-avoid-calling-ar-directly.patch 
b/dev-db/postgis/files/postgis-3.0.3-avoid-calling-ar-directly.patch
new file mode 100644
index 000..66a82e1e726
--- /dev/null
+++ b/dev-db/postgis/files/postgis-3.0.3-avoid-calling-ar-directly.patch
@@ -0,0 +1,85 @@
+From 7c5acb8ab83ee278f6a16c7279c3a12ca93499e9 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sat, 5 Dec 2020 13:38:03 +0100
+Subject: [PATCH] avoid calling ar directly
+
+Signed-off-by: Bernd Waibel 
+---
+ configure.ac   | 2 +-
+ deps/wagyu/Makefile.in | 4 +++-
+ libpgcommon/Makefile.in| 4 +++-
+ raster/rt_core/Makefile.in | 1 +
+ 4 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4f26390..362d3e6 100644
+--- a/configure.ac
 b/configure.ac
+@@ -14,7 +14,7 @@ AC_CONFIG_HEADERS([postgis_config.h])
+ AC_CONFIG_MACRO_DIR([macros])
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_PROG_INSTALL
+-
++AM_PROG_AR
+ 
+ dnl Invoke libtool: we do this as it is the easiest way to find the PIC
+ dnl flags required to build liblwgeom
+diff --git a/deps/wagyu/Makefile.in b/deps/wagyu/Makefile.in
+index 03d2279..05d6629 100644
+--- a/deps/wagyu/Makefile.in
 b/deps/wagyu/Makefile.in
+@@ -28,6 +28,8 @@ LDFLAGS = @LDFLAGS@
+ top_builddir = @top_builddir@
+ libdir = @libdir@
+ LIBTOOL = @LIBTOOL@
++AR = @AR@
++ARFLAGS = rs
+ 
+ WAGYU_OBJS = \
+   lwgeom_wagyu.o
+@@ -78,7 +80,7 @@ WAGYU_HEADERS = \
+ all: @WAGYU_LIB@
+ 
+ @WAGYU_LIB@: $(WAGYU_OBJS)
+-  ar rs @WAGYU_LIB@ $(WAGYU_OBJS)
++  $(AR) $(ARFLAGS) @WAGYU_LIB@ $(WAGYU_OBJS)
+ 
+ $(WAGYU_OBJS): %.o: %.cpp ../../liblwgeom/liblwgeom.h $(WAGYU_HEADERS)
+   $(CXX) $(CXXFLAGS) -c -o $@ $<
+diff --git a/libpgcommon/Makefile.in b/libpgcommon/Makefile.in
+index c44cf5b..78eb282 100644
+--- a/libpgcommon/Makefile.in
 b/libpgcommon/Makefile.in
+@@ -12,6 +12,8 @@
+ CC=@CC@
+ CFLAGS=-I../liblwgeom @WARNFLAGS@ @CFLAGS@ @PGSQL_BE_CPPFLAGS@ 
@PROJ_CPPFLAGS@ @PICFLAGS@ @GETTEXT_CFLAGS@
+ LDFLAGS=@GETTEXT_LDFLAGS@ @LIBINTL@
++AR = @AR@
++ARFLAGS = rs
+ 
+ NUMERICFLAGS=@NUMERICFLAGS@
+ 
+@@ -39,7 +41,7 @@ all: libpgcommon.a
+ install uninstall:
+ 
+ libpgcommon.a: $(SA_OBJS) $(SA_HEADERS)
+-  ar rs libpgcommon.a $(SA_OBJS)
++  $(AR) $(ARFLAGS) libpgcommon.a $(SA_OBJS)
+ 
+ maintainer-clean: clean
+ 
+diff --git a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
+index 380a3e7..b399661 100644
+--- a/raster/rt_core/Makefile.in
 b/raster/rt_core/Makefile.in
+@@ -18,6 +18,7 @@
+ #
+ #
+ 
++AR = @AR@
+ ARFLAGS = rs
+ 
+ CC = @CC@
+-- 
+2.29.2
+

diff --git a/dev-db/postgis/postgis-3.0.3.ebuild 
b/dev-db/postgis/postgis-3.0.3-r1.ebuild
similarity index 96%
rename from dev-db/postgis/postgis-3.0.3.ebuild
rename to dev-db/postgis/postgis-3.0.3-r1.ebuild
index 3e05e061edf..ef6c9bc20db 100644
--- a/dev-db/postgis/postgis-3.0.3.ebuild
+++ b/dev-db/postgis/postgis-3.0.3-r1.ebuild
@@ -53,7 +53,10 @@ DEPEND="${RDEPEND}
test? ( dev-util/cunit )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+   "${FILESDIR}/${P}-avoid-calling-ar-directly.patch"
+)
 
 src_prepare() {
default



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2020-12-18 Thread Aaron W. Swenson
commit: 3d1c49a2aec5f9976835535e4e8b74fbf00315d6
Author: Bernd Waibel  gmail  com>
AuthorDate: Fri Dec 11 17:06:31 2020 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Fri Dec 18 23:17:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d1c49a2

dev-db/postgis: avoid calling ar directly

Backport patch from 3.0.3 to avoid ar being called directly.

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Bernd Waibel  gmail.com>
Signed-off-by: Aaron W. Swenson  gentoo.org>

 .../{postgis-3.1.0_alpha3.ebuild => postgis-3.1.0_alpha3-r1.ebuild}  | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-db/postgis/postgis-3.1.0_alpha3.ebuild 
b/dev-db/postgis/postgis-3.1.0_alpha3-r1.ebuild
similarity index 96%
rename from dev-db/postgis/postgis-3.1.0_alpha3.ebuild
rename to dev-db/postgis/postgis-3.1.0_alpha3-r1.ebuild
index 36cb7623ef8..d9647334f4e 100644
--- a/dev-db/postgis/postgis-3.1.0_alpha3.ebuild
+++ b/dev-db/postgis/postgis-3.1.0_alpha3-r1.ebuild
@@ -53,7 +53,10 @@ DEPEND="${RDEPEND}
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"
+)
 
 src_prepare() {
default



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2020-11-22 Thread 罗百科
commit: a74fe45494ddeea038e6a705a6a8c503f34415c7
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sun Nov 22 09:08:33 2020 +
Commit: 罗百科  gentoo  org>
CommitDate: Sun Nov 22 09:08:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a74fe454

dev-db/postgis: add 3.1.0_alpha3

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest|   1 +
 dev-db/postgis/postgis-3.1.0_alpha3.ebuild | 135 +
 2 files changed, 136 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index ee3adfa78ee..705f54c7fd9 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -5,3 +5,4 @@ DIST postgis-3.0.0.tar.gz 17359802 BLAKE2B 
aa83bdc2d1950c517f99cbdd877eb7261f6c2
 DIST postgis-3.0.1.tar.gz 16839923 BLAKE2B 
6888fa49562ab71929e92007de305fd6610c74988faaf08fbeabbf1d13029ebbb5da788826dc63d03ae5c873fbe408ae6c0f108b2975755d2b13bc69bed53558
 SHA512 
5ebce2303d672bb342f7fae6cade08140c8a687fc38e82e5b41eebb8465cdf3dc7bdbeae53b1179df8112a01842dd65f362fc107b381e2a1fa6e161b77a50227
 DIST postgis-3.0.2.tar.gz 16855299 BLAKE2B 
99ee872abf52651ab53e4dd6203d99d428d366f60b949fabcae938980f5c17809872e9b23f7ab1f3480a60242e735c926e54122492e1b8966ed8c748eb7c4fe6
 SHA512 
763d7818d195eca0b07d94a864b13da68e5734ae57b7c93c285dc2d0fa4a155715745e5da67e1a3bca49d8d4f89dc495ed3912c079722290ce9f220afca33f4d
 DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B 
891f814271de9193cd17013d6d971a752d2e984cb0f68b05510450adef97fc96827e3d1a1c7e4fa4cf79a5d15eb3f74b32e6e9a8db1947f7bad7c2b23656bc8f
 SHA512 
478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
+DIST postgis-3.1.0alpha3.tar.gz 17197128 BLAKE2B 
f3b777efa8542b82db6031fa77a5728be94689542b45e4515887306cd0ae42cd9d802eae94b07e5a70f308e82fe6afc49a29f43ad2c302d9913f00797118764c
 SHA512 
758b688aa01babc5ac9cc703d3d64fd751639425df7e1a2aa5bb72f1707a8279f87e7b3d84e23f465a51d08787858e0eb54e0afc38039d69ddfe7668e2dce256

diff --git a/dev-db/postgis/postgis-3.1.0_alpha3.ebuild 
b/dev-db/postgis/postgis-3.1.0_alpha3.ebuild
new file mode 100644
index 000..36cb7623ef8
--- /dev/null
+++ b/dev-db/postgis/postgis-3.1.0_alpha3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+else
+   PGIS="$(ver_cut 1-2)"
+   SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
+   KEYWORDS=""
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs test topology"
+
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.6.0
+   >=sci-libs/proj-4.9.0:=
+   >=sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+   test? ( dev-util/cunit )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" )
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   local myeconfargs=(
+   --with-protobuf # funky misdetection if enabled but 
--without-protobuf
+   $(use_with address-standardizer)
+   $(use_with gtk gui)
+   $(use_with topology)
+   )
+   postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_foreach emake cheatsheets
+   postgres-multi_forbest emake -C doc html
+   fi
+}
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2020-11-22 Thread 罗百科
commit: 4fc582d6e9f494bb8fa590838ad3620f3c3f6736
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sun Nov 22 08:36:06 2020 +
Commit: 罗百科  gentoo  org>
CommitDate: Sun Nov 22 08:36:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc582d6

dev-db/postgis: Bump

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   1 +
 dev-db/postgis/postgis-3.0.3.ebuild | 135 
 2 files changed, 136 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 7e1d9c388b6..ee3adfa78ee 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -4,3 +4,4 @@ DIST postgis-2.5.5.tar.gz 15936193 BLAKE2B 
df5d0e51bb5042a72ecd070273c4a87738b2b
 DIST postgis-3.0.0.tar.gz 17359802 BLAKE2B 
aa83bdc2d1950c517f99cbdd877eb7261f6c29ce2cbd9f67f1e606c290080fc3d02ab0b7ceb68ce852e0c0d3d4b7753f03cb5b0921da164ab65d68e23d1df538
 SHA512 
82c233681fa6444686f9979768e5d6d3a9b6ca9cbd4fc2b14bd0a5d1269a8d0f45ee067e64984077063407c7abc13fa0e37a29928d7ccbfe3a61b694f592bed2
 DIST postgis-3.0.1.tar.gz 16839923 BLAKE2B 
6888fa49562ab71929e92007de305fd6610c74988faaf08fbeabbf1d13029ebbb5da788826dc63d03ae5c873fbe408ae6c0f108b2975755d2b13bc69bed53558
 SHA512 
5ebce2303d672bb342f7fae6cade08140c8a687fc38e82e5b41eebb8465cdf3dc7bdbeae53b1179df8112a01842dd65f362fc107b381e2a1fa6e161b77a50227
 DIST postgis-3.0.2.tar.gz 16855299 BLAKE2B 
99ee872abf52651ab53e4dd6203d99d428d366f60b949fabcae938980f5c17809872e9b23f7ab1f3480a60242e735c926e54122492e1b8966ed8c748eb7c4fe6
 SHA512 
763d7818d195eca0b07d94a864b13da68e5734ae57b7c93c285dc2d0fa4a155715745e5da67e1a3bca49d8d4f89dc495ed3912c079722290ce9f220afca33f4d
+DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B 
891f814271de9193cd17013d6d971a752d2e984cb0f68b05510450adef97fc96827e3d1a1c7e4fa4cf79a5d15eb3f74b32e6e9a8db1947f7bad7c2b23656bc8f
 SHA512 
478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115

diff --git a/dev-db/postgis/postgis-3.0.3.ebuild 
b/dev-db/postgis/postgis-3.0.3.ebuild
new file mode 100644
index 000..3e05e061edf
--- /dev/null
+++ b/dev-db/postgis/postgis-3.0.3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs test topology"
+
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.6.0
+   >=sci-libs/proj-4.9.0:=
+   >=sci-libs/gdal-1.10.0:=
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+   test? ( dev-util/cunit )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" )
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   local myeconfargs=(
+   --with-protobuf # funky misdetection if enabled but 
--without-protobuf
+   $(use_with address-standardizer)
+   $(use_with gtk gui)
+   $(use_with topology)
+   )
+   postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_foreach emake cheatsheets
+   postgres-multi_forbest emake -C doc html
+   fi
+}
+
+src_instal

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2020-08-18 Thread 罗百科
commit: b970b744483a755b4b56bf45987fb4e4029ece90
Author: Patrick Lauer  gentoo  org>
AuthorDate: Tue Aug 18 17:55:59 2020 +
Commit: 罗百科  gentoo  org>
CommitDate: Tue Aug 18 17:57:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b970b744

dev-db/postgis: Bump

Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   2 +
 dev-db/postgis/postgis-2.5.5.ebuild | 137 
 dev-db/postgis/postgis-3.0.2.ebuild | 135 +++
 3 files changed, 274 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index fa6f2df34dd..7e1d9c388b6 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,4 +1,6 @@
 DIST postgis-2.5.3.tar.gz 16424752 BLAKE2B 
94c2ccd41eb88a39c6db48ad7f4d142742a1b0791e3abe57adb2c778406dcc8286afc6d55c80067e0b94a1300eff1c76a227d3cfd813e12541c715edeea11a9b
 SHA512 
1c9f873ba8f8ff4aeae248c68c001eb4174416de1e00ce6a0d0c9ea129b475e887a83235027068d52f587ab95c549adbfaa7e5dccdda77855e39c55dac0fdc2d
 DIST postgis-2.5.4.tar.gz 15882033 BLAKE2B 
317e6f3857dce8b1c054b5cdb6c6b215b015b89266aeaa0187803b9355cdc3cbb62be89f36ffe29e2fcbc1e7b693a7f88fb23b5c172fcefea376f6afea3c064d
 SHA512 
767c146245ae11545ce4e0764f9bd313cfdf2eed78c485c5aa5530517edb8e433bcdbaffcf4d92b0c0f3c997de9831b5e3beed7638fc3bc773f264b45e5d8ab4
+DIST postgis-2.5.5.tar.gz 15936193 BLAKE2B 
df5d0e51bb5042a72ecd070273c4a87738b2ba482993d39948137c8ba2da0a47845393023a6b4e45f01a91d37ef8fc9f89302203c639fb32b4451cb905fd08b3
 SHA512 
407c9ddf5b73aaa8d36ec606f974b86c16c9ed4aafbfd4a0b7f96cfc7a9f8a8fa38528cb4787bdd50de479416dbfb09934a85d189463cec549da66863060292e
 DIST postgis-3.0.0.tar.gz 17359802 BLAKE2B 
aa83bdc2d1950c517f99cbdd877eb7261f6c29ce2cbd9f67f1e606c290080fc3d02ab0b7ceb68ce852e0c0d3d4b7753f03cb5b0921da164ab65d68e23d1df538
 SHA512 
82c233681fa6444686f9979768e5d6d3a9b6ca9cbd4fc2b14bd0a5d1269a8d0f45ee067e64984077063407c7abc13fa0e37a29928d7ccbfe3a61b694f592bed2
 DIST postgis-3.0.1.tar.gz 16839923 BLAKE2B 
6888fa49562ab71929e92007de305fd6610c74988faaf08fbeabbf1d13029ebbb5da788826dc63d03ae5c873fbe408ae6c0f108b2975755d2b13bc69bed53558
 SHA512 
5ebce2303d672bb342f7fae6cade08140c8a687fc38e82e5b41eebb8465cdf3dc7bdbeae53b1179df8112a01842dd65f362fc107b381e2a1fa6e161b77a50227
+DIST postgis-3.0.2.tar.gz 16855299 BLAKE2B 
99ee872abf52651ab53e4dd6203d99d428d366f60b949fabcae938980f5c17809872e9b23f7ab1f3480a60242e735c926e54122492e1b8966ed8c748eb7c4fe6
 SHA512 
763d7818d195eca0b07d94a864b13da68e5734ae57b7c93c285dc2d0fa4a155715745e5da67e1a3bca49d8d4f89dc495ed3912c079722290ce9f220afca33f4d

diff --git a/dev-db/postgis/postgis-2.5.5.ebuild 
b/dev-db/postgis/postgis-2.5.5.ebuild
new file mode 100644
index 000..1cdbc058b8d
--- /dev/null
+++ b/dev-db/postgis/postgis-2.5.5.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.{5..6} {10..12} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk mapbox static-libs test topology"
+
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c
+   >=sci-libs/geos-3.5.0
+   >=sci-libs/proj-4.6.0:=
+   >=sci-libs/gdal-1.10.0
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+   mapbox? ( dev-libs/protobuf-c:= )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+   test? ( dev-util/cunit )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" )
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_pre

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2020-08-13 Thread Aaron W. Swenson
commit: d1d8f6ce4ac2dbb753bfd46d6231b99ec60fa0d0
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Fri Aug 14 00:44:31 2020 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Fri Aug 14 00:44:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1d8f6ce

dev-db/postgis: Dropping Pg 9.4 Support

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/postgis/postgis-2.5.3-r1.ebuild | 2 +-
 dev-db/postgis/postgis-2.5.4.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/postgis/postgis-2.5.3-r1.ebuild 
b/dev-db/postgis/postgis-2.5.3-r1.ebuild
index 13a85904de8..540d66ffadb 100644
--- a/dev-db/postgis/postgis-2.5.3-r1.ebuild
+++ b/dev-db/postgis/postgis-2.5.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-POSTGRES_COMPAT=( 9.{4..6} {10..12} )
+POSTGRES_COMPAT=( 9.{5..6} {10..12} )
 POSTGRES_USEDEP="server"
 inherit autotools eapi7-ver postgres-multi
 

diff --git a/dev-db/postgis/postgis-2.5.4.ebuild 
b/dev-db/postgis/postgis-2.5.4.ebuild
index 098d69d159b..1cdbc058b8d 100644
--- a/dev-db/postgis/postgis-2.5.4.ebuild
+++ b/dev-db/postgis/postgis-2.5.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-POSTGRES_COMPAT=( 9.{4..6} {10..12} )
+POSTGRES_COMPAT=( 9.{5..6} {10..12} )
 POSTGRES_USEDEP="server"
 inherit autotools postgres-multi
 



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2020-07-17 Thread 罗百科
commit: c88b563b404130e536c0a42d6475e87e22516b87
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sat Jul 18 06:45:31 2020 +
Commit: 罗百科  gentoo  org>
CommitDate: Sat Jul 18 06:45:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c88b563b

dev-db/postgis: Bump

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   2 +
 dev-db/postgis/postgis-2.5.4.ebuild | 137 
 dev-db/postgis/postgis-3.0.1.ebuild | 135 +++
 3 files changed, 274 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 617516bdd3e..fa6f2df34dd 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,2 +1,4 @@
 DIST postgis-2.5.3.tar.gz 16424752 BLAKE2B 
94c2ccd41eb88a39c6db48ad7f4d142742a1b0791e3abe57adb2c778406dcc8286afc6d55c80067e0b94a1300eff1c76a227d3cfd813e12541c715edeea11a9b
 SHA512 
1c9f873ba8f8ff4aeae248c68c001eb4174416de1e00ce6a0d0c9ea129b475e887a83235027068d52f587ab95c549adbfaa7e5dccdda77855e39c55dac0fdc2d
+DIST postgis-2.5.4.tar.gz 15882033 BLAKE2B 
317e6f3857dce8b1c054b5cdb6c6b215b015b89266aeaa0187803b9355cdc3cbb62be89f36ffe29e2fcbc1e7b693a7f88fb23b5c172fcefea376f6afea3c064d
 SHA512 
767c146245ae11545ce4e0764f9bd313cfdf2eed78c485c5aa5530517edb8e433bcdbaffcf4d92b0c0f3c997de9831b5e3beed7638fc3bc773f264b45e5d8ab4
 DIST postgis-3.0.0.tar.gz 17359802 BLAKE2B 
aa83bdc2d1950c517f99cbdd877eb7261f6c29ce2cbd9f67f1e606c290080fc3d02ab0b7ceb68ce852e0c0d3d4b7753f03cb5b0921da164ab65d68e23d1df538
 SHA512 
82c233681fa6444686f9979768e5d6d3a9b6ca9cbd4fc2b14bd0a5d1269a8d0f45ee067e64984077063407c7abc13fa0e37a29928d7ccbfe3a61b694f592bed2
+DIST postgis-3.0.1.tar.gz 16839923 BLAKE2B 
6888fa49562ab71929e92007de305fd6610c74988faaf08fbeabbf1d13029ebbb5da788826dc63d03ae5c873fbe408ae6c0f108b2975755d2b13bc69bed53558
 SHA512 
5ebce2303d672bb342f7fae6cade08140c8a687fc38e82e5b41eebb8465cdf3dc7bdbeae53b1179df8112a01842dd65f362fc107b381e2a1fa6e161b77a50227

diff --git a/dev-db/postgis/postgis-2.5.4.ebuild 
b/dev-db/postgis/postgis-2.5.4.ebuild
new file mode 100644
index 000..098d69d159b
--- /dev/null
+++ b/dev-db/postgis/postgis-2.5.4.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.{4..6} {10..12} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk mapbox static-libs test topology"
+
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c
+   >=sci-libs/geos-3.5.0
+   >=sci-libs/proj-4.6.0:=
+   >=sci-libs/gdal-1.10.0
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+   mapbox? ( dev-libs/protobuf-c:= )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+   test? ( dev-util/cunit )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" )
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   local myeconfargs=(
+   --with-protobuf
+   $(use_with address-standardizer)
+   $(use_with gtk gui)
+   $(use_with mapbox)
+   $(use_with topology)
+   )
+   postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_foreach emake cheatsheets
+   postgres-multi_forbest emake -C doc html
+   

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2020-02-26 Thread Andreas Sturmlechner
commit: f1114c56baaed9d587308d1c02557e65b96cf19c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb 26 17:20:02 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Feb 26 17:22:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1114c56

dev-db/postgis: Add missing slot op

Closes: https://bugs.gentoo.org/709660
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/postgis/postgis-3.0.0-r1.ebuild | 2 +-
 dev-db/postgis/postgis-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/postgis/postgis-3.0.0-r1.ebuild 
b/dev-db/postgis/postgis-3.0.0-r1.ebuild
index 2235d63f8dd..3a6f01adf2e 100644
--- a/dev-db/postgis/postgis-3.0.0-r1.ebuild
+++ b/dev-db/postgis/postgis-3.0.0-r1.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${POSTGRES_DEP}
dev-libs/protobuf-c:=
>=sci-libs/geos-3.6.0
>=sci-libs/proj-4.9.0:=
-   >=sci-libs/gdal-1.10.0
+   >=sci-libs/gdal-1.10.0:=
address-standardizer? ( dev-libs/libpcre )
gtk? ( x11-libs/gtk+:2 )
 "

diff --git a/dev-db/postgis/postgis-.ebuild 
b/dev-db/postgis/postgis-.ebuild
index 2235d63f8dd..3a6f01adf2e 100644
--- a/dev-db/postgis/postgis-.ebuild
+++ b/dev-db/postgis/postgis-.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${POSTGRES_DEP}
dev-libs/protobuf-c:=
>=sci-libs/geos-3.6.0
>=sci-libs/proj-4.9.0:=
-   >=sci-libs/gdal-1.10.0
+   >=sci-libs/gdal-1.10.0:=
address-standardizer? ( dev-libs/libpcre )
gtk? ( x11-libs/gtk+:2 )
 "



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2020-02-13 Thread Andreas Sturmlechner
commit: 1adf60a3b3b33756e05ad547dd0b247cc30588c7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 13 22:40:25 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 13 23:19:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1adf60a3

dev-db/postgis: Drop 2.4.7, 2.4.8 and 2.5.2

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/postgis/Manifest |   3 -
 dev-db/postgis/postgis-2.4.7.ebuild | 125 
 dev-db/postgis/postgis-2.4.8.ebuild | 125 
 dev-db/postgis/postgis-2.5.2.ebuild | 123 ---
 4 files changed, 376 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 584507e4d98..617516bdd3e 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,5 +1,2 @@
-DIST postgis-2.4.7.tar.gz 12831401 BLAKE2B 
0069a339cc778a02a008835189b5560ffb1724aceaaeeec5264750cdfaa4346310ca1d112f698556e750b6559f0dabb727584c9d41ff8747ed7673e147c9723e
 SHA512 
832f039e582227cd1c6edef98af8dfcceb90db75b18d4ba605b7baf2842227b23fe2d15c3b1cde941182c93230ba41ab94da59e97506c77e79f2016bbd98c885
-DIST postgis-2.4.8.tar.gz 12846228 BLAKE2B 
dc7cd26f08774011bddba362040f35fd46dab5f58870643d4e6d939fb107a8e93ccb8c2d57ac67bf5ba44a7dd05c25eee77358548d9d7d9a8b3e2f7538e49538
 SHA512 
afeddbdcbad68358c3bc36beec5f1baf74c328daba90f0ac7d6322e4330d18da2e5534fa200f8ae3f19e7e897221989a564f6e2855e9181eadfd9cc32315b666
-DIST postgis-2.5.2.tar.gz 16252761 BLAKE2B 
181ecc41e659c1df32392d0dfea9cc081c2a647fd23401b8b0470f99e1136b6b8ed900eaea38afdf87cc801bf13ede4247f9c188fcf0da6782624239c77b434f
 SHA512 
b10781f0b74bad8162c33eb111a6090fba184b45fe5874d22cd3a5b0acfb057f3407c073bc44c9d4cd20ed8c2cb1fbb34480b0cf331340bc8b52580d4eccb819
 DIST postgis-2.5.3.tar.gz 16424752 BLAKE2B 
94c2ccd41eb88a39c6db48ad7f4d142742a1b0791e3abe57adb2c778406dcc8286afc6d55c80067e0b94a1300eff1c76a227d3cfd813e12541c715edeea11a9b
 SHA512 
1c9f873ba8f8ff4aeae248c68c001eb4174416de1e00ce6a0d0c9ea129b475e887a83235027068d52f587ab95c549adbfaa7e5dccdda77855e39c55dac0fdc2d
 DIST postgis-3.0.0.tar.gz 17359802 BLAKE2B 
aa83bdc2d1950c517f99cbdd877eb7261f6c29ce2cbd9f67f1e606c290080fc3d02ab0b7ceb68ce852e0c0d3d4b7753f03cb5b0921da164ab65d68e23d1df538
 SHA512 
82c233681fa6444686f9979768e5d6d3a9b6ca9cbd4fc2b14bd0a5d1269a8d0f45ee067e64984077063407c7abc13fa0e37a29928d7ccbfe3a61b694f592bed2

diff --git a/dev-db/postgis/postgis-2.4.7.ebuild 
b/dev-db/postgis/postgis-2.4.7.ebuild
deleted file mode 100644
index 2b057bbea83..000
--- a/dev-db/postgis/postgis-2.4.7.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-POSTGRES_COMPAT=( 9.{4..6} {10..11} )
-POSTGRES_USEDEP="server"
-
-inherit autotools eutils postgres-multi versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net";
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="address-standardizer doc gtk static-libs mapbox test topology"
-
-RDEPEND="
-   ${POSTGRES_DEP}
-   dev-libs/json-c:=
-   dev-libs/libxml2:2
-   >=sci-libs/geos-3.5.0
-   >=sci-libs/proj-4.6.0
-   >=sci-libs/gdal-1.10.0
-   address-standardizer? ( dev-libs/libpcre )
-   gtk? ( x11-libs/gtk+:2 )
-   mapbox? ( dev-libs/protobuf )
-"
-
-DEPEND="${RDEPEND}
-   doc? (
-   app-text/docbook-xsl-stylesheets
-   app-text/docbook-xml-dtd:4.5
-   dev-libs/libxslt
-   || (
-   media-gfx/imagemagick[png]
-   
media-gfx/graphicsmagick[imagemagick,png]
-   )
-   )
-   virtual/pkgconfig
-   test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-MAKEOPTS+=' -j1'
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-src_prepare() {
-   eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch"
-
-   local AT_M4DIR="macros"
-   eautoreconf
-
-   postgres-multi_src_prepare
-}
-
-src_configure() {
-   local myargs=""
-
-   use gtk  && myargs+=" --with-gui"
-
-   use address-standardizer || myargs+=" --without-address-standardizer"
-   use mapbox  

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2020-02-03 Thread Agostino Sarubbo
commit: a1819572801ef4694c696036c9050d670c8fe406
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Feb  3 11:31:02 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Feb  3 11:31:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1819572

dev-db/postgis: x86 stable wrt bug #707510

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/postgis/postgis-2.5.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/postgis-2.5.3-r1.ebuild 
b/dev-db/postgis/postgis-2.5.3-r1.ebuild
index 3bd3537184e..13a85904de8 100644
--- a/dev-db/postgis/postgis-2.5.3-r1.ebuild
+++ b/dev-db/postgis/postgis-2.5.3-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = ** ]] ; 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"



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2020-02-03 Thread Agostino Sarubbo
commit: d95edbb3192e3a8c47e6aa5fc2691f1af5574abe
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Feb  3 11:27:51 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Feb  3 11:27:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d95edbb3

dev-db/postgis: amd64 stable wrt bug #707510

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/postgis/postgis-2.5.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/postgis-2.5.3-r1.ebuild 
b/dev-db/postgis/postgis-2.5.3-r1.ebuild
index 5c308dbe1b1..3bd3537184e 100644
--- a/dev-db/postgis/postgis-2.5.3-r1.ebuild
+++ b/dev-db/postgis/postgis-2.5.3-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = ** ]] ; 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"



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2020-01-31 Thread Andreas Sturmlechner
commit: 84c4e3c62c198fab9d9102e7b0e1d39c21b1dbe8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jan 31 09:03:55 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jan 31 09:50:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84c4e3c6

dev-db/postgis: Drop 2.5.3 (r0) and 3.0.0 (r0)

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/postgis/postgis-2.5.3.ebuild | 123 ---
 dev-db/postgis/postgis-3.0.0.ebuild | 125 
 2 files changed, 248 deletions(-)

diff --git a/dev-db/postgis/postgis-2.5.3.ebuild 
b/dev-db/postgis/postgis-2.5.3.ebuild
deleted file mode 100644
index 23608a5b3b0..000
--- a/dev-db/postgis/postgis-2.5.3.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-POSTGRES_COMPAT=( 9.{4..6} {10..12} )
-POSTGRES_USEDEP="server"
-
-inherit autotools eutils postgres-multi versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net";
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="address-standardizer doc gtk static-libs mapbox test topology"
-
-RDEPEND="
-   ${POSTGRES_DEP}
-   dev-libs/json-c:=
-   dev-libs/libxml2:2
-   >=sci-libs/geos-3.5.0
-   >=sci-libs/proj-4.6.0
-   >=sci-libs/gdal-1.10.0
-   address-standardizer? ( dev-libs/libpcre )
-   gtk? ( x11-libs/gtk+:2 )
-   mapbox? ( dev-libs/protobuf )
-"
-
-DEPEND="${RDEPEND}
-   doc? (
-   app-text/docbook-xsl-stylesheets
-   app-text/docbook-xml-dtd:4.5
-   dev-libs/libxslt
-   || (
-   media-gfx/imagemagick[png]
-   
media-gfx/graphicsmagick[imagemagick,png]
-   )
-   )
-   virtual/pkgconfig
-   test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-src_prepare() {
-   eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch"
-
-   local AT_M4DIR="macros"
-   eautoreconf
-
-   postgres-multi_src_prepare
-}
-
-src_configure() {
-   local myargs=""
-
-   use gtk  && myargs+=" --with-gui"
-
-   use address-standardizer || myargs+=" --without-address-standardizer"
-   use mapbox   || myargs+=" --without-protobuf"
-   use topology || myargs+=" --without-topology"
-
-   postgres-multi_foreach econf ${myargs}
-}
-
-src_compile() {
-   postgres-multi_foreach emake
-   postgres-multi_foreach emake -C topology
-
-   if use doc ; then
-   postgres-multi_foreach emake comments
-   postgres-multi_foreach emake cheatsheets
-   postgres-multi_forbest emake -C doc html
-   fi
-}
-
-src_install() {
-   postgres-multi_foreach emake DESTDIR="${D}" install
-   postgres-multi_foreach emake -C topology DESTDIR="${D}" install
-   postgres-multi_forbest dobin ./utils/postgis_restore.pl
-
-   dodoc CREDITS TODO loader/README.* doc/*txt
-
-   docinto topology
-   dodoc topology/{TODO,README}
-
-   if use doc ; then
-   postgres-multi_foreach emake DESTDIR="${D}" comments-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
-}
-
-pkg_postinst() {
-   ebegin "Refreshing PostgreSQL symlinks"
-   postgresql-config update
-   eend $?
-
-   elog "To finish installing PostGIS, follow the directions detailed at:"
-   elog 
"http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions";
-}

diff --git a/dev-db/postgis/postgis-3.0.0.ebuild 
b/dev-db/postgis/postgis-3.0.0.ebuild
deleted file mode 100644
index 9a383102a77..000
--- a/dev-db/postgis/postgis-3.0.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-POSTGRES_COMPAT=( 9.{5..6} {10..12} )

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2020-01-30 Thread Andreas Sturmlechner
commit: cc05edbb2791e17df74fd8ca2d2845f5ba55a30c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan 30 20:40:57 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jan 30 21:27:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc05edbb

dev-db/postgis: Drop 2.5.1-r1

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/postgis/Manifest|   1 -
 dev-db/postgis/postgis-2.5.1-r1.ebuild | 123 -
 2 files changed, 124 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 9b58ba786c7..584507e4d98 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,6 +1,5 @@
 DIST postgis-2.4.7.tar.gz 12831401 BLAKE2B 
0069a339cc778a02a008835189b5560ffb1724aceaaeeec5264750cdfaa4346310ca1d112f698556e750b6559f0dabb727584c9d41ff8747ed7673e147c9723e
 SHA512 
832f039e582227cd1c6edef98af8dfcceb90db75b18d4ba605b7baf2842227b23fe2d15c3b1cde941182c93230ba41ab94da59e97506c77e79f2016bbd98c885
 DIST postgis-2.4.8.tar.gz 12846228 BLAKE2B 
dc7cd26f08774011bddba362040f35fd46dab5f58870643d4e6d939fb107a8e93ccb8c2d57ac67bf5ba44a7dd05c25eee77358548d9d7d9a8b3e2f7538e49538
 SHA512 
afeddbdcbad68358c3bc36beec5f1baf74c328daba90f0ac7d6322e4330d18da2e5534fa200f8ae3f19e7e897221989a564f6e2855e9181eadfd9cc32315b666
-DIST postgis-2.5.1.tar.gz 16041872 BLAKE2B 
589cf7168d3698737a19d817b8efb91695c2c3f63d6c3aa24189d9a37459a28ca8a7db0450aa2d557699f76cd8e3ab1eec198bd332b294d976330fdc9d8a7f60
 SHA512 
c6c9c8c5befd945614e92d1062df1d753ca8b7fd69b70226065c2dac77a59783b14ece4da994187079b683ee090ba5a79389ba679f22fce8c20a5afc2c8dfca0
 DIST postgis-2.5.2.tar.gz 16252761 BLAKE2B 
181ecc41e659c1df32392d0dfea9cc081c2a647fd23401b8b0470f99e1136b6b8ed900eaea38afdf87cc801bf13ede4247f9c188fcf0da6782624239c77b434f
 SHA512 
b10781f0b74bad8162c33eb111a6090fba184b45fe5874d22cd3a5b0acfb057f3407c073bc44c9d4cd20ed8c2cb1fbb34480b0cf331340bc8b52580d4eccb819
 DIST postgis-2.5.3.tar.gz 16424752 BLAKE2B 
94c2ccd41eb88a39c6db48ad7f4d142742a1b0791e3abe57adb2c778406dcc8286afc6d55c80067e0b94a1300eff1c76a227d3cfd813e12541c715edeea11a9b
 SHA512 
1c9f873ba8f8ff4aeae248c68c001eb4174416de1e00ce6a0d0c9ea129b475e887a83235027068d52f587ab95c549adbfaa7e5dccdda77855e39c55dac0fdc2d
 DIST postgis-3.0.0.tar.gz 17359802 BLAKE2B 
aa83bdc2d1950c517f99cbdd877eb7261f6c29ce2cbd9f67f1e606c290080fc3d02ab0b7ceb68ce852e0c0d3d4b7753f03cb5b0921da164ab65d68e23d1df538
 SHA512 
82c233681fa6444686f9979768e5d6d3a9b6ca9cbd4fc2b14bd0a5d1269a8d0f45ee067e64984077063407c7abc13fa0e37a29928d7ccbfe3a61b694f592bed2

diff --git a/dev-db/postgis/postgis-2.5.1-r1.ebuild 
b/dev-db/postgis/postgis-2.5.1-r1.ebuild
deleted file mode 100644
index 39283cedf71..000
--- a/dev-db/postgis/postgis-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-POSTGRES_COMPAT=( 9.{4..6} {10..12} )
-POSTGRES_USEDEP="server"
-
-inherit autotools eutils postgres-multi versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net";
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="address-standardizer doc gtk static-libs mapbox test topology"
-
-RDEPEND="
-   ${POSTGRES_DEP}
-   dev-libs/json-c:=
-   dev-libs/libxml2:2
-   >=sci-libs/geos-3.5.0
-   >=sci-libs/proj-4.6.0
-   >=sci-libs/gdal-1.10.0
-   address-standardizer? ( dev-libs/libpcre )
-   gtk? ( x11-libs/gtk+:2 )
-   mapbox? ( dev-libs/protobuf )
-"
-
-DEPEND="${RDEPEND}
-   doc? (
-   app-text/docbook-xsl-stylesheets
-   app-text/docbook-xml-dtd:4.5
-   dev-libs/libxslt
-   || (
-   media-gfx/imagemagick[png]
-   
media-gfx/graphicsmagick[imagemagick,png]
-   )
-   )
-   virtual/pkgconfig
-   test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-src_prepare() {
-   eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch"
-
-   local AT_M4DIR="macros"
-   eautoreconf
-
-   postgres-multi_src_prepare
-}
-
-src_configure() {
-   local myargs=""
-
-   use gtk  && mya

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2020-01-30 Thread Andreas Sturmlechner
commit: f41cdaf2f7ab739ccb8ce91a002fc0a976ad5dfd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan 30 20:40:25 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jan 30 21:27:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f41cdaf2

dev-db/postgis: Drop 2.4.6

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/postgis/Manifest |   1 -
 dev-db/postgis/postgis-2.4.6.ebuild | 125 
 2 files changed, 126 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 72d18f4734e..9b58ba786c7 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,4 +1,3 @@
-DIST postgis-2.4.6.tar.gz 12616474 BLAKE2B 
8e33ae7e8ca5ef2a4dd90f64a8e9910118e4ef711444b196f46e4a63f98ff6044709d65a853c5c10de91308658a206965503b6a85a16438ea422becdbbd9bb40
 SHA512 
eec4276a58549f3cc57d6574186aebc72df0dd7dc2ab9acbaf410604b4d271dee6d5154caacd7297d20493d879434ca78050672e8197ff0fc63a36100c20c66c
 DIST postgis-2.4.7.tar.gz 12831401 BLAKE2B 
0069a339cc778a02a008835189b5560ffb1724aceaaeeec5264750cdfaa4346310ca1d112f698556e750b6559f0dabb727584c9d41ff8747ed7673e147c9723e
 SHA512 
832f039e582227cd1c6edef98af8dfcceb90db75b18d4ba605b7baf2842227b23fe2d15c3b1cde941182c93230ba41ab94da59e97506c77e79f2016bbd98c885
 DIST postgis-2.4.8.tar.gz 12846228 BLAKE2B 
dc7cd26f08774011bddba362040f35fd46dab5f58870643d4e6d939fb107a8e93ccb8c2d57ac67bf5ba44a7dd05c25eee77358548d9d7d9a8b3e2f7538e49538
 SHA512 
afeddbdcbad68358c3bc36beec5f1baf74c328daba90f0ac7d6322e4330d18da2e5534fa200f8ae3f19e7e897221989a564f6e2855e9181eadfd9cc32315b666
 DIST postgis-2.5.1.tar.gz 16041872 BLAKE2B 
589cf7168d3698737a19d817b8efb91695c2c3f63d6c3aa24189d9a37459a28ca8a7db0450aa2d557699f76cd8e3ab1eec198bd332b294d976330fdc9d8a7f60
 SHA512 
c6c9c8c5befd945614e92d1062df1d753ca8b7fd69b70226065c2dac77a59783b14ece4da994187079b683ee090ba5a79389ba679f22fce8c20a5afc2c8dfca0

diff --git a/dev-db/postgis/postgis-2.4.6.ebuild 
b/dev-db/postgis/postgis-2.4.6.ebuild
deleted file mode 100644
index 2b057bbea83..000
--- a/dev-db/postgis/postgis-2.4.6.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-POSTGRES_COMPAT=( 9.{4..6} {10..11} )
-POSTGRES_USEDEP="server"
-
-inherit autotools eutils postgres-multi versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net";
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="address-standardizer doc gtk static-libs mapbox test topology"
-
-RDEPEND="
-   ${POSTGRES_DEP}
-   dev-libs/json-c:=
-   dev-libs/libxml2:2
-   >=sci-libs/geos-3.5.0
-   >=sci-libs/proj-4.6.0
-   >=sci-libs/gdal-1.10.0
-   address-standardizer? ( dev-libs/libpcre )
-   gtk? ( x11-libs/gtk+:2 )
-   mapbox? ( dev-libs/protobuf )
-"
-
-DEPEND="${RDEPEND}
-   doc? (
-   app-text/docbook-xsl-stylesheets
-   app-text/docbook-xml-dtd:4.5
-   dev-libs/libxslt
-   || (
-   media-gfx/imagemagick[png]
-   
media-gfx/graphicsmagick[imagemagick,png]
-   )
-   )
-   virtual/pkgconfig
-   test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-MAKEOPTS+=' -j1'
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-src_prepare() {
-   eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch"
-
-   local AT_M4DIR="macros"
-   eautoreconf
-
-   postgres-multi_src_prepare
-}
-
-src_configure() {
-   local myargs=""
-
-   use gtk  && myargs+=" --with-gui"
-
-   use address-standardizer || myargs+=" --without-address-standardizer"
-   use mapbox   || myargs+=" --without-protobuf"
-   use topology || myargs+=" --without-topology"
-
-   postgres-multi_foreach econf ${myargs}
-}
-
-src_compile() {
-   postgres-multi_foreach emake
-   postgres-multi_foreach emake -C topology
-
-   if use doc ; then
-   postgres-multi_foreach emake comments
-   postgres-multi_foreach emake cheatsheets
-   postgres-multi_forbest emake -C doc html
-   fi
-}
-
-src_install() {
- 

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2020-01-30 Thread Andreas Sturmlechner
commit: 0013ad54f8a1b802403d20be7989895d07f19133
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan 30 19:54:55 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jan 30 19:58:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0013ad54

dev-db/postgis: Sync 2.5.3 with , fix dependencies

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/postgis/postgis-2.5.3-r1.ebuild | 135 +
 1 file changed, 135 insertions(+)

diff --git a/dev-db/postgis/postgis-2.5.3-r1.ebuild 
b/dev-db/postgis/postgis-2.5.3-r1.ebuild
new file mode 100644
index 000..5c308dbe1b1
--- /dev/null
+++ b/dev-db/postgis/postgis-2.5.3-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{4..6} {10..12} )
+POSTGRES_USEDEP="server"
+inherit autotools eapi7-ver postgres-multi
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk mapbox static-libs test topology"
+
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   >=sci-libs/geos-3.5.0
+   >=sci-libs/proj-4.6.0:=
+   >=sci-libs/gdal-1.10.0
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+   mapbox? ( dev-libs/protobuf-c:= )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+   test? ( dev-util/cunit )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" )
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   local myeconfargs=(
+   $(use_with address-standardizer)
+   $(use_with gtk gui)
+   $(use_with mapbox protobuf)
+   $(use_with topology)
+   )
+   postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_foreach emake cheatsheets
+   postgres-multi_forbest emake -C doc html
+   fi
+}
+
+src_install() {
+   postgres-multi_foreach emake DESTDIR="${D}" install
+   postgres-multi_foreach emake -C topology DESTDIR="${D}" install
+   postgres-multi_forbest dobin ./utils/postgis_restore.pl
+
+   dodoc CREDITS TODO loader/README.* doc/*txt
+
+   docinto topology
+   dodoc topology/{TODO,README}
+
+   if use doc ; then
+   postgres-multi_foreach emake DESTDIR="${D}" comments-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
+}
+
+pkg_postinst() {
+   ebegin "Refreshing PostgreSQL symlinks"
+   postgresql-config update
+   eend $?
+
+   local base_uri="https://postgis.net/docs/manual-";
+   if [[ ${PV} = ** ]] ; then
+   base_uri+="dev"
+   else
+   base_uri+="${PGIS}"
+   fi
+
+   elog "To finish installing PostGIS, follow the directions detailed at:"
+   elog "${base_uri}/postgis_installation.html#create_new_db_extensions"
+}



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2020-01-28 Thread Andreas Sturmlechner
commit: 9539dbeeeddb6f426318c0a58a085da7980faeb0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 28 21:44:39 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 28 22:12:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9539dbee

dev-db/postgis: git-r3, https, sync w/ 3.0.0, eutils--, eapi7-ver++

Upstream switched to git.
Use https links.
Use myeconfargs array with inline comments.
General overhaul and sync with latest 3.0.0 changes.
Add release switch for uniform ebuilds.
eutils is not used.
Run default, not eapply_user.

Closes: https://bugs.gentoo.org/698146
Closes: https://bugs.gentoo.org/691036
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/postgis/postgis-.ebuild | 104 +
 1 file changed, 59 insertions(+), 45 deletions(-)

diff --git a/dev-db/postgis/postgis-.ebuild 
b/dev-db/postgis/postgis-.ebuild
index ef406c8c690..2235d63f8dd 100644
--- a/dev-db/postgis/postgis-.ebuild
+++ b/dev-db/postgis/postgis-.ebuild
@@ -1,80 +1,87 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-POSTGRES_COMPAT=( 9.{4..6} {10..12} )
-POSTGRES_USEDEP="server"
 
-inherit autotools eutils postgres-multi subversion versionator
+POSTGRES_COMPAT=( 9.{5..6} {10..12} )
+POSTGRES_USEDEP="server"
+inherit autotools eapi7-ver postgres-multi
 
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
+MY_P="${PN}-$(ver_rs 3 '')"
 
-ESVN_REPO_URI="http://svn.osgeo.org/postgis/trunk/";
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
 
 DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net";
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="address-standardizer doc gtk static-libs mapbox test topology"
+IUSE="address-standardizer doc gtk static-libs test topology"
 
-RDEPEND="
-   ${POSTGRES_DEP}
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
dev-libs/json-c:=
dev-libs/libxml2:2
-   >=sci-libs/geos-3.5.0
-   >=sci-libs/proj-4.6.0
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.6.0
+   >=sci-libs/proj-4.9.0:=
>=sci-libs/gdal-1.10.0
address-standardizer? ( dev-libs/libpcre )
gtk? ( x11-libs/gtk+:2 )
-   mapbox? ( dev-libs/protobuf )
 "
-
 DEPEND="${RDEPEND}
-   doc? (
-   app-text/docbook-xsl-stylesheets
-   app-text/docbook-xml-dtd:4.5
-   dev-libs/libxslt
-   virtual/imagemagick-tools[png]
-   )
-   virtual/pkgconfig
-   test? ( dev-util/cunit )
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+   test? ( dev-util/cunit )
 "
 
-REQUIRED_USE="test? ( doc )"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" )
 
 src_prepare() {
-   source "${S}"/Version.config
-   export PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
 
# These modules are built using the same *FLAGS that were used to build
# dev-db/postgresql. The right thing to do is to ignore the current
# *FLAGS settings.
-   export QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-   eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch"
-   eapply_user
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
 
local AT_M4DIR="macros"
eautoreconf
+
postgres-multi_src_prepare
 }
 
 src_configure() {
-   local myargs=""
-
-   use gtk  && myargs+=" --with-gui"
-
-   use address-standardizer || myargs+=" --without-address-standardizer"
-   use mapbox   || myargs+=" --without-protobuf"
-   use topology || myargs+=" --without-topology"
-
-   postgres-multi_foreach econf ${myargs}
+   local myeconfargs=(
+   --with-protobuf # funky misdetection if enabled but 
--without-protobuf
+   $(use_wit

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2020-01-28 Thread Andreas Sturmlechner
commit: f28e994beb1d33a1d576e2c01df1f29cf076f2b7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 28 21:48:00 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 28 22:12:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f28e994b

dev-db/postgis: Sync with , fix dependencies

Reported-by: Daniel M. Weeks  danweeks.net>
Thanks-to: Chris Mayo  gmail.com>
Closes: https://bugs.gentoo.org/698146
Closes: https://bugs.gentoo.org/691036
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/postgis/postgis-3.0.0-r1.ebuild | 135 +
 1 file changed, 135 insertions(+)

diff --git a/dev-db/postgis/postgis-3.0.0-r1.ebuild 
b/dev-db/postgis/postgis-3.0.0-r1.ebuild
new file mode 100644
index 000..2235d63f8dd
--- /dev/null
+++ b/dev-db/postgis/postgis-3.0.0-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{5..6} {10..12} )
+POSTGRES_USEDEP="server"
+inherit autotools eapi7-ver postgres-multi
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = ** ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git";
+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"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net";
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs test topology"
+
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   dev-libs/protobuf-c:=
+   >=sci-libs/geos-3.6.0
+   >=sci-libs/proj-4.9.0:=
+   >=sci-libs/gdal-1.10.0
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   virtual/imagemagick-tools[png]
+   )
+   test? ( dev-util/cunit )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" )
+
+src_prepare() {
+   default
+
+   if [[ ${PV} = ** ]] ; then
+   source "${S}"/Version.config
+   PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+   fi
+
+   # These modules are built using the same *FLAGS that were used to build
+   # dev-db/postgresql. The right thing to do is to ignore the current
+   # *FLAGS settings.
+   QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   local myeconfargs=(
+   --with-protobuf # funky misdetection if enabled but 
--without-protobuf
+   $(use_with address-standardizer)
+   $(use_with gtk gui)
+   $(use_with topology)
+   )
+   postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_foreach emake cheatsheets
+   postgres-multi_forbest emake -C doc html
+   fi
+}
+
+src_install() {
+   postgres-multi_foreach emake DESTDIR="${D}" install
+   postgres-multi_foreach emake -C topology DESTDIR="${D}" install
+   postgres-multi_forbest dobin ./utils/postgis_restore.pl
+
+   dodoc CREDITS TODO loader/README.* doc/*txt
+
+   docinto topology
+   dodoc topology/{TODO,README}
+
+   if use doc ; then
+   postgres-multi_foreach emake DESTDIR="${D}" comments-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
+}
+
+pkg_postinst() {
+   ebegin "Refreshing PostgreSQL symlinks"
+   postgresql-config update
+   eend $?
+
+   local base_uri="https://postgis.net/docs/manual-";
+   if [[ ${PV} = ** ]] ; then
+   base_uri+="dev"
+   else
+   base_uri+="${PGIS}"
+   fi
+
+   elog "To finish installing PostGIS, follow the directions detailed at:"
+   elog "${base_uri}/postgis_installation.html#create_new_db_extensions"
+}



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2019-10-20 Thread 罗百科
commit: e90eb3dd1e96d0a52c0223f88150284638b9dd4d
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sun Oct 20 16:19:28 2019 +
Commit: 罗百科  gentoo  org>
CommitDate: Sun Oct 20 16:20:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90eb3dd

dev-db/postgis: Bump to 3.0.0 final

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest|   3 +-
 ...stgis-3.0.0_rc2.ebuild => postgis-3.0.0.ebuild} |   4 +-
 dev-db/postgis/postgis-3.0.0_alpha4.ebuild | 123 -
 3 files changed, 3 insertions(+), 127 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 7d118266bd3..72d18f4734e 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -4,5 +4,4 @@ DIST postgis-2.4.8.tar.gz 12846228 BLAKE2B 
dc7cd26f08774011bddba362040f35fd46dab
 DIST postgis-2.5.1.tar.gz 16041872 BLAKE2B 
589cf7168d3698737a19d817b8efb91695c2c3f63d6c3aa24189d9a37459a28ca8a7db0450aa2d557699f76cd8e3ab1eec198bd332b294d976330fdc9d8a7f60
 SHA512 
c6c9c8c5befd945614e92d1062df1d753ca8b7fd69b70226065c2dac77a59783b14ece4da994187079b683ee090ba5a79389ba679f22fce8c20a5afc2c8dfca0
 DIST postgis-2.5.2.tar.gz 16252761 BLAKE2B 
181ecc41e659c1df32392d0dfea9cc081c2a647fd23401b8b0470f99e1136b6b8ed900eaea38afdf87cc801bf13ede4247f9c188fcf0da6782624239c77b434f
 SHA512 
b10781f0b74bad8162c33eb111a6090fba184b45fe5874d22cd3a5b0acfb057f3407c073bc44c9d4cd20ed8c2cb1fbb34480b0cf331340bc8b52580d4eccb819
 DIST postgis-2.5.3.tar.gz 16424752 BLAKE2B 
94c2ccd41eb88a39c6db48ad7f4d142742a1b0791e3abe57adb2c778406dcc8286afc6d55c80067e0b94a1300eff1c76a227d3cfd813e12541c715edeea11a9b
 SHA512 
1c9f873ba8f8ff4aeae248c68c001eb4174416de1e00ce6a0d0c9ea129b475e887a83235027068d52f587ab95c549adbfaa7e5dccdda77855e39c55dac0fdc2d
-DIST postgis-3.0.0alpha4.tar.gz 17488411 BLAKE2B 
ef819793ee431e54ab69e9434d45fc9c59ecb014dc18ccfb93705bc0ec6dec99ec05cedf687db17a8d65da5b6f2bd8760589ed00d1c51328f84f01461deb0922
 SHA512 
85eb8380772e7be0520617b23d74ab729be0a2ea6f2cbea4f765f38c9522312366723b6972f75017e7675e32b89692c2c25f7e355a18edf1fbb84d4eaa10e52a
-DIST postgis-3.0.0rc2.tar.gz 17524319 BLAKE2B 
c538b9bf1813272fa5bdf3c842e483fac5b4285d2704988ff2a7601a4fcdb8e8966b3e884a4c8b5e37ca65c6ce6536524994c6a2f26d0c76ae5c4ec803525176
 SHA512 
479ddb9c59ca13b7b0f0003a60f0bce1acb07fbd580b071e6c5f693f7dfa62459ae8d6a44d24081bf34f942dcabbd3eacc5f455d26c6935d2d02032039fa0748
+DIST postgis-3.0.0.tar.gz 17359802 BLAKE2B 
aa83bdc2d1950c517f99cbdd877eb7261f6c29ce2cbd9f67f1e606c290080fc3d02ab0b7ceb68ce852e0c0d3d4b7753f03cb5b0921da164ab65d68e23d1df538
 SHA512 
82c233681fa6444686f9979768e5d6d3a9b6ca9cbd4fc2b14bd0a5d1269a8d0f45ee067e64984077063407c7abc13fa0e37a29928d7ccbfe3a61b694f592bed2

diff --git a/dev-db/postgis/postgis-3.0.0_rc2.ebuild 
b/dev-db/postgis/postgis-3.0.0.ebuild
similarity index 97%
rename from dev-db/postgis/postgis-3.0.0_rc2.ebuild
rename to dev-db/postgis/postgis-3.0.0.ebuild
index 50dc1cf0aa5..9a383102a77 100644
--- a/dev-db/postgis/postgis-3.0.0_rc2.ebuild
+++ b/dev-db/postgis/postgis-3.0.0.ebuild
@@ -17,14 +17,14 @@ HOMEPAGE="http://postgis.net";
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="address-standardizer doc gtk static-libs mapbox test topology"
 
 RDEPEND="
${POSTGRES_DEP}
dev-libs/json-c:=
dev-libs/libxml2:2
-   >=sci-libs/geos-3.5.0
+   >=sci-libs/geos-3.6.0
>=sci-libs/proj-4.6.0
>=sci-libs/gdal-1.10.0
address-standardizer? ( dev-libs/libpcre )

diff --git a/dev-db/postgis/postgis-3.0.0_alpha4.ebuild 
b/dev-db/postgis/postgis-3.0.0_alpha4.ebuild
deleted file mode 100644
index 4376ffab4a3..000
--- a/dev-db/postgis/postgis-3.0.0_alpha4.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-POSTGRES_COMPAT=( 9.{5..6} {10..12} )
-POSTGRES_USEDEP="server"
-
-inherit autotools eutils postgres-multi versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net";
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="address-standardizer doc gtk static-libs mapbox test topology"
-
-RDEPEND="
-   ${POSTGRES_DEP}
-   dev-libs/json-c:=
-   dev-libs/libxml2:2
-   >=sci-libs/geos-3.5.0
-   >=sci-libs/proj-4.6.0
-   >=sci-libs/gdal-1.10.0
-   address-standardizer? ( dev-libs/libpcre )
-   gtk? ( x11-libs/gtk+:2 )
-   mapbox? ( dev-libs/protobuf )
-"
-
-DEPEND="${RDEPEND}
-   doc? (
-   app-text/docbook-xsl-stylesheets
-   app-text/docbook-xml-dtd:4.5
-  

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2019-10-13 Thread 罗百科
commit: 2067a851da6b502902638885ff3fb91442efcc95
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sun Oct 13 19:47:41 2019 +
Commit: 罗百科  gentoo  org>
CommitDate: Sun Oct 13 19:48:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2067a851

dev-db/postgis: Bump to 3.0.0_rc2

Protobuf is a mandatory dep by accident now

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest |   1 +
 dev-db/postgis/postgis-3.0.0_rc2.ebuild | 125 
 2 files changed, 126 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 05cff1b04d4..7d118266bd3 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -5,3 +5,4 @@ DIST postgis-2.5.1.tar.gz 16041872 BLAKE2B 
589cf7168d3698737a19d817b8efb91695c2c
 DIST postgis-2.5.2.tar.gz 16252761 BLAKE2B 
181ecc41e659c1df32392d0dfea9cc081c2a647fd23401b8b0470f99e1136b6b8ed900eaea38afdf87cc801bf13ede4247f9c188fcf0da6782624239c77b434f
 SHA512 
b10781f0b74bad8162c33eb111a6090fba184b45fe5874d22cd3a5b0acfb057f3407c073bc44c9d4cd20ed8c2cb1fbb34480b0cf331340bc8b52580d4eccb819
 DIST postgis-2.5.3.tar.gz 16424752 BLAKE2B 
94c2ccd41eb88a39c6db48ad7f4d142742a1b0791e3abe57adb2c778406dcc8286afc6d55c80067e0b94a1300eff1c76a227d3cfd813e12541c715edeea11a9b
 SHA512 
1c9f873ba8f8ff4aeae248c68c001eb4174416de1e00ce6a0d0c9ea129b475e887a83235027068d52f587ab95c549adbfaa7e5dccdda77855e39c55dac0fdc2d
 DIST postgis-3.0.0alpha4.tar.gz 17488411 BLAKE2B 
ef819793ee431e54ab69e9434d45fc9c59ecb014dc18ccfb93705bc0ec6dec99ec05cedf687db17a8d65da5b6f2bd8760589ed00d1c51328f84f01461deb0922
 SHA512 
85eb8380772e7be0520617b23d74ab729be0a2ea6f2cbea4f765f38c9522312366723b6972f75017e7675e32b89692c2c25f7e355a18edf1fbb84d4eaa10e52a
+DIST postgis-3.0.0rc2.tar.gz 17524319 BLAKE2B 
c538b9bf1813272fa5bdf3c842e483fac5b4285d2704988ff2a7601a4fcdb8e8966b3e884a4c8b5e37ca65c6ce6536524994c6a2f26d0c76ae5c4ec803525176
 SHA512 
479ddb9c59ca13b7b0f0003a60f0bce1acb07fbd580b071e6c5f693f7dfa62459ae8d6a44d24081bf34f942dcabbd3eacc5f455d26c6935d2d02032039fa0748

diff --git a/dev-db/postgis/postgis-3.0.0_rc2.ebuild 
b/dev-db/postgis/postgis-3.0.0_rc2.ebuild
new file mode 100644
index 000..50dc1cf0aa5
--- /dev/null
+++ b/dev-db/postgis/postgis-3.0.0_rc2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+POSTGRES_COMPAT=( 9.{5..6} {10..12} )
+POSTGRES_USEDEP="server"
+
+inherit autotools eutils postgres-multi versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.net";
+SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="address-standardizer doc gtk static-libs mapbox test topology"
+
+RDEPEND="
+   ${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   >=sci-libs/geos-3.5.0
+   >=sci-libs/proj-4.6.0
+   >=sci-libs/gdal-1.10.0
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+   dev-libs/protobuf
+"
+
+DEPEND="${RDEPEND}
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   || (
+   media-gfx/imagemagick[png]
+   
media-gfx/graphicsmagick[imagemagick,png]
+   )
+   )
+   virtual/pkgconfig
+   test? ( dev-util/cunit )
+"
+
+PGIS="$(get_version_component_range 1-2)"
+
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+# These modules are built using the same *FLAGS that were used to build
+# dev-db/postgresql. The right thing to do is to ignore the current
+# *FLAGS settings.
+QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+src_prepare() {
+   eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+
+   # funky misdetection if enabled but --without-protobuf
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   local myargs=""
+
+   use gtk  && myargs+=" --with-gui"
+
+   use address-standardizer || myargs+=" --without-address-standardizer"
+   myargs+=" --with-protobuf"
+   use topology || myargs+=" --without-topology"
+
+   postgres-multi_foreach econf ${myargs}
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_foreach emake cheatsheet

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2019-08-13 Thread 罗百科
commit: d6452a56eafe6dcf5cf65cfcba71117e8421c732
Author: Patrick Lauer  gentoo  org>
AuthorDate: Tue Aug 13 18:50:41 2019 +
Commit: 罗百科  gentoo  org>
CommitDate: Tue Aug 13 18:50:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6452a56

dev-db/postgis: Bump

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/postgis/Manifest|   3 +
 dev-db/postgis/postgis-2.4.8.ebuild| 125 +
 dev-db/postgis/postgis-2.5.3.ebuild| 123 
 dev-db/postgis/postgis-3.0.0_alpha4.ebuild | 123 
 4 files changed, 374 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 52a373ebc39..05cff1b04d4 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,4 +1,7 @@
 DIST postgis-2.4.6.tar.gz 12616474 BLAKE2B 
8e33ae7e8ca5ef2a4dd90f64a8e9910118e4ef711444b196f46e4a63f98ff6044709d65a853c5c10de91308658a206965503b6a85a16438ea422becdbbd9bb40
 SHA512 
eec4276a58549f3cc57d6574186aebc72df0dd7dc2ab9acbaf410604b4d271dee6d5154caacd7297d20493d879434ca78050672e8197ff0fc63a36100c20c66c
 DIST postgis-2.4.7.tar.gz 12831401 BLAKE2B 
0069a339cc778a02a008835189b5560ffb1724aceaaeeec5264750cdfaa4346310ca1d112f698556e750b6559f0dabb727584c9d41ff8747ed7673e147c9723e
 SHA512 
832f039e582227cd1c6edef98af8dfcceb90db75b18d4ba605b7baf2842227b23fe2d15c3b1cde941182c93230ba41ab94da59e97506c77e79f2016bbd98c885
+DIST postgis-2.4.8.tar.gz 12846228 BLAKE2B 
dc7cd26f08774011bddba362040f35fd46dab5f58870643d4e6d939fb107a8e93ccb8c2d57ac67bf5ba44a7dd05c25eee77358548d9d7d9a8b3e2f7538e49538
 SHA512 
afeddbdcbad68358c3bc36beec5f1baf74c328daba90f0ac7d6322e4330d18da2e5534fa200f8ae3f19e7e897221989a564f6e2855e9181eadfd9cc32315b666
 DIST postgis-2.5.1.tar.gz 16041872 BLAKE2B 
589cf7168d3698737a19d817b8efb91695c2c3f63d6c3aa24189d9a37459a28ca8a7db0450aa2d557699f76cd8e3ab1eec198bd332b294d976330fdc9d8a7f60
 SHA512 
c6c9c8c5befd945614e92d1062df1d753ca8b7fd69b70226065c2dac77a59783b14ece4da994187079b683ee090ba5a79389ba679f22fce8c20a5afc2c8dfca0
 DIST postgis-2.5.2.tar.gz 16252761 BLAKE2B 
181ecc41e659c1df32392d0dfea9cc081c2a647fd23401b8b0470f99e1136b6b8ed900eaea38afdf87cc801bf13ede4247f9c188fcf0da6782624239c77b434f
 SHA512 
b10781f0b74bad8162c33eb111a6090fba184b45fe5874d22cd3a5b0acfb057f3407c073bc44c9d4cd20ed8c2cb1fbb34480b0cf331340bc8b52580d4eccb819
+DIST postgis-2.5.3.tar.gz 16424752 BLAKE2B 
94c2ccd41eb88a39c6db48ad7f4d142742a1b0791e3abe57adb2c778406dcc8286afc6d55c80067e0b94a1300eff1c76a227d3cfd813e12541c715edeea11a9b
 SHA512 
1c9f873ba8f8ff4aeae248c68c001eb4174416de1e00ce6a0d0c9ea129b475e887a83235027068d52f587ab95c549adbfaa7e5dccdda77855e39c55dac0fdc2d
+DIST postgis-3.0.0alpha4.tar.gz 17488411 BLAKE2B 
ef819793ee431e54ab69e9434d45fc9c59ecb014dc18ccfb93705bc0ec6dec99ec05cedf687db17a8d65da5b6f2bd8760589ed00d1c51328f84f01461deb0922
 SHA512 
85eb8380772e7be0520617b23d74ab729be0a2ea6f2cbea4f765f38c9522312366723b6972f75017e7675e32b89692c2c25f7e355a18edf1fbb84d4eaa10e52a

diff --git a/dev-db/postgis/postgis-2.4.8.ebuild 
b/dev-db/postgis/postgis-2.4.8.ebuild
new file mode 100644
index 000..7248b26049e
--- /dev/null
+++ b/dev-db/postgis/postgis-2.4.8.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+POSTGRES_COMPAT=( 9.{4..6} {10..11} )
+POSTGRES_USEDEP="server"
+
+inherit autotools eutils postgres-multi versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.net";
+SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="address-standardizer doc gtk static-libs mapbox test topology"
+
+RDEPEND="
+   ${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   >=sci-libs/geos-3.5.0
+   >=sci-libs/proj-4.6.0
+   >=sci-libs/gdal-1.10.0
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+   mapbox? ( dev-libs/protobuf )
+"
+
+DEPEND="${RDEPEND}
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   || (
+   media-gfx/imagemagick[png]
+   
media-gfx/graphicsmagick[imagemagick,png]
+   )
+   )
+   virtual/pkgconfig
+   test? ( dev-util/cunit )
+"
+
+PGIS="$(get_version_component_range 1-2)"
+
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+MAKEOPTS+=' -j1'
+
+# These modules are bui

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2019-07-22 Thread Mikle Kolyada
commit: c3966246e1b7046c1a484bbcbbfa77499c0f0f5f
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jul 22 09:20:46 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jul 22 09:20:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3966246

dev-db/postgis: amd64 stable wrt bug #688306

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 dev-db/postgis/postgis-2.4.7.ebuild | 2 +-
 dev-db/postgis/postgis-2.5.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/postgis/postgis-2.4.7.ebuild 
b/dev-db/postgis/postgis-2.4.7.ebuild
index 8c52fcf6b70..2b057bbea83 100644
--- a/dev-db/postgis/postgis-2.4.7.ebuild
+++ b/dev-db/postgis/postgis-2.4.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://postgis.net";
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="address-standardizer doc gtk static-libs mapbox test topology"
 
 RDEPEND="

diff --git a/dev-db/postgis/postgis-2.5.2.ebuild 
b/dev-db/postgis/postgis-2.5.2.ebuild
index 910b9060e6f..39283cedf71 100644
--- a/dev-db/postgis/postgis-2.5.2.ebuild
+++ b/dev-db/postgis/postgis-2.5.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://postgis.net";
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="address-standardizer doc gtk static-libs mapbox test topology"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2019-07-08 Thread Thomas Deutschmann
commit: 1abf0a96a1bf239d1e56a639b58b7fdc46f33d83
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jul  8 12:04:20 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul  8 12:10:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1abf0a96

dev-db/postgis: x86 stable (bug #688306)

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/postgis/postgis-2.4.7.ebuild | 2 +-
 dev-db/postgis/postgis-2.5.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/postgis/postgis-2.4.7.ebuild 
b/dev-db/postgis/postgis-2.4.7.ebuild
index 7248b26049e..8c52fcf6b70 100644
--- a/dev-db/postgis/postgis-2.4.7.ebuild
+++ b/dev-db/postgis/postgis-2.4.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://postgis.net";
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="address-standardizer doc gtk static-libs mapbox test topology"
 
 RDEPEND="

diff --git a/dev-db/postgis/postgis-2.5.2.ebuild 
b/dev-db/postgis/postgis-2.5.2.ebuild
index 23608a5b3b0..910b9060e6f 100644
--- a/dev-db/postgis/postgis-2.5.2.ebuild
+++ b/dev-db/postgis/postgis-2.5.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://postgis.net";
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="address-standardizer doc gtk static-libs mapbox test topology"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2019-06-18 Thread Aaron W. Swenson
commit: 81782d879a5928434ed2c40625563d584316b967
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Tue Jun 18 10:54:26 2019 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Tue Jun 18 10:54:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81782d87

dev-db/postgis: Live ebuild parity to 2.5.2

Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/postgis/postgis-.ebuild | 19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/dev-db/postgis/postgis-.ebuild 
b/dev-db/postgis/postgis-.ebuild
index 156d4d9bc7d..ef406c8c690 100644
--- a/dev-db/postgis/postgis-.ebuild
+++ b/dev-db/postgis/postgis-.ebuild
@@ -18,16 +18,18 @@ HOMEPAGE="http://postgis.net";
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc gtk static-libs test"
+IUSE="address-standardizer doc gtk static-libs mapbox test topology"
 
 RDEPEND="
${POSTGRES_DEP}
dev-libs/json-c:=
dev-libs/libxml2:2
-   >=sci-libs/geos-3.4.2
+   >=sci-libs/geos-3.5.0
>=sci-libs/proj-4.6.0
-   >=sci-libs/gdal-1.10.0:=
+   >=sci-libs/gdal-1.10.0
+   address-standardizer? ( dev-libs/libpcre )
gtk? ( x11-libs/gtk+:2 )
+   mapbox? ( dev-libs/protobuf )
 "
 
 DEPEND="${RDEPEND}
@@ -46,8 +48,6 @@ REQUIRED_USE="test? ( doc )"
 # Needs a running psql instance, doesn't work out of the box
 RESTRICT="test"
 
-MAKEOPTS+=' -j1'
-
 src_prepare() {
source "${S}"/Version.config
export PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
@@ -57,6 +57,7 @@ src_prepare() {
# *FLAGS settings.
export QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
 
+   eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch"
eapply_user
 
local AT_M4DIR="macros"
@@ -66,7 +67,13 @@ src_prepare() {
 
 src_configure() {
local myargs=""
-   use gtk && myargs+=" --with-gui"
+
+   use gtk  && myargs+=" --with-gui"
+
+   use address-standardizer || myargs+=" --without-address-standardizer"
+   use mapbox   || myargs+=" --without-protobuf"
+   use topology || myargs+=" --without-topology"
+
postgres-multi_foreach econf ${myargs}
 }
 



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2019-06-15 Thread Aaron W. Swenson
commit: 5fda0e5e9f0ba2a6e269ca6b2ecd9955831a3b5a
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Sat Jun 15 10:35:18 2019 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Sat Jun 15 10:35:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fda0e5e

dev-db/postgis: Remove POSTGRES_COMPAT 9.3

Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/postgis/postgis-2.4.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/postgis-2.4.6.ebuild 
b/dev-db/postgis/postgis-2.4.6.ebuild
index 9d8fa02e934..2b057bbea83 100644
--- a/dev-db/postgis/postgis-2.4.6.ebuild
+++ b/dev-db/postgis/postgis-2.4.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-POSTGRES_COMPAT=( 9.{3..6} {10..11} )
+POSTGRES_COMPAT=( 9.{4..6} {10..11} )
 POSTGRES_USEDEP="server"
 
 inherit autotools eutils postgres-multi versionator



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2019-05-19 Thread Aaron W. Swenson
commit: 50f2bdc4d8186d749ddac14cb2830b91ca2898cf
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Sun May 19 11:02:46 2019 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Sun May 19 11:04:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50f2bdc4

dev-db/postgis: Bump to 2.4.7, 2.5.2

Fixes configure test to detect/build against >=sci-libs/proj-6.0.0.

Bug: https://bugs.gentoo.org/686188
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/postgis/Manifest|  2 +
 .../{postgis-.ebuild => postgis-2.4.7.ebuild}  | 57 +-
 .../{postgis-.ebuild => postgis-2.5.2.ebuild}  | 57 +-
 dev-db/postgis/postgis-.ebuild |  4 +-
 4 files changed, 71 insertions(+), 49 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 588e5ec51cf..52a373ebc39 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,2 +1,4 @@
 DIST postgis-2.4.6.tar.gz 12616474 BLAKE2B 
8e33ae7e8ca5ef2a4dd90f64a8e9910118e4ef711444b196f46e4a63f98ff6044709d65a853c5c10de91308658a206965503b6a85a16438ea422becdbbd9bb40
 SHA512 
eec4276a58549f3cc57d6574186aebc72df0dd7dc2ab9acbaf410604b4d271dee6d5154caacd7297d20493d879434ca78050672e8197ff0fc63a36100c20c66c
+DIST postgis-2.4.7.tar.gz 12831401 BLAKE2B 
0069a339cc778a02a008835189b5560ffb1724aceaaeeec5264750cdfaa4346310ca1d112f698556e750b6559f0dabb727584c9d41ff8747ed7673e147c9723e
 SHA512 
832f039e582227cd1c6edef98af8dfcceb90db75b18d4ba605b7baf2842227b23fe2d15c3b1cde941182c93230ba41ab94da59e97506c77e79f2016bbd98c885
 DIST postgis-2.5.1.tar.gz 16041872 BLAKE2B 
589cf7168d3698737a19d817b8efb91695c2c3f63d6c3aa24189d9a37459a28ca8a7db0450aa2d557699f76cd8e3ab1eec198bd332b294d976330fdc9d8a7f60
 SHA512 
c6c9c8c5befd945614e92d1062df1d753ca8b7fd69b70226065c2dac77a59783b14ece4da994187079b683ee090ba5a79389ba679f22fce8c20a5afc2c8dfca0
+DIST postgis-2.5.2.tar.gz 16252761 BLAKE2B 
181ecc41e659c1df32392d0dfea9cc081c2a647fd23401b8b0470f99e1136b6b8ed900eaea38afdf87cc801bf13ede4247f9c188fcf0da6782624239c77b434f
 SHA512 
b10781f0b74bad8162c33eb111a6090fba184b45fe5874d22cd3a5b0acfb057f3407c073bc44c9d4cd20ed8c2cb1fbb34480b0cf331340bc8b52580d4eccb819

diff --git a/dev-db/postgis/postgis-.ebuild 
b/dev-db/postgis/postgis-2.4.7.ebuild
similarity index 59%
copy from dev-db/postgis/postgis-.ebuild
copy to dev-db/postgis/postgis-2.4.7.ebuild
index 0010979ad4b..7248b26049e 100644
--- a/dev-db/postgis/postgis-.ebuild
+++ b/dev-db/postgis/postgis-2.4.7.ebuild
@@ -1,33 +1,35 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-POSTGRES_COMPAT=( 9.{3..6} 10 )
+EAPI="6"
+
+POSTGRES_COMPAT=( 9.{4..6} {10..11} )
 POSTGRES_USEDEP="server"
 
-inherit autotools eutils postgres-multi subversion versionator
+inherit autotools eutils postgres-multi versionator
 
 MY_PV=$(replace_version_separator 3 '')
 MY_P="${PN}-${MY_PV}"
 S="${WORKDIR}/${MY_P}"
 
-ESVN_REPO_URI="http://svn.osgeo.org/postgis/trunk/";
-
 DESCRIPTION="Geographic Objects for PostgreSQL"
 HOMEPAGE="http://postgis.net";
+SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="doc gtk static-libs test"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="address-standardizer doc gtk static-libs mapbox test topology"
 
 RDEPEND="
${POSTGRES_DEP}
dev-libs/json-c:=
dev-libs/libxml2:2
-   >=sci-libs/geos-3.4.2
+   >=sci-libs/geos-3.5.0
>=sci-libs/proj-4.6.0
-   >=sci-libs/gdal-1.10.0:=
+   >=sci-libs/gdal-1.10.0
+   address-standardizer? ( dev-libs/libpcre )
gtk? ( x11-libs/gtk+:2 )
+   mapbox? ( dev-libs/protobuf )
 "
 
 DEPEND="${RDEPEND}
@@ -35,38 +37,47 @@ DEPEND="${RDEPEND}
app-text/docbook-xsl-stylesheets
app-text/docbook-xml-dtd:4.5
dev-libs/libxslt
-   virtual/imagemagick-tools[png]
+   || (
+   media-gfx/imagemagick[png]
+   
media-gfx/graphicsmagick[imagemagick,png]
+   )
)
virtual/pkgconfig
test? ( dev-util/cunit )
 "
 
-REQUIRED_USE="test? ( doc )"
+PGIS="$(get_version_component_range 1-2)"
+
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
 
 # Needs a running psql instance, doesn't work out of the box
 RESTRICT="test"
 
 MAKEOPTS+=' -j1'
 
-src_prepare() {
-   source "${S}"/Version.config
-   export PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
-
-   # These modules are built using the same *FLAGS that were used to build
-   # dev-db/postgresql. The right thing to do is to ignore the cur

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/, dev-db/postgis/files/

2019-02-10 Thread Aaron W. Swenson
commit: 82a9c5cdc6e383a94c5a8b4f412d33629d44a5cf
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Sun Feb 10 12:11:28 2019 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Sun Feb 10 12:13:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82a9c5cd

dev-db/postgis: Cleanup old

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/postgis/Manifest|   2 -
 .../postgis/files/postgis-2.4.2-jsonc_0.13.patch   |  23 
 dev-db/postgis/postgis-2.4.2.ebuild| 126 -
 dev-db/postgis/postgis-2.4.3.ebuild| 126 -
 dev-db/postgis/postgis-2.5.1.ebuild| 125 
 5 files changed, 402 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index db040ac97ea..588e5ec51cf 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,4 +1,2 @@
-DIST postgis-2.4.2.tar.gz 12470881 BLAKE2B 
116bb5d1c8f6066d537cac950254923a681babac456d155139dbdd2853b80499f4f9445dad985b94bd1d1285a6c78fee0fccb24e301d18147f3cd9230416
 SHA512 
e268572d5cd009754ef05f5d2eedcac7e362fa47199459c637cd4d9050d2b648d4b2b3746cde0dce5a42be2606a432b64dc905f193e12cf0869e3dd6f820b425
-DIST postgis-2.4.3.tar.gz 12601055 BLAKE2B 
662b2afe145bc23c77ebda7306d07a20e39c1a598316cee58e1591e65ce1b2d2a3f727f5463ba144711faa55f7c11e4a038b6ad2a76cab760b4fdd43647f09c3
 SHA512 
95b2c925cb10943e7136aa3b7b08a9ad3d6ff59a3994c653bba52e4c65193d519daa49684b924f68945dd596187aa17e0c713bf0b9e29f8c5973346b279dba1b
 DIST postgis-2.4.6.tar.gz 12616474 BLAKE2B 
8e33ae7e8ca5ef2a4dd90f64a8e9910118e4ef711444b196f46e4a63f98ff6044709d65a853c5c10de91308658a206965503b6a85a16438ea422becdbbd9bb40
 SHA512 
eec4276a58549f3cc57d6574186aebc72df0dd7dc2ab9acbaf410604b4d271dee6d5154caacd7297d20493d879434ca78050672e8197ff0fc63a36100c20c66c
 DIST postgis-2.5.1.tar.gz 16041872 BLAKE2B 
589cf7168d3698737a19d817b8efb91695c2c3f63d6c3aa24189d9a37459a28ca8a7db0450aa2d557699f76cd8e3ab1eec198bd332b294d976330fdc9d8a7f60
 SHA512 
c6c9c8c5befd945614e92d1062df1d753ca8b7fd69b70226065c2dac77a59783b14ece4da994187079b683ee090ba5a79389ba679f22fce8c20a5afc2c8dfca0

diff --git a/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch 
b/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch
deleted file mode 100644
index b980e77333d..000
--- a/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur postgis-2.4.2.old/liblwgeom/lwin_geojson.c 
postgis-2.4.2/liblwgeom/lwin_geojson.c
 postgis-2.4.2.old/liblwgeom/lwin_geojson.c 2017-12-21 22:52:40.422802160 
+0100
-+++ postgis-2.4.2/liblwgeom/lwin_geojson.c 2017-12-21 22:55:36.605430945 
+0100
-@@ -31,13 +31,19 @@
- 
- #if defined(HAVE_LIBJSON) || defined(HAVE_LIBJSON_C) /* --{ */
- 
-+#define JSON_C_VERSION_013 (13 << 8)
-+
- #ifdef HAVE_LIBJSON_C
- #include 
-+#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013
- #include 
-+#endif
- #else
- #include 
-+#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013
- #include 
- #endif
-+#endif
- 
- #ifndef JSON_C_VERSION
- /* Adds support for libjson < 0.10 */

diff --git a/dev-db/postgis/postgis-2.4.2.ebuild 
b/dev-db/postgis/postgis-2.4.2.ebuild
deleted file mode 100644
index 2dd323bc643..000
--- a/dev-db/postgis/postgis-2.4.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-POSTGRES_COMPAT=( 9.{3..6} 10 )
-POSTGRES_USEDEP="server"
-
-inherit autotools eutils postgres-multi versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net";
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="address-standardizer doc gtk static-libs mapbox test topology"
-
-RDEPEND="
-   ${POSTGRES_DEP}
-   dev-libs/json-c:=
-   dev-libs/libxml2:2
-   >=sci-libs/geos-3.5.0
-   >=sci-libs/proj-4.6.0
-   >=sci-libs/gdal-1.10.0
-   address-standardizer? ( dev-libs/libpcre )
-   gtk? ( x11-libs/gtk+:2 )
-   mapbox? ( dev-libs/protobuf )
-"
-
-DEPEND="${RDEPEND}
-   doc? (
-   app-text/docbook-xsl-stylesheets
-   app-text/docbook-xml-dtd:4.5
-   dev-libs/libxslt
-   || (
-   media-gfx/imagemagick[png]
-   
media-gfx/graphicsmagick[imagemagick,png]
-   )
-   )
-   virtual/pkgconfig
-   test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc 

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2019-02-08 Thread Mikle Kolyada
commit: 6b87833a24f3d519adf7b23b76dbf6a9d779a135
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Feb  8 14:19:37 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Feb  8 14:19:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b87833a

dev-db/postgis: amd64 stable wrt bug #674488

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-db/postgis/postgis-2.4.6.ebuild| 2 +-
 dev-db/postgis/postgis-2.5.1-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/postgis/postgis-2.4.6.ebuild 
b/dev-db/postgis/postgis-2.4.6.ebuild
index 4c1fdf889a9..9d8fa02e934 100644
--- a/dev-db/postgis/postgis-2.4.6.ebuild
+++ b/dev-db/postgis/postgis-2.4.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://postgis.net";
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="address-standardizer doc gtk static-libs mapbox test topology"
 
 RDEPEND="

diff --git a/dev-db/postgis/postgis-2.5.1-r1.ebuild 
b/dev-db/postgis/postgis-2.5.1-r1.ebuild
index 910b9060e6f..39283cedf71 100644
--- a/dev-db/postgis/postgis-2.5.1-r1.ebuild
+++ b/dev-db/postgis/postgis-2.5.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://postgis.net";
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="address-standardizer doc gtk static-libs mapbox test topology"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2019-01-24 Thread Thomas Deutschmann
commit: 08b9209cb3dfbe3e40d116ebe31973430af9097d
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jan 24 22:02:26 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jan 24 22:22:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08b9209c

dev-db/postgis: x86 stable (bug #674488)

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/postgis/postgis-2.4.6.ebuild| 4 ++--
 dev-db/postgis/postgis-2.5.1-r1.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-db/postgis/postgis-2.4.6.ebuild 
b/dev-db/postgis/postgis-2.4.6.ebuild
index c78f3e5ac27..4c1fdf889a9 100644
--- a/dev-db/postgis/postgis-2.4.6.ebuild
+++ b/dev-db/postgis/postgis-2.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,7 +17,7 @@ HOMEPAGE="http://postgis.net";
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="address-standardizer doc gtk static-libs mapbox test topology"
 
 RDEPEND="

diff --git a/dev-db/postgis/postgis-2.5.1-r1.ebuild 
b/dev-db/postgis/postgis-2.5.1-r1.ebuild
index 23608a5b3b0..910b9060e6f 100644
--- a/dev-db/postgis/postgis-2.5.1-r1.ebuild
+++ b/dev-db/postgis/postgis-2.5.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://postgis.net";
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="address-standardizer doc gtk static-libs mapbox test topology"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2019-01-04 Thread Aaron W. Swenson
commit: 389ff5630ff36a7c5c0e137670ba3c3ad12b4731
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Fri Jan  4 11:11:01 2019 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Fri Jan  4 11:11:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=389ff563

dev-db/postgis: Fix 2.5.1 POSTGRES_COMPAT

Beginning with the 2.5 branch, support for PostgreSQL 9.3 has been dropped.
https://trac.osgeo.org/postgis/wiki/UsersWikiPostgreSQLPostGIS

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/postgis/postgis-2.5.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/postgis/postgis-2.5.1-r1.ebuild 
b/dev-db/postgis/postgis-2.5.1-r1.ebuild
index 5d81ec77f46..23608a5b3b0 100644
--- a/dev-db/postgis/postgis-2.5.1-r1.ebuild
+++ b/dev-db/postgis/postgis-2.5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-POSTGRES_COMPAT=( 9.{3..6} {10..11} )
+POSTGRES_COMPAT=( 9.{4..6} {10..12} )
 POSTGRES_USEDEP="server"
 
 inherit autotools eutils postgres-multi versionator



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2018-12-01 Thread Aaron W. Swenson
commit: 6a360dbeb8bc89bfa0530eb73da6753ab8cf98f9
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Sat Dec  1 13:52:56 2018 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Sat Dec  1 13:53:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a360dbe

dev-db/postgis: Drop MAKEOPTS override

Parallel compilation errors resolved upstream.

Closes: https://bugs.gentoo.org/672106
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/postgis/postgis-2.5.1-r1.ebuild | 123 +
 1 file changed, 123 insertions(+)

diff --git a/dev-db/postgis/postgis-2.5.1-r1.ebuild 
b/dev-db/postgis/postgis-2.5.1-r1.ebuild
new file mode 100644
index 000..5d81ec77f46
--- /dev/null
+++ b/dev-db/postgis/postgis-2.5.1-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+POSTGRES_COMPAT=( 9.{3..6} {10..11} )
+POSTGRES_USEDEP="server"
+
+inherit autotools eutils postgres-multi versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.net";
+SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="address-standardizer doc gtk static-libs mapbox test topology"
+
+RDEPEND="
+   ${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   >=sci-libs/geos-3.5.0
+   >=sci-libs/proj-4.6.0
+   >=sci-libs/gdal-1.10.0
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+   mapbox? ( dev-libs/protobuf )
+"
+
+DEPEND="${RDEPEND}
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   || (
+   media-gfx/imagemagick[png]
+   
media-gfx/graphicsmagick[imagemagick,png]
+   )
+   )
+   virtual/pkgconfig
+   test? ( dev-util/cunit )
+"
+
+PGIS="$(get_version_component_range 1-2)"
+
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+# These modules are built using the same *FLAGS that were used to build
+# dev-db/postgresql. The right thing to do is to ignore the current
+# *FLAGS settings.
+QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+src_prepare() {
+   eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   local myargs=""
+
+   use gtk  && myargs+=" --with-gui"
+
+   use address-standardizer || myargs+=" --without-address-standardizer"
+   use mapbox   || myargs+=" --without-protobuf"
+   use topology || myargs+=" --without-topology"
+
+   postgres-multi_foreach econf ${myargs}
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_foreach emake cheatsheets
+   postgres-multi_forbest emake -C doc html
+   fi
+}
+
+src_install() {
+   postgres-multi_foreach emake DESTDIR="${D}" install
+   postgres-multi_foreach emake -C topology DESTDIR="${D}" install
+   postgres-multi_forbest dobin ./utils/postgis_restore.pl
+
+   dodoc CREDITS TODO loader/README.* doc/*txt
+
+   docinto topology
+   dodoc topology/{TODO,README}
+
+   if use doc ; then
+   postgres-multi_foreach emake DESTDIR="${D}" comments-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
+}
+
+pkg_postinst() {
+   ebegin "Refreshing PostgreSQL symlinks"
+   postgresql-config update
+   eend $?
+
+   elog "To finish installing PostGIS, follow the directions detailed at:"
+   elog 
"http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions";
+}



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2018-11-26 Thread Aaron Swenson
commit: 15321f6ec3be5eaa43510a078993bd92944b0106
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Mon Nov 26 11:20:09 2018 +
Commit: Aaron Swenson  gentoo  org>
CommitDate: Mon Nov 26 11:20:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15321f6e

dev-db/postgis: Bump to 2.4.6, 2.5.1

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/postgis/Manifest |   2 +
 dev-db/postgis/postgis-2.4.6.ebuild | 125 
 dev-db/postgis/postgis-2.5.1.ebuild | 125 
 3 files changed, 252 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 0c6de877d40..db040ac97ea 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,2 +1,4 @@
 DIST postgis-2.4.2.tar.gz 12470881 BLAKE2B 
116bb5d1c8f6066d537cac950254923a681babac456d155139dbdd2853b80499f4f9445dad985b94bd1d1285a6c78fee0fccb24e301d18147f3cd9230416
 SHA512 
e268572d5cd009754ef05f5d2eedcac7e362fa47199459c637cd4d9050d2b648d4b2b3746cde0dce5a42be2606a432b64dc905f193e12cf0869e3dd6f820b425
 DIST postgis-2.4.3.tar.gz 12601055 BLAKE2B 
662b2afe145bc23c77ebda7306d07a20e39c1a598316cee58e1591e65ce1b2d2a3f727f5463ba144711faa55f7c11e4a038b6ad2a76cab760b4fdd43647f09c3
 SHA512 
95b2c925cb10943e7136aa3b7b08a9ad3d6ff59a3994c653bba52e4c65193d519daa49684b924f68945dd596187aa17e0c713bf0b9e29f8c5973346b279dba1b
+DIST postgis-2.4.6.tar.gz 12616474 BLAKE2B 
8e33ae7e8ca5ef2a4dd90f64a8e9910118e4ef711444b196f46e4a63f98ff6044709d65a853c5c10de91308658a206965503b6a85a16438ea422becdbbd9bb40
 SHA512 
eec4276a58549f3cc57d6574186aebc72df0dd7dc2ab9acbaf410604b4d271dee6d5154caacd7297d20493d879434ca78050672e8197ff0fc63a36100c20c66c
+DIST postgis-2.5.1.tar.gz 16041872 BLAKE2B 
589cf7168d3698737a19d817b8efb91695c2c3f63d6c3aa24189d9a37459a28ca8a7db0450aa2d557699f76cd8e3ab1eec198bd332b294d976330fdc9d8a7f60
 SHA512 
c6c9c8c5befd945614e92d1062df1d753ca8b7fd69b70226065c2dac77a59783b14ece4da994187079b683ee090ba5a79389ba679f22fce8c20a5afc2c8dfca0

diff --git a/dev-db/postgis/postgis-2.4.6.ebuild 
b/dev-db/postgis/postgis-2.4.6.ebuild
new file mode 100644
index 000..c78f3e5ac27
--- /dev/null
+++ b/dev-db/postgis/postgis-2.4.6.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+POSTGRES_COMPAT=( 9.{3..6} {10..11} )
+POSTGRES_USEDEP="server"
+
+inherit autotools eutils postgres-multi versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.net";
+SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="address-standardizer doc gtk static-libs mapbox test topology"
+
+RDEPEND="
+   ${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   >=sci-libs/geos-3.5.0
+   >=sci-libs/proj-4.6.0
+   >=sci-libs/gdal-1.10.0
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+   mapbox? ( dev-libs/protobuf )
+"
+
+DEPEND="${RDEPEND}
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   || (
+   media-gfx/imagemagick[png]
+   
media-gfx/graphicsmagick[imagemagick,png]
+   )
+   )
+   virtual/pkgconfig
+   test? ( dev-util/cunit )
+"
+
+PGIS="$(get_version_component_range 1-2)"
+
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+MAKEOPTS+=' -j1'
+
+# These modules are built using the same *FLAGS that were used to build
+# dev-db/postgresql. The right thing to do is to ignore the current
+# *FLAGS settings.
+QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+src_prepare() {
+   eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   local myargs=""
+
+   use gtk  && myargs+=" --with-gui"
+
+   use address-standardizer || myargs+=" --without-address-standardizer"
+   use mapbox   || myargs+=" --without-protobuf"
+   use topology || myargs+=" --without-topology"
+
+   postgres-multi_foreach econf ${myargs}
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_foreach emake cheatsheets
+   po

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2018-05-13 Thread Aaron Swenson
commit: a0908df66704671789cd7def7eff23ae8220014d
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Sun May 13 16:50:32 2018 +
Commit: Aaron Swenson  gentoo  org>
CommitDate: Sun May 13 16:50:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0908df6

dev-db/postgis: Remove <9.3 from POSTGRES_COMPAT

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-db/postgis/postgis-2.4.2.ebuild | 2 +-
 dev-db/postgis/postgis-2.4.3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/postgis/postgis-2.4.2.ebuild 
b/dev-db/postgis/postgis-2.4.2.ebuild
index fdc275bb85b..2dd323bc643 100644
--- a/dev-db/postgis/postgis-2.4.2.ebuild
+++ b/dev-db/postgis/postgis-2.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-POSTGRES_COMPAT=( 9.{2..6} 10 )
+POSTGRES_COMPAT=( 9.{3..6} 10 )
 POSTGRES_USEDEP="server"
 
 inherit autotools eutils postgres-multi versionator

diff --git a/dev-db/postgis/postgis-2.4.3.ebuild 
b/dev-db/postgis/postgis-2.4.3.ebuild
index 205ce7a381c..a24f81220e5 100644
--- a/dev-db/postgis/postgis-2.4.3.ebuild
+++ b/dev-db/postgis/postgis-2.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-POSTGRES_COMPAT=( 9.{2..6} 10 )
+POSTGRES_COMPAT=( 9.{3..6} 10 )
 POSTGRES_USEDEP="server"
 
 inherit autotools eutils postgres-multi versionator



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2018-01-17 Thread Aaron Swenson
commit: 3ef20f89a6e5e7d09c77d3a89a9275d24ce60fed
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Wed Jan 17 12:07:19 2018 +
Commit: Aaron Swenson  gentoo  org>
CommitDate: Wed Jan 17 12:07:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ef20f89

dev-db/postgis: Bump to 2.4.3

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-db/postgis/Manifest |   1 +
 dev-db/postgis/postgis-2.4.3.ebuild | 126 
 2 files changed, 127 insertions(+)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index a1dfb601ce1..0c6de877d40 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1 +1,2 @@
 DIST postgis-2.4.2.tar.gz 12470881 BLAKE2B 
116bb5d1c8f6066d537cac950254923a681babac456d155139dbdd2853b80499f4f9445dad985b94bd1d1285a6c78fee0fccb24e301d18147f3cd9230416
 SHA512 
e268572d5cd009754ef05f5d2eedcac7e362fa47199459c637cd4d9050d2b648d4b2b3746cde0dce5a42be2606a432b64dc905f193e12cf0869e3dd6f820b425
+DIST postgis-2.4.3.tar.gz 12601055 BLAKE2B 
662b2afe145bc23c77ebda7306d07a20e39c1a598316cee58e1591e65ce1b2d2a3f727f5463ba144711faa55f7c11e4a038b6ad2a76cab760b4fdd43647f09c3
 SHA512 
95b2c925cb10943e7136aa3b7b08a9ad3d6ff59a3994c653bba52e4c65193d519daa49684b924f68945dd596187aa17e0c713bf0b9e29f8c5973346b279dba1b

diff --git a/dev-db/postgis/postgis-2.4.3.ebuild 
b/dev-db/postgis/postgis-2.4.3.ebuild
new file mode 100644
index 000..205ce7a381c
--- /dev/null
+++ b/dev-db/postgis/postgis-2.4.3.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+POSTGRES_COMPAT=( 9.{2..6} 10 )
+POSTGRES_USEDEP="server"
+
+inherit autotools eutils postgres-multi versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.net";
+SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="address-standardizer doc gtk static-libs mapbox test topology"
+
+RDEPEND="
+   ${POSTGRES_DEP}
+   dev-libs/json-c:=
+   dev-libs/libxml2:2
+   >=sci-libs/geos-3.5.0
+   >=sci-libs/proj-4.6.0
+   >=sci-libs/gdal-1.10.0
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+   mapbox? ( dev-libs/protobuf )
+"
+
+DEPEND="${RDEPEND}
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   || (
+   media-gfx/imagemagick[png]
+   
media-gfx/graphicsmagick[imagemagick,png]
+   )
+   )
+   virtual/pkgconfig
+   test? ( dev-util/cunit )
+"
+
+PGIS="$(get_version_component_range 1-2)"
+
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+MAKEOPTS+=' -j1'
+
+# These modules are built using the same *FLAGS that were used to build
+# dev-db/postgresql. The right thing to do is to ignore the current
+# *FLAGS settings.
+QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+src_prepare() {
+   eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" \
+  "${FILESDIR}/postgis-2.4.2-jsonc_0.13.patch"
+
+   local AT_M4DIR="macros"
+   eautoreconf
+
+   postgres-multi_src_prepare
+}
+
+src_configure() {
+   local myargs=""
+
+   use gtk  && myargs+=" --with-gui"
+
+   use address-standardizer || myargs+=" --without-address-standardizer"
+   use mapbox   || myargs+=" --without-protobuf"
+   use topology || myargs+=" --without-topology"
+
+   postgres-multi_foreach econf ${myargs}
+}
+
+src_compile() {
+   postgres-multi_foreach emake
+   postgres-multi_foreach emake -C topology
+
+   if use doc ; then
+   postgres-multi_foreach emake comments
+   postgres-multi_foreach emake cheatsheets
+   postgres-multi_forbest emake -C doc html
+   fi
+}
+
+src_install() {
+   postgres-multi_foreach emake DESTDIR="${D}" install
+   postgres-multi_foreach emake -C topology DESTDIR="${D}" install
+   postgres-multi_forbest dobin ./utils/postgis_restore.pl
+
+   dodoc CREDITS TODO loader/README.* doc/*txt
+
+   docinto topology
+   dodoc topology/{TODO,README}
+
+   if use doc ; then
+   postgres-multi_foreach emake DESTDIR="${D}" comments-install
+
+   docinto html
+   postgres-multi_forbest dodoc doc/html/{postgis.html,style.css}
+
+   docinto html/images
+   postgres-multi_forbest dodoc doc/html/ima

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/, dev-db/postgis/files/

2018-01-05 Thread Aaron Swenson
commit: 02044f52ba5d595ff0f824e828950035cd054694
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Fri Jan  5 16:47:25 2018 +
Commit: Aaron Swenson  gentoo  org>
CommitDate: Fri Jan  5 16:47:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02044f52

dev-db/postgis: Cleanup

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-db/postgis/Manifest|   3 -
 dev-db/postgis/files/postgis-2.0-arflags.patch |  18 --
 dev-db/postgis/files/postgis-2.1-ldflags.patch |  26 --
 .../files/postgis-2.1.4-pkgconfig-json.patch   | 122 -
 dev-db/postgis/files/postgis_dbs   |  49 
 dev-db/postgis/postgis-2.1.8-r1.ebuild | 281 -
 dev-db/postgis/postgis-2.3.3.ebuild| 116 -
 dev-db/postgis/postgis-2.4.0.ebuild| 116 -
 8 files changed, 731 deletions(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 63e28feeff2..a1dfb601ce1 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,4 +1 @@
-DIST postgis-2.1.8.tar.gz 6811272 BLAKE2B 
f39debafea797fec2595b1ba2256ce3ed19875f15e57829f3480b15ec82ddfbc51702bb29513a9b1cd381696ee0b0857c34e79395a1f627f38a1e41344485ba7
 SHA512 
e8aeb739a1ecf95b224a3908d2af3aa38933b56c63713af30d14243653745436165b418a3368601a699b744f6fe61ce645c980319eb159395d68166a3815c5f4
-DIST postgis-2.3.3.tar.gz 11342032 BLAKE2B 
d50eb0b43f56c31768c40083677e54f547e183287feaab6b21d223b49bb19c3599031f186f0f783b9c9c948e7ed0bcd4a0918e65e61babad35f6c37eacc8f981
 SHA512 
c0ec4b4b5c470e5f88d1bb72c528269a0cf954981385580db502c2da74e431b5a86e3d6427c839c3d4440122be18a69261c8205aa71c8aa4b790550c5e9c
-DIST postgis-2.4.0.tar.gz 12576979 BLAKE2B 
2d0312ca9202f92f55700e78881ecdd7128064393b1e7197dd658f8fcee676723c048fa2c7f199aa9d61a5638c0ad0129b6d2dc61d6324caeec3b7163f0f4edc
 SHA512 
813e8e9feb75b58673afaec2dda3b5d8fc586a0f483c553795c8ae2b917bb67a9741e8c901787a0b914c327848323239346f1d816aa60b47d5a7065596de0067
 DIST postgis-2.4.2.tar.gz 12470881 BLAKE2B 
116bb5d1c8f6066d537cac950254923a681babac456d155139dbdd2853b80499f4f9445dad985b94bd1d1285a6c78fee0fccb24e301d18147f3cd9230416
 SHA512 
e268572d5cd009754ef05f5d2eedcac7e362fa47199459c637cd4d9050d2b648d4b2b3746cde0dce5a42be2606a432b64dc905f193e12cf0869e3dd6f820b425

diff --git a/dev-db/postgis/files/postgis-2.0-arflags.patch 
b/dev-db/postgis/files/postgis-2.0-arflags.patch
deleted file mode 100644
index fa2e9a8da60..000
--- a/dev-db/postgis/files/postgis-2.0-arflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naruw a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
 a/raster/rt_core/Makefile.in   2012-03-21 21:36:59.0 +
-+++ b/raster/rt_core/Makefile.in   2013-04-28 13:23:21.055728249 +
-@@ -8,7 +8,7 @@
- #
- #
- 
--AR=ar rs
-+ARFLAGS=rs
- 
- CC=@CC@
- LIBLWGEOM_LDFLAGS=../../liblwgeom/.libs/liblwgeom.a
-@@ -35,4 +35,4 @@
-   rm -f Makefile
- 
- librtcore.a: $(RT_OBJS) $(RT_HEADERS)
--  $(AR) $(RT_LIB) $(RT_OBJS)
-+  $(AR) $(ARFLAGS) $(RT_LIB) $(RT_OBJS)

diff --git a/dev-db/postgis/files/postgis-2.1-ldflags.patch 
b/dev-db/postgis/files/postgis-2.1-ldflags.patch
deleted file mode 100644
index de11510ea37..000
--- a/dev-db/postgis/files/postgis-2.1-ldflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naruw postgis-2.1.0rc1.orig/loader/Makefile.in 
postgis-2.1.0rc1/loader/Makefile.in
 postgis-2.1.0rc1.orig/loader/Makefile.in   2013-05-06 08:30:51.0 
+
-+++ postgis-2.1.0rc1/loader/Makefile.in2013-07-14 17:19:19.313306844 
+
-@@ -97,11 +97,11 @@
- 
- $(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o 
$(LIBLWGEOM) 
-   $(LIBTOOL) --mode=link \
--$(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) 
$(GETTEXT_LDFLAGS) -o $@ 
-+$(CC) $(CFLAGS) $^ $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) 
$(GETTEXT_LDFLAGS) -o $@
- 
- $(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-cli.o 
$(LIBLWGEOM) 
-   $(LIBTOOL) --mode=link \
--$(CC) $(CFLAGS) $^ -o $@ $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS) 
-+$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(GETTEXT_LDFLAGS) 
$(ICONV_LDFLAGS)
- 
- shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h
-   $(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c 
shp2pgsql-gui.c
-@@ -109,7 +109,7 @@
- $(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o 
pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES)
-   $(LIBTOOL) --mode=link \
- $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ \
--$(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) 
-+$(LDFLAGS) $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) 
$(GETTEXT_LDFLAGS)
- 
- installdir:
-   @mkdir -p $(DESTDIR)$(bindir)

diff --git a/dev-db/postgis/files/postgis-2.1.4-pkgconfig-json.patch 
b/dev-db/pos

[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2018-01-04 Thread Mikle Kolyada
commit: 04a9768562bd34c084ecced862dd6e145bc3d958
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Jan  4 17:29:33 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Jan  4 17:29:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04a97685

dev-db/postgis: amd64 stable wrt bug #641574

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-db/postgis/postgis-2.4.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/postgis/postgis-2.4.2.ebuild 
b/dev-db/postgis/postgis-2.4.2.ebuild
index 52c149a6122..fdc275bb85b 100644
--- a/dev-db/postgis/postgis-2.4.2.ebuild
+++ b/dev-db/postgis/postgis-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,7 +17,7 @@ HOMEPAGE="http://postgis.net";
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="address-standardizer doc gtk static-libs mapbox test topology"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/, dev-db/postgis/files/

2017-12-23 Thread Aaron Swenson
commit: 2537c6ed079eca7a23f02321c0ef7670fa5a1aa0
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Sat Dec 23 13:00:52 2017 +
Commit: Aaron Swenson  gentoo  org>
CommitDate: Sat Dec 23 13:00:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2537c6ed

dev-db/postgis: Add json-c-0.13 patch

Fix compilation failure when building against json-c-0.13.

Thanks to Wojciech Myrda for submitting the patch to us, and Ștefan
Talpalaru for confirming.

Closes: https://bugs.gentoo.org/641978
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 .../postgis/files/postgis-2.4.2-jsonc_0.13.patch   | 23 ++
 dev-db/postgis/postgis-2.4.2.ebuild|  3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch 
b/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch
new file mode 100644
index 000..b980e77333d
--- /dev/null
+++ b/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch
@@ -0,0 +1,23 @@
+diff -Naur postgis-2.4.2.old/liblwgeom/lwin_geojson.c 
postgis-2.4.2/liblwgeom/lwin_geojson.c
+--- postgis-2.4.2.old/liblwgeom/lwin_geojson.c 2017-12-21 22:52:40.422802160 
+0100
 postgis-2.4.2/liblwgeom/lwin_geojson.c 2017-12-21 22:55:36.605430945 
+0100
+@@ -31,13 +31,19 @@
+ 
+ #if defined(HAVE_LIBJSON) || defined(HAVE_LIBJSON_C) /* --{ */
+ 
++#define JSON_C_VERSION_013 (13 << 8)
++
+ #ifdef HAVE_LIBJSON_C
+ #include 
++#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013
+ #include 
++#endif
+ #else
+ #include 
++#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013
+ #include 
+ #endif
++#endif
+ 
+ #ifndef JSON_C_VERSION
+ /* Adds support for libjson < 0.10 */

diff --git a/dev-db/postgis/postgis-2.4.2.ebuild 
b/dev-db/postgis/postgis-2.4.2.ebuild
index dca731bcd11..52c149a6122 100644
--- a/dev-db/postgis/postgis-2.4.2.ebuild
+++ b/dev-db/postgis/postgis-2.4.2.ebuild
@@ -61,7 +61,8 @@ MAKEOPTS+=' -j1'
 QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
 
 src_prepare() {
-   eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+   eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" \
+  "${FILESDIR}/postgis-2.4.2-jsonc_0.13.patch"
 
local AT_M4DIR="macros"
eautoreconf



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2017-12-19 Thread Thomas Deutschmann
commit: 05320ad05184d4f1609d33073c8c4ba9a3805dd9
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Dec 19 21:44:17 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Dec 19 21:44:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05320ad0

dev-db/postgis: Add subslot operator on dev-libs/json-c atom

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-db/postgis/postgis-2.1.8-r1.ebuild | 2 +-
 dev-db/postgis/postgis-2.3.3.ebuild| 2 +-
 dev-db/postgis/postgis-2.4.0.ebuild| 2 +-
 dev-db/postgis/postgis-2.4.2.ebuild| 2 +-
 dev-db/postgis/postgis-.ebuild | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-db/postgis/postgis-2.1.8-r1.ebuild 
b/dev-db/postgis/postgis-2.1.8-r1.ebuild
index 7b1340edd96..9774fabdbc3 100644
--- a/dev-db/postgis/postgis-2.1.8-r1.ebuild
+++ b/dev-db/postgis/postgis-2.1.8-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
dev-db/postgresql:9.3[server]
dev-db/postgresql:9.2[server]
)
-   dev-libs/json-c
+   dev-libs/json-c:=
dev-libs/libxml2:2
>=sci-libs/geos-3.4.2
>=sci-libs/proj-4.6.0

diff --git a/dev-db/postgis/postgis-2.3.3.ebuild 
b/dev-db/postgis/postgis-2.3.3.ebuild
index 87001946ec6..1655d70d7c3 100644
--- a/dev-db/postgis/postgis-2.3.3.ebuild
+++ b/dev-db/postgis/postgis-2.3.3.ebuild
@@ -22,7 +22,7 @@ IUSE="doc gtk static-libs test"
 
 RDEPEND="
${POSTGRES_DEP}
-   dev-libs/json-c
+   dev-libs/json-c:=
dev-libs/libxml2:2
>=sci-libs/geos-3.5.0
>=sci-libs/proj-4.6.0

diff --git a/dev-db/postgis/postgis-2.4.0.ebuild 
b/dev-db/postgis/postgis-2.4.0.ebuild
index 18cd48cf450..1f6443716a4 100644
--- a/dev-db/postgis/postgis-2.4.0.ebuild
+++ b/dev-db/postgis/postgis-2.4.0.ebuild
@@ -22,7 +22,7 @@ IUSE="doc gtk static-libs test"
 
 RDEPEND="
${POSTGRES_DEP}
-   dev-libs/json-c
+   dev-libs/json-c:=
dev-libs/libxml2:2
>=sci-libs/geos-3.5.0
>=sci-libs/proj-4.6.0

diff --git a/dev-db/postgis/postgis-2.4.2.ebuild 
b/dev-db/postgis/postgis-2.4.2.ebuild
index 821bc672cfe..dca731bcd11 100644
--- a/dev-db/postgis/postgis-2.4.2.ebuild
+++ b/dev-db/postgis/postgis-2.4.2.ebuild
@@ -22,7 +22,7 @@ IUSE="address-standardizer doc gtk static-libs mapbox test 
topology"
 
 RDEPEND="
${POSTGRES_DEP}
-   dev-libs/json-c
+   dev-libs/json-c:=
dev-libs/libxml2:2
>=sci-libs/geos-3.5.0
>=sci-libs/proj-4.6.0

diff --git a/dev-db/postgis/postgis-.ebuild 
b/dev-db/postgis/postgis-.ebuild
index c112970c706..0010979ad4b 100644
--- a/dev-db/postgis/postgis-.ebuild
+++ b/dev-db/postgis/postgis-.ebuild
@@ -22,7 +22,7 @@ IUSE="doc gtk static-libs test"
 
 RDEPEND="
${POSTGRES_DEP}
-   dev-libs/json-c
+   dev-libs/json-c:=
dev-libs/libxml2:2
>=sci-libs/geos-3.4.2
>=sci-libs/proj-4.6.0



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2017-12-19 Thread Thomas Deutschmann
commit: f68ff903a60d3e97954c0b25e7fe0f65d70e10f2
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Dec 19 14:50:25 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Dec 19 15:43:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f68ff903

dev-db/postgis: x86 stable (bug #641574)

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-db/postgis/postgis-2.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/postgis/postgis-2.4.2.ebuild 
b/dev-db/postgis/postgis-2.4.2.ebuild
index eb28a8841e0..821bc672cfe 100644
--- a/dev-db/postgis/postgis-2.4.2.ebuild
+++ b/dev-db/postgis/postgis-2.4.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://postgis.net";
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="address-standardizer doc gtk static-libs mapbox test topology"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/

2017-11-16 Thread Aaron Swenson
commit: cc14b56e70570e3804910f0c566be7cc1df6d2fe
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Thu Nov 16 15:26:57 2017 +
Commit: Aaron Swenson  gentoo  org>
CommitDate: Thu Nov 16 15:29:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc14b56e

dev-db/postgis: Bump to 2.4.2

Bump version to 2.4.2. Add additional USE flags to control optional
dependencies.

Closes: https://bugs.gentoo.org/634828
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-db/postgis/Manifest |   1 +
 dev-db/postgis/metadata.xml |  13 +++-
 dev-db/postgis/postgis-2.4.2.ebuild | 125 
 3 files changed, 138 insertions(+), 1 deletion(-)

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 0811dde086e..d4cda09966f 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,3 +1,4 @@
 DIST postgis-2.1.8.tar.gz 6811272 SHA256 
7c2380b895fe7bda34c2e70deab3fcf4c12b13ab40d7501cdaa6fa36f1a6c662 SHA512 
e8aeb739a1ecf95b224a3908d2af3aa38933b56c63713af30d14243653745436165b418a3368601a699b744f6fe61ce645c980319eb159395d68166a3815c5f4
 WHIRLPOOL 
b6675fecbb922379bd50c351abe1553fdbda53543fce56451c688e25a3fa2e9d0813d8f3a349b623b85fcb4016fc4710f6746a224ba7673ec0d2106c7635d3d1
 DIST postgis-2.3.3.tar.gz 11342032 SHA256 
723d43a1c8ca4cf06359ec0b7fd5521b355db4e37128a26fb8c661b1fe2fc930 SHA512 
c0ec4b4b5c470e5f88d1bb72c528269a0cf954981385580db502c2da74e431b5a86e3d6427c839c3d4440122be18a69261c8205aa71c8aa4b790550c5e9c
 WHIRLPOOL 
427d4637e0073ad549cd2e74d117b2dc2b0b0e5fff98f9a0bbee3514c00b3688dd56acd7bb3f1742eda61238cf8c5ab81cea6ead7ea5880261b753a86e0f847e
 DIST postgis-2.4.0.tar.gz 12576979 SHA256 
02baa90f04da41e04b6c18eedfda53110c45ae943d4e65050f6d202f7de07d29 SHA512 
813e8e9feb75b58673afaec2dda3b5d8fc586a0f483c553795c8ae2b917bb67a9741e8c901787a0b914c327848323239346f1d816aa60b47d5a7065596de0067
 WHIRLPOOL 
75403b5d1babdc1d714d29a6c1f86dfcd1503997536d6a35333b6e19c72de44aa131cba3c6a9a4f2ced59a280eb0eaee41696fa8440c2028f8555d6a2c4dcd3b
+DIST postgis-2.4.2.tar.gz 12470881 SHA256 
23625bc99ed440d53a20225721095a3f5c653b62421c4d597c8038f0d7a321d9 SHA512 
e268572d5cd009754ef05f5d2eedcac7e362fa47199459c637cd4d9050d2b648d4b2b3746cde0dce5a42be2606a432b64dc905f193e12cf0869e3dd6f820b425
 WHIRLPOOL 
5a87b34733dce189d6a30a4ca88599467ff0987c214b258d9d873975de2f746a26281a983d8f98f9d3758da121d0adc2384c8dc1d3d247130213020cecf887f1

diff --git a/dev-db/postgis/metadata.xml b/dev-db/postgis/metadata.xml
index 41af88acdf3..079d84079f2 100644
--- a/dev-db/postgis/metadata.xml
+++ b/dev-db/postgis/metadata.xml
@@ -10,6 +10,17 @@
Gentoo Geosciences Project


-   Build shp2pgsql-gui a graphical interface to 
shp2pgsql
+   
+   Normalize US and CA postal addresses
+   
+   
+   Build graphical interface for shp2pgsql (shp2pgsql-gui)
+   
+   
+   Add capability to transform geometry into Mapbox Vector 
Tile
+   
+   
+   Build topology spatial types and functions
+   

 

diff --git a/dev-db/postgis/postgis-2.4.2.ebuild 
b/dev-db/postgis/postgis-2.4.2.ebuild
new file mode 100644
index 000..eb28a8841e0
--- /dev/null
+++ b/dev-db/postgis/postgis-2.4.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+POSTGRES_COMPAT=( 9.{2..6} 10 )
+POSTGRES_USEDEP="server"
+
+inherit autotools eutils postgres-multi versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.net";
+SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz";
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="address-standardizer doc gtk static-libs mapbox test topology"
+
+RDEPEND="
+   ${POSTGRES_DEP}
+   dev-libs/json-c
+   dev-libs/libxml2:2
+   >=sci-libs/geos-3.5.0
+   >=sci-libs/proj-4.6.0
+   >=sci-libs/gdal-1.10.0
+   address-standardizer? ( dev-libs/libpcre )
+   gtk? ( x11-libs/gtk+:2 )
+   mapbox? ( dev-libs/protobuf )
+"
+
+DEPEND="${RDEPEND}
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/libxslt
+   || (
+   media-gfx/imagemagick[png]
+   
media-gfx/graphicsmagick[imagemagick,png]
+   )
+   )
+   virtual/pkgconfig
+   test? ( dev-util/cunit )
+"
+
+PGIS="$(get_version_component_range 1-2)"
+
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+
+# 

  1   2   >