1 |
commit: 52ca23b570acf750ca99271d2308c739f809450e |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 8 09:51:45 2020 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 8 09:54:29 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52ca23b5 |
7 |
|
8 |
media-sound/lilypond: bump to 2.21.1 + 9999 sync |
9 |
|
10 |
Closes: https://bugs.gentoo.org/629686 |
11 |
Closes: https://bugs.gentoo.org/720422 |
12 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
13 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
14 |
|
15 |
media-sound/lilypond/Manifest | 1 + |
16 |
.../files/lilypond-2.21.1-fix-font-size.patch | 10 +++++ |
17 |
...lilypond-9999.ebuild => lilypond-2.21.1.ebuild} | 48 +++++++++++----------- |
18 |
media-sound/lilypond/lilypond-9999.ebuild | 48 +++++++++++----------- |
19 |
4 files changed, 61 insertions(+), 46 deletions(-) |
20 |
|
21 |
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest |
22 |
index dfbd5444746..6e142f16da3 100644 |
23 |
--- a/media-sound/lilypond/Manifest |
24 |
+++ b/media-sound/lilypond/Manifest |
25 |
@@ -1,2 +1,3 @@ |
26 |
DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 |
27 |
DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604 |
28 |
+DIST lilypond-2.21.1.tar.gz 18135688 BLAKE2B 4a797c325e254b59cb314b28a801198f398efd7a37cac448b79d8161ab7248b0c9ca45ce742b82d0aebb784a98637209c84df74304a9e8c8f744b9f5033e18d2 SHA512 596f6a09d0f9a0c39ca717a9e4e246e03679a6cf40a78491eac9bc3eccf173799c75a0baef491cae8385bf1abda53244fd731695762b6fd841396edb92d0ab75 |
29 |
|
30 |
diff --git a/media-sound/lilypond/files/lilypond-2.21.1-fix-font-size.patch b/media-sound/lilypond/files/lilypond-2.21.1-fix-font-size.patch |
31 |
new file mode 100644 |
32 |
index 00000000000..cdd49584900 |
33 |
--- /dev/null |
34 |
+++ b/media-sound/lilypond/files/lilypond-2.21.1-fix-font-size.patch |
35 |
@@ -0,0 +1,10 @@ |
36 |
+--- lilypond-2.19.49.orig/lily/pango-font.cc 2016-10-16 07:16:18.000000000 -0400 |
37 |
++++ lilypond-2.19.49.new/lily/pango-font.cc 2016-10-29 22:39:02.921622080 -0400 |
38 |
+@@ -317,7 +317,7 @@ |
39 |
+ pango_fc_font_unlock_face (fcfont); |
40 |
+ pango_glyph_string_free (pgs); |
41 |
+ pgs = 0; |
42 |
+- PangoFontDescription *descr = pango_font_describe (pa->font); |
43 |
++ PangoFontDescription *descr = pango_context_get_font_description (context_); |
44 |
+ Real size = pango_font_description_get_size (descr) |
45 |
+ / (Real (PANGO_SCALE)); |
46 |
|
47 |
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-2.21.1.ebuild |
48 |
similarity index 86% |
49 |
copy from media-sound/lilypond/lilypond-9999.ebuild |
50 |
copy to media-sound/lilypond/lilypond-2.21.1.ebuild |
51 |
index 545b867b935..216a4d45876 100644 |
52 |
--- a/media-sound/lilypond/lilypond-9999.ebuild |
53 |
+++ b/media-sound/lilypond/lilypond-2.21.1.ebuild |
54 |
@@ -2,15 +2,16 @@ |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
|
57 |
EAPI=7 |
58 |
- |
59 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
60 |
+ |
61 |
inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils |
62 |
|
63 |
if [[ "${PV}" = "9999" ]]; then |
64 |
inherit git-r3 |
65 |
EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git" |
66 |
else |
67 |
- SRC_URI="http://lilypond.org/download/sources/v$(ver_cut 1-2)/${P}.tar.gz" |
68 |
+ MAIN_VER=$(ver_cut 1-2) |
69 |
+ SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz" |
70 |
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" |
71 |
fi |
72 |
|
73 |
@@ -19,41 +20,45 @@ HOMEPAGE="http://lilypond.org/" |
74 |
|
75 |
LICENSE="GPL-3 FDL-1.3" |
76 |
SLOT="0" |
77 |
-IUSE="debug emacs profile vim-syntax" |
78 |
+IUSE="debug emacs guile2 profile vim-syntax" |
79 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
80 |
|
81 |
-RDEPEND="${PYTHON_DEPS} |
82 |
- >=app-text/ghostscript-gpl-8.15 |
83 |
- >=dev-scheme/guile-2:12[deprecated,regex] |
84 |
+BDEPEND=" |
85 |
+ >=dev-texlive/texlive-metapost-2013 |
86 |
+ || ( |
87 |
+ >=app-text/texlive-core-2013 |
88 |
+ >=dev-tex/metapost-1.803 |
89 |
+ ) |
90 |
+ >=sys-apps/texinfo-4.11 |
91 |
+ >=sys-devel/bison-2.0 |
92 |
+ sys-devel/flex |
93 |
+ virtual/pkgconfig |
94 |
+" |
95 |
+RDEPEND=">=app-text/ghostscript-gpl-8.15 |
96 |
+ >=dev-scheme/guile-1.8.2:12=[deprecated,regex] |
97 |
media-fonts/tex-gyre |
98 |
media-libs/fontconfig |
99 |
media-libs/freetype:2 |
100 |
>=x11-libs/pango-1.12.3 |
101 |
emacs? ( >=app-editors/emacs-23.1:* ) |
102 |
-" |
103 |
+ guile2? ( >=dev-scheme/guile-2:12 ) |
104 |
+ !guile2? ( |
105 |
+ >=dev-scheme/guile-1.8.2:12=[deprecated,regex] |
106 |
+ <dev-scheme/guile-2.0:12 |
107 |
+ ) |
108 |
+ ${PYTHON_DEPS}" |
109 |
DEPEND="${RDEPEND} |
110 |
app-text/t1utils |
111 |
dev-lang/perl |
112 |
dev-libs/kpathsea |
113 |
- >=dev-texlive/texlive-metapost-2013 |
114 |
- || ( |
115 |
- >=app-text/texlive-core-2013 |
116 |
- >=dev-tex/metapost-1.803 |
117 |
- ) |
118 |
- virtual/pkgconfig |
119 |
media-gfx/fontforge[png] |
120 |
- >=sys-apps/texinfo-4.11 |
121 |
- >=sys-devel/bison-2.0 |
122 |
- sys-devel/flex |
123 |
- sys-devel/gettext |
124 |
- sys-devel/make |
125 |
-" |
126 |
+ sys-devel/gettext" |
127 |
|
128 |
# Correct output data for tests isn't bundled with releases |
129 |
RESTRICT="test" |
130 |
|
131 |
PATCHES=( |
132 |
- "${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch |
133 |
+ "${FILESDIR}"/${P}-fix-font-size.patch |
134 |
) |
135 |
|
136 |
DOCS=( DEDICATION HACKING README.txt ROADMAP ) |
137 |
@@ -80,9 +85,6 @@ src_prepare() { |
138 |
# respect CFLAGS |
139 |
sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die |
140 |
|
141 |
- # respect AR |
142 |
- sed -i "s:^AR=ar:AR=$(tc-getAR):" flower/GNUmakefile || die |
143 |
- |
144 |
# remove bundled texinfo file (fixes bug #448560) |
145 |
rm tex/texinfo.tex || die |
146 |
|
147 |
|
148 |
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild |
149 |
index 545b867b935..6d4c51473a1 100644 |
150 |
--- a/media-sound/lilypond/lilypond-9999.ebuild |
151 |
+++ b/media-sound/lilypond/lilypond-9999.ebuild |
152 |
@@ -2,15 +2,16 @@ |
153 |
# Distributed under the terms of the GNU General Public License v2 |
154 |
|
155 |
EAPI=7 |
156 |
- |
157 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
158 |
+ |
159 |
inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils |
160 |
|
161 |
if [[ "${PV}" = "9999" ]]; then |
162 |
inherit git-r3 |
163 |
EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git" |
164 |
else |
165 |
- SRC_URI="http://lilypond.org/download/sources/v$(ver_cut 1-2)/${P}.tar.gz" |
166 |
+ MAIN_VER=$(ver_cut 1-2) |
167 |
+ SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz" |
168 |
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" |
169 |
fi |
170 |
|
171 |
@@ -19,41 +20,45 @@ HOMEPAGE="http://lilypond.org/" |
172 |
|
173 |
LICENSE="GPL-3 FDL-1.3" |
174 |
SLOT="0" |
175 |
-IUSE="debug emacs profile vim-syntax" |
176 |
+IUSE="debug emacs guile2 profile vim-syntax" |
177 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
178 |
|
179 |
-RDEPEND="${PYTHON_DEPS} |
180 |
- >=app-text/ghostscript-gpl-8.15 |
181 |
- >=dev-scheme/guile-2:12[deprecated,regex] |
182 |
+BDEPEND=" |
183 |
+ >=dev-texlive/texlive-metapost-2013 |
184 |
+ || ( |
185 |
+ >=app-text/texlive-core-2013 |
186 |
+ >=dev-tex/metapost-1.803 |
187 |
+ ) |
188 |
+ >=sys-apps/texinfo-4.11 |
189 |
+ >=sys-devel/bison-2.0 |
190 |
+ sys-devel/flex |
191 |
+ virtual/pkgconfig |
192 |
+" |
193 |
+RDEPEND=">=app-text/ghostscript-gpl-8.15 |
194 |
+ >=dev-scheme/guile-1.8.2:12=[deprecated,regex] |
195 |
media-fonts/tex-gyre |
196 |
media-libs/fontconfig |
197 |
media-libs/freetype:2 |
198 |
>=x11-libs/pango-1.12.3 |
199 |
emacs? ( >=app-editors/emacs-23.1:* ) |
200 |
-" |
201 |
+ guile2? ( >=dev-scheme/guile-2:12 ) |
202 |
+ !guile2? ( |
203 |
+ >=dev-scheme/guile-1.8.2:12=[deprecated,regex] |
204 |
+ <dev-scheme/guile-2.0:12 |
205 |
+ ) |
206 |
+ ${PYTHON_DEPS}" |
207 |
DEPEND="${RDEPEND} |
208 |
app-text/t1utils |
209 |
dev-lang/perl |
210 |
dev-libs/kpathsea |
211 |
- >=dev-texlive/texlive-metapost-2013 |
212 |
- || ( |
213 |
- >=app-text/texlive-core-2013 |
214 |
- >=dev-tex/metapost-1.803 |
215 |
- ) |
216 |
- virtual/pkgconfig |
217 |
media-gfx/fontforge[png] |
218 |
- >=sys-apps/texinfo-4.11 |
219 |
- >=sys-devel/bison-2.0 |
220 |
- sys-devel/flex |
221 |
- sys-devel/gettext |
222 |
- sys-devel/make |
223 |
-" |
224 |
+ sys-devel/gettext" |
225 |
|
226 |
# Correct output data for tests isn't bundled with releases |
227 |
RESTRICT="test" |
228 |
|
229 |
PATCHES=( |
230 |
- "${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch |
231 |
+ "${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch |
232 |
) |
233 |
|
234 |
DOCS=( DEDICATION HACKING README.txt ROADMAP ) |
235 |
@@ -80,9 +85,6 @@ src_prepare() { |
236 |
# respect CFLAGS |
237 |
sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die |
238 |
|
239 |
- # respect AR |
240 |
- sed -i "s:^AR=ar:AR=$(tc-getAR):" flower/GNUmakefile || die |
241 |
- |
242 |
# remove bundled texinfo file (fixes bug #448560) |
243 |
rm tex/texinfo.tex || die |