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

4 files changed, 90 insertions, 4 deletions

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"