gentoo resync : 20.10.2021

3 files changed, 2 insertions, 50 deletions

diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 0b4268cb3e34..460d1f9c9c5f 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,5 +1,3 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD qdbusviewer-5.15.2-r10.ebuild 1042 BLAKE2B 6bbeee3455096dd33047db64ae66caf764f35672b9ca9cc311700e888b1b0faa0aaa8fb3e694aa328eb1b0770b132a2d5ee84c5cdca72eafd35178b6f6763913 SHA512 178563ee4a2f52a1aa9325157cfad66c62c9c82e5efb478624e59ca1c8a118d2bd25ca73c4ce990630517ec1a4b1a008450be020ee9a797a525c34e78554f610
-EBUILD qdbusviewer-5.15.2.ebuild 960 BLAKE2B 1d2910182ed9b6830230106d2596c393aae23544651cec3fa4e9ed1b65aa3eab3a2a25c8080d034c6988aa1366d3e56c98eb70cac7f946ff7cbed96aff89324f SHA512 9091c3d7a17e3481458b9dcb4116f7e973ca4e43ae0d47aa0f28e8595f16b100c843c11b7779867150d5159e9b0cfa140d94e0a6995c4c65962f0538a6a3ca62
+EBUILD qdbusviewer-5.15.2-r10.ebuild 1041 BLAKE2B b967aba8b225e5e9a9bd36d1350445b48a153342a96828771e86f23b8063878681413ab63799d7fba07850691d03644027c222331503d3da35c06f00ea986564 SHA512 0014aebe0181579b471539204c98ca991163fc6dadaddf798a74d4f47d955713388c200861f091ce9a902a4fa1a651fe23e168f9485a4229adc938cdf7ca1e7a
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild
index 09d3b0f1cd86..11f5c9a1d50a 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild
@@ -10,7 +10,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.2.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.2.ebuild
deleted file mode 100644
index a9976bf60249..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbusviewer
-)
-
-src_install() {
-	qt5-build_src_install
-
-	doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
-	newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
-	make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer' qdbusviewer 'Qt;Development'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}