1 |
commit: e29d93b85d758c74c4f8e90e52f051747dd33ea0 |
2 |
Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Sep 20 16:11:32 2016 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 26 16:09:03 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e29d93b8 |
7 |
|
8 |
media-libs/libmygpo-qt: add Qt5 support |
9 |
|
10 |
Gentoo Bug: 562588 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/2350 |
12 |
|
13 |
media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild | 73 ++++++++++++++++++++----- |
14 |
media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild | 73 ++++++++++++++++++++----- |
15 |
2 files changed, 118 insertions(+), 28 deletions(-) |
16 |
|
17 |
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild |
18 |
index cf7ac6c..5b6b821 100644 |
19 |
--- a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild |
20 |
+++ b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild |
21 |
@@ -2,38 +2,83 @@ |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
# $Id$ |
24 |
|
25 |
-EAPI=5 |
26 |
-inherit cmake-utils |
27 |
+EAPI=6 |
28 |
+inherit cmake-utils multibuild |
29 |
|
30 |
DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" |
31 |
HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt" |
32 |
|
33 |
if [[ ${PV} == *9999* ]]; then |
34 |
EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git" |
35 |
- KEYWORDS="" |
36 |
- SRC_URI="" |
37 |
- inherit git-2 |
38 |
+ inherit git-r3 |
39 |
else |
40 |
- KEYWORDS="~amd64 ~x86" |
41 |
SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
42 |
+ KEYWORDS="~amd64 ~x86" |
43 |
fi |
44 |
|
45 |
LICENSE="LGPL-2.1" |
46 |
SLOT="0" |
47 |
-IUSE="test" |
48 |
+IUSE="+qt4 qt5 test" |
49 |
+ |
50 |
+REQUIRED_USE="|| ( qt4 qt5 )" |
51 |
|
52 |
-RDEPEND="dev-qt/qtcore:4 |
53 |
- >=dev-libs/qjson-0.5" |
54 |
+RDEPEND=" |
55 |
+ qt4? ( |
56 |
+ >=dev-libs/qjson-0.5[qt4(+)] |
57 |
+ dev-qt/qtcore:4 |
58 |
+ ) |
59 |
+ qt5? ( |
60 |
+ dev-qt/qtcore:5 |
61 |
+ dev-qt/qtnetwork:5 |
62 |
+ ) |
63 |
+" |
64 |
DEPEND="${RDEPEND} |
65 |
virtual/pkgconfig |
66 |
- test? ( dev-qt/qttest:4 )" |
67 |
+ test? ( |
68 |
+ qt4? ( dev-qt/qttest:4 ) |
69 |
+ qt5? ( dev-qt/qttest:5 ) |
70 |
+ ) |
71 |
+" |
72 |
|
73 |
DOCS=( AUTHORS README ) |
74 |
PATCHES=( ${FILESDIR}/${PN}-1.0.8-fix-JsonCreatorTest-failure.patch ) |
75 |
|
76 |
+pkg_setup() { |
77 |
+ MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) |
78 |
+ if use qt5; then |
79 |
+ ewarn "Please note that Qt5 support is still experimental." |
80 |
+ ewarn "If you find anything to not work with Qt5, please report a bug." |
81 |
+ fi |
82 |
+} |
83 |
+ |
84 |
src_configure() { |
85 |
- local mycmakeargs=( |
86 |
- $(cmake-utils_use test MYGPO_BUILD_TESTS) |
87 |
- ) |
88 |
- cmake-utils_src_configure |
89 |
+ myconfigure() { |
90 |
+ local mycmakeargs=( |
91 |
+ -DMYGPO_BUILD_TESTS=$(usex test) |
92 |
+ ) |
93 |
+ |
94 |
+ if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then |
95 |
+ mycmakeargs+=(-DBUILD_WITH_QT4=ON) |
96 |
+ fi |
97 |
+ |
98 |
+ if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then |
99 |
+ mycmakeargs+=(-DBUILD_WITH_QT4=OFF) |
100 |
+ fi |
101 |
+ |
102 |
+ cmake-utils_src_configure |
103 |
+ } |
104 |
+ |
105 |
+ multibuild_foreach_variant myconfigure |
106 |
+} |
107 |
+ |
108 |
+src_compile() { |
109 |
+ multibuild_foreach_variant cmake-utils_src_compile |
110 |
+} |
111 |
+ |
112 |
+src_test() { |
113 |
+ multibuild_foreach_variant cmake-utils_src_test |
114 |
+} |
115 |
+ |
116 |
+src_install() { |
117 |
+ multibuild_foreach_variant cmake-utils_src_install |
118 |
} |
119 |
|
120 |
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild |
121 |
index af69ab2..60f6697 100644 |
122 |
--- a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild |
123 |
+++ b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild |
124 |
@@ -2,37 +2,82 @@ |
125 |
# Distributed under the terms of the GNU General Public License v2 |
126 |
# $Id$ |
127 |
|
128 |
-EAPI=5 |
129 |
-inherit cmake-utils |
130 |
+EAPI=6 |
131 |
+inherit cmake-utils multibuild |
132 |
|
133 |
DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" |
134 |
HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt" |
135 |
|
136 |
if [[ ${PV} == *9999* ]]; then |
137 |
EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git" |
138 |
- KEYWORDS="" |
139 |
- SRC_URI="" |
140 |
- inherit git-2 |
141 |
+ inherit git-r3 |
142 |
else |
143 |
- KEYWORDS="~amd64 ~x86" |
144 |
SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
145 |
+ KEYWORDS="~amd64 ~x86" |
146 |
fi |
147 |
|
148 |
LICENSE="LGPL-2.1" |
149 |
SLOT="0" |
150 |
-IUSE="test" |
151 |
+IUSE="+qt4 qt5 test" |
152 |
+ |
153 |
+REQUIRED_USE="|| ( qt4 qt5 )" |
154 |
|
155 |
-RDEPEND="dev-qt/qtcore:4 |
156 |
- >=dev-libs/qjson-0.5" |
157 |
+RDEPEND=" |
158 |
+ qt4? ( |
159 |
+ >=dev-libs/qjson-0.5[qt4(+)] |
160 |
+ dev-qt/qtcore:4 |
161 |
+ ) |
162 |
+ qt5? ( |
163 |
+ dev-qt/qtcore:5 |
164 |
+ dev-qt/qtnetwork:5 |
165 |
+ ) |
166 |
+" |
167 |
DEPEND="${RDEPEND} |
168 |
virtual/pkgconfig |
169 |
- test? ( dev-qt/qttest:4 )" |
170 |
+ test? ( |
171 |
+ qt4? ( dev-qt/qttest:4 ) |
172 |
+ qt5? ( dev-qt/qttest:5 ) |
173 |
+ ) |
174 |
+" |
175 |
|
176 |
DOCS=( AUTHORS README ) |
177 |
|
178 |
+pkg_setup() { |
179 |
+ MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) |
180 |
+ if use qt5; then |
181 |
+ ewarn "Please note that Qt5 support is still experimental." |
182 |
+ ewarn "If you find anything to not work with Qt5, please report a bug." |
183 |
+ fi |
184 |
+} |
185 |
+ |
186 |
src_configure() { |
187 |
- local mycmakeargs=( |
188 |
- $(cmake-utils_use test MYGPO_BUILD_TESTS) |
189 |
- ) |
190 |
- cmake-utils_src_configure |
191 |
+ myconfigure() { |
192 |
+ local mycmakeargs=( |
193 |
+ -DMYGPO_BUILD_TESTS=$(usex test) |
194 |
+ ) |
195 |
+ |
196 |
+ if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then |
197 |
+ mycmakeargs+=(-DBUILD_WITH_QT4=ON) |
198 |
+ fi |
199 |
+ |
200 |
+ if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then |
201 |
+ mycmakeargs+=(-DBUILD_WITH_QT4=OFF) |
202 |
+ fi |
203 |
+ |
204 |
+ cmake-utils_src_configure |
205 |
+ } |
206 |
+ |
207 |
+ multibuild_foreach_variant myconfigure |
208 |
+} |
209 |
+ |
210 |
+src_compile() { |
211 |
+ multibuild_foreach_variant cmake-utils_src_compile |
212 |
+} |
213 |
+ |
214 |
+src_test() { |
215 |
+ multibuild_foreach_variant cmake-utils_src_test |
216 |
+} |
217 |
+ |
218 |
+src_install() { |
219 |
+ multibuild_foreach_variant cmake-utils_src_install |
220 |
} |