gentoo resync : 14.05.2020

6 files changed, 82 insertions, 116 deletions

diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 90da9fd742f6..82fa98eeb851 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,11 +1,10 @@
 AUX 50lilypond-gentoo.el 258 BLAKE2B f7db42921301c25260128a9e1e990985883b8959cd76b9dda1d67f7515f003b6e8986cfafb3988748e0b2eac5e6b64db943b376ade3fdaa63023b0b6ea5d6fab SHA512 6cffb5df0776b0d03725c534d8fd1acc09b222d964bf6480e0220c02612d7d1348e3c27da908cdc8de929549dc52678d582d620c00cf35f82aaa2203e7b4d69e
-AUX lilypond-2.17.2-tex-docs.patch 608 BLAKE2B 7cf73d59a6ebadbc34952c199ba1085e6fcebafebe613b041dc8d16fae051380e051d72a2617bcc96fe382de55bfcf4e06d14c4cdd9cc1ac6a9c44a60f49ef68 SHA512 fe22e649e12ba1aacf05dab14b1820d636d58dce252832331577935db2c0e565b3ec6073c6bec11a05a4c1254ddd1495252e6b3e41623e290363eb124e7fa6c1
-AUX lilypond-2.18.2-fontforge.patch 924 BLAKE2B 5f128e65357033c2b2ae33d5f00cccd7237b59354342d33f958170e5f22d904a47aeb18dcb12b7f7c8846d3689ed7d39459b4995c99834603dc22f3b2c893fda SHA512 f4a45a1ed601c114df24e9e20aa083cd30d5b77955e19cac309508af2f59c808a629bc82bc181e5325d0534d29d3fe4de53029d2db317ed447e306e11150ef7f
 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
-DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
+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
-EBUILD lilypond-2.18.2-r3.ebuild 3236 BLAKE2B 599f2759e037577b9178ecd57f94e3d0f75c1556e7b4d02cf7959536726758dbe88b2aad35933f12f177b4e83229ac67ebaac668a3cfff535702b5dae09dd04b SHA512 788ea6f20f63795a05f205a10c1fed07a1afabfb8a321f0788216a54e92804d0254efdf74cf397f88cd96e566f98d6174eb30cd4ddeeb1c70920e1f177fadb26
+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-9999.ebuild 3148 BLAKE2B 71097cedd0f9cbcec0502f42b1e99faef8cc9adad06e4ff1f05acf71fe8cd0c0860464c285e983a39aad2b21477eaa04b28dc8c571121fe0b402936f8da727bd SHA512 6d0bbdd0f665578fbf98d18e2872a3db365bd76ba8c4400283f0e5af20b141336acf9d965f92d5dc56388959a3b7d6e7fa2bda1fbcd2dab5db3da76c5a162320
+EBUILD lilypond-2.21.1.ebuild 3215 BLAKE2B 9e3e76fff187953f7549583cfaece5e8355bdd95495a64745807ad0500a056b6faa0846c4632bb08406748876d857db6ed652164beca89cd2aaf2345d34ab172 SHA512 5a1a37f3cc74638ecf3ebeb0694acec52bc68b74873ff276fb92682c504188bba8954cf4153e3b9326bed628b06d5f213df0972b3b091a529e4c4b1257f8c745
+EBUILD lilypond-9999.ebuild 3223 BLAKE2B 5026b74a5129cd1482e8b033be13141c7d832445d228cb0b7042732b7b73a0705ed7cd014ff32eaa5e7282b70d22ec5f7d337673702f58d9859014e6669e0404 SHA512 9b5ba89e24ac4c26141de4330b94d7514f789d591ca2217f2b7ecb6e04ef55195534a49931bc7ec1e307507c70026e145a1b0e1925fbe746ac9f7ca0bbac9b91
 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
diff --git a/media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch b/media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch
deleted file mode 100644
index 9e0d7082c0d8..000000000000
--- a/media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lilypond-2.17.2/GNUmakefile.in
-+++ lilypond-2.17.2/GNUmakefile.in
-@@ -5,7 +5,7 @@
- SUBDIRS = python scripts \
- 	flower lily \
- 	mf ly \
--	tex ps scm \
-+	ps scm \
- 	po \
- 	elisp vim \
- 	input \
-@@ -14,7 +14,7 @@
- 
- ## this convoluted construction is necessary, since we don't know the
- ## value of DOCUMENTATION here.
--documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
-+documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation tex)
- 
- SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh
- README_FILES = COPYING COPYING.FDL DEDICATION ROADMAP HACKING \
diff --git a/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch b/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch
deleted file mode 100644
index cfd3295b3948..000000000000
--- a/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a832764e7300d48468a6812077b899a4beed271b Mon Sep 17 00:00:00 2001
-From: Masamichi Hosoda <trueroad@trueroad.jp>
-Date: Sat, 22 Aug 2015 21:20:17 +0900
-Subject: [PATCH] Fix fontforge version detection
-
-Newer fontforge shows git hash in `fontforge --version`.
-In that case, configure script
-might recognize it as date (version).
----
- aclocal.m4 | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 48d0b77..0037c58 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -42,7 +42,8 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
- 
-     if test -z "$_ver"; then
-         ## If empty, try date [fontforge]
--        eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \
-+        eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 \
-+	    | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \
- 	    | head -n 1 \
- 	    | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
-     fi
--- 
-2.6.2
-
diff --git a/media-sound/lilypond/files/lilypond-2.21.1-fix-font-size.patch b/media-sound/lilypond/files/lilypond-2.21.1-fix-font-size.patch
new file mode 100644
index 000000000000..cdd49584900e
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.21.1-fix-font-size.patch
@@ -0,0 +1,10 @@
+--- lilypond-2.19.49.orig/lily/pango-font.cc	2016-10-16 07:16:18.000000000 -0400
++++ lilypond-2.19.49.new/lily/pango-font.cc	2016-10-29 22:39:02.921622080 -0400
+@@ -317,7 +317,7 @@
+   pango_fc_font_unlock_face (fcfont);
+   pango_glyph_string_free (pgs);
+   pgs = 0;
+-  PangoFontDescription *descr = pango_font_describe (pa->font);
++  PangoFontDescription *descr = pango_context_get_font_description (context_);
+   Real size = pango_font_description_get_size (descr)
+               / (Real (PANGO_SCALE));
diff --git a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild b/media-sound/lilypond/lilypond-2.21.1.ebuild
index 610f8b27f2ca..216a4d458766 100644
--- a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
+++ b/media-sound/lilypond/lilypond-2.21.1.ebuild
@@ -1,57 +1,67 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 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="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+fi
+
 DESCRIPTION="GNU Music Typesetter"
-SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
 HOMEPAGE="http://lilypond.org/"
 
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa x86"
-LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
-IUSE="debug emacs profile vim-syntax"
+IUSE="debug emacs guile2 profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+BDEPEND="
+	>=dev-texlive/texlive-metapost-2013
+	|| (
+		>=app-text/texlive-core-2013
+		>=dev-tex/metapost-1.803
+	)
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	virtual/pkgconfig
+"
 RDEPEND=">=app-text/ghostscript-gpl-8.15
-	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
-	<dev-scheme/guile-2.0:12
-	media-fonts/urw-fonts
+	>=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"
+	sys-devel/gettext"
 
 # Correct output data for tests isn't bundled with releases
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
-	"${FILESDIR}"/${P}-fontforge.patch
+	"${FILESDIR}"/${P}-fix-font-size.patch
 )
 
-DOCS=( AUTHORS.txt NEWS.txt README.txt )
+DOCS=( DEDICATION HACKING README.txt ROADMAP )
 
 pkg_setup() {
 	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
@@ -66,7 +76,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	eapply "${PATCHES[@]}"
+	default
 
 	if ! use vim-syntax ; then
 		sed -i 's/vim//' GNUmakefile.in || die
@@ -75,18 +85,9 @@ src_prepare() {
 	# respect CFLAGS
 	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
 
-	for lang in ${LANGS}; do
-		has ${lang} ${LINGUAS-${lang}} || rm po/${lang}.po || die
-	done
-
-	# 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
 
-	eapply_user
-
 	eautoreconf
 
 	xdg_environment_reset #586592
@@ -96,13 +97,16 @@ src_configure() {
 	# documentation generation currently not supported since it requires a newer
 	# version of texi2html than is currently in the tree
 
-	econf \
-		--with-ncsb-dir=/usr/share/fonts/urw-fonts \
-		--disable-documentation \
-		--disable-optimising \
-		--disable-pipe \
-		$(use_enable debug debugging) \
+	local myeconfargs=(
+		--with-texgyre-dir=/usr/share/fonts/tex-gyre
+		--disable-documentation
+		--disable-optimising
+		--disable-pipe
+		$(use_enable debug debugging)
 		$(use_enable profile profiling)
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 545b867b9356..6d4c51473a1f 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -2,15 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
 PYTHON_COMPAT=( python3_{6,7,8} )
+
 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
-	SRC_URI="http://lilypond.org/download/sources/v$(ver_cut 1-2)/${P}.tar.gz"
+	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
 
@@ -19,41 +20,45 @@ HOMEPAGE="http://lilypond.org/"
 
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
-IUSE="debug emacs profile vim-syntax"
+IUSE="debug emacs guile2 profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/ghostscript-gpl-8.15
-	>=dev-scheme/guile-2:12[deprecated,regex]
+BDEPEND="
+	>=dev-texlive/texlive-metapost-2013
+	|| (
+		>=app-text/texlive-core-2013
+		>=dev-tex/metapost-1.803
+	)
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	virtual/pkgconfig
+"
+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
-"
+	sys-devel/gettext"
 
 # Correct output data for tests isn't bundled with releases
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch
+	"${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch
 )
 
 DOCS=( DEDICATION HACKING README.txt ROADMAP )
@@ -80,9 +85,6 @@ src_prepare() {
 	# respect CFLAGS
 	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
 
-	# respect AR
-	sed -i "s:^AR=ar:AR=$(tc-getAR):" flower/GNUmakefile || die
-
 	# remove bundled texinfo file (fixes bug #448560)
 	rm tex/texinfo.tex || die