commit: 0a1286442d37bd6143b547e2918d059d3e7f67dc Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jan 24 02:49:35 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jan 24 02:49:35 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0a128644
kde-frameworks: Move RESTRICT up the ladder Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-frameworks/baloo/baloo-9999.ebuild | 4 ++-- kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild | 4 ++-- kde-frameworks/breeze-icons/breeze-icons-9999.ebuild | 4 ++-- .../extra-cmake-modules/extra-cmake-modules-9999.ebuild | 4 ++-- .../frameworkintegration/frameworkintegration-9999.ebuild | 6 +++--- kde-frameworks/kcalendarcore/kcalendarcore-9999.ebuild | 4 ++-- kde-frameworks/kconfig/kconfig-9999.ebuild | 8 ++++---- kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild | 4 ++-- kde-frameworks/kemoticons/kemoticons-9999.ebuild | 6 +++--- kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild | 4 ++-- kde-frameworks/kiconthemes/kiconthemes-9999.ebuild | 4 ++-- kde-frameworks/kio/kio-9999.ebuild | 6 +++--- kde-frameworks/kirigami/kirigami-9999.ebuild | 6 +++--- kde-frameworks/kservice/kservice-9999.ebuild | 6 +++--- kde-frameworks/ktexteditor/ktexteditor-9999.ebuild | 4 ++-- kde-frameworks/kwayland/kwayland-9999.ebuild | 6 +++--- kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild | 4 ++-- kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild | 6 +++--- kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild | 4 ++-- kde-frameworks/plasma/plasma-9999.ebuild | 4 ++-- kde-frameworks/purpose/purpose-9999.ebuild | 6 +++--- 21 files changed, 52 insertions(+), 52 deletions(-) diff --git a/kde-frameworks/baloo/baloo-9999.ebuild b/kde-frameworks/baloo/baloo-9999.ebuild index 8fb2217d58..72d4f72bc6 100644 --- a/kde-frameworks/baloo/baloo-9999.ebuild +++ b/kde-frameworks/baloo/baloo-9999.ebuild @@ -14,6 +14,8 @@ LICENSE="LGPL-2+" KEYWORDS="" IUSE="" +RESTRICT+=" test" # bug 624250 + DEPEND=" >=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-${QTMIN}:5 @@ -31,5 +33,3 @@ DEPEND=" =kde-frameworks/solid-${PVCUT}*:5 " RDEPEND="${DEPEND}" - -RESTRICT+=" test" # bug 624250 diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild index 949bacbe6d..6b546e9287 100644 --- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild +++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild @@ -12,6 +12,8 @@ LICENSE="LGPL-3" KEYWORDS="" IUSE="test" +RESTRICT+=" !test? ( test )" + BDEPEND=" dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-${PVCUT}:5 @@ -19,8 +21,6 @@ BDEPEND=" " DEPEND="test? ( dev-qt/qttest:5 )" -RESTRICT+=" !test? ( test )" - src_prepare() { cmake_src_prepare use test || cmake_comment_add_subdirectory autotests diff --git a/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild b/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild index 3da64e4d01..8bba340006 100644 --- a/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild +++ b/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild @@ -11,6 +11,8 @@ LICENSE="LGPL-3" KEYWORDS="" IUSE="test" +RESTRICT+=" !test? ( test )" + BDEPEND=" dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-${PVCUT}:5 @@ -18,8 +20,6 @@ BDEPEND=" " DEPEND="test? ( dev-qt/qttest:5 )" -RESTRICT+=" !test? ( test )" - src_prepare() { cmake_src_prepare use test || cmake_comment_add_subdirectory autotests diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild index b587dbd27c..2467bf44b6 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild @@ -14,6 +14,8 @@ LICENSE="BSD" KEYWORDS="" IUSE="doc test" +RESTRICT+=" !test? ( test )" + BDEPEND=" doc? ( ${PYTHON_DEPS} @@ -29,8 +31,6 @@ RDEPEND=" app-arch/libarchive[bzip2] " -RESTRICT+=" !test? ( test )" - PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" "${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch" diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild index 54127aba0b..b9062f67b3 100644 --- a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild +++ b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild @@ -15,6 +15,9 @@ LICENSE="LGPL-2+" KEYWORDS="" IUSE="" +# requires running Plasma environment +RESTRICT+=" test" + RDEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 @@ -30,9 +33,6 @@ DEPEND="${RDEPEND} =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 " -# requires running Plasma environment -RESTRICT+=" test" - src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-9999.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-9999.ebuild index 8b71fe6e02..1e5f48491c 100644 --- a/kde-frameworks/kcalendarcore/kcalendarcore-9999.ebuild +++ b/kde-frameworks/kcalendarcore/kcalendarcore-9999.ebuild @@ -13,6 +13,8 @@ LICENSE="GPL-2+ test? ( LGPL-3+ )" KEYWORDS="" IUSE="" +RESTRICT+=" test" # multiple tests fail or hang indefinitely + BDEPEND=" sys-devel/bison " @@ -23,5 +25,3 @@ DEPEND=" RDEPEND="${DEPEND} !kde-apps/kcalcore:5 " - -RESTRICT+=" test" # multiple tests fail or hang indefinitely diff --git a/kde-frameworks/kconfig/kconfig-9999.ebuild b/kde-frameworks/kconfig/kconfig-9999.ebuild index 3fd67892ef..a5a15740a3 100644 --- a/kde-frameworks/kconfig/kconfig-9999.ebuild +++ b/kde-frameworks/kconfig/kconfig-9999.ebuild @@ -12,6 +12,9 @@ LICENSE="LGPL-2+" KEYWORDS="" IUSE="dbus nls" +# bug 560086 +RESTRICT+=" test" + BDEPEND=" nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) " @@ -24,10 +27,7 @@ DEPEND="${RDEPEND} test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 ) " -# bug 560086 -RESTRICT+=" test" - -DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md ) +DOCS=( DESIGN docs/{DESIGN.kconfig,options.md} ) src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild index 8a6803a344..d4613398be 100644 --- a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild +++ b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild @@ -15,6 +15,8 @@ LICENSE="LGPL-2+" KEYWORDS="" IUSE="libressl X" +RESTRICT+=" test" + BDEPEND=" dev-lang/perl dev-perl/URI @@ -76,8 +78,6 @@ RDEPEND="${COMMON_DEPEND} =kde-frameworks/kitemmodels-${PVCUT}*:5 " -RESTRICT+=" test" - PATCHES=( "${FILESDIR}/${PN}-5.78.0-no-kdesignerplugin.patch" ) src_prepare() { diff --git a/kde-frameworks/kemoticons/kemoticons-9999.ebuild b/kde-frameworks/kemoticons/kemoticons-9999.ebuild index fe28b041d5..f2e2427fd8 100644 --- a/kde-frameworks/kemoticons/kemoticons-9999.ebuild +++ b/kde-frameworks/kemoticons/kemoticons-9999.ebuild @@ -13,6 +13,9 @@ LICENSE="LGPL-2.1+" KEYWORDS="" IUSE="" +# requires running kde environment +RESTRICT+=" test" + DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -23,6 +26,3 @@ DEPEND=" =kde-frameworks/kservice-${PVCUT}*:5 " RDEPEND="${DEPEND}" - -# requires running kde environment -RESTRICT+=" test" diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild index 0476bb3c62..34fcdb3652 100644 --- a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild +++ b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild @@ -13,6 +13,8 @@ LICENSE="LGPL-2+" KEYWORDS="" IUSE="epub exif ffmpeg kernel_linux office pdf taglib" +RESTRICT+=" test" + BDEPEND=" test? ( ${PYTHON_DEPS} ) " @@ -31,8 +33,6 @@ DEPEND="${RDEPEND} kernel_linux? ( sys-apps/attr ) " -RESTRICT+=" test" - pkg_setup() { use test && python-any-r1_pkg_setup ecm_pkg_setup diff --git a/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild b/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild index 24ff813728..51f0888664 100644 --- a/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild +++ b/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild @@ -14,6 +14,8 @@ LICENSE="LGPL-2+" KEYWORDS="" IUSE="" +RESTRICT+=" test" # bug 574770 + DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -28,5 +30,3 @@ DEPEND=" =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 " RDEPEND="${DEPEND}" - -RESTRICT+=" test" # bug 574770 diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild index 3ceb079cb0..64aaff51d1 100644 --- a/kde-frameworks/kio/kio-9999.ebuild +++ b/kde-frameworks/kio/kio-9999.ebuild @@ -16,6 +16,9 @@ LICENSE="LGPL-2+" KEYWORDS="" IUSE="acl +handbook kerberos +kwallet X" +# tests hang +RESTRICT+=" test" + RDEPEND=" dev-libs/libxml2 dev-libs/libxslt @@ -68,9 +71,6 @@ PDEPEND=" >=kde-frameworks/kded-${PVCUT}:5 " -# tests hang -RESTRICT+=" test" - src_configure() { local mycmakeargs=( $(cmake_use_find_package acl ACL) diff --git a/kde-frameworks/kirigami/kirigami-9999.ebuild b/kde-frameworks/kirigami/kirigami-9999.ebuild index c12234c738..0dcc878183 100644 --- a/kde-frameworks/kirigami/kirigami-9999.ebuild +++ b/kde-frameworks/kirigami/kirigami-9999.ebuild @@ -18,6 +18,9 @@ LICENSE="LGPL-2+" KEYWORDS="" IUSE="" +# requires package to already be installed +RESTRICT+=" test" + BDEPEND=" >=dev-qt/linguist-tools-${QTMIN}:5 " @@ -34,9 +37,6 @@ RDEPEND="${DEPEND} >=dev-qt/qtgraphicaleffects-${QTMIN}:5 " -# requires package to already be installed -RESTRICT+=" test" - src_configure() { local mycmakeargs=( -DBUILD_EXAMPLES=$(usex examples) diff --git a/kde-frameworks/kservice/kservice-9999.ebuild b/kde-frameworks/kservice/kservice-9999.ebuild index 24166b3c05..0f22017f7d 100644 --- a/kde-frameworks/kservice/kservice-9999.ebuild +++ b/kde-frameworks/kservice/kservice-9999.ebuild @@ -13,6 +13,9 @@ LICENSE="LGPL-2 LGPL-2.1+" KEYWORDS="" IUSE="+man" +# requires running kde environment +RESTRICT+=" test" + BDEPEND=" sys-devel/bison sys-devel/flex @@ -31,9 +34,6 @@ DEPEND="${RDEPEND} test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 ) " -# requires running kde environment -RESTRICT+=" test" - src_configure() { local mycmakeargs=( -DAPPLICATIONS_MENU_NAME=kf5-applications.menu diff --git a/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild b/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild index 1b03b443ae..40d593f2d4 100644 --- a/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild +++ b/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild @@ -14,6 +14,8 @@ LICENSE="LGPL-2+" KEYWORDS="" IUSE="+editorconfig git" +RESTRICT+=" test" + BDEPEND=" test? ( >=kde-frameworks/kservice-${PVCUT}:5 ) " @@ -47,8 +49,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -RESTRICT+=" test" - src_configure() { local mycmakeargs=( $(cmake_use_find_package editorconfig EditorConfig) diff --git a/kde-frameworks/kwayland/kwayland-9999.ebuild b/kde-frameworks/kwayland/kwayland-9999.ebuild index ff023abeb6..67e89054b7 100644 --- a/kde-frameworks/kwayland/kwayland-9999.ebuild +++ b/kde-frameworks/kwayland/kwayland-9999.ebuild @@ -15,6 +15,9 @@ LICENSE="LGPL-2.1" KEYWORDS="" IUSE="" +# All failing, I guess we need a virtual wayland server +RESTRICT+=" test" + RDEPEND=" >=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-${QTMIN}:5 @@ -26,6 +29,3 @@ DEPEND="${RDEPEND} >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-libs/wayland-protocols-1.15 " - -# All failing, I guess we need a virtual wayland server -RESTRICT+=" test" diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild index 250e6052ab..829d7e8efa 100644 --- a/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild +++ b/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild @@ -12,6 +12,8 @@ LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT" KEYWORDS="" IUSE="nls X" +RESTRICT+=" test" + BDEPEND=" nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) " @@ -30,8 +32,6 @@ DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) " -RESTRICT+=" test" - DOCS=( docs/README.kstartupinfo ) src_configure() { diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild index e7caea854f..04480a524c 100644 --- a/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild +++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild @@ -12,6 +12,9 @@ LICENSE="LGPL-2" KEYWORDS="" IUSE="" +# requires running environment +RESTRICT+=" test" + BDEPEND=" virtual/pkgconfig " @@ -21,6 +24,3 @@ DEPEND=" net-misc/modemmanager " RDEPEND="${DEPEND}" - -# requires running environment -RESTRICT+=" test" diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild index 52eb19ec83..d27d863989 100644 --- a/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild +++ b/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild @@ -14,6 +14,8 @@ LICENSE="LGPL-3" KEYWORDS="" IUSE="test" +RESTRICT+=" !test? ( test )" + BDEPEND=" >=dev-qt/qtcore-${QTMIN}:5 >=kde-frameworks/extra-cmake-modules-${PVCUT}:5 @@ -21,8 +23,6 @@ BDEPEND=" " DEPEND="test? ( >=dev-qt/qttest-${QTMIN}:5 )" -RESTRICT+=" !test? ( test )" - src_prepare() { cmake_src_prepare use test || cmake_comment_add_subdirectory autotests diff --git a/kde-frameworks/plasma/plasma-9999.ebuild b/kde-frameworks/plasma/plasma-9999.ebuild index 396b6d9e9b..e8307c9966 100644 --- a/kde-frameworks/plasma/plasma-9999.ebuild +++ b/kde-frameworks/plasma/plasma-9999.ebuild @@ -15,6 +15,8 @@ LICENSE="LGPL-2+" KEYWORDS="" IUSE="gles2-only wayland X" +RESTRICT+=" test" + BDEPEND=" >=kde-frameworks/kdoctools-${PVCUT}:5 " @@ -59,8 +61,6 @@ DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) " -RESTRICT+=" test" - src_configure() { local mycmakeargs=( $(cmake_use_find_package !gles2-only OpenGL) diff --git a/kde-frameworks/purpose/purpose-9999.ebuild b/kde-frameworks/purpose/purpose-9999.ebuild index f40799053d..6d68c284fd 100644 --- a/kde-frameworks/purpose/purpose-9999.ebuild +++ b/kde-frameworks/purpose/purpose-9999.ebuild @@ -14,6 +14,9 @@ LICENSE="LGPL-2.1+" KEYWORDS="" IUSE="bluetooth +kaccounts" +# requires running environment +RESTRICT+=" test" + DEPEND=" >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -37,9 +40,6 @@ RDEPEND="${DEPEND} kaccounts? ( net-libs/accounts-qml ) " -# requires running environment -RESTRICT+=" test" - src_prepare() { ecm_src_prepare cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth