[gentoo-commits] proj/kde:master commit in: kde-apps/kgpg/

[Michael Palimaka]

commit:     8f62f638f7e9164eaec0bcc2de285be5512f76e8
Author:     Andrius Štikonas <andrius <AT> stikonas <DOT> eu>
AuthorDate: Sun Oct  9 12:04:12 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Oct  9 12:04:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8f62f638

kde-apps/kgpg: frameworks merged to master

 kde-apps/kgpg/kgpg-5.9999.ebuild | 55 ----------------------------------------
 kde-apps/kgpg/kgpg-9999.ebuild   | 34 +++++++++++++++++++++----
 2 files changed, 29 insertions(+), 60 deletions(-)

diff --git a/kde-apps/kgpg/kgpg-5.9999.ebuild b/kde-apps/kgpg/kgpg-5.9999.ebuild
deleted file mode 100644
index a05c4d7..0000000
--- a/kde-apps/kgpg/kgpg-5.9999.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_SELINUX_MODULE="gpg"
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
-HOMEPAGE="https://www.kde.org/applications/utilities/kgpg
-https://utils.kde.org/projects/kgpg"
-KEYWORDS=""
-IUSE=""
-
-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 kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-"
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version 'app-crypt/dirmngr' && ! has_version '>=app-crypt/gnupg-2.1'; then
-		elog "For improved key search functionality, install app-crypt/dirmngr."
-	fi
-}

diff --git a/kde-apps/kgpg/kgpg-9999.ebuild b/kde-apps/kgpg/kgpg-9999.ebuild
index 615d190..7809963 100644
--- a/kde-apps/kgpg/kgpg-9999.ebuild
+++ b/kde-apps/kgpg/kgpg-9999.ebuild
@@ -4,25 +4,49 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="gpg"
-inherit kde4-base
+inherit kde5
 
 DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
 HOMEPAGE="https://www.kde.org/applications/utilities/kgpg
 https://utils.kde.org/projects/kgpg"
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
 
 DEPEND="
-	$(add_kdeapps_dep kdepimlibs)
+	$(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 kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep kcontacts)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}
 	app-crypt/gnupg
 "
 
 pkg_postinst() {
-	kde4-base_pkg_postinst
+	kde5_pkg_postinst
 
 	if ! has_version 'app-crypt/dirmngr' && ! has_version '>=app-crypt/gnupg-2.1'; then
 		elog "For improved key search functionality, install app-crypt/dirmngr."