From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1066739-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 19366138334
for <garchives@archives.gentoo.org>; Sun, 13 Jan 2019 12:16:58 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B244BE0971;
Sun, 13 Jan 2019 12:16:56 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 77B06E096F
for <gentoo-commits@lists.gentoo.org>; Sun, 13 Jan 2019 12:16:56 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A3235335CF3
for <gentoo-commits@lists.gentoo.org>; Sun, 13 Jan 2019 12:16:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B51C6511
for <gentoo-commits@lists.gentoo.org>; Sun, 13 Jan 2019 12:16:52 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@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, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1547381758.49c3daab8f8550aacb7b4267c53351438f82b5dc.asturm@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/, kde-plasma/libkworkspace/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch kde-plasma/libkworkspace/libkworkspace-9999.ebuild
X-VCS-Directories: kde-plasma/libkworkspace/ kde-plasma/libkworkspace/files/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 49c3daab8f8550aacb7b4267c53351438f82b5dc
X-VCS-Branch: master
Date: Sun, 13 Jan 2019 12:16:52 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: fc4e9fb2-0f54-4824-aa13-2ad4782d03df
X-Archives-Hash: 33e83c042be826b381e6221a4eeee851
commit: 49c3daab8f8550aacb7b4267c53351438f82b5dc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 13 12:15:58 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 13 12:15:58 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=49c3daab
kde-plasma/libkworkspace: Fix standalone patch to 5.15 min versions
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
....2-standalone.patch => libkworkspace-5.14.90-standalone.patch} | 4 ++--
kde-plasma/libkworkspace/libkworkspace-9999.ebuild | 8 ++------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch
similarity index 97%
rename from kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch
rename to kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch
index f2332f7261..78042c5d16 100644
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch
@@ -20,8 +20,8 @@ index f66013f9..4e58bd60 100644
+
+ cmake_minimum_required(VERSION 3.0)
+
-+ set(QT_MIN_VERSION "GENTOO_QT_MINIMAL")
-+ set(KF5_MIN_VERSION "GENTOO_KF5_MINIMAL")
++ set(QT_MIN_VERSION "5.11.0")
++ set(KF5_MIN_VERSION "5.54.0")
+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
diff --git a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
index 59ede30087..7ae1f21cce 100644
--- a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
@@ -3,8 +3,6 @@
EAPI=6
-FRAMEWORKS_MINIMAL="5.50.0"
-QT_MINIMAL="5.11.1"
KDE_TEST="true"
KMNAME="plasma-workspace"
inherit kde5
@@ -36,7 +34,7 @@ RDEPEND="${COMMON_DEPEND}
S="${S}/${PN}"
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-standalone.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
src_prepare() {
# delete colliding libkworkspace translations, let kde5_src_prepare do its magic
@@ -52,8 +50,6 @@ src_prepare() {
_EOF_
fi
- sed -e "/set/s/GENTOO_PV/${PV}/" \
- -e "/set/s/GENTOO_QT_MINIMAL/${QT_MINIMAL}/" \
- -e "/set/s/GENTOO_KF5_MINIMAL/${FRAMEWORKS_MINIMAL}/" \
+ sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
}