From 2e86b680f289925efe40e05a8a7bd6017665f2a5 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 28 Jun 2018 17:49:39 +0000 Subject: [PATCH] sys-apps/portage: Apply CoreOS changes Disable the rsync-verify flag to avoid pulling new dependencies, and apply our patch set. --- .../sys-apps/portage/portage-2.3.40-r1.ebuild | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.3.40-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.3.40-r1.ebuild index ac3cb5f359..6aae60e475 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.3.40-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.3.40-r1.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd" SLOT="0" -IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" +IUSE="build doc epydoc gentoo-dev +ipc +native-extensions rsync-verify selinux xattr" DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) >=app-arch/tar-1.27 @@ -96,6 +96,15 @@ pkg_setup() { python_prepare_all() { distutils-r1_python_prepare_all + # CoreOS does not use the gentoo repo, silence oodles of errors about it: + echo "# no defaults, configuration is in /etc" > cnf/repos.conf + # upstream bug: https://bugs.gentoo.org/507284 + epatch "${FILESDIR}/${PN}-2.3.8-0001-portage-repository-config.py-add-disabled-attribute-.patch" + # upstream bug: https://bugs.gentoo.org/490014 + epatch "${FILESDIR}/${PN}-2.2.18-0002-environment-Filter-EROOT-for-all-EAPIs.patch" + # upstream bug: + epatch "${FILESDIR}/${PN}-2.2.18-0003-depgraph-ensure-slot-rebuilds-happen-in-the-correct-.patch" + epatch "${DISTDIR}/${P}-bug-656942-bug-657436-937d0156aa06.patch" \ "${DISTDIR}/${P}-bug-657436-937d0156aa06-1fc628eead43.patch"