gentoo resync : 04.01.2022

4 files changed, 12 insertions, 153 deletions

diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 808ba0db08b2..aa05b893d787 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,15 +1,12 @@
 AUX proj-8.1.0-test_factory-include.patch 844 BLAKE2B 612046cbc170c16362ffc4a43f5a3f6ade303e5ce8ce2a45494dc3280fcfee63120f110f30939b0408dfb963e79f1b6f4b6438bdd6d2708cbc6ab7ebd4b2b4d6 SHA512 b7095a0b892e6b31b456f48d640cbd4abd4537676f4ceed1491888a65443a58e3747943e9e8f1889ef6138b52e1273f9896ec71d5f16b84582dd095d1b8d2ef8
 DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7a13fc7adbd8e1e2c1c4699263d5d3105d03781b423f284205de3c79fc68850b9fba6aa05f1dc553b77b0842 SHA512 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
-DIST proj-8.0.1.tar.gz 5731452 BLAKE2B d2235f87bead1ec35f62b99e5236d1b6dc1a8f924555d21dec7f5e07b3d341b4b4e797dd5a3843e87d12db392716ec9bb5acae871fa2bb7a78c3404fa9487875 SHA512 cb5550a9fbccfc680bebb3b8c5ad347d53c38cb526edf4dcaa3af0eff57410b4d4d028e246954c4202a1d637e1e6f4e7a6a33e8741e8aa0a58bdfc8a5dbc68c9
-DIST proj-8.1.0.tar.gz 5786723 BLAKE2B 8960ae70beda502442548542173e3f21705c8213ba5b7b3004beca67aa16b7401db4b9778ea4abd910eae3e224b7efc73e0d67b83a3d75aaab0fead51977c9ba SHA512 0c11d43bcdf97fbb3be9238c77cc111ae6df7948dc5076b1a31350c84a60299964ea1a320edfbee0568a2d9d3c7f80eafa6322adfdf99aea5f06172d7ee53a2f
-DIST proj-8.1.1.tar.gz 5797853 BLAKE2B 5ff7640a4727db836b4ed00b36ba914b7f27e0890629dfa9c0cb477c00b74a43b6312ae45bd9fffe75e945689575def021a891110cb43dfaa2dff03624f479c2 SHA512 1f18ad83bae40c6c910900a062bd41c331838add6eebb7e83b4784e4e06fbf48706cee24aadbefe0f138f081ecc02e93a2b6fd45a84806e1372bf2997dafa852
 DIST proj-8.2.0.tar.gz 5880399 BLAKE2B be8be2f1e6b661600479aefa1cd49dfea70085abd37f66a6768cb6cca31c42fcfa43b6d10aca7ac10a5096aba8b8cc1a2a6c744ae767225c38e31b4c69cf7d40 SHA512 e7bcd959deeeb9130325a7bf63a8a0b8de2c55ba573065ca5ea32cf83c2c2643648760cfbe1c3bd1d2a2e74f65ceae4d9d525a537678386260fc2862b3927f5e
+DIST proj-8.2.1.tar.gz 5882136 BLAKE2B c4d80ee1bb1287e2539c9b5c5a5c6305fe8d2fc83526fd29507802b94351f51b016184c07a5e8c1bbf820252a6dfa5b4d55376e5d5566774e3e5e3154857dfa1 SHA512 c6164771fd492be5aa91d8dd2f2794a19b47431078f148356aa70dee96a4589ec5decbab9d8dd756a7bcb322ad94935750c22e0e7fb16e21c8f59ca474e7137e
 DIST proj-data-1.7.tar.gz 585899744 BLAKE2B 4d5c81ed64a1ee20b8bd7abf0426ced747e9050d8d7548815365d35884dd3952252a716df9d38986e4bb2e450436df206ce7b51dca77ee35a681e4028b11a54f SHA512 03865e972cc5898b3995582e5a5b8d129609b89ef9a077fa775aaf0b2f4a6002605cd657443840d83ffd5f56233d7d248e3442f7d0efdddfd0f90f2959831310
+DIST proj-data-1.8.tar.gz 586765549 BLAKE2B a54287fa81e2055737c1956bf7f10246ccdd8d9af49fe7e8a01a6f2206c234d2827c4268d901d49bbbfff4caace220aa1867f0088442e4849f9d3cd57f4ca72d SHA512 884425c3bc09a39cb1b611264ccaa17940f4779f4e0d6023306f6b82622cdd0a2e5970a79018d499d323640acb72560789ef127ff4e0c712fa3679e5cfeb34bc
 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.2.1.ebuild 1215 BLAKE2B 26a84ff93fefa9b88ab8017fa58da6ec89f037beb788bb11e3302bcf38ae578a846416ef23094b9a32ca8be447ee4e3a0d865f66db7c97cb30499930c48237b0 SHA512 b854fcbb1879b5bc161a06f853a5705c32705539bc0a3572d8b9df38cb7707e201e075e148e48534768dbacd550ebfa3ab836dbb387fa15e630e86e740e87a33
-EBUILD proj-8.0.1.ebuild 1431 BLAKE2B 17e47bd41495796fb1d2c4017fc5ffd074e04dc35acc0e8884aadb157247b91bb4a5efb076fd3c96c3310c4066571afbf385ab73a0b0ee596d22017bfd42ce4d SHA512 fd310ac894ddaac7298bfba6c0308ff6ec496e264b25f584d1024f31ed140af2f25025731779b811b0be7cc3fe26183f17de8fe9ba088a889f57a3e66f66a9a6
-EBUILD proj-8.1.0-r1.ebuild 1498 BLAKE2B fbbdb247cd29bf471e0ba6e2a5fe6b7e171c31e626ba2718e05ed2154643719d239cf4e2e20539134c45c31cfebff26b5bea98d88ce707a61fa30e4cefd08eed SHA512 d3578c54ee71ab99f6994df2aebdbe8b7f33284160ff14a684f7582a6fc9b1008a4ba77a6e04a3ab54c5648d93ae2d243c434bfeda26068d8cc39aab12d0996b
-EBUILD proj-8.1.1.ebuild 1298 BLAKE2B 2880810174ab266045211695a1af20a32289675766f0557eeef14d63a153c1dd3748ff0fb458b5965928507e6182d8e6a7ce077a236e315b9b4dbbafd0fd49cc SHA512 d0bc55182ee6c3f83fd5d1c97a53d80d864eeabdc018862cfbaa18db7bec2eef75b24965120cdbacf4c3ab9ebc8a05868c86fc4cfad152622c16f50bfd9963b4
 EBUILD proj-8.2.0.ebuild 1426 BLAKE2B be7f95d899ddc8d10bdfdd682cb73fba9949c21feef1e657637aa840add94dd5161fc57cad6bd7775d15d9b20b8b9d6bfbb2c06eb7a4ceed82b3f8e979f96509 SHA512 fa971dc5e7ba297e46c3116105759c0f6acd5d16387519d4eed477ddaefeb1a84af3b0fdf26518c9c411e2290d4646e41ddf7708c56e7e9e3347086d587d3830
+EBUILD proj-8.2.1.ebuild 1491 BLAKE2B 0654ba53725b6f1ce0ad05a305f61e2427cca06b96abc82ecb5e960f0cc8de747165759476a7da662c4ea7552cdc074598134f61ca7cc44b673d38f1456f68fc SHA512 7c19544659a5ab088e696653dc0d600972acf6a9a41e6161d4aab11dfb0b2e57692545363bb17a9a1f889592e81d84963bf3b097359b2ad808c84b5f5253e83a
 MISC metadata.xml 450 BLAKE2B a29666b3ab3d0e39d3d2ab247f250cd4f9a716ee1f01563e8d6739f507b96f553187999c6fcd501a0f8e9a564f7e5fe3a54c29dd985d1f91873da8252840ebf7 SHA512 c319fbe8249838dc881424641a19abc639d4a74d585e434be1a27802eb9fa88711a1c631ba92abd333d7baaa739b1c98faebe7c20ce7c1a4639d38b9dbe40381
diff --git a/sci-libs/proj/proj-8.0.1.ebuild b/sci-libs/proj/proj-8.0.1.ebuild
deleted file mode 100644
index d9e6bfd7022b..000000000000
--- a/sci-libs/proj/proj-8.0.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
-EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.6.tar.gz"
-
-DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj.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/22"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="curl europe test +tiff"
-REQUIRED_USE="test? ( !europe )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	curl? ( net-misc/curl )
-	tiff? ( media-libs/tiff )
-"
-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() {
-	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() {
-	cmake_src_install
-
-	cd data || die
-	dodoc README.{DATA,DATUMGRID}
-	use europe && dodoc README.EUROPE
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/sci-libs/proj/proj-8.1.0-r1.ebuild b/sci-libs/proj/proj-8.1.0-r1.ebuild
deleted file mode 100644
index 9898a2c4666a..000000000000
--- a/sci-libs/proj/proj-8.1.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
-EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.6.tar.gz"
-
-DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj.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/23"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="curl europe test +tiff"
-REQUIRED_USE="test? ( !europe )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	curl? ( net-misc/curl )
-	tiff? ( media-libs/tiff )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test_factory-include.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd "${S}"/data || die
-	mv README README.DATA || die
-
-	unpack ${DATUMGRID}
-	use europe && unpack ${EUROPE_DATUMGRID}
-}
-
-src_configure() {
-	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() {
-	cmake_src_install
-
-	cd data || die
-	dodoc README.{DATA,DATUMGRID}
-	use europe && dodoc README.EUROPE
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/sci-libs/proj/proj-8.1.1.ebuild b/sci-libs/proj/proj-8.2.1.ebuild
index 7c632133dcfb..35637f3d5d09 100644
--- a/sci-libs/proj/proj-8.1.1.ebuild
+++ b/sci-libs/proj/proj-8.2.1.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
-PROJ_DATA="proj-data-1.7.tar.gz"
+# Check https://proj.org/download.html for latest data tarball
+PROJ_DATA="proj-data-1.8.tar.gz"
 DESCRIPTION="PROJ coordinate transformation software"
 HOMEPAGE="https://proj.org/"
-SRC_URI="
-	https://download.osgeo.org/proj/${P}.tar.gz
-	https://download.osgeo.org/proj/${PROJ_DATA}
-"
+SRC_URI="https://download.osgeo.org/proj/${P}.tar.gz
+	https://download.osgeo.org/proj/${PROJ_DATA}"
 
 LICENSE="MIT"
 # SONAME in 8.1.1 is actually 23 (in 8.1.0, was 22)
+# ... and now 8.2.0 is back to 22 again.
+# Please increment to 25 on the next SONAME bump, even if it's not
+# going to correspond...
 # It's far less confusing to just increment it again here (so N+1)
 SLOT="0/24"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"