diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.18-0004-bintree.py-do-not-pass-unicode-encoding-with-non-str.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.18-0004-bintree.py-do-not-pass-unicode-encoding-with-non-str.patch deleted file mode 100644 index 8f7009be67..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.18-0004-bintree.py-do-not-pass-unicode-encoding-with-non-str.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9b47840a394c098694943319fcfaab697cc4f9f5 Mon Sep 17 00:00:00 2001 -From: Michael Marineau -Date: Wed, 29 Apr 2015 19:08:05 -0700 -Subject: [PATCH 4/4] bintree.py: do not pass unicode encoding with non-string - type - -unicode() cannot specify an encoding when converting arbitrary objects -such as exceptions. Doing so results in a TypeError. - -Fixes commit 4496ee37d6fa327ada635c67500e82f830141a9e. - -X-Gentoo-Bug: 532784 -X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=532784 ---- - pym/portage/dbapi/bintree.py | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py -index cd30b67..aa4508b 100644 ---- a/pym/portage/dbapi/bintree.py -+++ b/pym/portage/dbapi/bintree.py -@@ -1030,8 +1030,7 @@ class binarytree(object): - # With Python 2, the EnvironmentError message may - # contain bytes or unicode, so use _unicode to ensure - # safety with all locales (bug #532784). -- writemsg("!!! %s\n\n" % _unicode(e, -- _encodings["stdio"], errors="replace")) -+ writemsg("!!! %s\n\n" % _unicode(e)) - del e - pkgindex = None - if proc is not None: --- -2.0.5 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.8-add-disabled.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.8-add-disabled.patch deleted file mode 100644 index 8be4f509ed..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.8-add-disabled.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit b2f0e82190e7343374f399d7b0246587ee945870 -Author: Alex Crawford -Date: Mon Apr 14 12:43:56 2014 -0700 - - Adding disabled attribute to repos.conf - - This flag allows a repos.conf file to disable a previously-defined repository. - -diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py -index 5e0d055..b8b3180 100644 ---- a/pym/portage/repository/config.py -+++ b/pym/portage/repository/config.py -@@ -78,8 +78,8 @@ class RepoConfig(object): - """Stores config of one repository""" - - __slots__ = ('aliases', 'allow_missing_manifest', 'allow_provide_virtual', -- 'cache_formats', 'create_manifest', 'disable_manifest', 'eapi', -- 'eclass_db', 'eclass_locations', 'eclass_overrides', -+ 'cache_formats', 'create_manifest', 'disabled', 'disable_manifest', -+ 'eapi', 'eclass_db', 'eclass_locations', 'eclass_overrides', - 'find_invalid_path_char', 'force', 'format', 'local_config', 'location', - 'main_repo', 'manifest_hashes', 'masters', 'missing_repo_name', - 'name', 'portage1_profiles', 'portage1_profiles_compat', 'priority', -@@ -173,6 +173,11 @@ class RepoConfig(object): - location = None - self.location = location - -+ disabled = repo_opts.get('disabled') -+ if disabled is not None: -+ disabled = disabled.strip().lower() == 'true' -+ self.disabled = disabled or False -+ - eapi = None - missing = True - self.name = name -@@ -633,7 +638,10 @@ class RepoConfigLoader(object): - # Do this before expanding aliases, so that location_map and - # treemap consistently map unaliased names whenever available. - for repo_name, repo in list(prepos.items()): -- if repo.location is None: -+ if repo.disabled: -+ del prepos[repo_name] -+ continue -+ elif repo.location is None: - if repo_name != 'DEFAULT': - # Skip this warning for repoman (bug #474578). - if settings.local_config and paths: diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.8-filter-eroot.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.8-filter-eroot.patch deleted file mode 100644 index 3264d2bf34..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.8-filter-eroot.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6e0d2f0b0be100c033edf3593fe327bca061f0db Mon Sep 17 00:00:00 2001 -From: Michael Marineau -Date: Sun, 20 Jul 2014 20:27:43 -0700 -Subject: [PATCH] environment: Filter EROOT for all EAPIs - -This variable is often defined in older EAPIs with "${EROOT:=$ROOT}" -but it should never be preserved since ROOT may change. Bug #490014 ---- - bin/phase-functions.sh | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh -index f39a024..3a62904 100644 ---- a/bin/phase-functions.sh -+++ b/bin/phase-functions.sh -@@ -101,10 +101,13 @@ __filter_readonly_variables() { - filtered_vars="$readonly_bash_vars $bash_misc_vars - $PORTAGE_READONLY_VARS $misc_garbage_vars" - -- # Don't filter/interfere with prefix variables unless they are -- # supported by the current EAPI. -+ # Always filter EROOT to ensure it is redefined based on ROOT -+ filtered_vars+=" EROOT" -+ -+ # Don't filter/interfere with the other prefix variables unless -+ # they are supported by the current EAPI. - if ___eapi_has_prefix_variables; then -- filtered_vars+=" ED EPREFIX EROOT" -+ filtered_vars+=" ED EPREFIX" - fi - - if has --filter-sandbox $* ; then --- -1.8.5.5 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.8-rebuild-in-correct-root.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.8-rebuild-in-correct-root.patch deleted file mode 100644 index b57b23da3d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.8-rebuild-in-correct-root.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=520112 -diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py -index a10297a..2d30966 100644 ---- a/pym/_emerge/depgraph.py -+++ b/pym/_emerge/depgraph.py -@@ -3496,13 +3496,13 @@ class depgraph(object): - a favorite list.""" - debug = "--debug" in self._frozen_config.myopts - onlydeps = "--onlydeps" in self._frozen_config.myopts -- myroot = self._frozen_config.target_root -- pkgsettings = self._frozen_config.pkgsettings[myroot] -- pprovideddict = pkgsettings.pprovideddict -- virtuals = pkgsettings.getvirtuals() - args = self._dynamic_config._initial_arg_list[:] - - for arg in self._expand_set_args(args, add_to_digraph=True): -+ myroot = arg.root_config.root -+ pkgsettings = self._frozen_config.pkgsettings[myroot] -+ pprovideddict = pkgsettings.pprovideddict -+ virtuals = pkgsettings.getvirtuals() - for atom in arg.pset.getAtoms(): - self._spinner_update() - dep = Dependency(atom=atom, onlydeps=onlydeps,