gentoo resync : 03.11.2019

5 files changed, 178 insertions, 5 deletions

diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 98c54327ca0c..b78070427106 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,11 +1,14 @@
 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
 AUX lilypond-9999-programming_error.patch 479 BLAKE2B f5375c71b2a82340dcda7ca24b8f1a5f106642c9edff2dd35ccb5793e88cd5bc512bbc47ce9636d2536cef18b76bbf5e38325c635377405a277ac405d741c6ed SHA512 4ef02c68b919792199142e83607409f6e3037367e090540a257d611ce7ebe1620c586bbeaaef2d5a953e71074ecbf92cef9710bd4bda9ebfee0ab93ca6f59c9d
 DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
 DIST lilypond-2.19.80.tar.gz 17244725 BLAKE2B f0883d59b1a14634d5d32e6a6f02c0a224643d6d28a3da623d5163396b74ebd15c3307c33c4d96778254fb6486a74c3324d26e3015d51fa163e3765f2c3767aa SHA512 13a7f258bac8ff77ad6d3879f128e86dd5bf45c7780c9738e6976915574d2dfc5404e6f49ca61dcaf8bb15eb266e65fedec4131a50ded7ab305d1856bbd7a3d6
+DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604
 EBUILD lilypond-2.18.2-r3.ebuild 3211 BLAKE2B 3e87556e56d9fdf00535b816a952fe5a133ad46f71668a0d02102c09c9f73b799c5d370d6ed788434901da5217524ee7675a3a10338831f5d2df44ef95525b9f SHA512 3f8ad4d240e1df1ed32c1b2fcfb2755dc4aa9f1c018693df543074cf776034bf4b4b89c7129952004ea72ef7f053dadfb9d9bf696be9e6ebd04951b6f366677b
-EBUILD lilypond-2.19.80-r1.ebuild 3298 BLAKE2B 52ff415a50fa1509dad2305bd5b419d9a49d28bd0c542f8225100387f613576304bc728e6e6308821f07ba9bc4d6eb367a3b04b95837e45fee1d7189ea9f8dd4 SHA512 17ab9bc1ed6d5a71d7415395d7e0ddda5962247323318bba88a9ecab6e1e170ca941fa018d024e5d9867317c6bfb663615de4d0830bd895a699f7cd33df990a3
-EBUILD lilypond-9999.ebuild 3466 BLAKE2B d68e1e1962510d9653b2bbee3647eb88c9bdb4a9f1824ad41ff30f07ad927f3b93f0f8ddbf7eb92f42530e4a40a778c9b2ea4c648e0c4443f82705983a41a987 SHA512 5e8a7e0fea9896c76e3187d7417dea2c38f05ebd0b5cb06aba66770608a0c2c315412c1e24f22dcbdc182371c617e911785ccfbf1ac731e67e9b8914d9f00f6a
+EBUILD lilypond-2.19.80-r1.ebuild 3343 BLAKE2B df34e0e524e87f4db5d6653dbaae54350e1d57503a1b8aeffd8689af4e35904506f63c14d1973073110119395941064c4c5443370380d9258bc45219911c7302 SHA512 7a4e88ca41f372ee5bdbfc31dbd905e89f91d470097da54b1fcf9d2e865ac72b7007794e492ed99777a3b177d6870ca343b991601b1c6a68b97ebf446ffa19af
+EBUILD lilypond-2.19.83.ebuild 3380 BLAKE2B 6e27d1d0e9aebadd107778c730c4997444e4f8587f39cfff60a00fbfc264889c5db01706e99619077ea5c9ced4920aa24bde007bd1def20d8f86f690fdf1e863 SHA512 4deeef41a1af273e8b52deeaac8f3dc5abc89cf2a0cc50499ea4e7fe82015bad3e7902401d40a6c56d3d333a21d94dc80c183bb102998351203f78d903453dba
+EBUILD lilypond-9999.ebuild 3521 BLAKE2B fba802b73675eed22ebb2d9bdd05a8fa7ff7ccb66c7d8cf7f70d141b540234b1bf21fd74d19d740fe04ba345f4d5dc263eba2710663651f43ac59ad92a25c90f SHA512 28f0b9038116fc5eae0c0b35e7f353ce14fea0aee7fa9f09f503e9582ab1de06dfe48fa2c6fb97ad5362b30eeb5d4b4dc02f017cc19a5135c77b5ba0f1be7393
 MISC metadata.xml 633 BLAKE2B dac41152bf1bacb1e17be7bff2adb0d84c1bf1be3655cb2c32bf70375890fb9bb4be188142e2fa120b11ae14775d85a064bf3603b2f34d99b9b59b1ac30c8fc4 SHA512 b18557745ee11cf04c2950daf88bc1e6a38e05d6610f5740ddf569c914c38a4522706e3b170f318a8380939a9bd5890b6b4db3e6bff02c5f93a7ceb44c6493eb
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
new file mode 100644
index 000000000000..4e2c2ce77c12
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch
@@ -0,0 +1,16 @@
+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/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
index 1a358dd52c2c..3e23b2dfe640 100644
--- a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
@@ -55,7 +55,10 @@ DEPEND="${RDEPEND}
 # Correct output data for tests isn't bundled with releases
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}"/${P}-remove-ly-protect.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-ly-protect.patch
+	"${FILESDIR}"/${P}-fontforge-version.patch
+)
 
 DOCS=( DEDICATION HACKING README.txt ROADMAP )
 
diff --git a/media-sound/lilypond/lilypond-2.19.83.ebuild b/media-sound/lilypond/lilypond-2.19.83.ebuild
new file mode 100644
index 000000000000..b86d49030a18
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.19.83.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2019 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 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? ( virtual/emacs )
+	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-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 93bb8d785b9b..4d591c81e099 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,10 @@ SLOT="0"
 LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
 IUSE="debug emacs guile2 profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-PATCHES=(${FILESDIR}/$P-programming_error.patch)
+PATCHES=(
+	"${FILESDIR}"/$P-programming_error.patch
+	"${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch
+)
 
 RDEPEND=">=app-text/ghostscript-gpl-8.15
 	>=dev-scheme/guile-1.8.2:12[deprecated,regex]