gentoo auto-resync : 20:01:2023 - 06:00:45

4 files changed, 158 insertions, 0 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 8703d33a300a..59a4f7cb8ba8 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/pdal/Manifest b/sci-libs/pdal/Manifest
index e3911c17e363..9c946fbc52b9 100644
--- a/sci-libs/pdal/Manifest
+++ b/sci-libs/pdal/Manifest
@@ -1,6 +1,9 @@
 AUX pdal-2.4.3-fix-test.patch 1168 BLAKE2B a5b532ac015408c60d7f16d9aa325a36f85cd2aff8e028daf837d99c51cc3b39077a0cca81ce4e6664fe9370835e0410fad46c8ac5b36895b4a62b269a59be01 SHA512 5eea4f07c0368000420f7ee12f1bd63661525547b4169e1f3493df02144e6054074072d1ef589651a840e1a6a9a7c4412d5d46d41cc485a2e7835e5cd163b3b1
+AUX pdal-2.5.0-fix-opt-abseil.patch 3875 BLAKE2B c24a2320aab5ccf627bf6bca7b6c18a980c1be0e33ad69c16b1343c619d880d15938896c39c630d7b2103b4eaa9a2445ea0cc550bad93abc6744c129d356600f SHA512 c45040f70a57d3be0f3c739a580d4a72c74d9f219393b17d34608b4318abc72a30cfabd66b518a1dea40b382b9c018816c86f59df2c754a985d99b55cd185787
 DIST PDAL-2.4.0-src.tar.gz 113449697 BLAKE2B 8f774555d32ad4f0afe6dd850e6dcaf33b58c02934207ee2224230af762a7d3062a48909e267abf790a97a1d11788bb7543971c99239e5ae742d7945db09bda5 SHA512 655fadd2b435ed1cb801ba542028bcc15156da9266eedde93b2210dbadbc50d36b0b6a151062113f2adfb68a2938e2b867438a5a94952a7b3e46f59a53b47623
 DIST PDAL-2.4.3-src.tar.gz 100758279 BLAKE2B 7c157bb51416b24bd8896a62e71a186bc9a45b34d5ab58fadbe691cb1abc9595f598fcf92ec528c9103f646c21f940b26fbf199a998e707d17f1527eb2957a85 SHA512 ed342c29d10c0506e1c0f5ee4dba531189000dd0cc6912f681a95b7c56483d6136e515771a174e20906b1cd81dfd101d53be0cbaf200480d81d053d7dec8a386
+DIST PDAL-2.5.0-src.tar.gz 105190336 BLAKE2B 6dc303abdf98c07a64a1709bf6069d003cddffef976874e635caf950a291aa7dbdffa0c374a83678f7661ccccd5dd7b8d16dacfbe53354954265f688bdce1def SHA512 10545ad44efbb7a654d596d4a861a81177d61a602ff8425965def5dd99e1595a7873c741f99eefcd7ae5dc7f438b321b51399db3b33fb8eddf46bec8394472b4
 EBUILD pdal-2.4.0-r1.ebuild 1213 BLAKE2B 0d780865c514764e77958ef362dff3c5593148c7f9f6d9af06ba28cf5b778f3cdd3056fbe4a3f0485041339ea9022806bcff4d2a7dff913733e98d436c7452df SHA512 116651a1910b2aa95a02237adfeb66144754e5b2b14c19e440b556f9411bf46f4d946cc813bdfa0651c83ad0cb76377827e4262df29d756db460142e8c6b8bb9
 EBUILD pdal-2.4.3.ebuild 1213 BLAKE2B 8c51699183dabfa41c580c864cc463b400daca4ec77b5dd478752f27c2f3a52067e3a9cd024691ec022b34d58ae55ec8e49bb0137c79ad0d0621cf157d05acb6 SHA512 5c5e6d6ad2b1281185a2cb3b222d9c42a0e27d7eb52df42a4f50c86ff874d95914753a0c6a002481e8d05d78d6ee3433368306084af141c4b078785a3dba2bc6
+EBUILD pdal-2.5.0.ebuild 1246 BLAKE2B 2c8b758431ca93f7ac8e6c15b0b7d1e57f51874971500cefb6b0cc980e9db8e624723ce3a2b3b5cd6bc77d877cf141b4432b55def5b65abf22cf3f5918d08f58 SHA512 e2be03299ede2721ee539093c51eb42808e291221ab69d328310f1b9267470d04e620dcbefb7150e60c710bf3108a4c819f0d143a22c4b9aa1e4005105ef79af
 MISC metadata.xml 799 BLAKE2B 44fff88edc36553687a49ecf5113b1f7f3c8d092e82ef4e45f0d96cf53cc619647f45b3d3439a5b98bf43a8965e1b80582e7b074489dcd69f6f3aad9e5c7f59a SHA512 da405bacd840b714fe274fa5ca658f7a51b0078054058dcce46f690b33e641579981739de9511f4a876ff0f88aec5c2dbaa59e4db035eb9a85bdd8e9725bc7c2
diff --git a/sci-libs/pdal/files/pdal-2.5.0-fix-opt-abseil.patch b/sci-libs/pdal/files/pdal-2.5.0-fix-opt-abseil.patch
new file mode 100644
index 000000000000..79a0f0d162b0
--- /dev/null
+++ b/sci-libs/pdal/files/pdal-2.5.0-fix-opt-abseil.patch
@@ -0,0 +1,94 @@
+From: https://github.com/PDAL/PDAL/commit/a3a8d6f1759f848b1ec6f3a2fcb3e6b40f12d892
+From: Howard Butler <hobu.inc@gmail.com>
+Date: Thu, 19 Jan 2023 09:58:47 -0600
+Subject: [PATCH] Make Abseil/re2 an opt-in, not required when Abseil is lazily
+ found (#3948)
+
+* address #3944, Abseil/re2 being required. It is now an opt-in
+
+* missing endif()
+
+* WITH_ABSEIL FALSE
+---
+ cmake/gtest.cmake   | 48 ++++++++++++++++++++++++---------------------
+ cmake/options.cmake |  4 ++++
+ 2 files changed, 30 insertions(+), 22 deletions(-)
+
+diff --git a/cmake/gtest.cmake b/cmake/gtest.cmake
+index c0a0d44ba5..df230a10b2 100644
+--- a/cmake/gtest.cmake
++++ b/cmake/gtest.cmake
+@@ -4,32 +4,36 @@ if (MSVC)
+     option(gtest_force_shared_crt "Always use shared Visual C++ run-time DLL" ON)
+ endif()
+ 
+-set(GOOGLETEST_VERSION 1.10.0)
++set(GOOGLETEST_VERSION 1.12.1)
+ add_subdirectory(vendor/gtest)
+ 
+ set(FPHSA_NAME_MISMATCHED 1) # Suppress warnings, see https://cmake.org/cmake/help/v3.17/module/FindPackageHandleStandardArgs.html
+-find_package(absl QUIET)
+-set(FPHSA_NAME_MISMATCHED 0)
+ 
+-if (absl_FOUND)
+-    find_package(re2 REQUIRED)
+ 
+-    if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13.0")
+-        cmake_policy(SET CMP0079 NEW)
++if (WITH_ABSEIL)
++    find_package(absl REQUIRED)
++    set(FPHSA_NAME_MISMATCHED 0)
++
++    if (absl_FOUND)
++        find_package(re2 REQUIRED)
++
++        if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13.0")
++            cmake_policy(SET CMP0079 NEW)
++        endif()
++        target_compile_definitions(gtest PUBLIC GTEST_HAS_ABSL=1)
++        target_compile_definitions(gtest_main PUBLIC GTEST_HAS_ABSL=1)
++        target_link_libraries(gtest PRIVATE absl::algorithm
++                                            absl::base
++                                            absl::flags
++                                            absl::flags_internal
++                                            absl::flags_usage
++                                            absl::flags_commandlineflag
++                                            absl::flags_parse
++                                            absl::debugging
++                                            absl::numeric
++                                            absl::strings
++                                            absl::utility
++                                            absl::failure_signal_handler)
++        target_link_libraries(gtest PUBLIC re2::re2)
+     endif()
+-    target_compile_definitions(gtest PUBLIC GTEST_HAS_ABSL=1)
+-    target_compile_definitions(gtest_main PUBLIC GTEST_HAS_ABSL=1)
+-    target_link_libraries(gtest PRIVATE absl::algorithm
+-                                        absl::base
+-                                        absl::flags
+-                                        absl::flags_internal
+-                                        absl::flags_usage
+-                                        absl::flags_commandlineflag
+-                                        absl::flags_parse
+-                                        absl::debugging
+-                                        absl::numeric
+-                                        absl::strings
+-                                        absl::utility
+-                                        absl::failure_signal_handler)
+-    target_link_libraries(gtest PRIVATE re2::re2)
+ endif()
+diff --git a/cmake/options.cmake b/cmake/options.cmake
+index 73be6788b2..ca3460e629 100644
+--- a/cmake/options.cmake
++++ b/cmake/options.cmake
+@@ -105,6 +105,10 @@ add_feature_info("Unit tests" WITH_TESTS "PDAL unit tests")
+ option(ENABLE_CTEST
+     "Enable CTest to support submissions of results to CDash at http://cdash.org" FALSE)
+ 
++option(WITH_ABSEIL
++    "Choose if PDAL should be built with Abseil support for testing" FALSE)
++add_feature_info("Abseil debugging support " WITH_ABSEIL "unit tests")
++
+ #
+ # Choose dependent options
+ #
diff --git a/sci-libs/pdal/pdal-2.5.0.ebuild b/sci-libs/pdal/pdal-2.5.0.ebuild
new file mode 100644
index 000000000000..04eb190ce7d6
--- /dev/null
+++ b/sci-libs/pdal/pdal-2.5.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A C++ library for translating and manipulating point cloud data"
+HOMEPAGE="https://pdal.io/"
+SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="postgres test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	net-misc/curl
+	app-arch/zstd:=
+	dev-libs/libxml2
+	dev-libs/openssl:=
+	sci-libs/gdal:=
+	sci-libs/libgeotiff:=
+	sys-libs/libunwind:=
+	sys-libs/zlib
+	postgres? ( dev-db/postgresql:*[xml] )
+"
+DEPEND="
+	test? ( sci-libs/gdal[geos,jpeg,png] )
+	${RDEPEND}
+"
+
+S="${WORKDIR}/PDAL-${PV}-src"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-opt-abseil.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PLUGIN_PGPOINTCLOUD="$(usex postgres)"
+		-DWITH_COMPLETION=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		--exclude-regex '(pgpointcloudtest|pdal_io_bpf_base_test|pdal_io_bpf_zlib_test|pdal_filters_overlay_test|pdal_filters_stats_test|pdal_app_plugin_test|pdal_merge_test|pdal_io_stac_reader_test)'
+		--output-on-failure
+		-j1
+	)
+
+	cmake_src_test
+}