| 1 |
commit: 3e8f92f3984df2929fb4595cf7680c60693c7ac8 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 28 15:47:42 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 28 16:12:44 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3e8f92f3 |
| 7 |
|
| 8 |
dev-python/shiboken: follow upstream changes |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
dev-python/shiboken/shiboken-9999.ebuild | 37 +++++++++++++------------------- |
| 13 |
1 file changed, 15 insertions(+), 22 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-python/shiboken/shiboken-9999.ebuild b/dev-python/shiboken/shiboken-9999.ebuild |
| 16 |
index fd339bd..d04a967 100644 |
| 17 |
--- a/dev-python/shiboken/shiboken-9999.ebuild |
| 18 |
+++ b/dev-python/shiboken/shiboken-9999.ebuild |
| 19 |
@@ -2,11 +2,11 @@ |
| 20 |
# Distributed under the terms of the GNU General Public License v2 |
| 21 |
# $Id$ |
| 22 |
|
| 23 |
-EAPI=5 |
| 24 |
+EAPI=6 |
| 25 |
|
| 26 |
-PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
| 27 |
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) |
| 28 |
|
| 29 |
-inherit cmake-utils multilib python-r1 git-r3 |
| 30 |
+inherit cmake-utils python-r1 git-r3 |
| 31 |
|
| 32 |
DESCRIPTION="A tool for creating Python bindings for C++ libraries" |
| 33 |
HOMEPAGE="https://wiki.qt.io/Pyside" |
| 34 |
@@ -18,31 +18,28 @@ EGIT_REPO_URI=( |
| 35 |
LICENSE="LGPL-2.1" |
| 36 |
SLOT="0" |
| 37 |
KEYWORDS="" |
| 38 |
- |
| 39 |
IUSE="test" |
| 40 |
+ |
| 41 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 42 |
|
| 43 |
RDEPEND=" |
| 44 |
${PYTHON_DEPS} |
| 45 |
dev-libs/libxml2 |
| 46 |
dev-libs/libxslt |
| 47 |
- dev-qt/qtcore:4 |
| 48 |
- dev-qt/qtxmlpatterns:4 |
| 49 |
+ dev-qt/qtcore:5 |
| 50 |
+ dev-qt/qtxml:5 |
| 51 |
+ dev-qt/qtxmlpatterns:5 |
| 52 |
" |
| 53 |
DEPEND="${RDEPEND} |
| 54 |
test? ( |
| 55 |
- dev-qt/qtgui:4 |
| 56 |
- dev-qt/qttest:4 |
| 57 |
- )" |
| 58 |
+ dev-qt/qtgui:5 |
| 59 |
+ dev-qt/qttest:5 |
| 60 |
+ ) |
| 61 |
+" |
| 62 |
|
| 63 |
-DOCS=( AUTHORS ChangeLog ) |
| 64 |
+DOCS=( AUTHORS ) |
| 65 |
|
| 66 |
src_prepare() { |
| 67 |
- # Fix inconsistent naming of libshiboken.so and ShibokenConfig.cmake, |
| 68 |
- # caused by the usage of a different version suffix with python >= 3.2 |
| 69 |
- sed -i -e "/get_config_var('SOABI')/d" \ |
| 70 |
- cmake/Modules/FindPython3InterpWithDebug.cmake || die |
| 71 |
- |
| 72 |
if use prefix; then |
| 73 |
cp "${FILESDIR}"/rpath.cmake . || die |
| 74 |
sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die |
| 75 |
@@ -54,18 +51,14 @@ src_prepare() { |
| 76 |
src_configure() { |
| 77 |
configuration() { |
| 78 |
local mycmakeargs=( |
| 79 |
- $(cmake-utils_use_build test TESTS) |
| 80 |
+ -DBUILD_TESTS=$(usex test) |
| 81 |
-DPYTHON_EXECUTABLE="${PYTHON}" |
| 82 |
-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)" |
| 83 |
- -DPYTHON_SUFFIX="-${EPYTHON}" |
| 84 |
) |
| 85 |
|
| 86 |
if [[ ${EPYTHON} == python3* ]]; then |
| 87 |
mycmakeargs+=( |
| 88 |
- -DUSE_PYTHON3=ON |
| 89 |
- -DPYTHON3_EXECUTABLE="${PYTHON}" |
| 90 |
- -DPYTHON3_INCLUDE_DIR="$(python_get_includedir)" |
| 91 |
- -DPYTHON3_LIBRARY="$(python_get_library_path)" |
| 92 |
+ -DUSE_PYTHON_VERSION=3 |
| 93 |
) |
| 94 |
fi |
| 95 |
|
| 96 |
@@ -85,7 +78,7 @@ src_test() { |
| 97 |
src_install() { |
| 98 |
installation() { |
| 99 |
cmake-utils_src_install |
| 100 |
- mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-${EPYTHON}}.pc || die |
| 101 |
+ mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}2{,-${EPYTHON}}.pc || die |
| 102 |
} |
| 103 |
python_foreach_impl installation |
| 104 |
} |
Archives