commit: f2ac5e7a3786057b2f86d3611bf4586de576eb02 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jan 3 08:44:35 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jan 3 08:51:04 2024 +0000 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 <sam <AT> gentoo.org> media-sound/lilypond/Manifest | 1 + ...lilypond-9999.ebuild => lilypond-2.24.3.ebuild} | 25 +++++++++++----------- media-sound/lilypond/lilypond-9999.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-9999.ebuild b/media-sound/lilypond/lilypond-2.24.3.ebuild similarity index 84% copy from media-sound/lilypond/lilypond-9999.ebuild copy to media-sound/lilypond/lilypond-2.24.3.ebuild index 50b935febd44..4a04aea78500 100644 --- a/media-sound/lilypond/lilypond-9999.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}" = "9999" ]]; then +if [[ ${PV} == *9999* ]]; 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/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild index 50b935febd44..4a04aea78500 100644 --- a/media-sound/lilypond/lilypond-9999.ebuild +++ b/media-sound/lilypond/lilypond-9999.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}" = "9999" ]]; then +if [[ ${PV} == *9999* ]]; 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
