1 |
commit: 96a193835c5436dd9fc192be3436e0b818dc2632 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 22 18:16:41 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 22 18:38:01 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96a19383 |
7 |
|
8 |
media-libs/libmygpo-qt: Drop USE=qt4,qt5 and multibuild |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild | 67 +++++--------------------- |
13 |
1 file changed, 12 insertions(+), 55 deletions(-) |
14 |
|
15 |
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild |
16 |
index 6a6e0b5b0b2..bbdf31f17c5 100644 |
17 |
--- a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild |
18 |
+++ b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild |
19 |
@@ -1,8 +1,9 @@ |
20 |
-# Copyright 1999-2016 Gentoo Foundation |
21 |
+# Copyright 1999-2018 Gentoo Foundation |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
EAPI=6 |
25 |
-inherit cmake-utils multibuild |
26 |
+ |
27 |
+inherit cmake-utils |
28 |
|
29 |
DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" |
30 |
HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt" |
31 |
@@ -17,66 +18,22 @@ fi |
32 |
|
33 |
LICENSE="LGPL-2.1" |
34 |
SLOT="0" |
35 |
-IUSE="+qt4 qt5 test" |
36 |
- |
37 |
-REQUIRED_USE="|| ( qt4 qt5 )" |
38 |
+IUSE="test" |
39 |
|
40 |
RDEPEND=" |
41 |
- qt4? ( |
42 |
- >=dev-libs/qjson-0.5[qt4(+)] |
43 |
- dev-qt/qtcore:4 |
44 |
- ) |
45 |
- qt5? ( |
46 |
- dev-qt/qtcore:5 |
47 |
- dev-qt/qtnetwork:5 |
48 |
- ) |
49 |
+ dev-qt/qtcore:5 |
50 |
+ dev-qt/qtnetwork:5 |
51 |
" |
52 |
DEPEND="${RDEPEND} |
53 |
virtual/pkgconfig |
54 |
- test? ( |
55 |
- qt4? ( dev-qt/qttest:4 ) |
56 |
- qt5? ( dev-qt/qttest:5 ) |
57 |
- ) |
58 |
+ test? ( dev-qt/qttest:5 ) |
59 |
" |
60 |
|
61 |
-DOCS=( AUTHORS README ) |
62 |
- |
63 |
-pkg_setup() { |
64 |
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) |
65 |
- if use qt5; then |
66 |
- ewarn "Please note that Qt5 support is still experimental." |
67 |
- ewarn "If you find anything to not work with Qt5, please report a bug." |
68 |
- fi |
69 |
-} |
70 |
- |
71 |
src_configure() { |
72 |
- myconfigure() { |
73 |
- local mycmakeargs=( |
74 |
- -DMYGPO_BUILD_TESTS=$(usex test) |
75 |
- ) |
76 |
- |
77 |
- if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then |
78 |
- mycmakeargs+=(-DBUILD_WITH_QT4=ON) |
79 |
- fi |
80 |
- |
81 |
- if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then |
82 |
- mycmakeargs+=(-DBUILD_WITH_QT4=OFF) |
83 |
- fi |
84 |
- |
85 |
- cmake-utils_src_configure |
86 |
- } |
87 |
- |
88 |
- multibuild_foreach_variant myconfigure |
89 |
-} |
90 |
- |
91 |
-src_compile() { |
92 |
- multibuild_foreach_variant cmake-utils_src_compile |
93 |
-} |
94 |
- |
95 |
-src_test() { |
96 |
- multibuild_foreach_variant cmake-utils_src_test |
97 |
-} |
98 |
+ local mycmakeargs=( |
99 |
+ -DBUILD_WITH_QT4=OFF |
100 |
+ -DMYGPO_BUILD_TESTS=$(usex test) |
101 |
+ ) |
102 |
|
103 |
-src_install() { |
104 |
- multibuild_foreach_variant cmake-utils_src_install |
105 |
+ cmake-utils_src_configure |
106 |
} |