gentoo resync : 17.02.2021

3 files changed, 2 insertions, 147 deletions

diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 89ddad07c9c5..f11ef595f527 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,11 +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-2.23.0-fix-font-size.patch 573 BLAKE2B a9b9fe5249b76a92aa6c0f8e4c0002f03785225e081b07d4ab34db459bd8d241b97051273846dd9efee4536e00b37fd0a064302d05b537069e17b6dff834a1b9 SHA512 523e5d1ddf68c07715e791ed9367c836010603369f14ee22ce7ab2979131be1c066dabdd66a942ed9b098c3f535577dded0bb0e1e48c35754d7f9c455d4911f5
-DIST lilypond-2.21.6.tar.gz 17996701 BLAKE2B 2efbdae1bd16ab1682c14c1c0e01146d66dd408ff5d3f9b69ed38dcedd88b68c6ae3219b02e7a3967833d802488a90aecf50964f44ebb5445f887d4a532a41ad SHA512 9effceabe39a0ca5f3837e0ff1cb0d4caed87b4b76e40f7c4f618d682b2e3db8f82e461e5c9555d6c05d591be54a08370599ed8c72d1e92ba80bcabf4d21a6f7
 DIST lilypond-2.22.0.tar.gz 18023031 BLAKE2B a7512629be43680c6e6bda1404c9b8e4a9bfb0b65ad565aede9dba983ae8e5fb350e8a53250cd01314b4d032d1bbe7b391bb3acd411dc6665868f4cd04f15011 SHA512 4dcc4da1bd1aa1d10ca802acbe29f2256587cd8e2643651b6d2e42cfce0b9572d0eb1139fbc59cec98ad6b86b86e7a6910becb6be7a4350ee0adfe366daa0a65
 DIST lilypond-2.23.0.tar.gz 17047610 BLAKE2B 5d19a9936893a37db3ff6de269978d586012b7546fe5f3147e86966f1d521731dd2cf074c90de5b49feff6ee6f5057c90fe6485d7ae9126a8a5810b55d2dc5b2 SHA512 0138338e9e650f1d0d96504cd31d8b191307ae3fcec839162c80b8d233b27a9ff94f5b107aa2318278a874ed14e5e47747211ac4b44839d6749337f06dc12a6d
-EBUILD lilypond-2.21.6.ebuild 3259 BLAKE2B 2cb854d7b37cafe41bba0a32e0a121f6c1c40ae7da0dfa1d61018ecef07d430a5055b12fa57fbf7e23dbcdedfe3e9d5fed3d42fd035ebd8bdd1fa1b53edc02f8 SHA512 e62aa41a9a884abef1f0ae028c3816aa5c51b5c3699a8f723b049bb70a0449c42d4ee120edad5c932be18c17892946003b2762627c63aa343a7d96525f88ef55
-EBUILD lilypond-2.22.0.ebuild 3260 BLAKE2B ed1441a62347c2467baf6efbc35b973c280cb366d1e154ff06c88acfea301701c15b74a548be5e9beb8ded96d5b6ec425b664601ef4ca578c469443814640df9 SHA512 8b34f3617757e4a445f978e5ad7cae30577b8315442ee8a8421b0165bb476883fa2385a93363a5ab72bad119628f355e4efa793ab9c2a7af129c42b960a41fd8
+EBUILD lilypond-2.22.0.ebuild 3259 BLAKE2B 2cb854d7b37cafe41bba0a32e0a121f6c1c40ae7da0dfa1d61018ecef07d430a5055b12fa57fbf7e23dbcdedfe3e9d5fed3d42fd035ebd8bdd1fa1b53edc02f8 SHA512 e62aa41a9a884abef1f0ae028c3816aa5c51b5c3699a8f723b049bb70a0449c42d4ee120edad5c932be18c17892946003b2762627c63aa343a7d96525f88ef55
 EBUILD lilypond-2.23.0.ebuild 3125 BLAKE2B 09cd1233322c01a66ab269587e26e749d6cadaa59850cf9d43a1871ff83abe7c055bb6b3af9217025787ac39fb72cf19139d0cdeebaaa1ed6ebac68e8e3162f6 SHA512 05e6f86c0e9a077593ef291d7100f6d483ae38840675490abba3035b054ee66f48ec861db8d15723fa5f37b19445f5b1155517c2ed4bcc158c2504c2e0380fa2
 EBUILD lilypond-9999.ebuild 3133 BLAKE2B 0654eabc0c866033058b8acc79534507eaceff26722308b80a8fa813bd11f1dcfa403ef9a5630eda9c4bed42c45598b77cd3cdef19509dcf7720df482ec2b272 SHA512 df015a49fdc4eace7530a6443e71a051b1739ab09ba75f36b44081b794b99ab29a636b686fd05dd12de55ce8860befa1ee0f20903314cf408cfaf08154868e36
 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
diff --git a/media-sound/lilypond/lilypond-2.21.6.ebuild b/media-sound/lilypond/lilypond-2.21.6.ebuild
deleted file mode 100644
index 4b0263ccad91..000000000000
--- a/media-sound/lilypond/lilypond-2.21.6.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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"
-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 guile2 profile vim-syntax ${LANG_USE}"
-unset LANG_USE
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-texlive/texlive-metapost
-	sys-apps/texinfo
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	doc? ( app-text/texi2html )
-"
-RDEPEND="app-text/ghostscript-gpl
-	dev-scheme/guile:12=[deprecated,regex]
-	media-fonts/tex-gyre
-	media-libs/fontconfig
-	media-libs/freetype:2
-	x11-libs/pango
-	emacs? ( >=app-editors/emacs-23.1:* )
-	guile2? ( >=dev-scheme/guile-2.2:12 )
-	!guile2? (
-		dev-scheme/guile:12=[deprecated,regex]
-		<dev-scheme/guile-2.0:12
-	)
-	${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.21.1-fix-font-size.patch
-)
-
-DOCS=( DEDICATION HACKING README.md ROADMAP )
-
-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
-
-	# remove bundled texinfo file (fixes bug #448560)
-	rm tex/texinfo.tex || 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=(
-		--with-texgyre-dir=/usr/share/fonts/tex-gyre
-		--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
-
-	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
-
-	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.22.0.ebuild b/media-sound/lilypond/lilypond-2.22.0.ebuild
index 5214b122e904..4b0263ccad91 100644
--- a/media-sound/lilypond/lilypond-2.22.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.22.0.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"