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 86557139694 for ; Sat, 11 Feb 2017 19:48:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2CFC8E0D0E; Sat, 11 Feb 2017 19:47:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 EB956E0D0E for ; Sat, 11 Feb 2017 19:47:56 +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 8501D34162D for ; Sat, 11 Feb 2017 19:47:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2FD794485 for ; Sat, 11 Feb 2017 19:47:38 +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: <1486842430.528b542ebf8264a5d067f2ad39686995d2ba872e.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-text2skin/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild X-VCS-Directories: media-plugins/vdr-text2skin/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 528b542ebf8264a5d067f2ad39686995d2ba872e X-VCS-Branch: master Date: Sat, 11 Feb 2017 19:47:38 +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: 6d476470-ba6b-463d-a3c5-2e9f15c72af7 X-Archives-Hash: 5085108ab0faf9f474609ebaf9530d2a commit: 528b542ebf8264a5d067f2ad39686995d2ba872e Author: David Seifert gentoo org> AuthorDate: Sat Feb 11 19:21:57 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Feb 11 19:47:10 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528b542e media-plugins/vdr-text2skin: Use sub-slot operators for imagemagick Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3907 ...-1.3.2.ebuild => vdr-text2skin-1.3.2-r1.ebuild} | 45 +++++++++++++--------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild similarity index 68% rename from media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild rename to media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild index b072c9c495..b75013bc81 100644 --- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild +++ b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,18 +15,23 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" SLOT="0" LICENSE="GPL-2" KEYWORDS="~x86 ~amd64" -IUSE="contrib doc +imagemagick imlib" - -REQUIRED_USE="imagemagick? ( !imlib ) - imlib? ( !imagemagick )" - -RDEPEND=">=media-video/vdr-1.6.0 - imagemagick? ( || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx] ) ) - imlib? ( media-libs/imlib2 >=media-video/vdr-1.6.0[-graphtft] )" +IUSE="contrib doc graphicsmagick +imagemagick imlib" + +RDEPEND=" + >=media-video/vdr-1.6.0 + imagemagick? ( + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) + ) + !imagemagick? ( + imlib? ( + media-libs/imlib2 + >=media-video/vdr-1.6.0[-graphtft] + ) + )" DEPEND="${RDEPEND} - imagemagick? ( virtual/pkgconfig ) - imlib? ( virtual/pkgconfig ) - sys-devel/gettext" + sys-devel/gettext + virtual/pkgconfig" KEEP_I18NOBJECT="yes" @@ -42,17 +47,19 @@ src_prepare() { fi if use imagemagick; then - # Prefer imagemagick over graphicsmagick - if has_version "media-gfx/imagemagick"; then - imagelib="imagemagick" - elif has_version "media-gfx/graphicsmagick"; then + if use graphicsmagick; then imagelib="graphicsmagick" + else + imagelib="imagemagick" fi - elif use imlib; then - imagelib="imlib2" else - imagelib="none" + if use imlib; then + imagelib="imlib2" + else + imagelib="none" + fi fi + sed -i -e "s:\(IMAGELIB[[:space:]]*=\) .*:\1 ${imagelib}:" Makefile || die vdr-plugin-2_src_prepare