commit: 342d58bc644d0e3ec8bc5677601790bf9504f3a0
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 19 09:19:24 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 19 09:19:24 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=342d58bc
[kde-apps] Restore KF5-based ebuilds.
---
kde-apps/gwenview/gwenview-14.11.90.ebuild | 56 +++++++++++----------
kde-apps/gwenview/gwenview-5.9999.ebuild | 66 -------------------------
kde-apps/kanagram/kanagram-14.11.90.ebuild | 29 ++++++++---
kde-apps/kanagram/kanagram-5.9999.ebuild | 36 --------------
kde-apps/kate/kate-14.11.90.ebuild | 79 ++++++++++++++++--------------
kde-apps/kate/kate-5.9999.ebuild | 65 ------------------------
kde-apps/khangman/khangman-14.11.90.ebuild | 26 ++++++++--
kde-apps/khangman/khangman-5.9999.ebuild | 35 -------------
kde-apps/konsole/konsole-14.11.90.ebuild | 67 +++++++++++++++----------
kde-apps/konsole/konsole-5.9999.ebuild | 55 ---------------------
kde-apps/kwrite/kwrite-14.11.90.ebuild | 43 +++++++++++++---
kde-apps/kwrite/kwrite-5.9999.ebuild | 48 ------------------
kde-apps/okteta/okteta-14.11.90.ebuild | 43 ++++++++++++++--
kde-apps/okteta/okteta-5.9999.ebuild | 54 --------------------
14 files changed, 231 insertions(+), 471 deletions(-)
diff --git a/kde-apps/gwenview/gwenview-14.11.90.ebuild
b/kde-apps/gwenview/gwenview-14.11.90.ebuild
index 6ede75e..e197c4f 100644
--- a/kde-apps/gwenview/gwenview-14.11.90.ebuild
+++ b/kde-apps/gwenview/gwenview-14.11.90.ebuild
@@ -4,9 +4,7 @@
EAPI=5
-KDE_HANDBOOK="optional"
-OPENGL_REQUIRED="always"
-inherit kde4-base
+inherit kde5
DESCRIPTION="KDE image viewer"
HOMEPAGE="
@@ -14,29 +12,45 @@ HOMEPAGE="
http://gwenview.sourceforge.net/
"
KEYWORDS=""
-IUSE="debug kipi semantic-desktop"
-
-# tests fail, last checked 4.11.0
-RESTRICT="test"
+IUSE="semantic-desktop"
DEPEND="
- $(add_kdebase_dep libkdcraw)
$(add_kdebase_dep libkonq)
- $(add_kdebase_dep kactivities '' 4.13)
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
media-gfx/exiv2:=
media-libs/lcms:2
media-libs/libpng:0=
+ media-libs/phonon[qt5]
virtual/jpeg:0
x11-libs/libX11
- kipi? ( $(add_kdebase_dep libkipi) )
semantic-desktop? ( $(add_kdebase_dep baloo) )
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !kde-base/gwenview:4
+"
src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with kipi)
- )
# Workaround for bug #479510
if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then
mycmakeargs+=(
-DJCONFIG_H="${EPREFIX}/usr/include/${CHOST}/jconfig.h" )
@@ -48,17 +62,5 @@ src_configure() {
mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
fi
- kde4-base_src_configure
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- if ! has_version kde-base/svgpart:${SLOT} ; then
- elog "For SVG support, install kde-base/svgpart:${SLOT}"
- fi
-
- if use kipi && ! has_version media-plugins/kipi-plugins ; then
- elog "The plugins for the KIPI inteface can be found in
media-plugins/kipi-plugins"
- fi
+ kde5_src_configure
}
diff --git a/kde-apps/gwenview/gwenview-5.9999.ebuild
b/kde-apps/gwenview/gwenview-5.9999.ebuild
deleted file mode 100644
index e197c4f..0000000
--- a/kde-apps/gwenview/gwenview-5.9999.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="KDE image viewer"
-HOMEPAGE="
- http://www.kde.org/applications/graphics/gwenview/
- http://gwenview.sourceforge.net/
-"
-KEYWORDS=""
-IUSE="semantic-desktop"
-
-DEPEND="
- $(add_kdebase_dep libkonq)
- $(add_frameworks_dep kactivities)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- media-gfx/exiv2:=
- media-libs/lcms:2
- media-libs/libpng:0=
- media-libs/phonon[qt5]
- virtual/jpeg:0
- x11-libs/libX11
- semantic-desktop? ( $(add_kdebase_dep baloo) )
-"
-RDEPEND="${DEPEND}
- !kde-base/gwenview:4
-"
-
-src_configure() {
- # Workaround for bug #479510
- if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then
- mycmakeargs+=(
-DJCONFIG_H="${EPREFIX}/usr/include/${CHOST}/jconfig.h" )
- fi
-
- if use semantic-desktop; then
- mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)
- else
- mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
- fi
-
- kde5_src_configure
-}
diff --git a/kde-apps/kanagram/kanagram-14.11.90.ebuild
b/kde-apps/kanagram/kanagram-14.11.90.ebuild
index 0d2afc3..bfd21b4 100644
--- a/kde-apps/kanagram/kanagram-14.11.90.ebuild
+++ b/kde-apps/kanagram/kanagram-14.11.90.ebuild
@@ -4,16 +4,33 @@
EAPI=5
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_HANDBOOK="true"
+inherit kde5
-DESCRIPTION="KDE: letter order game"
+DESCRIPTION="Game based on anagrams of works"
HOMEPAGE="http://www.kde.org/applications/education/kanagram
http://edu.kde.org/kanagram";
KEYWORDS=""
-IUSE="debug"
+IUSE=""
DEPEND="
- $(add_kdebase_dep libkdeedu)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ $(add_kdebase_dep libkeduvocdocument)
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtwebkit:5[qml]
+ dev-qt/qtwidgets:5
+ media-libs/phonon[qt5]
+"
+RDEPEND="${DEPEND}
+ dev-qt/qtquickcontrols:5
+ !kde-base/kanagram:4
"
-RDEPEND=${DEPEND}
diff --git a/kde-apps/kanagram/kanagram-5.9999.ebuild
b/kde-apps/kanagram/kanagram-5.9999.ebuild
deleted file mode 100644
index bfd21b4..0000000
--- a/kde-apps/kanagram/kanagram-5.9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Game based on anagrams of works"
-HOMEPAGE="http://www.kde.org/applications/education/kanagram
-http://edu.kde.org/kanagram";
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdeclarative)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep sonnet)
- $(add_kdebase_dep libkeduvocdocument)
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtwebkit:5[qml]
- dev-qt/qtwidgets:5
- media-libs/phonon[qt5]
-"
-RDEPEND="${DEPEND}
- dev-qt/qtquickcontrols:5
- !kde-base/kanagram:4
-"
diff --git a/kde-apps/kate/kate-14.11.90.ebuild
b/kde-apps/kate/kate-14.11.90.ebuild
index b3804ef..1e68319 100644
--- a/kde-apps/kate/kate-14.11.90.ebuild
+++ b/kde-apps/kate/kate-14.11.90.ebuild
@@ -3,60 +3,63 @@
# $Header: $
EAPI=5
-KDE_HANDBOOK="optional"
-KMNAME="kate"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit python-single-r1 kde4-meta
+KDE_HANDBOOK="optional"
+inherit kde5
-DESCRIPTION="Kate is an MDI texteditor"
+DESCRIPTION="Kate is an advanced text editor"
HOMEPAGE="http://www.kde.org/applications/utilities/kate
http://kate-editor.org";
KEYWORDS=""
-IUSE="debug python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="+addons"
DEPEND="
- $(add_kdebase_dep kactivities '' 4.13)
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
dev-libs/libxml2
dev-libs/libxslt
dev-libs/qjson
- python? (
- ${PYTHON_DEPS}
- $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}" 4.9.2-r1)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ addons? (
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep plasma)
)
"
RDEPEND="${DEPEND}
- $(add_kdebase_dep katepart)
-"
-
-KMEXTRA="
- addons/kate
- addons/plasma
+ !kde-base/kate:4
"
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
- kde4-meta_pkg_setup
-}
-
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_build python pate)
+ $(cmake-utils_use_build addons)
+ -DBUILD_kwrite=FALSE
)
- kde4-meta_src_configure
-}
-
-pkg_postinst() {
- kde4-meta_pkg_postinst
-
- if ! has_version kde-base/kaddressbook:${SLOT}; then
- echo
- elog "File templates plugin requires
kde-base/kaddressbook:${SLOT}."
- elog "Please install it if you plan to use this plugin."
- echo
- fi
+ kde5_src_configure
}
diff --git a/kde-apps/kate/kate-5.9999.ebuild b/kde-apps/kate/kate-5.9999.ebuild
deleted file mode 100644
index 1e68319..0000000
--- a/kde-apps/kate/kate-5.9999.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Kate is an advanced text editor"
-HOMEPAGE="http://www.kde.org/applications/utilities/kate
http://kate-editor.org";
-KEYWORDS=""
-IUSE="+addons"
-
-DEPEND="
- $(add_frameworks_dep kactivities)
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep sonnet)
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/qjson
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- addons? (
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kwallet)
- $(add_frameworks_dep plasma)
- )
-"
-RDEPEND="${DEPEND}
- !kde-base/kate:4
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build addons)
- -DBUILD_kwrite=FALSE
- )
-
- kde5_src_configure
-}
diff --git a/kde-apps/khangman/khangman-14.11.90.ebuild
b/kde-apps/khangman/khangman-14.11.90.ebuild
index a20b258..b39d780 100644
--- a/kde-apps/khangman/khangman-14.11.90.ebuild
+++ b/kde-apps/khangman/khangman-14.11.90.ebuild
@@ -4,16 +4,32 @@
EAPI=5
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_HANDBOOK="true"
+inherit kde5
DESCRIPTION="Classical hangman game for KDE"
HOMEPAGE="http://www.kde.org/applications/education/khangman
http://edu.kde.org/khangman";
KEYWORDS=""
-IUSE="debug"
+IUSE=""
DEPEND="
- $(add_kdebase_dep libkdeedu)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_kdebase_dep libkeduvocdocument)
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-libs/phonon[qt5]
+"
+RDEPEND="${DEPEND}
+ !kde-base/khangman:4
"
-RDEPEND=${DEPEND}
diff --git a/kde-apps/khangman/khangman-5.9999.ebuild
b/kde-apps/khangman/khangman-5.9999.ebuild
deleted file mode 100644
index b39d780..0000000
--- a/kde-apps/khangman/khangman-5.9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Classical hangman game for KDE"
-HOMEPAGE="http://www.kde.org/applications/education/khangman
-http://edu.kde.org/khangman";
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_kdebase_dep libkeduvocdocument)
- dev-qt/qtgui:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-libs/phonon[qt5]
-"
-RDEPEND="${DEPEND}
- !kde-base/khangman:4
-"
diff --git a/kde-apps/konsole/konsole-14.11.90.ebuild
b/kde-apps/konsole/konsole-14.11.90.ebuild
index 0a877fe..b588b33 100644
--- a/kde-apps/konsole/konsole-14.11.90.ebuild
+++ b/kde-apps/konsole/konsole-14.11.90.ebuild
@@ -4,35 +4,52 @@
EAPI=5
-KDE_HANDBOOK="optional"
-KDE_DOC_DIRS="doc/manual"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-base
+KDE_HANDBOOK="true"
+inherit kde5
-DESCRIPTION="X terminal for use with KDE"
+DESCRIPTION="KDE's terminal emulator"
HOMEPAGE="http://www.kde.org/applications/system/konsole
http://konsole.kde.org";
+
KEYWORDS=""
-IUSE="debug"
+IUSE="X"
-COMMONDEPEND="
- !aqua? (
- $(add_kdebase_dep libkonq)
- x11-libs/libX11
- x11-libs/libXext
- >=x11-libs/libxklavier-3.2
- x11-libs/libXrender
- x11-libs/libXtst
- )
+DEPEND="
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kpty)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ X? ( x11-libs/libX11 )
"
-DEPEND="${COMMONDEPEND}
- !aqua? (
- x11-apps/bdftopcf
- x11-proto/kbproto
- x11-proto/renderproto
- )
+RDEPEND="${DEPEND}
+ !kde-base/konsole:4
"
-RDEPEND="${COMMONDEPEND}"
-# can't connect to a kded instance, fails to connect to dbus
-RESTRICT="test"
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-apps/konsole/konsole-5.9999.ebuild
b/kde-apps/konsole/konsole-5.9999.ebuild
deleted file mode 100644
index b588b33..0000000
--- a/kde-apps/konsole/konsole-5.9999.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="http://www.kde.org/applications/system/konsole
http://konsole.kde.org";
-
-KEYWORDS=""
-IUSE="X"
-
-DEPEND="
- $(add_frameworks_dep kbookmarks)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kpty)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}
- !kde-base/konsole:4
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package X X11)
- )
-
- kde5_src_configure
-}
diff --git a/kde-apps/kwrite/kwrite-14.11.90.ebuild
b/kde-apps/kwrite/kwrite-14.11.90.ebuild
index 741fafe..dc10789 100644
--- a/kde-apps/kwrite/kwrite-14.11.90.ebuild
+++ b/kde-apps/kwrite/kwrite-14.11.90.ebuild
@@ -4,16 +4,45 @@
EAPI=5
-KDE_HANDBOOK="optional"
KMNAME="kate"
-KMEXTRACTONLY="doc/kate"
-inherit kde4-meta
+inherit kde5
-DESCRIPTION="KDE MDI editor/IDE"
+DESCRIPTION="KDE simple text editor"
HOMEPAGE="http://www.kde.org/applications/utilities/kwrite";
KEYWORDS=""
-IUSE="debug"
-RDEPEND="
- $(add_kdebase_dep katepart)
+DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
"
+
+RDEPEND="${DEPEND}
+ !kde-base/kwrite:4
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_addons=FALSE
+ -DBUILD_kate=FALSE
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-apps/kwrite/kwrite-5.9999.ebuild
b/kde-apps/kwrite/kwrite-5.9999.ebuild
deleted file mode 100644
index dc10789..0000000
--- a/kde-apps/kwrite/kwrite-5.9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KMNAME="kate"
-inherit kde5
-
-DESCRIPTION="KDE simple text editor"
-HOMEPAGE="http://www.kde.org/applications/utilities/kwrite";
-KEYWORDS=""
-
-DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep sonnet)
-"
-
-RDEPEND="${DEPEND}
- !kde-base/kwrite:4
-"
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_addons=FALSE
- -DBUILD_kate=FALSE
- )
-
- kde5_src_configure
-}
diff --git a/kde-apps/okteta/okteta-14.11.90.ebuild
b/kde-apps/okteta/okteta-14.11.90.ebuild
index d570121..8aabdf2 100644
--- a/kde-apps/okteta/okteta-14.11.90.ebuild
+++ b/kde-apps/okteta/okteta-14.11.90.ebuild
@@ -5,15 +5,50 @@
EAPI=5
KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_TEST="true"
+inherit kde5
DESCRIPTION="KDE hexeditor"
HOMEPAGE="http://www.kde.org/applications/utilities/okteta
http://utils.kde.org/projects/okteta";
KEYWORDS=""
-IUSE="debug"
+IUSE="crypt examples"
DEPEND="
- app-crypt/qca:2
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdoctools)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtcore:5
+ dev-qt/qtnetwork:5
+ dev-qt/designer:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ dev-qt/qtscript:5[scripttools]
+ crypt? ( app-crypt/qca:2[qt5] )
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !kde-base/okteta:4
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package crypt QCA2)
+ $(cmake-utils_use_enable examples OKTETA_BUILD_EXAMPLES)
+ $(cmake-utils_use_build test TESTING)
+ $(cmake-utils_use_find_package test Qt5Test)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-apps/okteta/okteta-5.9999.ebuild
b/kde-apps/okteta/okteta-5.9999.ebuild
deleted file mode 100644
index 8aabdf2..0000000
--- a/kde-apps/okteta/okteta-5.9999.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE hexeditor"
-HOMEPAGE="http://www.kde.org/applications/utilities/okteta
-http://utils.kde.org/projects/okteta";
-KEYWORDS=""
-IUSE="crypt examples"
-
-DEPEND="
- $(add_frameworks_dep kbookmarks)
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep kdoctools)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5
- dev-qt/designer:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- dev-qt/qtscript:5[scripttools]
- crypt? ( app-crypt/qca:2[qt5] )
-"
-RDEPEND="${DEPEND}
- !kde-base/okteta:4
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package crypt QCA2)
- $(cmake-utils_use_enable examples OKTETA_BUILD_EXAMPLES)
- $(cmake-utils_use_build test TESTING)
- $(cmake-utils_use_find_package test Qt5Test)
- )
-
- kde5_src_configure
-}
