Version bump; remove old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

4 files changed, 94 insertions, 39 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 101399e20cb7..8f33b5923c96 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/opencv
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.104 2013/12/07 14:31:01 dilfridge Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.105 2014/01/24 21:16:38 dilfridge Exp $
+
+*opencv-2.4.8 (24 Jan 2014)
+
+  24 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  -opencv-2.4.6.1.ebuild, +opencv-2.4.8.ebuild,
+  +files/opencv-2.4.8-javamagic.patch:
+  Version bump; remove old
 
   07 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.7.ebuild:
   Fix build without openmp, bug 493530
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 8747fda948d2..2d20abe4f123 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -5,30 +5,31 @@ AUX opencv-2.3.1a-libav-0.7.patch 415 SHA256 3186998b7b9eaae061d538633276c7de47b
 AUX opencv-2.4.2-cflags.patch 742 SHA256 7ea8c07becb830fb03c14bfbf6c25fdfeaf3fcb75949b810520f4fd6c1178c1c SHA512 b92c07d8c9c40ad7721e0cca2d79b001f825478a336ad40cb43d02218fcd9e8b94b871575028ca8eaf6616cfce8138c796f32d4cf55d83d5cbe819ec50cf7c82 WHIRLPOOL f83ee4b677490cf6981b5a326ae6a7ad4cfae1c27fc6c516d054337939957d801ff1319798d2b0b9e86429b8d688f514e74b74bfff56c64df06fc3c7035f320e
 AUX opencv-2.4.3-gcc47.patch 835 SHA256 bb64b8af632b67293d1c8024b3786162fccc9f4ee4159f6592af0e76e86b7b00 SHA512 cc5e3e4c0def0745867403e990abf4b88d7d3edc72867a283403a991fd96f59c4cca6524ca184a52a40c913cd5d9cdfb52e98be71d5060fc4c7aa6b613a2a220 WHIRLPOOL 52aa228d8ebf2ba51eb67cc31ba4eee27f43d5fc86d3b5028e32e2a8caf1350ebda70bab2a060f9a387312795788b575253d446380645e52e7cf10f57cad9a88
 AUX opencv-2.4.5-javamagic.patch 1140 SHA256 1a3fd6918982909dc1de4258cc386139f7005617032cb457d5ea521f0b4d2ad5 SHA512 f283529bc6482203b2ffdf57aafcdf80351eaf8d09c07c6f14991e5d6bc25679dab31f3dd0475b1eee32f9ba8636e9ba96755b90c96de7059c8f69c0d43746aa WHIRLPOOL a483809bfe0ca11a299757bd1ec42ada5fc1d415eb366f9e2d05a6e8a30dec6b8d8baf662da0041632e23b3ed0d4f90e612fb15ede0e126c09e9a98da7a9621c
+AUX opencv-2.4.8-javamagic.patch 1165 SHA256 b13037b93683ee8e6f535cbbd8742005e675e13a11ebd6593815625c3328bfec SHA512 fd8a0d33997889c9316c0a4474c836b2528b676cd26bbb0e6ee2262377e45c5a0c465534831bd7fec3c0aa9cb198bc792a53f958b05a5217009314b678076d64 WHIRLPOOL 405901f0de77d1f16dc9d28deec6a56062bbfd514994ec094f468ea2298a15111067031cef33ce92b4c237539ed2ee294ec54e2ea6b5c739466e879c291af964
 DIST opencv-2.4.5.tar.gz 81884985 SHA256 d30beecf4b57977fbd1635af54c5ab3fc00113e9e59a9d58081732260fe06292 SHA512 2e0ab19203cc5d3a4d83633ee9762441d0d12128752edecb351b3c4abddc1714baf4b320b161f8b58e771933506bfa5a192d394a3b6b5b63d914923c6a767a08 WHIRLPOOL 117551edab5837a9382a6d84dec7f84fb693485e3cad7c08d38158baa22951381eb4958caaaa910dcef6ee2b78a0a494d732d0cac88cd18f1f6ebc2d30e3ddf0
-DIST opencv-2.4.6.1.tar.gz 80762052 SHA256 ae7cfd859476b6cc05246949ddcb165fb284eaf9a6d814b2976dc21088778aa0 SHA512 0e04ce40f749cceb1305f0d8f22241fcdef4aa2a158ea490516a0fa0ce7d7ff137ef5932a1ed0b8258324793662042a464d92477faf0c6087d6fdb95e5f31720 WHIRLPOOL baaad3a037c61bd6b08aec3a5194f4fb2cdda8f90a59ecfb2b72f7b3fdaa11deffcef52d728e3ce49d3d40d584063a9dbd975a870d6e6bafedbfe7df4838e413
 DIST opencv-2.4.7.tar.gz 85587316 SHA256 c48d6c735bfa40c76cadcc0106051e095d8b492b05ac7d2cc9647be807dd2a43 SHA512 8979971f805b72e3384038acb6d555035a7f921f6b37a901c1f6b7020d076bdbcbb5385d616bb8afb5c03d447cdddbb0ad4b13e84a5fabf5c0a61cae54f49f44 WHIRLPOOL 975df7cb8e2ce2b07a8cc1b46e43dcbe53959c4264371710cb46985db19665f857f3d071cbefadd60785bffc289cf1118102a9ce55ce231014e92cdd1cb93ab5
+DIST opencv-2.4.8.zip 91302285 SHA256 f1ea29de0707939f6e09ae7a78dd271c032cac69a9ba6c6f7eb29fd4f83b9a68 SHA512 a451f4cc2fc7f31a5dba2997c57f3964d8239949dedb62e83b3fb2c68c2533786750906823137fa126a20d28d841aafc3a49b82c6358a6e6bc7d223e66598237 WHIRLPOOL 5881682746b30601421874bf6acb13bd0354b607f2e4da8abaa6077a59c8015c60bfbe888da077eaa7413c5fd8816b50616cee2eeb7dfcd884afff4df8c22561
 EBUILD opencv-2.4.5.ebuild 5174 SHA256 9947ef216eb778c4db530afa7c0c73ecfaf007d4195f652c552038e4d1afac92 SHA512 95b2cc6cf749046e66c783d3a13e0b098e4044c9741a9cd336c189bfcc454f2d1a554c33df3c0e71111e16601cb1cafe5db3f37839abc118a68d2755d296c916 WHIRLPOOL e9e9e2aec05fcaabacd7e973094591eac839e8cfd42a18bfd2567c047f33006a18191dd313e2e3244ee8e2cf6aa087701cd640d9caaf43c81e74a71f2a08e52e
-EBUILD opencv-2.4.6.1.ebuild 5180 SHA256 8dd5be4bb1110ca3053d1884385dbe1f5fd85b5a578ba03ae9c0c6049b2f8ccc SHA512 2d1dca4daa44f94c80b5f9fcc29c5fe6faf8dd980cddd8e37ed5419391710143376235f3e56b52397cc1d0cfa85d5525952c1bfb0764057cb7f634da96557989 WHIRLPOOL 785fb7dd867c10bff29f8e46979db474e10f0e30f106d8b5bd5dbe614a45a6468ef3ef5299fc9ca0d6a9c0fe17c353c9ba3f322d85b712a001ac3888ee6af9ab
 EBUILD opencv-2.4.7.ebuild 5339 SHA256 c35ac60d24b7f77692f3a0e3ca264a8bc17b188d4813ffc61807a450650b5866 SHA512 d73cd41bc1e96ba3581a9016f6f4b40451704b03cb04e88028f8f01083cfc71e60dee41c3130273bb27084fc5a6a5a9616403405ad0336fa10a0dbea8d0fca73 WHIRLPOOL fd85656fe42e0a130a8cfb3b2cc61afacb5989b12dcba33ed957af5791c77f427e443af0bdc353bdd5abc3c2098eb6b4775906cc9f2075364c8fde16608250ba
-MISC ChangeLog 17826 SHA256 ae88a6d16b511779792a6a58e4c3e6dd749b59e4cccbc7eb31a22f3cfefa150c SHA512 686f14859486c3afb60f829ca0ce1574f534a59d78f111066edce0f2756e2dc2f824c2eee9a7fcbbda2540e20a6227d0984264460f456d25eb90ab1f829ad595 WHIRLPOOL 165a58f62a3fea1f96ec1e8eebffe783535442176be945e186beb96149ec8a229e96047cfeafb059017c3f13b9d11743c433f010402ee68ffc4315ef2baccb0c
+EBUILD opencv-2.4.8.ebuild 5753 SHA256 5aca5917d3ae86003f4d01aa2a43191f9a0a492ebbebd7ba34bebfda8e5f3ed5 SHA512 800a43b7f06abc4057d2bc3addb10647b2c47c6555223cfb3d5ed3dec473a6cef3ae5d445eb3a2408be5c451dc23039d9624cf14380beef5642952e79f8b27a1 WHIRLPOOL 55d8296324f970ecb32e93a39a5193737a35e8c68bfe173efb0ac458c1e0a92639e4bc3e05489722c2b7b1c0f89a596cdec8e8166fffbbd61ba5e17543d1cc4a
+MISC ChangeLog 18027 SHA256 562ece973973235cc19d6d288fdeace40126cdf144bd326be3338e22d84ed2c8 SHA512 c109e1d5a30a5f2ba0074b1f955b981ada29495d56df3864746518d3c667c3c3a902738bf09e4cdf17be34b95af80634f89ab78fa9e9b3b47a159054aa0bf0d7 WHIRLPOOL 8aee377a90468a8efb178e6e48703f9691a8eb94d20f7e9958f463d344739c10d18faf3129ee1f44a7e1d98f81332decee5d3cc4f75375f79377f3410ab3a1fe
 MISC metadata.xml 1058 SHA256 a8c4be7d80245b258f435bee2afaab35dd8665bdaea986b389527c80d25f8b68 SHA512 d3dde0afab2a1b6960d47838ffd7af97311df04ebfff091ef200ce93268e5efc3c28e4c35e848c8faac0a95b92e63b8cc2b51e72e3df8709c1951a6ba346974b WHIRLPOOL eeae49e5972bf997954d69f29bc6f058c7c8eeed2a7f1791517e9344f28e32e60e76c3fee9ecca06f48548882e0b8ccabe10ce0b3bc7ca1cc40662a6f411a0a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSozFdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJS4tiVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcEx8P/2RAxKV6Y24kh3n9k8cQTVj8
-m/ao2CNFvz5TGH1Agklvx7fj/BSp4hbCROVtSnWEkgUnYR+T9NWSBY1DknrFRSCu
-dXINT/GkamGNttc5OpcaKz49UngYVcAg5IHZJhnH0D+X1LekfOEsr+4wbx8PQEYu
-DCiApLIScqhFg5Sr8N3Hl2GACzTgM7iVdl3zfZJnflGP90sjm6jByCHrSv6Cu/mf
-Q//rBzJ0Zuzg+nK1Qppi693TvY8ELTq8be3fM4PAHgpxhgCc5BpKg7S0SNLDLISy
-7lULSnjL7IVV/U8sq4XdaWst0MPZH0ococcRrzQo5a3SljWglQeRc0Z+fBkw12SE
-LWyaltegJymBLOi07A+z4+zsy/Cg/T/eMmfQNo2vAAL3twZx7ekXX3il2jBuHj3c
-bVK+yizzcNQpmtgrzN7+Z2aMAB0FakS/r3VcLaKMJE8s215clPZt4rBqO+vhN/aE
-La4ys3GeHgDLyBKKzDj2kSt7XQCbYtrd8bBaTfcRcw0DvQLDcUEx5Gq5hHKUxwNx
-lur5KitH31aWEwJgG2qolgta1YsDrEDAsUG4nVx3ZWXlQc4sl4NKgpmlUN5yx2qq
-D64FFWJak38euhZVKIDJ/wctEcLjlXAEWqlPtwWieVUhP13hCsXDEknZ+45ha+LN
-KtiPNYjWfzodZ3Lk/WbO
-=brqV
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcZLIQALcqYBWv+bBdhB7gJLHsSFpk
+LpCtQudSLfLTORCfHSUM6J5phr/qvHe6euWI8wz6Nwa661+3uJS+Q9q6HdiRFm4n
+wqiTST7ZRexUVxTiH+7JlPEqTmAgHUxA2cRz3Xpko4LmsGiPp0n5SMs/eag9N1T7
+VQK2BM2kYiVv2AxjpJKf5pnr0/kEfhy8LRpkSGY/AwCVXKLyptRTuehgsyXE7ZWO
+DvLmGe/19rbCpSGa3tz8udBAPK6BngHAThuq+X1mAQ35T7ICqy8ic+qGMkYvenzx
+/CRyYZB4u+cZW6pfwCI4BtUpcu5YwJZcEgBUzf9llJA5wdFum2Sdg1TAaVMKD6yJ
+J/d4vXaeFXpS0goVHco2Q0tWseJoQlpd59rbBhcG3KUVCTyy5GZ2DmrVpX6kJyC+
+3OiIEd/c8la6HDTQtveoxJT05YYKQibJBlot3vGpQOPUZaJ9Q5w3rmNhOQesUQwU
+6SNwu/5Q/2FFhSUudtDoPCSgzj0eeKdeGvwWwWLNrgX5e92hTcFJjgVlcY5yGXoL
+bbxOyHWrmKRCNeYPOaeTLsXbaVaWCgdn7TrHXOheN+LOEtxcwF28FNsfjPRMluQM
+ADn5qsD3uY55na/OcnClz8isANQowib3evwdgOTB1iDr9InOf/r3e4gnjZhOBemC
+9tW4oqoDK3ko3+BXpgNT
+=cJW2
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.4.8-javamagic.patch b/media-libs/opencv/files/opencv-2.4.8-javamagic.patch
new file mode 100644
index 000000000000..766abc1e0941
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.4.8-javamagic.patch
@@ -0,0 +1,32 @@
+diff -ruN opencv-2.4.8.orig/CMakeLists.txt opencv-2.4.8/CMakeLists.txt
+--- opencv-2.4.8.orig/CMakeLists.txt	2013-12-27 18:09:18.000000000 +0100
++++ opencv-2.4.8/CMakeLists.txt	2014-01-24 22:06:12.000000000 +0100
+@@ -164,6 +164,7 @@
+ OCV_OPTION(WITH_OPENCLAMDFFT   "Include AMD OpenCL FFT library support"      ON   IF (NOT ANDROID AND NOT IOS) )
+ OCV_OPTION(WITH_OPENCLAMDBLAS  "Include AMD OpenCL BLAS library support"     ON   IF (NOT ANDROID AND NOT IOS) )
+ OCV_OPTION(WITH_INTELPERC      "Include Intel Perceptual Computing support"  OFF  IF WIN32 )
++OCV_OPTION(WITH_JAVA           "Include Java support"                        ON)
+ 
+ # OpenCV build components
+ # ===================================================
+@@ -449,6 +450,8 @@
+ include(cmake/OpenCVDetectPython.cmake)
+ 
+ # --- Java Support ---
++if(WITH_JAVA)
++
+ include(cmake/OpenCVDetectApacheAnt.cmake)
+ if(ANDROID)
+   include(cmake/OpenCVDetectAndroidSDK.cmake)
+@@ -466,6 +469,11 @@
+   SET(CAN_BUILD_ANDROID_PROJECTS FALSE)
+ endif()
+ 
++else()
++  SET(ANT_EXECUTABLE "")
++  SET(CAN_BUILD_ANDROID_PROJECTS FALSE)
++endif()
++
+ # --- OpenCL ---
+ if(WITH_OPENCL)
+   include(cmake/OpenCVDetectOpenCL.cmake)
diff --git a/media-libs/opencv/opencv-2.4.6.1.ebuild b/media-libs/opencv/opencv-2.4.8.ebuild
index a046de54455c..b9bf88bd965b 100644
--- a/media-libs/opencv/opencv-2.4.6.1.ebuild
+++ b/media-libs/opencv/opencv-2.4.8.ebuild
@@ -1,27 +1,35 @@
-# 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.6.1.ebuild,v 1.1 2013/09/04 18:43:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.8.ebuild,v 1.1 2014/01/24 21:16:38 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"
-SRC_URI="mirror://sourceforge/opencvlibrary/${P}.tar.gz"
+
+SRC_URI="mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip"
 
 LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~amd64-linux"
-IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl pch png qt4 testprograms threads tiff v4l xine"
+SLOT="0/2.4"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+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="
+	opengl? ( || ( gtk qt4 ) )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+#	gtk? ( !qt4 )
+#	openmp? ( !threads )
 
 RDEPEND="
 	app-arch/bzip2
-	dev-python/numpy
 	sys-libs/zlib
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2 )
-	eigen? ( dev-cpp/eigen:2 )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
 	ffmpeg? ( virtual/ffmpeg )
 	gstreamer? (
 		media-libs/gstreamer:0.10
@@ -30,6 +38,7 @@ RDEPEND="
 	gtk? (
 		dev-libs/glib:2
 		x11-libs/gtk+:2
+		opengl? ( x11-libs/gtkglext )
 	)
 	java? ( >=virtual/jre-1.6 )
 	jpeg? ( virtual/jpeg )
@@ -41,8 +50,9 @@ RDEPEND="
 	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,21 +65,19 @@ RDEPEND="
 "
 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"
 	"${FILESDIR}/${PN}-2.4.2-cflags.patch"
-	"${FILESDIR}/${PN}-2.4.5-javamagic.patch"
+	"${FILESDIR}/${PN}-2.4.8-javamagic.patch"
 )
 
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+	use python && python-single-r1_pkg_setup
 	java-pkg-opt-2_pkg_setup
 }
 
@@ -86,6 +94,10 @@ src_prepare() {
 }
 
 src_configure() {
+	if use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
 	JAVA_ANT_ENCODING="iso-8859-1"
 	# set encoding so even this cmake build will pick it up.
 	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
@@ -110,8 +122,10 @@ src_configure() {
 	#	$(cmake-utils_use_with opencl OPENCLAMDBLAS)
 		$(cmake-utils_use_with openexr)
 		$(cmake-utils_use_with opengl)
+		$(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
@@ -119,6 +133,7 @@ src_configure() {
 		$(cmake-utils_use_with tiff)
 		-DWITH_UNICAP=OFF					# not packaged
 		$(cmake-utils_use_with v4l V4L)
+		-DWITH_LIBV4L=ON
 		-DWITH_VIDEOINPUT=OFF					# windows only
 		-DWITH_XIMEA=OFF					# windows only
 		$(cmake-utils_use_with xine)
@@ -145,8 +160,8 @@ src_configure() {
 	)
 
 	if use cuda; then
-		if [[ "$(gcc-version)" > "4.6" ]]; then
-			ewarn "CUDA and >=sys-devel/gcc-4.7 do not play well together. Disabling CUDA support."
+		if [[ "$(gcc-version)" > "4.7" ]]; then
+			ewarn "CUDA and >=sys-devel/gcc-4.8 do not play well together. Disabling CUDA support."
 			mycmakeargs+=( "-DWITH_CUDA=OFF" )
 			mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
 			mycmakeargs+=( "-DWITH_CUFFT=OFF" )
@@ -161,7 +176,7 @@ src_configure() {
 		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" )