gentoo auto-resync : 14:09:2022 - 11:10:10

3 files changed, 142 insertions, 0 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index f50a7e8664de..09d5aa21f9ed 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index e25a410c30d0..5e8e1c8251ff 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -12,6 +12,7 @@ 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
 EBUILD postgis-3.0.3-r3.ebuild 3368 BLAKE2B ea576ee75bcd2c934d6f3768d365aae86440cd2b79afb474be3a7d4b4877aabe15a5e9c928cfb86c07c5231fcf0fc3eec5a4af56551c4696e9dad992bd8935d9 SHA512 4c526cfd36822beb4fb022e23081b7571a7d3e74241d53baf70b45f4eeebc667c39aaf4316e9b64bb350e9abe5b78172d569a4a33e27cff86948eb4b24681b05
 EBUILD postgis-3.0.5.ebuild 3377 BLAKE2B afabdeefddd2eccd48d0eef575643d6ff7a4c8f3793d6d40f7729d84df876916ceb9d01665ba1896111aca39a799cb037bc978455ff77ab2e0d402103db9887e SHA512 28912ad325569b12eb062ca0cea2253f2464b03b36bdf0298b594eacf670c468e4983240c17a283ede4a23c6544ec4c55dfb29edb487a45f500b181aef0981a5
 EBUILD postgis-3.0.7.ebuild 3374 BLAKE2B c012fd6f42b61b662aafaac10a3a0970b9210ceaaa2af3fc53e049af8566958b77bb217e29d1b14dcac4e421e9ee1c4e94e7ece35bf2caddcf434a84b76ddefa SHA512 5e650942f46f5df631591605483b52581e0e063e71da1c02a6d28db0940e42fb46ee27c4c53f006b7649d2e3b060602e95cfd865be4e13c7b9ae37a5a2e034bf
@@ -22,5 +23,6 @@ EBUILD postgis-3.2.0.ebuild 3270 BLAKE2B 476ce0b409382d179937cb0166d58c67fe4d1ce
 EBUILD postgis-3.2.1.ebuild 3270 BLAKE2B 476ce0b409382d179937cb0166d58c67fe4d1ce22e296e08be4a7816b57f82ac1797bb22b7240722ed026bcc49889364a295ef7b481a4ea4505c0c580d737706 SHA512 db0a9478994056fff6a868d4892bf67afabb4baa3e3beb97573a22bc186d26cd946896cffbb4b6fce70e22b606fc9b5b0ff993b326a07a2028f41b857d69ed17
 EBUILD postgis-3.2.3.ebuild 3270 BLAKE2B 476ce0b409382d179937cb0166d58c67fe4d1ce22e296e08be4a7816b57f82ac1797bb22b7240722ed026bcc49889364a295ef7b481a4ea4505c0c580d737706 SHA512 db0a9478994056fff6a868d4892bf67afabb4baa3e3beb97573a22bc186d26cd946896cffbb4b6fce70e22b606fc9b5b0ff993b326a07a2028f41b857d69ed17
 EBUILD postgis-3.3.0.ebuild 3166 BLAKE2B 3051d193c31f2bf1105fd84509aea400ef5647095ee006ba1be279c36effe3559d7d5689074b7fc63719491c24c49da1d28aca63c6b43f361238c77425b4e816 SHA512 4701ca697fd4a3ac6760ba01d9eeb8ee4800ba7e98c854b5e0a8f14b8070f0fe66a4491f66fcefaf7689b5df9f266f4100dfc789feadc6e15b4c8e4416e000b3
+EBUILD postgis-3.3.1.ebuild 3166 BLAKE2B 3051d193c31f2bf1105fd84509aea400ef5647095ee006ba1be279c36effe3559d7d5689074b7fc63719491c24c49da1d28aca63c6b43f361238c77425b4e816 SHA512 4701ca697fd4a3ac6760ba01d9eeb8ee4800ba7e98c854b5e0a8f14b8070f0fe66a4491f66fcefaf7689b5df9f266f4100dfc789feadc6e15b4c8e4416e000b3
 EBUILD postgis-9999.ebuild 3270 BLAKE2B ba496aa8b149415cb09f1920aa3fbaf03158f6a27fb6d3fd4d699995a076f30324eafa5378409af35728e464a8878b63818664be733fdfb0fcb0293c5bda72d0 SHA512 8033a0c133105cf6b90244b984c2b0ea6c947a58c33c4878ee0a66d8677aef832ebbd5c4097197afdef533e1200f6fe17ab5044dab9997d2f628f66d963e1539
 MISC metadata.xml 818 BLAKE2B 1f49aad6ae27cc838c1eb0908eaec3eda84400174b0ef20a7afd828a3212b0215761e3c6d8dcdb2b62cbb8c7bda7266854d93b02f121c253ae8618cb917e39ce SHA512 c344b128ea11c07a098bb5cf6f6cdf67677a43a6d40222e74258b26951774cf59ec9ad61b515cc6f5abaf5eb99593b38c66fbeabe3f7fafa52e16e055cb7f119
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 000000000000..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} = *9999* ]] ; 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} = *9999* ]] ; 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} = *9999* ]] ; 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"
+}