commit: cb4f05a0c21f6a738a41407462c13dffb3639416
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 31 18:40:34 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 01:28:23 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cb4f05a0
*/*: Switch to kde-frameworks/kholidays
app-office/calligra/calligra-9999.ebuild | 2 +-
app-office/kmymoney/kmymoney-5.0.9999.ebuild | 2 +-
app-office/kmymoney/kmymoney-9999.ebuild | 2 +-
kde-apps/calendarsupport/calendarsupport-17.12.49.9999.ebuild | 2 +-
kde-apps/calendarsupport/calendarsupport-9999.ebuild | 2 +-
kde-apps/kalarm/kalarm-17.12.49.9999.ebuild | 2 +-
kde-apps/kalarm/kalarm-9999.ebuild | 2 +-
kde-apps/kalarmcal/kalarmcal-17.12.49.9999.ebuild | 2 +-
kde-apps/kalarmcal/kalarmcal-9999.ebuild | 2 +-
kde-apps/kdepim-meta/kdepim-meta-17.12.49.9999.ebuild | 2 +-
kde-apps/kdepim-meta/kdepim-meta-9999.ebuild | 1 -
kde-apps/korganizer/korganizer-17.12.49.9999.ebuild | 2 +-
kde-apps/korganizer/korganizer-9999.ebuild | 2 +-
kde-plasma/plasma-workspace/plasma-workspace-5.12.0.ebuild | 2 +-
kde-plasma/plasma-workspace/plasma-workspace-5.12.49.9999.ebuild | 2 +-
kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 2 +-
16 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/app-office/calligra/calligra-9999.ebuild
b/app-office/calligra/calligra-9999.ebuild
index 834247c72f..dc4aede4b5 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -110,8 +110,8 @@ COMMON_DEPEND="
okular? ( $(add_kdeapps_dep okular) )
)
calligra_features_plan? (
+ $(add_frameworks_dep kholidays)
$(add_frameworks_dep khtml)
- $(add_kdeapps_dep kholidays)
dev-libs/kdiagram:5
pim? (
$(add_kdeapps_dep kcalcore)
diff --git a/app-office/kmymoney/kmymoney-5.0.9999.ebuild
b/app-office/kmymoney/kmymoney-5.0.9999.ebuild
index 2fd25f2ebb..c7a86f57c5 100644
--- a/app-office/kmymoney/kmymoney-5.0.9999.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.9999.ebuild
@@ -66,7 +66,7 @@ COMMON_DEPEND="
>=net-libs/aqbanking-5.6.5
>=sys-libs/gwenhywfar-4.15.3-r1[qt5]
)
- holidays? ( $(add_kdeapps_dep kholidays) )
+ holidays? ( $(add_frameworks_dep kholidays) )
ofx? ( dev-libs/libofx )
webkit? (
$(add_frameworks_dep kdewebkit)
diff --git a/app-office/kmymoney/kmymoney-9999.ebuild
b/app-office/kmymoney/kmymoney-9999.ebuild
index bb66599b18..2a884c35cc 100644
--- a/app-office/kmymoney/kmymoney-9999.ebuild
+++ b/app-office/kmymoney/kmymoney-9999.ebuild
@@ -65,7 +65,7 @@ COMMON_DEPEND="
>=net-libs/aqbanking-5.6.5
>=sys-libs/gwenhywfar-4.15.3-r1[qt5]
)
- holidays? ( $(add_kdeapps_dep kholidays) )
+ holidays? ( $(add_frameworks_dep kholidays) )
ofx? ( dev-libs/libofx )
webkit? (
$(add_frameworks_dep kdewebkit)
diff --git a/kde-apps/calendarsupport/calendarsupport-17.12.49.9999.ebuild
b/kde-apps/calendarsupport/calendarsupport-17.12.49.9999.ebuild
index f95b38bef1..83f507ee59 100644
--- a/kde-apps/calendarsupport/calendarsupport-17.12.49.9999.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-17.12.49.9999.ebuild
@@ -17,6 +17,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep kholidays)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
@@ -28,7 +29,6 @@ DEPEND="
$(add_kdeapps_dep kcalcore)
$(add_kdeapps_dep kcalutils)
$(add_kdeapps_dep kdepim-apps-libs)
- $(add_kdeapps_dep kholidays)
$(add_kdeapps_dep kidentitymanagement)
$(add_kdeapps_dep kmime)
$(add_kdeapps_dep libkdepim)
diff --git a/kde-apps/calendarsupport/calendarsupport-9999.ebuild
b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
index f95b38bef1..83f507ee59 100644
--- a/kde-apps/calendarsupport/calendarsupport-9999.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
@@ -17,6 +17,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep kholidays)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
@@ -28,7 +29,6 @@ DEPEND="
$(add_kdeapps_dep kcalcore)
$(add_kdeapps_dep kcalutils)
$(add_kdeapps_dep kdepim-apps-libs)
- $(add_kdeapps_dep kholidays)
$(add_kdeapps_dep kidentitymanagement)
$(add_kdeapps_dep kmime)
$(add_kdeapps_dep libkdepim)
diff --git a/kde-apps/kalarm/kalarm-17.12.49.9999.ebuild
b/kde-apps/kalarm/kalarm-17.12.49.9999.ebuild
index 832ae08bf0..53a80d590a 100644
--- a/kde-apps/kalarm/kalarm-17.12.49.9999.ebuild
+++ b/kde-apps/kalarm/kalarm-17.12.49.9999.ebuild
@@ -23,6 +23,7 @@ DEPEND="
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep kholidays)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
@@ -42,7 +43,6 @@ DEPEND="
$(add_kdeapps_dep kcalutils)
$(add_kdeapps_dep kcontacts)
$(add_kdeapps_dep kdepim-apps-libs)
- $(add_kdeapps_dep kholidays)
$(add_kdeapps_dep kidentitymanagement)
$(add_kdeapps_dep kmailtransport)
$(add_kdeapps_dep kmime)
diff --git a/kde-apps/kalarm/kalarm-9999.ebuild
b/kde-apps/kalarm/kalarm-9999.ebuild
index 832ae08bf0..53a80d590a 100644
--- a/kde-apps/kalarm/kalarm-9999.ebuild
+++ b/kde-apps/kalarm/kalarm-9999.ebuild
@@ -23,6 +23,7 @@ DEPEND="
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep kholidays)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
@@ -42,7 +43,6 @@ DEPEND="
$(add_kdeapps_dep kcalutils)
$(add_kdeapps_dep kcontacts)
$(add_kdeapps_dep kdepim-apps-libs)
- $(add_kdeapps_dep kholidays)
$(add_kdeapps_dep kidentitymanagement)
$(add_kdeapps_dep kmailtransport)
$(add_kdeapps_dep kmime)
diff --git a/kde-apps/kalarmcal/kalarmcal-17.12.49.9999.ebuild
b/kde-apps/kalarmcal/kalarmcal-17.12.49.9999.ebuild
index b18dc3101f..6c47da7867 100644
--- a/kde-apps/kalarmcal/kalarmcal-17.12.49.9999.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-17.12.49.9999.ebuild
@@ -12,10 +12,10 @@ IUSE=""
DEPEND="
$(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kholidays)
$(add_frameworks_dep ki18n)
$(add_kdeapps_dep akonadi)
$(add_kdeapps_dep kcalcore)
- $(add_kdeapps_dep kholidays)
$(add_kdeapps_dep kidentitymanagement)
$(add_qt_dep qtgui)
"
diff --git a/kde-apps/kalarmcal/kalarmcal-9999.ebuild
b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
index b18dc3101f..6c47da7867 100644
--- a/kde-apps/kalarmcal/kalarmcal-9999.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
@@ -12,10 +12,10 @@ IUSE=""
DEPEND="
$(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kholidays)
$(add_frameworks_dep ki18n)
$(add_kdeapps_dep akonadi)
$(add_kdeapps_dep kcalcore)
- $(add_kdeapps_dep kholidays)
$(add_kdeapps_dep kidentitymanagement)
$(add_qt_dep qtgui)
"
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
index 9509e86d81..b86fc2e42d 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-17.12.49.9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-17.12.49.9999.ebuild
@@ -11,6 +11,7 @@ KEYWORDS=""
IUSE=""
RDEPEND="
+ $(add_frameworks_dep kholidays)
$(add_kdeapps_dep akonadi)
$(add_kdeapps_dep akonadiconsole)
$(add_kdeapps_dep akonadi-calendar)
@@ -35,7 +36,6 @@ RDEPEND="
$(add_kdeapps_dep kdepim-addons)
$(add_kdeapps_dep kdepim-apps-libs)
$(add_kdeapps_dep kdepim-runtime)
- $(add_kdeapps_dep kholidays)
$(add_kdeapps_dep kidentitymanagement)
$(add_kdeapps_dep kimap)
$(add_kdeapps_dep kldap)
diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
index 9509e86d81..8486a72d96 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
@@ -35,7 +35,6 @@ RDEPEND="
$(add_kdeapps_dep kdepim-addons)
$(add_kdeapps_dep kdepim-apps-libs)
$(add_kdeapps_dep kdepim-runtime)
- $(add_kdeapps_dep kholidays)
$(add_kdeapps_dep kidentitymanagement)
$(add_kdeapps_dep kimap)
$(add_kdeapps_dep kldap)
diff --git a/kde-apps/korganizer/korganizer-17.12.49.9999.ebuild
b/kde-apps/korganizer/korganizer-17.12.49.9999.ebuild
index d4bc605459..cb315ee142 100644
--- a/kde-apps/korganizer/korganizer-17.12.49.9999.ebuild
+++ b/kde-apps/korganizer/korganizer-17.12.49.9999.ebuild
@@ -24,6 +24,7 @@ COMMON_DEPEND="
$(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kholidays)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
@@ -50,7 +51,6 @@ COMMON_DEPEND="
$(add_kdeapps_dep kcalutils)
$(add_kdeapps_dep kcontacts)
$(add_kdeapps_dep kdepim-apps-libs)
- $(add_kdeapps_dep kholidays)
$(add_kdeapps_dep kidentitymanagement)
$(add_kdeapps_dep kmailtransport)
$(add_kdeapps_dep kmime)
diff --git a/kde-apps/korganizer/korganizer-9999.ebuild
b/kde-apps/korganizer/korganizer-9999.ebuild
index d4bc605459..cb315ee142 100644
--- a/kde-apps/korganizer/korganizer-9999.ebuild
+++ b/kde-apps/korganizer/korganizer-9999.ebuild
@@ -24,6 +24,7 @@ COMMON_DEPEND="
$(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kholidays)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
@@ -50,7 +51,6 @@ COMMON_DEPEND="
$(add_kdeapps_dep kcalutils)
$(add_kdeapps_dep kcontacts)
$(add_kdeapps_dep kdepim-apps-libs)
- $(add_kdeapps_dep kholidays)
$(add_kdeapps_dep kidentitymanagement)
$(add_kdeapps_dep kmailtransport)
$(add_kdeapps_dep kmime)
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.12.0.ebuild
b/kde-plasma/plasma-workspace/plasma-workspace-5.12.0.ebuild
index a1428902e1..dcc548329a 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.12.0.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.12.0.ebuild
@@ -77,7 +77,7 @@ COMMON_DEPEND="
x11-libs/xcb-util
x11-libs/xcb-util-image
appstream? ( dev-libs/appstream[qt5] )
- calendar? ( $(add_kdeapps_dep kholidays) )
+ calendar? ( || ( $(add_frameworks_dep kholidays) $(add_kdeapps_dep
kholidays) ) )
geolocation? ( $(add_frameworks_dep networkmanager-qt) )
gps? ( sci-geosciences/gpsd )
prison? ( $(add_frameworks_dep prison) )
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
index 5a0b1a6606..a33002f4fe 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.12.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.12.49.9999.ebuild
@@ -77,7 +77,7 @@ COMMON_DEPEND="
x11-libs/xcb-util
x11-libs/xcb-util-image
appstream? ( dev-libs/appstream[qt5] )
- calendar? ( $(add_kdeapps_dep kholidays) )
+ calendar? ( $(add_frameworks_dep kholidays) )
geolocation? ( $(add_frameworks_dep networkmanager-qt) )
gps? ( sci-geosciences/gpsd )
prison? ( $(add_frameworks_dep prison) )
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index a336104635..923f193500 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -77,7 +77,7 @@ COMMON_DEPEND="
x11-libs/xcb-util
x11-libs/xcb-util-image
appstream? ( dev-libs/appstream[qt5] )
- calendar? ( $(add_kdeapps_dep kholidays) )
+ calendar? ( $(add_frameworks_dep kholidays) )
geolocation? ( $(add_frameworks_dep networkmanager-qt) )
gps? ( sci-geosciences/gpsd )
prison? ( $(add_frameworks_dep prison) )
