Remove old; libpng slot dependency

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

6 files changed, 30 insertions, 204 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index cb3d3ad950dc..b078755843a5 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.90 2013/03/29 20:05:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.91 2013/04/06 10:17:50 dilfridge Exp $
+
+  06 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  opencv-2.3.1a-r1.ebuild, -opencv-2.4.2.ebuild, opencv-2.4.3.ebuild,
+  opencv-2.4.4a.ebuild:
+  Remove old; libpng slot dependency
 
   29 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.4a.ebuild:
   Add java support, thanks to sera for the help
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 6dbd524c49a8..dcb1b1104263 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -12,31 +12,29 @@ 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.4-javamagic.patch 1187 SHA256 03fb9c62464a09809d1fd8a14d1dab31f9d6ae0fc3d6916590217966fe1b8045 SHA512 84c6dac9c0dc2a9573af400543f746a28a1db0bd02318d5a0fb6262d7151ebc8ef0d327bd51ba0e82a95c04fe81040f6aed6f2dbe3de0820723a7726c2fc00e1 WHIRLPOOL c9d7ba39dc68bf1f9e4ae4aa198b431d39a98d22cd6ccc838facd7dcd8ccb6cd6ad3fafe8a1879d6d8ac740b2b0a3eb10faf997d8b09fa76f238e9854a492ed3
 DIST OpenCV-2.3.1a.tar.bz2 32669613 SHA256 a9a2f529101c04eb2b606eee8c80f3ad93190b36f91ac09ee0ec5aa1eed1450c SHA512 6875eae92fa099766410dece37b65ee51c95eb8ed6d1bbe19b533c66361686b31bf5513f6558efdd37332e68b30c5a5f221d17492c00822aeb07efcbf956584d WHIRLPOOL 7cea733b5ea764b229b72565b3c8ea7b2665aa7063c98f97d05bc82d6a41000110a1935b9061050bf17fdf2cb3f382778ba924aa5c8ce7fbf96895a0317e4489
-DIST OpenCV-2.4.2.tar.bz2 52562911 SHA256 690023811e03e21df996291392fcf78e43e42ef557b9307503c74c74b4272c28 SHA512 1e009817553668e4040c7959e07b402d06d66f6d4743ac4da2e44a38bef6c73ae0fa454932f7aae778915d29f5d457248fa3488f5df208d1cfb5775a26e34f44 WHIRLPOOL 8412be6b0f51ec76cce9fcb1fc1450b4b50aa3a98a2ab7d312d62ea47fc2b40f997cf09843de048a71d2cc1b5b2f1bf5eea92696ad3d4f5f520c4f3c850266e1
 DIST OpenCV-2.4.3.tar.bz2 67240491 SHA256 f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b SHA512 5305e726089f3f43b2bac06b09e2b5f021c63421ba0b36eeb10e43a067a6954569fccb5a66ff8971e83ffb2c3829df222b74e6a33117f85286b3389e5add232e WHIRLPOOL a384e7d09ac31638bb4bc93c2c7c6b2bc88d0344a494d44d53110528a1abb84250b7979c46d3be55891b61b952ed780f10cee41478bdb906357d80bf52f52b57
 DIST OpenCV-2.4.4a.tar.bz2 74636004 SHA256 e663cf6e4762c8be2f80f9bca8fb32c01d65e103df44c2df4a728ddf65216030 SHA512 7ea28d57a8a7127c7daf25df087420c163ab4d0c765f02919aff28dffc27f7d2c378fb738da7182ffd4102080d9fc57eff214dc54514d7b6525675acd2068fd2 WHIRLPOOL f18ec40c16b1a7a32d4b3e6788d0ea94a9ea80626f91245d2d7a076b2de280c41f775ce1876ae2948958b3c344aeb6821d81c8e576aa7fa40dfbb497f22e0786
-EBUILD opencv-2.3.1a-r1.ebuild 4210 SHA256 e636c4c0ccc54bbf9b7d1d534ae2f53c32578625889d1d27bd5966d48133b5c9 SHA512 7bbc55b12dfbff2045e57f61aee9a3967caf52bf3c30ae92f9fb610231f23541a79b8bde0560e08a2052740e070dbe220ae1f01ae4216780c2f52ce46c8358a2 WHIRLPOOL 84d9b1a8af49dd9fc9f2f54d560381025a99a73c5a18156ea5f043db52d830781d6ea9017a1618c35a0c89756f8eec11c4631398549a54f002dcb9294e074bdc
-EBUILD opencv-2.4.2.ebuild 4684 SHA256 0f6638745a2b944ff05c791c2b6b4dbfc5929b5ffe7f321bc02ae835e3667bc0 SHA512 64f23e0887a909949e16a6da1da92a074173c8b5fcfc52072851fa9112448f898b0dea6e36d17b2dd5e0e5a35d4f82a06b4978a43845e876ee405e225583f4fa WHIRLPOOL 631cade9124458d9045241a649013ac1a4200c528612da5807274f4b9f9107ddca666395fef6470f439ad88521090840a85be95c73392625b30c9fa632a97722
-EBUILD opencv-2.4.3.ebuild 4777 SHA256 94621b673dca5cfcf2c12582c4e27964387fbd3f43f1fc30f5408d343d8dd97e SHA512 bdac10f0786aba6790b39080b8c2a63ec77369d0497399e00f8df92d565eb9f6da5fac9a6ff0f5e8d0b6420c788e7b3c496395728538255cffb21f55591a2511 WHIRLPOOL f8a959431722e4cac14e7667bda9c1e85fe968c3d548894cef29dabe8fe01c3ec473970ab34ea4c0781cf8e966e8bf0db26d3cf3eb9a20d2e05964481badc878
-EBUILD opencv-2.4.4a.ebuild 5166 SHA256 a3fe57b29aafa6054d74b0bba5cf8766f09e950c55aa2ea3ea554f8d210b1adb SHA512 4464971449473a8a2194ad9900b2c8415d649ce6564345c64c4db7971bc7323373b9bc19e2d9c6e44a7469f928efc2b4ef9440f93a6308fa3dc171e19220ab07 WHIRLPOOL 14a99405781d510cb02b3e21e1fec793e085a09696efc9769bef1c9e6e1d5d82a37dc9f8907b4ebcdf6476720f24a354dda2b19e9adc963560dbb4f5fb0721c6
-MISC ChangeLog 15820 SHA256 81250cf8c57cc64b074d822729a7e6c5307c1ea73e1d3c7b2fc4faa12cedb3af SHA512 7600eeecfdbd43617c50af69595df69f78be7cef2d5af071b761c4fc86e7d5ff0690058b7889ff696d716abb2c934378be50428ce9f0a99ffe83556a84e6da97 WHIRLPOOL c65b2c73bcb1b6d325cc28d64524ed876844525347926b64f029f9557803eb91121762be2a04187d7839cd34379731fd7539f3bda992f7ea384b84a00a78f444
+EBUILD opencv-2.3.1a-r1.ebuild 4213 SHA256 a8311a95a0fb2fe11dae8eba5bfbe7b1a7f40362f84c24eb17e031836788448e SHA512 52f1b09a18cd84a3d23da5595fca3a104b0faa8790f2c9d50f969d2488531b1f9a0d2cea017620506dabf0b4dce02149424f85431472eddc08eecd4a21954a4c WHIRLPOOL 43aef62b25ed40329a8eb86409c4a9d40c4325446bd87cc09bcb9ae6cdc0b4bc1d54432ee2553cbde5fd88ff5137c812283d2207861f757a7e61da3e9f9fbd17
+EBUILD opencv-2.4.3.ebuild 4780 SHA256 384324386e196d6238b9000db1a100116196c2506883acda04ac353a5678881e SHA512 e4b7f9b4489aecde56ab2650933974457d145dfd76faae464458ae41105c30b5f2dc600b7ff2890d762d300739e21f5ff290d2eb6ef4f91bba3f47cbed1db2e9 WHIRLPOOL 46007ca0dac016fcea8fd509d1c07a0e500c7616f97084fca3fb003a50efc781a3127c1c286dfe9ede13ee6dc9a84e2072cf5721e952767a0fa5df33ecee582f
+EBUILD opencv-2.4.4a.ebuild 5169 SHA256 8a8fbd17d1adb4cebae4f40cf839327c436a22cc54044e5053f327e891b6fd56 SHA512 dbb1deba4d434fdc66b7cc8738440b4d291224102b5fd6dc0f7714a8f5fa8e4d28877dfb8ba1bdec9246c9483d0b8157d751756ba44e5015e183e9257050a6e9 WHIRLPOOL d403127a4702efc5f1d75fa19a699a5edc3588862a687f218c7bdd0cd3c171d119e0581c62aac0c270cb1d8c4f8126ed087e53159b7680e2fd6e321e20fe8d75
+MISC ChangeLog 16009 SHA256 906c027547920765d41c4da016675f8f8fd8ad3acfaf7fced0e83eb82378f6c3 SHA512 4a4be2ceec74ebe09a591bfd69cb9d0ef979afb2b86747575a3678dea7737ac745ed7e669202eaa5d2840328ed2335e22146a00cf785acbc53e772cc2a3d50e4 WHIRLPOOL 17bbad31c8da036b05c44f3f04cae3a36a423057ce61fa78df51f940cd070ef0daca73adfefa7d3fa49c95b1cb14520f5377b17e770829ca39a8635e3d733282
 MISC metadata.xml 1327 SHA256 572366f1f13fcaa7c7773ef255f519a6e8a8c94ef49eabb2ab58631d621a5d89 SHA512 e8b0b9c864e71871f27334f52f6b90d14132c75ea6b63f72e34f26770989a73b07cd50c2ca96a3b9aa42af95c6b83c39b405b7bd41c2d4c2ed35ad5a57966340 WHIRLPOOL e8a0532a83665b47064be8a41a6ca72d3e678e3797c7a971bf4b3817c95fb12895ac6cfc09eaff429a08fbadaef80fab250155bc2bdc43d628571796f3fce5d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRVfRZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRX/aJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcvdUP/3005Fq+Q6G8Yt88Ot0dbrah
-BCyl8P8bJz4nanrcOoybnSKV8+vYanQReFN5SuLpP/nlGST1s/baEB9IXMdDKvz9
-vzbmeoQll7kjn1IglCtzkYj91nQhsEcOdLb4949+92mhVuhCnO8GWWAzuEaSvuUW
-zbJ3LiTLSfaFlHST0sPCBKehhkUbcdnLonzVgLbn7UDrr7QksQSS1uUyivvFZOcX
-En/I/cV7YQv+sk5TkJQ+dJf0oNz4WELmMU7r99zQ2IREEgsgePAQfaGm/b9Kd3zw
-IjE7FiCQnAKfEUR8+vqZleYdmP+JsesujJufrJfFO1S0gx2OxckBbGwKjfdQi3MB
-zdiTaoA0+RlUg4MBnIEoT7KpeqoWzw0cgldzXGfHBoNPcP9qKpA5sGXaa5MIo7Rc
-cF5ic8S9/n1/pSkdsstiUVjid15nDpVVnBi/NtiCj/Y80vo5G0hzvqp77V90yds1
-vP0EpWDS5sAXO8tDiQ0fJkWSItSJ+55XK2hmr04y/yEKB4ecff76b+grZ+UjY5sE
-aLZZpG/7mlB/M9yCtEeMSAUyRbUTOFeOJDa2hATsdHgkQCSHPkLj7ICvY8ruht7M
-KZ0eMyJhrNZjzcd1rPxbxIry/ahbQdtu2ahWRH5klXNErgR+HmA+i6ltu3SyZkE/
-WSEuk4yUeVJI5DG7QrDb
-=7x2l
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcFmMP/ApEsFe5TCq7jl0wSvQqXsG1
+XQQSrG7yC81IVYTLnXcQaptl+EsNqhU0LBFZjRpeDKeDR0eMaVxyBH5Y2N1/NQnh
+AnBZF4/9XH6v1F7ENz6x4RBSgdDjkA7XRry3Gu1jFpJfh3GvBL7AJTk1frUza/6p
+1tcvcSZnqEHN9ZxiFJwezkKyG5U6274vBnE5I6upZEmKDrgQWHo9wKY6DZZL0x31
+n34a60E5JQw4ZfB6tUUOOLwHCyYMEi5+jzgeKZR29Q/ehULwMbpRiVwje6IaW+mC
+UkgZ4KD+GwkR6WNwQioW3vVzpMkWS6ca36jxNMpdkge5Q0Rk/LPMVuHLpfOk+DBA
+P5radqi59gZ0tmFReBjp7h/qOZ6zrfAPOiteT/n3qICaeAnaZPBzjZHSyVC3cau3
+E26KoAkoZtEjnX6pVqD6/3Z1KCmCpzCwxO2XXVC2/oBbWZs3je+Ix8J2oP6+z66M
+f3PyPrKP6faZckkGnrN+Bu1pW89eW5CBqKZ0wHGhfRBxiVzT9tX7lVUvBDHso7KR
+jLONWAxTT7BH1R9Z+dbFCJn5r0lcIvynNWj7doqVgthmeQMRgD6SzarIk2GYxilk
+MqnPxGmvQgP+TmOwpLVKcYdpUx2DgL3grsAexMPq1k8CgZH68GDNritIYGUcukfU
+qAQUPErmK06A1e0wq/bn
+=rj10
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.3.1a-r1.ebuild b/media-libs/opencv/opencv-2.3.1a-r1.ebuild
index 165e3191d57a..99ac9c4a22db 100644
--- a/media-libs/opencv/opencv-2.3.1a-r1.ebuild
+++ b/media-libs/opencv/opencv-2.3.1a-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.1a-r1.ebuild,v 1.10 2013/03/02 21:46:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a-r1.ebuild,v 1.11 2013/04/06 10:17:50 dilfridge Exp $
 
 EAPI=3
 
@@ -37,7 +37,7 @@ RDEPEND="
 	jpeg2k? ( media-libs/jasper )
 	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
 	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng )
+	png? ( media-libs/libpng:0 )
 	python? ( dev-python/numpy )
 	qt4? (
 		dev-qt/qtgui:4
diff --git a/media-libs/opencv/opencv-2.4.2.ebuild b/media-libs/opencv/opencv-2.4.2.ebuild
deleted file mode 100644
index 2452fddc1e10..000000000000
--- a/media-libs/opencv/opencv-2.4.2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# 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.2.ebuild,v 1.6 2013/03/02 21:46:34 hwoarang Exp $
-
-EAPI=4
-PYTHON_DEPEND="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 qt4 tbb testprograms 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
-	)
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
-	ipp? ( sci-libs/ipp )
-	openexr? ( media-libs/openexr )
-	opengl? ( virtual/glu )
-	png? ( media-libs/libpng )
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qttest:4
-		opengl? ( dev-qt/qtopengl: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.2-cflags.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-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_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"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/opencv/opencv-2.4.3.ebuild b/media-libs/opencv/opencv-2.4.3.ebuild
index c80c47ee4f13..53a3600a0e92 100644
--- a/media-libs/opencv/opencv-2.4.3.ebuild
+++ b/media-libs/opencv/opencv-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.7 2013/03/02 21:46:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.3.ebuild,v 1.8 2013/04/06 10:17:50 dilfridge Exp $
 
 EAPI=4
 PYTHON_DEPEND="2:2.6"
@@ -43,7 +43,7 @@ RDEPEND="
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr )
 	opengl? ( virtual/glu )
-	png? ( media-libs/libpng )
+	png? ( media-libs/libpng:0 )
 	qt4? (
 		dev-qt/qtgui:4
 		dev-qt/qttest:4
diff --git a/media-libs/opencv/opencv-2.4.4a.ebuild b/media-libs/opencv/opencv-2.4.4a.ebuild
index c67e12a3e68a..763d0ccdb8fb 100644
--- a/media-libs/opencv/opencv-2.4.4a.ebuild
+++ b/media-libs/opencv/opencv-2.4.4a.ebuild
@@ -1,6 +1,6 @@
 # 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.4a.ebuild,v 1.2 2013/03/29 20:05:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild,v 1.3 2013/04/06 10:17:50 dilfridge Exp $
 
 EAPI=5
 PYTHON_DEPEND="2:2.6"
@@ -44,7 +44,7 @@ RDEPEND="
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr )
 	opengl? ( virtual/glu )
-	png? ( media-libs/libpng )
+	png? ( media-libs/libpng:0= )
 	qt4? (
 		dev-qt/qtgui:4
 		dev-qt/qttest:4