gentoo resync : 31.10.2017

3 files changed, 1 insertions, 47 deletions

diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index f3bf056b0a0f..2d26d1f30c1b 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,9 +1,7 @@
-DIST qtbase-opensource-src-5.6.2.tar.xz 46825164 SHA256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512 ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321 WHIRLPOOL 4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95
-EBUILD qtwidgets-5.6.2.ebuild 873 SHA256 a541f0b344222a1038e4dd6e74bf04b9dd93e40d9d1edf809fb59b4ffbb228b5 SHA512 cdd478f84f6d3437750d550d4ad3e1e83e73638ccc1c015a9f63948f89fdba980871dfed4b8db0548fbc7e6657229c809f7827b8f655f860472c52b683cfdeb3 WHIRLPOOL 1884af0f59d2a7956f0a664af5a25956ff8d901b5e020fe7653fd9ce30e42c674690b9395b31980a33835f60fa020570957d7fe73eef3676675122bf14d05256
 EBUILD qtwidgets-5.7.1.ebuild 834 SHA256 5ad48278bc6648cd85ff6a7d23de4de8d4694654cf9f9634d08062c4c3612831 SHA512 29890730308f8bf264098bfb70fabd6d4212290b9090ffede33bd6a4baa3eb9f3a71178850f1355ff6c12a90c7b41793aca224b7b95671fec3142c81e4667832 WHIRLPOOL 43ff9d31213829fc75e764ffc41a92ee0dc7998cd69f5f8d05a09dbc3c9427f71519055f2c6f9e39cdeaf52308a9f82396c1b76f21adda29740fa37143e1dbc2
 EBUILD qtwidgets-5.9.2.ebuild 981 SHA256 dd704bece0d99740682ce0295b57f7f5e6397604fa4ea660a721e0ea51504636 SHA512 f48b4ea1e674f2773818a37f6dc5f1691dde365f531f02e07e6bd8bac0425031a4273721cefc9c4489a31a46788f965728cbb781d838b146427e17a0236a18cf WHIRLPOOL 45c3c35bece5c00c6e69575a4564899aa25cf3db200d9bea7edeba507ff700e57554bd2ae6996daff93a8220ea4110dcd325a455670baa82f0a6178704919a21
 MISC ChangeLog 7180 SHA256 6f1424945b5ec4a787469c6ca502b49059573c70cf997010c9cbba4477d413d2 SHA512 ea8bf329c9faaf113d50814554b61556c4d0a9c7dda443698ebc058c6bde8f94569fc8ec904cbc286571ab337625eaf57808ad982fa9b4f11cb31b58ff19a7e2 WHIRLPOOL 599da33ec28ed06dd9c48f0dd6056a6385cbb5707d3ecb5ef332208ede11bb9f2a258ff84f958b5feb44cd3c2f3c692a7ed86595b8a4e5f5fa2a78ba64c6c94c
 MISC ChangeLog-2015 2041 SHA256 b54b9c3395759d344d133797b698a20b719cd3f5cc6d68b571bb105ea1473aff SHA512 7d4a16e8871728f2ed4e32b9ec4020f10a0ebc6c70b098bb05905acc1aff774ddefe5f3c63f4a8f8bfe1b65ccaace4533c33b7e4bdadff2920477f487af8accd WHIRLPOOL a9d530e97e5e593050711e1166ecb1f361471089a35621f10067b77db97bd1cd9be5aed77f8537e2a67ff2f91cc4e8939cf8fdda6e17941f890eb265cc822dd7
-MISC metadata.xml 666 SHA256 02491a5478b26775d989504f53181de43852a9e63db7d4e606d99037baa39503 SHA512 3def57de2b43c03e582f246e7757b470553e139c13d6456f05786ad106ac6c71fb9c2f75d5a3913ea850613c8c3328c0ee1e7355138939184fd980d338745b68 WHIRLPOOL 46f82656ae59d7a5d253cfda3a64d8b67b46edea0bc9064ba33c5664ab5123839604216577286a9bc923e18bd01994fe9ab47b66419aaa0582645cd7580478eb
+MISC metadata.xml 569 SHA256 29972a6c77f44c62be39c25e18764ec70467c25350d8231cdf3b0b0eaee3146d SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192 WHIRLPOOL 533b0bb36559f85f36c79bdd0987de917db43e133ebeba5f3c56d5e70c9b9dfe3358ce7c8b009f942a2cda9c6c47403dd17b2e28bda74b89fadad24d15537688
diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml
index afb05fc28403..17b1d11ac715 100644
--- a/dev-qt/qtwidgets/metadata.xml
+++ b/dev-qt/qtwidgets/metadata.xml
@@ -7,8 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
-		<flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active
-			GTK+ theme</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qtwidgets/qtwidgets-5.6.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.6.2.ebuild
deleted file mode 100644
index afe6ca1a7bad..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.6.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtkstyle +png +xcb"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=,gtkstyle=,png=,xcb?]
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/uic
-	src/widgets
-)
-
-QT5_GENTOO_CONFIG=(
-	!:no-widgets:
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use gtkstyle)
-		-opengl $(usex gles2 es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use xcb xcb system)
-		$(qt_use xcb xkbcommon system)
-		$(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
-	)
-	qt5-build_src_configure
-}