From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1109346-garchives=archives.gentoo.org@lists.gentoo.org>
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 A3565138334
for <garchives@archives.gentoo.org>; Fri, 6 Sep 2019 22:15:14 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id EE666E09E2;
Fri, 6 Sep 2019 22:15:13 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id D7450E09E2
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Sep 2019 22:15:13 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D653034AD39
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Sep 2019 22:15:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 579A271A
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Sep 2019 22:15:11 +0000 (UTC)
From: "Zac Medico" <zmedico@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, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <1567808101.2b1778c25157f4ab48237d25431ee5742261e6b2.zmedico@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.3.75-r1.ebuild sys-apps/portage/portage-2.3.75.ebuild
X-VCS-Directories: sys-apps/portage/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 2b1778c25157f4ab48237d25431ee5742261e6b2
X-VCS-Branch: master
Date: Fri, 6 Sep 2019 22:15: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c01d4f84-05b5-4279-8eb4-084dbd4f37e5
X-Archives-Hash: 3535e20f8967a4e6747877297f75c7b7
commit: 2b1778c25157f4ab48237d25431ee5742261e6b2
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 6 21:52:28 2019 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Sep 6 22:15:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b1778c2
sys-apps/portage: Revbump to 2.3.75-r1 for bug 688902
Fix emaint --fix binhost with FEATURES=pkgdir-index-trusted.
Bug: https://bugs.gentoo.org/688902
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
sys-apps/portage/{portage-2.3.75.ebuild => portage-2.3.75-r1.ebuild} | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys-apps/portage/portage-2.3.75.ebuild b/sys-apps/portage/portage-2.3.75-r1.ebuild
similarity index 96%
rename from sys-apps/portage/portage-2.3.75.ebuild
rename to sys-apps/portage/portage-2.3.75-r1.ebuild
index b45fedf3529..3b24def35f5 100644
--- a/sys-apps/portage/portage-2.3.75.ebuild
+++ b/sys-apps/portage/portage-2.3.75-r1.ebuild
@@ -103,6 +103,10 @@ pkg_setup() {
python_prepare_all() {
distutils-r1_python_prepare_all
+ # Apply 2565d3a for bug 688902
+ sed -e 's|bintree = self._bintree|\0\n\t\t# Force reindex in case pkgdir-index-trusted is enabled.\n\t\tbintree._populate_local(reindex=True)\n\t\tbintree.populated = True|' \
+ -i lib/portage/emaint/modules/binhost/binhost.py || die
+
if use gentoo-dev; then
einfo "Disabling --dynamic-deps by default for gentoo-dev..."
sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \