gentoo auto-resync : 18:09:2023 - 17:06:27

3 files changed, 153 insertions, 0 deletions

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 4b1ccdd1ed36..59b7bfb2a307 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -3,6 +3,7 @@ AUX postgis-3.0.3-avoid-calling-ar-directly.patch 2302 BLAKE2B b45f5c1e3bfd694ac
 AUX postgis-3.0.3-detect-only-stdc.patch 813 BLAKE2B 837b1bcd9dc2084d452dc3403293c159fac081f9564783a787bfe4a22af4486207f84d9f426926acd106d50d83ffaf239abb671eeba75d12677db00a9aab27b2 SHA512 cf950a100dda547caf7f1da3f92cd4f070d4f6e0e864be5cf049c1904ee2ad7e4cdf3f19468a591bdab1e921728d62ba143a4be54f22502d1fd47ee6a0839225
 AUX postgis-3.0.3-try-other-cpp-names.patch 459 BLAKE2B ff9b529a733861956062303e7e3e95979411e33de2c82b8849ba30fa4fc1fad4f030acac667eb33c5a3ce6801025a41a62a0b27b2fc3f198fa98417038bb1e3f SHA512 f7da42b7ecf9efa1a203c0096d8d4d292ff2d5a2d61cdb816a53a37fbef6956a8a6f309c45c9c7132fb7d5cf7c27ee4ebf10cbfd9185d8de66c777cc7fa049f9
 AUX postgis-3.3.2-flatbuffers-abseil-2023.patch 1640 BLAKE2B 7d9efcaca113e52829282b6aeaaa6459321954fa0fa061766a76ea3b1f7b6bba6167b52293000082f3a9c6cb9ca77429604d6e7cc391e039b57aaa096ea62eb0 SHA512 46f5823624e623edd1e4b03c6d436569acfe0e7444dbf06fe907aad666ba0281dc080370bad234bc5ed84b070447b0518edab06ac843a67507ba178c64b777bf
+AUX postgis-3.4.0-without-gui.patch 491 BLAKE2B 6c2ff929b453986045e6ecddc30345922229ea929ae43c1c2c7b61f87caf3f9169438fb38621ca3cfecd770084d8a796e18a10a96b981a09a799f346aa76468c SHA512 e80e55f05e06460a151303c80252c34d59dda8340950fd334808bb8c9f214404fd2580f14653b80b67bf126b172e6969df75ce1f1ab22d54d2d6f775ce56d095
 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
@@ -17,5 +18,6 @@ EBUILD postgis-3.2.5.ebuild 3271 BLAKE2B fb53dfd7b4c478f8c875297a5d714a6326f71d9
 EBUILD postgis-3.3.2-r1.ebuild 3287 BLAKE2B af284a892ee0204fcc287b5dc25610c5b93614c69822140a5f83cd0d010a9a4e871c2ced6ae857272a0084efb54baaea95a64d859d5c128fc2fcdf1838f32619 SHA512 1c77890c523174a1c39a48bda25c8661a244374d3a76610f31d96d1be1b23ea1d45095ac51dc173a038ce11f1ccc2fc61ffcf679d7c02119aa987cbcade8b9e6
 EBUILD postgis-3.3.3.ebuild 3296 BLAKE2B 82ef1831438b395c6d2520be2bb2f78ea87a73ab59ec25645ffca624a79b1b77fe8f178f8cfff4b9260aadab08c8ea2ab5c7335761ccc4b0988672a2bbc8cb7e SHA512 a7bb9f40cc209e9a37004539f1912f8ae22be3e2e7b4bc48d7fd66924e7bfa5af66ada184c64dc3932e61e53dd2638a9c1c4eddd259867a834e3ea543b346d99
 EBUILD postgis-3.4.0-r1.ebuild 3303 BLAKE2B 53b5af82e5cd5b9a9ea84b841e6f1dfd26256c5551822352aec5b82f1c7846874111e1eb4b8349c89f006d73349305744db93fc788823bbc3f06e2ecd0e6eb6d SHA512 707951abc9a6a29d4a8ac4e18f141ca19fb08e0bfc003030645a255997745eb3bdb6a7142667de665f28ba2d52a051ef707c681995b74f03ca39d3fa90bd1b6d
+EBUILD postgis-3.4.0-r2.ebuild 3294 BLAKE2B f0c02c1ad6dfb5ec274d4eff1b38e57351c94d05a877f8e928bcf4126d025b092c460e8ce33708ad75e0034e95ed568c86886b4ea63f9d106609f99911141ece SHA512 acec537baac97d5d206960feb16eac89dbaebfcb057f99c4a4de16fa7a547bc3edf1ce5470c5f128b3f77a9590e82b99692f42ed9e83ca62cc385d074bbcfad8
 EBUILD postgis-9999.ebuild 3271 BLAKE2B fb53dfd7b4c478f8c875297a5d714a6326f71d9335dfa0a7ad4e549027eb8a7061a93293344a3d1314bc829bda71e06fa0978dbe1ed61c203d5416ceba6afe39 SHA512 fae60a6234c706cb8aca0b2f8ec209f160257f957a6ae886ce3cb75197f89c51ccc28fb72a211d7ea7b2f42590ea21ed8b376700940903fe8c7c96ac384c8066
 MISC metadata.xml 818 BLAKE2B 1f49aad6ae27cc838c1eb0908eaec3eda84400174b0ef20a7afd828a3212b0215761e3c6d8dcdb2b62cbb8c7bda7266854d93b02f121c253ae8618cb917e39ce SHA512 c344b128ea11c07a098bb5cf6f6cdf67677a43a6d40222e74258b26951774cf59ec9ad61b515cc6f5abaf5eb99593b38c66fbeabe3f7fafa52e16e055cb7f119
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 000000000000..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 000000000000..515b220b2b43
--- /dev/null
+++ b/dev-db/postgis/postgis-3.4.0-r2.ebuild
@@ -0,0 +1,138 @@
+# 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} = *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-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} = *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_forbest 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
+		postgres-multi_forbest emake DESTDIR="${D}" -C doc cheatsheet-install html-install html-assets-install
+	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"
+}