quvi 0.4.2, libquvi 0.4.1, libquvi-scripts 0.4.8

Closes #14545.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

2 files changed, 40 insertions, 9 deletions

diff --git a/Library/Formula/libquvi.rb b/Library/Formula/libquvi.rb
new file mode 100644
index 000000000..18f70b90c
--- /dev/null
+++ b/Library/Formula/libquvi.rb
@@ -0,0 +1,32 @@
+require 'formula'
+
+class LibquviScripts < Formula
+  homepage 'http://quvi.sourceforge.net/'
+  url 'http://downloads.sourceforge.net/project/quvi/0.4/libquvi-scripts/libquvi-scripts-0.4.8.tar.bz2'
+  sha1 '097ca9da1efe17a9b94a58bbd3ec94e3a4101e54'
+end
+
+class Libquvi < Formula
+  homepage 'http://quvi.sourceforge.net/'
+  url 'http://downloads.sourceforge.net/project/quvi/0.4/libquvi/libquvi-0.4.1.tar.bz2'
+  sha1 'b7ac371185c35a1a9a2135ef4ee61c86c48f78f4'
+
+  depends_on 'pkg-config' => :build
+  depends_on 'lua'
+
+  def install
+    scripts = prefix/'libquvi-scripts'
+    LibquviScripts.new.brew do
+      system "./configure", "--prefix=#{scripts}", "--with-nsfw"
+      system "make install"
+    end
+    ENV.append 'PKG_CONFIG_PATH', "#{scripts}/lib/pkgconfig", ':'
+
+    # Lua 5.2 does not have a proper lua.pc
+    ENV['liblua_CFLAGS'] = ' '
+    ENV['liblua_LIBS'] = '-llua'
+
+    system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
+    system "make install"
+  end
+end
diff --git a/Library/Formula/quvi.rb b/Library/Formula/quvi.rb
index 8e8218b5f..0045764b7 100644
--- a/Library/Formula/quvi.rb
+++ b/Library/Formula/quvi.rb
@@ -2,19 +2,18 @@ require 'formula'
 
 class Quvi < Formula
   homepage 'http://quvi.sourceforge.net/'
-  url 'http://sourceforge.net/projects/quvi/files/0.2/quvi-0.2.19.tar.bz2'
-  sha1 'f416f43ea690caeb0d9c003a84ec231ce64d5116'
+  url 'http://downloads.sourceforge.net/project/quvi/0.4/quvi/quvi-0.4.2.tar.bz2'
+  sha1 'ba67a380785212886089d75f8aa1480d6c05936e'
 
   depends_on 'pkg-config' => :build
-  depends_on 'pcre'
-  depends_on 'lua'
+  depends_on 'libquvi'
 
   def install
-    system "./configure", "--disable-dependency-tracking",
-                          "--prefix=#{prefix}",
-                          "--enable-nsfw",
-                          "--enable-todo",
-                          "--enable-nlfy"
+    system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
     system "make install"
   end
+
+  def test
+    system "#{bin}/quvi", "--version"
+  end
 end