Version bump

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

3 files changed, 222 insertions, 16 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index e92100501074..f869f994144e 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,11 @@
 # 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.102 2013/09/06 16:39:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.103 2013/12/07 00:20:15 dilfridge Exp $
+
+*opencv-2.4.7 (07 Dec 2013)
+
+  07 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org> +opencv-2.4.7.ebuild:
+  Version bump
 
   06 Sep 2013; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.5.ebuild:
   OpenCV-2.4.5 only works with CUDA 5.0 or lower, bug 483634
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 719e11766658..17377a142afd 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -7,24 +7,28 @@ AUX opencv-2.4.3-gcc47.patch 835 SHA256 bb64b8af632b67293d1c8024b3786162fccc9f4e
 AUX opencv-2.4.5-javamagic.patch 1140 SHA256 1a3fd6918982909dc1de4258cc386139f7005617032cb457d5ea521f0b4d2ad5 SHA512 f283529bc6482203b2ffdf57aafcdf80351eaf8d09c07c6f14991e5d6bc25679dab31f3dd0475b1eee32f9ba8636e9ba96755b90c96de7059c8f69c0d43746aa WHIRLPOOL a483809bfe0ca11a299757bd1ec42ada5fc1d415eb366f9e2d05a6e8a30dec6b8d8baf662da0041632e23b3ed0d4f90e612fb15ede0e126c09e9a98da7a9621c
 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
 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
-MISC ChangeLog 17584 SHA256 5e2a644508b3d3764250544037b681fe691a46a07dcd20ca3f3ed98dd6be6900 SHA512 d658685976da406399feb508b92ea4d49a5aff967ba5ae11fffa28df5fa27c6c944d4c8cf08b8bfed1b2214319c6e1905db28a83a4be2f3d858476ac45e280ab WHIRLPOOL 65579daa155daf8311aa2dfd7c3b73e1002a54ad7eb790c7727e88796e24683424502c102c0f4e4950c6d6bb9a7ba9bdf61da2aa7d0931581abccc5157f82576
+EBUILD opencv-2.4.7.ebuild 5327 SHA256 bb60806338d3b615757bbe6ba56d63f8ec3885bf37d0e15265763479bb48f207 SHA512 6779933f75a0293f5435d3794ab0b7630835d6755162f542db26e3c67569d4ea49b4cff79411192f42a42274d547d7372b73700b5723e5e51f59ed21a615aa8c WHIRLPOOL 918882b418ff0fc54bb236f78d46e106ef93bd6db74b83e3fc15964a72f3baa4f382cdb59c0666576f403038414f8e741160658ac106060a388fffbdf50eb0a5
+MISC ChangeLog 17708 SHA256 96b368addd956b10932e0d780bb01182b709c6fe5475a6192fd92e3236a0d081 SHA512 a9331a16b5f3def059063776715733952335dee2e5e2703e7838503385efa205de082dce455582323f28d0402ad99fd9c6f1f8844f5087eb4b65d0385aca1f1c WHIRLPOOL 323a99eb8aaa587f5d1cbdb160d807994c55e65343416ba791a53879cc14ef2d54a47019200297ea7795adedeae45078185919132384c0aad987a68b0ca9dbdb
 MISC metadata.xml 1058 SHA256 a8c4be7d80245b258f435bee2afaab35dd8665bdaea986b389527c80d25f8b68 SHA512 d3dde0afab2a1b6960d47838ffd7af97311df04ebfff091ef200ce93268e5efc3c28e4c35e848c8faac0a95b92e63b8cc2b51e72e3df8709c1951a6ba346974b WHIRLPOOL eeae49e5972bf997954d69f29bc6f058c7c8eeed2a7f1791517e9344f28e32e60e76c3fee9ecca06f48548882e0b8ccabe10ce0b3bc7ca1cc40662a6f411a0a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSKgWEAAoJEJS/30SErRQvGPcP/0KWPQJB+xuN/DSqgvk5APBU
-g3R6ZeoSXrxBkANoPjoGaADIM+mhWK4tLoogoHCGaQs3JzXeaxa3r2CASetO6gNE
-i0rNAwPS4OPfTccqRYM8/89+3AexRM3do0pg69n/NBPchgZgqBymydb37WKSlsut
-L29klpDSc9/KSp8M/RQr+8SSdKCSztEC0gC8iyqTsCBar+XEOVDjB6u5d3AeQSRo
-oZt05yxM9wsR+WnptTNSJSr7HVvYpe7+V8kuCbGLix3gYVnZNnzNCPvef6G7uU7Y
-SQfqJKf5VU9Qe+XFs0d0jKyW5EKKJp02UeZi3xkGZz0jFESazerV0oxQrWi5LwX3
-vj0UU1w7X/k/5+92hpm3Ni+7AvV90vVVbqNCZmtwaAKuIvdQGaFvOLk+PG53zoIi
-/a41Vnk8koUZk1AnCzWjwS9Vxh7L5+wHJQtlIQzLdh63bmjQC2FaEtPKdT9MpwPh
-w67S92obJr1FDZ87yDY2yh30XKpKWYOOhm91OnQLMWxK1+LMkwtjLSDi94MLzESa
-iFESJHi0S2OoOzvezdJkIFdVs3vo3cyBcy+MwPQsLnhFmZuZwyAlpO1yiiIsztYO
-S6QPTmNlsX9u0Dv1r2tT1gTeC0rB6zJEPVVUImP0AdJr2fQ/cEq8gG5CmU5JlBgA
-fj8nKfNnQipXTVl8aDUI
-=aAmM
+iQJ8BAEBCABmBQJSomn4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcsiYP/19qBdqReeEuRj8K9c4VnMOz
+dKoQ8FC2krQJHh+C3/IPrJrDgwQVE2NSEKt2ANlKCXogxumGpGcj8OPnLLHSdyFa
+mYaVaCVsABL8LIeUrzaBmPYsAUxb+ebbyTPxpH0Bh6IZKti3dgEQOEk45+AER/f6
+T9poBb152g6gwWr1+F+z0PJluiW0NWGsZL2WQ3XkK+WS1jJEWd7muadQ6CZ+EFoU
+kQwAXcIk/PW6Gy5QhxXGddLFvE7vj0feC8VSRF4cM0ldFAKBq/9Bx1+iwpXj2Y5C
+erOA9fxk44wDkPlLCBUKHeKkSHBBIYzBo0csClP1q32JmpjnwddgzGXc2I8jwMrD
+mQsL9wfo32hQcd8GM8Dc1uld3fnntomWY8hc+OJTIyps+z5qQpXRPZm8cAk+7HAI
+idZVzt98VHjMzX8qxBtV7R5DIOgj3lJjdEe76+gtaN+DYC4xOdtsT9vxzTDQgjJC
+8rst8RYcMybib7Q4fNZ1y7tTb6PhcS3sCv1h3NupMYG2j+N4QjrZPh+D6CWK7tev
+jKPu0MjPRV7nXptRGHBcKC9FfTpVaPMGIIlSbFAoi1VKQ2nnR08/2BzdSOZHVfb4
+pYhLhWbgwcdht2qHZvVIG82marPAsLVPXPjY0VfxMC+KMCEcXfoVt9r7OO4Q5S3E
+JayMQJ6EbF3aWAuRrAm3
+=5Zi4
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.4.7.ebuild b/media-libs/opencv/opencv-2.4.7.ebuild
new file mode 100644
index 000000000000..2bd80fdf3852
--- /dev/null
+++ b/media-libs/opencv/opencv-2.4.7.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2013 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.1 2013/12/07 00:20:15 dilfridge Exp $
+
+EAPI=5
+PYTHON_DEPEND="2:2.6"
+
+inherit base toolchain-funcs cmake-utils python 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"
+
+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"
+
+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
+		media-libs/gst-plugins-base:0.10
+	)
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+	)
+	java? ( >=virtual/jre-1.6 )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/jasper )
+	ieee1394? (
+		media-libs/libdc1394
+		sys-libs/libraw1394
+	)
+	ipp? ( sci-libs/ipp )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr )
+	opengl? ( virtual/glu )
+	png? ( media-libs/libpng:0= )
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qttest:4
+		opengl? ( dev-qt/qtopengl:4 )
+	)
+	threads? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	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"
+)
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	base_src_prepare
+
+	# remove bundled stuff
+	rm -rf 3rdparty
+	sed -i \
+		-e '/add_subdirectory(3rdparty)/ d' \
+		CMakeLists.txt || die
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	use openmp && tc-has-openmp || die "Please switch to an openmp compatible compiler"
+
+	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"
+	java-ant-2_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 java)
+		$(cmake-utils_use_with jpeg2k JASPER)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with opencl)
+	#	$(cmake-utils_use_with opencl OPENCLAMDFFT)
+	#	$(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)
+		-DWITH_PVAPI=OFF					# not packaged
+		$(cmake-utils_use_with qt4 QT)
+		-DWITH_QUICKTIME=OFF
+		$(cmake-utils_use_with threads TBB)
+		$(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)
+	# 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=OFF
+		$(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				#
+		-DENABLE_FAST_MATH=OFF					#
+		-DENABLE_SSE=OFF					# these 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_FLAGS_RELEASE=""				# black magic
+	)
+
+	if use cuda; then
+		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" )
+		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 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"
+	)
+
+	# workaround for bug 413429
+	tc-export CC CXX
+
+	cmake-utils_src_configure
+}