gentoo auto-resync : 19:09:2024 - 12:11:50

3 files changed, 165 insertions, 8 deletions

diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 2b3ebf610470..4beae000a00e 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -4,6 +4,7 @@ AUX lilypond-2.23.0-fix-font-size.patch 573 BLAKE2B a9b9fe5249b76a92aa6c0f8e4c00
 DIST lilypond-2.24.3.tar.gz 19441299 BLAKE2B 6be6ca1f090869a8d545befe3d1f54122514e7dcf9aff1bcc2d78819820da8cef908c5033039eb231b48ae914c1ebd6d766566862a40721580747f017f1445ad SHA512 5153f6cbe5e68e4b3dfcc03a8299ef6b82fbfb487eb3e4f9d631b9dc5a07a972168c3f141d6d50eac936f5c7aeeacd19837c0c9ab70f11dfd5c7efe085d5b56e
 DIST lilypond-2.24.4.tar.gz 19442316 BLAKE2B 12e05f4f9831b9e0eb589b970b16dfde9fe8d4a82d93990e77a8c57cc696bb851e444c65c7f050a457973f5594bfe3e1847bde4adcce82618fd6f5a926eefebb SHA512 f350d1bf6d653c3af9e0b6b12457bbc5f6f3b27d4116ef25d8809e515cef3a28f569f00845a1144f3b4dd8b2fff5265de8f5b338506db4aca2a2928d0ecca726
 EBUILD lilypond-2.24.3.ebuild 3249 BLAKE2B 85e46059a325bc75259783bf6692e0827fb58ddbbdf5c6380af3ac8924a1f45f24fe697801cd9360f825704868074a26a105ff38e0d8d48de80182893d0abcba SHA512 74add15014a58d2a18a304305a72fdc953f7bec96ee12befc0c48a39a854c1dc94bcead79df71c53a9fc4d00b3cf7e57d0138185e53627cd494252c5b89de36b
+EBUILD lilypond-2.24.4-r100.ebuild 3319 BLAKE2B b561668afd9396191229b764a829f97b46d3886478d2559e39da6592f9d3695dfda04d3da281cdf93045f0fde210325e052aa62881cb0f32dc9734cc14de3cf5 SHA512 315bfdb0d18ac9b7094390407a95df2fb78433e046c4bf05996c063b71ba4dcf465012f43cfb793fd6c3a17aa78f1d74843257efa26e5a56e657eb31454ec528
 EBUILD lilypond-2.24.4.ebuild 3155 BLAKE2B f4c453435b0e174a0a4298885d1d11e555c66ced5ff97466abcec6c2660f384a677d228ee78004cf8e2dac752152f2e7ff846df57f5fbc1e0dc3aff7e5bcd5d3 SHA512 91666d903bd85aad7c7bfdc8675651dbbf9849a150ee9e2682ae0878e3eb2ed0773850cf0cb712a3b2db87440696ed8365715e7b0d7cf7e87e0cdeecd5a1db70
-EBUILD lilypond-9999.ebuild 3157 BLAKE2B 202683830714058d8b97a48319b696c2170ba7dc38ef10a64463c21527658824a1a8951a3ff080e7e15bf4089d6ee801648f497d2012fceee9803dc5adaac474 SHA512 d92ac5dc23e988e7358136ea0f792e63ba46c889e41cdf6ac2afc58120b0be47c9a9d555ce6f3208571f3022dba99ee97534f2a85619019fa8cbadc45a7372e3
+EBUILD lilypond-9999.ebuild 3319 BLAKE2B b561668afd9396191229b764a829f97b46d3886478d2559e39da6592f9d3695dfda04d3da281cdf93045f0fde210325e052aa62881cb0f32dc9734cc14de3cf5 SHA512 315bfdb0d18ac9b7094390407a95df2fb78433e046c4bf05996c063b71ba4dcf465012f43cfb793fd6c3a17aa78f1d74843257efa26e5a56e657eb31454ec528
 MISC metadata.xml 443 BLAKE2B a90a4f1d4685d5ca26c5948f10a2a84fc28abf22c89adcc477fab0bb465d2f257007bb22a74c0ebad4e5f2941e43063ff39fe8ae0a9e246f194aef318b7f5668 SHA512 24d3c93b4cceaa00138977e8e6137c1649baee08e96c9cd617b4ed489dfd093219dcb80419ba41c2ee84ad5989528c76c1e5b1203ef0d215e77b441c1d72db7a
diff --git a/media-sound/lilypond/lilypond-2.24.4-r100.ebuild b/media-sound/lilypond/lilypond-2.24.4-r100.ebuild
new file mode 100644
index 000000000000..63d46dcb3e06
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.24.4-r100.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GUILE_REQ_USE="deprecated,regex"
+GUILE_COMPAT=( 2-2 3-0 )
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit elisp-common autotools guile-single 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="${GUILE_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-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
+	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"
+
+DOCS=( DEDICATION README.md ROADMAP )
+
+QA_PREBUILT="usr/*/${PN}/${PV}/ccache/*"
+
+pkg_setup() {
+	guile-single_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	guile-single_src_prepare
+
+	# 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
+
+	guile_unstrip_ccache
+
+	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 ae3457cd2655..63d46dcb3e06 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.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} == *9999* ]]; 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