gentoo resync : 16.09.2020

4 files changed, 56 insertions, 26 deletions

diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 3a0b17df2c66..a36d3e5c6b7f 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,9 +1,9 @@
 AUX 50lilypond-gentoo.el 258 BLAKE2B f7db42921301c25260128a9e1e990985883b8959cd76b9dda1d67f7515f003b6e8986cfafb3988748e0b2eac5e6b64db943b376ade3fdaa63023b0b6ea5d6fab SHA512 6cffb5df0776b0d03725c534d8fd1acc09b222d964bf6480e0220c02612d7d1348e3c27da908cdc8de929549dc52678d582d620c00cf35f82aaa2203e7b4d69e
 AUX lilypond-2.21.1-fix-font-size.patch 505 BLAKE2B 33f98803eea6a87082a9c724bb88ea6fc9493f97856f8c581f28c786010ce215a6626970eec602d8d311ec5e84f5485cf7a3cfd3fdc1099c8096ca5af28aeae6 SHA512 a59c00e4f2c44797e4e7656bc7f097b644399a211c691c8ca1502dfbdc0806ce9efbc24644675b2d246f585b74a17bd1895a5bb830fe10cda2e6dc7c0846848c
 AUX lilypond-fix-cve-2020-17353.patch 2867 BLAKE2B 135d6ccc6ed93786189b54ea77219d527e6febd59434a10b33255e2d3c21db600ea9e231d852d188a8933c6acf5f1567f48c4b7e8f905f8bc87dda1b13d8d936 SHA512 83f513a6c4999579102b592e7babc556f49a4d04f799203ff790ec211c0744a91a17700b6742c3a2044ef90c2ce52a6f768f69f376952867715315bc8096689c
-DIST lilypond-2.21.1.tar.gz 18135688 BLAKE2B 4a797c325e254b59cb314b28a801198f398efd7a37cac448b79d8161ab7248b0c9ca45ce742b82d0aebb784a98637209c84df74304a9e8c8f744b9f5033e18d2 SHA512 596f6a09d0f9a0c39ca717a9e4e246e03679a6cf40a78491eac9bc3eccf173799c75a0baef491cae8385bf1abda53244fd731695762b6fd841396edb92d0ab75
 DIST lilypond-2.21.4.tar.gz 18011766 BLAKE2B fe9731a170ec6e551bd5e2259cca33e1c69ee5dedccaf39e7026afe3342da8d301f7450450122f4e102915d4469dddb89575b3a75db21e988d526d9b683bcc38 SHA512 29d671d411cf3817e8a62f208bec4c8d74a08c3a54b8856c1474cfa736e2882c5418b52af2675598093fae2b77c2ba4c812aae9164d99c9643ff18271cee6860
-EBUILD lilypond-2.21.1-r1.ebuild 2915 BLAKE2B 8d74f5ee00c2720c7727e01c68fc9b1b2f26c98e1fc42e924e18dc2aa5fc85d4ddf808b55a93be3b4bdaaafa61889589b3bb0c717ece561be73e556c54532e72 SHA512 d308d5fb8916446b59ef63635e18e2ff657bfac712342910836a081f2d09c3aed8236115a39ccdfd780172d472a2fed5b94c837be3205d820fb94a0cd16c8387
-EBUILD lilypond-2.21.4-r1.ebuild 2928 BLAKE2B e304dfcaf4f267b991a5f449913fdcaa195a72dd8465ddac3865395de5fb7213b296a5b5e1c0993ca1a383cbcacd83f23f262f08c99e1239755655ad3d42ecc1 SHA512 5f76b763f9f582afbc24f3b97e1ccd26593d7dc571f08e0ca9dae71f8cad93ca7b14d1bfd2608ea349174646498583185f90bf7f59e706af4c90170c04d79145
-EBUILD lilypond-9999.ebuild 2908 BLAKE2B 4fbe34b7372cc6aa790119433519b2f9f934b7315b9601f5148598dbfafdeeca2de58b0b53afe15f80efb6ed0b24fe6ff0faf13d91e21b21815184663ef9444a SHA512 2a36d755c15731d168283dd2d4a582c479d77740d5f4596baf04b502a662e9e50e63bdf4aa6becb3e273f0b0c80b098d038723ff51e441e90eaba0d75fff34b9
+DIST lilypond-2.21.5.tar.gz 18005124 BLAKE2B d41f2baaeb0e72905f688bf7bd88e9acdc1eabc1bf69a05e8d5208f8ffc06197830c6b6ff1f09034eebc15fc4d94f6909848940361e06120530abc67b10aa87e SHA512 bcc72d0d040125fc9e4f7447e31af59959cae8c1afef1f6c4b7fb1fdbf037931a94d64c94b6b26e37de7d66ec52f24b2ba1b4fd0a6e0862b82eeef3c86d94958
+EBUILD lilypond-2.21.4-r1.ebuild 3053 BLAKE2B f8f2f771482766d84725f1237f65a3fd7d9f83043a9458ef0f9484609fb27e0a83586956a091cfa75b31a4c567cacf60cea51a6e8052c49d2428dd08abf0f997 SHA512 0a089d91141293c8c85f839c00b7524afb1fb4cc06a78eea49faa16d3c678c904fd393eaf1aa007015f029eaed18cc71fd4ddbf34ae78436c3c8e6c6670eee3a
+EBUILD lilypond-2.21.5.ebuild 3343 BLAKE2B 77b92a732c68cefb1c1cdff69ed0e54b20b633d6b5ee1a292d543a45385bafe67594381d9b0ebbfa4a42f92cdc56509f0a0295c0c983b28bab027c525a3f93bd SHA512 6f6cb65f7e1a951ea2a1039bece43658471ff32cdfa5159649b87fd83681b3923ca2c05254417c2d54a9608afbecf004c50738be90f7e29ef6091d4b07dc208b
+EBUILD lilypond-9999.ebuild 3343 BLAKE2B 77b92a732c68cefb1c1cdff69ed0e54b20b633d6b5ee1a292d543a45385bafe67594381d9b0ebbfa4a42f92cdc56509f0a0295c0c983b28bab027c525a3f93bd SHA512 6f6cb65f7e1a951ea2a1039bece43658471ff32cdfa5159649b87fd83681b3923ca2c05254417c2d54a9608afbecf004c50738be90f7e29ef6091d4b07dc208b
 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
diff --git a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild
index 0196e4c7d4d9..7d751530c323 100644
--- a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.21.4-r1.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"
@@ -79,9 +79,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# fix hardcoded `ar`
+	sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
+
 	# 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
@@ -90,9 +92,10 @@ src_configure() {
 		$(use_enable debug debugging)
 		$(use_enable profile profiling)
 	)
+
 	export VARTEXFONTS="${T}/fonts"  # https://bugs.gentoo.org/692010
 
-	econf "${myeconfargs[@]}"
+	econf "${myeconfargs[@]}" AR="$(tc-getAR)"
 }
 
 src_compile() {
diff --git a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild b/media-sound/lilypond/lilypond-2.21.5.ebuild
index 521872ddafbd..c03d4b781515 100644
--- a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.21.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
@@ -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"
@@ -20,7 +20,9 @@ HOMEPAGE="http://lilypond.org/"
 
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
-IUSE="debug emacs guile2 profile vim-syntax"
+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 guile2 profile vim-syntax ${LANG_USE}"
+unset LANG_USE
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
@@ -29,6 +31,7 @@ BDEPEND="
 	>=sys-devel/bison-2.0
 	sys-devel/flex
 	virtual/pkgconfig
+	doc? ( app-text/texi2html )
 "
 RDEPEND=">=app-text/ghostscript-gpl-8.15
 	>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
@@ -48,17 +51,22 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-libs/kpathsea
 	media-gfx/fontforge[png,python]
-	sys-devel/gettext"
-
+	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}"/${P}-fix-font-size.patch
-	"${FILESDIR}"/${PN}-fix-cve-2020-17353.patch
+	"${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch
 )
 
-DOCS=( DEDICATION HACKING README.txt ROADMAP )
+DOCS=( DEDICATION HACKING Documentation/out/topdocs/README.txt ROADMAP )
 
 src_prepare() {
 	default
@@ -79,25 +87,28 @@ src_prepare() {
 }
 
 src_configure() {
-	# documentation generation currently not supported since it requires a newer
-	# version of texi2html than is currently in the tree
+	# fix hardcoded `ar`
+	sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
 
 	local myeconfargs=(
 		--with-texgyre-dir=/usr/share/fonts/tex-gyre
-		--disable-documentation
 		--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[@]}"
+	econf "${myeconfargs[@]}" AR="$(tc-getAR)"
 }
 
 src_compile() {
 	default
 
+	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"
@@ -107,6 +118,8 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
 
+	use doc && emake DESTDIR="${D}" install-doc
+
 	# remove elisp files since they are in the wrong directory
 	rm -r "${ED}"/usr/share/emacs || die
 
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index fc14ef8ed34b..c03d4b781515 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -20,7 +20,9 @@ HOMEPAGE="http://lilypond.org/"
 
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
-IUSE="debug emacs guile2 profile vim-syntax"
+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 guile2 profile vim-syntax ${LANG_USE}"
+unset LANG_USE
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
@@ -29,6 +31,7 @@ BDEPEND="
 	>=sys-devel/bison-2.0
 	sys-devel/flex
 	virtual/pkgconfig
+	doc? ( app-text/texi2html )
 "
 RDEPEND=">=app-text/ghostscript-gpl-8.15
 	>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
@@ -48,8 +51,14 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-libs/kpathsea
 	media-gfx/fontforge[png,python]
-	sys-devel/gettext"
-
+	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"
 
@@ -78,25 +87,28 @@ src_prepare() {
 }
 
 src_configure() {
-	# documentation generation currently not supported since it requires a newer
-	# version of texi2html than is currently in the tree
+	# fix hardcoded `ar`
+	sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
 
 	local myeconfargs=(
 		--with-texgyre-dir=/usr/share/fonts/tex-gyre
-		--disable-documentation
 		--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[@]}"
+	econf "${myeconfargs[@]}" AR="$(tc-getAR)"
 }
 
 src_compile() {
 	default
 
+	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"
@@ -106,6 +118,8 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
 
+	use doc && emake DESTDIR="${D}" install-doc
+
 	# remove elisp files since they are in the wrong directory
 	rm -r "${ED}"/usr/share/emacs || die