Update to 2.2.2, thanks to Maarten Wisse in bug 46701

4 files changed, 114 insertions, 3 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 5648a28b5cfe..c828ed45b039 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/lilypond
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.25 2004/05/28 14:36:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.26 2004/06/12 03:06:01 agriffis Exp $
+
+*lilypond-2.2.2 (11 Jun 2004)
+
+  11 Jun 2004; Aron Griffis <agriffis@gentoo.org> +lilypond-2.2.2.ebuild:
+  Update to 2.2.2, thanks to Maarten Wisse in bug 46701
 
 *lilypond-2.2.1 (28 May 2004)
 
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index c0f82059bdcb..6598be34d2f1 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,8 +1,10 @@
-MD5 874912a0252e9128225cbce2e105a8ee lilypond-2.0.3.ebuild 2834
-MD5 04033054afdc505a0833c025487f0f29 lilypond-2.2.1.ebuild 2914
+MD5 a60a638787bd2e3d9d9e78239aaa0a71 lilypond-2.2.2.ebuild 2914
+MD5 857e2ddac1c5ae84d9ec0651713db6cd lilypond-2.0.3.ebuild 2833
+MD5 ebdb5a8f3151eeeae34712dfb0ef23cb lilypond-2.2.1.ebuild 2913
 MD5 1d0e8f1ee80b6e183b0bb7e227185a79 ChangeLog 4522
 MD5 50117cfdeb267d9181cf9cacac87d8a6 metadata.xml 256
 MD5 8d0e1943fd413ff9d7d90857eb301ee6 files/lilypond-1.8.2-coreutils-compat.patch 4485
 MD5 d3708d2873d08b1272e434098fd1ad85 files/lilypond-2.0.0-coreutils-compat.patch 5638
 MD5 0c696acd218d39a22a32db326ac9d5b0 files/digest-lilypond-2.0.3 67
 MD5 5415f075387bdad39c013a0b2b673d34 files/digest-lilypond-2.2.1 67
+MD5 41cdb3b8ee599da6d05f6c23c2bf7413 files/digest-lilypond-2.2.2 67
diff --git a/media-sound/lilypond/files/digest-lilypond-2.2.2 b/media-sound/lilypond/files/digest-lilypond-2.2.2
new file mode 100644
index 000000000000..8270d3c6fb97
--- /dev/null
+++ b/media-sound/lilypond/files/digest-lilypond-2.2.2
@@ -0,0 +1 @@
+MD5 1f9ed6b5a80533ce6c960c889fa51226 lilypond-2.2.2.tar.gz 1900426
diff --git a/media-sound/lilypond/lilypond-2.2.2.ebuild b/media-sound/lilypond/lilypond-2.2.2.ebuild
new file mode 100644
index 000000000000..6bd6040bb2b2
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.2.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.2.2.ebuild,v 1.1 2004/06/12 03:06:01 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"
+KEYWORDS="~alpha ~x86 ~ppc"
+
+RDEPEND=">=dev-util/guile-1.6.4
+	virtual/ghostscript
+	>=app-text/tetex-2.0.2
+	>=dev-lang/python-2.2.3-r1"
+
+DEPEND="${RDEPEND}
+	>=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.
+	. /usr/share/lilypond/${PV}/buildscripts/out/clean-fonts
+}
+
+pkg_prerm () {
+	. /usr/share/lilypond/${PV}/buildscripts/out/clean-fonts
+}