1 |
commit: bd6248570d50008c5baded5fe80f737a26e69a46 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 26 10:48:07 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 26 11:01:09 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd624857 |
7 |
|
8 |
media-plugins/vdr-music: Remove support for non-existent deps |
9 |
|
10 |
media-plugins/vdr-music/metadata.xml | 3 --- |
11 |
media-plugins/vdr-music/vdr-music-0.9.9.ebuild | 12 ++++-------- |
12 |
profiles/base/package.use.mask | 4 ---- |
13 |
3 files changed, 4 insertions(+), 15 deletions(-) |
14 |
|
15 |
diff --git a/media-plugins/vdr-music/metadata.xml b/media-plugins/vdr-music/metadata.xml |
16 |
index b60af890e86..27f419c289c 100644 |
17 |
--- a/media-plugins/vdr-music/metadata.xml |
18 |
+++ b/media-plugins/vdr-music/metadata.xml |
19 |
@@ -5,7 +5,4 @@ |
20 |
<email>vdr@g.o</email> |
21 |
<name>Gentoo VDR Project</name> |
22 |
</maintainer> |
23 |
-<use> |
24 |
- <flag name="graphtft">Enable support for vdr-graphtft plugin</flag> |
25 |
-</use> |
26 |
</pkgmetadata> |
27 |
|
28 |
diff --git a/media-plugins/vdr-music/vdr-music-0.9.9.ebuild b/media-plugins/vdr-music/vdr-music-0.9.9.ebuild |
29 |
index 283c1cf0d1a..a9a7a268fc8 100644 |
30 |
--- a/media-plugins/vdr-music/vdr-music-0.9.9.ebuild |
31 |
+++ b/media-plugins/vdr-music/vdr-music-0.9.9.ebuild |
32 |
@@ -15,22 +15,18 @@ SRC_URI="http://www.glaserei-franz.de/VDR/Moronimo/files/${MY_P}.tgz" |
33 |
SLOT="0" |
34 |
LICENSE="GPL-2" |
35 |
KEYWORDS="~amd64 ~x86" |
36 |
-IUSE="+imagemagick debug graphtft sndfile vorbis" |
37 |
+IUSE="+imagemagick debug sndfile vorbis" |
38 |
|
39 |
DEPEND=">=media-video/vdr-1.6.0 |
40 |
media-libs/libmad |
41 |
media-libs/libid3tag |
42 |
- graphtft? ( media-gfx/imagemagick[png] ) |
43 |
imagemagick? ( media-gfx/imagemagick[png] ) |
44 |
sndfile? ( media-libs/libsndfile ) |
45 |
vorbis? ( media-libs/libvorbis ) |
46 |
- !imagemagick? ( |
47 |
- !graphtft? ( media-libs/imlib2[png] ) |
48 |
- )" |
49 |
+ !imagemagick? ( media-libs/imlib2[png] )" |
50 |
|
51 |
RDEPEND="sys-process/at |
52 |
- media-sound/id3v2 |
53 |
- graphtft? ( >=media-plugins/vdr-graphtft-0.1.5 )" |
54 |
+ media-sound/id3v2" |
55 |
|
56 |
src_prepare() { |
57 |
# # prepare sources with new Makefile handling |
58 |
@@ -44,7 +40,7 @@ src_prepare() { |
59 |
use !vorbis && sed -i Makefile -e "s:#WITHOUT_LIBVORBISFILE=1:WITHOUT_LIBVORBISFILE=1:" |
60 |
use !sndfile && sed -i Makefile -e "s:#WITHOUT_LIBSNDFILE=1:WITHOUT_LIBSNDFILE=1:" |
61 |
use !debug && sed -i Makefile -e "s:DEBUG=1:#DEBUG=1:" |
62 |
- use graphtft || use imagemagick && sed -i Makefile \ |
63 |
+ use imagemagick && sed -i Makefile \ |
64 |
-e "s:#HAVE_MAGICK=1:HAVE_MAGICK=1:" \ |
65 |
-e "s:#MAGICKDIR=:MAGICKDIR=:" |
66 |
} |
67 |
|
68 |
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask |
69 |
index f933a7491fb..1cba445d369 100644 |
70 |
--- a/profiles/base/package.use.mask |
71 |
+++ b/profiles/base/package.use.mask |
72 |
@@ -89,10 +89,6 @@ sys-freebsd/freebsd-lib hesiod |
73 |
# sys-fabric/mstflint will be removed (#594908) |
74 |
sys-fabric/ofed mstflint |
75 |
|
76 |
-# Pacho Ramos <pacho@g.o> (17 Mar 2018) |
77 |
-# x11-themes/vdrgraphtft-avp is being removed (#592066) |
78 |
-media-plugins/vdr-music graphtft |
79 |
- |
80 |
# Lars Wendler <polynomial-c@g.o> (14 Mar 2018) |
81 |
# Broken on all 32bit arches. Globally masked because of sys-apps/dmapi having |
82 |
# no active upstream anymore. |