From 50189bb31877b3d299b6442d0051ac5d17fac570 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Thu, 22 May 2008 17:13:16 +0000 Subject: 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. (Portage version: 2.1.4.4) --- app-text/docbook2X/ChangeLog | 13 +++- app-text/docbook2X/docbook2X-0.8.8-r2.ebuild | 55 +++++++++++++ ...docbook2X-0.8.8-error_on_missing_refentry.patch | 33 ++++++++ ...book2X-0.8.8-filename_whitespace_handling.patch | 43 +++++++++++ ...k2X-0.8.8-preprocessor_declaration_syntax.patch | 90 ++++++++++++++++++++++ 5 files changed, 233 insertions(+), 1 deletion(-) create mode 100644 app-text/docbook2X/docbook2X-0.8.8-r2.ebuild create mode 100644 app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch create mode 100644 app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch create mode 100644 app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch (limited to 'app-text') 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 + +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/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 +## +## 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: +## DP: + +@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 @@ + + + +- +- ++ + + + ++ ++ ++ ++ WARNING: Sorry, but I cannot find a refentry element in your source! ++ + + + 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) +## +## 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 @@ + + + +- ++ + + + +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 @@ + + + +- ++ ++ ++ ++ ++ + +