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

Package-Manager: portage-2.1.10.20/cvs/Linux x86_64

4 files changed, 28 insertions, 21 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/Manifest b/media-libs/opencv/Manifest
index 8d96f404c6f2..25cbd11f565c 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX opencv-2.0.0-libpng14.patch 505 RMD160 86ef29284531519dcc5c6da1bb3abfd3c46efc73 SHA1 81bf18db6984144a0cc5b49e47e180e5337aae75 SHA256 78dc27ae16b2fcbef7cc05496dddf227640f47c37d8da05fe469eeb04146af4a
 AUX opencv-2.1.0-mmap.patch 483 RMD160 a1e1843d1845307d1e6bb7ef03f3fe45fe45380e SHA1 981e4614b5360351426990e2e12d276b04b7043a SHA256 f05a7d79218bfd5ec392a5f0017dd9efce4cdc08bbda7b223bf72525fa40a322
@@ -27,18 +27,24 @@ DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81
 EBUILD opencv-2.1.0.ebuild 2962 RMD160 e6db74fcd2d4c76c3b1f0dc50b6623921ffc5d4f SHA1 9a266d3406186a1e6ca1c619cda3119ea3483413 SHA256 e0f1622906fcefd8f128e60291db8a23eecc5179286704080c8663c7663423b5
 EBUILD opencv-2.2.0-r10.ebuild 4496 RMD160 e4f404e4d2368b27736501bd0d493e6e9dddb196 SHA1 50673483544b1760774a7c25629273b98e15df3a SHA256 979fe4eaf0b7ad221080e5663a973af68ad64385e7adb70017306328def340da
 EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc
-EBUILD opencv-2.3.0-r1.ebuild 4244 RMD160 b9699b3568e57e1e84bbdec1ff2017b6634b76a8 SHA1 0cd9e0dc22858a3ee218fd72f29bfda40f52b888 SHA256 4fb55a63a5c7bbec94068cc07d1cf7748139b9058abee7b47ab14430959cadf4
-EBUILD opencv-2.3.0.ebuild 4201 RMD160 f97b957e567042bbc3933be3827f3971d9afeed7 SHA1 0c619be99b6b08cb9016a347c3a22ab319e54e2d SHA256 dacbb1d432acbe4e91968f0c2df555bafb7aebb99c7fde9ca2336f6fcb6595ec
-MISC ChangeLog 8547 RMD160 db99ae5dfd5dbc6d71cd71564431748395355517 SHA1 a799931a45775a265f11e3c482a256069a8cd0be SHA256 061548aa3df6fb0af9f43a15c93ab76f707ebbab692505f8b099bb8880be3e83
+EBUILD opencv-2.3.0-r1.ebuild 4174 RMD160 9a06ad9626697da2ae8ed8dfcc79a3629fe22b7a SHA1 27b360656b328228952934455825b8b039220d88 SHA256 224b80d6e522956a4cc1160919864e8e6d1cba727e40ccd61bad9dd374090df1
+EBUILD opencv-2.3.0.ebuild 4131 RMD160 6ce688381ec5f018f29b25ebf7e96514cd8ad60a SHA1 4fa92bb6b7097e74da387856fbbb6df6f04a2de2 SHA256 6b308bccdd7ddcbfe26f8d53b47b1939ddc4bb601a0843d604feb0b0824d4882
+MISC ChangeLog 8747 RMD160 6974a3deb288d99d84b562d1dbc761182d7d7035 SHA1 c450db352f55185a652435676c105451f4b051e4 SHA256 1f41accadab5f14e9b532b74359087677179056f7b95b4819770a191952e19f6
 MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOjiyjAAoJEEdUh39IaPFNTMgIAIry4ZcwXQPd2G3VARdQ3vWg
-3nCFmWL2OJKzzoQIY2Z+I1t0MjzzPoyuHKxm7Rtfkfw2zkpi4HAiXvFh9sVl9cS0
-KZKUa1HiSkA6ZF14gWnR8LXktY1S9sUGAj/lZg1Q/vvWJJikwi4FHIPHg2dmDjiS
-Hep9ZRCZGsOV74GK1EeBRPdvtZvt+BeaqfED7mZnLiX5PJi0ynZ8UAcvLSfGu0pE
-kPRpMFXyyLqh9BclsMkMixxIrG8G6zVmk5+/xKGIMr8/lQbdWiSaT0MMKyYmApyh
-kjzqbmeMEyXZQkGFf26HRLjyn4uGi+Gc3SSXulqXCH54+P9r2chriAvSwJLQlrk=
-=Ne6a
+iQIcBAEBCgAGBQJOjvxFAAoJENwGBM22xffeCVUP/3LFO4dzM1ZnmA+TJ1W/aaKI
+O0cHHONh5Bwkk0/eBa3FRH+iO3n7s6U3c54slqlFfnjJjmVR/sZ2E12ZH9eNhFcD
+C0Bd+kPD549cGvDj/GlUfIOPcukw72J6UTDKuU9OYKOnvOMcK6M1tmD6WPziygIu
+8YVGsIHcfib14JYeYT3RhJRJfru5wrxakLL2h+8KrtqHHg5WE5QVrVYnhDhsY6Zj
+dEjLjgXKTn1BTnLaQ5o64BEESFU2cNW9gVfD3e84OkVB0ue7HtmOCuzpSgJQHhk3
+gSyZmLbhac+qiYNpHb0s+rDQHkv83VFPh4EDe4cQs20wahiHCunGfaqp6+X14P9l
+o36ivb5Jfu4Ro9qgOFy1VkmvCM9C4qRbMKT8MutVtyKDOP9pma0zOS+40r7j6UYJ
+cfENRlXyvwRqIEABU+uoo+J74bjQAZ+TmXZqyRojgjYBNXituRGJqFCrOTaq58hk
+qLo/qnkxMzVY3sALgRrA6KNLwrjfQB+bO8M9vGQetC+5iNmfk0Az9OPEPgQVOhPC
+kVla6tD2EXAb7U6xkN6oDfZNsmmHwf0DYJnTU/F/vreCCM5kPncNUfns37buoARV
+tmOB2PazAub9ttvbpV9PpSNCZ0eFxeJrs/K1SB38mTUZMkaVJ3PTS5h90mio1qHt
+qEmRoABMfQs1q0gz6yNx
+=tre9
 -----END PGP SIGNATURE-----
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