gentoo resync : 16.02.1018

3 files changed, 2 insertions, 43 deletions

diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 9a2d56ded07a..d5fbf8e185b6 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,5 +1,3 @@
-DIST qtwayland-everywhere-src-5.11.1.tar.xz 392200 BLAKE2B 2e65c6bd8c9ea44ae84f608312db6983d540382bfb2a22412fe054f4e7253d70e21f4d0577653b246de5b0266271e40911a7c79fc28b266cc29ff30669df280e SHA512 dc1327ef8cdc9ed9521e9db316da0bcdbe9639b714a2dda7a792c52ba5897ddb75deba1ab89e010bc05cc2a96ede781b9990f5449ce4a2f85e15466a4d6d82ad
 DIST qtwayland-everywhere-src-5.11.3.tar.xz 391124 BLAKE2B 2bc90c7a6f6769bcae7e52072d71f38ad984cc931767613e7972373131c9d58c145e9882c29163190257f07a205bdda63f78833859d2be6d6478126c301b70a1 SHA512 e442a13c61a508d6021fb15a0917b7861faf139fb7dca41ac1a3967f4b8dc82da5095029e4c6120464bd36ecf559547fe2f42935d9980f19298f5875cfb5e62e
-EBUILD qtwayland-5.11.1.ebuild 900 BLAKE2B 81edc7e804f70e0ab5b126d4128e7796794ba303802414c72c35bdc36e0489c9136294c1b4d4874c597f8bd387f84d4d16f0a109a9ee4449ea398086e16b2d11 SHA512 225ccb256c0df03fe9e17ecc5091ba4fa9435f09df0d57e6dd3da8a7d27c69f7b2eb39a84410a2d0d3a12524165412456e823184b8f65dca460e1c4d2dcb79d8
-EBUILD qtwayland-5.11.3.ebuild 901 BLAKE2B c9ec2030cfd5ff2c7885870cedf30fbc809cd615370127a6bb18bd72d4b51c6fe6c39131b9cedc5c5f2ff698e61680c657731129e94fd061fec4a2f0f01d70e8 SHA512 cef9477b7940a2c40885f57ed3d5fd7a77cd1d187d44a0956c845d720afdbfd300dc2d7f28993d7160da3c30786153da17f01d6f722d5def3bfd9c0f9e81d081
+EBUILD qtwayland-5.11.3.ebuild 900 BLAKE2B 5ca9b8b36a7430adc85e566ed4e02d9a54268e683f2871588b1f72dd9c333b7d7328ca9bf4afc707ea74731ea84be78a1c0420b8b4bf162835bf5aa68eb27be4 SHA512 698fabd9d97312675317d0b336562c49c11420af417e5534a89397d1f08de7dd522774c1d8ea462172f80d6e898fac2497275aa648eaca4576dea7d676a40ab8
 MISC metadata.xml 593 BLAKE2B a6af5855403e860ee4a4900cef3019fea4552e8c9edc02ada1de5edc467ae9a8f9d86aff6bc656c4154ddb8018c8c8599b75f92d7b766c48e05e56e37999a009 SHA512 2603bc1d30993bf0d0b94784c7dca7c2cd2d15ff5fce4ca4bbdad4b2dc65a8ab7b7bb8cf207649ca4717ca6e4caaa8c75e079db81f0598511a1355c0f325a00d
diff --git a/dev-qt/qtwayland/qtwayland-5.11.1.ebuild b/dev-qt/qtwayland/qtwayland-5.11.1.ebuild
deleted file mode 100644
index a1f1e6f3bda3..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.11.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE="+libinput xcomposite"
-
-DEPEND="
-	>=dev-libs/wayland-1.6.0
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl,libinput?]
-	media-libs/mesa[egl]
-	>=x11-libs/libxkbcommon-0.2.0
-	xcomposite? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_config libinput xkbcommon-evdev \
-		src/client/client.pro \
-		src/compositor/wayland_wrapper/wayland_wrapper.pri \
-		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
-		tests/auto/compositor/compositor/compositor.pro
-
-	use xcomposite || rm -r config.tests/xcomposite || die
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwayland/qtwayland-5.11.3.ebuild b/dev-qt/qtwayland/qtwayland-5.11.3.ebuild
index b750c12f0af6..40732e909df7 100644
--- a/dev-qt/qtwayland/qtwayland-5.11.3.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.11.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Wayland platform plugin for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 fi
 
 IUSE="+libinput xcomposite"