Bump to 2.4.2. Add DEPEND on ec-fonts-mftraced which requires dropping some

KEYWORDS for now. #69594

4 files changed, 125 insertions, 14 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index f7a2ab66a051..0d9b22aeeb23 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/lilypond
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.30 2004/11/03 02:30:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.31 2004/11/28 18:33:46 agriffis Exp $
+
+*lilypond-2.4.2 (28 Nov 2004)
+
+  28 Nov 2004; Aron Griffis <agriffis@gentoo.org> +lilypond-2.4.2.ebuild:
+  Bump to 2.4.2. Add DEPEND on ec-fonts-mftraced which requires dropping some
+  KEYWORDS for now. #69594
 
 *lilypond-2.2.6 (02 Nov 2004)
 
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 1eb161c4b218..037f410d3cc0 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6c59bf312d2cf2c144197c2a54ce7a25 ChangeLog 5206
 MD5 7955bf65f49f0bd7219a9089c2140473 lilypond-2.0.3.ebuild 2825
-MD5 50117cfdeb267d9181cf9cacac87d8a6 metadata.xml 256
 MD5 72fa8b5953d5c1c4b7860ee25dfb6285 lilypond-2.2.4.ebuild 3021
+MD5 6c59bf312d2cf2c144197c2a54ce7a25 ChangeLog 5206
+MD5 50117cfdeb267d9181cf9cacac87d8a6 metadata.xml 256
 MD5 ac04c57e4e0c1762f16b71afdfc5dd29 lilypond-2.2.6.ebuild 3021
-MD5 0c696acd218d39a22a32db326ac9d5b0 files/digest-lilypond-2.0.3 67
+MD5 c94853e5c04ae5ab4fa5469328fbac62 lilypond-2.4.2.ebuild 3052
 MD5 d3708d2873d08b1272e434098fd1ad85 files/lilypond-2.0.0-coreutils-compat.patch 5638
+MD5 0c696acd218d39a22a32db326ac9d5b0 files/digest-lilypond-2.0.3 67
 MD5 be315c1b4040c4985ede01deff60d51a files/digest-lilypond-2.2.4 67
 MD5 529bea6c58e6c0407e9eab6ab8f5ecbe files/digest-lilypond-2.2.6 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBiEftArHZZzCEUG0RArJQAJ42i5vwyG5RUkxYxwQ7et9J0od6TQCfdZgg
-3GG4fVikPyhfwIFjMvWD5KE=
-=/mAu
------END PGP SIGNATURE-----
+MD5 f21b6776d2f09f88b6dba504afa8ed29 files/digest-lilypond-2.4.2 67
diff --git a/media-sound/lilypond/files/digest-lilypond-2.4.2 b/media-sound/lilypond/files/digest-lilypond-2.4.2
new file mode 100644
index 000000000000..2dd5bb3e5784
--- /dev/null
+++ b/media-sound/lilypond/files/digest-lilypond-2.4.2
@@ -0,0 +1 @@
+MD5 52c503750ca979cea948b304da8cfe8e lilypond-2.4.2.tar.gz 2018069
diff --git a/media-sound/lilypond/lilypond-2.4.2.ebuild b/media-sound/lilypond/lilypond-2.4.2.ebuild
new file mode 100644
index 000000000000..a396e8c9b09a
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.4.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.4.2.ebuild,v 1.1 2004/11/28 18:33:46 agriffis Exp $
+
+IUSE="doc"
+
+MY_PV="v$(echo ${PV} | cut -d. -f1,2)"
+
+DESCRIPTION="GNU Music Typesetter"
+SRC_URI="http://www.lilypond.org/ftp/${MY_PV}/${P}.tar.gz"
+HOMEPAGE="http://lilypond.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+#-amd64: 2.2.6: lilypond-bin exits error code 139 ... upstream needs to fix it...
+KEYWORDS="~x86 -amd64"
+
+RDEPEND=">=dev-util/guile-1.6.4
+	virtual/ghostscript
+	virtual/tetex
+	>=dev-lang/python-2.2.3-r1
+	media-fonts/ec-fonts-mftraced"
+
+DEPEND="${RDEPEND}
+	>=app-text/t1utils-1.32
+	>=dev-lang/perl-5.8.0-r12
+	>=sys-apps/texinfo-4.6
+	>=sys-devel/flex-2.5.4a-r5
+	>=sys-devel/gcc-3.1-r8
+	>=sys-devel/make-3.80
+	>=app-text/mftrace-1.0.27
+	sys-devel/bison !=sys-devel/bison-1.75
+	doc? ( media-gfx/imagemagick
+		>=media-libs/netpbm-9.12-r4 )"
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+}
+
+src_compile() {
+	# Remove ccache from the PATH since it can break compilation of
+	# this package.  See bug 21305
+	PATH="$(echo ":${PATH}:" | sed 's/:[^:]*ccache[^:]*:/:/;s/^://;s/:$//;')"
+
+	addwrite /dev/stderr
+	addwrite /var/cache/fonts
+	addwrite /usr/share/texmf/fonts
+	addwrite /usr/share/texmf/ls-R
+
+	econf --build=${CHOST} || die "econf failed"
+	emake || die "emake failed"
+
+	if use doc; then
+		make web || die "make web failed"
+	fi
+}
+
+src_install () {
+	einstall \
+		lilypond_datadir=${D}/usr/share/lilypond \
+		local_lilypond_datadir=${D}/usr/share/lilypond/${PV} \
+		|| die "einstall failed"
+
+	dodoc AUTHORS.txt COPYING ChangeLog DEDICATION INSTALL.txt \
+		NEWS.txt README.txt ROADMAP THANKS VERSION \
+		|| die "dodoc failed"
+
+	insinto /usr/share/lilypond/${PV}/buildscripts/out
+	doins buildscripts/out/lilypond-profile \
+		buildscripts/out/lilypond-login \
+		buildscripts/out/clean-fonts \
+		buildscripts/out/lilypond-words \
+		|| die "doins failed"
+
+	# emacs support, should this be done differently?
+	insinto /usr/share/lilypond/${PV}/elisp
+	doins elisp/*.el \
+		|| die "doins failed"
+	insinto /usr/share/lilypond/${PV}/elisp/out
+	doins elisp/out/lilypond-words.el \
+		|| die "doins failed"
+
+	# vim support, should this be done differently?
+	insinto /usr/share/lilypond/${PV}/vim/out
+	doins vim/out/lilypond-words.vim \
+		|| die "doins failed"
+	insinto /usr/share/lilypond/${PV}/vim
+	doins vim/lilypond*.vim vim/vimrc \
+		|| die "doins failed"
+
+	# we might be able to get the new "make out=www web-install"
+	# to work (if someone wants to fight with it), but our
+	# old way is easier for now:
+	if use doc; then
+		dohtml -A txt,midi,ly,pdf,gz -r Documentation input *.html *.png \
+		|| die "doins failed"
+	fi
+}
+
+pkg_postinst () {
+	# Cleaning out old fonts is more appropriate in pkg_prerm, but we
+	# also need to clean up after any previous lilypond installations.
+	# Make sure to run this from somewhere safe since it references .
+	cd ${T}
+	. /usr/share/lilypond/${PV}/buildscripts/out/clean-fonts
+}
+
+pkg_prerm () {
+	# Make sure to run this from somewhere safe since it references .
+	cd ${T}
+	. /usr/share/lilypond/${PV}/buildscripts/out/clean-fonts
+}