From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1155735-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 A061A138350
for <garchives@archives.gentoo.org>; Wed, 25 Mar 2020 19:26:38 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7F2C1E0D8F;
Wed, 25 Mar 2020 19:26:37 +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 60E0BE0D8F
for <gentoo-commits@lists.gentoo.org>; Wed, 25 Mar 2020 19:26:37 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 BDF6E34F95C
for <gentoo-commits@lists.gentoo.org>; Wed, 25 Mar 2020 19:26:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 50A2D186
for <gentoo-commits@lists.gentoo.org>; Wed, 25 Mar 2020 19:26:33 +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: <1585164253.ab3a65311eaae2242a5b04d06daec7daea90e5da.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.96-r1.ebuild sys-apps/portage/portage-2.3.96.ebuild
X-VCS-Directories: sys-apps/portage/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: ab3a65311eaae2242a5b04d06daec7daea90e5da
X-VCS-Branch: master
Date: Wed, 25 Mar 2020 19:26:33 +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: 22d77eb7-d915-493c-b6ec-45c34e906a50
X-Archives-Hash: 3a2537f461faf255454b51cf4a795980
commit: ab3a65311eaae2242a5b04d06daec7daea90e5da
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 19:23:25 2020 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 19:24:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab3a6531
sys-apps/portage: Revbump to 2.3.96-r1
This applies a small fixup to the changes for bug 714480.
Bug: https://bugs.gentoo.org/711148
Bug: https://bugs.gentoo.org/714480
See: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2b3fc2be07ad897b7df6b77f79616c143a353275
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
sys-apps/portage/{portage-2.3.96.ebuild => portage-2.3.96-r1.ebuild} | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sys-apps/portage/portage-2.3.96.ebuild b/sys-apps/portage/portage-2.3.96-r1.ebuild
similarity index 98%
rename from sys-apps/portage/portage-2.3.96.ebuild
rename to sys-apps/portage/portage-2.3.96-r1.ebuild
index 1e0dc18322b..3c6d08531c7 100644
--- a/sys-apps/portage/portage-2.3.96.ebuild
+++ b/sys-apps/portage/portage-2.3.96-r1.ebuild
@@ -97,6 +97,9 @@ pkg_pretend() {
python_prepare_all() {
distutils-r1_python_prepare_all
+ # Apply 2b3fc2be07ad
+ sed -e '422s/return True/return (True, None)/' -i lib/portage/locks.py || die
+
sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
if use gentoo-dev; then