1 |
commit: 34fef534dc8545266df9665e31b6758cfa0a585c |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 5 11:22:34 2020 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 5 11:22:48 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34fef534 |
7 |
|
8 |
media-sound/lilypond: bump to 2.21.5 + updated live + doc use flag |
9 |
|
10 |
the doc use flag is for testing purposes now and to resolve |
11 |
all possible issues with building the documentation, i hope |
12 |
community can help with that |
13 |
|
14 |
Closes: https://bugs.gentoo.org/179178 |
15 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
16 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
17 |
|
18 |
media-sound/lilypond/Manifest | 1 + |
19 |
...lilypond-9999.ebuild => lilypond-2.21.5.ebuild} | 23 ++++++++++++++++------ |
20 |
media-sound/lilypond/lilypond-9999.ebuild | 23 ++++++++++++++++------ |
21 |
3 files changed, 35 insertions(+), 12 deletions(-) |
22 |
|
23 |
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest |
24 |
index 3687cff7423..e6b0880818e 100644 |
25 |
--- a/media-sound/lilypond/Manifest |
26 |
+++ b/media-sound/lilypond/Manifest |
27 |
@@ -1,2 +1,3 @@ |
28 |
DIST lilypond-2.21.1.tar.gz 18135688 BLAKE2B 4a797c325e254b59cb314b28a801198f398efd7a37cac448b79d8161ab7248b0c9ca45ce742b82d0aebb784a98637209c84df74304a9e8c8f744b9f5033e18d2 SHA512 596f6a09d0f9a0c39ca717a9e4e246e03679a6cf40a78491eac9bc3eccf173799c75a0baef491cae8385bf1abda53244fd731695762b6fd841396edb92d0ab75 |
29 |
DIST lilypond-2.21.4.tar.gz 18011766 BLAKE2B fe9731a170ec6e551bd5e2259cca33e1c69ee5dedccaf39e7026afe3342da8d301f7450450122f4e102915d4469dddb89575b3a75db21e988d526d9b683bcc38 SHA512 29d671d411cf3817e8a62f208bec4c8d74a08c3a54b8856c1474cfa736e2882c5418b52af2675598093fae2b77c2ba4c812aae9164d99c9643ff18271cee6860 |
30 |
+DIST lilypond-2.21.5.tar.gz 18005124 BLAKE2B d41f2baaeb0e72905f688bf7bd88e9acdc1eabc1bf69a05e8d5208f8ffc06197830c6b6ff1f09034eebc15fc4d94f6909848940361e06120530abc67b10aa87e SHA512 bcc72d0d040125fc9e4f7447e31af59959cae8c1afef1f6c4b7fb1fdbf037931a94d64c94b6b26e37de7d66ec52f24b2ba1b4fd0a6e0862b82eeef3c86d94958 |
31 |
|
32 |
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-2.21.5.ebuild |
33 |
similarity index 84% |
34 |
copy from media-sound/lilypond/lilypond-9999.ebuild |
35 |
copy to media-sound/lilypond/lilypond-2.21.5.ebuild |
36 |
index ffa9b40c076..c03d4b78151 100644 |
37 |
--- a/media-sound/lilypond/lilypond-9999.ebuild |
38 |
+++ b/media-sound/lilypond/lilypond-2.21.5.ebuild |
39 |
@@ -20,7 +20,9 @@ HOMEPAGE="http://lilypond.org/" |
40 |
|
41 |
LICENSE="GPL-3 FDL-1.3" |
42 |
SLOT="0" |
43 |
-IUSE="debug emacs guile2 profile vim-syntax" |
44 |
+LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh" |
45 |
+IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}" |
46 |
+unset LANG_USE |
47 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
48 |
|
49 |
BDEPEND=" |
50 |
@@ -29,6 +31,7 @@ BDEPEND=" |
51 |
>=sys-devel/bison-2.0 |
52 |
sys-devel/flex |
53 |
virtual/pkgconfig |
54 |
+ doc? ( app-text/texi2html ) |
55 |
" |
56 |
RDEPEND=">=app-text/ghostscript-gpl-8.15 |
57 |
>=dev-scheme/guile-1.8.2:12=[deprecated,regex] |
58 |
@@ -48,8 +51,14 @@ DEPEND="${RDEPEND} |
59 |
dev-lang/perl |
60 |
dev-libs/kpathsea |
61 |
media-gfx/fontforge[png,python] |
62 |
- sys-devel/gettext" |
63 |
- |
64 |
+ sys-devel/gettext |
65 |
+ doc? ( |
66 |
+ dev-texlive/texlive-langcyrillic |
67 |
+ l10n_cs? ( dev-texlive/texlive-xetex ) |
68 |
+ l10n_ja? ( dev-texlive/texlive-langjapanese ) |
69 |
+ l10n_zh? ( dev-texlive/texlive-langchinese ) |
70 |
+ ) |
71 |
+" |
72 |
# Correct output data for tests isn't bundled with releases |
73 |
RESTRICT="test" |
74 |
|
75 |
@@ -81,14 +90,12 @@ src_configure() { |
76 |
# fix hardcoded `ar` |
77 |
sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command" |
78 |
|
79 |
- # documentation generation currently not supported since it requires a newer |
80 |
- # version of texi2html than is currently in the tree |
81 |
local myeconfargs=( |
82 |
--with-texgyre-dir=/usr/share/fonts/tex-gyre |
83 |
- --disable-documentation |
84 |
--disable-optimising |
85 |
--disable-pipe |
86 |
$(use_enable debug debugging) |
87 |
+ $(use_enable doc documentation) |
88 |
$(use_enable profile profiling) |
89 |
) |
90 |
|
91 |
@@ -100,6 +107,8 @@ src_configure() { |
92 |
src_compile() { |
93 |
default |
94 |
|
95 |
+ use doc && emake LANGS="${L10N}" doc info |
96 |
+ |
97 |
if use emacs ; then |
98 |
elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \ |
99 |
|| die "elisp-compile failed" |
100 |
@@ -109,6 +118,8 @@ src_compile() { |
101 |
src_install() { |
102 |
emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install |
103 |
|
104 |
+ use doc && emake DESTDIR="${D}" install-doc |
105 |
+ |
106 |
# remove elisp files since they are in the wrong directory |
107 |
rm -r "${ED}"/usr/share/emacs || die |
108 |
|
109 |
|
110 |
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild |
111 |
index ffa9b40c076..c03d4b78151 100644 |
112 |
--- a/media-sound/lilypond/lilypond-9999.ebuild |
113 |
+++ b/media-sound/lilypond/lilypond-9999.ebuild |
114 |
@@ -20,7 +20,9 @@ HOMEPAGE="http://lilypond.org/" |
115 |
|
116 |
LICENSE="GPL-3 FDL-1.3" |
117 |
SLOT="0" |
118 |
-IUSE="debug emacs guile2 profile vim-syntax" |
119 |
+LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh" |
120 |
+IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}" |
121 |
+unset LANG_USE |
122 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
123 |
|
124 |
BDEPEND=" |
125 |
@@ -29,6 +31,7 @@ BDEPEND=" |
126 |
>=sys-devel/bison-2.0 |
127 |
sys-devel/flex |
128 |
virtual/pkgconfig |
129 |
+ doc? ( app-text/texi2html ) |
130 |
" |
131 |
RDEPEND=">=app-text/ghostscript-gpl-8.15 |
132 |
>=dev-scheme/guile-1.8.2:12=[deprecated,regex] |
133 |
@@ -48,8 +51,14 @@ DEPEND="${RDEPEND} |
134 |
dev-lang/perl |
135 |
dev-libs/kpathsea |
136 |
media-gfx/fontforge[png,python] |
137 |
- sys-devel/gettext" |
138 |
- |
139 |
+ sys-devel/gettext |
140 |
+ doc? ( |
141 |
+ dev-texlive/texlive-langcyrillic |
142 |
+ l10n_cs? ( dev-texlive/texlive-xetex ) |
143 |
+ l10n_ja? ( dev-texlive/texlive-langjapanese ) |
144 |
+ l10n_zh? ( dev-texlive/texlive-langchinese ) |
145 |
+ ) |
146 |
+" |
147 |
# Correct output data for tests isn't bundled with releases |
148 |
RESTRICT="test" |
149 |
|
150 |
@@ -81,14 +90,12 @@ src_configure() { |
151 |
# fix hardcoded `ar` |
152 |
sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command" |
153 |
|
154 |
- # documentation generation currently not supported since it requires a newer |
155 |
- # version of texi2html than is currently in the tree |
156 |
local myeconfargs=( |
157 |
--with-texgyre-dir=/usr/share/fonts/tex-gyre |
158 |
- --disable-documentation |
159 |
--disable-optimising |
160 |
--disable-pipe |
161 |
$(use_enable debug debugging) |
162 |
+ $(use_enable doc documentation) |
163 |
$(use_enable profile profiling) |
164 |
) |
165 |
|
166 |
@@ -100,6 +107,8 @@ src_configure() { |
167 |
src_compile() { |
168 |
default |
169 |
|
170 |
+ use doc && emake LANGS="${L10N}" doc info |
171 |
+ |
172 |
if use emacs ; then |
173 |
elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \ |
174 |
|| die "elisp-compile failed" |
175 |
@@ -109,6 +118,8 @@ src_compile() { |
176 |
src_install() { |
177 |
emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install |
178 |
|
179 |
+ use doc && emake DESTDIR="${D}" install-doc |
180 |
+ |
181 |
# remove elisp files since they are in the wrong directory |
182 |
rm -r "${ED}"/usr/share/emacs || die |