gentoo resync : 29.05.2018

3 files changed, 2 insertions, 91 deletions

diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index bb8ca9ef3e62..efccc7c26856 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-5.11.5.tar.xz 22228964 BLAKE2B f3fdcc10b7350acf612bec9edf4cbea544c6f1dbbc713c8cf9903054b3fb015fffa3a9be5fed4ce5d19209a476d9a84fbcc219ff5cdcdc93e05f3537bb209e85 SHA512 4ef2e7507f7175af7725157611bfe6339d417749d565e50760a5da70db7603f59a9c41deec42f343149442b2e82204eb9519354fb91e407d4c89a9300edad2df
 DIST breeze-5.12.5.tar.xz 22207864 BLAKE2B a3963b4e236391d1e8ea0709f7fe68ebc1f4b644a8fc33f83992bba2675853c25addde43edfdf01700eea06c4121f23eebfa0ee64259da31a298d78592f975af SHA512 5d21fe948c8a480ce04c45ce21b56a3b2517c7642de588debfd1e76d2b53bd1e1ef1204cbb28398d5a673a986698baf91dbfb49d95e8810188f21c104e185d46
-EBUILD breeze-5.11.5.ebuild 1867 BLAKE2B 24ba84df08da2ed59de370a074062e35195d0460e571c405c1aede248af731438b9c94e7ab6fea288790c0021e8ee0be332c42007e79b76a0316419bee6cb4be SHA512 2d93e0dcb6ce34f3c042e5b7edc3b098aa9ef7cd72efae48cae3966ea355064a584edea9e42ec86ce5b3410247af1a49cccb1ad1bb2347f0a670ba9e17bc585b
-EBUILD breeze-5.12.5.ebuild 1160 BLAKE2B 1964bf1af977b4235cdf0d640eb16e086192938f3be5944dbf17cd40e2edf5a218b911f5eed14e968fb2ba8642156db872be9315b229def3405ef239fc4a83a4 SHA512 5162e4c0f6cef196a5d29e7124b8789c19303bb31b21eba21c2481ff6423ccb8f2df7526b2702bb7f8c9db95eed0e7ae9b934ff149557e26983b9a153593b939
+EBUILD breeze-5.12.5.ebuild 1159 BLAKE2B 68fa4833efa841f5aa0d401c2c71651fb4a78b84c0cbcf211e49723534bbea1c0716cc354f21bafa5cfe6ba673e1d457aa54c6fb26cec567c1de0160daa14619 SHA512 8aa3c9f69db433e57a54cb73fbe40e1603a8824fc8fed1a979034504375e5b9ec0a665bcf6d701231fce82d3021c24526e3c796f4cddcd6fbb348045a1ead675
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.11.5.ebuild b/kde-plasma/breeze/breeze-5.11.5.ebuild
deleted file mode 100644
index 79bc91235ae1..000000000000
--- a/kde-plasma/breeze/breeze-5.11.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic kde5 multibuild
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://cgit.kde.org/breeze.git"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="qt4 wayland X"
-
-REQUIRED_USE="qt4? ( X )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	qt4? (
-		kde-frameworks/kdelibs:4
-		x11-libs/libX11
-	)
-	wayland? ( $(add_frameworks_dep kwayland) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libxcb
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kpackage)
-	qt4? ( dev-util/automoc:0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep breeze-icons)
-	$(add_plasma_dep kde-cli-tools)
-"
-
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=()
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			use debug || append-cppflags -DQT_NO_DEBUG
-			mycmakeargs+=(
-				-DUSE_KDE4=true
-				-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-			)
-			cmake-utils_src_configure
-		else
-			mycmakeargs+=(
-				$(cmake-utils_use_find_package wayland KF5Wayland)
-				$(cmake-utils_use_find_package X XCB)
-			)
-			kde5_src_configure
-		fi
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
-}
diff --git a/kde-plasma/breeze/breeze-5.12.5.ebuild b/kde-plasma/breeze/breeze-5.12.5.ebuild
index b72fcfb30697..d02c0fea41ea 100644
--- a/kde-plasma/breeze/breeze-5.12.5.ebuild
+++ b/kde-plasma/breeze/breeze-5.12.5.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Breeze visual style for the Plasma desktop"
 HOMEPAGE="https://cgit.kde.org/breeze.git"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="wayland X"
 
 COMMON_DEPEND="