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 849B813832E for ; Tue, 2 Aug 2016 21:22:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F12921C090; Tue, 2 Aug 2016 21:22:15 +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 9A0B821C090 for ; Tue, 2 Aug 2016 21:22:11 +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 4BFF6340B23 for ; Tue, 2 Aug 2016 21:22:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A813F241F for ; Tue, 2 Aug 2016 21:22:07 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1470172912.bda053d9d7e85d77e2ce21b850df618d4b34d7af.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kfind/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kfind/kfind-5.9999.ebuild kde-apps/kfind/kfind-9999.ebuild X-VCS-Directories: kde-apps/kfind/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: bda053d9d7e85d77e2ce21b850df618d4b34d7af X-VCS-Branch: master Date: Tue, 2 Aug 2016 21:22:07 +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: 2c6c0906-abbd-419b-a4ed-4dc41164235b X-Archives-Hash: bef9ecc90d420d1689e0f799c5980e54 commit: bda053d9d7e85d77e2ce21b850df618d4b34d7af Author: Andreas Sturmlechner gmail com> AuthorDate: Tue Aug 2 18:40:36 2016 +0000 Commit: Johannes Huber gentoo org> CommitDate: Tue Aug 2 21:21:52 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bda053d9 kde-apps/kfind: Frameworks merged to master Package-Manager: portage-2.2.28 Signed-off-by: Johannes Huber gentoo.org> kde-apps/kfind/kfind-5.9999.ebuild | 36 ------------------------------------ kde-apps/kfind/kfind-9999.ebuild | 25 +++++++++++++++++++++---- 2 files changed, 21 insertions(+), 40 deletions(-) diff --git a/kde-apps/kfind/kfind-5.9999.ebuild b/kde-apps/kfind/kfind-5.9999.ebuild deleted file mode 100644 index dffad59..0000000 --- a/kde-apps/kfind/kfind-5.9999.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -EGIT_BRANCH="frameworks" -KDE_HANDBOOK="true" -KMNAME="kde-baseapps" -inherit kde5 - -DESCRIPTION="KDE file finder utility" -HOMEPAGE="https://www.kde.org/applications/utilities/kfind/" -KEYWORDS="" -IUSE="" - -DEPEND=" - $(add_frameworks_dep karchive) - $(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 kio) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_kdeapps_dep libkonq) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) -" -RDEPEND="${DEPEND}" - -S=${S}/${PN} diff --git a/kde-apps/kfind/kfind-9999.ebuild b/kde-apps/kfind/kfind-9999.ebuild index 3ccfa3c..8ad9a6a 100644 --- a/kde-apps/kfind/kfind-9999.ebuild +++ b/kde-apps/kfind/kfind-9999.ebuild @@ -4,16 +4,33 @@ EAPI=6 -KDE_HANDBOOK="optional" +KDE_DOC_DIR="docs" +KDE_HANDBOOK="forceoptional" KMNAME="kde-baseapps" -inherit kde4-meta +inherit kde5 -DESCRIPTION="KDE file finder utility" +DESCRIPTION="File finder utility based on KDE Frameworks" HOMEPAGE="https://www.kde.org/applications/utilities/kfind/" KEYWORDS="" -IUSE="debug" +IUSE="" DEPEND=" + $(add_frameworks_dep karchive) + $(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 kio) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) $(add_kdeapps_dep libkonq) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) " RDEPEND="${DEPEND}" + +S="${S}/${PN}"