From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5369C138330 for ; Mon, 19 Sep 2016 14:01:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 063BFE08C5; Mon, 19 Sep 2016 14:01:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B25B6E08C5 for ; Mon, 19 Sep 2016 14:00:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C25A340A5D for ; Mon, 19 Sep 2016 14:00:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9A7C2464 for ; Mon, 19 Sep 2016 14:00:56 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1474293611.42c16a429662b3ddab73139603798748d43f2068.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/, sys-apps/portage/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/portage/files/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch sys-apps/portage/portage-2.3.1.ebuild X-VCS-Directories: sys-apps/portage/files/ sys-apps/portage/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 42c16a429662b3ddab73139603798748d43f2068 X-VCS-Branch: master Date: Mon, 19 Sep 2016 14:00:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 377680d1-47d8-43d3-9d95-17669aea48ce X-Archives-Hash: a45fb0297ba79d11807e2a961fe12709 commit: 42c16a429662b3ddab73139603798748d43f2068 Author: Mike Gilbert gentoo org> AuthorDate: Mon Sep 19 14:00:04 2016 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Sep 19 14:00:11 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c16a42 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 ...ert-URI-changes-related-to-docbook-schema.patch | 39 ++++++++++++++++++++++ sys-apps/portage/portage-2.3.1.ebuild | 4 ++- 2 files changed, 42 insertions(+), 1 deletion(-) 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 00000000..ee191ff --- /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 +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 @@ +- ++ + + + +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 @@ + + + +-- +2.10.0 + diff --git a/sys-apps/portage/portage-2.3.1.ebuild b/sys-apps/portage/portage-2.3.1.ebuild index ba8f996..4ea4ef7 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 )