Mark 2.0.3 stable on alpha and x86; prune old ebuilds. Add ebuild for version 2.2.1, thanks to Maarten Wisse in bug 46701 for the ebuild

14 files changed, 36 insertions, 355 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 54b538c4b36c..5648a28b5cfe 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,14 @@
 # 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.24 2004/05/17 16:07:34 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.25 2004/05/28 14:36:08 agriffis Exp $
+
+*lilypond-2.2.1 (28 May 2004)
+
+  28 May 2004; Aron Griffis <agriffis@gentoo.org> -lilypond-1.5.15.ebuild,
+  -lilypond-1.6.6.ebuild, -lilypond-1.6.9.ebuild, -lilypond-1.8.2.ebuild,
+  -lilypond-2.0.0.ebuild, lilypond-2.0.3.ebuild, +lilypond-2.2.1.ebuild:
+  Mark 2.0.3 stable on alpha and x86; prune old ebuilds. Add ebuild for version
+  2.2.1, thanks to Maarten Wisse in bug 46701 for the ebuild
 
   18 May 2004; Mamoru KOMACHI <usata@gentoo.org> lilypond-1.5.15.ebuild,
   lilypond-1.6.6.ebuild, lilypond-1.6.9.ebuild, lilypond-1.8.2.ebuild,
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index def6c077115c..a2ec68b22840 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,16 +1,8 @@
-MD5 cbf817c7eab42fadaa5f91ec3bd9d900 lilypond-1.5.15.ebuild 755
-MD5 89cf6ceb00d4e1c5aee4c5cedb433257 lilypond-1.6.9.ebuild 2697
-MD5 df337f1748ee1443f6fe2f9ab3ab7a2f lilypond-1.6.6.ebuild 3006
-MD5 a99a2ebfbb1d1a6c886ecdc869d33c5a lilypond-2.0.0.ebuild 2897
-MD5 396cb3ca29894fa95bfa8880d50d2033 lilypond-1.8.2.ebuild 2744
+MD5 62bc369efd96ecaf0df49170314f1b50 lilypond-2.0.3.ebuild 2831
+MD5 2aa054017914eda27fcf0296f009a388 lilypond-2.2.1.ebuild 2836
 MD5 645a543c25b7c149f8a25cc165896676 ChangeLog 4124
 MD5 50117cfdeb267d9181cf9cacac87d8a6 metadata.xml 256
-MD5 2adafd7b5436183a7c4e8e08ca68fb6b lilypond-2.0.3.ebuild 2833
 MD5 8d0e1943fd413ff9d7d90857eb301ee6 files/lilypond-1.8.2-coreutils-compat.patch 4485
 MD5 d3708d2873d08b1272e434098fd1ad85 files/lilypond-2.0.0-coreutils-compat.patch 5638
-MD5 42dc732527fc9a940a950f3a498a8b48 files/digest-lilypond-1.6.6 67
-MD5 be5450deeb374c228e7584c880fd8c08 files/digest-lilypond-1.6.9 67
-MD5 703b1f9f055b18b78a761a0b97c89983 files/digest-lilypond-1.8.2 67
-MD5 da4ce96e5a45694e057f2b25ec26c1e7 files/digest-lilypond-2.0.0 67
-MD5 598b545eba349fc6f14f888818c1a8f7 files/digest-lilypond-1.5.15 68
 MD5 0c696acd218d39a22a32db326ac9d5b0 files/digest-lilypond-2.0.3 67
+MD5 5415f075387bdad39c013a0b2b673d34 files/digest-lilypond-2.2.1 67
diff --git a/media-sound/lilypond/files/digest-lilypond-1.5.15 b/media-sound/lilypond/files/digest-lilypond-1.5.15
deleted file mode 100644
index b0153e7f337a..000000000000
--- a/media-sound/lilypond/files/digest-lilypond-1.5.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f14379ded1f1d85bacbb52309ad48e4a lilypond-1.5.15.tar.gz 1400608
diff --git a/media-sound/lilypond/files/digest-lilypond-1.6.6 b/media-sound/lilypond/files/digest-lilypond-1.6.6
deleted file mode 100644
index 4b8f4f383dc8..000000000000
--- a/media-sound/lilypond/files/digest-lilypond-1.6.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8ed5318b49dfee6e9aa4bb2328187c99 lilypond-1.6.6.tar.gz 1595311
diff --git a/media-sound/lilypond/files/digest-lilypond-1.6.9 b/media-sound/lilypond/files/digest-lilypond-1.6.9
deleted file mode 100644
index 703d01b451bc..000000000000
--- a/media-sound/lilypond/files/digest-lilypond-1.6.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94f1350455c62c4fd85926d019c8d10f lilypond-1.6.9.tar.gz 1599628
diff --git a/media-sound/lilypond/files/digest-lilypond-1.8.2 b/media-sound/lilypond/files/digest-lilypond-1.8.2
deleted file mode 100644
index 06ee6706037a..000000000000
--- a/media-sound/lilypond/files/digest-lilypond-1.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b41efcf16c3499d0a146cb625e5682a0 lilypond-1.8.2.tar.gz 1669714
diff --git a/media-sound/lilypond/files/digest-lilypond-2.0.0 b/media-sound/lilypond/files/digest-lilypond-2.0.0
deleted file mode 100644
index 2834e2681783..000000000000
--- a/media-sound/lilypond/files/digest-lilypond-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 80faf9f9abc4ecf72a71ba0036cdfee0 lilypond-2.0.0.tar.gz 1771134
diff --git a/media-sound/lilypond/files/digest-lilypond-2.2.1 b/media-sound/lilypond/files/digest-lilypond-2.2.1
new file mode 100644
index 000000000000..c5c43f5e2d70
--- /dev/null
+++ b/media-sound/lilypond/files/digest-lilypond-2.2.1
@@ -0,0 +1 @@
+MD5 54b72f637689ea3425ecd293b3d6647b lilypond-2.2.1.tar.gz 1899919
diff --git a/media-sound/lilypond/lilypond-1.5.15.ebuild b/media-sound/lilypond/lilypond-1.5.15.ebuild
deleted file mode 100644
index a8827c7e61be..000000000000
--- a/media-sound/lilypond/lilypond-1.5.15.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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-1.5.15.ebuild,v 1.10 2004/05/17 16:07:34 usata Exp $
-
-IUSE=""
-
-DESCRIPTION="GNU Music Typesetter"
-HOMEPAGE="http://lilypond.org/"
-SRC_URI="http://www.lilypond.org/ftp/LilyPond/development/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND=">=dev-lang/python-2.0-r4
-	>=dev-util/guile-1.4-r3
-	>=sys-devel/flex-2.5.4a-r4
-	>=sys-devel/bison-1.28-r3
-	>=sys-apps/texinfo-4.0-r3
-	virtual/tetex"
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr install || die
-	dodoc AUTHORS* CHANGES DEDICATION NEWS README.txt ROADMAP FAQ* VERSION
-}
diff --git a/media-sound/lilypond/lilypond-1.6.6.ebuild b/media-sound/lilypond/lilypond-1.6.6.ebuild
deleted file mode 100644
index 20e4c819879a..000000000000
--- a/media-sound/lilypond/lilypond-1.6.6.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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-1.6.6.ebuild,v 1.12 2004/05/17 16:07:34 usata Exp $
-
-inherit gcc
-
-MY_PV="v$(echo ${PV} | cut -d. -f1,2)"
-DESCRIPTION="GNU Music Typesetter"
-HOMEPAGE="http://lilypond.org/"
-SRC_URI="http://www.lilypond.org/ftp/${MY_PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 alpha"
-IUSE="doc"
-
-DEPEND=">=dev-lang/python-2.2.1-r2
-	>=dev-lang/perl-5.6.1-r6
-	>=dev-util/guile-1.4-r3
-	>=sys-devel/bison-1.35
-	virtual/tetex
-	>=sys-apps/texinfo-4.2-r5
-	>=sys-devel/flex-2.5.4a-r5
-	doc? ( >=app-text/mftrace-1.0.8
-		virtual/ghostscript
-		>=media-libs/netpbm-9.12-r2 )"
-RDEPEND=">=dev-util/guile-1.4-r3
-	virtual/ghostscript
-	virtual/tetex
-	>=dev-lang/python-2.2.1-r2"
-
-src_compile() {
-	# See http://lilypond.org/stable/Documentation/topdocs/out-www/INSTALL.html
-	local flex_version=`flex --version | cut -d' ' -f2`
-	case "$(gcc-version):${flex_version}" in
-		2.*:*)
-			# Verified by agriffis 03 Dec 2002 using
-			# gcc-2.95.3-r7 with flex-2.5.4a-r5
-			# (i.e. Gentoo 1.2)
-			./configure --build=${CHOST} --prefix=/usr || die "configure failed"
-			emake || die "emake failed"
-			;;
-
-		3.0:*)
-			# Unverified
-			./configure --build=${CHOST} --prefix=/usr || die "configure failed"
-			make -C lily out/lexer.cc
-			( cd out; patch -p1 < ../lexer-gcc-3.0.patch; )
-			emake || die "emake failed"
-			;;
-
-		3.1:*)
-			# Unverified
-			./lexer-gcc-3.1.sh
-			CPPFLAGS=-I$(pwd)/lily/out ./configure || die "configure failed"
-			./lexer-gcc-3.1.sh
-			emake || die "emake failed"
-			;;
-
-		# Note the following is the DEFAULT if there was no match,
-		# i.e. for gcc >= 3.2
-		3.2:*|*)
-			# Verified by agriffis 03 Dec 2002 using
-			# gcc-3.2.1 with flex-2.5.4a and flex-2.5.23
-			./configure --build=${CHOST} --prefix=/usr || die "configure failed"
-			# Fix std::cerr problem in flex 2.5.4a and 2.5.23
-			make -C lily out/lexer.cc
-			perl -i -pe 's/\scerr\s/ std::cerr /g' lily/out/lexer.cc
-			emake || die "emake failed"
-			;;
-	esac
-	#use doc && make web-doc || die "make web-doc failed"
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		lilypond_datadir=${D}/usr/share/lilypond \
-		local_lilypond_datadir=${D}/usr/share/lilypond/${PV} \
-		install || die "make install failed"
-	dodoc AUTHORS* COPYING ChangeLog DEDICATION NEWS README.txt \
-		ROADMAP THANKS VERSION *.el
-	insinto /usr/share/lilypond/${PV}/buildscripts/out
-	doins buildscripts/out/lilypond-profile \
-		buildscripts/out/lilypond-login \
-		buildscripts/out/clean-fonts
-}
-
-pkg_postinst () {
-	# Cleaning out old fonts is more appropriate in pkg_prerm, but we
-	# also need to clean up after any lilypond installations which may
-	# not have been installed via portage.
-	. /usr/share/lilypond/${PV}/buildscripts/out/clean-fonts
-}
-
-pkg_prerm () {
-	. /usr/share/lilypond/${PV}/buildscripts/out/clean-fonts
-}
diff --git a/media-sound/lilypond/lilypond-1.6.9.ebuild b/media-sound/lilypond/lilypond-1.6.9.ebuild
deleted file mode 100644
index 812f264e9678..000000000000
--- a/media-sound/lilypond/lilypond-1.6.9.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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-1.6.9.ebuild,v 1.10 2004/05/17 16:07:34 usata Exp $
-
-IUSE=""
-
-inherit gcc
-
-MY_PV="v$(echo ${PV} | cut -d. -f1,2)"
-DESCRIPTION="GNU Music Typesetter"
-HOMEPAGE="http://lilypond.org/"
-SRC_URI="http://www.lilypond.org/ftp/${MY_PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND=">=dev-lang/python-2.2.1-r2
-	>=dev-lang/perl-5.6.1-r6
-	>=dev-util/guile-1.4-r3
-	>=sys-devel/bison-1.35
-	virtual/tetex
-	>=sys-apps/texinfo-4.2-r5
-	>=sys-devel/flex-2.5.4a-r5
-	doc? ( >=app-text/mftrace-1.0.8
-		virtual/ghostscript
-		>=media-libs/netpbm-9.12-r2 )"
-RDEPEND=">=dev-util/guile-1.4-r3
-	virtual/ghostscript
-	virtual/tetex
-	>=dev-lang/python-2.2.1-r2"
-
-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/:$//;')"
-
-	# See http://lilypond.org/stable/Documentation/topdocs/out-www/INSTALL.html
-	if [ "`gcc-major-version`" -eq "2" ]; then
-		# Verified by agriffis 03 Dec 2002 using
-		# gcc-2.95.3-r7 with flex-2.5.4a-r5
-		# (i.e. Gentoo 1.2)
-		./configure --build=${CHOST} --prefix=/usr || die "configure failed"
-		emake || die "emake failed"
-	elif [ "`gcc-major-version`" -eq "3" -a "`gcc-minor-version`" -ge "2" ]; then
-		# Verified by agriffis 03 Dec 2002 using
-		# gcc-3.2.1 with flex-2.5.4a and flex-2.5.23
-		./configure --build=${CHOST} --prefix=/usr || die "configure failed"
-		# Fix std::cerr problem in flex 2.5.4a and 2.5.23
-		make -C lily out/lexer.cc
-		perl -i -pe 's/\scerr\s/ std::cerr /g' lily/out/lexer.cc
-		emake || die "emake failed"
-	else
-		eerror "Unsupported GCC version, 2.95 and 3.2 are supported"
-		die
-	fi
-}
-
-src_install () {
-	make install \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		lilypond_datadir=${D}/usr/share/lilypond \
-		local_lilypond_datadir=${D}/usr/share/lilypond/${PV} \
-		|| die "make install failed"
-	dodoc AUTHORS* COPYING ChangeLog DEDICATION NEWS README.txt \
-		ROADMAP THANKS VERSION *.el
-	insinto /usr/share/lilypond/${PV}/buildscripts/out
-	doins buildscripts/out/lilypond-profile \
-		buildscripts/out/lilypond-login \
-		buildscripts/out/clean-fonts
-}
-
-pkg_postinst () {
-	# Cleaning out old fonts is more appropriate in pkg_prerm, but we
-	# also need to clean up after any lilypond installations which may
-	# not have been installed via portage.
-	. /usr/share/lilypond/${PV}/buildscripts/out/clean-fonts
-}
-
-pkg_prerm () {
-	. /usr/share/lilypond/${PV}/buildscripts/out/clean-fonts
-}
diff --git a/media-sound/lilypond/lilypond-1.8.2.ebuild b/media-sound/lilypond/lilypond-1.8.2.ebuild
deleted file mode 100644
index 9e1d6d81b049..000000000000
--- a/media-sound/lilypond/lilypond-1.8.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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-1.8.2.ebuild,v 1.6 2004/05/17 16:07:34 usata Exp $
-
-IUSE="doc nopfa"
-
-inherit gcc eutils
-
-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"
-
-DEPEND=">=dev-lang/python-2.2.3-r1
-	>=dev-lang/perl-5.8.0-r12
-	>=dev-util/guile-1.6.4
-	>=sys-devel/bison-1.35
-	virtual/tetex
-	>=sys-apps/texinfo-4.5
-	>=sys-devel/flex-2.5.4a-r5
-	!nopfa? ( >=app-text/mftrace-1.0.19 )
-	doc? ( media-gfx/imagemagick
-		>=app-text/mftrace-1.0.19
-		virtual/ghostscript
-		>=media-libs/netpbm-9.12-r4 )"
-
-RDEPEND=">=dev-util/guile-1.6.4
-	virtual/ghostscript
-	virtual/tetex
-	>=dev-lang/python-2.2.3-r1"
-
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-	cd ${S}; epatch ${FILESDIR}/${P}-coreutils-compat.patch
-	NOCONFIGURE=1 ./autogen.sh >/dev/null
-}
-
-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
-
-	econf --build=${CHOST} || die "econf failed"
-	emake || die "emake failed"
-
-	if ! use nopfa; then
-		addwrite /var/cache/fonts
-		addwrite /usr/share/texmf/fonts
-		addwrite /usr/share/texmf/ls-R
-		make pfa-fonts || die "make pfa-fonts failed"
-	fi
-
-	if use doc; then
-		addwrite /var/cache/fonts
-		addwrite /usr/share/texmf/fonts
-		addwrite /usr/share/texmf/ls-R
-		make web || die "make web failed"
-	fi
-}
-
-src_install () {
-	# Remove ccache from the PATH since it can break compilation of
-	# this package.  See bug 21305
-	PATH="$(echo ":${PATH}:" | sed 's/:[^:]*ccache[^:]*:/:/;s/^://;s/:$//;')"
-
-	BUILD_PFA="MAKE_PFA_FILES=1"
-	use nopfa && BUILD_PFA=""
-	einstall \
-		lilypond_datadir=${D}/usr/share/lilypond \
-		local_lilypond_datadir=${D}/usr/share/lilypond/${PV} \
-		${BUILD_PFA}
-
-	dodoc AUTHORS* COPYING ChangeLog DEDICATION NEWS* README.txt \
-		ROADMAP THANKS VERSION *.el lilypond.words vimrc
-
-	insinto /usr/share/lilypond/${PV}/buildscripts/out
-	doins buildscripts/out/lilypond-profile \
-		buildscripts/out/lilypond-login \
-		buildscripts/out/clean-fonts
-
-	use doc && dohtml -A txt,midi,ly,pdf,gz -r \
-		Documentation input *.html *.png
-}
-
-pkg_postinst () {
-	# Cleaning out old fonts is more appropriate in pkg_prerm, but we
-	# also need to clean up after any lilypond installations which may
-	# not have been installed via portage.
-	. /usr/share/lilypond/${PV}/buildscripts/out/clean-fonts
-}
-
-pkg_prerm () {
-	. /usr/share/lilypond/${PV}/buildscripts/out/clean-fonts
-}
diff --git a/media-sound/lilypond/lilypond-2.0.3.ebuild b/media-sound/lilypond/lilypond-2.0.3.ebuild
index 27cea4ee04c5..575a889c05eb 100644
--- a/media-sound/lilypond/lilypond-2.0.3.ebuild
+++ b/media-sound/lilypond/lilypond-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # 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.0.3.ebuild,v 1.4 2004/05/17 16:07:34 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.0.3.ebuild,v 1.5 2004/05/28 14:36:08 agriffis Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="alpha x86 ~ppc"
 
 RDEPEND=">=dev-util/guile-1.6.4
 	virtual/ghostscript
diff --git a/media-sound/lilypond/lilypond-2.0.0.ebuild b/media-sound/lilypond/lilypond-2.2.1.ebuild
index 168463cd46ce..252b7f6f9b2d 100644
--- a/media-sound/lilypond/lilypond-2.0.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.2.1.ebuild
@@ -1,8 +1,6 @@
 # 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.0.0.ebuild,v 1.7 2004/05/17 16:07:34 usata Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.2.1.ebuild,v 1.1 2004/05/28 14:36:08 agriffis Exp $
 
 IUSE="doc"
 
@@ -12,31 +10,26 @@ SRC_URI="http://www.lilypond.org/ftp/${MY_PV}/${P}.tar.gz"
 HOMEPAGE="http://lilypond.org/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~x86"
+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=">=dev-lang/python-2.2.3-r1
+DEPEND="${RDEPEND}
 	>=dev-lang/perl-5.8.0-r12
-	>=dev-util/guile-1.6.4
-	virtual/tetex
 	>=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.19
-	virtual/ghostscript
 	sys-devel/bison !=sys-devel/bison-1.75
 	doc? ( media-gfx/imagemagick
 		>=media-libs/netpbm-9.12-r4 )"
 
-RDEPEND=">=dev-util/guile-1.6.4
-	virtual/ghostscript
-	virtual/tetex
-	>=dev-lang/python-2.2.3-r1"
-
 src_unpack() {
 	unpack ${A} || die "unpack failed"
-	cd ${S}; epatch ${FILESDIR}/${P}-coreutils-compat.patch
-	NOCONFIGURE=1 ./autogen.sh >/dev/null
 }
 
 src_compile() {
@@ -71,16 +64,23 @@ src_install () {
 	doins buildscripts/out/lilypond-profile \
 		buildscripts/out/lilypond-login \
 		buildscripts/out/clean-fonts \
-		buildscripts/out/lilypond.words \
-		|| die "doins failed"
-	insinto /usr/share/lilypond/${PV}/elisp/out
-	doins elisp/out/lilypond.words.el elisp/out/lilypond.words.vim \
+		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}/
-	doins lilypond.vim vimrc \
+	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"