Version bump.

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

3 files changed, 126 insertions, 10 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 8cd34440e6c8..3c4b534f814a 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/lilypond
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.171 2013/12/11 05:08:27 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.172 2014/01/01 20:23:06 radhermit Exp $
+
+*lilypond-2.18.0 (01 Jan 2014)
+
+  01 Jan 2014; Tim Harder <radhermit@gentoo.org> +lilypond-2.18.0.ebuild:
+  Version bump.
 
 *lilypond-2.17.97 (11 Dec 2013)
 
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 021fcb303ab9..78aba806d179 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -8,21 +8,23 @@ DIST lilypond-2.16.2.tar.gz 16062982 SHA256 1f4326cf8f9363076a83ce3cbe35f7471880
 DIST lilypond-2.17.95.tar.gz 15960245 SHA256 5f286112624ed3d8c52b6d3776651ad88c2fd6c08b3f1d0049101d37488a3db4 SHA512 468e08453b2ab05594fc785bfc6995d418adab6d5ebec53361dfbee0d5b6cb82e296c83de6b1217b683c93525a0e775eabda43f1e10737114c5f18e3f12be766 WHIRLPOOL 0f9925debf113b361b28491e1dc9bf6075017ce11bac7fd36969f824287b2271387a75f795978e6e90f302480a243ac16b39285179f2dc8f89cd4c2aad0332fd
 DIST lilypond-2.17.96.tar.gz 15965830 SHA256 c0dda829ebbe637ec9fee27c47928a2cc934a2b363e761040b0e04d9e4e97a3c SHA512 cb51b84b16a33d5583cec940f8978fb3526535917a288c101d13cfcbaad08a71b9dc4583be36559b5435a5228d092e457adc277b37ca511c548f0afd16e43136 WHIRLPOOL 7a9fd2150e0f8fe796f8be6cfb8d005809127255221a8af1f154b8b6369b695d205174deb91bae14d1f68ba0099c26e81671b5c97b7048629bac574a98be70a6
 DIST lilypond-2.17.97.tar.gz 15982053 SHA256 ca8d1bc03f35399d40f768d773282e44c903a6315669d0cd385fb0c473d4aebf SHA512 31988f101f7c9f5f5c986f349405628cbbc6621499b628aa0bf256d535f20816919e4f11f99cea21ef7cf2e9f3dc28691e60cfafa92f1a0b3ce4cc53ec8bfe75 WHIRLPOOL 49a74d307fb196d196050832eadce4bd4d2e11eae24c1cb1e79ce62a7a02b65d3ef03a18e1980b0d68c8b281ab4fbea82f5b13869f189515257c76cf0527f410
+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.17.95.ebuild 2665 SHA256 1b1c9298496709e27cf3e9ccf5d43b5613d15e191aa38c1bea94ecda92fce934 SHA512 6951e83de272ae202f340093cf75d9458071c1cafe8a475f2e7d63231e56ceb22d96b09814a292bcf5182eb6d6c347067a2b8277ba151141c8cc08325b44c5c9 WHIRLPOOL e273496833a5f3f52399530c123d298ac6859467c44bfd5fc528c05874a016ec071c412b5cf7e36810860644056503d0242b727161c778407c40748c7bf3b7cb
 EBUILD lilypond-2.17.96.ebuild 2703 SHA256 f7614e7058e7e4eaa6ad02ebd748b8c7b9e68af8095c9216bdd931062d1d4505 SHA512 3ecbcb17a646d52321e8f674533c1177112394c98cc73e0d38fa67df6e711747bef7528ed7c6a2f3af2e663e61b904410164f1c3b5f32c62247262a7be9edd48 WHIRLPOOL de7228ed322bad6e105e26301d7ba217b24c8705d2deb5e0ee1a531e1c891de637a7a5d01ea7087171592b6b30c2c69a240bb25486c0ca2f1ee0b706adeff092
 EBUILD lilypond-2.17.97.ebuild 2703 SHA256 94ebc6fbd0bc7b5eb46b8cce573461fc14746e80973d1499df90c51a8b059c35 SHA512 d76a799806b79ead1654af71af69b1e602ca2003d986dad01720e18df1ac03923ad49a4cbaf037da4f73f33d529ec2cd780bb25df05f84d981ea9df053443672 WHIRLPOOL 291a0f7ebe1b645bd9dba5ffcca4da1c3d4f494aadebd917fac04ec0f9d12c4db700fdd1669ec3917fe31f494b268471cfd0451760994bd833321cdac6507b93
+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 27205 SHA256 bff04865072241dba11d5e49cb81e1cea3174f80d6c73ef1c1f79e153aa46cb9 SHA512 a8272b39cd4172f6575fcd6e83059c495142ad986004b18e95861e9860ec3ab9b75a397670406804839b3addf0aa344ed0cf1246aec27d44aab54e96eee37ab2 WHIRLPOOL e90df42640eab3a079373fa4c7a1a47acc422a8fbcf9497deb2de4534e88cf877e89106005a049d9e3fd05b993489a50681acaca447250e6c9908e9eade1bfbf
+MISC ChangeLog 27328 SHA256 3e0b8a8aa94857c382d15517e2b803cd92f32501119e5eba4608ed54bcff10fd SHA512 ae33dd54fe6342817c0b74cef59533a774daebc2a8122ba10b0d7fc26eaf63247c8bc9997579a0104f94ba327e603b2f296af1a633664ee4c44410d5dd506435 WHIRLPOOL dc778b30478d4d40f15c8d36811d798c885b7a0235683b83b7cd3d8e87ff83e63972cdacb2a2c7ac89e189c8f18c2eea4ec813a103943e3725882dc3527c7144
 MISC metadata.xml 534 SHA256 9d9d5dba892fde9a346843a9cacaeac7ce9236f643d1c0f778333cc65181a025 SHA512 711b4d7ff31d686c01cc9f67bbd84bd69da5a955e60a759b814a9379d20079061d019a53da9906a75a4a408654307406eef99129655fb38a21953eaf209215e1 WHIRLPOOL 87cddb2db014ae47a3e2408fb696fcce7118632a8574d0b8be21ef603d3ecdc4714f2736a7a3388fc907e6b2b984feabca1f77b603e34ff1477920260cb696b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSp/NOAAoJEEqz6FtPBkyj92MH/i4EFm1660A+T/NGycu2pFJF
-Qo9G5593NpfPZ29MBuHIMheABS6iUs/v/yh3Ce50hKihHhu2BxDMWARQ6KwofRUH
-BqE3/PRylO5sk+h/US9hY+yFfIXLO/GfJODYY/u1oKR3QbxdIofJp477P/tgNsC+
-WYbUmfbqUdzu5jEIQ30cfJkatqwRfWGP6aTjpnIRM2NbtGB5sbDjynXxciVTNXVd
-nOQ9ibMADLx3SrJEIZa2nkdeMcCbDHRAnlFbTiXOYz8Q/BLOYSOFDW61S7WmUGZS
-cnX2+1ueOGCdZEOyYBmYsPG7zJAiCvsk0vZgLLUZZZpSxn1lPwWG/Og22iidYFs=
-=sFhh
+iQEcBAEBCAAGBQJSxHkrAAoJEEqz6FtPBkyjEucH/3MsPhMn6sR5JS4+RP/WqYos
+Idky3JHm3ZlQZW+0ephf4TdkU2LAxQ5QVl7rp0SdN72+tss9/phka+ZL9kCn7ur0
+H361zkUQ8jjPKOoBhSOuyoTh6Ap2OQ6q7tmPjc71tUBTCL0zmpZVVl+MVDEjpCaS
+LKZ2/Nh6QVlw1X14NoZG+inkF8wkWeA/93dzJ9oewPN2RXJEP9LRt7By/VxAQW7h
+QPZ7XH2yGOWvkFrBuCrOIgkkhi99kZyp3CWTJuJrbpkFK/AcQmcIT0zfd9KpVXb1
+GEhIP0XXK0uffdROQXmlyKsiaNLZckprqb19392R8k+k5/j69uqy9jn9ShGICl8=
+=pxUp
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lilypond/lilypond-2.18.0.ebuild b/media-sound/lilypond/lilypond-2.18.0.ebuild
new file mode 100644
index 000000000000..73bf38ca720b
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.18.0.ebuild
@@ -0,0 +1,109 @@
+# 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.ebuild,v 1.1 2014/01/01 20:23:06 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 )
+	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
+}