From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2B010138330 for ; Sun, 9 Oct 2016 14:53:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5222E0B78; Sun, 9 Oct 2016 14:52:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9461E0B78 for ; Sun, 9 Oct 2016 14:52:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18F65341618 for ; Sun, 9 Oct 2016 14:52:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 265D22492 for ; Sun, 9 Oct 2016 14:52:56 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1476014660.8f62f638f7e9164eaec0bcc2de285be5512f76e8.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kgpg/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kgpg/kgpg-5.9999.ebuild kde-apps/kgpg/kgpg-9999.ebuild X-VCS-Directories: kde-apps/kgpg/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 8f62f638f7e9164eaec0bcc2de285be5512f76e8 X-VCS-Branch: master Date: Sun, 9 Oct 2016 14:52:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6583daf8-abc5-4f03-a54c-2117cb17d3f8 X-Archives-Hash: db6ac4365611f8acdb02c385e57aaadd commit: 8f62f638f7e9164eaec0bcc2de285be5512f76e8 Author: Andrius Štikonas stikonas eu> AuthorDate: Sun Oct 9 12:04:12 2016 +0000 Commit: Michael Palimaka gentoo 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."