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

9 files changed, 214 insertions, 7 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index fab021737b6d..956cb923963c 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
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
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index 274b9f8b9be9..23e63d665246 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -1,7 +1,8 @@
+AUX mirrorselect-2.3.0-setup.py.patch 2000 BLAKE2B b5881e7b03c12f4107216286702657824efc2d6864443874d05890cd9880193baee8a00522c13274cc04717e6e10d1ac162e77247b41f43ad8f7fec59ec871a0 SHA512 d8ff2a9969ade6574457d316a145e822160edcd6f1cc928e4cd4c5cb53bff9ccd87f5985cbfb179c2b7ad6a8e4007c54a9bd3a770c723bf14730e437c72d49b8
 DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 8875bf61e26ac474338d81a602297fa4fdf3fab3dbd478b02129dbe71f2d09445efa9b82792e3e654725c5e87a4ca00d37a3d924f8bd6f2decdf74148d1069c8 SHA512 ff2b88bf568f79182275e2c85cafbeee7cbeb0226225a7c3289f0a1d7a8b5eae9d41c69b099bb7e0cc9b0300b23afea43c3ac1baa13f37c696159bb1b3ac05f8
 DIST mirrorselect-2.3.0.tar.gz 18039 BLAKE2B eebc4a02257b734c3dfd05cee541369689b92548b5421e977dd451442e8c83e426a03845a46e92eaa01507e0cba2b3679c97db2c00f012619cf9f551cfa1e1af SHA512 fc040bf6a9cc79f781157c7b65c6366c86dd54d583b4286845e3d037a2709c376e9132889e9dbe2cd40846cd7bd138aae7111d1a442a421101db756cc259b535
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
 EBUILD mirrorselect-2.2.6-r2.ebuild 1507 BLAKE2B 91374318bbdfb338811209f38db391a0d629af3157f65bde835d7f7844a4afbfed3346e04d8a39ea43d5ce21643424d0bdb78d2671e6ed70e4b3d6d89551e5c1 SHA512 87a34ec1476748a68df5b10fbc3e241ec39740566a0f52af3169265c2d6b7e71720edfc38543a8f52ebe1eb880e0049d9ae53574d8e04c892477681481367db9
-EBUILD mirrorselect-2.3.0.ebuild 1112 BLAKE2B f58b41ab17f42d95f9d923fe208c9f4424b53a8eaac8e55a0425a95f2835ca655ffed10643415a3ab870e189e90dfa80a5b9927881c791f396a7f90e19b1b219 SHA512 81b016ac837bac72e5c09ad83ceff233ac5c9e3de6e74850c63e6e397b3156dcf47cea2aab431e00f7eb3d6618525db329dfd6884859f5de4cd60f070df1e5a2
-EBUILD mirrorselect-9999.ebuild 1153 BLAKE2B ca42aec3a908267d192e7b74a82e3ae17fe254c1f9a3070273ae625c3398dd0bcecbe9abc79915f2137ff3fb213c8056fab579ffbb3b7139e232c8a2c8e03e7d SHA512 6def50cf976060cf3329fae96fc906f9322313b3a31d83854857ffa895aaffa193a9aa6a457135336657839e245378905b055506d3d48438bd9edfe890f1604f
+EBUILD mirrorselect-2.3.0-r1.ebuild 1170 BLAKE2B 794d69c2f4fd2316bc29688266c07cd119479b4e90729c7168558754070db949cd3aa3d79bd0a60b15c07977ced5cb09f9fa0529b34425a7374f7f1bf9a90e04 SHA512 989f5269cfb62139813fa4f4d11705cf8ccf1359d3ecfda5adf0e703de38622d46a18157353630648fe92a2667aa1a865c4e1b1eb2abfc78a86a3ac4850c759e
+EBUILD mirrorselect-9999.ebuild 1149 BLAKE2B e79713845296aa2e2200fe569568f67575d3b5dfb242c49d5508bad613bc715c92bacc6b310ff4cb297f6a9eacafc59890fb4b4cb7612177aef57d3d0bd3c8b7 SHA512 5e1f73c34d485528d923924765b43388c8bfa21ab6edf159fa3f4506fbedef49a8bb5c89c112bc6eb56db1e4841dd74bcf771a2f546808f10e8e6458198ab676
 MISC metadata.xml 495 BLAKE2B ebc7faf279e0a14f107411622bb0855c36c2229ed8357d7abea7cc7ea6e49a7ae7d136d476c33c02da46bb93614adadf87d6b6e19d1698d14c78942f9eace139 SHA512 5e8f9c4e185318f2de112e02c2c15662553ccae75f35a14023eac9e55ade710a45f0f6b78d98c899fa7604043e28f0ec2109889459aca46b3708c97c444d858d
diff --git a/app-portage/mirrorselect/files/mirrorselect-2.3.0-setup.py.patch b/app-portage/mirrorselect/files/mirrorselect-2.3.0-setup.py.patch
new file mode 100644
index 000000000000..6b2e074c0878
--- /dev/null
+++ b/app-portage/mirrorselect/files/mirrorselect-2.3.0-setup.py.patch
@@ -0,0 +1,81 @@
+From 5444d0ddb5268325aac63dcdeb908b614916dd0f Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Sun, 10 Jul 2022 13:54:45 -0700
+Subject: [PATCH] Revert "setup.py: Migrate from deprecated distutils to setuptools"
+
+This reverts commit 4cd4fb6280433f301ad9159f7473dc32ceb063d6.
+setuptools is installing data_file to the pkg dir inside python.
+Reverting back to distutils for correct install for now.
+
+Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
+---
+ setup.py | 22 +++++++++++++++++++---
+ 1 file changed, 19 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 9111d5e..a9728fa 100755
+--- a/setup.py
++++ b/setup.py
+@@ -5,10 +5,13 @@
+ import logging
+ import re
+ import sys
++from distutils import core, log
++from distutils.command.sdist import sdist
++from distutils.core import Command
++
+ import os
+ import io
+ import unittest
+-from setuptools import setup, Command
+ 
+ 
+ __version__ = os.getenv('VERSION', default=os.getenv('PVR', default='9999'))
+@@ -34,7 +37,7 @@ manpage = [os.path.join(cwd, path) for path in (
+ )]
+ 
+ 
+-class set_version(Command):
++class set_version(core.Command):
+ 	"""Set python version to our __version__."""
+ 	description = "hardcode scripts' version using VERSION from environment"
+ 	user_options = []  # [(long_name, short_name, desc),]
+@@ -66,6 +69,18 @@ class set_version(Command):
+ 		sub(manpage, man_re)
+ 
+ 
++class x_sdist(sdist):
++	"""sdist defaulting to archive files owned by root."""
++
++	def finalize_options(self):
++		if self.owner is None:
++			self.owner = 'root'
++		if self.group is None:
++			self.group = 'root'
++
++		sdist.finalize_options(self)
++
++
+ class TestCommand(Command):
+ 	user_options = []
+ 
+@@ -89,7 +104,7 @@ test_data = {
+ 	]
+ }
+ 
+-setup(
++core.setup(
+ 	name='mirrorselect',
+ 	version=__version__,
+ 	description='Tool for selecting Gentoo source and rsync mirrors.',
+@@ -109,6 +124,7 @@ setup(
+ 	),
+ 	cmdclass={
+ 		'test': TestCommand,
++		'sdist': x_sdist,
+ 		'set_version': set_version,
+ 	},
+ )
+--
+libgit2 1.4.3
+
diff --git a/app-portage/mirrorselect/mirrorselect-2.3.0.ebuild b/app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild
index 140f530d2904..063dbe74d8c3 100644
--- a/app-portage/mirrorselect/mirrorselect-2.3.0.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
 
@@ -26,6 +26,10 @@ RDEPEND="
 	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
 "
 
+PATCHES=(
+	"${FILESDIR}/mirrorselect-2.3.0-setup.py.patch"
+)
+
 python_prepare_all() {
 	python_setup
 	eprefixify setup.py mirrorselect/main.py
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index 505417a219e3..b84d0b9c191a 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"