From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-855186-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 88BC11384B4
for <garchives@archives.gentoo.org>; Mon, 4 Jan 2016 16:21:54 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 02B8121C008;
Mon, 4 Jan 2016 16:21:54 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id EB2BAE0880
for <gentoo-commits@lists.gentoo.org>; Mon, 4 Jan 2016 16:21:52 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1E20F33FE7D
for <gentoo-commits@lists.gentoo.org>; Mon, 4 Jan 2016 16:21:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BE5AACFE
for <gentoo-commits@lists.gentoo.org>; Mon, 4 Jan 2016 16:21:50 +0000 (UTC)
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" <kensington@gentoo.org>
Message-ID: <1451924494.f93e7cd59b8d6eae0c9fdc1d3fff112ab9627b9f.kensington@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
X-VCS-Directories: kde-plasma/plasma-workspace/
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: f93e7cd59b8d6eae0c9fdc1d3fff112ab9627b9f
X-VCS-Branch: master
Date: Mon, 4 Jan 2016 16:21:50 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 7197695f-5109-4dbe-8bb5-693ed5862600
X-Archives-Hash: fd941a8e9f14a653b18652c2f5b837f1
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|" \