From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A5BD41395E2 for ; Sat, 10 Dec 2016 21:47:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5894E0B16; Sat, 10 Dec 2016 21:47:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C1D41E0B16 for ; Sat, 10 Dec 2016 21:47:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF1943413AA for ; Sat, 10 Dec 2016 21:47:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5356F4A6 for ; Sat, 10 Dec 2016 21:47:37 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1481406435.596bf1589b40e4bb0c35811a2a6ead82e7157cc8.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/opencv/opencv-3.1.0-r7.ebuild X-VCS-Directories: media-libs/opencv/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 596bf1589b40e4bb0c35811a2a6ead82e7157cc8 X-VCS-Branch: master Date: Sat, 10 Dec 2016 21:47:37 +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: 1bdfbb5b-56dc-4c71-9be0-d51d0502086a X-Archives-Hash: dac7e2cc2835b35606719f517220bee2 commit: 596bf1589b40e4bb0c35811a2a6ead82e7157cc8 Author: David Seifert gentoo org> AuthorDate: Sat Dec 10 21:47:15 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Dec 10 21:47:15 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=596bf158 media-libs/opencv: [QA] Minor fixes Package-Manager: portage-2.3.3 media-libs/opencv/opencv-3.1.0-r7.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media-libs/opencv/opencv-3.1.0-r7.ebuild b/media-libs/opencv/opencv-3.1.0-r7.ebuild index 26371e1..879e7e2 100644 --- a/media-libs/opencv/opencv-3.1.0-r7.ebuild +++ b/media-libs/opencv/opencv-3.1.0-r7.ebuild @@ -115,11 +115,12 @@ pkg_pretend() { } pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp java-pkg-opt-2_pkg_setup } src_prepare() { - default + cmake-utils_src_prepare # remove bundled stuff rm -rf 3rdparty || die "Removing 3rd party components failed"