Split off docbook-xsl from docbook

These are separate packages developed by (somewhat) separate development
groups on different release cycles, so it makes more sense to have them
as separate packages.

Also take this opportunity to reduce some redundancies between the
docbook-xsl and docbook-xsl-ns formulae.

Closes #19313.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

2 files changed, 38 insertions, 48 deletions

diff --git a/Library/Formula/docbook-xsl.rb b/Library/Formula/docbook-xsl.rb
new file mode 100644
index 000000000..af06830be
--- /dev/null
+++ b/Library/Formula/docbook-xsl.rb
@@ -0,0 +1,37 @@
+require 'formula'
+
+class DocbookXsl < Formula
+  homepage 'http://docbook.sourceforge.net/'
+  url 'http://downloads.sourceforge.net/project/docbook/docbook-xsl/1.78.0/docbook-xsl-1.78.0.tar.bz2'
+  sha1 '39a62791e7c1479e22d13d12a9ecbb2273d66229'
+
+  depends_on 'docbook'
+
+  def install
+    doc_files = %w[AUTHORS BUGS COPYING NEWS README RELEASE-NOTES.txt TODO VERSION VERSION.xsl]
+    xsl_files = %w[assembly catalog.xml common docsrc eclipse epub epub3 extensions
+                   fo highlighting html htmlhelp images javahelp lib log manpages
+                   params profiling roundtrip slides template tests tools webhelp
+                   website xhtml xhtml-1_1 xhtml5]
+    (prefix/'docbook-xsl').install xsl_files + doc_files
+    DocbookXslNs.new.brew do
+      (prefix/'docbook-xsl-ns').install xsl_files + doc_files + ['README.ns']
+    end
+
+    [prefix/'docbook-xsl/catalog.xml', prefix/'docbook-xsl-ns/catalog.xml'].each do |catalog|
+      system "xmlcatalog", "--noout", "--del", "file://#{catalog}", "#{etc}/xml/catalog"
+      system "xmlcatalog", "--noout", "--add", "nextCatalog", "", "file://#{catalog}", "#{etc}/xml/catalog"
+    end
+
+    (bin/'dbtoepub').write <<-EOS.undent
+      #!/bin/sh
+      exec "#{prefix}/docbook-xsl/epub/bin/dbtoepub" "$@"
+    EOS
+  end
+end
+
+class DocbookXslNs < Formula
+  homepage 'http://docbook.sourceforge.net/'
+  url 'http://downloads.sourceforge.net/project/docbook/docbook-xsl-ns/1.78.0/docbook-xsl-ns-1.78.0.tar.bz2'
+  sha1 '377c7bc16af6779c827ac9e818b0f665c7a038f2'
+end
diff --git a/Library/Formula/docbook.rb b/Library/Formula/docbook.rb
index 2894f31f4..51c79f9c3 100644
--- a/Library/Formula/docbook.rb
+++ b/Library/Formula/docbook.rb
@@ -13,9 +13,7 @@ class Docbook < Formula
                 Docbookxml43,
                 Docbookxml44,
                 Docbookxml45,
-                Docbookxml50,
-                Docbookxsl,
-                Docbookxslns]
+                Docbookxml50]
 
     (etc/'xml').mkpath
     system "xmlcatalog", "--noout", "--create", "#{etc}/xml/catalog"
@@ -94,48 +92,3 @@ class Docbookxml50 < Docbookxml
   url 'http://www.docbook.org/xml/5.0/docbook-5.0.zip'
   sha1 '49f274e67efdee771300cba4da1f3e4bc00be1ec'
 end
-
-class Docbookxsl < Formula
-  homepage 'http://docbook.sourceforge.net/'
-  url 'http://downloads.sourceforge.net/project/docbook/docbook-xsl/1.78.0/docbook-xsl-1.78.0.tar.bz2'
-  sha1 '39a62791e7c1479e22d13d12a9ecbb2273d66229'
-
-  def install
-    doc_files = %w[AUTHORS BUGS COPYING NEWS README RELEASE-NOTES.txt TODO VERSION VERSION.xsl]
-    xsl_files = %w[assembly catalog.xml common docsrc eclipse epub epub3 extensions
-                   fo highlighting html htmlhelp images javahelp lib log manpages
-                   params profiling roundtrip slides template tests tools webhelp
-                   website xhtml xhtml-1_1 xhtml5]
-    docbook = Formula.factory 'docbook'
-    (docbook.prefix/'docbook/xsl'/version).install xsl_files + doc_files
-
-    (docbook.bin/'dbtoepub').write <<-EOS.undent
-      #!/bin/sh
-      exec "#{docbook.prefix}/docbook/xsl/#{version}/epub/bin/dbtoepub" "$@"
-    EOS
-  end
-
-  def catalog
-    "docbook/xsl/#{version}"
-  end
-end
-
-class Docbookxslns < Formula
-  homepage 'http://docbook.sourceforge.net/'
-  url 'http://downloads.sourceforge.net/project/docbook/docbook-xsl-ns/1.78.0/docbook-xsl-ns-1.78.0.tar.bz2'
-  sha1 '377c7bc16af6779c827ac9e818b0f665c7a038f2'
-
-  def install
-    doc_files = %w[AUTHORS BUGS COPYING NEWS README README.ns RELEASE-NOTES.txt TODO VERSION VERSION.xsl]
-    xsl_files = %w[assembly catalog.xml common docsrc eclipse epub epub3 extensions
-                   fo highlighting html htmlhelp images javahelp lib log manpages
-                   params profiling roundtrip slides template tests tools webhelp
-                   website xhtml xhtml-1_1 xhtml5]
-    docbook = Formula.factory 'docbook'
-    (docbook.prefix/'docbook/xsl-ns'/version).install xsl_files + doc_files
-  end
-
-  def catalog
-    "docbook/xsl-ns/#{version}"
-  end
-end