gentoo auto-resync : 04:03:2023 - 01:36:13

5 files changed, 2 insertions, 202 deletions

diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index b29a300fba59..b7aeb13fbfcc 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,10 +1,6 @@
-AUX pcl-1.12.0-cmake-targets.patch 818 BLAKE2B 6d0592ce47444514763719754670415f21098f4654756057cf384777572a2adf59d170d06c9800ba0a526c5b6a0349d90ece5fce1b5a8daeb895a0b75b2650dc SHA512 f619d1cebef985c74093020792c9fb58e820830b96060cc218292e7d96d41154b00b441eaf1394ecbe0dddf6c5cad4601a95d8afcd4b22b219f0970f62df7bd5
 AUX pcl-1.12.1-allow-configuration-of-install-dirs.patch 1188 BLAKE2B 5ffc3c22c10df8a14270ce1e6a3b0c2db0ed3c5e9154bfed366b87faf8a13546fbf78a88f0d52c4ca09e345ba9add384dad86a08963e0b496a2944293f38516b SHA512 ab4cb57d5d1e494501412d5fcd662f8d75f74a7cf768e948abc1270d11b7ec2bc90901630fa7ac6e96237507c9bfa4214594fc76c58f505bcf2f40e4e37487a8
 AUX pcl-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch 832 BLAKE2B e7095163cba68ee7487251506e19434050c4c7d4bb5feb6d0946356a607dad5555c7327dc1ba68761086b3708ad653256337a110983d9d656fa863dbf9a75896 SHA512 5581df74c9f6f0bd9613b7f158d0d799a4fdea512101001aafdf8eaa91c31e4570f4ce04f1b828730c9fa8082d00000e78055da87427301f04807c1087f1b8b2
-DIST pcl-1.12.0.tar.gz 68547886 BLAKE2B 1734af6fb44587cf52bf37802494fcdd7b3623f8fad6ca83ce40803912a48dc76a58263ba454678d18bc7ce46486c3053a5eed32947864db6653fd7381fada42 SHA512 ce0544fdd82bcc415f81a9c74d58e5f6da2d0e0aaa54238a2601eca90386774155f1e032e6fb55a9edbf467ffa5ebf2ad695ec652ab437b323b8c6241f81193f
 DIST pcl-1.12.1.tar.gz 68565637 BLAKE2B e93ecc9e562ba0ab6d91fbc9d890accacafe4558ddcf4950ed46d7f11bcc2b74111ea249ac2a300c2411f553f4d267467dbe77af54d8eb9538ce27e98f19a913 SHA512 5cef7699ad69df67129520b50405d62b6a1c37da791b472c112e4e0b9f24b4a37303344c774ec121370495492eee1e61c8565dee58aabec090795585365afc1b
-EBUILD pcl-1.12.0.ebuild 2202 BLAKE2B e9effe2dec08f45da94e6d749366bc95bfa1a36a24d183b8594612be4809140519ca98da18dbd05e58d4204a42d74155d1a642804ad86117faf4f8226a749548 SHA512 3d643fa885d1e42d3d65db743cca6d38dea426cc11e991b4d989498273363082acdd6abdfae660cd56943b599c6a681189afd2ae2917eb8de524fb4eb52e9da2
-EBUILD pcl-1.12.1-r2.ebuild 2596 BLAKE2B c9485345ed1a7d7ea377caf3e81e3f5ebbf10bfb0dc04a2d7e968da3c369cfae42c189238678ebe0e113c8071e2c98a7525ba84499c071056898dfba6c9d2bd3 SHA512 2cec871b728a708dfa504459238837a6bca30f1817c59e886e17798f4b555627681504f6c9a5a622a48801e087bae06016c5d1e9fd9e19a4748f7a5eb7c83b63
-EBUILD pcl-1.12.1.ebuild 2142 BLAKE2B f7b6612812bb74b69ca3a038fe209dc4689e9ac5535613ce9f17114da57cca429508dd1f34afa8c4ca4095308d3b9c7e7f8e287dd4a20f254f2e81458a7d1db1 SHA512 7612fad1bee914a0b11a3516a7cb005c72fbafff4124ba4454e0f0ea75d2efb0c70f38bbd1369d47b78312e648ee5aa97b6e00e93fdbdd6c5ee63283b68a7057
+EBUILD pcl-1.12.1-r2.ebuild 2595 BLAKE2B db156d1c94086de35cdf4932a82d18c4e59ea7733d1410d75030e4eb644f00ea5fb9463029b7735910cb8faae813c30e5f97eb9626a498b892787405385bc1fd SHA512 b17cae37d9f77bbdcad5ac5a8e3bde7e7da118bfaa5732df3a4076c009fd24d81c85700a24b709d0b933cfc5ef53ec0945d20b5661156315a6fa7312579bab71
 EBUILD pcl-9999.ebuild 2596 BLAKE2B c9485345ed1a7d7ea377caf3e81e3f5ebbf10bfb0dc04a2d7e968da3c369cfae42c189238678ebe0e113c8071e2c98a7525ba84499c071056898dfba6c9d2bd3 SHA512 2cec871b728a708dfa504459238837a6bca30f1817c59e886e17798f4b555627681504f6c9a5a622a48801e087bae06016c5d1e9fd9e19a4748f7a5eb7c83b63
 MISC metadata.xml 1126 BLAKE2B 3e04d24d862e13d5c89bfe4099660df099f1d498c376292f7984be6064953cdc972455c99cf4f7819bab537ee99f367269f593f266b5d517be9808b00a86b965 SHA512 2afabfca4c5a7f3da157e59e07015132c91b1b24e464a1fcfd0505ca51f27b53f3256657d0a5b8a8698f8136aecd3790e7e7f70de7c58cbf3017389bbb2cb6a1
diff --git a/sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch b/sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch
deleted file mode 100644
index 408216747792..000000000000
--- a/sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/PointCloudLibrary/pcl/pull/5012
-https://bugs.gentoo.org/810853
-
-From: Maarten de Vries <maarten@de-vri.es>
-Date: Wed, 3 Nov 2021 21:40:19 +0100
-Subject: [PATCH] Limit VTK_LIBRARIES to wanted components for VTK 9.0.
-
---- a/cmake/pcl_find_vtk.cmake
-+++ b/cmake/pcl_find_vtk.cmake
-@@ -119,6 +119,15 @@ else()
-   unset(HAVE_QVTK)
- endif()
- 
-+# Overwrite VTK_LIBRARIES with only the set we actually want for VTK >= 9.0.
-+# Otherwise, it will contain ALL available components.
-+if(NOT (VTK_VERSION VERSION_LESS 9.0))
-+  set(VTK_LIBRARIES)
-+  foreach(vtkComponent ${PCL_VTK_COMPONENTS})
-+    list(APPEND VTK_LIBRARIES VTK::${vtkComponent})
-+  endforeach()
-+endif()
-+
- if(PCL_SHARED_LIBS OR (NOT (PCL_SHARED_LIBS) AND NOT (VTK_BUILD_SHARED_LIBS)))
-   if(VTK_VERSION VERSION_LESS 9.0)
-     if(VTK_USE_FILE)
-
diff --git a/sci-libs/pcl/pcl-1.12.0.ebuild b/sci-libs/pcl/pcl-1.12.0.ebuild
deleted file mode 100644
index 5733df559779..000000000000
--- a/sci-libs/pcl/pcl-1.12.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
-fi
-
-inherit ${SCM} cmake multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-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/1.12"
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
-RESTRICT="!test? ( 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
-	)
-	usb? ( virtual/libusb:1 )
-	vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-"
-DEPEND="${RDEPEND}
-	!!dev-cpp/metslib
-	test? ( >=dev-cpp/gtest-1.6.0 )
-"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink )
-	virtual/pkgconfig"
-
-REQUIRED_USE="
-	openni? ( usb )
-	openni2? ( usb )
-	tutorials? ( doc )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.0-cmake-targets.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLIB_INSTALL_DIR=$(get_libdir)"
-		"-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_QT=$(usex qt5 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_TESTS=$(usex test TRUE FALSE)"
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/pcl/pcl-1.12.1-r2.ebuild b/sci-libs/pcl/pcl-1.12.1-r2.ebuild
index cc8d925c4502..ce701b54c21c 100644
--- a/sci-libs/pcl/pcl-1.12.1-r2.ebuild
+++ b/sci-libs/pcl/pcl-1.12.1-r2.ebuild
@@ -14,7 +14,7 @@ inherit ${SCM} cmake cuda
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm"
+	KEYWORDS="amd64 ~arm"
 	SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${P}"
 fi
diff --git a/sci-libs/pcl/pcl-1.12.1.ebuild b/sci-libs/pcl/pcl-1.12.1.ebuild
deleted file mode 100644
index a8ef973a1640..000000000000
--- a/sci-libs/pcl/pcl-1.12.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
-fi
-
-inherit ${SCM} cmake multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-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/1.12"
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
-RESTRICT="!test? ( 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
-	)
-	usb? ( virtual/libusb:1 )
-	vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-"
-DEPEND="${RDEPEND}
-	!!dev-cpp/metslib
-	test? ( >=dev-cpp/gtest-1.6.0 )
-"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink )
-	virtual/pkgconfig"
-
-REQUIRED_USE="
-	openni? ( usb )
-	openni2? ( usb )
-	tutorials? ( doc )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLIB_INSTALL_DIR=$(get_libdir)"
-		"-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_QT=$(usex qt5 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_TESTS=$(usex test TRUE FALSE)"
-	)
-	cmake_src_configure
-}