[gentoo-commits] repo/gentoo:master commit in: sci-libs/pdal/, sci-libs/pdal/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     c1484244e59b0cb38f35221f62f971c0898ee6dd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 13:44:06 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct  9 18:29:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1484244

sci-libs/pdal: drop 2.3.0

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/pdal/Manifest                             |   1 -
 .../pdal-2.3.0-fix_cmake_install_location.patch    |  17 ----
 .../files/pdal-2.3.0-fix_tests_for_proj811.patch   | 110 ---------------------
 .../pdal/files/pdal-2.3.0-upgrade_cmake_min.patch  |  77 ---------------
 sci-libs/pdal/pdal-2.3.0.ebuild                    |  60 -----------
 5 files changed, 265 deletions(-)

diff --git a/sci-libs/pdal/Manifest b/sci-libs/pdal/Manifest
index 0819a558369b..7066dee406c7 100644
--- a/sci-libs/pdal/Manifest
+++ b/sci-libs/pdal/Manifest
@@ -1,2 +1 @@
-DIST PDAL-2.3.0-src.tar.gz 110530128 BLAKE2B 435997e7ae7fe84ff77d8546e68ce6d32e54a221b5a4bbea45543554355506d7900f65ebb47a4f5333d0f3a44192ffe548178b6b3e8b3b7575d3c104618e288b SHA512 9de87de7370175e76b95d3ec08667eb28b90a63eed8133f144427ff931e575d1f37aa13496f12054577539ee552458475dd054bcbdedfabe52eb0e32c4483d05
 DIST PDAL-2.4.0-src.tar.gz 113449697 BLAKE2B 8f774555d32ad4f0afe6dd850e6dcaf33b58c02934207ee2224230af762a7d3062a48909e267abf790a97a1d11788bb7543971c99239e5ae742d7945db09bda5 SHA512 655fadd2b435ed1cb801ba542028bcc15156da9266eedde93b2210dbadbc50d36b0b6a151062113f2adfb68a2938e2b867438a5a94952a7b3e46f59a53b47623

diff --git a/sci-libs/pdal/files/pdal-2.3.0-fix_cmake_install_location.patch b/sci-libs/pdal/files/pdal-2.3.0-fix_cmake_install_location.patch
deleted file mode 100644
index 65e32100d18d..000000000000
--- a/sci-libs/pdal/files/pdal-2.3.0-fix_cmake_install_location.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/cmake/config.cmake.orig	2022-02-19 13:06:41.654048306 +0100
-+++ b/cmake/config.cmake	2022-02-19 13:07:21.007165692 +0100
-@@ -6,7 +6,7 @@
- configure_package_config_file(
-   PDALConfig.cmake.in
-   ${CMAKE_CURRENT_BINARY_DIR}/PDALConfig.cmake
--  INSTALL_DESTINATION ${LIB_INSTALL_DIR}/cmake/PDAL
-+  INSTALL_DESTINATION ${PDAL_LIB_INSTALL_DIR}/cmake/PDAL
-   PATH_VARS INCLUDE_INSTALL_DIR LIB_INSTALL_DIR)
- 
- write_basic_package_version_file(
-@@ -17,4 +17,4 @@
- install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/PDALConfig.cmake
-   ${CMAKE_CURRENT_BINARY_DIR}/PDALConfigVersion.cmake
--  DESTINATION ${LIB_INSTALL_DIR}/cmake/PDAL)
-+  DESTINATION ${PDAL_LIB_INSTALL_DIR}/cmake/PDAL)

diff --git a/sci-libs/pdal/files/pdal-2.3.0-fix_tests_for_proj811.patch b/sci-libs/pdal/files/pdal-2.3.0-fix_tests_for_proj811.patch
deleted file mode 100644
index 6a34686330f4..000000000000
--- a/sci-libs/pdal/files/pdal-2.3.0-fix_tests_for_proj811.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From https://github.com/PDAL/PDAL/commit/1a7415f67cfe13f816345ce4b7fc1c68f0a45c83
-Bug https://bugs.gentoo.org/833820
-From: Andrew Bell <andrew.bell.ia@gmail.com>
-Date: Thu, 7 Oct 2021 11:15:18 -0400
-Subject: [PATCH] Work around test issues with varying versions of PROJ (#3560)
-
-* Add range for crop because of varying proj precision.
-
-* Fix tests for PROJ 8.1.1
-
-* More test workaround for proj.
----
- test/unit/filters/CropFilterTest.cpp | 10 +++++++
- test/unit/io/EptReaderTest.cpp       | 41 +++++++++++++++++++++++++++-
- 2 files changed, 50 insertions(+), 1 deletion(-)
-
-diff --git a/test/unit/filters/CropFilterTest.cpp b/test/unit/filters/CropFilterTest.cpp
-index 23ccb465bc..f4b825c891 100644
---- a/test/unit/filters/CropFilterTest.cpp
-+++ b/test/unit/filters/CropFilterTest.cpp
-@@ -250,7 +250,17 @@ TEST(CropFilterTest, test_crop_polygon_reprojection)
-     PointViewSet viewSet = crop.execute(table);
-     EXPECT_EQ(viewSet.size(), 1u);
-     view = *viewSet.begin();
-+//ABELL - I'd like to do the following, but we don't necessarily have proj.h
-+/**
-+#if defined(PROJ_VERSION_NUMBER) && PROJ_VERSION_NUMBER > 80101
-+    EXPECT_EQ(view->size(), 45u);
-+#else
-     EXPECT_EQ(view->size(), 47u);
-+#endif
-+**/
-+// So instead...
-+    EXPECT_GE(view->size(), 45u);
-+    EXPECT_LE(view->size(), 47u);
- 
-     FileUtils::closeFile(wkt_stream);
- }
-diff --git a/test/unit/io/EptReaderTest.cpp b/test/unit/io/EptReaderTest.cpp
-index ab5cfdee4a..0d274d4c08 100644
---- a/test/unit/io/EptReaderTest.cpp
-+++ b/test/unit/io/EptReaderTest.cpp
-@@ -625,8 +625,21 @@ TEST(EptReaderTest, boundedCrop)
-     }
- 
-     EXPECT_EQ(eptNp, sourceNp);
-+
-+//ABELL - A change in proj changed the numbers, but we don't necessarily have proj.h
-+/**
-+#if defined(PROJ_VERSION_NUMBER) && PROJ_VERSION_NUMBER > 80101
-+    EXPECT_EQ(eptNp, 45u);
-+    EXPECT_EQ(sourceNp, 45u);
-+#else
-     EXPECT_EQ(eptNp, 47u);
-     EXPECT_EQ(sourceNp, 47u);
-+#endif
-+**/
-+    EXPECT_GE(eptNp, 45u);
-+    EXPECT_GE(sourceNp, 45u);
-+    EXPECT_LE(eptNp, 47u);
-+    EXPECT_LE(sourceNp, 47u);
- }
- 
- TEST(EptReaderTest, polygonAndBoundsCrop)
-@@ -769,8 +782,20 @@ TEST(EptReaderTest, boundedCropReprojection)
-         sourceNp += view->size();
- 
-     EXPECT_EQ(eptNp, sourceNp);
-+//ABELL - We don't necessarily have proj.h, so we can't do this:
-+/**
-+#if defined(PROJ_VERSION_NUMBER) && PROJ_VERSION_NUMBER > 80101
-+    EXPECT_EQ(eptNp, 45u);
-+    EXPECT_EQ(sourceNp, 45u);
-+#else
-     EXPECT_EQ(eptNp, 47u);
-     EXPECT_EQ(sourceNp, 47u);
-+#endif
-+**/
-+    EXPECT_GE(eptNp, 45u);
-+    EXPECT_GE(sourceNp, 45u);
-+    EXPECT_LE(eptNp, 47u);
-+    EXPECT_LE(sourceNp, 47u);
- }
- 
- 
-@@ -811,9 +836,23 @@ TEST(EptReaderTest, ogrCrop)
-     for (const PointViewPtr& view : source.execute(sourceTable))
-         sourceNp += view->size();
- 
--    EXPECT_EQ(eptNp, sourceNp);
-+//ABELL - PROJ changed to make the number of points that pass the filter different from
-+//  what's in the file we've got stored.
-+//    EXPECT_EQ(eptNp, sourceNp);
-+//ABELL -  We don't necessarily have proj.h, so can't do the following:
-+/**
-+#if defined(PROJ_VERSION_NUMBER) && PROJ_VERSION_NUMBER > 80101
-+    EXPECT_EQ(eptNp, 89u);
-+    EXPECT_EQ(sourceNp, 89u);
-+#else
-     EXPECT_EQ(eptNp, 86u);
-     EXPECT_EQ(sourceNp, 86u);
-+#endif
-+**/
-+    EXPECT_LE(eptNp, 89u);
-+    EXPECT_LE(sourceNp, 89u);
-+    EXPECT_GE(eptNp, 86u);
-+    EXPECT_GE(sourceNp, 86u);
- }
- 
- } // namespace pdal

diff --git a/sci-libs/pdal/files/pdal-2.3.0-upgrade_cmake_min.patch b/sci-libs/pdal/files/pdal-2.3.0-upgrade_cmake_min.patch
deleted file mode 100644
index 9b712cb0e789..000000000000
--- a/sci-libs/pdal/files/pdal-2.3.0-upgrade_cmake_min.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
-index 8dd8845f35..c4b7e37543 100644
---- a/apps/CMakeLists.txt
-+++ b/apps/CMakeLists.txt
-@@ -3,7 +3,7 @@
- #
- # (based originally on the libLAS files copyright Mateusz Loskot)
- 
--cmake_minimum_required(VERSION 2.8)
-+cmake_minimum_required(VERSION 3.5)
- 
- #------------------------------------------------------------------------------
- # Configure build targets
-diff --git a/cmake/ctest.cmake b/cmake/ctest.cmake
-index a8382aaef5..98035205d1 100644
---- a/cmake/ctest.cmake
-+++ b/cmake/ctest.cmake
-@@ -5,7 +5,7 @@ if(ENABLE_CTEST)
-     if (WITH_TESTS)
-         message(STATUS
-             "Enable CTest to support submissions of results to CDash at http://cdash.org")
--        cmake_minimum_required(VERSION 2.8.0)
-+        cmake_minimum_required(VERSION 3.5.0)
-         #
-         # Dashboard has been prepared for experiments
-         # http://my.cdash.org/index.php?project=PDAL
-diff --git a/dimbuilder/CMakeLists.txt b/dimbuilder/CMakeLists.txt
-index 09d334f1f8..9aa9742f63 100644
---- a/dimbuilder/CMakeLists.txt
-+++ b/dimbuilder/CMakeLists.txt
-@@ -2,7 +2,7 @@
- # The seemingly strange arrangement of this cmake file allows you to build
- # this application as a standalone.
- #
--cmake_minimum_required(VERSION 2.8.6)
-+cmake_minimum_required(VERSION 3.5)
- 
- set(MAKE_COLOR_MAKEFILE ON)
- 
-diff --git a/plugins/rdb/CMakeLists.txt b/plugins/rdb/CMakeLists.txt
-index 2ec0adcf92..2e8ae422de 100644
---- a/plugins/rdb/CMakeLists.txt
-+++ b/plugins/rdb/CMakeLists.txt
-@@ -1,6 +1,6 @@
- 
- if (STANDALONE)
--cmake_minimum_required(VERSION 3.1)
-+cmake_minimum_required(VERSION 3.5)
- set(ROOT_DIR "../../${PROJECT_SOURCE_DIR}")
- include(../../cmake/common.cmake NO_POLICY_SCOPE)
- include(FeatureSummary)
-diff --git a/tools/lasdump/CMakeLists.txt b/tools/lasdump/CMakeLists.txt
-index 8083a228d8..767d642e76 100644
---- a/tools/lasdump/CMakeLists.txt
-+++ b/tools/lasdump/CMakeLists.txt
-@@ -2,7 +2,7 @@
- # The seemingly strange arrangement of this cmake file allows you to build
- # lasdump as a standalone.
- #
--cmake_minimum_required(VERSION 2.8.6)
-+cmake_minimum_required(VERSION 3.5)
- 
- set(MAKE_COLOR_MAKEFILE ON)
- 
-diff --git a/vendor/gtest/CMakeLists.txt b/vendor/gtest/CMakeLists.txt
-index db292946a5..e41e59761e 100644
---- a/vendor/gtest/CMakeLists.txt
-+++ b/vendor/gtest/CMakeLists.txt
-@@ -53,7 +53,7 @@ else()
-   cmake_policy(SET CMP0048 NEW)
-   project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
- endif()
--cmake_minimum_required(VERSION 2.6.4)
-+cmake_minimum_required(VERSION 3.5)
- 
- if (POLICY CMP0063) # Visibility
-   cmake_policy(SET CMP0063 NEW)

diff --git a/sci-libs/pdal/pdal-2.3.0.ebuild b/sci-libs/pdal/pdal-2.3.0.ebuild
deleted file mode 100644
index e201138eb587..000000000000
--- a/sci-libs/pdal/pdal-2.3.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2021-2022 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/13"
-KEYWORDS="amd64 ~x86"
-IUSE="postgres test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/jsoncpp
-	net-misc/curl
-	sci-libs/gdal
-	sci-libs/libgeotiff
-	sci-geosciences/laszip
-	sys-libs/libunwind
-	sys-libs/zlib
-	postgres? ( dev-db/postgresql:*[xml] )
-	test? ( sci-libs/gdal[geos,jpeg,png] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix_cmake_install_location.patch
-	"${FILESDIR}"/${P}-upgrade_cmake_min.patch
-	"${FILESDIR}"/${P}-fix_tests_for_proj811.patch
-)
-
-S="${WORKDIR}/PDAL-${PV}-src"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PLUGIN_PGPOINTCLOUD="$(usex postgres)"
-		-DWITH_LAZPERF=OFF
-		-DWITH_LASZIP=ON
-		-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)'
-		--output-on-failure
-	)
-
-	cmake_src_test
-}