From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 68B8915806E for ; Sat, 20 May 2023 08:28:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 491F0E0856; Sat, 20 May 2023 08:28:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 2B710E0856 for ; Sat, 20 May 2023 08:28:23 +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 19649340E64 for ; Sat, 20 May 2023 08:28:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4500EA65 for ; Sat, 20 May 2023 08:28:20 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1684571290.ccb41e740fdb087ea0f5100fab226d7f1f80318f.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt5-sip/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/PyQt5-sip/PyQt5-sip-12.12.0.ebuild dev-python/PyQt5-sip/PyQt5-sip-12.12.1.ebuild X-VCS-Directories: dev-python/PyQt5-sip/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ccb41e740fdb087ea0f5100fab226d7f1f80318f X-VCS-Branch: master Date: Sat, 20 May 2023 08:28:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f1f7d02d-c1ff-47cf-8086-57e57d36db81 X-Archives-Hash: 2681b57e567cd9fd542f52de4361358e commit: ccb41e740fdb087ea0f5100fab226d7f1f80318f Author: Michał Górny gentoo org> AuthorDate: Sat May 20 07:37:53 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat May 20 08:28:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccb41e74 dev-python/PyQt5-sip: Use pypi.eclass Signed-off-by: Michał Górny gentoo.org> dev-python/PyQt5-sip/PyQt5-sip-12.12.0.ebuild | 8 +++++--- dev-python/PyQt5-sip/PyQt5-sip-12.12.1.ebuild | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.12.0.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-12.12.0.ebuild index c2e8bc17898f..c18c7e8c8b47 100644 --- a/dev-python/PyQt5-sip/PyQt5-sip-12.12.0.ebuild +++ b/dev-python/PyQt5-sip/PyQt5-sip-12.12.0.ebuild @@ -5,6 +5,8 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 +PYPI_PN=${PN/-/_} PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 @@ -12,13 +14,13 @@ inherit distutils-r1 DESCRIPTION="sip extension module for PyQt5" HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/PyQt5-sip/" -MY_P=${PN/-/_}-${PV/_pre/.dev} if [[ ${PV} == *_pre* ]]; then + MY_P=${PYPI_PN}-${PV/_pre/.dev} SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz" + S="${WORKDIR}/${MY_P}" else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" + inherit pypi fi -S="${WORKDIR}/${MY_P}" LICENSE="|| ( GPL-2 GPL-3 SIP )" SLOT="0/$(ver_cut 1)" diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.12.1.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-12.12.1.ebuild index 1906637cae9b..469e940e7fbd 100644 --- a/dev-python/PyQt5-sip/PyQt5-sip-12.12.1.ebuild +++ b/dev-python/PyQt5-sip/PyQt5-sip-12.12.1.ebuild @@ -5,6 +5,8 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 +PYPI_PN=${PN/-/_} PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 @@ -12,13 +14,13 @@ inherit distutils-r1 DESCRIPTION="sip extension module for PyQt5" HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/PyQt5-sip/" -MY_P=${PN/-/_}-${PV/_pre/.dev} if [[ ${PV} == *_pre* ]]; then + MY_P=${PYPI_PN}-${PV/_pre/.dev} SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz" + S="${WORKDIR}/${MY_P}" else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" + inherit pypi fi -S="${WORKDIR}/${MY_P}" LICENSE="|| ( GPL-2 GPL-3 SIP )" SLOT="0/$(ver_cut 1)"