1 |
zzam 09/02/24 00:41:04 |
2 |
|
3 |
Modified: vdr-music-0.2.0.ebuild ChangeLog |
4 |
Log: |
5 |
Switch to eapi2 so the built_with_use can be replaced by a proper use-depend. Also add DEPEND to RDEPEND as that seems to be missing. |
6 |
(Portage version: 2.1.6.7/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.5 media-plugins/vdr-music/vdr-music-0.2.0.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-music/vdr-music-0.2.0.ebuild?rev=1.5&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-music/vdr-music-0.2.0.ebuild?rev=1.5&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-music/vdr-music-0.2.0.ebuild?r1=1.4&r2=1.5 |
14 |
|
15 |
Index: vdr-music-0.2.0.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/vdr-music-0.2.0.ebuild,v |
18 |
retrieving revision 1.4 |
19 |
retrieving revision 1.5 |
20 |
diff -u -r1.4 -r1.5 |
21 |
--- vdr-music-0.2.0.ebuild 13 Jan 2009 20:54:17 -0000 1.4 |
22 |
+++ vdr-music-0.2.0.ebuild 24 Feb 2009 00:41:04 -0000 1.5 |
23 |
@@ -1,6 +1,8 @@ |
24 |
# Copyright 2003-2009 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/vdr-music-0.2.0.ebuild,v 1.4 2009/01/13 20:54:17 zzam Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/vdr-music-0.2.0.ebuild,v 1.5 2009/02/24 00:41:04 zzam Exp $ |
28 |
+ |
29 |
+EAPI="2" |
30 |
|
31 |
inherit vdr-plugin |
32 |
|
33 |
@@ -21,35 +23,19 @@ |
34 |
DEPEND=">=media-video/vdr-1.3.30 |
35 |
media-libs/libmad |
36 |
media-libs/libid3tag |
37 |
- imagemagick? ( media-gfx/imagemagick ) |
38 |
+ imagemagick? ( media-gfx/imagemagick[png] ) |
39 |
vorbis? ( media-libs/libvorbis ) |
40 |
sndfile? ( media-libs/libsndfile ) |
41 |
oss? ( media-libs/alsa-oss ) |
42 |
- !imagemagick? ( media-libs/imlib2 )" |
43 |
+ !imagemagick? ( media-libs/imlib2[png] )" |
44 |
|
45 |
-RDEPEND="dev-java/blackdown-jre |
46 |
+RDEPEND="${DEPEND} |
47 |
+ dev-java/blackdown-jre |
48 |
media-tv/shoutcast2vdr |
49 |
sys-process/at |
50 |
graphtft? ( >=media-plugins/vdr-graphtft-0.1.5 )" |
51 |
|
52 |
-pkg_setup() { |
53 |
- |
54 |
- use imagemagick && local LIB="media-gfx/imagemagick" |
55 |
- use !imagemagick && local LIB="media-libs/imlib2" |
56 |
- |
57 |
- if ! built_with_use $LIB png; then |
58 |
- echo |
59 |
- eerror "Please recompile $LIB with" |
60 |
- eerror "USE=\"png\"" |
61 |
- die "$LIB need png support" |
62 |
- fi |
63 |
- |
64 |
- vdr-plugin_pkg_setup |
65 |
-} |
66 |
- |
67 |
-src_unpack() { |
68 |
- vdr-plugin_src_unpack |
69 |
- |
70 |
+src_prepare() { |
71 |
use graphtft && epatch "${FILESDIR}/${P}-graphtftcoverfix.diff" |
72 |
|
73 |
use !ff-card && sed -i Makefile -e "s:HAVE_FFCARD=1:#HAVE_FFCARD=1:" |
74 |
@@ -59,6 +45,8 @@ |
75 |
use oss && sed -i Makefile -e "s:#WITH_OSS_OUTPUT=1:WITH_OSS_OUTPUT=1:" |
76 |
use 4mb-mod && sed -i Makefile -e "s:#HAVE_OSDMOD=1:HAVE_OSDMOD=1:" |
77 |
use debug && sed -i Makefile -e "s:#DBG=1:DBG=1:" |
78 |
+ |
79 |
+ vdr-plugin_src_prepare |
80 |
} |
81 |
|
82 |
src_install() { |
83 |
|
84 |
|
85 |
|
86 |
1.7 media-plugins/vdr-music/ChangeLog |
87 |
|
88 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-music/ChangeLog?rev=1.7&view=markup |
89 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-music/ChangeLog?rev=1.7&content-type=text/plain |
90 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-music/ChangeLog?r1=1.6&r2=1.7 |
91 |
|
92 |
Index: ChangeLog |
93 |
=================================================================== |
94 |
RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/ChangeLog,v |
95 |
retrieving revision 1.6 |
96 |
retrieving revision 1.7 |
97 |
diff -u -r1.6 -r1.7 |
98 |
--- ChangeLog 13 Jan 2009 20:54:17 -0000 1.6 |
99 |
+++ ChangeLog 24 Feb 2009 00:41:04 -0000 1.7 |
100 |
@@ -1,6 +1,10 @@ |
101 |
# ChangeLog for media-plugins/vdr-music |
102 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
103 |
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/ChangeLog,v 1.6 2009/01/13 20:54:17 zzam Exp $ |
104 |
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/ChangeLog,v 1.7 2009/02/24 00:41:04 zzam Exp $ |
105 |
+ |
106 |
+ 24 Feb 2009; Matthias Schwarzott <zzam@g.o> vdr-music-0.2.0.ebuild: |
107 |
+ Switch to eapi2 so the built_with_use can be replaced by a proper |
108 |
+ use-depend. Also add DEPEND to RDEPEND as that seems to be missing. |
109 |
|
110 |
13 Jan 2009; Matthias Schwarzott <zzam@g.o> |
111 |
+files/vdr-music-0.2.0-gcc4.3.diff, vdr-music-0.2.0.ebuild: |