bump, fix bug 230706, reinstate -j1 (bug 236010)

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 x86_64

3 files changed, 129 insertions, 2 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index f22450b1976b..c2ef8687487e 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.87 2008/09/14 17:40:15 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.88 2008/10/31 13:47:04 hkbst Exp $
+
+*lilypond-2.11.63 (31 Oct 2008)
+
+  31 Oct 2008; Marijn Schouten <hkBst@gentoo.org> +lilypond-2.11.63.ebuild:
+  bump, fix bug 230706, reinstate -j1 (bug 236010)
 
 *lilypond-2.11.58 (14 Sep 2008)
 
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 6e2b6f2de2d7..549fa4b6f1c9 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -7,11 +7,13 @@ DIST lilypond-2.11.51.tar.gz 3879780 RMD160 4908aeacc4bf84575bec20831757fe7f05fd
 DIST lilypond-2.11.52.tar.gz 3889529 RMD160 54c46cc39be703631c5fefcd7838eb43d2d056e3 SHA1 dbee98750cd34da7d11e57a05164d82da2a68cac SHA256 9df945f4fc3e94f576038e192487a5b1ba526c955edcf8d1b22efc79b5614c6d
 DIST lilypond-2.11.56.tar.gz 3943067 RMD160 44c49fca79d49e11946c4a37eb4c52752ac55dbb SHA1 4f5bd4807a16c27e04000445070dbaa1220ccab0 SHA256 972d5fc142153f8d3485be61de76d68beeee57c48add6bb99395380d8c0bfd08
 DIST lilypond-2.11.58.tar.gz 4033708 RMD160 0794791dbfb021f090958f397bde423ec3ac482a SHA1 001b28e06cf7e7ea351fd3151f3e4eafe02da67e SHA256 519863fbebb9e531ef6ff9b5db774967f2938c091c796aeec169dced34f4383a
+DIST lilypond-2.11.63.tar.gz 4257965 RMD160 7fcf5fc489df136ec6d1e6178de070e4ab82fb01 SHA1 fddded3952a6f0a2f71648a9d41413e338f902a1 SHA256 c1ff8f54a4f1627a09bba00c1a0fdb254d95ce0e6adce511e5e9e5a7c864c06f
 EBUILD lilypond-2.10.33.ebuild 3203 RMD160 6ff2c0fa97ed3643cd7fad16a636d6e2f61eb2bd SHA1 3dbdcdb7874cb1d37a2a91a9f8e48365868af428 SHA256 8ce5836781304f8c2c60f77be398952fdb482da44d6965140fb70b78d7f21117
 EBUILD lilypond-2.11.50.ebuild 3257 RMD160 daf824e6099f10e74f0e36626d4eb7d0cd766d0c SHA1 b799e75b159e67ff23a6947a80fdcd51209a0155 SHA256 98a5ebb03ee06686db1e9c476cf064bdc5fe0097cf3d98508c776cae552360e1
 EBUILD lilypond-2.11.51.ebuild 3257 RMD160 94f879e0993e44b54e34be469cedcad4d547d4b1 SHA1 4bed9cc146c54692a6b8fd0f426ae30cb111d43d SHA256 24d753c79e1c2dcef13d7cb2ef2c5cc858e751cc6ec737e4d51100f58edde19d
 EBUILD lilypond-2.11.52.ebuild 3257 RMD160 98741e6ce2c273db4ed46c50d668cd3c75bd55a7 SHA1 09f30d0b41ceddf567622f49df85197b08456557 SHA256 5dc8a5b37c97c45c54ef769bcc51dc5c7fd283ae35ea1cba54a16fa9975ee5ea
 EBUILD lilypond-2.11.56.ebuild 3257 RMD160 0804cad645629a6ce2c4d19eafd8c75ac0db5d5d SHA1 36fee06fabd01555b0c2941254a214a58c129423 SHA256 74620797014c201dc3b41e634dbbbca0ca817809efe9c92845417fcff5f34745
 EBUILD lilypond-2.11.58.ebuild 3288 RMD160 466494fbb981364cbf22e876a9b5689c8203847e SHA1 77e330e8a13b15a900af2452f14536765ff7d2f3 SHA256 879166b58c86dffb299e3591543159be4c078a377b6fd0d4903eb78e18228043
-MISC ChangeLog 14581 RMD160 1ab8e930fad954e263071c777113e617d9b24a28 SHA1 6675c4ca3848163bf521f532f2f956967c643f0e SHA256 4e6d7622410347d5b3d34227e9efa7900a668aa22d4b57f10280029c6c8d5cfa
+EBUILD lilypond-2.11.63.ebuild 3344 RMD160 cfaa6e25f667aa4b711c5bc32e315e508a4878bb SHA1 0a3c62c8c7e4734f4a8363110a3d14db2684a3c5 SHA256 54f5d9cb3e9a7a44f18ec97fbcee1d4ad84401b9a67c327d6ed0cdaa450261f8
+MISC ChangeLog 14742 RMD160 af58837ab14b5f878b60b668742cf5efc8433d7a SHA1 b885c25edd036b8d32b9058ead4b3e8dc8d5caab SHA256 cab1336fe717d50cb85d11438008f9275f9172460093dcba94f69dd5a4bbb1c6
 MISC metadata.xml 440 RMD160 303266342eda535b9947139b2ff53c00228d9ccf SHA1 f294fb6ef478508f521240bb9d6492f5341e9193 SHA256 036d6305ad38764d6c362c74949cc7241fbc685220c34409fc4a793ff93f214f
diff --git a/media-sound/lilypond/lilypond-2.11.63.ebuild b/media-sound/lilypond/lilypond-2.11.63.ebuild
new file mode 100644
index 000000000000..fd880859f1e9
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.11.63.ebuild
@@ -0,0 +1,120 @@
+# 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.63.ebuild,v 1.1 2008/10/31 13:47:04 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"
+
+#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.2
+	>=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 )"
+
+DEPEND="${RDEPEND}
+	>=media-gfx/fontforge-20070501
+	dev-texlive/texlive-metapost
+	app-text/t1utils
+	>=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
+#          app-text/texi2html )"
+
+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, bug 236010
+	emake -j1 || die "emake failed"
+#	emake || die "emake failed"
+
+# -j is unsupported, but CPU_COUNT may be set instead
+#	if use doc; then
+#		emake -j1 CPU_COUNT=2 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
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}