gentoo resync : 13.06.2020

3 files changed, 2 insertions, 61 deletions

diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index f7db0fa548de..315a84ead529 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,7 +1,5 @@
-DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
 DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a
-EBUILD qtwidgets-5.14.1-r1.ebuild 1039 BLAKE2B 714f6d303c4f87e2ca3b265de66beba491691ffdc7367bc624109baf8e2c424b35c8d6a38a0ad9a1de827376b6abd720c00ed606f6c454e545150269e1775a48 SHA512 854c6e5c399d921e30485de86f86e8d654cd6ddefa6808f085d39a08b925bc818e0114dcd7c38fbd4b3a36ec9da4e23b0908770c07d69e5a013ba3a693ef166c
-EBUILD qtwidgets-5.14.2.ebuild 1042 BLAKE2B e656bcd292bb884dc4fdaf8a62f981362c834945fc98a392c72c11edbc2d7603174ee4f84c865731b78dafb7b50130ea233746e3960bc5b363bb9fdccc0e140a SHA512 7edc628d1488f59b452d15d29b1627f3b7238be7fcb603c0195aa231e7dcf8513ab2b9504b80b84bf2c9675f1857b57326eadf0d3614b668f7d67200558017fc
+EBUILD qtwidgets-5.14.2.ebuild 1041 BLAKE2B 728671cef741bd25389eb98e85def46f3e9bb878f5df8ff1a4cb08be7edb5b11265978ac3f3af1663879d103224c01e9a8e93b6c85d7af5b76d3bae87eb2a4dc SHA512 12b194ec32e7eb39399e001a8f590ded9b2729a6a8286868a8977798c0821e9b51dc42cb25d1b0f5dc05b32be5ce961006e5c115193e4cabfe5c8add49751624
 EBUILD qtwidgets-5.15.0.ebuild 1023 BLAKE2B d7ef3bfccf7811dcd98e6e5396a1c74ffc2a0ddf946d2d53bdaf4b4cdf2b4302fe2ea8e3ea0c1341a1464903c2c05b101f344955a60c76d5891c0538e232101c SHA512 61e6f7f44674778a41f6e24d9758877cd62cc532cebe58c9d1d5ca1bcbd613608c8282c0005ac6519faf82b93a4f48ce4d100bf5b25cd4f47f26c2d0b7038517
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtwidgets/qtwidgets-5.14.1-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.14.1-r1.ebuild
deleted file mode 100644
index d1a1706e59ad..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.14.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~sparc x86"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2-only gtk +png +X"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=,png=,X?]
-	gtk? (
-		~dev-qt/qtgui-${PV}[dbus]
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/uic
-	src/widgets
-	src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
-	gtk:gtk3:
-	::widgets
-	!:no-widgets:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:widgets
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use gtk)
-		-gui
-		$(qt_use png libpng system)
-		-widgets
-		$(qt_use X xcb system)
-		$(usex X '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild
index 45e44f6d5f0c..3704914a9488 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild
@@ -9,7 +9,7 @@ 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 ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 # keep IUSE defaults in sync with qtgui