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 5987113832E for ; Tue, 2 Aug 2016 21:22:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3B6E21C08D; Tue, 2 Aug 2016 21:22:13 +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 A497721C08B for ; Tue, 2 Aug 2016 21:22:12 +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 9FF89340B30 for ; Tue, 2 Aug 2016 21:22:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F10C42443 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.1dd801ca6c0af8354ffa311a87504edf4f99a1d5.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdialog/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kdialog/kdialog-5.9999.ebuild kde-apps/kdialog/kdialog-9999.ebuild X-VCS-Directories: kde-apps/kdialog/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 1dd801ca6c0af8354ffa311a87504edf4f99a1d5 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: 30959a85-dac0-4227-9050-1e0e40feb082 X-Archives-Hash: 88b39265cea48dd67ae6338bd55a30a6 commit: 1dd801ca6c0af8354ffa311a87504edf4f99a1d5 Author: Andreas Sturmlechner gmail com> AuthorDate: Tue Aug 2 18:30:45 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=1dd801ca kde-apps/kdialog: Frameworks merged to master Package-Manager: portage-2.2.28 Signed-off-by: Johannes Huber gentoo.org> kde-apps/kdialog/kdialog-5.9999.ebuild | 22 ---------------------- kde-apps/kdialog/kdialog-9999.ebuild | 31 +++++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/kde-apps/kdialog/kdialog-5.9999.ebuild b/kde-apps/kdialog/kdialog-5.9999.ebuild deleted file mode 100644 index 089c2ac..0000000 --- a/kde-apps/kdialog/kdialog-5.9999.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KMNAME="kde-baseapps" -EGIT_BRANCH="frameworks" -inherit kde5 - -DESCRIPTION="Can be used to show nice dialog boxes from shell scripts" -KEYWORDS="" -IUSE="" - -S=${WORKDIR}/${P}/${PN} - -DEPEND=" - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kwidgetsaddons) - $(add_qt_dep qtdbus) -" -RDEPEND="${DEPEND}" diff --git a/kde-apps/kdialog/kdialog-9999.ebuild b/kde-apps/kdialog/kdialog-9999.ebuild index 515d89c..0ec37bd 100644 --- a/kde-apps/kdialog/kdialog-9999.ebuild +++ b/kde-apps/kdialog/kdialog-9999.ebuild @@ -5,8 +5,35 @@ EAPI=6 KMNAME="kde-baseapps" -inherit kde4-meta +inherit kde5 DESCRIPTION="Can be used to show nice dialog boxes from shell scripts" KEYWORDS="" -IUSE="debug" +IUSE="X" + +DEPEND=" + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + X? ( x11-libs/libX11 ) +" +RDEPEND="${DEPEND}" + +S="${S}/${PN}" + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package X X11) + ) + kde5_src_configure +}