wine 1.8

Closes Homebrew/homebrew#47188.

Signed-off-by: Dominyk Tiller <dominyktiller@gmail.com>

Formula/wine.rb

@@ -5,21 +5,12 @@
 class Wine < Formula
   desc "Wine Is Not an Emulator"
   homepage "https://www.winehq.org/"
-  revision 1
 
   stable do
-    url "https://downloads.sourceforge.net/project/wine/Source/wine-1.6.2.tar.bz2"
-    sha256 "f0ab9eede5a0ccacbf6e50682649f9377b9199e49cf55641f1787cf72405acbe"
-
-    resource "gecko" do
-      url "https://downloads.sourceforge.net/wine/wine_gecko-2.21-x86.msi", :using => :nounzip
-      sha256 "f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8"
-    end
-
-    resource "mono" do
-      url "https://downloads.sourceforge.net/wine/wine-mono-0.0.8.msi", :using => :nounzip
-      sha256 "3dfc23bbc29015e4e538dab8b83cb825d3248a0e5cf3b3318503ee7331115402"
-    end
+    url "https://dl.winehq.org/wine/source/1.8/wine-1.8.tar.bz2"
+    mirror "https://downloads.sourceforge.net/project/wine/Source/wine-1.8.tar.bz2"
+    mirror "http://mirrors.ibiblio.org/wine/source/1.8/wine-1.8.tar.bz2"
+    sha256 "f33b45c18112b2071fbf9edee0e8c575407f9e2a9855ca4ee918ed33efa7c6f4"
   end
 
   bottle do
@@ -28,35 +19,8 @@ class Wine < Formula
     sha256 "341bb3bbe9e29dc1835eece6822df46b3d2df6761742b10ded6247a81db721f3" => :mavericks
   end
 
-  devel do
-    url "https://dl.winehq.org/wine/source/1.8/wine-1.8-rc4.tar.bz2"
-    mirror "https://downloads.sourceforge.net/project/wine/Source/wine-1.8-rc4.tar.bz2"
-    mirror "http://mirrors.ibiblio.org/wine/source/1.8/wine-1.8-rc4.tar.bz2"
-    sha256 "aec083196d0b813cf5971d0b2edbcc02a343827e84360e106a3284a612599530"
-
-    depends_on "samba" => :optional
-    depends_on "gnutls"
-
-    # Patch to fix screen-flickering issues. Still relevant on 1.7.53.
-    # https://bugs.winehq.org/show_bug.cgi?id=34166
-    patch do
-      url "https://bugs.winehq.org/attachment.cgi?id=52485"
-      sha256 "59f1831a1b49c1b7a4c6e6af7e3f89f0bc60bec0bead645a615b251d37d232ac"
-    end
-
-    # Patch to fix texture compression issues. Still relevant on 1.7.53.
-    # https://bugs.winehq.org/show_bug.cgi?id=14939
-    patch do
-      url "https://bugs.winehq.org/attachment.cgi?id=52384"
-      sha256 "30766403f5064a115f61de8cacba1defddffe2dd898b59557956400470adc699"
-    end
-  end
-
   head do
     url "git://source.winehq.org/git/wine.git"
-    depends_on "samba" => :optional
-    option "with-win64",
-           "Build with win64 emulator (won't run 32-bit binaries.)"
   end
 
   # note that all wine dependencies should declare a --universal option in their formula,
@@ -77,6 +41,28 @@ class Wine < Formula
   depends_on "libtiff"
   depends_on "sane-backends"
   depends_on "libgsm" => :optional
+  depends_on "samba" => :optional
+  depends_on "gnutls"
+
+  # Patch to fix screen-flickering issues. Still relevant on 1.8.
+  # https://bugs.winehq.org/show_bug.cgi?id=34166
+  patch do
+    url "https://bugs.winehq.org/attachment.cgi?id=52485"
+    sha256 "59f1831a1b49c1b7a4c6e6af7e3f89f0bc60bec0bead645a615b251d37d232ac"
+  end
+
+  # Patch to fix texture compression issues. Still relevant on 1.8.
+  # https://bugs.winehq.org/show_bug.cgi?id=14939
+  patch do
+    url "https://bugs.winehq.org/attachment.cgi?id=52384"
+    sha256 "30766403f5064a115f61de8cacba1defddffe2dd898b59557956400470adc699"
+  end
+
+  # This option is currently disabled because Apple clang currently doesn't
+  # support a required feature: http://reviews.llvm.org/D1623
+  # It builds fine with GCC, however.
+  # option "with-win64",
+  #        "Build with win64 emulator (won't run 32-bit binaries.)"
 
   resource "gecko" do
     url "https://downloads.sourceforge.net/wine/wine_gecko-2.40-x86.msi", :using => :nounzip
@@ -173,17 +159,6 @@ class Wine < Formula
         brew install winetricks
     EOS
 
-    if build.stable?
-      s += <<-EOS.undent
-
-        The current version of Wine contains a partial implementation of dwrite.dll
-        which may cause text rendering issues in applications such as Steam.
-        We recommend that you run winecfg, add an override for dwrite in the
-        Libraries tab, and edit the override mode to "disable". See:
-          https://bugs.winehq.org/show_bug.cgi?id=31374
-      EOS
-    end
-
     if build.with? "x11"
       s += <<-EOS.undent