bump, fix bug 228823

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.23-gentoo-r8 x86_64

3 files changed, 130 insertions, 2 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 642463407a2d..099383cc01fe 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/lilypond
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.81 2008/06/12 20:39:21 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.82 2008/07/03 18:09:57 hkbst Exp $
+
+*lilypond-2.11.50 (03 Jul 2008)
+
+  03 Jul 2008; Marijn Schouten <hkBst@gentoo.org> +lilypond-2.11.50.ebuild:
+  bump
 
 *lilypond-2.11.49 (12 Jun 2008)
 
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 6b1c843c6c99..2fd83f9feac2 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -9,6 +9,7 @@ DIST lilypond-2.11.44.tar.gz 3743522 RMD160 083ed24fe936a0f7f73c05131a3561a77d11
 DIST lilypond-2.11.46.tar.gz 3800115 RMD160 baf8b4bccbcedd566daf7775db569b5559ea30f5 SHA1 28a1e20315b045671fbc171f6a21ba8ffe2fda52 SHA256 e0afb99e4354196eb962498546cb1304c02c29889bcb3fd3d88919b48c55a7e0
 DIST lilypond-2.11.48.tar.gz 3815459 RMD160 157762b0ff0599b65c9c44cb07285131161da5af SHA1 f1296157435c7fa896bc7b211b28e73793ef195b SHA256 58c7b117d0d371fd21f37d5e08f69575dd8df80f588a575079de8f3a427479d7
 DIST lilypond-2.11.49.tar.gz 3822459 RMD160 3838696a949dfa3f6fb58b445246d85da203ad6b SHA1 a2ecf2a2bdba024f98118e1de26bfcd9b794ff57 SHA256 5beda0d1d20489f637b4183ffdbd4ec915da28ab7a4e0c24f6cbf54084b0ec2d
+DIST lilypond-2.11.50.tar.gz 3853529 RMD160 5fa3869089db8d8b4319338968d6a4d652b6e104 SHA1 7dd80cd11df141a83db7d8996d2c0ffbb85e0a7b SHA256 4913ca12af8af383c25cd4b0d38cab504757435b853201953f092661ab860501
 EBUILD lilypond-2.10.33.ebuild 3203 RMD160 6ff2c0fa97ed3643cd7fad16a636d6e2f61eb2bd SHA1 3dbdcdb7874cb1d37a2a91a9f8e48365868af428 SHA256 8ce5836781304f8c2c60f77be398952fdb482da44d6965140fb70b78d7f21117
 EBUILD lilypond-2.11.33.ebuild 3205 RMD160 72749f46dc349a333ec53ccaa9b3c40d2b992168 SHA1 f9d84491b49d208c80a44c97ddca01967308097c SHA256 78158107bd7bad7a5335a29e4eca74c947164f2052a52310f048cb74656866f1
 EBUILD lilypond-2.11.36.ebuild 3185 RMD160 b8c989669625a9f7678b34ff8b82e63eabe99bc1 SHA1 fca7bed4ecefc742c3c4fe5747ad76c1c60ee771 SHA256 268e12cb34248bcc0c830e89b679313b2b769135744e57ac2df751eb1ab25b9b
@@ -17,5 +18,6 @@ EBUILD lilypond-2.11.44.ebuild 3186 RMD160 39e3bb34f0cf10165c691778b93cd54ecc34b
 EBUILD lilypond-2.11.46.ebuild 3186 RMD160 3d63f72faa089207122e377416a8cc0365902bbc SHA1 744ed2e29565dc629b3a5abc7cfde2c464422ad4 SHA256 092f8b9aeb968186da35f8a54b7e0ca6ac7672bd4ae4a46395356350f50b4043
 EBUILD lilypond-2.11.48.ebuild 3186 RMD160 f471f9d3955915782f6a051428bd3d474d75a9dd SHA1 6a6699c444697ec2d4f45b4eb376680cea192e90 SHA256 dc4736b5719c829d30ac1056a96c745fe0e34880c68ebf948f940500ed96712e
 EBUILD lilypond-2.11.49.ebuild 3186 RMD160 586d812f7d34c7238ba7bc4c2be40e8144bffd86 SHA1 ab6a89a508988833fc8de76dca437237ae05f82b SHA256 7b2689baa0aaa059def0ebd513430a892d0bb6c7bf1cf9b2d5bc43ed75a41eaa
-MISC ChangeLog 13695 RMD160 a8c35e4cb177b3ff5c54a4ee22dd073d1a87beed SHA1 32f61a486853f16e30df76a48971bc2fb5e3d130 SHA256 914085a9e967583fb13c98f344abf09d16a71a7319545cff1e3c547808673cdc
+EBUILD lilypond-2.11.50.ebuild 3257 RMD160 daf824e6099f10e74f0e36626d4eb7d0cd766d0c SHA1 b799e75b159e67ff23a6947a80fdcd51209a0155 SHA256 98a5ebb03ee06686db1e9c476cf064bdc5fe0097cf3d98508c776cae552360e1
+MISC ChangeLog 13812 RMD160 1788db76237151570040c9a4c85c9bde21afbd1f SHA1 8acc2c244e73eae0af0596c117b58bf2f93c3bbb SHA256 ba7fcba4d61c7529367db3968d86a1030a9129b703ce3bd95161d341af092a57
 MISC metadata.xml 440 RMD160 303266342eda535b9947139b2ff53c00228d9ccf SHA1 f294fb6ef478508f521240bb9d6492f5341e9193 SHA256 036d6305ad38764d6c362c74949cc7241fbc685220c34409fc4a793ff93f214f
diff --git a/media-sound/lilypond/lilypond-2.11.50.ebuild b/media-sound/lilypond/lilypond-2.11.50.ebuild
new file mode 100644
index 000000000000..dbe687d0726a
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.11.50.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.11.50.ebuild,v 1.1 2008/07/03 18:09:57 hkbst Exp $
+
+inherit eutils versionator toolchain-funcs elisp-common
+
+DESCRIPTION="GNU Music Typesetter"
+SRC_URI="http://download.linuxaudio.org/lilypond/sources/v$(get_version_component_range 1-2)/${P}.tar.gz"
+HOMEPAGE="http://lilypond.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~sparc ~x86"
+
+#LANGS="cs da de es fi fr it ja nl ru rw sv tr zh_TW"
+IUSE="debug emacs profile"
+#IUSE="debug doc emacs gtk profile vim"
+
+#for X in ${LANGS} ; do
+#		 IUSE="${IUSE} linguas_${X/-/_}"
+#done
+
+# guile with deprecated and regex
+RDEPEND="
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	>=x11-libs/pango-1.12.3
+	>=dev-scheme/guile-1.8.1
+	>=dev-lang/python-2.4
+	|| ( >=app-text/ghostscript-gnu-8.15
+		 >=app-text/ghostscript-gpl-8.15
+		 >=app-text/ghostscript-esp-8.15 )
+	emacs? ( virtual/emacs )"
+#	>=app-text/ghostscript-gnu-8.55"
+
+#	virtual/tetex
+
+DEPEND="${RDEPEND}
+	>=media-gfx/fontforge-20070501
+	>=app-text/mftrace-1.2.9
+	>=sys-apps/texinfo-4.11
+	sys-devel/make
+	sys-devel/gettext
+	sys-devel/flex
+	dev-lang/perl
+	>=sys-devel/bison-2.0"
+#	doc? (	media-libs/netpbm
+#		media-gfx/imagemagick )"
+
+pkg_setup() {
+	if has_version =dev-scheme/guile-1.8*; then
+		local flags="deprecated regex"
+		built_with_use dev-scheme/guile ${flags} || die "guile must be built with \"${flags}\" use flags"
+	fi
+}
+
+src_compile() {
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		eerror "You need GCC 4.x to build this software."
+		die "you need to compile with gcc-4 or later"
+	fi
+
+	# see bug 228823
+	econf --with-ncsb-dir=/usr/share/fonts/default/ghostscript \
+		$(use_enable debug debugging) \
+		$(use_enable profile profiling) \
+		--disable-gui \
+		--disable-documentation
+#		$(use_enable doc documentation) \
+
+	# without -j1 it will not fail, but building docs later will
+	emake -j1 || die "emake failed"
+
+#	if use doc; then
+#		emake -j1 web || die "emake web failed"
+#	fi
+
+	if use emacs; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+# lilypond doesn't include the answers to the tests.
+# You are supposed to build those yourself with an
+# earlier version. Then running tests will compare the
+# results of the tests against the results from the
+# earlier version. As such, tests seem mostly useless
+# for our purposes.
+RESTRICT=test
+
+src_install () {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install || die "emake install failed"
+
+#	if use doc; then
+#		# Note: installs .html docs, .pdf docs and examples
+#		emake out=www web-install DESTDIR=${D} \
+#			webdir=/usr/share/doc/${PF}/html || die "emake web-install failed"
+#	fi
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${D}"/usr/share/emacs
+
+	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
+
+	dodoc AUTHORS.txt HACKING NEWS.txt README.txt
+
+#	use vim || rm -r ${D}/usr/share/vim
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}