commit: 1dd801ca6c0af8354ffa311a87504edf4f99a1d5
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Aug 2 18:30:45 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Aug 2 21:21:52 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1dd801ca
kde-apps/kdialog: Frameworks merged to master
Package-Manager: portage-2.2.28
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
kde-apps/kdialog/kdialog-5.9999.ebuild | 22 ----------------------
kde-apps/kdialog/kdialog-9999.ebuild | 31 +++++++++++++++++++++++++++++--
2 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/kde-apps/kdialog/kdialog-5.9999.ebuild
b/kde-apps/kdialog/kdialog-5.9999.ebuild
deleted file mode 100644
index 089c2ac..0000000
--- a/kde-apps/kdialog/kdialog-5.9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KMNAME="kde-baseapps"
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
-KEYWORDS=""
-IUSE=""
-
-S=${WORKDIR}/${P}/${PN}
-
-DEPEND="
- $(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_qt_dep qtdbus)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdialog/kdialog-9999.ebuild
b/kde-apps/kdialog/kdialog-9999.ebuild
index 515d89c..0ec37bd 100644
--- a/kde-apps/kdialog/kdialog-9999.ebuild
+++ b/kde-apps/kdialog/kdialog-9999.ebuild
@@ -5,8 +5,35 @@
EAPI=6
KMNAME="kde-baseapps"
-inherit kde4-meta
+inherit kde5
DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
KEYWORDS=""
-IUSE="debug"
+IUSE="X"
+
+DEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ )
+ kde5_src_configure
+}
