From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1535139-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C0B1C15800D
for <garchives@archives.gentoo.org>; Thu, 6 Jul 2023 08:12:19 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 06519E083D;
Thu, 6 Jul 2023 08:12:19 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id E30BFE083D
for <gentoo-commits@lists.gentoo.org>; Thu, 6 Jul 2023 08:12:18 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1F9D6335CF5
for <gentoo-commits@lists.gentoo.org>; Thu, 6 Jul 2023 08:12:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 74327AC8
for <gentoo-commits@lists.gentoo.org>; Thu, 6 Jul 2023 08:12:16 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1688631125.14b57e5a2a42d21f6db2e5935d57f3a6e5e05fd6.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/mirrorselect/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-portage/mirrorselect/mirrorselect-2.3.0-r2.ebuild app-portage/mirrorselect/mirrorselect-9999.ebuild
X-VCS-Directories: app-portage/mirrorselect/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 14b57e5a2a42d21f6db2e5935d57f3a6e5e05fd6
X-VCS-Branch: master
Date: Thu, 6 Jul 2023 08:12:16 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 7a672299-678b-4f8b-b814-df15b54da5b3
X-Archives-Hash: e29237fbaef8e4958d60ce4bb9e8f3b4
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
}