Add missing dependency on virtual/glu, bug 434434; remove old

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

6 files changed, 23 insertions, 392 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 48a70262b8b9..731b27c7f2c4 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.80 2012/08/23 11:06:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.81 2012/09/11 14:03:47 dilfridge Exp $
+
+  11 Sep 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -opencv-2.3.1a-r20.ebuild, -opencv-2.4.0.ebuild,
+  -files/opencv-2.4.0-cflags.patch, opencv-2.4.2.ebuild:
+  Add missing dependency on virtual/glu, bug 434434; remove old
 
   23 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.2.ebuild:
   Bump required nvidia-cuda-toolkit version to allow gcc-4.6, bug 431808
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 42b12198049f..61e3c537cc94 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -8,31 +8,27 @@ AUX opencv-2.3.1a-gcc47.patch 811 SHA256 62defcf34b6e4c00ddfe67d64234b68ba5ac131
 AUX opencv-2.3.1a-libav-0.7.patch 415 SHA256 3186998b7b9eaae061d538633276c7de47b2388b639106e190d80dcf09fb9099 SHA512 b17466470a47876e1a8434367f47ce13ec989bdc35ec707d87188187e08b8ccca6af4c5563f20b3170758582b500323030cff22961a7fbbc6b4843d8bb808f1e WHIRLPOOL 5caf84c49efef118e1c90f6bd88237c6d91e9b37163248e5a6f6c135ae60f5f4f4328d83f061df2c4d5f81fdf68faa5b55828feaf67707956701c633614cc5fc
 AUX opencv-2.3.1a-libsuffix.patch 1949 SHA256 442c5e7fab7cf28f806c8fc2057d17705b71d95da8ba0792828dab91c6742f44 SHA512 353609bfa761833945afee5b78f5efe0feaf435409b6aca1780da28bfe77b966d0511b1c173cf58ccaea2b8fcd49bbcf6f270dbd46f32eea7282bdb2be8f32bf WHIRLPOOL 3479194bcb35b633ae2a0d6a10d6f7278b5f7cf1bcc9c5c333cfb61c900434d895b1f2d86f764c3717f8ddcf50ddcc4239a90c63787e6ee789edf3a2d4449081
 AUX opencv-2.3.1a-nocaps.patch 5220 SHA256 eedd2f7881e592a34217e8217a5600c307dbb9558197ca576b431e4c30ce8207 SHA512 4df5cc178246befdf2913877abfc0e842dc76ab59baa82423d48979b3c18077020755708995a4c20d1d7a3e6bbfa54c9e6907ea472fe07ef791fa16f717c0ce1 WHIRLPOOL f00c5aa6e2b15740eb022c4d52c3217f8fdcaad14f177e350f64b1c3dab039ae24d43537b1374967145c8bc9953750fccdf8236aaeb90821692799cd2c304f29
-AUX opencv-2.4.0-cflags.patch 863 SHA256 b42abef4a919a3fa07ba3ca20a01d83fd887bed2521ebfd1dbce4fe940c7ca6e SHA512 736da7d1d90fac00158b8654457daaaebc56844143f8cc912621fe9374521355cbb9b225fb8f50074ac5ec8f7e8a7fd8fa39866b8837b07acdfed2bcc7d09c7f WHIRLPOOL 60ab35a0d9be106884533c7a381e2d82109a573406608b7d009fe72eb33ee925021058e93a5d2c0a2294ee898c2b4aecb94dc18eceeaa05b2bfbe8da016d030c
 AUX opencv-2.4.2-cflags.patch 742 SHA256 7ea8c07becb830fb03c14bfbf6c25fdfeaf3fcb75949b810520f4fd6c1178c1c SHA512 b92c07d8c9c40ad7721e0cca2d79b001f825478a336ad40cb43d02218fcd9e8b94b871575028ca8eaf6616cfce8138c796f32d4cf55d83d5cbe819ec50cf7c82 WHIRLPOOL f83ee4b677490cf6981b5a326ae6a7ad4cfae1c27fc6c516d054337939957d801ff1319798d2b0b9e86429b8d688f514e74b74bfff56c64df06fc3c7035f320e
 DIST OpenCV-2.3.1a.tar.bz2 32669613 SHA256 a9a2f529101c04eb2b606eee8c80f3ad93190b36f91ac09ee0ec5aa1eed1450c SHA512 6875eae92fa099766410dece37b65ee51c95eb8ed6d1bbe19b533c66361686b31bf5513f6558efdd37332e68b30c5a5f221d17492c00822aeb07efcbf956584d WHIRLPOOL 7cea733b5ea764b229b72565b3c8ea7b2665aa7063c98f97d05bc82d6a41000110a1935b9061050bf17fdf2cb3f382778ba924aa5c8ce7fbf96895a0317e4489
-DIST OpenCV-2.4.0.tar.bz2 47156770 SHA256 3b5fedb2fc6ad0aa1509676468f571ba21456679e7d48a8242a096d62e2c6ac9 SHA512 b8233acf56324c537afe2f6fa2303ee7c12d9a0d06ae95f0b876ddb1f68dd0ae9b654269786fe3020c48600f4c39b54bf383804c54f604c17e84bb2a0e81f7e6 WHIRLPOOL 47b8056b0fccb78ed29d530ba69a931b24e1547cdf30e0e91a4ae7625f9a35bf77a5bb7d0f87dfc73fd6418193ca8fc355fa67fbf8e3e87ac72d67e7e8523523
 DIST OpenCV-2.4.2.tar.bz2 52562911 SHA256 690023811e03e21df996291392fcf78e43e42ef557b9307503c74c74b4272c28 SHA512 1e009817553668e4040c7959e07b402d06d66f6d4743ac4da2e44a38bef6c73ae0fa454932f7aae778915d29f5d457248fa3488f5df208d1cfb5775a26e34f44 WHIRLPOOL 8412be6b0f51ec76cce9fcb1fc1450b4b50aa3a98a2ab7d312d62ea47fc2b40f997cf09843de048a71d2cc1b5b2f1bf5eea92696ad3d4f5f520c4f3c850266e1
 EBUILD opencv-2.3.1a-r1.ebuild 4210 SHA256 725e02dea14c43c3fc5fc25970dbc884af6229211b78a174cdb587e45369cc09 SHA512 e4cb91055fd138f16a4def4eca90c791fdf372ab94b89d11b019776dcb60f8265600ae3b2d0e8843a01489ee440682c922e3e782a2b0c1f67e768880edca26b3 WHIRLPOOL e370a15429be343942c55a08e4fedf0bf5f6cdf1345520ca6d492266ab3c557dc2c96a2a82a50d7d171bf4cab677dca91b44a9ed2cdadb6fa4e6a5c9cbec5308
-EBUILD opencv-2.3.1a-r20.ebuild 4253 SHA256 0101773f11add8197935bf854c0290f50fc3f735233d48d545a1bbe3f4fbc314 SHA512 c09d1576144f1954078a1cabf9ce5592071fdea5fee3170eb987ead29bb155a337567b0c448cf67e6958aa6a13c9133d29f0d641ab36023b05fd56cd324064c2 WHIRLPOOL dabd119d3b55772fe7692a342e87954ea8d8083ad010073691042289e0551b3e87aee39178ecd04502ea6d0a3ae87a1825b9994c20a4815be3b7531192e1a9f4
-EBUILD opencv-2.4.0.ebuild 4757 SHA256 2ad46ec2adf5ee6939bd95d89d0f14d92817f9071e592f9aef74401f1ac02276 SHA512 e8b98b94775fcef0df52a802fdd5492db286de07947bdceb284455ff31f55f31f3c326e47050832bd0cd2683fab06a4d098d8f9cbbc8855861fbad339ee267e9 WHIRLPOOL 191f87708fd6f9d4512976017045837499e428a7ef3df553d48985bf85cd94ab1fb24c25ba97059e091bccb008952ab9cdaecef49df6ccbc1009108d2ba585cb
-EBUILD opencv-2.4.2.ebuild 4659 SHA256 4bf2c3c4a3b28fd27e944f46dd5ffa821a0052f4d100b4c6896748205a00277a SHA512 a1b7b6174e3623f324600fd5430b51e67f1300777e5635de1565624d1ca379669abe7e2fa5f44e4003446eda9fe382f04da67b3223893e4795c099494cea2b7b WHIRLPOOL 6bde3c69e93ae43e24a8b847b49e7ce95b12f6fc348c16d1247bbce4948b470a5c8e85142af1c68b2d28b9c1e443de3d69122b7508894cd0b38f18cec6b92e5e
-MISC ChangeLog 14304 SHA256 f5e035761b8126f4cf56938721a549ce520251fa1b96c29e40be031eb45cce71 SHA512 082a615d24313c380ec77aa798c25c7cdd7795e37a9b6a8791970510b5508f55a9b9ee973b1e80b375567f7e7d9bf55f9fbe609793a53116034b4c84c3bee491 WHIRLPOOL 7d4d799e5a1d317235d9c1d7b227c3d13e45a90e73acb6d01b3339da1ca3d6863bf9e5fbb93f3d11b7436f7c5b152002e9970ad035ebdb54a92568ce4c4afc50
+EBUILD opencv-2.4.2.ebuild 4684 SHA256 22cef403f0b3bb855a4d0eb3488cc77ba3664d0fa75c19e378ad10cfa87493c5 SHA512 9975b9ddd1ef54132b141946151661684018b8fbdb36d8b03934eea100ca6f57a81f57140afe45d35b85b32aa2825b609eb6194024d760e9c8d56f13079b2a51 WHIRLPOOL 550d8427b2cc0f8541541bae1d6a16410d5ecd450b2d64a13351f5bfe8321db7e1dc9120e16636b6d90cf3ea897babcb1011bd557ee9bd1cd6b031d559abf446
+MISC ChangeLog 14534 SHA256 aa5bdf08012d2042e8b53d6003570f1116e297bb92b5d0bc4fa7d90f9b42e261 SHA512 f532d05dbf6fd1665c9301cb575feba1742d2f811bf48b0b7ff58a1b80ef9def63121654d7739dd23fc1c56ad0e382fdda46be4deef0ffb67106a505481cb095 WHIRLPOOL 67a3eef912f2e3d8a87d770505cb4d6ab5f79a8da22e0f94972c83a0b020e5af0a9b807e55af1cc6e1c2c67eba2afb54eb3d70ff63fde906b894034f1b3ccb1d
 MISC metadata.xml 1276 SHA256 136997ca68983dcc93f04a622699777946a73407f0a689cb9a0cab2760e42226 SHA512 5bc5b4cf280cb02b93b5a6393cab3b3a1a9b5d68139acd70491fb39996f5e7c8918628e4111e914d548281235bcf292da0ce726944a361a7a60d99d5d3c326c8 WHIRLPOOL ecb425f3275c633efd55f1f2dccae95c64151b9709f897635412ef66218876f4d4ce0f2387f7823f4bbe362913f85a0e6cd011507b46867bd00cb0842a7dc3e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQNg8+AAoJEEb+UGWnxTyH0YQP/0eAykS8aQKx5jQ4nW5UT1JZ
-mvOvAEuzb4zjEFUTQR8PMWafw2vCeuKcQ51Ccs5N0m8psr8JfZboyJm5qLLY6BEr
-9PllOInTP/czl17tdxaKWSJ1+gZeusvj6uyl6hSi5Dvm9ZYDQJAuQDzSAsXM8HFf
-ZZeL796eqb1Z306LXShAFk0CCVhwmgemRQ2MiibfocLEue6uFalUjaJ82meOo/pR
-m9P10wK525k8DcRPEsxpclBYDQT8fmMmRj1Nx9+5EoC5fA2HMQ1PJU+LbX2Buas+
-qlP5FNU91GKFJ4nH+O+3CePHfmthEOM6shgK0+vC5eSv9WO8aCCWTAV5/nHMmSS5
-NTFnjIBgL0VypGs0MMkFafKJIhyaNxJFIGlWLvMMiONL2tEsiAg0QA0BsEHOISVQ
-wEfu2GklZYfoN+AZh3MRNeVjY3wyHoeppw7oWY2yJX52Ft2r8M8j1wBE+ImplENf
-1x5vNJLMtGnKz4+1x/YaLR4CzUPWfi7zweaioiAfKqW6hLGUZNYKVx/YHx8kMsfz
-I9LPqbnd5F4Z1dBb6f2xkL7iOZzz0TEchg/6e+C2oLePtRielVz6cyUFxCoYtF20
-iA8PCL4kJlYEnMvLSqAnZTOwzpmXDsewm42gUtDHAHQ13rHB/XjneWD0XbGev/vN
-Y4qOpLBzyND2DXikcyPO
-=274o
+iQIcBAEBCAAGBQJQT0U1AAoJEEb+UGWnxTyHGfAQAICp/1gWNybq2k1JN+7FU/z3
+nMQTvp8PwDIMS4cZCSLJDs2ATZJVuLZpYdbt8Ti5+y8rkZJb9PH6sjoPa7mhBSIr
+LTSm5Ew4CTaM4Cp+5VOIG9d2Sp1XsrMnf4RFdLGLQUnF3PS8ciA3EpSnSW9m3Wl+
+bx7n0ERl3K5oFFTuuobM/V+YfuRSB9FZ/JTxdrKGTGsFez6ACoG6VVwo9+vAsRfG
++joNls0bt6ydrPIZoBUG7foTaR3cNUR9AVq+M3DHkQ6sK/Z53D+f19x71F+HfrzC
+Rnj7Fu9kkThlNXywEzsuK6SHLJ0BP/hqX1Ynxr+0xkdC/VhHp8dwdfs//tSrL4yv
+K8laSN4EMHa27LKvAX8ar8s7stelPTUUiX0XcVK7OsMgr3ENciH+VI6HtlAujJ+D
+xDdeO4w3XTvPCG96q2ULamXc06LA/gZanpx4izltWWiIBUkigdaIKgzXZHSRPnb5
+DK2MpyJsWqbbseryGUJlsDzkVUIvqCHX2tRX8QVKrn04LxHVSKmPyrAJT96zL5gk
+gSUTO5mXqk3OK2Y3qVtD2WiOBSQ6LVTysZLp9xpcZOMxn8GG7R0C7cLt+pICD8SF
+AMfJfHG7/SvWR+jfTUPW+RhZFiZVKv2ELI+POBWFe0qdoZqCHLOq9k9rNVbh1yM8
+jlvuNFZllEX97Hkw66Hv
+=TUdz
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.4.0-cflags.patch b/media-libs/opencv/files/opencv-2.4.0-cflags.patch
deleted file mode 100644
index e4093ebcef80..000000000000
--- a/media-libs/opencv/files/opencv-2.4.0-cflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN OpenCV-2.4.0.orig/cmake/OpenCVCompilerOptions.cmake OpenCV-2.4.0/cmake/OpenCVCompilerOptions.cmake
---- OpenCV-2.4.0.orig/cmake/OpenCVCompilerOptions.cmake	2012-04-27 01:47:48.000000000 +0200
-+++ OpenCV-2.4.0/cmake/OpenCVCompilerOptions.cmake	2012-05-28 21:58:15.000000000 +0200
-@@ -40,17 +40,6 @@
-   endif()
- 
-   # Other optimizations
--  if(ENABLE_OMIT_FRAME_POINTER)
--    set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} -fomit-frame-pointer")
--  else()
--    set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} -fno-omit-frame-pointer")
--  endif()
--  if(ENABLE_FAST_MATH)
--    set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} -ffast-math")
--  endif()
--  if(ENABLE_POWERPC)
--    set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} -mcpu=G3 -mtune=G5")
--  endif()
-   if(ENABLE_SSE)
-     set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} -msse")
-   endif()
diff --git a/media-libs/opencv/opencv-2.3.1a-r20.ebuild b/media-libs/opencv/opencv-2.3.1a-r20.ebuild
deleted file mode 100644
index 4a59f179273a..000000000000
--- a/media-libs/opencv/opencv-2.3.1a-r20.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a-r20.ebuild,v 1.3 2012/05/06 20:05:25 dilfridge Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit base toolchain-funcs cmake-utils python
-
-MY_P=OpenCV-${PV}
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="http://opencv.willowgarage.com"
-SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
-IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 tiff v4l xine"
-
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-	eigen? ( dev-cpp/eigen:2 )
-	ffmpeg? ( virtual/ffmpeg )
-	gstreamer? (
-		media-libs/gstreamer
-		media-libs/gst-plugins-base
-	)
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
-	ipp? ( sci-libs/ipp )
-	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng )
-	python? ( dev-python/numpy )
-	qt4? (
-		x11-libs/qt-gui:4
-		x11-libs/qt-test:4
-		opengl? ( x11-libs/qt-opengl:4 )
-	)
-	tiff? ( media-libs/tiff )
-	v4l? ( >=media-libs/libv4l-0.8.3 )
-	xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )
-	virtual/pkgconfig
-"
-
-# REQUIRED_USE="opengl? ( qt )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.0-numpy.patch"
-	"${FILESDIR}/${P}-convert_sets_to_options.patch"
-	"${FILESDIR}/${P}-libsuffix.patch"
-	"${FILESDIR}/${P}-nocaps.patch"
-	"${FILESDIR}/${P}-libav-0.7.patch"
-	"${FILESDIR}/${P}-True-False.patch"
-	"${FILESDIR}/${P}-gcc47.patch"
-)
-
-CMAKE_BUILD_TYPE="Release"
-
-S=${WORKDIR}/${MY_P/2.3.1a/2.3.1}
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	base_src_prepare
-
-	# remove bundled stuff
-	rm -rf 3rdparty
-	sed -i \
-		-e '/add_subdirectory(3rdparty)/ d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build doc DOCS)
-		$(cmake-utils_use_build examples)
-		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
-		$(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
-		$(cmake-utils_use_enable sse SSE)
-		$(cmake-utils_use_enable sse2 SSE2)
-		$(cmake-utils_use_enable sse3 SSE3)
-		$(cmake-utils_use_enable ssse3 SSSE3)
-		$(cmake-utils_use_with ipp)
-		$(cmake-utils_use_with ieee1394 1394)
-		$(cmake-utils_use_with eigen)
-		$(cmake-utils_use_with ffmpeg)
-		$(cmake-utils_use_with gstreamer)
-		$(cmake-utils_use_with gtk)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with jpeg2k JASPER)
-		$(cmake-utils_use_with openexr)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4 QT)
-		$(cmake-utils_use_with opengl QT_OPENGL)
-		$(cmake-utils_use_with tiff)
-		$(cmake-utils_use_with v4l V4L)
-		$(cmake-utils_use_with xine)
-	)
-
-	if use cuda; then
-		if [[ "$(gcc-version)" > "4.4" ]]; then
-			ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support."
-			mycmakeargs+=( "-DWITH_CUDA=OFF" )
-		else
-			mycmakeargs+=( "-DWITH_CUDA=ON" )
-		fi
-	else
-		mycmakeargs+=( "-DWITH_CUDA=OFF" )
-	fi
-
-	if use python && use examples; then
-		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
-	else
-		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
-	fi
-
-	# things we want to be hard off or not yet figured out
-	# unicap: https://bugs.gentoo.org/show_bug.cgi?id=175881
-	# openni: ???
-	mycmakeargs+=(
-		"-DUSE_OMIT_FRAME_POINTER=OFF"
-		"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
-		"-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
-		"-DBUILD_LATEX_DOCS=OFF"
-		"-DENABLE_POWERPC=OFF"
-		"-DBUILD_PACKAGE=OFF"
-		"-DENABLE_PROFILING=OFF"
-		"-DUSE_O2=OFF"
-		"-DUSE_O3=OFF"
-		"-DUSE_FAST_MATH=OFF"
-		"-DENABLE_SSE41=OFF"
-		"-DENABLE_SSE42=OFF"
-		"-DWITH_PVAPI=OFF"
-		"-DWITH_UNICAP=OFF"
-		"-DWITH_TBB=OFF"
-		"-DWITH_OPENNI=OFF"
-	)
-
-	# things we want to be hard enabled not worth useflag
-	mycmakeargs+=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DBUILD_SHARED_LIBS=ON"
-		"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	# hardcode cuda paths
-	mycmakeargs+=(
-		"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/opencv/opencv-2.4.0.ebuild b/media-libs/opencv/opencv-2.4.0.ebuild
deleted file mode 100644
index c7cfcdfc151d..000000000000
--- a/media-libs/opencv/opencv-2.4.0.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.0.ebuild,v 1.4 2012/06/03 08:50:43 dilfridge Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit base toolchain-funcs cmake-utils python
-
-MY_P=OpenCV-${PV}
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="http://opencv.willowgarage.com"
-SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
-IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl pch png python qt4 tbb testprograms tiff v4l xine"
-
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.1 )
-	eigen? ( dev-cpp/eigen:2 )
-	ffmpeg? ( virtual/ffmpeg )
-	gstreamer? (
-		media-libs/gstreamer
-		media-libs/gst-plugins-base
-	)
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
-	ipp? ( sci-libs/ipp )
-	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng )
-	python? ( dev-python/numpy )
-	qt4? (
-		x11-libs/qt-gui:4
-		x11-libs/qt-test:4
-		opengl? ( x11-libs/qt-opengl:4 )
-	)
-	tbb? ( dev-cpp/tbb )
-	tiff? ( media-libs/tiff )
-	v4l? ( >=media-libs/libv4l-0.8.3 )
-	xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )
-	virtual/pkgconfig
-"
-
-# REQUIRED_USE="opengl? ( qt )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch"
-	"${FILESDIR}/${PN}-2.3.1a-True-False.patch"
-	"${FILESDIR}/${PN}-2.3.1a-gcc47.patch"
-	"${FILESDIR}/${PN}-2.4.0-cflags.patch"
-)
-
-CMAKE_BUILD_TYPE="Release"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	base_src_prepare
-
-	# remove bundled stuff
-	rm -rf 3rdparty
-	sed -i \
-		-e '/add_subdirectory(3rdparty)/ d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	# please dont sort here, order is the same as in CMakeLists.txt
-	local mycmakeargs=(
-	# the optinal dependency libraries
-		$(cmake-utils_use_with ieee1394 1394)
-		-DWITH_AVFOUNDATION=OFF
-		-DWITH_CARBON=OFF
-		$(cmake-utils_use_with eigen)
-		$(cmake-utils_use_with ffmpeg)
-		$(cmake-utils_use_with gstreamer)
-		$(cmake-utils_use_with gtk)
-		$(cmake-utils_use_with ipp)
-		$(cmake-utils_use_with jpeg2k JASPER)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with openexr)
-		$(cmake-utils_use_with opengl)
-		-DWITH_OPENNI=OFF					# not packaged
-		$(cmake-utils_use_with png)
-		-DWITH_PVAPI=OFF					# not packaged
-		$(cmake-utils_use_with qt4 QT)
-		-DWITH_QUICKTIME=OFF
-		$(cmake-utils_use_with tbb)
-		$(cmake-utils_use_with tiff)
-		-DWITH_UNICAP=OFF					# not packaged
-		$(cmake-utils_use_with v4l V4L)
-		-DWITH_VIDEOINPUT=OFF					# windows only
-		-DWITH_XIMEA=OFF					# windows only
-		$(cmake-utils_use_with xine)
-	# the build components
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		$(cmake-utils_use_build doc DOCS)
-		$(cmake-utils_use_build examples)
-		-DBUILD_PERF_TESTS=ON
-		$(cmake-utils_use_build testprograms TESTS)
-	# install examples
-		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
-	# build options
-		$(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
-		-DENABLE_OMIT_FRAME_POINTER=OFF				# dito
-		-DENABLE_FAST_MATH=OFF					# dito
-		-DENABLE_SSE=OFF					# these SSE options do nothing but
-		-DENABLE_SSE2=OFF					# add params to CFLAGS
-		-DENABLE_SSE3=OFF
-		-DENABLE_SSSE3=OFF
-		-DENABLE_SSE41=OFF
-		-DENABLE_SSE42=OFF
-		-DOPENCV_EXTRA_C_FLAGS_RELEASE=""			# black magic
-	)
-
-	if use cuda; then
-		if [[ "$(gcc-version)" > "4.5" ]]; then
-			ewarn "CUDA and >=sys-devel/gcc-4.6 do not play well together. Disabling CUDA support."
-			mycmakeargs+=( "-DWITH_CUDA=OFF" )
-			mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
-			mycmakeargs+=( "-DWITH_CUFFT=OFF" )
-		else
-			mycmakeargs+=( "-DWITH_CUDA=ON" )
-			mycmakeargs+=( "-DWITH_CUBLAS=ON" )
-			mycmakeargs+=( "-DWITH_CUFFT=ON" )
-		fi
-	else
-		mycmakeargs+=( "-DWITH_CUDA=OFF" )
-		mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
-		mycmakeargs+=( "-DWITH_CUFFT=OFF" )
-	fi
-
-	if use python && use examples; then
-		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
-	else
-		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
-	fi
-
-	# things we want to be hard off or not yet figured out
-	mycmakeargs+=(
-		"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
-		"-DBUILD_LATEX_DOCS=OFF"
-		"-DBUILD_PACKAGE=OFF"
-		"-DENABLE_PROFILING=OFF"
-	)
-
-	# things we want to be hard enabled not worth useflag
-	mycmakeargs+=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	# hardcode cuda paths
-	mycmakeargs+=(
-		"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/opencv/opencv-2.4.2.ebuild b/media-libs/opencv/opencv-2.4.2.ebuild
index 62313ef54961..0d9f260d6384 100644
--- a/media-libs/opencv/opencv-2.4.2.ebuild
+++ b/media-libs/opencv/opencv-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.2.ebuild,v 1.3 2012/08/23 11:06:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.2.ebuild,v 1.4 2012/09/11 14:03:47 dilfridge Exp $
 
 EAPI=4
 PYTHON_DEPEND="2:2.6"
@@ -38,6 +38,7 @@ RDEPEND="
 	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
 	ipp? ( sci-libs/ipp )
 	openexr? ( media-libs/openexr )
+	opengl? ( virtual/glu )
 	png? ( media-libs/libpng )
 	qt4? (
 		x11-libs/qt-gui:4