From 6848f95797eba82703ad5b323f7936aacf1575eb Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 18 Aug 2021 15:45:29 +0200 Subject: [PATCH 1/4] app-portage/repoman: delete repoman Delete deprecated ebuild that was pulled in by coreos-devel/sdk-extras. --- .../app-portage/repoman/Manifest | 1 - .../app-portage/repoman/README.md | 3 - .../app-portage/repoman/metadata.xml | 12 ---- .../app-portage/repoman/repoman-3.0.2.ebuild | 68 ------------------- 4 files changed, 84 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-portage/repoman/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-portage/repoman/README.md delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-portage/repoman/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-portage/repoman/repoman-3.0.2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/Manifest b/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/Manifest deleted file mode 100644 index 025020f048..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST repoman-3.0.2.tar.bz2 88258 BLAKE2B 32c4d6750fd225cf9fc071be0ffbb38563ffdaf50f1f1ac7247ce3733bd781cd699052101df8b6565fd3d32ec6d9a54efb611b815a722b7954d8100ce01de146 SHA512 fd5b4549a0b108ed1ad37fc0766fc73db127bba8b023a74566ee0167e2a9c56c8597b83ead16522aaf84f158a9a5d0d59e4b5bcc908e6024724c087c837e1fa2 diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/README.md b/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/README.md deleted file mode 100644 index 351e18bd81..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This is a fork of app-portage/repoman package. The sole reason for -having it here is to drop support for python 3.8 and 3.9 we haven't -yet packaged. diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/metadata.xml deleted file mode 100644 index c15cfac453..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - mailto:dev-portage@gentoo.org - https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES - https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage - - - dev-portage@gentoo.org - - diff --git a/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/repoman-3.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/repoman-3.0.2.ebuild deleted file mode 100644 index aaa858d88f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-portage/repoman/repoman-3.0.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Flatcar: Based on repoman-3.0.2.ebuild from commit -# 375d601ca5d48a81a2d03d62853fc7b7085f8210 in Gentoo repo (see -# https://gitweb.gentoo.org/repo/gentoo.git/plain/app-portage/repoman/repoman-3.0.2.ebuild?id=375d601ca5d48a81a2d03d62853fc7b7085f8210). - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{6..7} pypy3 ) -PYTHON_REQ_USE='bzip2(+)' - -inherit distutils-r1 - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git" - S="${WORKDIR}/${P}/repoman" -else - SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -RDEPEND=" - >=sys-apps/portage-3.0.4[${PYTHON_USEDEP}] - >=dev-python/lxml-3.6.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -python_test() { - esetup.py test -} - -python_install() { - # Install sbin scripts to bindir for python-exec linking - # they will be relocated in pkg_preinst() - distutils-r1_python_install \ - --system-prefix="${EPREFIX}/usr" \ - --bindir="$(python_get_scriptdir)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --sbindir="$(python_get_scriptdir)" \ - --sysconfdir="${EPREFIX}/etc" \ - "${@}" -} - -pkg_postinst() { - if [[ -z {REPLACING_VERSIONS} ]]; then - elog "" - elog "This release of repoman is from the new portage/repoman split" - elog "release code base." - elog "This new repoman code base is still being developed. So its API's" - elog "are not to be considered stable and are subject to change." - elog "The code released has been tested and considered ready for use." - elog "This however does not guarantee it to be completely bug free." - elog "Please report any bugs you may encounter." - elog "" - fi -} From 63745e2a954e5a30ff5994445125f634e53b916b Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 19 Aug 2021 09:44:25 +0200 Subject: [PATCH 2/4] coreos-base/hard-host-depends: remove obsolete comments Now that coreos-devel/sdk-extras are deleted, we do not need to keep obsolete comments about sdk-extras. --- .../coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index 1bf5733ba7..3c4ac52817 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -109,7 +109,6 @@ RDEPEND="${RDEPEND} " # Host dependencies for running pylint within the chroot -# TODO: move to sdk-extras RDEPEND="${RDEPEND} dev-python/pylint " From 1aaee6d3c039a4b567921ea3763dad8aa519e132 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 18 Aug 2021 15:57:40 +0200 Subject: [PATCH 3/4] profiles: clean up unnecessary configs Now that coreos-devel/sdk-extras are gone, delete unnecessary configs in profiles, for app-portage/repoman, dev-go/glide, dev-go/godep, dev-python/awscli, dev-python/botocore, dev-python/s3transfer. --- .../coreos-overlay/profiles/coreos/base/package.use | 1 - .../profiles/coreos/targets/sdk/package.accept_keywords | 9 --------- 2 files changed, 10 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index 99e79d65e0..cc4fa1f843 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -18,7 +18,6 @@ app-emulation/qemu aio caps curl ncurses png python threads uuid vhost-net virtf # python3 problems app-portage/gentoolkit python_single_target_python3_6 -app-portage/repoman python_single_target_python3_6 sys-apps/portage python_single_target_python3_6 # python3 only diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords index e7e4dede9a..0d3ddd099f 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords @@ -1,16 +1,7 @@ -# aws cli; handy for developer usage when working with kola -dev-python/awscli ~amd64 -dev-python/s3transfer ~amd64 -dev-python/botocore ~amd64 - # Accept unstable host Rust compilers dev-lang/rust ~amd64 virtual/cargo ~amd64 virtual/rust ~amd64 -# Accept go utilities -dev-go/glide ~amd64 -dev-go/godep ~amd64 - # Accept perl libs required to build >=samba-4.12 dev-perl/Parse-Yapp ~amd64 ~arm64 From 44ea3e801a09fbe9e4d099ac705341d1525a49b6 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 18 Aug 2021 15:27:25 +0200 Subject: [PATCH 4/4] coreos-devel/sdk-extras: delete sdk-extras Apparently the `coreos-devel/sdk-extras` was originally meant to work as a meta package to pull in all the optional packages in the SDK at once. It has been unmaintained since 2~3 years, so an attempt of `emerge coreos-devel/sdk-extras` will give you a huge list of conflicts to resolve. It is difficult to resurrect sdk-extras at the moment. Delete `coreos-devel/sdk-extras` completely. Doing that, we can delete more than 20 other packages from the source tree. --- .../sdk-extras/sdk-extras-0.0.1-r5.ebuild | 1 - .../sdk-extras/sdk-extras-0.0.1.ebuild | 38 ------------------- 2 files changed, 39 deletions(-) delete mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1-r5.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1-r5.ebuild deleted file mode 120000 index 4e0907d789..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1-r5.ebuild +++ /dev/null @@ -1 +0,0 @@ -sdk-extras-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1.ebuild deleted file mode 100644 index dede7f2605..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2017 The CoreOS Authors -# Distributed under the terms of the GNU General Public License v2 - -# This isn't meant to be installed directly. It mostly exists so we can better keep track of -# dependencies within the SDK. - -EAPI=5 - -DESCRIPTION="Meta ebuild for everything that isn't needed in the SDK, but might be useful" -HOMEPAGE="http://coreos.com/docs/sdk/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -RDEPEND=" - app-admin/python-updater - app-crypt/efitools - app-crypt/tpm-tools - app-editors/emacs - app-editors/nano - app-portage/eix - app-portage/gentoolkit-dev - app-portage/repoman - app-misc/screen - app-misc/tmux - app-text/tree - app-text/dos2unix - dev-util/cscope - dev-util/strace - dev-util/valgrind - dev-go/glide - dev-go/godep - dev-python/awscli - sys-apps/ed -"