[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/

[Michael Palimaka]

commit:     f93e7cd59b8d6eae0c9fdc1d3fff112ab9627b9f
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jan  2 17:00:04 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan  4 16:21:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f93e7cd5

kde-plasma/plasma-workspace: Patches go into PATCHES

Important: Requires b56904fffadd50e7f13d49d47797604fd0ecbc87

Package-Manager: portage-2.2.24

 kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild | 8 ++++----
 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild        | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild
index e4274c7..ce03118 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild
@@ -117,14 +117,14 @@ DEPEND="${COMMON_DEPEND}
        x11-proto/xproto
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
+PATCHES=(
+       "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+       "${FILESDIR}/${PN}-tests-optional.patch"
+)
 
 RESTRICT="test"
 
 src_prepare() {
-       # whole patch should be upstreamed, doesn't work in PATCHES
-       epatch "${FILESDIR}/${PN}-tests-optional.patch"
-
        kde5_src_prepare
 
        sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index c069d10..848c7e2 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -117,14 +117,14 @@ DEPEND="${COMMON_DEPEND}
        x11-proto/xproto
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
+PATCHES=(
+       "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+       "${FILESDIR}/${PN}-tests-optional.patch"
+)
 
 RESTRICT="test"
 
 src_prepare() {
-       # whole patch should be upstreamed, doesn't work in PATCHES
-       epatch "${FILESDIR}/${PN}-tests-optional.patch"
-
        kde5_src_prepare
 
        sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \