gentoo resync : 09.07.2022

3 files changed, 2 insertions, 63 deletions

diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 6c2bebe7f2dd..11ceb38d1f77 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/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 assistant-5.15.4.ebuild 1294 BLAKE2B 4d82a7c93d76936baabfaf3cd4530b697fddc75673765a19c66dd2421265be1f14772f2ce9d6360cef16b4c9d1b5a9549c9a374f41e6419f951b533958e9d64e SHA512 6e7623f0aa3756d84cf9e9349995cf43326ac2bed50c5ea55ff686ec13a5e3d0eb00a4571f1902bc89b42c1fb85a11c36cb88bb438ee5df4dcfbb6d3859a0bf2
-EBUILD assistant-5.15.5.ebuild 1298 BLAKE2B 27b7c81c58e60f80780af2b2eefe224166e98bcb6ca2b74aa598f7aa271a7eba536f9d368becc3d09c6efd6b65f30a9b3c5fa4bc1eb321b93bbbbcbfec2f46fa SHA512 5640534163a406708f08b75669969128ee8dec50c3544ef02c2453886c909b555f4c46e20ebe3dd5851c0723de86cf7d4761ccc33af61963f079a67e5010a84f
+EBUILD assistant-5.15.5.ebuild 1294 BLAKE2B 4d82a7c93d76936baabfaf3cd4530b697fddc75673765a19c66dd2421265be1f14772f2ce9d6360cef16b4c9d1b5a9549c9a374f41e6419f951b533958e9d64e SHA512 6e7623f0aa3756d84cf9e9349995cf43326ac2bed50c5ea55ff686ec13a5e3d0eb00a4571f1902bc89b42c1fb85a11c36cb88bb438ee5df4dcfbb6d3859a0bf2
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/assistant/assistant-5.15.4.ebuild b/dev-qt/assistant/assistant-5.15.4.ebuild
deleted file mode 100644
index 3aef877d922c..000000000000
--- a/dev-qt/assistant/assistant-5.15.4.ebuild
+++ /dev/null
@@ -1,59 +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="Tool for viewing on-line documentation in Qt help file format"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*[png]
-	=dev-qt/qthelp-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qtprintsupport-${QT5_PV}*
-	=dev-qt/qtsql-${QT5_PV}*[sqlite]
-	=dev-qt/qtwidgets-${QT5_PV}*
-"
-RDEPEND="${DEPEND}
-	!dev-qt/${PN}:5
-	!<dev-qt/qtchooser-66-r2
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/assistant
-)
-
-src_prepare() {
-	sed -e "s/qtHaveModule(webkitwidgets)/false/g" \
-		-i src/assistant/assistant/assistant.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path assistant
-
-	doicon -s 32 src/assistant/assistant/images/assistant.png
-	newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
-	make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
-}
-
-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/assistant/assistant-5.15.5.ebuild b/dev-qt/assistant/assistant-5.15.5.ebuild
index 52bf83ac3a7d..3aef877d922c 100644
--- a/dev-qt/assistant/assistant-5.15.5.ebuild
+++ b/dev-qt/assistant/assistant-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE=""