From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-850877-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id E9D5F1384B4
for <garchives@archives.gentoo.org>; Wed, 9 Dec 2015 19:07:20 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E722B21C037;
Wed, 9 Dec 2015 19:07:17 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id E310E21C02E
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Dec 2015 19:07:16 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D69CD34085B
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Dec 2015 19:07:15 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FAD1E82
for <gentoo-commits@lists.gentoo.org>; Wed, 9 Dec 2015 19:07:11 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1449688007.e80293dcc6386268b90dd5130409f0069c5de832.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-apps/portage/portage-2.2.26.ebuild sys-apps/portage/portage-9999.ebuild
X-VCS-Directories: sys-apps/portage/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: e80293dcc6386268b90dd5130409f0069c5de832
X-VCS-Branch: master
Date: Wed, 9 Dec 2015 19:07:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 242d0d81-8d2b-4181-b3bb-16de736bcdb4
X-Archives-Hash: 1061942e71bb4d995c8c26c23b55ad14
commit: e80293dcc6386268b90dd5130409f0069c5de832
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 9 18:46:48 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec 9 19:06:47 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e80293dc
sys-apps/portage: Force py2 for doc-build with USE=epydoc
sys-apps/portage/portage-2.2.26.ebuild | 4 ++++
sys-apps/portage/portage-9999.ebuild | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/sys-apps/portage/portage-2.2.26.ebuild b/sys-apps/portage/portage-2.2.26.ebuild
index 43cb079..9473c2c 100644
--- a/sys-apps/portage/portage-2.2.26.ebuild
+++ b/sys-apps/portage/portage-2.2.26.ebuild
@@ -79,6 +79,10 @@ TARBALL_PV=${PV}
SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+pkg_setup() {
+ use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
python_prepare_all() {
distutils-r1_python_prepare_all
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index f6dea3e..f69e62f 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -78,6 +78,10 @@ prefix_src_archives() {
EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git
https://github.com/gentoo/portage.git"
+pkg_setup() {
+ use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
python_prepare_all() {
distutils-r1_python_prepare_all