gentoo auto-resync : 06:07:2023 - 10:13:38

4 files changed, 129 insertions, 24 deletions

diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index fa56335d8d31..fe5bc6d15b93 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -1,8 +1,10 @@
+AUX mirrorselect-2.3.0-main-Fix-all-option-parsing.patch 1869 BLAKE2B 795e1c8dda749b2df32913e27cb3eb97eeb670873a6e7a63f145726e20d5614031ec4ce1c25a467eb1f8fd58e8cbeb39edc338904239a129b7396ba56bcc413f SHA512 3375d2c2f931dc4d72ee532a1112f567b87463002ea85c1b07b77fc069f3ca05e6a0b5652219ed69256c5a10f1541e3cb89b0aa7ad4243abdc28a43dec4df05f
 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 1510 BLAKE2B 3e1b3c8c7c9be8fd28c5c9fd32e164f3a9c6624db9737f948446f619623bfd7137e7f5d64c95f5486e7476205e6e86d80716fcaa6f1a179baa233b3c6920e395 SHA512 0257055c1eb403c54a10741406b336ea668cca0c2f2bf7b579fefbb492ce5cf92f682234d650e3365d7818b326fb4cdb43758461ab605895f307650304480e2f
 EBUILD mirrorselect-2.3.0-r1.ebuild 1165 BLAKE2B 626efb68f6e3ea42c911f6c69cdee21cc6852b5425136c44494dbac4ea990ed94fafae8ad4f08c1f72d3345a2efd61404dc44b6318d041e1ad12923626be4884 SHA512 f309b707d851517948d71faebae958d940b9272f747d2809162a4d761d304d67bb9e71553641f1f393d2eaf7cc206c3b605cfe38929e6147a0fb5a1b60a6e4ee
-EBUILD mirrorselect-9999.ebuild 1152 BLAKE2B ac62c333bbe94307b1bee244ce5eeaf0667dfc0b5bcea316f545bd20bf27aad10526256e90686bdfd3eea53b97c38ad468baab11ac4acb62f497a61bb8f7a808 SHA512 8468a11211f1c67dc709875b87866df54d08c7ab2055d4c18ac245c56b9e7e3d208baa0e8eefb4a2cd3e0d2e14d0eb3a44234f2b8455bcdcdfa14bed7db41320
+EBUILD mirrorselect-2.3.0-r2.ebuild 1161 BLAKE2B 185814d260504e85c081339b7162969158bb635aa6099792e008b82c1742d340f3571ee807482d368c145e6a7c71eb98d8805a688f9b518877b6afe4937a5278 SHA512 a5cc5bec7b9185dc49c56c119416c6bd14ef4aa9f552302848c7ca2d7661fae3957497a5041a63e37b490c6a35d6de6688c4d8fec51ccb8e9ed044cecd20baf7
+EBUILD mirrorselect-9999.ebuild 1161 BLAKE2B 185814d260504e85c081339b7162969158bb635aa6099792e008b82c1742d340f3571ee807482d368c145e6a7c71eb98d8805a688f9b518877b6afe4937a5278 SHA512 a5cc5bec7b9185dc49c56c119416c6bd14ef4aa9f552302848c7ca2d7661fae3957497a5041a63e37b490c6a35d6de6688c4d8fec51ccb8e9ed044cecd20baf7
 MISC metadata.xml 495 BLAKE2B ebc7faf279e0a14f107411622bb0855c36c2229ed8357d7abea7cc7ea6e49a7ae7d136d476c33c02da46bb93614adadf87d6b6e19d1698d14c78942f9eace139 SHA512 5e8f9c4e185318f2de112e02c2c15662553ccae75f35a14023eac9e55ade710a45f0f6b78d98c899fa7604043e28f0ec2109889459aca46b3708c97c444d858d
diff --git a/app-portage/mirrorselect/files/mirrorselect-2.3.0-main-Fix-all-option-parsing.patch b/app-portage/mirrorselect/files/mirrorselect-2.3.0-main-Fix-all-option-parsing.patch
new file mode 100644
index 000000000000..0d0462c64752
--- /dev/null
+++ b/app-portage/mirrorselect/files/mirrorselect-2.3.0-main-Fix-all-option-parsing.patch
@@ -0,0 +1,48 @@
+From e0fbc2fb33762211aa5e64175d525e66f4c257d4 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 6 Jul 2023 09:04:42 +0100
+Subject: [PATCH] main: Fix --all option parsing
+
+Avoid --all erroring out with "ERROR: Choose at most one of -s or -a".
+
+Bug: https://bugs.gentoo.org/872218
+Fixes: 7caac017833b01e13028658effc502430c56d770
+Thanks-to: <xpenev@gmail.com>
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/mirrorselect/main.py
++++ b/mirrorselect/main.py
+@@ -145,6 +145,11 @@ class MirrorSelect(object):
+ 			self.output.white("	 interactive:"),
+ 			"		 # mirrorselect -i -r",
+ 			))
++
++		def set_servers(option, opt_str, value, parser):
++			set_servers.user_configured = True
++			setattr(parser.values, option.dest, value)
++
+ 		parser = OptionParser(
+ 			formatter=ColoredFormatter(self.output), description=desc,
+ 			version='Mirrorselect version: %s' % version)
+@@ -236,8 +241,8 @@ class MirrorSelect(object):
+ 			"-q", "--quiet", action="store_const", const=0, dest="verbosity",
+ 			help="Quiet mode")
+ 		group.add_option(
+-			"-s", "--servers", action="store", type="int", default=1,
+-			help="Specify Number of servers for Automatic Mode "
++			"-s", "--servers", action="callback", callback=set_servers,
++			type="int", default=1, help="Specify Number of servers for Automatic Mode "
+ 			"to select. this is only valid for download mirrors. "
+ 			"If this is not specified, a default of 1 is used.")
+ 		group.add_option(
+@@ -271,7 +276,7 @@ class MirrorSelect(object):
+ 		if options.rsync and not (options.interactive or options.all_mirrors):
+ 			self.output.print_err('rsync servers can only be selected with -i or -a')
+ 
+-		if options.servers and options.all_mirrors:
++		if options.all_mirrors and hasattr(set_servers, 'user_configured'):
+ 			self.output.print_err('Choose at most one of -s or -a')
+ 
+ 		if options.interactive and (
+-- 
+2.41.0
+
diff --git a/app-portage/mirrorselect/mirrorselect-2.3.0-r2.ebuild b/app-portage/mirrorselect/mirrorselect-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..c3e54ebd2ad0
--- /dev/null
+++ b/app-portage/mirrorselect/mirrorselect-2.3.0-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit edo distutils-r1 prefix
+
+DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mirrorselect.git"
+	inherit git-r3
+
+	SSL_FETCH_VER=9999
+else
+	SRC_URI="
+		https://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
+		https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+	"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+	SSL_FETCH_VER=0.3
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ipv6"
+
+RDEPEND="
+	dev-util/dialog
+	>=net-analyzer/netselect-0.4[ipv6(+)?]
+	>=dev-python/ssl-fetch-${SSL_FETCH_VER}[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	python_setup
+
+	local -x VERSION="${PVR}"
+	eprefixify setup.py mirrorselect/main.py
+	edo "${PYTHON}" setup.py set_version
+
+	distutils-r1_python_prepare_all
+}
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index 04b97f469874..c3e54ebd2ad0 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -4,44 +4,48 @@
 EAPI="8"
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="xml(+)"
 
-inherit distutils-r1 git-r3 prefix
-
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mirrorselect.git"
+inherit edo distutils-r1 prefix
 
 DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
-SRC_URI=""
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mirrorselect.git"
+	inherit git-r3
+
+	SSL_FETCH_VER=9999
+else
+	SRC_URI="
+		https://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
+		https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+	"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+	SSL_FETCH_VER=0.3
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
+IUSE="ipv6"
 
 RDEPEND="
 	dev-util/dialog
-	>=net-analyzer/netselect-0.4[ipv6(+)]
-	~dev-python/ssl-fetch-9999[${PYTHON_USEDEP}]
+	>=net-analyzer/netselect-0.4[ipv6(+)?]
+	>=dev-python/ssl-fetch-${SSL_FETCH_VER}[${PYTHON_USEDEP}]
 "
 
+distutils_enable_tests setup.py
+
 python_prepare_all() {
 	python_setup
-	eprefixify setup.py mirrorselect/main.py
-	echo Now setting version... VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
-	VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test || die "tests failed under ${EPYTHON}"
-}
 
-pkg_postinst() {
-	distutils-r1_pkg_postinst
+	local -x VERSION="${PVR}"
+	eprefixify setup.py mirrorselect/main.py
+	edo "${PYTHON}" setup.py set_version
 
-	einfo "This is a development version."
-	einfo "Please report any bugs you encounter to:"
-	einfo "https://bugs.gentoo.org/"
+	distutils-r1_python_prepare_all
 }