From 6a4408b9bbd9fe61dc0966f587db94081fa5f52b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 Jan 2024 19:03:44 +0000 Subject: gentoo auto-resync : 10:01:2024 - 19:03:44 --- sci-libs/proj/Manifest | 5 +- sci-libs/proj/files/proj-geotiff.patch | 33 ++++++++++++++ sci-libs/proj/proj-9.2.1-r1.ebuild | 83 ++++++++++++++++++++++++++++++++++ sci-libs/proj/proj-9.2.1.ebuild | 79 -------------------------------- sci-libs/proj/proj-9.3.0-r1.ebuild | 83 ++++++++++++++++++++++++++++++++++ sci-libs/proj/proj-9.3.0.ebuild | 79 -------------------------------- 6 files changed, 202 insertions(+), 160 deletions(-) create mode 100644 sci-libs/proj/files/proj-geotiff.patch create mode 100644 sci-libs/proj/proj-9.2.1-r1.ebuild delete mode 100644 sci-libs/proj/proj-9.2.1.ebuild create mode 100644 sci-libs/proj/proj-9.3.0-r1.ebuild delete mode 100644 sci-libs/proj/proj-9.3.0.ebuild (limited to 'sci-libs/proj') diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest index f98eefef1cb8..84d7fe6f6c38 100644 --- a/sci-libs/proj/Manifest +++ b/sci-libs/proj/Manifest @@ -1,7 +1,8 @@ +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-data-1.13.tar.gz 709788173 BLAKE2B 33a487f327d2b35acfd6c7c12286bcd6e338c3459540482f968ef7038d78cea9d1519d89ba979f493e007fa961e0eb955889bf2348a235705ec3b71abf1e31c1 SHA512 14eca1b47dad913de608babc73708a35da8bb614c5374e990564a32549998a16e90d4c548f2dac0cd555fc8a4a645eeaf649db929cc38906bee1050e378a662e DIST proj-data-1.15.tar.gz 727387470 BLAKE2B 03d5b69214e23741ae214ff18f523542247fdca5c301891616be6b79c8a916bf762d0a7ee3983cee62236bc0d4d1b5fc93151164b134db220d4582b15a84e8d7 SHA512 4007c639d5c9f0422652315e8d69527eb39e3d045cef3537361e16c61c9aae76d69e3eb7efefead04793350b8502114eec740efe970f25fbbee2db449b2e3694 -EBUILD proj-9.2.1.ebuild 1567 BLAKE2B f713eff00dd54919a12d842c731987705a8faad46aa80fdafccea97c9ed15b9a43101339381293c465e24c96f5c7147f112858f8e4c7d83d5f7323d9ff72f495 SHA512 c503bc98cf3cc95271388717e4041480e126cf7d1a5380f6bb9caa17bbaa7b8726a7ef1fc608a9ca216d58c188ed732755b33a10a7f96e270427afe24029bd2d -EBUILD proj-9.3.0.ebuild 1571 BLAKE2B 5f8efa8bee5cd389d17f3269df1e1ef63c80b0ba527210bd6f8fafbd0b0973f0873eacaeb99388764cf314e4011a8562658bbf438a6333a25115fe02c2e5a8e3 SHA512 84bb806a2a9220de27dd6d4ef38d88bfb7c9772e0a01d63dfaf2b823be3930ed97bae379b8fa4a7f526458d9826256dd7bd6aea9c86f25264a298cbece2efeec +EBUILD proj-9.2.1-r1.ebuild 1615 BLAKE2B 67182f158f8a60ee20eb18e66a452d425794cdbdadf1ee5e29c99f6557a6c94434d9734b0aebd7d79a9913e88f9d49ba0f5398da14bb49b8bf9ba01e43322ef5 SHA512 cc3f35f803878fa526789bb882f06782c83de0b40cdeaa3334e46db8600057b48be9606039c38fa9694ac112f09830f5b5c8a1271e35245adc81385ac53b41ea +EBUILD proj-9.3.0-r1.ebuild 1619 BLAKE2B 53ecd62a0b9ca95f3ef45940004342c3dc2c039c751af27da6827d813a017642efcc2c2328f875016cec907eb8a56f409b4b5cc7681b20326a01a1a9da3aeed6 SHA512 86a9107e4b00cf02315cc479062dc2754f792fe811ec770bdfdc36ce0d0d485bee93370f7add15c97a2d14166cc05dbb9ba38fcc8172d12e26f6fa13a3347748 MISC metadata.xml 345 BLAKE2B 356bd57a232baa5119842e6741d735afe44bf2c48fe144286743dd64716b3777f190980074d9013640cabb57306057e0abd42ea9fed80a44ee53366ea2413b23 SHA512 ec91a8fd73c7c798cfb0f23fc138e79bc642181265e4ee1fd94b9535dc3ae97e717f9115300ba648314e177f1dd3d0e3077e5746fbbc4c8eacd9b4692c721453 diff --git a/sci-libs/proj/files/proj-geotiff.patch b/sci-libs/proj/files/proj-geotiff.patch new file mode 100644 index 000000000000..cef1faa4628f --- /dev/null +++ b/sci-libs/proj/files/proj-geotiff.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/917393 +https://github.com/OSGeo/PROJ/pull/3970 + +From afccfb609db16524b602216d9dc2b55c154403bb Mon Sep 17 00:00:00 2001 +From: Marco Genasci +Date: Sun, 26 Nov 2023 08:40:45 +0100 +Subject: [PATCH] Database: added ability to install *.tif if present in data + +--- + data/CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt +index 4cb89e7849..85ed6ba8d4 100644 +--- a/data/CMakeLists.txt ++++ b/data/CMakeLists.txt +@@ -38,6 +38,8 @@ set(GRIDSHIFT_FILES ${GSB_FILES} ${GTX_FILES}) + + file(GLOB SCHEMA_FILES *.json) + ++file(GLOB GEOTIFF_FILES *.tif) ++ + set(ALL_SQL_IN "${CMAKE_CURRENT_BINARY_DIR}/all.sql.in") + set(PROJ_DB "${CMAKE_CURRENT_BINARY_DIR}/proj.db") + include(sql_filelist.cmake) +@@ -107,6 +109,7 @@ set(ALL_DATA_FILE + ${GRIDSHIFT_FILES} + ${PROJ_DB} + ${SCHEMA_FILES} ++ ${GEOTIFF_FILES} + ) + install( + FILES ${ALL_DATA_FILE} diff --git a/sci-libs/proj/proj-9.2.1-r1.ebuild b/sci-libs/proj/proj-9.2.1-r1.ebuild new file mode 100644 index 000000000000..50bbae86a419 --- /dev/null +++ b/sci-libs/proj/proj-9.2.1-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 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.13.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 ~loong ~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 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-geotiff.patch +) + +src_unpack() { + unpack ${P}.tar.gz + + cd "${S}"/data || die + mv README README.DATA || die + + unpack ${PROJ_DATA} +} + +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() { + 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.2.1.ebuild b/sci-libs/proj/proj-9.2.1.ebuild deleted file mode 100644 index ac5e5df3f04d..000000000000 --- a/sci-libs/proj/proj-9.2.1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2023 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.13.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 ~loong ~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=( - -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() { - 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.3.0-r1.ebuild b/sci-libs/proj/proj-9.3.0-r1.ebuild new file mode 100644 index 000000000000..f605561280c2 --- /dev/null +++ b/sci-libs/proj/proj-9.3.0-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 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.15.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 ~loong ~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 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-geotiff.patch +) + +src_unpack() { + unpack ${P}.tar.gz + + cd "${S}"/data || die + mv README README.DATA || die + + unpack ${PROJ_DATA} +} + +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() { + 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.3.0.ebuild b/sci-libs/proj/proj-9.3.0.ebuild deleted file mode 100644 index d161662887a4..000000000000 --- a/sci-libs/proj/proj-9.3.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2023 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.15.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 ~loong ~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=( - -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() { - 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 -} -- cgit v1.2.3