gentoo resync : 14.05.2020

3 files changed, 2 insertions, 60 deletions

diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index df94026cb65a..8b53b73baefd 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,5 +1,3 @@
-DIST geos-3.8.0.tar.bz2 2399403 BLAKE2B 0f9b6d7f9a4052b9b84e77d534be6e2909e5dc4995287f34e3b7e7c1537c9a73088d4a49f96f43034723eb37c88674aae469e26d7db3eb40efbcdf5551553a1a SHA512 c89b25b42092152ef261090f25ff64b229f30f67d42fdf44c2871e78b66bb2c42e23b9ae21f9aea0e48823bdb0267d609ab2ee77d310abcb76fa672c6614d8f1
 DIST geos-3.8.1.tar.bz2 2505407 BLAKE2B 43053ea9e29d190f41c37d5d382b689ef477e0256cfd5705f4f2f316cac21a1674660bcf0900c51db72909c41d46be7a41d297958de48e108ae6d6bd1ca9d247 SHA512 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
-EBUILD geos-3.8.0-r1.ebuild 1148 BLAKE2B 8fb0f023e255cb3cd5c90dc9f26f6ed1589c8d73c5cfb73cb7aa579fac03d7bac0951565ac13764ced5bc3e915af341007e44b56ee5f3689640058c616ac05b4 SHA512 ebbc36bb4a71b7612534ac6d6fa557d6fc413c50ac243deaf02f328f859bafafec50ae475388eabc10bc49ab1ea22e6300f826296f83234b1b47382ec1543bfa
-EBUILD geos-3.8.1.ebuild 1118 BLAKE2B 49c05deb35d5b4d56132375bc673e24937f3e596f052b3e6018a09df8311673f33a622df02907d0732e3de6d53b5f0b810a4c79214307bb3428c922b47feb47c SHA512 01f5f170b96f0ebd506bbac22edb64ab1f3b3c88bddc65a03a0634e88ff8d12a6f02a5d7f5c2619968beba26049a09729e642f7d1a391ba559eda90333af26cd
+EBUILD geos-3.8.1.ebuild 1112 BLAKE2B afa7d180906c86844c2b0f7a9b7305b30b32b91fef8f691449830e720a3547018440e323918e2453c8f138e7b2390246f97c83ba999a4cb6c5afa353ed2ae57a SHA512 78a60b83eed54e0882b2b168a85558c3fe6b24e208b8f6a70c9971f9e9015ad108ec6d591e898ae058e320478d702edecda44e9ed0c6f4ae14b76b2900f87278
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.8.0-r1.ebuild b/sci-libs/geos/geos-3.8.0-r1.ebuild
deleted file mode 100644
index 53a956cfd2d4..000000000000
--- a/sci-libs/geos/geos-3.8.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="http://trac.osgeo.org/geos/"
-SRC_URI="http://download.osgeo.org/geos/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc ruby static-libs"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	ruby? ( dev-lang/swig:0 )
-"
-RDEPEND="
-	ruby? ( dev-lang/ruby:* )
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_prepare() {
-	default
-	echo "#!${EPREFIX}/bin/bash" > py-compile
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-python
-		$(use_enable ruby)
-		$(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 && HTML_DOCS=( doc/doxygen_docs/html/. )
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/geos/geos-3.8.1.ebuild b/sci-libs/geos/geos-3.8.1.ebuild
index f19227d4b289..d8be59bbb02f 100644
--- a/sci-libs/geos/geos-3.8.1.ebuild
+++ b/sci-libs/geos/geos-3.8.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://download.osgeo.org/geos/${PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc ruby static-libs"
 
 BDEPEND="