summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-02-16 13:16:24 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-02-16 13:16:24 +0000
commit9d8a69f12352e9398d0686d96fd17bd7c4e7177b (patch)
tree54c43291debf8e877860db67377be0008db34ee9
parent7340641da5fa8ba645c166d9b1925837ff86df00 (diff)
kde-plasma/libkworkspace : version bump
-rw-r--r--kde-plasma/libkworkspace/Manifest2
-rw-r--r--kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch (renamed from kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch)4
-rw-r--r--kde-plasma/libkworkspace/libkworkspace-5.15.0-r1337.ebuild (renamed from kde-plasma/libkworkspace/libkworkspace-5.14.5-r1337.ebuild)13
3 files changed, 7 insertions, 12 deletions
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 9c91c2b6..3a67fdc6 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1 +1 @@
-DIST plasma-workspace-5.14.5.tar.xz 4578556 BLAKE2B 3c37bd9f880225f0e8b2496b90e5afc5ad591e8e356bd68ae135c3e9ccfe646adcb2418e2e80185f396c3b412f0df603ba0902e5a6d54a6d9a5abdff500a71f7 SHA512 247abdfe4ed4c7b6bb847c5352b3df11d110d59f8cc62b51dfd9de76c62549a0191efdd1e1f5a6ab82a87eccdc9fd28481a85c1252d05595e0f1a72174b3f8c6
+DIST plasma-workspace-5.15.0.tar.xz 4706936 BLAKE2B f1f772bf0c27b491ed2e8b9e4342694b5e1acaabec701ca44b252fb522c72688be1bf4c8db8826e5c7cd407c47ca1c205ae422312532bb7ea2dce165d9b9204e SHA512 2ed2f0ce2ef15aafa337a2b4943389668d18e18f026df67950f4d506d2c5647660ddade6f9c915b1e2fb36c79fbcddf563c25fdac69aac3f14e26afb603c533c
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch
index f2332f72..78042c5d 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-5.14.5-r1337.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.15.0-r1337.ebuild
index 6eb8e547..68f6e9f5 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.14.5-r1337.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.15.0-r1337.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-FRAMEWORKS_MINIMAL="5.50.0"
-QT_MINIMAL="5.11.1"
KDE_TEST="true"
KMNAME="plasma-workspace"
inherit kde5
@@ -29,13 +27,12 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
- !kde-plasma/libkworkspace:4
!<kde-plasma/plasma-workspace-5.14.2:5
"
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
@@ -51,8 +48,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"
}