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 EADA7139085 for ; Mon, 30 Jan 2017 15:01:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D135E1048; Mon, 30 Jan 2017 15:01:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 17910E1048 for ; Mon, 30 Jan 2017 15:01:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 0916634164C for ; Mon, 30 Jan 2017 15:01:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64AA13B0B for ; Mon, 30 Jan 2017 15:01:23 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1485788447.538563772eca2dd73461edb4133c4bba62d73e12.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/frei0r-plugins/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-plugins/frei0r-plugins/frei0r-plugins-1.5.0.ebuild X-VCS-Directories: media-plugins/frei0r-plugins/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 538563772eca2dd73461edb4133c4bba62d73e12 X-VCS-Branch: master Date: Mon, 30 Jan 2017 15:01:23 +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: ba3bc8e0-0041-4fb2-a3ca-81d6224735cd X-Archives-Hash: 563c6d1d2e75cc3713aca6b80cdae3ea commit: 538563772eca2dd73461edb4133c4bba62d73e12 Author: Johannes Huber gentoo org> AuthorDate: Mon Jan 30 15:00:35 2017 +0000 Commit: Johannes Huber gentoo org> CommitDate: Mon Jan 30 15:00:47 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53856377 media-plugins/frei0r-plugins: EAPI 6 Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../frei0r-plugins/frei0r-plugins-1.5.0.ebuild | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/media-plugins/frei0r-plugins/frei0r-plugins-1.5.0.ebuild b/media-plugins/frei0r-plugins/frei0r-plugins-1.5.0.ebuild index 992ae73..541c06a 100644 --- a/media-plugins/frei0r-plugins/frei0r-plugins-1.5.0.ebuild +++ b/media-plugins/frei0r-plugins/frei0r-plugins-1.5.0.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=6 + inherit cmake-utils multilib DESCRIPTION="A minimalistic plugin API for video effects" @@ -24,6 +25,8 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS.txt ChangeLog.txt README.txt TODO.txt ) src_prepare() { + cmake-utils_src_prepare + local f=CMakeLists.txt sed -i \ @@ -38,10 +41,11 @@ src_prepare() { } src_configure() { - local mycmakeargs=( - $(cmake-utils_use "!facedetect" "WITHOUT_OPENCV" ) - $(cmake-utils_use "!scale0tilt" "WITHOUT_GAVL" ) - ) + local mycmakeargs=( + -DWITHOUT_OPENCV=$(usex !facedetect) + -DWITHOUT_GAVL=$(usex !scale0tilt) + ) + cmake-utils_src_configure } @@ -58,5 +62,5 @@ src_compile() { src_install() { cmake-utils_src_install - use doc && dohtml -r doc/html + use doc && dodoc -r doc/html }