gentoo resync : 03.07.2021

5 files changed, 144 insertions, 2 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 245cd4ec0dc1..f6c70caa297a 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index ba82c5bfad67..a0d191db5252 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -6,9 +6,11 @@ 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
 EBUILD postgis-3.0.3-r2.ebuild 3272 BLAKE2B 06518c8017ca44033f52567e3282d4091eee07f8201fba59a33974b47792b0aaa509396b9f2a6216bd19b09f6c722bb9ce4f04423e28406661c0c98b641d337e SHA512 8a86e9ba2d9da2b11bedf22081041576d11d33a370d53ee4e52f7ef968e6e93e9a399fc2e3de55cb2daec823e057fc414269b2879880e04d32413225ccb49268
 EBUILD postgis-3.1.0.ebuild 3271 BLAKE2B 666e8213ab401c2ea1de316b1df9e3af3370b787a7d2af2d63320e6753d393f95e011e0adf82e8b1df7f24d82de6c1bfc2924f94199670f0741c2e5111032f0e SHA512 d57fe42670b1c900ca08fcd3aa7d5c02db2f5c2971b4cbec31d44743bcaa5a5fe45fff93c6341cba851fd43fe803612251c912917b95ec76ec7d3d68a2bb8654
 EBUILD postgis-3.1.1.ebuild 3273 BLAKE2B 45efcb2a012d52b70efecbacfd0a1f20736cc79544787a6c1375ce0b4ee430a2ded97745ab931b0bf12e431eff320ebc5382221ee49898cb8b3c295db8a92a12 SHA512 80a4d58b2b80468a3d451a4222a1ad202bf120c54785d46764a409fd73937018a657cb1984d404fa563825f7940cfc08bafd51ae2fd7c2daeeb86bbe67eba47e
 EBUILD postgis-3.1.2.ebuild 3273 BLAKE2B 45efcb2a012d52b70efecbacfd0a1f20736cc79544787a6c1375ce0b4ee430a2ded97745ab931b0bf12e431eff320ebc5382221ee49898cb8b3c295db8a92a12 SHA512 80a4d58b2b80468a3d451a4222a1ad202bf120c54785d46764a409fd73937018a657cb1984d404fa563825f7940cfc08bafd51ae2fd7c2daeeb86bbe67eba47e
+EBUILD postgis-3.1.3.ebuild 3273 BLAKE2B 45efcb2a012d52b70efecbacfd0a1f20736cc79544787a6c1375ce0b4ee430a2ded97745ab931b0bf12e431eff320ebc5382221ee49898cb8b3c295db8a92a12 SHA512 80a4d58b2b80468a3d451a4222a1ad202bf120c54785d46764a409fd73937018a657cb1984d404fa563825f7940cfc08bafd51ae2fd7c2daeeb86bbe67eba47e
 EBUILD postgis-9999.ebuild 3201 BLAKE2B 099dcddb6188239cd7738cb265e73e5b218265aec531e957b5db791149a5c8e3c3bd425b3a169fafdd451028ba29b21cdfa3031bad8f6b78958f1131ae2958b1 SHA512 0b343e8a7e6afdd0bc5d999a44f1f117eac7191360af83c535dd476408a4661aff61da697e0d48098e4e7403821402405a43e81ff2df5afa2d5163c2d0361e63
 MISC metadata.xml 682 BLAKE2B 8ba8b31f48ae367ebfca1e4f34337b806f965f97ec449480d3043cf21a5fa755e92ac1fe2ee914b22819d4fc5cc136bc7f51fea07d962e392eb450793936e0d4 SHA512 b22c968248f19308bc5d4bde3a725810e1d4f0cddfa836825099e7add32a758f7afebe89f73ae4c85f1033830a2e94bd5a0827f899896429ab3f4977f9baa486
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 000000000000..7661f499f162
--- /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} = *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}-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} = *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"
+
+	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"
+}
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 7ad7d19c9247..3e0e5787c709 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -26,5 +26,5 @@ EBUILD sqlite-3.35.1.ebuild 12993 BLAKE2B 1cf0e69091090563ed26fe2775f15565f00839
 EBUILD sqlite-3.35.2.ebuild 12993 BLAKE2B 1cf0e69091090563ed26fe2775f15565f008395df7faa1b0d13e970f7240aa9b371250f3ce318c97da956a611014b76d74aadd74beef7e3435d533d4ab7437e3 SHA512 62e893f13ea89fd7cf4f557554bee924dbac9dec449275fa7e89f369e2cef03a9599cb89197e2dc1116c469e5403615c39ee3d0c28aff3b85b59223f271c1d0a
 EBUILD sqlite-3.35.3.ebuild 12993 BLAKE2B 1cf0e69091090563ed26fe2775f15565f008395df7faa1b0d13e970f7240aa9b371250f3ce318c97da956a611014b76d74aadd74beef7e3435d533d4ab7437e3 SHA512 62e893f13ea89fd7cf4f557554bee924dbac9dec449275fa7e89f369e2cef03a9599cb89197e2dc1116c469e5403615c39ee3d0c28aff3b85b59223f271c1d0a
 EBUILD sqlite-3.35.4.ebuild 12993 BLAKE2B 1cf0e69091090563ed26fe2775f15565f008395df7faa1b0d13e970f7240aa9b371250f3ce318c97da956a611014b76d74aadd74beef7e3435d533d4ab7437e3 SHA512 62e893f13ea89fd7cf4f557554bee924dbac9dec449275fa7e89f369e2cef03a9599cb89197e2dc1116c469e5403615c39ee3d0c28aff3b85b59223f271c1d0a
-EBUILD sqlite-3.35.5.ebuild 12993 BLAKE2B 1cf0e69091090563ed26fe2775f15565f008395df7faa1b0d13e970f7240aa9b371250f3ce318c97da956a611014b76d74aadd74beef7e3435d533d4ab7437e3 SHA512 62e893f13ea89fd7cf4f557554bee924dbac9dec449275fa7e89f369e2cef03a9599cb89197e2dc1116c469e5403615c39ee3d0c28aff3b85b59223f271c1d0a
+EBUILD sqlite-3.35.5.ebuild 12987 BLAKE2B 9c689559b1c626eddd2826fc4246098733acecbc666d8ab480f2f1498e18275386e9ebbf563be52b69fdaf1d95bd41cc33dca533f9201fdf9027c2b079bdb5d1 SHA512 a7420a06f42000b72f4d61a161eace3c2771c43ab594405216dc7781ac4c0062bf2b664909769eb588d6ab20a105ea94e58b012fedd963274105a6f3e921410c
 MISC metadata.xml 743 BLAKE2B 4e2cdd6391c851ad8a705895fc9a5b5f8d77df3ae9cdd96310b1a72d5f4963d19427b8c97f5690f49262e91e9f321f6aafcdd5fee222eede0505810a803265cc SHA512 06315ac56dd1d0e738e3d1161b611c4db053de49e1a35e536b06b9ad7c0f9276b50c390ea6572802b58d49b84c7f1a3c8e63496d04d0f4b0d603bba804fb1757
diff --git a/dev-db/sqlite/sqlite-3.35.5.ebuild b/dev-db/sqlite/sqlite-3.35.5.ebuild
index c55b60d754d1..e7759136aa75 100644
--- a/dev-db/sqlite/sqlite-3.35.5.ebuild
+++ b/dev-db/sqlite/sqlite-3.35.5.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 if [[ "${PV}" == "9999" ]]; then
 	PROPERTIES="live"