* [gentoo-commits] proj/kde:master commit in: kde-frameworks/baloo/, kde-frameworks/kio/, kde-apps/analitza/, ...
@ 2017-08-15 9:16 Andreas Sturmlechner
0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2017-08-15 9:16 UTC (permalink / raw
To: gentoo-commits
commit: 2a87802f9d3cffdceb5ee53601c779b4451717d7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 21:37:37 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 15 08:14:47 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a87802f
Revert "*/*: Switch KDE_TEST back to forceoptional"
Upstream reverted the necessary patch to ECMAddTest because of build
failures with BUILD_TESTING=OFF, and recent commits in other repositories
made it even harder to pursue this kind of solution.
This reverts commits from 20caf700d502f20281c3d067f7c2fd8d3a143391 to
e0db5fc5568ec4db84da25e90ca62cde0ea1dc8f.
app-office/calligra/calligra-9999.ebuild | 2 +-
app-office/kmymoney/kmymoney-9999.ebuild | 2 +-
dev-util/kdevelop-php/kdevelop-php-9999.ebuild | 2 +-
kde-apps/analitza/analitza-17.08.0.ebuild | 2 +-
kde-apps/analitza/analitza-17.08.49.9999.ebuild | 2 +-
kde-apps/analitza/analitza-9999.ebuild | 2 +-
kde-apps/kaddressbook/kaddressbook-17.08.0.ebuild | 2 +-
kde-apps/kaddressbook/kaddressbook-17.08.49.9999.ebuild | 2 +-
kde-apps/kaddressbook/kaddressbook-9999.ebuild | 2 +-
kde-apps/kdepim-addons/kdepim-addons-17.08.0.ebuild | 2 +-
kde-apps/kdepim-addons/kdepim-addons-17.08.49.9999.ebuild | 2 +-
kde-apps/kdepim-addons/kdepim-addons-9999.ebuild | 2 +-
kde-apps/kpimtextedit/kpimtextedit-17.07.90.ebuild | 2 +-
kde-apps/kpimtextedit/kpimtextedit-17.08.0.ebuild | 2 +-
kde-apps/kpimtextedit/kpimtextedit-17.08.49.9999.ebuild | 2 +-
kde-apps/kpimtextedit/kpimtextedit-9999.ebuild | 2 +-
kde-apps/messagelib/messagelib-17.08.0.ebuild | 2 +-
kde-apps/messagelib/messagelib-17.08.49.9999.ebuild | 2 +-
kde-apps/messagelib/messagelib-9999.ebuild | 2 +-
kde-frameworks/baloo/baloo-9999.ebuild | 2 +-
kde-frameworks/kio/kio-9999.ebuild | 7 ++++---
net-libs/libktorrent/libktorrent-9999.ebuild | 2 +-
22 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index d528c84c2f..0861d3a981 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
CHECKREQS_DISK_BUILD="4G"
KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
inherit check-reqs kde5 versionator
DESCRIPTION="KDE Office Suite"
diff --git a/app-office/kmymoney/kmymoney-9999.ebuild b/app-office/kmymoney/kmymoney-9999.ebuild
index 749217a57b..dfd668d3bd 100644
--- a/app-office/kmymoney/kmymoney-9999.ebuild
+++ b/app-office/kmymoney/kmymoney-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
# QT_MINIMAL="5.9.1" # for webengine; defaulting to +webkit until Qt-5.9.1 in tree
VIRTUALX_REQUIRED="test"
VIRTUALDBUS_TEST="true"
diff --git a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
index 366514b602..35fa16b513 100644
--- a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
KDEBASE="kdevelop"
KDE_DOC_DIR="docs"
KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
KMNAME="kdev-php"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-apps/analitza/analitza-17.08.0.ebuild b/kde-apps/analitza/analitza-17.08.0.ebuild
index b66301cdfd..aa5d3cf789 100644
--- a/kde-apps/analitza/analitza-17.08.0.ebuild
+++ b/kde-apps/analitza/analitza-17.08.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-apps/analitza/analitza-17.08.49.9999.ebuild b/kde-apps/analitza/analitza-17.08.49.9999.ebuild
index fbe1e11681..283f6749e3 100644
--- a/kde-apps/analitza/analitza-17.08.49.9999.ebuild
+++ b/kde-apps/analitza/analitza-17.08.49.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-apps/analitza/analitza-9999.ebuild b/kde-apps/analitza/analitza-9999.ebuild
index fbe1e11681..283f6749e3 100644
--- a/kde-apps/analitza/analitza-9999.ebuild
+++ b/kde-apps/analitza/analitza-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-apps/kaddressbook/kaddressbook-17.08.0.ebuild b/kde-apps/kaddressbook/kaddressbook-17.08.0.ebuild
index 04d23b8690..f44d0ea313 100644
--- a/kde-apps/kaddressbook/kaddressbook-17.08.0.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-17.08.0.ebuild
@@ -4,7 +4,7 @@
EAPI=6
KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-apps/kaddressbook/kaddressbook-17.08.49.9999.ebuild b/kde-apps/kaddressbook/kaddressbook-17.08.49.9999.ebuild
index ede5dc4489..7f9b2eb228 100644
--- a/kde-apps/kaddressbook/kaddressbook-17.08.49.9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-17.08.49.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-apps/kaddressbook/kaddressbook-9999.ebuild b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
index ede5dc4489..7f9b2eb228 100644
--- a/kde-apps/kaddressbook/kaddressbook-9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-apps/kdepim-addons/kdepim-addons-17.08.0.ebuild b/kde-apps/kdepim-addons/kdepim-addons-17.08.0.ebuild
index ed9749deb2..87be9d09fe 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-17.08.0.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-17.08.0.ebuild
@@ -4,7 +4,7 @@
EAPI=6
KDE_EXAMPLES="true"
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-apps/kdepim-addons/kdepim-addons-17.08.49.9999.ebuild b/kde-apps/kdepim-addons/kdepim-addons-17.08.49.9999.ebuild
index c5850a3c6a..34beab0bdc 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-17.08.49.9999.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-17.08.49.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
KDE_EXAMPLES="true"
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
index c5850a3c6a..34beab0bdc 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
KDE_EXAMPLES="true"
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-apps/kpimtextedit/kpimtextedit-17.07.90.ebuild b/kde-apps/kpimtextedit/kpimtextedit-17.07.90.ebuild
index 8364f4a598..99cabebb5c 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-17.07.90.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-17.07.90.ebuild
@@ -4,7 +4,7 @@
EAPI=6
KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
+KDE_TEST="true"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-apps/kpimtextedit/kpimtextedit-17.08.0.ebuild b/kde-apps/kpimtextedit/kpimtextedit-17.08.0.ebuild
index 8364f4a598..99cabebb5c 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-17.08.0.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-17.08.0.ebuild
@@ -4,7 +4,7 @@
EAPI=6
KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
+KDE_TEST="true"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-apps/kpimtextedit/kpimtextedit-17.08.49.9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-17.08.49.9999.ebuild
index 74ee6f9ec1..5bcf119497 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-17.08.49.9999.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-17.08.49.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
+KDE_TEST="true"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
index 74ee6f9ec1..5bcf119497 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
+KDE_TEST="true"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-apps/messagelib/messagelib-17.08.0.ebuild b/kde-apps/messagelib/messagelib-17.08.0.ebuild
index 9a7dd10db5..21d635e406 100644
--- a/kde-apps/messagelib/messagelib-17.08.0.ebuild
+++ b/kde-apps/messagelib/messagelib-17.08.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-apps/messagelib/messagelib-17.08.49.9999.ebuild b/kde-apps/messagelib/messagelib-17.08.49.9999.ebuild
index 619ed81159..f53e971d41 100644
--- a/kde-apps/messagelib/messagelib-17.08.49.9999.ebuild
+++ b/kde-apps/messagelib/messagelib-17.08.49.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-apps/messagelib/messagelib-9999.ebuild b/kde-apps/messagelib/messagelib-9999.ebuild
index 619ed81159..f53e971d41 100644
--- a/kde-apps/messagelib/messagelib-9999.ebuild
+++ b/kde-apps/messagelib/messagelib-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-frameworks/baloo/baloo-9999.ebuild b/kde-frameworks/baloo/baloo-9999.ebuild
index a97671aca5..e263506b24 100644
--- a/kde-frameworks/baloo/baloo-9999.ebuild
+++ b/kde-frameworks/baloo/baloo-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild
index 2eb7ab56e6..683897a310 100644
--- a/kde-frameworks/kio/kio-9999.ebuild
+++ b/kde-frameworks/kio/kio-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
VIRTUALX_REQUIRED="test"
inherit kde5
@@ -12,7 +12,7 @@ LICENSE="LGPL-2+"
KEYWORDS=""
IUSE="acl +handbook kerberos +kwallet X"
-RDEPEND="
+COMMON_DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kbookmarks)
$(add_frameworks_dep kcodecs)
@@ -48,7 +48,7 @@ RDEPEND="
kwallet? ( $(add_frameworks_dep kwallet) )
X? ( $(add_qt_dep qtx11extras) )
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
$(add_qt_dep qtconcurrent)
handbook? ( $(add_frameworks_dep kdoctools) )
test? ( sys-libs/zlib )
@@ -61,6 +61,7 @@ DEPEND="${RDEPEND}
PDEPEND="
$(add_frameworks_dep kded)
"
+RDEPEND="${COMMON_DEPEND}"
# tests hang
RESTRICT+=" test"
diff --git a/net-libs/libktorrent/libktorrent-9999.ebuild b/net-libs/libktorrent/libktorrent-9999.ebuild
index ebb359feaf..8f0a164ffa 100644
--- a/net-libs/libktorrent/libktorrent-9999.ebuild
+++ b/net-libs/libktorrent/libktorrent-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} != 9999* ]]; then
KEYWORDS="~amd64 ~arm ~x86"
fi
-KDE_TEST="forceoptional"
+KDE_TEST="forceoptional-recursive"
VIRTUALX_REQUIRED="test"
inherit kde5
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-08-15 9:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-15 9:16 [gentoo-commits] proj/kde:master commit in: kde-frameworks/baloo/, kde-frameworks/kio/, kde-apps/analitza/, Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox