commit: 79464d74ba7ddfe45a11e033a462848d7ce93294
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 17 08:46:24 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 08:46:24 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=79464d74
kde-frameworks: Move some dev-qt/* USE test from BDEPEND to DEPEND
Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kconfig/kconfig-9999.ebuild | 7 ++++---
kde-frameworks/kcrash/kcrash-9999.ebuild | 2 +-
kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild | 2 +-
kde-frameworks/khtml/khtml-9999.ebuild | 2 +-
kde-frameworks/ki18n/ki18n-9999.ebuild | 9 ++++-----
kde-frameworks/kio/kio-9999.ebuild | 4 +---
kde-frameworks/kitemmodels/kitemmodels-9999.ebuild | 2 +-
kde-frameworks/kservice/kservice-9999.ebuild | 7 ++++---
kde-frameworks/solid/solid-9999.ebuild | 7 ++++---
kde-frameworks/syndication/syndication-9999.ebuild | 12 ++++++------
10 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/kde-frameworks/kconfig/kconfig-9999.ebuild
b/kde-frameworks/kconfig/kconfig-9999.ebuild
index e35e32094b..a6d1b9ccac 100644
--- a/kde-frameworks/kconfig/kconfig-9999.ebuild
+++ b/kde-frameworks/kconfig/kconfig-9999.ebuild
@@ -13,14 +13,15 @@ IUSE="dbus nls"
BDEPEND="
nls? ( $(add_qt_dep linguist-tools) )
- test? ( $(add_qt_dep qtconcurrent) )
"
-DEPEND="
+RDEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtxml)
dbus? ( $(add_qt_dep qtdbus) )
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ test? ( $(add_qt_dep qtconcurrent) )
+"
# bug 560086
RESTRICT+=" test"
diff --git a/kde-frameworks/kcrash/kcrash-9999.ebuild
b/kde-frameworks/kcrash/kcrash-9999.ebuild
index 4b67a59c6e..edb3fad0e2 100644
--- a/kde-frameworks/kcrash/kcrash-9999.ebuild
+++ b/kde-frameworks/kcrash/kcrash-9999.ebuild
@@ -16,7 +16,6 @@ RESTRICT+=" test"
BDEPEND="
nls? ( $(add_qt_dep linguist-tools) )
- test? ( $(add_qt_dep qtwidgets) )
"
RDEPEND="
$(add_frameworks_dep kcoreaddons)
@@ -27,4 +26,5 @@ RDEPEND="
"
DEPEND="${RDEPEND}
x11-base/xorg-proto
+ test? ( $(add_qt_dep qtwidgets) )
"
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
index 0844dd2160..c20a24e815 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
@@ -16,7 +16,6 @@ IUSE="libressl X"
BDEPEND="
dev-lang/perl
dev-perl/URI
- test? ( $(add_qt_dep qtconcurrent) )
"
COMMON_DEPEND="
$(add_frameworks_dep kauth)
@@ -67,6 +66,7 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
$(add_qt_dep designer)
+ test? ( $(add_qt_dep qtconcurrent) )
X? ( x11-base/xorg-proto )
"
RDEPEND="${COMMON_DEPEND}
diff --git a/kde-frameworks/khtml/khtml-9999.ebuild
b/kde-frameworks/khtml/khtml-9999.ebuild
index 05e20f61c3..ccf59c3f4e 100644
--- a/kde-frameworks/khtml/khtml-9999.ebuild
+++ b/kde-frameworks/khtml/khtml-9999.ebuild
@@ -15,7 +15,6 @@ IUSE="libressl X"
BDEPEND="
dev-lang/perl
dev-util/gperf
- test? ( $(add_qt_dep qtx11extras) )
"
RDEPEND="
$(add_frameworks_dep karchive)
@@ -58,6 +57,7 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
+ test? ( $(add_qt_dep qtx11extras) )
X? ( x11-base/xorg-proto )
"
diff --git a/kde-frameworks/ki18n/ki18n-9999.ebuild
b/kde-frameworks/ki18n/ki18n-9999.ebuild
index c884c6d473..b452e1b707 100644
--- a/kde-frameworks/ki18n/ki18n-9999.ebuild
+++ b/kde-frameworks/ki18n/ki18n-9999.ebuild
@@ -13,15 +13,14 @@ IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-BDEPEND="
- test? ( $(add_qt_dep qtconcurrent) )
-"
-DEPEND="${PYTHON_DEPS}
+RDEPEND="${PYTHON_DEPS}
$(add_qt_dep qtdeclarative)
sys-devel/gettext
virtual/libintl
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ test? ( $(add_qt_dep qtconcurrent) )
+"
pkg_setup() {
kde5_pkg_setup
diff --git a/kde-frameworks/kio/kio-9999.ebuild
b/kde-frameworks/kio/kio-9999.ebuild
index 050102e386..75ede5aa4a 100644
--- a/kde-frameworks/kio/kio-9999.ebuild
+++ b/kde-frameworks/kio/kio-9999.ebuild
@@ -13,9 +13,6 @@ KEYWORDS=""
IUSE="acl +handbook kerberos +kwallet X"
# drop qtnetwork subslot operator when QT_MINIMAL >= 5.12.0
-BDEPEND="
- test? ( sys-libs/zlib )
-"
RDEPEND="
$(add_frameworks_dep kauth)
$(add_frameworks_dep karchive)
@@ -57,6 +54,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
$(add_qt_dep qtconcurrent)
+ test? ( sys-libs/zlib )
X? (
x11-base/xorg-proto
x11-libs/libX11
diff --git a/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild
b/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild
index 77fb4c606d..d213e59310 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild
@@ -11,4 +11,4 @@ LICENSE="LGPL-2+"
KEYWORDS=""
IUSE=""
-BDEPEND="test? ( $(add_qt_dep qtwidgets) )"
+DEPEND="test? ( $(add_qt_dep qtwidgets) )"
diff --git a/kde-frameworks/kservice/kservice-9999.ebuild
b/kde-frameworks/kservice/kservice-9999.ebuild
index 2862551b87..bf3a52cb30 100644
--- a/kde-frameworks/kservice/kservice-9999.ebuild
+++ b/kde-frameworks/kservice/kservice-9999.ebuild
@@ -14,9 +14,8 @@ BDEPEND="
sys-devel/bison
sys-devel/flex
man? ( $(add_frameworks_dep kdoctools) )
- test? ( $(add_qt_dep qtconcurrent) )
"
-DEPEND="
+RDEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
@@ -25,7 +24,9 @@ DEPEND="
$(add_qt_dep qtdbus)
$(add_qt_dep qtxml)
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ test? ( $(add_qt_dep qtconcurrent) )
+"
# requires running kde environment
RESTRICT+=" test"
diff --git a/kde-frameworks/solid/solid-9999.ebuild
b/kde-frameworks/solid/solid-9999.ebuild
index d42d3b1c34..eec12ad6bd 100644
--- a/kde-frameworks/solid/solid-9999.ebuild
+++ b/kde-frameworks/solid/solid-9999.ebuild
@@ -13,9 +13,8 @@ IUSE="nls"
BDEPEND="
nls? ( $(add_qt_dep linguist-tools) )
- test? ( $(add_qt_dep qtconcurrent) )
"
-DEPEND="
+RDEPEND="
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative)
$(add_qt_dep qtwidgets)
@@ -23,7 +22,9 @@ DEPEND="
sys-fs/udisks:2
virtual/udev
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ test? ( $(add_qt_dep qtconcurrent) )
+"
pkg_postinst() {
kde5_pkg_postinst
diff --git a/kde-frameworks/syndication/syndication-9999.ebuild
b/kde-frameworks/syndication/syndication-9999.ebuild
index ec10e5d1c1..9045049854 100644
--- a/kde-frameworks/syndication/syndication-9999.ebuild
+++ b/kde-frameworks/syndication/syndication-9999.ebuild
@@ -11,16 +11,16 @@ LICENSE="LGPL-2+"
KEYWORDS=""
IUSE=""
-BDEPEND="
+COMMON_DEPEND="
+ $(add_frameworks_dep kcodecs)
+ $(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
test? (
$(add_qt_dep qtnetwork)
$(add_qt_dep qtwidgets)
)
"
-DEPEND="
- $(add_frameworks_dep kcodecs)
- $(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
!kde-apps/syndication
"
