From 5502bfc254d0a0df518590bc787ff987f778e83f Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Sat, 19 Nov 2016 20:36:02 +1100 Subject: kde-plasma/plasma-workspace: revision bump to ensure rebuild against non-broken kde-frameworks/kpackage KDE-bug: 372594 Package-Manager: portage-2.3.2 --- .../plasma-workspace-5.8.3-r3.ebuild | 176 -------------------- .../plasma-workspace-5.8.3-r4.ebuild | 177 +++++++++++++++++++++ 2 files changed, 177 insertions(+), 176 deletions(-) delete mode 100644 kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r3.ebuild create mode 100644 kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild (limited to 'kde-plasma') diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r3.ebuild deleted file mode 100644 index c97f621a5c86..000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r3.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 multilib qmake-utils - -DESCRIPTION="KDE Plasma workspace" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+calendar geolocation gps prison qalculate +semantic-desktop" - -COMMON_DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kauth) - $(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 kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kdesu) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kjs) - $(add_frameworks_dep kjsembed) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kpackage) - $(add_frameworks_dep krunner) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktexteditor) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwayland) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep kxmlrpcclient) - $(add_frameworks_dep plasma) - $(add_frameworks_dep solid) - $(add_plasma_dep kscreenlocker) - $(add_plasma_dep kwin) - $(add_plasma_dep libksysguard) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui 'jpeg') - $(add_qt_dep qtnetwork) - $(add_qt_dep qtscript) - $(add_qt_dep qtsql) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - $(add_qt_dep qtxml) - dev-libs/libdbusmenu-qt[qt5] - media-libs/phonon[qt5] - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/xcb-util - x11-libs/xcb-util-image - calendar? ( $(add_kdeapps_dep kholidays) ) - geolocation? ( $(add_frameworks_dep networkmanager-qt) ) - gps? ( sci-geosciences/gpsd ) - prison? ( media-libs/prison:5 ) - qalculate? ( sci-libs/libqalculate ) - semantic-desktop? ( $(add_frameworks_dep baloo) ) -" -RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kded) - $(add_kdeapps_dep kio-extras) - $(add_plasma_dep kde-cli-tools) - $(add_plasma_dep ksysguard) - $(add_plasma_dep milou) - $(add_plasma_dep plasma-integration) - $(add_qt_dep qdbus) - $(add_qt_dep qtgraphicaleffects) - $(add_qt_dep qtpaths) - $(add_qt_dep qtquickcontrols 'widgets') - app-text/iso-codes - x11-apps/mkfontdir - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrdb - x11-apps/xset - x11-apps/xsetroot - !dev-libs/xembed-sni-proxy - !kde-base/freespacenotifier:4 - !kde-base/libtaskmanager:4 - !kde-base/kcminit:4 - !kde-base/kdebase-startkde:4 - !kde-base/klipper:4 - !kde-base/krunner:4 - !kde-base/ksmserver:4 - !kde-base/ksplash:4 - !kde-base/plasma-workspace:4 -" -DEPEND="${COMMON_DEPEND} - x11-proto/xproto -" - -PATCHES=( - "${FILESDIR}/${PN}-5.4-startkde-script.patch" - # stable branch - "${FILESDIR}/${PN}-5.8.3-all-outputs-known.patch" - "${FILESDIR}/${PN}-5.8.3-sync-app-w-applets-config.patch" - "${FILESDIR}/${PN}-5.8.3-dont-connect-twice.patch" - "${FILESDIR}/${PN}-5.8.3-screenpool-screenchange.patch" - "${FILESDIR}/${PN}-5.8.3-krunner-crash.patch" - # master - "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch" - "${FILESDIR}/${PN}-5.8.3-systray-cpuload.patch" -) - -RESTRICT+=" test" - -src_prepare() { - kde5_src_prepare - - sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \ - -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package calendar KF5Holidays) - $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt) - $(cmake-utils_use_find_package gps libgps) - $(cmake-utils_use_find_package prison KF5Prison) - $(cmake-utils_use_find_package qalculate Qalculate) - $(cmake-utils_use_find_package semantic-desktop KF5Baloo) - ) - - kde5_src_configure -} - -src_install() { - kde5_src_install - - # startup and shutdown scripts - insinto /etc/plasma/startup - doins "${FILESDIR}/10-agent-startup.sh" - - insinto /etc/plasma/shutdown - doins "${FILESDIR}/10-agent-shutdown.sh" -} - -pkg_postinst () { - kde5_pkg_postinst - - echo - elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," - elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and" - elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh" - echo -} diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild new file mode 100644 index 000000000000..481701da45bd --- /dev/null +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" +VIRTUALX_REQUIRED="test" +inherit kde5 multilib qmake-utils + +DESCRIPTION="KDE Plasma workspace" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+calendar geolocation gps prison qalculate +semantic-desktop" + +COMMON_DEPEND=" + $(add_frameworks_dep kactivities) + $(add_frameworks_dep kauth) + $(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 kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kdeclarative) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep kdesu) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kidletime) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemmodels) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep kjs) + $(add_frameworks_dep kjsembed) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kpackage) + $(add_frameworks_dep krunner) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktexteditor) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep kwayland) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep kxmlrpcclient) + $(add_frameworks_dep plasma) + $(add_frameworks_dep solid) + $(add_plasma_dep kscreenlocker) + $(add_plasma_dep kwin) + $(add_plasma_dep libksysguard) + $(add_qt_dep qtconcurrent) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative 'widgets') + $(add_qt_dep qtgui 'jpeg') + $(add_qt_dep qtnetwork) + $(add_qt_dep qtscript) + $(add_qt_dep qtsql) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) + $(add_qt_dep qtxml) + dev-libs/libdbusmenu-qt[qt5] + || ( >=kde-frameworks/kpackage-5.28.0-r1