commit:     2a4e1abd1b1a189a2d3d1da756545d136fba32ab
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 20:53:13 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 20:55:06 2024 +0000
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 <sam <AT> gentoo.org>

 media-sound/lilypond/Manifest                                 |  1 +
 .../lilypond/{lilypond-9999.ebuild => lilypond-2.24.4.ebuild} | 11 +++--------
 media-sound/lilypond/lilypond-9999.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-9999.ebuild 
b/media-sound/lilypond/lilypond-2.24.4.ebuild
similarity index 93%
copy from media-sound/lilypond/lilypond-9999.ebuild
copy to media-sound/lilypond/lilypond-2.24.4.ebuild
index 3d18994e27df..bd18392af3a7 100644
--- a/media-sound/lilypond/lilypond-9999.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-9999.ebuild 
b/media-sound/lilypond/lilypond-9999.ebuild
index 3d18994e27df..ae3457cd2655 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.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

Reply via email to