Remove old.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

5 files changed, 22 insertions, 459 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 1a6e0ad29132..60af5742cc7d 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.116 2014/11/25 08:43:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.117 2014/12/26 18:18:22 kensington Exp $
+
+  26 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  -files/opencv-2.4.5-javamagic.patch, -opencv-2.4.5.ebuild,
+  -opencv-2.4.8.ebuild:
+  Remove old.
 
   25 Nov 2014; Agostino Sarubbo <ago@gentoo.org> opencv-2.4.9.ebuild:
   Stable for x86, wrt bug #527518
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 88c79a805fc6..3a6b1efe98df 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -4,32 +4,28 @@ Hash: SHA256
 AUX opencv-2.3.1a-libav-0.7.patch 415 SHA256 3186998b7b9eaae061d538633276c7de47b2388b639106e190d80dcf09fb9099 SHA512 b17466470a47876e1a8434367f47ce13ec989bdc35ec707d87188187e08b8ccca6af4c5563f20b3170758582b500323030cff22961a7fbbc6b4843d8bb808f1e WHIRLPOOL 5caf84c49efef118e1c90f6bd88237c6d91e9b37163248e5a6f6c135ae60f5f4f4328d83f061df2c4d5f81fdf68faa5b55828feaf67707956701c633614cc5fc
 AUX opencv-2.4.2-cflags.patch 742 SHA256 7ea8c07becb830fb03c14bfbf6c25fdfeaf3fcb75949b810520f4fd6c1178c1c SHA512 b92c07d8c9c40ad7721e0cca2d79b001f825478a336ad40cb43d02218fcd9e8b94b871575028ca8eaf6616cfce8138c796f32d4cf55d83d5cbe819ec50cf7c82 WHIRLPOOL f83ee4b677490cf6981b5a326ae6a7ad4cfae1c27fc6c516d054337939957d801ff1319798d2b0b9e86429b8d688f514e74b74bfff56c64df06fc3c7035f320e
 AUX opencv-2.4.3-gcc47.patch 835 SHA256 bb64b8af632b67293d1c8024b3786162fccc9f4ee4159f6592af0e76e86b7b00 SHA512 cc5e3e4c0def0745867403e990abf4b88d7d3edc72867a283403a991fd96f59c4cca6524ca184a52a40c913cd5d9cdfb52e98be71d5060fc4c7aa6b613a2a220 WHIRLPOOL 52aa228d8ebf2ba51eb67cc31ba4eee27f43d5fc86d3b5028e32e2a8caf1350ebda70bab2a060f9a387312795788b575253d446380645e52e7cf10f57cad9a88
-AUX opencv-2.4.5-javamagic.patch 1140 SHA256 1a3fd6918982909dc1de4258cc386139f7005617032cb457d5ea521f0b4d2ad5 SHA512 f283529bc6482203b2ffdf57aafcdf80351eaf8d09c07c6f14991e5d6bc25679dab31f3dd0475b1eee32f9ba8636e9ba96755b90c96de7059c8f69c0d43746aa WHIRLPOOL a483809bfe0ca11a299757bd1ec42ada5fc1d415eb366f9e2d05a6e8a30dec6b8d8baf662da0041632e23b3ed0d4f90e612fb15ede0e126c09e9a98da7a9621c
 AUX opencv-2.4.8-javamagic.patch 1165 SHA256 b13037b93683ee8e6f535cbbd8742005e675e13a11ebd6593815625c3328bfec SHA512 fd8a0d33997889c9316c0a4474c836b2528b676cd26bbb0e6ee2262377e45c5a0c465534831bd7fec3c0aa9cb198bc792a53f958b05a5217009314b678076d64 WHIRLPOOL 405901f0de77d1f16dc9d28deec6a56062bbfd514994ec094f468ea2298a15111067031cef33ce92b4c237539ed2ee294ec54e2ea6b5c739466e879c291af964
 AUX opencv-2.4.9-cuda.patch 7247 SHA256 94f01e58038306a6f699d867936038c9815f965f31075c268e80ad30aab33cc2 SHA512 b8d7a18e00359a985f389eecf779b2d648ea88f2508c31f1895eb0d9ef9ce2924866054a2df0bb452ba161c3ba254e4cb9717c1275392a2e8691b9b34c245e9b WHIRLPOOL 6bc5b4afb724a6450228eae6e6920ee57d36f2d1bb50c09a6bd7230f870224d75367d3a9dbd0f02d1bacb1fa48d6e2d331d363716cc547fb85b67b48985dc5fb
 AUX opencv-2.4.9-libav10.patch 22417 SHA256 7c95f31c8242b239c2cb3259e2bdecad4a56d1dfd8d6087e71265ab6123aeb8c SHA512 e6ce98f788df2cfa32861d62c21296e4a3cea7a8b6747bc945cf80267a23aa207f94b30c000bddf6ccea69fc22edef635ee33cd3dd683a4b790bcca49e068a93 WHIRLPOOL 887a684bdc0994b8a5bf6a83aca4e94eca45c5a65ab5bfda873156b4cb8c9ab3b3bc6a5a75a8a2016f4416e47ab4f6f9a3b6776ac10af3ca57d9a4e2c3b08c9c
-DIST opencv-2.4.5.tar.gz 81884985 SHA256 d30beecf4b57977fbd1635af54c5ab3fc00113e9e59a9d58081732260fe06292 SHA512 2e0ab19203cc5d3a4d83633ee9762441d0d12128752edecb351b3c4abddc1714baf4b320b161f8b58e771933506bfa5a192d394a3b6b5b63d914923c6a767a08 WHIRLPOOL 117551edab5837a9382a6d84dec7f84fb693485e3cad7c08d38158baa22951381eb4958caaaa910dcef6ee2b78a0a494d732d0cac88cd18f1f6ebc2d30e3ddf0
-DIST opencv-2.4.8.zip 91302285 SHA256 f1ea29de0707939f6e09ae7a78dd271c032cac69a9ba6c6f7eb29fd4f83b9a68 SHA512 a451f4cc2fc7f31a5dba2997c57f3964d8239949dedb62e83b3fb2c68c2533786750906823137fa126a20d28d841aafc3a49b82c6358a6e6bc7d223e66598237 WHIRLPOOL 5881682746b30601421874bf6acb13bd0354b607f2e4da8abaa6077a59c8015c60bfbe888da077eaa7413c5fd8816b50616cee2eeb7dfcd884afff4df8c22561
 DIST opencv-2.4.9.zip 91684751 SHA256 803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 SHA512 8eb6ee11d8260428ae461e06348ce037979efc29b7e33d59c3d348a6b4bae95b7004df4527aba7c634e7356f7b5635c98493dc15a0b43479e8f10f7258540c62 WHIRLPOOL 5bb5e39678b3072b2e8b923216529c84982559dd69d5ec51b8703e65af3401f3a8ff31e4e3bfc076480d0605e333df0b03a61713a927ec058bfaf25b4fa8fd5e
-EBUILD opencv-2.4.5.ebuild 5174 SHA256 9947ef216eb778c4db530afa7c0c73ecfaf007d4195f652c552038e4d1afac92 SHA512 95b2cc6cf749046e66c783d3a13e0b098e4044c9741a9cd336c189bfcc454f2d1a554c33df3c0e71111e16601cb1cafe5db3f37839abc118a68d2755d296c916 WHIRLPOOL e9e9e2aec05fcaabacd7e973094591eac839e8cfd42a18bfd2567c047f33006a18191dd313e2e3244ee8e2cf6aa087701cd640d9caaf43c81e74a71f2a08e52e
-EBUILD opencv-2.4.8.ebuild 5818 SHA256 190da86183dc78feb6ad3f3f779e18b5dfd13fc1b44970e62f0af399108a2cba SHA512 6452194524bd7598654ada564c99c5e7afe6c95abd4b65efc2468a89e4d95cb84fba7f7b6ff118f97bb7c0f3be5e671cd45d231370502dad4157b40d0030adc5 WHIRLPOOL 7e5c8d5306e3a343589c17ab589514a3ad31eef4da2e15af830562e74a4ef500ab1a26d2013fb36d14772526ee11c6258d8c1ef4f3900fafa66d1f0e24bbce15
 EBUILD opencv-2.4.9.ebuild 6024 SHA256 ccf39ba57b99084398ed11768b1db5f689525e2541852f4ea54d5d655259b2fe SHA512 c629f56a0569179e0dea0c32dcc0998ad89614cb74145b04431935b2248d0434ce3d183a408adb2f726fb8beca6b5de55ffbf1875c09fafd1c64199ba29e9a20 WHIRLPOOL 84ba5133619970efa59e3bf1c5db32db76aaca325e4c8b900257f25abe92c5b859025c351becd208614b8aa66d7c6fca2d3adc358828b2baf4ca3b0a0b71e607
-MISC ChangeLog 19320 SHA256 8c01b49bfab684c87059c5a18be9e4caae20cb6681357ab5ad4127235d499ab5 SHA512 8886076cba86557e125dda3b9569973c7188e55de25b3d18a19f2d02fd5540e5d636dbb304750fc1587f605cadd2923a50910a85ec8ba9413165b9ce20c8e224 WHIRLPOOL cbee053deae96aad811d5ce310b6d1f4cb1413b6f2cf4c37a6641ffcacfe606b16e1f0b1fb8d39c7ae762303cbe8856cf8243426b872f4bef5db117aa26d0d53
+MISC ChangeLog 19483 SHA256 0732a8d36f86d0b62683dc52d45cf7edbf31a1439255c18b4a4df561fad7aad7 SHA512 7f49be6d9a8a5272f953d1ac99b1dbbeb2c4b22f2706f31e835eeeba305e0190f26dbbbb857948f824e056466d26cb7702e827ab90c9681390ea9838f99d29b6 WHIRLPOOL 6e5a56c8d9f55421d5f551fd536c3583fe7f6f8936158c555848c051fe03c56f030b64c4da6be1cffd7f49abb653c7aff4eb0d20933fb96c9d7e73f159087cb1
 MISC metadata.xml 1230 SHA256 8ac77d1094c6a1d2f83c13693a34e3c7745e4b55d99d44d7471ed0d847bae369 SHA512 4a3191076a5e9c211ffbff7ea6870214c1533193d7a26d0937f78b00d80f4874561dbe76d05c63dbde820db2e49603d048fcb6a34cb704bb0f5e7cb33f645be0 WHIRLPOOL 87825beff89509383be4fc077471c3c91e0b3956ea19b2f7373310404f0e27c1d394309d996ce3763f63f611a61b9d8e7e6c3b82c50a0cf4c56b399accc396a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUdEE+AAoJELp701BxlEWfpmIQAIbC0vNPC/cRlD7Fqohlse0a
-Z0PvaPIrxT9iurRakgMpsKYepdRm3r++K0/tFCDiAtu7SMQeG2EKmMabSgPGI1Ju
-6FwG9FuDAs6DHgZE+s4DSGsfmEt+aQMzP4VGHKDoKc4ajszSoL3S05LDQ4wuEMcs
-HuDLnphKtBa+u8m2PnaqoVkdTDTYypmof4SPeR1kCMjQaxPfUOAQPjbxcMB7wRPi
-EnVbolxp4eon8+bfOfx3LZvg8ICrS6BENweS9LZvw2TGlyz5Ld02IOiah5SccbqO
-BO9sBkGnfFCOMbrkXz053kDwTerHYKwdczYrEZ0bUJViHfPX+Uiu5f14IhXxmRYI
-fy/sFLX3DM8TH7Jl2OxK7xm5rJ3mAQ1+gakG33bnE6wyG6QBW3FDAHa33frc4ZkP
-qS9bdYxRiHKl09621hcliuOS4lT6hiISWzXxJiEEBmn9qQjEj62IBDH4ifS117B2
-7G14GDUcjKSsT/BLw8nywldqSGmQqPbUqd4+Wge4RCJ0GI+jZWPqB7bwcknZvGcU
-LN0lj4CDAWsaOp3D9CkH4bkzZ6cgxAhJCICsdS44vhPTp1QaJQNw5tehvlHaiOKr
-IWiczH8l7eXn7ZkY3/PzSWcVbTOjy+2V8H7iyRqXT9TD2j5N45PdwcCcMjS//vBU
-yBxmuv4kZqB7QUjpYnlW
-=l3iA
+iQJiBAEBCABMBQJUnaZ/RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7JO/D/9Zq17QcxE9AGalQCgfNxvLJlLJVTJOClBlFDjegbrUue4dbLcRcNcKfh8A
+LDpcuyEdIO9bmauoUEE6wfr1zl56F5rhIX1OEdIqoiQLllaL7ItMk7Po9Iqhea6a
+7xpzYx32nLjq4teh7TD2rPeGmZiF70XL4PkquA5CGddGeVBk5m/d0mKccEjzd4ap
+cksxnXbxe/zur8j9aEgVeb0mEtKuqtMS2R0OlFljtgHFhtTtNL7NvuBhF6Tu4g0u
+jqgE272PUMmrQijeajzC3rPQyRXstAOdaud+Fk/aGxU1JbzpMjiNbWu6aZUOuqi3
+0h2GYTE15owHhpgIhpUzTF9pkl5gvATHUBBBKBUkTncwAQRWyYXB9NU8KrsbxhGc
+Zb29Tn/oSL0JJHq9jCq6lbVmsESvA9yef8RxZDej3BqexGTbCqI92wqiI8wFKX9v
+fwXbBQvWqdcX7KGUSk09nXNYNFmvH041pAZIIA0hHMFiC4fxREb56iR5QWHK25gv
+cc7L6HkazWWvK7vaz82LBPNp/5b0heaX2gYOe8kmLYbZEplkWVE+XUDMHfwQ5L0E
++A3Da3PW+eV+LlRBC2g1JJMBoGB5Dt5okDosKRAPArwlyRy8WBbr30hh/9XRspzm
+koVuHtct5YwTyxS4v++t9hygIPA+OGqAoTU4X67M9dH4E9v26w==
+=joxQ
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.4.5-javamagic.patch b/media-libs/opencv/files/opencv-2.4.5-javamagic.patch
deleted file mode 100644
index 00597b9b6e35..000000000000
--- a/media-libs/opencv/files/opencv-2.4.5-javamagic.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ruN opencv-2.4.5-1-gentoo/CMakeLists.txt opencv-2.4.5/CMakeLists.txt
---- opencv-2.4.5-1-gentoo/CMakeLists.txt	2013-04-05 11:00:20.000000000 +0200
-+++ opencv-2.4.5/CMakeLists.txt	2013-05-02 18:38:59.412094714 +0200
-@@ -147,6 +147,7 @@
- OCV_OPTION(WITH_OPENCL         "Include OpenCL Runtime support"              ON   IF (NOT ANDROID AND NOT IOS) )
- OCV_OPTION(WITH_OPENCLAMDFFT   "Include AMD OpenCL FFT library support"      ON   IF (NOT ANDROID AND NOT IOS) )
- OCV_OPTION(WITH_OPENCLAMDBLAS  "Include AMD OpenCL BLAS library support"     ON   IF (NOT ANDROID AND NOT IOS) )
-+OCV_OPTION(WITH_JAVA           "Include Java support"                        ON)
- 
- 
- # OpenCV build components
-@@ -395,6 +396,8 @@
- include(cmake/OpenCVDetectPython.cmake)
- 
- # --- Java Support ---
-+if(WITH_JAVA)
-+
- include(cmake/OpenCVDetectApacheAnt.cmake)
- if(ANDROID)
-   include(cmake/OpenCVDetectAndroidSDK.cmake)
-@@ -412,6 +415,11 @@
-   SET(CAN_BUILD_ANDROID_PROJECTS FALSE)
- endif()
- 
-+else()
-+  SET(ANT_EXECUTABLE "")
-+  SET(CAN_BUILD_ANDROID_PROJECTS FALSE)
-+endif()
-+
- # --- OpenCL ---
- if(WITH_OPENCL)
-   include(cmake/OpenCVDetectOpenCL.cmake)
diff --git a/media-libs/opencv/opencv-2.4.5.ebuild b/media-libs/opencv/opencv-2.4.5.ebuild
deleted file mode 100644
index f4a977017e39..000000000000
--- a/media-libs/opencv/opencv-2.4.5.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.5.ebuild,v 1.7 2013/09/06 16:39:49 dilfridge Exp $
-
-EAPI=5
-PYTHON_DEPEND="2:2.6"
-
-inherit base toolchain-funcs cmake-utils python java-pkg-opt-2 java-ant-2
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="http://opencv.willowgarage.com"
-SRC_URI="mirror://sourceforge/opencvlibrary/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-fbsd ~amd64-linux"
-IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl pch png qt4 testprograms threads tiff v4l xine"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-python/numpy
-	sys-libs/zlib
-	cuda? ( <dev-util/nvidia-cuda-toolkit-5.5 )
-	eigen? ( dev-cpp/eigen:2 )
-	ffmpeg? ( virtual/ffmpeg )
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-	)
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	java? ( >=virtual/jre-1.6 )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper )
-	ieee1394? (
-		media-libs/libdc1394
-		sys-libs/libraw1394
-	)
-	ipp? ( sci-libs/ipp )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr )
-	opengl? ( virtual/glu )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qttest:4
-		opengl? ( dev-qt/qtopengl:4 )
-	)
-	threads? ( dev-cpp/tbb )
-	tiff? ( media-libs/tiff )
-	v4l? ( >=media-libs/libv4l-0.8.3 )
-	xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.6 )
-"
-
-# REQUIRED_USE="opengl? ( qt )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch"
-	"${FILESDIR}/${PN}-2.4.3-gcc47.patch"
-	"${FILESDIR}/${PN}-2.4.2-cflags.patch"
-	"${FILESDIR}/${PN}-2.4.5-javamagic.patch"
-)
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	base_src_prepare
-
-	# remove bundled stuff
-	rm -rf 3rdparty
-	sed -i \
-		-e '/add_subdirectory(3rdparty)/ d' \
-		CMakeLists.txt || die
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-
-	# please dont sort here, order is the same as in CMakeLists.txt
-	local mycmakeargs=(
-	# the optinal dependency libraries
-		$(cmake-utils_use_with ieee1394 1394)
-		-DWITH_AVFOUNDATION=OFF
-		-DWITH_CARBON=OFF
-		$(cmake-utils_use_with eigen)
-		$(cmake-utils_use_with ffmpeg)
-		$(cmake-utils_use_with gstreamer)
-		$(cmake-utils_use_with gtk)
-		$(cmake-utils_use_with ipp)
-		$(cmake-utils_use_with java)
-		$(cmake-utils_use_with jpeg2k JASPER)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with opencl)
-	#	$(cmake-utils_use_with opencl OPENCLAMDFFT)
-	#	$(cmake-utils_use_with opencl OPENCLAMDBLAS)
-		$(cmake-utils_use_with openexr)
-		$(cmake-utils_use_with opengl)
-		-DWITH_OPENNI=OFF					# not packaged
-		$(cmake-utils_use_with png)
-		-DWITH_PVAPI=OFF					# not packaged
-		$(cmake-utils_use_with qt4 QT)
-		-DWITH_QUICKTIME=OFF
-		$(cmake-utils_use_with threads TBB)
-		$(cmake-utils_use_with tiff)
-		-DWITH_UNICAP=OFF					# not packaged
-		$(cmake-utils_use_with v4l V4L)
-		-DWITH_VIDEOINPUT=OFF					# windows only
-		-DWITH_XIMEA=OFF					# windows only
-		$(cmake-utils_use_with xine)
-	# the build components
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		$(cmake-utils_use_build doc DOCS)
-		$(cmake-utils_use_build examples)
-		-DBUILD_PERF_TESTS=OFF
-		$(cmake-utils_use_build testprograms TESTS)
-	# install examples
-		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
-	# build options
-		$(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
-		-DENABLE_OMIT_FRAME_POINTER=OFF				#
-		-DENABLE_FAST_MATH=OFF					#
-		-DENABLE_SSE=OFF					# these options do nothing but
-		-DENABLE_SSE2=OFF					# add params to CFLAGS
-		-DENABLE_SSE3=OFF
-		-DENABLE_SSSE3=OFF
-		-DENABLE_SSE41=OFF
-		-DENABLE_SSE42=OFF
-		-DOPENCV_EXTRA_FLAGS_RELEASE=""				# black magic
-	)
-
-	if use cuda; then
-		if [[ "$(gcc-version)" > "4.6" ]]; then
-			ewarn "CUDA and >=sys-devel/gcc-4.7 do not play well together. Disabling CUDA support."
-			mycmakeargs+=( "-DWITH_CUDA=OFF" )
-			mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
-			mycmakeargs+=( "-DWITH_CUFFT=OFF" )
-		else
-			mycmakeargs+=( "-DWITH_CUDA=ON" )
-			mycmakeargs+=( "-DWITH_CUBLAS=ON" )
-			mycmakeargs+=( "-DWITH_CUFFT=ON" )
-		fi
-	else
-		mycmakeargs+=( "-DWITH_CUDA=OFF" )
-		mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
-		mycmakeargs+=( "-DWITH_CUFFT=OFF" )
-	fi
-
-	if use examples; then
-		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
-	else
-		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
-	fi
-
-	# things we want to be hard off or not yet figured out
-	mycmakeargs+=(
-		"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
-		"-DBUILD_LATEX_DOCS=OFF"
-		"-DBUILD_PACKAGE=OFF"
-		"-DENABLE_PROFILING=OFF"
-	)
-
-	# things we want to be hard enabled not worth useflag
-	mycmakeargs+=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	# hardcode cuda paths
-	mycmakeargs+=(
-		"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
-	)
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/opencv/opencv-2.4.8.ebuild b/media-libs/opencv/opencv-2.4.8.ebuild
deleted file mode 100644
index 81bb706b2874..000000000000
--- a/media-libs/opencv/opencv-2.4.8.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.8.ebuild,v 1.3 2014/01/25 11:01:29 dilfridge Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit base toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="http://opencv.willowgarage.com"
-
-SRC_URI="mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0/2.4"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
-IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl openmp pch png +python qt4 testprograms threads tiff v4l xine"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#	gtk? ( !qt4 )
-#	opengl? ( || ( gtk qt4 ) )
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
-	ffmpeg? ( virtual/ffmpeg )
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-	)
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-		opengl? ( x11-libs/gtkglext )
-	)
-	java? ( >=virtual/jre-1.6 )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper )
-	ieee1394? (
-		media-libs/libdc1394
-		sys-libs/libraw1394
-	)
-	ipp? ( sci-libs/ipp )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr )
-	opengl? ( virtual/opengl virtual/glu )
-	png? ( media-libs/libpng:0= )
-	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qttest:4
-		opengl? ( dev-qt/qtopengl:4 )
-	)
-	threads? ( dev-cpp/tbb )
-	tiff? ( media-libs/tiff )
-	v4l? ( >=media-libs/libv4l-0.8.3 )
-	xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	eigen? ( dev-cpp/eigen:3 )
-	java? ( >=virtual/jdk-1.6 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch"
-	"${FILESDIR}/${PN}-2.4.3-gcc47.patch"
-	"${FILESDIR}/${PN}-2.4.2-cflags.patch"
-	"${FILESDIR}/${PN}-2.4.8-javamagic.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	base_src_prepare
-
-	# remove bundled stuff
-	rm -rf 3rdparty
-	sed -i \
-		-e '/add_subdirectory(3rdparty)/ d' \
-		CMakeLists.txt || die
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	if use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-
-	# please dont sort here, order is the same as in CMakeLists.txt
-	local mycmakeargs=(
-	# the optinal dependency libraries
-		$(cmake-utils_use_with ieee1394 1394)
-		-DWITH_AVFOUNDATION=OFF
-		-DWITH_CARBON=OFF
-		$(cmake-utils_use_with eigen)
-		$(cmake-utils_use_with ffmpeg)
-		$(cmake-utils_use_with gstreamer)
-		$(cmake-utils_use_with gtk)
-		$(cmake-utils_use_with ipp)
-		$(cmake-utils_use_with java)
-		$(cmake-utils_use_with jpeg2k JASPER)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with opencl)
-	#	$(cmake-utils_use_with opencl OPENCLAMDFFT)
-	#	$(cmake-utils_use_with opencl OPENCLAMDBLAS)
-		$(cmake-utils_use_with openexr)
-		$(cmake-utils_use_with opengl)
-		$(cmake-utils_use_with openmp)
-		-DWITH_OPENNI=OFF					# not packaged
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_build python opencv_python)
-		-DWITH_PVAPI=OFF					# not packaged
-		-DWITH_QUICKTIME=OFF
-		$(cmake-utils_use_with threads TBB)
-		$(cmake-utils_use_with tiff)
-		-DWITH_UNICAP=OFF					# not packaged
-		$(cmake-utils_use_with v4l V4L)
-		-DWITH_LIBV4L=ON
-		-DWITH_VIDEOINPUT=OFF					# windows only
-		-DWITH_XIMEA=OFF					# windows only
-		$(cmake-utils_use_with xine)
-	# the build components
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		$(cmake-utils_use_build doc DOCS)
-		$(cmake-utils_use_build examples)
-		-DBUILD_PERF_TESTS=OFF
-		$(cmake-utils_use_build testprograms TESTS)
-	# install examples
-		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
-	# build options
-		$(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
-		-DENABLE_OMIT_FRAME_POINTER=OFF				#
-		-DENABLE_FAST_MATH=OFF					#
-		-DENABLE_SSE=OFF					# these options do nothing but
-		-DENABLE_SSE2=OFF					# add params to CFLAGS
-		-DENABLE_SSE3=OFF
-		-DENABLE_SSSE3=OFF
-		-DENABLE_SSE41=OFF
-		-DENABLE_SSE42=OFF
-		-DOPENCV_EXTRA_FLAGS_RELEASE=""				# black magic
-	)
-
-	if use qt4; then
-		mycmakeargs+=( "-DWITH_QT=4" )
-	else
-		mycmakeargs+=( "-DWITH_QT=OFF" )
-	fi
-
-	if use cuda; then
-		if [[ "$(gcc-version)" > "4.7" ]]; then
-			ewarn "CUDA and >=sys-devel/gcc-4.8 do not play well together. Disabling CUDA support."
-			mycmakeargs+=( "-DWITH_CUDA=OFF" )
-			mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
-			mycmakeargs+=( "-DWITH_CUFFT=OFF" )
-		else
-			mycmakeargs+=( "-DWITH_CUDA=ON" )
-			mycmakeargs+=( "-DWITH_CUBLAS=ON" )
-			mycmakeargs+=( "-DWITH_CUFFT=ON" )
-		fi
-	else
-		mycmakeargs+=( "-DWITH_CUDA=OFF" )
-		mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
-		mycmakeargs+=( "-DWITH_CUFFT=OFF" )
-	fi
-
-	if use examples && use python; then
-		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
-	else
-		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
-	fi
-
-	# things we want to be hard off or not yet figured out
-	mycmakeargs+=(
-		"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
-		"-DBUILD_LATEX_DOCS=OFF"
-		"-DBUILD_PACKAGE=OFF"
-		"-DENABLE_PROFILING=OFF"
-	)
-
-	# things we want to be hard enabled not worth useflag
-	mycmakeargs+=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	# hardcode cuda paths
-	mycmakeargs+=(
-		"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
-	)
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	cmake-utils_src_configure
-}