Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/
Date: Sun, 05 Jun 2016 18:59:37
Message-Id: 1465153016.cbf9fed3838960a561fb7285214499d1f9e449f5.kensington@gentoo
1 commit: cbf9fed3838960a561fb7285214499d1f9e449f5
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Sat May 14 13:47:59 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 5 18:56:56 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cbf9fed3
7
8 kde-apps/akonadi: Use KDE_DESIGNERPLUGIN, force tests optional
9
10 Package-Manager: portage-2.2.28
11
12 kde-apps/akonadi/akonadi-16.04.1.ebuild | 14 ++++++--------
13 kde-apps/akonadi/akonadi-16.04.49.9999.ebuild | 14 ++++++--------
14 kde-apps/akonadi/akonadi-9999.ebuild | 14 ++++++--------
15 3 files changed, 18 insertions(+), 24 deletions(-)
16
17 diff --git a/kde-apps/akonadi/akonadi-16.04.1.ebuild b/kde-apps/akonadi/akonadi-16.04.1.ebuild
18 index 8327472..99ad093 100644
19 --- a/kde-apps/akonadi/akonadi-16.04.1.ebuild
20 +++ b/kde-apps/akonadi/akonadi-16.04.1.ebuild
21 @@ -4,17 +4,18 @@
22
23 EAPI=6
24
25 -KDE_DOXYGEN=true
26 -KDE_TEST=true
27 -VIRTUALDBUS_TEST=true
28 -VIRTUALX_REQUIRED=test
29 +KDE_DESIGNERPLUGIN="true"
30 +KDE_DOXYGEN="true"
31 +KDE_TEST="true"
32 +VIRTUALDBUS_TEST="true"
33 +VIRTUALX_REQUIRED="test"
34 inherit kde5
35
36 DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
37 HOMEPAGE="https://pim.kde.org/akonadi"
38 KEYWORDS="~amd64 ~x86"
39 LICENSE="LGPL-2.1"
40 -IUSE="designer +mysql postgres sqlite tools xml"
41 +IUSE="+mysql postgres sqlite tools xml"
42
43 REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
44
45 @@ -24,7 +25,6 @@ COMMON_DEPEND="
46 $(add_frameworks_dep kconfigwidgets)
47 $(add_frameworks_dep kcoreaddons)
48 $(add_frameworks_dep kdbusaddons)
49 - $(add_frameworks_dep kdesignerplugin)
50 $(add_frameworks_dep kguiaddons)
51 $(add_frameworks_dep ki18n)
52 $(add_frameworks_dep kiconthemes)
53 @@ -41,7 +41,6 @@ COMMON_DEPEND="
54 $(add_qt_dep qtwidgets)
55 $(add_qt_dep qtxml)
56 x11-misc/shared-mime-info
57 - designer? ( $(add_qt_dep designer) )
58 sqlite? ( dev-db/sqlite:3 )
59 tools? ( xml? ( dev-libs/libxml2 ) )
60 "
61 @@ -96,7 +95,6 @@ pkg_setup() {
62
63 src_configure() {
64 local mycmakeargs=(
65 - $(cmake-utils_use_find_package designer Qt5Designer)
66 -DAKONADI_BUILD_QSQLITE=$(usex sqlite)
67 -DBUILD_TOOLS=$(usex tools)
68 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
69
70 diff --git a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
71 index 1333734..85b3060 100644
72 --- a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
73 +++ b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
74 @@ -4,17 +4,18 @@
75
76 EAPI=6
77
78 -KDE_DOXYGEN=true
79 -KDE_TEST=true
80 -VIRTUALDBUS_TEST=true
81 -VIRTUALX_REQUIRED=test
82 +KDE_DESIGNERPLUGIN="true"
83 +KDE_DOXYGEN="true"
84 +KDE_TEST="true"
85 +VIRTUALDBUS_TEST="true"
86 +VIRTUALX_REQUIRED="test"
87 inherit kde5
88
89 DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
90 HOMEPAGE="https://pim.kde.org/akonadi"
91 KEYWORDS=""
92 LICENSE="LGPL-2.1"
93 -IUSE="designer +mysql postgres sqlite tools xml"
94 +IUSE="+mysql postgres sqlite tools xml"
95
96 REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
97
98 @@ -24,7 +25,6 @@ COMMON_DEPEND="
99 $(add_frameworks_dep kconfigwidgets)
100 $(add_frameworks_dep kcoreaddons)
101 $(add_frameworks_dep kdbusaddons)
102 - $(add_frameworks_dep kdesignerplugin)
103 $(add_frameworks_dep kguiaddons)
104 $(add_frameworks_dep ki18n)
105 $(add_frameworks_dep kiconthemes)
106 @@ -41,7 +41,6 @@ COMMON_DEPEND="
107 $(add_qt_dep qtwidgets)
108 $(add_qt_dep qtxml)
109 x11-misc/shared-mime-info
110 - designer? ( $(add_qt_dep designer) )
111 sqlite? ( dev-db/sqlite:3 )
112 tools? ( xml? ( dev-libs/libxml2 ) )
113 "
114 @@ -96,7 +95,6 @@ pkg_setup() {
115
116 src_configure() {
117 local mycmakeargs=(
118 - $(cmake-utils_use_find_package designer Qt5Designer)
119 -DAKONADI_BUILD_QSQLITE=$(usex sqlite)
120 -DBUILD_TOOLS=$(usex tools)
121 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
122
123 diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
124 index 849a687..7bc0012 100644
125 --- a/kde-apps/akonadi/akonadi-9999.ebuild
126 +++ b/kde-apps/akonadi/akonadi-9999.ebuild
127 @@ -4,18 +4,19 @@
128
129 EAPI=6
130
131 -KDE_DOXYGEN=true
132 -KDE_TEST=true
133 -VIRTUALDBUS_TEST=true
134 -VIRTUALX_REQUIRED=test
135 +KDE_DESIGNERPLUGIN="true"
136 +KDE_DOXYGEN="true"
137 +KDE_TEST="forceoptional"
138 QT_MINIMAL="5.6.0"
139 +VIRTUALDBUS_TEST="true"
140 +VIRTUALX_REQUIRED="test"
141 inherit kde5
142
143 DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
144 HOMEPAGE="https://pim.kde.org/akonadi"
145 KEYWORDS=""
146 LICENSE="LGPL-2.1"
147 -IUSE="designer +mysql postgres sqlite tools xml"
148 +IUSE="+mysql postgres sqlite tools xml"
149
150 REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
151
152 @@ -25,7 +26,6 @@ COMMON_DEPEND="
153 $(add_frameworks_dep kconfigwidgets)
154 $(add_frameworks_dep kcoreaddons)
155 $(add_frameworks_dep kdbusaddons)
156 - $(add_frameworks_dep kdesignerplugin)
157 $(add_frameworks_dep ki18n)
158 $(add_frameworks_dep kiconthemes)
159 $(add_frameworks_dep kio)
160 @@ -41,7 +41,6 @@ COMMON_DEPEND="
161 $(add_qt_dep qtwidgets)
162 $(add_qt_dep qtxml)
163 x11-misc/shared-mime-info
164 - designer? ( $(add_qt_dep designer) )
165 sqlite? ( dev-db/sqlite:3 )
166 tools? ( xml? ( dev-libs/libxml2 ) )
167 "
168 @@ -96,7 +95,6 @@ pkg_setup() {
169
170 src_configure() {
171 local mycmakeargs=(
172 - $(cmake-utils_use_find_package designer Qt5Designer)
173 -DAKONADI_BUILD_QSQLITE=$(usex sqlite)
174 -DBUILD_TOOLS=$(usex tools)
175 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
Report Message
Find on MARC Find on Google Groups