New version with various bug fixes and improvements. User documentation is installed again, viewable with yelp. Remove old versions

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.29-gentoo-r2 x86_64

7 files changed, 366 insertions, 92 deletions

diff --git a/dev-util/gtk-doc/ChangeLog b/dev-util/gtk-doc/ChangeLog
index 289b6df4c072..f309a9b7d16d 100644
--- a/dev-util/gtk-doc/ChangeLog
+++ b/dev-util/gtk-doc/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/gtk-doc
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.103 2009/04/28 18:10:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.104 2009/05/04 00:29:10 leio Exp $
+
+*gtk-doc-1.11 (04 May 2009)
+
+  04 May 2009; Mart Raudsepp <leio@gentoo.org>
+  +files/gtk-doc-1.11-fix-index-id-gen.patch,
+  +files/gtk-doc-1.11-quote-filenames-with-space.patch,
+  +files/gtk-doc-1.11-tests-fixes.patch, -gtk-doc-1.8-r2.ebuild,
+  -gtk-doc-1.10-r1.ebuild, +gtk-doc-1.11.ebuild:
+  New version with various bug fixes and improvements. User documentation is
+  installed again, viewable with yelp. Remove old versions
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org> gtk-doc-1.10-r2.ebuild:
   m68k stable
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index f2d17d86362d..4b01c0964023 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,10 +1,12 @@
 AUX 61gtk-doc-gentoo.el 283 RMD160 9adc999d70cd5da21b0f02de2ecabca831d9e5cc SHA1 b5857c1b6a11fda687aa6aebb12c34daca2efcc3 SHA256 211c75484f2a4651a1e65a00c066640c3bf782030cfff5872a7af51bafd027c8
 AUX gtk-doc-1.10-no-m4.patch 1238 RMD160 afebe8f0587973b0aad062ab753992e4e1440227 SHA1 b1bb61557339b6873dfb9060c0b286df94fe199d SHA256 3091e4ccd666597cbfe87da13b8fdc8460028be60f9e97174e8b7b21cfcff602
+AUX gtk-doc-1.11-fix-index-id-gen.patch 2580 RMD160 e789564579a1cb8093dcdfd8009f77d3cae4f6d8 SHA1 802d9d2b6c55d56e4ae62b120f0fa349c5de6cf6 SHA256 c35c643a2bee6a766e22862aadbb1f71c1c35dccd4148072561d5aa13acf512e
+AUX gtk-doc-1.11-quote-filenames-with-space.patch 1319 RMD160 7434284f8d94affa463583fb615d4e87e5f101b4 SHA1 f2cda31249b8443754db437cd38a20a518f10ac3 SHA256 e598e0abd05a09bef828ca2fb68b590813433e36c8ea2e889d94750154f530a7
+AUX gtk-doc-1.11-tests-fixes.patch 9425 RMD160 67d78e7b399c431080299efb2d0f18d0caebec36 SHA1 146c58f2bcfabbff77c9cfbe01ca97962e99d991 SHA256 83bc382419342fa8ee73dc0cfd387e547f7ddc19221aa9b98c428b6ef681a294
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 RMD160 b424c063ca1c2bb475fd7fa6bd66723230e395bb SHA1 73da3922797febe1c75336f291b72c0a1ad2e7f3 SHA256 e81eb1d06c489e19567277c9a14d84122025b0184e8773db2d421ab074fc8b38
 DIST gtk-doc-1.10.tar.bz2 404379 RMD160 b7f7563ddec9ff140fc6fc6feea5b7f49cb1ff32 SHA1 861c977b011efd1bf91957d1a02fb792f39e5509 SHA256 5aeefd055c47d4e8b906e7f74b7769ebafbe3873d90cb9987b2ec503a9b558eb
-DIST gtk-doc-1.8.tar.bz2 186203 RMD160 fbb3e36e3cdf9904439262b2bafab86017691984 SHA1 cb47355347fd92025f348ae63b7f688225aaaabe SHA256 7a21c6f094f39b73ab23653ec628dd78ded47412636c491b3513fa760a8a22d3
-EBUILD gtk-doc-1.10-r1.ebuild 1947 RMD160 85996d8cc3f4a63272a22e2ff21594b2b5ae2a9b SHA1 d64fa619e5eec2070ecb16303d295b63732f31b4 SHA256 03cf69c6136e6ec97bcb0c0af17ae7e06938d156f160045e7a7cb4265d5ef09a
+DIST gtk-doc-1.11.tar.bz2 453459 RMD160 802c61e4e2072f5e91fe65d6f40587313b7bd23b SHA1 685823e269cc08fdef50828b0a68697222877b1c SHA256 92135cdf89c48a52baa8920f69d702b22d1a7556af410709d2172b90ec33ff23
 EBUILD gtk-doc-1.10-r2.ebuild 2053 RMD160 3bf1fc4534a98bb2b2b6df51b27fce3ef8dd7104 SHA1 fe4b6a999b23238113c5795b6b6944a74cd0d217 SHA256 b34dc6c2404dc2a39e48127790d57ec1005683ce108d0b6184d93def985b93b4
-EBUILD gtk-doc-1.8-r2.ebuild 1726 RMD160 445b2aeccb3973d7cc6a07ce8e5d5f1e20e03278 SHA1 54f7cc3a77bc0b720bbf9d8ad0ea75f321405a5e SHA256 8dd47aa2fbda934f88a2af70f5c6518af446ac854075547727c55083efa55508
-MISC ChangeLog 14218 RMD160 f24f1a9980b69b200d132d30634b15af7826d870 SHA1 3979f83e9fc90a4384fb22f8f7fd90e4ead82486 SHA256 e8bdaf325062fc5a9acb7ac82272236730e3de57b8385a10d395aa0a897d7bbd
+EBUILD gtk-doc-1.11.ebuild 2249 RMD160 714f25decc03ea30145cd2e4aedc8484864c6bcb SHA1 42ab9d0ce095d7567c80e0f40f41c07252cda941 SHA256 0be6d6cf95813442e485279629c6e2a6e9865d634574850bfb9eec10a67a9dc6
+MISC ChangeLog 14644 RMD160 7554f4a71753f9102ea0f3a47999371d72ffed00 SHA1 f9f30e621fa171c4c793937f403f04572d38be93 SHA256 016c0a641bd914a1df372634ed247c4ecb6c8c8fe79c645845203ae32e4d09b7
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.11-fix-index-id-gen.patch b/dev-util/gtk-doc/files/gtk-doc-1.11-fix-index-id-gen.patch
new file mode 100644
index 000000000000..9b96096511eb
--- /dev/null
+++ b/dev-util/gtk-doc/files/gtk-doc-1.11-fix-index-id-gen.patch
@@ -0,0 +1,84 @@
+From 420db2513f558083f9b8c35315d7708b8a3700d8 Mon Sep 17 00:00:00 2001
+From: Stefan Kost <stefkost@src.gnome.org>
+Date: Mon, 1 Dec 2008 09:22:32 +0000
+Subject: [PATCH 1/3] 	patch by: Matthias Clasen  <mclasen@redhat.com>
+ 	* gtkdoc-mkdb.in:
+ 	  Fix index-id generation for child and style properties. Fixes #562064.
+
+svn path=/trunk/; revision=621
+(cherry picked from commit 455a93571bf807f0a273c57fda81bb4956e4bcca)
+---
+ ChangeLog      |    7 +++++++
+ gtkdoc-mkdb.in |   18 ++++++++++++------
+ 2 files changed, 19 insertions(+), 6 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index b315ad5..63fa517 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,10 @@
++2008-12-01  Stefan Kost  <ensonic@users.sf.net>
++
++	patch by: Matthias Clasen  <mclasen@redhat.com>
++
++	* gtkdoc-mkdb.in:
++	  Fix index-id generation for child and style properties. Fixes #562064.
++
+ 2008-11-16  Stefan Kost  <ensonic@users.sf.net>
+ 
+ 	* HACKING:
+diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
+index fa67316..bd2f465 100755
+--- a/gtkdoc-mkdb.in
++++ b/gtkdoc-mkdb.in
+@@ -311,6 +311,13 @@ for my $dir (@SOURCE_DIRS) {
+     &ReadSourceDocumentation ($dir);
+ }
+ 
++# FIXME: can we scan for a common prefix?
++# DEBUG
++# check $Declarations{$key} to first '_', we would need to count
++#my %prefixes = map { m/^(.*?)\_.*/;uc($1) => 1 } grep { m/\_/ } keys (%Declarations);
++#foreach (keys %prefixes) { print "$_\n"; }
++# DEBUG
++
+ my $changed = &OutputSGML ("$ROOT_DIR/$MODULE-sections.txt");
+ 
+ # If any of the DocBook SGML files have changed, update the timestamp file (so
+@@ -823,15 +830,15 @@ sub OutputIndex {
+             $short_symbol = $symbol;
+         }
+ 
+-        my $xref = &MakeXRef ($symbol);
+         my $curletter = uc(substr($short_symbol,0,1));
+         my $id = $apiindex{$symbol};
+-        
++        my $xref = &MakeXRef ($id, $symbol);
++
+         #print "  add symbol $symbol with $id to index in section $curletter\n";
+ 
+         if ($curletter ne $lastletter) {
+             $lastletter = $curletter;
+-      
++
+             if ($divopen == 1) {
+                 print (OUTPUT "</indexdiv>\n");
+             }
+@@ -2122,12 +2129,11 @@ EOF
+ sub CreateValidSGMLID {
+     my ($id) = $_[0];
+ 
+-    # Append ":CAPS" to all all-caps identifiers
+-
+     # Special case, '_' would end up as '' so we use 'gettext-macro' instead.
+     if ($id eq "_") { return "gettext-macro"; }
+ 
+-    if ($id !~ /[a-z]/) { $id .= ":CAPS" };
++    # Append ":CAPS" to all all-caps identifiers
++    if ($id !~ /[a-z]/ && $id !~ /-CAPS$/) { $id .= ":CAPS" };
+ 
+     $id =~ s/[_ ]/-/g;
+     $id =~ s/[,\.]//g;
+-- 
+1.6.1.3
+
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.11-quote-filenames-with-space.patch b/dev-util/gtk-doc/files/gtk-doc-1.11-quote-filenames-with-space.patch
new file mode 100644
index 000000000000..104d4ef94b7a
--- /dev/null
+++ b/dev-util/gtk-doc/files/gtk-doc-1.11-quote-filenames-with-space.patch
@@ -0,0 +1,46 @@
+From d31d3e9a0733ccf229526b70b38b73889240b0ba Mon Sep 17 00:00:00 2001
+From: Stefan Kost <stefkost@src.gnome.org>
+Date: Tue, 17 Mar 2009 11:20:01 +0000
+Subject: [PATCH 3/3] 	patch by: Vincent Untz <vuntz@nome.org>
+ 	* gtkdoc-common.pl.in:
+ 	  Be more friendly for files with a space in their name. Fixes #575574.
+
+svn path=/trunk/; revision=705
+(cherry picked from commit 390599e14a7fc65945e3966e32ae06e2148089e2)
+---
+ ChangeLog           |    8 ++++++++
+ gtkdoc-common.pl.in |    2 +-
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index bc14efa..25430b8 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,11 @@
++2009-03-17  Stefan Kost  <ensonic@users.sf.net>
++
++	patch by: Vincent Untz <vuntz@nome.org>
++
++	* gtkdoc-common.pl.in:
++	  Be more friendly for files with a space in their name. Fixes #575574.
++	  
++
+ 2009-01-04  Stefan Kost  <ensonic@users.sf.net>
+ 
+ 	* tests/gtk-doc.make:
+diff --git a/gtkdoc-common.pl.in b/gtkdoc-common.pl.in
+index 972644d..8cd7614 100644
+--- a/gtkdoc-common.pl.in
++++ b/gtkdoc-common.pl.in
+@@ -51,7 +51,7 @@ sub UpdateFileIfChanged {
+     my $exit_code = 1;
+ 
+     if (-e $old_file) {
+-	`cmp -s $old_file $new_file`;
++	`cmp -s "$old_file" "$new_file"`;
+ 	$exit_code = $? >> 8;
+ #	print "   cmp exit code: $exit_code ($?)\n";
+     }
+-- 
+1.6.1.3
+
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.11-tests-fixes.patch b/dev-util/gtk-doc/files/gtk-doc-1.11-tests-fixes.patch
new file mode 100644
index 000000000000..8e28f540c633
--- /dev/null
+++ b/dev-util/gtk-doc/files/gtk-doc-1.11-tests-fixes.patch
@@ -0,0 +1,202 @@
+From 7ef64f1d7d3309612a14c22dba59a3a4a34bc381 Mon Sep 17 00:00:00 2001
+From: Stefan Kost <stefkost@src.gnome.org>
+Date: Sun, 4 Jan 2009 12:08:02 +0000
+Subject: [PATCH 2/3] Fix running tests, if no gtk-doc is installed yet.
+
+* gtkdoc-mkhtml.in:
+* tests/Makefile.am:
+* tests/gtk-doc.make:
+* tests/gtk-doc.notmpl.make:
+* tests/gtkdoctest.sh:
+Fix running tests, if no gtk-doc is installed yet.
+
+svn path=/trunk/; revision=630
+(cherry picked from commit 0ceaa25cb719bda5205627819fa170a41783cafc)
+
+Now aall tests pass.
+
+* tests/gtk-doc.make:
+* tests/gtk-doc.notmpl.make:
+Now aall tests pass.
+
+svn path=/trunk/; revision=631
+(cherry picked from commit b3305a943c1dfe522fdc222d495a4a449d37d30c)
+---
+ ChangeLog                 |   15 +++++++++++++++
+ gtkdoc-mkhtml.in          |   12 ++++++------
+ tests/Makefile.am         |    4 +++-
+ tests/gtk-doc.make        |   12 ++++++------
+ tests/gtk-doc.notmpl.make |   10 +++++-----
+ tests/gtkdoctest.sh       |    2 +-
+ 6 files changed, 36 insertions(+), 19 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 63fa517..bc14efa 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,18 @@
++2009-01-04  Stefan Kost  <ensonic@users.sf.net>
++
++	* tests/gtk-doc.make:
++	* tests/gtk-doc.notmpl.make:
++	  Now aall tests pass.
++
++2009-01-04  Stefan Kost  <ensonic@users.sf.net>
++
++	* gtkdoc-mkhtml.in:
++	* tests/Makefile.am:
++	* tests/gtk-doc.make:
++	* tests/gtk-doc.notmpl.make:
++	* tests/gtkdoctest.sh:
++	  Fix running tests, if no gtk-doc is installed yet.
++
+ 2008-12-01  Stefan Kost  <ensonic@users.sf.net>
+ 
+ 	patch by: Matthias Clasen  <mclasen@redhat.com>
+diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in
+index 1671cf0..d18b10e 100644
+--- a/gtkdoc-mkhtml.in
++++ b/gtkdoc-mkhtml.in
+@@ -29,16 +29,16 @@ shift
+ document=$1
+ shift
+ 
+-# FIXME: this is a hack to run uninstalled
+-if test "x$0" = "x../../../gtkdoc-mkhtml" ; then
+-      # uninstalled
+-      gtkdocdir=`dirname $0`
+-else
+-      # installed
++# FIXME: this is a hack to detect uninstalled
++if test "x$0" = "x@prefix@/bin/gtkdoc-mkhtml" ; then
++      #echo "installed"
+       # the first two are needed to resolve datadir
+       prefix=@prefix@
+       datarootdir=@datarootdir@
+       gtkdocdir=@datadir@/gtk-doc/data
++else
++      #echo "uninstalled"
++      gtkdocdir=`dirname $0`
+ fi
+ 
+ if head -n 1 $document | grep "<?xml" > /dev/null; then
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 4281c5c..1b05e7a 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -5,7 +5,9 @@ SUBDIRS = gobject bugs annotations .
+ if BUILD_TESTS
+ 
+ TESTS = gobject.sh bugs.sh annotations.sh
+-TESTS_ENVIRONMENT = PATH=$(top_builddir):$(srcdir):$(PATH)
++TESTS_ENVIRONMENT = \
++	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
++	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
+ 
+ endif
+ 
+diff --git a/tests/gtk-doc.make b/tests/gtk-doc.make
+index 1c37e9b..b18c405 100644
+--- a/tests/gtk-doc.make
++++ b/tests/gtk-doc.make
+@@ -59,10 +59,10 @@ $(REPORT_FILES): sgml-build.stamp
+ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+ 	@echo 'gtk-doc: Scanning header files'
+ 	@-chmod -R u+w $(srcdir)
+-	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
++	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+ 	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+ 	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" $(top_builddir)/gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \
++	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \
+ 	else \
+ 	    cd $(srcdir) ; \
+ 	    for i in $(SCANOBJ_FILES) ; do \
+@@ -79,7 +79,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
+ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+ 	@echo 'gtk-doc: Rebuilding template files'
+ 	@-chmod -R u+w $(srcdir)
+-	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
++	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+ 	gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+ 	touch tmpl-build.stamp
+ 
+@@ -94,7 +94,7 @@ tmpl/*.sgml:
+ sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+ 	@echo 'gtk-doc: Building XML'
+ 	@-chmod -R u+w $(srcdir)
+-	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
++	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+ 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+ 	touch sgml-build.stamp
+ 
+@@ -108,11 +108,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ 	@-chmod -R u+w $(srcdir)
+ 	rm -rf $(srcdir)/html
+ 	mkdir $(srcdir)/html
+-	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir)/html && \
++	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+ 	gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
+ 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ 	@echo 'gtk-doc: Fixing cross-references'
+-	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
++	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+ 	gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ 	touch html-build.stamp
+ 
+diff --git a/tests/gtk-doc.notmpl.make b/tests/gtk-doc.notmpl.make
+index 1f4c518..46bdb41 100644
+--- a/tests/gtk-doc.notmpl.make
++++ b/tests/gtk-doc.notmpl.make
+@@ -59,10 +59,10 @@ $(REPORT_FILES): sgml-build.stamp
+ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+ 	@echo 'gtk-doc: Scanning header files'
+ 	@-chmod -R u+w $(srcdir)
+-	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
++	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+ 	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+ 	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" $(top_builddir)/gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \
++	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \
+ 	else \
+ 	    cd $(srcdir) ; \
+ 	    for i in $(SCANOBJ_FILES) ; do \
+@@ -79,7 +79,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
+ sgml-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+ 	@echo 'gtk-doc: Building XML'
+ 	@-chmod -R u+w $(srcdir)
+-	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
++	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+ 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+ 	touch sgml-build.stamp
+ 
+@@ -93,11 +93,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ 	@-chmod -R u+w $(srcdir)
+ 	rm -rf $(srcdir)/html
+ 	mkdir $(srcdir)/html
+-	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir)/html && \
++	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+ 	gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
+ 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ 	@echo 'gtk-doc: Fixing cross-references'
+-	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
++	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+ 	gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ 	touch html-build.stamp
+ 
+diff --git a/tests/gtkdoctest.sh b/tests/gtkdoctest.sh
+index 2b92d57..694c4c5 100755
+--- a/tests/gtkdoctest.sh
++++ b/tests/gtkdoctest.sh
+@@ -3,7 +3,7 @@
+ suite=$1
+ dir=`dirname $0`
+ 
+-PATH=`pwd`:$PATH PERL5LIB=`pwd`:$PERL5LIB && cd $dir/$suite/docs && gtkdoc-check
++cd $dir/$suite/docs && gtkdoc-check
+ 
+ # xmllint --noout --nonet --schema ../devhelp2.xsd ./bugs/docs/html/tester.devhelp2
+ #
+-- 
+1.6.1.3
+
diff --git a/dev-util/gtk-doc/gtk-doc-1.10-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.11.ebuild
index fb997deeedcb..b2d9dfc6e80e 100644
--- a/dev-util/gtk-doc/gtk-doc-1.10-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.10-r1.ebuild,v 1.7 2008/06/15 22:21:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.11.ebuild,v 1.1 2009/05/04 00:29:10 leio Exp $
 
 inherit eutils elisp-common gnome2
 
@@ -9,40 +9,45 @@ HOMEPAGE="http://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="doc emacs"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="debug doc emacs"
 
 RDEPEND=">=dev-libs/glib-2.6
 	>=dev-lang/perl-5.6
 	>=app-text/openjade-1.3.1
 	dev-libs/libxslt
 	>=dev-libs/libxml2-2.3.6
-	~app-text/docbook-xml-dtd-4.1.2
+	~app-text/docbook-xml-dtd-4.3
 	app-text/docbook-xsl-stylesheets
 	~app-text/docbook-sgml-dtd-3.0
 	>=app-text/docbook-dsssl-stylesheets-1.40
 	emacs? ( virtual/emacs )"
 
 DEPEND="${RDEPEND}
-	=dev-util/gtk-doc-am-${PV}*
+	~dev-util/gtk-doc-am-${PV}
 	>=dev-util/pkgconfig-0.19
-	>=app-text/scrollkeeper-0.3.5"
+	>=app-text/scrollkeeper-0.3.14
+	>=app-text/gnome-doc-utils-0.3.2"
 
 SITEFILE=61${PN}-gentoo.el
 
 DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
 
-# Revisit this in next version. Might be related to upstream bug 521784 and/or 485806
-RESTRICT="test"
-
 src_unpack() {
 	gnome2_src_unpack
 
 	# Remove global Emacs keybindings.
-	epatch "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch
+	epatch "${FILESDIR}/${PN}-1.8-emacs-keybindings.patch"
 
 	# Don't install gtk-doc.m4; it's in gtk-doc-am now
-	epatch "${FILESDIR}"/${PN}-1.10-no-m4.patch
+	epatch "${FILESDIR}/${PN}-1.10-no-m4.patch"
+
+	# Fix index-id generation for child and style properties. Upstream #562064
+	epatch "${FILESDIR}/${P}-fix-index-id-gen.patch"
+	# Upstream test run fixes when no gtk-doc installed yet
+	epatch "${FILESDIR}/${P}-tests-fixes.patch"
+	# Upstream patch for fixing quoting of filenames with spaces, bug #263372
+	epatch "${FILESDIR}/${P}-quote-filenames-with-space.patch"
 }
 
 src_compile() {
diff --git a/dev-util/gtk-doc/gtk-doc-1.8-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.8-r2.ebuild
deleted file mode 100644
index d12821ced1bd..000000000000
--- a/dev-util/gtk-doc/gtk-doc-1.8-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.8-r2.ebuild,v 1.4 2008/06/15 22:21:12 eva Exp $
-
-inherit eutils elisp-common gnome2
-
-DESCRIPTION="GTK+ Documentation Generator"
-HOMEPAGE="http://www.gtk.org/gtk-doc/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="doc emacs"
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=dev-lang/perl-5.6
-	>=app-text/openjade-1.3.1
-	dev-libs/libxslt
-	>=dev-libs/libxml2-2.3.6
-	~app-text/docbook-xml-dtd-4.1.2
-	app-text/docbook-xsl-stylesheets
-	~app-text/docbook-sgml-dtd-3.0
-	>=app-text/docbook-dsssl-stylesheets-1.40
-	emacs? ( virtual/emacs )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.19
-	>=app-text/scrollkeeper-0.3.5
-	!dev-util/gtk-doc-am"
-
-SITEFILE=61${PN}-gentoo.el
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Remove global Emacs keybindings.
-	epatch "${FILESDIR}"/${P}-emacs-keybindings.patch
-}
-
-src_compile() {
-	gnome2_src_compile
-
-	use emacs && elisp-compile tools/gtk-doc.el
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use doc; then
-		docinto doc
-		dodoc doc/*
-		docinto examples
-		dodoc examples/*
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} tools/gtk-doc.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		elog "gtk-doc does no longer define global key bindings for Emacs."
-		elog "You may set your own key bindings for \"gtk-doc-insert\" and"
-		elog "\"gtk-doc-insert-section\" in your ~/.emacs file."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}