gentoo resync : 31.10.2017

3 files changed, 1 insertions, 45 deletions

diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 6c991ebd3c05..7725490b18b4 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,9 +1,7 @@
-DIST qtwayland-opensource-src-5.6.2.tar.xz 267028 SHA256 035c3199f4719627b64b7020f0f4574da2b4cb78c6981aba75f27b872d8e6c86 SHA512 193c1ef58282bf9597303996d8e03853d95c2e4f79a62bdcfc6ad48f397dbb71f8f2e94f8ab334c7fae0a6a0e5b79e8f762468be6a3b66eb3636c465fabff51d WHIRLPOOL e870e8be2ef393b8f5ba248e0f51e30297aa6bb0864c821c217c79e727d778751f89067913f0b7db0e0075d12843653529ce2c8cce37f429cf24265639db1e55
 DIST qtwayland-opensource-src-5.7.1.tar.xz 291776 SHA256 f23fc5e180c8af5b38419d84e44f1f342904a197c2382a7b03f83de2136201c7 SHA512 41a6699b9048a859bb0cb1e37cd0a3977f52a5a223d4f6a4ce5e1402c5b829cc907593ce2b70f4ec24dfad147251bb2f20e889eae26072cf53e774b4585f2921 WHIRLPOOL 959fb40ce79d9d09ee3c3ec436d3be229b614da15712494d943dd2cded12f0e29f9750b6e103307bb4e27e00a28f5b2ac508a29dff4f25e1b677f2f2519de98d
 DIST qtwayland-opensource-src-5.9.2.tar.xz 311052 SHA256 f6434d03f933867dfb219abec2cf19e2c1d1ef23d46d12cb9333c8066027f6c6 SHA512 28b6f77be5289cb9eba0e3e6b220d2c99d2ab4dbae8e02caecd7651b5ae33c09f117545664b01649ca52b27025cc15853806ece8dc10713c3d90832416c7def6 WHIRLPOOL 2d0c1ea872dbe4bd48dd1564062310eb2933e44dafe9c4547137f3b63aaddfe9a70aca806e48120abdbfa0de4eef9424258012afe2debe4c01012f3a94bcd932
-EBUILD qtwayland-5.6.2.ebuild 865 SHA256 2d95e6a433c25b3187acf1057c6377aad186a90bf345db89a96f92033d7a9390 SHA512 d37b5bb891b15d22af32fd363cab268884cf8a17fd37f7720ead8a039c51b6d71038502f1324e13b504e542b4424919d86f1a95ab69393716e3c87706a251749 WHIRLPOOL 5d021c0970e95d64c7e2d026db05d9506a0ed59a08ccab3969073ccc54eddbeabce0f016d87fd668ccc6743ef3f76b4539ee05bb673b8d61de39cb19fbfff3b8
 EBUILD qtwayland-5.7.1.ebuild 623 SHA256 2a3d6da03326aea6d955fd17ca9125a4c12fbcb99c127a6650ab430ccd93431d SHA512 8768c4014b155e6a5918d93228c2281e4742354f706089bc94355d8eedc939d5d32471163652cc6ce640beb719516b71832100d9d5e255ee90b38a3f68edc022 WHIRLPOOL 5abab1e92d40a1941dc1c0106f9ffc8824306c2a293c39d41af796d04dd706533bd459078103d878fa8f7c430f558cb47f771b66721c294538696c1125ccd37e
 EBUILD qtwayland-5.9.2.ebuild 907 SHA256 43b46fd094e98771528c9badfb3ad46f3941a8a8c6103cf7ca2a4d0049651283 SHA512 8f36a62cdd003781b58b70214de5593afd3ddce625a53e088ca1e4d19e270bc1afb65fb669f1cdd6173079661220c05280f19ae4ac394bec825f27d656bb0a61 WHIRLPOOL b793a8a7348da8894962cbacda4ec89731340e718cb52bbcaf151de73e0a969830805e398a05b3856b476133a66d64cf1296664e03aa02ae916643ac306a5b27
 MISC ChangeLog 6365 SHA256 10557ede221a5b7af278ac48105f3e9d906c12ccc5d3be829470f1ac10a20406 SHA512 aacbcf84ec21b9ed4c68ecc519b7c384aed61fa12ecc2e9f5be113acc4abbeb28f68488f6e498f545268629c0fea0b355581d0141e125c1d5b16941172e46c8a WHIRLPOOL 210c79d26de8acc65e4ce59ebe2da8ad4d8cc59daabc41716edbfc64d33785bf22bc3e4d359cb3c8c878ddd4f29cebbdd7a622446483fd3d6cc3f49014ff5230
 MISC ChangeLog-2015 1270 SHA256 7050817fd20620c2cba03a17449307a031d7b446e17855eb4093e1be7cf2f330 SHA512 120f419e9e672d2402e890a503d21df0445d6514deffb907d08cefc4f7792f59d9c3f382a1181989241532eb9a4bda314bbfd5db1e57be79a2c91a245fe06028 WHIRLPOOL 16142dcabd8cbe9e7481b1f5c2018975d4a3de36361d2ebee76d8cde860260d7591b93a2d61358760d9d7f994e4946d5fa20dfe70e728092031f0cd5cb0e5f0e
-MISC metadata.xml 719 SHA256 f8fea1f7753632cd00a58ff1fef8947cc951dab1b48e975bc391ab111559e22f SHA512 c5ea15976e3b19011280682ae02b0be7ff20cef45a24aa40d8b0e337eb7692c8adbda57cbf5e9fd6f9c03868f26aeb347204cc69e531386753622f6d2d2c47e3 WHIRLPOOL 87881c9d625a1e0b527d0b723cbe20fcaa292e598b61f78e38a9654eed8c50d96f36bd5f3ce96190d8486720854c3669e28967e035fedca42754c59348047eb4
+MISC metadata.xml 593 SHA256 e91fca16b63c7bfec03e008b79235aeecdf9cfdb364f53c1823bb1ecd3a77ae7 SHA512 2603bc1d30993bf0d0b94784c7dca7c2cd2d15ff5fce4ca4bbdad4b2dc65a8ab7b7bb8cf207649ca4717ca6e4caaa8c75e079db81f0598511a1355c0f325a00d WHIRLPOOL a8dec6b4ca57569a9e0898bb26e2cce42c1740f996877cd1a0124c9cace5b5f11c8c3147167d26b7a2f4a8e6d36eb3769ce7d93f59f0f3b4c3e5d73ebc866700
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index 9bd59538a9fe..4fb03e679017 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -7,8 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
-		<flag name="qml">Build QML/QtQuick bindings</flag>
-		<flag name="wayland-compositor">Build Qt compositor for wayland</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qtwayland/qtwayland-5.6.2.ebuild b/dev-qt/qtwayland/qtwayland-5.6.2.ebuild
deleted file mode 100644
index d427008009c6..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.6.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 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 hppa ~ppc ppc64 x86"
-fi
-
-IUSE="qml wayland-compositor xcomposite"
-
-DEPEND="
-	>=dev-libs/wayland-1.4.0
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[egl]
-	media-libs/mesa[egl]
-	>=x11-libs/libxkbcommon-0.2.0
-	wayland-compositor? (
-		qml? ( ~dev-qt/qtdeclarative-${PV} )
-	)
-	xcomposite? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	if use wayland-compositor; then
-		echo "CONFIG += wayland-compositor" >> "${QT5_BUILD_DIR}"/.qmake.cache
-	fi
-
-	qt_use_compile_test xcomposite
-	qt_use_disable_mod qml quick src/compositor/compositor_api/compositor_api.pri
-
-	qt5-build_src_configure
-}