gentoo auto-resync : 10:09:2023 - 16:36:07

4 files changed, 38 insertions, 6 deletions

diff --git a/app-misc/ddcui/Manifest b/app-misc/ddcui/Manifest
index bba2b1f6ddda..e24c51998308 100644
--- a/app-misc/ddcui/Manifest
+++ b/app-misc/ddcui/Manifest
@@ -1,6 +1,7 @@
 AUX ddcui-0.2.1-build.patch 639 BLAKE2B 0485050d4e57aff2261b210e55b96baaeb3271060ccc05a0f88aed2c678c99c8b4e0485153e924b3dcc0f8a2faabf0991bac4b698f66f6547f925189ff85344a SHA512 cb4d61500c083ed18cb5264e02997fc88416baea7676a92f1aedaa400007aaa7931993ec32a8b1baa7fd9bb552553a4dbc77393c2501fbe1618e4150c9c0d87c
+AUX ddcui-0.2.1-drop-qthelp-dep.patch 1398 BLAKE2B 6deb7e574f997f81e13834fa32b4dc435366231592a2a7e13e716252e475ae3d1301fd6678385522cc216f3924eaf7fa834b2ef92ee7d19714c4846e672d8d13 SHA512 a6432ba9d44f58f864a9f0c92770191afead20d28e527cc14056f494525e97f4f1978abc33cf03cdb20bd8a5fec78b4de19d4f46505322c98a7bd861751750c4
 DIST ddcui-0.2.1.tar.gz 601220 BLAKE2B 18af4ee4db741a612565260ed812f7274695472e9dc6e32c6670efcbdaeafcac9b0b45e44d02188d23e0f379f57b062270ecad58bdcfa8e8c2bf99c2775b1dfe SHA512 0df363dbf17750e3920e0afc5fc29b42271bbf06dcf52cddf46f3660155c0954ee39e8e356e9caebe1a6a679ab0b3a4ebb2e501a9bb9ac2cd47da3f522fb3169
 DIST ddcui-0.3.0.tar.gz 601534 BLAKE2B d91d7467879c684cbb8571da48dfd170afa60d63832b44515d6d19187792f6c3c2c178e907ad8693cdba8df44b448eb4393a91e4439dcda13ac096ad6e97a594 SHA512 fab1ea757aad90fa68d2f6f5c128d7917e81f287a0a9e432461c7b2119c3f0d9da0e28a013510d1b0cb300b40c3f4dd745f3e1732c52f671c4d6e39b3ef0c368
-EBUILD ddcui-0.2.1.ebuild 792 BLAKE2B 25c3542dbbcd4373b83165a26d17983f385629d6267a9ff87be323a36badbeb3d370f4f25e8c14cf54b537c33b00ede0c52362d65e186dc1c049989df31c3fe0 SHA512 6eff83bb90b446b7287bc9557f83d7fca0fa880b397928ec337b9ffa5af1ab8ad7a3c6df1951a9bb01822ee9de849984e2a18ccb11689dd7f60a01e3d55c33a3
-EBUILD ddcui-0.3.0.ebuild 747 BLAKE2B 89b640ab18679a53385659041044e7bd7d7642f0adb799fe1931fe913f3d7b8366b4180cdd62a8041eec3fabc8e90e613fbde5254008240c265b4f679fa8cc90 SHA512 d335fbc619662a1b9557d2259a043389f31565df392a20bbeb1252bbdc1c2b8d5b6c1423dcb6961751aa643a22d8a1db9c722502c55bdde4e221dadf19f84556
+EBUILD ddcui-0.2.1-r1.ebuild 817 BLAKE2B a0100685eea7621ab5b366e76798db8cbbb2ab15a0b665a13c807e755e10922a7a0b042ba1ea5064418d8a2999ce66fa133cbc4e6da201a427e2cee777eb543c SHA512 f6afdfda567341cfe0fd7e87caf9f8534de142f1a584aa36dd5f1a48a4f0a103389bd6ce2b6ecf8d06181995548a450376fc54e274579db01a23f1ec518c7e89
+EBUILD ddcui-0.3.0-r1.ebuild 792 BLAKE2B 4063de5d50691a1d39a8a167ed90d8e18e59fcd982438a679b5fa0cac4434883b8e836ee9be0d4f5ae4f5bd006ce2fd942070639edca6b226a68ab18f6ffed16 SHA512 b3e362f287fd8fdf8beef5596f33ceeb9124e8e1ee94d74f70a65ea4ec73f66a083861566deea64b547fe1ae3f67fdbda984ff3266d02717917deeca386ab55a
 MISC metadata.xml 507 BLAKE2B 4f458118ad0f48137ac6b50871d7bc07f3b4416cbb82b264edd00726a6b9655d9ce986618da3c53a8e8855054a1e1e68045353589fdde1541c17e3f4b2e29828 SHA512 6a5c378319fc110e1338f4f6aeb5ce41c76ac521e95311c8b368b5357a2fd362038b21e46ff59dafc2cd8b0baeb55b7530b64c9f4f25513eb3eb66e528fd1e28
diff --git a/app-misc/ddcui/ddcui-0.2.1.ebuild b/app-misc/ddcui/ddcui-0.2.1-r1.ebuild
index 285ebc614cfd..f8e4a4f945f3 100644
--- a/app-misc/ddcui/ddcui-0.2.1.ebuild
+++ b/app-misc/ddcui/ddcui-0.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,6 @@ DEPEND="
 	>=app-misc/ddcutil-1.2.0:0/4
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qthelp:5
 	dev-qt/qtwidgets:5
 "
 RDEPEND="${DEPEND}"
@@ -28,6 +27,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-drop-qthelp-dep.patch"
 )
 
 src_prepare() {
diff --git a/app-misc/ddcui/ddcui-0.3.0.ebuild b/app-misc/ddcui/ddcui-0.3.0-r1.ebuild
index 44bdcdbd1895..c32a66e52f95 100644
--- a/app-misc/ddcui/ddcui-0.3.0.ebuild
+++ b/app-misc/ddcui/ddcui-0.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,12 +20,15 @@ DEPEND="
 	>=app-misc/ddcutil-1.3.0:0/4
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qthelp:5
 	dev-qt/qtwidgets:5
 "
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.1-drop-qthelp-dep.patch"
+)
+
 src_prepare() {
 	# move docs to correct dir
 	sed -i -e "s%share/doc/ddcui%share/doc/${PF}%g" CMakeLists.txt || die
diff --git a/app-misc/ddcui/files/ddcui-0.2.1-drop-qthelp-dep.patch b/app-misc/ddcui/files/ddcui-0.2.1-drop-qthelp-dep.patch
new file mode 100644
index 000000000000..607777d5715b
--- /dev/null
+++ b/app-misc/ddcui/files/ddcui-0.2.1-drop-qthelp-dep.patch
@@ -0,0 +1,28 @@
+--- a/CMakeLists.txt	2022-08-01 15:19:36.000000000 +0200
++++ b/CMakeLists.txt	2022-10-16 14:08:37.422550810 +0200
+@@ -93,12 +93,11 @@
+ 
+ set(QT5_LIBRARIES Qt5::Widgets )
+ # Ensures all Qt componenets have same version: 
+-find_package(Qt5 ${ddcui_qt_version} COMPONENTS Core Widgets Gui Help REQUIRED)
++find_package(Qt5 ${ddcui_qt_version} COMPONENTS Core Widgets Gui REQUIRED)
+ message( ${VERBOSE} "Qt directories:")
+ message( ${VERBOSE} "  Qt5Widgets_INCLUDE_DIRS:  ${Qt5Widgets_INCLUDE_DIRS}" )
+ message( ${VERBOSE} "  Qt5Core_INCLUDE_DIRS:     ${Qt5Core_INCLUDE_DIRS}"    )
+ message( ${VERBOSE} "  Qt5Gui_INCLUDE_DIRS:      ${Qt5Gui_INCLUDE_DIRS}"     )
+-message( ${VERBOSE} "  Qt5Help_INCLUDE_DIRS:     ${Qt5Help_INCLUDE_DIRS}"    )
+ 
+ find_package (PkgConfig REQUIRED )
+ pkg_check_modules(GLIB2 REQUIRED glib-2.0>=${ddcui_glib_version})
+@@ -215,9 +214,9 @@
+ # add_compile_options(-Og -H V=1)
+ 
+ # redundant: ${Qt5Gui_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}. 
+-#            ${Qt5Help_INCLUDE_DIRS} is a superset of them all 
+ target_include_directories(ddcui SYSTEM PRIVATE 
+-                                 ${Qt5Help_INCLUDE_DIRS}
++                                 ${Qt5Gui_INCLUDE_DIRS}
++                                 ${Qt5Widgets_INCLUDE_DIRS}
+                                  ${GLIB2_INCLUDE_DIRS} 
+                                  ${DDCUTIL_INCLUDE_DIRS})
+