From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 07220138334 for ; Wed, 21 Nov 2018 05:05:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CBBE9E0924; Wed, 21 Nov 2018 05:05:15 +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 A46AFE0924 for ; Wed, 21 Nov 2018 05:05:15 +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 83AEC335C8C for ; Wed, 21 Nov 2018 05:05:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D9C8474 for ; Wed, 21 Nov 2018 05:05:11 +0000 (UTC) From: "Zac Medico" 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" Message-ID: <1542776695.ec4b54c4b0406d7f259dae34876da0b77d19fe3a.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.52-r1.ebuild sys-apps/portage/portage-2.3.52.ebuild X-VCS-Directories: sys-apps/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ec4b54c4b0406d7f259dae34876da0b77d19fe3a X-VCS-Branch: master Date: Wed, 21 Nov 2018 05:05:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 70dbe530-c81c-430c-a140-fccbd289313f X-Archives-Hash: 2f729b11948709296aa11758bba427c0 commit: ec4b54c4b0406d7f259dae34876da0b77d19fe3a Author: Zac Medico gentoo org> AuthorDate: Wed Nov 21 04:53:16 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Nov 21 05:04:55 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec4b54c4 sys-apps/portage: revbump to 2.3.52-r1 for bug 671472 Add trivial fix for an annoying regression in handling of broken ebuilds. Reported-by: Reinis Danne gmail.com> Closes: https://bugs.gentoo.org/671472 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Zac Medico gentoo.org> .../portage/{portage-2.3.52.ebuild => portage-2.3.52-r1.ebuild} | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys-apps/portage/portage-2.3.52.ebuild b/sys-apps/portage/portage-2.3.52-r1.ebuild similarity index 96% rename from sys-apps/portage/portage-2.3.52.ebuild rename to sys-apps/portage/portage-2.3.52-r1.ebuild index 9fc9f28ea21..aaf1fd8969f 100644 --- a/sys-apps/portage/portage-2.3.52.ebuild +++ b/sys-apps/portage/portage-2.3.52-r1.ebuild @@ -10,7 +10,7 @@ PYTHON_COMPAT=( ) PYTHON_REQ_USE='bzip2(+),threads(+)' -inherit distutils-r1 systemd +inherit distutils-r1 epatch systemd DESCRIPTION="Portage is the package management and distribution system for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" @@ -86,7 +86,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/74d2509c99fbcb43e018ead4950b938e41e524e5.patch -> portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch" pkg_setup() { use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) @@ -95,6 +96,8 @@ pkg_setup() { python_prepare_all() { distutils-r1_python_prepare_all + epatch "${DISTDIR}/portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch" + if use gentoo-dev; then einfo "Disabling --dynamic-deps by default for gentoo-dev..." sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \