gentoo resync : 29.05.2018

3 files changed, 2 insertions, 73 deletions

diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 83267b1d3492..bfd47e819104 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD plasma-meta-5.11.5.ebuild 2000 BLAKE2B bb5660a59599dd6d868010aa62a21baffeaee05667c921864a0cea0a6ae52bd6ecea67693d8a91498e6c3c73ccbaf13745a602425913766f004666828a799343 SHA512 ff0cce1055e377dfcd256a2bd26aa53d7ea6c2342bc4b1ad7bc6a07e5a0db809a003ba1bc37c31d2d6bc7cfd576e751dd41c7a38b8ed800a06c8e940186696b8
-EBUILD plasma-meta-5.12.5.ebuild 2140 BLAKE2B 3932e79c7eea9c113beab08d9e2ca75b613cf9d9799def9f53db789cb39948f3827ab902a949110fb57f540af2e98fe817343fc1a62dd010c1ad435fc2cbbc90 SHA512 978d7faf30a752770ff8296a64532e29e0771594cb5edf7ef72f2cb15f14a6506c5d1844987f8eee3939aad57d166ce8b4c4bad9abb9c925632127449f01e6a5
+EBUILD plasma-meta-5.12.5.ebuild 2139 BLAKE2B 6361bc64d16cd1d3971c72a8943e0ff2530da112809d6f2cfe9e558e51083ab55b4abaf4f6fb0a637b62b30f5d5be03243e77a383edea2edc843256f8dcd7c62 SHA512 c73d0a40a44b16a7bde0277ec019ffdcde5a649cf2b1c5ba9bb3bf12a897137f7993cd205b30f21e8fdf484fefbd1196fee67a35ab8e92aad21bf12e228c2694
 MISC metadata.xml 1199 BLAKE2B a5c21c8b9bedcf1ff127c79779ce8cc0b8afd6c88d4ad71890a621400abad2896b55c11942373cafb16347b8afe572c67ada4e33cdc553ac4efb8f126f5ca5e9 SHA512 de4cf365354410f2ecc83ed1cd3f8adf35e08ecb54fba4eb267b31dfbebe43b893c28642ab7760b66bc3de1cf06990850db799f03e15ea5cc86c902be4e5dfd2
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.11.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.11.5.ebuild
deleted file mode 100644
index 10a36060c778..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.11.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-functions
-
-DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://www.kde.org/workspaces/plasmadesktop/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 ~arm x86"
-IUSE="bluetooth crypt +display-manager grub gtk +handbook
-networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers"
-
-RDEPEND="
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep drkonqi)
-	$(add_plasma_dep kactivitymanagerd)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kdeplasma-addons)
-	$(add_plasma_dep kgamma)
-	$(add_plasma_dep khotkeys)
-	$(add_plasma_dep kinfocenter)
-	$(add_plasma_dep kmenuedit)
-	$(add_plasma_dep kscreen)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep ksshaskpass)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep kwayland-integration)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep kwrited)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep libksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep oxygen)
-	$(add_plasma_dep plasma-desktop)
-	$(add_plasma_dep plasma-integration)
-	$(add_plasma_dep plasma-workspace)
-	$(add_plasma_dep polkit-kde-agent)
-	$(add_plasma_dep powerdevil)
-	$(add_plasma_dep systemsettings)
-	$(add_plasma_dep user-manager)
-	bluetooth? ( $(add_plasma_dep bluedevil) )
-	crypt? ( $(add_plasma_dep plasma-vault) )
-	display-manager? (
-		sddm? (
-			$(add_plasma_dep sddm-kcm)
-			x11-misc/sddm
-		)
-		!sddm? ( x11-misc/lightdm )
-	)
-	grub? ( $(add_plasma_dep breeze-grub) )
-	gtk? (
-		$(add_plasma_dep breeze-gtk)
-		$(add_plasma_dep kde-gtk-config)
-	)
-	handbook? ( $(add_kdeapps_dep khelpcenter) )
-	networkmanager? ( $(add_plasma_dep plasma-nm) )
-	pam? ( $(add_plasma_dep kwallet-pam) )
-	plymouth? (
-		$(add_plasma_dep breeze-plymouth)
-		$(add_plasma_dep plymouth-kcm)
-	)
-	pulseaudio? ( $(add_plasma_dep plasma-pa) )
-	sdk? ( $(add_plasma_dep plasma-sdk) )
-	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
-"
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.12.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.12.5.ebuild
index c57a955e9d37..529ffa202315 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.12.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.12.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.kde.org/workspaces/plasmadesktop/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="bluetooth crypt +display-manager grub gtk +handbook legacy-systray
 networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers"