diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/Manifest b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/Manifest index af04c94753..08bf8c5a57 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/Manifest @@ -1,4 +1,2 @@ -DIST gentoolkit-0.4.6.tar.gz 3205641 BLAKE2B 7da91a313c8a9263eb7b4abd6207ece9dd602a5069a87f1e78ada13fc9f396e1f2afddaf0637c473445034cf57b5ca7631e209361a88fa3892d302b20f4cc986 SHA512 3aa3c9af7e994313400607943b9090fd813227ddd6d550b50fbcf7eeb4053da8bcdb41c9ef2579d957d2f279fdcc4e2f2ceca1091c5fd457df4204dd11792d6e -DIST gentoolkit-0.4.7.tar.gz 3205669 BLAKE2B e5f64b85546bc10ad16e7fa42d288965539177375e8796b40df699859efa13fb98bb86aec58e60363c955b2d5e4b2e6379a7597252ee4fdbeec49559de67b328 SHA512 0fab600b4323d23e12009eeb4ade595950880a88b05bcfbfeada1a9b9af615b96d31c568285629bf6e5de7b45ed857bdf98b6261dc54974fbaf70c924e093c76 -DIST gentoolkit-0.4.8.tar.gz 3206070 BLAKE2B 7f689ae85136827b8af50401165ccd44bc824e12bec43dad786c7221ec78ee3c1f14d538d197e277a2fedc23f570440f4ec7c0cc707a146814315ff6de48c115 SHA512 689b4229c5d2b6f4440b7d3d57e4b9be5265eead53737890c17dbd0510df287f5c19f86b924735d4ad146d1a500c59a15869b718cbf805b894b0bf115b69f838 DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B a379dcbbaba9d52c241fea020b87c458384e44092539947909e14fd6c63fd9cc06d076b8081874edf17fc50e80fe48ceab3400c90046867dc409e7ac39c17231 SHA512 8a5c344f3a17c4c779abbcaa35b5e3f147106dbc61310d0d1a816ec8080914271fa45c311a8feeb1bfe14195af7cf34c0b29142d6e43e2de232dae96fbd00861 +DIST gentoolkit-0.5.1.tar.gz 3203805 BLAKE2B de2cd69aec9be79f498b1180a90afb54e77f9d8a47636cd722f2028a906d43874132d55a71bf373b3d10c7c10034f5d8ce0280a35041b0c60a1d5aa2ed6296a1 SHA512 667e464853b17ae297c59fb06e8f4563119a1382470d064c5721ae898e61173e9af5b071c7618d315232e6974fec205e27559785d2816253711de3e83d9e1911 diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild deleted file mode 100644 index 34ae357f65..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) -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="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -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" - -DEPEND=" - sys-apps/portage[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND} - sys-apps/gawk - sys-apps/gentoo-functions" - -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 -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.4.0"; then - SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1 - 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 - - if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then - elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now" - elog "part of the gentoolkit package." - elog "The gentoolkit-dev package is now deprecated in favor of a single" - elog "gentoolkit package. The remaining tools from gentoolkit-dev" - elog "are now obsolete/unused with the git based tree." - fi - - # 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/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild deleted file mode 100644 index d2a61bf8f6..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) -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="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -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" - -DEPEND=" - sys-apps/portage[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND} - sys-apps/gawk - sys-apps/gentoo-functions" - -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 -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.4.0"; then - SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1 - 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 - - if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then - elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now" - elog "part of the gentoolkit package." - elog "The gentoolkit-dev package is now deprecated in favor of a single" - elog "gentoolkit package. The remaining tools from gentoolkit-dev" - elog "are now obsolete/unused with the git based tree." - fi - - # 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/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild similarity index 80% rename from sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild rename to sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild index 77fdfb33cf..436222faf8 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 ) +PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) PYTHON_REQ_USE="xml(+),threads(+)" -inherit distutils-r1 +inherit distutils-r1 tmpfiles DESCRIPTION="Collection of administration scripts for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" @@ -17,7 +17,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="" -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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" DEPEND=" sys-apps/portage[${PYTHON_USEDEP}]" @@ -37,6 +37,13 @@ python_prepare_all() { echo VERSION="${PVR}" "${PYTHON}" setup.py set_version VERSION="${PVR}" "${PYTHON}" setup.py set_version distutils-r1_python_prepare_all + + if use prefix-guest ; then + # use correct repo name, bug #632223 + sed -i \ + -e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \ + pym/gentoolkit/profile.py || die + fi } pkg_preinst() { @@ -46,9 +53,7 @@ pkg_preinst() { } pkg_postinst() { - # Create cache directory for revdep-rebuild - mkdir -p -m 0755 "${EROOT}"/var/cache - mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild + tmpfiles_process revdep-rebuild.conf if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now" @@ -71,7 +76,6 @@ pkg_postinst() { 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/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild similarity index 50% rename from sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild rename to sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild index 3c9347c0e9..bb95e6309c 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild @@ -1,23 +1,27 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{7..10} pypy3 ) PYTHON_REQ_USE="xml(+),threads(+)" -inherit distutils-r1 +inherit distutils-r1 tmpfiles + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git" + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi DESCRIPTION="Collection of administration scripts for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" -SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -IUSE="" - -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" DEPEND=" sys-apps/portage[${PYTHON_USEDEP}]" @@ -25,35 +29,24 @@ RDEPEND="${DEPEND} sys-apps/gawk sys-apps/gentoo-functions" +distutils_enable_tests setup.py + 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 -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.4.0"; then - SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1 + if use prefix-guest ; then + # use correct repo name, bug #632223 + sed -i \ + -e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \ + pym/gentoolkit/profile.py || die 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 - - if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then - elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now" - elog "part of the gentoolkit package." - elog "The gentoolkit-dev package is now deprecated in favor of a single" - elog "gentoolkit package. The remaining tools from gentoolkit-dev" - elog "are now obsolete/unused with the git based tree." - fi + tmpfiles_process revdep-rebuild.conf # Only show the elog information on a new install if [[ ! ${REPLACING_VERSIONS} ]]; then @@ -68,7 +61,6 @@ pkg_postinst() { 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/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild index 983d63f9d3..db0fa476bf 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild @@ -1,24 +1,27 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 ) +PYTHON_COMPAT=( python3_{7..10} pypy3 ) PYTHON_REQ_USE="xml(+),threads(+)" -EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git" -inherit distutils-r1 git-r3 +inherit distutils-r1 tmpfiles + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git" + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi DESCRIPTION="Collection of administration scripts for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" -SRC_URI="" LICENSE="GPL-2" SLOT="0" -IUSE="" - -KEYWORDS="" DEPEND=" sys-apps/portage[${PYTHON_USEDEP}]" @@ -33,26 +36,17 @@ python_prepare_all() { echo VERSION="${PVR}" "${PYTHON}" setup.py set_version VERSION="${PVR}" "${PYTHON}" setup.py set_version distutils-r1_python_prepare_all -} -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.4.0"; then - SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1 + if use prefix-guest ; then + # use correct repo name, bug #632223 + sed -i \ + -e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \ + pym/gentoolkit/profile.py || die 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 - - if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then - elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now" - elog "part of the gentoolkit package." - elog "The gentoolkit-dev package is now deprecated in favor of a single" - elog "gentoolkit package. The remaining tools from gentoolkit-dev" - elog "are now obsolete/unused with the git based tree." - fi + tmpfiles_process revdep-rebuild.conf # Only show the elog information on a new install if [[ ! ${REPLACING_VERSIONS} ]]; then @@ -67,7 +61,6 @@ pkg_postinst() { 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/portage-stable/app-portage/gentoolkit/metadata.xml b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/metadata.xml index 011e78ec74..38eac3c59b 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/metadata.xml @@ -1,5 +1,5 @@ - + tools-portage@gentoo.org