lilypond-devel: neue Quelle

2 files changed, 13 insertions, 35 deletions

diff --git a/checkVersions b/checkVersions
index 55535b00..bc46534e 100755
--- a/checkVersions
+++ b/checkVersions
@@ -575,13 +575,14 @@ then
           'dl\.suckless\.org' \
           'download\.osgeo\.org' \
           'ftp\.daper\.net' \
-          'www\.hashcash\.org' \
           'isl\.gforge\.inria\.fr' \
+          'lilypond\.org' \
           'pkgbuild\.com' \
           'qgis\.org' \
           'webhome\.phy\.duke\.edu' \
           'www\.cybernoia\.de' \
           'www\.gaia-gis\.it' \
+          'www\.hashcash\.org' \
           'www\.iozone\.org' \
           'www\.vandenoever\.info' \
           'www\.wurzel\.org' \
@@ -592,8 +593,8 @@ then
       remVer="$( \
         curl_it "${quVer}" | \
           tr '"<>' '\n\n\n' | \
-          grep "^${pkgname}\(-src\)\?-\?[0-9._]\+[a-z]\?\.t\(ar\(\.[gx]z\|\.bz2\)\?\|gz\)\$" | \
-          sed "s@^${pkgname}\(-src\)\?-\?\([0-9._]\+[a-z]\?\)\.t\(ar\(\.[gx]z\|\.bz2\)\?\|gz\)\$@\2@" | \
+          grep "^${pkgname%-devel}\(-src\)\?-\?[0-9._]\+[a-z]\?\.t\(ar\(\.[gx]z\|\.bz2\)\?\|gz\)\$" | \
+          sed "s@^${pkgname%-devel}\(-src\)\?-\?\([0-9._]\+[a-z]\?\)\.t\(ar\(\.[gx]z\|\.bz2\)\?\|gz\)\$@\2@" | \
           tr '_' '.' | \
           sort -V | \
           tail -n1
@@ -650,31 +651,6 @@ then
         [ -n "${remVer}" ] && break
       done
     elif echo "${src}" | \
-      grep -q '^http://download\.linuxaudio\.org/lilypond/sources/'
-    then
-      remVerz="$(
-        echo "${src}" | \
-          sed 's|[^/]\+/[^/]\+$||'
-      )"
-      for mainVer in $(
-          curl_it "${remVerz}" | \
-            tr '"' '\n' | \
-            grep '^v[0-9.]\+/$' | \
-            sed 's|^v\([0-9.]\+\)/$|\1|' | \
-            sort -Vr
-        )
-      do
-        remVer="$(
-          curl_it "${remVerz}v${mainVer}/" | \
-            tr '"' '\n' | \
-            grep '^lilypond-[0-9.]\+\.tar\.\(gz\|bz2\|xz\)$' | \
-            sed 's@^lilypond-\([0-9.]\+\)\.tar\.\(gz\|bz2\|xz\)$@\1@' | \
-            sort -V | \
-            tail -n1
-        )"
-        [ -n "${remVer}" ] && break
-      done
-    elif echo "${src}" | \
       grep -q '^https://archive\.apache\.org/'
     then
       remVerz="$(
diff --git a/lilypond-devel/PKGBUILD b/lilypond-devel/PKGBUILD
index ba7cc16d..bc8422a4 100644
--- a/lilypond-devel/PKGBUILD
+++ b/lilypond-devel/PKGBUILD
@@ -14,22 +14,24 @@ depends=('fontconfig'
          'guile1.8'
          'pango'
 	 'glib2'
-         'python2')
+         'python2'
+)
 makedepends=('fontforge'
              'gsfonts'
              't1utils'
 	     'ghostscript'
              'texlive-core>=2011.23170'
 	     'tex-gyre-fonts'
+	     'texlive-langcyrillic'
+	     'dblatex'
+)
+optdepends=('extractpdfmark: for reducing the size of pdf output significantly'
+            'tk: for the gui'
 )
-optdepends=('netpbm: building HTML documentation'
-            'imagemagick: building HTML documentation'
-            'ttf-kochi-substitute: building HTML documentation'
-            'texi2html>=1.82: building HTML documentation'
-            'rsync: installing HTML documentation')
 provides=("lilypond=$pkgver")
 conflicts=('lilypond' 'lilypond-git')
-source=("http://download.linuxaudio.org/lilypond/sources/v2.19/lilypond-${pkgver}.tar.gz" 'no_fontforge-versioncheck.patch')
+source=("http://lilypond.org/downloads/sources/v2.19/lilypond-${pkgver}.tar.gz"
+        'no_fontforge-versioncheck.patch')
 sha512sums=('13a7f258bac8ff77ad6d3879f128e86dd5bf45c7780c9738e6976915574d2dfc5404e6f49ca61dcaf8bb15eb266e65fedec4131a50ded7ab305d1856bbd7a3d6'
             '343317fd0d88cae1ed35bba6038ed5d24a0664bd47acf27895e03f2e95466439d80bb780277236ef74bd929c29a16ae840d09c3d50dd2a994b035d0d63e015aa')