gentoo resync : 16.02.1018

3 files changed, 103 insertions, 0 deletions

diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 3df96c29b212..a15258200c5c 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,4 +1,7 @@
 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.0.tar.xz 4706936 BLAKE2B f1f772bf0c27b491ed2e8b9e4342694b5e1acaabec701ca44b252fb522c72688be1bf4c8db8826e5c7cd407c47ca1c205ae422312532bb7ea2dce165d9b9204e SHA512 2ed2f0ce2ef15aafa337a2b4943389668d18e18f026df67950f4d506d2c5647660ddade6f9c915b1e2fb36c79fbcddf563c25fdac69aac3f14e26afb603c533c
 EBUILD xembed-sni-proxy-5.14.5.ebuild 1075 BLAKE2B 4aba0229e1823486e9ea7036513d76300d5ec390b5750a7f7df339bdc41e4834f734af2cec3885cb5d6515edf9c69433ed53fad4a9d8513778ae79f08bfc1707 SHA512 ed202181bae19dbb97712581ed64be5ea214f202d77e049e348fb384f2349c2ace6de2ad2db6477287fc5065e0027b78e5ef02bac1db7a296425a02d390d5594
+EBUILD xembed-sni-proxy-5.15.0.ebuild 933 BLAKE2B 19357f763ccebf94b2477b22518c6e2adf899e748e7d4b9269caadddc18c4dea5260d46edbd696f0f2a665a600060e4a2ee5f8c9ad4e76571ea9661a7a5626e0 SHA512 1b08d278c767a575877c3a539e2573021606ac1315dcea7864c02bcb472e0ddbbe81989d3d2fdb3891d30d403eaae194f9c6e3d75083f47e92c68ccdc7d8ffaf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch
new file mode 100644
index 000000000000..8fb3c1709042
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch
@@ -0,0 +1,59 @@
+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 "5.11.0")
++    set(KF5_MIN_VERSION "5.54.0")
++    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.90")
++    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.15.0.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.15.0.ebuild
new file mode 100644
index 000000000000..9b2a7e4bffcc
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.15.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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.90-standalone.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+
+	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
+		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+}