1 |
ssuominen 09/06/21 16:02:20 |
2 |
|
3 |
Modified: glame-2.0.1.ebuild ChangeLog |
4 |
Log: |
5 |
Fix compability with latest guile wrt #256206, thanks to Nathan Brink and others. |
6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.14 media-sound/glame/glame-2.0.1.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/glame/glame-2.0.1.ebuild?rev=1.14&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/glame/glame-2.0.1.ebuild?rev=1.14&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/glame/glame-2.0.1.ebuild?r1=1.13&r2=1.14 |
14 |
|
15 |
Index: glame-2.0.1.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/glame/glame-2.0.1.ebuild,v |
18 |
retrieving revision 1.13 |
19 |
retrieving revision 1.14 |
20 |
diff -u -r1.13 -r1.14 |
21 |
--- glame-2.0.1.ebuild 9 May 2009 15:48:48 -0000 1.13 |
22 |
+++ glame-2.0.1.ebuild 21 Jun 2009 16:02:20 -0000 1.14 |
23 |
@@ -1,7 +1,8 @@ |
24 |
# Copyright 1999-2009 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-2.0.1.ebuild,v 1.13 2009/05/09 15:48:48 ssuominen Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-2.0.1.ebuild,v 1.14 2009/06/21 16:02:20 ssuominen Exp $ |
28 |
|
29 |
+EAPI=2 |
30 |
WANT_AUTOCONF=2.5 |
31 |
inherit autotools eutils |
32 |
|
33 |
@@ -12,9 +13,9 @@ |
34 |
LICENSE="GPL-2" |
35 |
SLOT="0" |
36 |
KEYWORDS="amd64 ~ppc sparc x86" |
37 |
-IUSE="gnome vorbis debug alsa" |
38 |
+IUSE="+alsa +gnome vorbis" |
39 |
|
40 |
-RDEPEND=">=dev-scheme/guile-1.4-r3 |
41 |
+RDEPEND=">=dev-scheme/guile-1.8[deprecated] |
42 |
>=dev-libs/libxml-1.8 |
43 |
>=dev-libs/libxml2-2 |
44 |
>=media-sound/esound-0.2 |
45 |
@@ -23,45 +24,36 @@ |
46 |
media-libs/libmad |
47 |
media-libs/ladspa-sdk |
48 |
vorbis? ( >=media-libs/libvorbis-1 ) |
49 |
- gnome? ( >=gnome-base/libglade-2 >=gnome-base/libgnome-2.6 |
50 |
- >=gnome-base/libgnome-2.6 >=gnome-base/libgnomecanvas-2.6 |
51 |
- >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6 >=gnome-base/libgnomeui-2.6 ) |
52 |
+ gnome? ( >=gnome-base/libglade-2 |
53 |
+ >=gnome-base/libgnome-2.6 |
54 |
+ >=gnome-base/libgnomecanvas-2.6 |
55 |
+ >=x11-libs/gtk+-2.6 |
56 |
+ >=gnome-base/libgnomeui-2.6 ) |
57 |
alsa? ( media-libs/alsa-lib )" |
58 |
DEPEND="${RDEPEND} |
59 |
sys-devel/gettext" |
60 |
|
61 |
pkg_setup() { |
62 |
- if has_version =dev-scheme/guile-1.8*; then |
63 |
- built_with_use dev-scheme/guile deprecated || die "guile must be built with deprecated use flag." |
64 |
- fi |
65 |
+ use gnome || ewarn "You will need to emerge with USE gnome to get a GUI." |
66 |
} |
67 |
|
68 |
-src_unpack() { |
69 |
- unpack ${A} |
70 |
- cd "${S}"/libltdl |
71 |
+src_prepare() { |
72 |
+ cd libltdl |
73 |
eautoconf |
74 |
- cd "${S}" |
75 |
- epatch "${FILESDIR}"/${P}-cflags.patch |
76 |
- sed -i -e 's:glame.png:glame-logo.jpg:' src/gui/glame.desktop |
77 |
+ cd .. |
78 |
+ epatch "${FILESDIR}"/${P}-cflags.patch \ |
79 |
+ "${FILESDIR}"/${P}-guile_1_8_compat.patch |
80 |
} |
81 |
|
82 |
-src_compile() { |
83 |
- econf $(use_enable alsa alsatest) \ |
84 |
- $(use_enable debug swapfiledebug) $(use_enable debug) \ |
85 |
+src_configure() { |
86 |
+ econf \ |
87 |
$(use_enable gnome gui) \ |
88 |
- --enable-ladspa \ |
89 |
- ${myconf} |
90 |
- |
91 |
- emake || die "emake failed." |
92 |
+ $(use_enable alsa alsatest) \ |
93 |
+ --enable-ladspa |
94 |
} |
95 |
|
96 |
src_install() { |
97 |
- einstall || die "einstall failed." |
98 |
- |
99 |
- if use gnome; then |
100 |
- dodir /usr/share/pixmaps |
101 |
- dosym ../glame/pixmaps/glame-logo.jpg /usr/share/pixmaps/glame-logo.jpg |
102 |
- fi |
103 |
- |
104 |
+ einstall || die "einstall failed" |
105 |
+ use gnome && dosym ../glame/pixmaps/glame-logo.jpg /usr/share/pixmaps/${PN}.jpg |
106 |
dodoc AUTHORS BUGS CREDITS ChangeLog MAINTAINERS NEWS README TODO |
107 |
} |
108 |
|
109 |
|
110 |
|
111 |
1.39 media-sound/glame/ChangeLog |
112 |
|
113 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/glame/ChangeLog?rev=1.39&view=markup |
114 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/glame/ChangeLog?rev=1.39&content-type=text/plain |
115 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/glame/ChangeLog?r1=1.38&r2=1.39 |
116 |
|
117 |
Index: ChangeLog |
118 |
=================================================================== |
119 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/glame/ChangeLog,v |
120 |
retrieving revision 1.38 |
121 |
retrieving revision 1.39 |
122 |
diff -u -r1.38 -r1.39 |
123 |
--- ChangeLog 9 May 2009 15:48:48 -0000 1.38 |
124 |
+++ ChangeLog 21 Jun 2009 16:02:20 -0000 1.39 |
125 |
@@ -1,6 +1,11 @@ |
126 |
# ChangeLog for media-sound/glame |
127 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
128 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/ChangeLog,v 1.38 2009/05/09 15:48:48 ssuominen Exp $ |
129 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/ChangeLog,v 1.39 2009/06/21 16:02:20 ssuominen Exp $ |
130 |
+ |
131 |
+ 21 Jun 2009; Samuli Suominen <ssuominen@g.o> glame-2.0.1.ebuild, |
132 |
+ +files/glame-2.0.1-guile_1_8_compat.patch: |
133 |
+ Fix compability with latest guile wrt #256206, thanks to Nathan Brink and |
134 |
+ others. |
135 |
|
136 |
09 May 2009; Samuli Suominen <ssuominen@g.o> glame-2.0.1.ebuild: |
137 |
Remove USE nls wrt #165234 |