[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 55e92b7a6497c51403fa5b4017d79d1660eeb34b Author: Alfred Wingate protonmail com> AuthorDate: Wed Aug 28 09:15:30 2024 + Commit: Arsen Arsenović gentoo org> CommitDate: Wed Sep 18 13:06:38 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e92b7a media-sound/lilypond: update live to use new guile mechanism Signed-off-by: Alfred Wingate protonmail.com> Signed-off-by: Arsen Arsenović gentoo.org> media-sound/lilypond/lilypond-.ebuild | 25 ++--- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index ae3457cd2655..63d46dcb3e06 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -3,9 +3,11 @@ EAPI=8 +GUILE_REQ_USE="deprecated,regex" +GUILE_COMPAT=( 2-2 3-0 ) PYTHON_COMPAT=( python3_{10..13} ) -inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils +inherit elisp-common autotools guile-single python-single-r1 toolchain-funcs xdg-utils if [[ ${PV} == ** ]]; then inherit git-r3 @@ -24,7 +26,7 @@ SLOT="0" LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh" IUSE="debug doc emacs profile ${LANG_USE}" unset LANG_USE -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +REQUIRED_USE="${GUILE_REQUIRED_USE} ${PYTHON_REQUIRED_USE}" BDEPEND=" dev-texlive/texlive-metapost @@ -35,12 +37,16 @@ BDEPEND=" doc? ( app-text/texi2html ) " RDEPEND="app-text/ghostscript-gpl - >=dev-scheme/guile-3.0.7:12=[deprecated,regex] + dev-libs/boehm-gc + dev-libs/glib:2 + dev-libs/libatomic_ops media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 + media-libs/harfbuzz >=x11-libs/pango-1.40 emacs? ( >=app-editors/emacs-23.1:* ) + ${GUILE_DEPS} ${PYTHON_DEPS}" DEPEND="${RDEPEND} app-text/t1utils @@ -60,12 +66,15 @@ RESTRICT="test" DOCS=( DEDICATION README.md ROADMAP ) -# guile generates ELF files without use of C or machine code -# It's a portage's false positive. bug #677600 -QA_PREBUILT='*[.]go' +QA_PREBUILT="usr/*/${PN}/${PV}/ccache/*" + +pkg_setup() { + guile-single_pkg_setup + python-single-r1_pkg_setup +} src_prepare() { - default + guile-single_src_prepare # respect CFLAGS sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die @@ -120,6 +129,8 @@ src_install() { elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el fi + guile_unstrip_ccache + python_fix_shebang "${ED}" einstalldocs
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 2a4e1abd1b1a189a2d3d1da756545d136fba32ab Author: Sam James gentoo org> AuthorDate: Sun Aug 11 20:53:13 2024 + Commit: Sam James gentoo org> CommitDate: Sun Aug 11 20:55:06 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a4e1abd media-sound/lilypond: add 2.24.4 While here, fix minimum Pango version, and drop two patches which - after inspection because they applied with fuzz - appear obsolete. The changes remain on stable/2.24 and haven't been reverted and the files have had other changes since. No bug references or anything in the patches either... Closes: https://bugs.gentoo.org/913928 Signed-off-by: Sam James gentoo.org> media-sound/lilypond/Manifest | 1 + .../lilypond/{lilypond-.ebuild => lilypond-2.24.4.ebuild} | 11 +++ media-sound/lilypond/lilypond-.ebuild | 9 ++--- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 7d87edd6af13..ead69c5feba8 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1 +1,2 @@ DIST lilypond-2.24.3.tar.gz 19441299 BLAKE2B 6be6ca1f090869a8d545befe3d1f54122514e7dcf9aff1bcc2d78819820da8cef908c5033039eb231b48ae914c1ebd6d766566862a40721580747f017f1445ad SHA512 5153f6cbe5e68e4b3dfcc03a8299ef6b82fbfb487eb3e4f9d631b9dc5a07a972168c3f141d6d50eac936f5c7aeeacd19837c0c9ab70f11dfd5c7efe085d5b56e +DIST lilypond-2.24.4.tar.gz 19442316 BLAKE2B 12e05f4f9831b9e0eb589b970b16dfde9fe8d4a82d93990e77a8c57cc696bb851e444c65c7f050a457973f5594bfe3e1847bde4adcce82618fd6f5a926eefebb SHA512 f350d1bf6d653c3af9e0b6b12457bbc5f6f3b27d4116ef25d8809e515cef3a28f569f00845a1144f3b4dd8b2fff5265de8f5b338506db4aca2a2928d0ecca726 diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-2.24.4.ebuild similarity index 93% copy from media-sound/lilypond/lilypond-.ebuild copy to media-sound/lilypond/lilypond-2.24.4.ebuild index 3d18994e27df..bd18392af3a7 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-2.24.4.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..13} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils @@ -35,11 +35,11 @@ BDEPEND=" doc? ( app-text/texi2html ) " RDEPEND="app-text/ghostscript-gpl - >=dev-scheme/guile-3.0.7:12=[deprecated,regex] + >=dev-scheme/guile-2.2:12=[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 - x11-libs/pango + >=x11-libs/pango-1.40 emacs? ( >=app-editors/emacs-23.1:* ) ${PYTHON_DEPS}" DEPEND="${RDEPEND} @@ -58,11 +58,6 @@ DEPEND="${RDEPEND} # Correct output data for tests isn't bundled with releases RESTRICT="test" -PATCHES=( - "${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch - "${FILESDIR}"/${PN}-2.22.1-free_font.patch -) - DOCS=( DEDICATION README.md ROADMAP ) # guile generates ELF files without use of C or machine code diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 3d18994e27df..ae3457cd2655 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..13} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils @@ -39,7 +39,7 @@ RDEPEND="app-text/ghostscript-gpl media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 - x11-libs/pango + >=x11-libs/pango-1.40 emacs? ( >=app-editors/emacs-23.1:* ) ${PYTHON_DEPS}" DEPEND="${RDEPEND} @@ -58,11 +58,6 @@ DEPEND="${RDEPEND} # Correct output data for tests isn't bundled with releases RESTRICT="test" -PATCHES=( - "${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch - "${FILESDIR}"/${PN}-2.22.1-free_font.patch -) - DOCS=( DEDICATION README.md ROADMAP ) # guile generates ELF files without use of C or machine code
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: c4bc1287b46d2eb2d012107432475950a85b848d Author: Miroslav Šulc gentoo org> AuthorDate: Sun Jun 23 11:28:32 2024 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Jun 23 11:28:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4bc1287 media-sound/lilypond: updated guile version in live ebuild Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/lilypond-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 21f014259fe7..3d18994e27df 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -35,7 +35,7 @@ BDEPEND=" doc? ( app-text/texi2html ) " RDEPEND="app-text/ghostscript-gpl - >=dev-scheme/guile-2.2:12=[deprecated,regex] + >=dev-scheme/guile-3.0.7:12=[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/
commit: 7bcdc82629742c2418af8daa523b3e28d930988c Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Jun 18 17:25:25 2024 + Commit: Conrad Kostecki gentoo org> CommitDate: Sat Jun 22 18:50:40 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bcdc826 media-sound/lilypond: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> .../lilypond/files/lilypond-2.21.1-fix-font-size.patch | 10 -- .../lilypond/files/lilypond-2.22.1-fix-font-size.patch | 13 - 2 files changed, 23 deletions(-) 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 deleted file mode 100644 index cdd49584900e.. --- a/media-sound/lilypond/files/lilypond-2.21.1-fix-font-size.patch +++ /dev/null @@ -1,10 +0,0 @@ lilypond-2.19.49.orig/lily/pango-font.cc 2016-10-16 07:16:18.0 -0400 -+++ lilypond-2.19.49.new/lily/pango-font.cc2016-10-29 22:39:02.921622080 -0400 -@@ -317,7 +317,7 @@ - pango_fc_font_unlock_face (fcfont); - pango_glyph_string_free (pgs); - pgs = 0; -- PangoFontDescription *descr = pango_font_describe (pa->font); -+ PangoFontDescription *descr = pango_context_get_font_description (context_); - Real size = pango_font_description_get_size (descr) - / (Real (PANGO_SCALE)); diff --git a/media-sound/lilypond/files/lilypond-2.22.1-fix-font-size.patch b/media-sound/lilypond/files/lilypond-2.22.1-fix-font-size.patch deleted file mode 100644 index ab2bd8e59ae4.. --- a/media-sound/lilypond/files/lilypond-2.22.1-fix-font-size.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lily/pango-font.cc b/lily/pango-font.cc -index 053ce17..48bddd3 100644 a/lily/pango-font.cc -+++ b/lily/pango-font.cc -@@ -382,7 +382,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const - tail = SCM_CDRLOC (*tail); - } - -- PangoFontDescription *descr = pango_font_describe (pa->font); -+ PangoFontDescription *descr = pango_context_get_font_description (context_); - Real size = pango_font_description_get_size (descr) - / (static_cast (PANGO_SCALE)); - pango_font_description_free (descr);
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 6ca85fd7d933a377def9288a40b8c5dcb5ab4ffd Author: Miroslav Šulc gentoo org> AuthorDate: Sat Jun 8 07:29:59 2024 + Commit: Miroslav Šulc gentoo org> CommitDate: Sat Jun 8 07:30:55 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ca85fd7 media-sound/lilypond: added python 3.12 & 3.13 Closes: https://bugs.gentoo.org/929663 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/lilypond-2.24.3.ebuild | 2 +- media-sound/lilypond/lilypond-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-sound/lilypond/lilypond-2.24.3.ebuild b/media-sound/lilypond/lilypond-2.24.3.ebuild index 8acc71dc798d..4e54c94b78ae 100644 --- a/media-sound/lilypond/lilypond-2.24.3.ebuild +++ b/media-sound/lilypond/lilypond-2.24.3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..13} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index fb0d6447256b..21f014259fe7 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..13} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: f643c0960d167554d148afe55736e7e126620838 Author: Miroslav Šulc gentoo org> AuthorDate: Sat Jun 8 07:24:13 2024 + Commit: Miroslav Šulc gentoo org> CommitDate: Sat Jun 8 07:24:23 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f643c096 media-sound/lilypond: removed unused guile2 from metadata.xml Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/media-sound/lilypond/metadata.xml b/media-sound/lilypond/metadata.xml index ecc01c28acaf..9e6f97fb7f7f 100644 --- a/media-sound/lilypond/metadata.xml +++ b/media-sound/lilypond/metadata.xml @@ -8,7 +8,4 @@ LilyPond is an automated engraving system. It formats music beautifully and automatically, and has a friendly syntax for its input files. - - Enable experimental support for Guile 2 -
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: f01d2ad9f9090540380af1722c5d996c5f1bb2d8 Author: Miroslav Šulc gentoo org> AuthorDate: Sat Jun 8 07:19:57 2024 + Commit: Miroslav Šulc gentoo org> CommitDate: Sat Jun 8 07:20:30 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f01d2ad9 media-sound/lilypond: dropped old versions Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/Manifest | 5 - media-sound/lilypond/lilypond-2.22.0-r1.ebuild | 143 media-sound/lilypond/lilypond-2.22.1-r1.ebuild | 144 - media-sound/lilypond/lilypond-2.23.0-r1.ebuild | 139 media-sound/lilypond/lilypond-2.23.2-r1.ebuild | 139 media-sound/lilypond/lilypond-2.24.0.ebuild| 132 --- 6 files changed, 702 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index b6090ff8bdc6..7d87edd6af13 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,6 +1 @@ -DIST lilypond-2.22.0.tar.gz 18023031 BLAKE2B a7512629be43680c6e6bda1404c9b8e4a9bfb0b65ad565aede9dba983ae8e5fb350e8a53250cd01314b4d032d1bbe7b391bb3acd411dc6665868f4cd04f15011 SHA512 4dcc4da1bd1aa1d10ca802acbe29f2256587cd8e2643651b6d2e42cfce0b9572d0eb1139fbc59cec98ad6b86b86e7a6910becb6be7a4350ee0adfe366daa0a65 -DIST lilypond-2.22.1.tar.gz 18033161 BLAKE2B 41bd0159e8e851a3582c35285d301113e6a50c95c7b5adbe8ab1de3cc4e84a0580fe54e2166372b6640ab3d486b48d40edbcf4eacbf211d4fcb4e5d6defae2ff SHA512 dfe159928afd8592769fe9bf940b35e285465c2103707d855e82dba860e817a195c906fa9bda6fdfabce6f5adeaf49111891e14a822bf9cfb70a98312c6a9d1d -DIST lilypond-2.23.0.tar.gz 17047610 BLAKE2B 5d19a9936893a37db3ff6de269978d586012b7546fe5f3147e86966f1d521731dd2cf074c90de5b49feff6ee6f5057c90fe6485d7ae9126a8a5810b55d2dc5b2 SHA512 0138338e9e650f1d0d96504cd31d8b191307ae3fcec839162c80b8d233b27a9ff94f5b107aa2318278a874ed14e5e47747211ac4b44839d6749337f06dc12a6d -DIST lilypond-2.23.2.tar.gz 17080861 BLAKE2B e27bde3625454dc070e4aeaa8c857c5e62b3e73fd197ba014805f657210942b3d1ef03d2d75594f63e7cc1838fbcbd40e2b42d14707b6b6eeec02cdd3f346754 SHA512 f5713394d7e79dad585e21690d8ac3c057eebe77113f1f307e8e1e117bccc26bdc5370a144505ebd887e653cee114cb9efcf75ec56b9d0320bbdf79e32498269 -DIST lilypond-2.24.0.tar.gz 19430807 BLAKE2B 2915d44e0e61a5756f515d31d11d29c657d763b7d7d84701ba67cb67c8e84faad74b8743a9703c4fe64ea4ef5f7c4ff76ed9675d62bd670aa6ea81b15385d348 SHA512 fc00736ae899519408781a7f1bf83065e493a857073d6f56cdadabc5817d4f41092dad12bfe210ec8a866f454b70f87ede6c7f1ba7aedc901134913b22c1431b DIST lilypond-2.24.3.tar.gz 19441299 BLAKE2B 6be6ca1f090869a8d545befe3d1f54122514e7dcf9aff1bcc2d78819820da8cef908c5033039eb231b48ae914c1ebd6d766566862a40721580747f017f1445ad SHA512 5153f6cbe5e68e4b3dfcc03a8299ef6b82fbfb487eb3e4f9d631b9dc5a07a972168c3f141d6d50eac936f5c7aeeacd19837c0c9ab70f11dfd5c7efe085d5b56e diff --git a/media-sound/lilypond/lilypond-2.22.0-r1.ebuild b/media-sound/lilypond/lilypond-2.22.0-r1.ebuild deleted file mode 100644 index dc2e3093c83e.. --- a/media-sound/lilypond/lilypond-2.22.0-r1.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{9..10} ) - -inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils - -if [[ "${PV}" = "" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"; -else - MAIN_VER=$(ver_cut 1-2) - SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm arm64 ~hppa x86" -fi - -DESCRIPTION="GNU Music Typesetter" -HOMEPAGE="http://lilypond.org/"; - -LICENSE="GPL-3 FDL-1.3" -SLOT="0" -LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh" -IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}" -unset LANG_USE -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - dev-texlive/texlive-metapost - sys-apps/texinfo - app-alternatives/yacc - app-alternatives/lex - virtual/pkgconfig - doc? ( app-text/texi2html ) -" -RDEPEND="app-text/ghostscript-gpl - dev-scheme/guile:12=[deprecated,regex] - media-fonts/tex-gyre - media-libs/fontconfig - media-libs/freetype:2 - x11-libs/pango - emacs? ( >=app-editors/emacs-23.1:* ) - guile2? ( >=dev-scheme/guile-2.2:12 ) - !guile2? ( - dev-scheme/guile:12=[deprecated,regex] - https://bugs.gentoo.org/692010 - - econf "${myeconfargs[@]}" AR="$(tc-getAR)" -} - -src_compile() { - default - - use doc && emake LANGS="${L10N}" doc info - - if use emacs ; then - elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \ - || die "elisp-compile failed" - fi -} - -src_
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 00b5162d0bcb08a5bb8fb2bd38185859d6dbf68c Author: Sam James gentoo org> AuthorDate: Fri Jan 5 10:09:04 2024 + Commit: Sam James gentoo org> CommitDate: Fri Jan 5 10:09:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00b5162d media-sound/lilypond: Stabilize 2.24.3 x86, #921374 Signed-off-by: Sam James gentoo.org> media-sound/lilypond/lilypond-2.24.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.24.3.ebuild b/media-sound/lilypond/lilypond-2.24.3.ebuild index 2ce7ffc3d898..374b0e585c6e 100644 --- a/media-sound/lilypond/lilypond-2.24.3.ebuild +++ b/media-sound/lilypond/lilypond-2.24.3.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="https://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm arm64 ~hppa ~riscv ~x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ~riscv x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: b5d747bdf0b60eaa405397d43ab84e1bb2557e74 Author: Sam James gentoo org> AuthorDate: Fri Jan 5 08:28:17 2024 + Commit: Sam James gentoo org> CommitDate: Fri Jan 5 08:28:17 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d747bd media-sound/lilypond: Stabilize 2.24.3 amd64, #921374 Signed-off-by: Sam James gentoo.org> media-sound/lilypond/lilypond-2.24.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.24.3.ebuild b/media-sound/lilypond/lilypond-2.24.3.ebuild index 51c03745..2ce7ffc3d898 100644 --- a/media-sound/lilypond/lilypond-2.24.3.ebuild +++ b/media-sound/lilypond/lilypond-2.24.3.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="https://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm arm64 ~hppa ~riscv ~x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ~riscv ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: e00697e84faf1f5bb37ad4359a8b608bc2923d4f Author: Sam James gentoo org> AuthorDate: Fri Jan 5 08:12:43 2024 + Commit: Sam James gentoo org> CommitDate: Fri Jan 5 08:12:43 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e00697e8 media-sound/lilypond: Stabilize 2.24.3 arm64, #921374 Signed-off-by: Sam James gentoo.org> media-sound/lilypond/lilypond-2.24.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.24.3.ebuild b/media-sound/lilypond/lilypond-2.24.3.ebuild index 67c1d3818dfc..51c03745 100644 --- a/media-sound/lilypond/lilypond-2.24.3.ebuild +++ b/media-sound/lilypond/lilypond-2.24.3.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="https://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86" + KEYWORDS="~amd64 ~arm arm64 ~hppa ~riscv ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 314fcfb8edf46c826c1c94755086cf14c933e723 Author: Sam James gentoo org> AuthorDate: Wed Jan 3 08:54:12 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jan 3 08:55:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314fcfb8 media-sound/lilypond: fix minimum guile version Signed-off-by: Sam James gentoo.org> media-sound/lilypond/lilypond-2.24.0.ebuild | 4 ++-- media-sound/lilypond/lilypond-2.24.3.ebuild | 2 +- media-sound/lilypond/lilypond-.ebuild | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-sound/lilypond/lilypond-2.24.0.ebuild b/media-sound/lilypond/lilypond-2.24.0.ebuild index f703d97eea69..f5eac9e3e7ee 100644 --- a/media-sound/lilypond/lilypond-2.24.0.ebuild +++ b/media-sound/lilypond/lilypond-2.24.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,7 +35,7 @@ BDEPEND=" doc? ( app-text/texi2html ) " RDEPEND="app-text/ghostscript-gpl - dev-scheme/guile:12=[deprecated,regex] + >=dev-scheme/guile-2.2:12=[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 diff --git a/media-sound/lilypond/lilypond-2.24.3.ebuild b/media-sound/lilypond/lilypond-2.24.3.ebuild index 4a04aea78500..67c1d3818dfc 100644 --- a/media-sound/lilypond/lilypond-2.24.3.ebuild +++ b/media-sound/lilypond/lilypond-2.24.3.ebuild @@ -35,7 +35,7 @@ BDEPEND=" doc? ( app-text/texi2html ) " RDEPEND="app-text/ghostscript-gpl - dev-scheme/guile:12=[deprecated,regex] + >=dev-scheme/guile-2.2:12=[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 4a04aea78500..67c1d3818dfc 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -35,7 +35,7 @@ BDEPEND=" doc? ( app-text/texi2html ) " RDEPEND="app-text/ghostscript-gpl - dev-scheme/guile:12=[deprecated,regex] + >=dev-scheme/guile-2.2:12=[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: f2ac5e7a3786057b2f86d3611bf4586de576eb02 Author: Sam James gentoo org> AuthorDate: Wed Jan 3 08:44:35 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jan 3 08:51:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2ac5e7a media-sound/lilypond: add 2.24.3 This handles the bytecode part of bug #903777 but not the fonts yet. Bug: https://bugs.gentoo.org/903777 Closes: https://bugs.gentoo.org/825334 Closes: https://bugs.gentoo.org/903776 Closes: https://bugs.gentoo.org/920817 Signed-off-by: Sam James gentoo.org> media-sound/lilypond/Manifest | 1 + ...lilypond-.ebuild => lilypond-2.24.3.ebuild} | 25 +++--- media-sound/lilypond/lilypond-.ebuild | 25 +++--- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index edd54afc0ffa..b6090ff8bdc6 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -3,3 +3,4 @@ DIST lilypond-2.22.1.tar.gz 18033161 BLAKE2B 41bd0159e8e851a3582c35285d301113e6a DIST lilypond-2.23.0.tar.gz 17047610 BLAKE2B 5d19a9936893a37db3ff6de269978d586012b7546fe5f3147e86966f1d521731dd2cf074c90de5b49feff6ee6f5057c90fe6485d7ae9126a8a5810b55d2dc5b2 SHA512 0138338e9e650f1d0d96504cd31d8b191307ae3fcec839162c80b8d233b27a9ff94f5b107aa2318278a874ed14e5e47747211ac4b44839d6749337f06dc12a6d DIST lilypond-2.23.2.tar.gz 17080861 BLAKE2B e27bde3625454dc070e4aeaa8c857c5e62b3e73fd197ba014805f657210942b3d1ef03d2d75594f63e7cc1838fbcbd40e2b42d14707b6b6eeec02cdd3f346754 SHA512 f5713394d7e79dad585e21690d8ac3c057eebe77113f1f307e8e1e117bccc26bdc5370a144505ebd887e653cee114cb9efcf75ec56b9d0320bbdf79e32498269 DIST lilypond-2.24.0.tar.gz 19430807 BLAKE2B 2915d44e0e61a5756f515d31d11d29c657d763b7d7d84701ba67cb67c8e84faad74b8743a9703c4fe64ea4ef5f7c4ff76ed9675d62bd670aa6ea81b15385d348 SHA512 fc00736ae899519408781a7f1bf83065e493a857073d6f56cdadabc5817d4f41092dad12bfe210ec8a866f454b70f87ede6c7f1ba7aedc901134913b22c1431b +DIST lilypond-2.24.3.tar.gz 19441299 BLAKE2B 6be6ca1f090869a8d545befe3d1f54122514e7dcf9aff1bcc2d78819820da8cef908c5033039eb231b48ae914c1ebd6d766566862a40721580747f017f1445ad SHA512 5153f6cbe5e68e4b3dfcc03a8299ef6b82fbfb487eb3e4f9d631b9dc5a07a972168c3f141d6d50eac936f5c7aeeacd19837c0c9ab70f11dfd5c7efe085d5b56e diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-2.24.3.ebuild similarity index 84% copy from media-sound/lilypond/lilypond-.ebuild copy to media-sound/lilypond/lilypond-2.24.3.ebuild index 50b935febd44..4a04aea78500 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-2.24.3.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 + PYTHON_COMPAT=( python3_{9..11} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils -if [[ "${PV}" = "" ]]; then +if [[ ${PV} == ** ]]; then inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"; else MAIN_VER=$(ver_cut 1-2) - SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; + SRC_URI="https://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86" fi @@ -21,7 +22,7 @@ HOMEPAGE="http://lilypond.org/"; LICENSE="GPL-3 FDL-1.3" SLOT="0" LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh" -IUSE="debug doc emacs profile vim-syntax ${LANG_USE}" +IUSE="debug doc emacs profile ${LANG_USE}" unset LANG_USE REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -64,19 +65,16 @@ PATCHES=( DOCS=( DEDICATION README.md ROADMAP ) +# guile generates ELF files without use of C or machine code +# It's a portage's false positive. bug #677600 +QA_PREBUILT='*[.]go' + src_prepare() { default - if ! use vim-syntax ; then - sed -i 's/vim//' GNUmakefile.in || die - fi - # respect CFLAGS sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die - # remove bundled texinfo file (fixes bug #448560) - rm Documentation/tex/texinfo.tex || die - eautoreconf xdg_environment_reset #586592 @@ -102,6 +100,9 @@ src_configure() { src_compile() { default + # http://lilypond.org/doc/v2.24/Documentation/changes/index#notes-for-source-compilation-and-packagers + emake bytecode + use doc && emake LANGS="${L10N}" doc info if use emacs ; then @@ -111,7 +112,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install + emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install install-bytecode use doc && emake DESTDIR="${D}" install-doc diff --git a/media-sound/li
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: f92d992e359e14da4e2fe5672fef7555d22fb2e9 Author: Sam James gentoo org> AuthorDate: Thu Apr 20 04:02:11 2023 + Commit: Sam James gentoo org> CommitDate: Thu Apr 20 04:02:25 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f92d992e media-sound/lilypond: Stabilize 2.24.0 x86, #904572 Signed-off-by: Sam James gentoo.org> media-sound/lilypond/lilypond-2.24.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.24.0.ebuild b/media-sound/lilypond/lilypond-2.24.0.ebuild index 750f39dd42bd..f703d97eea69 100644 --- a/media-sound/lilypond/lilypond-2.24.0.ebuild +++ b/media-sound/lilypond/lilypond-2.24.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm arm64 ~hppa ~riscv ~x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ~riscv x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: a7db5ab441f8a8ebee1bd1a80c1d82ff08d15e4f Author: Sam James gentoo org> AuthorDate: Thu Apr 20 04:02:10 2023 + Commit: Sam James gentoo org> CommitDate: Thu Apr 20 04:02:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7db5ab4 media-sound/lilypond: Stabilize 2.24.0 amd64, #904572 Signed-off-by: Sam James gentoo.org> media-sound/lilypond/lilypond-2.24.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.24.0.ebuild b/media-sound/lilypond/lilypond-2.24.0.ebuild index 572a35713b01..750f39dd42bd 100644 --- a/media-sound/lilypond/lilypond-2.24.0.ebuild +++ b/media-sound/lilypond/lilypond-2.24.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm arm64 ~hppa ~riscv ~x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ~riscv ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 99a560e31a6e88a9498e9d625b2568cd264835ea Author: Arthur Zamarin gentoo org> AuthorDate: Wed Apr 19 18:08:53 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Apr 19 18:08:53 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99a560e3 media-sound/lilypond: Stabilize 2.24.0 arm64, #904572 Signed-off-by: Arthur Zamarin gentoo.org> media-sound/lilypond/lilypond-2.24.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.24.0.ebuild b/media-sound/lilypond/lilypond-2.24.0.ebuild index b230712614fa..572a35713b01 100644 --- a/media-sound/lilypond/lilypond-2.24.0.ebuild +++ b/media-sound/lilypond/lilypond-2.24.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86" + KEYWORDS="~amd64 ~arm arm64 ~hppa ~riscv ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 249ab3d50b0061d95b75d111e6ec8e9a1f324b33 Author: Maciej Barć gentoo org> AuthorDate: Tue Feb 7 20:31:17 2023 + Commit: Maciej Barć gentoo org> CommitDate: Tue Feb 7 21:49:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=249ab3d5 media-sound/lilypond: bump to 2.24.0 Closes: https://bugs.gentoo.org/893444 Signed-off-by: Maciej Barć gentoo.org> media-sound/lilypond/Manifest | 1 + media-sound/lilypond/lilypond-2.24.0.ebuild | 132 2 files changed, 133 insertions(+) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 2a71a9ca0ff4..edd54afc0ffa 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -2,3 +2,4 @@ DIST lilypond-2.22.0.tar.gz 18023031 BLAKE2B a7512629be43680c6e6bda1404c9b8e4a9b DIST lilypond-2.22.1.tar.gz 18033161 BLAKE2B 41bd0159e8e851a3582c35285d301113e6a50c95c7b5adbe8ab1de3cc4e84a0580fe54e2166372b6640ab3d486b48d40edbcf4eacbf211d4fcb4e5d6defae2ff SHA512 dfe159928afd8592769fe9bf940b35e285465c2103707d855e82dba860e817a195c906fa9bda6fdfabce6f5adeaf49111891e14a822bf9cfb70a98312c6a9d1d DIST lilypond-2.23.0.tar.gz 17047610 BLAKE2B 5d19a9936893a37db3ff6de269978d586012b7546fe5f3147e86966f1d521731dd2cf074c90de5b49feff6ee6f5057c90fe6485d7ae9126a8a5810b55d2dc5b2 SHA512 0138338e9e650f1d0d96504cd31d8b191307ae3fcec839162c80b8d233b27a9ff94f5b107aa2318278a874ed14e5e47747211ac4b44839d6749337f06dc12a6d DIST lilypond-2.23.2.tar.gz 17080861 BLAKE2B e27bde3625454dc070e4aeaa8c857c5e62b3e73fd197ba014805f657210942b3d1ef03d2d75594f63e7cc1838fbcbd40e2b42d14707b6b6eeec02cdd3f346754 SHA512 f5713394d7e79dad585e21690d8ac3c057eebe77113f1f307e8e1e117bccc26bdc5370a144505ebd887e653cee114cb9efcf75ec56b9d0320bbdf79e32498269 +DIST lilypond-2.24.0.tar.gz 19430807 BLAKE2B 2915d44e0e61a5756f515d31d11d29c657d763b7d7d84701ba67cb67c8e84faad74b8743a9703c4fe64ea4ef5f7c4ff76ed9675d62bd670aa6ea81b15385d348 SHA512 fc00736ae899519408781a7f1bf83065e493a857073d6f56cdadabc5817d4f41092dad12bfe210ec8a866f454b70f87ede6c7f1ba7aedc901134913b22c1431b diff --git a/media-sound/lilypond/lilypond-2.24.0.ebuild b/media-sound/lilypond/lilypond-2.24.0.ebuild new file mode 100644 index ..b230712614fa --- /dev/null +++ b/media-sound/lilypond/lilypond-2.24.0.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils + +if [[ ${PV} == ** ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"; +else + MAIN_VER=$(ver_cut 1-2) + SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86" +fi + +DESCRIPTION="GNU Music Typesetter" +HOMEPAGE="http://lilypond.org/"; + +LICENSE="GPL-3 FDL-1.3" +SLOT="0" +LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh" +IUSE="debug doc emacs profile ${LANG_USE}" +unset LANG_USE +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + dev-texlive/texlive-metapost + sys-apps/texinfo + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + doc? ( app-text/texi2html ) +" +RDEPEND="app-text/ghostscript-gpl + dev-scheme/guile:12=[deprecated,regex] + media-fonts/tex-gyre + media-libs/fontconfig + media-libs/freetype:2 + x11-libs/pango + emacs? ( >=app-editors/emacs-23.1:* ) + ${PYTHON_DEPS}" +DEPEND="${RDEPEND} + app-text/t1utils + dev-lang/perl + dev-libs/kpathsea + media-gfx/fontforge[png,python] + sys-devel/gettext + doc? ( + dev-texlive/texlive-langcyrillic + l10n_cs? ( dev-texlive/texlive-xetex ) + l10n_ja? ( dev-texlive/texlive-langjapanese ) + l10n_zh? ( dev-texlive/texlive-langchinese ) + ) +" +# Correct output data for tests isn't bundled with releases +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch + "${FILESDIR}"/${PN}-2.22.1-free_font.patch +) + +DOCS=( DEDICATION README.md ROADMAP ) + +src_prepare() { + default + + # respect CFLAGS + sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die + + eautoreconf + + xdg_environment_reset #586592 +} + +src_configure() { + # fix hardcoded `ar` + sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command" + + local myeconfargs=( + --disable-optimising + --disable-pipe + $(use_enable debug debugging) + $(use_enable doc documentation) + $(use_enable profile profiling) + ) + + export VARTEXFONTS="${T}/fonts" # https://bugs.gentoo.org/692010 + + econf "${myeconfarg
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 722877ea48fbd3e467a8ef066b9465689dbf91fb Author: Miroslav Šulc gentoo org> AuthorDate: Wed Nov 9 10:29:24 2022 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Nov 9 10:29:33 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=722877ea media-sound/lilypond: updated live Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/lilypond-.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 4690f0a0f45f..091fda002afa 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8..11} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils @@ -75,7 +75,7 @@ src_prepare() { sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die # remove bundled texinfo file (fixes bug #448560) - rm tex/texinfo.tex || die + rm Documentation/tex/texinfo.tex || die eautoreconf @@ -87,7 +87,6 @@ src_configure() { sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command" local myeconfargs=( - --with-texgyre-dir=/usr/share/fonts/tex-gyre --disable-optimising --disable-pipe $(use_enable debug debugging)
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 38d8f4b61eae9541bbf70064ab9173412f5568fa Author: Miroslav Šulc gentoo org> AuthorDate: Sat Jun 25 12:19:40 2022 + Commit: Miroslav Šulc gentoo org> CommitDate: Sat Jun 25 12:19:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d8f4b6 media-sound/lilypond: updated live - added python 3.11, fixed docs Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/lilypond-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 267d1a8af4de..4690f0a0f45f 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils @@ -62,7 +62,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.22.1-free_font.patch ) -DOCS=( DEDICATION HACKING README.md ROADMAP ) +DOCS=( DEDICATION README.md ROADMAP ) src_prepare() { default
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 63ca91c008ea186dc8f41273cb871750bdd0a501 Author: Maciej Barć gentoo org> AuthorDate: Thu Feb 24 01:13:30 2022 + Commit: Maciej Barć gentoo org> CommitDate: Thu Feb 24 01:23:48 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63ca91c0 media-sound/lilypond: remove python3.7 compat Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Maciej Barć gentoo.org> .../lilypond/{lilypond-2.22.0.ebuild => lilypond-2.22.0-r1.ebuild}| 4 ++-- media-sound/lilypond/lilypond-2.22.1.ebuild | 4 ++-- media-sound/lilypond/lilypond-2.23.0.ebuild | 4 ++-- media-sound/lilypond/lilypond-.ebuild | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/media-sound/lilypond/lilypond-2.22.0.ebuild b/media-sound/lilypond/lilypond-2.22.0-r1.ebuild similarity index 97% rename from media-sound/lilypond/lilypond-2.22.0.ebuild rename to media-sound/lilypond/lilypond-2.22.0-r1.ebuild index 60368b530796..1cba135cc210 100644 --- a/media-sound/lilypond/lilypond-2.22.0.ebuild +++ b/media-sound/lilypond/lilypond-2.22.0-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils diff --git a/media-sound/lilypond/lilypond-2.22.1.ebuild b/media-sound/lilypond/lilypond-2.22.1.ebuild index cf3311c16dd4..8757a650991f 100644 --- a/media-sound/lilypond/lilypond-2.22.1.ebuild +++ b/media-sound/lilypond/lilypond-2.22.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils diff --git a/media-sound/lilypond/lilypond-2.23.0.ebuild b/media-sound/lilypond/lilypond-2.23.0.ebuild index c82db90488df..71ce2205451a 100644 --- a/media-sound/lilypond/lilypond-2.23.0.ebuild +++ b/media-sound/lilypond/lilypond-2.23.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index fea5dc370d4b..ebce02eda789 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 592b8cc74b8b4c6b65f9520967f94bddd11ea791 Author: Maciej Barć gentoo org> AuthorDate: Thu Feb 24 01:23:38 2022 + Commit: Maciej Barć gentoo org> CommitDate: Thu Feb 24 01:23:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=592b8cc7 media-sound/lilypond: sync live Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Maciej Barć gentoo.org> media-sound/lilypond/lilypond-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 23bd30635ead..267d1a8af4de 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/, media-sound/lilypond/files/
commit: fcaa927cebf1bc3db1404487e3fa7757a8e1eb99 Author: Maciej Barć gentoo org> AuthorDate: Thu Feb 24 01:18:06 2022 + Commit: Maciej Barć gentoo org> CommitDate: Thu Feb 24 01:23:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcaa927c media-sound/lilypond: add free temporary font description patch Closes: https://bugs.gentoo.org/833864 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Maciej Barć gentoo.org> media-sound/lilypond/files/lilypond-2.22.1-free_font.patch | 14 ++ .../{lilypond-2.22.1.ebuild => lilypond-2.22.1-r1.ebuild} | 1 + .../{lilypond-2.23.0.ebuild => lilypond-2.23.0-r1.ebuild} | 1 + .../{lilypond-2.23.2.ebuild => lilypond-2.23.2-r1.ebuild} | 3 ++- media-sound/lilypond/lilypond-.ebuild | 1 + 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch b/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch new file mode 100644 index ..2d27291551d4 --- /dev/null +++ b/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch @@ -0,0 +1,14 @@ +Revert "Pango_font: Free temporary font description" +This reverts commit 102bed8b5a6332f2021a284bd5a937a2603fb327. +diff --git a/lily/pango-font.cc b/lily/pango-font.cc +index 053ce17143..1a63b18338 100644 +--- a/lily/pango-font.cc b/lily/pango-font.cc +@@ -385,7 +385,6 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const + PangoFontDescription *descr = pango_font_describe (pa->font); + Real size = pango_font_description_get_size (descr) + / (static_cast (PANGO_SCALE)); +- pango_font_description_free (descr); + + if (ps_name_str0.empty ()) + warning (_f ("no PostScript font name for font `%s'", file_name)); diff --git a/media-sound/lilypond/lilypond-2.22.1.ebuild b/media-sound/lilypond/lilypond-2.22.1-r1.ebuild similarity index 98% rename from media-sound/lilypond/lilypond-2.22.1.ebuild rename to media-sound/lilypond/lilypond-2.22.1-r1.ebuild index 8757a650991f..48e98a5be8f0 100644 --- a/media-sound/lilypond/lilypond-2.22.1.ebuild +++ b/media-sound/lilypond/lilypond-2.22.1-r1.ebuild @@ -64,6 +64,7 @@ RESTRICT="test" PATCHES=( "${FILESDIR}"/${P}-fix-font-size.patch + "${FILESDIR}"/${P}-free_font.patch ) DOCS=( DEDICATION HACKING README.md ROADMAP ) diff --git a/media-sound/lilypond/lilypond-2.23.0.ebuild b/media-sound/lilypond/lilypond-2.23.0-r1.ebuild similarity index 98% rename from media-sound/lilypond/lilypond-2.23.0.ebuild rename to media-sound/lilypond/lilypond-2.23.0-r1.ebuild index 71ce2205451a..e20ef84346b3 100644 --- a/media-sound/lilypond/lilypond-2.23.0.ebuild +++ b/media-sound/lilypond/lilypond-2.23.0-r1.ebuild @@ -59,6 +59,7 @@ RESTRICT="test" PATCHES=( "${FILESDIR}"/${P}-fix-font-size.patch + "${FILESDIR}"/${PN}-2.22.1-free_font.patch ) DOCS=( DEDICATION HACKING README.md ROADMAP ) diff --git a/media-sound/lilypond/lilypond-2.23.2.ebuild b/media-sound/lilypond/lilypond-2.23.2-r1.ebuild similarity index 97% rename from media-sound/lilypond/lilypond-2.23.2.ebuild rename to media-sound/lilypond/lilypond-2.23.2-r1.ebuild index adb492fe79e4..267d1a8af4de 100644 --- a/media-sound/lilypond/lilypond-2.23.2.ebuild +++ b/media-sound/lilypond/lilypond-2.23.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -59,6 +59,7 @@ RESTRICT="test" PATCHES=( "${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch + "${FILESDIR}"/${PN}-2.22.1-free_font.patch ) DOCS=( DEDICATION HACKING README.md ROADMAP ) diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index ebce02eda789..23bd30635ead 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -59,6 +59,7 @@ RESTRICT="test" PATCHES=( "${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch + "${FILESDIR}"/${PN}-2.22.1-free_font.patch ) DOCS=( DEDICATION HACKING README.md ROADMAP )
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 13293d2a3201b351f7a506f4a404ea7ab1ddcd5e Author: Marek Szuba gentoo org> AuthorDate: Mon Jul 26 22:32:57 2021 + Commit: Marek Szuba gentoo org> CommitDate: Mon Jul 26 23:19:59 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13293d2a media-sound/lilypond: keyword 2.23.2 for ~riscv Signed-off-by: Marek Szuba gentoo.org> media-sound/lilypond/lilypond-2.23.2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-sound/lilypond/lilypond-2.23.2.ebuild b/media-sound/lilypond/lilypond-2.23.2.ebuild index fea5dc370d4..adb492fe79e 100644 --- a/media-sound/lilypond/lilypond-2.23.2.ebuild +++ b/media-sound/lilypond/lilypond-2.23.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/, media-sound/lilypond/files/
commit: 532fd8eb6e25bb2cffb263a2a5fb47d176373c5d Author: Miroslav Šulc gentoo org> AuthorDate: Wed May 26 10:24:17 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed May 26 10:24:28 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=532fd8eb media-sound/lilypond: bump to 2.22.1 & 2.23.2 + py3_10 Closes: https://bugs.gentoo.org/792036 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/Manifest | 2 ++ .../lilypond/files/lilypond-2.22.1-fix-font-size.patch | 13 + media-sound/lilypond/lilypond-2.22.0.ebuild | 2 +- .../{lilypond-2.22.0.ebuild => lilypond-2.22.1.ebuild} | 6 +++--- media-sound/lilypond/lilypond-2.23.0.ebuild | 2 +- .../{lilypond-.ebuild => lilypond-2.23.2.ebuild}| 2 +- media-sound/lilypond/lilypond-.ebuild | 2 +- 7 files changed, 22 insertions(+), 7 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 2e1f1538edc..2a71a9ca0ff 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,2 +1,4 @@ DIST lilypond-2.22.0.tar.gz 18023031 BLAKE2B a7512629be43680c6e6bda1404c9b8e4a9bfb0b65ad565aede9dba983ae8e5fb350e8a53250cd01314b4d032d1bbe7b391bb3acd411dc6665868f4cd04f15011 SHA512 4dcc4da1bd1aa1d10ca802acbe29f2256587cd8e2643651b6d2e42cfce0b9572d0eb1139fbc59cec98ad6b86b86e7a6910becb6be7a4350ee0adfe366daa0a65 +DIST lilypond-2.22.1.tar.gz 18033161 BLAKE2B 41bd0159e8e851a3582c35285d301113e6a50c95c7b5adbe8ab1de3cc4e84a0580fe54e2166372b6640ab3d486b48d40edbcf4eacbf211d4fcb4e5d6defae2ff SHA512 dfe159928afd8592769fe9bf940b35e285465c2103707d855e82dba860e817a195c906fa9bda6fdfabce6f5adeaf49111891e14a822bf9cfb70a98312c6a9d1d DIST lilypond-2.23.0.tar.gz 17047610 BLAKE2B 5d19a9936893a37db3ff6de269978d586012b7546fe5f3147e86966f1d521731dd2cf074c90de5b49feff6ee6f5057c90fe6485d7ae9126a8a5810b55d2dc5b2 SHA512 0138338e9e650f1d0d96504cd31d8b191307ae3fcec839162c80b8d233b27a9ff94f5b107aa2318278a874ed14e5e47747211ac4b44839d6749337f06dc12a6d +DIST lilypond-2.23.2.tar.gz 17080861 BLAKE2B e27bde3625454dc070e4aeaa8c857c5e62b3e73fd197ba014805f657210942b3d1ef03d2d75594f63e7cc1838fbcbd40e2b42d14707b6b6eeec02cdd3f346754 SHA512 f5713394d7e79dad585e21690d8ac3c057eebe77113f1f307e8e1e117bccc26bdc5370a144505ebd887e653cee114cb9efcf75ec56b9d0320bbdf79e32498269 diff --git a/media-sound/lilypond/files/lilypond-2.22.1-fix-font-size.patch b/media-sound/lilypond/files/lilypond-2.22.1-fix-font-size.patch new file mode 100644 index 000..ab2bd8e59ae --- /dev/null +++ b/media-sound/lilypond/files/lilypond-2.22.1-fix-font-size.patch @@ -0,0 +1,13 @@ +diff --git a/lily/pango-font.cc b/lily/pango-font.cc +index 053ce17..48bddd3 100644 +--- a/lily/pango-font.cc b/lily/pango-font.cc +@@ -382,7 +382,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const + tail = SCM_CDRLOC (*tail); + } + +- PangoFontDescription *descr = pango_font_describe (pa->font); ++ PangoFontDescription *descr = pango_context_get_font_description (context_); + Real size = pango_font_description_get_size (descr) + / (static_cast (PANGO_SCALE)); + pango_font_description_free (descr); diff --git a/media-sound/lilypond/lilypond-2.22.0.ebuild b/media-sound/lilypond/lilypond-2.22.0.ebuild index 4b0263ccad9..60368b53079 100644 --- a/media-sound/lilypond/lilypond-2.22.0.ebuild +++ b/media-sound/lilypond/lilypond-2.22.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils diff --git a/media-sound/lilypond/lilypond-2.22.0.ebuild b/media-sound/lilypond/lilypond-2.22.1.ebuild similarity index 96% copy from media-sound/lilypond/lilypond-2.22.0.ebuild copy to media-sound/lilypond/lilypond-2.22.1.ebuild index 4b0263ccad9..cf3311c16dd 100644 --- a/media-sound/lilypond/lilypond-2.22.0.ebuild +++ b/media-sound/lilypond/lilypond-2.22.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm arm64 ~hppa x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter" @@ -63,7 +63,7 @@ DEPEND="${RDEPEND} RESTRICT="test" PATCHES=( - "${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch + "${FILESDIR}"/${P}-fix-font-size.patch ) DOCS=( DEDICATION HACKING README.md ROADMAP ) diff --git a/med
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 07c7aa4b403c6ee9ef796aef10791ec114f8b530 Author: Miroslav Šulc gentoo org> AuthorDate: Mon Feb 15 08:25:19 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Feb 15 08:25:19 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07c7aa4b media-sound/lilypond: removed obsolete 2.21.6 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/Manifest | 1 - media-sound/lilypond/lilypond-2.21.6.ebuild | 143 2 files changed, 144 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index d258c9aa11c..2e1f1538edc 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,3 +1,2 @@ -DIST lilypond-2.21.6.tar.gz 17996701 BLAKE2B 2efbdae1bd16ab1682c14c1c0e01146d66dd408ff5d3f9b69ed38dcedd88b68c6ae3219b02e7a3967833d802488a90aecf50964f44ebb5445f887d4a532a41ad SHA512 9effceabe39a0ca5f3837e0ff1cb0d4caed87b4b76e40f7c4f618d682b2e3db8f82e461e5c9555d6c05d591be54a08370599ed8c72d1e92ba80bcabf4d21a6f7 DIST lilypond-2.22.0.tar.gz 18023031 BLAKE2B a7512629be43680c6e6bda1404c9b8e4a9bfb0b65ad565aede9dba983ae8e5fb350e8a53250cd01314b4d032d1bbe7b391bb3acd411dc6665868f4cd04f15011 SHA512 4dcc4da1bd1aa1d10ca802acbe29f2256587cd8e2643651b6d2e42cfce0b9572d0eb1139fbc59cec98ad6b86b86e7a6910becb6be7a4350ee0adfe366daa0a65 DIST lilypond-2.23.0.tar.gz 17047610 BLAKE2B 5d19a9936893a37db3ff6de269978d586012b7546fe5f3147e86966f1d521731dd2cf074c90de5b49feff6ee6f5057c90fe6485d7ae9126a8a5810b55d2dc5b2 SHA512 0138338e9e650f1d0d96504cd31d8b191307ae3fcec839162c80b8d233b27a9ff94f5b107aa2318278a874ed14e5e47747211ac4b44839d6749337f06dc12a6d diff --git a/media-sound/lilypond/lilypond-2.21.6.ebuild b/media-sound/lilypond/lilypond-2.21.6.ebuild deleted file mode 100644 index 4b0263ccad9..000 --- a/media-sound/lilypond/lilypond-2.21.6.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils - -if [[ "${PV}" = "" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"; -else - MAIN_VER=$(ver_cut 1-2) - SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm arm64 ~hppa x86" -fi - -DESCRIPTION="GNU Music Typesetter" -HOMEPAGE="http://lilypond.org/"; - -LICENSE="GPL-3 FDL-1.3" -SLOT="0" -LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh" -IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}" -unset LANG_USE -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - dev-texlive/texlive-metapost - sys-apps/texinfo - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - doc? ( app-text/texi2html ) -" -RDEPEND="app-text/ghostscript-gpl - dev-scheme/guile:12=[deprecated,regex] - media-fonts/tex-gyre - media-libs/fontconfig - media-libs/freetype:2 - x11-libs/pango - emacs? ( >=app-editors/emacs-23.1:* ) - guile2? ( >=dev-scheme/guile-2.2:12 ) - !guile2? ( - dev-scheme/guile:12=[deprecated,regex] - https://bugs.gentoo.org/692010 - - econf "${myeconfargs[@]}" AR="$(tc-getAR)" -} - -src_compile() { - default - - use doc && emake LANGS="${L10N}" doc info - - if use emacs ; then - elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \ - || die "elisp-compile failed" - fi -} - -src_install() { - emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install - - use doc && emake DESTDIR="${D}" install-doc - - # remove elisp files since they are in the wrong directory - rm -r "${ED}"/usr/share/emacs || die - - if use emacs ; then - elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \ - || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el - fi - - python_fix_shebang "${ED}" - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -}
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 75cf7645b8d5d0fa38bf5d8ece87af81c5926db3 Author: Sam James gentoo org> AuthorDate: Sun Feb 14 14:53:22 2021 + Commit: Sam James gentoo org> CommitDate: Sun Feb 14 14:53:22 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75cf7645 media-sound/lilypond: Stabilize 2.22.0 arm64, #770199 Signed-off-by: Sam James gentoo.org> media-sound/lilypond/lilypond-2.22.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.22.0.ebuild b/media-sound/lilypond/lilypond-2.22.0.ebuild index 5214b122e90..4b0263ccad9 100644 --- a/media-sound/lilypond/lilypond-2.22.0.ebuild +++ b/media-sound/lilypond/lilypond-2.22.0.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm ~arm64 ~hppa x86" + KEYWORDS="amd64 ~arm arm64 ~hppa x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 9081beff2c21c9873abb014ede2cf9c6ec4d5d56 Author: Sam James gentoo org> AuthorDate: Fri Feb 12 14:14:57 2021 + Commit: Sam James gentoo org> CommitDate: Fri Feb 12 14:14:57 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9081beff media-sound/lilypond: Stabilize 2.22.0 amd64, #770199 Signed-off-by: Sam James gentoo.org> media-sound/lilypond/lilypond-2.22.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.22.0.ebuild b/media-sound/lilypond/lilypond-2.22.0.ebuild index ac3767ae3c8..5214b122e90 100644 --- a/media-sound/lilypond/lilypond-2.22.0.ebuild +++ b/media-sound/lilypond/lilypond-2.22.0.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa x86" + KEYWORDS="amd64 ~arm ~arm64 ~hppa x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: dcf313f761d4927fc8ae670be015468a0ba3a657 Author: Sam James gentoo org> AuthorDate: Fri Feb 12 13:55:30 2021 + Commit: Sam James gentoo org> CommitDate: Fri Feb 12 13:55:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf313f7 media-sound/lilypond: Stabilize 2.22.0 x86, #770199 Signed-off-by: Sam James gentoo.org> media-sound/lilypond/lilypond-2.22.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.22.0.ebuild b/media-sound/lilypond/lilypond-2.22.0.ebuild index e6944858aba..ac3767ae3c8 100644 --- a/media-sound/lilypond/lilypond-2.22.0.ebuild +++ b/media-sound/lilypond/lilypond-2.22.0.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/, media-sound/lilypond/files/
commit: 9c086e4b01610c65f79929cb03c817653d92617e Author: Miroslav Šulc gentoo org> AuthorDate: Fri Feb 12 11:02:56 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Feb 12 11:02:56 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c086e4b media-sound/lilypond: +2.23.0, dropped guile2 use flag, updated live Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/Manifest| 1 + ...9-fix-font-size.patch => lilypond-2.23.0-fix-font-size.patch} | 0 .../lilypond/{lilypond-.ebuild => lilypond-2.23.0.ebuild}| 7 +-- media-sound/lilypond/lilypond-.ebuild| 9 ++--- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 86c44eb63be..d258c9aa11c 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,2 +1,3 @@ DIST lilypond-2.21.6.tar.gz 17996701 BLAKE2B 2efbdae1bd16ab1682c14c1c0e01146d66dd408ff5d3f9b69ed38dcedd88b68c6ae3219b02e7a3967833d802488a90aecf50964f44ebb5445f887d4a532a41ad SHA512 9effceabe39a0ca5f3837e0ff1cb0d4caed87b4b76e40f7c4f618d682b2e3db8f82e461e5c9555d6c05d591be54a08370599ed8c72d1e92ba80bcabf4d21a6f7 DIST lilypond-2.22.0.tar.gz 18023031 BLAKE2B a7512629be43680c6e6bda1404c9b8e4a9bfb0b65ad565aede9dba983ae8e5fb350e8a53250cd01314b4d032d1bbe7b391bb3acd411dc6665868f4cd04f15011 SHA512 4dcc4da1bd1aa1d10ca802acbe29f2256587cd8e2643651b6d2e42cfce0b9572d0eb1139fbc59cec98ad6b86b86e7a6910becb6be7a4350ee0adfe366daa0a65 +DIST lilypond-2.23.0.tar.gz 17047610 BLAKE2B 5d19a9936893a37db3ff6de269978d586012b7546fe5f3147e86966f1d521731dd2cf074c90de5b49feff6ee6f5057c90fe6485d7ae9126a8a5810b55d2dc5b2 SHA512 0138338e9e650f1d0d96504cd31d8b191307ae3fcec839162c80b8d233b27a9ff94f5b107aa2318278a874ed14e5e47747211ac4b44839d6749337f06dc12a6d diff --git a/media-sound/lilypond/files/lilypond--fix-font-size.patch b/media-sound/lilypond/files/lilypond-2.23.0-fix-font-size.patch similarity index 100% rename from media-sound/lilypond/files/lilypond--fix-font-size.patch rename to media-sound/lilypond/files/lilypond-2.23.0-fix-font-size.patch diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-2.23.0.ebuild similarity index 94% copy from media-sound/lilypond/lilypond-.ebuild copy to media-sound/lilypond/lilypond-2.23.0.ebuild index 4b7150162b1..de2a548eb65 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-2.23.0.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="http://lilypond.org/"; LICENSE="GPL-3 FDL-1.3" SLOT="0" LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh" -IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}" +IUSE="debug doc emacs profile vim-syntax ${LANG_USE}" unset LANG_USE REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -40,11 +40,6 @@ RDEPEND="app-text/ghostscript-gpl media-libs/freetype:2 x11-libs/pango emacs? ( >=app-editors/emacs-23.1:* ) - guile2? ( >=dev-scheme/guile-2.2:12 ) - !guile2? ( - dev-scheme/guile:12=[deprecated,regex] - http://lilypond.org/"; LICENSE="GPL-3 FDL-1.3" SLOT="0" LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh" -IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}" +IUSE="debug doc emacs profile vim-syntax ${LANG_USE}" unset LANG_USE REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -40,11 +40,6 @@ RDEPEND="app-text/ghostscript-gpl media-libs/freetype:2 x11-libs/pango emacs? ( >=app-editors/emacs-23.1:* ) - guile2? ( >=dev-scheme/guile-2.2:12 ) - !guile2? ( - dev-scheme/guile:12=[deprecated,regex] -
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 8f909a43745e30e21af7ac4dc2583f27a25627be Author: Miroslav Šulc gentoo org> AuthorDate: Thu Jan 14 10:46:18 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Jan 14 10:46:18 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f909a43 media-sound/lilypond: removed obsolete 2.21.5 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/Manifest | 1 - media-sound/lilypond/lilypond-2.21.5.ebuild | 143 2 files changed, 144 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index df1a204aff0..86c44eb63be 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,3 +1,2 @@ -DIST lilypond-2.21.5.tar.gz 18005124 BLAKE2B d41f2baaeb0e72905f688bf7bd88e9acdc1eabc1bf69a05e8d5208f8ffc06197830c6b6ff1f09034eebc15fc4d94f6909848940361e06120530abc67b10aa87e SHA512 bcc72d0d040125fc9e4f7447e31af59959cae8c1afef1f6c4b7fb1fdbf037931a94d64c94b6b26e37de7d66ec52f24b2ba1b4fd0a6e0862b82eeef3c86d94958 DIST lilypond-2.21.6.tar.gz 17996701 BLAKE2B 2efbdae1bd16ab1682c14c1c0e01146d66dd408ff5d3f9b69ed38dcedd88b68c6ae3219b02e7a3967833d802488a90aecf50964f44ebb5445f887d4a532a41ad SHA512 9effceabe39a0ca5f3837e0ff1cb0d4caed87b4b76e40f7c4f618d682b2e3db8f82e461e5c9555d6c05d591be54a08370599ed8c72d1e92ba80bcabf4d21a6f7 DIST lilypond-2.22.0.tar.gz 18023031 BLAKE2B a7512629be43680c6e6bda1404c9b8e4a9bfb0b65ad565aede9dba983ae8e5fb350e8a53250cd01314b4d032d1bbe7b391bb3acd411dc6665868f4cd04f15011 SHA512 4dcc4da1bd1aa1d10ca802acbe29f2256587cd8e2643651b6d2e42cfce0b9572d0eb1139fbc59cec98ad6b86b86e7a6910becb6be7a4350ee0adfe366daa0a65 diff --git a/media-sound/lilypond/lilypond-2.21.5.ebuild b/media-sound/lilypond/lilypond-2.21.5.ebuild deleted file mode 100644 index a213efeabbd..000 --- a/media-sound/lilypond/lilypond-2.21.5.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9} ) - -inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils - -if [[ "${PV}" = "" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"; -else - MAIN_VER=$(ver_cut 1-2) - SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm arm64 ~hppa x86" -fi - -DESCRIPTION="GNU Music Typesetter" -HOMEPAGE="http://lilypond.org/"; - -LICENSE="GPL-3 FDL-1.3" -SLOT="0" -LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh" -IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}" -unset LANG_USE -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - >=dev-texlive/texlive-metapost-2020 - >=sys-apps/texinfo-4.11 - >=sys-devel/bison-2.0 - sys-devel/flex - virtual/pkgconfig - doc? ( app-text/texi2html ) -" -RDEPEND=">=app-text/ghostscript-gpl-8.15 - >=dev-scheme/guile-1.8.2:12=[deprecated,regex] - media-fonts/tex-gyre - media-libs/fontconfig - media-libs/freetype:2 - >=x11-libs/pango-1.12.3 - emacs? ( >=app-editors/emacs-23.1:* ) - guile2? ( >=dev-scheme/guile-2.2:12 ) - !guile2? ( - >=dev-scheme/guile-1.8.2:12=[deprecated,regex] - https://bugs.gentoo.org/692010 - - econf "${myeconfargs[@]}" AR="$(tc-getAR)" -} - -src_compile() { - default - - use doc && emake LANGS="${L10N}" doc info - - if use emacs ; then - elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \ - || die "elisp-compile failed" - fi -} - -src_install() { - emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install - - use doc && emake DESTDIR="${D}" install-doc - - # remove elisp files since they are in the wrong directory - rm -r "${ED}"/usr/share/emacs || die - - if use emacs ; then - elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \ - || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el - fi - - python_fix_shebang "${ED}" - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -}
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: cf4c26706f10dfd745cc01b8adc30f79388fa55d Author: Sam James gentoo org> AuthorDate: Wed Jan 13 09:18:04 2021 + Commit: Sam James gentoo org> CommitDate: Wed Jan 13 09:18:04 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf4c2670 media-sound/lilypond: Stabilize 2.21.6 x86, #765097 Signed-off-by: Sam James gentoo.org> media-sound/lilypond/lilypond-2.21.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.21.6.ebuild b/media-sound/lilypond/lilypond-2.21.6.ebuild index 59e13bddfff..1206511028a 100644 --- a/media-sound/lilypond/lilypond-2.21.6.ebuild +++ b/media-sound/lilypond/lilypond-2.21.6.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm arm64 ~hppa ~x86" + KEYWORDS="amd64 ~arm arm64 ~hppa x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 245fee68f89196bf2f124b9ef744d2bec9050cea Author: Sam James gentoo org> AuthorDate: Wed Jan 13 09:17:05 2021 + Commit: Sam James gentoo org> CommitDate: Wed Jan 13 09:17:05 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=245fee68 media-sound/lilypond: Stabilize 2.21.6 amd64, #765097 Signed-off-by: Sam James gentoo.org> media-sound/lilypond/lilypond-2.21.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.21.6.ebuild b/media-sound/lilypond/lilypond-2.21.6.ebuild index 69c17a1749d..59e13bddfff 100644 --- a/media-sound/lilypond/lilypond-2.21.6.ebuild +++ b/media-sound/lilypond/lilypond-2.21.6.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm arm64 ~hppa ~x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 3483683e458ac2eeedc23ff7815e38b5bfddcec9 Author: Sam James gentoo org> AuthorDate: Tue Jan 12 22:37:19 2021 + Commit: Sam James gentoo org> CommitDate: Tue Jan 12 22:37:19 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3483683e media-sound/lilypond: Stabilize 2.21.6 arm64, #765097 Signed-off-by: Sam James gentoo.org> media-sound/lilypond/lilypond-2.21.6.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-sound/lilypond/lilypond-2.21.6.ebuild b/media-sound/lilypond/lilypond-2.21.6.ebuild index 89cf464d7f8..69c17a1749d 100644 --- a/media-sound/lilypond/lilypond-2.21.6.ebuild +++ b/media-sound/lilypond/lilypond-2.21.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" + KEYWORDS="~amd64 ~arm arm64 ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: d175345b65676afd99a40ec7e275940d6582bc46 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Jan 12 12:49:56 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Tue Jan 12 12:50:14 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d175345b media-sound/lilypond: bump to 2.22.0 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/Manifest | 1 + media-sound/lilypond/lilypond-2.22.0.ebuild | 143 2 files changed, 144 insertions(+) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 98bef22425b..df1a204aff0 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,2 +1,3 @@ DIST lilypond-2.21.5.tar.gz 18005124 BLAKE2B d41f2baaeb0e72905f688bf7bd88e9acdc1eabc1bf69a05e8d5208f8ffc06197830c6b6ff1f09034eebc15fc4d94f6909848940361e06120530abc67b10aa87e SHA512 bcc72d0d040125fc9e4f7447e31af59959cae8c1afef1f6c4b7fb1fdbf037931a94d64c94b6b26e37de7d66ec52f24b2ba1b4fd0a6e0862b82eeef3c86d94958 DIST lilypond-2.21.6.tar.gz 17996701 BLAKE2B 2efbdae1bd16ab1682c14c1c0e01146d66dd408ff5d3f9b69ed38dcedd88b68c6ae3219b02e7a3967833d802488a90aecf50964f44ebb5445f887d4a532a41ad SHA512 9effceabe39a0ca5f3837e0ff1cb0d4caed87b4b76e40f7c4f618d682b2e3db8f82e461e5c9555d6c05d591be54a08370599ed8c72d1e92ba80bcabf4d21a6f7 +DIST lilypond-2.22.0.tar.gz 18023031 BLAKE2B a7512629be43680c6e6bda1404c9b8e4a9bfb0b65ad565aede9dba983ae8e5fb350e8a53250cd01314b4d032d1bbe7b391bb3acd411dc6665868f4cd04f15011 SHA512 4dcc4da1bd1aa1d10ca802acbe29f2256587cd8e2643651b6d2e42cfce0b9572d0eb1139fbc59cec98ad6b86b86e7a6910becb6be7a4350ee0adfe366daa0a65 diff --git a/media-sound/lilypond/lilypond-2.22.0.ebuild b/media-sound/lilypond/lilypond-2.22.0.ebuild new file mode 100644 index 000..99720d1e704 --- /dev/null +++ b/media-sound/lilypond/lilypond-2.22.0.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils + +if [[ "${PV}" = "" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"; +else + MAIN_VER=$(ver_cut 1-2) + SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" +fi + +DESCRIPTION="GNU Music Typesetter" +HOMEPAGE="http://lilypond.org/"; + +LICENSE="GPL-3 FDL-1.3" +SLOT="0" +LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh" +IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}" +unset LANG_USE +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + dev-texlive/texlive-metapost + sys-apps/texinfo + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + doc? ( app-text/texi2html ) +" +RDEPEND="app-text/ghostscript-gpl + dev-scheme/guile:12=[deprecated,regex] + media-fonts/tex-gyre + media-libs/fontconfig + media-libs/freetype:2 + x11-libs/pango + emacs? ( >=app-editors/emacs-23.1:* ) + guile2? ( >=dev-scheme/guile-2.2:12 ) + !guile2? ( + dev-scheme/guile:12=[deprecated,regex] + https://bugs.gentoo.org/692010 + + econf "${myeconfargs[@]}" AR="$(tc-getAR)" +} + +src_compile() { + default + + use doc && emake LANGS="${L10N}" doc info + + if use emacs ; then + elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \ + || die "elisp-compile failed" + fi +} + +src_install() { + emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install + + use doc && emake DESTDIR="${D}" install-doc + + # remove elisp files since they are in the wrong directory + rm -r "${ED}"/usr/share/emacs || die + + if use emacs ; then + elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \ + || die "elisp-install failed" + elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el + fi + + python_fix_shebang "${ED}" + + einstalldocs +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +}
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/
commit: d563795787d06818ae1f686d3849f20b61a330ac Author: Miroslav Šulc gentoo org> AuthorDate: Tue Jan 12 12:43:19 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Tue Jan 12 12:43:37 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5637957 media-sound/lilypond: updated patch for live Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Miroslav Šulc gentoo.org> .../lilypond/files/lilypond--fix-font-size.patch| 13 + media-sound/lilypond/lilypond-.ebuild | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/media-sound/lilypond/files/lilypond--fix-font-size.patch b/media-sound/lilypond/files/lilypond--fix-font-size.patch new file mode 100644 index 000..45a3ad5e22c --- /dev/null +++ b/media-sound/lilypond/files/lilypond--fix-font-size.patch @@ -0,0 +1,13 @@ +diff --git a/lily/pango-font.cc b/lily/pango-font.cc +index 053ce17143..0c171bc44e 100644 +--- a/lily/pango-font.cc b/lily/pango-font.cc +@@ -382,7 +382,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const + tail = SCM_CDRLOC (*tail); + } + +- PangoFontDescription *descr = pango_font_describe (pa->font); ++ PangoFontDescription *descr = pango_context_get_font_description (context_); + Real size = pango_font_description_get_size (descr) + / (static_cast (PANGO_SCALE)); + pango_font_description_free (descr); diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 89cf464d7f8..03ab64de7f8 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -63,7 +63,7 @@ DEPEND="${RDEPEND} RESTRICT="test" PATCHES=( - "${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch + "${FILESDIR}"/${P}-fix-font-size.patch ) DOCS=( DEDICATION HACKING README.md ROADMAP )
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/
commit: 9511e4df4940f2de5cf59540b096d20cbaa98369 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Oct 7 08:18:39 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Oct 7 08:18:39 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9511e4df media-sound/lilypond: removed obsolete 2.21.4-r1 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/Manifest | 1 - .../files/lilypond-fix-cve-2020-17353.patch| 101 media-sound/lilypond/lilypond-2.21.4-r1.ebuild | 133 - 3 files changed, 235 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index b5615aa667c..98bef22425b 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,3 +1,2 @@ -DIST lilypond-2.21.4.tar.gz 18011766 BLAKE2B fe9731a170ec6e551bd5e2259cca33e1c69ee5dedccaf39e7026afe3342da8d301f7450450122f4e102915d4469dddb89575b3a75db21e988d526d9b683bcc38 SHA512 29d671d411cf3817e8a62f208bec4c8d74a08c3a54b8856c1474cfa736e2882c5418b52af2675598093fae2b77c2ba4c812aae9164d99c9643ff18271cee6860 DIST lilypond-2.21.5.tar.gz 18005124 BLAKE2B d41f2baaeb0e72905f688bf7bd88e9acdc1eabc1bf69a05e8d5208f8ffc06197830c6b6ff1f09034eebc15fc4d94f6909848940361e06120530abc67b10aa87e SHA512 bcc72d0d040125fc9e4f7447e31af59959cae8c1afef1f6c4b7fb1fdbf037931a94d64c94b6b26e37de7d66ec52f24b2ba1b4fd0a6e0862b82eeef3c86d94958 DIST lilypond-2.21.6.tar.gz 17996701 BLAKE2B 2efbdae1bd16ab1682c14c1c0e01146d66dd408ff5d3f9b69ed38dcedd88b68c6ae3219b02e7a3967833d802488a90aecf50964f44ebb5445f887d4a532a41ad SHA512 9effceabe39a0ca5f3837e0ff1cb0d4caed87b4b76e40f7c4f618d682b2e3db8f82e461e5c9555d6c05d591be54a08370599ed8c72d1e92ba80bcabf4d21a6f7 diff --git a/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch b/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch deleted file mode 100644 index e91947eae05..000 --- a/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch +++ /dev/null @@ -1,101 +0,0 @@ -From b84ea4740f3279516905c5db05f4074e777c16ff Mon Sep 17 00:00:00 2001 -From: Han-Wen Nienhuys -Date: Tue, 21 Jul 2020 14:45:08 +0200 -Subject: [PATCH] scm: disable embedded-ps and embedded-svg in -dsafe mode - -This prevents executing privileged PostScript and exploiting -Ghostscript vulnerablilities - -Tested: - $ lilypond -dsafe input/regression/les-nereides.ly - (works, kinda) - - $ cat f.ly - { c4_ \markup \postscript #" (x) show " } - - $ lilypond -dsafe f - Preprocessing graphical objects.../home/hanwen/vc/lilypond/out/share/lilypond/current/scm/define-markup-commands.scm:1145:3: In procedure ly_make_stencil in expression (ly:make-stencil (list # #) (quote #) ...): - /home/hanwen/vc/lilypond/out/share/lilypond/current/scm/define-markup-commands.scm:1145:3: Wrong type argument in position 1 (expecting registered stencil expression): (embedded-ps " - scm/define-stencil-commands.scm | 65 ++--- - 1 file changed, 35 insertions(+), 30 deletions(-) - -diff --git a/scm/define-stencil-commands.scm b/scm/define-stencil-commands.scm -index 09a2299..e388788 100644 a/scm/define-stencil-commands.scm -+++ b/scm/define-stencil-commands.scm -@@ -21,36 +21,41 @@ - (define-public (ly:all-stencil-commands) - "Return the list of stencil commands that can be - defined in the output modules (@file{output-*.scm})." -- '(blank --char --circle --dashed-line --draw-line --ellipse --embedded-ps --embedded-svg --end-group-node --glyph-string --grob-cause --named-glyph --no-origin --page-link --path --partial-ellipse --placebox --polygon --resetcolor --resetrotation --resetscale --round-filled-box --setcolor --setrotation --setscale --start-group-node --text --unknown --url-link --utf-8-string -+ (let* -+ ((commands '(blank -+ char -+ circle -+ dashed-line -+ draw-line -+ ellipse -+ end-group-node -+ glyph-string -+ grob-cause -+ named-glyph -+ no-origin -+ page-link -+ path -+ partial-ellipse -+ placebox -+ polygon -+ resetcolor -+ resetrotation -+ resetscale -+ round-filled-box -+ setcolor -+ setrotation -+ setscale -+ start-group-node -+ text -+ unknown -+ url-link -+ utf-8-string -+ ))) -+ -+(if (ly:get-option 'safe) -+commands -+(append '(embedded-ps emb
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 9c01bbe0f7e826bdd4cda432d388c26e5fc03a36 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Oct 7 07:07:17 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Oct 7 07:09:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c01bbe0 media-sound/lilypond: x86 stable wrt bug #746692 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> media-sound/lilypond/lilypond-2.21.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.21.5.ebuild b/media-sound/lilypond/lilypond-2.21.5.ebuild index ffc9b03e151..a213efeabbd 100644 --- a/media-sound/lilypond/lilypond-2.21.5.ebuild +++ b/media-sound/lilypond/lilypond-2.21.5.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm arm64 ~hppa ~x86" + KEYWORDS="amd64 ~arm arm64 ~hppa x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 40cd4d3434e1c147a6962c48fc47138874899d88 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Oct 7 06:39:15 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Oct 7 06:39:15 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40cd4d34 media-sound/lilypond: amd64 stable wrt bug #746692 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> media-sound/lilypond/lilypond-2.21.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.21.5.ebuild b/media-sound/lilypond/lilypond-2.21.5.ebuild index 3208b608af8..ffc9b03e151 100644 --- a/media-sound/lilypond/lilypond-2.21.5.ebuild +++ b/media-sound/lilypond/lilypond-2.21.5.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm arm64 ~hppa ~x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 70c082bcc1d821b3ec7606e6df0f272af43b1bf3 Author: Sam James gentoo org> AuthorDate: Tue Oct 6 15:01:08 2020 + Commit: Sam James gentoo org> CommitDate: Tue Oct 6 15:01:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70c082bc media-sound/lilypond: Stabilize 2.21.5 arm64, #746692 Signed-off-by: Sam James gentoo.org> media-sound/lilypond/lilypond-2.21.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.21.5.ebuild b/media-sound/lilypond/lilypond-2.21.5.ebuild index c03d4b78151..3208b608af8 100644 --- a/media-sound/lilypond/lilypond-2.21.5.ebuild +++ b/media-sound/lilypond/lilypond-2.21.5.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" + KEYWORDS="~amd64 ~arm arm64 ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 5ee1b737b762ddd99789547c2a71f7798e093b2f Author: Miroslav Šulc gentoo org> AuthorDate: Thu Sep 17 07:17:04 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Sep 17 07:30:00 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee1b737 media-sound/lilypond: fixed readme install in Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/lilypond-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index c03d4b78151..eed5fa9c0fb 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -66,7 +66,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch ) -DOCS=( DEDICATION HACKING Documentation/out/topdocs/README.txt ROADMAP ) +DOCS=( DEDICATION HACKING README.md ROADMAP ) src_prepare() { default
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 61432476c147decbfbb233c6d39fedb0a3f1f41c Author: Miroslav Šulc gentoo org> AuthorDate: Thu Sep 17 07:29:41 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Sep 17 07:30:01 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61432476 media-sound/lilypond: bump to 2.21.6 + sync'd live Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/Manifest | 1 + .../{lilypond-.ebuild => lilypond-2.21.6.ebuild} | 14 +++--- media-sound/lilypond/lilypond-.ebuild | 14 +++--- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index d4005fbc593..b5615aa667c 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,2 +1,3 @@ DIST lilypond-2.21.4.tar.gz 18011766 BLAKE2B fe9731a170ec6e551bd5e2259cca33e1c69ee5dedccaf39e7026afe3342da8d301f7450450122f4e102915d4469dddb89575b3a75db21e988d526d9b683bcc38 SHA512 29d671d411cf3817e8a62f208bec4c8d74a08c3a54b8856c1474cfa736e2882c5418b52af2675598093fae2b77c2ba4c812aae9164d99c9643ff18271cee6860 DIST lilypond-2.21.5.tar.gz 18005124 BLAKE2B d41f2baaeb0e72905f688bf7bd88e9acdc1eabc1bf69a05e8d5208f8ffc06197830c6b6ff1f09034eebc15fc4d94f6909848940361e06120530abc67b10aa87e SHA512 bcc72d0d040125fc9e4f7447e31af59959cae8c1afef1f6c4b7fb1fdbf037931a94d64c94b6b26e37de7d66ec52f24b2ba1b4fd0a6e0862b82eeef3c86d94958 +DIST lilypond-2.21.6.tar.gz 17996701 BLAKE2B 2efbdae1bd16ab1682c14c1c0e01146d66dd408ff5d3f9b69ed38dcedd88b68c6ae3219b02e7a3967833d802488a90aecf50964f44ebb5445f887d4a532a41ad SHA512 9effceabe39a0ca5f3837e0ff1cb0d4caed87b4b76e40f7c4f618d682b2e3db8f82e461e5c9555d6c05d591be54a08370599ed8c72d1e92ba80bcabf4d21a6f7 diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-2.21.6.ebuild similarity index 92% copy from media-sound/lilypond/lilypond-.ebuild copy to media-sound/lilypond/lilypond-2.21.6.ebuild index eed5fa9c0fb..89cf464d7f8 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-2.21.6.ebuild @@ -26,23 +26,23 @@ unset LANG_USE REQUIRED_USE="${PYTHON_REQUIRED_USE}" BDEPEND=" - >=dev-texlive/texlive-metapost-2020 - >=sys-apps/texinfo-4.11 - >=sys-devel/bison-2.0 + dev-texlive/texlive-metapost + sys-apps/texinfo + sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-text/texi2html ) " -RDEPEND=">=app-text/ghostscript-gpl-8.15 - >=dev-scheme/guile-1.8.2:12=[deprecated,regex] +RDEPEND="app-text/ghostscript-gpl + dev-scheme/guile:12=[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 - >=x11-libs/pango-1.12.3 + x11-libs/pango emacs? ( >=app-editors/emacs-23.1:* ) guile2? ( >=dev-scheme/guile-2.2:12 ) !guile2? ( - >=dev-scheme/guile-1.8.2:12=[deprecated,regex] + dev-scheme/guile:12=[deprecated,regex] =x11-libs/pango-1.12.3 + x11-libs/pango emacs? ( >=app-editors/emacs-23.1:* ) guile2? ( >=dev-scheme/guile-2.2:12 ) !guile2? ( - >=dev-scheme/guile-1.8.2:12=[deprecated,regex] + dev-scheme/guile:12=[deprecated,regex]
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 5bc7f757e80eee7ec25983e6f2f7a188c87d739c Author: Miroslav Šulc gentoo org> AuthorDate: Sun Sep 6 07:07:24 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Sep 6 07:07:24 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bc7f757 media-sound/lilypond: removed obsolete 2.21.1-r1 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/Manifest | 1 - media-sound/lilypond/lilypond-2.21.1-r1.ebuild | 133 - 2 files changed, 134 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index e6b0880818e..d4005fbc593 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,3 +1,2 @@ -DIST lilypond-2.21.1.tar.gz 18135688 BLAKE2B 4a797c325e254b59cb314b28a801198f398efd7a37cac448b79d8161ab7248b0c9ca45ce742b82d0aebb784a98637209c84df74304a9e8c8f744b9f5033e18d2 SHA512 596f6a09d0f9a0c39ca717a9e4e246e03679a6cf40a78491eac9bc3eccf173799c75a0baef491cae8385bf1abda53244fd731695762b6fd841396edb92d0ab75 DIST lilypond-2.21.4.tar.gz 18011766 BLAKE2B fe9731a170ec6e551bd5e2259cca33e1c69ee5dedccaf39e7026afe3342da8d301f7450450122f4e102915d4469dddb89575b3a75db21e988d526d9b683bcc38 SHA512 29d671d411cf3817e8a62f208bec4c8d74a08c3a54b8856c1474cfa736e2882c5418b52af2675598093fae2b77c2ba4c812aae9164d99c9643ff18271cee6860 DIST lilypond-2.21.5.tar.gz 18005124 BLAKE2B d41f2baaeb0e72905f688bf7bd88e9acdc1eabc1bf69a05e8d5208f8ffc06197830c6b6ff1f09034eebc15fc4d94f6909848940361e06120530abc67b10aa87e SHA512 bcc72d0d040125fc9e4f7447e31af59959cae8c1afef1f6c4b7fb1fdbf037931a94d64c94b6b26e37de7d66ec52f24b2ba1b4fd0a6e0862b82eeef3c86d94958 diff --git a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild deleted file mode 100644 index ac757af28f2..000 --- a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils - -if [[ "${PV}" = "" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"; -else - MAIN_VER=$(ver_cut 1-2) - SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm arm64 ~hppa x86" -fi - -DESCRIPTION="GNU Music Typesetter" -HOMEPAGE="http://lilypond.org/"; - -LICENSE="GPL-3 FDL-1.3" -SLOT="0" -IUSE="debug emacs guile2 profile vim-syntax" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - >=dev-texlive/texlive-metapost-2020 - >=sys-apps/texinfo-4.11 - >=sys-devel/bison-2.0 - sys-devel/flex - virtual/pkgconfig -" -RDEPEND=">=app-text/ghostscript-gpl-8.15 - >=dev-scheme/guile-1.8.2:12=[deprecated,regex] - media-fonts/tex-gyre - media-libs/fontconfig - media-libs/freetype:2 - >=x11-libs/pango-1.12.3 - emacs? ( >=app-editors/emacs-23.1:* ) - guile2? ( >=dev-scheme/guile-2.2:12 ) - !guile2? ( - >=dev-scheme/guile-1.8.2:12=[deprecated,regex] - https://bugs.gentoo.org/692010 - - econf "${myeconfargs[@]}" AR="$(tc-getAR)" -} - -src_compile() { - default - - if use emacs ; then - elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \ - || die "elisp-compile failed" - fi -} - -src_install() { - emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install - - # remove elisp files since they are in the wrong directory - rm -r "${ED}"/usr/share/emacs || die - - if use emacs ; then - elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \ - || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el - fi - - python_fix_shebang "${ED}" - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -}
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 67f8f4191edadc85cd2f563955859097c1e74ff8 Author: Sam James gentoo org> AuthorDate: Sun Sep 6 03:37:25 2020 + Commit: Sam James gentoo org> CommitDate: Sun Sep 6 03:37:25 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67f8f419 media-sound/lilypond: arm64 stable (bug #740458) Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> media-sound/lilypond/lilypond-2.21.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild index 5b6a4c8ee04..7d751530c32 100644 --- a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm ~arm64 ~hppa x86" + KEYWORDS="amd64 ~arm arm64 ~hppa x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 484f8765854995214a4b7485a7c44cd4c04ce167 Author: Sam James gentoo org> AuthorDate: Sat Sep 5 22:55:20 2020 + Commit: Sam James gentoo org> CommitDate: Sat Sep 5 22:55:20 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=484f8765 media-sound/lilypond: Stabilize 2.21.4-r1 amd64, #740458 Signed-off-by: Sam James gentoo.org> media-sound/lilypond/lilypond-2.21.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild index c5a15c0af40..5b6a4c8ee04 100644 --- a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa x86" + KEYWORDS="amd64 ~arm ~arm64 ~hppa x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: ac973c63f4663b82f9dcc0dcd546c3e92965d5e9 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Sep 5 16:14:30 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Sep 5 16:14:30 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac973c63 media-sound/lilypond: x86 stable (bug #740458) Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Thomas Deutschmann gentoo.org> media-sound/lilypond/lilypond-2.21.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild index 5fb8dcb93de..c5a15c0af40 100644 --- a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 34fef534dc8545266df9665e31b6758cfa0a585c Author: Miroslav Šulc gentoo org> AuthorDate: Sat Sep 5 11:22:34 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sat Sep 5 11:22:48 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34fef534 media-sound/lilypond: bump to 2.21.5 + updated live + doc use flag the doc use flag is for testing purposes now and to resolve all possible issues with building the documentation, i hope community can help with that Closes: https://bugs.gentoo.org/179178 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/Manifest | 1 + ...lilypond-.ebuild => lilypond-2.21.5.ebuild} | 23 -- media-sound/lilypond/lilypond-.ebuild | 23 -- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 3687cff7423..e6b0880818e 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,2 +1,3 @@ DIST lilypond-2.21.1.tar.gz 18135688 BLAKE2B 4a797c325e254b59cb314b28a801198f398efd7a37cac448b79d8161ab7248b0c9ca45ce742b82d0aebb784a98637209c84df74304a9e8c8f744b9f5033e18d2 SHA512 596f6a09d0f9a0c39ca717a9e4e246e03679a6cf40a78491eac9bc3eccf173799c75a0baef491cae8385bf1abda53244fd731695762b6fd841396edb92d0ab75 DIST lilypond-2.21.4.tar.gz 18011766 BLAKE2B fe9731a170ec6e551bd5e2259cca33e1c69ee5dedccaf39e7026afe3342da8d301f7450450122f4e102915d4469dddb89575b3a75db21e988d526d9b683bcc38 SHA512 29d671d411cf3817e8a62f208bec4c8d74a08c3a54b8856c1474cfa736e2882c5418b52af2675598093fae2b77c2ba4c812aae9164d99c9643ff18271cee6860 +DIST lilypond-2.21.5.tar.gz 18005124 BLAKE2B d41f2baaeb0e72905f688bf7bd88e9acdc1eabc1bf69a05e8d5208f8ffc06197830c6b6ff1f09034eebc15fc4d94f6909848940361e06120530abc67b10aa87e SHA512 bcc72d0d040125fc9e4f7447e31af59959cae8c1afef1f6c4b7fb1fdbf037931a94d64c94b6b26e37de7d66ec52f24b2ba1b4fd0a6e0862b82eeef3c86d94958 diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-2.21.5.ebuild similarity index 84% copy from media-sound/lilypond/lilypond-.ebuild copy to media-sound/lilypond/lilypond-2.21.5.ebuild index ffa9b40c076..c03d4b78151 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-2.21.5.ebuild @@ -20,7 +20,9 @@ HOMEPAGE="http://lilypond.org/"; LICENSE="GPL-3 FDL-1.3" SLOT="0" -IUSE="debug emacs guile2 profile vim-syntax" +LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh" +IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}" +unset LANG_USE REQUIRED_USE="${PYTHON_REQUIRED_USE}" BDEPEND=" @@ -29,6 +31,7 @@ BDEPEND=" >=sys-devel/bison-2.0 sys-devel/flex virtual/pkgconfig + doc? ( app-text/texi2html ) " RDEPEND=">=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12=[deprecated,regex] @@ -48,8 +51,14 @@ DEPEND="${RDEPEND} dev-lang/perl dev-libs/kpathsea media-gfx/fontforge[png,python] - sys-devel/gettext" - + sys-devel/gettext + doc? ( + dev-texlive/texlive-langcyrillic + l10n_cs? ( dev-texlive/texlive-xetex ) + l10n_ja? ( dev-texlive/texlive-langjapanese ) + l10n_zh? ( dev-texlive/texlive-langchinese ) + ) +" # Correct output data for tests isn't bundled with releases RESTRICT="test" @@ -81,14 +90,12 @@ src_configure() { # fix hardcoded `ar` sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command" - # documentation generation currently not supported since it requires a newer - # version of texi2html than is currently in the tree local myeconfargs=( --with-texgyre-dir=/usr/share/fonts/tex-gyre - --disable-documentation --disable-optimising --disable-pipe $(use_enable debug debugging) + $(use_enable doc documentation) $(use_enable profile profiling) ) @@ -100,6 +107,8 @@ src_configure() { src_compile() { default + use doc && emake LANGS="${L10N}" doc info + if use emacs ; then elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \ || die "elisp-compile failed" @@ -109,6 +118,8 @@ src_compile() { src_install() { emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install + use doc && emake DESTDIR="${D}" install-doc + # remove elisp files since they are in the wrong directory rm -r "${ED}"/usr/share/emacs || die diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index ffa9b40c076..c03d4b78151 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilyp
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 567c5bc07e771ba1d236510cd9ada578700b61c3 Author: Miroslav Šulc gentoo org> AuthorDate: Sat Sep 5 08:31:24 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sat Sep 5 08:31:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=567c5bc0 media-sound/lilypond: fixed hardcoded ar command Closes: https://bugs.gentoo.org/734176 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/lilypond-2.21.1-r1.ebuild | 7 +-- media-sound/lilypond/lilypond-2.21.4-r1.ebuild | 7 +-- media-sound/lilypond/lilypond-.ebuild | 7 +-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild index 521872ddafb..ac757af28f2 100644 --- a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild @@ -79,9 +79,11 @@ src_prepare() { } src_configure() { + # fix hardcoded `ar` + sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command" + # documentation generation currently not supported since it requires a newer # version of texi2html than is currently in the tree - local myeconfargs=( --with-texgyre-dir=/usr/share/fonts/tex-gyre --disable-documentation @@ -90,9 +92,10 @@ src_configure() { $(use_enable debug debugging) $(use_enable profile profiling) ) + export VARTEXFONTS="${T}/fonts" # https://bugs.gentoo.org/692010 - econf "${myeconfargs[@]}" + econf "${myeconfargs[@]}" AR="$(tc-getAR)" } src_compile() { diff --git a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild index 0196e4c7d4d..5fb8dcb93de 100644 --- a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild @@ -79,9 +79,11 @@ src_prepare() { } src_configure() { + # fix hardcoded `ar` + sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command" + # documentation generation currently not supported since it requires a newer # version of texi2html than is currently in the tree - local myeconfargs=( --with-texgyre-dir=/usr/share/fonts/tex-gyre --disable-documentation @@ -90,9 +92,10 @@ src_configure() { $(use_enable debug debugging) $(use_enable profile profiling) ) + export VARTEXFONTS="${T}/fonts" # https://bugs.gentoo.org/692010 - econf "${myeconfargs[@]}" + econf "${myeconfargs[@]}" AR="$(tc-getAR)" } src_compile() { diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index fc14ef8ed34..ffa9b40c076 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -78,9 +78,11 @@ src_prepare() { } src_configure() { + # fix hardcoded `ar` + sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command" + # documentation generation currently not supported since it requires a newer # version of texi2html than is currently in the tree - local myeconfargs=( --with-texgyre-dir=/usr/share/fonts/tex-gyre --disable-documentation @@ -89,9 +91,10 @@ src_configure() { $(use_enable debug debugging) $(use_enable profile profiling) ) + export VARTEXFONTS="${T}/fonts" # https://bugs.gentoo.org/692010 - econf "${myeconfargs[@]}" + econf "${myeconfargs[@]}" AR="$(tc-getAR)" } src_compile() {
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 1a38c1ce10a896855b8917a58ffc50bcc693802d Author: Miroslav Šulc gentoo org> AuthorDate: Fri Aug 7 12:04:48 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Aug 7 12:04:48 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a38c1ce media-sound/lilypond: removed vulnerable 2.21.1 Bug: https://bugs.gentoo.org/736074 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/lilypond-2.21.1.ebuild | 129 1 file changed, 129 deletions(-) diff --git a/media-sound/lilypond/lilypond-2.21.1.ebuild b/media-sound/lilypond/lilypond-2.21.1.ebuild deleted file mode 100644 index 53f73d164f5..000 --- a/media-sound/lilypond/lilypond-2.21.1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils - -if [[ "${PV}" = "" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"; -else - MAIN_VER=$(ver_cut 1-2) - SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm arm64 ~hppa x86" -fi - -DESCRIPTION="GNU Music Typesetter" -HOMEPAGE="http://lilypond.org/"; - -LICENSE="GPL-3 FDL-1.3" -SLOT="0" -IUSE="debug emacs guile2 profile vim-syntax" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - >=dev-texlive/texlive-metapost-2020 - >=sys-apps/texinfo-4.11 - >=sys-devel/bison-2.0 - sys-devel/flex - virtual/pkgconfig -" -RDEPEND=">=app-text/ghostscript-gpl-8.15 - >=dev-scheme/guile-1.8.2:12=[deprecated,regex] - media-fonts/tex-gyre - media-libs/fontconfig - media-libs/freetype:2 - >=x11-libs/pango-1.12.3 - emacs? ( >=app-editors/emacs-23.1:* ) - guile2? ( >=dev-scheme/guile-2.2:12 ) - !guile2? ( - >=dev-scheme/guile-1.8.2:12=[deprecated,regex] - https://bugs.gentoo.org/692010 - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use emacs ; then - elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \ - || die "elisp-compile failed" - fi -} - -src_install() { - emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install - - # remove elisp files since they are in the wrong directory - rm -r "${ED}"/usr/share/emacs || die - - if use emacs ; then - elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \ - || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el - fi - - python_fix_shebang "${ED}" - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -}
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 0286d98a25b399739aad65747dad7092e77a8113 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Aug 7 11:53:05 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Aug 7 11:53:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0286d98a media-sound/lilypond: x86 stable wrt bug #736074 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> media-sound/lilypond/lilypond-2.21.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild index 8bb1f2e0a32..521872ddafb 100644 --- a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm arm64 ~hppa ~x86" + KEYWORDS="amd64 ~arm arm64 ~hppa x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 06ba6643d744a1878de678deeed2e72a5dd02a89 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Aug 7 11:44:12 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Aug 7 11:44:12 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06ba6643 media-sound/lilypond: amd64 stable wrt bug #736074 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> media-sound/lilypond/lilypond-2.21.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild index e6e79f40267..8bb1f2e0a32 100644 --- a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm arm64 ~hppa ~x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: d3dd9b201d44a5826049bcc51592377c5c1f450a Author: Sam James gentoo org> AuthorDate: Wed Aug 5 23:13:45 2020 + Commit: Sam James gentoo org> CommitDate: Wed Aug 5 23:13:45 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3dd9b20 media-sound/lilypond: Stabilize 2.21.1-r1 arm64, #736074 Signed-off-by: Sam James gentoo.org> media-sound/lilypond/lilypond-2.21.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild index 1f1e8202a99..e6e79f40267 100644 --- a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" + KEYWORDS="~amd64 ~arm arm64 ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/
commit: b643169012fae9013d509ef7fc19602450113b77 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Aug 5 17:57:09 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Aug 5 17:57:26 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6431690 media-sound/lilypond: fixed cve-2020-17353 Bug: https://bugs.gentoo.org/736074 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Miroslav Šulc gentoo.org> .../files/lilypond-fix-cve-2020-17353.patch| 101 + ...ond-2.21.4.ebuild => lilypond-2.21.1-r1.ebuild} | 5 +- ...ond-2.21.4.ebuild => lilypond-2.21.4-r1.ebuild} | 1 + 3 files changed, 105 insertions(+), 2 deletions(-) diff --git a/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch b/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch new file mode 100644 index 000..e91947eae05 --- /dev/null +++ b/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch @@ -0,0 +1,101 @@ +From b84ea4740f3279516905c5db05f4074e777c16ff Mon Sep 17 00:00:00 2001 +From: Han-Wen Nienhuys +Date: Tue, 21 Jul 2020 14:45:08 +0200 +Subject: [PATCH] scm: disable embedded-ps and embedded-svg in -dsafe mode + +This prevents executing privileged PostScript and exploiting +Ghostscript vulnerablilities + +Tested: + $ lilypond -dsafe input/regression/les-nereides.ly + (works, kinda) + + $ cat f.ly + { c4_ \markup \postscript #" (x) show " } + + $ lilypond -dsafe f + Preprocessing graphical objects.../home/hanwen/vc/lilypond/out/share/lilypond/current/scm/define-markup-commands.scm:1145:3: In procedure ly_make_stencil in expression (ly:make-stencil (list # #) (quote #) ...): + /home/hanwen/vc/lilypond/out/share/lilypond/current/scm/define-markup-commands.scm:1145:3: Wrong type argument in position 1 (expecting registered stencil expression): (embedded-ps " +--- + scm/define-stencil-commands.scm | 65 ++--- + 1 file changed, 35 insertions(+), 30 deletions(-) + +diff --git a/scm/define-stencil-commands.scm b/scm/define-stencil-commands.scm +index 09a2299..e388788 100644 +--- a/scm/define-stencil-commands.scm b/scm/define-stencil-commands.scm +@@ -21,36 +21,41 @@ + (define-public (ly:all-stencil-commands) + "Return the list of stencil commands that can be + defined in the output modules (@file{output-*.scm})." +- '(blank +-char +-circle +-dashed-line +-draw-line +-ellipse +-embedded-ps +-embedded-svg +-end-group-node +-glyph-string +-grob-cause +-named-glyph +-no-origin +-page-link +-path +-partial-ellipse +-placebox +-polygon +-resetcolor +-resetrotation +-resetscale +-round-filled-box +-setcolor +-setrotation +-setscale +-start-group-node +-text +-unknown +-url-link +-utf-8-string ++ (let* ++ ((commands '(blank ++ char ++ circle ++ dashed-line ++ draw-line ++ ellipse ++ end-group-node ++ glyph-string ++ grob-cause ++ named-glyph ++ no-origin ++ page-link ++ path ++ partial-ellipse ++ placebox ++ polygon ++ resetcolor ++ resetrotation ++ resetscale ++ round-filled-box ++ setcolor ++ setrotation ++ setscale ++ start-group-node ++ text ++ unknown ++ url-link ++ utf-8-string ++ ))) ++ ++(if (ly:get-option 'safe) ++commands ++(append '(embedded-ps embedded-svg) ++commands)) + )) + + ;; TODO: +-- +1.9.1 + diff --git a/media-sound/lilypond/lilypond-2.21.4.ebuild b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild similarity index 95% copy from media-sound/lilypond/lilypond-2.21.4.ebuild copy to media-sound/lilypond/lilypond-2.21.1-r1.ebuild index 3aa63a51f18..1f1e8202a99 100644 --- a/media-sound/lilypond/lilypond-2.21.4.ebuild +++ b/media-sound/lilypond/lilypond-2.21.1-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils @@ -54,7 +54,8 @@ DEPEND="${RDEPEND} RESTRICT="test" PATCHES=( - "${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch + "${FILESDIR}"/${P}-fix-font-size.patch + "${FILESDIR}"/${PN}-fix-cve-2020-17353.patch ) DOCS=( DEDICATION HACKING README.txt ROADMAP ) diff --git a/media-sound/lilypond/lilypond-2.21.4.ebuild b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild similarity index 98% rename fr
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 794cce3f16bb0eb284765f30048968f07ca2fdf8 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Aug 5 08:31:32 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Aug 5 08:32:15 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=794cce3f media-sound/lilypond: bump to 2.21.4 + python3_9 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/Manifest | 1 + media-sound/lilypond/{lilypond-.ebuild => lilypond-2.21.4.ebuild} | 4 ++-- media-sound/lilypond/lilypond-.ebuild | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 40fc65bffd7..3687cff7423 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1 +1,2 @@ DIST lilypond-2.21.1.tar.gz 18135688 BLAKE2B 4a797c325e254b59cb314b28a801198f398efd7a37cac448b79d8161ab7248b0c9ca45ce742b82d0aebb784a98637209c84df74304a9e8c8f744b9f5033e18d2 SHA512 596f6a09d0f9a0c39ca717a9e4e246e03679a6cf40a78491eac9bc3eccf173799c75a0baef491cae8385bf1abda53244fd731695762b6fd841396edb92d0ab75 +DIST lilypond-2.21.4.tar.gz 18011766 BLAKE2B fe9731a170ec6e551bd5e2259cca33e1c69ee5dedccaf39e7026afe3342da8d301f7450450122f4e102915d4469dddb89575b3a75db21e988d526d9b683bcc38 SHA512 29d671d411cf3817e8a62f208bec4c8d74a08c3a54b8856c1474cfa736e2882c5418b52af2675598093fae2b77c2ba4c812aae9164d99c9643ff18271cee6860 diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-2.21.4.ebuild similarity index 96% copy from media-sound/lilypond/lilypond-.ebuild copy to media-sound/lilypond/lilypond-2.21.4.ebuild index adc21f971c1..3aa63a51f18 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-2.21.4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils @@ -57,7 +57,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch ) -DOCS=( DEDICATION HACKING Documentation/out/topdocs/README.txt ROADMAP ) +DOCS=( DEDICATION HACKING README.txt ROADMAP ) src_prepare() { default diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index adc21f971c1..fc14ef8ed34 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: abd576f7129eb1e005a83f71c1c9bd59b31ceb70 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Aug 5 08:21:59 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Aug 5 08:22:16 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abd576f7 media-sound/lilypond: fixed readme path in Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/lilypond-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 97370354492..adc21f971c1 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -57,7 +57,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch ) -DOCS=( DEDICATION HACKING README.txt ROADMAP ) +DOCS=( DEDICATION HACKING Documentation/out/topdocs/README.txt ROADMAP ) src_prepare() { default
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: c9de6da2710d4d635196c767a943e4c91872e760 Author: Ulrich Müller gentoo org> AuthorDate: Sat Jul 25 21:30:53 2020 + Commit: Ulrich Müller gentoo org> CommitDate: Tue Jul 28 08:45:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9de6da2 media-sound/lilypond: Drop dependency on dev-tex/metapost. dev-tex/metapost and app-eselect/eselect-mpost are slated for removal. The any-of-many dependency had no effect, because in any case texlive-metapost would pull in app-text/texlive-core as a dependency. Also remove eselect-mpost magic in pkg_setup(). Bug: https://bugs.gentoo.org/733862 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Ulrich Müller gentoo.org> media-sound/lilypond/lilypond-2.21.1.ebuild | 18 +- media-sound/lilypond/lilypond-.ebuild | 18 +- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/media-sound/lilypond/lilypond-2.21.1.ebuild b/media-sound/lilypond/lilypond-2.21.1.ebuild index 36707103792..53f73d164f5 100644 --- a/media-sound/lilypond/lilypond-2.21.1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.1.ebuild @@ -24,11 +24,7 @@ IUSE="debug emacs guile2 profile vim-syntax" REQUIRED_USE="${PYTHON_REQUIRED_USE}" BDEPEND=" - >=dev-texlive/texlive-metapost-2013 - || ( - >=app-text/texlive-core-2013 - >=dev-tex/metapost-1.803 - ) + >=dev-texlive/texlive-metapost-2020 >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex @@ -63,18 +59,6 @@ PATCHES=( DOCS=( DEDICATION HACKING README.txt ROADMAP ) -pkg_setup() { - # make sure >=metapost-1.803 is selected if it's installed, bug 498704 - if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then - if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then - einfo "Updating metapost symlink" - eselect mpost update || die - fi - fi - - python-single-r1_pkg_setup -} - src_prepare() { default diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index fe972b46434..97370354492 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -24,11 +24,7 @@ IUSE="debug emacs guile2 profile vim-syntax" REQUIRED_USE="${PYTHON_REQUIRED_USE}" BDEPEND=" - >=dev-texlive/texlive-metapost-2013 - || ( - >=app-text/texlive-core-2013 - >=dev-tex/metapost-1.803 - ) + >=dev-texlive/texlive-metapost-2020 >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex @@ -63,18 +59,6 @@ PATCHES=( DOCS=( DEDICATION HACKING README.txt ROADMAP ) -pkg_setup() { - # make sure >=metapost-1.803 is selected if it's installed, bug 498704 - if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then - if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then - einfo "Updating metapost symlink" - eselect mpost update || die - fi - fi - - python-single-r1_pkg_setup -} - src_prepare() { default
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: bd80db217c847c1b4c9d7bccc906610e66fb4b36 Author: Alexey Sokolov google com> AuthorDate: Fri Jul 3 11:07:26 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Jul 5 09:33:21 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd80db21 media-sound/lilypond: fix sandbox violation Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Alexey Sokolov asokolov.org> Closes: https://bugs.gentoo.org/692010 Closes: https://github.com/gentoo/gentoo/pull/16568 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/lilypond-2.21.1.ebuild | 1 + media-sound/lilypond/lilypond-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/media-sound/lilypond/lilypond-2.21.1.ebuild b/media-sound/lilypond/lilypond-2.21.1.ebuild index ffc80213cf1..36707103792 100644 --- a/media-sound/lilypond/lilypond-2.21.1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.1.ebuild @@ -105,6 +105,7 @@ src_configure() { $(use_enable debug debugging) $(use_enable profile profiling) ) + export VARTEXFONTS="${T}/fonts" # https://bugs.gentoo.org/692010 econf "${myeconfargs[@]}" } diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index eb38a121f49..fe972b46434 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -105,6 +105,7 @@ src_configure() { $(use_enable debug debugging) $(use_enable profile profiling) ) + export VARTEXFONTS="${T}/fonts" # https://bugs.gentoo.org/692010 econf "${myeconfargs[@]}" }
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: d253e061f9490bbc628804b6f47d91bf8b479bee Author: Miroslav Šulc gentoo org> AuthorDate: Wed Jun 10 13:41:44 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Jun 10 13:41:44 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d253e061 media-sound/lilypond: fixed fontforge dependency use flag Closes: https://bugs.gentoo.org/727712 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/lilypond-2.21.1.ebuild | 2 +- media-sound/lilypond/lilypond-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-sound/lilypond/lilypond-2.21.1.ebuild b/media-sound/lilypond/lilypond-2.21.1.ebuild index cd59095a7dd..ffc80213cf1 100644 --- a/media-sound/lilypond/lilypond-2.21.1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.1.ebuild @@ -51,7 +51,7 @@ DEPEND="${RDEPEND} app-text/t1utils dev-lang/perl dev-libs/kpathsea - media-gfx/fontforge[png] + media-gfx/fontforge[png,python] sys-devel/gettext" # Correct output data for tests isn't bundled with releases diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index bfc43d04764..eb38a121f49 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -51,7 +51,7 @@ DEPEND="${RDEPEND} app-text/t1utils dev-lang/perl dev-libs/kpathsea - media-gfx/fontforge[png] + media-gfx/fontforge[png,python] sys-devel/gettext" # Correct output data for tests isn't bundled with releases
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/, media-sound/lilypond/files/
commit: e5b5476878671c51ef4f47fe2dfac926224e47b7 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Jun 10 06:44:44 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Jun 10 06:45:01 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b54768 media-sound/lilypond: removed obsolete 2.19.83 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/Manifest | 1 - .../files/lilypond-2.19.80-fontforge-version.patch | 16 --- .../files/lilypond-2.19.80-remove-ly-protect.patch | 39 -- media-sound/lilypond/lilypond-2.19.83.ebuild | 148 - 4 files changed, 204 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index c08f1a07927..40fc65bffd7 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,2 +1 @@ -DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604 DIST lilypond-2.21.1.tar.gz 18135688 BLAKE2B 4a797c325e254b59cb314b28a801198f398efd7a37cac448b79d8161ab7248b0c9ca45ce742b82d0aebb784a98637209c84df74304a9e8c8f744b9f5033e18d2 SHA512 596f6a09d0f9a0c39ca717a9e4e246e03679a6cf40a78491eac9bc3eccf173799c75a0baef491cae8385bf1abda53244fd731695762b6fd841396edb92d0ab75 diff --git a/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch b/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch deleted file mode 100644 index 4e2c2ce77c1..000 --- a/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch +++ /dev/null @@ -1,16 +0,0 @@ -The version test fails for two reasons: -* fontforge --version does not print anything that resembles what the configure - script expects a version to look like -* fontforge fails to print a version if it cannot connect to an X display - a/configure.ac -+++ b/configure.ac -@@ -236,7 +236,7 @@ - - STEPMAKE_PYTHON_DEVEL(REQUIRED, 2.4, 3.0) - --STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20110222) -+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED,) - - STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED) - diff --git a/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch b/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch deleted file mode 100644 index d21b0a413a1..000 --- a/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -purN a/lily/general-scheme.cc b/lily/general-scheme.cc a/lily/general-scheme.cc 2017-10-15 17:42:11.0 +0100 -+++ b/lily/general-scheme.cc 2018-01-10 16:20:08.129066507 + -@@ -267,6 +267,8 @@ LY_DEFINE (ly_dimension_p, "ly:dimension - /* - Debugging mem leaks: - */ -+ -+/* - LY_DEFINE (ly_protects, "ly:protects", -0, 0, 0, (), -"Return hash of protected objects.") -@@ -278,6 +280,7 @@ LY_DEFINE (ly_protects, "ly:protects", - return programming_error ("ly:protects is not supported in Guile 2.1"); - #endif - } -+*/ - - LY_DEFINE (ly_gettext, "ly:gettext", -1, 0, 0, (SCM original), -diff -purN a/scm/lily.scm b/scm/lily.scm a/scm/lily.scm 2017-10-15 17:42:11.0 +0100 -+++ b/scm/lily.scm 2018-01-10 16:22:54.914457450 + -@@ -836,10 +836,11 @@ messages into errors.") - - (define-public (dump-gc-protects) - (set! gc-protect-stat-count (1+ gc-protect-stat-count)) -- (let* ((protects (sort (hash-table->alist (ly:protects)) -- (lambda (a b) -- (< (object-address (car a)) -- (object-address (car b)) -+ (let* (;(protects (sort (hash-table->alist (ly:protects)) -+ ;(lambda (a b) -+ ; (< (object-address (car a)) -+ ; (object-address (car b)) -+ (protects '()) - (out-file-name (string-append - "gcstat-" (number->string gc-protect-stat-count) - ".scm")) diff --git a/media-sound/lilypond/lilypond-2.19.83.ebuild b/media-sound/lilypond/lilypond-2.19.83.ebuild deleted file mode 100644 index 8b1f709e600..000 --- a/media-sound/lilypond/lilypond-2.19.83.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 ) - -[[ "${PV}" = "" ]] && inherit git-r3 -inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils - -if [[ "${PV}" = "" ]]; then - EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" -else - MAIN_VER=$(ver_cut 1-2) - SRC_URI="http://lilypond.org/download/sources/v${MA
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 029bdb33092788907c84a20fe75183da2a6c3659 Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Jun 9 13:52:47 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Jun 9 13:52:47 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=029bdb33 media-sound/lilypond: x86 stable wrt bug #727512 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> media-sound/lilypond/lilypond-2.21.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.21.1.ebuild b/media-sound/lilypond/lilypond-2.21.1.ebuild index 284dcefb253..cd59095a7dd 100644 --- a/media-sound/lilypond/lilypond-2.21.1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.1.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm arm64 ~hppa ~x86" + KEYWORDS="amd64 ~arm arm64 ~hppa x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 76658342dc6d0e72fb7f38571726fc77210cca91 Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Jun 9 13:44:25 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Jun 9 13:44:25 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76658342 media-sound/lilypond: amd64 stable wrt bug #727512 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> media-sound/lilypond/lilypond-2.21.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.21.1.ebuild b/media-sound/lilypond/lilypond-2.21.1.ebuild index aac2c349319..284dcefb253 100644 --- a/media-sound/lilypond/lilypond-2.21.1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.1.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm arm64 ~hppa ~x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: ee59b5061dc9b1927824273d70e04ed621462b4e Author: Sam James (sam_c) cmpct info> AuthorDate: Mon Jun 8 14:57:52 2020 + Commit: Mart Raudsepp gentoo org> CommitDate: Tue Jun 9 04:22:18 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee59b506 media-sound/lilypond: arm64 stable (bug #727512) Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Sam James (sam_c) cmpct.info> Signed-off-by: Mart Raudsepp gentoo.org> media-sound/lilypond/lilypond-2.21.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.21.1.ebuild b/media-sound/lilypond/lilypond-2.21.1.ebuild index 4598fa2894b..aac2c349319 100644 --- a/media-sound/lilypond/lilypond-2.21.1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.1.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" + KEYWORDS="~amd64 ~arm arm64 ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: d1940c1e0d5e6798ed4eebfe31a7d3db5c05f2ff Author: Miroslav Šulc gentoo org> AuthorDate: Mon Jun 8 08:03:43 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Jun 8 08:03:56 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1940c1e media-sound/lilypond: fixed guile2 dep Closes: https://bugs.gentoo.org/724788 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/lilypond-2.21.1.ebuild | 2 +- media-sound/lilypond/lilypond-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-sound/lilypond/lilypond-2.21.1.ebuild b/media-sound/lilypond/lilypond-2.21.1.ebuild index 216a4d45876..4598fa2894b 100644 --- a/media-sound/lilypond/lilypond-2.21.1.ebuild +++ b/media-sound/lilypond/lilypond-2.21.1.ebuild @@ -41,7 +41,7 @@ RDEPEND=">=app-text/ghostscript-gpl-8.15 media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( >=app-editors/emacs-23.1:* ) - guile2? ( >=dev-scheme/guile-2:12 ) + guile2? ( >=dev-scheme/guile-2.2:12 ) !guile2? ( >=dev-scheme/guile-1.8.2:12=[deprecated,regex]
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/
commit: 52ca23b570acf750ca99271d2308c739f809450e Author: Miroslav Šulc gentoo org> AuthorDate: Fri May 8 09:51:45 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri May 8 09:54:29 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52ca23b5 media-sound/lilypond: bump to 2.21.1 + sync Closes: https://bugs.gentoo.org/629686 Closes: https://bugs.gentoo.org/720422 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/Manifest | 1 + .../files/lilypond-2.21.1-fix-font-size.patch | 10 + ...lilypond-.ebuild => lilypond-2.21.1.ebuild} | 48 +++--- media-sound/lilypond/lilypond-.ebuild | 48 +++--- 4 files changed, 61 insertions(+), 46 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index dfbd5444746..6e142f16da3 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,2 +1,3 @@ DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604 +DIST lilypond-2.21.1.tar.gz 18135688 BLAKE2B 4a797c325e254b59cb314b28a801198f398efd7a37cac448b79d8161ab7248b0c9ca45ce742b82d0aebb784a98637209c84df74304a9e8c8f744b9f5033e18d2 SHA512 596f6a09d0f9a0c39ca717a9e4e246e03679a6cf40a78491eac9bc3eccf173799c75a0baef491cae8385bf1abda53244fd731695762b6fd841396edb92d0ab75 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 new file mode 100644 index 000..cdd49584900 --- /dev/null +++ b/media-sound/lilypond/files/lilypond-2.21.1-fix-font-size.patch @@ -0,0 +1,10 @@ +--- lilypond-2.19.49.orig/lily/pango-font.cc 2016-10-16 07:16:18.0 -0400 lilypond-2.19.49.new/lily/pango-font.cc2016-10-29 22:39:02.921622080 -0400 +@@ -317,7 +317,7 @@ + pango_fc_font_unlock_face (fcfont); + pango_glyph_string_free (pgs); + pgs = 0; +- PangoFontDescription *descr = pango_font_describe (pa->font); ++ PangoFontDescription *descr = pango_context_get_font_description (context_); + Real size = pango_font_description_get_size (descr) + / (Real (PANGO_SCALE)); diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-2.21.1.ebuild similarity index 86% copy from media-sound/lilypond/lilypond-.ebuild copy to media-sound/lilypond/lilypond-2.21.1.ebuild index 545b867b935..216a4d45876 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-2.21.1.ebuild @@ -2,15 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 - PYTHON_COMPAT=( python3_{6,7,8} ) + inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils if [[ "${PV}" = "" ]]; then inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"; else - SRC_URI="http://lilypond.org/download/sources/v$(ver_cut 1-2)/${P}.tar.gz" + MAIN_VER=$(ver_cut 1-2) + SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" fi @@ -19,41 +20,45 @@ HOMEPAGE="http://lilypond.org/"; LICENSE="GPL-3 FDL-1.3" SLOT="0" -IUSE="debug emacs profile vim-syntax" +IUSE="debug emacs guile2 profile vim-syntax" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="${PYTHON_DEPS} - >=app-text/ghostscript-gpl-8.15 - >=dev-scheme/guile-2:12[deprecated,regex] +BDEPEND=" + >=dev-texlive/texlive-metapost-2013 + || ( + >=app-text/texlive-core-2013 + >=dev-tex/metapost-1.803 + ) + >=sys-apps/texinfo-4.11 + >=sys-devel/bison-2.0 + sys-devel/flex + virtual/pkgconfig +" +RDEPEND=">=app-text/ghostscript-gpl-8.15 + >=dev-scheme/guile-1.8.2:12=[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( >=app-editors/emacs-23.1:* ) -" + guile2? ( >=dev-scheme/guile-2:12 ) + !guile2? ( + >=dev-scheme/guile-1.8.2:12=[deprecated,regex] + https://git.savannah.gnu.org/git/lilypond.git"; else - SRC_URI="http://lilypond.org/download/sources/v$(ver_cut 1-2)/${P}.tar.gz" + MAIN_VER=$(ver_cut 1-2) + SRC_URI="http://lilypond.org/down
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/
commit: 76107a464dde77a13302ff67f29be020fb5075f9 Author: Miroslav Šulc gentoo org> AuthorDate: Fri May 8 09:54:17 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri May 8 09:54:29 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76107a46 media-sound/lilypond: removed obsolete 2.18.2-r3 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/Manifest | 1 - .../lilypond/files/lilypond-2.17.2-tex-docs.patch | 20 --- .../lilypond/files/lilypond-2.18.2-fontforge.patch | 29 - media-sound/lilypond/lilypond-2.18.2-r3.ebuild | 140 - 4 files changed, 190 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 6e142f16da3..c08f1a07927 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,3 +1,2 @@ -DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604 DIST lilypond-2.21.1.tar.gz 18135688 BLAKE2B 4a797c325e254b59cb314b28a801198f398efd7a37cac448b79d8161ab7248b0c9ca45ce742b82d0aebb784a98637209c84df74304a9e8c8f744b9f5033e18d2 SHA512 596f6a09d0f9a0c39ca717a9e4e246e03679a6cf40a78491eac9bc3eccf173799c75a0baef491cae8385bf1abda53244fd731695762b6fd841396edb92d0ab75 diff --git a/media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch b/media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch deleted file mode 100644 index 9e0d7082c0d..000 --- a/media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch +++ /dev/null @@ -1,20 +0,0 @@ lilypond-2.17.2/GNUmakefile.in -+++ lilypond-2.17.2/GNUmakefile.in -@@ -5,7 +5,7 @@ - SUBDIRS = python scripts \ - flower lily \ - mf ly \ -- tex ps scm \ -+ ps scm \ - po \ - elisp vim \ - input \ -@@ -14,7 +14,7 @@ - - ## this convoluted construction is necessary, since we don't know the - ## value of DOCUMENTATION here. --documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation) -+documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation tex) - - SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh - README_FILES = COPYING COPYING.FDL DEDICATION ROADMAP HACKING \ diff --git a/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch b/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch deleted file mode 100644 index cfd3295b394..000 --- a/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a832764e7300d48468a6812077b899a4beed271b Mon Sep 17 00:00:00 2001 -From: Masamichi Hosoda -Date: Sat, 22 Aug 2015 21:20:17 +0900 -Subject: [PATCH] Fix fontforge version detection - -Newer fontforge shows git hash in `fontforge --version`. -In that case, configure script -might recognize it as date (version). - aclocal.m4 | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/aclocal.m4 b/aclocal.m4 -index 48d0b77..0037c58 100644 a/aclocal.m4 -+++ b/aclocal.m4 -@@ -42,7 +42,8 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [ - - if test -z "$_ver"; then - ## If empty, try date [fontforge] --eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \ -+eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 \ -+ | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ - | head -n 1 \ - | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" - fi --- -2.6.2 - diff --git a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild deleted file mode 100644 index 610f8b27f2c..000 --- a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils - -DESCRIPTION="GNU Music Typesetter" -SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; -HOMEPAGE="http://lilypond.org/"; - -LICENSE="GPL-3 FDL-1.3" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa x86" -LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" -IUSE="debug emacs profile vim-syntax" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=">=app-text/ghostscript-gpl-8.15 - >=dev-scheme/guile-1.8.2:12[deprecated,reg
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: d3f23ce9843947e2d326b2fe7e4177451d7b0a35 Author: Miroslav Šulc gentoo org> AuthorDate: Thu Apr 2 10:38:12 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Apr 2 10:38:30 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3f23ce9 media-sound/lilypond: fixed configuration of Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/lilypond-.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 82cfb3b7c71..545b867b935 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -81,7 +81,7 @@ src_prepare() { sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die # respect AR - sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die + sed -i "s:^AR=ar:AR=$(tc-getAR):" flower/GNUmakefile || die # remove bundled texinfo file (fixes bug #448560) rm tex/texinfo.tex || die @@ -97,7 +97,6 @@ src_configure() { local myeconfargs=( --with-texgyre-dir=/usr/share/fonts/tex-gyre - --enable-guile2 --disable-documentation --disable-optimising --disable-pipe
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: e6edf2433b03fa49e439c54c4a75fe1fef896d2d Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 16 14:43:48 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 16 14:51:26 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6edf243 media-sound/lilypond: Drop duplicate DEPEND Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> media-sound/lilypond/lilypond-.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 6aa7409e5b7..dc5446cf20c 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -24,8 +24,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} >=app-text/ghostscript-gpl-8.15 - >=dev-scheme/guile-2:12 - >=dev-scheme/guile-1.8.2:12[deprecated,regex] + >=dev-scheme/guile-2:12[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: ad4b98782b6a8267123c74173350a6d663007308 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 16 12:18:02 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 16 13:41:32 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad4b9878 media-sound/lilypond: Sort variables, style, drop LANGS, USE guile2 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> media-sound/lilypond/lilypond-.ebuild | 36 +-- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 8cf9f39887d..6aa7409e5b7 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -2,15 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -[[ "${PV}" = "" ]] && inherit git-r3 +PYTHON_COMPAT=( python3_{6,7,8} ) inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils if [[ "${PV}" = "" ]]; then + inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"; else - SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; + SRC_URI="http://lilypond.org/download/sources/v$(ver_cut 1-2)/${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" fi @@ -19,26 +19,19 @@ HOMEPAGE="http://lilypond.org/"; LICENSE="GPL-3 FDL-1.3" SLOT="0" -LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" -IUSE="debug emacs guile2 profile vim-syntax" +IUSE="debug emacs profile vim-syntax" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -PATCHES=( - "${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch -) -RDEPEND=">=app-text/ghostscript-gpl-8.15 +RDEPEND="${PYTHON_DEPS} + >=app-text/ghostscript-gpl-8.15 + >=dev-scheme/guile-2:12 >=dev-scheme/guile-1.8.2:12[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( >=app-editors/emacs-23.1:* ) - guile2? ( >=dev-scheme/guile-2:12 ) - !guile2? ( - >=dev-scheme/guile-1.8.2:12[deprecated,regex] - =sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext - sys-devel/make" + sys-devel/make +" # Correct output data for tests isn't bundled with releases RESTRICT="test" +PATCHES=( + "${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch +) + DOCS=( DEDICATION HACKING README.txt ROADMAP ) pkg_setup() { @@ -83,10 +81,6 @@ src_prepare() { # respect CFLAGS sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die - for lang in ${LANGS}; do - has ${lang} ${LINGUAS-${lang}} || rm po/${lang}.po || die - done - # respect AR sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die @@ -104,11 +98,11 @@ src_configure() { local myeconfargs=( --with-texgyre-dir=/usr/share/fonts/tex-gyre + --enable-guile2 --disable-documentation --disable-optimising --disable-pipe $(use_enable debug debugging) - $(use_enable guile2) $(use_enable profile profiling) )
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/
commit: e23aa306e4e32bd3b0d8d435bf0a9cb6ddba2b16 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Feb 5 00:27:45 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Feb 5 00:27:45 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e23aa306 media-sound/lilypond: updated 1) eapi7 2) switched to python3 3) dropped patch not needed anymore Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> .../lilypond/files/lilypond--programming_error.patch| 13 - media-sound/lilypond/lilypond-.ebuild | 7 +++ 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/media-sound/lilypond/files/lilypond--programming_error.patch b/media-sound/lilypond/files/lilypond--programming_error.patch deleted file mode 100644 index f2b85164a6e..000 --- a/media-sound/lilypond/files/lilypond--programming_error.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc -index d25e6c9ef8..2fd2e4a4fa 100644 a/lily/general-scheme.cc -+++ b/lily/general-scheme.cc -@@ -275,7 +275,7 @@ LY_DEFINE (ly_protects, "ly:protects", - #if SCM_MAJOR_VERSION < 2 || SCM_MAJOR_VERSION == 2 && SCM_MINOR_VERSION < 1 - return scm_protects; - #else -- return programming_error ("ly:protects is not supported in Guile 2.1"); -+ programming_error ("ly:protects is not supported in Guile 2.1"); - #endif - } - diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 2ae50f18047..ccdde5e349a 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python2_7 ) +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) [[ "${PV}" = "" ]] && inherit git-r3 inherit elisp-common autotools python-single-r1 xdg-utils @@ -23,7 +23,6 @@ LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" IUSE="debug emacs guile2 profile vim-syntax" REQUIRED_USE="${PYTHON_REQUIRED_USE}" PATCHES=( - "${FILESDIR}"/$P-programming_error.patch "${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch )
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 22afad786a78d6a1a52c8dc2eef1a91eac5de563 Author: Miroslav Šulc gentoo org> AuthorDate: Mon Dec 2 11:21:29 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Dec 2 11:21:53 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22afad78 media-sound/lilypond-2.19.80-r1: removed old Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/Manifest | 1 - media-sound/lilypond/lilypond-2.19.80-r1.ebuild | 147 2 files changed, 148 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 1133e497bbc..dfbd5444746 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,3 +1,2 @@ DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 -DIST lilypond-2.19.80.tar.gz 17244725 BLAKE2B f0883d59b1a14634d5d32e6a6f02c0a224643d6d28a3da623d5163396b74ebd15c3307c33c4d96778254fb6486a74c3324d26e3015d51fa163e3765f2c3767aa SHA512 13a7f258bac8ff77ad6d3879f128e86dd5bf45c7780c9738e6976915574d2dfc5404e6f49ca61dcaf8bb15eb266e65fedec4131a50ded7ab305d1856bbd7a3d6 DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604 diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild deleted file mode 100644 index 3e23b2dfe64..000 --- a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -[[ "${PV}" = "" ]] && inherit git-r3 -inherit elisp-common autotools python-single-r1 xdg-utils - -if [[ "${PV}" = "" ]]; then - EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" -else - SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm arm64 ~hppa x86" -fi - -DESCRIPTION="GNU Music Typesetter" -HOMEPAGE="http://lilypond.org/"; - -LICENSE="GPL-3 FDL-1.3" -SLOT="0" -IUSE="debug emacs guile2 profile vim-syntax" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=">=app-text/ghostscript-gpl-8.15 - >=dev-scheme/guile-1.8.2:12=[deprecated,regex] - media-fonts/tex-gyre - media-libs/fontconfig - media-libs/freetype:2 - >=x11-libs/pango-1.12.3 - emacs? ( virtual/emacs ) - guile2? ( >=dev-scheme/guile-2:12 ) - !guile2? ( - >=dev-scheme/guile-1.8.2:12=[deprecated,regex] - =metapost-1.803 is selected if it's installed, bug 498704 - if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then - if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then - einfo "Updating metapost symlink" - eselect mpost update || die - fi - fi - - python-single-r1_pkg_setup -} - -src_prepare() { - default - - if ! use vim-syntax ; then - sed -i 's/vim//' GNUmakefile.in || die - fi - - # respect CFLAGS - sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die - - # respect AR - sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die - - # remove bundled texinfo file (fixes bug #448560) - rm tex/texinfo.tex || die - - eautoreconf - - xdg_environment_reset #586592 -} - -src_configure() { - # documentation generation currently not supported since it requires a newer - # version of texi2html than is currently in the tree - - local myeconfargs=( - --with-texgyre-dir=/usr/share/fonts/tex-gyre - --disable-documentation - --disable-optimising - --disable-pipe - $(use_enable debug debugging) - $(use_enable guile2) - $(use_enable profile profiling) - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use emacs ; then - elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \ - || die "elisp-compile failed" - fi -} - -src_install () { - emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install - - # remove elisp files since they are in the wrong directory - rm -r "${ED}"/usr/share/emacs || die - - if use emacs ; then -
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 868488cbe54490b72ce6c17439e93f068d5a6514 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Dec 1 15:35:08 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Dec 1 15:35:08 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868488cb media-sound/lilypond: x86 stable (bug #701380) Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Thomas Deutschmann gentoo.org> media-sound/lilypond/lilypond-2.19.83.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.19.83.ebuild b/media-sound/lilypond/lilypond-2.19.83.ebuild index 65cc83ea819..f4e9eb984de 100644 --- a/media-sound/lilypond/lilypond-2.19.83.ebuild +++ b/media-sound/lilypond/lilypond-2.19.83.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm arm64 ~hppa ~x86" + KEYWORDS="amd64 ~arm arm64 ~hppa x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 7d6a2820e9666076cd5cce10a865f4ebde2bcde7 Author: Aaron Bauman gentoo org> AuthorDate: Fri Nov 29 21:54:19 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Nov 29 21:54:27 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d6a2820 media-sound/lilypond: arm64 stable (bug #701380) Signed-off-by: Aaron Bauman gentoo.org> Package-Manager: Portage-2.3.80, Repoman-2.3.19 media-sound/lilypond/lilypond-2.19.83.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.19.83.ebuild b/media-sound/lilypond/lilypond-2.19.83.ebuild index 8de3dc4a1a5..65cc83ea819 100644 --- a/media-sound/lilypond/lilypond-2.19.83.ebuild +++ b/media-sound/lilypond/lilypond-2.19.83.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: d080c8a9b97df1c0b0c71637b97689d7385a3c49 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Nov 29 08:59:55 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Nov 29 08:59:55 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d080c8a9 media-sound/lilypond: amd64 stable wrt bug #701380 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> media-sound/lilypond/lilypond-2.19.83.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.19.83.ebuild b/media-sound/lilypond/lilypond-2.19.83.ebuild index b86d49030a1..8de3dc4a1a5 100644 --- a/media-sound/lilypond/lilypond-2.19.83.ebuild +++ b/media-sound/lilypond/lilypond-2.19.83.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: ca2fd81cab1e8d264e6d8c39e695a2d24091b380 Author: Tim Harder gentoo org> AuthorDate: Wed Oct 23 17:25:17 2019 + Commit: Tim Harder gentoo org> CommitDate: Mon Nov 4 07:20:51 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca2fd81c media-sound/lilypond: drop myself as a maintainer Signed-off-by: Tim Harder gentoo.org> media-sound/lilypond/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/media-sound/lilypond/metadata.xml b/media-sound/lilypond/metadata.xml index 75dc5b8e883..a9cdf5b3658 100644 --- a/media-sound/lilypond/metadata.xml +++ b/media-sound/lilypond/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> - - radher...@gentoo.org - Tim Harder - sch...@gentoo.org Gentoo Scheme Project
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 386cee9b23c47fc5e9c558e51ad91929eed05096 Author: Miroslav Šulc gentoo org> AuthorDate: Mon Oct 28 10:53:29 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Oct 28 10:54:01 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=386cee9b media-sound/lilypond-2.19.83: bump Closes: https://bugs.gentoo.org/673660 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/lilypond/Manifest| 1 + media-sound/lilypond/lilypond-2.19.83.ebuild | 148 +++ 2 files changed, 149 insertions(+) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 2cb6b35b56f..1133e497bbc 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,2 +1,3 @@ DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 DIST lilypond-2.19.80.tar.gz 17244725 BLAKE2B f0883d59b1a14634d5d32e6a6f02c0a224643d6d28a3da623d5163396b74ebd15c3307c33c4d96778254fb6486a74c3324d26e3015d51fa163e3765f2c3767aa SHA512 13a7f258bac8ff77ad6d3879f128e86dd5bf45c7780c9738e6976915574d2dfc5404e6f49ca61dcaf8bb15eb266e65fedec4131a50ded7ab305d1856bbd7a3d6 +DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604 diff --git a/media-sound/lilypond/lilypond-2.19.83.ebuild b/media-sound/lilypond/lilypond-2.19.83.ebuild new file mode 100644 index 000..b86d49030a1 --- /dev/null +++ b/media-sound/lilypond/lilypond-2.19.83.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 ) + +[[ "${PV}" = "" ]] && inherit git-r3 +inherit elisp-common autotools python-single-r1 xdg-utils + +if [[ "${PV}" = "" ]]; then + EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" +else + MAIN_VER=$(ver_cut 1-2) + SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"; + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" +fi + +DESCRIPTION="GNU Music Typesetter" +HOMEPAGE="http://lilypond.org/"; + +LICENSE="GPL-3 FDL-1.3" +SLOT="0" +IUSE="debug emacs guile2 profile vim-syntax" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=">=app-text/ghostscript-gpl-8.15 + >=dev-scheme/guile-1.8.2:12=[deprecated,regex] + media-fonts/tex-gyre + media-libs/fontconfig + media-libs/freetype:2 + >=x11-libs/pango-1.12.3 + emacs? ( virtual/emacs ) + guile2? ( >=dev-scheme/guile-2:12 ) + !guile2? ( + >=dev-scheme/guile-1.8.2:12=[deprecated,regex] + =metapost-1.803 is selected if it's installed, bug 498704 + if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then + if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then + einfo "Updating metapost symlink" + eselect mpost update || die + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + default + + if ! use vim-syntax ; then + sed -i 's/vim//' GNUmakefile.in || die + fi + + # respect CFLAGS + sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die + + # respect AR + sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die + + # remove bundled texinfo file (fixes bug #448560) + rm tex/texinfo.tex || die + + eautoreconf + + xdg_environment_reset #586592 +} + +src_configure() { + # documentation generation currently not supported since it requires a newer + # version of texi2html than is currently in the tree + + local myeconfargs=( + --with-texgyre-dir=/usr/share/fonts/tex-gyre + --disable-documentation + --disable-optimising + --disable-pipe + $(use_enable debug debugging) + $(use_enable guile2) + $(use_enable profile profiling) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + default + + if use emacs ; then + elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \ + || die "elisp-compile failed" + fi +} + +src_install () { + emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install + + # remove elisp files since they are in the wrong directory + rm -r "${ED}"/usr/share/emacs || die +
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/
commit: b86de0942126d6005b21f34a2a93ed2ad07d400e Author: Miroslav Šulc gentoo org> AuthorDate: Mon Oct 28 10:35:11 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Oct 28 10:35:32 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b86de094 media-sound/lilypond-{2.19.80-r1,}: fix #681630 Closes: https://bugs.gentoo.org/681630 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Miroslav Šulc gentoo.org> .../files/lilypond-2.19.80-fontforge-version.patch | 16 media-sound/lilypond/lilypond-2.19.80-r1.ebuild | 5 - media-sound/lilypond/lilypond-.ebuild| 7 +-- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch b/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch new file mode 100644 index 000..4e2c2ce77c1 --- /dev/null +++ b/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch @@ -0,0 +1,16 @@ +The version test fails for two reasons: +* fontforge --version does not print anything that resembles what the configure + script expects a version to look like +* fontforge fails to print a version if it cannot connect to an X display + +--- a/configure.ac b/configure.ac +@@ -236,7 +236,7 @@ + + STEPMAKE_PYTHON_DEVEL(REQUIRED, 2.4, 3.0) + +-STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20110222) ++STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED,) + + STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED) + diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild index 1a358dd52c2..3e23b2dfe64 100644 --- a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild +++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild @@ -55,7 +55,10 @@ DEPEND="${RDEPEND} # Correct output data for tests isn't bundled with releases RESTRICT="test" -PATCHES=( "${FILESDIR}"/${P}-remove-ly-protect.patch ) +PATCHES=( + "${FILESDIR}"/${P}-remove-ly-protect.patch + "${FILESDIR}"/${P}-fontforge-version.patch +) DOCS=( DEDICATION HACKING README.txt ROADMAP ) diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 93bb8d785b9..4d591c81e09 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,7 +22,10 @@ SLOT="0" LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" IUSE="debug emacs guile2 profile vim-syntax" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -PATCHES=(${FILESDIR}/$P-programming_error.patch) +PATCHES=( + "${FILESDIR}"/$P-programming_error.patch + "${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch +) RDEPEND=">=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12[deprecated,regex]
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 1404a6a4fffdfc8fc526e8a5216e14d8f5c041f8 Author: Aaron Bauman gentoo org> AuthorDate: Sun Apr 14 14:27:53 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Sun Apr 14 14:27:53 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1404a6a4 media-sound/lilypond: arm64 stable (bug #641648) Signed-off-by: Aaron Bauman gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 media-sound/lilypond/lilypond-2.19.80-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild index b4574b4a73c..1a358dd52c2 100644 --- a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild +++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild @@ -11,7 +11,7 @@ if [[ "${PV}" = "" ]]; then EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" else SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm ~arm64 ~hppa x86" + KEYWORDS="amd64 ~arm arm64 ~hppa x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: af2da04a621951b866fd2150af11f57ac7075798 Author: Pacho Ramos gentoo org> AuthorDate: Sat Mar 23 13:36:19 2019 + Commit: Pacho Ramos gentoo org> CommitDate: Sat Mar 23 13:47:59 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af2da04a media-sound/lilypond: Needs to be rebuilt with guile subslot bumps Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Pacho Ramos gentoo.org> media-sound/lilypond/lilypond-2.19.80-r1.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild index 11303d06464..b4574b4a73c 100644 --- a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild +++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,7 +23,7 @@ IUSE="debug emacs guile2 profile vim-syntax" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=">=app-text/ghostscript-gpl-8.15 - >=dev-scheme/guile-1.8.2:12[deprecated,regex] + >=dev-scheme/guile-1.8.2:12=[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 @@ -31,7 +31,7 @@ RDEPEND=">=app-text/ghostscript-gpl-8.15 emacs? ( virtual/emacs ) guile2? ( >=dev-scheme/guile-2:12 ) !guile2? ( - >=dev-scheme/guile-1.8.2:12[deprecated,regex] + >=dev-scheme/guile-1.8.2:12=[deprecated,regex]
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: e76c6c3289f82cfd8d748aa40b4ca344f8bfa78a Author: Tim Harder gentoo org> AuthorDate: Fri Mar 23 06:33:30 2018 + Commit: Tim Harder gentoo org> CommitDate: Fri Mar 23 06:39:13 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e76c6c32 media-sound/lilypond: remove old media-sound/lilypond/Manifest| 2 - media-sound/lilypond/lilypond-2.19.54.ebuild | 147 --- media-sound/lilypond/lilypond-2.19.64.ebuild | 147 --- media-sound/lilypond/lilypond-2.19.80.ebuild | 147 --- 4 files changed, 443 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index cf599c47e14..2cb6b35b56f 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,4 +1,2 @@ DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 -DIST lilypond-2.19.54.tar.gz 17068093 BLAKE2B ebc3100a55affd9b89fa93abf32c7c74cf1fc3f3b026c77d7893d7cd622079a236f5690692a98bf258bea4f3cfd764307c730a1896da0b853eddda6498414d00 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b -DIST lilypond-2.19.64.tar.gz 17174255 BLAKE2B 840b91ff39648e7ad741d1139a2040ee33aa922934a7bf891649ea99cf4aa95b0e82a98421e154cae3fb617ac8b38dc412e072206e3437e770801fe91ab914a3 SHA512 f0728496b0271c55e29871f23df53ea1be7036029c85a5ba4b88cd7c6005ff0ec880ab0992e9d99c36c7e82e83023a809f783e69f10982de3ccdd161f38ecec9 DIST lilypond-2.19.80.tar.gz 17244725 BLAKE2B f0883d59b1a14634d5d32e6a6f02c0a224643d6d28a3da623d5163396b74ebd15c3307c33c4d96778254fb6486a74c3324d26e3015d51fa163e3765f2c3767aa SHA512 13a7f258bac8ff77ad6d3879f128e86dd5bf45c7780c9738e6976915574d2dfc5404e6f49ca61dcaf8bb15eb266e65fedec4131a50ded7ab305d1856bbd7a3d6 diff --git a/media-sound/lilypond/lilypond-2.19.54.ebuild b/media-sound/lilypond/lilypond-2.19.54.ebuild deleted file mode 100644 index 36867682c19..000 --- a/media-sound/lilypond/lilypond-2.19.54.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -[[ "${PV}" = "" ]] && inherit git-r3 -inherit elisp-common autotools python-single-r1 xdg-utils - -if [[ "${PV}" = "" ]]; then - EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" -else - SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~hppa ~x86" -fi - -DESCRIPTION="GNU Music Typesetter" -HOMEPAGE="http://lilypond.org/"; - -LICENSE="GPL-3 FDL-1.3" -SLOT="0" -LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" -IUSE="debug emacs guile2 profile vim-syntax" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=">=app-text/ghostscript-gpl-8.15 - >=dev-scheme/guile-1.8.2:12[deprecated,regex] - media-fonts/tex-gyre - media-libs/fontconfig - media-libs/freetype:2 - >=x11-libs/pango-1.12.3 - emacs? ( virtual/emacs ) - guile2? ( >=dev-scheme/guile-2:12 ) - !guile2? ( - >=dev-scheme/guile-1.8.2:12[deprecated,regex] - =metapost-1.803 is selected if it's installed, bug 498704 - if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then - if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then - einfo "Updating metapost symlink" - eselect mpost update || die - fi - fi - - python-single-r1_pkg_setup -} - -src_prepare() { - default - - if ! use vim-syntax ; then - sed -i 's/vim//' GNUmakefile.in || die - fi - - # respect CFLAGS - sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die - - for lang in ${LANGS}; do - has ${lang} ${LINGUAS-${lang}} || rm po/${lang}.po || die - done - - # respect AR - sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die - - # remove bundled texinfo file (fixes bug #448560) - rm tex/texinfo.tex || die - - eautoreconf - - xdg_environment_reset #586592 -} - -src_configure() { - # documentation generation currently not supported since it requires a newer - # version of texi2html than is currently in the tree - - local myeconfargs+=( - --with-texgyre-dir=/usr/share/fonts/tex-gyre - --disable-documentation - --disable-optimising - --disable-pipe - $(use_enable debug debugging) - $(use_enable guile2) - $
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 61a3a23d82aff2fbbbfc002245cb026d30e94b21 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Mar 18 12:11:22 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Mar 18 12:11:22 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61a3a23d media-sound/lilypond: amd64 stable wrt bug #647476 Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-sound/lilypond/lilypond-2.19.80-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild index 15c191a79a2..11303d06464 100644 --- a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild +++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild @@ -11,7 +11,7 @@ if [[ "${PV}" = "" ]]; then EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" else SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa x86" + KEYWORDS="amd64 ~arm ~arm64 ~hppa x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 09c652fe181262aa88c5b24bcfa41b72fe9006a9 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Mar 18 00:26:12 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Mar 18 00:40:06 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09c652fe media-sound/lilypond: x86 stable (bug #647476) Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-sound/lilypond/lilypond-2.19.80-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild index 783231bbe34..15c191a79a2 100644 --- a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild +++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild @@ -11,7 +11,7 @@ if [[ "${PV}" = "" ]]; then EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" else SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: ef7759378c2e57b172405bb3998c989c7cc37fb2 Author: Matt Turner gentoo org> AuthorDate: Sat Mar 17 18:20:49 2018 + Commit: Matt Turner gentoo org> CommitDate: Sat Mar 17 18:20:55 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef775937 media-sound/lilypond: Drop alpha keywords, bug 647476 media-sound/lilypond/lilypond-2.18.2-r3.ebuild | 2 +- media-sound/lilypond/lilypond-2.19.54.ebuild| 2 +- media-sound/lilypond/lilypond-2.19.64.ebuild| 2 +- media-sound/lilypond/lilypond-2.19.80-r1.ebuild | 2 +- media-sound/lilypond/lilypond-2.19.80.ebuild| 2 +- media-sound/lilypond/lilypond-.ebuild | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild index 2bb07eef335..3c3dc3ec94a 100644 --- a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild +++ b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://lilypond.org/"; LICENSE="GPL-3 FDL-1.3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa x86" +KEYWORDS="amd64 ~arm ~hppa x86" LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" IUSE="debug emacs profile vim-syntax" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/media-sound/lilypond/lilypond-2.19.54.ebuild b/media-sound/lilypond/lilypond-2.19.54.ebuild index ba9f4899580..36867682c19 100644 --- a/media-sound/lilypond/lilypond-2.19.54.ebuild +++ b/media-sound/lilypond/lilypond-2.19.54.ebuild @@ -11,7 +11,7 @@ if [[ "${PV}" = "" ]]; then EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" else SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; - KEYWORDS="alpha ~amd64 ~arm ~hppa ~x86" + KEYWORDS="~amd64 ~arm ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter" diff --git a/media-sound/lilypond/lilypond-2.19.64.ebuild b/media-sound/lilypond/lilypond-2.19.64.ebuild index 2388951c777..bd8d61ad63c 100644 --- a/media-sound/lilypond/lilypond-2.19.64.ebuild +++ b/media-sound/lilypond/lilypond-2.19.64.ebuild @@ -11,7 +11,7 @@ if [[ "${PV}" = "" ]]; then EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" else SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter" diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild index 7bada7ba83e..783231bbe34 100644 --- a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild +++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild @@ -11,7 +11,7 @@ if [[ "${PV}" = "" ]]; then EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" else SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter" diff --git a/media-sound/lilypond/lilypond-2.19.80.ebuild b/media-sound/lilypond/lilypond-2.19.80.ebuild index 893b3b8c814..2fe3ef42d3e 100644 --- a/media-sound/lilypond/lilypond-2.19.80.ebuild +++ b/media-sound/lilypond/lilypond-2.19.80.ebuild @@ -11,7 +11,7 @@ if [[ "${PV}" = "" ]]; then EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" else SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter" diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index e24a72ba576..93bb8d785b9 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -11,7 +11,7 @@ if [[ "${PV}" = "" ]]; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"; else SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/
commit: cb700cf3a8b38490fc2a9e9368b8720045a2ea81 Author: Miroslav Šulc gentoo org> AuthorDate: Sat Feb 17 11:59:53 2018 + Commit: Miroslav Šulc gentoo org> CommitDate: Sat Feb 17 11:59:53 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb700cf3 media-sound/lilypond: fixed bug causing lilypond does not compile (programming_error does not return value) Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../lilypond/files/lilypond--programming_error.patch| 13 + media-sound/lilypond/lilypond-.ebuild | 1 + 2 files changed, 14 insertions(+) diff --git a/media-sound/lilypond/files/lilypond--programming_error.patch b/media-sound/lilypond/files/lilypond--programming_error.patch new file mode 100644 index 000..f2b85164a6e --- /dev/null +++ b/media-sound/lilypond/files/lilypond--programming_error.patch @@ -0,0 +1,13 @@ +diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc +index d25e6c9ef8..2fd2e4a4fa 100644 +--- a/lily/general-scheme.cc b/lily/general-scheme.cc +@@ -275,7 +275,7 @@ LY_DEFINE (ly_protects, "ly:protects", + #if SCM_MAJOR_VERSION < 2 || SCM_MAJOR_VERSION == 2 && SCM_MINOR_VERSION < 1 + return scm_protects; + #else +- return programming_error ("ly:protects is not supported in Guile 2.1"); ++ programming_error ("ly:protects is not supported in Guile 2.1"); + #endif + } + diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 27bfc06997d..e24a72ba576 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -22,6 +22,7 @@ SLOT="0" LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" IUSE="debug emacs guile2 profile vim-syntax" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +PATCHES=(${FILESDIR}/$P-programming_error.patch) RDEPEND=">=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12[deprecated,regex]
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/, media-sound/lilypond/files/
commit: 554ac2c79d1ba54ed79eb87cbb511e5c48f86230 Author: Jonathan Scruggs gmail com> AuthorDate: Wed Jan 10 18:48:12 2018 + Commit: Amy Liffey gentoo org> CommitDate: Wed Jan 10 22:43:25 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=554ac2c7 media-sound/lilypond: Add patch to remove ly protects The function was causing errors errors with Guile v2.2. The patch is based on the discussion from the developers here: http://lists.gnu.org/archive/html/guile-user/2017-03/msg00042.html Remove linguas logic. Closes: #6822 Closes: https://bugs.gentoo.org/642962 Closes: https://bugs.gentoo.org/640554 .../files/lilypond-2.19.80-remove-ly-protect.patch | 39 ++ media-sound/lilypond/lilypond-2.19.80-r1.ebuild| 144 + 2 files changed, 183 insertions(+) diff --git a/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch b/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch new file mode 100644 index 000..d21b0a413a1 --- /dev/null +++ b/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch @@ -0,0 +1,39 @@ +diff -purN a/lily/general-scheme.cc b/lily/general-scheme.cc +--- a/lily/general-scheme.cc 2017-10-15 17:42:11.0 +0100 b/lily/general-scheme.cc 2018-01-10 16:20:08.129066507 + +@@ -267,6 +267,8 @@ LY_DEFINE (ly_dimension_p, "ly:dimension + /* + Debugging mem leaks: + */ ++ ++/* + LY_DEFINE (ly_protects, "ly:protects", +0, 0, 0, (), +"Return hash of protected objects.") +@@ -278,6 +280,7 @@ LY_DEFINE (ly_protects, "ly:protects", + return programming_error ("ly:protects is not supported in Guile 2.1"); + #endif + } ++*/ + + LY_DEFINE (ly_gettext, "ly:gettext", +1, 0, 0, (SCM original), +diff -purN a/scm/lily.scm b/scm/lily.scm +--- a/scm/lily.scm 2017-10-15 17:42:11.0 +0100 b/scm/lily.scm 2018-01-10 16:22:54.914457450 + +@@ -836,10 +836,11 @@ messages into errors.") + + (define-public (dump-gc-protects) + (set! gc-protect-stat-count (1+ gc-protect-stat-count)) +- (let* ((protects (sort (hash-table->alist (ly:protects)) +- (lambda (a b) +- (< (object-address (car a)) +- (object-address (car b)) ++ (let* (;(protects (sort (hash-table->alist (ly:protects)) ++ ;(lambda (a b) ++ ; (< (object-address (car a)) ++ ; (object-address (car b)) ++ (protects '()) + (out-file-name (string-append + "gcstat-" (number->string gc-protect-stat-count) + ".scm")) diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild new file mode 100644 index 000..7bada7ba83e --- /dev/null +++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +[[ "${PV}" = "" ]] && inherit git-r3 +inherit elisp-common autotools python-single-r1 xdg-utils + +if [[ "${PV}" = "" ]]; then + EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" +else + SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86" +fi + +DESCRIPTION="GNU Music Typesetter" +HOMEPAGE="http://lilypond.org/"; + +LICENSE="GPL-3 FDL-1.3" +SLOT="0" +IUSE="debug emacs guile2 profile vim-syntax" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=">=app-text/ghostscript-gpl-8.15 + >=dev-scheme/guile-1.8.2:12[deprecated,regex] + media-fonts/tex-gyre + media-libs/fontconfig + media-libs/freetype:2 + >=x11-libs/pango-1.12.3 + emacs? ( virtual/emacs ) + guile2? ( >=dev-scheme/guile-2:12 ) + !guile2? ( + >=dev-scheme/guile-1.8.2:12[deprecated,regex] + =metapost-1.803 is selected if it's installed, bug 498704 + if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then + if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then + einfo "Updating metapost symlink" + eselect mpost update || die + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + default + + if ! use vim-syntax ; then + sed -i 's/vim//' GNUmakefile.in || die + fi + + # respect CFLAGS + sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die + + # respect AR + sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die + + # remove bundled texinfo file (fixes bug #448560) + rm tex/texinfo.tex || die + + eautoreconf + + xdg_environment_reset #586592 +} + +src_configure() { +
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 6e2956ca418df76496eabcff03e8caa3ec220a0a Author: Ulrich Müller gentoo org> AuthorDate: Sat Jan 6 19:51:01 2018 + Commit: Ulrich Müller gentoo org> CommitDate: Sat Jan 6 19:53:35 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e2956ca media-sound/lilypond: Test LINGUAS rather than linguas_* USE flags. Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-sound/lilypond/lilypond-2.18.2-r3.ebuild | 6 +++--- media-sound/lilypond/lilypond-2.19.54.ebuild | 6 +++--- media-sound/lilypond/lilypond-2.19.64.ebuild | 6 +++--- media-sound/lilypond/lilypond-2.19.80.ebuild | 6 +++--- media-sound/lilypond/lilypond-.ebuild | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild index ee3ea59a82a..2bb07eef335 100644 --- a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild +++ b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,7 @@ LICENSE="GPL-3 FDL-1.3" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~hppa x86" LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" -IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}" +IUSE="debug emacs profile vim-syntax" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=">=app-text/ghostscript-gpl-8.15 @@ -76,7 +76,7 @@ src_prepare() { sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die for lang in ${LANGS}; do - use linguas_${lang} || rm po/${lang}.po || die + has ${lang} ${LINGUAS-${lang}} || rm po/${lang}.po || die done # respect AR diff --git a/media-sound/lilypond/lilypond-2.19.54.ebuild b/media-sound/lilypond/lilypond-2.19.54.ebuild index c0d01a0d9e2..ba9f4899580 100644 --- a/media-sound/lilypond/lilypond-2.19.54.ebuild +++ b/media-sound/lilypond/lilypond-2.19.54.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,7 +20,7 @@ HOMEPAGE="http://lilypond.org/"; LICENSE="GPL-3 FDL-1.3" SLOT="0" LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" -IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}" +IUSE="debug emacs guile2 profile vim-syntax" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=">=app-text/ghostscript-gpl-8.15 @@ -81,7 +81,7 @@ src_prepare() { sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die for lang in ${LANGS}; do - use linguas_${lang} || rm po/${lang}.po || die + has ${lang} ${LINGUAS-${lang}} || rm po/${lang}.po || die done # respect AR diff --git a/media-sound/lilypond/lilypond-2.19.64.ebuild b/media-sound/lilypond/lilypond-2.19.64.ebuild index 5dd683dc418..2388951c777 100644 --- a/media-sound/lilypond/lilypond-2.19.64.ebuild +++ b/media-sound/lilypond/lilypond-2.19.64.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,7 +20,7 @@ HOMEPAGE="http://lilypond.org/"; LICENSE="GPL-3 FDL-1.3" SLOT="0" LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" -IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}" +IUSE="debug emacs guile2 profile vim-syntax" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=">=app-text/ghostscript-gpl-8.15 @@ -81,7 +81,7 @@ src_prepare() { sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die for lang in ${LANGS}; do - use linguas_${lang} || rm po/${lang}.po || die + has ${lang} ${LINGUAS-${lang}} || rm po/${lang}.po || die done # respect AR diff --git a/media-sound/lilypond/lilypond-2.19.80.ebuild b/media-sound/lilypond/lilypond-2.19.80.ebuild index 3fae42dbe7e..893b3b8c814 100644 --- a/media-sound/lilypond/lilypond-2.19.80.ebuild +++ b/media-sound/lilypond/lilypond-2.19.80.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,7 +20,7 @@ HOMEPAGE="http://lilypond.org/"; LICENSE="GPL-3 FDL-1.3" SLOT="0" LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" -IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}" +IUSE="debug emacs guile2 profile vim-syntax" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=">=app-text/ghostscript-gpl-8.15 @@ -81,7 +81,7 @@ src_prepare() { sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die for lang in ${LANGS}; do - use linguas_${lang} || rm po/${lang}.po || die + has ${lang} ${LINGUAS-${lang}} || rm po
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: e2148c7f93d676e91662e88f4029f2e4474c8c72 Author: Karl Linden gmail com> AuthorDate: Sun Nov 26 18:40:00 2017 + Commit: Patrice Clement gentoo org> CommitDate: Thu Nov 30 14:45:56 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2148c7f media-sound/lilypond: version bump to 2.19.80. Package-Manager: Portage-2.3.16, Repoman-2.3.6 Closes: https://bugs.gentoo.org/637596 Closes: https://github.com/gentoo/gentoo/pull/6312 media-sound/lilypond/Manifest| 7 +- media-sound/lilypond/lilypond-2.19.80.ebuild | 147 +++ 2 files changed, 151 insertions(+), 3 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 48f81deda1c..fabbf167fac 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,5 +1,6 @@ DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 WHIRLPOOL 95db264992a1e425fd1ee53d980941eef554c1784a1adfc105750d82d11664f61207c2b1897b6e99448790131c0715f08401f45b663c420553925596c6fd4b1c DIST lilypond-2.19.54.tar.gz 17068093 SHA256 0ee709f1e58caf13cf5abea9bb74179ba5c7a4f2dc470ec48d9aefb553e68a58 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b WHIRLPOOL 7ce1cc7e89c5907515f8505a1e1efe1aadf8df48c24d70a2fe39924cf9301b6c676121e6c6ceac75b76a085e5d940c6c3bb6c31e87d314dda72c68f0af1307c8 -DIST lilypond-2.19.61.tar.gz 17154903 SHA256 fc42103824cbd9e5d230ded0f73c8ecffae14998b2ad2e136914f7eab1eecb0a SHA512 870d747f6d29644824e965f4a0ff37555afbf8d8013f01965f64d4b95ca6487d15468aee27fa44036ed2d35b00f8e9bc69c22a670ad97f04ae39a16d57ea83b9 WHIRLPOOL bc690e42b2b52a5b39dea956f83558e3adb72f8027a1acb2441cd104fd5d85f2860f2a9f0c76ec882a9404ed6cbfcecd3ee4aa60d3148e79405ca9487e4de26f -DIST lilypond-2.19.63.tar.gz 17172960 SHA256 803f3bbf87d68fbde4ea364fc62394e5907e73cecd6188bb8f12fa4f433d9b43 SHA512 58f8922e2965bb37a08472f49d88e650d2c530a29e4672b858c0d8d91dbd8a94db78668c37424ab59084cc03c7cd07e931b138374d351ecd580f23986035f106 WHIRLPOOL 926916f23237c6ea10aaae4081b00c04aa10706cf81be51d99afba2e1eb8c8638039def026a16b6cca2e0d57120e737f0f2d4809c1e12118e78a987467162749 -DIST lilypond-2.19.64.tar.gz 17174255 SHA256 9b660fe99914c54cf30b391976d6e30f7dc7683928b3bf9b3454250c86990137 SHA512 f0728496b0271c55e29871f23df53ea1be7036029c85a5ba4b88cd7c6005ff0ec880ab0992e9d99c36c7e82e83023a809f783e69f10982de3ccdd161f38ecec9 WHIRLPOOL b13d8d9fc72392653d090175ec4cba7858ed7015607e4c249454a42a4d3027f5c1799f527aab86b57eac38b36510ce5b08b7b79f3f536386c14b7f3f285ed15c +DIST lilypond-2.19.61.tar.gz 17154903 BLAKE2B e592d1e25e6bdac0136410ded4edd3bfd1c0cc45433a2455bed2fead5fddc7b99ba2d8eac079e6bd79046bb621d6294e3c8fd296c70efd18c4dfe4c678c50c4f SHA512 870d747f6d29644824e965f4a0ff37555afbf8d8013f01965f64d4b95ca6487d15468aee27fa44036ed2d35b00f8e9bc69c22a670ad97f04ae39a16d57ea83b9 +DIST lilypond-2.19.63.tar.gz 17172960 BLAKE2B 6f81f86cef097ef466db47f5056c4dfac53f31ffdfb99c127ca4e477c8828dacbc8ac0fdb6eb432516337252336c55e24ebc4effcca38a2f2c8bd7de7ce9aba9 SHA512 58f8922e2965bb37a08472f49d88e650d2c530a29e4672b858c0d8d91dbd8a94db78668c37424ab59084cc03c7cd07e931b138374d351ecd580f23986035f106 +DIST lilypond-2.19.64.tar.gz 17174255 BLAKE2B 840b91ff39648e7ad741d1139a2040ee33aa922934a7bf891649ea99cf4aa95b0e82a98421e154cae3fb617ac8b38dc412e072206e3437e770801fe91ab914a3 SHA512 f0728496b0271c55e29871f23df53ea1be7036029c85a5ba4b88cd7c6005ff0ec880ab0992e9d99c36c7e82e83023a809f783e69f10982de3ccdd161f38ecec9 +DIST lilypond-2.19.80.tar.gz 17244725 BLAKE2B f0883d59b1a14634d5d32e6a6f02c0a224643d6d28a3da623d5163396b74ebd15c3307c33c4d96778254fb6486a74c3324d26e3015d51fa163e3765f2c3767aa SHA512 13a7f258bac8ff77ad6d3879f128e86dd5bf45c7780c9738e6976915574d2dfc5404e6f49ca61dcaf8bb15eb266e65fedec4131a50ded7ab305d1856bbd7a3d6 diff --git a/media-sound/lilypond/lilypond-2.19.80.ebuild b/media-sound/lilypond/lilypond-2.19.80.ebuild new file mode 100644 index 000..5dd683dc418 --- /dev/null +++ b/media-sound/lilypond/lilypond-2.19.80.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +[[ "${PV}" = "" ]] && inherit git-r3 +inherit elisp-common autotools python-single-r1 xdg-utils + +if [[ "${PV}" = "" ]]; then + EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" +else + SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86" +fi + +DESCRIPTION="GNU Music Typesetter" +HOMEPAGE="http://lilypond.org/"; + +LICENSE="GPL-3 FDL-1.3" +SLOT="0" +LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" +IU
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 960dae034d2e4a5c2606009a4bc1656fc32f4470 Author: Karl Linden gmail com> AuthorDate: Mon Nov 27 06:23:17 2017 + Commit: Patrice Clement gentoo org> CommitDate: Thu Nov 30 14:46:04 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=960dae03 media-sound/lilypond-: use https for git repo. This updates the EGIT_REPO_URI with the one from: https://git.savannah.gnu.org/gitweb/?p=lilypond.git Package-Manager: Portage-2.3.16, Repoman-2.3.6 media-sound/lilypond/Manifest | 2 +- media-sound/lilypond/lilypond-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 9eadf5b38fd..916718c6f99 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,4 +1,4 @@ -DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 WHIRLPOOL 95db264992a1e425fd1ee53d980941eef554c1784a1adfc105750d82d11664f61207c2b1897b6e99448790131c0715f08401f45b663c420553925596c6fd4b1c +DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 DIST lilypond-2.19.54.tar.gz 17068093 SHA256 0ee709f1e58caf13cf5abea9bb74179ba5c7a4f2dc470ec48d9aefb553e68a58 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b WHIRLPOOL 7ce1cc7e89c5907515f8505a1e1efe1aadf8df48c24d70a2fe39924cf9301b6c676121e6c6ceac75b76a085e5d940c6c3bb6c31e87d314dda72c68f0af1307c8 DIST lilypond-2.19.64.tar.gz 17174255 BLAKE2B 840b91ff39648e7ad741d1139a2040ee33aa922934a7bf891649ea99cf4aa95b0e82a98421e154cae3fb617ac8b38dc412e072206e3437e770801fe91ab914a3 SHA512 f0728496b0271c55e29871f23df53ea1be7036029c85a5ba4b88cd7c6005ff0ec880ab0992e9d99c36c7e82e83023a809f783e69f10982de3ccdd161f38ecec9 DIST lilypond-2.19.80.tar.gz 17244725 BLAKE2B f0883d59b1a14634d5d32e6a6f02c0a224643d6d28a3da623d5163396b74ebd15c3307c33c4d96778254fb6486a74c3324d26e3015d51fa163e3765f2c3767aa SHA512 13a7f258bac8ff77ad6d3879f128e86dd5bf45c7780c9738e6976915574d2dfc5404e6f49ca61dcaf8bb15eb266e65fedec4131a50ded7ab305d1856bbd7a3d6 diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 3fae42dbe7e..e451c38deeb 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 ) inherit elisp-common autotools python-single-r1 xdg-utils if [[ "${PV}" = "" ]]; then - EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" + EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"; else SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 8fc37c742ee8b73a1ac9fc35671e58c35ecc03ba Author: Karl Linden gmail com> AuthorDate: Sun Nov 26 18:51:36 2017 + Commit: Patrice Clement gentoo org> CommitDate: Thu Nov 30 14:46:00 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc37c74 media-sound/lilypond: fix sed invocation. Closes: https://bugs.gentoo.org/629496 Package-Manager: Portage-2.3.16, Repoman-2.3.6 media-sound/lilypond/lilypond-2.18.2-r3.ebuild | 4 ++-- media-sound/lilypond/lilypond-2.19.80.ebuild | 2 +- media-sound/lilypond/lilypond-.ebuild | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild index 4afc18c6e1d..ee3ea59a82a 100644 --- a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild +++ b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -80,7 +80,7 @@ src_prepare() { done # respect AR - sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die + sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die # remove bundled texinfo file (fixes bug #448560) rm tex/texinfo.tex || die diff --git a/media-sound/lilypond/lilypond-2.19.80.ebuild b/media-sound/lilypond/lilypond-2.19.80.ebuild index 5dd683dc418..3fae42dbe7e 100644 --- a/media-sound/lilypond/lilypond-2.19.80.ebuild +++ b/media-sound/lilypond/lilypond-2.19.80.ebuild @@ -85,7 +85,7 @@ src_prepare() { done # respect AR - sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die + sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die # remove bundled texinfo file (fixes bug #448560) rm tex/texinfo.tex || die diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 5dd683dc418..3fae42dbe7e 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -85,7 +85,7 @@ src_prepare() { done # respect AR - sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die + sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die # remove bundled texinfo file (fixes bug #448560) rm tex/texinfo.tex || die
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 52201849c88be17ce3d964508bc23b07313b137e Author: Karl Linden gmail com> AuthorDate: Sun Nov 26 18:45:48 2017 + Commit: Patrice Clement gentoo org> CommitDate: Thu Nov 30 14:45:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52201849 media-sound/lilypond: remove old. Package-Manager: Portage-2.3.16, Repoman-2.3.6 media-sound/lilypond/Manifest| 2 - media-sound/lilypond/lilypond-2.19.61.ebuild | 147 --- media-sound/lilypond/lilypond-2.19.63.ebuild | 147 --- 3 files changed, 296 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index fabbf167fac..9eadf5b38fd 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,6 +1,4 @@ DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 WHIRLPOOL 95db264992a1e425fd1ee53d980941eef554c1784a1adfc105750d82d11664f61207c2b1897b6e99448790131c0715f08401f45b663c420553925596c6fd4b1c DIST lilypond-2.19.54.tar.gz 17068093 SHA256 0ee709f1e58caf13cf5abea9bb74179ba5c7a4f2dc470ec48d9aefb553e68a58 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b WHIRLPOOL 7ce1cc7e89c5907515f8505a1e1efe1aadf8df48c24d70a2fe39924cf9301b6c676121e6c6ceac75b76a085e5d940c6c3bb6c31e87d314dda72c68f0af1307c8 -DIST lilypond-2.19.61.tar.gz 17154903 BLAKE2B e592d1e25e6bdac0136410ded4edd3bfd1c0cc45433a2455bed2fead5fddc7b99ba2d8eac079e6bd79046bb621d6294e3c8fd296c70efd18c4dfe4c678c50c4f SHA512 870d747f6d29644824e965f4a0ff37555afbf8d8013f01965f64d4b95ca6487d15468aee27fa44036ed2d35b00f8e9bc69c22a670ad97f04ae39a16d57ea83b9 -DIST lilypond-2.19.63.tar.gz 17172960 BLAKE2B 6f81f86cef097ef466db47f5056c4dfac53f31ffdfb99c127ca4e477c8828dacbc8ac0fdb6eb432516337252336c55e24ebc4effcca38a2f2c8bd7de7ce9aba9 SHA512 58f8922e2965bb37a08472f49d88e650d2c530a29e4672b858c0d8d91dbd8a94db78668c37424ab59084cc03c7cd07e931b138374d351ecd580f23986035f106 DIST lilypond-2.19.64.tar.gz 17174255 BLAKE2B 840b91ff39648e7ad741d1139a2040ee33aa922934a7bf891649ea99cf4aa95b0e82a98421e154cae3fb617ac8b38dc412e072206e3437e770801fe91ab914a3 SHA512 f0728496b0271c55e29871f23df53ea1be7036029c85a5ba4b88cd7c6005ff0ec880ab0992e9d99c36c7e82e83023a809f783e69f10982de3ccdd161f38ecec9 DIST lilypond-2.19.80.tar.gz 17244725 BLAKE2B f0883d59b1a14634d5d32e6a6f02c0a224643d6d28a3da623d5163396b74ebd15c3307c33c4d96778254fb6486a74c3324d26e3015d51fa163e3765f2c3767aa SHA512 13a7f258bac8ff77ad6d3879f128e86dd5bf45c7780c9738e6976915574d2dfc5404e6f49ca61dcaf8bb15eb266e65fedec4131a50ded7ab305d1856bbd7a3d6 diff --git a/media-sound/lilypond/lilypond-2.19.61.ebuild b/media-sound/lilypond/lilypond-2.19.61.ebuild deleted file mode 100644 index 5dd683dc418..000 --- a/media-sound/lilypond/lilypond-2.19.61.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -[[ "${PV}" = "" ]] && inherit git-r3 -inherit elisp-common autotools python-single-r1 xdg-utils - -if [[ "${PV}" = "" ]]; then - EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" -else - SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86" -fi - -DESCRIPTION="GNU Music Typesetter" -HOMEPAGE="http://lilypond.org/"; - -LICENSE="GPL-3 FDL-1.3" -SLOT="0" -LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" -IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=">=app-text/ghostscript-gpl-8.15 - >=dev-scheme/guile-1.8.2:12[deprecated,regex] - media-fonts/tex-gyre - media-libs/fontconfig - media-libs/freetype:2 - >=x11-libs/pango-1.12.3 - emacs? ( virtual/emacs ) - guile2? ( >=dev-scheme/guile-2:12 ) - !guile2? ( - >=dev-scheme/guile-1.8.2:12[deprecated,regex] - =metapost-1.803 is selected if it's installed, bug 498704 - if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then - if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then - einfo "Updating metapost symlink" - eselect mpost update || die - fi - fi - - python-single-r1_pkg_setup -} - -src_prepare() { - default - - if ! use vim-syntax ; then - sed -i 's/vim//' GNUmakefile.in || die - fi - - # respect CFLAGS - sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die - - for lang in ${LANGS}; do - use linguas_${lan
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 7e6e5da5c47b84f43ed762f03e55eff1e290d774 Author: Tim Harder gentoo org> AuthorDate: Sat Jul 29 10:15:46 2017 + Commit: Tim Harder gentoo org> CommitDate: Sat Jul 29 11:32:25 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e6e5da5 media-sound/lilypond: version bump to 2.19.64 media-sound/lilypond/Manifest| 1 + media-sound/lilypond/lilypond-2.19.64.ebuild | 147 +++ 2 files changed, 148 insertions(+) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 0822417874d..48f81deda1c 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -2,3 +2,4 @@ DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875c DIST lilypond-2.19.54.tar.gz 17068093 SHA256 0ee709f1e58caf13cf5abea9bb74179ba5c7a4f2dc470ec48d9aefb553e68a58 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b WHIRLPOOL 7ce1cc7e89c5907515f8505a1e1efe1aadf8df48c24d70a2fe39924cf9301b6c676121e6c6ceac75b76a085e5d940c6c3bb6c31e87d314dda72c68f0af1307c8 DIST lilypond-2.19.61.tar.gz 17154903 SHA256 fc42103824cbd9e5d230ded0f73c8ecffae14998b2ad2e136914f7eab1eecb0a SHA512 870d747f6d29644824e965f4a0ff37555afbf8d8013f01965f64d4b95ca6487d15468aee27fa44036ed2d35b00f8e9bc69c22a670ad97f04ae39a16d57ea83b9 WHIRLPOOL bc690e42b2b52a5b39dea956f83558e3adb72f8027a1acb2441cd104fd5d85f2860f2a9f0c76ec882a9404ed6cbfcecd3ee4aa60d3148e79405ca9487e4de26f DIST lilypond-2.19.63.tar.gz 17172960 SHA256 803f3bbf87d68fbde4ea364fc62394e5907e73cecd6188bb8f12fa4f433d9b43 SHA512 58f8922e2965bb37a08472f49d88e650d2c530a29e4672b858c0d8d91dbd8a94db78668c37424ab59084cc03c7cd07e931b138374d351ecd580f23986035f106 WHIRLPOOL 926916f23237c6ea10aaae4081b00c04aa10706cf81be51d99afba2e1eb8c8638039def026a16b6cca2e0d57120e737f0f2d4809c1e12118e78a987467162749 +DIST lilypond-2.19.64.tar.gz 17174255 SHA256 9b660fe99914c54cf30b391976d6e30f7dc7683928b3bf9b3454250c86990137 SHA512 f0728496b0271c55e29871f23df53ea1be7036029c85a5ba4b88cd7c6005ff0ec880ab0992e9d99c36c7e82e83023a809f783e69f10982de3ccdd161f38ecec9 WHIRLPOOL b13d8d9fc72392653d090175ec4cba7858ed7015607e4c249454a42a4d3027f5c1799f527aab86b57eac38b36510ce5b08b7b79f3f536386c14b7f3f285ed15c diff --git a/media-sound/lilypond/lilypond-2.19.64.ebuild b/media-sound/lilypond/lilypond-2.19.64.ebuild new file mode 100644 index 000..5dd683dc418 --- /dev/null +++ b/media-sound/lilypond/lilypond-2.19.64.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +[[ "${PV}" = "" ]] && inherit git-r3 +inherit elisp-common autotools python-single-r1 xdg-utils + +if [[ "${PV}" = "" ]]; then + EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" +else + SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86" +fi + +DESCRIPTION="GNU Music Typesetter" +HOMEPAGE="http://lilypond.org/"; + +LICENSE="GPL-3 FDL-1.3" +SLOT="0" +LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" +IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=">=app-text/ghostscript-gpl-8.15 + >=dev-scheme/guile-1.8.2:12[deprecated,regex] + media-fonts/tex-gyre + media-libs/fontconfig + media-libs/freetype:2 + >=x11-libs/pango-1.12.3 + emacs? ( virtual/emacs ) + guile2? ( >=dev-scheme/guile-2:12 ) + !guile2? ( + >=dev-scheme/guile-1.8.2:12[deprecated,regex] + =metapost-1.803 is selected if it's installed, bug 498704 + if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then + if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then + einfo "Updating metapost symlink" + eselect mpost update || die + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + default + + if ! use vim-syntax ; then + sed -i 's/vim//' GNUmakefile.in || die + fi + + # respect CFLAGS + sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die + + for lang in ${LANGS}; do + use linguas_${lang} || rm po/${lang}.po || die + done + + # respect AR + sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die + + # remove bundled texinfo file (fixes bug #448560) + rm tex/texinfo.tex || die + + eautoreconf + + xdg_environment_reset #586592 +} + +src_configure() { + # documentation generation currently not supported since it requires a newer + # version of texi2html than is currently in the tree + + local myeconfargs=( +
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 9423fe5d37e302bb7a3239810d75294146ff0629 Author: Tim Harder gentoo org> AuthorDate: Mon Jul 10 07:31:18 2017 + Commit: Tim Harder gentoo org> CommitDate: Mon Jul 10 07:34:51 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9423fe5d media-sound/lilypond: remove old media-sound/lilypond/Manifest| 6 -- media-sound/lilypond/lilypond-2.19.55.ebuild | 147 --- media-sound/lilypond/lilypond-2.19.56.ebuild | 147 --- media-sound/lilypond/lilypond-2.19.57.ebuild | 147 --- media-sound/lilypond/lilypond-2.19.58.ebuild | 147 --- media-sound/lilypond/lilypond-2.19.59.ebuild | 147 --- media-sound/lilypond/lilypond-2.19.60.ebuild | 147 --- 7 files changed, 888 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 29f68bd6a4d..0822417874d 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,10 +1,4 @@ DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 WHIRLPOOL 95db264992a1e425fd1ee53d980941eef554c1784a1adfc105750d82d11664f61207c2b1897b6e99448790131c0715f08401f45b663c420553925596c6fd4b1c DIST lilypond-2.19.54.tar.gz 17068093 SHA256 0ee709f1e58caf13cf5abea9bb74179ba5c7a4f2dc470ec48d9aefb553e68a58 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b WHIRLPOOL 7ce1cc7e89c5907515f8505a1e1efe1aadf8df48c24d70a2fe39924cf9301b6c676121e6c6ceac75b76a085e5d940c6c3bb6c31e87d314dda72c68f0af1307c8 -DIST lilypond-2.19.55.tar.gz 17138603 SHA256 fe39c2ce7ff5c1945e4bf96deffdf17fe962d681aa9aeb585e5691e301acb31b SHA512 4e3c8f408a3508bd6f82951a417aa67cbbcf11d9d77e128cb52512418d3f91df781ac07356ea96a1b60b67ce42c48ee7dcad44100ddf64584a6f4e0f58f1e0a5 WHIRLPOOL ef60cd6bd5043f5d22f97513e0c93a96ea6698bcf26ebadf204bf30ce19aed70bfb7114d158f23b36370543858bda44e7fb660f778ecd420fa9430801681c55c -DIST lilypond-2.19.56.tar.gz 17157260 SHA256 71e53cb4a7c1fe33f383be1af186b40a9b42d81784f6fb5e605c29be5359265c SHA512 e56dc3dab2768d0056e2525d19ab9e2e0c74e781a2bc914ac910a4c85f770ef55561e6110386211025de34fa608d16988cc0a3ae398e8f347ac993013ef832af WHIRLPOOL a042048bea43ee2cfe49612b6ec1ae550d3abfa7e4ed0a62c0c805ac429340f2fa4979e1c3995aa516796aadf6135d2c714212d971a087bdb725fa6d89f8f567 -DIST lilypond-2.19.57.tar.gz 17182103 SHA256 be86019ae91cf78267081e96f35cf682931d0219215e160b16b03b907cac755a SHA512 12fed797591e95452d628291c95a5a22fadd6f54a3d98fbb40d2e1e1061153cfdb555a843a7f036139194d8e4a8bd6ac0a27ad94bec7fe632aa4e8cca5a328da WHIRLPOOL fdb8b80a008e076494a3fec50cc79e4436b6f9765837b99394911e7416642f5063497690490f591569f6c312f7cdaa30e2d4dc6c6c768f9da0d1c3f4d32c3366 -DIST lilypond-2.19.58.tar.gz 17188063 SHA256 074ee50299c7791403c8354a3604a0f0b3d35b8440fc53726d181b17c7ba4a72 SHA512 e5117a02c0a18b335fc74aa864c8432fe8dcf91691ad592cae7991e1097063397b82bdfbab6b24439e0027ce946059f2169534d998e63f2230fcbbba0fcc8e91 WHIRLPOOL fe301dc4c357adba53cf5bc247d9ecfa8384d2d21d39fe6d735ada1c4a180907bf576763fe7eaeb1f1eab80833bdd25e27399a8fd3fb28148790cfa799fa5558 -DIST lilypond-2.19.59.tar.gz 17159567 SHA256 168f1d18850e295c1d5db71cf7c84aaf33bc9c6901f91c8b48fec58836bb5c1c SHA512 b915667bf3e86c8ee4be0519e4d351cb7f5e38354a882607ef3547467f9a56fcffd9bbdf40bbd1381624d5e8803c23a42ac5cdc95707a874c064493da369257a WHIRLPOOL 49b481a91e58436cafd0684a5e6470e0186a823758271f47e7d5b29f61c4317ad87fe536987685b1295cb1124d3dafaaed2e4602bce62f7168093d894265ec48 -DIST lilypond-2.19.60.tar.gz 17158191 SHA256 648b8b7c0d5987fc9f3b3387e0ac07d28b6860ad7314c1495c2a4401335b333f SHA512 852f1aadfa1dab959cd50ffe5a37a9cbf235ea1fde762ecb8185eab6ae308ebb63dce59157fc481f311f23107a47e88bf3b5bba45126b94096701c29eaac0ad0 WHIRLPOOL 2552fc97968cb24402d1aed1db2555bad7300b53101d564ed15fc4c1ade36293f99f26afcda7a07ac705a91f383b987037dc70aea6625b0c3286992f136377bc DIST lilypond-2.19.61.tar.gz 17154903 SHA256 fc42103824cbd9e5d230ded0f73c8ecffae14998b2ad2e136914f7eab1eecb0a SHA512 870d747f6d29644824e965f4a0ff37555afbf8d8013f01965f64d4b95ca6487d15468aee27fa44036ed2d35b00f8e9bc69c22a670ad97f04ae39a16d57ea83b9 WHIRLPOOL bc690e42b2b52a5b39dea956f83558e3adb72f8027a1acb2441cd104fd5d85f2860f2a9f0c76ec882a9404ed6cbfcecd3ee4aa60d3148e79405ca9487e4de26f DIST lilypond-2.19.63.tar.gz 17172960 SHA256 803f3bbf87d68fbde4ea364fc62394e5907e73cecd6188bb8f12fa4f433d9b43 SHA512 58f8922e2965bb37a08472f49d88e650d2c530a29e4672b858c0d8d91dbd8a94db78668c37424ab59084cc03c7cd07e931b138374d351ecd580f23986035f106 WHIRLPOOL 926916f23237c6ea10aaae4081b00c04aa10706cf81be51d99afba2e1eb8c8638039def026a16b6cca2e0d57120e737f0f2d4809c1e12118e78a987467162749 diff
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 7bd15decab2086d06eec4e67e6ed5205c140039d Author: Tim Harder gentoo org> AuthorDate: Mon Jul 10 07:30:34 2017 + Commit: Tim Harder gentoo org> CommitDate: Mon Jul 10 07:34:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bd15dec media-sound/lilypond: version bump to 2.19.63 media-sound/lilypond/Manifest| 1 + media-sound/lilypond/lilypond-2.19.63.ebuild | 147 +++ 2 files changed, 148 insertions(+) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 094fc45a361..29f68bd6a4d 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -7,3 +7,4 @@ DIST lilypond-2.19.58.tar.gz 17188063 SHA256 074ee50299c7791403c8354a3604a0f0b3d DIST lilypond-2.19.59.tar.gz 17159567 SHA256 168f1d18850e295c1d5db71cf7c84aaf33bc9c6901f91c8b48fec58836bb5c1c SHA512 b915667bf3e86c8ee4be0519e4d351cb7f5e38354a882607ef3547467f9a56fcffd9bbdf40bbd1381624d5e8803c23a42ac5cdc95707a874c064493da369257a WHIRLPOOL 49b481a91e58436cafd0684a5e6470e0186a823758271f47e7d5b29f61c4317ad87fe536987685b1295cb1124d3dafaaed2e4602bce62f7168093d894265ec48 DIST lilypond-2.19.60.tar.gz 17158191 SHA256 648b8b7c0d5987fc9f3b3387e0ac07d28b6860ad7314c1495c2a4401335b333f SHA512 852f1aadfa1dab959cd50ffe5a37a9cbf235ea1fde762ecb8185eab6ae308ebb63dce59157fc481f311f23107a47e88bf3b5bba45126b94096701c29eaac0ad0 WHIRLPOOL 2552fc97968cb24402d1aed1db2555bad7300b53101d564ed15fc4c1ade36293f99f26afcda7a07ac705a91f383b987037dc70aea6625b0c3286992f136377bc DIST lilypond-2.19.61.tar.gz 17154903 SHA256 fc42103824cbd9e5d230ded0f73c8ecffae14998b2ad2e136914f7eab1eecb0a SHA512 870d747f6d29644824e965f4a0ff37555afbf8d8013f01965f64d4b95ca6487d15468aee27fa44036ed2d35b00f8e9bc69c22a670ad97f04ae39a16d57ea83b9 WHIRLPOOL bc690e42b2b52a5b39dea956f83558e3adb72f8027a1acb2441cd104fd5d85f2860f2a9f0c76ec882a9404ed6cbfcecd3ee4aa60d3148e79405ca9487e4de26f +DIST lilypond-2.19.63.tar.gz 17172960 SHA256 803f3bbf87d68fbde4ea364fc62394e5907e73cecd6188bb8f12fa4f433d9b43 SHA512 58f8922e2965bb37a08472f49d88e650d2c530a29e4672b858c0d8d91dbd8a94db78668c37424ab59084cc03c7cd07e931b138374d351ecd580f23986035f106 WHIRLPOOL 926916f23237c6ea10aaae4081b00c04aa10706cf81be51d99afba2e1eb8c8638039def026a16b6cca2e0d57120e737f0f2d4809c1e12118e78a987467162749 diff --git a/media-sound/lilypond/lilypond-2.19.63.ebuild b/media-sound/lilypond/lilypond-2.19.63.ebuild new file mode 100644 index 000..5dd683dc418 --- /dev/null +++ b/media-sound/lilypond/lilypond-2.19.63.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +[[ "${PV}" = "" ]] && inherit git-r3 +inherit elisp-common autotools python-single-r1 xdg-utils + +if [[ "${PV}" = "" ]]; then + EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" +else + SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86" +fi + +DESCRIPTION="GNU Music Typesetter" +HOMEPAGE="http://lilypond.org/"; + +LICENSE="GPL-3 FDL-1.3" +SLOT="0" +LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" +IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=">=app-text/ghostscript-gpl-8.15 + >=dev-scheme/guile-1.8.2:12[deprecated,regex] + media-fonts/tex-gyre + media-libs/fontconfig + media-libs/freetype:2 + >=x11-libs/pango-1.12.3 + emacs? ( virtual/emacs ) + guile2? ( >=dev-scheme/guile-2:12 ) + !guile2? ( + >=dev-scheme/guile-1.8.2:12[deprecated,regex] + =metapost-1.803 is selected if it's installed, bug 498704 + if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then + if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then + einfo "Updating metapost symlink" + eselect mpost update || die + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + default + + if ! use vim-syntax ; then + sed -i 's/vim//' GNUmakefile.in || die + fi + + # respect CFLAGS + sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die + + for lang in ${LANGS}; do + use linguas_${lang} || rm po/${lang}.po || die + done + + # respect AR + sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die + + # remove bundled texinfo file (fixes bug #448560) + rm tex/texinfo.tex || die + + eautoreconf + + xdg_environment_reset #586592 +} + +src_configure() { + # documentation generation currently not supported since it requires a newer + # version of texi2html than is currently in the tree + + local myeconfargs=( +
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: f9c396a7153f9126e13922e010648d42246654ed Author: Alexis Ballier gentoo org> AuthorDate: Fri Jun 30 07:21:35 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Jun 30 07:39:39 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9c396a7 media-sound/lilypond: keyword ~arm64 Package-Manager: Portage-2.3.6, Repoman-2.3.2 media-sound/lilypond/lilypond-2.19.61.ebuild | 2 +- media-sound/lilypond/lilypond-.ebuild| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-sound/lilypond/lilypond-2.19.61.ebuild b/media-sound/lilypond/lilypond-2.19.61.ebuild index a9a57ba996f..5dd683dc418 100644 --- a/media-sound/lilypond/lilypond-2.19.61.ebuild +++ b/media-sound/lilypond/lilypond-2.19.61.ebuild @@ -11,7 +11,7 @@ if [[ "${PV}" = "" ]]; then EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" else SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter" diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index a9a57ba996f..5dd683dc418 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -11,7 +11,7 @@ if [[ "${PV}" = "" ]]; then EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" else SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 1adc3db6300f1991652703a930ccae6b9661a62c Author: Tim Harder gentoo org> AuthorDate: Wed May 24 06:05:31 2017 + Commit: Tim Harder gentoo org> CommitDate: Wed May 24 06:06:44 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1adc3db6 media-sound/lilypond: version bump to 2.19.61 media-sound/lilypond/Manifest| 1 + media-sound/lilypond/lilypond-2.19.61.ebuild | 147 +++ 2 files changed, 148 insertions(+) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 13350ada961..094fc45a361 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -6,3 +6,4 @@ DIST lilypond-2.19.57.tar.gz 17182103 SHA256 be86019ae91cf78267081e96f35cf682931 DIST lilypond-2.19.58.tar.gz 17188063 SHA256 074ee50299c7791403c8354a3604a0f0b3d35b8440fc53726d181b17c7ba4a72 SHA512 e5117a02c0a18b335fc74aa864c8432fe8dcf91691ad592cae7991e1097063397b82bdfbab6b24439e0027ce946059f2169534d998e63f2230fcbbba0fcc8e91 WHIRLPOOL fe301dc4c357adba53cf5bc247d9ecfa8384d2d21d39fe6d735ada1c4a180907bf576763fe7eaeb1f1eab80833bdd25e27399a8fd3fb28148790cfa799fa5558 DIST lilypond-2.19.59.tar.gz 17159567 SHA256 168f1d18850e295c1d5db71cf7c84aaf33bc9c6901f91c8b48fec58836bb5c1c SHA512 b915667bf3e86c8ee4be0519e4d351cb7f5e38354a882607ef3547467f9a56fcffd9bbdf40bbd1381624d5e8803c23a42ac5cdc95707a874c064493da369257a WHIRLPOOL 49b481a91e58436cafd0684a5e6470e0186a823758271f47e7d5b29f61c4317ad87fe536987685b1295cb1124d3dafaaed2e4602bce62f7168093d894265ec48 DIST lilypond-2.19.60.tar.gz 17158191 SHA256 648b8b7c0d5987fc9f3b3387e0ac07d28b6860ad7314c1495c2a4401335b333f SHA512 852f1aadfa1dab959cd50ffe5a37a9cbf235ea1fde762ecb8185eab6ae308ebb63dce59157fc481f311f23107a47e88bf3b5bba45126b94096701c29eaac0ad0 WHIRLPOOL 2552fc97968cb24402d1aed1db2555bad7300b53101d564ed15fc4c1ade36293f99f26afcda7a07ac705a91f383b987037dc70aea6625b0c3286992f136377bc +DIST lilypond-2.19.61.tar.gz 17154903 SHA256 fc42103824cbd9e5d230ded0f73c8ecffae14998b2ad2e136914f7eab1eecb0a SHA512 870d747f6d29644824e965f4a0ff37555afbf8d8013f01965f64d4b95ca6487d15468aee27fa44036ed2d35b00f8e9bc69c22a670ad97f04ae39a16d57ea83b9 WHIRLPOOL bc690e42b2b52a5b39dea956f83558e3adb72f8027a1acb2441cd104fd5d85f2860f2a9f0c76ec882a9404ed6cbfcecd3ee4aa60d3148e79405ca9487e4de26f diff --git a/media-sound/lilypond/lilypond-2.19.61.ebuild b/media-sound/lilypond/lilypond-2.19.61.ebuild new file mode 100644 index 000..a9a57ba996f --- /dev/null +++ b/media-sound/lilypond/lilypond-2.19.61.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +[[ "${PV}" = "" ]] && inherit git-r3 +inherit elisp-common autotools python-single-r1 xdg-utils + +if [[ "${PV}" = "" ]]; then + EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" +else + SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86" +fi + +DESCRIPTION="GNU Music Typesetter" +HOMEPAGE="http://lilypond.org/"; + +LICENSE="GPL-3 FDL-1.3" +SLOT="0" +LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" +IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=">=app-text/ghostscript-gpl-8.15 + >=dev-scheme/guile-1.8.2:12[deprecated,regex] + media-fonts/tex-gyre + media-libs/fontconfig + media-libs/freetype:2 + >=x11-libs/pango-1.12.3 + emacs? ( virtual/emacs ) + guile2? ( >=dev-scheme/guile-2:12 ) + !guile2? ( + >=dev-scheme/guile-1.8.2:12[deprecated,regex] + =metapost-1.803 is selected if it's installed, bug 498704 + if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then + if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then + einfo "Updating metapost symlink" + eselect mpost update || die + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + default + + if ! use vim-syntax ; then + sed -i 's/vim//' GNUmakefile.in || die + fi + + # respect CFLAGS + sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die + + for lang in ${LANGS}; do + use linguas_${lang} || rm po/${lang}.po || die + done + + # respect AR + sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die + + # remove bundled texinfo file (fixes bug #448560) + rm tex/texinfo.tex || die + + eautoreconf + + xdg_environment_reset #586592 +} + +src_configure() { + # documentation generation currently not supported since it requires a newer + # version of texi2html than is currently in the tree + + local myeconfargs=( + --w
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: a8214abb5b0ec99e0dcf9b65846dfb251b311e03 Author: Tim Harder gentoo org> AuthorDate: Sat May 20 14:49:00 2017 + Commit: Tim Harder gentoo org> CommitDate: Sat May 20 14:49:00 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8214abb media-sound/lilypond: version bump to 2.19.60 media-sound/lilypond/Manifest | 1 + media-sound/lilypond/{lilypond-.ebuild => lilypond-2.19.60.ebuild} | 2 +- media-sound/lilypond/lilypond-.ebuild | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 4afc669eb98..13350ada961 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -5,3 +5,4 @@ DIST lilypond-2.19.56.tar.gz 17157260 SHA256 71e53cb4a7c1fe33f383be1af186b40a9b4 DIST lilypond-2.19.57.tar.gz 17182103 SHA256 be86019ae91cf78267081e96f35cf682931d0219215e160b16b03b907cac755a SHA512 12fed797591e95452d628291c95a5a22fadd6f54a3d98fbb40d2e1e1061153cfdb555a843a7f036139194d8e4a8bd6ac0a27ad94bec7fe632aa4e8cca5a328da WHIRLPOOL fdb8b80a008e076494a3fec50cc79e4436b6f9765837b99394911e7416642f5063497690490f591569f6c312f7cdaa30e2d4dc6c6c768f9da0d1c3f4d32c3366 DIST lilypond-2.19.58.tar.gz 17188063 SHA256 074ee50299c7791403c8354a3604a0f0b3d35b8440fc53726d181b17c7ba4a72 SHA512 e5117a02c0a18b335fc74aa864c8432fe8dcf91691ad592cae7991e1097063397b82bdfbab6b24439e0027ce946059f2169534d998e63f2230fcbbba0fcc8e91 WHIRLPOOL fe301dc4c357adba53cf5bc247d9ecfa8384d2d21d39fe6d735ada1c4a180907bf576763fe7eaeb1f1eab80833bdd25e27399a8fd3fb28148790cfa799fa5558 DIST lilypond-2.19.59.tar.gz 17159567 SHA256 168f1d18850e295c1d5db71cf7c84aaf33bc9c6901f91c8b48fec58836bb5c1c SHA512 b915667bf3e86c8ee4be0519e4d351cb7f5e38354a882607ef3547467f9a56fcffd9bbdf40bbd1381624d5e8803c23a42ac5cdc95707a874c064493da369257a WHIRLPOOL 49b481a91e58436cafd0684a5e6470e0186a823758271f47e7d5b29f61c4317ad87fe536987685b1295cb1124d3dafaaed2e4602bce62f7168093d894265ec48 +DIST lilypond-2.19.60.tar.gz 17158191 SHA256 648b8b7c0d5987fc9f3b3387e0ac07d28b6860ad7314c1495c2a4401335b333f SHA512 852f1aadfa1dab959cd50ffe5a37a9cbf235ea1fde762ecb8185eab6ae308ebb63dce59157fc481f311f23107a47e88bf3b5bba45126b94096701c29eaac0ad0 WHIRLPOOL 2552fc97968cb24402d1aed1db2555bad7300b53101d564ed15fc4c1ade36293f99f26afcda7a07ac705a91f383b987037dc70aea6625b0c3286992f136377bc diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-2.19.60.ebuild similarity index 98% copy from media-sound/lilypond/lilypond-.ebuild copy to media-sound/lilypond/lilypond-2.19.60.ebuild index 4b68761a09e..a9a57ba996f 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-2.19.60.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 4b68761a09e..a9a57ba996f 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 31aff4706c8fb6dd7290f950a85d9dd61a8ede02 Author: Tim Harder gentoo org> AuthorDate: Wed Apr 12 10:36:30 2017 + Commit: Tim Harder gentoo org> CommitDate: Wed Apr 12 10:36:56 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31aff470 media-sound/lilypond: version bump to 2.19.59 media-sound/lilypond/Manifest| 1 + media-sound/lilypond/lilypond-2.19.59.ebuild | 147 +++ 2 files changed, 148 insertions(+) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 9c634e5ce47..4afc669eb98 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -4,3 +4,4 @@ DIST lilypond-2.19.55.tar.gz 17138603 SHA256 fe39c2ce7ff5c1945e4bf96deffdf17fe96 DIST lilypond-2.19.56.tar.gz 17157260 SHA256 71e53cb4a7c1fe33f383be1af186b40a9b42d81784f6fb5e605c29be5359265c SHA512 e56dc3dab2768d0056e2525d19ab9e2e0c74e781a2bc914ac910a4c85f770ef55561e6110386211025de34fa608d16988cc0a3ae398e8f347ac993013ef832af WHIRLPOOL a042048bea43ee2cfe49612b6ec1ae550d3abfa7e4ed0a62c0c805ac429340f2fa4979e1c3995aa516796aadf6135d2c714212d971a087bdb725fa6d89f8f567 DIST lilypond-2.19.57.tar.gz 17182103 SHA256 be86019ae91cf78267081e96f35cf682931d0219215e160b16b03b907cac755a SHA512 12fed797591e95452d628291c95a5a22fadd6f54a3d98fbb40d2e1e1061153cfdb555a843a7f036139194d8e4a8bd6ac0a27ad94bec7fe632aa4e8cca5a328da WHIRLPOOL fdb8b80a008e076494a3fec50cc79e4436b6f9765837b99394911e7416642f5063497690490f591569f6c312f7cdaa30e2d4dc6c6c768f9da0d1c3f4d32c3366 DIST lilypond-2.19.58.tar.gz 17188063 SHA256 074ee50299c7791403c8354a3604a0f0b3d35b8440fc53726d181b17c7ba4a72 SHA512 e5117a02c0a18b335fc74aa864c8432fe8dcf91691ad592cae7991e1097063397b82bdfbab6b24439e0027ce946059f2169534d998e63f2230fcbbba0fcc8e91 WHIRLPOOL fe301dc4c357adba53cf5bc247d9ecfa8384d2d21d39fe6d735ada1c4a180907bf576763fe7eaeb1f1eab80833bdd25e27399a8fd3fb28148790cfa799fa5558 +DIST lilypond-2.19.59.tar.gz 17159567 SHA256 168f1d18850e295c1d5db71cf7c84aaf33bc9c6901f91c8b48fec58836bb5c1c SHA512 b915667bf3e86c8ee4be0519e4d351cb7f5e38354a882607ef3547467f9a56fcffd9bbdf40bbd1381624d5e8803c23a42ac5cdc95707a874c064493da369257a WHIRLPOOL 49b481a91e58436cafd0684a5e6470e0186a823758271f47e7d5b29f61c4317ad87fe536987685b1295cb1124d3dafaaed2e4602bce62f7168093d894265ec48 diff --git a/media-sound/lilypond/lilypond-2.19.59.ebuild b/media-sound/lilypond/lilypond-2.19.59.ebuild new file mode 100644 index 000..a9a57ba996f --- /dev/null +++ b/media-sound/lilypond/lilypond-2.19.59.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +[[ "${PV}" = "" ]] && inherit git-r3 +inherit elisp-common autotools python-single-r1 xdg-utils + +if [[ "${PV}" = "" ]]; then + EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" +else + SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86" +fi + +DESCRIPTION="GNU Music Typesetter" +HOMEPAGE="http://lilypond.org/"; + +LICENSE="GPL-3 FDL-1.3" +SLOT="0" +LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" +IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=">=app-text/ghostscript-gpl-8.15 + >=dev-scheme/guile-1.8.2:12[deprecated,regex] + media-fonts/tex-gyre + media-libs/fontconfig + media-libs/freetype:2 + >=x11-libs/pango-1.12.3 + emacs? ( virtual/emacs ) + guile2? ( >=dev-scheme/guile-2:12 ) + !guile2? ( + >=dev-scheme/guile-1.8.2:12[deprecated,regex] + =metapost-1.803 is selected if it's installed, bug 498704 + if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then + if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then + einfo "Updating metapost symlink" + eselect mpost update || die + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + default + + if ! use vim-syntax ; then + sed -i 's/vim//' GNUmakefile.in || die + fi + + # respect CFLAGS + sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die + + for lang in ${LANGS}; do + use linguas_${lang} || rm po/${lang}.po || die + done + + # respect AR + sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die + + # remove bundled texinfo file (fixes bug #448560) + rm tex/texinfo.tex || die + + eautoreconf + + xdg_environment_reset #586592 +} + +src_configure() { + # documentation generation currently not supported since it requires a newer + # version of texi2html than is currently in the tree + + local myeconfargs=( + --w
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 906ad545e8d1f6dd3e5ed71149341294ef1612bf Author: Tim Harder gentoo org> AuthorDate: Mon Apr 3 08:22:52 2017 + Commit: Tim Harder gentoo org> CommitDate: Mon Apr 3 08:34:25 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=906ad545 media-sound/lilypond: version bump to 2.19.58 media-sound/lilypond/Manifest| 1 + media-sound/lilypond/lilypond-2.19.58.ebuild | 147 +++ 2 files changed, 148 insertions(+) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 2efef68c449..9c634e5ce47 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -3,3 +3,4 @@ DIST lilypond-2.19.54.tar.gz 17068093 SHA256 0ee709f1e58caf13cf5abea9bb74179ba5c DIST lilypond-2.19.55.tar.gz 17138603 SHA256 fe39c2ce7ff5c1945e4bf96deffdf17fe962d681aa9aeb585e5691e301acb31b SHA512 4e3c8f408a3508bd6f82951a417aa67cbbcf11d9d77e128cb52512418d3f91df781ac07356ea96a1b60b67ce42c48ee7dcad44100ddf64584a6f4e0f58f1e0a5 WHIRLPOOL ef60cd6bd5043f5d22f97513e0c93a96ea6698bcf26ebadf204bf30ce19aed70bfb7114d158f23b36370543858bda44e7fb660f778ecd420fa9430801681c55c DIST lilypond-2.19.56.tar.gz 17157260 SHA256 71e53cb4a7c1fe33f383be1af186b40a9b42d81784f6fb5e605c29be5359265c SHA512 e56dc3dab2768d0056e2525d19ab9e2e0c74e781a2bc914ac910a4c85f770ef55561e6110386211025de34fa608d16988cc0a3ae398e8f347ac993013ef832af WHIRLPOOL a042048bea43ee2cfe49612b6ec1ae550d3abfa7e4ed0a62c0c805ac429340f2fa4979e1c3995aa516796aadf6135d2c714212d971a087bdb725fa6d89f8f567 DIST lilypond-2.19.57.tar.gz 17182103 SHA256 be86019ae91cf78267081e96f35cf682931d0219215e160b16b03b907cac755a SHA512 12fed797591e95452d628291c95a5a22fadd6f54a3d98fbb40d2e1e1061153cfdb555a843a7f036139194d8e4a8bd6ac0a27ad94bec7fe632aa4e8cca5a328da WHIRLPOOL fdb8b80a008e076494a3fec50cc79e4436b6f9765837b99394911e7416642f5063497690490f591569f6c312f7cdaa30e2d4dc6c6c768f9da0d1c3f4d32c3366 +DIST lilypond-2.19.58.tar.gz 17188063 SHA256 074ee50299c7791403c8354a3604a0f0b3d35b8440fc53726d181b17c7ba4a72 SHA512 e5117a02c0a18b335fc74aa864c8432fe8dcf91691ad592cae7991e1097063397b82bdfbab6b24439e0027ce946059f2169534d998e63f2230fcbbba0fcc8e91 WHIRLPOOL fe301dc4c357adba53cf5bc247d9ecfa8384d2d21d39fe6d735ada1c4a180907bf576763fe7eaeb1f1eab80833bdd25e27399a8fd3fb28148790cfa799fa5558 diff --git a/media-sound/lilypond/lilypond-2.19.58.ebuild b/media-sound/lilypond/lilypond-2.19.58.ebuild new file mode 100644 index 000..4b68761a09e --- /dev/null +++ b/media-sound/lilypond/lilypond-2.19.58.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +[[ "${PV}" = "" ]] && inherit git-r3 +inherit elisp-common autotools python-single-r1 xdg-utils + +if [[ "${PV}" = "" ]]; then + EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" +else + SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86" +fi + +DESCRIPTION="GNU Music Typesetter" +HOMEPAGE="http://lilypond.org/"; + +LICENSE="GPL-3 FDL-1.3" +SLOT="0" +LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" +IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=">=app-text/ghostscript-gpl-8.15 + >=dev-scheme/guile-1.8.2:12[deprecated,regex] + media-fonts/tex-gyre + media-libs/fontconfig + media-libs/freetype:2 + >=x11-libs/pango-1.12.3 + emacs? ( virtual/emacs ) + guile2? ( >=dev-scheme/guile-2:12 ) + !guile2? ( + >=dev-scheme/guile-1.8.2:12[deprecated,regex] + =metapost-1.803 is selected if it's installed, bug 498704 + if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then + if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then + einfo "Updating metapost symlink" + eselect mpost update || die + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + default + + if ! use vim-syntax ; then + sed -i 's/vim//' GNUmakefile.in || die + fi + + # respect CFLAGS + sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die + + for lang in ${LANGS}; do + use linguas_${lang} || rm po/${lang}.po || die + done + + # respect AR + sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die + + # remove bundled texinfo file (fixes bug #448560) + rm tex/texinfo.tex || die + + eautoreconf + + xdg_environment_reset #586592 +} + +src_configure() { + # documentation generation currently not supported since it requires a newer + # version of texi2html than is currently in the tree + + local myeconfargs=( + --w
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 20f5dd41312db4f34ee79466567633bd3a9b461f Author: Tim Harder gentoo org> AuthorDate: Sat Mar 25 09:02:00 2017 + Commit: Tim Harder gentoo org> CommitDate: Sat Mar 25 09:02:36 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20f5dd41 media-sound/lilypond: version bump to 2.19.57 media-sound/lilypond/Manifest| 1 + media-sound/lilypond/lilypond-2.19.57.ebuild | 147 +++ 2 files changed, 148 insertions(+) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 65444f5b328..2efef68c449 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -2,3 +2,4 @@ DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875c DIST lilypond-2.19.54.tar.gz 17068093 SHA256 0ee709f1e58caf13cf5abea9bb74179ba5c7a4f2dc470ec48d9aefb553e68a58 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b WHIRLPOOL 7ce1cc7e89c5907515f8505a1e1efe1aadf8df48c24d70a2fe39924cf9301b6c676121e6c6ceac75b76a085e5d940c6c3bb6c31e87d314dda72c68f0af1307c8 DIST lilypond-2.19.55.tar.gz 17138603 SHA256 fe39c2ce7ff5c1945e4bf96deffdf17fe962d681aa9aeb585e5691e301acb31b SHA512 4e3c8f408a3508bd6f82951a417aa67cbbcf11d9d77e128cb52512418d3f91df781ac07356ea96a1b60b67ce42c48ee7dcad44100ddf64584a6f4e0f58f1e0a5 WHIRLPOOL ef60cd6bd5043f5d22f97513e0c93a96ea6698bcf26ebadf204bf30ce19aed70bfb7114d158f23b36370543858bda44e7fb660f778ecd420fa9430801681c55c DIST lilypond-2.19.56.tar.gz 17157260 SHA256 71e53cb4a7c1fe33f383be1af186b40a9b42d81784f6fb5e605c29be5359265c SHA512 e56dc3dab2768d0056e2525d19ab9e2e0c74e781a2bc914ac910a4c85f770ef55561e6110386211025de34fa608d16988cc0a3ae398e8f347ac993013ef832af WHIRLPOOL a042048bea43ee2cfe49612b6ec1ae550d3abfa7e4ed0a62c0c805ac429340f2fa4979e1c3995aa516796aadf6135d2c714212d971a087bdb725fa6d89f8f567 +DIST lilypond-2.19.57.tar.gz 17182103 SHA256 be86019ae91cf78267081e96f35cf682931d0219215e160b16b03b907cac755a SHA512 12fed797591e95452d628291c95a5a22fadd6f54a3d98fbb40d2e1e1061153cfdb555a843a7f036139194d8e4a8bd6ac0a27ad94bec7fe632aa4e8cca5a328da WHIRLPOOL fdb8b80a008e076494a3fec50cc79e4436b6f9765837b99394911e7416642f5063497690490f591569f6c312f7cdaa30e2d4dc6c6c768f9da0d1c3f4d32c3366 diff --git a/media-sound/lilypond/lilypond-2.19.57.ebuild b/media-sound/lilypond/lilypond-2.19.57.ebuild new file mode 100644 index 000..4b68761a09e --- /dev/null +++ b/media-sound/lilypond/lilypond-2.19.57.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +[[ "${PV}" = "" ]] && inherit git-r3 +inherit elisp-common autotools python-single-r1 xdg-utils + +if [[ "${PV}" = "" ]]; then + EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" +else + SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86" +fi + +DESCRIPTION="GNU Music Typesetter" +HOMEPAGE="http://lilypond.org/"; + +LICENSE="GPL-3 FDL-1.3" +SLOT="0" +LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" +IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=">=app-text/ghostscript-gpl-8.15 + >=dev-scheme/guile-1.8.2:12[deprecated,regex] + media-fonts/tex-gyre + media-libs/fontconfig + media-libs/freetype:2 + >=x11-libs/pango-1.12.3 + emacs? ( virtual/emacs ) + guile2? ( >=dev-scheme/guile-2:12 ) + !guile2? ( + >=dev-scheme/guile-1.8.2:12[deprecated,regex] + =metapost-1.803 is selected if it's installed, bug 498704 + if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then + if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then + einfo "Updating metapost symlink" + eselect mpost update || die + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + default + + if ! use vim-syntax ; then + sed -i 's/vim//' GNUmakefile.in || die + fi + + # respect CFLAGS + sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die + + for lang in ${LANGS}; do + use linguas_${lang} || rm po/${lang}.po || die + done + + # respect AR + sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die + + # remove bundled texinfo file (fixes bug #448560) + rm tex/texinfo.tex || die + + eautoreconf + + xdg_environment_reset #586592 +} + +src_configure() { + # documentation generation currently not supported since it requires a newer + # version of texi2html than is currently in the tree + + local myeconfargs=( + --w
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: cbadc74855e64618d3cff4e994f2585ed5aeaa63 Author: Tim Harder gentoo org> AuthorDate: Wed Mar 1 13:52:40 2017 + Commit: Tim Harder gentoo org> CommitDate: Wed Mar 1 13:54:06 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbadc748 media-sound/lilypond: version bump to 2.19.56 media-sound/lilypond/Manifest | 1 + media-sound/lilypond/{lilypond-.ebuild => lilypond-2.19.56.ebuild} | 2 +- media-sound/lilypond/lilypond-.ebuild | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 5b3b7ef93a6..65444f5b328 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,3 +1,4 @@ DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 WHIRLPOOL 95db264992a1e425fd1ee53d980941eef554c1784a1adfc105750d82d11664f61207c2b1897b6e99448790131c0715f08401f45b663c420553925596c6fd4b1c DIST lilypond-2.19.54.tar.gz 17068093 SHA256 0ee709f1e58caf13cf5abea9bb74179ba5c7a4f2dc470ec48d9aefb553e68a58 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b WHIRLPOOL 7ce1cc7e89c5907515f8505a1e1efe1aadf8df48c24d70a2fe39924cf9301b6c676121e6c6ceac75b76a085e5d940c6c3bb6c31e87d314dda72c68f0af1307c8 DIST lilypond-2.19.55.tar.gz 17138603 SHA256 fe39c2ce7ff5c1945e4bf96deffdf17fe962d681aa9aeb585e5691e301acb31b SHA512 4e3c8f408a3508bd6f82951a417aa67cbbcf11d9d77e128cb52512418d3f91df781ac07356ea96a1b60b67ce42c48ee7dcad44100ddf64584a6f4e0f58f1e0a5 WHIRLPOOL ef60cd6bd5043f5d22f97513e0c93a96ea6698bcf26ebadf204bf30ce19aed70bfb7114d158f23b36370543858bda44e7fb660f778ecd420fa9430801681c55c +DIST lilypond-2.19.56.tar.gz 17157260 SHA256 71e53cb4a7c1fe33f383be1af186b40a9b42d81784f6fb5e605c29be5359265c SHA512 e56dc3dab2768d0056e2525d19ab9e2e0c74e781a2bc914ac910a4c85f770ef55561e6110386211025de34fa608d16988cc0a3ae398e8f347ac993013ef832af WHIRLPOOL a042048bea43ee2cfe49612b6ec1ae550d3abfa7e4ed0a62c0c805ac429340f2fa4979e1c3995aa516796aadf6135d2c714212d971a087bdb725fa6d89f8f567 diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-2.19.56.ebuild similarity index 99% copy from media-sound/lilypond/lilypond-.ebuild copy to media-sound/lilypond/lilypond-2.19.56.ebuild index 07f46f515a1..4b68761a09e 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-2.19.56.ebuild @@ -99,7 +99,7 @@ src_configure() { # documentation generation currently not supported since it requires a newer # version of texi2html than is currently in the tree - local myeconfargs+=( + local myeconfargs=( --with-texgyre-dir=/usr/share/fonts/tex-gyre --disable-documentation --disable-optimising diff --git a/media-sound/lilypond/lilypond-.ebuild b/media-sound/lilypond/lilypond-.ebuild index 07f46f515a1..4b68761a09e 100644 --- a/media-sound/lilypond/lilypond-.ebuild +++ b/media-sound/lilypond/lilypond-.ebuild @@ -99,7 +99,7 @@ src_configure() { # documentation generation currently not supported since it requires a newer # version of texi2html than is currently in the tree - local myeconfargs+=( + local myeconfargs=( --with-texgyre-dir=/usr/share/fonts/tex-gyre --disable-documentation --disable-optimising
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: ed99ae7be00d12c7da77d524dd5046bb94a0afa5 Author: Tim Harder gentoo org> AuthorDate: Wed Feb 22 20:55:12 2017 + Commit: Tim Harder gentoo org> CommitDate: Wed Feb 22 20:57:00 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed99ae7b media-sound/lilypond: version bump to 2.19.55 media-sound/lilypond/Manifest| 1 + media-sound/lilypond/lilypond-2.19.55.ebuild | 148 +++ 2 files changed, 149 insertions(+) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index df3e6775dc..5b3b7ef93a 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,2 +1,3 @@ DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 WHIRLPOOL 95db264992a1e425fd1ee53d980941eef554c1784a1adfc105750d82d11664f61207c2b1897b6e99448790131c0715f08401f45b663c420553925596c6fd4b1c DIST lilypond-2.19.54.tar.gz 17068093 SHA256 0ee709f1e58caf13cf5abea9bb74179ba5c7a4f2dc470ec48d9aefb553e68a58 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b WHIRLPOOL 7ce1cc7e89c5907515f8505a1e1efe1aadf8df48c24d70a2fe39924cf9301b6c676121e6c6ceac75b76a085e5d940c6c3bb6c31e87d314dda72c68f0af1307c8 +DIST lilypond-2.19.55.tar.gz 17138603 SHA256 fe39c2ce7ff5c1945e4bf96deffdf17fe962d681aa9aeb585e5691e301acb31b SHA512 4e3c8f408a3508bd6f82951a417aa67cbbcf11d9d77e128cb52512418d3f91df781ac07356ea96a1b60b67ce42c48ee7dcad44100ddf64584a6f4e0f58f1e0a5 WHIRLPOOL ef60cd6bd5043f5d22f97513e0c93a96ea6698bcf26ebadf204bf30ce19aed70bfb7114d158f23b36370543858bda44e7fb660f778ecd420fa9430801681c55c diff --git a/media-sound/lilypond/lilypond-2.19.55.ebuild b/media-sound/lilypond/lilypond-2.19.55.ebuild new file mode 100644 index 00..4326beff00 --- /dev/null +++ b/media-sound/lilypond/lilypond-2.19.55.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +[[ "${PV}" = "" ]] && inherit git-r3 +inherit elisp-common autotools python-single-r1 xdg-utils + +if [[ "${PV}" = "" ]]; then + EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" +else + SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86" +fi + +DESCRIPTION="GNU Music Typesetter" +HOMEPAGE="http://lilypond.org/"; + +LICENSE="GPL-3 FDL-1.3" +SLOT="0" +LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" +IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=">=app-text/ghostscript-gpl-8.15 + >=dev-scheme/guile-1.8.2:12[deprecated,regex] + media-fonts/tex-gyre + media-libs/fontconfig + media-libs/freetype:2 + >=x11-libs/pango-1.12.3 + emacs? ( virtual/emacs ) + guile2? ( >=dev-scheme/guile-2:12 ) + !guile2? ( + >=dev-scheme/guile-1.8.2:12[deprecated,regex] + =metapost-1.803 is selected if it's installed, bug 498704 + if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then + if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then + einfo "Updating metapost symlink" + eselect mpost update || die + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + default + + if ! use vim-syntax ; then + sed -i 's/vim//' GNUmakefile.in || die + fi + + # respect CFLAGS + sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die + + for lang in ${LANGS}; do + use linguas_${lang} || rm po/${lang}.po || die + done + + # respect AR + sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die + + # remove bundled texinfo file (fixes bug #448560) + rm tex/texinfo.tex || die + + eautoreconf + + xdg_environment_reset #586592 +} + +src_configure() { + # documentation generation currently not supported since it requires a newer + # version of texi2html than is currently in the tree + + local myeconfargs+=( + --with-texgyre-dir=/usr/share/fonts/tex-gyre + --disable-documentation + --disable-optimising + --disable-pipe + $(use_enable debug debugging) + $(use_enable guile2) + $(use_enable profile profiling) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + default + + if use emacs ; then + elisp-compile elisp/lilypond-{font-lock,indent,mode,what
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: 53000725b62b4045297bceb8024f43e0a44ba219 Author: Tobias Klausmann gentoo org> AuthorDate: Sun Jan 22 08:27:33 2017 + Commit: Tobias Klausmann gentoo org> CommitDate: Sun Jan 22 09:00:18 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53000725 media-sound/lilypond-2.19.54-r0: stable on alpha Gentoo-Bug: 577838 media-sound/lilypond/lilypond-2.19.54.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lilypond/lilypond-2.19.54.ebuild b/media-sound/lilypond/lilypond-2.19.54.ebuild index 4326bef..a7cd8ad 100644 --- a/media-sound/lilypond/lilypond-2.19.54.ebuild +++ b/media-sound/lilypond/lilypond-2.19.54.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "" ]]; then EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" else SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86" + KEYWORDS="alpha ~amd64 ~arm ~hppa ~x86" fi DESCRIPTION="GNU Music Typesetter"
[gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
commit: a50b0ea410b2d5fa809a89ffbdbe0b727ca9b128 Author: Tim Harder gentoo org> AuthorDate: Fri Jan 6 02:27:59 2017 + Commit: Tim Harder gentoo org> CommitDate: Fri Jan 6 02:30:24 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a50b0ea4 media-sound/lilypond: remove old media-sound/lilypond/Manifest | 3 - media-sound/lilypond/lilypond-2.18.2.ebuild | 128 media-sound/lilypond/lilypond-2.19.50-r1.ebuild | 148 media-sound/lilypond/lilypond-2.19.52-r1.ebuild | 148 media-sound/lilypond/lilypond-2.19.53.ebuild| 148 5 files changed, 575 deletions(-) diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index b34ec68..df3e677 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,5 +1,2 @@ DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 WHIRLPOOL 95db264992a1e425fd1ee53d980941eef554c1784a1adfc105750d82d11664f61207c2b1897b6e99448790131c0715f08401f45b663c420553925596c6fd4b1c -DIST lilypond-2.19.50.tar.gz 17059560 SHA256 169ad09fac39512c780d917f5b164dc6a1570f19f5516f812df9eb2157224eb3 SHA512 14267d7e0b578b8b32913042438e4087904023860d3ad607faa3a702741176f2cecc019e0b6c5c88132a93696b087f59ede58e96972c877c911d20b89de1ecd2 WHIRLPOOL 1b8f31728541a9fcd1c34f22c544b464dc89c0591938a882097af1f0581e76dfa8ddb7c4f09f31ad4d5df413615f99bc774bd08a0a668879f9449ef9cd8ff8e4 -DIST lilypond-2.19.52.tar.gz 17064855 SHA256 77f4a62b2872f7d6813c7e58b9f8680fc4c3434b86f695117d135b5402e90409 SHA512 afdfa6f277235911b8cfb85985df110d740a580d7d8cb3899e682077674e71faaa050dab16d156d78c0e99243ddb59fb20282a3557309f8679ed457563364020 WHIRLPOOL 54882a8d43ce371ad3a27a955cd464a2296a630b7f274235e24373e08eca746535b0f62b8fca62e82ebed8425d8347a310405ee6134a248dc2e29ff9fd686e73 -DIST lilypond-2.19.53.tar.gz 17066384 SHA256 ef2e50d064911127e4dfdf0acea85a33bbb5cc0a1db68a90fc4d73f8f2932e17 SHA512 f09f15e80a8339ba71d68239f3a2b1a0df6407ffc89c4ec622c15cff4ea9686eb1f73ff540d89ad14278327002b22e98b2caa3b5f946dca3ae2bdd2705d78a9b WHIRLPOOL 285fe7da99eefef24a12ff52baba06e56ed0193c4a236e880812f5cb21f03a3a2d5c4f213265c5b70cf1722979416fca2633fea9dac0efb4dea0882be4336476 DIST lilypond-2.19.54.tar.gz 17068093 SHA256 0ee709f1e58caf13cf5abea9bb74179ba5c7a4f2dc470ec48d9aefb553e68a58 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b WHIRLPOOL 7ce1cc7e89c5907515f8505a1e1efe1aadf8df48c24d70a2fe39924cf9301b6c676121e6c6ceac75b76a085e5d940c6c3bb6c31e87d314dda72c68f0af1307c8 diff --git a/media-sound/lilypond/lilypond-2.18.2.ebuild b/media-sound/lilypond/lilypond-2.18.2.ebuild deleted file mode 100644 index 830607c.. --- a/media-sound/lilypond/lilypond-2.18.2.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit elisp-common autotools eutils python-single-r1 - -DESCRIPTION="GNU Music Typesetter" -SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"; -HOMEPAGE="http://lilypond.org/"; - -LICENSE="GPL-3 FDL-1.3" -SLOT="0" -KEYWORDS="amd64 ~hppa x86" -LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" -IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=">=app-text/ghostscript-gpl-8.15 - >=dev-scheme/guile-1.8.2[deprecated,regex] - media-fonts/urw-fonts - media-libs/fontconfig - media-libs/freetype:2 - >=x11-libs/pango-1.12.3 - emacs? ( virtual/emacs ) - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - app-text/t1utils - dev-lang/perl - || ( - ( >=dev-texlive/texlive-metapost-2013 >=dev-tex/metapost-1.803 ) - =sys-apps/texinfo-4.11 - >=sys-devel/bison-2.0 - sys-devel/flex - sys-devel/gettext - sys-devel/make" - -# Correct output data for tests isn't bundled with releases -RESTRICT="test" - -pkg_setup() { - # make sure >=metapost-1.803 is selected if it's installed, bug 498704 - if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then - if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then - einfo "Updating metapost symlink" - eselect mpost update || die - fi - fi - - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch - epatch "${FILESDIR}"/${P}-fontforge.patch - - if ! use vim-syntax ; then -