[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt5-sip/, dev-python/sip/

[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt5-sip/, dev-python/sip/

[Davide Pesavento]

commit:     d70a0e53123a2370c86a0748bef59d2a86e6762e
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  3 00:22:56 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Apr  3 00:32:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d70a0e53

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 <AT> gentoo.org>

 dev-python/PyQt5-sip/PyQt5-sip-4.19.15.ebuild | 5 +++--
 dev-python/sip/sip-4.19.15.ebuild             | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

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 0f179c01f2e..7a8d6adad88 100644
--- 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 cf5df2baf39..cbfa17402c9 100644
--- 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