commit:     55e92b7a6497c51403fa5b4017d79d1660eeb34b
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Wed Aug 28 09:15:30 2024 +0000
Commit:     Arsen Arsenović <arsen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 13:06:38 2024 +0000
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 <parona <AT> protonmail.com>
Signed-off-by: Arsen Arsenović <arsen <AT> gentoo.org>

 media-sound/lilypond/lilypond-9999.ebuild | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

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

Reply via email to