From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1139948-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 DA551138350
for <garchives@archives.gentoo.org>; Thu, 23 Jan 2020 21:11:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DD539E0AEA;
Thu, 23 Jan 2020 21:11:29 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 AECFEE0AEA
for <gentoo-commits@lists.gentoo.org>; Thu, 23 Jan 2020 21:11:29 +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 20C4834E441
for <gentoo-commits@lists.gentoo.org>; Thu, 23 Jan 2020 21:11:27 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FCF23E
for <gentoo-commits@lists.gentoo.org>; Thu, 23 Jan 2020 21:11:24 +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: <1579813873.112cea7e7269625c68fee63c27ab0c80ff35ad03.zmedico@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-apps/portage/Manifest sys-apps/portage/portage-2.3.85-r1.ebuild sys-apps/portage/portage-2.3.85.ebuild
X-VCS-Directories: sys-apps/portage/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 112cea7e7269625c68fee63c27ab0c80ff35ad03
X-VCS-Branch: master
Date: Thu, 23 Jan 2020 21:11:24 +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: a4249f0f-1731-459e-b908-ad4920c14455
X-Archives-Hash: 52c9c72a91e469b889dd85e4726673d5
commit: 112cea7e7269625c68fee63c27ab0c80ff35ad03
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 23 21:06:43 2020 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 21:11:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=112cea7e
sys-apps/portage: 2.3.85-r1 revbump for bug 706186
Closes: https://bugs.gentoo.org/706186
Bug: https://bugs.gentoo.org/706142
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
sys-apps/portage/Manifest | 1 +
.../portage/{portage-2.3.85.ebuild => portage-2.3.85-r1.ebuild} | 9 +++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index fc2bc630ddf..b9d77ebd50c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,5 @@
DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e SHA512 20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
DIST portage-2.3.79.tar.bz2 1038675 BLAKE2B 7a6cff28fa1d4b54607e9416914ab534d250718b082a9789a36be057933867a8a3befd7c99d404b058f67b92c6ee975323c37251fe89d3e3e46865daf0fea25e SHA512 23101644185fb7c6eff12f015d442599b3af744f7b13dcb630f47a7f27c1392c46bd4aa5fa32d403dcf058cc3cc1d56cef00fd8c34dda811388eb268761c0797
DIST portage-2.3.84.tar.bz2 1043069 BLAKE2B 85ccc209011ef5206e0aaf768ec0276449f5a691f62f8dd65b812b6a285030796180acce89e9f2c8ae05fe4f59505133535f0374bf076846f819477d0a62d231 SHA512 49797ded65091ea7450f3c37e4ca1efb4205bc67e873295b5060ee6d39c1c63313fc1caa8c2f6c7afa6b352cef6d7ef04b8371c66a3ade05ac734b46f807bfd7
+DIST portage-2.3.85-bug-706186.patch 2603 BLAKE2B 6a7d236594a01514dab4fcffaec16542f1334ba8c4f14ab2e01ebed2fb1bfbdf291863132a6726cd7968bd713894970418384307aac003208dd73a50d39a67a6 SHA512 00bd251d3df04f88dc676bdda933a12534bd2d6399b588014a5bc13bf73d5b321e0635ba31083df5c47675e98644e55a1f1fec2f5a7aad86cb6c5375fc642fa7
DIST portage-2.3.85.tar.bz2 1046025 BLAKE2B 721999b1200b69d2fd3fdd8f4690859f44e6796bdbef1636a80f09ff7625cdff437d183b4e3bdb7d4455b4da9f067adf199106c6b7bdf9b0d5d5ae7a30c7ce03 SHA512 f42f6d87df0bde5e143b7c8b901556c325b9f8250131db400543b54040eb931f9b541ad8211b35942c4bbd99fcfdea6ead93459e57b03173f5bcb37e64a85304
diff --git a/sys-apps/portage/portage-2.3.85.ebuild b/sys-apps/portage/portage-2.3.85-r1.ebuild
similarity index 95%
rename from sys-apps/portage/portage-2.3.85.ebuild
rename to sys-apps/portage/portage-2.3.85-r1.ebuild
index e5d1c88a69c..b99c3df60e6 100644
--- a/sys-apps/portage/portage-2.3.85.ebuild
+++ b/sys-apps/portage/portage-2.3.85-r1.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=(
)
PYTHON_REQ_USE='bzip2(+),threads(+)'
-inherit distutils-r1 linux-info systemd prefix
+inherit distutils-r1 epatch linux-info systemd prefix
DESCRIPTION="Portage is the package management and distribution system for Gentoo"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
@@ -93,7 +93,8 @@ prefix_src_archives() {
TARBALL_PV=${PV}
SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
- $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+ https://github.com/gentoo/portage/commit/27d653052549e5d1880ab68be12f3b82857506fe.patch -> ${P}-bug-706186.patch"
pkg_pretend() {
local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
@@ -108,6 +109,10 @@ pkg_setup() {
python_prepare_all() {
distutils-r1_python_prepare_all
+ # Omit hunk for the unit test which is not included in this source tree.
+ head -n 52 "${DISTDIR}/${P}-bug-706186.patch" > "${WORKDIR}/${P}-bug-706186.patch" || die
+ epatch "${WORKDIR}/${P}-bug-706186.patch"
+
if use gentoo-dev; then
einfo "Disabling --dynamic-deps by default for gentoo-dev..."
sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \