gentoo resync : 24.12.2018

4 files changed, 5 insertions, 170 deletions

diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index a205c0036fd0..6cc399f6efd7 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,6 +1,5 @@
-AUX oxygen-5.13.5-symlinks.patch 5407 BLAKE2B 9ba3d1b84f3dae54bbf52e6cfddf6bc414d5508ae1a3168e599caafcc1b23ab182007a1bc78f2ff582407f39cc383802d8cea2d3e4d61f79fbefdf9c22142ed5 SHA512 4b67595f546bed1c98b19a9592e9cfebe6cbebd1ab6d5aa3fad17578e099e7b410f2e5849513128019a7026fbb43d302c278db04a9932ec95b239e0c529410cb
-DIST oxygen-5.13.5.tar.xz 4468116 BLAKE2B 9e71ca71cfe5acef6b5344e0ab89a63b0ef68119251515534a7841d67ad0d7e5141ed48cfaef828870d9cb0ad9bcfb1188214fae3eaec13f84379ba710a09a5a SHA512 322188223d03b48f09123ef8b8e13dff3b256f190a42d81655707b9fd4707d8ca147a2f859346ba691a54a76b8b3cc5504485aca8f0bd7bd7bf0f13cfba1692e
 DIST oxygen-5.14.3.tar.xz 4479292 BLAKE2B 5c1a0c9b3abd7c5823081b7a1b69d510ebab297a9573c066285107ebedeb23a1eb7ccf6811e11322278d5f4940dfa7ff5273a59610f7ec97883b3e4100f74516 SHA512 9ea74fed0228d9431cef6e51fb24a7c59c4070055ae10ee87b25c04b01c7652df97bb7f09b62402cfa71ad27936905b9db3a1a69f73710f40683c5b33a302336
-EBUILD oxygen-5.13.5-r1.ebuild 1173 BLAKE2B 4f445105d66015bf1600ebddb332dc6d5572388531b837a01499face23aa37c7cb3df750e77d4e148e2a349fd53786cf790eb64dfe534a0b718efc5c354d3a0c SHA512 b5746e12ce37a9bc4379a5f88a6ab99dcbdb3a18b9687e75724c05eeb22795f5da57938b1373c690c202cbc6aa59b921e325b561790bc2216fd46bb50ca5245a
-EBUILD oxygen-5.14.3.ebuild 1128 BLAKE2B 585a30ac1f1a228eff53a5874984b7bb05cf260120fdfc8ab3e09c8444f9fcb548b88798dc30730dcfb7094e486a2ce9e60dba884ff60a747a84704b5843addc SHA512 a0e4bb462a0541c0ae6f7572a5374f5a28531e0a70e07d5f7b85e15ba09973e8633f538c71014ec9e2db9a2199c248b819ec71e547bf899b4b31423e73431240
+DIST oxygen-5.14.4.tar.xz 4468560 BLAKE2B e67f7cd832fbd04e2d8c0f3c5e3157d36bd77e590379cfa40f6f881167831c0a30af846ff1cb663242c976e09b5338ac15c9ed578e95db7dd701389f8f140b34 SHA512 bc7362a90507730a4e7a7f8a0bafaabc47789c6cbd3b42931349abf2584abad77603fe4c6c1d49e6ca7c09a408c0620008dadf448f335985003bc4d1a23bf76b
+EBUILD oxygen-5.14.3.ebuild 1126 BLAKE2B f8b7d7d2c24bf53b4fc84e0344bfe0c216082fbe93c0589e0700262cdc3a78fc7545624fbe09899488e6e4ee392d9ac00a0c54c40e31a4bccaba778bbe04ee1f SHA512 6bd1874df00cf07a3a3bbe5394b38fbf3eef8de9186fed427fc169bb60e2a1c5497d268318285d8e28763aab1a0c1321187a55a179ff9b3cf26243948734c71b
+EBUILD oxygen-5.14.4.ebuild 1128 BLAKE2B 585a30ac1f1a228eff53a5874984b7bb05cf260120fdfc8ab3e09c8444f9fcb548b88798dc30730dcfb7094e486a2ce9e60dba884ff60a747a84704b5843addc SHA512 a0e4bb462a0541c0ae6f7572a5374f5a28531e0a70e07d5f7b85e15ba09973e8633f538c71014ec9e2db9a2199c248b819ec71e547bf899b4b31423e73431240
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/files/oxygen-5.13.5-symlinks.patch b/kde-plasma/oxygen/files/oxygen-5.13.5-symlinks.patch
deleted file mode 100644
index 755ddde8cd30..000000000000
--- a/kde-plasma/oxygen/files/oxygen-5.13.5-symlinks.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 5bf9dfe906b50f2455210a29a00ec5494d8e26b7 Mon Sep 17 00:00:00 2001
-From: Jack Ostroff <ostroffjh@users.sourceforge.net>
-Date: Thu, 30 Aug 2018 19:02:11 -0400
-Subject: Correcting symlinks between col- and row-resize and split_v and _h
- cursors
-
-Summary: BUG: 384864
-
-Reviewers: #plasma, apol, cfeck
-
-Reviewed By: cfeck
-
-Subscribers: davidedmundson, rdieter, tfoster, apol, asturmlechner, cfeck, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D8267
----
- cursors/KDE_Classic/cursors/col-resize   | 2 +-
- cursors/KDE_Classic/cursors/row-resize   | 2 +-
- cursors/Oxygen_Black/cursors/col-resize  | 2 +-
- cursors/Oxygen_Black/cursors/row-resize  | 2 +-
- cursors/Oxygen_Blue/cursors/col-resize   | 2 +-
- cursors/Oxygen_Blue/cursors/row-resize   | 2 +-
- cursors/Oxygen_White/cursors/col-resize  | 2 +-
- cursors/Oxygen_White/cursors/row-resize  | 2 +-
- cursors/Oxygen_Yellow/cursors/col-resize | 2 +-
- cursors/Oxygen_Yellow/cursors/row-resize | 2 +-
- cursors/Oxygen_Zion/cursors/col-resize   | 2 +-
- cursors/Oxygen_Zion/cursors/row-resize   | 2 +-
- cursors/src/symlinks/col-resize          | 2 +-
- cursors/src/symlinks/row-resize          | 2 +-
- 14 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/cursors/KDE_Classic/cursors/col-resize b/cursors/KDE_Classic/cursors/col-resize
-index 179b52b..e3aa748 120000
---- a/cursors/KDE_Classic/cursors/col-resize
-+++ b/cursors/KDE_Classic/cursors/col-resize
-@@ -1 +1 @@
--split_v
-\ No newline at end of file
-+split_h
-\ No newline at end of file
-diff --git a/cursors/KDE_Classic/cursors/row-resize b/cursors/KDE_Classic/cursors/row-resize
-index e3aa748..179b52b 120000
---- a/cursors/KDE_Classic/cursors/row-resize
-+++ b/cursors/KDE_Classic/cursors/row-resize
-@@ -1 +1 @@
--split_h
-\ No newline at end of file
-+split_v
-\ No newline at end of file
-diff --git a/cursors/Oxygen_Black/cursors/col-resize b/cursors/Oxygen_Black/cursors/col-resize
-index 179b52b..e3aa748 120000
---- a/cursors/Oxygen_Black/cursors/col-resize
-+++ b/cursors/Oxygen_Black/cursors/col-resize
-@@ -1 +1 @@
--split_v
-\ No newline at end of file
-+split_h
-\ No newline at end of file
-diff --git a/cursors/Oxygen_Black/cursors/row-resize b/cursors/Oxygen_Black/cursors/row-resize
-index e3aa748..179b52b 120000
---- a/cursors/Oxygen_Black/cursors/row-resize
-+++ b/cursors/Oxygen_Black/cursors/row-resize
-@@ -1 +1 @@
--split_h
-\ No newline at end of file
-+split_v
-\ No newline at end of file
-diff --git a/cursors/Oxygen_Blue/cursors/col-resize b/cursors/Oxygen_Blue/cursors/col-resize
-index 179b52b..e3aa748 120000
---- a/cursors/Oxygen_Blue/cursors/col-resize
-+++ b/cursors/Oxygen_Blue/cursors/col-resize
-@@ -1 +1 @@
--split_v
-\ No newline at end of file
-+split_h
-\ No newline at end of file
-diff --git a/cursors/Oxygen_Blue/cursors/row-resize b/cursors/Oxygen_Blue/cursors/row-resize
-index e3aa748..179b52b 120000
---- a/cursors/Oxygen_Blue/cursors/row-resize
-+++ b/cursors/Oxygen_Blue/cursors/row-resize
-@@ -1 +1 @@
--split_h
-\ No newline at end of file
-+split_v
-\ No newline at end of file
-diff --git a/cursors/Oxygen_White/cursors/col-resize b/cursors/Oxygen_White/cursors/col-resize
-index 179b52b..e3aa748 120000
---- a/cursors/Oxygen_White/cursors/col-resize
-+++ b/cursors/Oxygen_White/cursors/col-resize
-@@ -1 +1 @@
--split_v
-\ No newline at end of file
-+split_h
-\ No newline at end of file
-diff --git a/cursors/Oxygen_White/cursors/row-resize b/cursors/Oxygen_White/cursors/row-resize
-index e3aa748..179b52b 120000
---- a/cursors/Oxygen_White/cursors/row-resize
-+++ b/cursors/Oxygen_White/cursors/row-resize
-@@ -1 +1 @@
--split_h
-\ No newline at end of file
-+split_v
-\ No newline at end of file
-diff --git a/cursors/Oxygen_Yellow/cursors/col-resize b/cursors/Oxygen_Yellow/cursors/col-resize
-index 179b52b..e3aa748 120000
---- a/cursors/Oxygen_Yellow/cursors/col-resize
-+++ b/cursors/Oxygen_Yellow/cursors/col-resize
-@@ -1 +1 @@
--split_v
-\ No newline at end of file
-+split_h
-\ No newline at end of file
-diff --git a/cursors/Oxygen_Yellow/cursors/row-resize b/cursors/Oxygen_Yellow/cursors/row-resize
-index e3aa748..179b52b 120000
---- a/cursors/Oxygen_Yellow/cursors/row-resize
-+++ b/cursors/Oxygen_Yellow/cursors/row-resize
-@@ -1 +1 @@
--split_h
-\ No newline at end of file
-+split_v
-\ No newline at end of file
-diff --git a/cursors/Oxygen_Zion/cursors/col-resize b/cursors/Oxygen_Zion/cursors/col-resize
-index 179b52b..e3aa748 120000
---- a/cursors/Oxygen_Zion/cursors/col-resize
-+++ b/cursors/Oxygen_Zion/cursors/col-resize
-@@ -1 +1 @@
--split_v
-\ No newline at end of file
-+split_h
-\ No newline at end of file
-diff --git a/cursors/Oxygen_Zion/cursors/row-resize b/cursors/Oxygen_Zion/cursors/row-resize
-index e3aa748..179b52b 120000
---- a/cursors/Oxygen_Zion/cursors/row-resize
-+++ b/cursors/Oxygen_Zion/cursors/row-resize
-@@ -1 +1 @@
--split_h
-\ No newline at end of file
-+split_v
-\ No newline at end of file
-diff --git a/cursors/src/symlinks/col-resize b/cursors/src/symlinks/col-resize
-index 179b52b..e3aa748 120000
---- a/cursors/src/symlinks/col-resize
-+++ b/cursors/src/symlinks/col-resize
-@@ -1 +1 @@
--split_v
-\ No newline at end of file
-+split_h
-\ No newline at end of file
-diff --git a/cursors/src/symlinks/row-resize b/cursors/src/symlinks/row-resize
-index e3aa748..179b52b 120000
---- a/cursors/src/symlinks/row-resize
-+++ b/cursors/src/symlinks/row-resize
-@@ -1 +1 @@
--split_h
-\ No newline at end of file
-+split_v
-\ No newline at end of file
--- 
-cgit v0.11.2
diff --git a/kde-plasma/oxygen/oxygen-5.14.3.ebuild b/kde-plasma/oxygen/oxygen-5.14.3.ebuild
index d45e10e9fae1..391fd848726e 100644
--- a/kde-plasma/oxygen/oxygen-5.14.3.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.14.3.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Oxygen visual style for the Plasma desktop"
 HOMEPAGE="https://cgit.kde.org/oxygen.git"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="wayland"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/oxygen/oxygen-5.13.5-r1.ebuild b/kde-plasma/oxygen/oxygen-5.14.4.ebuild
index 008de4748b79..d45e10e9fae1 100644
--- a/kde-plasma/oxygen/oxygen-5.13.5-r1.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.14.4.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Oxygen visual style for the Plasma desktop"
 HOMEPAGE="https://cgit.kde.org/oxygen.git"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="wayland"
 
 COMMON_DEPEND="
@@ -38,8 +38,6 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/kdebase-cursors:4
 "
 
-PATCHES=( "${FILESDIR}/${P}-symlinks.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package wayland KF5Wayland)