[gtk-osx] Update gtk-doc, replace gnome-doc-utils with yelp

[John Ralls <jralls src gnome org>]

commit 7c922c1e6f270e9de47b103ed68a0cfee82c2315
Author: Philip Chimento <philip chimento gmail com>
Date:   Mon Nov 10 22:47:32 2014 -0800

    Update gtk-doc, replace gnome-doc-utils with yelp
    
    The latest gtk-doc needs itstool and libxml2, so it needs to go into
    gtk-osx-bootstrap.modules.
    
    The gnome-doc-utils module has been superseded by yelp-tools and
    yelp-xsl.

 modulesets-stable/bootstrap.modules           |   11 ------
 modulesets-stable/gtk-osx-bootstrap.modules   |   49 +++++++++++++++++--------
 modulesets-unstable/gtk-osx-bootstrap.modules |   44 +++++++++++++++-------
 modulesets/gtk-osx-bootstrap.modules          |   42 +++++++++++++++------
 4 files changed, 93 insertions(+), 53 deletions(-)
---
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index 802a8bc..697c25b 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -166,16 +166,6 @@
             version="1.1"/>
   </autotools>
 
-  <autotools id="gtk-doc" autogenargs="--disable-scrollkeeper 
--with-xml-catalog=$JHBUILD_PREFIX/etc/xml/catalog"
-            makeargs="-k -i" makeinstallargs="-k -i install"
-            autogen-sh="configure">
-    <branch version="1.18" module="gtk-doc/1.18/gtk-doc-1.18.tar.bz2"
-           hash="sha256:a634d2e93d70468237033c06a17c97f29cf71a35ac5cc01c016324c965d42f73"/>
-    <dependencies>
-      <dep package="gtk-osx-docbook"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="intltool" autogen-sh="configure">
     <branch repo="intltool" module="0.50.2/+download/intltool-0.50.2.tar.gz"
            version="0.50.2"
@@ -208,7 +198,6 @@
       <dep package="perl-xml-parser"/>
       <dep package="perl-xml-simple"/>
       <dep package="gtk-osx-docbook"/>
-      <dep package="gtk-doc"/>
       <dep package="gnome-common"/>
       <dep package="intltool"/>
    </dependencies>
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 05d2af5..30ec0cf 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -75,21 +75,6 @@
     </dependencies>
   </autotools>
 
-<!-- Yes, this is a tool and it should be in bootstrap.modules, but it
-     needs libxslt and libxml2, both of which are dependencies for a
-     lot of packages. -->
-<!-- This has python bits that don't work in a separate build
-     dir. Until a better solution is found, just copy the source into
-     the build and try again.-->
-  <autotools id="gnome-doc-utils" autogenargs="--disable-scrollkeeper"
-            autogen-sh="configure" supports-non-srcdir-builds="no">
-    <branch module="gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz"
-           version="0.20.10" hash="sha256:cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6"/>
-    <dependencies>
-      <dep package="libxslt"/>
-    </dependencies>
-  </autotools>
-
   <!-- Cups is needed *only* for Tiger, and skipped otherwise -->
   <autotools id='cups' autogen-sh='configure' skip-autogen='never'
             autogenargs='DSOFLAGS="$LDFLAGS"'>
@@ -108,6 +93,38 @@
     </dependencies>
   </autotools>
 
+  <autotools id="yelp-xsl">
+    <branch version="3.14.0" module="yelp-xsl/3.14/yelp-xsl-3.14.0.tar.xz"
+            hash="sha256:8f5b6793cd600f8308e4ac93da68009169fa6d590eb71ed4a8e98bafe541a87e"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
+      <dep package="itstool"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="yelp-tools">
+    <branch version="3.14.1" module="yelp-tools/3.14/yelp-tools-3.14.1.tar.xz"
+            hash="sha256:000222baf5d2db394df6025591054976b5cecd0b27872601de7538f36520f60f"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
+      <dep package="itstool"/>
+      <dep package="yelp-xsl"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gtk-doc" autogen-sh="configure"
+             autogenargs="--with-xml-catalog=$JHBUILD_PREFIX/etc/xml/catalog">
+    <branch version="1.21" module="gtk-doc/1.21/gtk-doc-1.21.tar.xz"
+            hash="sha256:5d934d012ee08edd1585544792efa80da271652587ba5b843d2cea8e8b80ee3e"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="itstool"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="harfbuzz" autogen-sh="configure" autogenargs="--with-coretext">
     <branch repo="harfbuzz" module="harfbuzz-0.9.26.tar.bz2" version="0.9.26"/>
     <dependencies>
@@ -155,8 +172,8 @@
       <dep package="libjpeg"/>
       <dep package="libtiff"/>
       <dep package="gettext-runtime"/>
-      <dep package="gnome-doc-utils"/>
       <dep package="hicolor-icon-theme"/>
+      <dep package="gtk-doc"/>
     </dependencies>
   </metamodule>
 
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 7fd8280..52cf9db 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -72,19 +72,6 @@
     </dependencies>
   </autotools>
 
-<!-- Yes, this is a tool and it should be in bootstrap.modules, but
-     the dependency on lixslt makes that not possible. -->
-<!-- This has python bits that don't work in a separate build
-     dir. Until a better solution is found, just copy the source int
-     the build and try again. -->
-  <autotools id="gnome-doc-utils" autogenargs="--disable-scrollkeeper"
-            supports-non-srcdir-builds="no">
-    <branch repo="git.gnome.org"/>
-    <dependencies>
-      <dep package="libxslt"/>
-    </dependencies>
-  </autotools>
-
   <!-- Cups is needed *only* for Tiger, and skipped otherwise -->
   <autotools id='cups' autogen-sh='configure' skip-autogen='never'
             autogenargs='DSOFLAGS="$LDFLAGS"'>
@@ -102,6 +89,35 @@
     </dependencies>
   </autotools>
 
+  <autotools id="yelp-xsl">
+    <branch repo="git.gnome.org"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
+      <dep package="itstool"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="yelp-tools">
+    <branch repo="git.gnome.org"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
+      <dep package="itstool"/>
+      <dep package="yelp-xsl"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gtk-doc"
+             autogenargs="--with-xml-catalog=$JHBUILD_PREFIX/etc/xml/catalog">
+    <branch repo="git.gnome.org"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="itstool"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="freetype-no-harfbuzz" skip-autogen="never" autogenargs="--without-bzip2 --without-harfbuzz"
             autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s 
--libdir %(libdir)s %(autogenargs)s"
             supports-non-srcdir-builds="no">
@@ -163,8 +179,8 @@
       <dep package="libjpeg"/>
       <dep package="libtiff"/>
       <dep package="gettext-runtime"/>
-      <dep package="gnome-doc-utils"/>
       <dep package="hicolor-icon-theme"/>
+      <dep package="gtk-doc"/>
     </dependencies>
   </metamodule>
 
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 2a884dc..acc023c 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -75,17 +75,6 @@
     </dependencies>
   </autotools>
 
-<!-- Yes, this is a tool and it should be in bootstrap.modules, but it
-     needs libxslt and libxml2, both of which are dependencies for a
-     lot of packages. -->
-  <autotools id="gnome-doc-utils" autogenargs="--disable-scrollkeeper"
-            supports-non-srcdir-builds="no">
-    <branch repo="git.gnome.org" tag="0.20.10"/>
-    <dependencies>
-      <dep package="libxslt"/>
-    </dependencies>
-  </autotools>
-
   <!-- Cups is needed *only* for Tiger, and skipped otherwise -->
   <autotools id='cups' autogen-sh='configure' skip-autogen='never'
             autogenargs='DSOFLAGS="$LDFLAGS"'>
@@ -103,6 +92,35 @@
     </dependencies>
   </autotools>
 
+  <autotools id="yelp-xsl">
+    <branch repo="git.gnome.org" tag="3.14.0"/> <!--no gnome-3-14 branch yet-->
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
+      <dep package="itstool"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="yelp-tools">
+    <branch repo="git.gnome.org" tag="3.14.1"/> <!--no gnome-3-14 branch yet-->
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
+      <dep package="itstool"/>
+      <dep package="yelp-xsl"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gtk-doc"
+             autogenargs="--with-xml-catalog=$JHBUILD_PREFIX/etc/xml/catalog">
+    <branch repo="git.gnome.org" version="1.21" tag="GTK_DOC_1_21"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="itstool"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="harfbuzz" autogenargs="--with-coretext">
     <branch repo="freedesktop" tag="0.9.26"/>
     <dependencies>
@@ -156,8 +174,8 @@
       <dep package="libjpeg"/>
       <dep package="libtiff"/>
       <dep package="gettext-runtime"/>
-      <dep package="gnome-doc-utils"/>
       <dep package="hicolor-icon-theme"/>
+      <dep package="gtk-doc"/>
     </dependencies>
   </metamodule>