kde-apps: Move some bogus BDEPEND to DEPEND

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

18 files changed, 48 insertions, 46 deletions

diff --git a/kde-apps/akonadi-search/akonadi-search-18.12.49.9999.ebuild b/kde-apps/akonadi-search/akonadi-search-18.12.49.9999.ebuild
index 0a60945259..0a1a4156c1 100644
--- a/kde-apps/akonadi-search/akonadi-search-18.12.49.9999.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-18.12.49.9999.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
 IUSE=""
 
 BDEPEND="
-	test? ( $(add_kdeapps_dep akonadi 'mysql,postgres,sqlite,tools') )
+	test? ( $(add_kdeapps_dep akonadi 'tools') )
 "
 COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
@@ -38,6 +38,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
+	test? ( $(add_kdeapps_dep akonadi 'mysql,postgres,sqlite') )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
diff --git a/kde-apps/akonadi-search/akonadi-search-9999.ebuild b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
index ee7fbd5129..d1a645f968 100644
--- a/kde-apps/akonadi-search/akonadi-search-9999.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
 IUSE=""
 
 BDEPEND="
-	test? ( $(add_kdeapps_dep akonadi 'mysql,postgres,sqlite,tools') )
+	test? ( $(add_kdeapps_dep akonadi 'tools') )
 "
 COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
@@ -38,6 +38,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
+	test? ( $(add_kdeapps_dep akonadi 'mysql,postgres,sqlite') )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
diff --git a/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild b/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild
index ed92d10189..6bfce9dee7 100644
--- a/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild
@@ -18,9 +18,6 @@ IUSE="+mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
 
-BDEPEND="
-	test? ( sys-apps/dbus )
-"
 COMMON_DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -51,6 +48,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 	dev-libs/libxslt
+	test? ( sys-apps/dbus )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/akonadi:4
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 36490bdf17..9070a6e386 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -18,9 +18,6 @@ IUSE="+mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
 
-BDEPEND="
-	test? ( sys-apps/dbus )
-"
 COMMON_DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -51,6 +48,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 	dev-libs/libxslt
+	test? ( sys-apps/dbus )
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kapptemplate-17.11.80
diff --git a/kde-apps/kalarmcal/kalarmcal-18.12.49.9999.ebuild b/kde-apps/kalarmcal/kalarmcal-18.12.49.9999.ebuild
index bf7b3162c4..04e4a4a819 100644
--- a/kde-apps/kalarmcal/kalarmcal-18.12.49.9999.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-18.12.49.9999.ebuild
@@ -11,10 +11,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS=""
 IUSE=""
 
-BDEPEND="
-	test? ( $(add_qt_dep qtdbus) )
-"
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kholidays)
 	$(add_frameworks_dep ki18n)
@@ -24,7 +21,10 @@ DEPEND="
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_qt_dep qtgui)
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_qt_dep qtdbus) )
+"
+RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
 	!<kde-apps/kdepim-runtime-18.03.80
 "
diff --git a/kde-apps/kalarmcal/kalarmcal-9999.ebuild b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
index bf7b3162c4..04e4a4a819 100644
--- a/kde-apps/kalarmcal/kalarmcal-9999.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
@@ -11,10 +11,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS=""
 IUSE=""
 
-BDEPEND="
-	test? ( $(add_qt_dep qtdbus) )
-"
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kholidays)
 	$(add_frameworks_dep ki18n)
@@ -24,7 +21,10 @@ DEPEND="
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_qt_dep qtgui)
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_qt_dep qtdbus) )
+"
+RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
 	!<kde-apps/kdepim-runtime-18.03.80
 "
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.12.49.9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.12.49.9999.ebuild
index f27012b448..b81207a5b6 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-18.12.49.9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-18.12.49.9999.ebuild
@@ -16,7 +16,6 @@ IUSE="+oauth"
 # TODO kolab
 BDEPEND="
 	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep kimap 'test') )
 "
 COMMON_DEPEND="
 	$(add_frameworks_dep kcodecs)
@@ -69,6 +68,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtxmlpatterns)
+	test? ( $(add_kdeapps_dep kimap 'test') )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
index 312f3f0f04..46b423a923 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
@@ -16,7 +16,6 @@ IUSE=""
 # TODO kolab
 BDEPEND="
 	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep kimap 'test') )
 "
 COMMON_DEPEND="
 	$(add_frameworks_dep kcodecs)
@@ -69,6 +68,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtxmlpatterns)
+	test? ( $(add_kdeapps_dep kimap 'test') )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
diff --git a/kde-apps/kmail/kmail-18.12.49.9999.ebuild b/kde-apps/kmail/kmail-18.12.49.9999.ebuild
index 62f9eaea7b..7ea718a0ba 100644
--- a/kde-apps/kmail/kmail-18.12.49.9999.ebuild
+++ b/kde-apps/kmail/kmail-18.12.49.9999.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 BDEPEND="
 	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+	test? ( $(add_kdeapps_dep akonadi 'tools') )
 "
 COMMON_DEPEND="
 	$(add_frameworks_dep kbookmarks)
@@ -73,6 +73,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kcalutils)
 	$(add_kdeapps_dep kldap)
+	test? ( $(add_kdeapps_dep akonadi 'sqlite') )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
diff --git a/kde-apps/kmail/kmail-9999.ebuild b/kde-apps/kmail/kmail-9999.ebuild
index 44b76099ee..fef9873849 100644
--- a/kde-apps/kmail/kmail-9999.ebuild
+++ b/kde-apps/kmail/kmail-9999.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 BDEPEND="
 	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+	test? ( $(add_kdeapps_dep akonadi 'tools') )
 "
 COMMON_DEPEND="
 	$(add_frameworks_dep kbookmarks)
@@ -73,6 +73,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kcalutils)
 	$(add_kdeapps_dep kldap)
+	test? ( $(add_kdeapps_dep akonadi 'sqlite') )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
diff --git a/kde-apps/kmailtransport/kmailtransport-18.12.49.9999.ebuild b/kde-apps/kmailtransport/kmailtransport-18.12.49.9999.ebuild
index 5e452b9107..804819896a 100644
--- a/kde-apps/kmailtransport/kmailtransport-18.12.49.9999.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-18.12.49.9999.ebuild
@@ -11,10 +11,7 @@ LICENSE="LGPL-2.1+"
 KEYWORDS=""
 IUSE=""
 
-BDEPEND="
-	test? ( $(add_frameworks_dep ktextwidgets) )
-"
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -34,7 +31,10 @@ DEPEND="
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_frameworks_dep ktextwidgets) )
+"
+RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
 	!kde-apps/kdepimlibs:4
 "
diff --git a/kde-apps/kmailtransport/kmailtransport-9999.ebuild b/kde-apps/kmailtransport/kmailtransport-9999.ebuild
index 5e452b9107..804819896a 100644
--- a/kde-apps/kmailtransport/kmailtransport-9999.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-9999.ebuild
@@ -11,10 +11,7 @@ LICENSE="LGPL-2.1+"
 KEYWORDS=""
 IUSE=""
 
-BDEPEND="
-	test? ( $(add_frameworks_dep ktextwidgets) )
-"
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -34,7 +31,10 @@ DEPEND="
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_frameworks_dep ktextwidgets) )
+"
+RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
 	!kde-apps/kdepimlibs:4
 "
diff --git a/kde-apps/korganizer/korganizer-18.12.49.9999.ebuild b/kde-apps/korganizer/korganizer-18.12.49.9999.ebuild
index e4cd4304c9..d6529d4dab 100644
--- a/kde-apps/korganizer/korganizer-18.12.49.9999.ebuild
+++ b/kde-apps/korganizer/korganizer-18.12.49.9999.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=""
 IUSE="X"
 
 BDEPEND="
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+	test? ( $(add_kdeapps_dep akonadi 'tools') )
 "
 COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
@@ -72,6 +72,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kldap)
 	$(add_qt_dep designer)
+	test? ( $(add_kdeapps_dep akonadi 'sqlite') )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
diff --git a/kde-apps/korganizer/korganizer-9999.ebuild b/kde-apps/korganizer/korganizer-9999.ebuild
index da18e202ec..6fdf519ac9 100644
--- a/kde-apps/korganizer/korganizer-9999.ebuild
+++ b/kde-apps/korganizer/korganizer-9999.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=""
 IUSE="X"
 
 BDEPEND="
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+	test? ( $(add_kdeapps_dep akonadi 'tools') )
 "
 COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
@@ -72,6 +72,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kldap)
 	$(add_qt_dep designer)
+	test? ( $(add_kdeapps_dep akonadi 'sqlite') )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
diff --git a/kde-apps/kpimtextedit/kpimtextedit-18.12.49.9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-18.12.49.9999.ebuild
index 08c14d5b6c..fe4199870b 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-18.12.49.9999.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-18.12.49.9999.ebuild
@@ -13,10 +13,7 @@ LICENSE="LGPL-2.1+"
 KEYWORDS=""
 IUSE=""
 
-BDEPEND="
-	test? ( $(add_frameworks_dep ktextwidgets) )
-"
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -35,7 +32,10 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	dev-libs/grantlee:5
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_frameworks_dep ktextwidgets) )
+"
+RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
 "
 
diff --git a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
index 08c14d5b6c..fe4199870b 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
@@ -13,10 +13,7 @@ LICENSE="LGPL-2.1+"
 KEYWORDS=""
 IUSE=""
 
-BDEPEND="
-	test? ( $(add_frameworks_dep ktextwidgets) )
-"
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -35,7 +32,10 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	dev-libs/grantlee:5
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_frameworks_dep ktextwidgets) )
+"
+RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
 "
 
diff --git a/kde-apps/pimcommon/pimcommon-18.12.49.9999.ebuild b/kde-apps/pimcommon/pimcommon-18.12.49.9999.ebuild
index fc0594ff9b..dd8c44a8e2 100644
--- a/kde-apps/pimcommon/pimcommon-18.12.49.9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-18.12.49.9999.ebuild
@@ -15,7 +15,6 @@ IUSE="share"
 
 BDEPEND="
 	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep kmime) )
 "
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -50,6 +49,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kiconthemes)
+	test? ( $(add_kdeapps_dep kmime) )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
diff --git a/kde-apps/pimcommon/pimcommon-9999.ebuild b/kde-apps/pimcommon/pimcommon-9999.ebuild
index fc0594ff9b..dd8c44a8e2 100644
--- a/kde-apps/pimcommon/pimcommon-9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-9999.ebuild
@@ -15,7 +15,6 @@ IUSE="share"
 
 BDEPEND="
 	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep kmime) )
 "
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -50,6 +49,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kiconthemes)
+	test? ( $(add_kdeapps_dep kmime) )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4