From bd6248570d50008c5baded5fe80f737a26e69a46 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 26 Aug 2018 12:48:07 +0200 Subject: [PATCH] media-plugins/vdr-music: Remove support for non-existent deps --- media-plugins/vdr-music/metadata.xml | 3 --- media-plugins/vdr-music/vdr-music-0.9.9.ebuild | 12 ++++-------- profiles/base/package.use.mask | 4 ---- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/media-plugins/vdr-music/metadata.xml b/media-plugins/vdr-music/metadata.xml index b60af890e86e..27f419c289c3 100644 --- a/media-plugins/vdr-music/metadata.xml +++ b/media-plugins/vdr-music/metadata.xml @@ -5,7 +5,4 @@ vdr@gentoo.org Gentoo VDR Project - - Enable support for vdr-graphtft plugin - diff --git a/media-plugins/vdr-music/vdr-music-0.9.9.ebuild b/media-plugins/vdr-music/vdr-music-0.9.9.ebuild index 283c1cf0d1ac..a9a7a268fc82 100644 --- a/media-plugins/vdr-music/vdr-music-0.9.9.ebuild +++ b/media-plugins/vdr-music/vdr-music-0.9.9.ebuild @@ -15,22 +15,18 @@ SRC_URI="http://www.glaserei-franz.de/VDR/Moronimo/files/${MY_P}.tgz" SLOT="0" LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" -IUSE="+imagemagick debug graphtft sndfile vorbis" +IUSE="+imagemagick debug sndfile vorbis" DEPEND=">=media-video/vdr-1.6.0 media-libs/libmad media-libs/libid3tag - graphtft? ( media-gfx/imagemagick[png] ) imagemagick? ( media-gfx/imagemagick[png] ) sndfile? ( media-libs/libsndfile ) vorbis? ( media-libs/libvorbis ) - !imagemagick? ( - !graphtft? ( media-libs/imlib2[png] ) - )" + !imagemagick? ( media-libs/imlib2[png] )" RDEPEND="sys-process/at - media-sound/id3v2 - graphtft? ( >=media-plugins/vdr-graphtft-0.1.5 )" + media-sound/id3v2" src_prepare() { # # prepare sources with new Makefile handling @@ -44,7 +40,7 @@ src_prepare() { use !vorbis && sed -i Makefile -e "s:#WITHOUT_LIBVORBISFILE=1:WITHOUT_LIBVORBISFILE=1:" use !sndfile && sed -i Makefile -e "s:#WITHOUT_LIBSNDFILE=1:WITHOUT_LIBSNDFILE=1:" use !debug && sed -i Makefile -e "s:DEBUG=1:#DEBUG=1:" - use graphtft || use imagemagick && sed -i Makefile \ + use imagemagick && sed -i Makefile \ -e "s:#HAVE_MAGICK=1:HAVE_MAGICK=1:" \ -e "s:#MAGICKDIR=:MAGICKDIR=:" } diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index f933a7491fb4..1cba445d3694 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -89,10 +89,6 @@ sys-freebsd/freebsd-lib hesiod # sys-fabric/mstflint will be removed (#594908) sys-fabric/ofed mstflint -# Pacho Ramos (17 Mar 2018) -# x11-themes/vdrgraphtft-avp is being removed (#592066) -media-plugins/vdr-music graphtft - # Lars Wendler (14 Mar 2018) # Broken on all 32bit arches. Globally masked because of sys-apps/dmapi having # no active upstream anymore. -- 2.26.2