gentoo auto-resync : 16:08:2024 - 12:22:56

4 files changed, 243 insertions, 0 deletions

diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 84d7fe6f6c38..0ad7d131d319 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,8 +1,13 @@
+AUX proj-9.4.1-include-cstdint.patch 992 BLAKE2B a78dc0fb259a863e83fc1b4dc77591b1c1b110aeef055351324185b8af1aa2882cdfaf261f99a0e007497d7dcf53583dce8458aed75ed35d8fdf882bff851cd3 SHA512 4b9f44383e9fa6466df3bf81bfe34cd3f023961d5167d6467fe66eeafbf690463491c4eea70c7be6be0dc68fe1c84bfc0ba39728a97dfa2f83f2eebb1ac009ad
 AUX proj-geotiff.patch 943 BLAKE2B e2d1df20f8b87239e2c1f748e92b4ab5a3fe567994e6ce0c136383d1d0fcd1efa99e6c5586924d675acc3539e006e401a8683e719ff8532790e727ef19af4b71 SHA512 8462ef4f231d41b1a947528afa36da9e4231fae1adfb9bba8465a3402be8e78ae95ed39424e3f6ed635b0e2a0d9f2cfb9bc36187303444d80abc41518817ed3a
 DIST proj-9.2.1.tar.gz 5536575 BLAKE2B e08dc370cfac2c6358e1b28e44f3893c75e07fd64a4235041edf836885d31af33605673486edb122cec8aa13a2c564156c429a68e5045de52d8ea970d2e440f1 SHA512 5640e9bd4ea24a0e0b1521c90b8f709b64b9ee357190aaf08af0cff5df68ae93bdfb27211bde5c50340b067fc218b4f2aa8fb998ed2852ebeb2c2ad0ac4629ef
 DIST proj-9.3.0.tar.gz 5559825 BLAKE2B 83916294411a35094a2dbc89b1f219eff9b9baa4df6322a51a1965979044a36b4f1b75a99ea96fed8f59937ac000337a3e2e8ad4d9e1ef2ae929ccb7e06654b0 SHA512 1a79a7eaab0859cf615141723b68d6dd7b88390c3e590df12ec0d4c58ba69574863e5892d8108818dbc7e8abbf0b6372496228c02411d506b7169f732ff5cd57
+DIST proj-9.4.1.tar.gz 5665272 BLAKE2B 9751ca658e77650236e5d8888d4d3a5e3da4c5761494d1a544baa565bd0aea967c08d871d7b67de0b0f7ffb07fc16212edbbd3a91532c70677e1702e050a7f7e SHA512 e9e4a80125a9481709fa7a16c8ceed7c5480c1d9152fe0c16ff69cd976081b9f41e23783459ee2a50771ec7f6210f46167de5af9ee943ff274bd27a1de4b6305
 DIST proj-data-1.13.tar.gz 709788173 BLAKE2B 33a487f327d2b35acfd6c7c12286bcd6e338c3459540482f968ef7038d78cea9d1519d89ba979f493e007fa961e0eb955889bf2348a235705ec3b71abf1e31c1 SHA512 14eca1b47dad913de608babc73708a35da8bb614c5374e990564a32549998a16e90d4c548f2dac0cd555fc8a4a645eeaf649db929cc38906bee1050e378a662e
 DIST proj-data-1.15.tar.gz 727387470 BLAKE2B 03d5b69214e23741ae214ff18f523542247fdca5c301891616be6b79c8a916bf762d0a7ee3983cee62236bc0d4d1b5fc93151164b134db220d4582b15a84e8d7 SHA512 4007c639d5c9f0422652315e8d69527eb39e3d045cef3537361e16c61c9aae76d69e3eb7efefead04793350b8502114eec740efe970f25fbbee2db449b2e3694
+DIST proj-data-1.18.tar.gz 735652646 BLAKE2B 62ca77e6f0a58992a914ebc6a7558b5ddb4529a5bf20a96eedbc62ef7c1bcc5c05582663846e43e132a1b8eaf821bbbc0be792335bad03028db085422d3ed269 SHA512 805eadd29665697398f568f5e4f45df8eadea6fc2841ce901c703613fab13f6f064e6f187621e76017b9b67bb1ca0c6dc1dd2be9848c5169d7e6ebaa2aeea950
 EBUILD proj-9.2.1-r1.ebuild 1615 BLAKE2B 67182f158f8a60ee20eb18e66a452d425794cdbdadf1ee5e29c99f6557a6c94434d9734b0aebd7d79a9913e88f9d49ba0f5398da14bb49b8bf9ba01e43322ef5 SHA512 cc3f35f803878fa526789bb882f06782c83de0b40cdeaa3334e46db8600057b48be9606039c38fa9694ac112f09830f5b5c8a1271e35245adc81385ac53b41ea
 EBUILD proj-9.3.0-r1.ebuild 1619 BLAKE2B 53ecd62a0b9ca95f3ef45940004342c3dc2c039c751af27da6827d813a017642efcc2c2328f875016cec907eb8a56f409b4b5cc7681b20326a01a1a9da3aeed6 SHA512 86a9107e4b00cf02315cc479062dc2754f792fe811ec770bdfdc36ce0d0d485bee93370f7add15c97a2d14166cc05dbb9ba38fcc8172d12e26f6fa13a3347748
+EBUILD proj-9.4.1.ebuild 2220 BLAKE2B f445cf35a273a38d7c3c7dbaab9466031f21434a0bc107c64b20c4443645c2f721aed99188356b5bfa7a5c2d59be9b734a41f73b4454e94fa7d445c1574022aa SHA512 e44b326f2259747d94fc1210b570fc140c2fd5b9f9d4eed55daaab9ee9146c321a2aa677b011904ac1aae222d9e014563ec7da1e4dfcc86d6bcbd445059b62aa
+EBUILD proj-9999.ebuild 2171 BLAKE2B 5afcffb9cf19aec6f2c3a7caa3f325940e61ecc6a41227e6d8ec2285ad74ecd1c70ab424a39dc9448db19edb30bad075a057d06452507e396cbbc79e5629cc04 SHA512 ff0968131ddd97a084d21891fff1d03fa0a277fffa3e0a21c26bd1be580cc779d9d63abc6a3aab0cdae6a64dcb4f8d6a7f1ed330c81c8d48481d47e913453cb8
 MISC metadata.xml 345 BLAKE2B 356bd57a232baa5119842e6741d735afe44bf2c48fe144286743dd64716b3777f190980074d9013640cabb57306057e0abd42ea9fed80a44ee53366ea2413b23 SHA512 ec91a8fd73c7c798cfb0f23fc138e79bc642181265e4ee1fd94b9535dc3ae97e717f9115300ba648314e177f1dd3d0e3077e5746fbbc4c8eacd9b4692c721453
diff --git a/sci-libs/proj/files/proj-9.4.1-include-cstdint.patch b/sci-libs/proj/files/proj-9.4.1-include-cstdint.patch
new file mode 100644
index 000000000000..482e967805ac
--- /dev/null
+++ b/sci-libs/proj/files/proj-9.4.1-include-cstdint.patch
@@ -0,0 +1,37 @@
+https://github.com/rouault/PROJ/commit/35546a7eb1846b93bd035932562193b980c27520
+
+From 35546a7eb1846b93bd035932562193b980c27520 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Wed, 7 Aug 2024 11:25:30 +0200
+Subject: [PATCH] Add missing include cstdint
+
+Fixes #4215
+---
+ src/apps/cct.cpp   | 1 +
+ src/apps/cs2cs.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/apps/cct.cpp b/src/apps/cct.cpp
+index f7d46cd655..193fff6e47 100644
+--- a/src/apps/cct.cpp
++++ b/src/apps/cct.cpp
+@@ -79,6 +79,7 @@ Thomas Knudsen, thokn@sdfe.dk, 2016-05-25/2017-10-26
+ #include <string.h>
+ 
+ #include <algorithm>
++#include <cstdint>
+ #include <fstream> // std::ifstream
+ #include <iostream>
+ 
+diff --git a/src/apps/cs2cs.cpp b/src/apps/cs2cs.cpp
+index 27caa603cc..88353bf8f0 100644
+--- a/src/apps/cs2cs.cpp
++++ b/src/apps/cs2cs.cpp
+@@ -36,6 +36,7 @@
+ #include <string.h>
+ 
+ #include <cassert>
++#include <cstdint>
+ #include <iostream>
+ #include <string>
+ #include <vector>
diff --git a/sci-libs/proj/proj-9.4.1.ebuild b/sci-libs/proj/proj-9.4.1.ebuild
new file mode 100644
index 000000000000..2658f91d09c9
--- /dev/null
+++ b/sci-libs/proj/proj-9.4.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="PROJ coordinate transformation software"
+HOMEPAGE="https://proj.org/"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OSGeo/PROJ.git"
+	EGIT_DATA_REPO_URI="https://github.com/OSGeo/PROJ-data.git"
+else
+	# Check https://proj.org/download.html for latest data tarball
+	# https://github.com/OSGeo/PROJ-data/releases
+	PROJ_DATA_PV="1.18"
+	SRC_URI="
+		https://github.com/OSGeo/PROJ/releases/download/${PV}/${P}.tar.gz
+		https://github.com/OSGeo/PROJ-data/releases/download/${PROJ_DATA_PV}.0/${PN}-data-${PROJ_DATA_PV}.tar.gz
+		https://download.osgeo.org/proj/${P}.tar.gz
+		https://download.osgeo.org/proj/${PN}-data-${PROJ_DATA_PV}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+# Changes on every major release
+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 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9.4.1-include-cstdint.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+
+		git-r3_fetch "${EGIT_DATA_REPO_URI}"
+		git-r3_checkout "${EGIT_DATA_REPO_URI}" "${S}/data"
+	else
+		unpack "${P}.tar.gz"
+
+		cd "${S}"/data || die
+		mv README README.DATA || die
+
+		unpack "${PN}-data-${PROJ_DATA_PV}.tar.gz"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DBUILD_PROJSYNC=$(usex curl)
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_TIFF=$(usex tiff)
+	)
+
+	if use test ; then
+		mycmakeargs+=(
+			-DUSE_EXTERNAL_GTEST=ON
+			-DBUILD_BENCHMARKS=OFF
+			-DRUN_NETWORK_DEPENDENT_TESTS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	CMAKE_SKIP_TESTS=(
+		# proj_test_cpp_api: https://lists.osgeo.org/pipermail/proj/2019-September/008836.html
+		# testprojinfo: Also related to map data?
+		"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-9999.ebuild b/sci-libs/proj/proj-9999.ebuild
new file mode 100644
index 000000000000..c269939f1a73
--- /dev/null
+++ b/sci-libs/proj/proj-9999.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="PROJ coordinate transformation software"
+HOMEPAGE="https://proj.org/"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OSGeo/PROJ.git"
+	EGIT_DATA_REPO_URI="https://github.com/OSGeo/PROJ-data.git"
+else
+	# Check https://proj.org/download.html for latest data tarball
+	# https://github.com/OSGeo/PROJ-data/releases
+	PROJ_DATA_PV="1.18"
+	SRC_URI="
+		https://github.com/OSGeo/PROJ/releases/download/${PV}/${P}.tar.gz
+		https://github.com/OSGeo/PROJ-data/releases/download/${PROJ_DATA_PV}.0/${PN}-data-${PROJ_DATA_PV}.tar.gz
+		https://download.osgeo.org/proj/${P}.tar.gz
+		https://download.osgeo.org/proj/${PN}-data-${PROJ_DATA_PV}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+# Changes on every major release
+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 )
+"
+
+PATCHES=(
+)
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+
+		git-r3_fetch "${EGIT_DATA_REPO_URI}"
+		git-r3_checkout "${EGIT_DATA_REPO_URI}" "${S}/data"
+	else
+		unpack "${P}.tar.gz"
+
+		cd "${S}"/data || die
+		mv README README.DATA || die
+
+		unpack "${PN}-data-${PROJ_DATA_PV}.tar.gz"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DBUILD_PROJSYNC=$(usex curl)
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_TIFF=$(usex tiff)
+	)
+
+	if use test ; then
+		mycmakeargs+=(
+			-DUSE_EXTERNAL_GTEST=ON
+			-DBUILD_BENCHMARKS=OFF
+			-DRUN_NETWORK_DEPENDENT_TESTS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	CMAKE_SKIP_TESTS=(
+		# proj_test_cpp_api: https://lists.osgeo.org/pipermail/proj/2019-September/008836.html
+		# testprojinfo: Also related to map data?
+		"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
+}