gentoo resync : 15.01.2020

3 files changed, 10 insertions, 83 deletions

diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 94eea2bdc417..25b8d01d3a51 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,8 +1,6 @@
 AUX 3.4.2-solaris-isnan.patch 575 BLAKE2B 34e2fddd46e4e503630d0c44c03ee72ceb8bb19af31075ae209d0198b5db0839a633cbb7c855035bf8964d860174c56288579a4bd50e322d728ea4704d312108 SHA512 efa2730f178814e8d98318347e7a8313327679a5c861ef2a844ce821c5854f4dd56e0cc2c52fa5866fb4214b0d9aa8614b1f1ebaa62f0427e69221a93106aa45
-DIST geos-3.7.0.tar.bz2 2028814 BLAKE2B 17385d9be831d4812391a30627e13989d3ca099ca9b0a719a92cdb2503dadff3693d4b3d320652764185db05782b33760ca14d155365d87167bb4ef6d6c2463c SHA512 fcca5e503efa32bb388376b2a06b9ca5c74fbcddba750cce6b3b4109eb2eb122058aead12b9462cdd881f425cd75d7241645ab344f25ce022bc0659954560742
 DIST geos-3.7.2.tar.bz2 2071465 BLAKE2B ba968488aa5d845e582d3771d8d2b1f67b0f301e73fad5834a0805a912c8f3b1200bba93d8758f43539ce269758de348d999db3db9738e7abf5c1a443f388d8c SHA512 ff0fde2e21ed9d2770c139aa50c6efd22d9cff3c6bfd8f1ef86b064efd1ad318b08dec66e34661bc1c7a341b0837978853494f27d63988be865a8ee4f7611d38
 DIST geos-3.8.0.tar.bz2 2399403 BLAKE2B 0f9b6d7f9a4052b9b84e77d534be6e2909e5dc4995287f34e3b7e7c1537c9a73088d4a49f96f43034723eb37c88674aae469e26d7db3eb40efbcdf5551553a1a SHA512 c89b25b42092152ef261090f25ff64b229f30f67d42fdf44c2871e78b66bb2c42e23b9ae21f9aea0e48823bdb0267d609ab2ee77d310abcb76fa672c6614d8f1
-EBUILD geos-3.7.0.ebuild 1338 BLAKE2B 7ebfca396ca09ebe266c59c901ad7f931076a5bef9b7574167d35b0123297205504cdfe7b11ad3a44729483ab57a14bfce6a17f66c9a4391c06b8fcf4c1071d4 SHA512 fe01f7c023c67401396ba760266b62ebba2388e42a7aae08a188fb7ec4726d9c6390f8768511fbd28ad6374a8f47a5de55a530c025d01e43a43082f7ea3a0021
 EBUILD geos-3.7.2.ebuild 1338 BLAKE2B 7ebfca396ca09ebe266c59c901ad7f931076a5bef9b7574167d35b0123297205504cdfe7b11ad3a44729483ab57a14bfce6a17f66c9a4391c06b8fcf4c1071d4 SHA512 fe01f7c023c67401396ba760266b62ebba2388e42a7aae08a188fb7ec4726d9c6390f8768511fbd28ad6374a8f47a5de55a530c025d01e43a43082f7ea3a0021
-EBUILD geos-3.8.0.ebuild 1346 BLAKE2B e68219f57a210aa0f2ae633740360a75b88e302715deaec1af24446c540e9e3fb24812985118f73e2fb34e404c1bea7f7f91203df6c87d62b7e9165bcc85da06 SHA512 173bf18fd49919a49a9459a43ab598a68ca84cf3db8d0b299d72bd9e1e3de3ce6e9d3adb15fab5ab5b63d58bc29920b20a8dafb23b22a26d011d1c96fb62f240
+EBUILD geos-3.8.0-r1.ebuild 1063 BLAKE2B 19625edaabcff38f910f4dcd8bdb526c1a452d4206d47aff3d822f1c1bfb680aff32ddfb610340ebd5dc8d319ceee7b42121fb2bac661ed07ecdca54549749d3 SHA512 73e3eaf6b0cea2a7977ec37bf4e4b602a31d11fa7a4bf35938e57a606076b1561ad7873a8f16d9d4ed85f0813f1799fbf6cd028240e6c8748b3c9dc7bc5a180f
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.7.0.ebuild b/sci-libs/geos/geos-3.7.0.ebuild
deleted file mode 100644
index 4c8405e7855f..000000000000
--- a/sci-libs/geos/geos-3.7.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="http://trac.osgeo.org/geos/"
-SRC_URI="http://download.osgeo.org/geos/${P}.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 python ruby static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby:* )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig:0 )
-	ruby? ( dev-lang/swig:0 )
-"
-
-PATCHES=( "${FILESDIR}"/3.4.2-solaris-isnan.patch )
-
-RESTRICT="test"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	echo "#!${EPREFIX}/bin/bash" > py-compile
-}
-
-src_configure() {
-	econf \
-		$(use_enable python) \
-		$(use_enable ruby) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	use doc && emake -C "${S}/doc" doxygen-html
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/doxygen_docs/html/. )
-	default
-	use python && python_optimize "${D}$(python_get_sitedir)"/geos/
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/geos/geos-3.8.0.ebuild b/sci-libs/geos/geos-3.8.0-r1.ebuild
index 3ad295e1f4be..9e41eddd122e 100644
--- a/sci-libs/geos/geos-3.8.0.ebuild
+++ b/sci-libs/geos/geos-3.8.0-r1.ebuild
@@ -1,14 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
+EAPI=7
 
 MY_PV=${PV/_/}
-S=${WORKDIR}/${PN}-${MY_PV}
 
 DESCRIPTION="Geometry engine library for Geographic Information Systems"
 HOMEPAGE="http://trac.osgeo.org/geos/"
@@ -18,23 +13,19 @@ 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 python ruby static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby:* )
-"
-DEPEND="${RDEPEND}
+BDEPEND="
 	doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig:0 )
 	ruby? ( dev-lang/swig:0 )
 "
+RDEPEND="
+	ruby? ( dev-lang/ruby:* )
+"
+DEPEND="${RDEPEND}"
 
 RESTRICT="test"
 
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
+S="${WORKDIR}"/${PN}-${MY_PV}
 
 src_prepare() {
 	default
@@ -43,20 +34,19 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable python) \
+		--disable-python \
 		$(use_enable ruby) \
 		$(use_enable static-libs static)
 }
 
 src_compile() {
 	default
-	use doc && emake -C "${S}/doc" doxygen-html
+	use doc && emake -C doc doxygen-html
 }
 
 src_install() {
 	use doc && HTML_DOCS=( doc/doxygen_docs/html/. )
 	default
-	use python && python_optimize "${D}$(python_get_sitedir)"/geos/
 
 	find "${D}" -name '*.la' -delete || die
 }