gentoo resync : 11.01.2018

3 files changed, 185 insertions, 0 deletions

diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 3a494a5c8138..11484b929ef6 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,6 +1,7 @@
 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-remove-ly-protect.patch 1534 BLAKE2B fbb07b254ac8c41ac3db4c00203efd46fa48b0d3157d0ac57f60587bacae6d0cee6d1694f7a1a74b4fc1d31b338f31dd55daf294872cf8cd85d090683853cbcb SHA512 ec74abc959b569ef43eae0709ea62f012d41700dcebcb9cb4ece551b0095e593e6ac579520a3be3bef648e04ee69b3549f9152158c705ebb615ecb66f0f4d0fd
 DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
 DIST lilypond-2.19.54.tar.gz 17068093 BLAKE2B ebc3100a55affd9b89fa93abf32c7c74cf1fc3f3b026c77d7893d7cd622079a236f5690692a98bf258bea4f3cfd764307c730a1896da0b853eddda6498414d00 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b
 DIST lilypond-2.19.64.tar.gz 17174255 BLAKE2B 840b91ff39648e7ad741d1139a2040ee33aa922934a7bf891649ea99cf4aa95b0e82a98421e154cae3fb617ac8b38dc412e072206e3437e770801fe91ab914a3 SHA512 f0728496b0271c55e29871f23df53ea1be7036029c85a5ba4b88cd7c6005ff0ec880ab0992e9d99c36c7e82e83023a809f783e69f10982de3ccdd161f38ecec9
@@ -8,6 +9,7 @@ DIST lilypond-2.19.80.tar.gz 17244725 BLAKE2B f0883d59b1a14634d5d32e6a6f02c0a224
 EBUILD lilypond-2.18.2-r3.ebuild 3218 BLAKE2B b0ae7fcd18dbc5801139b982c9e7b14992b811a115e20319de1742ae6dcf9090f5dc64a70c000ca17b840dc4564de6eec918489fed41159b81de403d99a75c76 SHA512 fd882d95c2b3ca3c74bbe361082cf4eaf56caf59965d4e5c42c20a8f8de1742b4d6cd733e29d7ebcbe4b036d20169a62d03a23914d3b3df9bb70fee54a64ecda
 EBUILD lilypond-2.19.54.ebuild 3405 BLAKE2B 11cda4b12db9ffd74848b34dd67631b99c3e0081b38f5d45454d3cb41674eb0b95e309feb4abb7cc2563e6df2818473a96bfc2d17da3bc3fb8e2ded8e869286b SHA512 bc36d734846b06d50496d92a90f716733ae9cc458df000c88c9e53cbcc4f273b376487de298f8c3b365e3e6b1882fd9d693fa722cfd9f13256c5c124bbc342b3
 EBUILD lilypond-2.19.64.ebuild 3412 BLAKE2B 9123385f5ee2db9cc62a1d3c2d624c656d85704d240ee0fcf7d84bed6eb3b3f8d146287a9485006e737912d21e932ed83c72bf55886c025f80886bf4fda47f5e SHA512 572971acf6aeef2c1b61caf0588fa66e1d63d9a5b4a3b1c43af3e515817f50816be698f9e6c910cd16bf854d4a19a1a8c06711c7b515fbaa2fddb45ed25935a6
+EBUILD lilypond-2.19.80-r1.ebuild 3309 BLAKE2B 25c1bd50f48201552a27feddb85f27c11bf85c0706273c9489ce568bf5fcc5c5d23b69dc7b258db1890eb66da203443e2d5df562c189c33564a0784bcf132edc SHA512 f22a2d7f16cbe85580c19e62ec7fc64fe2314e05bceb63b8af617ef4e6c76bcf18fd1c44474ba4fb0601cd9e687df3e5095400613f6397f0943c7a5a6598eb32
 EBUILD lilypond-2.19.80.ebuild 3412 BLAKE2B 1dfd0e40c1bf89ce8203d4423110e3c2b307ef9a0ef40989ac86dccd34322120de6335f989a14d429a25ece14f57ae6c3acd0dccae5e887f2044000a6f37c60d SHA512 b10abfa1293fd20f275949690509c1076d007161b92551887da975e22667f92fd364228c9b85090d234709ade9410cce428f5f7b6a61b900aebc9d4283d4ba14
 EBUILD lilypond-9999.ebuild 3424 BLAKE2B 0b665ab80334b220921ee30b04b45156b7e871c349b34fae85f87e268760a7a6d6d5c403a440b437328ffe34f1a56daf783425f3361e9e74d9cb22c75afc837d SHA512 3fe435e2ea515617d03e11074b8c35176d30a78d344525cfec1fc4cae84d69086081de180c9e51cbfbf41cbc723f028a1e7acd92e8bde1e794ad7b9dbbf72fdc
 MISC metadata.xml 861 BLAKE2B c7214caf915ce8f32dad9cd6f08c72bb42490de9f679f073bb6e68c6f14e209f6b3013554fc786d3fb765d271bbb39d54ecdc4df2967700507ab0c9f782d4621 SHA512 d20e7dc27a7836585c7ca28cb78c073c3767a1749d16bca3989bb552d4920e949b3caf36f2227862655e61be0914602aa3af41f17a0f61246b3f305228c9b70c
diff --git a/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch b/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch
new file mode 100644
index 000000000000..d21b0a413a12
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch
@@ -0,0 +1,39 @@
+diff -purN a/lily/general-scheme.cc b/lily/general-scheme.cc
+--- a/lily/general-scheme.cc	2017-10-15 17:42:11.000000000 +0100
++++ b/lily/general-scheme.cc	2018-01-10 16:20:08.129066507 +0000
+@@ -267,6 +267,8 @@ LY_DEFINE (ly_dimension_p, "ly:dimension
+ /*
+   Debugging mem leaks:
+ */
++
++/*
+ LY_DEFINE (ly_protects, "ly:protects",
+            0, 0, 0, (),
+            "Return hash of protected objects.")
+@@ -278,6 +280,7 @@ LY_DEFINE (ly_protects, "ly:protects",
+   return programming_error ("ly:protects is not supported in Guile 2.1");
+ #endif
+ }
++*/
+ 
+ LY_DEFINE (ly_gettext, "ly:gettext",
+            1, 0, 0, (SCM original),
+diff -purN a/scm/lily.scm b/scm/lily.scm
+--- a/scm/lily.scm	2017-10-15 17:42:11.000000000 +0100
++++ b/scm/lily.scm	2018-01-10 16:22:54.914457450 +0000
+@@ -836,10 +836,11 @@ messages into errors.")
+ 
+ (define-public (dump-gc-protects)
+   (set! gc-protect-stat-count (1+ gc-protect-stat-count))
+-  (let* ((protects (sort (hash-table->alist (ly:protects))
+-                         (lambda (a b)
+-                           (< (object-address (car a))
+-                              (object-address (car b))))))
++  (let* (;(protects (sort (hash-table->alist (ly:protects))
++         ;                (lambda (a b)
++         ;                  (< (object-address (car a))
++         ;                     (object-address (car b))))))
++         (protects '())
+          (out-file-name (string-append
+                          "gcstat-" (number->string gc-protect-stat-count)
+                          ".scm"))
diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
new file mode 100644
index 000000000000..7bada7ba83ea
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2018 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"
+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}"/${P}-remove-ly-protect.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
+}