gentoo Easter resync : 12.04.2020

4 files changed, 2 insertions, 82 deletions

diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest
index 6983fc2162c0..787e286ded17 100644
--- a/sci-libs/shapelib/Manifest
+++ b/sci-libs/shapelib/Manifest
@@ -1,7 +1,3 @@
-DIST shapelib-1.4.0.tar.gz 548990 BLAKE2B 0e75481d35f8dc5687eee23696d46a780d4b185a81ca1246e5c19f01e58f4a55dc7b69347c9effa01ac1786c5271dfe3907798cc81fe9314979c502bcb9d982d SHA512 206b81fe859a837e821e449ab1b2dbd5a3aa7abd1871da4aec69e130b6fad6300697429884ce359c90e4b76bca90e2108f32b9fdbd3b92013fa5a39f3bedeeb1
-DIST shapelib-1.4.1.tar.gz 549831 BLAKE2B e579704bd71c2525133f87628261e78f39e8063cd7e8a57997e90a8ca4a6ebb5de3a4d1ab8da5d00afe1363d9eb22e8c7a9a66ac109c300b72b6d26bd87b61fd SHA512 791c1a0d6c5ff09341176f68349ebd760ae91e8749a9f844299d7ac38a42c4f1131e63479c384a8a8b05a89e90d02e9fd92c526cab417eb80b171d639b4a4422
 DIST shapelib-1.5.0.tar.gz 547686 BLAKE2B 3f962ee701d8cfb86a56aa1c0b2156bc2288a2bc908bb1a8303e491812845241f5281b0b8650befcc53e9dfc408b652a56f5e2fdc5ac7c2ff6eb99170696e437 SHA512 6dbd5fc7929ca403e65017ef58211f351608d9ad08221bf68bde047ceecfd27013ce731f9ae4edcfd040bc3db7fe9054b5d96e46128d2968788bef19532b1721
-EBUILD shapelib-1.4.0-r1.ebuild 734 BLAKE2B 01ef8f8b68ef976f4dc0fe32e948af09cb2c0fe8696566aaf21707d13f2ed1d9a726c67f124b8efb6ead679737c7a5e5d08fa06a1765ab15269bf4e9416cd700 SHA512 9855cd8eae880e70691c10cf7fc253dae7720118930a3ff3a8884e6f89ce55a35ac58b023de0883d321cd130f392d11359e5f82beb680c497e83bc239777d2b3
-EBUILD shapelib-1.4.1.ebuild 739 BLAKE2B 54d057ca4143ffa67a6911a9ff755b9cb716b6e01ad93f34e04500da4f7d314f2c96f2f0a457248d3f38c5bdb668511c0c2511156f4275bde13ca0a3da7a3bf4 SHA512 b7692107c187098ec350e8591aa744681819dd603145f491ce3a11d1060a792d23a72e05f69a4d5b040c06514a8354d158137e18c95bd0e56d7cc89dfc92ef86
-EBUILD shapelib-1.5.0.ebuild 731 BLAKE2B 11eddcc77943b51e50691d4a11f62131cf6bed0907c83a09ff4268d51b2bba4f0ebbbf481511c24ed32d543370cb516b96b756023aca9500f947514276b23324 SHA512 d44767c4ab7c745d4cce9e4f5a48518d412ed422e57c28d2efe82a4c79131059af5f6c44bb47516c6f6590771b457d0ca92d16527b72a4080f13a5b090640048
+EBUILD shapelib-1.5.0.ebuild 730 BLAKE2B 93cc8317306991cd5306eedb1e297f76982bf9c37e32a7513a4d9b03ada9249edf3d8730b1ec7e6525cc6121317baa9f1ea02f0c080391234e8e358d4dc5b7e2 SHA512 f986dcef8a808a318e20258a10ff55fb0fe5cce8dcb5d5162796bfb89570b9b294770a27d45a1e76abcb3bce5163264947b986c0f1760488c140a1b4ae3f8cdc
 MISC metadata.xml 405 BLAKE2B ed97fadfd57934dab768c271f100531eb2f5c9e98564b54d73c2396d0959c62b39ee7ce5ad96495f1133cf8c3de8ad2ffcb0d13353c1a32c9be92ad81bd80995 SHA512 9581a1f8123cdcc6b68de0fdc03dfa866c64668222f1d90b55160cdaf8d36e1441f0530fced6b149681fef88321bf33879996199685eb6e26cefae975b704adb
diff --git a/sci-libs/shapelib/shapelib-1.4.0-r1.ebuild b/sci-libs/shapelib/shapelib-1.4.0-r1.ebuild
deleted file mode 100644
index becf6ab986ba..000000000000
--- a/sci-libs/shapelib/shapelib-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Library for manipulating ESRI Shapefiles"
-HOMEPAGE="http://shapelib.maptools.org/"
-SRC_URI="http://download.osgeo.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/2"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-RDEPEND="sci-libs/proj:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	rm -r m4/* || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--includedir=/usr/include/libshp
-}
-
-src_install() {
-	use doc && HTML_DOCS=( web/. )
-	default
-
-	if ! use static-libs; then
-		find "${D}" \( -name '*.la' -o -name '*.a' \) -delete || die
-	fi
-}
diff --git a/sci-libs/shapelib/shapelib-1.4.1.ebuild b/sci-libs/shapelib/shapelib-1.4.1.ebuild
deleted file mode 100644
index 2cdd74bbd191..000000000000
--- a/sci-libs/shapelib/shapelib-1.4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Library for manipulating ESRI Shapefiles"
-HOMEPAGE="http://shapelib.maptools.org/"
-SRC_URI="http://download.osgeo.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-RDEPEND="sci-libs/proj:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	rm -r m4/* || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--includedir=/usr/include/libshp
-}
-
-src_install() {
-	use doc && HTML_DOCS=( web/. )
-	default
-
-	if ! use static-libs; then
-		find "${D}" \( -name '*.la' -o -name '*.a' \) -delete || die
-	fi
-}
diff --git a/sci-libs/shapelib/shapelib-1.5.0.ebuild b/sci-libs/shapelib/shapelib-1.5.0.ebuild
index 1d5eefa7869f..bb0e872ae7d7 100644
--- a/sci-libs/shapelib/shapelib-1.5.0.ebuild
+++ b/sci-libs/shapelib/shapelib-1.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.osgeo.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 src_prepare() {