python rebuilds, various

PKGBUILD

@@ -6,13 +6,13 @@
 
 pkgname=lilypond
 pkgver=2.12.3
-pkgrel=4
+pkgrel=5
 pkgdesc="An automated music engraving system"
 arch=('i686' 'x86_64')
 url="http://lilypond.org"
 license=('GPL')
-depends=('guile' 'python' 'tetex' 'ghostscript' 'pango' 'fontconfig')
-makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils')
+depends=('guile' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig')
+makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils' 'gsfonts')
 options=('emptydirs')
 source=(http://download.linuxaudio.org/lilypond/sources/v2.12/$pkgname-$pkgver.tar.gz
 	lilypond-gcc45.patch)
@@ -21,12 +21,19 @@ md5sums=('2303bf5f2ea8d4628f33a68f016f3866'
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+
+  # python2 fix
+  for file in $(find . -name '*.py' -print); do
+    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
+    sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
+  done
+
 #  libtoolize --force --copy
 #  aclocal
 #  autoconf
 #  automake
   ./configure --prefix=/usr --disable-gui
   patch -p1 <$srcdir/lilypond-gcc45.patch
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
+  make
+  make DESTDIR="$pkgdir" install
 }