diff options
| author |   David Seifert <soap@gentoo.org> | 2017-02-11 20:21:57 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2017-02-11 20:47:10 +0100 |
| commit | 528b542ebf8264a5d067f2ad39686995d2ba872e (patch) | |
| tree | d47378561275ab7a9e68585179d826081adb3d15 /media-plugins | |
| parent | media-gfx/converseen: Use sub-slot operators for imagemagick (diff) | |
| download | gentoo-528b542ebf8264a5d067f2ad39686995d2ba872e.tar.gz gentoo-528b542ebf8264a5d067f2ad39686995d2ba872e.tar.bz2 gentoo-528b542ebf8264a5d067f2ad39686995d2ba872e.zip | |
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
Diffstat (limited to 'media-plugins')
| -rw-r--r-- | media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild (renamed from media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild) | 45 |
1 files 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 index b072c9c4955d..b75013bc8179 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 |