commit: e52e8da5a548d5167ab72eded42a5a33accf2e4b Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sun Mar 6 17:47:35 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Mon Mar 7 15:13:39 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e52e8da5
kde-apps/krdc: Frameworks merged to master Package-Manager: portage-2.2.27 kde-apps/krdc/krdc-5.9999.ebuild | 50 ---------------------------------------- kde-apps/krdc/krdc-9999.ebuild | 41 +++++++++++++++++++++----------- 2 files changed, 27 insertions(+), 64 deletions(-) diff --git a/kde-apps/krdc/krdc-5.9999.ebuild b/kde-apps/krdc/krdc-5.9999.ebuild deleted file mode 100644 index b5460f1..0000000 --- a/kde-apps/krdc/krdc-5.9999.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -EGIT_BRANCH="frameworks" -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="Remote desktop connection (RDP and VNC) client" -HOMEPAGE="https://www.kde.org/applications/internet/krdc/"; -KEYWORDS="" -IUSE="+rdesktop vnc" - -#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24 - -DEPEND=" - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdnssd) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - net-dns/avahi - vnc? ( >=net-libs/libvncserver-0.9 ) -" -RDEPEND="${DEPEND} - rdesktop? ( >=net-misc/freerdp-1.1.0_beta1[X] ) -" - -src_configure() { - local mycmakeargs=( - -DWITH_LibVNCServer=$(usex vnc) - ) - - kde5_src_configure -} diff --git a/kde-apps/krdc/krdc-9999.ebuild b/kde-apps/krdc/krdc-9999.ebuild index f06d46c..366963f 100644 --- a/kde-apps/krdc/krdc-9999.ebuild +++ b/kde-apps/krdc/krdc-9999.ebuild @@ -2,23 +2,39 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -KDE_HANDBOOK="optional" -inherit kde4-base +KDE_HANDBOOK="forceoptional" +inherit kde5 -DESCRIPTION="KDE remote desktop connection (RDP and VNC) client" +DESCRIPTION="Remote desktop connection (RDP and VNC) client" HOMEPAGE="https://www.kde.org/applications/internet/krdc/"; KEYWORDS="" -IUSE="debug jpeg +rdesktop telepathy vnc zeroconf" +IUSE="+rdesktop vnc" -#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.13.1 +#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24 DEPEND=" - jpeg? ( virtual/jpeg:0 ) - telepathy? ( >=net-libs/telepathy-qt-0.9[qt4] ) + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdnssd) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + net-dns/avahi vnc? ( >=net-libs/libvncserver-0.9 ) - zeroconf? ( net-dns/avahi ) " RDEPEND="${DEPEND} rdesktop? ( >=net-misc/freerdp-1.1.0_beta1[X] ) @@ -26,11 +42,8 @@ RDEPEND="${DEPEND} src_configure() { local mycmakeargs=( - $(cmake-utils_use_with jpeg) - $(cmake-utils_use_with telepathy TelepathyQt4) - $(cmake-utils_use_with vnc LibVNCServer) - $(cmake-utils_use_with zeroconf DNSSD) + -DWITH_LibVNCServer=$(usex vnc) ) - kde4-base_src_configure + kde5_src_configure }
