Fix automagic highlighting program detection, bug #334489. Handle multi-slot python. Clean up old revisions.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

12 files changed, 150 insertions, 799 deletions

diff --git a/dev-util/gtk-doc/ChangeLog b/dev-util/gtk-doc/ChangeLog
index 78cc4b61d876..1bb6f3870dec 100644
--- a/dev-util/gtk-doc/ChangeLog
+++ b/dev-util/gtk-doc/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-util/gtk-doc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.136 2010/10/17 14:54:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.137 2010/11/14 15:40:27 eva Exp $
+
+*gtk-doc-1.15-r2 (14 Nov 2010)
+
+  14 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gtk-doc-1.10-no-m4.patch, -gtk-doc-1.11.ebuild,
+  -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.13-r2.ebuild,
+  -files/gtk-doc-1.13-fixxref-compat.patch,
+  -files/gtk-doc-1.13-scan-touch-module-overrides.patch,
+  +gtk-doc-1.15-r2.ebuild,
+  +files/gtk-doc-1.15-allow-selection-highlighter.patch, metadata.xml:
+  Fix automagic highlighting program detection, bug #334489. Handle
+  multi-slot python. Clean up old revisions.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org> gtk-doc-1.15.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #324077
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 4035c20ebd59..2de64f3639b9 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,19 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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 19569 RMD160 92060264998ece1e04abba7b2a381fb89815277e SHA1 101f1127f206d753ca1b5a562710ebe5272fb1f1 SHA256 24e408830b231d75702ee37d78de2652cfe6f8d18758d32e2b22c5f8ddf5aae8
-AUX gtk-doc-1.13-fixxref-compat.patch 2262 RMD160 a3700d7a6e6310dc152e5307b6a7ec6201c82268 SHA1 3a8af73749d6447f1bdfe0411ce91acae4fac1cc SHA256 7532a8ffdc6a7b814e90269a069433d949a6f5c34928e56ca5af5a2ec3ad237f
 AUX gtk-doc-1.13-fixxref-vim-u-NONE.patch 672 RMD160 d0b542ede146bcbdc5d1ec0feec5d897d5931c01 SHA1 f8c8a7c2309bcd6f637adb7c1c27125108708c1f SHA256 49c4704f9d8130c55c33bedeea043ca4026b71cd39d1403ecb05cd2671ea05e4
-AUX gtk-doc-1.13-scan-touch-module-overrides.patch 1041 RMD160 7f10f662b0b8d1a618491b5e5541f99870f50277 SHA1 29efa4a1f6d580ff933a6b50e8e4766c21906c17 SHA256 4ed735326d5038b8bb4f9a6a2c698eec2f974088277c5242b70e74c371ca6ff0
+AUX gtk-doc-1.15-allow-selection-highlighter.patch 2693 RMD160 8f06d9c8cfe759a8ba5f4bdc38992f6e9dcab72d SHA1 8940b7a45ccf413c2ea3df9fff989b451636f1fb SHA256 f71ca41839d9d5a1f4f2d648b303d4de1d434a909508e73dadc3cb160de96411
 AUX gtk-doc-1.15-fixxref-vim-fixes.patch 991 RMD160 d1425a549acb7e808c15fd340b7b8728c3d1c857 SHA1 d66784718684d5c16efdce201091c775fe09efe6 SHA256 3fb764d102aa75ea2e51e016e2dc1e1da7bec86b93e7f7dbb7ce66e775996d48
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 RMD160 b424c063ca1c2bb475fd7fa6bd66723230e395bb SHA1 73da3922797febe1c75336f291b72c0a1ad2e7f3 SHA256 e81eb1d06c489e19567277c9a14d84122025b0184e8773db2d421ab074fc8b38
-DIST gtk-doc-1.11.tar.bz2 453459 RMD160 802c61e4e2072f5e91fe65d6f40587313b7bd23b SHA1 685823e269cc08fdef50828b0a68697222877b1c SHA256 92135cdf89c48a52baa8920f69d702b22d1a7556af410709d2172b90ec33ff23
-DIST gtk-doc-1.13.tar.bz2 644297 RMD160 36da31b769aa0e9d35c246160489d4c59a6f0e67 SHA1 8c6b157e594072aaf598bc7e68562ec02e50b651 SHA256 25c7fbfcd7a08995c665abe304c4da4ee6d1ea34db880f21b46fa9edb268b706
 DIST gtk-doc-1.15.tar.bz2 787687 RMD160 142ad9dca015ba69261fe44847f3a27721e06551 SHA1 fc1c593e8107cbe33451e3e938ca14b59104e999 SHA256 59cc73babf0db3a89d1a71f7ef5394a42ec1d3447d3a0a1539057a7b0ce44831
-EBUILD gtk-doc-1.11.ebuild 2240 RMD160 e6c66b5a225a379e6b3c50bd2adbabd70a3c2179 SHA1 034d114a5970846de4e77d2b769a876f8e2d6c06 SHA256 3e169d4ecd2151e5b7062be3760395a9f4a6f916ab6a877bb5db65f28a65aaa9
-EBUILD gtk-doc-1.13-r2.ebuild 2701 RMD160 620f2755246be418a08cd415eb88f8e17837a9e7 SHA1 bfe247d06a55b4cf5feeecc67619b24fad72c49a SHA256 4aa6867f4799d4624b15ac2a3908f37d743983f2990a44faccfe2b7b6db11c38
 EBUILD gtk-doc-1.15-r1.ebuild 2364 RMD160 6ec447fa8c4ff28dd4681af8674030be71aa692e SHA1 b5b47e46b850a6bd2f7927571b2df431636838fa SHA256 fa2c55971bf81a70ef80428b61e07581aba54062b9a6a097c3405d70fe68bfed
+EBUILD gtk-doc-1.15-r2.ebuild 2882 RMD160 65943048829271e88cec9ed721a85ffb168fda39 SHA1 5c9549f49b55ea98ba4b3e93dba473dda67f7b92 SHA256 6228478f4e205633870b81f607363c6ff9f22be099885a06ad9d38ede845d0d4
 EBUILD gtk-doc-1.15.ebuild 2378 RMD160 6ceb7165d045621acdcb3f479e1942775bfaf43e SHA1 67bd719b58278684135ed4b3d53bc0dbec7548b8 SHA256 230815023c10b333a3d7ebdc7e8bfdc7dc367a6ec4bbb7db146c1f94a9427935
-MISC ChangeLog 19094 RMD160 a51824c6db3007f9d16df684059716304a1593ef SHA1 3b89560d6c29d24f37ec48b91f63a298557c82b4 SHA256 379ecbf0b1b68b164a4b624ce7dd79843a5a684d9020c61d6701ddbebd55508c
-MISC metadata.xml 399 RMD160 c36a962162c4c335e5d5c3059b17709481e026c2 SHA1 2584444f5432843239cf7e1b0c4a04375eff1aee SHA256 ce4f066425793550cba43ceaac34ae7d582ff7d7e7ae085042b285479d1a4a57
+MISC ChangeLog 19714 RMD160 7a2533d827e89c38f73ea308f0bb9dedcbf59cf3 SHA1 a562db112132e5d356aa13d663b6d2f865f523bb SHA256 e7485e71fbc9d3e2232a2c340a796bd1895763db646d1aee0615a3696cdb2fad
+MISC metadata.xml 568 RMD160 5fe3388f9787ccf8fda03317819d95da8758afba SHA1 3fb6c943baad4eec93070b6063b1ba1d8c48cc89 SHA256 351bf17354d07b9bc14055c0092cb0368387437cdf5c1707bdb5120e35419326
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzgAvgACgkQ1fmVwcYIWAZCSQCfVooVV8x7ExuYiKBWuZMmrwWI
+NIMAn3hdgfR5uRTXTGvXDvsw6yDeXUZU
+=8xOG
+-----END PGP SIGNATURE-----
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.10-no-m4.patch b/dev-util/gtk-doc/files/gtk-doc-1.10-no-m4.patch
deleted file mode 100644
index 8c71c3cc5484..000000000000
--- a/dev-util/gtk-doc/files/gtk-doc-1.10-no-m4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtk-doc-1.9.orig/Makefile.am gtk-doc-1.9/Makefile.am
---- gtk-doc-1.9.orig/Makefile.am	2007-09-24 15:16:20.000000000 -0400
-+++ gtk-doc-1.9/Makefile.am	2008-03-24 10:29:24.000000000 -0400
-@@ -35,16 +35,12 @@ gtkdocdata_DATA = \
- pkgconfigdir = $(datadir)/pkgconfig
- pkgconfig_DATA = gtk-doc.pc
- 
--aclocaldir = $(datadir)/aclocal
--aclocal_DATA = gtk-doc.m4
--
- sgmldir = $(datadir)/sgml/gtk-doc
- sgml_DATA = gtk-doc.cat
- 
- EXTRA_DIST = \
-   MAINTAINERS     \
-   gtk-doc.pc.in   \
--  gtk-doc.m4      \
-   gtk-doc.make    \
-   gtk-doc.notmpl.make \
-   gtk-doc.spec.in \
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtk-doc-1.9.orig/Makefile.in gtk-doc-1.9/Makefile.in
---- gtk-doc-1.9.orig/Makefile.in	2007-09-24 15:18:36.000000000 -0400
-+++ gtk-doc-1.9/Makefile.in	2008-03-24 10:29:22.000000000 -0400
-@@ -260,14 +260,11 @@ gtkdocdata_DATA = \
- 
- pkgconfigdir = $(datadir)/pkgconfig
- pkgconfig_DATA = gtk-doc.pc
--aclocaldir = $(datadir)/aclocal
--aclocal_DATA = gtk-doc.m4
- sgmldir = $(datadir)/sgml/gtk-doc
- sgml_DATA = gtk-doc.cat
- EXTRA_DIST = \
-   MAINTAINERS     \
-   gtk-doc.pc.in   \
--  gtk-doc.m4      \
-   gtk-doc.make    \
-   gtk-doc.notmpl.make \
-   gtk-doc.spec.in \
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
deleted file mode 100644
index 9b96096511eb..000000000000
--- a/dev-util/gtk-doc/files/gtk-doc-1.11-fix-index-id-gen.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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
deleted file mode 100644
index 104d4ef94b7a..000000000000
--- a/dev-util/gtk-doc/files/gtk-doc-1.11-quote-filenames-with-space.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index 6b3f5835d1f0..000000000000
--- a/dev-util/gtk-doc/files/gtk-doc-1.11-tests-fixes.patch
+++ /dev/null
@@ -1,403 +0,0 @@
-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/Makefile.in b/tests/Makefile.in
---- a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -193,7 +193,10 @@
- top_srcdir = @top_srcdir@
- SUBDIRS = gobject bugs annotations .
- @BUILD_TESTS_TRUE@TESTS = gobject.sh bugs.sh annotations.sh
--@BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = PATH=$(top_builddir):$(srcdir):$(PATH)
-+@BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \
-+@BUILD_TESTS_TRUE@	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
-+@BUILD_TESTS_TRUE@	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
-+
- EXTRA_DIST = gtkdoctest.sh \
- 	gobject.sh bugs.sh annotations.sh
- 
-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
- #
---- a/tests/annotations/docs/Makefile.am
-+++ b/tests/annotations/docs/Makefile.am
-@@ -76,3 +76,10 @@
- 	gtkdoc-mkhtml.log \
- 	gtkdoc-fixxref.log
- 
-+if BUILD_TESTS
-+
-+TESTS_ENVIRONMENT = \
-+	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
-+	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
-+
-+endif
---- a/tests/annotations/docs/Makefile.in
-+++ b/tests/annotations/docs/Makefile.in
-@@ -295,6 +295,10 @@
- 	gtkdoc-mkhtml.log \
- 	gtkdoc-fixxref.log
- 
-+@BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \
-+@BUILD_TESTS_TRUE@	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
-+@BUILD_TESTS_TRUE@	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
-+
- all: all-am
- 
- .SUFFIXES:
-@@ -482,10 +486,10 @@
- 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 \
-@@ -502,7 +506,7 @@
- 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
- 
-@@ -516,11 +520,11 @@
- 	@-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
- 
---- a/tests/bugs/docs/Makefile.am
-+++ b/tests/bugs/docs/Makefile.am
-@@ -76,3 +76,10 @@
- 	gtkdoc-mkhtml.log \
- 	gtkdoc-fixxref.log
- 
-+if BUILD_TESTS
-+
-+TESTS_ENVIRONMENT = \
-+	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
-+	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
-+
-+endif
---- a/tests/bugs/docs/Makefile.in
-+++ b/tests/bugs/docs/Makefile.in
-@@ -295,6 +295,10 @@
- 	gtkdoc-mkhtml.log \
- 	gtkdoc-fixxref.log
- 
-+@BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \
-+@BUILD_TESTS_TRUE@	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
-+@BUILD_TESTS_TRUE@	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
-+
- all: all-am
- 
- .SUFFIXES:
-@@ -482,10 +486,10 @@
- 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 \
-@@ -502,7 +506,7 @@
- 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
- 
-@@ -516,11 +520,11 @@
- 	@-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
- 
---- a/tests/gobject/docs/Makefile.am
-+++ b/tests/gobject/docs/Makefile.am
-@@ -76,3 +76,10 @@
- 	gtkdoc-mkhtml.log \
- 	gtkdoc-fixxref.log
- 
-+if BUILD_TESTS
-+
-+TESTS_ENVIRONMENT = \
-+	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
-+	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
-+
-+endif
---- a/tests/gobject/docs/Makefile.in
-+++ b/tests/gobject/docs/Makefile.in
-@@ -295,6 +295,10 @@
- 	gtkdoc-mkhtml.log \
- 	gtkdoc-fixxref.log
- 
-+@BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \
-+@BUILD_TESTS_TRUE@	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
-+@BUILD_TESTS_TRUE@	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
-+
- all: all-am
- 
- .SUFFIXES:
-@@ -482,10 +486,10 @@
- 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 \
-@@ -502,7 +506,7 @@
- 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
- 
-@@ -516,11 +520,11 @@
- 	@-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
- 
--- 
-1.6.1.3
-
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-compat.patch b/dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-compat.patch
deleted file mode 100644
index 6b5a09b66c77..000000000000
--- a/dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-compat.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From b39bb84dfb5f16c8b2977105bd5876b7b8d58a11 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Tue, 22 Dec 2009 11:54:31 +0000
-Subject: fixxref: make it work again without --module argument, Fixes #605211
-
-This restores a compatible behavior with previous versions of gtk-doc,
-which is required by many tarballs.
----
-diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in
-index 8f166ef..5a703ad 100755
---- a/gtkdoc-fixxref.in
-+++ b/gtkdoc-fixxref.in
-@@ -168,36 +168,38 @@ foreach my $dir (@EXTRA_DIRS) {
-     }
- }
- 
--open (INPUT, "$MODULE-sections.txt")
--	|| die "Can't open $MODULE-sections.txt: $!";
--my $subsection = "";
--while (<INPUT>) {
--    if (m/^#/) {
--        next;
--
--    } elsif (m/^<SECTION>/) {
--        $subsection = "";
--    } elsif (m/^<SUBSECTION\s*(.*)>/i) {
--        $subsection = $1;
--    } elsif (m/^<SUBSECTION>/) {
--        next;
--    } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
--        next;
--    } elsif (m/^<FILE>(.*)<\/FILE>/) {
--        next;
--    } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
--        next;
--    } elsif (m/^<\/SECTION>/) {
--        next;
--    } elsif (m/^(\S+)/) {
--        my $symbol=CreateValidSGMLID($1);
--
--        if ($subsection eq "Standard" || $subsection eq "Private") {
--            $NoLinks{$symbol} = 1;
-+if (defined($MODULE)) {
-+    open (INPUT, "$MODULE-sections.txt")
-+            || die "Can't open $MODULE-sections.txt: $!";
-+    my $subsection = "";
-+    while (<INPUT>) {
-+        if (m/^#/) {
-+            next;
-+
-+        } elsif (m/^<SECTION>/) {
-+            $subsection = "";
-+        } elsif (m/^<SUBSECTION\s*(.*)>/i) {
-+            $subsection = $1;
-+        } elsif (m/^<SUBSECTION>/) {
-+            next;
-+        } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
-+            next;
-+        } elsif (m/^<FILE>(.*)<\/FILE>/) {
-+            next;
-+        } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
-+            next;
-+        } elsif (m/^<\/SECTION>/) {
-+            next;
-+        } elsif (m/^(\S+)/) {
-+            my $symbol=CreateValidSGMLID($1);
-+
-+            if ($subsection eq "Standard" || $subsection eq "Private") {
-+                $NoLinks{$symbol} = 1;
-+            }
-         }
-     }
-+    close (INPUT);
- }
--close (INPUT);
- 
- &FixCrossReferences ($MODULE_DIR);
- 
---
-cgit v0.8.3.1
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.13-scan-touch-module-overrides.patch b/dev-util/gtk-doc/files/gtk-doc-1.13-scan-touch-module-overrides.patch
deleted file mode 100644
index ded24161d3bf..000000000000
--- a/dev-util/gtk-doc/files/gtk-doc-1.13-scan-touch-module-overrides.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d1a042fbd75b7f8d44293fbee01e783be79d884c Mon Sep 17 00:00:00 2001
-From: Nicola Fontana <ntd@entidi.it>
-Date: Mon, 03 Aug 2009 13:32:36 +0000
-Subject: gtkdoc-scan: touch MODULE-overrides.txt when missing. Fixes #590625
-
-gtk-doc.make puts $(DOC_MODULE)-overrides.txt in EXTRA_DIST, so this
-file must exist to be able to "make dist".
----
-diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in
-index ece8d99..c986f36 100755
---- a/gtkdoc-scan.in
-+++ b/gtkdoc-scan.in
-@@ -185,12 +185,12 @@ if ($REBUILD_SECTIONS || ! -e $sections_file) {
-   `cp $old_decl_list $sections_file`;
- }
- 
--# If there is no MODULE-overrides.txt file we create an empty one.
--# FIXME: why?
--#my $overrides_file = "${OUTPUT_DIR}/$MODULE-overrides.txt";
--#if (! -e $overrides_file) {
--#  `touch $overrides_file`;
--#}
-+# If there is no MODULE-overrides.txt file we create an empty one
-+# because EXTRA_DIST in gtk-doc.make requires it.
-+my $overrides_file = "${OUTPUT_DIR}/$MODULE-overrides.txt";
-+if (! -e $overrides_file) {
-+  `touch $overrides_file`;
-+}
- 
- 
- 
---
-cgit v0.8.3.1
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.15-allow-selection-highlighter.patch b/dev-util/gtk-doc/files/gtk-doc-1.15-allow-selection-highlighter.patch
new file mode 100644
index 000000000000..a3b2b9d1835a
--- /dev/null
+++ b/dev-util/gtk-doc/files/gtk-doc-1.15-allow-selection-highlighter.patch
@@ -0,0 +1,86 @@
+From 8506e3b61dca2861b594c3cea2dc4e0470aad4fc Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 26 Sep 2010 18:48:04 +0200
+Subject: [PATCH 01/13] Allow selection of a specific syntax highlighter, bug #628611.
+
+---
+ configure.ac |   53 +++++++++++++++++++++++++++++++++++++++++++----------
+ 1 files changed, 43 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3d7c8e1..9dada11 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -100,26 +100,59 @@ JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/html/ch
+ dnl
+ dnl Check for syntax highlighters
+ dnl
++AC_ARG_WITH([highlight],
++	AS_HELP_STRING([--with-highlight], [Select source code syntax highlighter (no|source-highlight|highlight|vim|auto)]),
++	, [with_highlight=auto])
++
++case $with_highlight in
++	no|source-highlight|highlight|vim|auto) ;;
++	*) AC_MSG_ERROR([Invalid value for syntax highlighting option.]) ;;
++esac
++
+ HIGHLIGHT_OPTIONS=""
+-AC_PATH_PROG([HIGHLIGHT], [source-highlight])
+-if test -n "$HIGHLIGHT"; then
+-	HIGHLIGHT_OPTIONS="-t4 -sc -cstyle.css --no-doc -i"
+-else
+-	AC_PATH_PROG([HIGHLIGHT], [highlight])
++if test "$with_highlight" = "auto"; then
++	AC_PATH_PROG([HIGHLIGHT], [source-highlight])
+ 	if test -n "$HIGHLIGHT"; then
+-		HIGHLIGHT_OPTIONS="-X -f --class-name=gtkdoc "
++		HIGHLIGHT_OPTIONS="-t4 -sc -cstyle.css --no-doc -i"
+ 	else
+-		AC_PATH_PROG([HIGHLIGHT], [vim])
++		AC_PATH_PROG([HIGHLIGHT], [highlight])
+ 		if test -n "$HIGHLIGHT"; then
+-			dnl vim is useless if it does not support syntax highlighting
++			HIGHLIGHT_OPTIONS="-X -f --class-name=gtkdoc "
++		else
++			AC_PATH_PROG([HIGHLIGHT], [vim])
++			if test -n "$HIGHLIGHT"; then
++				dnl vim is useless if it does not support syntax highlighting
++				AC_MSG_CHECKING([whether vim has +syntax feature])
++				if $HIGHLIGHT --version | grep '+syntax' >/dev/null; then
++					AC_MSG_RESULT([yes])
++				else
++					AC_MSG_RESULT([no])
++					HIGHLIGHT=
++				fi
++			fi
++		fi
++	fi
++else
++	if test "$with_highlight" != "no"; then
++		AC_PATH_PROG([HIGHLIGHT], [$with_highlight], [no])
++	fi
++
++	case $with_highlight in
++		source-highlight) HIGHLIGHT_OPTIONS="-t4 -sc -cstyle.css --no-doc -i";;
++		highlight) HIGHLIGHT_OPTIONS="-X -f --class-name=gtkdoc ";;
++		vim)
+ 			AC_MSG_CHECKING([whether vim has +syntax feature])
+ 			if $HIGHLIGHT --version | grep '+syntax' >/dev/null; then
+ 				AC_MSG_RESULT([yes])
+ 			else
+ 				AC_MSG_RESULT([no])
+-				HIGHLIGHT=
++				HIGHLIGHT=no
+ 			fi
+-		fi
++		;;
++	esac
++
++	if test "$HIGHLIGHT" = "no" && test "$with_highlight" != "no"; then
++		AC_MSG_ERROR([Could not find requested syntax highlighter])
+ 	fi
+ fi
+ AC_SUBST([HIGHLIGHT_OPTIONS])
+-- 
+1.7.3.1
+
diff --git a/dev-util/gtk-doc/gtk-doc-1.11.ebuild b/dev-util/gtk-doc/gtk-doc-1.11.ebuild
deleted file mode 100644
index bf3b1440e9ee..000000000000
--- a/dev-util/gtk-doc/gtk-doc-1.11.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.11.ebuild,v 1.9 2009/10/26 17:58:47 armin76 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 x86 ~sparc-fbsd ~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.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/pkgconfig-0.19
-	>=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"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Remove global Emacs keybindings.
-	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"
-
-	# 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() {
-	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
-}
diff --git a/dev-util/gtk-doc/gtk-doc-1.13-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.15-r2.ebuild
index c06e60b3d005..848b7f56e07e 100644
--- a/dev-util/gtk-doc/gtk-doc-1.13-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.15-r2.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2010 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.13-r2.ebuild,v 1.9 2010/09/02 12:36:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.15-r2.ebuild,v 1.1 2010/11/14 15:40:27 eva Exp $
 
 EAPI="2"
+PYTHON_DEPEND="2"
 
-inherit eutils elisp-common gnome2
+inherit autotools eutils elisp-common gnome2 python
 
 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 x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug doc emacs test"
+KEYWORDS="~amd64 ~m68k ~mips ~ppc ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="debug doc emacs highlight vim test"
 
-# app-editors/vim blocker needed due bug #333313
+# dev-tex/tex4ht blocker needed due bug #315287
 RDEPEND=">=dev-libs/glib-2.6
 	>=dev-lang/perl-5.6
 	>=app-text/openjade-1.3.1
@@ -25,7 +26,11 @@ RDEPEND=">=dev-libs/glib-2.6
 	~app-text/docbook-sgml-dtd-3.0
 	>=app-text/docbook-dsssl-stylesheets-1.40
 	emacs? ( virtual/emacs )
-	!!>=app-editors/vim-7.3"
+	highlight? (
+		vim? ( app-editors/vim )
+		!vim? ( dev-util/source-highlight )
+	)
+	!!<dev-tex/tex4ht-20090611_p1038-r1"
 
 DEPEND="${RDEPEND}
 	~dev-util/gtk-doc-am-${PV}
@@ -36,7 +41,15 @@ DEPEND="${RDEPEND}
 
 SITEFILE=61${PN}-gentoo.el
 
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+	if use vim; then
+		G2CONF="${G2CONF} $(use_with highlight highlight vim)"
+	else
+		G2CONF="${G2CONF} $(use_with highlight highlight source-highlight)"
+	fi
+	python_set_active_version 2
+}
 
 src_prepare() {
 	gnome2_src_prepare
@@ -44,17 +57,16 @@ src_prepare() {
 	# Remove global Emacs keybindings.
 	epatch "${FILESDIR}/${PN}-1.8-emacs-keybindings.patch"
 
-	# gtk-doc.make puts $(DOC_MODULE)-overrides.txt in EXTRA_DIST,
-	# so this file must exist to be able to "make dist".
-	# fix bug #305191, upstream ##590625.
-	epatch "${FILESDIR}/${P}-scan-touch-module-overrides.patch"
-	# This restores a compatible behavior with previous versions of gtk-doc,
-	# which is required by many tarballs, fix bug #305191, upstream #605211
-	epatch "${FILESDIR}/${P}-fixxref-compat.patch"
-
 	# Fix bug 306569 by not loading vim plugins while calling vim in
 	# gtkdoc-fixxref for fixing vim syntax highlighting
-	epatch "${FILESDIR}/${P}-fixxref-vim-u-NONE.patch"
+	# Also fix incompatibility with vim-7.3 (bug #333313)
+	epatch "${FILESDIR}/${PN}-1.15-fixxref-vim-fixes.patch"
+
+	# Allow selection of specific highlighter, bug #334489
+	# In upstream's master
+	epatch "${FILESDIR}/${PN}-1.15-allow-selection-highlighter.patch"
+
+	eautoreconf
 }
 
 src_compile() {
@@ -66,6 +78,8 @@ src_compile() {
 src_install() {
 	gnome2_src_install
 
+	python_convert_shebangs 2 "${D}"/usr/bin/gtkdoc-depscan
+
 	# Don't install those files, they are in gtk-doc-am now
 	rm "${D}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
 	rm "${D}"/usr/bin/gtkdoc-rebase || die "failed to remove gtkdoc-rebase"
diff --git a/dev-util/gtk-doc/metadata.xml b/dev-util/gtk-doc/metadata.xml
index 7d6cbb1602cb..a562fd84b87c 100644
--- a/dev-util/gtk-doc/metadata.xml
+++ b/dev-util/gtk-doc/metadata.xml
@@ -2,6 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name="highlight">Enable source code highlighting</flag>
+	<flag name="vim">Enable source code highlighting through
+	<pkg>app-editors/vim</pkg></flag>
+</use>
 <longdescription lang="en">
 	GTK-Doc is used to document C code.
 	It is typically used to document the public API of libraries,