gentoo resync : 14.05.2020

3 files changed, 2 insertions, 38 deletions

diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 58180de55e61..755fcff0798e 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,7 +1,5 @@
-DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 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
-EBUILD qtopengl-5.13.2-r1.ebuild 615 BLAKE2B 0353e36dbf87fbcc524e9748dad1f610018a8ce2b0bfdab6ae3e18fdec30847238c0d7c6c1a2689abfcf4765e6d52ee799b4779edb12ea47837b47866e79badd SHA512 bc1f2e24b40fc3f6562100fa8b9fd4de53e97876a9c6b055338112fa7c3f75255e94c237c3ce1ac6da1913c9003e6e1d6ff5b9d606fb67bc049438e512bce9dd
 EBUILD qtopengl-5.14.1-r1.ebuild 655 BLAKE2B c6484e88455f763fb3582c36f3ab470f6935173a8cfccb278f5647709a8443252bc72cfe4f192570d6a9548476b37e339fd28f003be034cfe1ff68fff6935ff6 SHA512 fa781c852509a89ae0d02c475c2b75011fd7cd0e625294339e40c0f721296bf553c77102b3fad73bbf3f9bb3cfffb2e2ca0013598a9fae88f695bb4c7ee60fd0
-EBUILD qtopengl-5.14.2.ebuild 663 BLAKE2B b5ed7e2936e449ab115aed7f1fa1199661d176d5985040bf1dad4f3e83458d62a9ac1afbea081f9b68fe3799e07ccec8379b63dda8843f0337ff136d0f0ee40c SHA512 150da15223ec6f4049d9c05b7facb12faec803d22755d5f30f89366f3b5af8eb1ff1a76583aad17556469ea4841a0208df4506392febc42d6f383e92fdd122de
+EBUILD qtopengl-5.14.2.ebuild 661 BLAKE2B f0f39a637d9fa1d0c849d6bf0c71cf3d4ba4f6a37604ce00baa64f4a4c0f562d228ba857bd8af3ab3808da6f5922bbfce5dfd05a42ad8c657dbac56515356a7c SHA512 8ff6653734b17c272221340973de1aa4993728a2cf0e7733d5bc2f92cdd56ffdf791e2906700243f662f33dc6a2693d4cf3ce5cfc1d977a3e77b0dc0b5b56c4a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtopengl/qtopengl-5.13.2-r1.ebuild b/dev-qt/qtopengl/qtopengl-5.13.2-r1.ebuild
deleted file mode 100644
index c772d0bd7ced..000000000000
--- a/dev-qt/qtopengl/qtopengl-5.13.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm"
-fi
-
-IUSE="gles2-only"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~dev-qt/qtwidgets-${PV}[gles2-only=]
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/opengl
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2-only es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtopengl/qtopengl-5.14.2.ebuild b/dev-qt/qtopengl/qtopengl-5.14.2.ebuild
index a2891c533fb6..4ffaa4034734 100644
--- a/dev-qt/qtopengl/qtopengl-5.14.2.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.14.2.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
 
 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
 
 IUSE="gles2-only"