Version bump opencv-3.0.0 bug #550248.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x34E69781

3 files changed, 225 insertions, 24 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index a9197769fc52..ebbd344b8302 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.124 2015/05/23 19:50:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.125 2015/07/10 22:02:43 amynka Exp $
+
+*opencv-3.0.0 (10 Jul 2015)
+
+  10 Jul 2015;  <amy@gentoo.org> +opencv-3.0.0.ebuild:
+  Version bump opencv-3.0.0 bug #550248.
 
   23 May 2015; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.10.ebuild,
   +files/opencv-2.4.10-pic-x86.patch:
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 70dcc597bec9..1d3cc7e2ceb2 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX opencv-2.3.1a-libav-0.7.patch 415 SHA256 3186998b7b9eaae061d538633276c7de47b2388b639106e190d80dcf09fb9099 SHA512 b17466470a47876e1a8434367f47ce13ec989bdc35ec707d87188187e08b8ccca6af4c5563f20b3170758582b500323030cff22961a7fbbc6b4843d8bb808f1e WHIRLPOOL 5caf84c49efef118e1c90f6bd88237c6d91e9b37163248e5a6f6c135ae60f5f4f4328d83f061df2c4d5f81fdf68faa5b55828feaf67707956701c633614cc5fc
 AUX opencv-2.4.10-pic-x86.patch 2036 SHA256 75db3a5f51264f65d5e294cff2329489a518d680559136fbf06ef25b77890ce6 SHA512 e1f0efe3a94e3be4331f82b65afc707a7e771f5f93fcd0816043daf13d830af2a4a0607915eab25b2dbe9becafe612d3e09d20d797cdb364fce35187dd899a6c WHIRLPOOL faff27d3e642a96b04294dc7126bb19494e34d740dee3955b8011edb60309060050bacfbe36dcd78a27b9243a7c37d8fde8d5e065ac8fc8941ec4fa12ab251e2
 AUX opencv-2.4.2-cflags.patch 742 SHA256 7ea8c07becb830fb03c14bfbf6c25fdfeaf3fcb75949b810520f4fd6c1178c1c SHA512 b92c07d8c9c40ad7721e0cca2d79b001f825478a336ad40cb43d02218fcd9e8b94b871575028ca8eaf6616cfce8138c796f32d4cf55d83d5cbe819ec50cf7c82 WHIRLPOOL f83ee4b677490cf6981b5a326ae6a7ad4cfae1c27fc6c516d054337939957d801ff1319798d2b0b9e86429b8d688f514e74b74bfff56c64df06fc3c7035f320e
@@ -11,26 +8,9 @@ AUX opencv-2.4.9-cuda.patch 7247 SHA256 94f01e58038306a6f699d867936038c9815f965f
 AUX opencv-2.4.9-libav10.patch 22417 SHA256 7c95f31c8242b239c2cb3259e2bdecad4a56d1dfd8d6087e71265ab6123aeb8c SHA512 e6ce98f788df2cfa32861d62c21296e4a3cea7a8b6747bc945cf80267a23aa207f94b30c000bddf6ccea69fc22edef635ee33cd3dd683a4b790bcca49e068a93 WHIRLPOOL 887a684bdc0994b8a5bf6a83aca4e94eca45c5a65ab5bfda873156b4cb8c9ab3b3bc6a5a75a8a2016f4416e47ab4f6f9a3b6776ac10af3ca57d9a4e2c3b08c9c
 DIST opencv-2.4.10.zip 91692581 SHA256 1bf4cb87283797fd91669d4f90b622a677a903c20b4a577b7958a2164f7596c6 SHA512 545345f2984bda9ec5e5f0947077c5f40028ea018cbb21362f33615e5a02d5ed19a51c77a9b183086534e6496509dd008f9d7d40c2efc46bf2a942c710b4424c WHIRLPOOL 3231c1f6b766b39a44b10354532037f5f9f856bd1533c205cc39a1a3758aa53dd4d15595127fd6d1c1d2b6b7bdafe64521ca833c036a5075de4b298218d4bf0c
 DIST opencv-2.4.9.zip 91684751 SHA256 803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 SHA512 8eb6ee11d8260428ae461e06348ce037979efc29b7e33d59c3d348a6b4bae95b7004df4527aba7c634e7356f7b5635c98493dc15a0b43479e8f10f7258540c62 WHIRLPOOL 5bb5e39678b3072b2e8b923216529c84982559dd69d5ec51b8703e65af3401f3a8ff31e4e3bfc076480d0605e333df0b03a61713a927ec058bfaf25b4fa8fd5e
+DIST opencv-3.0.0.zip 100980799 SHA256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 SHA512 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375 WHIRLPOOL 61cbbf5201b1dea75ffa998d1f55ee35f098bb8f76591cc9705de13b9f05eaefd19dcc74e93d2643d9b721e62483a36547617ec2e3d14fa6a2522e18ccf06747
 EBUILD opencv-2.4.10.ebuild 6158 SHA256 c24bfb58248c57756cad39976581f279f70a9ec89d79332ee9e13cd33157666f SHA512 774448ea1b56adefb87baaaa19050994e03b056ef2b8b012092552a87890b028623ea6b35c53e2419372c19deae109a1889352bd5abd012be0bbdb2fc3577650 WHIRLPOOL eb6362c1b8a488e54f066a137bfedf99a8f3e6536629bd49186aada6a0c634f7649aa4e7ac17317f46c450682b7481fd9cfad10c52b100818a6744b97d120e59
 EBUILD opencv-2.4.9.ebuild 6145 SHA256 46923f2f7d72d5cc270a02afb9648efbf12c779137b1d9a8ee15e5fda4d4c65e SHA512 0ed36f1e35f085f00d28d120ac5c4a34f95f2bfa1fa13b1c8c3337fd474121e2cf7e36e213ab1144c5983cfed916841b5fae5ced02c802f80f3a7780a0d45361 WHIRLPOOL 2a71f4a2bb7868bd279676b56f5526f0f9ea8444ab3df73ee4e3fb8c46fe322c02b1fe02b415bead855c7df87a6d980d8af26b4e0264a93cc54fb13b80e98053
-MISC ChangeLog 20496 SHA256 b24f3d52c89197b52bfa508b55d028ea7ed2574a44f9182dfc5b2aef19da05d8 SHA512 8c4b2d571c3ca21217b603b03d19854f6f7c33d0ab43ecbfa27dd6621330956b7ba6db339c400f4b8082d13cb07a6376edb7545a1cc7af82a2870329109606eb WHIRLPOOL 8472c796d7f1a1b7798da373ef93e8f44f923ba0f1d6bfd55732966aadf4a62b1903ec8be59d3af873113ba83a316dd617b6e4d8cbafb9752220e8ce5a084e81
+EBUILD opencv-3.0.0.ebuild 5857 SHA256 55791b04a7d15a273d97a61744e738a05f466f6aa67be37dc6af15ce25df49dd SHA512 ed00a3789b16203ad254610944a8b61ac8e57b2cfadc218e9b13b39507f01f59e6e238e6777f7e7ce2107a81b221c49f8b1d9620a05b4698b49f4dab800ba400 WHIRLPOOL af0918b91c8136537a3bf21643be7f98798568098f0fa76ba4322fe61345d29757a33d10639896d598deffdb387a903c7da574ad44e36d6f173c7a56e9fa9ada
+MISC ChangeLog 20619 SHA256 39d281a872ed0117a34fe746f0144fc0eabf8b355ef97ded65b5ab34b762d88d SHA512 1a4b823d34dc39860f51e632a05011374e3558668ae16ffe7dc858f10d99204e7b3fe494f0d1f10f198e63375ca86be2845bc2b71d632d9400566302f51293b0 WHIRLPOOL 9181c8fc964927216de90986b2c55d6dac4262f5b5ace5eb5f84d88eaf1079c9ee4241783cf4e0b1a47289c2c8ab6da41d476be73dd04e22613cf24c9c4a5929
 MISC metadata.xml 1331 SHA256 e15a4a1db3e105297dd1e081e599a5987d3f6a5dd0840ce32ffe60f3b2fc7d23 SHA512 adc6b5794ac0ede6d2477d9b62efff3c96495ac66c0ddfd50879047c514ecaac8f69cb5f0ea0a60f83e3542f5e0dda49ef945f63a22784df46e42dd73266fdaf WHIRLPOOL 4cefa607c0da6eaf753d26d18cdc0cf300c7c9fae71a0d06468db81dbe6faea347c6883d5c437d5e891661d661ac4fcec4bec600c385d873d3c9c7ef7362dcbb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJVfuoxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNr4P/2lSGwV2WsAPdESUx3M/27jk
-rABlSfDdSFL090B121By3hTgbEecAFtiDTx2NKtLwGrvgZAviB6ePxbEbHCoF5tu
-bihG4OO4ssuly/1sn31euO5jyQuwykVX0Xnw+cvb7AHcaSfUfvxA4/742FBhBhgu
-tarBvrv7MyaPKlfS+q5W7THt9UQw0Eu2Yo7zfEMx0B+h4iKyZ0pYvg+LtZetgDVy
-kBEqhBjGL4d5meLop1g+SAsVwu4E9hIJdVh4kBCYrZDHzSL6xIRMA6EYuZPBjKHL
-z7FIOxzAW7zwsX/AJVJsHK97JE6Fk6UQ9+6y/wROy17vMnN/6F4s05ge/afNF1s8
-DynKoEfFiu21xGTliLxs611X+NlDcxgISBHhIuLtVKy7+Ef29OmoXxRVAME6xV3Z
-9xg9bFsXk9DxVxGgEp5EFOpUM3IktG1hhlKC9oDr+0z789n0TN3fhkg5bkgS9tsw
-2EJZEuPsgBRnn5w+a/KBRDmldTedEWXFK0TrAOvn0AqxLSZgLZ0l57fiS6P+aNw+
-QQyvlGDWovWkWrsqAiyklyl/1Eznp7PS21Mm7UQZ6d04N3ycDuxF22n12PDTYeql
-8YZFHdGI9YdUCBH+ExyacWlJybXWp6FK7qYYL4Z07Lzei5ODSOnJp9BXVEdsyaBH
-oW+lPHs0DoQQdfe1rBFX
-=VhVM
------END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
new file mode 100644
index 000000000000..f677b7a7fa40
--- /dev/null
+++ b/media-libs/opencv/opencv-3.0.0.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-3.0.0.ebuild,v 1.1 2015/07/10 22:02:43 amynka Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+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.org"
+
+SRC_URI="
+	mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
+	https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0/3.0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff v4l vtk xine"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt4? ( !qt5 )
+	qt5? ( !qt4 )
+"
+
+# 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 )
+#	opengl? ( || ( gtk qt4 ) )
+#	openmp? ( !threads )
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	media-libs/libwebp
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
+	)
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+		opengl? ( x11-libs/gtkglext )
+	)
+	java? ( >=virtual/jre-1.6:* )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/jasper )
+	ieee1394? (
+		media-libs/libdc1394
+		sys-libs/libraw1394
+	)
+	ipp? ( sci-libs/ipp )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr )
+	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
+		opengl? ( dev-qt/qtopengl:4 )
+	)
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qttest:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	threads? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff:0 )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	vtk? ( sci-libs/vtk[rendering] )
+	xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	eigen? ( dev-cpp/eigen:3 )
+	java? ( >=virtual/jdk-1.6 )
+"
+
+pkg_setup() {
+	use python && python-single-r1_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 cmake/*cmake || die
+
+	java-pkg-opt-2_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"
+	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)
+		$(cmake-utils_use_build python opencv_python)
+		-DWITH_PVAPI=OFF					# not packaged
+		-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)
+		$(cmake-utils_use_with vtk VTK)
+		-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, tests etc
+		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
+		$(cmake-utils_use testprograms INSTALL_TESTS)
+	# build options
+		$(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
+		-DOPENCV_EXTRA_FLAGS_RELEASE=""				# black magic
+	)
+
+	if use qt4; then
+		mycmakeargs+=( "-DWITH_QT=4" )
+	elif use qt5; then
+		mycmakeargs+=( "-DWITH_QT=5" )
+	else
+		mycmakeargs+=( "-DWITH_QT=OFF" )
+	fi
+
+	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 && use python; 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
+}