Drop old

(Portage version: 2.1.9.48/cvs/Linux x86_64)

3 files changed, 5 insertions, 202 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/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
-}