Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/lilypond: lilypond-9999.ebuild ChangeLog lilypond-2.16.2.ebuild lilypond-2.17.19.ebuild
Date: Thu, 30 May 2013 07:08:10
Message-Id: 20130530070758.4FB4A2171D@flycatcher.gentoo.org
1 radhermit 13/05/30 07:07:58
2
3 Modified: lilypond-9999.ebuild ChangeLog
4 lilypond-2.16.2.ebuild
5 Added: lilypond-2.17.19.ebuild
6 Log:
7 Version bump, update live ebuild, and add PYTHON_REQUIRED_USE for python-single-r1.
8
9 (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
10
11 Revision Changes Path
12 1.3 media-sound/lilypond/lilypond-9999.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/lilypond-9999.ebuild?rev=1.3&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/lilypond-9999.ebuild?rev=1.3&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/lilypond-9999.ebuild?r1=1.2&r2=1.3
17
18 Index: lilypond-9999.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-9999.ebuild,v
21 retrieving revision 1.2
22 retrieving revision 1.3
23 diff -u -r1.2 -r1.3
24 --- lilypond-9999.ebuild 14 Jan 2013 03:04:10 -0000 1.2
25 +++ lilypond-9999.ebuild 30 May 2013 07:07:58 -0000 1.3
26 @@ -1,8 +1,8 @@
27 # Copyright 1999-2013 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-9999.ebuild,v 1.2 2013/01/14 03:04:10 radhermit Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-9999.ebuild,v 1.3 2013/05/30 07:07:58 radhermit Exp $
31
32 -EAPI="5"
33 +EAPI=5
34 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
35
36 inherit elisp-common autotools eutils git-2 python-single-r1
37 @@ -12,10 +12,11 @@
38 DESCRIPTION="GNU Music Typesetter"
39 HOMEPAGE="http://lilypond.org/"
40
41 -SLOT="0"
42 LICENSE="GPL-3 FDL-1.3"
43 -KEYWORDS=""
44 -IUSE="debug emacs profile vim-syntax"
45 +SLOT="0"
46 +LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
47 +IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}"
48 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
49
50 RDEPEND=">=app-text/ghostscript-gpl-8.15
51 >=dev-scheme/guile-1.8.2[deprecated,regex]
52 @@ -42,10 +43,18 @@
53
54 src_prepare() {
55 if ! use vim-syntax ; then
56 - sed -i -e "s/vim//" GNUmakefile.in || die
57 + sed -i 's/vim//' GNUmakefile.in || die
58 fi
59
60 - sed -i -e "s/OPTIMIZE -g/OPTIMIZE/" aclocal.m4 || die
61 + # respect CFLAGS
62 + sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
63 +
64 + for lang in ${LANGS}; do
65 + use linguas_${lang} || rm po/${lang}.po || die
66 + done
67 +
68 + # respect AR
69 + sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
70
71 eautoreconf
72 }
73 @@ -86,7 +95,7 @@
74
75 python_fix_shebang "${ED}"
76
77 - dodoc HACKING README.txt
78 + dodoc HACKING
79 }
80
81 pkg_postinst() {
82
83
84
85 1.152 media-sound/lilypond/ChangeLog
86
87 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/ChangeLog?rev=1.152&view=markup
88 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/ChangeLog?rev=1.152&content-type=text/plain
89 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/ChangeLog?r1=1.151&r2=1.152
90
91 Index: ChangeLog
92 ===================================================================
93 RCS file: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v
94 retrieving revision 1.151
95 retrieving revision 1.152
96 diff -u -r1.151 -r1.152
97 --- ChangeLog 13 May 2013 07:35:31 -0000 1.151
98 +++ ChangeLog 30 May 2013 07:07:58 -0000 1.152
99 @@ -1,6 +1,13 @@
100 # ChangeLog for media-sound/lilypond
101 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
102 -# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.151 2013/05/13 07:35:31 radhermit Exp $
103 +# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.152 2013/05/30 07:07:58 radhermit Exp $
104 +
105 +*lilypond-2.17.19 (30 May 2013)
106 +
107 + 30 May 2013; Tim Harder <radhermit@g.o> lilypond-2.16.2.ebuild,
108 + +lilypond-2.17.19.ebuild, lilypond-9999.ebuild:
109 + Version bump, update live ebuild, and add PYTHON_REQUIRED_USE for
110 + python-single-r1.
111
112 *lilypond-2.17.18 (13 May 2013)
113
114
115
116
117 1.2 media-sound/lilypond/lilypond-2.16.2.ebuild
118
119 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/lilypond-2.16.2.ebuild?rev=1.2&view=markup
120 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/lilypond-2.16.2.ebuild?rev=1.2&content-type=text/plain
121 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/lilypond-2.16.2.ebuild?r1=1.1&r2=1.2
122
123 Index: lilypond-2.16.2.ebuild
124 ===================================================================
125 RCS file: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.16.2.ebuild,v
126 retrieving revision 1.1
127 retrieving revision 1.2
128 diff -u -r1.1 -r1.2
129 --- lilypond-2.16.2.ebuild 14 Jan 2013 03:04:10 -0000 1.1
130 +++ lilypond-2.16.2.ebuild 30 May 2013 07:07:58 -0000 1.2
131 @@ -1,6 +1,6 @@
132 # Copyright 1999-2013 Gentoo Foundation
133 # Distributed under the terms of the GNU General Public License v2
134 -# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.16.2.ebuild,v 1.1 2013/01/14 03:04:10 radhermit Exp $
135 +# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.16.2.ebuild,v 1.2 2013/05/30 07:07:58 radhermit Exp $
136
137 EAPI="5"
138 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
139 @@ -16,6 +16,7 @@
140 KEYWORDS="~amd64 ~hppa ~x86"
141 LANGS=" cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
142 IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}"
143 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
144
145 RDEPEND=">=app-text/ghostscript-gpl-8.15
146 >=dev-scheme/guile-1.8.2[deprecated,regex]
147
148
149
150 1.1 media-sound/lilypond/lilypond-2.17.19.ebuild
151
152 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/lilypond-2.17.19.ebuild?rev=1.1&view=markup
153 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/lilypond-2.17.19.ebuild?rev=1.1&content-type=text/plain
154
155 Index: lilypond-2.17.19.ebuild
156 ===================================================================
157 # Copyright 1999-2013 Gentoo Foundation
158 # Distributed under the terms of the GNU General Public License v2
159 # $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.17.19.ebuild,v 1.1 2013/05/30 07:07:58 radhermit Exp $
160
161 EAPI=5
162 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
163
164 inherit elisp-common autotools eutils python-single-r1
165
166 DESCRIPTION="GNU Music Typesetter"
167 SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
168 HOMEPAGE="http://lilypond.org/"
169
170 LICENSE="GPL-3 FDL-1.3"
171 SLOT="0"
172 KEYWORDS="~amd64 ~hppa ~x86"
173 LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
174 IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}"
175 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
176
177 RDEPEND=">=app-text/ghostscript-gpl-8.15
178 >=dev-scheme/guile-1.8.2[deprecated,regex]
179 media-fonts/urw-fonts
180 media-libs/fontconfig
181 media-libs/freetype:2
182 >=x11-libs/pango-1.12.3
183 emacs? ( virtual/emacs )
184 ${PYTHON_DEPS}"
185 DEPEND="${RDEPEND}
186 app-text/t1utils
187 dev-lang/perl
188 dev-texlive/texlive-metapost
189 virtual/pkgconfig
190 media-gfx/fontforge
191 >=sys-apps/texinfo-4.11
192 >=sys-devel/bison-2.0
193 sys-devel/flex
194 sys-devel/gettext
195 sys-devel/make"
196
197 # Correct output data for tests isn't bundled with releases
198 RESTRICT="test"
199
200 src_prepare() {
201 epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
202
203 if ! use vim-syntax ; then
204 sed -i 's/vim//' GNUmakefile.in || die
205 fi
206
207 # respect CFLAGS
208 sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
209
210 for lang in ${LANGS}; do
211 use linguas_${lang} || rm po/${lang}.po || die
212 done
213
214 # respect AR
215 sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
216
217 eautoreconf
218 }
219
220 src_configure() {
221 # documentation generation currently not supported since it requires a newer
222 # version of texi2html than is currently in the tree
223
224 econf \
225 --with-ncsb-dir=/usr/share/fonts/urw-fonts \
226 --disable-documentation \
227 --disable-optimising \
228 --disable-pipe \
229 $(use_enable debug debugging) \
230 $(use_enable profile profiling)
231 }
232
233 src_compile() {
234 default
235
236 if use emacs ; then
237 elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
238 || die "elisp-compile failed"
239 fi
240 }
241
242 src_install () {
243 emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
244
245 # remove elisp files since they are in the wrong directory
246 rm -r "${ED}"/usr/share/emacs || die
247
248 if use emacs ; then
249 elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
250 || die "elisp-install failed"
251 elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
252 fi
253
254 python_fix_shebang "${ED}"
255
256 dodoc AUTHORS.txt HACKING NEWS.txt README.txt
257 }
258
259 pkg_postinst() {
260 use emacs && elisp-site-regen
261 }
262
263 pkg_postrm() {
264 use emacs && elisp-site-regen
265 }