| 1 |
commit: 6ef356868735403eac615511fe4d435178717587 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 30 19:38:26 2017 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 30 19:46:35 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef35686 |
| 7 |
|
| 8 |
dev-python/pyside-tools: restrict shiboken and pyside deps to same SLOT |
| 9 |
|
| 10 |
For future compatibility with shiboken:2 and pyside:2 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 13 |
|
| 14 |
dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild | 11 ++++++----- |
| 15 |
1 file changed, 6 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index f36869230a9..3cfe6a5212e 100644 |
| 19 |
--- a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild |
| 20 |
+++ b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild |
| 21 |
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
| 22 |
inherit cmake-utils python-r1 vcs-snapshot virtualx |
| 23 |
|
| 24 |
DESCRIPTION="PySide development tools (lupdate, rcc, uic)" |
| 25 |
-HOMEPAGE="https://wiki.qt.io/Pyside" |
| 26 |
+HOMEPAGE="http://wiki.qt.io/PySide" |
| 27 |
SRC_URI="https://github.com/PySide/Tools/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 28 |
|
| 29 |
LICENSE="BSD GPL-2" |
| 30 |
@@ -21,8 +21,8 @@ IUSE="test" |
| 31 |
|
| 32 |
RDEPEND=" |
| 33 |
${PYTHON_DEPS} |
| 34 |
- >=dev-python/pyside-1.2.0[X,${PYTHON_USEDEP}] |
| 35 |
- >=dev-python/shiboken-1.2.0[${PYTHON_USEDEP}] |
| 36 |
+ >=dev-python/pyside-1.2.0:${SLOT}[X,${PYTHON_USEDEP}] |
| 37 |
+ >=dev-python/shiboken-1.2.0:${SLOT}[${PYTHON_USEDEP}] |
| 38 |
dev-qt/qtcore:4 |
| 39 |
dev-qt/qtgui:4 |
| 40 |
" |
| 41 |
@@ -43,11 +43,11 @@ src_prepare() { |
| 42 |
|
| 43 |
preparation() { |
| 44 |
pushd "${BUILD_DIR}" >/dev/null || die |
| 45 |
+ |
| 46 |
if python_is_python3; then |
| 47 |
rm -fr pysideuic/port_v2 || die |
| 48 |
|
| 49 |
- # need to run with -py3 to generate |
| 50 |
- # proper python 3 interfaces |
| 51 |
+ # need to run with -py3 to generate proper python 3 interfaces |
| 52 |
sed -i -e 's:${PYSIDERCC_EXECUTABLE}:"${PYSIDERCC_EXECUTABLE} -py3":' \ |
| 53 |
tests/rcc/CMakeLists.txt || die |
| 54 |
else |
| 55 |
@@ -56,6 +56,7 @@ src_prepare() { |
| 56 |
|
| 57 |
sed -i -e "/pkg-config/ s:shiboken:&-${EPYTHON}:" \ |
| 58 |
tests/rcc/run_test.sh || die |
| 59 |
+ |
| 60 |
popd >/dev/null || die |
| 61 |
} |
| 62 |
python_foreach_impl preparation |
Archives