5 files changed, 95 insertions, 35 deletions
diff --git a/x11-drivers/libfreenect/ChangeLog b/x11-drivers/libfreenect/ChangeLog
index 9dd6f811a..754ac050f 100644
--- a/x11-drivers/libfreenect/ChangeLog
+++ b/x11-drivers/libfreenect/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Jan 2011; Matthew Schultz (mschultz) <mattsch@gmail.com>
+  -libfreenect-0.0.1_p20110105.ebuild,
+  +libfreenect-0.0.1_p20110105-r1.ebuild, metadata.xml:
+  Added several use flags and added library support for opencv and python.
+
   23 Jan 2011; Matthew Schultz (mschultz) <mattsch@gmail.com>
   +files/51-kinect.rules, +libfreenect-0.0.1_p20110105.ebuild,
   +metadata.xml:
diff --git a/x11-drivers/libfreenect/Manifest b/x11-drivers/libfreenect/Manifest
index 7e1fda7a2..a27fd95d9 100644
--- a/x11-drivers/libfreenect/Manifest
+++ b/x11-drivers/libfreenect/Manifest
@@ -1,5 +1,5 @@
 AUX 51-kinect.rules 384 RMD160 9de784f7a2284e07b7db061159aaee8704e82241 SHA1 04cbcb9d5bbd5aaf25619567580ebbfe8582ac90 SHA256 447878c45d095acf01e14fe284e71bfb9406dec5e8072110027885bc27484352
 DIST libfreenect-0.0.1_p20110105.tar.bz2 1541523 RMD160 dc367e67f883404e948c4e413210a109c9d22f38 SHA1 1bdf91bc82e4ed467121c87099c3040eb7cdd580 SHA256 128fa3896695d4bfd1542a6172279becaa260e74b404e9562a1b7dbd2973bb95
-EBUILD libfreenect-0.0.1_p20110105.ebuild 733 RMD160 18f776716ea3ab304e72f7ea97d3856d0fb080b7 SHA1 c162ea31ef662f7f920a751230b8ad5195ffc831 SHA256 09474facbe377f97f7485bd921c6e0d3233d08aa44b8e40125980b223e0662a7
-MISC ChangeLog 295 RMD160 2e1a6ddd9a48b68324e1ac1e31571c611bb0015f SHA1 bf757ad8f6a1bea03d1c765ddbe94c47f1537890 SHA256 6e4c3e313bd0e843bcf78ac51b466c086e8847f89db78c9bee57895e9e867053
-MISC metadata.xml 319 RMD160 7bb8d8509a4e94472f3b4c749c1eacee2df6f799 SHA1 ce84c58e3d04e80de3872ea0ce9673fc22abedba SHA256 b24ba619fbee4f46cf0d840f11919834317cf2459165189bf753776e1ca7166f
+EBUILD libfreenect-0.0.1_p20110105-r1.ebuild 1977 RMD160 9204cb19a775a9096ab61c5b29de8db86bc2d427 SHA1 e641f67fa73c2366d57be780e777a8a934fe4424 SHA256 3f0cda1ae3384db3c71b5f1cef29b598e63c22a37fe30d0d7da214a79762450d
+MISC ChangeLog 528 RMD160 a6ff1fde90e75c1281f77871722d0d11ce5e5c81 SHA1 628ea783f40e0fb4b06455396384fc5e9f0e9623 SHA256 27346ab3d4c516eefa9e5887337b35f593e63e1c09357d8526f3a760f9cce57c
+MISC metadata.xml 633 RMD160 6e4c440c3acc94e831365496acd1870e118eb793 SHA1 5217ae0ce95b0c503595c6cc9834ba73c0df6dca SHA256 6ea6be4ea63eb7d6065ac7a1f85850ebaddd5bba8ecf19b369815464080dbd4d
diff --git a/x11-drivers/libfreenect/libfreenect-0.0.1_p20110105-r1.ebuild b/x11-drivers/libfreenect/libfreenect-0.0.1_p20110105-r1.ebuild
new file mode 100644
index 000000000..be9015fbb
--- /dev/null
+++ b/x11-drivers/libfreenect/libfreenect-0.0.1_p20110105-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit cmake-utils multilib python
+
+DESCRIPTION="Drivers and libraries for the Xbox Kinect device"
+HOMEPAGE="https://github.com/OpenKinect/libfreenect"
+SRC_URI="http://ompldr.org/vNzQ5bg/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples fakenect c_sync opencv python"
+
+RDEPEND="dev-libs/libusb:1
+	examples? (
+		media-libs/freeglut
+		virtual/opengl
+	)
+	opencv? ( media-libs/opencv )
+	python? ( dev-python/numpy )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build examples)
+		$(cmake-utils_use_build fakenect)
+		$(cmake-utils_use_build examples CPP)
+		$(cmake-utils_use_build opencv CV)
+		$(cmake-utils_use_build python)
+	)
+	# opencv & python requires c_sync
+	if ! use c_sync && ( use opencv || use python ); then
+		if use opencv; then
+			local useflag="opencv"
+		else
+			local useflag="python"
+		fi
+		ewarn "${useflag} requires c synchronous support to be enabled; c_sync enabled"
+	        mycmakeargs+=(
+			-DBUILD_C_SYNC=ON
+		)
+	else
+		mycmakeargs+=(
+			$(cmake-utils_use_build c_sync)
+		)
+	fi
+	if use python; then
+		#Add numpy core include path in python CMakeList.txt to allow compilation
+		sed -i -e "s|../c_sync/|$(python_get_sitedir)/numpy/core/include/ ../c_sync/|" "wrappers/python/CMakeLists.txt" || die
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	# Remove cvdemo if examples is not enabled
+	if use opencv && ! use examples; then
+		rm -f "${D}"/usr/bin/cvdemo || die
+	fi
+	insinto /$(get_libdir)/udev/rules.d/
+	doins "${FILESDIR}/51-kinect.rules" || die
+}
+
+pkg_postinst() {
+	elog "Make sure your user is in the 'video' group"
+	elog "Just run 'gpasswd -a <USER> video', then have <USER> re-login."
+}
diff --git a/x11-drivers/libfreenect/libfreenect-0.0.1_p20110105.ebuild b/x11-drivers/libfreenect/libfreenect-0.0.1_p20110105.ebuild
deleted file mode 100644
index a8316a471..000000000
--- a/x11-drivers/libfreenect/libfreenect-0.0.1_p20110105.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="1"
-
-inherit cmake-utils
-
-DESCRIPTION="Drivers and libraries for the Xbox Kinect device"
-HOMEPAGE="https://github.com/OpenKinect/libfreenect"
-SRC_URI="http://ompldr.org/vNzQ5bg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libusb:1
-	media-libs/freeglut"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install() {
-	cmake-utils_src_install
-	insinto /$(get_libdir)/udev/rules.d/
-	doins "${FILESDIR}/51-kinect.rules" || die
-}
-
-pkg_postinst() {
-	elog "Make sure your user is in the 'video' group"
-	elog "Just run 'gpasswd -a <USER> video', then have <USER> re-login."
-}
diff --git a/x11-drivers/libfreenect/metadata.xml b/x11-drivers/libfreenect/metadata.xml
index 3a21f5d17..a0e8615ee 100644
--- a/x11-drivers/libfreenect/metadata.xml
+++ b/x11-drivers/libfreenect/metadata.xml
@@ -4,4 +4,11 @@
   <herd>no-herd</herd>
   <maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
   <longdescription>Drivers and libraries for the Xbox Kinect device</longdescription>
+  <use>
+    <flag name="c_sync">Install C synchronous library</flag>
+    <flag name="fakenect">Install fakenect mock library</flag>
+    <flag name="examples">Install demo programs</flag>
+    <flag name="opencv">Install opencv library</flag>
+    <flag name="python">Install python library extension</flag>
+  </use>
 </pkgmetadata>