flann is now completely integrated, and it makes no sense to unbundle it anymore; cleanups

(Portage version: 2.1.10.20/cvs/Linux x86_64)

3 files changed, 10 insertions, 9 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 49b48007017c..2d183f793f89 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.49 2011/10/06 22:32:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.50 2011/10/07 13:18:45 dilfridge Exp $
+
+  07 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild,
+  opencv-2.3.0-r1.ebuild:
+  flann is now completely integrated, and it makes no sense to unbundle it
+  anymore; cleanups
 
 *opencv-2.3.0-r1 (06 Oct 2011)
 
diff --git a/media-libs/opencv/opencv-2.3.0-r1.ebuild b/media-libs/opencv/opencv-2.3.0-r1.ebuild
index 63be83dceccb..ea0c07974c24 100644
--- a/media-libs/opencv/opencv-2.3.0-r1.ebuild
+++ b/media-libs/opencv/opencv-2.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0-r1.ebuild,v 1.1 2011/10/06 22:32:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0-r1.ebuild,v 1.2 2011/10/07 13:18:45 dilfridge Exp $
 
 EAPI=3
 
@@ -22,7 +22,6 @@ IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k open
 RDEPEND="
 	app-arch/bzip2
 	sys-libs/zlib
-	sci-libs/flann
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
 	eigen? ( dev-cpp/eigen:2 )
 	ffmpeg? ( virtual/ffmpeg )
@@ -61,6 +60,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.3.0-ffmpeg.patch"
 	"${FILESDIR}/${PN}-2.3.0-numpy.patch"
 	"${FILESDIR}/${PN}-2.3.0-symlink.patch"
+	"${FILESDIR}/${PN}-2.3.0-libpng15.patch"
 )
 
 CMAKE_BUILD_TYPE="Release"
@@ -77,8 +77,6 @@ pkg_setup() {
 
 src_prepare() {
 	base_src_prepare
-	# include missing zlib.h for libpng>1.5. Bug #383571
-	epatch "${FILESDIR}"/${P}-libpng15.patch
 
 	# remove bundled stuff
 	rm -rf 3rdparty
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild
index 73f3d0514894..1189337ff23a 100644
--- a/media-libs/opencv/opencv-2.3.0.ebuild
+++ b/media-libs/opencv/opencv-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.5 2011/10/06 22:32:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.6 2011/10/07 13:18:45 dilfridge Exp $
 
 EAPI=3
 
@@ -22,7 +22,6 @@ IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k openexr
 RDEPEND="
 	app-arch/bzip2
 	sys-libs/zlib
-	sci-libs/flann
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
 	eigen? ( dev-cpp/eigen:2 )
 	ffmpeg? ( virtual/ffmpeg )
@@ -60,6 +59,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.3.0-ffmpeg.patch"
 	"${FILESDIR}/${PN}-2.3.0-numpy.patch"
 	"${FILESDIR}/${PN}-2.3.0-symlink.patch"
+	"${FILESDIR}/${PN}-2.3.0-libpng15.patch"
 )
 
 CMAKE_BUILD_TYPE="Release"
@@ -76,8 +76,6 @@ pkg_setup() {
 
 src_prepare() {
 	base_src_prepare
-	# include missing zlib.h for libpng>1.5. Bug #383571
-	epatch "${FILESDIR}"/${P}-libpng15.patch
 
 	# remove bundled stuff
 	rm -rf 3rdparty