gentoo resync : 03.03.2021

4 files changed, 30 insertions, 67 deletions

diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 825a280982e1..49517aa5637b 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,9 +1,7 @@
-DIST proj-7.0.1.tar.gz 5312488 BLAKE2B 421a3b5324ab7c952a8b45036e6db2c8cfc1fd2db3d050d2e644cb1c1c78fe669a20c6d8428debf75233a975a989e3ad2ce6a83cd944825641ffd3107cc44a02 SHA512 034d1b916980c80fe9f8e67d2897814e611920af3e852f152fcd9e3fc4ec8cbc39bbd8f8296949a3c3f5e6708bb9d84e61c4cba9c01476a3888448135e97dc33
-DIST proj-7.1.1.tar.gz 5509592 BLAKE2B f745df3ef276b8a3213aff5ed92890f9c8f4b82a61a1e55fd013925befb018f01d7e60264dc996ea5aa9630b3ee3c149a7f37ca87d89c9df2f29367d4b26b19b SHA512 9f092318835006ffe864bb54ac456054196d30ff367546b41f1e49a5f1cc99a4b0b19e3d09c0ce7a336d1562df5784805560e7f725380411b1013a6baf90cf56
 DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7a13fc7adbd8e1e2c1c4699263d5d3105d03781b423f284205de3c79fc68850b9fba6aa05f1dc553b77b0842 SHA512 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
+DIST proj-8.0.0.tar.gz 5722153 BLAKE2B a79626b62f5a9bdfb5395b32fee889e9ed003679926d499c169f896c5a8cd9495173cf156f4c780522dd31f79b71928d1c2add790176fb452c7267210c380816 SHA512 4195fd26075787465e578f86398e224957cddba743e2b090b65c877a6bfbc91b3b36d5acf9883bd2fc215a5aebd0b9f3188ee0e0926aa86d37f9753042fb3d75
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
-EBUILD proj-7.0.1.ebuild 1208 BLAKE2B 9512e12fc93cbd4e17be6c8e3f222e7e1a62f5b73d7e1233bc7701c429f9d5877837a6eba03587a4e8bea26eaa921a4dd4686adf0412200e932de14b90878364 SHA512 9e6b0a2343b2cce7b0cb00063380f0df9012b746c56d9a7cf12b3c0f1d23bd53e0e3071c0e0b01b21d6a816de54ad52afb391a31ac2a1e83d02445c674d17bf8
-EBUILD proj-7.1.1.ebuild 1213 BLAKE2B 96a64b1e5f39515d4caa5c7cbc46c01297b0220b6f85aa5dee6f52f4a69505fd3495d9a01aadb97f661a6d51709df523709dde99c1d12ecaed27abc8c91a06d8 SHA512 861d267b0f82d55223b569b1655af44c65d687d5f8a9c86e519f4bcbce17f6c9c7dab35a3ab9b51a7cb7b3690df1d001b9ec3dec4768301d44a6231540978cc9
 EBUILD proj-7.2.1.ebuild 1209 BLAKE2B ac70d263aab2b700dcfc7f8564b81607a31c3387ed6f39770fb7583c063428680a8ef5d0dcba6e786fbce847d2791bb8285b983f662a161b171a6755b2e72a16 SHA512 ce8e0b02dad6ce6de1620328fd6e65c478eafcc81dd55b3551a4452425840d4226fa43c02f7310a3ed9779ddf1d14e00f83a35a459869dcb18eae45c29cffa94
-MISC metadata.xml 374 BLAKE2B d6d3066273af3324fb5ebf6b0d3b0f49c4e78a88c7cbd7689e9d9ec6841033a03bb5f219c62be88320b2fee6c712079e54a5368125d7a33b301ae1263aec98e9 SHA512 34124c295beb66129e72963474508d26f1482919447bde9ed3af89f2123dffcf98037760aab2b589cc0a5dad23183fa0c28ecc3c4322a1ddfb926fb4ba52c8ad
+EBUILD proj-8.0.0.ebuild 1432 BLAKE2B 575e8654d3d429d2a52b2c47aec7ed086367aaaf5f0b2f1898997b0ba43a6badd8a37092105cc1fa22bdd4744ec8ddc5c8e9ad2475b3df2a51a12b13000b8bdd SHA512 e82e8453b99c349caec34eb2e474cc433af88f35fb47ee451561d757b86361e509bfd84879472f7b7b8eb628440cf8bb4b3c559d9201d9b85b99d85fd8c069e0
+MISC metadata.xml 449 BLAKE2B e29aeb78ff28d336ffbe19913702d656299183b1657c09deaf12f3f8c263867e9facbef4ee626f78e667f3f6ad5cebb0c490e84247fe784bc3fbf68c5418692e SHA512 a1b14653a4388d42e3e08ddabd3734e5987bf41092dd699788ed1a4b8819da831f602b48dd3ad64dbb9fc1bbc0005623456744a6b5a3fcd3313d844bf3bc6886
diff --git a/sci-libs/proj/metadata.xml b/sci-libs/proj/metadata.xml
index 434e5e60f525..e36b505c0918 100644
--- a/sci-libs/proj/metadata.xml
+++ b/sci-libs/proj/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="europe">Install the PROJ collection of European grids and init-files</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">OSGeo/PROJ</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/proj/proj-7.0.1.ebuild b/sci-libs/proj/proj-7.0.1.ebuild
deleted file mode 100644
index e7f70f68ee19..000000000000
--- a/sci-libs/proj/proj-7.0.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 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.6.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/19"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="curl europe static-libs test +tiff"
-REQUIRED_USE="test? ( !europe )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	curl? ( net-misc/curl )
-	tiff? ( media-libs/tiff )
-"
-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_with curl) \
-		$(use_enable static-libs static) \
-		$(use_enable tiff)
-}
-
-src_install() {
-	default
-	cd data || die
-	dodoc README.{DATA,DATUMGRID}
-	use europe && dodoc README.EUROPE
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/sci-libs/proj/proj-7.1.1.ebuild b/sci-libs/proj/proj-8.0.0.ebuild
index 7709f61d762f..c6a3966a2684 100644
--- a/sci-libs/proj/proj-7.1.1.ebuild
+++ b/sci-libs/proj/proj-8.0.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit cmake
+
 DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
 EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.6.tar.gz"
 
@@ -15,9 +17,9 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-SLOT="0/19"
+SLOT="0/22"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="curl europe static-libs test +tiff"
+IUSE="curl europe test +tiff"
 REQUIRED_USE="test? ( !europe )"
 
 RESTRICT="!test? ( test )"
@@ -27,27 +29,40 @@ RDEPEND="
 	curl? ( net-misc/curl )
 	tiff? ( media-libs/tiff )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
 
 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_with curl) \
-		$(use_enable static-libs static) \
-		$(use_enable tiff)
+	local mycmakeargs=(
+		-DDOCDIR="${EPREFIX}/usr/share/${PF}"
+		-DBUILD_TESTING=$(usex test)
+		-DENABLE_CURL=$(usex curl)
+		-DBUILD_PROJSYNC=$(usex curl)
+		-DENABLE_TIFF=$(usex tiff)
+	)
+
+	use test && mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON )
+
+	cmake_src_configure
 }
 
 src_install() {
-	default
+	cmake_src_install
+
 	cd data || die
 	dodoc README.{DATA,DATUMGRID}
 	use europe && dodoc README.EUROPE
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }