gentoo auto-resync : 09:01:2025 - 06:41:15

11 files changed, 60 insertions, 403 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index aafa0fbe7b7e..2831d74c2560 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ddcui/Manifest b/app-misc/ddcui/Manifest
index cbd659f7fc7a..546401968954 100644
--- a/app-misc/ddcui/Manifest
+++ b/app-misc/ddcui/Manifest
@@ -1,7 +1,6 @@
 AUX ddcui-0.4.2-drop-qthelp-dep.patch 1531 BLAKE2B e675ca6dfed846a77734f9d2ddb2120ac836d5c2b2d82e7d7d3ad29cae8a01955cee897a8bd5f356bafc1a377e013cd3a8c51de2453e05e10c62bd67b14be3ae SHA512 c626b27a06578d2e41077ac5683fcf742018f9af53b6d23fefbe70efa9ba4a16b9a132656a6c56ebcc0145af809d7e2072b818d42508704b49e61419c46ff375
 AUX ddcui-0.5.3-drop-qthelp-dep.patch 2147 BLAKE2B fbebf71b918bfad546f68f265e163891efb0e091cb5f4835f9f316e7ac51f1b47f7abece640d8771d686ee5510d10b0eb673a8c1abfeae78539d57c19c188bf3 SHA512 c98ee08206d89dd933e6a0628cc8a25256e31314022eb6daceb8a9a704face4ae7eb896489db1fa3e5b86cd2705e884111f97a1c3734b916c4d9fbb7af623943
-DIST ddcui-0.4.2.tar.gz 613765 BLAKE2B 2479570d9a79c298d8823c8a658c190e230ec83afc1b1deb9e3659e723c30bd0f2c1d55bc0aa5dcdf975adbab5792afd8ef5d350247eef5710cee4c99f4b56a6 SHA512 7f4339d292e42feb5912570be3b5629d61433a51bfdf0197deb10f8c0bc0e568dbc72f8e117c82dade30f01e3f00b5e805c4458e2bf9e6cc5932e33b7e7e51aa
+AUX ddcui-0.5.4-qt6.patch 1535 BLAKE2B a69df74eb385ac8cde1e903025b58963caaa54e8f5797565ecac3f8a2c5d95ef5ae1023813e09b4e0d8dbf71817af13c21682f7c08b637185d0334d89d2ccd90 SHA512 d08fd17cf2186d070a30c21abc235ea6c3dab4f7b1c34a61af6ccab91be62e8a76c0010288868e8b7fc58c8c15dd3e6d7246a0fcd4e6fa0ebef6f97ad7223ea7
 DIST ddcui-0.5.4.tar.gz 617279 BLAKE2B a8a4fe8ad938efdee4baed1f8d450cc9aa0e8687fbe35bc2f4593a2214413e1b00ad1ee9884f4ef1eaebc3d7173a6aa01b0ace1b0ee99afc7b06f83fffd06da1 SHA512 f6e044f99419e0841663034ee84c1ad038ed64f8287fd48bbe5ba19b1dea3b714e4952cb11e04a04548e7c31e476459554b75748b2c0f844ed7b68fa5bb543e6
-EBUILD ddcui-0.4.2.ebuild 792 BLAKE2B 325db53f5ceb0bb14b257c7d0fced20ac5c4c81c3ea9483b771e508e02a37439455b327b7704f1671f2eccca28df52a4d3b9dbc8cea6ddb08d81248ababb91fb SHA512 c0f77bf4d5b6196a4a6082f94dff9a0ffcd4d390db242ef6a9a979a2db165bcc0aff914df570fc6ec84109d4779bf2a86e4e9e7f6452ec5ec800b31b738ba165
-EBUILD ddcui-0.5.4.ebuild 913 BLAKE2B dad7372cec84c6987171e7ca829320eccd67d038d0f8818c467e7484a78948073c1488981167ced5ed9225c1d1a885cbbdd5e1676e50fbf62f50f6ad05807110 SHA512 58968a1240b612cf925d0e6fe93459448be19a2435f37832c4758c61fb4b48be1783d12124daeafb3ae9aeb7232320973e0705ee9aaff94c773242b564380850
+EBUILD ddcui-0.5.4-r1.ebuild 932 BLAKE2B ec6d54e0b643e2c8b542e2785691a1fff2d6f190cbf1ce7476e99aa5eda32f629481d135e71a00ec141b457689c83a24c83459ea551c5c47afe8bf317bb50f11 SHA512 858950a0600fe7c7112093772d44f1a6767bdb262e7d545420497f8d969f698336f910301f1e822979d66afb5c0f14a1f059f25613803aa226d16a1c3c3ef6ba
 MISC metadata.xml 494 BLAKE2B 1825704bf25cc8aaf1960d8999666681cf522af7f4f46a8fc09e6ca5c375391326b7cd2a3464723aad832c13f7d5489404f93968efcf67baf836b4c90db516eb SHA512 f6fb0255fb556a164f7e33f8630639f3001814b35968477322e21163cf7ff376bbacaedafe2894f2c053e59334ef5d9330be9097cf409c20b0107760ce02583d
diff --git a/app-misc/ddcui/ddcui-0.4.2.ebuild b/app-misc/ddcui/ddcui-0.4.2.ebuild
deleted file mode 100644
index 94f61da45cdd..000000000000
--- a/app-misc/ddcui/ddcui-0.4.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Check for bumps & cleanup with app-misc/ddcutil
-
-inherit cmake xdg
-
-DESCRIPTION="Graphical user interface for ddcutil - control monitor settings"
-HOMEPAGE="https://www.ddcutil.com/ddcui_main/"
-SRC_URI="https://github.com/rockowitz/ddcui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2+"
-SLOT="0"
-
-DEPEND="
-	dev-libs/glib
-	>=app-misc/ddcutil-2.0.0:0/5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.2-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
-	cmake_src_prepare
-}
diff --git a/app-misc/ddcui/ddcui-0.5.4.ebuild b/app-misc/ddcui/ddcui-0.5.4-r1.ebuild
index 9858454df36b..0319174c3ebb 100644
--- a/app-misc/ddcui/ddcui-0.5.4.ebuild
+++ b/app-misc/ddcui/ddcui-0.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,22 +11,21 @@ DESCRIPTION="Graphical user interface for ddcutil - control monitor settings"
 HOMEPAGE="https://www.ddcutil.com/ddcui_main/"
 SRC_URI="https://github.com/rockowitz/ddcui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64"
 LICENSE="GPL-2+"
 SLOT="0"
+KEYWORDS="~amd64"
 
 DEPEND="
 	dev-libs/glib
 	>=app-misc/ddcutil-2.1.3:0/5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
+	>=dev-qt/qtbase-6.1:6[gui,widgets]
 "
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.5.3-drop-qthelp-dep.patch"
+	"${FILESDIR}/${PN}-0.5.4-qt6.patch"
 )
 
 src_prepare() {
@@ -38,7 +37,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		# Not quite there yet, so force off
-		-DUSE_QT6=OFF
+		-DUSE_QT6=ON
 	)
 
 	cmake_src_configure
diff --git a/app-misc/ddcui/files/ddcui-0.5.4-qt6.patch b/app-misc/ddcui/files/ddcui-0.5.4-qt6.patch
new file mode 100644
index 000000000000..efc363a17086
--- /dev/null
+++ b/app-misc/ddcui/files/ddcui-0.5.4-qt6.patch
@@ -0,0 +1,51 @@
+From d1773d3625388f4e56f0debabff3a3b6bd4100cb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= <luis.artur.pereira@gmail.com>
+Date: Tue, 15 Oct 2024 18:22:50 +0100
+Subject: [PATCH] Fixes a FTBFS using Qt6
+
+Also builds with Qt5.
+The use of "universal" headers allows source compatibility between Qt5 and
+Qt6.
+---
+ src/main/mainwindow.cpp  |  2 +-
+ src/main/mainwindow_ui.h | 14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/main/mainwindow.cpp b/src/main/mainwindow.cpp
+index fbf3fc5..4b42ea1 100644
+--- a/src/main/mainwindow.cpp
++++ b/src/main/mainwindow.cpp
+@@ -15,7 +15,7 @@
+ #include <QtGui/QKeyEvent>
+ #include <QtWidgets/QMessageBox>
+ #include <QtWidgets/QWidget>
+-#include <QtWidgets/QShortcut>     // 5.9
++#include <QShortcut>     // 5.9
+ 
+ #include <ddcutil_c_api.h>
+ #include <ddcutil_status_codes.h>
+diff --git a/src/main/mainwindow_ui.h b/src/main/mainwindow_ui.h
+index edd7d88..2665fe4 100644
+--- a/src/main/mainwindow_ui.h
++++ b/src/main/mainwindow_ui.h
+@@ -9,13 +9,13 @@
+ #include <iostream>
+ 
+ #include <QtGui/QFont>
+-#include <QtWidgets/QAction>
+-#include <QtWidgets/QApplication>
+-#include <QtWidgets/QMainWindow>
+-#include <QtWidgets/QMenuBar>
+-#include <QtWidgets/QStackedWidget>
+-#include <QtWidgets/QStatusBar>
+-#include <QtWidgets/QToolBar>
++#include <QAction>
++#include <QApplication>
++#include <QMainWindow>
++#include <QMenuBar>
++#include <QStackedWidget>
++#include <QStatusBar>
++#include <QToolBar>
+ #include <QtGui/QKeyEvent>
+ 
+ #include "base/ddcui_core.h"
diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index 11df35ca3179..10de1cb99816 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -2,16 +2,10 @@ AUX ddcutil-1.2.2-no-werror.patch 858 BLAKE2B 83dbd07d70237f0cf7c823fa1c412c8ce6
 AUX ddcutil-1.3.0-no-werror.patch 1835 BLAKE2B 1edbfb8c00db14f5e33dd229b83e5145b8a659f8ea4c2c2626b79abbdafb8b7872fe55e1dccd7cb6ec5f390c8a91591d61fad08d08b952457e6ad8df54075ae6 SHA512 a8664bafa314c3664c32b3a7c7a22bf7a3a9163dd57888e91726f0d82371b65f873342b0daba598ac02020cef5742bbecd6b2434c2392c46642951f9bba4d2f2
 AUX ddcutil-1.4.1-no-werror.patch 767 BLAKE2B 0769e02893eb5f2c1b6f6713a140696412eb910a4f65e6ef9dc85d4c500c0a892f80a6954e7c41a9b96393aa45cc2fa23997be810d80804592a8a589eacd0c30 SHA512 d63aff2fc41849b53454dfe3a7f3a378febf4454be2647d89feeb3028256c5ff61b5173fce9ac5c94de348e6c2f735464e8647ce0449f376d3e556aa763fcfb8
 AUX ddcutil-2.0.0-fix-build-with-usb-monitor-disabled.patch 721 BLAKE2B c5514b7bc6406017a1dbdc831743da975881102ee7290eb04a6b52a83ae291e2330efd5b3c71623b014263cf1682cfb8a175d5e691538e153bf6dead88d5800e SHA512 013fe7ff51992a1e69f05184f97d4026f4d10b42b45934925754199029bf3e16f8403f61a4b7caaa6306eed3083e735ef355d794b5b066400a3d146f455ad43b
-DIST ddcutil-1.2.2.tar.gz 803943 BLAKE2B 65cc5dc0d1ee85d1e2b6670f7c24508ab817c6eebdb596b5f6f70c7ff7b9257f12f70abfea2d735e23755e508d4829d4be6574ac16564d4d828e0b1153cf8afe SHA512 0329711e536cbcaee2efe6cf981a17181ab318846e9c6a82f2ceacc42691ba49c06df44a52d1f079568e9ccec588cc85d4de4adf19b6db83bebe4bb90ae29207
 DIST ddcutil-1.3.0.tar.gz 816789 BLAKE2B 1cb3b64961503416b85b792e1002ec67788f8cf7d622be1c4930808f99e16974ff57ed582d1d02a67580e3f4d92bef54b3669fd7378462bf4c98a3643d6786be SHA512 93d69958b2e1dcb66ad700712742536179383c93f2ec1f746b6a6c78adfd6daa861275208850cc807e0c16a11ea84904cb13ceef512ca76e1daa910410303d41
-DIST ddcutil-1.4.1.tar.gz 816782 BLAKE2B ebc8b8893fda9a1e5b278b198594619f7c26a309e15aab90d5f8c61da352c54173076c86ce4e9d9bdcad8857e8ee45500de0c28d5de073038c841caf12080e5f SHA512 e53820662c12cd3a91b1182e02ad74841238117c129e88c8bcdede42d4e0dec22a9c1ec37a7b1e1dd512f2cf7ef410e737d9fdba62d95ea48e5912e43e6d3857
 DIST ddcutil-1.4.5.tar.gz 817492 BLAKE2B b6442d9f7ec3687a3e75d9784dc9f62563f42c72c82a8a2ea24a392c3c4f186578c2c2f6592ba12c324568a20b7b25082acce9e7b753c41c1ac925d9d6de62dd SHA512 c355f104b60dbc3c893dea473d841181cfcaacd0cb2e97bc41ea829185c7ccdcff19ab19189ee572e7f2f6b41cbb2bd6c569ad3c09f6d645f9e342b7d1a5310f
-DIST ddcutil-2.0.0.tar.gz 882984 BLAKE2B 19f92ab7fb02130c84e029a8055fe85ea99b9bd2959ad3c86b698afba9a45844817c0828fd2ad3178b954493a12dc62e95815e2700a42d37c340f098ad9d3f16 SHA512 e1880cf0e3e724f6ac88f807a867a34f451422b58ce7d23bee7b2fc40b253ef8de13df7706749e0c8242fe5de6db8da91784d16fbf008bb5161732a598c3b9e7
 DIST ddcutil-2.1.4.tar.gz 924298 BLAKE2B d11c4daa6a6b4c5c694cf45fa3a76709bcacc8a63bbe7ea331bcf2dd45a7e99dcdf890d97a9515dda909e6a54ca90c30d966e0dd5437fdd0972232878c4de581 SHA512 8c352bfacc2a5cdd22b8d84f2facd58de6d425d0d3f98de543cf36a3e6b15aa10fc86e87780c82f872f0bf0db984e1cc800aaff914bafe4dbf17602e2a7caeb0
-EBUILD ddcutil-1.2.2.ebuild 2858 BLAKE2B bcc3c7806612b87f84e83a42dccec89b554af1b7e31a1e6d3721256480b8f39321a902cbc53cf4ff27f66bea280ba3fce2a799b9f30cbcda9e64dfce72b93e84 SHA512 f7b028f86f18c3290c9e066ab9404e2a071aed1506661d03128da052cc25771151d8245ca79dc4832b486cb8c4e4800feebe14d889fae33f17a45f47a520e597
 EBUILD ddcutil-1.3.0.ebuild 2933 BLAKE2B 3a32592eb97a2df63a18c82e473d4ba13ab556307960a0b727fc753ba6979a23098b36c8ed36721a6798612d6a5ecc83bff17b62900737f828fafb88321639ab SHA512 f4b220503b91620611bfbb0b90fde47906eab3471ac704f47c090567f0090269a6e823970c30722652cec69971fc13d4ee87edbc10a41f5a85d8675809e6485a
-EBUILD ddcutil-1.4.1.ebuild 2938 BLAKE2B 0b104b941b0fde07f1539dab57b3201917f11c2c564c7e911bfa5e14d73a8a291d4b7822beb4e79e0bade89aff1da4d534bb5b2c722831c29f942fd7cb093577 SHA512 c10403a5a83747c9058a1851dd1abe22abb8015ab04e761d87f92e7ea537051c9b6928afe2c771fc529a685b5047e2551e1697afe650177f4854a1ad4c5435d3
 EBUILD ddcutil-1.4.5.ebuild 2945 BLAKE2B 014ff0e0a740916303ce6af069f2066ff7fbea4c5d714cc13e45b288ef784484a9e7f2a94da04bef5c2f5e9bb57595b935a62d3dbb7e4c9db7535169b5ed7419 SHA512 b60685531a199a33891a8073197b813d4d56bb9e8a9888ed19e00b4b3635525ba4305899c7d50c87061a567808dcc96d6920e5480050f46e491bc92bf0476492
-EBUILD ddcutil-2.0.0-r2.ebuild 3049 BLAKE2B 6c23467ee06a7dcfb89e4d9ee0a1a7ae1fffe2fcdf86e972fdf5005708234b320ef03e50a6ecb160df85b7a42026fe9cb2e3afe144949022c798956f1b01213e SHA512 354af8e35c242a39c6497b89a36c897a6e826bd7d330ac6f062509467f402899b7c56fdaa0fee90ccd83019c11b5d9336b4a0bdaaa01007d63df7d5d63743549
 EBUILD ddcutil-2.1.4.ebuild 2982 BLAKE2B 9e15a22f121e245df6df476343659e285db428c8d1bf21356cdf41516f785feefacb89ec11de0af25a1746ad0f9261a2d7cf517ab428b99e42f7679e8d655502 SHA512 f0031252183128fb3951c0a88b1f89f4a6b575a720fec69aea68a1ef95f803e835fd13f8f70a3520f544581dcdc72eaa7d6029264fefdb7b1dddc95b724e5664
 MISC metadata.xml 1293 BLAKE2B c7fc827c0bcf7914b2c0b3f9ecec9dee145824c33a516ef3d9cd43fcd368977d9f17a76b6b8775fa773f8ce8b109d16b1e5c8b14dee5d0e9e56aa7a4024a190d SHA512 a795c9fb1479ae198446160e9a020ce911b02ffd0d51af9cd634504aca1ded4c38d3295eca0cbc6ad33506684f55cf96676c868ec349229d0dfdaa17f8afa806
diff --git a/app-misc/ddcutil/ddcutil-1.2.2.ebuild b/app-misc/ddcutil/ddcutil-1.2.2.ebuild
deleted file mode 100644
index 2286e15815e9..000000000000
--- a/app-misc/ddcutil/ddcutil-1.2.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Check for bumps & cleanup with app-misc/ddcui
-
-inherit autotools linux-info udev
-
-DESCRIPTION="Program for querying and changing monitor settings"
-HOMEPAGE="https://www.ddcutil.com/"
-SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="drm introspection usb-monitor user-permissions video_cards_nvidia X"
-REQUIRED_USE="drm? ( X )"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-apps/i2c-tools
-	virtual/udev
-	drm? ( x11-libs/libdrm )
-	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
-	usb-monitor? (
-		dev-libs/hidapi
-		virtual/libusb:1
-		sys-apps/usbutils
-	)
-	user-permissions? (
-		acct-group/i2c
-		usb-monitor? ( acct-group/video )
-	)
-	X? (
-		x11-libs/libXrandr
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.2-no-werror.patch
-)
-
-pkg_pretend() {
-	# This program needs /dev/ic2-* devices to communicate with the monitor.
-	CONFIG_CHECK="~I2C_CHARDEV"
-	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
-	if use usb-monitor; then
-		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
-		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
-		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
-	fi
-
-	# Now do the actual checks setup above
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable drm)
-		$(use_enable usb-monitor usb)
-		$(use_enable X x11)
-		--enable-lib
-		$(use_enable introspection)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if use user-permissions; then
-		udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
-		if use usb-monitor; then
-			udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use user-permissions; then
-		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
-		einfo "users to the i2c group: usermod -aG i2c user"
-		einfo "Restart the computer or reload the i2c-dev module to activate"
-		einfo "the new udev rule."
-		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
-
-		if use usb-monitor; then
-			einfo "To allow non-root users access to USB monitors, add those users"
-			einfo "to the video group: usermod -aG video user"
-			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
-			einfo "the monitor to activate the new udev rule."
-			einfo "For more information read: http://www.ddcutil.com/usb/"
-		fi
-
-		udev_reload
-	fi
-
-	if use video_cards_nvidia; then
-		ewarn "Please read the following webpage on proper usage with the nVidia "
-		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
-	fi
-}
diff --git a/app-misc/ddcutil/ddcutil-1.4.1.ebuild b/app-misc/ddcutil/ddcutil-1.4.1.ebuild
deleted file mode 100644
index abfe0f0ce127..000000000000
--- a/app-misc/ddcutil/ddcutil-1.4.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Check for bumps & cleanup with app-misc/ddcui
-
-inherit autotools linux-info udev
-
-DESCRIPTION="Program for querying and changing monitor settings"
-HOMEPAGE="https://www.ddcutil.com/"
-SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
-REQUIRED_USE="drm? ( X )"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-apps/i2c-tools
-	virtual/udev
-	drm? ( x11-libs/libdrm )
-	usb-monitor? (
-		dev-libs/hidapi
-		virtual/libusb:1
-		sys-apps/usbutils
-	)
-	user-permissions? (
-		acct-group/i2c
-		usb-monitor? ( acct-group/video )
-	)
-	X? (
-		x11-libs/libXrandr
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-# doc? ( app-text/doxygen[dot] )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-werror.patch
-)
-
-pkg_pretend() {
-	# This program needs /dev/ic2-* devices to communicate with the monitor.
-	CONFIG_CHECK="~I2C_CHARDEV"
-	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
-	if use usb-monitor; then
-		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
-		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
-		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
-	fi
-
-	# Now do the actual checks setup above
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		# FAILS: doxyfile: No such file or directory
-		# $(use_enable doc doxygen)
-		$(use_enable drm)
-		--enable-udev
-		$(use_enable usb-monitor usb)
-		--enable-lib
-		$(use_enable X x11)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if use user-permissions; then
-		udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
-		if use usb-monitor; then
-			udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use user-permissions; then
-		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
-		einfo "users to the i2c group: usermod -aG i2c user"
-		einfo "Restart the computer or reload the i2c-dev module to activate"
-		einfo "the new udev rule."
-		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
-
-		if use usb-monitor; then
-			einfo "To allow non-root users access to USB monitors, add those users"
-			einfo "to the video group: usermod -aG video user"
-			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
-			einfo "the monitor to activate the new udev rule."
-			einfo "For more information read: http://www.ddcutil.com/usb/"
-		fi
-
-		udev_reload
-	fi
-
-	if use video_cards_nvidia; then
-		ewarn "Please read the following webpage on proper usage with the nVidia "
-		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
-	fi
-}
-
-pkg_postrm() {
-	if use user-permissions; then
-		udev_reload
-	fi
-}
diff --git a/app-misc/ddcutil/ddcutil-2.0.0-r2.ebuild b/app-misc/ddcutil/ddcutil-2.0.0-r2.ebuild
deleted file mode 100644
index bb578a0e25c5..000000000000
--- a/app-misc/ddcutil/ddcutil-2.0.0-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Check for bumps & cleanup with app-misc/ddcui
-
-inherit autotools linux-info udev
-
-DESCRIPTION="Program for querying and changing monitor settings"
-HOMEPAGE="https://www.ddcutil.com/"
-SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/5"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
-REQUIRED_USE="drm? ( X )"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=dev-libs/jansson-2
-	sys-apps/i2c-tools
-	virtual/udev
-	drm? ( x11-libs/libdrm )
-	usb-monitor? (
-		dev-libs/hidapi
-		virtual/libusb:1
-		sys-apps/usbutils
-	)
-	user-permissions? (
-		acct-group/i2c
-		usb-monitor? ( acct-group/video )
-	)
-	X? (
-		x11-libs/libXrandr
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-# doc? ( app-text/doxygen[dot] )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.1-no-werror.patch
-	"${FILESDIR}"/${PN}-2.0.0-fix-build-with-usb-monitor-disabled.patch
-)
-
-pkg_pretend() {
-	# This program needs /dev/ic2-* devices to communicate with the monitor.
-	CONFIG_CHECK="~I2C_CHARDEV"
-	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
-	if use usb-monitor; then
-		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
-		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
-		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
-	fi
-
-	# Now do the actual checks setup above
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		# FAILS: doxyfile: No such file or directory
-		# $(use_enable doc doxygen)
-		$(use_enable drm)
-		--enable-udev
-		$(use_enable usb-monitor usb)
-		--enable-lib
-		$(use_enable X x11)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if use user-permissions; then
-		udev_dorules data/usr/lib/udev/rules.d/60-ddcutil-i2c.rules
-		if use usb-monitor; then
-			udev_dorules data/usr/lib/udev/rules.d/60-ddcutil-usb.rules
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use user-permissions; then
-		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
-		einfo "users to the i2c group: usermod -aG i2c user"
-		einfo "Restart the computer or reload the i2c-dev module to activate"
-		einfo "the new udev rule."
-		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
-
-		if use usb-monitor; then
-			einfo "To allow non-root users access to USB monitors, add those users"
-			einfo "to the video group: usermod -aG video user"
-			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
-			einfo "the monitor to activate the new udev rule."
-			einfo "For more information read: http://www.ddcutil.com/usb/"
-		fi
-
-		udev_reload
-	fi
-
-	if use video_cards_nvidia; then
-		ewarn "Please read the following webpage on proper usage with the nVidia "
-		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
-	fi
-}
-
-pkg_postrm() {
-	if use user-permissions; then
-		udev_reload
-	fi
-}
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index e710a5a2eed0..ff691d370b24 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -3,7 +3,7 @@ DIST solaar-1.1.14.tar.gz 1790657 BLAKE2B bc2d2d42e4af02f72ecf9fb25152605582ada7
 DIST solaar-1.1.8.tar.gz 1550947 BLAKE2B a33879e3c1b161d86c4c8a2c8edcc79eff285cb8937bf1e6621f3595ba5cf420e75fe700902b9f375698085bb929401154fa2bd25ae9663265e38c8406205bf6 SHA512 543c6257b36181813c9ed36747e53a15403da251fdd431c32525cada3ac88611da2c5f2a8212767ba3c7bb0071a3c2024f114805d9a33c761701bf958df29d85
 DIST solaar-1.1.9.tar.gz 1564119 BLAKE2B 67161bdd2a59ff17cafcdc5399f9f0c072985df85b2d0408e54c8f4e4966c3602a2b62f93b90e56e80fb3c4cbd285de2bbcc87a7709bea06ee4394f42a16f52e SHA512 42ea592aa8c4020be5e2ffd096de0bf6a7e6fdfac7eb2acd069c80084f88979398f779db6507b8b2cc4fd44c8a2ffce89024a42c161f130b4e1bd2c53e4e73a9
 EBUILD solaar-1.1.13.ebuild 1964 BLAKE2B abbfacb6e1e5dad42949a42d70d7c771678718c63a9666eed0886de4707f8d3170e42fbad042df9f7fcca19da8905166d4e26bde5b797d32d2b32ec38d888ae2 SHA512 2716aa4db3c0404dcc6654e909ee680f973adb4f150a4e1f8a04f9870a29124d400a575b6d6cb3b81ad0a293dbb42b2e74725871138455017b225335f135c28e
-EBUILD solaar-1.1.14.ebuild 2769 BLAKE2B d824df4b3fe4059380d81739e7ff230e6bf0d8ab8c255b5e722f8cc0c15c192c381be43023ef97b02ec63860db7b397c9434ea9bf8a50a3a8f06f183faa7befb SHA512 3bf863f67971b2211ca1f4784807ba2957894ed5dd6e83e184a8de1a0b7ff006cbd602f7f308247c69f41fa1d21bdb4eaf6a72af85917e1d5051bfac6209716e
+EBUILD solaar-1.1.14-r1.ebuild 2817 BLAKE2B 4f036b387227da9ed41bb20eee13a7b38fc93d6745077f2dcb338cfaea8c32cd56eebc58779429537d1c8cc7ee8f38e5b7d494b42f721c8d2163ddf06ec0c6ea SHA512 16f42196684cf5473912bb8c9cdf5ff7b84dd617ce49ad523ad85f700ec6857603b6e8aef7706cf40760893e93d8457da01bf4e7420d76b8b2469573d124442e
 EBUILD solaar-1.1.8-r1.ebuild 1957 BLAKE2B a18583976d1ffc399f3a2f50d153c5aab82c534561c660a66b35d02af74fe000edc6246abdf0439e9152fceb0529d3aae3d298fb965494652eea202ad8509828 SHA512 a411509d13aa3abfdc5c304bd846ed7528a3f8d66e48e4e8621c081984eedf61bcf365b6008c5e1db464e5ab80230c07ed18dcb2c846de182665f0517cc9f536
 EBUILD solaar-1.1.9.ebuild 1964 BLAKE2B 5c2d2a350100bf50cb96451021f22fd9cef19b452080cb1a6419bed17d1c91f6507d79f41dbb4568b1e70a67c81a4927dc36dbc90492b5b0097b34c46a18a894 SHA512 acc20a18f70e918233e9a0df3aee968c05baeef19d7607e4884195c1b875e85239d16863456d9058694e43dd74c5b7d38ece1023bf62d0ba45179d415271975b
 EBUILD solaar-9999.ebuild 1966 BLAKE2B 192e192ce685cf5906b007c41246a39963ac9f31ba2f1cfa814070d94cf1666542b484fa3e94437890f8d475a7543c293827a7d245cd0d770129ddc04ff97d50 SHA512 35e0ae411da757ae125e27aece35f03ef7ab149c35d7bbb1e3fc78f82832e69f44a298a3adcc1c797cc4c42eed4fcc2fc705631ff93ba1fb94a7425d105f5a00
diff --git a/app-misc/solaar/solaar-1.1.14.ebuild b/app-misc/solaar/solaar-1.1.14-r1.ebuild
index a9edbf132724..36377ed0edd4 100644
--- a/app-misc/solaar/solaar-1.1.14.ebuild
+++ b/app-misc/solaar/solaar-1.1.14-r1.ebuild
@@ -32,6 +32,7 @@ RDEPEND="
 	dev-python/python-xlib[${PYTHON_USEDEP}]
 	>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3[introspection]
 	appindicator? ( dev-libs/libayatana-appindicator )
 	libnotify? ( x11-libs/libnotify[introspection] )