gentoo resync : 09.07.2022

3 files changed, 2 insertions, 62 deletions

diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 0b6472011d66..1e5c62b321d0 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 DIST qttools-everywhere-opensource-src-5.15.5.tar.xz 8898140 BLAKE2B 49b7b0db9d9ae9c6d405678eab0ec097bc160eb7787bc939aa92816cc63c5c97aef2de0c978a2a3597014878dca9466631131bc7746bd03d87229ed7edb6594c SHA512 ff5e658ec812dd36d00ad3ac7e824de708968ff1c66a73da1470b6f0cdb6853a7084f18b1bcf1614afd4c23f381d817d7eb665f8573a4e981a9b87c6e4d6fa2b
-EBUILD designer-5.15.4.ebuild 1305 BLAKE2B d34c310f6df1c8ded660fd02850bb092d917ceae30d9e8ecd122ef9ef4fbefbfb075eebd16b520de8e40ce5680c33ba65aa223ec17b84ff681b7986ab213297b SHA512 2564e590d1e3eaddf593be70f59ec107acc3be4eb62ccddd22da7d15ae431aa8770fc26d4bf702187acc3bfd7ce5b28fb75cb2e0a43da8d15511307b75d20233
-EBUILD designer-5.15.5.ebuild 1318 BLAKE2B ed8ceff17589a417e91bf602560014efd5f98d060c4d29c2f694a27a05600e72bfe30af56577ea7e3bea0d1b967165b239ea4f8bf6135d4fab21c76d636e95ec SHA512 362febe3f569d6f8792ddd569f55ade08f7418a5cfdcc016d8e4c4760594e5bd1a75147cee6a1cfb73255a9579613be04e6f664e60d3c7c05f43c6b61e7a05a7
+EBUILD designer-5.15.5.ebuild 1312 BLAKE2B cbda84bf90348f0412ea2dc9032d6b51b4f6e33a74fec1cb0a9567a6834e031b62957a4a08d67c76bbac8e491333b7072864a16ead730f8791a18c67808d02e3 SHA512 9136d5e22601b294f691ea5f13407bae5c4a462134c0573a5b8ede85d10f27980a46c83d2012f94128198fb8bf26e97e7690e8009dd9ad1be1e5f79d64751e12
 MISC metadata.xml 565 BLAKE2B ff18f784bf09ba4add0fe5a9966a07ba2694dd84046bc528b22bcfd643a7e57be99235bd98eca4e58f68636f9fe6c8e274aabf82ed2055c6a4c70d10c60864ed SHA512 357d80b857e508aeceefcb45ab3757ce24d6ec3e1fd67642f2cbedf496748f89ab5a9726eb974bea8d5b1693601a965571913f79b1325aeaf9020183882ba16d
diff --git a/dev-qt/designer/designer-5.15.4.ebuild b/dev-qt/designer/designer-5.15.4.ebuild
deleted file mode 100644
index 3e0bd60eb5d9..000000000000
--- a/dev-qt/designer/designer-5.15.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
-fi
-
-IUSE="declarative"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[png]
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qtprintsupport-${QT5_PV}*
-	=dev-qt/qtwidgets-${QT5_PV}*
-	=dev-qt/qtxml-${QT5_PV}*
-	declarative? ( =dev-qt/qtdeclarative-${QT5_PV}*[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/designer
-)
-
-src_prepare() {
-	qt_use_disable_mod declarative quickwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	sed -e "s/qtHaveModule(webkitwidgets)/false/g" \
-		-i src/designer/src/plugins/plugins.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path designer 5
-
-	doicon -s 128 src/designer/src/designer/images/designer.png
-	make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/designer/designer-5.15.5.ebuild b/dev-qt/designer/designer-5.15.5.ebuild
index dde64f6e6a6d..e3c7c976377a 100644
--- a/dev-qt/designer/designer-5.15.5.ebuild
+++ b/dev-qt/designer/designer-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
 fi
 
 IUSE="declarative"