From: Amy Winston <amynka@gentoo.org>
Date: Tue, 19 Jan 2016 16:59:00 +0000 (+0100)
Subject: media-libs/opencv: 2.4.9 base migration
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b4d8d72b827bca5505da099fd455bf5eb58fe9ad;p=gentoo.git

media-libs/opencv: 2.4.9 base migration

Package-Manager: portage-2.2.24
---

diff --git a/media-libs/opencv/opencv-2.4.9.ebuild b/media-libs/opencv/opencv-2.4.9.ebuild
index b91b22fe4207..872d74c823a3 100644
--- a/media-libs/opencv/opencv-2.4.9.ebuild
+++ b/media-libs/opencv/opencv-2.4.9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit base toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
+inherit 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"
@@ -73,23 +73,20 @@ DEPEND="${RDEPEND}
 	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"
-	"${FILESDIR}/${PN}-2.4.9-cuda.patch"
-	"${FILESDIR}/${PN}-2.4.9-libav10.patch"
-	"${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch"
-)
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 	java-pkg-opt-2_pkg_setup
 }
 
 src_prepare() {
-	base_src_prepare
+
+	epatch "${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" \
+        	"${FILESDIR}/${PN}-2.4.9-cuda.patch" \
+        	"${FILESDIR}/${PN}-2.4.9-libav10.patch" \
+        	"${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch"
 
 	# remove bundled stuff
 	rm -rf 3rdparty