From f733d528945231f315cfeff266a4bdae01638d3f Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 25 Mar 2016 18:11:39 -0700 Subject: [PATCH] portage: apply coreos patches to 2.2.28, stabilize New in this version: ship an empty repos.conf since having the gentoo repo defined raises warnings despite our patch to disable it. This seems like a better path forward since upstream never accepted our patch. Later once our configs/scripts are transitioned away from explicitly disabling the gentoo repo we can drop the patch. --- .../sys-apps/portage/portage-2.2.28.ebuild | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.2.28.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.2.28.ebuild index 5aeb48116b..3cf9569812 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.2.28.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.2.28.ebuild @@ -17,7 +17,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" SLOT="0" IUSE="build doc epydoc +ipc linguas_ru selinux xattr" @@ -78,6 +78,12 @@ TARBALL_PV=${PV} SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" +PATCHES=( + "${FILESDIR}/${PN}-2.2.18-0001-portage-repository-config.py-add-disabled-attribute-.patch" + "${FILESDIR}/${PN}-2.2.18-0002-environment-Filter-EROOT-for-all-EAPIs.patch" + "${FILESDIR}/${PN}-2.2.18-0003-depgraph-ensure-slot-rebuilds-happen-in-the-correct-.patch" +) + pkg_setup() { use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) } @@ -85,6 +91,9 @@ 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 + if ! use ipc ; then einfo "Disabling ipc..." sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \