gentoo resync : 13.06.2020

6 files changed, 7 insertions, 214 deletions

diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 82fa98eeb851..cddef8a23359 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,10 +1,6 @@
 AUX 50lilypond-gentoo.el 258 BLAKE2B f7db42921301c25260128a9e1e990985883b8959cd76b9dda1d67f7515f003b6e8986cfafb3988748e0b2eac5e6b64db943b376ade3fdaa63023b0b6ea5d6fab SHA512 6cffb5df0776b0d03725c534d8fd1acc09b222d964bf6480e0220c02612d7d1348e3c27da908cdc8de929549dc52678d582d620c00cf35f82aaa2203e7b4d69e
-AUX lilypond-2.19.80-fontforge-version.patch 503 BLAKE2B ff0565562e2156aa833d0de1fda31cce3901999c6fc1f5ec05fcc1dad5a60b4df4823eb9e5e809e4bfd863eef7088627e8dbab38fc1b2fe10152d9c26965c934 SHA512 0098b5f7fae77bd39f08397b460efc43bed8ea90feb2afd5349cb3459209720111bba657ca04be9781d5ad2731476887b6a9414690842d455e22f3c9ed6faeed
-AUX lilypond-2.19.80-remove-ly-protect.patch 1534 BLAKE2B fbb07b254ac8c41ac3db4c00203efd46fa48b0d3157d0ac57f60587bacae6d0cee6d1694f7a1a74b4fc1d31b338f31dd55daf294872cf8cd85d090683853cbcb SHA512 ec74abc959b569ef43eae0709ea62f012d41700dcebcb9cb4ece551b0095e593e6ac579520a3be3bef648e04ee69b3549f9152158c705ebb615ecb66f0f4d0fd
 AUX lilypond-2.21.1-fix-font-size.patch 505 BLAKE2B 33f98803eea6a87082a9c724bb88ea6fc9493f97856f8c581f28c786010ce215a6626970eec602d8d311ec5e84f5485cf7a3cfd3fdc1099c8096ca5af28aeae6 SHA512 a59c00e4f2c44797e4e7656bc7f097b644399a211c691c8ca1502dfbdc0806ce9efbc24644675b2d246f585b74a17bd1895a5bb830fe10cda2e6dc7c0846848c
-DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604
 DIST lilypond-2.21.1.tar.gz 18135688 BLAKE2B 4a797c325e254b59cb314b28a801198f398efd7a37cac448b79d8161ab7248b0c9ca45ce742b82d0aebb784a98637209c84df74304a9e8c8f744b9f5033e18d2 SHA512 596f6a09d0f9a0c39ca717a9e4e246e03679a6cf40a78491eac9bc3eccf173799c75a0baef491cae8385bf1abda53244fd731695762b6fd841396edb92d0ab75
-EBUILD lilypond-2.19.83.ebuild 3405 BLAKE2B 0409cf9038b396d0ee6df6cc65c7f5a9fdddd40f533cd4a7b76adf8ba9e65d4ca8e0d7bf3f831f94f2e681011cd7f8427eb105fd1b8759b50c0838a4f4b4febf SHA512 90d9a385992975fd9fa228bbfe886560711594b1a5c53d71d0291f842631fabe7e957db28ae8417d323f7c7f9aacaeb5eedd3cb25321413878c15b62b8c947a0
-EBUILD lilypond-2.21.1.ebuild 3215 BLAKE2B 9e3e76fff187953f7549583cfaece5e8355bdd95495a64745807ad0500a056b6faa0846c4632bb08406748876d857db6ed652164beca89cd2aaf2345d34ab172 SHA512 5a1a37f3cc74638ecf3ebeb0694acec52bc68b74873ff276fb92682c504188bba8954cf4153e3b9326bed628b06d5f213df0972b3b091a529e4c4b1257f8c745
-EBUILD lilypond-9999.ebuild 3223 BLAKE2B 5026b74a5129cd1482e8b033be13141c7d832445d228cb0b7042732b7b73a0705ed7cd014ff32eaa5e7282b70d22ec5f7d337673702f58d9859014e6669e0404 SHA512 9b5ba89e24ac4c26141de4330b94d7514f789d591ca2217f2b7ecb6e04ef55195534a49931bc7ec1e307507c70026e145a1b0e1925fbe746ac9f7ca0bbac9b91
+EBUILD lilypond-2.21.1.ebuild 3221 BLAKE2B 33351791371ec81926732bbd0fb5d85f2835e3c3548f85a9e3eb9ecdfacbc5bd545c00ec720ad7836d38d4c2dd2ef8ad1d99ad04b8bcbf230bd502268c84c473 SHA512 8cc9002fd62a60f71a3d404c873fd5149c1da6e83e3bede9303cef2f0a2724e60bf6997da2c944cc0e17a576728e185031e1e1e2172ec55f93c6a055017aa23f
+EBUILD lilypond-9999.ebuild 3232 BLAKE2B 136ffb23d241355358c792690d96a6e40b2c641c6180bfc2b513a2ae6defc228301b08530a4d8f271b76b245a722d0b85c3637193d6db9e0b68c7fa6b7ad3fb8 SHA512 5c95e8e885f9d9ee77bf469763fc738703aeba5f1580218d3b2144c56b0a1cae0f7a3b2bf0671eb4e6ab01eba8e844057763084990c073dff07bd2ea271edd41
 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
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]
-		<dev-scheme/guile-2.0:12
-	)
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/t1utils
-	dev-lang/perl
-	dev-libs/kpathsea
-	>=dev-texlive/texlive-metapost-2013
-	|| (
-		>=app-text/texlive-core-2013
-		>=dev-tex/metapost-1.803
-	)
-	virtual/pkgconfig
-	media-gfx/fontforge[png]
-	>=sys-apps/texinfo-4.11
-	>=sys-devel/bison-2.0
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/make"
-
-# Correct output data for tests isn't bundled with releases
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.19.80-remove-ly-protect.patch
-	"${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch
-)
-
-DOCS=( DEDICATION HACKING README.txt ROADMAP )
-
-pkg_setup() {
-	# make sure >=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
-}
diff --git a/media-sound/lilypond/lilypond-2.21.1.ebuild b/media-sound/lilypond/lilypond-2.21.1.ebuild
index 216a4d458766..ffc80213cf1b 100644
--- a/media-sound/lilypond/lilypond-2.21.1.ebuild
+++ b/media-sound/lilypond/lilypond-2.21.1.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = "9999" ]]; then
 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"
+	KEYWORDS="amd64 ~arm arm64 ~hppa x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
@@ -41,7 +41,7 @@ RDEPEND=">=app-text/ghostscript-gpl-8.15
 	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-2.2:12 )
 	!guile2? (
 		>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
 		<dev-scheme/guile-2.0:12
@@ -51,7 +51,7 @@ DEPEND="${RDEPEND}
 	app-text/t1utils
 	dev-lang/perl
 	dev-libs/kpathsea
-	media-gfx/fontforge[png]
+	media-gfx/fontforge[png,python]
 	sys-devel/gettext"
 
 # Correct output data for tests isn't bundled with releases
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 6d4c51473a1f..eb38a121f497 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -41,7 +41,7 @@ RDEPEND=">=app-text/ghostscript-gpl-8.15
 	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-2.2:12 )
 	!guile2? (
 		>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
 		<dev-scheme/guile-2.0:12
@@ -51,7 +51,7 @@ DEPEND="${RDEPEND}
 	app-text/t1utils
 	dev-lang/perl
 	dev-libs/kpathsea
-	media-gfx/fontforge[png]
+	media-gfx/fontforge[png,python]
 	sys-devel/gettext"
 
 # Correct output data for tests isn't bundled with releases