Drop old

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

4 files changed, 19 insertions, 219 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 3d2cbb136ada..f6d97fe8e977 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,10 @@
 # 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.33 2011/05/09 23:11:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.34 2011/05/11 20:10:16 dilfridge Exp $
+
+  11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org> -opencv-2.0.0.ebuild,
+  -files/opencv-2.0.0-multilib.patch:
+  Drop old
 
   09 May 2011; Markos Chandras <hwoarang@gentoo.org> opencv-2.2.0.ebuild:
   Stable on amd64 wrt bug #354033
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 5a523fdb0d4e..852dbaa56b49 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -2,7 +2,6 @@
 Hash: SHA512
 
 AUX opencv-2.0.0-libpng14.patch 505 RMD160 86ef29284531519dcc5c6da1bb3abfd3c46efc73 SHA1 81bf18db6984144a0cc5b49e47e180e5337aae75 SHA256 78dc27ae16b2fcbef7cc05496dddf227640f47c37d8da05fe469eeb04146af4a
-AUX opencv-2.0.0-multilib.patch 5569 RMD160 f519c1276600d6d22bce7415a0fd1411fc4bd5aa SHA1 1727a3d8d5673d647b128f627e24ec22584fea40 SHA256 594cdaf2b49253b6ab1e1d7c6b55c99e4f0a9924d743e5bf0947846459099777
 AUX opencv-2.1.0-mmap.patch 483 RMD160 a1e1843d1845307d1e6bb7ef03f3fe45fe45380e SHA1 981e4614b5360351426990e2e12d276b04b7043a SHA256 f05a7d79218bfd5ec392a5f0017dd9efce4cdc08bbda7b223bf72525fa40a322
 AUX opencv-2.1.0-multilib.patch 5132 RMD160 a47c10e8f8c7fc325a562b19a925b96288605600 SHA1 167358eb0b32112c2a877a27015b2b7fb04c69b8 SHA256 25280be148a410af8f8cf79dcdcba4d2ae24ddce041af7712f1d76cf0cd863a6
 AUX opencv-2.2.0-convert_sets_to_options.patch 16756 RMD160 0fa3fb99eafcf31cdcaa8dc8296b7904268449f8 SHA1 64158ca0539f742fbb419ccf332ba941c7d5a17e SHA256 b673edaa3de01d7e858205435ab663bf17ccd8aa5c6811a3bb3895f041693df2
@@ -15,29 +14,27 @@ AUX opencv-2.2.0-numpy.patch 632 RMD160 8652c618eebab2769952f47c8cceed33027079e1
 AUX opencv-2.2.0-ptrcvcapture.patch 512 RMD160 79e1f005b1aa494468edd3f57f944e0b51ac32d1 SHA1 7f49f7b25d93b734435dc572b65f0e2f45f42645 SHA256 d3c063e742abf7bc4898003d464a795ecf421a1d67a1abcdff9c712de0a3c7ad
 AUX opencv-2.2.0-use_system_libs.patch 5117 RMD160 02a9c2e896ebc453ee63770e5f216e5d696bc103 SHA1 ba0ac15a4f60a7b875b9e28e51a2e41b1ba26fb9 SHA256 f83725b7b7fe8e47e98269abc803bb678cd0566646735d78f3e82c3f70b872de
 AUX opencv-2.2.0-v4l_2.6.38.patch 1165 RMD160 1bf13eca350e015ce53611c77dc4e85d81fa8530 SHA1 64e4ea4df8d17843c73248bef778459660b556d9 SHA256 2d4e0c72c3f4e9c60cb10a5fc5a8512275c48e3f38ec3441a240ed49dd8a1b5b
-DIST OpenCV-2.0.0.tar.bz2 12779856 RMD160 f46b993ded3d579dc52175131e5485476ac1f569 SHA1 2090c2aaff77c3b0cc669c2ee81bea389db0a366 SHA256 c17db9974d87290aefc12bf7987a9f417946bc313823985de4df48ae3e1e0022
 DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
 DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
-EBUILD opencv-2.0.0.ebuild 2341 RMD160 95014760a935f3f421219f11af4b9f472c8ff11e SHA1 5ddf2e3492ee55d8c476a9f11a9da68881b4eb69 SHA256 a0a42ef185d9252339bf3010224ac21effbf6efaa59900c0021af07b4bea2097
 EBUILD opencv-2.1.0.ebuild 2933 RMD160 8e0259e3b871ab0085b89c2874b0bc63f21f1566 SHA1 0a95c8a2c88ad43614fb8e2603bd3733f602548d SHA256 3680d08c479af4508ccf84d2aac5389438468d4f7179658ee6e0b7dcf464bdc5
 EBUILD opencv-2.2.0-r10.ebuild 4234 RMD160 5863100749263ee45096a30b300a4a753a5e272c SHA1 05ebc58aa71df31760d56e31ec3d2b07119e267e SHA256 a0e505f8fbf5b5f2e3d2fa3ff8236e75c2f4ae4311bb54d94ae48454477a096b
 EBUILD opencv-2.2.0.ebuild 4129 RMD160 ba0cd2c9e4b22f8e103b6bbd2d4543b57ea53ee3 SHA1 79b97acaff50b27926eb3bef1173779a0ca1f000 SHA256 063511f17ea504f1aa41ec44192dc453dbb4282bb3506b7ea49f0d78ca7ec701
-MISC ChangeLog 6073 RMD160 577f232951f2f55f7ae5fe5162561be66f615cd9 SHA1 75f69e675b9696414f9b9ca7fdc006c0602eeadd SHA256 0e9c0dd8155bd8f52b25b05da539ad52f51075f009eb4126ecb0d7038ad614ea
+MISC ChangeLog 6203 RMD160 803557f473dceb15e64cd24e73529e2719ea462c SHA1 64416d4d413b3a57f6ca3a74e01a9ee89ed25e5b SHA256 7efa4601be6f6858a5ddaabbcb61ea676cdeca339b9b7f18c589a3acb20f1cd6
 MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNyHS6AAoJEPqDWhW0r/LCmlgQALceqyqWU1jiWjEvPUVA52YD
-z2tE9WRrwSaoRW52GgPp9gQ6KTMgcoDpFfDcBiqI8OJqlcGSvX/jXgCevDpcUSmE
-9eHFtOkwQ+9e+rqkFDEl0nIJi5QQZmSoyxaGETtYiG/Lir5ZQgtf7YvUvZ+7YsE/
-v6ZaYmrHsMIjMJkCvskx+nfetvuYdsiahJbxlvEwBoTa8VAKrx6doPrfykcjSR7Y
-EhFxUuBQty4318B151VUAVHRFmqsgCuufwCX8r5O5flpfUJIKynEa/kF8md3J2Wz
-FzI1P3u8ailZC6G3v+So9anY6Jy+5yJfhbXjdsGGJyikcznIy5j8bD7dEsTlOCvO
-TnB51ATvJTt94AppnaywzneZ3g49pkOc3p0aCU7YnOU9HpSuScGwS6l5oCIyKJM/
-PYR/GP+fEkFAG81wYd8DBhZ9JzrqAB1h41sx2m/plailVpcpA+b8TIVKvR+vPPMJ
-C9ddha3MguukU9wh031EFJ6oqYQGwNdSIxjLgk02aCnrwqXUq9uYS0+3xMVlyyRf
-w/OcKiuGppmqyv0kQ+0Qnq63NQhm6Ym3LuMlPbnGrZ7vJcKynQYlvTS/mT3LELSk
-DGfEkQY/SS5o+Fc+KujOSgouqXE+sX/TqQ2p+4MbN3E4Y1sughHArxrQlU9li5cW
-yTuARuz8mnbSr2zvV8TD
-=Kr2f
+iQIcBAEBCgAGBQJNyvIcAAoJENwGBM22xffeuJUP/3nWqwo1gyPnIMMdWDOu30sH
+/feAJRp7CWIQ0f/9n0VRYCqKuRQTiNduy7mX9i+LorwhuqDjL0sgQxdmqCJHncgy
+LvHASCb+Hx2OHw2SAErOsEdQEAnJmJ/tLlDjN6YvLJVjjxKE/Wgxzdv/Ia15KlS9
+LmqhsuDq0V9gNsqbwKtAc1XmpBwmZVGv16LQUMVJhB4MK1Hz4h0X0HMKq07rPHjx
+f4CAClEXG6e39lH/Q7sM5JrgCbXdlO7rXiD7O0dcFzi2JDl1VkblaFeyrwkRU9Mh
+//btYX5hc2rwoNB69+sJWkQWhXVigEoWVuJrRRC9uVyiZyEsog0+5z2Gu0P2Tj8C
+9KfA2LcaqrznwMhq2dhlWUNyGDnj2Ly4P7rpiOtbnOkOd1UqmAhiHysptOQ/B3+H
+2yd3IujlYmYqdUL7c1kImvgrK51KhwD+s1hUBuuybvGErwXfGvouQHxdt+7NoARy
+C4mUZWh3FUdDQLvQTh0qFMHo0BmqACeCsZRKejmzDqmqIKS6P5z76d6Cz3f7gD1d
+6/I/fLxCuqal8ues99G5L5ybHm5Y/JfYpEjo1eaqm3zE/9FdlKHzxTNUlQdI3cWM
+NlPjVScpBhEfWLKFbL8j6Cf3M1Q3+NnHyq41vE67SmFr4zSe6n7J3I0lnLWF19Fq
+BNWJ7a+q95vHClDjYCrR
+=GAQs
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.0.0-multilib.patch b/media-libs/opencv/files/opencv-2.0.0-multilib.patch
deleted file mode 100644
index b1075aa414bd..000000000000
--- a/media-libs/opencv/files/opencv-2.0.0-multilib.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -ur OpenCV-2.0.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.0.0/3rdparty/flann/CMakeLists.txt
---- OpenCV-2.0.0.orig/3rdparty/flann/CMakeLists.txt	2009-10-01 03:21:00.000000000 +0300
-+++ OpenCV-2.0.0/3rdparty/flann/CMakeLists.txt	2009-10-16 17:12:16.000000000 +0300
-@@ -86,8 +86,8 @@
- INSTALL (
-     TARGETS flann flann_s
-     RUNTIME DESTINATION bin
--    LIBRARY DESTINATION lib
--    ARCHIVE DESTINATION lib
-+    LIBRARY DESTINATION "lib${LIB_SUFFIX}"
-+    ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
- )
- 
- # INSTALL (
-diff -ur OpenCV-2.0.0.orig/CMakeLists.txt OpenCV-2.0.0/CMakeLists.txt
---- OpenCV-2.0.0.orig/CMakeLists.txt	2009-10-01 03:21:05.000000000 +0300
-+++ OpenCV-2.0.0/CMakeLists.txt	2009-10-16 17:22:56.000000000 +0300
-@@ -405,8 +405,8 @@
- 

-     string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")

-     if(UNIX)

--        set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)

--        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)

-+        set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)

-+        set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)

-     endif()

-     if(WIN32)

-         get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)

-diff -ur OpenCV-2.0.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.0.0/interfaces/ffopencv/CMakeLists.txt
---- OpenCV-2.0.0.orig/interfaces/ffopencv/CMakeLists.txt	2009-10-01 03:20:57.000000000 +0300
-+++ OpenCV-2.0.0/interfaces/ffopencv/CMakeLists.txt	2009-10-16 17:13:34.000000000 +0300
-@@ -33,5 +33,5 @@
- 
- install(TARGETS ${the_target}
- 	RUNTIME DESTINATION bin COMPONENT main
--	LIBRARY DESTINATION lib COMPONENT main
-+	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
-     )
-diff -ur OpenCV-2.0.0.orig/src/cv/CMakeLists.txt OpenCV-2.0.0/src/cv/CMakeLists.txt
---- OpenCV-2.0.0.orig/src/cv/CMakeLists.txt	2009-10-01 03:20:58.000000000 +0300
-+++ OpenCV-2.0.0/src/cv/CMakeLists.txt	2009-10-16 17:14:53.000000000 +0300
-@@ -66,8 +66,8 @@
- 

- install(TARGETS ${the_target}

- 	RUNTIME DESTINATION bin COMPONENT main

--	LIBRARY DESTINATION lib COMPONENT main

--	ARCHIVE DESTINATION lib COMPONENT main)

-+	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main

-+	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)

- 

- install(FILES ${lib_hdrs}

-     DESTINATION include/opencv

-diff -ur OpenCV-2.0.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.0.0/src/cvaux/CMakeLists.txt
---- OpenCV-2.0.0.orig/src/cvaux/CMakeLists.txt	2009-10-01 03:20:59.000000000 +0300
-+++ OpenCV-2.0.0/src/cvaux/CMakeLists.txt	2009-10-16 17:13:55.000000000 +0300
-@@ -76,8 +76,8 @@
- 
- install(TARGETS ${the_target}
- 	RUNTIME DESTINATION bin COMPONENT main
--	LIBRARY DESTINATION lib COMPONENT main
--	ARCHIVE DESTINATION lib COMPONENT main)
-+	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
-+	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
- 
- install(FILES ${aux_hdrs_ext}
-         DESTINATION include/opencv
-diff -ur OpenCV-2.0.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.0.0/src/cxcore/CMakeLists.txt
---- OpenCV-2.0.0.orig/src/cxcore/CMakeLists.txt	2009-10-01 03:20:59.000000000 +0300
-+++ OpenCV-2.0.0/src/cxcore/CMakeLists.txt	2009-10-16 17:14:34.000000000 +0300
-@@ -66,8 +66,8 @@
- 

- install(TARGETS ${the_target}

-     RUNTIME DESTINATION bin COMPONENT main

--	LIBRARY DESTINATION lib COMPONENT main

--	ARCHIVE DESTINATION lib COMPONENT main)

-+	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main

-+	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)

- 

- # install each module headers separately

- install(FILES ${lib_hdrs}

-diff -ur OpenCV-2.0.0.orig/src/highgui/CMakeLists.txt OpenCV-2.0.0/src/highgui/CMakeLists.txt
---- OpenCV-2.0.0.orig/src/highgui/CMakeLists.txt	2009-10-01 03:20:58.000000000 +0300
-+++ OpenCV-2.0.0/src/highgui/CMakeLists.txt	2009-10-16 17:15:11.000000000 +0300
-@@ -206,8 +206,8 @@
- 
- install(TARGETS ${the_target}
- 	RUNTIME DESTINATION bin COMPONENT main
--	LIBRARY DESTINATION lib COMPONENT main
--	ARCHIVE DESTINATION lib COMPONENT main)
-+	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
-+	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
- 
- install(FILES ${highgui_ext_hdrs}
-         DESTINATION include/opencv
-diff -ur OpenCV-2.0.0.orig/src/ml/CMakeLists.txt OpenCV-2.0.0/src/ml/CMakeLists.txt
---- OpenCV-2.0.0.orig/src/ml/CMakeLists.txt	2009-10-01 03:20:59.000000000 +0300
-+++ OpenCV-2.0.0/src/ml/CMakeLists.txt	2009-10-16 17:14:17.000000000 +0300
-@@ -61,8 +61,8 @@
- 

- install(TARGETS ${the_target}

- 	RUNTIME DESTINATION bin COMPONENT main

--	LIBRARY DESTINATION lib COMPONENT main

--	ARCHIVE DESTINATION lib COMPONENT main)

-+	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main

-+	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)

- 

- install(FILES ${lib_hdrs}

-         DESTINATION include/opencv

-diff -ur OpenCV-2.0.0.orig/tests/cxts/CMakeLists.txt OpenCV-2.0.0/tests/cxts/CMakeLists.txt
---- OpenCV-2.0.0.orig/tests/cxts/CMakeLists.txt	2009-10-01 03:20:56.000000000 +0300
-+++ OpenCV-2.0.0/tests/cxts/CMakeLists.txt	2009-10-16 17:15:28.000000000 +0300
-@@ -63,6 +63,6 @@
- if(WIN32)
- install(TARGETS ${the_target}
-     RUNTIME DESTINATION bin COMPONENT main
--	LIBRARY DESTINATION lib COMPONENT main
--	ARCHIVE DESTINATION lib COMPONENT main)
-+	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
-+	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
- endif()
diff --git a/media-libs/opencv/opencv-2.0.0.ebuild b/media-libs/opencv/opencv-2.0.0.ebuild
deleted file mode 100644
index e5312913b011..000000000000
--- a/media-libs/opencv/opencv-2.0.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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.0.0.ebuild,v 1.10 2011/04/14 12:39:11 scarabeus Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit 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="v4l? ( GPL-2 ) xine? ( GPL-2 ) BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug +deprecated examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k
-mmx octave openmp png python sse sse2 sse3 test tiff v4l xine"
-
-RDEPEND="sys-libs/zlib
-	ieee1394? ( sys-libs/libraw1394
-		media-libs/libdc1394:2 )
-	ffmpeg? ( virtual/ffmpeg )
-	gstreamer? ( media-libs/gstreamer )
-	gtk? ( x11-libs/gtk+:2 )
-	jpeg2k? ( media-libs/jasper )
-	jpeg? ( virtual/jpeg )
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	xine? ( media-libs/xine-lib )
-	octave? ( sci-mathematics/octave )"
-DEPEND="${RDEPEND}
-	octave? ( dev-lang/swig )
-	python? ( deprecated? ( dev-lang/swig ) )
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${P}-multilib.patch"
-	"${FILESDIR}/${P}-libpng14.patch" )
-
-# Skip test suite for -r0, try to solve it in -r1.
-RESTRICT="test"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DCMAKE_SKIP_RPATH=ON
-		$(cmake-utils_use_build examples)
-		$(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
-		$(cmake-utils_use_build octave OCTAVE_SUPPORT)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_enable openmp)
-		-DUSE_IPP=OFF
-		$(cmake-utils_use mmx USE_MMX)
-		-DUSE_O3=OFF
-		-DUSE_OMIT_FRAME_POINTER=OFF
-		$(cmake-utils_use sse USE_SSE)
-		$(cmake-utils_use sse2 USE_SSE2)
-		$(cmake-utils_use sse3 USE_SSE3)
-		$(cmake-utils_use_with ieee1394 1394)
-		$(cmake-utils_use_with ffmpeg)
-		$(cmake-utils_use_with gstreamer)
-		$(cmake-utils_use_with gtk)
-		$(cmake-utils_use_with jpeg2k jasper)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with tiff)
-		-DWITH_UNICAP=OFF
-		$(cmake-utils_use_with v4l)
-		$(cmake-utils_use_with xine)"
-
-	if use python; then
-		mycmakeargs="${mycmakeargs}
-			$(cmake-utils_use_build deprecated SWIG_PYTHON_SUPPORT)"
-	fi
-
-	cmake-utils_src_configure
-}