gentoo resync : 09.07.2022

3 files changed, 2 insertions, 40 deletions

diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 945bbaea93ed..8d9b343e21f1 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,8 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
-DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtopengl-5.15.4.ebuild 686 BLAKE2B c2d82b9f170fdb10a2080503bb37a7af1390de81b52d6a9701b29cc49cdbeb72d3c589ad176c2800fc7b9270a41f1d0759f9c59e904b622b7880303bccc2a2a7 SHA512 d8ef406bbd81743f529554bf34eb1cafe8a2818459c8a4e39521722eee50b37a84c5685f1aa08be5dbc5a086b9d12c633fca0da9af8bd368862dab8e566a3d84
-EBUILD qtopengl-5.15.5.ebuild 699 BLAKE2B 82f2eff4fd38c5b53b15eb7d17c839c2440da2fde23bffaf80ac8e877045874e8a8fa6bc0b22cfa0dd624fb70a6f54e74406d8bf17d76d0ed879db62d8b64cc5 SHA512 ce6b96f4f12030013a98e228e8395d45b17e6569a6b5bce389d966dea46be3b5072c37796af844853115529a34a08462eb6329945543cb99d2c5a92687ddc919
+EBUILD qtopengl-5.15.5.ebuild 693 BLAKE2B e6cf2f8ea907d8169ece01a7ff6315ec212cfbee3c1ebdc7f4a734cc05630b8f79e1d7ecf65fea4e77a7cae9c931e7f42f3474efa0cf05d0a9d2b5aa6f8b55e1 SHA512 d3255c3d379208c5ef57b42f5a3e597c2ee3b96e810dd6b81d5ecda9bfd447b33c880945918ccc556f7beedbfaa4714038a8f3676f3c81f5963fcf4e021d3860
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtopengl/qtopengl-5.15.4.ebuild b/dev-qt/qtopengl/qtopengl-5.15.4.ebuild
deleted file mode 100644
index a250eecca415..000000000000
--- a/dev-qt/qtopengl/qtopengl-5.15.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-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="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="gles2-only"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
-	=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
-"
-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.15.5.ebuild b/dev-qt/qtopengl/qtopengl-5.15.5.ebuild
index b38abd967b2d..8d393b94267f 100644
--- a/dev-qt/qtopengl/qtopengl-5.15.5.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.15.5.ebuild
@@ -11,7 +11,7 @@ inherit qt5-build
 DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="gles2-only"