Some patches from debian (read patches for description). Updated deps: 1. they required at build time too, 2. fixed bug #223071, thank Mike Weissman for report and hint to fix.

Package-Manager: portage-2.1.4.4

6 files changed, 238 insertions, 2 deletions

diff --git a/app-text/docbook2X/ChangeLog b/app-text/docbook2X/ChangeLog
index 7579950d3935..b2aaccb070a1 100644
--- a/app-text/docbook2X/ChangeLog
+++ b/app-text/docbook2X/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-text/docbook2X
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/ChangeLog,v 1.23 2008/04/09 09:27:21 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/ChangeLog,v 1.24 2008/05/22 17:13:16 pva Exp $
+
+*docbook2X-0.8.8-r2 (22 May 2008)
+
+  22 May 2008; Peter Volkov <pva@gentoo.org>
+  +files/docbook2X-0.8.8-error_on_missing_refentry.patch,
+  +files/docbook2X-0.8.8-filename_whitespace_handling.patch,
+  +files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch,
+  +docbook2X-0.8.8-r2.ebuild:
+  Some patches from debian (read patches for description). Updated deps: 1.
+  they required at build time too, 2. fixed bug #223071, thank Mike Weissman
+  for report and hint to fix.
 
 *docbook2X-0.8.8-r1 (09 Apr 2008)
 
diff --git a/app-text/docbook2X/Manifest b/app-text/docbook2X/Manifest
index da546f9ff861..afc233d9a28f 100644
--- a/app-text/docbook2X/Manifest
+++ b/app-text/docbook2X/Manifest
@@ -1,9 +1,13 @@
+AUX docbook2X-0.8.8-error_on_missing_refentry.patch 1247 RMD160 b8994d28b83b62a3880291e4bc22a13166653754 SHA1 0802e9a73aa4fd146c5394f5cd200c7e452de18e SHA256 273eaa08cfff75bb5fab4975761d1e427e4180d82700da396901a59ed0546c0d
+AUX docbook2X-0.8.8-filename_whitespace_handling.patch 2080 RMD160 18965f6a35d2604e85558b188ae74ae3028113bf SHA1 db6411e5ee48b83c1d9a2fed296020c4f00e17d3 SHA256 ac5755da0dbdd67e7131284e865d86df24a56ac26cfbcdcdbe561926a54999fd
+AUX docbook2X-0.8.8-preprocessor_declaration_syntax.patch 3358 RMD160 9d65c7e6cf48b0a99c7cb12e5ba2bfb48ebbf573 SHA1 eda3c5d507cd21c1f564110111c5f7a6c26c6fab SHA256 0f571f0e9576ef09a07c46da76723cd3f83085ccf8daf25dee15b9921455112a
 DIST docbook2X-0.6.1.tar.gz 231262 RMD160 78b7f0cff04093a2c35371803d34c5c32c7eb8a9 SHA1 df1c70b3fa531c97fe406bea06eb3b5da05d4d1c SHA256 fb162799d29a86e2d7b506b87edd9b88eb6b126ed4b9648ac658fcdd0ebe058f
 DIST docbook2X-0.8.7.tar.gz 656814 RMD160 89b40ffe563def5416139315e46e63b4f13d2307 SHA1 14aa84bc28080a74f9c47126dc21a9982a6cf7c0 SHA256 562c143f64091b7e537042a6dce582d98bd4120b08a500ded3f78815c334e5f4
 DIST docbook2X-0.8.8.tar.gz 723909 RMD160 35c8dcbe86e91e787a67b1d17251bf00fed9aabf SHA1 7dc34d420f8aae2a0c0cdb39f52146ce005bf902 SHA256 4077757d367a9d1b1427e8d5dfc3c49d993e90deabc6df23d05cfe9cd2fcdc45
 EBUILD docbook2X-0.6.1-r2.ebuild 1493 RMD160 9b71d505117606242cfbbbe9b1c127a9d6d9565c SHA1 0da44b91ee4c2891ef982cb9d9d09569ea37f4b6 SHA256 0046e0cf067e085addeaec0ff0e3617b9c70542870baa09a412f0b9ee9535359
 EBUILD docbook2X-0.8.7-r1.ebuild 945 RMD160 54a934704218103d485d79f0a091a8c67443d7b1 SHA1 929d99afbf1672ca2f5e70bcdbad921e1a0035b4 SHA256 154d80b7b2f09fb9b2cb7a393bfd9d43eb955ac8c3ee73f0d59dd3b933064deb
 EBUILD docbook2X-0.8.8-r1.ebuild 1032 RMD160 616b540f10794e7f4680e18886cce8dbd2718940 SHA1 6d64debc6b3107d887f68de29fd869c82ceb5bfd SHA256 04587c87194ca5f409296f43cbe20fb55fe5b5f6b52880cce3b4ecb385454d1d
+EBUILD docbook2X-0.8.8-r2.ebuild 1502 RMD160 5c1f4bc8d9b02fba5e386427d54903bfad2f3193 SHA1 c983ea1349ece7ab547660507da7f95a9f2a8316 SHA256 111aa0059f2c514b5eef6994cdea7af38d7afd613424552ce5329bdac3890e4d
 EBUILD docbook2X-0.8.8.ebuild 1001 RMD160 7342631b1240fa4b8322aaa9bd00b92288cdffc6 SHA1 32de09cdd287df655697aaec6cd1bd0eaf67b0a3 SHA256 2cdf239aefe30673c829ae66b0ee1afd05d9e3e38fe558db8ff8f8a9d268055c
-MISC ChangeLog 3678 RMD160 fe4f694e8b9fe5d986d11ce118423c904aaac092 SHA1 663e6afebd6723515a69f1ce3e462f5eb4718826 SHA256 bd7bf181627110c4f52903a864daaf3ee224c99e95312b3943d8a0323304b1ab
+MISC ChangeLog 4155 RMD160 1d8c5861e8c7d8e007ddd4fde16c8a4b98933c84 SHA1 4be7fc28504a1b55c37d7615a33bf53a779a9007 SHA256 bddea694adc1bd36f9cb536eca27e02859af927f3342ce9687de7feb44725d82
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild
new file mode 100644
index 000000000000..a2864dcf0916
--- /dev/null
+++ b/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild,v 1.1 2008/05/22 17:13:16 pva Exp $
+
+inherit eutils
+
+DESCRIPTION="Tools to convert docbook to man and info"
+SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
+HOMEPAGE="http://docbook2x.sourceforge.net/"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="test"
+LICENSE="MIT"
+
+# dev-perl/XML-LibXML - although not mentioned upstream is required
+# for make check to complete.
+DEPEND="dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-NamespaceSupport
+	dev-perl/XML-SAX
+	dev-perl/XML-LibXML
+	app-text/docbook-xsl-stylesheets
+	=app-text/docbook-xml-dtd-4.2*"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Patches from debian, for description see patches itself.
+	epatch "${FILESDIR}"/${P}-filename_whitespace_handling.patch
+	epatch "${FILESDIR}"/${P}-preprocessor_declaration_syntax.patch
+	epatch "${FILESDIR}"/${P}-error_on_missing_refentry.patch
+}
+
+src_compile() {
+	econf \
+		--with-xslt-processor=libxslt \
+		--program-transform-name='s,\(docbook2.*\),\1.pl,' \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}
+
+pkg_postinst() {
+	elog "To avoid conflict with docbook-sgml-utils, which is much more widely used,"
+	elog "all executables have been renamed to *.pl."
+}
diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch b/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch
new file mode 100644
index 000000000000..b8a493be2f36
--- /dev/null
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_fix_439214_error_on_missing_refentry.dpatch by Daniel Leidert <daniel.leidert@wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: If there is no refentry element, the manpage stylesheets silently
+## DP:   "ignores" this. It has been requested to print at least a
+## DP:   warning.
+## DP:
+## DP: <URL:http://bugs.debian.org/439214>
+## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html>
+
+@DPATCH@
+diff -urNad trunk~/xslt/man/docbook.xsl trunk/xslt/man/docbook.xsl
+--- trunk~/xslt/man/docbook.xsl	2006-04-11 21:00:19.000000000 +0200
++++ trunk/xslt/man/docbook.xsl	2008-02-05 03:31:48.000000000 +0100
+@@ -111,11 +111,15 @@
+     <xsl:when test="child::refentry">
+       <xsl:apply-templates />
+     </xsl:when>
+-
+-    <xsl:otherwise>
++    <xsl:when test="descendant-or-self::refentry">
+       <manpageset>
+         <xsl:apply-templates select="descendant-or-self::refentry" />
+       </manpageset>
++    </xsl:when>
++    <xsl:otherwise>
++      <xsl:message terminate="no">
++        <xsl:text>WARNING: Sorry, but I cannot find a refentry element in your source!</xsl:text>
++      </xsl:message>
+     </xsl:otherwise>
+   </xsl:choose>
+ </xsl:template>
diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch b/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch
new file mode 100644
index 000000000000..26cdf8e1baea
--- /dev/null
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_fix_420153_filename_whitespace_handling.dpatch by
+##     Daniel Leidert (dale) <daniel.leidert@wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Peter Eisentraut reported a regression in the whitespace handling of
+## DP: refentrytitle content during filename creation:
+## DP: http://bugs.debian.org/420153. The problem is, that upstream first
+## DP: replaces all spaces (but not linebreaks btw) with underlines and then
+## DP: it tries to normalize the result. This means, that a linebreak with
+## DP: additional whitespaces results in manpage names like 'foo_ ____bar.9'.
+## DP: So what we basically do in this patch is, that we first normalize the
+## DP: refentrytitle and then replace any spaces left with underlines.
+
+@DPATCH@
+diff -urNad docbook2x-0.8.8~/xslt/man/manpage.xsl docbook2x-0.8.8/xslt/man/manpage.xsl
+--- docbook2x-0.8.8~/xslt/man/manpage.xsl	2006-04-20 15:45:55.000000000 +0200
++++ docbook2x-0.8.8/xslt/man/manpage.xsl	2007-04-20 16:19:28.000000000 +0200
+@@ -30,7 +30,7 @@
+ 
+ <xsl:template name="manpage-filename">
+   <xsl:param name="filename" />
+-  <xsl:value-of select="normalize-space(translate($filename, &quot; /&quot;, &quot;__&quot;))" />
++  <xsl:value-of select="translate(normalize-space($filename), ' /', '__')" />
+ </xsl:template>
+ 
+ 
+diff -urNad docbook2x-0.8.8~/xslt/man/refentry.xsl docbook2x-0.8.8/xslt/man/refentry.xsl
+--- docbook2x-0.8.8~/xslt/man/refentry.xsl	2006-04-21 04:39:55.000000000 +0200
++++ docbook2x-0.8.8/xslt/man/refentry.xsl	2007-04-20 16:21:53.000000000 +0200
+@@ -38,7 +38,11 @@
+ <xsl:template name="refentry-filename">
+   <xsl:param name="title" />
+ 
+-  <xsl:variable name="title2" select="translate($title, &quot; /&quot;, &quot;__&quot;)" />
++  <xsl:variable name="title2">
++    <xsl:call-template name="manpage-filename">
++      <xsl:with-param name="filename" select="$title" />
++    </xsl:call-template>
++  </xsl:variable>
+ 
+   <!-- not using gentext here since man page names tend not to have
+        accented chars / non-Latin chars ...
diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch b/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch
new file mode 100644
index 000000000000..b6ddbfa2a0d3
--- /dev/null
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch
@@ -0,0 +1,90 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_fix_442782_preprocessor_declaration_syntax.dpatch by Colin Watson <cjwatson@debian.org>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Conventionally, preprocessor declarations should start with
+## DP:       '\"
+## DP:   rather than
+## DP:       .\"
+## DP:   Current man-db only supports the first (and recommended) syntax. So
+## DP:   Colin Watson provided this patch to fix docbook2x.
+## DP:
+## DP: <URL:http://bugs.debian.org/442782>
+## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html>
+
+@DPATCH@
+diff -urNad trunk~/perl/db2x_manxml.pl trunk/perl/db2x_manxml.pl
+--- trunk~/perl/db2x_manxml.pl	2006-04-22 17:21:32.000000000 +0200
++++ trunk/perl/db2x_manxml.pl	2007-11-24 01:27:37.000000000 +0100
+@@ -342,6 +342,25 @@
+     $self->{line_start} = 1;
+ }
+ 
++#
++# Print a comment in the output, without causing a break.
++# Params: comment - the comment text.  
++#                   May use any characters; they need not be escaped.
++#
++sub comment_nobreak
++{
++    my ($self, $comment) = @_;
++    $self->write("\n") unless $self->{line_start};
++
++    foreach my $line (split(/\n/, $comment)) {
++        $self->write('\'\" ');
++        $self->write($line);
++        $self->write("\n");
++    }
++
++    $self->{line_start} = 1;
++}
++
+ 
+ #
+ # Use a roff "escape" i.e. commands embedded in text starting with \
+@@ -510,16 +529,20 @@
+ 
+     $self->{'adjust-stack'} = [ 'b' ];
+ 
+-    $self->{rw}->comment($elem->attr('preprocessors'))
+-        if($elem->attr('preprocessors') ne '');
+-
++    my $preprocessors = $elem->attr('preprocessors');
+     # I've dug through the Internet to see if there was any
+     # standard way to specify encoding with man pages.
+     # The following seems to be a reasonable proposal:
+     # <URL:http://mail.nl.linux.org/linux-utf8/2001-04/msg00168.html>
+     my $encoding = $self->{options}->{'encoding'};
+     $encoding =~ s#//TRANSLIT$##i;
+-    $self->{rw}->comment("-*- coding: $encoding -*-");
++    $encoding = "-*- coding: $encoding -*-";
++    if ($preprocessors eq '') {
++        $preprocessors = $encoding;
++    } else {
++        $preprocessors = "$preprocessors $encoding";
++    }
++    $self->{rw}->comment_nobreak($preprocessors);
+     
+     # Define escapes for switching to and from monospace fonts (groff only)
+     $self->{rw}->request(qw{ .if \n(.g .ds T< \\\\FC});
+diff -urNad trunk~/xslt/backend/db2x_manxml.xsl trunk/xslt/backend/db2x_manxml.xsl
+--- trunk~/xslt/backend/db2x_manxml.xsl	2006-04-23 16:44:52.000000000 +0200
++++ trunk/xslt/backend/db2x_manxml.xsl	2007-11-24 01:27:37.000000000 +0100
+@@ -528,7 +528,7 @@
+       <exslt:document method="text" 
+                       encoding="{$encoding}" 
+                       href="{$path}">
+-        <xsl:text>.\" -*- coding: </xsl:text>
++        <xsl:text>'\" -*- coding: </xsl:text>
+         <xsl:value-of select="$encoding" />
+         <xsl:text> -*-&#10;</xsl:text>
+         <xsl:copy-of select="$content" />
+@@ -538,7 +538,7 @@
+       <saxon:output method="text" 
+                     encoding="{$encoding}" 
+                     href="{$path}">
+-        <xsl:text>.\" -*- coding: </xsl:text>
++        <xsl:text>'\" -*- coding: </xsl:text>
+         <xsl:value-of select="$encoding" />
+         <xsl:text> -*-&#10;</xsl:text>
+         <xsl:copy-of select="$content" />