diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/gentoolkit/Manifest b/sdk_container/src/third_party/coreos-overlay/app-portage/gentoolkit/Manifest deleted file mode 100644 index 07da4f2253..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-portage/gentoolkit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gentoolkit-0.3.2.tar.gz 3198294 SHA256 f3bb38d663c1b153447556b5265df5a11b6ed78411e761335b692111c823d9dd SHA512 e174ac7f12d45703515876ea558a661e1d0c5d4cc71d2d64ee793786e2a2d3d2b309500b6e1891774e3415de74922efc77553c0103d695f5dda91def9a6ac637 WHIRLPOOL 67192702f72f437cc31aeeef8bf005c83a4a9322e9fa0de3c1e0d229bfb95d7363f14a8902da5ffbf49dee45cd587286899ea1ead017cd7d18d0f852cc7fd9fb diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/gentoolkit/files/0.3.2-fix-int-coercion.patch b/sdk_container/src/third_party/coreos-overlay/app-portage/gentoolkit/files/0.3.2-fix-int-coercion.patch deleted file mode 100644 index 204748a64d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-portage/gentoolkit/files/0.3.2-fix-int-coercion.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e07c6f2ea4963e6f9cdf6ee5eceaaf6f30319eda Mon Sep 17 00:00:00 2001 -From: David Michael -Date: Tue, 17 Jan 2017 13:20:43 -0800 -Subject: [PATCH] gentoolkit/glsa: Fix AttributeError from int coercion - ---- - pym/gentoolkit/glsa/__init__.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/pym/gentoolkit/glsa/__init__.py b/pym/gentoolkit/glsa/__init__.py -index ba1eed7..0ed539e 100644 ---- a/pym/gentoolkit/glsa/__init__.py -+++ b/pym/gentoolkit/glsa/__init__.py -@@ -567,6 +567,8 @@ class Glsa: - (self.revised, count) = self.revised.split(":") - else: - count = 1 -+ else: -+ count = count.value - - self.revised = format_date(self.revised) - --- -2.7.4 - diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/gentoolkit/files/0.3.2-helpers.py-589686.patch b/sdk_container/src/third_party/coreos-overlay/app-portage/gentoolkit/files/0.3.2-helpers.py-589686.patch deleted file mode 100644 index 282846c472..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-portage/gentoolkit/files/0.3.2-helpers.py-589686.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bc92540f8ce498e8305103619c7085b670ba19b1 Mon Sep 17 00:00:00 2001 -From: Paul Varner -Date: Mon, 25 Jul 2016 13:01:06 -0500 -Subject: Add missing import of io.open when using python2.7 - -This fixes the traceback when running equery changes with Python 2.7 - -X-Gentoo-bug: 589686 -X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=589686 ---- - pym/gentoolkit/helpers.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/pym/gentoolkit/helpers.py b/pym/gentoolkit/helpers.py -index 0d985b6..8d25393 100644 ---- a/pym/gentoolkit/helpers.py -+++ b/pym/gentoolkit/helpers.py -@@ -26,6 +26,9 @@ __docformat__ = 'epytext' - # ======= - - import os -+import sys -+if sys.hexversion < 0x3000000: -+ from io import open - import re - from functools import partial - from itertools import chain --- -cgit v0.12 - diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild deleted file mode 100644 index 96b5c11286..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="6" - -PYTHON_COMPAT=(python{2_7,3_4,3_5} pypy) -PYTHON_REQ_USE="xml(+),threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Collection of administration scripts for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" -SRC_URI="http://dev.gentoo.org/~dolsen/releases/gentoolkit/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -DEPEND="sys-apps/portage[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND} - !<=app-portage/gentoolkit-dev-0.2.7 - sys-apps/gawk - sys-apps/gentoo-functions" - -PATCHES=( - "${FILESDIR}"/${PV}-helpers.py-589686.patch - "${FILESDIR}"/${PV}-fix-int-coercion.patch -) - -python_prepare_all() { - python_setup - echo VERSION="${PVR}" "${PYTHON}" setup.py set_version - VERSION="${PVR}" "${PYTHON}" setup.py set_version - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - - # remove on Gentoo Prefix platforms where it's broken anyway - if use prefix; then - elog "The revdep-rebuild command is removed, the preserve-libs" - elog "feature of portage will handle issues." - rm "${ED}"/usr/bin/revdep-rebuild* - rm "${ED}"/usr/share/man/man1/revdep-rebuild.1 - rm -rf "${ED}"/etc/revdep-rebuild - rm -rf "${ED}"/var - fi -} - -pkg_postinst() { - # Create cache directory for revdep-rebuild - mkdir -p -m 0755 "${EROOT%/}"/var/cache - mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild - - # Only show the elog information on a new install - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog - elog "For further information on gentoolkit, please read the gentoolkit" - elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit" - elog - elog "Another alternative to equery is app-portage/portage-utils" - elog - elog "Additional tools that may be of interest:" - elog - elog " app-admin/eclean-kernel" - elog " app-portage/diffmask" - elog " app-portage/flaggie" - elog " app-portage/install-mask" - elog " app-portage/portpeek" - elog " app-portage/smart-live-rebuild" - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/gentoolkit/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-portage/gentoolkit/metadata.xml deleted file mode 100644 index 011e78ec74..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-portage/gentoolkit/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - tools-portage@gentoo.org - Gentoo Portage tools team - - -Gentoolkit is a collection of useful adminstration scripts particular to -the Gentoo Linux distribution. It contains rough drafts and -implementations of features that may in time make it into Portage, or -into full-fledged tools in their own right. - - diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-portage/gentoolkit-0.3.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-portage/gentoolkit-0.3.2-r1 deleted file mode 100644 index 4effa10822..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-portage/gentoolkit-0.3.2-r1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare test -DEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] -DESCRIPTION=Collection of administration scripts for Gentoo -EAPI=6 -HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools -IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 -KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !<=app-portage/gentoolkit-dev-0.2.7 sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] -REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) -SLOT=0 -SRC_URI=http://dev.gentoo.org/~dolsen/releases/gentoolkit/gentoolkit-0.3.2.tar.gz -_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25 -_md5_=14632264c91528bd0437c56ad47d3466