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 A5FF213888F for ; Fri, 16 Oct 2015 18:24:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42EAA21C02E; Fri, 16 Oct 2015 18:24:35 +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 C98C321C02E for ; Fri, 16 Oct 2015 18:24:29 +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 DD722340A30 for ; Fri, 16 Oct 2015 18:24:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9686510B7 for ; Fri, 16 Oct 2015 18:24:21 +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: <1445019849.13519fab9f45bba04a9d6acfa1932ecc11a34ed5.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/krfb/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/krfb/krfb-5.9999.ebuild kde-apps/krfb/krfb-9999.ebuild X-VCS-Directories: kde-apps/krfb/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 13519fab9f45bba04a9d6acfa1932ecc11a34ed5 X-VCS-Branch: master Date: Fri, 16 Oct 2015 18:24:21 +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: 869dbba2-f57f-424e-adf6-b9ea47bf68a9 X-Archives-Hash: daea018d8633fd9f2e2b25cd96b4d249 commit: 13519fab9f45bba04a9d6acfa1932ecc11a34ed5 Author: Andreas Sturmlechner gmail com> AuthorDate: Thu Oct 15 23:04:23 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 16 18:24:09 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=13519fab kde-apps/krfb: Frameworks merged to master Package-Manager: portage-2.2.23 kde-apps/krfb/krfb-5.9999.ebuild | 43 -------------------------------------- kde-apps/krfb/krfb-9999.ebuild | 45 ++++++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 63 deletions(-) diff --git a/kde-apps/krfb/krfb-5.9999.ebuild b/kde-apps/krfb/krfb-5.9999.ebuild deleted file mode 100644 index 38e7739..0000000 --- a/kde-apps/krfb/krfb-5.9999.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -EGIT_BRANCH="frameworks" -KDE_DOXYGEN="true" -KDE_HANDBOOK="true" -inherit kde5 - -DESCRIPTION="VNC-compatible server to share KDE desktops" -HOMEPAGE="https://www.kde.org/applications/system/krfb/" -KEYWORDS="" -IUSE="" - -DEPEND=" - $(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 kdnssd) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - >=net-libs/libvncserver-0.9.9 - sys-libs/zlib - virtual/jpeg:0 - x11-libs/libX11 - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXtst -" -RDEPEND="${DEPEND}" diff --git a/kde-apps/krfb/krfb-9999.ebuild b/kde-apps/krfb/krfb-9999.ebuild index 0157a97..649f1c4 100644 --- a/kde-apps/krfb/krfb-9999.ebuild +++ b/kde-apps/krfb/krfb-9999.ebuild @@ -4,34 +4,39 @@ EAPI=5 -KDE_HANDBOOK="optional" -inherit kde4-base +KDE_DOXYGEN="true" +KDE_HANDBOOK="true" +inherit kde5 DESCRIPTION="VNC-compatible server to share KDE desktops" HOMEPAGE="https://www.kde.org/applications/system/krfb/" KEYWORDS="" -IUSE="debug telepathy ktp" -REQUIRED_USE="ktp? ( telepathy )" +IUSE="" DEPEND=" + $(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 kdnssd) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 >=net-libs/libvncserver-0.9.9 sys-libs/zlib virtual/jpeg:0 - !aqua? ( - x11-libs/libX11 - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXtst - ) - telepathy? ( >=net-libs/telepathy-qt-0.9 ) + x11-libs/libX11 + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXtst " RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_with telepathy TelepathyQt4) - $(cmake-utils_use_with ktp KTp) - ) - - kde4-base_src_configure -}