summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2016-09-19 10:00:04 -0400
committerMike Gilbert <floppym@gentoo.org>2016-09-19 10:00:11 -0400
commit42c16a429662b3ddab73139603798748d43f2068 (patch)
treed22d7b0f936444cbf5dae2988c56c8bd54585c53 /sys-apps
parentsys-libs/cracklib: Stable for HPPA PPC64 (bug #591456). (diff)
downloadgentoo-42c16a429662b3ddab73139603798748d43f2068.tar.gz
gentoo-42c16a429662b3ddab73139603798748d43f2068.tar.bz2
gentoo-42c16a429662b3ddab73139603798748d43f2068.zip
sys-apps/portage: apply fix for doc building to 2.3.1
Bug: https://bugs.gentoo.org/589210 Package-Manager: portage-2.3.0_p42
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/portage/files/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch39
-rw-r--r--sys-apps/portage/portage-2.3.1.ebuild4
2 files changed, 42 insertions, 1 deletions
diff --git a/sys-apps/portage/files/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch b/sys-apps/portage/files/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch
new file mode 100644
index 000000000000..ee191fffa730
--- /dev/null
+++ b/sys-apps/portage/files/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch
@@ -0,0 +1,39 @@
+From 35863a80b915939aac3ce6bf017d942cac879df8 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 20 Jul 2016 12:30:05 -0400
+Subject: [PATCH] doc: Revert URI changes related to docbook schema
+
+This partially reverts b5365341dad167e314023df95d2c5e0f955962f0.
+
+X-Gentoo-Bug: 589210
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/589210
+---
+ doc/custom.xsl | 2 +-
+ doc/portage.docbook | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/custom.xsl b/doc/custom.xsl
+index 11a2b9e..a7763ec 100644
+--- a/doc/custom.xsl
++++ b/doc/custom.xsl
+@@ -1,4 +1,4 @@
+-<xsl:stylesheet xmlns:xsl="https://www.w3.org/1999/XSL/Transform" version="1.0">
++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:param name="toc.section.depth" select="20"/>
+ <xsl:param name="chunk.section.depth" select="2"/>
+ <xsl:param name="generate.section.toc.level" select="2"/>
+diff --git a/doc/portage.docbook b/doc/portage.docbook
+index f7d539a..811544f 100644
+--- a/doc/portage.docbook
++++ b/doc/portage.docbook
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
+- "https://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
++ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+ <!ENTITY date SYSTEM "fragment/date">
+ <!ENTITY version SYSTEM "fragment/version">
+--
+2.10.0
+
diff --git a/sys-apps/portage/portage-2.3.1.ebuild b/sys-apps/portage/portage-2.3.1.ebuild
index ba8f996c4009..4ea4ef79bac9 100644
--- a/sys-apps/portage/portage-2.3.1.ebuild
+++ b/sys-apps/portage/portage-2.3.1.ebuild
@@ -78,7 +78,9 @@ TARBALL_PV=${PV}
SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-PATCHES=()
+PATCHES=(
+ "${FILESDIR}/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch"
+)
pkg_setup() {
use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )