gentoo resync 31.01.2019

3 files changed, 2 insertions, 111 deletions

diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index d0def32be546..724a901a1694 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD plasma-meta-5.14.3-r1.ebuild 3328 BLAKE2B 544555fb9e28331dc86489a2edc6154496f4301de7ef67996d60ce442d8fd486ed41361e4633b6b656994fb7a6be4ddd1b59240300bc83b87f7276caf4011ecd SHA512 bf7155b71dfb9629072ac8b325fa9c424d099e8b68739d0ffd9575c9ec1ee21df20a08921f92fb8a2b91ced2040674619b6bd061cab3029114529427d65a67e0
-EBUILD plasma-meta-5.14.5.ebuild 3685 BLAKE2B e5fbd052ae54559b432786834eadefe4662f8c4335531fa8a8e8857ffae64ff6d1a1c10acae18d41822fbc46952828dd1b7af52376c0552e341bbb1402f661ef SHA512 ab0ff11d9ae36cbcd590a499ad5052176d16b00c0a8a37148520220ae0895cdf7fdeb5a06fcdee4a79c72aa6b6a9cd3c753bcf3b4cad06804bd6682b13279d84
+EBUILD plasma-meta-5.14.5.ebuild 3683 BLAKE2B 6a783d9fdbd1853b32a69d94bb1a7e29f06fa0a42a655f4d5d9b53ca7287191976e6338aa901dd22128822e2234e6ce04317f1e66138c4de3ae565a92142f7ed SHA512 486728c86ee9eb36c12d3014813f8891749926cb2711c54a2564b0a2a5053fd013d23b0b1db92919075f7109e94fd5341fb4a159d4585d02b1c662f8c375f253
 MISC metadata.xml 1656 BLAKE2B ca6cffa3becb923ebb5e5feefb43215ec30f95f4745275ecf6da10185b2d7715ca74dae6ae757d835370a933754ff0d703fcdeef22766596618a48d8a5849528 SHA512 a4a469d477efc111210f5afa647741666eaebd303688c7e297b1c191ca312d9ac129887055ab95e0750338a5e4e9316aff0f1c62da8b40959fce9e5873683005
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.14.3-r1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.14.3-r1.ebuild
deleted file mode 100644
index d5cd6979a7e6..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.14.3-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/plasma-desktop"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 ~arm x86"
-IUSE="bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook
-+legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers"
-
-REQUIRED_USE="?? ( consolekit elogind systemd )"
-
-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)
-	sys-apps/dbus[elogind?,systemd?]
-	sys-auth/polkit[elogind?,systemd?]
-	sys-fs/udisks:2[elogind?,systemd?]
-	bluetooth? ( $(add_plasma_dep bluedevil) )
-	browser-integration? ( $(add_plasma_dep plasma-browser-integration) )
-	consolekit? (
-		>=sys-auth/consolekit-1.0.1
-		pm-utils? ( sys-power/pm-utils )
-	)
-	crypt? ( $(add_plasma_dep plasma-vault) )
-	display-manager? (
-		sddm? (
-			$(add_plasma_dep sddm-kcm)
-			x11-misc/sddm[consolekit?,elogind?,systemd?]
-		)
-		!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) )
-	legacy-systray? ( $(add_plasma_dep xembed-sni-proxy) )
-	networkmanager? (
-		$(add_plasma_dep plasma-nm)
-		net-misc/networkmanager[consolekit?,elogind?,systemd?]
-	)
-	pam? (
-		$(add_plasma_dep kwallet-pam)
-		sys-auth/pambase[consolekit?,elogind?,systemd?]
-	)
-	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) )
-"
-
-pkg_postinst() {
-	local i selected use_pkg_map=(
-		consolekit:sys-auth/consolekit
-		elogind:sys-auth/elogind
-		systemd:sys-apps/systemd
-	)
-	for i in ${use_pkg_map[@]}; do
-		use ${i%:*} && selected="${i%:*}"
-	done
-	for i in ${use_pkg_map[@]}; do
-		if ! use ${i%:*} && has_version ${i#*:}; then
-			ewarn "An existing installation of ${i#*:} was detected even though"
-			ewarn "${PN} was configured with USE ${selected} instead of ${i%:*}."
-			ewarn "There can only be one session manager at runtime, otherwise random issues"
-			ewarn "may occur. Please make sure USE ${i%:*} is nowhere enabled in make.conf"
-			ewarn "or package.use and remove ${i#*:} before raising bugs."
-			ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
-		fi
-	done
-}
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.14.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.14.5.ebuild
index 17439dc7faa1..ea23101e8758 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.14.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.14.5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.kde.org/plasma-desktop"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook
 +legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers"