media-libs/opencv: Removed 2.0.0 ebuild as it is now included in the

official Portage tree.

3 files changed, 4 insertions, 78 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 86f354a..a0461c3 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Oct 2009; Aaron Mavrinac <mavrinac@gmail.com> opencv-2.0.0.ebuild:
+  Version removed as it is now included in the official tree
+
   16 Oct 2009; Aaron Mavrinac <mavrinac@gmail.com> opencv-2.0.0.ebuild:
   Updated ebuild based on S. Suominen's version in #289258
 
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index d3f9805..92cc2ae 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -2,10 +2,8 @@ AUX opencv-1.1.0_pre1-libtool.patch 425 RMD160 677c2dee8aba8b5170eabc39528f904f5
 AUX opencv-1.1.0_pre1-link.patch 1264 RMD160 9b189456b9d7c089c61755368950e47f9e6bb716 SHA1 2430a3028c02729038b447f4a90fffa9c2bd86a9 SHA256 5535327774d5062ff24a6ac26d874db1377cbd64f1e1052b65e8f4557f8b145b
 AUX opencv-1.1.0_pre1-stereorectify.patch 1409 RMD160 0b317df1cb2a2b61be6e673b1b52ecf836b0e7cf SHA1 2a4d841dac0882de2087bcf7c495045b4639d142 SHA256 2a25dd7b7cf968dfbac143a1cfbd1a5afaaafb2fceb62e60d51d21220139c8af
 AUX opencv-2.0.0-multilib.patch 5557 RMD160 f3b9114b3c69b74ec48cf399c0b4a091b888213b SHA1 9ef9e91d147e34325bf16aa70ac18af0ca2709ff SHA256 133bf0b2b757f422bbecf36c8273ac80e72d12c4063a8d818bffa9bb6f570e73
-DIST OpenCV-2.0.0.tar.bz2 12779856 RMD160 f46b993ded3d579dc52175131e5485476ac1f569 SHA1 2090c2aaff77c3b0cc669c2ee81bea389db0a366 SHA256 c17db9974d87290aefc12bf7987a9f417946bc313823985de4df48ae3e1e0022
 DIST opencv-1.1pre1.tar.gz 22301291 RMD160 d105a97f211637edbbac1eb21dca2b140b1f37be SHA1 4bc4bda92a250adcb82b236161d364c059021a43 SHA256 7e4f0026e5543c38afcf8a4298b1da2bace977499f99b885c925fc784783d812
 EBUILD opencv-1.1.0_pre1.ebuild 2199 RMD160 f550df98b58a352cf06772eda1cb094cb04fe03f SHA1 598b691bb5932df387b1f7f3bb9fec05c7310400 SHA256 3bf985bc9040c62311b25ae1372fb3f71c6148b6ce215982f2c27001a89c7699
-EBUILD opencv-2.0.0.ebuild 2304 RMD160 2b6c9c294dba33234d1cbd08bd8e6f21209049fe SHA1 61beba2c080a1ac7a2a362bee66f8913b4265181 SHA256 95ed08fdbbf884873e3bb3f1f11cc28c0021f24afa0ef09c2467907371a4688d
 EBUILD opencv-9999.ebuild 1640 RMD160 a32c3e8e8ecfc7d7881a6b6a058ec105c4dc75ab SHA1 0d49e75567fea8f7e951f84cf4993a4c6db0e4b0 SHA256 0630fcb45e20d40d7b1a92aa42cd58ce6b065f44942807346ff21b0e712cdc0d
-MISC ChangeLog 1039 RMD160 74d58f3e7ed4ffade4efec2f9817964e0828c43e SHA1 0f05592c2f58189b01d76e3c3d631c79e72d54da SHA256 e409b431e786377ddd6039947fd07ac25e5498c4af398e1de7e478787c902b3b
+MISC ChangeLog 1173 RMD160 671403715ed2d7e733ac23ae0ca9d1db5544e00b SHA1 9988a99aa9ecacb44cec8dc2d68a51081807e270 SHA256 84e2682b7f86604070d00922e94d8e7b1803da31e6a8582949d7ff602b7006e6
 MISC metadata.xml 758 RMD160 bdfc7cd1bf469fe5951429333659946f377faa48 SHA1 812545f8fab4fc2304006b8ebc6bfcb1155cc519 SHA256 7468b2722153f29842e40153f877e1bd980ef617f46a3f438b686b2f1a9f1dea
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 abe518d..0000000
--- a/media-libs/opencv/opencv-2.0.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-inherit cmake-utils
-
-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="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug examples test python ieee1394 ffmpeg gstreamer gtk jpeg2k jpeg mmx openmp png sse sse2 sse3 tiff v4l xine +deprecated ipp octave unicap"
-
-COMMON_DEPEND="sys-libs/zlib
-	ipp? ( sci-libs/ipp )
-	python? ( >=dev-lang/python-2.5
-	deprecated? ( >=dev-lang/swig-1.3.30 ) )
-	ieee1394? ( >=sys-libs/libraw1394-1.2.0 media-libs/libdc1394 )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
-	gstreamer? ( media-libs/gstreamer )
-	gtk? ( x11-libs/gtk+:2 )
-	jpeg2k? ( media-libs/jasper )
-	jpeg? ( media-libs/jpeg )
-	png? ( media-libs/libpng:1.2 )
-	tiff? ( media-libs/tiff )
-	xine? ( media-libs/xine-lib )
-	octave? ( sci-mathematics/octave >=dev-lang/swig-1.3.30 )
-	unicap? ( media-libs/unicap )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-	openmp? ( >=sys-devel/gcc-4.2[openmp] )"
-RDEPEND="${COMMON_DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${P}-multilib.patch" )
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DUSE_O3=OFF
-		-DUSE_OMIT_FRAME_POINTER=OFF
-		-DCMAKE_SKIP_RPATH=ON
-		$(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
-		$(cmake-utils_use_build octave OCTAVE_SUPPORT)
-		$(cmake-utils_use_build examples)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_enable openmp)
-		$(cmake-utils_use mmx USE_MMX)
-		$(cmake-utils_use sse USE_SSE)
-		$(cmake-utils_use sse2 USE_SSE2)
-		$(cmake-utils_use sse3 USE_SSE3)
-		$(cmake-utils_use ipp USE_IPP)
-		$(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)
-		$(cmake-utils_use_with unicap)
-		$(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
-}