| 1 |
commit: cb4f05a0c21f6a738a41407462c13dffb3639416 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 31 18:40:34 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 6 01:28:23 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cb4f05a0 |
| 7 |
|
| 8 |
*/*: Switch to kde-frameworks/kholidays |
| 9 |
|
| 10 |
app-office/calligra/calligra-9999.ebuild | 2 +- |
| 11 |
app-office/kmymoney/kmymoney-5.0.9999.ebuild | 2 +- |
| 12 |
app-office/kmymoney/kmymoney-9999.ebuild | 2 +- |
| 13 |
kde-apps/calendarsupport/calendarsupport-17.12.49.9999.ebuild | 2 +- |
| 14 |
kde-apps/calendarsupport/calendarsupport-9999.ebuild | 2 +- |
| 15 |
kde-apps/kalarm/kalarm-17.12.49.9999.ebuild | 2 +- |
| 16 |
kde-apps/kalarm/kalarm-9999.ebuild | 2 +- |
| 17 |
kde-apps/kalarmcal/kalarmcal-17.12.49.9999.ebuild | 2 +- |
| 18 |
kde-apps/kalarmcal/kalarmcal-9999.ebuild | 2 +- |
| 19 |
kde-apps/kdepim-meta/kdepim-meta-17.12.49.9999.ebuild | 2 +- |
| 20 |
kde-apps/kdepim-meta/kdepim-meta-9999.ebuild | 1 - |
| 21 |
kde-apps/korganizer/korganizer-17.12.49.9999.ebuild | 2 +- |
| 22 |
kde-apps/korganizer/korganizer-9999.ebuild | 2 +- |
| 23 |
kde-plasma/plasma-workspace/plasma-workspace-5.12.0.ebuild | 2 +- |
| 24 |
kde-plasma/plasma-workspace/plasma-workspace-5.12.49.9999.ebuild | 2 +- |
| 25 |
kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 2 +- |
| 26 |
16 files changed, 15 insertions(+), 16 deletions(-) |
| 27 |
|
| 28 |
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild |
| 29 |
index 834247c72f..dc4aede4b5 100644 |
| 30 |
--- a/app-office/calligra/calligra-9999.ebuild |
| 31 |
+++ b/app-office/calligra/calligra-9999.ebuild |
| 32 |
@@ -110,8 +110,8 @@ COMMON_DEPEND=" |
| 33 |
okular? ( $(add_kdeapps_dep okular) ) |
| 34 |
) |
| 35 |
calligra_features_plan? ( |
| 36 |
+ $(add_frameworks_dep kholidays) |
| 37 |
$(add_frameworks_dep khtml) |
| 38 |
- $(add_kdeapps_dep kholidays) |
| 39 |
dev-libs/kdiagram:5 |
| 40 |
pim? ( |
| 41 |
$(add_kdeapps_dep kcalcore) |
| 42 |
|
| 43 |
diff --git a/app-office/kmymoney/kmymoney-5.0.9999.ebuild b/app-office/kmymoney/kmymoney-5.0.9999.ebuild |
| 44 |
index 2fd25f2ebb..c7a86f57c5 100644 |
| 45 |
--- a/app-office/kmymoney/kmymoney-5.0.9999.ebuild |
| 46 |
+++ b/app-office/kmymoney/kmymoney-5.0.9999.ebuild |
| 47 |
@@ -66,7 +66,7 @@ COMMON_DEPEND=" |
| 48 |
>=net-libs/aqbanking-5.6.5 |
| 49 |
>=sys-libs/gwenhywfar-4.15.3-r1[qt5] |
| 50 |
) |
| 51 |
- holidays? ( $(add_kdeapps_dep kholidays) ) |
| 52 |
+ holidays? ( $(add_frameworks_dep kholidays) ) |
| 53 |
ofx? ( dev-libs/libofx ) |
| 54 |
webkit? ( |
| 55 |
$(add_frameworks_dep kdewebkit) |
| 56 |
|
| 57 |
diff --git a/app-office/kmymoney/kmymoney-9999.ebuild b/app-office/kmymoney/kmymoney-9999.ebuild |
| 58 |
index bb66599b18..2a884c35cc 100644 |
| 59 |
--- a/app-office/kmymoney/kmymoney-9999.ebuild |
| 60 |
+++ b/app-office/kmymoney/kmymoney-9999.ebuild |
| 61 |
@@ -65,7 +65,7 @@ COMMON_DEPEND=" |
| 62 |
>=net-libs/aqbanking-5.6.5 |
| 63 |
>=sys-libs/gwenhywfar-4.15.3-r1[qt5] |
| 64 |
) |
| 65 |
- holidays? ( $(add_kdeapps_dep kholidays) ) |
| 66 |
+ holidays? ( $(add_frameworks_dep kholidays) ) |
| 67 |
ofx? ( dev-libs/libofx ) |
| 68 |
webkit? ( |
| 69 |
$(add_frameworks_dep kdewebkit) |
| 70 |
|
| 71 |
diff --git a/kde-apps/calendarsupport/calendarsupport-17.12.49.9999.ebuild b/kde-apps/calendarsupport/calendarsupport-17.12.49.9999.ebuild |
| 72 |
index f95b38bef1..83f507ee59 100644 |
| 73 |
--- a/kde-apps/calendarsupport/calendarsupport-17.12.49.9999.ebuild |
| 74 |
+++ b/kde-apps/calendarsupport/calendarsupport-17.12.49.9999.ebuild |
| 75 |
@@ -17,6 +17,7 @@ DEPEND=" |
| 76 |
$(add_frameworks_dep kconfig) |
| 77 |
$(add_frameworks_dep kcoreaddons) |
| 78 |
$(add_frameworks_dep kguiaddons) |
| 79 |
+ $(add_frameworks_dep kholidays) |
| 80 |
$(add_frameworks_dep ki18n) |
| 81 |
$(add_frameworks_dep kiconthemes) |
| 82 |
$(add_frameworks_dep kio) |
| 83 |
@@ -28,7 +29,6 @@ DEPEND=" |
| 84 |
$(add_kdeapps_dep kcalcore) |
| 85 |
$(add_kdeapps_dep kcalutils) |
| 86 |
$(add_kdeapps_dep kdepim-apps-libs) |
| 87 |
- $(add_kdeapps_dep kholidays) |
| 88 |
$(add_kdeapps_dep kidentitymanagement) |
| 89 |
$(add_kdeapps_dep kmime) |
| 90 |
$(add_kdeapps_dep libkdepim) |
| 91 |
|
| 92 |
diff --git a/kde-apps/calendarsupport/calendarsupport-9999.ebuild b/kde-apps/calendarsupport/calendarsupport-9999.ebuild |
| 93 |
index f95b38bef1..83f507ee59 100644 |
| 94 |
--- a/kde-apps/calendarsupport/calendarsupport-9999.ebuild |
| 95 |
+++ b/kde-apps/calendarsupport/calendarsupport-9999.ebuild |
| 96 |
@@ -17,6 +17,7 @@ DEPEND=" |
| 97 |
$(add_frameworks_dep kconfig) |
| 98 |
$(add_frameworks_dep kcoreaddons) |
| 99 |
$(add_frameworks_dep kguiaddons) |
| 100 |
+ $(add_frameworks_dep kholidays) |
| 101 |
$(add_frameworks_dep ki18n) |
| 102 |
$(add_frameworks_dep kiconthemes) |
| 103 |
$(add_frameworks_dep kio) |
| 104 |
@@ -28,7 +29,6 @@ DEPEND=" |
| 105 |
$(add_kdeapps_dep kcalcore) |
| 106 |
$(add_kdeapps_dep kcalutils) |
| 107 |
$(add_kdeapps_dep kdepim-apps-libs) |
| 108 |
- $(add_kdeapps_dep kholidays) |
| 109 |
$(add_kdeapps_dep kidentitymanagement) |
| 110 |
$(add_kdeapps_dep kmime) |
| 111 |
$(add_kdeapps_dep libkdepim) |
| 112 |
|
| 113 |
diff --git a/kde-apps/kalarm/kalarm-17.12.49.9999.ebuild b/kde-apps/kalarm/kalarm-17.12.49.9999.ebuild |
| 114 |
index 832ae08bf0..53a80d590a 100644 |
| 115 |
--- a/kde-apps/kalarm/kalarm-17.12.49.9999.ebuild |
| 116 |
+++ b/kde-apps/kalarm/kalarm-17.12.49.9999.ebuild |
| 117 |
@@ -23,6 +23,7 @@ DEPEND=" |
| 118 |
$(add_frameworks_dep kdbusaddons) |
| 119 |
$(add_frameworks_dep kdelibs4support) |
| 120 |
$(add_frameworks_dep kguiaddons) |
| 121 |
+ $(add_frameworks_dep kholidays) |
| 122 |
$(add_frameworks_dep ki18n) |
| 123 |
$(add_frameworks_dep kiconthemes) |
| 124 |
$(add_frameworks_dep kio) |
| 125 |
@@ -42,7 +43,6 @@ DEPEND=" |
| 126 |
$(add_kdeapps_dep kcalutils) |
| 127 |
$(add_kdeapps_dep kcontacts) |
| 128 |
$(add_kdeapps_dep kdepim-apps-libs) |
| 129 |
- $(add_kdeapps_dep kholidays) |
| 130 |
$(add_kdeapps_dep kidentitymanagement) |
| 131 |
$(add_kdeapps_dep kmailtransport) |
| 132 |
$(add_kdeapps_dep kmime) |
| 133 |
|
| 134 |
diff --git a/kde-apps/kalarm/kalarm-9999.ebuild b/kde-apps/kalarm/kalarm-9999.ebuild |
| 135 |
index 832ae08bf0..53a80d590a 100644 |
| 136 |
--- a/kde-apps/kalarm/kalarm-9999.ebuild |
| 137 |
+++ b/kde-apps/kalarm/kalarm-9999.ebuild |
| 138 |
@@ -23,6 +23,7 @@ DEPEND=" |
| 139 |
$(add_frameworks_dep kdbusaddons) |
| 140 |
$(add_frameworks_dep kdelibs4support) |
| 141 |
$(add_frameworks_dep kguiaddons) |
| 142 |
+ $(add_frameworks_dep kholidays) |
| 143 |
$(add_frameworks_dep ki18n) |
| 144 |
$(add_frameworks_dep kiconthemes) |
| 145 |
$(add_frameworks_dep kio) |
| 146 |
@@ -42,7 +43,6 @@ DEPEND=" |
| 147 |
$(add_kdeapps_dep kcalutils) |
| 148 |
$(add_kdeapps_dep kcontacts) |
| 149 |
$(add_kdeapps_dep kdepim-apps-libs) |
| 150 |
- $(add_kdeapps_dep kholidays) |
| 151 |
$(add_kdeapps_dep kidentitymanagement) |
| 152 |
$(add_kdeapps_dep kmailtransport) |
| 153 |
$(add_kdeapps_dep kmime) |
| 154 |
|
| 155 |
diff --git a/kde-apps/kalarmcal/kalarmcal-17.12.49.9999.ebuild b/kde-apps/kalarmcal/kalarmcal-17.12.49.9999.ebuild |
| 156 |
index b18dc3101f..6c47da7867 100644 |
| 157 |
--- a/kde-apps/kalarmcal/kalarmcal-17.12.49.9999.ebuild |
| 158 |
+++ b/kde-apps/kalarmcal/kalarmcal-17.12.49.9999.ebuild |
| 159 |
@@ -12,10 +12,10 @@ IUSE="" |
| 160 |
|
| 161 |
DEPEND=" |
| 162 |
$(add_frameworks_dep kdelibs4support) |
| 163 |
+ $(add_frameworks_dep kholidays) |
| 164 |
$(add_frameworks_dep ki18n) |
| 165 |
$(add_kdeapps_dep akonadi) |
| 166 |
$(add_kdeapps_dep kcalcore) |
| 167 |
- $(add_kdeapps_dep kholidays) |
| 168 |
$(add_kdeapps_dep kidentitymanagement) |
| 169 |
$(add_qt_dep qtgui) |
| 170 |
" |
| 171 |
|
| 172 |
diff --git a/kde-apps/kalarmcal/kalarmcal-9999.ebuild b/kde-apps/kalarmcal/kalarmcal-9999.ebuild |
| 173 |
index b18dc3101f..6c47da7867 100644 |
| 174 |
--- a/kde-apps/kalarmcal/kalarmcal-9999.ebuild |
| 175 |
+++ b/kde-apps/kalarmcal/kalarmcal-9999.ebuild |
| 176 |
@@ -12,10 +12,10 @@ IUSE="" |
| 177 |
|
| 178 |
DEPEND=" |
| 179 |
$(add_frameworks_dep kdelibs4support) |
| 180 |
+ $(add_frameworks_dep kholidays) |
| 181 |
$(add_frameworks_dep ki18n) |
| 182 |
$(add_kdeapps_dep akonadi) |
| 183 |
$(add_kdeapps_dep kcalcore) |
| 184 |
- $(add_kdeapps_dep kholidays) |
| 185 |
$(add_kdeapps_dep kidentitymanagement) |
| 186 |
$(add_qt_dep qtgui) |
| 187 |
" |
| 188 |
|
| 189 |
diff --git a/kde-apps/kdepim-meta/kdepim-meta-17.12.49.9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-17.12.49.9999.ebuild |
| 190 |
index 9509e86d81..b86fc2e42d 100644 |
| 191 |
--- a/kde-apps/kdepim-meta/kdepim-meta-17.12.49.9999.ebuild |
| 192 |
+++ b/kde-apps/kdepim-meta/kdepim-meta-17.12.49.9999.ebuild |
| 193 |
@@ -11,6 +11,7 @@ KEYWORDS="" |
| 194 |
IUSE="" |
| 195 |
|
| 196 |
RDEPEND=" |
| 197 |
+ $(add_frameworks_dep kholidays) |
| 198 |
$(add_kdeapps_dep akonadi) |
| 199 |
$(add_kdeapps_dep akonadiconsole) |
| 200 |
$(add_kdeapps_dep akonadi-calendar) |
| 201 |
@@ -35,7 +36,6 @@ RDEPEND=" |
| 202 |
$(add_kdeapps_dep kdepim-addons) |
| 203 |
$(add_kdeapps_dep kdepim-apps-libs) |
| 204 |
$(add_kdeapps_dep kdepim-runtime) |
| 205 |
- $(add_kdeapps_dep kholidays) |
| 206 |
$(add_kdeapps_dep kidentitymanagement) |
| 207 |
$(add_kdeapps_dep kimap) |
| 208 |
$(add_kdeapps_dep kldap) |
| 209 |
|
| 210 |
diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild |
| 211 |
index 9509e86d81..8486a72d96 100644 |
| 212 |
--- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild |
| 213 |
+++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild |
| 214 |
@@ -35,7 +35,6 @@ RDEPEND=" |
| 215 |
$(add_kdeapps_dep kdepim-addons) |
| 216 |
$(add_kdeapps_dep kdepim-apps-libs) |
| 217 |
$(add_kdeapps_dep kdepim-runtime) |
| 218 |
- $(add_kdeapps_dep kholidays) |
| 219 |
$(add_kdeapps_dep kidentitymanagement) |
| 220 |
$(add_kdeapps_dep kimap) |
| 221 |
$(add_kdeapps_dep kldap) |
| 222 |
|
| 223 |
diff --git a/kde-apps/korganizer/korganizer-17.12.49.9999.ebuild b/kde-apps/korganizer/korganizer-17.12.49.9999.ebuild |
| 224 |
index d4bc605459..cb315ee142 100644 |
| 225 |
--- a/kde-apps/korganizer/korganizer-17.12.49.9999.ebuild |
| 226 |
+++ b/kde-apps/korganizer/korganizer-17.12.49.9999.ebuild |
| 227 |
@@ -24,6 +24,7 @@ COMMON_DEPEND=" |
| 228 |
$(add_frameworks_dep kcrash) |
| 229 |
$(add_frameworks_dep kdbusaddons) |
| 230 |
$(add_frameworks_dep kdelibs4support) |
| 231 |
+ $(add_frameworks_dep kholidays) |
| 232 |
$(add_frameworks_dep ki18n) |
| 233 |
$(add_frameworks_dep kiconthemes) |
| 234 |
$(add_frameworks_dep kio) |
| 235 |
@@ -50,7 +51,6 @@ COMMON_DEPEND=" |
| 236 |
$(add_kdeapps_dep kcalutils) |
| 237 |
$(add_kdeapps_dep kcontacts) |
| 238 |
$(add_kdeapps_dep kdepim-apps-libs) |
| 239 |
- $(add_kdeapps_dep kholidays) |
| 240 |
$(add_kdeapps_dep kidentitymanagement) |
| 241 |
$(add_kdeapps_dep kmailtransport) |
| 242 |
$(add_kdeapps_dep kmime) |
| 243 |
|
| 244 |
diff --git a/kde-apps/korganizer/korganizer-9999.ebuild b/kde-apps/korganizer/korganizer-9999.ebuild |
| 245 |
index d4bc605459..cb315ee142 100644 |
| 246 |
--- a/kde-apps/korganizer/korganizer-9999.ebuild |
| 247 |
+++ b/kde-apps/korganizer/korganizer-9999.ebuild |
| 248 |
@@ -24,6 +24,7 @@ COMMON_DEPEND=" |
| 249 |
$(add_frameworks_dep kcrash) |
| 250 |
$(add_frameworks_dep kdbusaddons) |
| 251 |
$(add_frameworks_dep kdelibs4support) |
| 252 |
+ $(add_frameworks_dep kholidays) |
| 253 |
$(add_frameworks_dep ki18n) |
| 254 |
$(add_frameworks_dep kiconthemes) |
| 255 |
$(add_frameworks_dep kio) |
| 256 |
@@ -50,7 +51,6 @@ COMMON_DEPEND=" |
| 257 |
$(add_kdeapps_dep kcalutils) |
| 258 |
$(add_kdeapps_dep kcontacts) |
| 259 |
$(add_kdeapps_dep kdepim-apps-libs) |
| 260 |
- $(add_kdeapps_dep kholidays) |
| 261 |
$(add_kdeapps_dep kidentitymanagement) |
| 262 |
$(add_kdeapps_dep kmailtransport) |
| 263 |
$(add_kdeapps_dep kmime) |
| 264 |
|
| 265 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.12.0.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.12.0.ebuild |
| 266 |
index a1428902e1..dcc548329a 100644 |
| 267 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.12.0.ebuild |
| 268 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.12.0.ebuild |
| 269 |
@@ -77,7 +77,7 @@ COMMON_DEPEND=" |
| 270 |
x11-libs/xcb-util |
| 271 |
x11-libs/xcb-util-image |
| 272 |
appstream? ( dev-libs/appstream[qt5] ) |
| 273 |
- calendar? ( $(add_kdeapps_dep kholidays) ) |
| 274 |
+ calendar? ( || ( $(add_frameworks_dep kholidays) $(add_kdeapps_dep kholidays) ) ) |
| 275 |
geolocation? ( $(add_frameworks_dep networkmanager-qt) ) |
| 276 |
gps? ( sci-geosciences/gpsd ) |
| 277 |
prison? ( $(add_frameworks_dep prison) ) |
| 278 |
|
| 279 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.12.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.12.49.9999.ebuild |
| 280 |
index 5a0b1a6606..a33002f4fe 100644 |
| 281 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.12.49.9999.ebuild |
| 282 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.12.49.9999.ebuild |
| 283 |
@@ -77,7 +77,7 @@ COMMON_DEPEND=" |
| 284 |
x11-libs/xcb-util |
| 285 |
x11-libs/xcb-util-image |
| 286 |
appstream? ( dev-libs/appstream[qt5] ) |
| 287 |
- calendar? ( $(add_kdeapps_dep kholidays) ) |
| 288 |
+ calendar? ( $(add_frameworks_dep kholidays) ) |
| 289 |
geolocation? ( $(add_frameworks_dep networkmanager-qt) ) |
| 290 |
gps? ( sci-geosciences/gpsd ) |
| 291 |
prison? ( $(add_frameworks_dep prison) ) |
| 292 |
|
| 293 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 294 |
index a336104635..923f193500 100644 |
| 295 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 296 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 297 |
@@ -77,7 +77,7 @@ COMMON_DEPEND=" |
| 298 |
x11-libs/xcb-util |
| 299 |
x11-libs/xcb-util-image |
| 300 |
appstream? ( dev-libs/appstream[qt5] ) |
| 301 |
- calendar? ( $(add_kdeapps_dep kholidays) ) |
| 302 |
+ calendar? ( $(add_frameworks_dep kholidays) ) |
| 303 |
geolocation? ( $(add_frameworks_dep networkmanager-qt) ) |
| 304 |
gps? ( sci-geosciences/gpsd ) |
| 305 |
prison? ( $(add_frameworks_dep prison) ) |
Archives