From 44624d2b884158f0dd48a1f0c072f0d8b7c11352 Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Sat, 10 Dec 2016 16:01:00 +0100 Subject: [PATCH] kde-base/plasma-workspace -> kde-plasma/plasma-workspace --- eclass/kde5.eclass | 6 +++--- .../kdebase-startkde-4.11.22-r2.ebuild | 2 +- kde-base/plasma-workspace/Manifest | 1 - kde-base/plasma-workspace/metadata.xml | 13 ------------- .../adjustableclock/adjustableclock-4.1.4.ebuild | 2 +- kde-misc/bkodama/bkodama-0.3.1.ebuild | 6 +++--- kde-misc/commandwatch/commandwatch-0.1.1.ebuild | 6 +++--- kde-misc/cpuload/cpuload-0.3.2.ebuild | 6 +++--- .../customizable-weather-1.12.1.ebuild | 2 +- kde-misc/drop2ftp/drop2ftp-0.6.ebuild | 6 +++--- .../emerging-plasmoid-1.0.3.ebuild | 2 +- kde-misc/eyesaver/eyesaver-0.4.ebuild | 6 +++--- kde-misc/fancytasks/fancytasks-1.1.2-r1.ebuild | 2 +- kde-misc/geekclock/geekclock-1.0.ebuild | 6 +++--- kde-misc/gx-mail-notify/gx-mail-notify-0.4.4.ebuild | 4 ++-- kde-misc/hdaps_monitor/hdaps_monitor-0.3-r1.ebuild | 4 ++-- kde-misc/homerun/homerun-1.2.5.ebuild | 2 +- .../kbstateapplet/kbstateapplet-0_p1268845.ebuild | 4 ++-- kde-misc/kepas/kepas-0.9.3.ebuild | 6 +++--- kde-misc/kraidmonitor/kraidmonitor-0.5.ebuild | 4 ++-- kde-misc/miniplayer/miniplayer-2.5-r1.ebuild | 2 +- .../plasma-emergelog-0.0.2-r1.ebuild | 6 +++--- .../plasma-network-status-0.1.1.ebuild | 6 +++--- .../plasma-photooftheday-2.1.1.ebuild | 4 ++-- kde-misc/plasma-wifi/plasma-wifi-0.5-r1.ebuild | 6 +++--- kde-misc/plasmatvgr/plasmatvgr-0.47.ebuild | 6 +++--- .../plasmoid-workflow-0.4.1.ebuild | 2 +- kde-misc/quickaccess/quickaccess-0.8.2-r1.ebuild | 6 +++--- .../redshift-plasmoid/redshift-plasmoid-1.0.ebuild | 4 ++-- .../smooth-tasks/smooth-tasks-0_p20120130.ebuild | 4 ++-- .../stdin-plasmoid/stdin-plasmoid-0.2_beta1.ebuild | 6 +++--- kde-misc/stock-quote/stock-quote-2.1-r2.ebuild | 4 ++-- kde-misc/yawp/yawp-0.4.5.ebuild | 4 ++-- .../kdeplasma-addons-4.14.3-r1.ebuild | 2 +- .../plasma-desktop/plasma-desktop-5.8.3.ebuild | 2 +- .../plasma-desktop/plasma-desktop-5.8.4.ebuild | 2 +- kde-plasma/plasma-workspace/Manifest | 1 + kde-plasma/plasma-workspace/metadata.xml | 2 ++ .../plasma-workspace-4.11.22.ebuild | 0 .../plasma-workspace-5.8.3-r4.ebuild | 2 +- .../plasma-workspace/plasma-workspace-5.8.4.ebuild | 2 +- profiles/updates/4Q-2016 | 1 + 42 files changed, 77 insertions(+), 87 deletions(-) delete mode 100644 kde-base/plasma-workspace/Manifest delete mode 100644 kde-base/plasma-workspace/metadata.xml rename {kde-base => kde-plasma}/plasma-workspace/plasma-workspace-4.11.22.ebuild (100%) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 53b5eb4d832f9..3669536737d3d 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -720,11 +720,11 @@ kde5_pkg_postinst() { einfo "Use it at your own risk." einfo "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!" fi - # for kf5-based applications tell user that he SHOULD NOT be using kde-base/plasma-workspace + # for kf5-based applications tell user that he SHOULD NOT be using kde-plasma/plasma-workspace:4 if [[ ${KDEBASE} != kde-base || ${CATEGORY} = kde-apps ]] && \ - has_version 'kde-base/plasma-workspace'; then + has_version 'kde-plasma/plasma-workspace:4'; then echo - ewarn "WARNING! Your system configuration still contains \"kde-base/plasma-workspace\"," + ewarn "WARNING! Your system configuration still contains \"kde-plasma/plasma-workspace:4\"," ewarn "indicating a Plasma 4 setup. With this setting you are unsupported by KDE team." ewarn "Please consider upgrading to Plasma 5." fi diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild index 09975797afd5e..3529d01d96fe1 100644 --- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild +++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild @@ -53,13 +53,13 @@ RDEPEND=" $(add_kdeapps_dep plasma-runtime) $(add_kdeapps_dep renamedlg-plugins) $(add_kdeapps_dep solid-runtime) - $(add_kdebase_dep plasma-workspace) kde-plasma/kcminit:4 kde-plasma/krunner:4 kde-plasma/ksmserver:4 kde-plasma/ksplash:4 kde-plasma/kstartupconfig:4 kde-plasma/kwin:4 + kde-plasma/plasma-workspace:4 kde-plasma/systemsettings:4 x11-apps/mkfontdir x11-apps/xmessage diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest deleted file mode 100644 index db5163f83985b..0000000000000 --- a/kde-base/plasma-workspace/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802 diff --git a/kde-base/plasma-workspace/metadata.xml b/kde-base/plasma-workspace/metadata.xml deleted file mode 100644 index a103038bf8b94..0000000000000 --- a/kde-base/plasma-workspace/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - kde@gentoo.org - Gentoo KDE Project - - - Enable JSON support via dev-libs/qjson - KDE PIM integration via kde-apps/kdepimlibs - Enable Qalculate runner using sci-libs/libqalculate - - diff --git a/kde-misc/adjustableclock/adjustableclock-4.1.4.ebuild b/kde-misc/adjustableclock/adjustableclock-4.1.4.ebuild index 23c5e46c12769..0b3f420b3f433 100644 --- a/kde-misc/adjustableclock/adjustableclock-4.1.4.ebuild +++ b/kde-misc/adjustableclock/adjustableclock-4.1.4.ebuild @@ -22,7 +22,7 @@ DEPEND=" kde-plasma/libplasmaclock:4 " RDEPEND="${DEPEND} - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " src_prepare() { diff --git a/kde-misc/bkodama/bkodama-0.3.1.ebuild b/kde-misc/bkodama/bkodama-0.3.1.ebuild index 2c0dc36e33d11..5f60a1395c1f1 100644 --- a/kde-misc/bkodama/bkodama-0.3.1.ebuild +++ b/kde-misc/bkodama/bkodama-0.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI=5 inherit kde4-base -DESCRIPTION="A friendly, yet very simple-minded Kodama (Japanese ghost) wandering on your desktop" +DESCRIPTION="Friendly Kodama (Japanese ghost) wandering on your desktop" HOMEPAGE="http://kde-look.org/content/show.php/bkodama?content=106528" SRC_URI="http://kde-look.org/CONTENT/content-files/106528-${P}.tar.bz2" @@ -16,6 +16,6 @@ KEYWORDS="~amd64 ~x86" IUSE="debug" RDEPEND="${DEPEND} - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " DEPEND="${RDEPEND}" diff --git a/kde-misc/commandwatch/commandwatch-0.1.1.ebuild b/kde-misc/commandwatch/commandwatch-0.1.1.ebuild index c75c2bccb8b26..c5b5c88adb44e 100644 --- a/kde-misc/commandwatch/commandwatch-0.1.1.ebuild +++ b/kde-misc/commandwatch/commandwatch-0.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI=5 inherit kde4-base -DESCRIPTION="KDE4 plasmoid which periodically runs a system command and displays its output" +DESCRIPTION="Plasmoid which periodically runs a system command and displays its output" HOMEPAGE="http://www.kde-look.org/content/show.php/Command+Watch?content=84523" SRC_URI="http://www.kde-look.org/CONTENT/content-files/84523-${P}.tar.bz2" @@ -16,5 +16,5 @@ SLOT="4" IUSE="debug" RDEPEND=" - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " diff --git a/kde-misc/cpuload/cpuload-0.3.2.ebuild b/kde-misc/cpuload/cpuload-0.3.2.ebuild index 5eed6fb22d3c0..9c48c184f71ee 100644 --- a/kde-misc/cpuload/cpuload-0.3.2.ebuild +++ b/kde-misc/cpuload/cpuload-0.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI=5 inherit kde4-base -DESCRIPTION="KDE4 plasmoid that shows CPU load on the screen" +DESCRIPTION="Plasma 4 plasmoid that shows CPU load on the screen" HOMEPAGE="http://www.kde-look.org/content/show.php/cpuload?content=86628" SRC_URI="http://kde-look.org/CONTENT/content-files/86628-${P}.tar.gz" @@ -16,7 +16,7 @@ SLOT="4" IUSE="debug" DEPEND=" - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " RDEPEND="${DEPEND}" diff --git a/kde-misc/customizable-weather/customizable-weather-1.12.1.ebuild b/kde-misc/customizable-weather/customizable-weather-1.12.1.ebuild index 94131d4904145..6ffe8a6ec5278 100644 --- a/kde-misc/customizable-weather/customizable-weather-1.12.1.ebuild +++ b/kde-misc/customizable-weather/customizable-weather-1.12.1.ebuild @@ -19,7 +19,7 @@ KEYWORDS="amd64 x86" IUSE="debug" RDEPEND=" - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " DEPEND="${RDEPEND}" diff --git a/kde-misc/drop2ftp/drop2ftp-0.6.ebuild b/kde-misc/drop2ftp/drop2ftp-0.6.ebuild index c1fa2f004ba16..6a9a787c19fb9 100644 --- a/kde-misc/drop2ftp/drop2ftp-0.6.ebuild +++ b/kde-misc/drop2ftp/drop2ftp-0.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI=5 inherit kde4-base -DESCRIPTION="KDE4 plasmoid. Add files over KIO supported protocols, like ftp and ssh" +DESCRIPTION="Plasmoid to add files over KIO supported protocols, like ftp and ssh" HOMEPAGE="http://www.kde-look.org/content/show.php/Drop2FTP?content=97281" SRC_URI="http://www.kde-look.org/CONTENT/content-files/97281-${P}.tar.gz" @@ -16,7 +16,7 @@ SLOT="4" IUSE="debug" RDEPEND=" - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " PATCHES=( "${FILESDIR}/${P}-qt47.patch" ) diff --git a/kde-misc/emerging-plasmoid/emerging-plasmoid-1.0.3.ebuild b/kde-misc/emerging-plasmoid/emerging-plasmoid-1.0.3.ebuild index 128efe2581277..11601d25a45d1 100644 --- a/kde-misc/emerging-plasmoid/emerging-plasmoid-1.0.3.ebuild +++ b/kde-misc/emerging-plasmoid/emerging-plasmoid-1.0.3.ebuild @@ -20,5 +20,5 @@ DEPEND=" dev-perl/Date-Manip " RDEPEND="${DEPEND} - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " diff --git a/kde-misc/eyesaver/eyesaver-0.4.ebuild b/kde-misc/eyesaver/eyesaver-0.4.ebuild index db628eb01c244..ebf3dc2adea2e 100644 --- a/kde-misc/eyesaver/eyesaver-0.4.ebuild +++ b/kde-misc/eyesaver/eyesaver-0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI=5 inherit kde4-base -DESCRIPTION="KDE4 plasmoid. Reminds us to take our eyes off the screen" +DESCRIPTION="Plasmoid, which reminds us to take our eyes off the screen" HOMEPAGE="http://www.kde-look.org/content/show.php/Eyesaver?content=89989" SRC_URI="http://www.kde-look.org/CONTENT/content-files/89989-${P}.tar.gz" @@ -19,7 +19,7 @@ IUSE="debug" DEPEND="media-libs/phonon[qt4]" RDEPEND=" ${DEPEND} - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " PATCHES=( "${FILESDIR}/eyesaver-0.2a-fix.patch" ) diff --git a/kde-misc/fancytasks/fancytasks-1.1.2-r1.ebuild b/kde-misc/fancytasks/fancytasks-1.1.2-r1.ebuild index e4b6aeb8b808f..4c8b743881391 100644 --- a/kde-misc/fancytasks/fancytasks-1.1.2-r1.ebuild +++ b/kde-misc/fancytasks/fancytasks-1.1.2-r1.ebuild @@ -18,7 +18,7 @@ KEYWORDS="amd64 x86" IUSE="debug" DEPEND=" - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext diff --git a/kde-misc/geekclock/geekclock-1.0.ebuild b/kde-misc/geekclock/geekclock-1.0.ebuild index 9f7df2a438d15..1c1764067edc2 100644 --- a/kde-misc/geekclock/geekclock-1.0.ebuild +++ b/kde-misc/geekclock/geekclock-1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,7 +8,7 @@ inherit kde4-base MY_PN="geek-clock-plasmoid" -DESCRIPTION="Geeky Clock KDE4 Plasmoid" +DESCRIPTION="Geeky Clock Plasmoid" HOMEPAGE="http://kde-look.org/content/show.php/Geek+Clock?content=107807" SRC_URI="http://w2f2.com/projects/${PN}/${MY_PN}-${PV}-src.tar.gz" @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86" IUSE="debug" RDEPEND=" - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " S="${WORKDIR}/${MY_PN}-${PV}-src" diff --git a/kde-misc/gx-mail-notify/gx-mail-notify-0.4.4.ebuild b/kde-misc/gx-mail-notify/gx-mail-notify-0.4.4.ebuild index c8455d853ae51..b8668c06b63b9 100644 --- a/kde-misc/gx-mail-notify/gx-mail-notify-0.4.4.ebuild +++ b/kde-misc/gx-mail-notify/gx-mail-notify-0.4.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -18,7 +18,7 @@ SLOT="4" KEYWORDS="~amd64 ~x86" IUSE="debug" -DEPEND="$(add_kdebase_dep plasma-workspace)" +DEPEND="kde-plasma/plasma-workspace:4" RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-qt-4.7.patch" ) diff --git a/kde-misc/hdaps_monitor/hdaps_monitor-0.3-r1.ebuild b/kde-misc/hdaps_monitor/hdaps_monitor-0.3-r1.ebuild index 6e6cc327c9cd6..83ae50e9bf490 100644 --- a/kde-misc/hdaps_monitor/hdaps_monitor-0.3-r1.ebuild +++ b/kde-misc/hdaps_monitor/hdaps_monitor-0.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -14,6 +14,6 @@ SLOT="4" KEYWORDS="amd64 x86" IUSE="debug" -DEPEND="$(add_kdebase_dep plasma-workspace)" +DEPEND="kde-plasma/plasma-workspace:4" RDEPEND="${DEPEND} app-laptop/hdapsd" diff --git a/kde-misc/homerun/homerun-1.2.5.ebuild b/kde-misc/homerun/homerun-1.2.5.ebuild index 02ffaad634f42..32578c1c814e9 100644 --- a/kde-misc/homerun/homerun-1.2.5.ebuild +++ b/kde-misc/homerun/homerun-1.2.5.ebuild @@ -26,7 +26,7 @@ DEPEND=" " RDEPEND=" ${DEPEND} - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " # Fails 2 out of 6, check later again. diff --git a/kde-misc/kbstateapplet/kbstateapplet-0_p1268845.ebuild b/kde-misc/kbstateapplet/kbstateapplet-0_p1268845.ebuild index cd388b055f17c..3e5d70c12de21 100644 --- a/kde-misc/kbstateapplet/kbstateapplet-0_p1268845.ebuild +++ b/kde-misc/kbstateapplet/kbstateapplet-0_p1268845.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -20,5 +20,5 @@ DEPEND=" " RDEPEND=" ${DEPEND} - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " diff --git a/kde-misc/kepas/kepas-0.9.3.ebuild b/kde-misc/kepas/kepas-0.9.3.ebuild index 24aba5d1f9a92..a214895d331fe 100644 --- a/kde-misc/kepas/kepas-0.9.3.ebuild +++ b/kde-misc/kepas/kepas-0.9.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI=5 inherit kde4-base -DESCRIPTION="A zeroconf KDE4 filetransfer tool" +DESCRIPTION="A zeroconf Plasma 4 filetransfer tool" HOMEPAGE="http://www.kde-apps.org/content/show.php?content=73968" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" @@ -16,7 +16,7 @@ SLOT="4" IUSE="debug oscar zeroconf" RDEPEND=" - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 oscar? ( $(add_kdeapps_dep kopete oscar) ) zeroconf? ( $(add_kdeapps_dep zeroconf-ioslave) ) " diff --git a/kde-misc/kraidmonitor/kraidmonitor-0.5.ebuild b/kde-misc/kraidmonitor/kraidmonitor-0.5.ebuild index e70f0b51aa505..7b8e4c84c5fc5 100644 --- a/kde-misc/kraidmonitor/kraidmonitor-0.5.ebuild +++ b/kde-misc/kraidmonitor/kraidmonitor-0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86" IUSE="debug" RDEPEND=" - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " S=${WORKDIR}/${PN} diff --git a/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild b/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild index b6c559231ee15..3646c90234c11 100644 --- a/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild +++ b/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild @@ -22,7 +22,7 @@ DEPEND=" " RDEPEND=" ${DEPEND} - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " src_prepare() { diff --git a/kde-misc/plasma-emergelog/plasma-emergelog-0.0.2-r1.ebuild b/kde-misc/plasma-emergelog/plasma-emergelog-0.0.2-r1.ebuild index a420c3b6438d2..a5a56b95bbb52 100644 --- a/kde-misc/plasma-emergelog/plasma-emergelog-0.0.2-r1.ebuild +++ b/kde-misc/plasma-emergelog/plasma-emergelog-0.0.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI=5 inherit kde4-base -DESCRIPTION="KDE4 plasmoid for monitoring emerge progress" +DESCRIPTION="Plasmoid for monitoring emerge progress" HOMEPAGE="http://www.kde-look.org/content/show.php?content=103928" SRC_URI="http://dev.gentooexperimental.org/~hwoarang/projects/plasma-emergelog/${P}.tar.gz" @@ -18,7 +18,7 @@ SLOT="4" IUSE="debug" RDEPEND=" - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " PATCHES=( diff --git a/kde-misc/plasma-network-status/plasma-network-status-0.1.1.ebuild b/kde-misc/plasma-network-status/plasma-network-status-0.1.1.ebuild index 4e009b86e3db3..24cec36ce20ec 100644 --- a/kde-misc/plasma-network-status/plasma-network-status-0.1.1.ebuild +++ b/kde-misc/plasma-network-status/plasma-network-status-0.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI=5 inherit kde4-base -DESCRIPTION="KDE applet to monitor the network interface status" +DESCRIPTION="Plasma applet to monitor the network interface status" HOMEPAGE="https://sourceforge.net/projects/pa-net-stat/" SRC_URI="mirror://sourceforge/pa-net-stat/${P}-Source.tar.bz2" @@ -17,7 +17,7 @@ IUSE="debug" DEPEND="" RDEPEND="${DEPEND} - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " S="${WORKDIR}/${P}-Source" diff --git a/kde-misc/plasma-photooftheday/plasma-photooftheday-2.1.1.ebuild b/kde-misc/plasma-photooftheday/plasma-photooftheday-2.1.1.ebuild index 2a4d3fe69c14e..c1ee7720b0d70 100644 --- a/kde-misc/plasma-photooftheday/plasma-photooftheday-2.1.1.ebuild +++ b/kde-misc/plasma-photooftheday/plasma-photooftheday-2.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -20,7 +20,7 @@ SLOT="4" SRC_URI="http://kde-look.org/CONTENT/content-files/${CONTENT_NUMBER}-photo-of-the-day.tar.gz -> ${CONTENT_NUMBER}-photo-of-the-day-${PV}.tar.gz" RDEPEND=" - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " DEPEND="${RDEPEND} sys-devel/gettext diff --git a/kde-misc/plasma-wifi/plasma-wifi-0.5-r1.ebuild b/kde-misc/plasma-wifi/plasma-wifi-0.5-r1.ebuild index 86504563357f1..9ba3233a46e64 100644 --- a/kde-misc/plasma-wifi/plasma-wifi-0.5-r1.ebuild +++ b/kde-misc/plasma-wifi/plasma-wifi-0.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI=5 inherit kde4-base -DESCRIPTION="KDE4 plasmoid. Displays the currect signal strength" +DESCRIPTION="Plasmoid which displays the currect signal strength" HOMEPAGE="http://www.kde-look.org/content/show.php/cpuload?content=79476" SRC_URI="http://kde-look.org/CONTENT/content-files/79476-${P}.tgz" @@ -16,7 +16,7 @@ SLOT="4" IUSE="debug" RDEPEND=" - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " src_prepare() { diff --git a/kde-misc/plasmatvgr/plasmatvgr-0.47.ebuild b/kde-misc/plasmatvgr/plasmatvgr-0.47.ebuild index 339b629f21372..6a4fed79d3a48 100644 --- a/kde-misc/plasmatvgr/plasmatvgr-0.47.ebuild +++ b/kde-misc/plasmatvgr/plasmatvgr-0.47.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,7 +9,7 @@ inherit kde4-base versionator MY_PV=$(replace_version_separator . '') MY_P=${PN}${MY_PV} -DESCRIPTION="KDE4 plasmoid which shows greek TV program" +DESCRIPTION="Plasmoid which shows greek TV program" HOMEPAGE="http://www.kde-look.org/content/show.php/plasmatvgr?content=75728" SRC_URI="http://www.kde-look.org/CONTENT/content-files/75728-${MY_P}.tar.gz" @@ -19,6 +19,6 @@ SLOT="4" IUSE="debug" RDEPEND=" - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " S="${WORKDIR}/${PN}" diff --git a/kde-misc/plasmoid-workflow/plasmoid-workflow-0.4.1.ebuild b/kde-misc/plasmoid-workflow/plasmoid-workflow-0.4.1.ebuild index e7c6f08276fda..d3715b908f473 100644 --- a/kde-misc/plasmoid-workflow/plasmoid-workflow-0.4.1.ebuild +++ b/kde-misc/plasmoid-workflow/plasmoid-workflow-0.4.1.ebuild @@ -19,7 +19,7 @@ IUSE="" DEPEND=" kde-frameworks/kactivities:4 kde-plasma/libkworkspace:4 - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " RDEPEND=${DEPEND} diff --git a/kde-misc/quickaccess/quickaccess-0.8.2-r1.ebuild b/kde-misc/quickaccess/quickaccess-0.8.2-r1.ebuild index a3bbc91089647..4188d232bfb09 100644 --- a/kde-misc/quickaccess/quickaccess-0.8.2-r1.ebuild +++ b/kde-misc/quickaccess/quickaccess-0.8.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -10,7 +10,7 @@ inherit kde4-base MY_PN="plasma-widget-${PN}" MY_P="${MY_PN}-${PV}-2" -DESCRIPTION="KDE4 plasmoid. Designed for the panel, provides quick access to the most used folders" +DESCRIPTION="Plasmoid for the panel provides quick access to the most used folders" HOMEPAGE="http://kde-look.org/content/show.php?content=134442" SRC_URI="http://kde-look.org/CONTENT/content-files/134442-${MY_P}.zip" @@ -21,7 +21,7 @@ IUSE="debug" DEPEND="$(add_kdeapps_dep libkonq)" RDEPEND="${DEPEND} - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " S="${WORKDIR}/${MY_P}" diff --git a/kde-misc/redshift-plasmoid/redshift-plasmoid-1.0.ebuild b/kde-misc/redshift-plasmoid/redshift-plasmoid-1.0.ebuild index 5746f0e32c48a..751f48a036e60 100644 --- a/kde-misc/redshift-plasmoid/redshift-plasmoid-1.0.ebuild +++ b/kde-misc/redshift-plasmoid/redshift-plasmoid-1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,6 +16,6 @@ KEYWORDS="~amd64 ~x86" SLOT="4" IUSE="debug" -DEPEND="$(add_kdebase_dep plasma-workspace)" +DEPEND="kde-plasma/plasma-workspace:4" RDEPEND="${DEPEND} x11-misc/redshift" diff --git a/kde-misc/smooth-tasks/smooth-tasks-0_p20120130.ebuild b/kde-misc/smooth-tasks/smooth-tasks-0_p20120130.ebuild index c1a9be16b8265..1908e9c5ab32b 100644 --- a/kde-misc/smooth-tasks/smooth-tasks-0_p20120130.ebuild +++ b/kde-misc/smooth-tasks/smooth-tasks-0_p20120130.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -21,7 +21,7 @@ DEPEND=" kde-plasma/libtaskmanager:4 " RDEPEND="${DEPEND} - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " PATCHES=( "${FILESDIR}/${P}-kde48.patch" ) diff --git a/kde-misc/stdin-plasmoid/stdin-plasmoid-0.2_beta1.ebuild b/kde-misc/stdin-plasmoid/stdin-plasmoid-0.2_beta1.ebuild index 1b2224da8918e..1ac7ba5a70616 100644 --- a/kde-misc/stdin-plasmoid/stdin-plasmoid-0.2_beta1.ebuild +++ b/kde-misc/stdin-plasmoid/stdin-plasmoid-0.2_beta1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,7 +8,7 @@ inherit kde4-base versionator MY_P="$(replace_version_separator 2 '-')" -DESCRIPTION="KDE4 plasmoid for executing a process and capturing its stderr and stdout" +DESCRIPTION="Plasmoid for executing a process and capturing its stderr and stdout" HOMEPAGE="http://www.kde-look.org/content/show.php/STDIN+Plasmoid?content=92309" SRC_URI="http://www.kde-look.org/CONTENT/content-files/92309-${MY_P}.tar.bz2" @@ -18,7 +18,7 @@ SLOT="4" IUSE="debug" RDEPEND=" - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " S="${WORKDIR}/${MY_P}" diff --git a/kde-misc/stock-quote/stock-quote-2.1-r2.ebuild b/kde-misc/stock-quote/stock-quote-2.1-r2.ebuild index 5bb2ee7bbb756..7366e013a6357 100644 --- a/kde-misc/stock-quote/stock-quote-2.1-r2.ebuild +++ b/kde-misc/stock-quote/stock-quote-2.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -18,7 +18,7 @@ KEYWORDS="amd64 x86" IUSE="debug" RDEPEND=" - $(add_kdebase_dep plasma-workspace) + kde-plasma/plasma-workspace:4 " S=${WORKDIR}/${MY_P} diff --git a/kde-misc/yawp/yawp-0.4.5.ebuild b/kde-misc/yawp/yawp-0.4.5.ebuild index 107c89652023a..94b8a747b4300 100644 --- a/kde-misc/yawp/yawp-0.4.5.ebuild +++ b/kde-misc/yawp/yawp-0.4.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,4 +16,4 @@ SLOT="4" KEYWORDS="amd64 x86" IUSE="debug" -RDEPEND="$(add_kdebase_dep plasma-workspace)" +RDEPEND="kde-plasma/plasma-workspace:4" diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild index b4b5534f64405..74e41c07b2163 100644 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild @@ -20,7 +20,7 @@ RESTRICT=test COMMON_DEPEND=" app-crypt/qca:2[qt4(+)] kde-plasma/krunner:4 - $(add_kdebase_dep plasma-workspace '' 4.11) + kde-plasma/plasma-workspace:4 x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( $(add_kdeapps_dep marble) ) diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild index 12a22c28a8dbf..fedfddb785fa1 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild @@ -115,7 +115,7 @@ RDEPEND="${COMMON_DEPEND} !kde-apps/kdepasswd:4 !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 - !kde-base/plasma-workspace:4 + !kde-plasma/plasma-workspace:4 !kde-plasma/solid-actions-kcm:4 !kde-plasma/systemsettings:4 !kde-misc/kcm_touchpad diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.8.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.4.ebuild index 023719ccb4f90..46e1c4bf396bd 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.8.4.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.4.ebuild @@ -115,7 +115,7 @@ RDEPEND="${COMMON_DEPEND} !kde-apps/kdepasswd:4 !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 - !kde-base/plasma-workspace:4 + !kde-plasma/plasma-workspace:4 !kde-plasma/solid-actions-kcm:4 !kde-plasma/systemsettings:4 !kde-misc/kcm_touchpad diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index fac589a493dfc..578dee375b19b 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -1,2 +1,3 @@ +DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802 DIST plasma-workspace-5.8.3.tar.xz 6955700 SHA256 8b2f455bdf355d7d771bd6fb4e19510ec4b131c093b23268cb9c1a321c75059a SHA512 7ed6887dfd7b10c98bfba128a7d0bc6b534f067f519495fb389023308bec178043154bbe755158df6dc65623987f390389b9fde1b9d1780a87fd4450e41bdbeb WHIRLPOOL 3afa4bba6148c4e14cd17e83b71c744288a802161a711179c12b3190dc27c746d97476c8148130fd0cb39505697da1c4044af613dd4ba8ebc3a7682f4022227e DIST plasma-workspace-5.8.4.tar.xz 7018972 SHA256 8d732e141ccf6f56c02fc8f4234323ceaf907d159a736f907715e84118cf8dc3 SHA512 5f28779fbd34522bdfe1818a4015bc033e102da7f0d34af2ed8068b91f4453f5a466606d7dc87dd904a6d01044cc146e5936ed8033ce7302de2fab8408ff6252 WHIRLPOOL 70c4e5b29eef525096bc90353fa96aac52d6670b75ec9bb54d957f48b357ea662f983e06b61e43597004637c03a399fbb126261a1b93d2766572b2f236141749 diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml index bc65a860b673c..25ab4b69b441e 100644 --- a/kde-plasma/plasma-workspace/metadata.xml +++ b/kde-plasma/plasma-workspace/metadata.xml @@ -7,6 +7,8 @@ Enables dataengine providing location information + Enable JSON support via dev-libs/qjson + KDE PIM integration via kde-apps/kdepimlibs Enable support for barcodes/QRcodes Enable Qalculate runner using sci-libs/libqalculate diff --git a/kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-4.11.22.ebuild similarity index 100% rename from kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild rename to kde-plasma/plasma-workspace/plasma-workspace-4.11.22.ebuild 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 index 12ee56ea8707f..8fed1fb7c66b9 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild @@ -114,7 +114,7 @@ RDEPEND="${COMMON_DEPEND} !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 - !kde-base/plasma-workspace:4 + !kde-plasma/plasma-workspace:4 " DEPEND="${COMMON_DEPEND} x11-proto/xproto diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild index 914572361bba9..e8b62fcee1fa5 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild @@ -113,7 +113,7 @@ RDEPEND="${COMMON_DEPEND} !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 - !kde-base/plasma-workspace:4 + !kde-plasma/plasma-workspace:4 " DEPEND="${COMMON_DEPEND} x11-proto/xproto diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016 index 4e9e4a36f0608..3f8ae3f1ac247 100644 --- a/profiles/updates/4Q-2016 +++ b/profiles/updates/4Q-2016 @@ -51,3 +51,4 @@ move kde-base/krunner kde-plasma/krunner move kde-base/kdebase-pam kde-plasma/kdebase-pam move kde-base/kactivities kde-frameworks/kactivities move kde-base/kdm kde-plasma/kdm +move kde-base/plasma-workspace kde-plasma/plasma-workspace