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

2016-03-13 Thread Michael Palimaka
commit: a29e51d47b0acbf2794829e48da596d43b3c8820
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Mar 13 15:38:58 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Mar 13 18:54:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a29e51d4

kde-plasma/plasma-sdk: Drop old

Package-Manager: portage-2.2.27

 .../files/plasma-sdk-5.3.2-remove-qtwebkit.patch   | 11 --
 kde-plasma/plasma-sdk/plasma-sdk-5.5.5.ebuild  | 40 --
 2 files changed, 51 deletions(-)

diff --git a/kde-plasma/plasma-sdk/files/plasma-sdk-5.3.2-remove-qtwebkit.patch 
b/kde-plasma/plasma-sdk/files/plasma-sdk-5.3.2-remove-qtwebkit.patch
deleted file mode 100644
index 6a5c8b0..000
--- a/kde-plasma/plasma-sdk/files/plasma-sdk-5.3.2-remove-qtwebkit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/CMakeLists.txt   2015-07-18 18:21:24.686994466 +0200
-+++ b/CMakeLists.txt   2015-07-18 18:21:51.772993658 +0200
-@@ -24,7 +24,7 @@
- # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is 
checked
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} 
${ECM_KDE_MODULE_DIR})
- 
--find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core DBus Gui Qml Quick Svg 
WebKit WebKitWidgets Widgets Xml)
-+find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core DBus Gui Qml Quick Svg 
Widgets Xml)
- 
- find_package(Qt5Test ${QT_MIN_VERSION} CONFIG QUIET)
- set_package_properties(Qt5Test PROPERTIES

diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.5.5.ebuild 
b/kde-plasma/plasma-sdk/plasma-sdk-5.5.5.ebuild
deleted file mode 100644
index 1096627..000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.5.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Useful applications for Plasma development"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep kdeclarative)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kpackage)
-   $(add_frameworks_dep kservice)
-   $(add_frameworks_dep ktexteditor)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep plasma)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-   !dev-util/plasmate
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.3.2-remove-qtwebkit.patch" )



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

2016-03-13 Thread Michael Palimaka
commit: 55bbebf0dfc88476fe9858bfff0251c397307335
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Mar 13 15:38:14 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Mar 13 18:54:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55bbebf0

kde-plasma/plasma-sdk: Add missing DEPENDs, fix bug 577004

Package-Manager: portage-2.2.27

 .../files/plasma-sdk-5.5.5-dependencies.patch  |  51 
 .../plasma-sdk-5.5.5-kdevplatform-lookup.patch | 139 +
 .../files/plasma-sdk-5.5.5-qtwebkit-optional.patch |  32 +
 kde-plasma/plasma-sdk/metadata.xml |   3 +
 kde-plasma/plasma-sdk/plasma-sdk-5.5.5-r1.ebuild   |  63 ++
 5 files changed, 288 insertions(+)

diff --git a/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-dependencies.patch 
b/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-dependencies.patch
new file mode 100644
index 000..e585eef
--- /dev/null
+++ b/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-dependencies.patch
@@ -0,0 +1,51 @@
+commit 56676709a8a0ecf51429bc1ac508513f72d0a761
+Author: Andreas Sturmlechner 
+Date:   Sun Mar 13 14:43:50 2016 +0100
+
+Make Qt5Test really optional, fix plasmate dependencies
+
+KF5NewStuff, KF5Parts are only required for plasmate.
+Could not push KF5ItemModels down into plasmate without breaking
+build. Is it a problem within KDevPlatform?
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b556de6..bc982ae 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -74,7 +74,7 @@ endif()
+ # Load CMake, Compiler and InstallDirs settings from KF5 and the following 
are already somewhat "done" tier1/tier2 libs from kdelibs:
+ find_package(KF5 REQUIRED COMPONENTS
+ Archive Completion Config ConfigWidgets CoreAddons DBusAddons Declarative 
I18n IconThemes ItemModels
+-KIO NewStuff Parts Plasma PlasmaQuick Service TextEditor WidgetsAddons 
XmlGui WindowSystem)
++KIO Plasma PlasmaQuick Service TextEditor WidgetsAddons XmlGui 
WindowSystem)
+ 
+ #
+ 
+diff --git a/cuttlefish/CMakeLists.txt b/cuttlefish/CMakeLists.txt
+index 6eaa78a..5b90fef 100644
+--- a/cuttlefish/CMakeLists.txt
 b/cuttlefish/CMakeLists.txt
+@@ -2,7 +2,9 @@ project(cuttlefish)
+ add_definitions(-DTRANSLATION_DOMAIN=\"cuttlefish\")
+ 
+ add_subdirectory(src)
+-add_subdirectory(autotests)
++if(BUILD_TESTING)
++add_subdirectory(autotests)
++endif()
+ 
+ 
+ plasma_install_package(package org.kde.plasma.cuttlefish packages package)
+diff --git a/plasmate/CMakeLists.txt b/plasmate/CMakeLists.txt
+index 8f28ec4..4586102 100644
+--- a/plasmate/CMakeLists.txt
 b/plasmate/CMakeLists.txt
+@@ -13,6 +13,8 @@ add_feature_info(GIT_EXECUTABLE_FOUND "Git" "Distributed 
Revision Control System
+ 
+ find_package(KF5 REQUIRED COMPONENTS
+ KDELibs4Support
++NewStuff
++Parts
+ )
+ 
+ #install( FILES previewer/windowswitcher/thumbnails/konqueror.png

diff --git 
a/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-kdevplatform-lookup.patch 
b/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-kdevplatform-lookup.patch
new file mode 100644
index 000..83d3f2e
--- /dev/null
+++ b/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-kdevplatform-lookup.patch
@@ -0,0 +1,139 @@
+From: Kevin Funk 
+Date: Tue, 22 Dec 2015 14:25:48 +
+Subject: CMake: KDevplatform integration fixes
+X-Git-Tag: v5.5.95
+X-Git-Url: 
http://quickgit.kde.org/?p=plasma-sdk.git&a=commitdiff&h=616cd9c3cabff9b826fdba935b65b8dc45b05ac0
+---
+CMake: KDevplatform integration fixes
+
+Summary:
+* Adapt to kdevplatform changes
+* CMake: Simplify kdevplatform lookup
+
+Reviewers: mart
+
+Reviewed By: mart
+
+Differential Revision: https://phabricator.kde.org/D668
+---
+
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -36,6 +36,12 @@
+ set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
+ endif()
+ 
++find_package(KDevPlatform 4.90.90)
++set_package_properties(KDevPlatform PROPERTIES
++PURPOSE "Required for plasmate"
++TYPE OPTIONAL
++)
++
+ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
+ 
+ include(KDEInstallDirs)
+@@ -56,7 +62,7 @@
+ 
+ # Load CMake, Compiler and InstallDirs settings from KF5 and the following 
are already somewhat "done" tier1/tier2 libs from kdelibs:
+ find_package(KF5 REQUIRED COMPONENTS
+-Archive Completion Config ConfigWidgets CoreAddons DBusAddons Declarative 
I18n IconThemes
++Archive Completion Config ConfigWidgets CoreAddons DBusAddons Declarative 
I18n IconThemes ItemModels
+ KIO NewStuff Parts Plasma PlasmaQuick Service TextEditor WidgetsAddons 
XmlGui WindowSystem)
+ 
+ #
+@@ -66,18 +72,15 @@
+ 
+ remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS 
-DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS)
+ 
+-option(PLASMATE_BUILD_WITH_KDEVPLATFORM "Build the plasmate repository with 
KDevPlatform Support" OF