dev-python/PyQt5-sip: use new canonical SRC_URI

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Davide Pesavento <pesa@gentoo.org>

diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.15.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.15.ebuild
index 0f179c01f2efc61a73d022a6bc2d191c30dd8c72..7a8d6adad884eebe0b3370630a3588d2e2d64123 100644 (file)
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.15.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.15.ebuild
@@ -9,11 +9,12 @@ inherit python-r1 toolchain-funcs
 DESCRIPTION="Private sip module for PyQt5"
 HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
 
-MY_P=sip-${PV/_pre/.dev}
+MY_PN=sip
+MY_P=${MY_PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
        SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
 else
-       SRC_URI="https://www.riverbankcomputing.com/static/Downloads/sip/${MY_P}.tar.gz"
+       SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
 fi
 
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h

diff --git a/dev-python/sip/sip-4.19.15.ebuild b/dev-python/sip/sip-4.19.15.ebuild
index cf5df2baf394a10ac0aae979ebf2064267fe2179..cbfa17402c9d76532b994c6d557f5eb67f4454c2 100644 (file)
--- a/dev-python/sip/sip-4.19.15.ebuild
+++ b/dev-python/sip/sip-4.19.15.ebuild
@@ -9,11 +9,12 @@ inherit python-r1 toolchain-funcs
 DESCRIPTION="Python extension module generator for C and C++ libraries"
 HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
 
-MY_P=sip-${PV/_pre/.dev}
+MY_PN=sip
+MY_P=${MY_PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
        SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
 else
-       SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${PN}/${PV}/${MY_P}.tar.gz"
+       SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
 fi
 
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h