Fix metapost deps (bug #498704 by Aaron Pelton).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 135 insertions, 13 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 910df8a0786e..7197b5631bcc 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/lilypond
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.173 2014/01/01 20:23:57 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.174 2014/02/04 07:31:03 radhermit Exp $
+
+*lilypond-2.18.0-r1 (04 Feb 2014)
+
+  04 Feb 2014; Tim Harder <radhermit@gentoo.org> +lilypond-2.18.0-r1.ebuild,
+  lilypond-9999.ebuild:
+  Fix metapost deps (bug #498704 by Aaron Pelton).
 
   01 Jan 2014; Tim Harder <radhermit@gentoo.org> -lilypond-2.17.95.ebuild,
   -lilypond-2.17.96.ebuild, -lilypond-2.17.97.ebuild:
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 0f55ed7ae627..743f0d9ca6bc 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -7,18 +7,19 @@ AUX lilypond-2.17.2-tex-docs.patch 608 SHA256 ca43b5633f3ee85748d5f0f43814b144ec
 DIST lilypond-2.16.2.tar.gz 16062982 SHA256 1f4326cf8f9363076a83ce3cbe35f747188084f7492000ed3a7ccc3ce60aa1cb SHA512 3ead74ddb7e51be274aa5aa607b776261ae5d0e9863ebe745451875e62a60fac2376f7e80546df66010cdec2752c271e7006275608f30ce9a2d1b88f22dc1d8d WHIRLPOOL a25539dac5e508220e1ddeeaed261b730e76fd26c5dbc0f97683b65bcbc5907ef6bfbe8c16a7f6a15d12950d4a7d547ee1716e25cdfb5b750e235c913a8ef38e
 DIST lilypond-2.18.0.tar.gz 16013863 SHA256 89059139a560a4900305b52d9327969cfcdedb061ed7bae310fdf5d4ba2aa230 SHA512 17d758688ac0c7f9e654e0157cd55ec9e9310d70392109c1edd666c1dc33e1ac9682eb1c18e678d018181c7d7dc916a62c6cc49e3c66c5c940bd2634e0d2e3bb WHIRLPOOL 2db89015daa41fcee21f435bf3e9d86edcb9c52e278ab482be7ba3cd5a046b65be312e1c9702ee16080045b70ac3fa1757965a7586384af0485f4b3a43486a30
 EBUILD lilypond-2.16.2.ebuild 2560 SHA256 2e8712a0e9255175019eccbe036b9d59b66adffb2dac72e449208342d5b76928 SHA512 ab5adb4f15cfb188ea50ef2bb9c2b04de5591e143e5787ec0f2f74268008c67a4dc4b3afcb4435df3fb033b5635fa37a1e55c234234dabaf65ba30dbfd93c176 WHIRLPOOL d1096e66c7cc0d154edfc82bccb1393aaae42dc0257317ba99b5d50ab03babf5e4ec1ec6574b136b78bcf138e4e12b5299cd7ac3995062c7bde3b026b5620c1f
+EBUILD lilypond-2.18.0-r1.ebuild 2750 SHA256 b1e2a3b6be81ea530f9548a7b21b58819bb44c3455be7fa3d0f7b1136451c1f8 SHA512 5d57e9da96fbcf961b13b928dfe7d8ba24578dd5db351b9e6968518b64103abf4e5a0fc0ba96f47a2c63aa9cd42cd5cc0e1f908c6a98b63e1f17e3893fa491c0 WHIRLPOOL 18044f3c4a42dac83fb0874f688684902e042fb54e9ac75064c8ac289bd85c9ff49fee271ab2b7d5af61d767bed618eb85d3abbcc6448f4607f2d1a25866c018
 EBUILD lilypond-2.18.0.ebuild 2702 SHA256 6625f0b22b34438c037562a449bba01ca4bc5f7b9f30ce8d287e37e99ed501c4 SHA512 ae3cb255fb61292e6635b7bfc4ed55e2ac086ebcfadb718eb15d97fdf67910feb1313a5303fb7c52dc169818954f0a99884b4a364a200025738477174a75b019 WHIRLPOOL 65a2368b4bf882d7923d99816fbaaff9920e6608db1122e2695b50cffd6bfa2a04161efc929f81146dcd819b011c700d05e970e959d0b9bc54648920add51d36
-EBUILD lilypond-9999.ebuild 2575 SHA256 427065c30ccbd656885f5892560bb07fa3a6f6fc7288dc78708356c2097b1da8 SHA512 f57f7eeb5fb0fc273d3beea193fc358bbf2600e870c144ef0c7bcdded903b61692095c8f7db038eb556079868a942092b05bf9cd5f651aec5995914b97029f67 WHIRLPOOL 29f0be293fcc61aa3e45145b782bf3342f8cd3c86494631fbc391fd4632de7c0e678d06b6270d69ccceea4364bd382042bcdf10ce06c8331a4f9538cb6259b15
-MISC ChangeLog 27472 SHA256 ded98c628ffa7e4d713c3905ef2976595dd42cc2a3f723035dde7271ddcdc4bb SHA512 52f37d68569b109cacc7c0182a84da49094168afac69ae323ade9c41cf4ca9230ca5340d37ba74235b79d31ec302ef65d068c5801cba701370c4b244edef51a6 WHIRLPOOL c872fe86277d453dcf50f27b758ad84295a59685554fe8172253ad6cd57eb172d8e683f92b9969e272d2e1a76ecc7c11091e55713d2dbb52785ff03d52d53aa5
+EBUILD lilypond-9999.ebuild 2620 SHA256 1205d39ecc5da4660b73054cc848e8221f18ed0a00e4b54272902969f69d0cd2 SHA512 0a98731a90aee219c3e648ff8e8ff207d3330bf31b8e2e530b94ee6186e2ce7631316043c201da4c92281e76d2e2677493c4324767413b1b1f24d9d18a0387d5 WHIRLPOOL a62e4db13f7130bd37f34594660b20668b2f41f65c29a71e1aa38a1af31964a424a492cb5b99aecb60bbe8a36debac62e267de54ef1dc8d5ab5f2b5c5efc02cc
+MISC ChangeLog 27660 SHA256 d096c5bf752aa29615abb2b6625239043ca21d359336e25c2940a029be091077 SHA512 16894adcbac254123d1b538c202ca822a240b6ca9189269792ab7c8171621efe1907487e33ef911a2ec3bc41af7a0ba2908fc0207a7e6ae1f8dd33ccc72628c2 WHIRLPOOL 3b03fe8ca0151783517902f6aec7be5f40451824275b27048f5c62b21fe96154fc72b264abeccb80a5c716fde71f7634db15537d65910092068c6b4b3c557097
 MISC metadata.xml 534 SHA256 9d9d5dba892fde9a346843a9cacaeac7ce9236f643d1c0f778333cc65181a025 SHA512 711b4d7ff31d686c01cc9f67bbd84bd69da5a955e60a759b814a9379d20079061d019a53da9906a75a4a408654307406eef99129655fb38a21953eaf209215e1 WHIRLPOOL 87cddb2db014ae47a3e2408fb696fcce7118632a8574d0b8be21ef603d3ecdc4714f2736a7a3388fc907e6b2b984feabca1f77b603e34ff1477920260cb696b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSxHlfAAoJEEqz6FtPBkyjBKsH/338mJyl9ndgNjPtz0OR3h1p
-RFzpc/7aPHw7+2SI4clhKlcZ4gihGQBQpEiVudiD88uOi3k/s7mx7tbRfTw1jiQ3
-UuzZsN/Zk+3WuVe7fSBSNzmCywa13+Q+ioXOO8P5lOku04+RYLYvD+3fzJbcBy23
-3PviCKfhmQPe/sFsW6d/uEa1U6yD/jP6HBGh44HrSnIi4V0JeZj4kdz0c1Z3K3Y+
-+Q7qbJrC70b8cCin8N4Xm0ls9Vi71eXlSjOtdOiIxIXgrVNYllxmMigYHln5NVqc
-/DOKrmbVWc6NtYiEpS6au8uJ9N9cCfGU86Fbt+kssxyJOnsjSC1I9VYJ6uHEAvM=
-=p1Gh
+iQEcBAEBCAAGBQJS8Jc7AAoJEEqz6FtPBkyjPOQH/j/sk0idpKKgR1226tqamHH7
+s25ZE57hFMNDC3J1nCWybmJJHK4q6T34R2vDzZK8WO4eqtvT9UeJ2dkoTz92oOnW
+12AssoI14taSMBzAbZu7vYrMk1fzgO5yw/TCD8ulpbKh+tYONbjBqf3YGnQsTLS5
+VKIW5jQTYQd2pM4QfgagiaD6i8tZZGempyqHvV3e2vzPcC8tDJkPvOO64/nuRevA
+rcqj+8B0vQUUICjuOLkPlU5zPC72xFk/QR11tLAIdck1JinAYgFQ0EBuLlLmfb0R
+4DMH1bZfHWdvwxg/+JLMosZW0VoxTRCPcIwAHIZK2zvywNF/cR1f4qD2M4iUt0E=
+=rxgC
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lilypond/lilypond-2.18.0-r1.ebuild b/media-sound/lilypond/lilypond-2.18.0-r1.ebuild
new file mode 100644
index 000000000000..b0f266113114
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.18.0-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.18.0-r1.ebuild,v 1.1 2014/02/04 07:31:03 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit elisp-common autotools eutils python-single-r1
+
+DESCRIPTION="GNU Music Typesetter"
+SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
+IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2[deprecated,regex]
+	media-fonts/urw-fonts
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=x11-libs/pango-1.12.3
+	emacs? ( virtual/emacs )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	|| (
+		( >=dev-texlive/texlive-metapost-2013 >=dev-tex/metapost-1.803 )
+		<dev-texlive/texlive-metapost-2013
+	)
+	virtual/pkgconfig
+	media-gfx/fontforge
+	>=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"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
+
+	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
+
+	eautoreconf
+}
+
+src_configure() {
+	# documentation generation currently not supported since it requires a newer
+	# version of texi2html than is currently in the tree
+
+	econf \
+		--with-ncsb-dir=/usr/share/fonts/urw-fonts \
+		--disable-documentation \
+		--disable-optimising \
+		--disable-pipe \
+		$(use_enable debug debugging) \
+		$(use_enable profile profiling)
+}
+
+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}"
+
+	dodoc AUTHORS.txt HACKING NEWS.txt README.txt
+}
+
+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 6f6dd4fe44ce..1d09effd4c9b 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-9999.ebuild,v 1.5 2013/12/11 05:08:27 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-9999.ebuild,v 1.6 2014/02/04 07:31:03 radhermit Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -29,7 +29,10 @@ RDEPEND=">=app-text/ghostscript-gpl-8.15
 DEPEND="${RDEPEND}
 	app-text/t1utils
 	dev-lang/perl
-	|| ( <dev-texlive/texlive-metapost-2013 >=dev-tex/metapost-1.803 )
+	|| (
+		( >=dev-texlive/texlive-metapost-2013 >=dev-tex/metapost-1.803 )
+		<dev-texlive/texlive-metapost-2013
+	)
 	virtual/pkgconfig
 	media-gfx/fontforge
 	>=sys-apps/texinfo-4.11