lilypond 2.18.0

Closes Homebrew/homebrew#25585.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>

Formula/lilypond.rb

@@ -1,37 +1,45 @@
 require 'formula'
 
-# Necessary until upstream resolves the incompatibility issue with texinfo 5.
-# When this is fixed upstream, replace with a normal texinfo dependency
-class Texinfo4 < Formula
-  homepage 'http://www.gnu.org/software/texinfo/'
-  url 'http://ftp.gnu.org/gnu/texinfo/texinfo-4.13a.tar.gz'
-  sha1 'a1533cf8e03ea4fa6c443b73f4c85e4da04dead0'
-end
-
 class Lilypond < Formula
   homepage 'http://lilypond.org/'
-  url 'http://download.linuxaudio.org/lilypond/sources/v2.16/lilypond-2.16.2.tar.gz'
-  sha1 '1eb3b0e5c117a8669dba19ab28f933351e51e39a'
+  url 'http://download.linuxaudio.org/lilypond/sources/v2.18/lilypond-2.18.0.tar.gz'
+  sha1 '8bf2637b27351b999c535a219fe20407d359910a'
 
   devel do
-    url 'http://download.linuxaudio.org/lilypond/source/v2.17/lilypond-2.17.95.tar.gz'
-    sha1 'fb4dedb14a5616b2ac1f9031030c9a615f807548'
+    url 'http://download.linuxaudio.org/lilypond/source/v2.19/lilypond-2.19.2.tar.gz'
+    sha1 'a5526ecf9d6ceb23855116927fd6b85608924f4c'
+  end
+
+  # LilyPond currently only builds with an older version of Guile (<1.9)
+  resource 'guile18' do
+    url 'http://ftpmirror.gnu.org/guile/guile-1.8.8.tar.gz'
+    sha1 '548d6927aeda332b117f8fc5e4e82c39a05704f9'
   end
 
   env :std
 
   option 'with-doc', "Build documentation in addition to binaries (may require several hours)."
 
+  # Dependencies for LilyPond
   depends_on :tex
   depends_on :x11
   depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'pango'
-  depends_on 'guile'
   depends_on 'ghostscript'
   depends_on 'mftrace'
   depends_on 'fontforge' => ["with-x", "with-cairo"]
   depends_on 'fondu'
+  depends_on 'texinfo'
+
+  # Additional dependencies for guile1.8.
+  depends_on :libtool
+  depends_on 'libffi'
+  depends_on 'libunistring'
+  depends_on 'bdw-gc'
+  depends_on 'gmp'
+  depends_on 'readline'
+
   # Add dependency on keg-only Homebrew 'flex' because Apple bundles an older and incompatible
   # version of the library with 10.7 at least, seems slow keeping up with updates,
   # and the extra brew is tiny anyway.
@@ -52,16 +60,17 @@ class Lilypond < Formula
   end
 
   def install
-    # This texinfo4 business will be no longer needed, either,
-    # once the aforementioned issue is resolved.
-    texinfo4_prefix = libexec+'texinfo4'
-    Texinfo4.new.brew do
-      system "./configure", "--disable-dependency-tracking",
-                            "--disable-install-warnings",
-                            "--prefix=#{texinfo4_prefix}"
-      system "make CXX=#{ENV.cxx} install"
+    # The contents of the following block are taken from the guile18 formula
+    # in homebrew/versions.
+    resource('guile18').stage do
+       system "./configure", "--disable-dependency-tracking",
+                             "--prefix=#{prefix}",
+                             "--with-libreadline-prefix=#{Formula.factory('readline').opt_prefix}"
+       system "make", "install"
+       # A really messed up workaround required on OS X --mkhl
+       lib.cd { Dir["*.dylib"].each {|p| ln_sf p, File.basename(p, ".dylib")+".so" }}
+       ENV.prepend_path 'PATH', "#{bin}"
     end
-    ENV.prepend_path 'PATH', "#{texinfo4_prefix}/bin"
 
     gs = Formula.factory('ghostscript')