gentoo resync : 25.08.2020

4 files changed, 2 insertions, 102 deletions

diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 2b4f034efa61..3c13249fa7c1 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,11 +1,5 @@
-DIST proj-6.2.1.tar.gz 2698759 BLAKE2B 69867c05ef727df63351bbb8bc787d039c6a333a6e28b5fbbd1814fd9ca3ec279dd58ee7f0f79c3601ced270b6fa38619120e58f4407c49890a74996bbf88da5 SHA512 1e8632a9c6fa00c0354473f60d81e4644f173b42f6613856ba03e2404f429864fd5052aacba945ccd265173397bed2abdbe325320b54bc7b1c4a75ad95395a89
-DIST proj-6.3.0.tar.gz 2758388 BLAKE2B 33f9d6ce6aa885667b7c1337abd218ee802581320880288f948378073d04c46118927147794ce6c97616c906c683c33bf10984d08463faea214ffbe80b12d62b SHA512 679fd2e57f27feeb956d2a8843cb9028895a78f0dac104c920cc9060afade434b953fb381fed350e5c8ac15cd796f795220e0f1ad276a4f7482d6e7f5681d06e
 DIST proj-7.0.1.tar.gz 5312488 BLAKE2B 421a3b5324ab7c952a8b45036e6db2c8cfc1fd2db3d050d2e644cb1c1c78fe669a20c6d8428debf75233a975a989e3ad2ce6a83cd944825641ffd3107cc44a02 SHA512 034d1b916980c80fe9f8e67d2897814e611920af3e852f152fcd9e3fc4ec8cbc39bbd8f8296949a3c3f5e6708bb9d84e61c4cba9c01476a3888448135e97dc33
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
-DIST proj-datumgrid-europe-1.4.tar.gz 26115747 BLAKE2B 3dfb5c19362f9d9cdfc4ee5469e536b97d963a5ac3bcf6652ef5935ec393f4035bc15abc444d62cfa477478faabd66a8effe64dbb8eb26b7d73a717b4eae2e53 SHA512 4043c0791af086541a3e08f7ad667b25968ed25e6595c1f047e1272f52838d28ab4010a076f9524882f97d7aa9104769c0b9cdf17394915c5b70b0dc13e019ee
-DIST proj-datumgrid-europe-1.5.tar.gz 187195036 BLAKE2B 0f88922435793930e21ace8488e0d1cd6a6325880f90d61a91d1592e51191514db7fc93e08c4a6c51699e3eb43762786d11eea425c181a8d3f73ec5ad7848092 SHA512 456a8c27dad7ef8fc1790ef822e7e8dcbc69b79e0a28df8c6b58d24b0ef4a3221cebd8e911a0d84b7f00694247b0fb8f4361a38d7369f921da000c838812f389
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
-EBUILD proj-6.2.1.ebuild 1118 BLAKE2B efc31b3a18898c9fbf064d556a51b660bfabb2db0d08352d01367a2f1c88376d993dfeeee67556d5d65b57e22997e150a9ab80b90d497bf7d2a65487ea8b1108 SHA512 88101056c9660c8c088fc05592fbcb7c258c837aaad55971f4d7939c1ae79b51bb5069b963b8c6cfbedbfb4a54a0b9ce7324c6b056a8f4883e01e273b5bddde4
-EBUILD proj-6.3.0.ebuild 1123 BLAKE2B 27a3e1372aa2c62063b16caf2d9479d8d67092f9a6e3a0f7a1a3f7f2b52bb08694a358567d36fb96c8c4a5e1fca3ef24f8eded6834f3a0f9c787bb8ba3d204f1 SHA512 7f4a6c73f17a96e95848a81be7c3821deae554719db75ae02649b2430bb5b3e73b1c27e80cf66841820c59de825a9caed11d39c707c29d988641554db7787872
-EBUILD proj-7.0.1.ebuild 1224 BLAKE2B a34b37a7e721cf1711f294ff91ed351d727d0325fc6f3aa348f16196700ca423ed34a4d8c762278f4918b41d1b1d412d1bfc6e509ff7941ec91a5316ece3cb80 SHA512 665874582615997300f6b28312149b922ecbdbd3cac6ee9cffb8d878b231e303578c637c206d7bfdf1cdc732f4f7599f51424940bb2896d63759b3dd6e6f965d
+EBUILD proj-7.0.1.ebuild 1219 BLAKE2B 8852ed09c9a0b6ed39693f322d57fb1e447a0640af80b90831eb4c837913e345f1b4e69064f1d7409ece14794c7bb4b389a5555ca08327efcc9c6368bc854f67 SHA512 c0c17b2dc10b480e7cebad6a059e18ccb53a7bca93b68bdfec7737cb0ae20d66712a50bfb347fb1ea8b19c2d696b6bce93298fbf7f1336d70ab2938a3c553b5d
 MISC metadata.xml 513 BLAKE2B 4068b4ddcb4e95578df8da19650ab86b4dbfdba294a3d03f10ada37a578a2113b0d71720545c269b1c097d3a37dbc66ee0cdfe61889466171c109413088707fd SHA512 e841ea4fb30d3632fecca7d584121fce35dff2b23ad8a1feeb98a47f0a3b1d78f57a05b0d303aeff47f981f5b7feb831deb14644ab6615644c0a8593a6e321b3
diff --git a/sci-libs/proj/proj-6.2.1.ebuild b/sci-libs/proj/proj-6.2.1.ebuild
deleted file mode 100644
index a249436269b5..000000000000
--- a/sci-libs/proj/proj-6.2.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
-EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.4.tar.gz"
-
-DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj4.org/"
-SRC_URI="
-	https://download.osgeo.org/proj/${P}.tar.gz
-	https://download.osgeo.org/proj/${DATUMGRID}
-	europe? ( https://download.osgeo.org/proj/${EUROPE_DATUMGRID} )
-"
-
-LICENSE="MIT"
-SLOT="0/15"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="europe static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( !europe )"
-
-RDEPEND="dev-db/sqlite:3"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"/data || die
-	mv README README.DATA || die
-	unpack ${DATUMGRID}
-	use europe && unpack ${EUROPE_DATUMGRID}
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--without-jni
-}
-
-src_install() {
-	default
-	cd data || die
-	dodoc README.{DATA,DATUMGRID}
-	use europe && dodoc README.EUROPE
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/proj/proj-6.3.0.ebuild b/sci-libs/proj/proj-6.3.0.ebuild
deleted file mode 100644
index f8a951b32218..000000000000
--- a/sci-libs/proj/proj-6.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
-EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.5.tar.gz"
-
-DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj4.org/"
-SRC_URI="
-	https://download.osgeo.org/proj/${P}.tar.gz
-	https://download.osgeo.org/proj/${DATUMGRID}
-	europe? ( https://download.osgeo.org/proj/${EUROPE_DATUMGRID} )
-"
-
-LICENSE="MIT"
-SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="europe static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( !europe )"
-
-RDEPEND="dev-db/sqlite:3"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"/data || die
-	mv README README.DATA || die
-	unpack ${DATUMGRID}
-	use europe && unpack ${EUROPE_DATUMGRID}
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--without-jni
-}
-
-src_install() {
-	default
-	cd data || die
-	dodoc README.{DATA,DATUMGRID}
-	use europe && dodoc README.EUROPE
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/proj/proj-7.0.1.ebuild b/sci-libs/proj/proj-7.0.1.ebuild
index 5a90105f20d9..5d236f000813 100644
--- a/sci-libs/proj/proj-7.0.1.ebuild
+++ b/sci-libs/proj/proj-7.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/19"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="curl europe static-libs test +tiff"
 REQUIRED_USE="test? ( !europe )"