1 |
commit: 1621ee760ff8b1b45751424efc762fc427fd6b19 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 30 10:45:12 2018 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 30 10:45:23 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1621ee76 |
7 |
|
8 |
net-libs/jreen: sync with main tree |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
net-libs/jreen/jreen-9999.ebuild | 52 +++++++--------------------------------- |
13 |
1 file changed, 9 insertions(+), 43 deletions(-) |
14 |
|
15 |
diff --git a/net-libs/jreen/jreen-9999.ebuild b/net-libs/jreen/jreen-9999.ebuild |
16 |
index 28f97670c7..e71c537a02 100644 |
17 |
--- a/net-libs/jreen/jreen-9999.ebuild |
18 |
+++ b/net-libs/jreen/jreen-9999.ebuild |
19 |
@@ -8,66 +8,32 @@ if [[ ${PV} != *9999* ]]; then |
20 |
KEYWORDS="~amd64 ~ppc ~x86" |
21 |
else |
22 |
GIT_ECLASS="git-r3" |
23 |
- EGIT_REPO_URI=( "https://github.com/euroelessar/${PN}" ) |
24 |
+ EGIT_REPO_URI="https://github.com/euroelessar/${PN}.git" |
25 |
fi |
26 |
|
27 |
-inherit cmake-utils multibuild ${GIT_ECLASS} |
28 |
+inherit cmake-utils ${GIT_ECLASS} |
29 |
|
30 |
DESCRIPTION="Qt XMPP library" |
31 |
HOMEPAGE="https://github.com/euroelessar/jreen" |
32 |
|
33 |
LICENSE="GPL-2" |
34 |
SLOT="0" |
35 |
-IUSE="debug qt4 +qt5" |
36 |
- |
37 |
-REQUIRED_USE="|| ( qt4 qt5 )" |
38 |
+IUSE="debug" |
39 |
|
40 |
DEPEND=" |
41 |
+ dev-qt/qtcore:5 |
42 |
+ dev-qt/qtnetwork:5 |
43 |
media-libs/speex |
44 |
net-libs/libgsasl |
45 |
sys-libs/zlib |
46 |
- qt4? ( |
47 |
- dev-qt/qtcore:4[ssl] |
48 |
- dev-qt/qtgui:4 |
49 |
- ) |
50 |
- qt5? ( |
51 |
- dev-qt/qtcore:5 |
52 |
- dev-qt/qtnetwork:5 |
53 |
- ) |
54 |
" |
55 |
RDEPEND="${DEPEND}" |
56 |
|
57 |
DOCS=( AUTHORS ChangeLog README.md ) |
58 |
|
59 |
-pkg_setup() { |
60 |
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) |
61 |
-} |
62 |
- |
63 |
src_configure() { |
64 |
- myconfigure() { |
65 |
- local mycmakeargs=() |
66 |
- |
67 |
- if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then |
68 |
- mycmakeargs+=( -DJREEN_FORCE_QT4=ON ) |
69 |
- fi |
70 |
- if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then |
71 |
- mycmakeargs+=( -DJREEN_FORCE_QT4=OFF ) |
72 |
- fi |
73 |
- |
74 |
- cmake-utils_src_configure |
75 |
- } |
76 |
- |
77 |
- multibuild_foreach_variant myconfigure |
78 |
-} |
79 |
- |
80 |
-src_compile() { |
81 |
- multibuild_foreach_variant cmake-utils_src_compile |
82 |
-} |
83 |
- |
84 |
-src_test() { |
85 |
- multibuild_foreach_variant cmake-utils_src_test |
86 |
-} |
87 |
- |
88 |
-src_install() { |
89 |
- multibuild_foreach_variant cmake-utils_src_install |
90 |
+ local mycmakeargs=( |
91 |
+ -DJREEN_FORCE_QT4=OFF |
92 |
+ ) |
93 |
+ cmake-utils_src_configure |
94 |
} |