gentoo resync : 21.05.2019

4 files changed, 2 insertions, 109 deletions

diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index cfe8b4fbc8fc..dca2d370ec5b 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,7 +1,4 @@
-AUX xembed-sni-proxy-5.14.2-standalone.patch 2006 BLAKE2B 92efa283f3ddcc0997bcdcf082c7d28f0bdb8c40d5689672c1c46fcd9a4637ef7b85562fa06f120ec27a31139fd7e25a6ea89fad37a75f54d92bc417a3b8dcce SHA512 cb1dcffac66b51806b83e2254d0adf00008dd276520babf15a52b58c1d6b4fe7441032c80f968bb1988d7657c2c644041f8dbd20e7d794a22cd7781a252941f2
 AUX xembed-sni-proxy-5.14.90-standalone.patch 1984 BLAKE2B e3d5b53479fc18612bd698d89e27c69e178aa1f9bcfc7ce118eb1271d29cd7ee18ced9ec5e4296a3e6d45a4331c9688185ac41bc00ca30f2158d5617feae94d6 SHA512 cef4a94f1a31495bc7e8fab80be4e145a5335f4a9d500680435919e7554efa2c4e87013c4d16d53e1f7b4b7e341092e53d314ccb2a6f7e09ab83d5571275b4e1
-DIST plasma-workspace-5.14.5.tar.xz 4578556 BLAKE2B 3c37bd9f880225f0e8b2496b90e5afc5ad591e8e356bd68ae135c3e9ccfe646adcb2418e2e80185f396c3b412f0df603ba0902e5a6d54a6d9a5abdff500a71f7 SHA512 247abdfe4ed4c7b6bb847c5352b3df11d110d59f8cc62b51dfd9de76c62549a0191efdd1e1f5a6ab82a87eccdc9fd28481a85c1252d05595e0f1a72174b3f8c6
 DIST plasma-workspace-5.15.5.tar.xz 4713728 BLAKE2B 7ce14912bf0dc2556484b7b719b00e7296fb67d78faabb9e3c00fbfb56a41db04e27b5f94636142f07e88e24d51ff308025a50d719a940e1287943a35db93e79 SHA512 5d5429114a733d4328f7db6c8e3c7dfe5e04862f8083fcad40b21390efb309c58fd1b13cf63aa57f2842c38936b9fe1c60ad61fc601cf4f592b86285c2270bed
-EBUILD xembed-sni-proxy-5.14.5.ebuild 1075 BLAKE2B 4aba0229e1823486e9ea7036513d76300d5ec390b5750a7f7df339bdc41e4834f734af2cec3885cb5d6515edf9c69433ed53fad4a9d8513778ae79f08bfc1707 SHA512 ed202181bae19dbb97712581ed64be5ea214f202d77e049e348fb384f2349c2ace6de2ad2db6477287fc5065e0027b78e5ef02bac1db7a296425a02d390d5594
-EBUILD xembed-sni-proxy-5.15.5.ebuild 940 BLAKE2B 225160f7ba08e33c4153cd2e431d1ad89d731ca85eb128355268838c1516d142316335d65b1fab6782e653780a1a43f884caf3dda1f3b330c57689208029f571 SHA512 eb25848f0110495fcc2da70a3d0af063bbd764a513540976cf0f3a7e2a9e7a5a15c10535024ae6fb53db902e78106740f2a504149c8a516aaf7cd6243eb71892
+EBUILD xembed-sni-proxy-5.15.5.ebuild 938 BLAKE2B 3b94d30dfc6849bd596a3b1af2b371ad114b9162a7273ef8e0ac21a09f685d11c63117c4613caa21ae7e5048e9f92637746a5f6e8d74fad0694db9f6015fd5d3 SHA512 0697804bc8f946d3d27cd0ae52dc27d6bfccd8ff74b0d2785d42e447965d11041fd39b2b2f32a544b21fee00f43fd3e2ad3c0d32e21e90d644ccef1b6446a2d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.2-standalone.patch b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.2-standalone.patch
deleted file mode 100644
index ddbf13d55d8f..000000000000
--- a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.2-standalone.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 42008129f1659bc34c454ce14632fd279679f556 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Mon, 22 Oct 2018 21:44:33 +0200
-Subject: [PATCH] xembed-sni-proxy: Allow standalone build
-
----
- CMakeLists.txt | 35 +++++++++++++++++++++++++++++++++
- 1 file changed, 35 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c2f67ac6..30b2c1b5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,3 +1,34 @@
-+project(xembed-sni-proxy)
-+
-+if(${CMAKE_SOURCE_DIR} STREQUAL ${xembed-sni-proxy_SOURCE_DIR})
-+    set(PROJECT_VERSION "GENTOO_PV")
-+    set(PROJECT_VERSION_MAJOR 5)
-+
-+    cmake_minimum_required(VERSION 3.0)
-+
-+    set(QT_MIN_VERSION "GENTOO_QT_MINIMAL")
-+    set(KF5_MIN_VERSION "GENTOO_KF5_MINIMAL")
-+    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus X11Extras)
-+    find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
-+    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-+
-+    include(KDEInstallDirs)
-+    include(KDECMakeSettings)
-+    include(KDECompilerSettings NO_POLICY_SCOPE)
-+    include(FeatureSummary)
-+    include(ECMQtDeclareLoggingCategory)
-+
-+    find_package(KF5WindowSystem ${KF5_MIN_VERSION} REQUIRED)
-+    find_package(X11 REQUIRED)
-+    find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR)
-+    set_package_properties(XCB PROPERTIES TYPE REQUIRED)
-+
-+    configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
-+else()
-+    set(PROJECT_VERSION "5.14.1")
-+    set(PROJECT_VERSION_MAJOR 5)
-+endif()
-+
- add_definitions(-DQT_NO_CAST_TO_ASCII
- -DQT_NO_CAST_FROM_ASCII
- -DQT_NO_URL_CAST_FROM_STRING
-@@ -64,3 +95,7 @@ target_link_libraries(xembedsniproxy
- install(TARGETS xembedsniproxy ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
- install(FILES xembedsniproxy.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
- 
-+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-+    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-+endif()
-+
--- 
-2.19.1
-
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.5.ebuild
deleted file mode 100644
index 19e503988834..000000000000
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FRAMEWORKS_MINIMAL="5.50.0"
-QT_MINIMAL="5.9.6"
-KDE_AUTODEPS="false"
-KMNAME="plasma-workspace"
-inherit kde5
-
-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"
-KEYWORDS="amd64 ~arm x86"
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
-	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.2-standalone.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-
-	sed -e "/set/s/GENTOO_PV/${PV}/" \
-		-e "/set/s/GENTOO_QT_MINIMAL/${QT_MINIMAL}/" \
-		-e "/set/s/GENTOO_KF5_MINIMAL/${FRAMEWORKS_MINIMAL}/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.15.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.15.5.ebuild
index 54a97db0e7e7..fb712731ccb2 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.15.5.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.15.5.ebuild
@@ -11,7 +11,7 @@ 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"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 DEPEND="
 	$(add_frameworks_dep extra-cmake-modules)