From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1161092-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 903C0138239
for <garchives@archives.gentoo.org>; Sun, 12 Apr 2020 23:45:02 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C9C9EE086A;
Sun, 12 Apr 2020 23:45:01 +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 917B9E086A
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Apr 2020 23:45:01 +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 CC2CB34F104
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Apr 2020 23:44:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id AE3C4103
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Apr 2020 23:44:57 +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: <1586735085.01b0693dd0c5a8d20591cea805cbe4c4988585b7.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.99-r1.ebuild sys-apps/portage/portage-2.3.99.ebuild
X-VCS-Directories: sys-apps/portage/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 01b0693dd0c5a8d20591cea805cbe4c4988585b7
X-VCS-Branch: master
Date: Sun, 12 Apr 2020 23:44:57 +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: 5a7a7f30-86c3-48eb-ae1e-f1bb18a78b6c
X-Archives-Hash: 030257714e187e98334a38160613b169
commit: 01b0693dd0c5a8d20591cea805cbe4c4988585b7
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 23:40:37 2020 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 23:44:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01b0693d
sys-apps/portage: 2.3.99-r1 revbump for bug 700830
#700830 fix ENV_UNSET for DISPLAY variable
Bug: https://bugs.gentoo.org/711148
Bug: https://bugs.gentoo.org/700830
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
sys-apps/portage/{portage-2.3.99.ebuild => portage-2.3.99-r1.ebuild} | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sys-apps/portage/portage-2.3.99.ebuild b/sys-apps/portage/portage-2.3.99-r1.ebuild
similarity index 97%
rename from sys-apps/portage/portage-2.3.99.ebuild
rename to sys-apps/portage/portage-2.3.99-r1.ebuild
index 5d75a62bf45..2b801329cf6 100644
--- a/sys-apps/portage/portage-2.3.99.ebuild
+++ b/sys-apps/portage/portage-2.3.99-r1.ebuild
@@ -89,6 +89,9 @@ pkg_pretend() {
python_prepare_all() {
distutils-r1_python_prepare_all
+ # Apply 03efd1125214
+ sed -e '50s|"EMERGE_FROM", "EPREFIX",|"EMERGE_FROM", "ENV_UNSET", "EPREFIX",|' -i lib/portage/package/ebuild/_config/special_env_vars.py || die
+
sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
if use gentoo-dev; then