From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/, media-sound/lilypond/files/
Date: Sat, 30 Nov 2024 14:01:00 +0000 (UTC) [thread overview]
Message-ID: <1732974890.ea43ff745631059c14c045a80ac4f45258328ea2.sam@gentoo> (raw)
commit: ea43ff745631059c14c045a80ac4f45258328ea2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 30 13:54:50 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 30 13:54:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea43ff74
media-sound/lilypond: drop 2.24.3, 2.24.4
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/lilypond/Manifest | 1 -
.../lilypond/files/lilypond-2.22.1-free_font.patch | 14 ---
.../files/lilypond-2.23.0-fix-font-size.patch | 13 --
media-sound/lilypond/lilypond-2.24.3.ebuild | 139 ---------------------
media-sound/lilypond/lilypond-2.24.4.ebuild | 134 --------------------
5 files changed, 301 deletions(-)
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index ead69c5feba8..8ff1dcf220d0 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,2 +1 @@
-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/files/lilypond-2.22.1-free_font.patch b/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch
deleted file mode 100644
index 2d27291551d4..000000000000
--- a/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Revert "Pango_font: Free temporary font description"
-This reverts commit 102bed8b5a6332f2021a284bd5a937a2603fb327.
-diff --git a/lily/pango-font.cc b/lily/pango-font.cc
-index 053ce17143..1a63b18338 100644
---- a/lily/pango-font.cc
-+++ b/lily/pango-font.cc
-@@ -385,7 +385,6 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const
- PangoFontDescription *descr = pango_font_describe (pa->font);
- Real size = pango_font_description_get_size (descr)
- / (static_cast<Real> (PANGO_SCALE));
-- pango_font_description_free (descr);
-
- if (ps_name_str0.empty ())
- warning (_f ("no PostScript font name for font `%s'", file_name));
diff --git a/media-sound/lilypond/files/lilypond-2.23.0-fix-font-size.patch b/media-sound/lilypond/files/lilypond-2.23.0-fix-font-size.patch
deleted file mode 100644
index 45a3ad5e22ca..000000000000
--- a/media-sound/lilypond/files/lilypond-2.23.0-fix-font-size.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lily/pango-font.cc b/lily/pango-font.cc
-index 053ce17143..0c171bc44e 100644
---- a/lily/pango-font.cc
-+++ b/lily/pango-font.cc
-@@ -382,7 +382,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const
- tail = SCM_CDRLOC (*tail);
- }
-
-- PangoFontDescription *descr = pango_font_describe (pa->font);
-+ PangoFontDescription *descr = pango_context_get_font_description (context_);
- Real size = pango_font_description_get_size (descr)
- / (static_cast<Real> (PANGO_SCALE));
- pango_font_description_free (descr);
diff --git a/media-sound/lilypond/lilypond-2.24.3.ebuild b/media-sound/lilypond/lilypond-2.24.3.ebuild
deleted file mode 100644
index 4e54c94b78ae..000000000000
--- a/media-sound/lilypond/lilypond-2.24.3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..13} )
-
-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
- app-alternatives/yacc
- app-alternatives/lex
- 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-2.24.4.ebuild b/media-sound/lilypond/lilypond-2.24.4.ebuild
deleted file mode 100644
index bd18392af3a7..000000000000
--- a/media-sound/lilypond/lilypond-2.24.4.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-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
- app-alternatives/yacc
- app-alternatives/lex
- 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-1.40
- 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"
-
-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
-}
next reply other threads:[~2024-11-30 14:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-30 14:01 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-02-24 1:24 [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/, media-sound/lilypond/files/ Maciej Barć
2021-05-26 10:24 Miroslav Šulc
2021-02-12 11:03 Miroslav Šulc
2020-06-10 6:45 Miroslav Šulc
2018-01-10 22:44 Amy Liffey
2015-11-06 12:18 Ian Delaney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1732974890.ea43ff745631059c14c045a80ac4f45258328ea2.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox