version bump

Signed-off-by: Alexis Ballier <aballier@gentoo.org>
(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

3 files changed, 87 insertions, 9 deletions

diff --git a/sci-libs/rtabmap/ChangeLog b/sci-libs/rtabmap/ChangeLog
index 1cca9270632a..08055e33a25f 100644
--- a/sci-libs/rtabmap/ChangeLog
+++ b/sci-libs/rtabmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/rtabmap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/rtabmap/ChangeLog,v 1.4 2015/02/16 08:12:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/rtabmap/ChangeLog,v 1.5 2015/05/18 07:53:59 aballier Exp $
+
+*rtabmap-0.9.0 (18 May 2015)
+
+  18 May 2015; Alexis Ballier <aballier@gentoo.org> +rtabmap-0.9.0.ebuild,
+  rtabmap-9999.ebuild:
+  version bump
 
 *rtabmap-0.8.3 (16 Feb 2015)
 
diff --git a/sci-libs/rtabmap/rtabmap-0.9.0.ebuild b/sci-libs/rtabmap/rtabmap-0.9.0.ebuild
new file mode 100644
index 000000000000..7cb1680af724
--- /dev/null
+++ b/sci-libs/rtabmap/rtabmap-0.9.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/rtabmap/rtabmap-0.9.0.ebuild,v 1.1 2015/05/18 07:53:59 aballier Exp $
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
+fi
+
+inherit ${SCM} cmake-utils multilib
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
+HOMEPAGE="http://introlab.github.io/rtabmap/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="ieee1394 openni2 qt4 qt5"
+
+RDEPEND="
+	media-libs/opencv:=
+	sci-libs/pcl[openni]
+	sci-libs/vtk
+	sys-libs/zlib
+	ieee1394? ( media-libs/libdc1394 )
+	openni2? ( dev-libs/OpenNI2 )
+	!qt5? (
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtsvg:4
+			dev-qt/qtcore:4
+		)
+	)
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=()
+	use ieee1394 || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_DC1394=TRUE" )
+	use openni2  || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_OpenNI2=TRUE" )
+	use qt4      || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=TRUE" )
+	use qt5      && mycmakeargs+=( "-DRTABMAP_QT_VERSION=5" )
+	cmake-utils_src_configure
+}
diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild
index d80f33b2fb3d..bde80c374bf7 100644
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild
+++ b/sci-libs/rtabmap/rtabmap-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/rtabmap/rtabmap-9999.ebuild,v 1.2 2015/01/12 09:41:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/rtabmap/rtabmap-9999.ebuild,v 1.3 2015/05/18 07:53:59 aballier Exp $
 
 EAPI=5
 
@@ -24,25 +24,37 @@ DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
 HOMEPAGE="http://introlab.github.io/rtabmap/"
 LICENSE="BSD"
 SLOT="0"
-IUSE="qt4 openni2"
+IUSE="ieee1394 openni2 qt4 qt5"
 
 RDEPEND="
 	media-libs/opencv:=
 	sci-libs/pcl[openni]
 	sci-libs/vtk
 	sys-libs/zlib
+	ieee1394? ( media-libs/libdc1394 )
 	openni2? ( dev-libs/OpenNI2 )
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-		dev-qt/qtcore:4
+	!qt5? (
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtsvg:4
+			dev-qt/qtcore:4
+		)
+	)
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
 	)
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_configure() {
-	use openni2 || sed -e 's/OpenNI2)/DiSaBlEd)/' -i CMakeLists.txt || die
-	use qt4     || sed -e 's/Qt4/DiSaBlEd/' -i CMakeLists.txt || die
+	local mycmakeargs=()
+	use ieee1394 || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_DC1394=TRUE" )
+	use openni2  || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_OpenNI2=TRUE" )
+	use qt4      || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=TRUE" )
+	use qt5      && mycmakeargs+=( "-DRTABMAP_QT_VERSION=5" )
 	cmake-utils_src_configure
 }