summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2015-10-16 01:04:23 +0200
committerMichael Palimaka <kensington@gentoo.org>2015-10-17 05:24:09 +1100
commit13519fab9f45bba04a9d6acfa1932ecc11a34ed5 (patch)
tree5bd0b47dbf5be098dc87dff2a7fa533162792c38
parent41bf6663efa2c113b86c3ddfe11ca830e511c044 (diff)
downloadkde-13519fab9f45bba04a9d6acfa1932ecc11a34ed5.tar.gz
kde-13519fab9f45bba04a9d6acfa1932ecc11a34ed5.tar.bz2
kde-13519fab9f45bba04a9d6acfa1932ecc11a34ed5.zip
kde-apps/krfb: Frameworks merged to master
Package-Manager: portage-2.2.23
-rw-r--r--kde-apps/krfb/krfb-5.9999.ebuild43
-rw-r--r--kde-apps/krfb/krfb-9999.ebuild45
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 38e77393b94..00000000000
--- 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 0157a97bd9d..649f1c4676b 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
-}