gentoo resync : 30.05.2020

3 files changed, 3 insertions, 49 deletions

diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index e1f83a1fd739..d86a97b157db 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,6 +1,4 @@
 AUX xembed-sni-proxy-5.14.90-standalone.patch 1984 BLAKE2B e3d5b53479fc18612bd698d89e27c69e178aa1f9bcfc7ce118eb1271d29cd7ee18ced9ec5e4296a3e6d45a4331c9688185ac41bc00ca30f2158d5617feae94d6 SHA512 cef4a94f1a31495bc7e8fab80be4e145a5335f4a9d500680435919e7554efa2c4e87013c4d16d53e1f7b4b7e341092e53d314ccb2a6f7e09ab83d5571275b4e1
-DIST plasma-workspace-5.17.5.tar.xz 4962336 BLAKE2B d7c91130d303b612cae09627947547919d44ce91f31340bea4b8987ecc688728e0d937364c76710e0989554282688765bba58308cbb36c889e6729a6fbb7043a SHA512 b8a3f3a1a79d7254deecfb5228749abf15bc6f58ab17eb6d19e9010c74930491439aefa6589980dc0ae53858e4bef6be7edb66a15d3f227c5dfff458c1ca5d1a
 DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
-EBUILD xembed-sni-proxy-5.17.5.ebuild 1031 BLAKE2B fdc5eebcf1409d724fc553f8f58f83d926a54a02dc7a0a3a6b548f0f29cd16d234b205394c705af9cd4b1b94be1b42f950f187f259279b795bcb92dc0016f92f SHA512 63918320239a7af0644258f7bef511731d57df116a3911480d719359942b47df30198d1aeafefbfc98a75de563f61833cc62c890a745f518500dc8e196770b2a
-EBUILD xembed-sni-proxy-5.18.5.ebuild 1034 BLAKE2B 950d5d5637722daac78c6d17f0507afcf89f5be4d323bda075d4b99ac75a3199878d66adfbcd5554966eb5a2cfb268477b16b176e9078d9b119dc56b22360da6 SHA512 ebe14882c20cb3eb15cbec218346626aff1348f3b5a50eeabcf5bd8d0a6184847be9eded717489c6d0cc780a6f4198779cc8bf4d5511d4f028253bd0c3402fd0
+EBUILD xembed-sni-proxy-5.18.5.ebuild 1045 BLAKE2B 7bd18d0916a8b9bf85c558043162a446f94860769f32cd741919a535ff3227170e2ee1afd9edbc48f98c99e4acfef71788c3e6f85dd1be035a494d930639f4f4 SHA512 bf1bfc4583de9178b0d525662baaaebe96cc600b90761c1c6516a8e2b1a757f5afae3edcf986486b63cc2c4849850d8720e97763488a3092c2acc98c1979b582
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.5.ebuild
deleted file mode 100644
index fdff1765256f..000000000000
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit cmake kde.org
-
-DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
-HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/extra-cmake-modules-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-"
-RDEPEND="${DEPEND}
-	!<kde-plasma/plasma-workspace-5.14.2:5
-	!kde-plasma/xembed-sni-proxy:0
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.5.ebuild
index 7ef93d8e5aaa..4879c278a1ef 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.5.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.5.ebuild
@@ -10,11 +10,11 @@ QTMIN=5.12.3
 inherit cmake kde.org
 
 DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
-HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5