Add a patch to fix maketoc.xsl stylesheet, also don't run tests during src_compile but in src_test instead.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 172 insertions, 7 deletions

diff --git a/app-text/docbook-xsl-ns-stylesheets/ChangeLog b/app-text/docbook-xsl-ns-stylesheets/ChangeLog
index cd78dc5e5aad..b0bb847a937a 100644
--- a/app-text/docbook-xsl-ns-stylesheets/ChangeLog
+++ b/app-text/docbook-xsl-ns-stylesheets/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/docbook-xsl-ns-stylesheets
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-ns-stylesheets/ChangeLog,v 1.8 2008/11/24 21:14:59 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-ns-stylesheets/ChangeLog,v 1.9 2009/03/04 20:58:02 flameeyes Exp $
+
+*docbook-xsl-ns-stylesheets-1.74.0-r1 (04 Mar 2009)
+
+  04 Mar 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/docbook-xsl-ns-1.74.0-maketoc-fix.patch,
+  +docbook-xsl-ns-stylesheets-1.74.0-r1.ebuild:
+  Add a patch to fix maketoc.xsl stylesheet, also don't run tests during
+  src_compile but in src_test instead.
 
   24 Nov 2008; Brent Baude <ranger@gentoo.org>
   docbook-xsl-ns-stylesheets-1.74.0.ebuild:
diff --git a/app-text/docbook-xsl-ns-stylesheets/Manifest b/app-text/docbook-xsl-ns-stylesheets/Manifest
index 7002cdd6d05d..66f7df4b4641 100644
--- a/app-text/docbook-xsl-ns-stylesheets/Manifest
+++ b/app-text/docbook-xsl-ns-stylesheets/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX docbook-xsl-ns-1.74.0-maketoc-fix.patch 4188 RMD160 3e8b3269de1504f6beecd13363c55bd05cda6724 SHA1 d8f652b4210a493e0d28a5a66aafd6a574d63caa SHA256 b3b80fd1482e6f195e76c79a96bcafdf91aa2665c34fa0d4f8e6074c84fb22ca
 DIST docbook-xsl-ns-1.74.0.tar.bz2 9990840 RMD160 705334dae1270ee14dd026afb69e3c6008df4dde SHA1 34255f0f97322833ad52fbbd5c4297509f445ae8 SHA256 a90fb74f14ee748226ddc73074ebcc03799770bae87fd5f51f8ba7096ef5a308
+EBUILD docbook-xsl-ns-stylesheets-1.74.0-r1.ebuild 1649 RMD160 9f47b00b8ab7f48652357347ddcef49ea2e75e87 SHA1 ad4cf31c8ddec0c5939e8b9d3b26972307ba2d9f SHA256 5932e45bbdbdba097863b6f577c83d6a78f73a731607af1cd4d80bc1f19460c8
 EBUILD docbook-xsl-ns-stylesheets-1.74.0.ebuild 1371 RMD160 f5960727a40c02d378fb431cc81fec01ca0a3e7e SHA1 2d1de21f70436c15c91b13591d812e42c375f3e5 SHA256 250952595785720a53da6e8a414f65097fdf22d1edea0ed6aaba9c7d90a0c449
-MISC ChangeLog 1441 RMD160 0db4dfe8fe6239177689ef667c5217ad19d88a98 SHA1 2786e672aa3b1d3b07cb499f26eb6c4545782d15 SHA256 e29cbdee71b86dd73a315a6610678ed974a8da665f56c1d9a5f4ba8f53dc0039
+MISC ChangeLog 1764 RMD160 bed92d1a9fb8acfbc3131cd339cfcaa4a80099d2 SHA1 41eb0dd7fb017872b030a17d8fec9bea8f2580e4 SHA256 7a1d80ee1a037b1866090b0ef1bba00201474e4c207dd0846f64f07b4d9d26bd
 MISC metadata.xml 233 RMD160 da5a1d3b7836dcebb5fec29696b5bfb583fe346c SHA1 1c7142c677598358888a6cfc6f6f65df2e8b6901 SHA256 4d1294dc1b2a6f96aa637a0b8d340bc67191103af0f15197d07fc62446b4a709
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkk7t4MACgkQ67wieSYcaxeD4wCg2BgsxRlAN1OuAC+qamtajMh6
-M0oAnjdVXFbBaJYAV6qBe/wxXQK/84eI
-=KIJ+
+iEYEARECAAYFAkmu650ACgkQAiZjviIA2XisdwCfeZDXuCS1WQc5Nju6KOVKjAGD
+C40An2CUXFX6dROLyIO1DlyXHJFp8WQx
+=b1wA
 -----END PGP SIGNATURE-----
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.74.0-r1.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.74.0-r1.ebuild
new file mode 100644
index 000000000000..b74aab61b993
--- /dev/null
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.74.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.74.0-r1.ebuild,v 1.1 2009/03/04 20:58:02 flameeyes Exp $
+
+inherit eutils
+
+DESCRIPTION="XSL Stylesheets for Docbook"
+HOMEPAGE="http://wiki.docbook.org/topic/DocBookXslStylesheets"
+SRC_URI="mirror://sourceforge/docbook/docbook-xsl-ns-${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-libs/libxml2
+		dev-libs/libxslt )"
+
+RDEPEND=">=app-text/build-docbook-catalog-1.4"
+
+S=${WORKDIR}/docbook-xsl-ns-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/docbook-xsl-ns-${PV}-maketoc-fix.patch"
+}
+
+# The makefile runs tests, not builds.
+src_compile() { :; }
+
+src_test() {
+	emake check || die "test failed"
+}
+
+src_install() {
+	# Create the installation directory
+	DEST="/usr/share/sgml/docbook/xsl-ns-stylesheets"
+	insinto ${DEST}
+
+	local i
+	for sheet in $(find . -maxdepth 1 -mindepth 1 -type d); do
+		i=$(basename $sheet)
+		cd "${S}"/${i}
+		for doc in ChangeLog README; do
+			if [ -e "$doc" ]; then
+				mv ${doc} ${doc}.${i}
+				dodoc ${doc}.${i}
+				rm ${doc}.${i}
+			fi
+		done
+
+		doins -r "${S}"/${i}
+	done
+
+	# Install misc. docs
+	# The changelog is now zipped, and copied as the RELEASE-NOTES, so we
+	# don't need to install it
+	cd "${S}"
+	dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
+	doins VERSION
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+}
diff --git a/app-text/docbook-xsl-ns-stylesheets/files/docbook-xsl-ns-1.74.0-maketoc-fix.patch b/app-text/docbook-xsl-ns-stylesheets/files/docbook-xsl-ns-1.74.0-maketoc-fix.patch
new file mode 100644
index 000000000000..0020820383f6
--- /dev/null
+++ b/app-text/docbook-xsl-ns-stylesheets/files/docbook-xsl-ns-1.74.0-maketoc-fix.patch
@@ -0,0 +1,82 @@
+Index: docbook-xsl-ns-1.74.0/xhtml-1_1/maketoc.xsl
+===================================================================
+--- docbook-xsl-ns-1.74.0.orig/xhtml-1_1/maketoc.xsl
++++ docbook-xsl-ns-1.74.0/xhtml-1_1/maketoc.xsl
+@@ -1,8 +1,8 @@
+ <?xml version="1.0" encoding="ASCII"?>
+ <!--This file was created automatically by html2xhtml-->
+ <!--from the HTML stylesheets.-->
+-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:d="http://docbook.org/ns/docbook"
+-xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc d">
++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://docbook.org/ns/docbook"
++xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" version="1.0" exclude-result-prefixes="doc">
+ 
+ <!-- ********************************************************************
+      $Id: docbook-xsl-ns-1.74.0-maketoc-fix.patch,v 1.1 2009/03/04 20:58:06 flameeyes Exp $
+@@ -19,13 +19,13 @@ xmlns:doc="http://nwalsh.com/xsl/documen
+ <xsl:import href="docbook.xsl"/>
+ <xsl:import href="chunk.xsl"/>
+ 
+-<xsl:output method="xml" indent="no" encoding="UTF-8" doctype-public="-//W3C//DTD XHTML 1.1//EN" doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"/>
++<xsl:output method="xml" indent="no" encoding="UTF-8"/>
+ 
+ <xsl:param name="toc.list.type" select="'tocentry'"/>
+ 
+ <!-- refentry in autotoc.xsl does not use subtoc, so must
+      handle it explicitly here. -->
+-<xsl:template match="d:refentry" mode="toc">
++<xsl:template match="refentry" mode="toc">
+   <xsl:param name="toc-context" select="."/>
+ 
+   <xsl:call-template name="subtoc">
+Index: docbook-xsl-ns-1.74.0/xhtml/maketoc.xsl
+===================================================================
+--- docbook-xsl-ns-1.74.0.orig/xhtml/maketoc.xsl
++++ docbook-xsl-ns-1.74.0/xhtml/maketoc.xsl
+@@ -1,8 +1,8 @@
+ <?xml version="1.0" encoding="ASCII"?>
+ <!--This file was created automatically by html2xhtml-->
+ <!--from the HTML stylesheets.-->
+-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:d="http://docbook.org/ns/docbook"
+-xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc d">
++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://docbook.org/ns/docbook"
++xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" version="1.0" exclude-result-prefixes="doc">
+ 
+ <!-- ********************************************************************
+      $Id: docbook-xsl-ns-1.74.0-maketoc-fix.patch,v 1.1 2009/03/04 20:58:06 flameeyes Exp $
+@@ -19,13 +19,13 @@ xmlns:doc="http://nwalsh.com/xsl/documen
+ <xsl:import href="docbook.xsl"/>
+ <xsl:import href="chunk.xsl"/>
+ 
+-<xsl:output method="xml" indent="no" encoding="UTF-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
++<xsl:output method="xml" indent="no" encoding="UTF-8" />
+ 
+ <xsl:param name="toc.list.type" select="'tocentry'"/>
+ 
+ <!-- refentry in autotoc.xsl does not use subtoc, so must
+      handle it explicitly here. -->
+-<xsl:template match="d:refentry" mode="toc">
++<xsl:template match="refentry" mode="toc">
+   <xsl:param name="toc-context" select="."/>
+ 
+   <xsl:call-template name="subtoc">
+Index: docbook-xsl-ns-1.74.0/html/maketoc.xsl
+===================================================================
+--- docbook-xsl-ns-1.74.0.orig/html/maketoc.xsl
++++ docbook-xsl-ns-1.74.0/html/maketoc.xsl
+@@ -1,5 +1,5 @@
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+-                xmlns:d="http://docbook.org/ns/docbook"
++                xmlns="http://docbook.org/ns/docbook"
+ xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
+ 		version="1.0"
+                 exclude-result-prefixes="doc d">
+@@ -25,7 +25,7 @@ xmlns:doc="http://nwalsh.com/xsl/documen
+ 
+ <!-- refentry in autotoc.xsl does not use subtoc, so must
+      handle it explicitly here. -->
+-<xsl:template match="d:refentry" mode="toc">
++<xsl:template match="refentry" mode="toc">
+   <xsl:param name="toc-context" select="."/>
+ 
+   <xsl:call-template name="subtoc">