gentoo auto-resync : 11:07:2022 - 01:28:44

4 files changed, 124 insertions, 3 deletions

diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index dd6938723e89..585916fa6d92 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,8 +1,11 @@
 AUX gentoolkit-0.5.0-python3_9.patch 1425 BLAKE2B 51663e01d48f6f192cfe96972c584337e62495d553251ffe360c4e928e208d528b453faefeb3c2d1641c9e662151b8ba91ebb7f1ec6b3a2c67fcb18eaefe3495 SHA512 327ff6d6aa77293f7bff3be6e543e3bb1b4fcf226d3e913668c69fdb9de2d2e04a73d9e73526910ae4e2c3b0bce3f87249cb31d55928b58a9c4274b97525e9d3
 AUX gentoolkit-0.5.0-r1-python3_9.patch 1220 BLAKE2B ce01d9a8cdd214d585b0e4ee61ce21aba2880deb76c666f6a0fd5833d340a24b741be68e6923a942353d53ad0c4d66014290548d52fe76bad4cc0069b6322d29 SHA512 19ab5bd0bd76571106e12f361ef41a7eb4fb573afe5e5d61c547e4df1d2697c80db8307623edbdffcdaee9472ab56c1b61e133cfbf3845b174a10f4e7aec7d44
+AUX gentoolkit-0.6.1-data_files.patch 1157 BLAKE2B 1b6bebcc9de77532df7f3eef8e19cb82ed011e36eb20e8dc7f0fcaaabf856c7845cf3c46722c947b8235e3745e2754f227ac02f7ca48ed14af5aa0c4ff7ae906 SHA512 309d36852d4b631cb8767b85059a33f430021598b83fd26cffbddf4ce6487f10a8588ccd835335c48b62ebfd36ddf5f6cf6bc0cc980192f7ceaea90991089891
 DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B a379dcbbaba9d52c241fea020b87c458384e44092539947909e14fd6c63fd9cc06d076b8081874edf17fc50e80fe48ceab3400c90046867dc409e7ac39c17231 SHA512 8a5c344f3a17c4c779abbcaa35b5e3f147106dbc61310d0d1a816ec8080914271fa45c311a8feeb1bfe14195af7cf34c0b29142d6e43e2de232dae96fbd00861
 DIST gentoolkit-0.5.1.tar.gz 3203805 BLAKE2B de2cd69aec9be79f498b1180a90afb54e77f9d8a47636cd722f2028a906d43874132d55a71bf373b3d10c7c10034f5d8ce0280a35041b0c60a1d5aa2ed6296a1 SHA512 667e464853b17ae297c59fb06e8f4563119a1382470d064c5721ae898e61173e9af5b071c7618d315232e6974fec205e27559785d2816253711de3e83d9e1911
+DIST gentoolkit-0.6.1.tar.gz 3195781 BLAKE2B 27e370de77586b375dc70caa1abba4c2bc4207e8f08e0a7ea2953097135506949db71ff9102a0ead198e4dea425440c57b94ac7a811ca2d5e0016fc7e234bb0d SHA512 1ffc466b69a9c53f1bbd40f6f4d1eb33d5f0f4287bb65ba1a7b1b2675ad61ecffa55ed9fda7c1ae8148744f0a77e224315eb1903dfd61a2a3dab1600fc672d2d
 EBUILD gentoolkit-0.5.0-r3.ebuild 2400 BLAKE2B 8c3aaeb7089a3223ec1df18aea05eb0b69da3e95ce10d8f2bab23e1047ca5c0bfe71db5a5f3ad3293d5f1c6f33b10e79b15d0af5c2fe12d5c04c97129ae04019 SHA512 33e37394f2204bfe15f113c907067337e6393aec7293ad4002e846c6e984373b98c1fe2188097898604cf39e6e164dfc8e167372e3a651cd6f5f3b737bad388e
 EBUILD gentoolkit-0.5.1-r1.ebuild 1934 BLAKE2B fdb476e07a1830dbfad24ef9f253c549fea39dab50c9b170f995c25880177e8d710c42ba46869cf2dde69ee85a9ab64f4b46642828e53841f61394c60612e04f SHA512 4bdd8c774fbe5d3114a0aa35eab1b040f679834d57bfd5dc64a6f6402a62fbc82b36420f909aa7d560e87a389f899a5d8884a46241669cfa5da1e81bbcda58e5
-EBUILD gentoolkit-9999.ebuild 1942 BLAKE2B 29d7221abfbfb9f0533e405bfd31d8d8e3bc0bd2fb5a7585b091a01c8593c2ebfdde062bf1b578c64e7b892783d792058ff79475ea2de8453ae07a72e7e8ea1e SHA512 9ff52aa6e155eed979ea825a6cb791a75c4ea935413101471e6598c0e5057e8731257d83ef6832b7a60fd34f4c3464c5aeee1e2cb9901c6b4f43c39c4b1116cc
+EBUILD gentoolkit-0.6.1-r1.ebuild 2002 BLAKE2B 072b00a9d054576e31c2eb1dbfcc423140c98a7d70f1d34e2d553093046d0c08c9c8c7cda62184a0f2620ef2de445f3879ea5ced2f9a4f715d8182bc45db2d14 SHA512 7f932628d82010f5bec3756127946ed00c7295daf6efa5484c6edf3f7aeb79dcdd71911fca3a132bb23abc2051eca07663a751bb49b96516b4a541884d1cdf28
+EBUILD gentoolkit-9999.ebuild 1940 BLAKE2B 76b9d10079ce996932ec1ca540d4be0ac4ecc97d5ebd2363e46490c87f0cf7834e936f21c2116d0da7e612ffdb59ee6cd0f3d8c28170789cc6ccdfa7398fde49 SHA512 e2c5272fa77c50779e98b4789fc1bc349bdcb2704b82d899adaa8b8ace72091d510465b0d2ce2dc4541c1a411fd27182a984f255e4dc964974d0bb5053873cb6
 MISC metadata.xml 559 BLAKE2B bbd703786a8eee12a1dbdac88476a3444622841918bcb3011c77b444bff3f650c6f5fb6c6c9ca053f3d85d16aa7fbb7e617bae79eb95fe4b17569b26726e6859 SHA512 a4788b331c6fd201abfdfc5500f4f055bf3e75d7cce9cf25528559aa3eeb9c763c9c72cfb88b774f93b2c5e0ba7be8ca55f8d2337701e517e70f4ef04a618a62
diff --git a/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch b/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch
new file mode 100644
index 000000000000..8039864d69f9
--- /dev/null
+++ b/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch
@@ -0,0 +1,47 @@
+From 5b52ee6c6efab68111d128d45f386ac21eaf84f6 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Sun, 10 Jul 2022 13:41:36 -0700
+Subject: [PATCH] Revert "setup.py: migrate to setuptools"
+
+This reverts commit bbbde97b5e625a49a1a66e307931548cb33f260b.
+setuptools only installs data files to the python pkg directory
+---
+ setup.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 36995de..23e9b36 100755
+--- a/setup.py
++++ b/setup.py
+@@ -3,8 +3,8 @@
+ import re
+ import sys
+ import subprocess
+-
+-from setuptools import setup, Command
++from distutils import core
++from distutils.cmd import Command
+ from glob import glob
+ 
+ import os
+@@ -67,7 +67,7 @@ manpages = [
+ ]
+ 
+ 
+-class set_version(Command):
++class set_version(core.Command):
+     """Set python __version__ and bash VERSION to our __version__."""
+ 
+     description = "hardcode scripts' version using VERSION from environment"
+@@ -130,7 +130,7 @@ test_data = {
+     ]
+ }
+ 
+-setup(
++core.setup(
+     name="gentoolkit",
+     version=__version__,
+     description="Set of tools that work with and enhance portage.",
+--
+libgit2 1.4.3
+
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..d176540989f7
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+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 ~loong ~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"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	virtual/awk
+	sys-apps/gentoo-functions"
+
+PATCHES=(
+	"${FILESDIR}/gentoolkit-0.6.1-data_files.patch"
+)
+
+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
+
+	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() {
+	tmpfiles_process revdep-rebuild.conf
+
+	# 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/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
+}
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index 9c1afefeba26..00ccd192438d 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1 tmpfiles
@@ -26,7 +26,7 @@ SLOT="0"
 DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-	sys-apps/gawk
+	virtual/awk
 	sys-apps/gentoo-functions"
 
 distutils_enable_tests setup.py