From ec4b54c4b0406d7f259dae34876da0b77d19fe3a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 20 Nov 2018 20:53:16 -0800 Subject: [PATCH] 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 Closes: https://bugs.gentoo.org/671472 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Zac Medico --- .../{portage-2.3.52.ebuild => portage-2.3.52-r1.ebuild} | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) rename sys-apps/portage/{portage-2.3.52.ebuild => portage-2.3.52-r1.ebuild} (96%) 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 9fc9f28ea21ba..aaf1fd8969f3e 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":' \