gentoo resync : 29.12.2022

4 files changed, 69 insertions, 4 deletions

diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 27e15e8f7bee..775b4e0788a6 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,4 +1,6 @@
-DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
-DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
-EBUILD qthelp-5.15.3.ebuild 636 BLAKE2B 1b4d04e4e765618d5bf5f69c2a6b9bb3871a63d6f2252bfbfe83483c7c86dbb79936abe3589665f449e01d23b554f9cb83540f58caf34f00d62572f4c4210e06 SHA512 41368f3dd72a6297fff9ef96c899ad5dd06c0234e692a0fd0a54d812488911dc1345030b009848ecab48b5894e3dffc3acba2229620ae436c8c54ab45068a024
+AUX qthelp-5.15.4-bogusdep.patch 779 BLAKE2B 1d939de92a719cc26b154ae6522ea12b304e3e0499125164e12eefa137df878eda56f0ee81b2448f0f4dee7a80468e616580e93c698c8f1847bc0296a63476bb SHA512 1b4a6f02f35ef038fa61a8cbc218fc758c34bc249f5a2da59f46209cc39c0e886bbd95a0b430588c49185eeeeaae70aafe58317a396a2455655fd073aff8626b
+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 qthelp-5.15.4.ebuild 727 BLAKE2B a7cce96f7d87b713b69fc3f5624bf1f742113a88a66fd74cef76f1c3c9b700813f8c2fa9e9c081e7ad4332b0f77de3d21214cd80beb8b600d5ee4cb336106434 SHA512 b383bf2534a9ec1ebea17b13b269eeca40523de913a989e09628fc27f88317da5f6c6edda28254086583390aa3b72f67e1cc025d8ba6c303932711f60084cf4d
+EBUILD qthelp-5.15.5.ebuild 733 BLAKE2B 0a0734d541ec282299cfc3b22251ca105a2f01dea756d52ce5d8cc2c7dabf51c3b7941319c0d5f9172a3e53514e2f6b7e5abff94c8fd2d2d35b385db92731f11 SHA512 600eca9188462802b7cd92d752622bef5695915d127daac85e030d432dbeb097764ed27b70b9c50cfb6ba052e1c9ed74f723ec2587ec931b1e7c92e6c0694d88
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qthelp/files/qthelp-5.15.4-bogusdep.patch b/dev-qt/qthelp/files/qthelp-5.15.4-bogusdep.patch
new file mode 100644
index 000000000000..bc32959e4ca1
--- /dev/null
+++ b/dev-qt/qthelp/files/qthelp-5.15.4-bogusdep.patch
@@ -0,0 +1,29 @@
+https://invent.kde.org/qt/qt/qttools/-/merge_requests/2
+
+(Dropped first patch as it seems to be in 5.15.4.)
+
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 18 Mar 2022 12:43:18 +0100
+Subject: [PATCH 2/2] Drop superfluous network dependency from
+ assistant/{help,qhelpgenerator}.pro
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+--- a/src/assistant/help/help.pro
++++ b/src/assistant/help/help.pro
+@@ -1,7 +1,6 @@
+ TARGET = QtHelp
+ 
+ QT = core-private gui widgets sql
+-QT_PRIVATE = network
+ 
+ DEFINES += QHELP_LIB
+ 
+--- a/src/assistant/qhelpgenerator/qhelpgenerator.pro
++++ b/src/assistant/qhelpgenerator/qhelpgenerator.pro
+@@ -1,4 +1,4 @@
+-QT += network help-private
++QT += help-private
+ 
+ QTPLUGIN.platforms = qminimal
+ QTPLUGIN.sqldrivers = qsqlite
+GitLab
diff --git a/dev-qt/qthelp/qthelp-5.15.3.ebuild b/dev-qt/qthelp/qthelp-5.15.4.ebuild
index 90a95aba5a1b..7db1ae3ebada 100644
--- a/dev-qt/qthelp/qthelp-5.15.3.ebuild
+++ b/dev-qt/qthelp/qthelp-5.15.4.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-QT5_KDEPATCHSET_REV=1
 QT5_MODULE="qttools"
 inherit qt5-build
 
@@ -23,6 +22,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+# https://invent.kde.org/qt/qt/qttools/-/merge_requests/2
+PATCHES=( "${FILESDIR}/${PN}-5.15.4-bogusdep.patch" )
+
 QT5_TARGET_SUBDIRS=(
 	src/assistant/help
 	src/assistant/qcollectiongenerator
diff --git a/dev-qt/qthelp/qthelp-5.15.5.ebuild b/dev-qt/qthelp/qthelp-5.15.5.ebuild
new file mode 100644
index 000000000000..c4a559956981
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-5.15.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt5 module for integrating online documentation into applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*
+	=dev-qt/qtsql-${QT5_PV}*[sqlite]
+	=dev-qt/qtwidgets-${QT5_PV}*
+"
+RDEPEND="${DEPEND}"
+
+# https://invent.kde.org/qt/qt/qttools/-/merge_requests/2
+PATCHES=( "${FILESDIR}/${PN}-5.15.4-bogusdep.patch" )
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/help
+	src/assistant/qcollectiongenerator
+	src/assistant/qhelpgenerator
+)