gentoo resync : 18.11.2018

3 files changed, 2 insertions, 65 deletions

diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index c0fd449c4079..247289a3efb7 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,6 +1,4 @@
 AUX 3.4.2-solaris-isnan.patch 575 BLAKE2B 34e2fddd46e4e503630d0c44c03ee72ceb8bb19af31075ae209d0198b5db0839a633cbb7c855035bf8964d860174c56288579a4bd50e322d728ea4704d312108 SHA512 efa2730f178814e8d98318347e7a8313327679a5c861ef2a844ce821c5854f4dd56e0cc2c52fa5866fb4214b0d9aa8614b1f1ebaa62f0427e69221a93106aa45
-DIST geos-3.6.2.tar.bz2 2030705 BLAKE2B f23cf1fc080fb7b353fb6292900d84811ace04a5364200bfea19f79d7b09a795d36e30cd6e4dbb7acd8417245bc2ce644298dc1b4140ef70495e4f7d71fc522b SHA512 515d8700b8a28282678e481faee355e3a43d7b70160472a63335b8d7225d9ba10437be782378f18f31a15288118126d411a2d862f01ce35d27c96f6bc0a73016
 DIST geos-3.7.0.tar.bz2 2028814 BLAKE2B 17385d9be831d4812391a30627e13989d3ca099ca9b0a719a92cdb2503dadff3693d4b3d320652764185db05782b33760ca14d155365d87167bb4ef6d6c2463c SHA512 fcca5e503efa32bb388376b2a06b9ca5c74fbcddba750cce6b3b4109eb2eb122058aead12b9462cdd881f425cd75d7241645ab344f25ce022bc0659954560742
-EBUILD geos-3.6.2.ebuild 1342 BLAKE2B 2cdc55473a3c7e2f4cf45b77de88e3e359598e1b9a7f6ee33d221474853ad191c61692ed84b1648204fe71b4e8c3fec70710725a1f30f4c81c89c3607db6e51a SHA512 91f4a1f15927b151e2d7811410dfa3cf4ccee0a667751eb05f6ebdcaa12b2a8c38e0c6ce08018f22da7bb7220ac77846a5975d4dd439c230eb326718a03ea6ba
-EBUILD geos-3.7.0.ebuild 1340 BLAKE2B 1aabe23b1bea2f7800b909c76c5bab28d94fe580d2df0ee48fb484ef328a92064df1a94c403de778414e64b620cb17f12155f7af74550a4a264d2b08fbd7bbf9 SHA512 2be4b6ab790c8cfddb5559924d9985c31bffdd6ee695433d0bd04ffdb7b854e810529a2a398f4114ef1b71430e1dc4086f2727cd988e7b3d152c58d548f0fcf7
+EBUILD geos-3.7.0.ebuild 1339 BLAKE2B 34db98d731c945204bc323681df3929c430e62f257edeaf99dd30ece466d50ab0b688efd9f852fe87cf105dcef916beafc0422af34a8993443284da2a8497e40 SHA512 907a02c6d3884f8fbf3e49a04eca0c98b4a1c719d6088cd86e3b6ea7b9fb3fc5d0962f459f545fbce81db5a6a45048480aafa7871df6fc8600ecdf9b7dff0d67
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.6.2.ebuild b/sci-libs/geos/geos-3.6.2.ebuild
deleted file mode 100644
index a53255ec4230..000000000000
--- a/sci-libs/geos/geos-3.6.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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.7.0.ebuild b/sci-libs/geos/geos-3.7.0.ebuild
index 8d66cd012ccd..f0f47c27e064 100644
--- a/sci-libs/geos/geos-3.7.0.ebuild
+++ b/sci-libs/geos/geos-3.7.0.ebuild
@@ -13,7 +13,7 @@ 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"
+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} )"