Version bump.

9 files changed, 26 insertions, 205 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 50b2140e93e4..f7a2ab66a051 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,13 @@
 # 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.29 2004/09/02 10:18:18 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.30 2004/11/03 02:30:46 eradicator Exp $
+
+*lilypond-2.2.6 (02 Nov 2004)
+
+  02 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/lilypond-1.8.2-coreutils-compat.patch, -lilypond-2.2.1.ebuild,
+  -lilypond-2.2.2.ebuild, +lilypond-2.2.6.ebuild:
+  Version bump.
 
   02 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> lilypond-2.2.1.ebuild,
   lilypond-2.2.2.ebuild, lilypond-2.2.4.ebuild:
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 99695bf1d2a1..7046155139a1 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,12 +1,11 @@
-MD5 80b98620ec3185640d73c663488d80d9 lilypond-2.2.1.ebuild 2893
-MD5 4c7484dee84e128b8a8e87f3c307d3e8 lilypond-2.2.2.ebuild 2893
-MD5 98f8bb4f5b318a113522fb9369db8300 lilypond-2.2.4.ebuild 2989
 MD5 471402771781abbf3065e3785e3c898f ChangeLog 4974
-MD5 50117cfdeb267d9181cf9cacac87d8a6 metadata.xml 256
 MD5 7955bf65f49f0bd7219a9089c2140473 lilypond-2.0.3.ebuild 2825
-MD5 8d0e1943fd413ff9d7d90857eb301ee6 files/lilypond-1.8.2-coreutils-compat.patch 4485
+MD5 98f8bb4f5b318a113522fb9369db8300 lilypond-2.4.0.ebuild 2989
+MD5 50117cfdeb267d9181cf9cacac87d8a6 metadata.xml 256
+MD5 98f8bb4f5b318a113522fb9369db8300 lilypond-2.2.4.ebuild 2989
+MD5 98f8bb4f5b318a113522fb9369db8300 lilypond-2.2.6.ebuild 2989
+MD5 0c696acd218d39a22a32db326ac9d5b0 files/digest-lilypond-2.0.3 67
+MD5 ae47de5265231b013faaa67b9578cbb7 files/digest-lilypond-2.4.0 67
 MD5 d3708d2873d08b1272e434098fd1ad85 files/lilypond-2.0.0-coreutils-compat.patch 5638
-MD5 5415f075387bdad39c013a0b2b673d34 files/digest-lilypond-2.2.1 67
-MD5 41cdb3b8ee599da6d05f6c23c2bf7413 files/digest-lilypond-2.2.2 67
 MD5 be315c1b4040c4985ede01deff60d51a files/digest-lilypond-2.2.4 67
-MD5 0c696acd218d39a22a32db326ac9d5b0 files/digest-lilypond-2.0.3 67
+MD5 529bea6c58e6c0407e9eab6ab8f5ecbe files/digest-lilypond-2.2.6 67
diff --git a/media-sound/lilypond/files/digest-lilypond-2.2.1 b/media-sound/lilypond/files/digest-lilypond-2.2.1
deleted file mode 100644
index c5c43f5e2d70..000000000000
--- a/media-sound/lilypond/files/digest-lilypond-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 54b72f637689ea3425ecd293b3d6647b lilypond-2.2.1.tar.gz 1899919
diff --git a/media-sound/lilypond/files/digest-lilypond-2.2.2 b/media-sound/lilypond/files/digest-lilypond-2.2.2
deleted file mode 100644
index 8270d3c6fb97..000000000000
--- a/media-sound/lilypond/files/digest-lilypond-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f9ed6b5a80533ce6c960c889fa51226 lilypond-2.2.2.tar.gz 1900426
diff --git a/media-sound/lilypond/files/digest-lilypond-2.2.6 b/media-sound/lilypond/files/digest-lilypond-2.2.6
new file mode 100644
index 000000000000..86dc273d0c83
--- /dev/null
+++ b/media-sound/lilypond/files/digest-lilypond-2.2.6
@@ -0,0 +1 @@
+MD5 c379905b53973cc314415340dd017c77 lilypond-2.2.6.tar.gz 1920103
diff --git a/media-sound/lilypond/files/lilypond-1.8.2-coreutils-compat.patch b/media-sound/lilypond/files/lilypond-1.8.2-coreutils-compat.patch
deleted file mode 100644
index 7d8eecdefe19..000000000000
--- a/media-sound/lilypond/files/lilypond-1.8.2-coreutils-compat.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -uNr lilypond-1.8.1/autogen.sh lilypond-1.8.1-coreutils-compat/autogen.sh
---- lilypond-1.8.1/autogen.sh	2002-12-24 14:57:36.000000000 -0700
-+++ lilypond-1.8.1-coreutils-compat/autogen.sh	2003-08-22 21:32:25.000000000 -0600
-@@ -23,7 +23,7 @@
- # If you have such a setup, invoke this script as:
- #   autoconf=autoconf2.50 ./autogen.sh
- for i in autoconf2.50 autoconf-2.50 autoconf  false; do
--  version=`$i --version 2>/dev/null | head -1 | awk '{print $NF}' | awk -F. '{print $1 * 100 + $2}'`
-+  version=`$i --version 2>/dev/null | head -n 1 | awk '{print $NF}' | awk -F. '{print $1 * 100 + $2}'`
-   if test "0$version" -ge 250; then
-     autoconf=$i
-     break
-diff -uNr lilypond-1.8.1/buildscripts/mf-to-xpms.sh lilypond-1.8.1-coreutils-compat/buildscripts/mf-to-xpms.sh
---- lilypond-1.8.1/buildscripts/mf-to-xpms.sh	1999-10-04 03:11:14.000000000 -0600
-+++ lilypond-1.8.1-coreutils-compat/buildscripts/mf-to-xpms.sh	2003-08-22 21:32:34.000000000 -0600
-@@ -21,7 +21,7 @@
- 	gftopk out/$font.${RESOLUTION}gf out/$font.${RESOLUTION}pk
- fi
- 
--# num=`grep "^C *[0-9]*;" $afm | tail -1 | sed "s!^C *\([^;]*\).*!\\1!"`
-+# num=`grep "^C *[0-9]*;" $afm | tail -n 1 | sed "s!^C *\([^;]*\).*!\\1!"`
- # num=66
- # tex=out/$font.tex
- # cat > $tex <<EOF
-diff -uNr lilypond-1.8.1/stepmake/aclocal.m4 lilypond-1.8.1-coreutils-compat/stepmake/aclocal.m4
---- lilypond-1.8.1/stepmake/aclocal.m4	2003-07-17 13:28:47.000000000 -0600
-+++ lilypond-1.8.1-coreutils-compat/stepmake/aclocal.m4	2003-08-22 21:32:25.000000000 -0600
-@@ -11,13 +11,13 @@
-     ## command -v doesn't work in zsh
-     ## command -v "$1" 2>&1
-     ## this test should work in ash, bash, pdksh (ksh), zsh
--    type -p "$1" 2>/dev/null | tail -1 | awk '{print $NF}'
-+    type -p "$1" 2>/dev/null | tail -n 1 | awk '{print $NF}'
- ])
- 
- 
- # Get version string from executable ($1)
- AC_DEFUN(STEPMAKE_GET_VERSION, [
--    ## "$1" --version 2>&1 | grep -v '^$' | head -1 | awk '{print $NF}'
-+    ## "$1" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}'
-     ##
-     ## ARG.
-     ## Workaround for broken Debian gcc version string:
-@@ -28,7 +28,7 @@
-     ## Assume, and hunt for, dotted version multiplet.
- 
-     changequote(<<, >>)dnl
--    ("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\.[0-9]' | head -1 | \
-+    ("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\.[0-9]' | head -n 1 | \
- 	sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/'
-     changequote([, ])dnl
- ])
-diff -uNr lilypond-1.8.1/stepmake/autogen.sh lilypond-1.8.1-coreutils-compat/stepmake/autogen.sh
---- lilypond-1.8.1/stepmake/autogen.sh	2002-12-15 11:34:47.000000000 -0700
-+++ lilypond-1.8.1-coreutils-compat/stepmake/autogen.sh	2003-08-22 21:32:52.000000000 -0600
-@@ -23,7 +23,7 @@
- # If you have such a setup, invoke this script as:
- #   autoconf=autoconf2.50 ./autogen.sh
- for i in autoconf2.50 autoconf-2.50 autoconf  false; do
--  version=`$i --version 2>/dev/null | head -1 | awk '{print $NF}' | awk -F. '{print $1 * 100 + $2}'`
-+  version=`$i --version 2>/dev/null | head -n 1 | awk '{print $NF}' | awk -F. '{print $1 * 100 + $2}'`
-   if test "0$version" -ge 250; then
-     autoconf=$i
-     break
-diff -uNr lilypond-1.8.1/stepmake/bin/stepmakeise.sh lilypond-1.8.1-coreutils-compat/stepmake/bin/stepmakeise.sh
---- lilypond-1.8.1/stepmake/bin/stepmakeise.sh	1998-07-08 02:04:40.000000000 -0600
-+++ lilypond-1.8.1-coreutils-compat/stepmake/bin/stepmakeise.sh	2003-08-22 21:32:42.000000000 -0600
-@@ -54,7 +54,7 @@
- 		echo "$name: huh 2?"
- 		exit 1
- 	fi
--	LATEST=`cd $reldir; ls -t1 stepmake-*.tar.gz | head -1 | sed 's!stepmake-!!' | sed 's!.tar.gz!!'`
-+	LATEST=`cd $reldir; ls -t1 stepmake-*.tar.gz | head -n 1 | sed 's!stepmake-!!' | sed 's!.tar.gz!!'`
- 	# urg
- 	latest=`echo $LATEST | sed 's/\.[a-zA-Z][a-zA-Z]*[0-9]*$//'`
- 	latest_val=`value $latest`
-diff -uNr lilypond-1.8.1/stepmake/stepmake/automatically-generated.sub.make lilypond-1.8.1-coreutils-compat/stepmake/stepmake/automatically-generated.sub.make
---- lilypond-1.8.1/stepmake/stepmake/automatically-generated.sub.make	2002-05-17 06:09:10.000000000 -0600
-+++ lilypond-1.8.1-coreutils-compat/stepmake/stepmake/automatically-generated.sub.make	2003-08-22 21:35:03.000000000 -0600
-@@ -3,7 +3,7 @@
- 
- default:
- 	-chmod +w $(OUTFILE)
--	head -1 $(INFILE) > $(OUTFILE)
-+	head -n 1 $(INFILE) > $(OUTFILE)
- 	echo "$(LINECOMMENT) WARNING WARNING WARNING" >> $(OUTFILE)
- 	echo "$(LINECOMMENT) do not edit! this is $(OUTFILE), generated from $(INFILE)" >> $(OUTFILE)
- 	cat $(INFILE) >> $(OUTFILE)
diff --git a/media-sound/lilypond/lilypond-2.2.1.ebuild b/media-sound/lilypond/lilypond-2.2.1.ebuild
deleted file mode 100644
index 74fa3d485db6..000000000000
--- a/media-sound/lilypond/lilypond-2.2.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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.2.1.ebuild,v 1.3 2004/09/02 10:18:18 usata 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
-	virtual/tetex
-	>=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.19
-	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
-}
diff --git a/media-sound/lilypond/lilypond-2.2.4.ebuild b/media-sound/lilypond/lilypond-2.2.4.ebuild
index d1eae48f04eb..1b4b779327ea 100644
--- a/media-sound/lilypond/lilypond-2.2.4.ebuild
+++ b/media-sound/lilypond/lilypond-2.2.4.ebuild
@@ -1,13 +1,15 @@
 # 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.2.4.ebuild,v 1.2 2004/09/02 10:18:18 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.2.4.ebuild,v 1.3 2004/11/03 02:30:46 eradicator 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.4: lilypond-bin exits error code 139 ... upstream needs to fix it...
@@ -19,6 +21,7 @@ RDEPEND=">=dev-util/guile-1.6.4
 	>=dev-lang/python-2.2.3-r1"
 
 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
diff --git a/media-sound/lilypond/lilypond-2.2.2.ebuild b/media-sound/lilypond/lilypond-2.2.6.ebuild
index 2d98f011a8fd..109543b8a7f1 100644
--- a/media-sound/lilypond/lilypond-2.2.2.ebuild
+++ b/media-sound/lilypond/lilypond-2.2.6.ebuild
@@ -1,16 +1,19 @@
 # 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.2.2.ebuild,v 1.3 2004/09/02 10:18:18 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.2.6.ebuild,v 1.1 2004/11/03 02:30:46 eradicator 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"
+#-amd64: 2.2.6: lilypond-bin exits error code 139 ... upstream needs to fix it...
+KEYWORDS="~alpha ~x86 ~ppc ~sparc -amd64"
 
 RDEPEND=">=dev-util/guile-1.6.4
 	virtual/ghostscript
@@ -18,6 +21,7 @@ RDEPEND=">=dev-util/guile-1.6.4
 	>=dev-lang/python-2.2.3-r1"
 
 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