From e5b5476878671c51ef4f47fe2dfac926224e47b7 Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Wed, 10 Jun 2020 08:44:44 +0200 Subject: media-sound/lilypond: removed obsolete 2.19.83 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Miroslav Šulc --- media-sound/lilypond/Manifest | 1 - .../files/lilypond-2.19.80-fontforge-version.patch | 16 --- .../files/lilypond-2.19.80-remove-ly-protect.patch | 39 ------ media-sound/lilypond/lilypond-2.19.83.ebuild | 148 --------------------- 4 files changed, 204 deletions(-) delete mode 100644 media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch delete mode 100644 media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch delete mode 100644 media-sound/lilypond/lilypond-2.19.83.ebuild (limited to 'media-sound') diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index c08f1a079275..40fc65bffd7d 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,2 +1 @@ -DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604 DIST lilypond-2.21.1.tar.gz 18135688 BLAKE2B 4a797c325e254b59cb314b28a801198f398efd7a37cac448b79d8161ab7248b0c9ca45ce742b82d0aebb784a98637209c84df74304a9e8c8f744b9f5033e18d2 SHA512 596f6a09d0f9a0c39ca717a9e4e246e03679a6cf40a78491eac9bc3eccf173799c75a0baef491cae8385bf1abda53244fd731695762b6fd841396edb92d0ab75 diff --git a/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch b/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch deleted file mode 100644 index 4e2c2ce77c12..000000000000 --- a/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch +++ /dev/null @@ -1,16 +0,0 @@ -The version test fails for two reasons: -* fontforge --version does not print anything that resembles what the configure - script expects a version to look like -* fontforge fails to print a version if it cannot connect to an X display - ---- a/configure.ac -+++ b/configure.ac -@@ -236,7 +236,7 @@ - - STEPMAKE_PYTHON_DEVEL(REQUIRED, 2.4, 3.0) - --STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20110222) -+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED,) - - STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED) - diff --git a/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch b/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch deleted file mode 100644 index d21b0a413a12..000000000000 --- a/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -purN a/lily/general-scheme.cc b/lily/general-scheme.cc ---- a/lily/general-scheme.cc 2017-10-15 17:42:11.000000000 +0100 -+++ b/lily/general-scheme.cc 2018-01-10 16:20:08.129066507 +0000 -@@ -267,6 +267,8 @@ LY_DEFINE (ly_dimension_p, "ly:dimension - /* - Debugging mem leaks: - */ -+ -+/* - LY_DEFINE (ly_protects, "ly:protects", - 0, 0, 0, (), - "Return hash of protected objects.") -@@ -278,6 +280,7 @@ LY_DEFINE (ly_protects, "ly:protects", - return programming_error ("ly:protects is not supported in Guile 2.1"); - #endif - } -+*/ - - LY_DEFINE (ly_gettext, "ly:gettext", - 1, 0, 0, (SCM original), -diff -purN a/scm/lily.scm b/scm/lily.scm ---- a/scm/lily.scm 2017-10-15 17:42:11.000000000 +0100 -+++ b/scm/lily.scm 2018-01-10 16:22:54.914457450 +0000 -@@ -836,10 +836,11 @@ messages into errors.") - - (define-public (dump-gc-protects) - (set! gc-protect-stat-count (1+ gc-protect-stat-count)) -- (let* ((protects (sort (hash-table->alist (ly:protects)) -- (lambda (a b) -- (< (object-address (car a)) -- (object-address (car b)))))) -+ (let* (;(protects (sort (hash-table->alist (ly:protects)) -+ ; (lambda (a b) -+ ; (< (object-address (car a)) -+ ; (object-address (car b)))))) -+ (protects '()) - (out-file-name (string-append - "gcstat-" (number->string gc-protect-stat-count) - ".scm")) diff --git a/media-sound/lilypond/lilypond-2.19.83.ebuild b/media-sound/lilypond/lilypond-2.19.83.ebuild deleted file mode 100644 index 8b1f709e6002..000000000000 --- a/media-sound/lilypond/lilypond-2.19.83.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 ) - -[[ "${PV}" = "9999" ]] && inherit git-r3 -inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils - -if [[ "${PV}" = "9999" ]]; then - EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git" -else - MAIN_VER=$(ver_cut 1-2) - SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz" - KEYWORDS="amd64 ~arm arm64 ~hppa x86" -fi - -DESCRIPTION="GNU Music Typesetter" -HOMEPAGE="http://lilypond.org/" - -LICENSE="GPL-3 FDL-1.3" -SLOT="0" -IUSE="debug emacs guile2 profile vim-syntax" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=">=app-text/ghostscript-gpl-8.15 - >=dev-scheme/guile-1.8.2:12=[deprecated,regex] - media-fonts/tex-gyre - media-libs/fontconfig - media-libs/freetype:2 - >=x11-libs/pango-1.12.3 - emacs? ( >=app-editors/emacs-23.1:* ) - guile2? ( >=dev-scheme/guile-2:12 ) - !guile2? ( - >=dev-scheme/guile-1.8.2:12=[deprecated,regex] - =metapost-1.803 is selected if it's installed, bug 498704 - if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then - if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then - einfo "Updating metapost symlink" - eselect mpost update || die - fi - fi - - python-single-r1_pkg_setup -} - -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 - - # respect AR - sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die - - # remove bundled texinfo file (fixes bug #448560) - rm tex/texinfo.tex || die - - eautoreconf - - xdg_environment_reset #586592 -} - -src_configure() { - # documentation generation currently not supported since it requires a newer - # version of texi2html than is currently in the tree - - local myeconfargs=( - --with-texgyre-dir=/usr/share/fonts/tex-gyre - --disable-documentation - --disable-optimising - --disable-pipe - $(use_enable debug debugging) - $(use_enable guile2) - $(use_enable profile profiling) - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - 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 - - # 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 -} -- cgit v1.2.3-18-g5258