[gtk-osx] Update gtk-doc.

[John Ralls <jralls src gnome org>]

commit dd835d43d1e70d73ad5b26eec3c5d2f378d8945f
Author: John Ralls <jralls ceridwen us>
Date:   Thu Mar 21 17:44:02 2019 -0700

    Update gtk-doc.
    
    Now depends on Python3 (so no more six module). No longer depends on
    itstool or yelp-tools so yelp-tools and yelp-xml modules are deleted.

 modulesets-stable/gtk-osx-bootstrap.modules   | 27 +++------------------------
 modulesets-unstable/gtk-osx-bootstrap.modules | 25 +++----------------------
 modulesets-unstable/gtk-osx.modules           |  4 +---
 modulesets/gtk-osx-bootstrap.modules          | 24 ++----------------------
 4 files changed, 9 insertions(+), 71 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index dde2180..10d2f6d 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -96,34 +96,13 @@
     </dependencies>
   </autotools>
 
-  <autotools id="yelp-xsl">
-    <branch version="3.20.1" module="yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz"
-            hash="sha256:dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0"/>
-    <dependencies>
-      <dep package="libxml2"/>
-      <dep package="libxslt"/>
-      <dep package="itstool"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="yelp-tools">
-    <branch version="3.18.0" module="yelp-tools/3.18/yelp-tools-3.18.0.tar.xz"
-            hash="sha256:c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"/>
-    <dependencies>
-      <dep package="libxml2"/>
-      <dep package="libxslt"/>
-      <dep package="itstool"/>
-      <dep package="yelp-xsl"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gtk-doc" autogen-sh="configure">
-    <branch version="1.28" module="gtk-doc/1.28/gtk-doc-1.28.tar.xz"
-            hash="sha256:911e29e302252c96128965ee1f4067d5431a88e00ad1023a8bc1d6b922af5715"/>
+    <branch version="1.29" module="gtk-doc/1.29/gtk-doc-1.29.tar.xz"
+            hash="sha256:14578e002496567276d310a62c9ffd6c56ee8806ce5079ffb0b81c4111f586b1"/>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="itstool"/>
-      <dep package="yelp-tools"/>
+      <dep package="python3"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 63f5c32..a1a41ce 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -89,31 +89,12 @@
     </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"/>
+  <autotools id="gtkdoc" autogen-sh="configure">
+    <branch repo="git.gnome.org" module="gtk-doc-stub"/>
     <dependencies>
       <dep package="libxml2"/>
-      <dep package="libxslt"/>
       <dep package="itstool"/>
-      <dep package="yelp-xsl"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gtk-doc">
-    <branch repo="git.gnome.org"/>
-    <dependencies>
-      <dep package="libxml2"/>
-      <dep package="itstool"/>
-      <dep package="yelp-tools"/>
+      <dep package="python3"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 52379f5..5dd2e29 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -82,10 +82,8 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
+      <dep package='python3'/>
     </dependencies>
-    <after>
-      <dep package='python'/>
-    </after>
   </autotools>
 
       <!-- c2man is required only for documentation. There used to be a -\-disable-docs flag but it was 
removed. This will of course fail, so shell in and do 'git revert 095d885' and then rerun configuration. -->
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 8493f03..c69dc16 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -91,32 +91,12 @@
     </dependencies>
   </autotools>
 
-  <autotools id="yelp-xsl">
-    <branch repo="git.gnome.org" revision="gnome-3-20"/>
-    <dependencies>
-      <dep package="libxml2"/>
-      <dep package="libxslt"/>
-      <dep package="itstool"/>
-    </dependencies>
-  </autotools>
-
-  <!-- Yelp tools is releasing from the master branch. -->
-  <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">
-    <branch repo="git.gnome.org" version="1.25" tag="GTK_DOC_1_25"/>
+    <branch repo="git.gnome.org" version="1.29" tag="GTK_DOC_1_29"/>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="itstool"/>
-      <dep package="yelp-tools"/>
+      <dep package="python3"/>
     </dependencies>
   </autotools>