gentoo Easter resync : 12.04.2020

3 files changed, 3 insertions, 55 deletions

diff --git a/dev-db/spatialite/Manifest b/dev-db/spatialite/Manifest
index 81d4f46f521d..ec718e02c98a 100644
--- a/dev-db/spatialite/Manifest
+++ b/dev-db/spatialite/Manifest
@@ -1,5 +1,3 @@
-DIST libspatialite-4.3.0.tar.gz 4439538 BLAKE2B f3bbda3b9d6099197691eb85e20c693d5cbc3a8958c8f23bd1ba57add9d8676895163d845a4aadd690650244ffa7ae2a02ce86e844e032b815fe4c94f30fb4b8 SHA512 b686766ed90711a41efbf219a8942ead8aefda8784a9cabc59233f107e0e10eda949d022152af1064a169975aa6a47515f6064589166418b853427dde5779ecc
 DIST libspatialite-4.3.0a.tar.gz 4440660 BLAKE2B 2eb2afb96b096b86be9c30cf71663b7b2839d345b6c418fc8511653ed59d0aeff1756b6b19807140c67128c938e39be66d13088640658d14883c92c438c97251 SHA512 adfd63e8dde0f370b07e4e7bb557647d2bfb5549205b60bdcaaca69ff81298a3d885e7c1ca515ef56dd0aca152ae940df8b5dbcb65bb61ae0a9337499895c3c0
-EBUILD spatialite-4.3.0-r1.ebuild 1087 BLAKE2B fa255b48b12ce9f52fee369e08ff14e5d178de0692506165128e357fe8544d5296dbb88e4288142bf755616a475ceb2bc6f3e040e916698ef1a031b0023ed38a SHA512 70cc5be58b571bfa42295b080ff789b0a223422ede1af0e5652d7c02e98c7f5d860b1e4f9a23f28ec01063952541143b42dbd5aa9ef4a7eeccb924ce9228e44e
-EBUILD spatialite-4.3.0a.ebuild 1235 BLAKE2B ac9586a36cf87717194c777373b988e534b41c6c0e1ec6dac4c83ab3388219495ed41381972ac2dc705cec7a5eb0d57a1dcca2089dafae91c0ee46588de5ebc4 SHA512 52780f2e597b73f3c2098b1476223699bcd81d292378df3c9ac2ea96902cec3603c8790db54eeb52842b0ceb4132a667d842b47d72e264d51de4560d3fa0a92b
+EBUILD spatialite-4.3.0a.ebuild 1234 BLAKE2B 13526ec828adbe85fb5e53e0b9e48142c8d26d48ef78b6d070e149da0ee86cc3d4b5cd6b8338377f1ea207d609e33f860b3550650957f22f6bcc2e12fd0f24f2 SHA512 4ed7d7af559d2a779aae76f7bf5a3f91717376ff694eb6b3de6bdeaf7d5414fca5129cec39bd5fdef3673e26129c19ef40db413eb8ee1862618ab3e4e8888de8
 MISC metadata.xml 559 BLAKE2B b128c4425723bb652063fd3ebebcd83de75a44c7a01e5a8b6c6596cad0bcd1a5f86977f4e3b49d2f1945ea83f12f9761ba712d5f1d919338996c7ddf18bc4a66 SHA512 a21438d83d828b52e4fc16f91edd29e6ace87ada9b697cf233b847a6d3a9f5196135769993873f23409f98548bf852a4e89645c2b0eaf57bd8427ff6dcc36111
diff --git a/dev-db/spatialite/spatialite-4.3.0-r1.ebuild b/dev-db/spatialite/spatialite-4.3.0-r1.ebuild
deleted file mode 100644
index fc885a9624fa..000000000000
--- a/dev-db/spatialite/spatialite-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="lib${PN}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A complete Spatial DBMS in a nutshell built upon sqlite"
-HOMEPAGE="https://www.gaia-gis.it/gaia-sins/"
-SRC_URI="https://www.gaia-gis.it/gaia-sins/${MY_PN}-sources/${MY_P}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="+geos iconv +proj test +xls +xml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-db/sqlite-3.7.5:3[extensions(+)]
-	sys-libs/zlib
-	geos? ( >=sci-libs/geos-3.4 )
-	proj? ( sci-libs/proj )
-	xls? ( dev-libs/freexl )
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="test? ( iconv )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf \
-		--disable-examples \
-		--disable-static \
-		--enable-epsg \
-		--enable-geocallbacks \
-		$(use_enable geos) \
-		$(use_enable geos geosadvanced) \
-		$(use_enable iconv) \
-		$(use_enable proj) \
-		$(use_enable xls freexl) \
-		$(use_enable xml libxml2)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-db/spatialite/spatialite-4.3.0a.ebuild b/dev-db/spatialite/spatialite-4.3.0a.ebuild
index ccd7a6e07707..e745b55a7969 100644
--- a/dev-db/spatialite/spatialite-4.3.0a.ebuild
+++ b/dev-db/spatialite/spatialite-4.3.0a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://www.gaia-gis.it/gaia-sins/${MY_PN}-sources/${MY_P}.tar.gz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="+geos iconv +proj test +xls +xml"
 RESTRICT="!test? ( test )"