Version bump, bug 480830

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

3 files changed, 217 insertions, 6 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index d60445651270..5405f20d2478 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,12 @@
 # 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.100 2013/08/27 20:33:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.101 2013/09/04 18:43:16 dilfridge Exp $
+
+*opencv-2.4.6.1 (04 Sep 2013)
+
+  04 Sep 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +opencv-2.4.6.1.ebuild:
+  Version bump, bug 480830
 
   27 Aug 2013; Alexis Ballier <aballier@gentoo.org> opencv-2.4.5.ebuild:
   keyword ~amd64-fbsd
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 84def0c59f9a..658fbf758ff1 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -6,13 +6,25 @@ AUX opencv-2.4.2-cflags.patch 742 SHA256 7ea8c07becb830fb03c14bfbf6c25fdfeaf3fcb
 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
 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
 EBUILD opencv-2.4.5.ebuild 5174 SHA256 d5e0c53f98ec79923ae8297d60f81cb69ee715b4023c02a9a060f4750eb2656f SHA512 c3e59e2c519f07e322a72bdea385c316ef75c6a5a65b218489c8b39859d1e3ccc3fd6af47fa3c29671a52d86f5973efcf0419aeb80b5745a046360cd2218bc41 WHIRLPOOL d0cf8de6a12cc746dfafdcb449eb6d41e3db0b110fead0982e8228e5e311154c827beabf7cd23198fd9d535899036d2780a1320dd58a3537ec695cbade2e93fe
-MISC ChangeLog 17301 SHA256 1bcbf1e6fb9fb85142fb3017fa3c1a61bdbdda60170bfc50be02e5ad83238622 SHA512 696996402bf8f59956b53382784c6a4acd1b1e96f362132e380281783859795894ccc5b7ddcfeb3266d6fe0f0b4def65577191b8fac812dfd97eb45d4f639587 WHIRLPOOL 721ccfa679fb82e57a8ec1ba298b2c2de6351cb7c0f1a4757d7900c6b46a90fee750ec082a6e2bf24c6a2ded9467a3d4fc38ecb1a871fe8973fa0842db8c7d53
+EBUILD opencv-2.4.6.1.ebuild 5180 SHA256 8dd5be4bb1110ca3053d1884385dbe1f5fd85b5a578ba03ae9c0c6049b2f8ccc SHA512 2d1dca4daa44f94c80b5f9fcc29c5fe6faf8dd980cddd8e37ed5419391710143376235f3e56b52397cc1d0cfa85d5525952c1bfb0764057cb7f634da96557989 WHIRLPOOL 785fb7dd867c10bff29f8e46979db474e10f0e30f106d8b5bd5dbe614a45a6468ef3ef5299fc9ca0d6a9c0fe17c353c9ba3f322d85b712a001ac3888ee6af9ab
+MISC ChangeLog 17444 SHA256 d993b0a30ceaedad4848257f98f46896f42dcc384d26ec1e27eacf96f7e32be3 SHA512 9ace11996431f833cf2a9293c73413adbfb932436f70137a06a4e14d20e491b1b081ccfe767617e9be83a82befd30379e1dadbcae1327b7f6098c0839c79a8f2 WHIRLPOOL 59811e737e5cbf6f1df4dc4b91a1107360fb859a6296dfb7423553db7f8adaa1b3615132903517232c2a92e53dd4fbf9d49a4b474f38c0281dde06738601b8db
 MISC metadata.xml 1058 SHA256 a8c4be7d80245b258f435bee2afaab35dd8665bdaea986b389527c80d25f8b68 SHA512 d3dde0afab2a1b6960d47838ffd7af97311df04ebfff091ef200ce93268e5efc3c28e4c35e848c8faac0a95b92e63b8cc2b51e72e3df8709c1951a6ba346974b WHIRLPOOL eeae49e5972bf997954d69f29bc6f058c7c8eeed2a7f1791517e9344f28e32e60e76c3fee9ecca06f48548882e0b8ccabe10ce0b3bc7ca1cc40662a6f411a0a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIdDSkACgkQvFcC4BYPU0pKuQCfaFeY3iHBR49spl+FVbCM86kh
-C0YAoJhyun1kZTppaNk+bcJ0AdDXW5Ec
-=FD7L
+iQIcBAEBCAAGBQJSJ399AAoJEJS/30SErRQvQxgP/0cKob3+i/5zIXBOZA68ZWak
+zgXFdtOiNdAoykZGtftbQOlOvGnsk5DjT9fz+povCXwijk6fmCVZ5/HqgZB0besq
+mKAwqwAYw58IFnxMiKQ4hk+ymziwlsYz9lXDCAxBkQnhwvyy3xoI/QwDaLeN///9
+E3un+e0W3MTQl0mzPO3P5yooXCGcqDrkTMamO4DNMt6q1NFXhOrOCdUIBMNXtc34
+cL1X30+XyOFNSGWvUSglgcrNCdC90SbEbsuGwhdoKdMrs2twDiNfOmuyf+A0+10H
+A6qFVBWuWcqYx4wnKxCW+xanK4XYhLcGuUV2aDSTFYOf+38QEU8qb1yId4o80Hi5
+pSy0LdFKkH+ISi5dwgh9AcZbLISF8KU0Aa2rL5BbG3YRjYhM7UYZEjR/vCo/Y0VH
+3Zd/5IAiCEngiXwnF2z1JNcVLBnTGLbE4XMso7fIj1ogMuH4L4bMhRMxxN711q1M
+e5Hls5vXj9Acve1sIBZaLozPJPpU7RzSy9tEzya0RQfPNoWNTyc31HFZrI79sbPO
+b9fNGRnct1dUfHvx1muL33PW7I3V7YKX7SqTlgJEhvCxhwcMvf0urGWCEF0vB9Db
+SwGDcc4lO5lfqk5lUG3BS6KY2XICcktnTov7wMIsAZNDbVBNPomlF7POS/AAh80U
+YQ+S+zexsfx7ekoYXdRF
+=LzHx
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.4.6.1.ebuild b/media-libs/opencv/opencv-2.4.6.1.ebuild
new file mode 100644
index 000000000000..a046de54455c
--- /dev/null
+++ b/media-libs/opencv/opencv-2.4.6.1.ebuild
@@ -0,0 +1,193 @@
+# 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.6.1.ebuild,v 1.1 2013/09/04 18:43:16 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"
+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"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-python/numpy
+	sys-libs/zlib
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2 )
+	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() {
+	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)
+		-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_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.6" ]]; then
+			ewarn "CUDA and >=sys-devel/gcc-4.7 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
+}