From a8c0585b1124d3fd40dce3b9403f8b3112628763 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sat, 1 Aug 2026 22:16:43 -0400 Subject: [PATCH 1/4] app-portage/mirrorselect: convert to meson Signed-off-by: Mike Gilbert --- .../mirrorselect/mirrorselect-9999.ebuild | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild index 9dafbef0ffad9..c2816e046722b 100644 --- a/app-portage/mirrorselect/mirrorselect-9999.ebuild +++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild @@ -3,11 +3,10 @@ EAPI=8 -DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{12..14} ) PYTHON_REQ_USE="xml(+)" -inherit edo distutils-r1 prefix +inherit edo meson python-single-r1 DESCRIPTION="Tool to help select distfiles mirrors for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect" @@ -18,34 +17,27 @@ if [[ ${PV} == 9999 ]] ; then else SRC_URI=" https://gitweb.gentoo.org/proj/mirrorselect.git/snapshot/${P}.tar.gz - 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi +REQUIRED_USE="${PYTHON_REQUIRED_USE}" LICENSE="GPL-2" SLOT="0" -BDEPEND="${DISTUTILS_DEPS}" -RDEPEND=" +BDEPEND="${PYTHON_DEPS}" +RDEPEND="${PYTHON_DEPS} dev-util/dialog >=net-analyzer/netselect-0.4 - dev-python/requests[${PYTHON_USEDEP}] - sys-apps/portage[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/requests[${PYTHON_USEDEP}] + sys-apps/portage[${PYTHON_USEDEP}] + ') " -distutils_enable_tests unittest - -python_prepare_all() { - python_setup - - local -x VERSION="${PVR}" - sed -e 's:os.path.join(os.sep, EPREFIX.lstrip(os.sep), "usr/share/man/man8"):"share/man/man8":' \ - -i setup.py || die - eprefixify setup.py mirrorselect/main.py - edo "${PYTHON}" setup.py set_version - - distutils-r1_python_prepare_all +src_install() { + meson_src_install + python_fix_shebang "${ED}" + python_optimize } From 261e11cd4dc0b4e59aebc0122c85a6332ad5a9c6 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sat, 1 Aug 2026 22:23:00 -0400 Subject: [PATCH 2/4] app-portage/mirrorselect: add 2.7.0 Closes: https://bugs.gentoo.org/910603 Closes: https://bugs.gentoo.org/922058 Closes: https://bugs.gentoo.org/922216 Closes: https://bugs.gentoo.org/978207 Closes: https://bugs.gentoo.org/978438 Signed-off-by: Mike Gilbert --- app-portage/mirrorselect/Manifest | 1 + .../mirrorselect/mirrorselect-2.7.0.ebuild | 43 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 app-portage/mirrorselect/mirrorselect-2.7.0.ebuild diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest index 5565a0583c03a..70da8095f4501 100644 --- a/app-portage/mirrorselect/Manifest +++ b/app-portage/mirrorselect/Manifest @@ -1,3 +1,4 @@ DIST mirrorselect-2.6.4.tar.gz 19053 BLAKE2B 8ade56ebcac99bc50c7912da43768eff411cc1e3ad9f2670482b7cb6ea897e3cce1f1716c4b8f3a05491820a7dcd74ce42e278bacfb1b92b54da13021b2dbe5e SHA512 e1251496af1d3862bd52c78ebf4a4a09a8fc1cd489b5eb4063d107befc6b1f14de312b16f61fcc362653d4bb8306145f48d29a3d5aedc9042ec80f1185eabd22 DIST mirrorselect-2.6.5.tar.gz 19211 BLAKE2B c05cd77febe4f19d271d2a575a5234946561ac5d0996c84d6623ad2af989f5f6011b8a54de26903007086685ad8c1a2a32243ac8f9df90ad56345760b77bff4b SHA512 e313504f69c08098cedf9ee1fbd12206272fd9ec174c914bf5d28847cfb8c737631a3eb0196d7cb883aef066c700c5ca224c1b184a5ddddbcd1f67722ee7b0f8 +DIST mirrorselect-2.7.0.tar.gz 19060 BLAKE2B 0e40cc22206eaba1bb0e3dbd3a759c6047de42247d03f54809e9502a5f4bdfd03027bb40938afd16bfcfd06cc16f57962519bfc04d0a51300273b8908473f8e8 SHA512 3ee8e0a92d8859fc05ab9e883c1171c7da5f202a3e4c2d414420c9600877ddfcee6a0c681f62484c2060fdf11af8f562583cf714e37926512cb8c0b15dfe921e DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27 diff --git a/app-portage/mirrorselect/mirrorselect-2.7.0.ebuild b/app-portage/mirrorselect/mirrorselect-2.7.0.ebuild new file mode 100644 index 0000000000000..c2816e046722b --- /dev/null +++ b/app-portage/mirrorselect/mirrorselect-2.7.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{12..14} ) +PYTHON_REQ_USE="xml(+)" + +inherit edo meson python-single-r1 + +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 +else + SRC_URI=" + https://gitweb.gentoo.org/proj/mirrorselect.git/snapshot/${P}.tar.gz + " + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +LICENSE="GPL-2" +SLOT="0" + +BDEPEND="${PYTHON_DEPS}" +RDEPEND="${PYTHON_DEPS} + dev-util/dialog + >=net-analyzer/netselect-0.4 + $(python_gen_cond_dep ' + dev-python/requests[${PYTHON_USEDEP}] + sys-apps/portage[${PYTHON_USEDEP}] + ') +" + +src_install() { + meson_src_install + python_fix_shebang "${ED}" + python_optimize +} From 5aa0c5e8fbcb509c0bf671e1435d515dd6d6faf1 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sat, 1 Aug 2026 22:27:46 -0400 Subject: [PATCH 3/4] app-portage/mirrorselect: drop 2.6.5 Signed-off-by: Mike Gilbert --- app-portage/mirrorselect/Manifest | 1 - .../mirrorselect/mirrorselect-2.6.5.ebuild | 51 ------------------- 2 files changed, 52 deletions(-) delete mode 100644 app-portage/mirrorselect/mirrorselect-2.6.5.ebuild diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest index 70da8095f4501..3e530b80cf0d8 100644 --- a/app-portage/mirrorselect/Manifest +++ b/app-portage/mirrorselect/Manifest @@ -1,4 +1,3 @@ DIST mirrorselect-2.6.4.tar.gz 19053 BLAKE2B 8ade56ebcac99bc50c7912da43768eff411cc1e3ad9f2670482b7cb6ea897e3cce1f1716c4b8f3a05491820a7dcd74ce42e278bacfb1b92b54da13021b2dbe5e SHA512 e1251496af1d3862bd52c78ebf4a4a09a8fc1cd489b5eb4063d107befc6b1f14de312b16f61fcc362653d4bb8306145f48d29a3d5aedc9042ec80f1185eabd22 -DIST mirrorselect-2.6.5.tar.gz 19211 BLAKE2B c05cd77febe4f19d271d2a575a5234946561ac5d0996c84d6623ad2af989f5f6011b8a54de26903007086685ad8c1a2a32243ac8f9df90ad56345760b77bff4b SHA512 e313504f69c08098cedf9ee1fbd12206272fd9ec174c914bf5d28847cfb8c737631a3eb0196d7cb883aef066c700c5ca224c1b184a5ddddbcd1f67722ee7b0f8 DIST mirrorselect-2.7.0.tar.gz 19060 BLAKE2B 0e40cc22206eaba1bb0e3dbd3a759c6047de42247d03f54809e9502a5f4bdfd03027bb40938afd16bfcfd06cc16f57962519bfc04d0a51300273b8908473f8e8 SHA512 3ee8e0a92d8859fc05ab9e883c1171c7da5f202a3e4c2d414420c9600877ddfcee6a0c681f62484c2060fdf11af8f562583cf714e37926512cb8c0b15dfe921e DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27 diff --git a/app-portage/mirrorselect/mirrorselect-2.6.5.ebuild b/app-portage/mirrorselect/mirrorselect-2.6.5.ebuild deleted file mode 100644 index 9dafbef0ffad9..0000000000000 --- a/app-portage/mirrorselect/mirrorselect-2.6.5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{12..14} ) -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 -else - SRC_URI=" - https://gitweb.gentoo.org/proj/mirrorselect.git/snapshot/${P}.tar.gz - 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" - -BDEPEND="${DISTUTILS_DEPS}" -RDEPEND=" - dev-util/dialog - >=net-analyzer/netselect-0.4 - dev-python/requests[${PYTHON_USEDEP}] - sys-apps/portage[${PYTHON_USEDEP}] -" - -distutils_enable_tests unittest - -python_prepare_all() { - python_setup - - local -x VERSION="${PVR}" - sed -e 's:os.path.join(os.sep, EPREFIX.lstrip(os.sep), "usr/share/man/man8"):"share/man/man8":' \ - -i setup.py || die - eprefixify setup.py mirrorselect/main.py - edo "${PYTHON}" setup.py set_version - - distutils-r1_python_prepare_all -} From b3f332d754cace4cf9d4281ad01b5934228450b2 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sat, 1 Aug 2026 22:28:18 -0400 Subject: [PATCH 4/4] profiles: drop mirrorselect mask Signed-off-by: Mike Gilbert --- profiles/package.mask | 4 ---- 1 file changed, 4 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 57d2bfe38c273..2cc54118ec06c 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -78,10 +78,6 @@ acct-group/microsoft-identity-broker # Removal on 2026-07-27. Bug #949068. gui-libs/tepl -# Sam James (2026-07-16) -# Broken (bug #978438). -=app-portage/mirrorselect-2.6.5 - # Sam James (2026-07-16) # Stub since Bind 9.18. Maintaining a separate build just for the client # binaries proved brittle and unsustainable (see discussion in