commit: 14b57e5a2a42d21f6db2e5935d57f3a6e5e05fd6 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jul 6 08:12:05 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jul 6 08:12:05 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14b57e5a
app-portage/mirrorselect: sync live Signed-off-by: Sam James <sam <AT> gentoo.org> .../mirrorselect/mirrorselect-2.3.0-r2.ebuild | 31 ++++++++------ app-portage/mirrorselect/mirrorselect-9999.ebuild | 50 ++++++++++++---------- 2 files changed, 46 insertions(+), 35 deletions(-) diff --git a/app-portage/mirrorselect/mirrorselect-2.3.0-r2.ebuild b/app-portage/mirrorselect/mirrorselect-2.3.0-r2.ebuild index 42d5b60553c5..c3e54ebd2ad0 100644 --- a/app-portage/mirrorselect/mirrorselect-2.3.0-r2.ebuild +++ b/app-portage/mirrorselect/mirrorselect-2.3.0-r2.ebuild @@ -11,34 +11,41 @@ inherit edo distutils-r1 prefix DESCRIPTION="Tool to help select distfiles mirrors for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"; -SRC_URI=" - https://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz - https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test -" + +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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="ipv6" RDEPEND=" dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)?] - >=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}] + >=dev-python/ssl-fetch-${SSL_FETCH_VER}[${PYTHON_USEDEP}] " -PATCHES=( - "${FILESDIR}"/${P}-setup.py.patch - "${FILESDIR}"/${P}-main-Fix-all-option-parsing.patch -) - distutils_enable_tests setup.py python_prepare_all() { python_setup + local -x VERSION="${PVR}" eprefixify setup.py mirrorselect/main.py - VERSION="${PVR}" edo "${PYTHON}" setup.py set_version + 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 }
