gentoo resync : 03.03.2021

3 files changed, 44 insertions, 2 deletions

diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 5b973fb67b8d..97622eb0edb3 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,5 +1,7 @@
 DIST geos-3.8.1.tar.bz2 2505407 BLAKE2B 43053ea9e29d190f41c37d5d382b689ef477e0256cfd5705f4f2f316cac21a1674660bcf0900c51db72909c41d46be7a41d297958de48e108ae6d6bd1ca9d247 SHA512 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
 DIST geos-3.9.0-r1.tar.bz2 4710957 BLAKE2B dab0f4e0bfb1bd244c2faf5ee6149b65d142eea78e87490025f90b672eee0d25d4ba9bc4c3b223e78ea0c9d34625b4750c7ba03852e5ea9540ad5c479d84b995 SHA512 1081f2aa20e671450953f7bb53b17c703804a1c9f4987c9da0987ff24339af5811b2c8b79c8e438d04ca38e4d06164dc5a4206f266f7efc19af3f9d9ea8f71f8
+DIST geos-3.9.1-r1.tar.bz2 4761372 BLAKE2B af1597d9372b18a2f280d82941949518cd8edb9296e9647aa3949c9e10fdd1b6ef500298471ec469d711ab0569eabd8fc3fb0a8f7e9bd48f91150cfdcaea65a8 SHA512 7ea131685cd110ec5e0cb7c214b52b75397371e75f011e1410b6770b6a48ca492a02337d86a7be35c852ef94604fe9d6f49634c79d4946df611aaa4f5cbaee28
 EBUILD geos-3.8.1.ebuild 1102 BLAKE2B 6b6a901ab393f6501c8ecbd6195e57c76bf7165b79d892049535212d16d3961a1abf82154e897a7172768551a44396e33cc95ec500949863024ffb06185bada0 SHA512 deb6a39dc4cdf5529243b89be65fdaba5cd85905860575cab33202d9c52e511b677e0e72c280867939cd081d4a6787959def3798689913ef15afc988774641fe
-EBUILD geos-3.9.0-r2.ebuild 1079 BLAKE2B 4342a48c7009b291e3f57be9869e753b5fa8e1eee85937ddffd21341c1fab398e71b30e2a142ac5cedc7867e105fb7e620263737d6ebbd9cb5e509d8e275e4f3 SHA512 26881b455e21855cb5985f1c5bd66669b468fac53ad861a63cb9096d5dde0e6bbe6cbf0e37341342d2338994dfa6655675ae190ba93fdf938ffcdea39a42d20a
+EBUILD geos-3.9.0-r2.ebuild 1074 BLAKE2B ac3bcf9766564e0b2a9fd45bd0a8ececbd00a6067ab2a3ecc67c8d37af427f41c299d423bcf71ddb4697196cc61870be4659343067794411b33a164afdf73ea7 SHA512 0bdd9ba61a2b9e22199f59ebc15b8506b676d5cf967c34d794796c9331842b5e05461791e5caa13b7ed4f42e6dd4af4c72ff219ce2aa5f805f6c9926b68db8fc
+EBUILD geos-3.9.1.ebuild 1079 BLAKE2B 4342a48c7009b291e3f57be9869e753b5fa8e1eee85937ddffd21341c1fab398e71b30e2a142ac5cedc7867e105fb7e620263737d6ebbd9cb5e509d8e275e4f3 SHA512 26881b455e21855cb5985f1c5bd66669b468fac53ad861a63cb9096d5dde0e6bbe6cbf0e37341342d2338994dfa6655675ae190ba93fdf938ffcdea39a42d20a
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.9.0-r2.ebuild b/sci-libs/geos/geos-3.9.0-r2.ebuild
index 69116e672afc..b08ecee5c7de 100644
--- a/sci-libs/geos/geos-3.9.0-r2.ebuild
+++ b/sci-libs/geos/geos-3.9.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.osgeo.org/geos/${PN}-${PV}.tar.bz2 -> ${PN}-${PV}-r1.t
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc static-libs"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sci-libs/geos/geos-3.9.1.ebuild b/sci-libs/geos/geos-3.9.1.ebuild
new file mode 100644
index 000000000000..69116e672afc
--- /dev/null
+++ b/sci-libs/geos/geos-3.9.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Geometry engine library for Geographic Information Systems"
+HOMEPAGE="https://trac.osgeo.org/geos/"
+
+# Arrow can be removed at next version bump. Upstream mistakenly
+# released rc1 as 3.9.0. So, we need(ed) a new Manifest entry to get the
+# real 3.9.0
+SRC_URI="https://download.osgeo.org/geos/${PN}-${PV}.tar.bz2 -> ${PN}-${PV}-r1.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="doc static-libs"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+RESTRICT="test"
+
+src_configure() {
+	local myeconfargs=(	$(use_enable static-libs static) )
+	use arm && myeconfargs+=( --disable-inline ) # bug 709368
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use doc && emake -C doc doxygen-html
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/doxygen_docs/html/. )
+	default
+
+	find "${D}" -name '*.la' -type f -delete || die
+}