From 75b7f6b2d9f56db65129c894978678e64a3c8623 Mon Sep 17 00:00:00 2001 From: Amy Winston Date: Tue, 19 Jan 2016 18:28:55 +0100 Subject: media-libs/opencv: 2.4.11 base migration Package-Manager: portage-2.2.24 --- media-libs/opencv/opencv-2.4.11.ebuild | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'media-libs/opencv') diff --git a/media-libs/opencv/opencv-2.4.11.ebuild b/media-libs/opencv/opencv-2.4.11.ebuild index 08de0651dd4d..d5fc0f790313 100644 --- a/media-libs/opencv/opencv-2.4.11.ebuild +++ b/media-libs/opencv/opencv-2.4.11.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,21 +73,17 @@ 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-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-pkg-config.patch" # remove bundled stuff rm -rf 3rdparty -- cgit v1.2.3-65-gdbad