From fe57099ad3c1e2002a231f5028675d478751605f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 27 Sep 2018 22:49:44 -0700 Subject: [PATCH] sys-apps/portage: 2.3.50-r4 revbump for bug 666554 Bug: https://bugs.gentoo.org/666554 Signed-off-by: Zac Medico Package-Manager: Portage-2.3.50, Repoman-2.3.10 --- .../{portage-2.3.50-r3.ebuild => portage-2.3.50-r4.ebuild} | 4 ++++ 1 file changed, 4 insertions(+) rename sys-apps/portage/{portage-2.3.50-r3.ebuild => portage-2.3.50-r4.ebuild} (96%) diff --git a/sys-apps/portage/portage-2.3.50-r3.ebuild b/sys-apps/portage/portage-2.3.50-r4.ebuild similarity index 96% rename from sys-apps/portage/portage-2.3.50-r3.ebuild rename to sys-apps/portage/portage-2.3.50-r4.ebuild index 7bcdd43e5182..d710911faee7 100644 --- a/sys-apps/portage/portage-2.3.50-r3.ebuild +++ b/sys-apps/portage/portage-2.3.50-r4.ebuild @@ -109,6 +109,10 @@ python_prepare_all() { -e 's:set -- "${filtered_args\[@\]}":set -- "${!filtered_args[@]}":' \ -i bin/ecompress-file || die + # Apply b587fc874ce9 for bug 666554 + sed -e 's:yield self\._check_call(\['\''rsync'\'', '\''-a'\''.*:\0\n\t\t\t'\''--exclude=/distfiles'\'', '\''--exclude=/local'\'', '\''--exclude=/lost+found'\'', '\''--exclude=/packages'\'',:' \ + -i lib/portage/repository/storage/hardlink_quarantine.py || die + if use gentoo-dev; then einfo "Disabling --dynamic-deps by default for gentoo-dev..." sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ -- 2.26.2