gentoo resync : 09.03.2018

2 files changed, 18 insertions, 19 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index c29eb40f8c17..9fcd7ad7672c 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-desktop-5.11.5.tar.xz 8534060 BLAKE2B 3d3405c5ed1b85cad172c6c5f92c4da9a9204e901a3f3f3e4a581f20726881baeb086df71cc9d7df36715f809856f9fd01487497543efa7d3a28be206381b29c SHA512 328b6a75def1343c87cc783dd9cf6fcbd17a000f5ef7d28f2d558225a38de6d879767335036c97743d1f6ea029c9b932671dec8436d0bdba5a0f27b1afdd82a7
-DIST plasma-desktop-5.12.2.tar.xz 8433900 BLAKE2B eb2c3b70315d967d6abe1818196aca06120f4e447003d381489b652e3f9bd0f14002e54a017112a9790641df3c4ddea5ef2b1d632a25ec9e95580e994d2e9bc2 SHA512 9d0497269451e39464a0e637fafb3e7830801be0895552a2275daf81cd6d372fded790ced806c2b09f48e0b28ac0940fe8d6ca2bf2789103321dcf35f4871e5c
+DIST plasma-desktop-5.12.3.tar.xz 8433088 BLAKE2B 0f14c6f9f0ac29dfa191440f81ff4ce5d829a76fcdc3606830b003735e23cfbfd6ae79b5f96d560d3077b165d2f45f2efa7511e0d139eb7685570298018acf77 SHA512 58937067bff3e9ea9f5add9d9208c8455a5f16774938fb7f96f296c9deb05dabed88733cc36641b3aea09e567c5ad81fe157084dfbb6ed42be705083d7935022
 EBUILD plasma-desktop-5.11.5.ebuild 4372 BLAKE2B a5353650f3eec32961ba02cbdb16afd389767a69c9b50cf0971e3a05bbc74d09dc606fa9c7946d15b69396c8a3b809e1ffda365f6d32c7019a772719ba4817fb SHA512 8c578b6c7602ed9b4e3fe16687cf04960a29e6821d5773b6760fe676ff5587b30c2b619faebce69141cd4454a15bbadc02308ee2bc56906730d831927189099a
-EBUILD plasma-desktop-5.12.2.ebuild 4410 BLAKE2B 96dc82fc074def93d93ab45ea9a174d38df788cf7035213eb36a189a0bd51c2f97d8e9f770f5f11544cd9a52f5a251a860827c31cddf49fe3b5e50e27b01003f SHA512 026f9327e9597492da75cea469052da71c2bc3970f8e14e82ea7de328fdc015a7ab0eaadee6d595fe2c5c40c4333d03c47effe4e7176e2569ceed408050358d9
+EBUILD plasma-desktop-5.12.3.ebuild 4494 BLAKE2B b7ac84c4498eeabd839932633821f7872971c2972fb2ad8cfd6f06424c006f460246d71aceab4c96bd9675c221722620649acb63b80b2885d86594b33b063dfa SHA512 ed242861f62f306c26c5da073350b8090a82feeb02fd8339daa4466d56cf049ce864868e25f04651ab0cb995dea6366c8ed64b5a22c0fed0416da64e9afe0920
 MISC metadata.xml 936 BLAKE2B 36f03184c29147611b8db767332ac26008ede1379844401486b1a9c0b82118c88a63d03c4260601069adc4b3e73d9e7087fd947c99b4e834dfc3aeea5347eb0a SHA512 cbdfc40a4ec80d01d0fd11e695259e4525347f4294a4ff786be7b863b4c679daea38187e1a8eac0239396ccea84ef83c5a7cc18dce387829edc69096e29041f8
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.12.2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.12.3.ebuild
index 4099aa9321e7..1c48f8ffa813 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.12.2.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio qt4 scim +semantic-desktop touchpad"
+IUSE="appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep attica)
@@ -113,32 +113,17 @@ RDEPEND="${COMMON_DEPEND}
 	sys-apps/accountsservice
 	sys-apps/util-linux
 	x11-apps/setxkbmap
-	legacy-systray? (
-		gtk2? ( dev-libs/libappindicator:2 )
-		gtk3? ( dev-libs/libappindicator:3 )
-		qt4? ( dev-libs/sni-qt )
-	)
 	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
-	qt4? ( kde-plasma/qguiplatformplugin_kde:4 )
 	!kde-apps/kcontrol
 	!<kde-apps/kde4-l10n-17.08.1-r1
 	!kde-apps/knetattach[handbook]
-	!kde-base/plasma-desktop:4
 	!kde-misc/kcm-touchpad
+	!kde-plasma/plasma-desktop:4
 	!kde-plasma/plasma-workspace:4
 	!kde-plasma/solid-actions-kcm:4
 	!kde-plasma/systemsettings:4
 "
 
-REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
-
-pkg_setup() {
-	kde5_pkg_setup
-	if has_version net-im/skype && use legacy-systray && use amd64; then
-		elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary."
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package appstream AppStreamQt)
@@ -162,3 +147,17 @@ src_test() {
 
 	kde5_src_test
 }
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if has_version "dev-qt/qtcore:4" && ! has_version "dev-libs/sni-qt" ; then
+		elog "For Qt4 applications legacy-systray support, please install dev-libs/sni-qt."
+	fi
+	if has_version "x11-libs/gtk+:2" && ! has_version "dev-libs/libappindicator:2"; then
+		elog "For GTK+2 applications legacy-systray support, please install dev-libs/libappindicator:2."
+	fi
+	if has_version "x11-libs/gtk+:3" && ! has_version "dev-libs/libappindicator:3"; then
+		elog "For GTK+3 applications legacy-systray support, please install dev-libs/libappindicator:3."
+	fi
+}