Use gtk-doc-stub

new file mode 100644
index 0000000..195fc41
@@ -0,0 +1,19 @@
+SUMMARY = "Stub implementation of gtk-doc"
+DESCRIPTION = "Stub implementation of gtk-doc, as we don't want to build the API documentation"
+SECTION = "x11/base"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+PROVIDES = "gtk-doc"
+
+SRCREV = "3dfd0a09de696ec8c544762747f8a0f77153622e"
+PV = "0.0+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.gnome.org/${BPN};protocol=git"
+
+S = "${WORKDIR}/git"
+
+inherit autotools
+
+BBCLASSEXTEND = "native"

index 58daaf3..6a3854f 100644
@@ -1,4 +1,16 @@
-# We don't have gtk-doc so disable it
-do_configure_prepend() {
-	echo "EXTRA_DIST=">> ${S}/gtk-doc.make
-}
+# Helper class to pull in the right gtk-doc dependencies and disable
+# gtk-doc.
+#
+# Long-term it would be great if this class could be toggled between
+# gtk-doc-stub-native and the real gtk-doc-native, which would enable
+# re-generation of documentation.  For now, we'll make do with this which
+# packages up any existing documentation (so from tarball builds).
+
+DEPENDS += "gtk-doc-stub-native"
+DEPENDS_virtclass-native += "gtk-doc-stub-native"
+
+EXTRA_OECONF_append = "\
+  --disable-gtk-doc \
+  --disable-gtk-doc-html \
+  --disable-gtk-doc-pdf \
+"

index 58daaf3..603b191 100644
@@ -1,4 +1,16 @@
-# We don't have gtk-doc so disable it
-do_configure_prepend() {
-	echo "EXTRA_DIST=">> ${S}/gtk-doc.make
-}
+# Helper class to pull in the right gtk-doc dependencies and disable
+# gtk-doc.
+#
+# Long-term it would be great if this class could be toggled between
+# gtk-doc-stub-native and the real gtk-doc-native, which would enable
+# re-generation of documentation.  For now, we'll make do with this which
+# packages up any existing documentation (so from tarball builds).
+
+DEPENDS_append = " gtk-doc-stub-native"
+DEPENDS_virtclass-native_append = " gtk-doc-stub-native"
+
+EXTRA_OECONF_append = "\
+  --disable-gtk-doc \
+  --disable-gtk-doc-html \
+  --disable-gtk-doc-pdf \
+"

index 1f8ad7d..988494b 100644
@@ -1,6 +1,6 @@
 require glib.inc
 
-PR = "r2"
+PR = "r3"
 PE = "1"
 
 DEPENDS += "libffi python-argparse-native zlib"

@@ -23,9 +23,6 @@ SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
 BBCLASSEXTEND = "native nativesdk"
 
 do_configure_prepend() {
-	# missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough, because it calls gtkdocize (not provided by gtk-doc-native)
-	sed -i '/^docs/d' ${S}/configure.ac
-	sed -i 's/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po/g' ${S}/Makefile.am
 	sed -i -e "s:TEST_PROGS += gdbus-serialization::g"  ${S}/gio/tests/Makefile.am
 	sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
 }

index 2f48e27..3540cd5 100644
@@ -13,15 +13,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
 BUGTRACKER = "http://bugzilla.gnome.org"
 SECTION = "libs"
 
-DEPENDS = "glib-2.0-native gtk-doc-native zip virtual/libiconv"
-DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native"
+DEPENDS = "glib-2.0-native zip virtual/libiconv"
+DEPENDS_virtclass-native = "pkgconfig-native gettext-native"
 DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
 PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext"
 
-inherit autotools pkgconfig gettext
+inherit autotools gettext gtk-doc pkgconfig
 
 S = "${WORKDIR}/glib-${PV}"
 

index 1da7203..d84f981 100644
@@ -9,9 +9,9 @@ POLKIT_libc-uclibc = ""
 DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT}"
 DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native"
 
-PR = "r9"
+PR = "r10"
 
-inherit gnomebase
+inherit gnomebase gtk-doc
 
 SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.bz2;name=archive \
 	   file://nointro.patch \

@@ -29,10 +29,6 @@ POLKIT_OECONF_libc-uclibc = "--disable-default-service"
 EXTRA_OECONF = "--disable-gtk-doc --enable-shared --disable-static --enable-debug=yes \
                 --disable-introspection --disable-orbit --with-openldap=no ${POLKIT_OECONF} --disable-gtk"
 
-do_configure_prepend () {
-	touch gtk-doc.make
-}
-
 do_install_append() {
 	# this directory need to be created to avoid an Error 256 at gdm launch
 	install -d ${D}${sysconfdir}/gconf/gconf.xml.system

index f51e83e..2be10be 100644
@@ -3,6 +3,8 @@ DEPENDS = "glib-2.0 libffi python-native gobject-introspection-native"
 DEPENDS_virtclass-native = "glib-2.0-native libffi-native python-native bison-native flex-native"
 BBCLASSEXTEND = "native"
 
+PR = "r1"
+
 SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
 SRC_URI = "\
   ${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \

@@ -17,15 +19,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \
                     file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7"
 
-inherit autotools
+inherit autotools gtk-doc
 
 do_configure_prepend () {
         echo "EXTRA_DIST = " > ${S}/gtk-doc.make
 }
 
-EXTRA_OECONF = "\
-  --disable-gtk-doc \
-  --disable-gtk-doc-html \
-  --disable-gtk-doc-pdf \
-  --disable-tests \
-"
+EXTRA_OECONF = "--disable-tests"

index 8352384..1e0dd61 100644
@@ -13,21 +13,16 @@ LIC_FILES_CHKSUM = "file://COPYING.tools;md5=94d55d512a9ba36caa9b7df079bae19f \
 
 SRCREV = "8d64bc23d2b837421ecf9c7b0e4b8d5d95ca0d21"
 PV = "1.29.0+gitr${SRCPV}"
+PR = "r1"
+
 DEFAULT_PREFERENCE = "-1"
 
 S = "${WORKDIR}/git"
 
-inherit autotools
+inherit autotools gtk-doc
 
 BBCLASSEXTEND = "native"
 
-do_configure_prepend () {
-        echo "EXTRA_DIST = " > ${S}/gtk-doc.make
-}
-
 EXTRA_OECONF = "\
-  --disable-gtk-doc \
-  --disable-gtk-doc-html \
-  --disable-gtk-doc-pdf \
   --disable-tests \
 "

index f2ad6d1..7d840be 100644
@@ -2,8 +2,8 @@ DESCRIPTION = "a modern 3D graphics API with associated utility APIs"
 HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
 LICENSE = "LGPLv2.1+"
 
-STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gdk-pixbuf libxi"
-BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
+STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes gdk-pixbuf libxi"
+BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}"
 
 DEPENDS = "${STDDEPENDS} virtual/libgl libxcomposite"
 EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"

index 25875f3..f733598 100644
@@ -1,6 +1,6 @@
 require cogl.inc
 
-PR = "r1"
+PR = "r2"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 

index 689b965..682f931 100644
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 # the 1.8.2 tag
 SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5"
 PV = "1.8.2+git${SRCPV}"
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 

index 11a7204..0c1735e 100644
@@ -8,12 +8,8 @@ LICENSE = "GPLv2.0 & LGPLv2.1"
 SECTION = "x11"
 DEPENDS = "glib-2.0 dbus bluez4 dbus-glib"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gtk-doc
 
 EXTRA_OECONF += "--with-distro=debian"
 
-do_configure_prepend () {
-	touch ${S}/gtk-doc.make
-}
-
 FILES_${PN} += "/usr/share/dbus-1/services/"

index 59a34fa..e701838 100644
@@ -16,7 +16,7 @@ DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt"
 SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-${PV}.tar.gz \
            file://fix-unused-but-set-variable-warning.patch \
           "
-PR = "r2"
+PR = "r3"
 
 inherit autotools pkgconfig
 

index b123e11..495467e 100644
@@ -4,6 +4,8 @@ DEFAULT_PREFERENCE = "-1"
 
 SRCREV = "3652e1f37e82b8e63983e30fda3482cd099a8cf5"
 PV = "0.8+git${SRCPV}"
+PR = "r1"
+
 S = "${WORKDIR}/git"
 
 LICENSE = "GPLv2+ & LGPLv2+"

index d84f981..60c2be2 100644
@@ -9,7 +9,7 @@ POLKIT_libc-uclibc = ""
 DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT}"
 DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native"
 
-PR = "r10"
+PR = "r11"
 
 inherit gnomebase gtk-doc
 

@@ -26,7 +26,7 @@ POLKIT_OECONF = "--enable-defaults-service"
 POLKIT_OECONF_virtclass-native = "--disable-defaults-service"
 POLKIT_OECONF_libc-uclibc = "--disable-default-service"
 
-EXTRA_OECONF = "--disable-gtk-doc --enable-shared --disable-static --enable-debug=yes \
+EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \
                 --disable-introspection --disable-orbit --with-openldap=no ${POLKIT_OECONF} --disable-gtk"
 
 do_install_append() {

index 9966f87..11ac0e4 100644
@@ -20,7 +20,7 @@ DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
             ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
             "
 
-INC_PR = "r12"
+INC_PR = "r13"
 
 TIST = "--enable-tist"
 TIST_powerpc = ""

@@ -28,7 +28,6 @@ TIST_powerpc = ""
 EXTRA_OECONF += "\
     ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \
     ac_cv_path_PPPD=${sbindir}/pppd \
-    --disable-gtk-doc \
     --enable-debug \
     --enable-threads \
     --enable-loopback \

@@ -53,7 +52,7 @@ USERADD_PARAM_${PN} = "--create-home \
                        --groups video,tty,audio \
                        --user-group xuser"
 
-inherit autotools pkgconfig update-rc.d useradd
+inherit autotools gtk-doc pkgconfig update-rc.d useradd
 
 # This allows *everyone* to access ConnMan over DBus, without any access
 # control.  Really the at_console flag should work, which would mean that

index 6a8fdd6..8435c26 100644
@@ -11,7 +11,7 @@ DEPENDS = "expat dbus-glib eggdbus intltool-native"
 PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
 PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam"
 
-PR = "r5"
+PR = "r6"
 
 PAM_SRC_URI = "file://polkit-1_pam.patch"
 SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \

@@ -24,9 +24,9 @@ SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
 SRC_URI[md5sum] = "e380b4c6fb1e7bccf854e92edc0a8ce1"
 SRC_URI[sha256sum] = "6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9"
 
-EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
+EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages --disable-introspection"
 
-inherit autotools pkgconfig
+inherit autotools gtk-doc pkgconfig
 
 do_install_append() {
 	rm -f ${D}${libdir}/${PN}-1/extensions/*.a

index bba917c..7e9fc2b 100644
@@ -10,15 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74579fab173e4c5e12aac0cd83ee98ec \
 SRC_URI = "http://hal.freedesktop.org/releases/polkit-gnome-${PV}.tar.bz2 \
           "
 
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = " --disable-scrollkeeper \
                  --disable-man-pages \
                  --disable-examples \
-                 --disable-gtk-doc \
                  --disable-introspection "
 
-inherit autotools pkgconfig
+inherit autotools gtk-doc pkgconfig
 
 FILES_${PN} += " ${datadir}/dbus-1 \
                  ${datadir}/PolicyKit \

index 32ef6c5..df6cd03 100644
@@ -7,15 +7,13 @@ PROVIDES = "virtual/gail"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
-PR = "r1"
+PR = "r2"
 
-inherit gnome
+inherit gnome gtk-doc
 
 SRC_URI[archive.md5sum] = "e805806f897cf6040e1f3e9c0cd2151b"
 SRC_URI[archive.sha256sum] = "5025b13a4f3b960c8ab7c3e5c7d6d86082e2e1af6ee18e61e37fd4ce3dcc0153"
 
-EXTRA_OECONF = "--disable-gtk-doc"
-
 FILES_${PN} += "${libdir}/gtk-2.0/modules/*.so"
 FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug"
 

index ad60094..1fd42b4 100644
@@ -11,14 +11,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 
 SECTION = "x11/gnome"
 
-PR = "r7"
+PR = "r8"
 
-inherit autotools gnome pkgconfig
+inherit autotools gnome gtk-doc pkgconfig
 
 DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils"
 
-EXTRA_OECONF = "--disable-gtk-doc ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}"
+EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}"
 
 SRC_URI += "file://org.gnome.keyring.service"
 

index d82ea19..d0bfe28 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Library of functions for 2D graphics"
 SECTION = "x11/gnome"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-PR = "r1"
+PR = "r2"
 
 ART_CONFIG = "${HOST_ARCH}/art_config.h"
 

@@ -14,7 +14,7 @@ SRC_URI = "${GNOME_MIRROR}/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "08559ff3c67fd95d57b0c5e91a6b4302"
 SRC_URI[sha256sum] = "fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa"
 
-inherit autotools pkgconfig
+inherit autotools gtk-doc pkgconfig
 
 DEPENDS = ""
 

@@ -26,6 +26,3 @@ S = "${WORKDIR}/libart_lgpl-${PV}"
 do_configure_prepend() {
 	cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h
 }
-
-EXTRA_OECONF = "--disable-gtk-doc"
-

index 53e583e..e5cb628 100644
@@ -9,13 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0914b9d3ebaba41ef2e3e0ae16f296cf \
                     file://egg/egg-dh.h;endline=22;md5=1626c16af2a8da1f88324cf3ced33f08"
 
 SECTION = "x11/gnome/libs"
-PR = "r1"
+PR = "r2"
 
-inherit gnome
+inherit gnome gtk-doc
 
 DEPENDS = "dbus eggdbus libgcrypt"
 
-EXTRA_OECONF = "--disable-gtk-doc"
-
 SRC_URI[archive.md5sum] = "c42b2ca66204835d901d3dbfc1fa5ae6"
 SRC_URI[archive.sha256sum] = "56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c"

index 4e03670..c6d235f 100644
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 SECTION = "libs"
 
 X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite"
-DEPENDS = "glib-2.0 pango atk jpeg libpng gtk-doc-native gdk-pixbuf-native docbook-utils-native \
+DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \
  libgcrypt cairo gdk-pixbuf"
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \

@@ -23,7 +23,7 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
 PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
 PACKAGECONFIG[gtk-directfb] = "--with-gdktarget=directfb,,directfb"
 
-inherit autotools pkgconfig
+inherit autotools gtk-doc pkgconfig
 
 PACKAGES += "libgail gtk-demo"
 

index 1d4121c..ac4e0cd 100644
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-PR = "r14"
+PR = "r15"
 
 SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
            file://xsettings.patch \

index 16aa693..0b989da 100644
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \
            file://xsettings.patch \

index 3b85759..529f8e1 100644
@@ -27,7 +27,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
 #        file://combo-arrow-size.patch;striplevel=0
 #            file://configurefix.patch
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI[md5sum] = "0413187f7e596aef00ccd1b54776ff03"
 SRC_URI[sha256sum] = "ac2325a65312922a6722a7c02a389f3f4072d79e13131485cc7b7226e2537043"

index 747b4ed..0b01dc1 100644
@@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
                     file://glade/glade-gtk.c;endline=22;md5=766f993433e2642fec87936d319990ff"
 
 SECTION = "libs"
-PR = "r3"
-DEPENDS = "zlib gdk-pixbuf gtk+ gtk-doc-native"
+PR = "r4"
+DEPENDS = "zlib gdk-pixbuf gtk+"
 
-inherit autotools pkgconfig gnome
+inherit autotools pkgconfig gnome gtk-doc
 
 SRC_URI += "file://glade-cruft.patch file://no-xml2.patch file://python_environment.patch"
 

index a3e8f0f..6eba686 100644
@@ -11,9 +11,9 @@ DEPENDS = "gtk+ libcroco cairo libxml2 popt"
 DEPENDS_virtclass-native = "cairo-native pango-native gdk-pixbuf-native"
 BBCLASSEXTEND = "native"
 
-PR = "r6"
+PR = "r7"
 
-inherit autotools pkgconfig gnome
+inherit autotools pkgconfig gnome gtk-doc
 
 EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disable-gnome-vfs"
 

@@ -24,7 +24,6 @@ SRC_URI[archive.sha256sum] = "91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2
 
 do_configure_prepend () {
 	export GDK_PIXBUF_QUERYLOADERS="${libdir}/gtk-2.0/version/loaders"
-	echo "CLEANFILES=" > gtk-doc.make
 }
 
 PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"

index 378b6fe..a370568 100644
@@ -1,6 +1,8 @@
 require recipes-graphics/clutter/clutter.inc
 require recipes-graphics/clutter/clutter-package.inc
 
+PR = "r1"
+
 # We're API/ABI compatible and this may make things easier for layers
 PROVIDES += "clutter-1.6"
 

index 9f7b048..7d8bcb3 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 # the 1.8.4 tag
 SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459"
 PV = "1.8.4+git${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 

index 9d7760f..ce54ac2 100644
@@ -3,8 +3,8 @@ HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "LGPLv2.1+"
 
 # Internal json-glib was removed in Clutter 1.5.2, cogl was removed in 1.8, atk required since 1.8
-STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes libxi json-glib cogl atk"
-BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
+STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes libxi json-glib cogl atk"
+BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}"
 
 DEPENDS = "${STDDEPENDS} virtual/libgl"
 EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"

index 4fcc94f..c9e92f0 100644
@@ -10,7 +10,7 @@ SECTION = "libs"
 LICENSE = "LGPLv2.0+"
 
 X11DEPENDS = "virtual/libx11 libxft"
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo elfutils"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo elfutils"
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
 PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}"

@@ -22,7 +22,7 @@ PACKAGES_DYNAMIC = "pango-module-*"
 
 RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc" 
 
-inherit gnomebase
+inherit gnomebase gtk-doc
 # Create a pango-modules package
 ALLOW_EMPTY_${BPN}-modules = "1"
 PACKAGES += "${BPN}-modules"

index 7055158..4869592 100644
@@ -2,7 +2,7 @@ require pango.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI += "file://no-tests.patch \
             file://noconst.patch \

index 5f655fd..4723ee3 100644
@@ -8,12 +8,12 @@ LICENSE = "GPL-2.0+ & LGPL-2.1+"
 LICENSE_libkmod = "LGPL-2.1+"
 SECTION = "base"
 PV = "8"
-INC_PR = "r0"
-DEPENDS += "gnome-doc-utils-native"
+INC_PR = "r1"
+
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                    "
-inherit autotools
+inherit autotools gtk-doc
 
 SRC_URI = "git://git.profusion.mobi/kmod.git;protocol=git;branch=master \
            file://depmod-search.conf \

index 2ad81e4..c114c0e 100644
@@ -13,7 +13,7 @@ DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libi
 SRCREV = "3ca578d968d09785933ebbb45b66b3bccdbd5832"
 
 PV = "2.30+git${SRCPV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
            file://oh-contact.patch;striplevel=0 \

@@ -28,7 +28,7 @@ SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
 
 S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig
+inherit autotools gtk-doc pkgconfig
 
 # -ldb needs this on some platforms
 LDFLAGS += "-lpthread"

@@ -38,10 +38,6 @@ LDFLAGS += "-lpthread"
 # directories by make resulting in truncated/corrupt .la files
 #PARALLEL_MAKE = ""
 
-do_configure_prepend () {
-        echo "EXTRA_DIST = " > ${S}/gtk-doc.make
-}
-
 do_configure_append () {
         cp ${WORKDIR}/iconv-detect.h ${S}
         sed -i 's/-DG_DISABLE_DEPRECATED//g' ${S}/libedataserver/Makefile

@@ -49,7 +45,7 @@ do_configure_append () {
 
 EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \
                 --with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \
-                --disable-smime --disable-ssl --disable-nntp --disable-gtk-doc --without-weather"
+                --disable-smime --disable-ssl --disable-nntp --without-weather"
 
 PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
              libedata-book libedata-book-dev libedata-cal libedata-cal-dev \

index 180861e..58f467c 100644
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
                     file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
                     file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f"
 
+PR = "r1"
+
 # Choice of language backends - icu has issues on Big Endian machines so use pango
 ICU_LIB = "icu"
 ICU_LIB_powerpc = "pango"

@@ -25,7 +27,7 @@ SRC_URI = "\
 SRC_URI[md5sum] = "f2f01b1fdc7262a2eede81ebed0970b2"
 SRC_URI[sha256sum] = "9a126a76b40ca61adb1f1626e1567f976740af2332948cc5189489dbd01e3b28"
 
-inherit autotools lib_package pkgconfig
+inherit autotools lib_package gtk-doc pkgconfig
 
 S = "${WORKDIR}/webkit-${PV}/"
 

@@ -38,7 +40,6 @@ EXTRA_OECONF = "\
                 --enable-link-prefetch \
                 --with-gtk=2.0 \
                 --disable-geolocation \
-                --disable-gtk-doc \
                 ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \
                 UNICODE_CFLAGS=-D_REENTRANT \
                "

index 74e7288..d8706ff 100644
@@ -7,11 +7,11 @@ LICENSE = "GPLv2+ & LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
                     file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \
                     file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
-PR = "r2"
+PR = "r3"
 
-DEPENDS = "glib-2.0 gtk-doc-native"
+DEPENDS = "glib-2.0"
 
-inherit autotools pkgconfig
+inherit autotools gtk-doc pkgconfig
 
 SRC_URI = "http://download.gnome.org/sources/atk/2.2/${BPN}-${PV}.tar.bz2"
 SRC_URI[md5sum] = "4894e9b04f0a9f1c37a624a1e8d6d73f"

index 7971673..9fe7956 100644
@@ -4,11 +4,11 @@ LICENSE = "LGPLv2.1+"
 DEPENDS = " glib-2.0 gtk+ intltool-native ncurses"
 RDEPENDS_libvte = "vte-termcap"
 
-inherit gnome
+inherit gnome gtk-doc
 
 SRC_URI += "file://introspection.patch"
 
-EXTRA_OECONF = "--disable-gtk-doc --disable-python --disable-introspection"
+EXTRA_OECONF = "--disable-python --disable-introspection"
 
 PACKAGES =+ "libvte vte-termcap"
 FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper"

index 6111ccf..2cb1871 100644
@@ -2,7 +2,7 @@ require vte.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI[archive.md5sum] = "f07a4bf943194f94b7f142db8f7f36dc"
 SRC_URI[archive.sha256sum] = "8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903"

deleted file mode 100644
index 3147d4a..0000000
@@ -1,19 +0,0 @@
-SUMMARY = "API documentation generation tool for GTK+ and GNOME"
-DESCRIPTION = "gtk-doc is a tool for generating API reference documentation. \
-It is used for generating the documentation for GTK+, GLib \
-and GNOME."
-SECTION = "x11/base"
-SRC_URI = "file://gtk-doc.m4"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://../gtk-doc.m4;endline=10;md5=868a952d8bb2d825d724854cfaf8f14e"
-
-PR = "r4"
-
-ALLOW_EMPTY_${PN} = "1"
-
-BBCLASSEXTEND = "native"
-
-do_install () {
-	install -d ${D}${datadir}/aclocal/
-	install -m 0644 ${WORKDIR}/gtk-doc.m4 ${D}${datadir}/aclocal/
-}

61 lines not on this page · raw message