gentoo resync : 15.09.2018

3 files changed, 166 insertions, 1 deletions

diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 4e0e8f634417..0480469b3d69 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,7 +1,8 @@
+AUX oxygen-5.13.5-symlinks.patch 5407 BLAKE2B 9ba3d1b84f3dae54bbf52e6cfddf6bc414d5508ae1a3168e599caafcc1b23ab182007a1bc78f2ff582407f39cc383802d8cea2d3e4d61f79fbefdf9c22142ed5 SHA512 4b67595f546bed1c98b19a9592e9cfebe6cbebd1ab6d5aa3fad17578e099e7b410f2e5849513128019a7026fbb43d302c278db04a9932ec95b239e0c529410cb
 DIST oxygen-5.12.5.tar.xz 4467896 BLAKE2B f9477184cc13553086f6b828ab953dc91e42aa9bd50a85d553ed7347e2e588dfc8b5aaab9eec12481e20121044ebd4412fc728e22d437ede54451c0a2245c6be SHA512 92acb2cc2033a8b07a0ac75772f696f5c1196e0c5a424ba6146d576bc956fcfc172b4a65a79551b2d43be4b56d5289bee091ebb837fe40dc60f076ca7d5898b4
 DIST oxygen-5.12.6.tar.xz 4467020 BLAKE2B 4112d881bba6b30ab295af576678068227c2831459c21eabbd59c9c57e7cc2a1c08cf2d40cc6496bd0ee38c2384ad8f91a4246e6cb3b33328406019c62dab539 SHA512 7f558f92dc218a8218c6b87fd432985ef446d88e7a73911bc557481bd7d0ccdda7a9ebb350c6f71547f3c35cda1f844cda8aa735e0fcbdb413aedb25b9d0d8de
 DIST oxygen-5.13.5.tar.xz 4468116 BLAKE2B 9e71ca71cfe5acef6b5344e0ab89a63b0ef68119251515534a7841d67ad0d7e5141ed48cfaef828870d9cb0ad9bcfb1188214fae3eaec13f84379ba710a09a5a SHA512 322188223d03b48f09123ef8b8e13dff3b256f190a42d81655707b9fd4707d8ca147a2f859346ba691a54a76b8b3cc5504485aca8f0bd7bd7bf0f13cfba1692e
 EBUILD oxygen-5.12.5.ebuild 1129 BLAKE2B 51f53fbab179d76e4eef5adeca269e10e956954e61a32e2315ed6a62f27b20e7fc81dd1f6b1137a53389aef2b82c9a2b3d7457e27e13baf2300a5447a28804cb SHA512 f5cbb0a73bb9a87f2e64015ad39157191fecf10cfd1598cf4674441123032477b51646f9760fa90d24b8561b63f702b00d8e65f253ed8eef7bc1bb845643c01f
 EBUILD oxygen-5.12.6.ebuild 1131 BLAKE2B 22ba1a44212c649c6582e6253eaed956e3621d6ca94b989948d20fd99699ac5afaae812334f303a8a54b88377af1548792679eaf28db6693beb0b62d2628bef5 SHA512 74e9ce2fb1e37ff8395ca820a1ece9bf28623fe7aaecd41b59bde2572601f048c4a0ffcbfd5b1f68536b13744eaa0dc06d4552c4e13d7d56e89ccc2a7db2c30a
-EBUILD oxygen-5.13.5.ebuild 1131 BLAKE2B 22ba1a44212c649c6582e6253eaed956e3621d6ca94b989948d20fd99699ac5afaae812334f303a8a54b88377af1548792679eaf28db6693beb0b62d2628bef5 SHA512 74e9ce2fb1e37ff8395ca820a1ece9bf28623fe7aaecd41b59bde2572601f048c4a0ffcbfd5b1f68536b13744eaa0dc06d4552c4e13d7d56e89ccc2a7db2c30a
+EBUILD oxygen-5.13.5-r1.ebuild 1178 BLAKE2B 66ea157510513a09f926b39e9921689786d293f26560a1e1f4d8cf05b881a480afe7d853c230ab5de5ffcfcb324388df22839adafd84d1ec359f67081e2e74a6 SHA512 4511d39d0254c995e55419f251ae963ce60a0e3b9c22a6832549312743ffd0d7cccb296a2115440c62a45f78e8de40095633da71b3648f7803551d39e6eafb8d
 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
new file mode 100644
index 000000000000..755ddde8cd30
--- /dev/null
+++ b/kde-plasma/oxygen/files/oxygen-5.13.5-symlinks.patch
@@ -0,0 +1,162 @@
+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.13.5.ebuild b/kde-plasma/oxygen/oxygen-5.13.5-r1.ebuild
index dbf174a24cc8..607c3ab579a3 100644
--- a/kde-plasma/oxygen/oxygen-5.13.5.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.13.5-r1.ebuild
@@ -38,6 +38,8 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/kdebase-cursors:4
 "
 
+PATCHES=( "${FILESDIR}/${P}-symlinks.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package wayland KF5Wayland)