commit: ac5e5179132f416c4ddd7a7b19c5cc8dd8f7aa87
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Jun 1 20:17:39 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jun 8 21:04:40 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ac5e5179
[kde-apps/umbrello] Frameworks merged to master
Package-Manager: portage-2.2.20
.../files/umbrello-5.9999-tests-optional.patch | 33 ---------------
kde-apps/umbrello/umbrello-5.9999.ebuild | 49 ----------------------
kde-apps/umbrello/umbrello-9999.ebuild | 38 +++++++++++++++--
3 files changed, 35 insertions(+), 85 deletions(-)
diff --git a/kde-apps/umbrello/files/umbrello-5.9999-tests-optional.patch
b/kde-apps/umbrello/files/umbrello-5.9999-tests-optional.patch
deleted file mode 100644
index e9bb603..0000000
--- a/kde-apps/umbrello/files/umbrello-5.9999-tests-optional.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/CMakeLists.txt 2015-02-03 20:04:23.900153480 +0100
-+++ b/CMakeLists.txt 2015-02-03 20:25:08.164973819 +0100
-@@ -26,11 +26,19 @@
- Gui
- PrintSupport
- Svg
-- Test
- Widgets
- Xml
- )
-
-+find_package(Qt5Test ${QT_MIN_VERSION} QUIET)
-+set_package_properties(Qt5Test PROPERTIES
-+ PURPOSE "Required for tests"
-+ TYPE OPTIONAL)
-+add_feature_info("Qt5Test" Qt5Test_FOUND "Required for building tests")
-+if (NOT Qt5Test_FOUND)
-+ set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
-+endif()
-+
- # search packages used by KDE
- find_package(KF5 REQUIRED COMPONENTS
- Archive
-@@ -105,6 +113,8 @@
- endif(LIBXSLT_FOUND AND LIBXML2_FOUND)
-
- # for automatic unit tests
--ecm_optional_add_subdirectory(unittests)
-+if (BUILD_TESTING)
-+ ecm_optional_add_subdirectory(unittests)
-+endif()
-
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/kde-apps/umbrello/umbrello-5.9999.ebuild
b/kde-apps/umbrello/umbrello-5.9999.ebuild
deleted file mode 100644
index 5bb65ad..0000000
--- a/kde-apps/umbrello/umbrello-5.9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-EGIT_BRANCH="frameworks"
-KDE_HANDBOOK="true"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="
- http://www.kde.org/applications/development/umbrello
- http://umbrello.kde.org
-"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kauth)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdoctools)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kinit)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- dev-libs/libxml2
- dev-libs/libxslt
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}"-5.9999-tests-optional.patch )
diff --git a/kde-apps/umbrello/umbrello-9999.ebuild
b/kde-apps/umbrello/umbrello-9999.ebuild
index ae00fa2..520b1c8 100644
--- a/kde-apps/umbrello/umbrello-9999.ebuild
+++ b/kde-apps/umbrello/umbrello-9999.ebuild
@@ -4,8 +4,9 @@
EAPI=5
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+inherit kde5
DESCRIPTION="KDE UML Modeller"
HOMEPAGE="
@@ -13,10 +14,41 @@ HOMEPAGE="
http://umbrello.kde.org
"
KEYWORDS=""
-IUSE="debug"
+IUSE=""
RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdoctools)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
dev-libs/libxml2
dev-libs/libxslt
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
"
DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_KF5=ON
+ )
+
+ kde5_src_configure
+}
