From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C45A9138A87 for ; Mon, 23 Feb 2015 20:24:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69BC4E0848; Mon, 23 Feb 2015 20:24:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E2958E0848 for ; Mon, 23 Feb 2015 20:24:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8BC7F340929 for ; Mon, 23 Feb 2015 20:24:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F9841266E for ; Mon, 23 Feb 2015 20:24:49 +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: <1424723005.fe2aa8f0b7dc45c1c688d1e8aab4dfc12cf5f6c7.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kcharselect/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kcharselect/kcharselect-5.9999.ebuild kde-apps/kcharselect/kcharselect-9999.ebuild X-VCS-Directories: kde-apps/kcharselect/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: fe2aa8f0b7dc45c1c688d1e8aab4dfc12cf5f6c7 X-VCS-Branch: master Date: Mon, 23 Feb 2015 20:24:49 +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: 7e4e2c21-bd6c-46c9-826a-4cd8652212b4 X-Archives-Hash: da2b7d457763e1691c88a49963277307 commit: fe2aa8f0b7dc45c1c688d1e8aab4dfc12cf5f6c7 Author: Johannes Huber gentoo org> AuthorDate: Mon Feb 23 20:23:25 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Mon Feb 23 20:23:25 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=fe2aa8f0 [kde-apps/kcharselect] Frameworks merged to master Package-Manager: portage-2.2.17 --- kde-apps/kcharselect/kcharselect-5.9999.ebuild | 29 -------------------------- kde-apps/kcharselect/kcharselect-9999.ebuild | 18 +++++++++++++--- 2 files changed, 15 insertions(+), 32 deletions(-) diff --git a/kde-apps/kcharselect/kcharselect-5.9999.ebuild b/kde-apps/kcharselect/kcharselect-5.9999.ebuild deleted file mode 100644 index 0f77bf7..0000000 --- a/kde-apps/kcharselect/kcharselect-5.9999.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -KDE_HANDBOOK="true" -EGIT_BRANCH="frameworks" -inherit kde5 - -DESCRIPTION="KDE character selection utility" -HOMEPAGE="http://www.kde.org/applications/utilities/kcharselect -http://utils.kde.org/projects/kcharselect" -KEYWORDS="" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 -" -RDEPEND="${DEPEND} - !kde-base/kcharselect:4 -" diff --git a/kde-apps/kcharselect/kcharselect-9999.ebuild b/kde-apps/kcharselect/kcharselect-9999.ebuild index 3d9e14e..2ee611a 100644 --- a/kde-apps/kcharselect/kcharselect-9999.ebuild +++ b/kde-apps/kcharselect/kcharselect-9999.ebuild @@ -4,11 +4,23 @@ EAPI=5 -KDE_HANDBOOK="optional" -inherit kde4-base +KDE_HANDBOOK="true" +inherit kde5 DESCRIPTION="KDE character selection utility" HOMEPAGE="http://www.kde.org/applications/utilities/kcharselect http://utils.kde.org/projects/kcharselect" KEYWORDS="" -IUSE="debug" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 +" +RDEPEND="${DEPEND}"