gentoo auto-resync : 03:01:2024 - 13:56:25

4 files changed, 159 insertions, 17 deletions

diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 00bcf25e4b32..c3c376be8f68 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -8,10 +8,12 @@ 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
 EBUILD lilypond-2.22.0-r1.ebuild 3259 BLAKE2B c8709c461436475455a836636c8bcdf54b8cf553824b7784c7d4551bbd260ca4daa1278e0209b5eba636d3973c1d895821aca83866a5497bdc2a930089fd9db2 SHA512 42a3fa63ab641558c453957a52f163738d3c72d4f8c1c1ad3ca121905813a549f4f3e4fbc14e9086c7e2a21acc854d7f46b6bada21f1f4024f9a445e2a805138
 EBUILD lilypond-2.22.1-r1.ebuild 3290 BLAKE2B 01d01846137ce0dceaf18f48111e017a54daf3206cd5dbd0ae0de7e2ffa93b00b4a7ddcfda9652d532ff4be45409eff60c60c883cf7d142dc825227ead8e3ae9 SHA512 96a1abf83d5a2d72f01b3b3eb85494dfe4b7b85d3150c3a83efdda5f69e4f388820be5324a9f1f47210255eb9c0754f8df7e851cf0a36400581b31f28540fbb7
 EBUILD lilypond-2.23.0-r1.ebuild 3169 BLAKE2B 045cac5a2d298d354ce29bc3c8fcbff0d2f823bda6ae8adf343769b3fa56d48d67d458b98cdd3bd1913e57c32a7473bf9d52efab3a19ef13d259904e193e34cc SHA512 be484e2cd71f4d50b124d9f07bf392e9d8bd81cd16f7591d297458d26ddc8885d6634943725b4729bbf1217fa2bfe89769ed4286e30936d4a3ff3c88ec668b2f
 EBUILD lilypond-2.23.2-r1.ebuild 3184 BLAKE2B 5e6eed86581df8a3c82ef0fff2e3ba8b5217a3c3521c376674e0e0511d287a0ba9f46bd6faa80a2c1c72002e6a31b0b94ed5d036652d766065067616e0390abc SHA512 9090401ac88a635445adeb1dd75f006aa3da92ab023eb8a810aeabe55f528d703f9e188e512ccfcc1e95af736a82c2e75521adcd0417d1797eb9a1cf88ce8461
-EBUILD lilypond-2.24.0.ebuild 2962 BLAKE2B 1079f054e38b500db87f42f68c3621c3e5496fb9471fb9bdae081733a9a13497546539f12615a59ccc150ce93f23439525a78e999ec9bb7cbb17c1d23c73c209 SHA512 a27184adfb49b65d87a6fdd6f8d90cda84231f7828a5410ea5a960227459fabd860c9cec1ec7053946d72a31a7bfb4f77b4e2dbabbf7ab94811e7fc1149bdd11
-EBUILD lilypond-9999.ebuild 3143 BLAKE2B 68754245d21139e75a4638996f678860d3ec787e2140bcc73ddb5bb8e94e9f621cb1e1581dafe236ed5f57d334d6a106922f788cee74d7a62285043235e85180 SHA512 3538857063127913029e53ac786578306b0c9041bcfca71ab94a52982b58b1bdb95da5037a4ab6f7b311f6a8d4e7cff05187a894ec96041d9e9569fa78606ef4
+EBUILD lilypond-2.24.0.ebuild 2968 BLAKE2B c6d82afcd6057649f5b2f53f1f3b8af3c4f45edd589da04a757126c28a699868cd38db56b7aeb10cd399dd0967db734f2c43f73c2c870f21afb5705d129618d7 SHA512 240a82b52ba82cd604371baf9b717419aa53dc3bc1d53eeb51efe0b0ef306ca93b40f8a486612864d8ee5647467fd58467fb65b4140bc1d048cd6c475d9a07d5
+EBUILD lilypond-2.24.3.ebuild 3240 BLAKE2B 6af61570e6c5711324a761ee8ea4e934743ada450b47ddde418942dd7a9aef977c2b456d3f583938841b646aaf8797616961a17ccccb81b4b5a0af5cbecad857 SHA512 a2ef3c667ba2683e3b20500565baabb0f66d896d9b5de69a9974943c47fe0059fe705a36a98df35d2566a833f17e79238501cee3a7da504d5f0ba56674e25aca
+EBUILD lilypond-9999.ebuild 3240 BLAKE2B 6af61570e6c5711324a761ee8ea4e934743ada450b47ddde418942dd7a9aef977c2b456d3f583938841b646aaf8797616961a17ccccb81b4b5a0af5cbecad857 SHA512 a2ef3c667ba2683e3b20500565baabb0f66d896d9b5de69a9974943c47fe0059fe705a36a98df35d2566a833f17e79238501cee3a7da504d5f0ba56674e25aca
 MISC metadata.xml 527 BLAKE2B b110a46a24ff9f9f8b93e28a17c40ff7d0674e9162e7804b476e9568fc4ddd1afd9c7386a129e9b2c3adf2010221e463cf0a32c720edda7fa31feb8ce806f5d0 SHA512 1f5cb81806c3155895a5a3a2b773c3ebbbfb35d7cafdb37b96961a46f6db11762a25444a868af975183b386bcc8dd8bf665e082a65d1c8423b224ea3185b31cd
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
new file mode 100644
index 000000000000..67c1d3818dfc
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.24.3.ebuild
@@ -0,0 +1,139 @@
+# 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
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
+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"
+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-2.2: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 )
+
+# 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
+
+	# 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 "${myeconfargs[@]}" AR="$(tc-getAR)"
+}
+
+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
+		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 install-bytecode
+
+	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
+}
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 50b935febd44..67c1d3818dfc 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}"
 
@@ -34,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
@@ -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