gentoo resync : 01.12.2017

5 files changed, 11 insertions, 160 deletions

diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index ec5c74aeb737..155275d2d6f9 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,15 +1,13 @@
 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
-DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 WHIRLPOOL 95db264992a1e425fd1ee53d980941eef554c1784a1adfc105750d82d11664f61207c2b1897b6e99448790131c0715f08401f45b663c420553925596c6fd4b1c
+DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
 DIST lilypond-2.19.54.tar.gz 17068093 SHA256 0ee709f1e58caf13cf5abea9bb74179ba5c7a4f2dc470ec48d9aefb553e68a58 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b WHIRLPOOL 7ce1cc7e89c5907515f8505a1e1efe1aadf8df48c24d70a2fe39924cf9301b6c676121e6c6ceac75b76a085e5d940c6c3bb6c31e87d314dda72c68f0af1307c8
-DIST lilypond-2.19.61.tar.gz 17154903 SHA256 fc42103824cbd9e5d230ded0f73c8ecffae14998b2ad2e136914f7eab1eecb0a SHA512 870d747f6d29644824e965f4a0ff37555afbf8d8013f01965f64d4b95ca6487d15468aee27fa44036ed2d35b00f8e9bc69c22a670ad97f04ae39a16d57ea83b9 WHIRLPOOL bc690e42b2b52a5b39dea956f83558e3adb72f8027a1acb2441cd104fd5d85f2860f2a9f0c76ec882a9404ed6cbfcecd3ee4aa60d3148e79405ca9487e4de26f
-DIST lilypond-2.19.63.tar.gz 17172960 SHA256 803f3bbf87d68fbde4ea364fc62394e5907e73cecd6188bb8f12fa4f433d9b43 SHA512 58f8922e2965bb37a08472f49d88e650d2c530a29e4672b858c0d8d91dbd8a94db78668c37424ab59084cc03c7cd07e931b138374d351ecd580f23986035f106 WHIRLPOOL 926916f23237c6ea10aaae4081b00c04aa10706cf81be51d99afba2e1eb8c8638039def026a16b6cca2e0d57120e737f0f2d4809c1e12118e78a987467162749
-DIST lilypond-2.19.64.tar.gz 17174255 SHA256 9b660fe99914c54cf30b391976d6e30f7dc7683928b3bf9b3454250c86990137 SHA512 f0728496b0271c55e29871f23df53ea1be7036029c85a5ba4b88cd7c6005ff0ec880ab0992e9d99c36c7e82e83023a809f783e69f10982de3ccdd161f38ecec9 WHIRLPOOL b13d8d9fc72392653d090175ec4cba7858ed7015607e4c249454a42a4d3027f5c1799f527aab86b57eac38b36510ce5b08b7b79f3f536386c14b7f3f285ed15c
-EBUILD lilypond-2.18.2-r3.ebuild 3229 BLAKE2B 3dffa2d207370b3ca8ba881748f7161c8ca2696cb1d212e2cf32b5bb7632584e9adf5e64fccb9557c9b9febf4ddd854207122eb98509d8cb1d5c10c8aff42a03 SHA512 d388d75f4694be743d1a6127984f2fc60dde1333dd23704bc2b84263a24d0a73c8875f237d1e9b887ea524fbdd9d1c22ad2bf466b00fddce0c25a66f557d7107
+DIST lilypond-2.19.64.tar.gz 17174255 BLAKE2B 840b91ff39648e7ad741d1139a2040ee33aa922934a7bf891649ea99cf4aa95b0e82a98421e154cae3fb617ac8b38dc412e072206e3437e770801fe91ab914a3 SHA512 f0728496b0271c55e29871f23df53ea1be7036029c85a5ba4b88cd7c6005ff0ec880ab0992e9d99c36c7e82e83023a809f783e69f10982de3ccdd161f38ecec9
+DIST lilypond-2.19.80.tar.gz 17244725 BLAKE2B f0883d59b1a14634d5d32e6a6f02c0a224643d6d28a3da623d5163396b74ebd15c3307c33c4d96778254fb6486a74c3324d26e3015d51fa163e3765f2c3767aa SHA512 13a7f258bac8ff77ad6d3879f128e86dd5bf45c7780c9738e6976915574d2dfc5404e6f49ca61dcaf8bb15eb266e65fedec4131a50ded7ab305d1856bbd7a3d6
+EBUILD lilypond-2.18.2-r3.ebuild 3229 BLAKE2B a4c2d4fc7c1cb5f671c05b3e192cc4f3b4ab71ce4b914e339c7f7011cbeda4d721acee2bf1932d4b7797cc16a802daa770366cda69918c192ea148df1799e839 SHA512 bc8734666926410472dbcbcdfc1c9f1fa6482accbb94a2d47eab478e1cfe28f8bb026968d7012c3d0d0aa875765e2a8d212df33100e7ce63ee32bee226a24ac8
 EBUILD lilypond-2.19.54.ebuild 3416 BLAKE2B 3e75bae5a0c65715ee08c277fc175ea95ae8fccd44706571ee3d9c9dffc2eb0be339e9861fa756fba00cc41e4263b244466bdc3d368621e28d19c3ee8f43df10 SHA512 7a36abc1dc63e2d0d2a3c7a5befab55786211ec55e7c35caf5cc3a6eb456b1bd1db9fe4b66f29c2aa7f9bee15c685a08c70feccb3d06de6e19a7b3fab39b1a20
-EBUILD lilypond-2.19.61.ebuild 3423 BLAKE2B a13fdbe1a6b747444f22463736206cc2d20ff22cc657f8977f95c17004404b9e630528737835b612bb6668952fd04500ecdb45b55643a6f0e65a65e4b15cdd3f SHA512 72295001f330d68d7a3aed4f33dcbfcdc49fae897c862da764a943ba254469935707f03d18680566aea1249771070ae6ae921e658ad3bbae3161bfa2632b8242
-EBUILD lilypond-2.19.63.ebuild 3423 BLAKE2B a13fdbe1a6b747444f22463736206cc2d20ff22cc657f8977f95c17004404b9e630528737835b612bb6668952fd04500ecdb45b55643a6f0e65a65e4b15cdd3f SHA512 72295001f330d68d7a3aed4f33dcbfcdc49fae897c862da764a943ba254469935707f03d18680566aea1249771070ae6ae921e658ad3bbae3161bfa2632b8242
 EBUILD lilypond-2.19.64.ebuild 3423 BLAKE2B a13fdbe1a6b747444f22463736206cc2d20ff22cc657f8977f95c17004404b9e630528737835b612bb6668952fd04500ecdb45b55643a6f0e65a65e4b15cdd3f SHA512 72295001f330d68d7a3aed4f33dcbfcdc49fae897c862da764a943ba254469935707f03d18680566aea1249771070ae6ae921e658ad3bbae3161bfa2632b8242
-EBUILD lilypond-9999.ebuild 3423 BLAKE2B a13fdbe1a6b747444f22463736206cc2d20ff22cc657f8977f95c17004404b9e630528737835b612bb6668952fd04500ecdb45b55643a6f0e65a65e4b15cdd3f SHA512 72295001f330d68d7a3aed4f33dcbfcdc49fae897c862da764a943ba254469935707f03d18680566aea1249771070ae6ae921e658ad3bbae3161bfa2632b8242
+EBUILD lilypond-2.19.80.ebuild 3423 BLAKE2B e662df69a672d1c3f32cad8245d4068d9cbe160709cc4fc4177f40edfb67fb4bf2ef8d273e8bf259fdd4d75831fe3f45ddc58d5994da5bb29b2df14e7d1f3abb SHA512 2182071dc9e0a0cdaa446af6f24593e27f9709893acc9ea91629c76d1fb76e91f17f5b8f1b85c0f352d10a77562eb12117fe2097e088ae419eb4d95a95385ec0
+EBUILD lilypond-9999.ebuild 3435 BLAKE2B afb446ff41e90d4fb2ded54d0854d30c7cca89a50fbcdc1a159b38444c033f2e127a9189811f1e8c04682842ceb76e38e390ecad11281ae91e2d3444a970fbe5 SHA512 0205ed0916234ea036b527ccc8e0b086f143a73282aabe3d7a92bd196ad5638058e1ec6318f027f8a71327231cae6858843b4f1f75b674705badd004de07edf1
 MISC metadata.xml 861 BLAKE2B c7214caf915ce8f32dad9cd6f08c72bb42490de9f679f073bb6e68c6f14e209f6b3013554fc786d3fb765d271bbb39d54ecdc4df2967700507ab0c9f782d4621 SHA512 d20e7dc27a7836585c7ca28cb78c073c3767a1749d16bca3989bb552d4920e949b3caf36f2227862655e61be0914602aa3af41f17a0f61246b3f305228c9b70c
diff --git a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
index 4afc18c6e1d6..ee3ea59a82a8 100644
--- a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
+++ b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -80,7 +80,7 @@ src_prepare() {
 	done
 
 	# respect AR
-	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+	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
diff --git a/media-sound/lilypond/lilypond-2.19.63.ebuild b/media-sound/lilypond/lilypond-2.19.63.ebuild
deleted file mode 100644
index 5dd683dc4186..000000000000
--- a/media-sound/lilypond/lilypond-2.19.63.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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
-	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
-fi
-
-DESCRIPTION="GNU Music Typesetter"
-HOMEPAGE="http://lilypond.org/"
-
-LICENSE="GPL-3 FDL-1.3"
-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 ${LANGS// / linguas_}"
-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"
-
-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
-
-	for lang in ${LANGS}; do
-		use 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
-
-	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.19.61.ebuild b/media-sound/lilypond/lilypond-2.19.80.ebuild
index 5dd683dc4186..3fae42dbe7e2 100644
--- a/media-sound/lilypond/lilypond-2.19.61.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.80.ebuild
@@ -85,7 +85,7 @@ src_prepare() {
 	done
 
 	# respect AR
-	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+	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
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 5dd683dc4186..e451c38deeb9 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit elisp-common autotools python-single-r1 xdg-utils
 
 if [[ "${PV}" = "9999" ]]; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
 else
 	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
@@ -85,7 +85,7 @@ src_prepare() {
 	done
 
 	# respect AR
-	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+	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