From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CE92758974 for ; Tue, 19 Jan 2016 17:49:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F091921C021; Tue, 19 Jan 2016 17:49:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3772B21C021 for ; Tue, 19 Jan 2016 17:49:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F892340931 for ; Tue, 19 Jan 2016 17:49:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE5011024 for ; Tue, 19 Jan 2016 17:49:05 +0000 (UTC) From: "Amy Winston" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amy Winston" Message-ID: <1453225689.75b7f6b2d9f56db65129c894978678e64a3c8623.amynka@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/opencv/opencv-2.4.11.ebuild X-VCS-Directories: media-libs/opencv/ X-VCS-Committer: amynka X-VCS-Committer-Name: Amy Winston X-VCS-Revision: 75b7f6b2d9f56db65129c894978678e64a3c8623 X-VCS-Branch: master Date: Tue, 19 Jan 2016 17:49:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1d271219-d49e-4092-86e5-1d946b1e7cfc X-Archives-Hash: 2ecda1ebcca28a1bf1fcebc5a36d4afa commit: 75b7f6b2d9f56db65129c894978678e64a3c8623 Author: Amy Winston gentoo org> AuthorDate: Tue Jan 19 17:28:55 2016 +0000 Commit: Amy Winston gentoo org> CommitDate: Tue Jan 19 17:48:09 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75b7f6b2 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(-) diff --git a/media-libs/opencv/opencv-2.4.11.ebuild b/media-libs/opencv/opencv-2.4.11.ebuild index 08de065..d5fc0f7 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