[gentoo-commits] repo/gentoo:master commit in: kde-plasma/qguiplatformplugin_kde/files/, kde-plasma/qguiplatformplugin_kde/

[gentoo-commits] repo/gentoo:master commit in: kde-plasma/qguiplatformplugin_kde/files/, kde-plasma/qguiplatformplugin_kde/

[Andreas Sturmlechner]

commit:     a321a66e1bccc885db3b2d0d56a5eca348e0b2c4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  4 20:46:34 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 00:34:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a321a66e

kde-plasma/qguiplatformplugin_kde: Switch to kde4-base, EAPI 6

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../files/qguiplatformplugin_kde-4.11.22-cmake.patch    | 17 +++++++++++++++++
 .../qguiplatformplugin_kde-4.11.22.ebuild               | 12 ++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/kde-plasma/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.22-cmake.patch b/kde-plasma/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.22-cmake.patch
new file mode 100644
index 00000000000..defd44f2651
--- /dev/null
+++ b/kde-plasma/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.22-cmake.patch
@@ -0,0 +1,17 @@
+Standalone build of the plugin.
+
+--- a/CMakeLists.txt	2018-01-04 21:38:30.921464554 +0100
++++ b/CMakeLists.txt	2018-01-04 21:38:30.890464324 +0100
+@@ -1,5 +1,12 @@
++cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR)
++
+ project(qguiplatformplugin_kde)
+ 
++find_package(KDE4 4.9.4 REQUIRED)
++include(KDE4Defaults)
++add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
++include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
++
+ set(kde_SOURCES  qguiplatformplugin_kde.cpp)
+ qt4_generate_moc(qguiplatformplugin_kde.cpp ${CMAKE_CURRENT_BINARY_DIR}/qguiplatformplugin_kde.moc)
+ 

diff --git a/kde-plasma/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild b/kde-plasma/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild
index 0c587aa1716..a192beace50 100644
--- a/kde-plasma/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild
+++ b/kde-plasma/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild
@@ -1,11 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 KMNAME="kde-workspace"
-inherit kde4-meta
+inherit kde4-base
 
-DESCRIPTION="Helps integration of pure Qt applications with KDE Plasma"
+DESCRIPTION="Helps integration of pure Qt4 applications with KDE Plasma"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
+
+S="${WORKDIR}/${KMNAME}-${PV}/qguiplatformplugin_kde"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )