gentoo resync : 24.12.2018

4 files changed, 5 insertions, 46 deletions

diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index f7fd2d4947b9..c37c15c20405 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,7 +1,5 @@
 DIST qtwayland-everywhere-src-5.11.1.tar.xz 392200 BLAKE2B 2e65c6bd8c9ea44ae84f608312db6983d540382bfb2a22412fe054f4e7253d70e21f4d0577653b246de5b0266271e40911a7c79fc28b266cc29ff30669df280e SHA512 dc1327ef8cdc9ed9521e9db316da0bcdbe9639b714a2dda7a792c52ba5897ddb75deba1ab89e010bc05cc2a96ede781b9990f5449ce4a2f85e15466a4d6d82ad
-DIST qtwayland-everywhere-src-5.11.2.tar.xz 387644 BLAKE2B e590d0f83e89a2ea33f4782cf295df4fe8ffc5e3767dbcb81ad633a2de35eda714e28a69a9c95263786883fff66a25ce5e9b52dab9929f499a0b8dab90489cc6 SHA512 27aabe18cf876afaf9da9e9fa91c3efa2c024229a6cf4746eefc4f4ea71f125a95ca52f887a42683d7743d3f876efe927001b8ee5580123ba5f4c4d4dea24013
-DIST qtwayland-opensource-src-5.9.6.tar.xz 316152 BLAKE2B a1ebbf98eea9ca36f8229ed0bdfdeb79eb9d1519ff35eb153d7f8b7af2ad9831905e564464ec1faf793a7b11088d43d6dda6dc21b36943fccb569163c119a30a SHA512 7376f76001323d7971cb3be7592086b26c855d8d702184e84f28656b4262a9780b4cc0a0991c97ca011863570b6abd63b006c78021934e1516be65715f82ae4b
-EBUILD qtwayland-5.11.1.ebuild 902 BLAKE2B 1349980e1c109b56baee2bd2a0066dd497f8851024f1b90618d6edf67538a29763b779fd42a801781abeaff2180518eb6ba15834c55f871a49ebd58cd3adf241 SHA512 5e25d3b4c2611953f0f266b746c2285456ca3eb418dac9f759346120512583af9cbe8f296273b88da7480015a8b172f7d2cca175981c8c5e2735ffc924d8cf1e
-EBUILD qtwayland-5.11.2.ebuild 904 BLAKE2B 0bd333be3d951b0ae63e2932ed7376d638d4078b33e2fabed721fd7f28460d8308fef85f9618d870fc200165bcbd42b188fbe3bcb724a3705b219239be931fac SHA512 1842b4094dd7ee1004342ac2d50294fc8dd1860df4fb804dfbb6d2d58b39783d431e7947d3cdf853512806feac5ba42f6d472af34c0604569d0b06e3e8c8805b
-EBUILD qtwayland-5.9.6.ebuild 910 BLAKE2B 43718b86e317b59b1940328d13c634fc4283f1c307b16cb06d49a1d0c8a94fb5c7f1e02e99706e2efa403b3ec4d7bff193513669af94f641281849b4d47b8528 SHA512 4085dd400ec562b46b0f1117ad52f269e726ed62e6a8efe9597193074dccc162e9181a9d7b06eb7922e765d8a2ad3bb2c87a3cd24be31f1b4c1b9125d0d6580f
+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 904 BLAKE2B 71131a4e76fca477c65bba332aefaa6d95ce749b4134cd593d34ae715898b223e56aed820239a8f32d41eccafb70ddb0191519c1c074db83fba359282de61634 SHA512 1f0127f61fdf8dec0256c0b05b5383db0715ee459a60262d2e91ac40843a869b5f5563a53ed1198e7da5423b638cbc8737b53bc0820806eac23b1cd7444765ae
 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
index 0a6dfec7eea2..a1f1e6f3bda3 100644
--- a/dev-qt/qtwayland/qtwayland-5.11.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.11.1.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"
diff --git a/dev-qt/qtwayland/qtwayland-5.11.2.ebuild b/dev-qt/qtwayland/qtwayland-5.11.3.ebuild
index ff62f71d3a79..1379e01ee01b 100644
--- a/dev-qt/qtwayland/qtwayland-5.11.2.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.11.3.ebuild
@@ -16,7 +16,7 @@ DEPEND="
 	>=dev-libs/wayland-1.6.0
 	~dev-qt/qtcore-${PV}
 	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl,libinput?]
+	~dev-qt/qtgui-${PV}[egl,libinput=]
 	media-libs/mesa[egl]
 	>=x11-libs/libxkbcommon-0.2.0
 	xcomposite? (
diff --git a/dev-qt/qtwayland/qtwayland-5.9.6.ebuild b/dev-qt/qtwayland/qtwayland-5.9.6.ebuild
deleted file mode 100644
index c112fffaff34..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.9.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 ~sparc 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
-}