gentoo auto-resync : 02:12:2022 - 08:55:37

3 files changed, 5 insertions, 77 deletions

diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 4f98b7b7fb9b..f92f6e07a0a6 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,16 +1,14 @@
 DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7a13fc7adbd8e1e2c1c4699263d5d3105d03781b423f284205de3c79fc68850b9fba6aa05f1dc553b77b0842 SHA512 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
 DIST proj-8.2.1.tar.gz 5882136 BLAKE2B c4d80ee1bb1287e2539c9b5c5a5c6305fe8d2fc83526fd29507802b94351f51b016184c07a5e8c1bbf820252a6dfa5b4d55376e5d5566774e3e5e3154857dfa1 SHA512 c6164771fd492be5aa91d8dd2f2794a19b47431078f148356aa70dee96a4589ec5decbab9d8dd756a7bcb322ad94935750c22e0e7fb16e21c8f59ca474e7137e
-DIST proj-9.0.0.tar.gz 5242155 BLAKE2B dd0a2234d0a8dddc1303c4dbc73bf1d13be0248f712c20dfb67f4003ace2504f96498f769214198f62ba3bbddea00e25a9745fe23d265d8b911ea9170288c24f SHA512 ae1e65f03fba1e922a61f843b64cf4fde0ff015ef8c18bde0a10cb3e732c4d1b27d2c6b0179e8456338c552a760de22abf16e887fc92118288ffa394a9c6a000
-DIST proj-9.0.1.tar.gz 5264935 BLAKE2B 4957727fab9f6158e83025eed502bfc42f0c2fb4ca26ece34284f1b410d490c70ed414b7fc82a01753052acad93d592bb946aed83a2b2d985028554681d61b85 SHA512 9cb716a061315752a23405bd5bf879cdf63432493286ef828f442eea0bea872301be10f6e35a8e28ffe42cb6aafc039213e35be65ab692223a135b03422e3dab
 DIST proj-9.1.0.tar.gz 5299132 BLAKE2B 955b1f2492f47432d8df771fda495e87f977f6a6b4a0957effca0535ff4c3a8edf451028bd805800a2c0c6662e971e1073c35a863426b47f75817ef44e30d281 SHA512 cc23fbfaa16cd14f499ee5162bfe743ec9d738d0ba6358716320aa03e1a752da45fd6102fca1981c9b695934e7c358540be53d667c48dae922ac5511eea6824c
+DIST proj-9.1.1.tar.gz 5311995 BLAKE2B d51652f649ac97f419740e30facd86b04ee0872197d235aecc9d8fd50c18340bc7969a4a78c33f28753fc8b5556e7e8bdc47e0b6a9d9971e214575481cf25c0b SHA512 b9d19a999e063e465579eb86da3fd2aa32fd894f0d15ba178733bcbad92246b3b3ea1811a276cd556874e171a5ba7cfd678ce563c0b8626c6db9349a64c04726
 DIST proj-data-1.11.tar.gz 597743778 BLAKE2B d68a3a1154d560b724364a843e09ca5350a6a04ce30fb124788220d8e48eff3ab33f6061effec88e658067e0d430b5606f386d82bdcefa69551d9855db9ee476 SHA512 6c91b7ad81b9cf93330cb27f6632cc3e6d854ed4e84318520200d3fffe59c94e4061e2ebece220a143624ae5c4b672458379a546e75547544347cc28576b984f
+DIST proj-data-1.12.tar.gz 611423889 BLAKE2B 5376f041aae1a23668a0cae79f4deadff29aad80a1187f837cd5c62c21dc49738fc598c52825f5d8575cd135b55c188d9456b5da72adc6a507fa778f0cad6596 SHA512 788d7c3ad70dd7aab21824ff189dd0cddc28b7e64999f6a9953d7af95f9fabab7143b0f1c3bed19d5deb8f3e3a7be62723fc5fda778fcaefab0ab6d449db5def
 DIST proj-data-1.8.tar.gz 586765549 BLAKE2B a54287fa81e2055737c1956bf7f10246ccdd8d9af49fe7e8a01a6f2206c234d2827c4268d901d49bbbfff4caace220aa1867f0088442e4849f9d3cd57f4ca72d SHA512 884425c3bc09a39cb1b611264ccaa17940f4779f4e0d6023306f6b82622cdd0a2e5970a79018d499d323640acb72560789ef127ff4e0c712fa3679e5cfeb34bc
-DIST proj-data-1.9.tar.gz 589748963 BLAKE2B 53f9fa442d074127df11cf11f1be426438a334fb28fc47f4513acf985bb8c9f52678ba1e297baacf576b2082ce0371abb63747958c1fc233538efdf0d9fade57 SHA512 25607137a32c65e906d3f4e64f5e6b0fd5882faf0c4bf458116c582e6438df38cc36e9b6e67498b7d63dceb863f31b3890f04bdb19a1287e6d902a7193221711
 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.2.1.ebuild 1486 BLAKE2B 67bf1c6d3f0852c39c89c70b8c63f104ac2b395b5f5a11263955d60c12cb23d0426e009958af46228e5fc614e89daf432425f2ae44aa35d85509c049388c779b SHA512 318b2d8b027cf84c53246ac8c1c181d30deae0f93db8c3d589691809abaaa8a0d36786f2c9848c2ee3a3e7bb1e6f18da44a8ffcc29cf65c48b20d39010a4080f
-EBUILD proj-9.0.0.ebuild 1512 BLAKE2B 6a8e2546269eab8e2a18caf3ef0521d959497e3998376e027240a847bf22c4e882c888ee02f519f761aa8b57c650a659a765f9bd68e934f9f7c5f4b2caedc3ba SHA512 a2619ffc5229ca6b51f0f73e5449f73cc9860363fdf066734af8ee66211e9067e258de9bda21c4025a55e86e5ecd73a6e4aabc086b08683c74e5f60ae1f9c6e3
-EBUILD proj-9.0.1.ebuild 1512 BLAKE2B 6a8e2546269eab8e2a18caf3ef0521d959497e3998376e027240a847bf22c4e882c888ee02f519f761aa8b57c650a659a765f9bd68e934f9f7c5f4b2caedc3ba SHA512 a2619ffc5229ca6b51f0f73e5449f73cc9860363fdf066734af8ee66211e9067e258de9bda21c4025a55e86e5ecd73a6e4aabc086b08683c74e5f60ae1f9c6e3
 EBUILD proj-9.1.0.ebuild 1469 BLAKE2B 69ed19d5b4faa255d72d94382bbf1740515d1dfe9d8711abfd42cafe810338223ae87bde8a9e5fd96f31a5f0606a41d53f0d376759acf82a519fbc331f9cc087 SHA512 de460bbfb5b712b1a7b3eca0770946193ddf7eae100158f47c97e8e6c5f803e1ade83485f5969ced33c86488d3b3d778f483bb403eb0688aeb611232c6057952
+EBUILD proj-9.1.1.ebuild 1473 BLAKE2B 6c4fa6c1111898977cd7e2fb637a60b7c5f5c061e008bf0d23aa92447e238bc011c44277241901da5cdee8dc754f05e8126e766c550d61898dec2bb348465053 SHA512 f3479885b4485d5c5497d9e5ed96bf0f082296d40df2666a9deb96b6bddce09dc8daa4b6a9ce2e1b0609bb7f4dc06ccfd087fb35226e739e1331bc1c90646772
 MISC metadata.xml 450 BLAKE2B a29666b3ab3d0e39d3d2ab247f250cd4f9a716ee1f01563e8d6739f507b96f553187999c6fcd501a0f8e9a564f7e5fe3a54c29dd985d1f91873da8252840ebf7 SHA512 c319fbe8249838dc881424641a19abc639d4a74d585e434be1a27802eb9fa88711a1c631ba92abd333d7baaa739b1c98faebe7c20ce7c1a4639d38b9dbe40381
diff --git a/sci-libs/proj/proj-9.0.1.ebuild b/sci-libs/proj/proj-9.0.1.ebuild
deleted file mode 100644
index 8f75a4028225..000000000000
--- a/sci-libs/proj/proj-9.0.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-# Check https://proj.org/download.html for latest data tarball
-PROJ_DATA="proj-data-1.9.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}"
-
-LICENSE="MIT"
-# Changes on every major release
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="curl test +tiff"
-
-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 ${PROJ_DATA}
-}
-
-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_test() {
-	local myctestargs=(
-		# proj_test_cpp_api: https://lists.osgeo.org/pipermail/proj/2019-September/008836.html
-		# testprojinfo: Also related to map data?
-		-E "(proj_test_cpp_api|testprojinfo)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	cd data || die
-	dodoc README.DATA
-
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/sci-libs/proj/proj-9.0.0.ebuild b/sci-libs/proj/proj-9.1.1.ebuild
index 8f75a4028225..4d625f87c6a8 100644
--- a/sci-libs/proj/proj-9.0.0.ebuild
+++ b/sci-libs/proj/proj-9.1.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit cmake
 
 # Check https://proj.org/download.html for latest data tarball
-PROJ_DATA="proj-data-1.9.tar.gz"
+PROJ_DATA="proj-data-1.12.tar.gz"
 DESCRIPTION="PROJ coordinate transformation software"
 HOMEPAGE="https://proj.org/"
 SRC_URI="https://download.osgeo.org/proj/${P}.tar.gz
@@ -37,10 +37,9 @@ src_unpack() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DDOCDIR="${EPREFIX}"/usr/share/${PF}
 		-DBUILD_TESTING=$(usex test)
-		-DENABLE_CURL=$(usex curl)
 		-DBUILD_PROJSYNC=$(usex curl)
+		-DENABLE_CURL=$(usex curl)
 		-DENABLE_TIFF=$(usex tiff)
 	)