gentoo auto-resync : 26:11:2024 - 02:00:48

4 files changed, 43 insertions, 175 deletions

diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 67b8e27b41b2..f85b0e00ebcb 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -3,9 +3,7 @@ AUX pcl-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.pat
 AUX pcl-1.14.1-boost.patch 1155 BLAKE2B 09f41979ef2878bd062e14fc38e9525cea090729e9d49b3a55d95bfc375c42cee9b9d0af1578407d9bc467babcb11b15f4c600fe2b8e34e30e12fb50c83ab577 SHA512 88431830523552c45625b1931138e79b75eebe4be0432b263519fde24518942a92ef595b77e73fea393db6da8bfaba286f07644e3894fb8eb66ebaa8babe9588
 AUX pcl-1.14.1-gcc15.patch 2070 BLAKE2B 9baa1eda8a751c832fe875d9f941214f854bf70e0feba4f2793aadd3421898c6ce580f488f0daa35d102b63bf0aba7015d3552d0f6c97e456b4dfb9c47203433 SHA512 a15b13aee5d1e727072066c549a131e58f81bc804c2d9bc67cbec6da11a881a19a5438051f3eea4ad7c63ca7b4d92bc3105cc8ff8d58621a46f61a364077e7c3
 AUX pcl-1.14.1-tests.patch 785 BLAKE2B 3cd99c021f70dbf2239979772c642d60e1d4c0631b2c7dd7d732c0ed51ecfec2fa02e1c796115bd4242e0403524422f8a6a3fa0b1e47474d278770b5ea23a0b4 SHA512 0039aac3850b0fe29fb7ef416fc3f812462001c145406e196d60ab9ec4e4c325b3bd2e342bd423a89f9bc547c51ccd95184d8b548186b338b90f4b3262d5080c
-DIST pcl-1.14.0.tar.gz 68662907 BLAKE2B 5e797666b2a6cd5b828b399592daaa78c3bcbc0968c1ec5dafe441717bb4067de4604cdab11d3317370c7f69a1b29db0cca6348e91697d16846ae44c1952ce3e SHA512 0ea388d5f4ccdc1e5fcace6a1e1b90843be1a4ed2e1d37cc3c80d8abc0e868324d8f9da80513f1cb3f16738e00586f29cac151ce0d501645514f280aee8b1d7f
 DIST pcl-1.14.1.tar.gz 68672885 BLAKE2B 207389d844ac2793f6f321504c05282ace2d8e51aaf0277c13fb11f5be22ac93f7e044f34fc2259aca7d7e34ae3b9b00287ee9df0d15f851f1f4b4bd651578c7 SHA512 8e2d2839fe73a955d49b9a72861de2becf2da9a0dc906bd10ab8a3518e270a2f1900d801922d02871d704f2ed380273d35c2d0e04d8da7e24a21eb351c43c00b
-EBUILD pcl-1.14.0.ebuild 2783 BLAKE2B 9c7e1362d4078dcd6ce910751788ed3d3647a7d6aad4cb45f9fb632dbb0ce8f5d8947dd7d6890a9866c8ddb0aee9069799505a53f93d9c7bf94b52de0ed31fb4 SHA512 b6272250819871c32e703642f97e26f84c0682029b1d2406eca72e093c5eb8e6bc367a4655d81653dbd2dfefaa05eb1d86af8701ffd8ab0f26587d024ce6088c
-EBUILD pcl-1.14.1.ebuild 2948 BLAKE2B f34ae38659bad171e6e7c07162760c62b63d195f9a707b8675bd194f9df170a48f0befb879fdf9819640bad9584689e048528d1cd9f9334d2fff2fecb151f62b SHA512 ece5aa9aef1d65b9e28f16ac13f690f5e7eb2ca0a68cd2bb42781362f8e4ebb3673e8bbdea21cc7580a8cc98983edf28633412e33a204e2d1f87b4cf6421a408
-EBUILD pcl-9999.ebuild 2909 BLAKE2B 313fb46699bb0cb81146f0ee803866770a9021269f73260844ae07ff3ae141633f3ffbd3aba47e98fb20e9439418f5ccf5970d5f9f292504287aabb070d001a9 SHA512 dbf5f62e2191207f96f6ba2a7b30230b66da39e9153a2aee76585beed93e18f295fb8fec02e4e0b295606815c7224ce98a781f6af846c5a3817ebfea8d65380f
+EBUILD pcl-1.14.1-r1.ebuild 2761 BLAKE2B f0f960fff2c09adf816f4e0e369028535f320908c855af734c88daa90000836bab96704cbe06d7a5ba998855ce4ecd735b5fcb7ace6f5f5c7c4aa9d73a6f87d5 SHA512 a4e59b4cf6e3f8a9cccdcb3065aa22bb2f2557cf5edb6302d8b29b259af0cd77564494b6e701edf51d5b0a84aa5bd32f81d630e9faf5a9444de7308095e0ef56
+EBUILD pcl-9999.ebuild 2722 BLAKE2B a6b3462cd72c1540e66d9e2a83ceb2d268165fcdfcd33efd5c54c27d38d81eea9d3e666b3a0d5dcb695edd845dbcfd77c38ed3d8a4207b0d281a6d20c1092558 SHA512 b20241abd527a32e14a5f17973f7e2cf394be7b3a20ef8a7443f81a29d4b75cdf2d6dbfc5f834e3313d1311554749b6360714539f68e9c5d460bd5ac728505b7
 MISC metadata.xml 1069 BLAKE2B efb4dd7a8d1d65a7922da25e9f31e327b35cf88924be9dbc12ec2adc2e2d57017714ab931611d17b575daaa831934d9b90493be307ed668e24b7831bf4bd0106 SHA512 ac01ef352a9d6d66a02981585e8a19b01574a254639067520ab7422d89e5f095f84f7fc91a3e4f5b6dcb154ca0e487604aa1461bae6fa02a2037d7ca2668de3f
diff --git a/sci-libs/pcl/pcl-1.14.0.ebuild b/sci-libs/pcl/pcl-1.14.0.ebuild
deleted file mode 100644
index 6fc89d2b0d70..000000000000
--- a/sci-libs/pcl/pcl-1.14.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake cuda
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
-else
-	KEYWORDS="amd64 ~arm"
-	SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-HOMEPAGE="https://pointclouds.org/"
-DESCRIPTION="2D/3D image and point cloud processing"
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 qt6 usb vtk cpu_flags_x86_sse test tutorials"
-# tests need the gtest sources to be available at build time
-RESTRICT="test"
-
-RDEPEND="
-	>=sci-libs/flann-1.7.1
-	dev-libs/boost:=
-	dev-cpp/eigen:3
-	opengl? ( virtual/opengl media-libs/freeglut )
-	openni? ( dev-libs/OpenNI )
-	openni2? ( dev-libs/OpenNI2 )
-	pcap? ( net-libs/libpcap )
-	png? ( media-libs/libpng:0= )
-	qhull? ( media-libs/qhull:= )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtcore:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtopengl:5
-		vtk? ( sci-libs/vtk[qt5] )
-	)
-	qt6? (
-		!qt5? (
-			dev-qt/qtbase:6[concurrent,gui,opengl]
-			vtk? ( sci-libs/vtk[-qt5,qt6] )
-		)
-	)
-	usb? ( virtual/libusb:1 )
-	vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-"
-DEPEND="${RDEPEND}
-	!!dev-cpp/metslib
-"
-BDEPEND="
-	doc? (
-		app-text/doxygen[dot]
-		virtual/latex-base
-	)
-	tutorials? (
-		dev-python/sphinx
-		dev-python/sphinx-rtd-theme
-		dev-python/sphinxcontrib-doxylink
-	)
-	virtual/pkgconfig"
-
-REQUIRED_USE="
-	openni? ( usb )
-	openni2? ( usb )
-	tutorials? ( doc )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch
-	"${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch
-)
-
-src_prepare() {
-	if use cuda; then
-		cuda_src_prepare
-		cuda_add_sandbox -w
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DDOC_INSTALL_DIR=share/doc/${PF}"
-		"-DLIB_INSTALL_DIR=$(get_libdir)"
-		"-DPCLCONFIG_INSTALL_DIR=share/cmake/${PN}-$(ver_cut 1-2)"
-		"-DWITH_CUDA=$(usex cuda TRUE FALSE)"
-		"-DWITH_LIBUSB=$(usex usb TRUE FALSE)"
-		"-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
-		"-DWITH_PNG=$(usex png TRUE FALSE)"
-		"-DWITH_QHULL=$(usex qhull TRUE FALSE)"
-		"-DWITH_VTK=$(usex vtk TRUE FALSE)"
-		"-DWITH_PCAP=$(usex pcap TRUE FALSE)"
-		"-DWITH_OPENNI=$(usex openni TRUE FALSE)"
-		"-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)"
-		"-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
-		"-DWITH_DOCS=$(usex doc TRUE FALSE)"
-		"-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
-		"-DBUILD_global_tests=FALSE"
-	)
-
-	if use qt5; then
-		mycmakeargs+=( "-DWITH_QT=QT5" )
-	elif use qt6; then
-		mycmakeargs+=( "-DWITH_QT=QT6" )
-	else
-		mycmakeargs+=( "-DWITH_QT=NO" )
-	fi
-
-	cmake_src_configure
-}
diff --git a/sci-libs/pcl/pcl-1.14.1.ebuild b/sci-libs/pcl/pcl-1.14.1-r1.ebuild
index f13905c51f60..774a3e660967 100644
--- a/sci-libs/pcl/pcl-1.14.1.ebuild
+++ b/sci-libs/pcl/pcl-1.14.1-r1.ebuild
@@ -5,44 +5,45 @@ EAPI=8
 
 inherit cmake cuda
 
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
 else
-	KEYWORDS="amd64 ~arm"
 	SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${P}"
+	KEYWORDS="amd64 ~arm"
 fi
 
 DESCRIPTION="2D/3D image and point cloud processing"
 HOMEPAGE="https://pointclouds.org/"
+
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 qt6 usb vtk cpu_flags_x86_sse test tutorials"
+IUSE="cuda doc opengl openni openni2 pcap png +qhull qt6 usb vtk cpu_flags_x86_sse test tutorials"
+
+REQUIRED_USE="
+	openni? ( usb )
+	openni2? ( usb )
+	tutorials? ( doc )
+"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=sci-libs/flann-1.7.1
 	dev-libs/boost:=
 	dev-cpp/eigen:3
-	opengl? ( virtual/opengl media-libs/freeglut )
+	>=sci-libs/flann-1.7.1
+	opengl? (
+		media-libs/freeglut
+		virtual/opengl
+	)
 	openni? ( dev-libs/OpenNI )
 	openni2? ( dev-libs/OpenNI2 )
 	pcap? ( net-libs/libpcap )
 	png? ( media-libs/libpng:0= )
 	qhull? ( media-libs/qhull:= )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtcore:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtopengl:5
-		vtk? ( sci-libs/vtk[qt5] )
-	)
 	qt6? (
-		!qt5? (
-			dev-qt/qtbase:6[concurrent,gui,opengl]
-			vtk? ( sci-libs/vtk[-qt5,qt6] )
-		)
+		dev-qt/qtbase:6[concurrent,gui,opengl]
+		vtk? ( sci-libs/vtk[-qt5,qt6] )
 	)
 	usb? ( virtual/libusb:1 )
 	vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] )
@@ -65,18 +66,12 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="
-	openni? ( usb )
-	openni2? ( usb )
-	tutorials? ( doc )
-"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch
 	"${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch
-	"${FILESDIR}/${PN}-1.14.1-gcc15.patch"
-	"${FILESDIR}/${PN}-1.14.1-tests.patch"
-	"${FILESDIR}/${PN}-1.14.1-boost.patch"
+	"${FILESDIR}"/${PN}-1.14.1-gcc15.patch
+	"${FILESDIR}"/${PN}-1.14.1-tests.patch
+	"${FILESDIR}"/${PN}-1.14.1-boost.patch
 )
 
 src_prepare() {
@@ -108,9 +103,7 @@ src_configure() {
 		-DBUILD_global_tests="$(usex test)"
 	)
 
-	if use qt5; then
-		mycmakeargs+=( "-DWITH_QT=QT5" )
-	elif use qt6; then
+	if use qt6; then
 		mycmakeargs+=( "-DWITH_QT=QT6" )
 	else
 		mycmakeargs+=( "-DWITH_QT=NO" )
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild
index b5d59362af57..01025ec4ffd0 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.ebuild
@@ -5,44 +5,45 @@ EAPI=8
 
 inherit cmake cuda
 
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
 else
-	KEYWORDS="~amd64 ~arm"
 	SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${P}"
+	KEYWORDS="~amd64 ~arm"
 fi
 
 DESCRIPTION="2D/3D image and point cloud processing"
 HOMEPAGE="https://pointclouds.org/"
+
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 qt6 usb vtk cpu_flags_x86_sse test tutorials"
+IUSE="cuda doc opengl openni openni2 pcap png +qhull qt6 usb vtk cpu_flags_x86_sse test tutorials"
+
+REQUIRED_USE="
+	openni? ( usb )
+	openni2? ( usb )
+	tutorials? ( doc )
+"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=sci-libs/flann-1.7.1
 	dev-libs/boost:=
 	dev-cpp/eigen:3
-	opengl? ( virtual/opengl media-libs/freeglut )
+	>=sci-libs/flann-1.7.1
+	opengl? (
+		media-libs/freeglut
+		virtual/opengl
+	)
 	openni? ( dev-libs/OpenNI )
 	openni2? ( dev-libs/OpenNI2 )
 	pcap? ( net-libs/libpcap )
 	png? ( media-libs/libpng:0= )
 	qhull? ( media-libs/qhull:= )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtcore:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtopengl:5
-		vtk? ( sci-libs/vtk[qt5] )
-	)
 	qt6? (
-		!qt5? (
-			dev-qt/qtbase:6[concurrent,gui,opengl]
-			vtk? ( sci-libs/vtk[-qt5,qt6] )
-		)
+		dev-qt/qtbase:6[concurrent,gui,opengl]
+		vtk? ( sci-libs/vtk[-qt5,qt6] )
 	)
 	usb? ( virtual/libusb:1 )
 	vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] )
@@ -65,17 +66,11 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="
-	openni? ( usb )
-	openni2? ( usb )
-	tutorials? ( doc )
-"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch
 	"${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch
-	"${FILESDIR}/${PN}-1.14.1-gcc15.patch"
-	"${FILESDIR}/${PN}-1.14.1-tests.patch"
+	"${FILESDIR}"/${PN}-1.14.1-gcc15.patch
+	"${FILESDIR}"/${PN}-1.14.1-tests.patch
 )
 
 src_prepare() {
@@ -107,9 +102,7 @@ src_configure() {
 		-DBUILD_global_tests="$(usex test)"
 	)
 
-	if use qt5; then
-		mycmakeargs+=( "-DWITH_QT=QT5" )
-	elif use qt6; then
+	if use qt6; then
 		mycmakeargs+=( "-DWITH_QT=QT6" )
 	else
 		mycmakeargs+=( "-DWITH_QT=NO" )