1 |
commit: 651c680fa60d0d360e4171685cc10561c378ae4d |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 28 16:44:28 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 28 17:14:52 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=651c680f |
7 |
|
8 |
dev-python/pyside: make it fail to build less |
9 |
|
10 |
Still needs a lot of work. |
11 |
|
12 |
Package-Manager: portage-2.3.2 |
13 |
|
14 |
dev-python/pyside/metadata.xml | 2 +- |
15 |
dev-python/pyside/pyside-9999.ebuild | 62 +++++++++++++----------------------- |
16 |
2 files changed, 24 insertions(+), 40 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/pyside/metadata.xml b/dev-python/pyside/metadata.xml |
19 |
index fafc401..dcfc63e 100644 |
20 |
--- a/dev-python/pyside/metadata.xml |
21 |
+++ b/dev-python/pyside/metadata.xml |
22 |
@@ -12,7 +12,6 @@ |
23 |
<flag name="help">Build QtHelp module</flag> |
24 |
<flag name="multimedia">Build QtMultimedia module</flag> |
25 |
<flag name="opengl">Build QtOpenGL module</flag> |
26 |
- <flag name="phonon">Build phonon module</flag> |
27 |
<flag name="script">Build QtScript module</flag> |
28 |
<flag name="scripttools">Build QtScriptTools module</flag> |
29 |
<flag name="sql">Build QtSql module</flag> |
30 |
@@ -21,3 +20,4 @@ |
31 |
<flag name="xmlpatterns">Build QtXmlPatterns module</flag> |
32 |
</use> |
33 |
</pkgmetadata> |
34 |
+ |
35 |
|
36 |
diff --git a/dev-python/pyside/pyside-9999.ebuild b/dev-python/pyside/pyside-9999.ebuild |
37 |
index b6795f8..f86dcad 100644 |
38 |
--- a/dev-python/pyside/pyside-9999.ebuild |
39 |
+++ b/dev-python/pyside/pyside-9999.ebuild |
40 |
@@ -2,13 +2,11 @@ |
41 |
# Distributed under the terms of the GNU General Public License v2 |
42 |
# $Id$ |
43 |
|
44 |
-EAPI=5 |
45 |
+EAPI=6 |
46 |
|
47 |
-PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
48 |
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) |
49 |
|
50 |
-inherit cmake-utils multilib python-r1 virtualx git-r3 |
51 |
- |
52 |
-MY_P="${PN}-qt4.8+${PV}" |
53 |
+inherit cmake-utils flag-o-matic python-r1 virtualx git-r3 |
54 |
|
55 |
DESCRIPTION="Python bindings for the Qt framework" |
56 |
HOMEPAGE="https://wiki.qt.io/Pyside" |
57 |
@@ -21,7 +19,7 @@ LICENSE="LGPL-2.1" |
58 |
SLOT="0" |
59 |
KEYWORDS="" |
60 |
|
61 |
-IUSE="X declarative designer help multimedia opengl phonon script scripttools sql svg test webkit xmlpatterns" |
62 |
+IUSE="X declarative designer help multimedia opengl script scripttools sql svg test webkit xmlpatterns" |
63 |
REQUIRED_USE=" |
64 |
${PYTHON_REQUIRED_USE} |
65 |
declarative? ( X ) |
66 |
@@ -29,7 +27,6 @@ REQUIRED_USE=" |
67 |
help? ( X ) |
68 |
multimedia? ( X ) |
69 |
opengl? ( X ) |
70 |
- phonon? ( X ) |
71 |
scripttools? ( X script ) |
72 |
sql? ( X ) |
73 |
svg? ( X ) |
74 |
@@ -53,10 +50,6 @@ RDEPEND=" |
75 |
help? ( >=dev-qt/qthelp-${QT_PV} ) |
76 |
multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} ) |
77 |
opengl? ( >=dev-qt/qtopengl-${QT_PV} ) |
78 |
- phonon? ( || ( |
79 |
- media-libs/phonon[qt4(+)] |
80 |
- >=dev-qt/qtphonon-${QT_PV} |
81 |
- ) ) |
82 |
script? ( >=dev-qt/qtscript-${QT_PV} ) |
83 |
sql? ( >=dev-qt/qtsql-${QT_PV} ) |
84 |
svg? ( >=dev-qt/qtsvg-${QT_PV}[accessibility] ) |
85 |
@@ -67,15 +60,13 @@ DEPEND="${RDEPEND} |
86 |
>=dev-qt/qtgui-${QT_PV} |
87 |
" |
88 |
|
89 |
-S=${WORKDIR}/${MY_P} |
90 |
- |
91 |
DOCS=( ChangeLog ) |
92 |
|
93 |
src_prepare() { |
94 |
# Fix generated pkgconfig file to require the shiboken |
95 |
# library suffixed with the correct python version. |
96 |
sed -i -e '/^Requires:/ s/shiboken$/&@SHIBOKEN_PYTHON_SUFFIX@/' \ |
97 |
- libpyside/pyside.pc.in || die |
98 |
+ libpyside/pyside2.pc.in || die |
99 |
|
100 |
if use prefix; then |
101 |
cp "${FILESDIR}"/rpath.cmake . || die |
102 |
@@ -86,36 +77,29 @@ src_prepare() { |
103 |
} |
104 |
|
105 |
src_configure() { |
106 |
+ append-cxxflags -std=c++11 |
107 |
+ |
108 |
local mycmakeargs=( |
109 |
- $(cmake-utils_use_build test TESTS) |
110 |
- $(cmake-utils_use_disable X QtGui) |
111 |
- $(cmake-utils_use_disable X QtTest) |
112 |
- $(cmake-utils_use_disable declarative QtDeclarative) |
113 |
- $(cmake-utils_use_disable designer QtDesigner) |
114 |
- $(cmake-utils_use_disable designer QtUiTools) |
115 |
- $(cmake-utils_use_disable help QtHelp) |
116 |
- $(cmake-utils_use_disable multimedia QtMultimedia) |
117 |
- $(cmake-utils_use_disable opengl QtOpenGL) |
118 |
- $(cmake-utils_use_disable phonon) |
119 |
- $(cmake-utils_use_disable script QtScript) |
120 |
- $(cmake-utils_use_disable scripttools QtScriptTools) |
121 |
- $(cmake-utils_use_disable sql QtSql) |
122 |
- $(cmake-utils_use_disable svg QtSvg) |
123 |
- $(cmake-utils_use_disable webkit QtWebKit) |
124 |
- $(cmake-utils_use_disable xmlpatterns QtXmlPatterns) |
125 |
+ -DBUILD_TESTS=$(usex test) |
126 |
+ -DDISABLE_QtGui=$(usex !X) |
127 |
+ -DDISABLE_QtTest=$(usex !X) |
128 |
+ -DDISABLE_QtQml=$(usex !declarative) |
129 |
+ -DDISABLE_QtQuick=$(usex !declarative) |
130 |
+ -DDISABLE_QtQuickWidgets=$(usex !declarative) |
131 |
+ -DDISABLE_QtUiTools=$(usex !designer) |
132 |
+ -DDISABLE_QtHelp=$(usex !help) |
133 |
+ -DDISABLE_QtMultimedia=$(usex !multimedia) |
134 |
+ -DDISABLE_QtOpenGL=$(usex !opengl) |
135 |
+ -DDISABLE_QtScript=$(usex !script) |
136 |
+ -DDISABLE_QtScriptTools=$(usex !scripttools) |
137 |
+ -DDISABLE_QtSql=$(usex !sql) |
138 |
+ -DDISABLE_QtSvg=$(usex !svg) |
139 |
+ -DDISABLE_QtWebKit=$(usex !webkit) |
140 |
+ -DDISABLE_QtXmlPatterns=$(usex !xmlpatterns) |
141 |
) |
142 |
|
143 |
- if use phonon && has_version "media-libs/phonon[qt4(+)]"; then |
144 |
- # bug 475786 |
145 |
- mycmakeargs+=( |
146 |
- -DQT_PHONON_INCLUDE_DIR="${EPREFIX}/usr/include/phonon" |
147 |
- -DQT_PHONON_LIBRARY_RELEASE="${EPREFIX}/usr/$(get_libdir)/libphonon.so" |
148 |
- ) |
149 |
- fi |
150 |
- |
151 |
configuration() { |
152 |
local mycmakeargs=( |
153 |
- -DPYTHON_SUFFIX="-${EPYTHON}" |
154 |
"${mycmakeargs[@]}" |
155 |
) |
156 |
cmake-utils_src_configure |