commit: 6ef356868735403eac615511fe4d435178717587
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 30 19:38:26 2017 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 30 19:46:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef35686
dev-python/pyside-tools: restrict shiboken and pyside deps to same SLOT
For future compatibility with shiboken:2 and pyside:2
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
index f36869230a9..3cfe6a5212e 100644
--- a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
+++ b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit cmake-utils python-r1 vcs-snapshot virtualx
DESCRIPTION="PySide development tools (lupdate, rcc, uic)"
-HOMEPAGE="https://wiki.qt.io/Pyside";
+HOMEPAGE="http://wiki.qt.io/PySide";
SRC_URI="https://github.com/PySide/Tools/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD GPL-2"
@@ -21,8 +21,8 @@ IUSE="test"
RDEPEND="
${PYTHON_DEPS}
- >=dev-python/pyside-1.2.0[X,${PYTHON_USEDEP}]
- >=dev-python/shiboken-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/pyside-1.2.0:${SLOT}[X,${PYTHON_USEDEP}]
+ >=dev-python/shiboken-1.2.0:${SLOT}[${PYTHON_USEDEP}]
dev-qt/qtcore:4
dev-qt/qtgui:4
"
@@ -43,11 +43,11 @@ src_prepare() {
preparation() {
pushd "${BUILD_DIR}" >/dev/null || die
+
if python_is_python3; then
rm -fr pysideuic/port_v2 || die
- # need to run with -py3 to generate
- # proper python 3 interfaces
+ # need to run with -py3 to generate proper python 3
interfaces
sed -i -e
's:${PYSIDERCC_EXECUTABLE}:"${PYSIDERCC_EXECUTABLE} -py3":' \
tests/rcc/CMakeLists.txt || die
else
@@ -56,6 +56,7 @@ src_prepare() {
sed -i -e "/pkg-config/ s:shiboken:&-${EPYTHON}:" \
tests/rcc/run_test.sh || die
+
popd >/dev/null || die
}
python_foreach_impl preparation
