commit: d429baf76dfbce3ce995e2524013635fada2ddfe
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 10:56:35 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 10:56:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d429baf7
sci-libs/pcl: bump to 1.8.0 and add subslot
Package-Manager: portage-2.3.0
sci-libs/pcl/Manifest | 1 +
sci-libs/pcl/{pcl-9999.ebuild => pcl-1.8.0.ebuild} | 17 +++++++++++------
sci-libs/pcl/pcl-9999.ebuild | 17 +++++++++++------
3 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 293b421..ae402fd 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1 +1,2 @@
DIST pcl-1.7.2.tar.gz 63474627 SHA256
479f84f2c658a6319b78271111251b4c2d6cf07643421b66bbc351d9bed0ae93 SHA512
23b24f35aa97a167083b0e94164af1c1e1b4b82e1ed7a2514b2453fb5001ad375cda983f4470b34b7b7f717f1399ccec1bcff7ce7f057cd25f024a58830cc2e9
WHIRLPOOL
f41f2aa964e617a7e554c5ecf18dc2fc92a87ea1358d3796b364d933c8353bbcf16da6e57409e191b99ca59d5cd7fce236ead29f130e6231949ea5f4c9624332
+DIST pcl-1.8.0.tar.gz 66811948 SHA256
9e54b0c1b59a67a386b9b0f4acb2d764272ff9a0377b825c4ed5eedf46ebfcf4 SHA512
185470e980a208bd7213e1087dbc81b9741ae6e8783984e306d34d3e0e4fa69d42aa9c3a2a276d260d11cb89fff9c6cf324401938a66cd3883bdeaa38994e6a1
WHIRLPOOL
1ed161cce3882353241e5720df4c092eff1b2561373b1620bebd98ffae2028eeb31a689377edd1bf1394b0474e221e14d3d0b0107848d37dd54bfbf731dbd91b
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-1.8.0.ebuild
similarity index 86%
copy from sci-libs/pcl/pcl-9999.ebuild
copy to sci-libs/pcl/pcl-1.8.0.ebuild
index 528691c..c5c91fc 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -24,8 +24,8 @@ fi
HOMEPAGE="http://pointclouds.org/";
DESCRIPTION="2D/3D image and point cloud processing"
LICENSE="BSD"
-SLOT="0"
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt4 usb vtk
cpu_flags_x86_sse test tutorials"
+SLOT="0/1.8"
+IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk
cpu_flags_x86_sse test tutorials"
RDEPEND="
>=sci-libs/flann-1.7.1
@@ -37,9 +37,14 @@ RDEPEND="
pcap? ( net-libs/libpcap )
png? ( media-libs/libpng:0= )
qhull? ( media-libs/qhull )
- qt4? ( dev-qt/qtgui:4 )
+ 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,qt4?] )
+ vtk? ( >=sci-libs/vtk-5.6[imaging,rendering] )
cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
"
DEPEND="${RDEPEND}
@@ -63,7 +68,7 @@ src_configure() {
"-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
"-DWITH_PNG=$(usex png TRUE FALSE)"
"-DWITH_QHULL=$(usex qhull TRUE FALSE)"
- "-DWITH_QT=$(usex qt4 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)"
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild
index 528691c..c5c91fc 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -24,8 +24,8 @@ fi
HOMEPAGE="http://pointclouds.org/";
DESCRIPTION="2D/3D image and point cloud processing"
LICENSE="BSD"
-SLOT="0"
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt4 usb vtk
cpu_flags_x86_sse test tutorials"
+SLOT="0/1.8"
+IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk
cpu_flags_x86_sse test tutorials"
RDEPEND="
>=sci-libs/flann-1.7.1
@@ -37,9 +37,14 @@ RDEPEND="
pcap? ( net-libs/libpcap )
png? ( media-libs/libpng:0= )
qhull? ( media-libs/qhull )
- qt4? ( dev-qt/qtgui:4 )
+ 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,qt4?] )
+ vtk? ( >=sci-libs/vtk-5.6[imaging,rendering] )
cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
"
DEPEND="${RDEPEND}
@@ -63,7 +68,7 @@ src_configure() {
"-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
"-DWITH_PNG=$(usex png TRUE FALSE)"
"-DWITH_QHULL=$(usex qhull TRUE FALSE)"
- "-DWITH_QT=$(usex qt4 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)"
