diff options
Diffstat (limited to 'media-sound/lilypond')
| -rw-r--r-- | media-sound/lilypond/ChangeLog | 8 | ||||
| -rw-r--r-- | media-sound/lilypond/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/lilypond/files/digest-lilypond-1.8.2 | 1 | ||||
| -rw-r--r-- | media-sound/lilypond/files/lilypond-1.8.2-coreutils-compat.patch | 88 | ||||
| -rw-r--r-- | media-sound/lilypond/lilypond-1.8.2.ebuild | 99 |
5 files changed, 197 insertions, 3 deletions
diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog index 0b6512d3e1db..ef7d73535429 100644 --- a/media-sound/lilypond/ChangeLog +++ b/media-sound/lilypond/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/lilypond # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.11 2003/09/12 16:48:26 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.12 2003/09/12 17:34:38 agriffis Exp $ + +*lilypond-1.8.2 (12 Sep 2003) + + 12 Sep 2003; Aron Griffis <agriffis@gentoo.org> lilypond-1.8.2.ebuild, + files/lilypond-1.8.2-coreutils-compat.patch: + Update to 1.8.2. Thanks to Mike Ossman and Chandler Carruth in bug 26136 12 Sep 2003; Aron Griffis <agriffis@gentoo.org> lilypond-1.6.9.ebuild: Remove web-doc building since it's broken in this ebuild and the 1.8.0 ebuild diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index ea2c7e5c4427..42c791c8038d 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,8 +1,8 @@ MD5 191399a858d12633982583c1dd0ca4e5 lilypond-1.5.15.ebuild 758 MD5 12b0ac2a4e70332a97a2087b81812aae lilypond-1.6.9.ebuild 2737 MD5 64ce9864da4f354f00f77c57640f8cae lilypond-1.6.6.ebuild 3050 -MD5 a89a98379cf241d8e8dcefd709e9cd72 lilypond-1.8.2.ebuild 2800 -MD5 53599bf8e5ff87ca76ff312be642af1c ChangeLog 2170 +MD5 e7f6bbf1a21e277bf7bdb3a53e8133ef lilypond-1.8.2.ebuild 2794 +MD5 600f5429c1d428e1f1f13cb5d446f578 ChangeLog 2398 MD5 8d0e1943fd413ff9d7d90857eb301ee6 files/lilypond-1.8.2-coreutils-compat.patch 4485 MD5 42dc732527fc9a940a950f3a498a8b48 files/digest-lilypond-1.6.6 67 MD5 be5450deeb374c228e7584c880fd8c08 files/digest-lilypond-1.6.9 67 diff --git a/media-sound/lilypond/files/digest-lilypond-1.8.2 b/media-sound/lilypond/files/digest-lilypond-1.8.2 new file mode 100644 index 000000000000..06ee6706037a --- /dev/null +++ b/media-sound/lilypond/files/digest-lilypond-1.8.2 @@ -0,0 +1 @@ +MD5 b41efcf16c3499d0a146cb625e5682a0 lilypond-1.8.2.tar.gz 1669714 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 new file mode 100644 index 000000000000..7d8eecdefe19 --- /dev/null +++ b/media-sound/lilypond/files/lilypond-1.8.2-coreutils-compat.patch @@ -0,0 +1,88 @@ +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-1.8.2.ebuild b/media-sound/lilypond/lilypond-1.8.2.ebuild new file mode 100644 index 000000000000..e17f2cbbe8f8 --- /dev/null +++ b/media-sound/lilypond/lilypond-1.8.2.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2003 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.1 2003/09/12 17:34:38 agriffis Exp $ + +IUSE="doc nopfa" + +inherit gcc + +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 + >=app-text/tetex-1.0.7-r12 + >=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 + >=app-text/ghostscript-7.05.6-r3 + >=media-libs/netpbm-9.12-r4 )" + +RDEPEND=">=dev-util/guile-1.6.4 + >=app-text/ghostscript-7.05.6-r3 + >=app-text/tetex-1.0.7-r12 + >=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 +} |