--- /var/package-manager/portage/media-libs/opencv/opencv-2.4.7.ebuild	2013-12-07 18:31:21.000000000 +0400
+++ /var/package-manager/portage/media-libs/opencv/opencv-2.4.7.ebuild	2014-01-21 01:57:09.000000000 +0400
@@ -1,11 +1,11 @@ 
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.7.ebuild,v 1.2 2013/12/07 14:31:01 dilfridge Exp $
 
 EAPI=5
-PYTHON_DEPEND="2:2.6"
+PYTHON_COMPAT=( python2_{6,7} )
 
-inherit base toolchain-funcs cmake-utils python java-pkg-opt-2 java-ant-2
+inherit base toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
 
 DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
 HOMEPAGE="http://opencv.willowgarage.com"
@@ -14,14 +14,18 @@ 
 LICENSE="BSD"
 SLOT="0/2.4"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~amd64-linux"
-IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl openmp pch png qt4 testprograms threads tiff v4l xine"
+IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl openmp pch png python qt4 testprograms threads tiff v4l xine"
+REQUIRED_USE="
+	gtk? ( !qt4 )
+	opengl? ( || ( gtk qt4 ) )
+	openmp? ( !threads )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
 
 RDEPEND="
 	app-arch/bzip2
-	dev-python/numpy
 	sys-libs/zlib
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
-	eigen? ( dev-cpp/eigen:2 )
 	ffmpeg? ( virtual/ffmpeg )
 	gstreamer? (
 		media-libs/gstreamer:0.10
@@ -30,6 +34,7 @@ 
 	gtk? (
 		dev-libs/glib:2
 		x11-libs/gtk+:2
+		opengl? ( x11-libs/gtkglext )
 	)
 	java? ( >=virtual/jre-1.6 )
 	jpeg? ( virtual/jpeg )
@@ -41,8 +46,9 @@ 
 	ipp? ( sci-libs/ipp )
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr )
-	opengl? ( virtual/glu )
+	opengl? ( virtual/opengl virtual/glu )
 	png? ( media-libs/libpng:0= )
+	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
 	qt4? (
 		dev-qt/qtgui:4
 		dev-qt/qttest:4
@@ -55,11 +61,10 @@ 
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
+	eigen? ( dev-cpp/eigen:3 )
 	java? ( >=virtual/jdk-1.6 )
 "
 
-# REQUIRED_USE="opengl? ( qt )"
-
 PATCHES=(
 	"${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch"
 	"${FILESDIR}/${PN}-2.4.3-gcc47.patch"
@@ -68,8 +73,7 @@ 
 )
 
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+	use python && python-single-r1_pkg_setup
 	java-pkg-opt-2_pkg_setup
 }
 
@@ -77,7 +81,7 @@ 
 	base_src_prepare
 
 	# remove bundled stuff
-	rm -rf 3rdparty
+	rm -rf 3rdparty || die
 	sed -i \
 		-e '/add_subdirectory(3rdparty)/ d' \
 		CMakeLists.txt || die
@@ -117,6 +121,7 @@ 
 		$(cmake-utils_use_with openmp)
 		-DWITH_OPENNI=OFF					# not packaged
 		$(cmake-utils_use_with png)
+		$(cmake-utils_use_build python opencv_python)
 		-DWITH_PVAPI=OFF					# not packaged
 		$(cmake-utils_use_with qt4 QT)
 		-DWITH_QUICKTIME=OFF
@@ -167,7 +172,7 @@ 
 		mycmakeargs+=( "-DWITH_CUFFT=OFF" )
 	fi
 
-	if use examples; then
+	if use examples && use python; then
 		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
 	else
 		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )