gentoo auto-resync : 24:01:2023 - 18:57:53

16 files changed, 264 insertions, 81 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 2e3da08bed42..2ed5b4b0fa66 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/autorandr/Manifest b/x11-misc/autorandr/Manifest
index ab58b7b271af..efe97d79662e 100644
--- a/x11-misc/autorandr/Manifest
+++ b/x11-misc/autorandr/Manifest
@@ -1,7 +1,7 @@
 AUX autorandr-Makefile-fix-install_udev-target-by-s-TARGETS-MAKECM.patch 1682 BLAKE2B 6c168ffc8e0b217999e4780a9776c6ca7d1fd16868a00ec8301ab8b94412033a38cec28929bb21d7a39fe18544244a947891715a32fe1e80d927b3550dec8513 SHA512 8d3b1164e962bd6b6d741e22f1328b98037b6f2ea878ffe26da07f22947476ca35c5fa066462b913fda7319b8671055c3f28354261daf6e5c3301d7a85f5dc88
 DIST autorandr-1.12.1.tar.gz 45550 BLAKE2B 5b434325d13c00c3fa70b5d09edb540cdcf3bb921307c60f2c616231e7a87ea85f60e39500ed8116f28619139f71ecc4a8fa153ffadc6b8d74df570736a0d815 SHA512 a7e095eb96e7e0d3a5b3b2122d68a3d3a5121d8be7a86ddd9f837ad42b7a53ed5ee45151f23861c5b900e214a4dfc0c575f45fe70c8c5587562a4035458137a0
-DIST autorandr-1.13.1.tar.gz 47380 BLAKE2B f3173d795294eaa89d4f8c98d8bf6dc6a9c09d57649c228d17759e76d9c15d66b32803a63a07f44090b8d4580af8ae9dd42a3c8ff76d91f47d82f58896aebea6 SHA512 b090de5b4c7ff3d886d6aabac695a694983704678eedb31b4cbfdc88e6569e1f1c4e32ed5d16e59d0c98702c93c8600e7625d4d88dd6c988c7db131364cfb6f7
+DIST autorandr-1.13.2.tar.gz 47607 BLAKE2B 8e4fe1b8ece98abb5ee88218db512e18822cf96e0587b3b117f0bcb07130b1c8bc473c987cf110d1ab0f2a8ea2fed64833610c951cee5ed5b899d180b3a80704 SHA512 79c344317be2f881a19a4dbd798441da49c6dbeeba555ad6c4d6fe1e4cba97587f2016910f850472b78341e1b6b16467f0ad33b496f68300054442e5c1675e4a
 EBUILD autorandr-1.12.1-r2.ebuild 1571 BLAKE2B cc9ee1819681f13aa237e4ffac593834822f795cb9d5c41b94edd39262ed345cb5772efbc35f177afe9a5ef1379b5cdd6bffdc52fd97b210f75db5c5ef32dd38 SHA512 ae624c9ed4df52dfdb9061c147f6339ff9c4c50234650315feee79765973273bd6c34b0de7db843c6deb1b9ff36d690ecefd854e512d82e553da40b49c394cbc
-EBUILD autorandr-1.13.1.ebuild 1421 BLAKE2B d4b6c1e08c1f17aa039473c27e7c88f63507824f4c0e255a6bc823cfa0e789c56ec3f615ec35c3eb2a35bed6b0c12c6b843906a5f6164f05cf763123b83b9554 SHA512 738285e95ba6437a76cbbd8685edd3ad83e5c174040bff154bd0fb4248ed24aac5a84caa0832215fc7bc7e250f2ba2d2e437a506495d48c505ef9e858637bc15
-EBUILD autorandr-9999.ebuild 1421 BLAKE2B d4b6c1e08c1f17aa039473c27e7c88f63507824f4c0e255a6bc823cfa0e789c56ec3f615ec35c3eb2a35bed6b0c12c6b843906a5f6164f05cf763123b83b9554 SHA512 738285e95ba6437a76cbbd8685edd3ad83e5c174040bff154bd0fb4248ed24aac5a84caa0832215fc7bc7e250f2ba2d2e437a506495d48c505ef9e858637bc15
+EBUILD autorandr-1.13.2.ebuild 1509 BLAKE2B 38fdd65595ae46310629c7f40bf3a56820999f8838194e41871377bc49663f1bc497c034c26c70d44fe8642bdc2a8a9d8448a6a88a39f3a9cf4d0c4d1c2b0612 SHA512 331b770efe9b3945c8bf964d7c7a91c5d734b58209db6b757baf3253863204eb20c262d927b9cfda504fa1a6a843750c66b081a0e7c1752b6dfdcec12f47d50c
+EBUILD autorandr-9999.ebuild 1509 BLAKE2B 38fdd65595ae46310629c7f40bf3a56820999f8838194e41871377bc49663f1bc497c034c26c70d44fe8642bdc2a8a9d8448a6a88a39f3a9cf4d0c4d1c2b0612 SHA512 331b770efe9b3945c8bf964d7c7a91c5d734b58209db6b757baf3253863204eb20c262d927b9cfda504fa1a6a843750c66b081a0e7c1752b6dfdcec12f47d50c
 MISC metadata.xml 450 BLAKE2B bb36360893882faa3306ce69953a4c699e613dd5608bd379c3a179cd68d79ce42171c01611fb08269b9521eca61c67825ea1d52711a0ac67fa99f919350b54bd SHA512 d676779669537dff4c0964d48996b3cdcbc1b6d7f3f00412b48614f42b86b6acdea05b646d3d9d048db6b19e0733bbc1281ed8dbea7d4ea36f19f14c5a055d29
diff --git a/x11-misc/autorandr/autorandr-1.13.1.ebuild b/x11-misc/autorandr/autorandr-1.13.2.ebuild
index c4b2f818767a..5a4cdc0e7c9f 100644
--- a/x11-misc/autorandr/autorandr-1.13.1.ebuild
+++ b/x11-misc/autorandr/autorandr-1.13.2.ebuild
@@ -29,7 +29,11 @@ RDEPEND="
 	udev? ( virtual/udev )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+# desktop-file-util: uses desktop-file-edit in Makefile
+BDEPEND="
+	dev-util/desktop-file-utils
+	virtual/pkgconfig
+"
 
 src_compile() {
 	distutils-r1_src_compile
diff --git a/x11-misc/autorandr/autorandr-9999.ebuild b/x11-misc/autorandr/autorandr-9999.ebuild
index c4b2f818767a..5a4cdc0e7c9f 100644
--- a/x11-misc/autorandr/autorandr-9999.ebuild
+++ b/x11-misc/autorandr/autorandr-9999.ebuild
@@ -29,7 +29,11 @@ RDEPEND="
 	udev? ( virtual/udev )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+# desktop-file-util: uses desktop-file-edit in Makefile
+BDEPEND="
+	dev-util/desktop-file-utils
+	virtual/pkgconfig
+"
 
 src_compile() {
 	distutils-r1_src_compile
diff --git a/x11-misc/gammastep/Manifest b/x11-misc/gammastep/Manifest
index c05cb68eba9d..c9d7e67ec2a4 100644
--- a/x11-misc/gammastep/Manifest
+++ b/x11-misc/gammastep/Manifest
@@ -1,3 +1,4 @@
 DIST gammastep-v2.0.9.tar.bz2 540120 BLAKE2B cfc29b157ad2dbd3d6bb0ac4bdb26c958ba07cad3e817931c2ee4c2e4d15c157b7c0b8b891869ddcc2cdfc39c1d52afb8437991ae60501afee84500e1f28c694 SHA512 d8b23e5890d6135cef79057408e1b7c1dbc36444dfbfaf7c80a3f36c46df19eaded1829c2cd52365413779cc752d0911a44669b5abce16d7e266b92b15c035fb
+EBUILD gammastep-2.0.9-r1.ebuild 1942 BLAKE2B 45af25c0aedcc5e2e0924e058302e05d6dba29115675f747ffe7581e674b81b468e0bf124782faa9852a8a6111ce7b6f4289bf69c05ba57ccb00ba17e50c0c1f SHA512 4d7077c761ebb27b8047bc50a20dadae056c9183892f15f3ecc72b93cbb40ec3e197dc8e22b5e436cb34062680f0a3eb8b4802324a9f7f2cbcc71f5d0abb024c
 EBUILD gammastep-2.0.9.ebuild 1951 BLAKE2B dc03e43cbca16e98165aa5d8110d34c7a495b4564eecc668578bac3cecb1ff0828b1e0d496d85fbe2cf29b72f8e2b886f584c68f76a141d457139fbe10da3636 SHA512 b049f991c2d3227ab84cadeb0f97daeff47d769dad35ddd9662681cb6524a08261e40d96ea11c040b3a4a372d76d7b553450abfdffa2941f9ee2f59b3aa38cfc
 MISC metadata.xml 408 BLAKE2B 76e880ceff79cafe0ee71c2b2bab4c2977a43eb15bc2ffb26cf1431b6c9303bd3b95801e501d01134e546e20c0c83239864eb32e4b8bcea0c7eb8191bc191d8b SHA512 dfd49b49ec66241adb4e53941455d4e1df8af068f894748973fcafab0f8e87238fa3d358b222366efb897558dd7f05e67274a11799169470b5ea3d2663b10137
diff --git a/x11-misc/gammastep/gammastep-2.0.9-r1.ebuild b/x11-misc/gammastep/gammastep-2.0.9-r1.ebuild
new file mode 100644
index 000000000000..6024a5b52019
--- /dev/null
+++ b/x11-misc/gammastep/gammastep-2.0.9-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools systemd xdg-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="https://gitlab.com/chinstrap/gammastep"
+SRC_URI="https://gitlab.com/chinstrap/gammastep/-/archive/v${PV}/gammastep-v${PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="appindicator geoclue gtk nls wayland"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	x11-libs/libdrm
+	appindicator? ( dev-libs/libayatana-appindicator )
+	geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
+	gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+		dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	nls? ( sys-devel/gettext )
+"
+REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}"/${PN}-v${PV}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use gtk && python_setup
+
+	econf \
+		$(use_enable nls) \
+		--enable-drm \
+		$(use_enable wayland) \
+		--enable-randr \
+		--enable-vidmode \
+		$(use_enable geoclue geoclue2) \
+		$(use_enable gtk gui) \
+		--enable-apparmor \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+}
+
+_impl_specific_src_install() {
+	emake DESTDIR="${D}" \
+		PYTHON="${PYTHON}" \
+		pythondir="$(python_get_sitedir)" \
+		-C src/gammastep_indicator install
+}
+
+src_install() {
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
+
+	if use gtk; then
+		python_foreach_impl _impl_specific_src_install
+		python_replicate_script "${D}"/usr/bin/gammastep-indicator
+
+		python_foreach_impl python_optimize
+	fi
+
+	insinto /etc/gammastep/
+	newins gammastep.conf.sample config.ini.example
+}
+
+pkg_postinst() {
+	use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && xdg_icon_cache_update
+}
diff --git a/x11-misc/i3blocks-contrib/Manifest b/x11-misc/i3blocks-contrib/Manifest
index 105337b25c0e..429237380475 100644
--- a/x11-misc/i3blocks-contrib/Manifest
+++ b/x11-misc/i3blocks-contrib/Manifest
@@ -1,4 +1,4 @@
 AUX i3blocks-contrib-2.0.0-respect-CFLAGS.patch 1391 BLAKE2B 4d2f1d6a567074dce73aa4d5ecec38cc6cba130e94efbb3074c53ea5253f167bcb01e8b37f8d35f6802961a7e610ffa606e31d91fc9f4936ee55425b0b128719 SHA512 ab137c15781f6874cbbb731810ed8fdeb022374048670571e46048e823814e5961e9c8f8b749197478494073bf97d660d03b93edcde500da662ef90513382c23
 DIST i3blocks-contrib-2.0.0.tar.gz 840332 BLAKE2B e220566edea4249c25ac80dcba3e24fc37de842049ad072a14fd5003e298ec9a4b4f36cd3937682ab00355b1f1c3fc7ea795ac6593f24aed2438b465ad338d8f SHA512 30cf9297e710a2d685b275d424de817e7940a487c615e64ffaf15e0f90e937bedbd3921dfeece081e32f720b6add92c0790fa7a29e4e8f81f85c3a74cbcea835
-EBUILD i3blocks-contrib-2.0.0.ebuild 1920 BLAKE2B da6ea6a3475355e05694d10e0b442b01f40f99c4e6c9018aa597d95187a091ed1bc1d0295d6844ea7a206fcd6d9b1410734c3df7665843ec2d29fb956a06214a SHA512 13e66f0fddb02e20401d10f5190e394d29096c815435e68115b249c3ddf3bc6e2abab15441db8310af60eab7d43fa7e87649accec06ff94b65b23df26106de5e
+EBUILD i3blocks-contrib-2.0.0.ebuild 1926 BLAKE2B a0435403b8c9e3d20eff22041bf21f89d65d7567610951836b4e6bffec89dadbc7c61de94adc014a67d6855e277fcac648bb3f21b0ae6e48aa0d1e56c3a9e2fa SHA512 e498d3e46008e0bba682b4c481f43e0394824552cdd62c063d8a8335f661f2025a8176edeb0b7783a24b4882d840629d6c2c48ef003042a421f58cc1e439dbed
 MISC metadata.xml 333 BLAKE2B e61c03570a64645a4a0e96357b75c4bc0c19abc377726c4b413ea8a75fff7f6707b3bd6f126cf2c2d9ec4c90dd45e386116f0243ff6e574a059102c6ad5b5e2c SHA512 273f7dbcf62381ff71890a76478e0ca056a5114b2fd31cbd7203ab8bc30655495f6b5b85c2621b04d2a5681b612dbbffb98388e5f7523d88cc388475e56aa59a
diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
index b588938c6635..104cad3b9417 100644
--- a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
+++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -53,5 +53,5 @@ pkg_postinst() {
 	optfeature "rofi-calendar" x11-misc/rofi
 	optfeature "ssid and wlan-dbm" net-wireless/iw
 	optfeature "temperature" sys-apps/lm-sensors
-	optfeature "ytdl-mpv" "media-fonts/fontawesome media-video/mpv x11-misc/xclip net-misc/youtube-dl"
+	optfeature "ytdl-mpv" "media-fonts/fontawesome media-video/mpv[lua] x11-misc/xclip net-misc/yt-dlp"
 }
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index b60d80033a45..473a163eecb0 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1,6 +1,8 @@
 AUX redshift-1.12-apparmor.patch 1195 BLAKE2B 1601e4c8ba980e6f54497e28b8e7d33d6c592487a5bf951821b8236e035cd4840315398c77d1c6873060b123f49d8bb1ff42b5a5b026091332f28961d4c5b076 SHA512 12e3deee53ee2804527f95b888a09c324959b1f11ccc76bf52a04b36626e6fea508ccda3ab16add636a30245b90f1de5c4df1c0524a7ca6350bfa0bdb61264e0
+AUX redshift-1.12-libayatana-appindicator.patch 1125 BLAKE2B 94eac1a5b7567788d1ba70e25b3104dbd0db309a16da1b071d7b0affca6244d1957f7201ee18d085d93c25592d7dce35e876c54807ef86c87e307b6729dc242d SHA512 5ba8bea77c28fa2c96cb6933fbb83e57b363f71e6269dc31b1a86c375e84b082a931aa95b132a906772a7112e97f96f8aac39d37f1a034a1a3a57e36178eb9ef
 DIST redshift-1.12.tar.gz 659019 BLAKE2B 09339a57fee192e3428ba4387cbea498f2f9f97eb75a418588cdda3289cfa7b7fada4cb299e983e9e6d2ffe3822c8235082e67bdfa542716b6dee9fc853a8dc1 SHA512 6763f6964b577fc146191af1c67a283a60df5bbdd3a74bfc94f66d5f9f3bef8835a479c6ec8a648b650b83a0e245928884a0f628606ace8c3f58d8319d35036f
 DIST redshift-1.12.tar.xz 486072 BLAKE2B b7ce74ae134a8f6954ff978e99670f24c447b23ab5e8d69a62109806bfe38c5e1b41e5f65cd6b182298aaf3e0b9187a2c70ea3148fd4ccba8b9c17697024944d SHA512 225e222e5f2c55be4571094ccaf02a92e162dfc35fd0fe504084e21e358b888a72f9992f9f9edaf1d496eb673af74a0d825ae5cf6ef7f0f1ab51d32419722c32
+EBUILD redshift-1.12-r10.ebuild 2132 BLAKE2B a9e57a39dbf37c8b4c5de6893ef710e2ee6a56ac945e089a22f822054ecea5fa6b06c9130067d9316a23248eee547675b1bd1b8b31f85948bc0243797b89e3b1 SHA512 b0d0c3a4480ccc3c661f371beeaf33598bd0cafc2fc237e229de1ec8b61a85d33f0ccb710d1fe9e9d24ae1cef20d5752007dd389f619d48d0ba8cf14ffd2c2c6
 EBUILD redshift-1.12-r6.ebuild 2068 BLAKE2B fd344ecb14d93d2c4117417eef887227cb0f0baa9d9b3bc04e9e90b9d5b462d4637c98e068f6452fe49530e517c801ecd4bd149a8e093b94f2cd8ebf7a8843e8 SHA512 6710a6668b4893267e4496c65332b2b5e7d158758e560b1759f1626f72cd01db322eaa91d14b0bf59fa9cd90d324165fef1599644e9ba5baea27983809f65026
 EBUILD redshift-1.12-r7.ebuild 2014 BLAKE2B 1b0208e6405bc335029d8b1fc0e74e3dfae248d6f175e2db519864db08e3b4a7a0b78467bd27ad34563d1646b86ce0738fd05b8eb1b00cb1c068defa779a11a7 SHA512 349c4a80a3ec45c858a7bf6499be8d0d9ee256565a1c1119b790df6b8ba1b1c2f4bc2240d6fbd1d86ddd6ff4abb36c1cc2604b1c6999c53b4fe50c86c1458c86
 EBUILD redshift-1.12-r8.ebuild 2043 BLAKE2B d84d6385e818f7b331bd4e44a69f6fb5bb51451f4a42a3e364aa9f262e65b2d312a94c7d4995217f0b06558984762fe417349be6bada800de3474c097c66b9cc SHA512 b7c89e73a803dd607905c56bf11132f4e1fab52d92a12ab40f5b29b5d114ebfbd9ff35bed192209e9edd823cb05a2cd12426e0de1a03942c1f4a3bc67fce4025
diff --git a/x11-misc/redshift/files/redshift-1.12-libayatana-appindicator.patch b/x11-misc/redshift/files/redshift-1.12-libayatana-appindicator.patch
new file mode 100644
index 000000000000..e2ff7a7c100d
--- /dev/null
+++ b/x11-misc/redshift/files/redshift-1.12-libayatana-appindicator.patch
@@ -0,0 +1,33 @@
+From f2df94b6ad23eceea8c163f9c910e1f6ea122428 Mon Sep 17 00:00:00 2001
+From: Kentaro Hayashi <kenhys@gmail.com>
+Date: Mon, 27 Apr 2020 11:56:02 +0900
+Subject: [PATCH] redshift-gtk: use Ayatana AppIndicator3 instead of App
+ Indicator3
+
+libappindicator was deprecated and it will be removed in the
+future Debian release.
+
+  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=895037
+
+There is a successor API compatible library - Ayatana Indicator.
+
+  https://ayatanaindicators.github.io/code/
+---
+ src/redshift-gtk/statusicon.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/redshift-gtk/statusicon.py b/src/redshift-gtk/statusicon.py
+index b4adfb00..68752ed6 100644
+--- a/src/redshift-gtk/statusicon.py
++++ b/src/redshift-gtk/statusicon.py
+@@ -33,8 +33,8 @@
+ from gi.repository import Gtk, GLib
+ 
+ try:
+-    gi.require_version('AppIndicator3', '0.1')
+-    from gi.repository import AppIndicator3 as appindicator
++    gi.require_version('AyatanaAppIndicator3', '0.1')
++    from gi.repository import AyatanaAppIndicator3 as appindicator
+ except (ImportError, ValueError):
+     appindicator = None
+ 
diff --git a/x11-misc/redshift/redshift-1.12-r10.ebuild b/x11-misc/redshift/redshift-1.12-r10.ebuild
new file mode 100644
index 000000000000..a63b6864529c
--- /dev/null
+++ b/x11-misc/redshift/redshift-1.12-r10.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit flag-o-matic systemd xdg-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="http://jonls.dk/redshift/"
+SRC_URI="https://github.com/jonls/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="appindicator geoclue gtk nls"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	x11-libs/libdrm
+	appindicator? ( dev-libs/libayatana-appindicator )
+	geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
+	gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+		dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	nls? ( sys-devel/gettext )
+"
+REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-apparmor.patch
+	"${FILESDIR}"/${P}-libayatana-appindicator.patch
+)
+
+src_configure() {
+	use gtk && python_setup
+
+	# Fix compile for Clang (bug #732438)
+	append-cflags -fPIE
+
+	econf \
+		$(use_enable nls) \
+		--enable-drm \
+		--enable-randr \
+		--enable-vidmode \
+		--disable-wingdi \
+		\
+		--disable-corelocation \
+		$(use_enable geoclue geoclue2) \
+		\
+		$(use_enable gtk gui) \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		--enable-apparmor \
+		--disable-quartz \
+		--disable-ubuntu
+}
+
+_impl_specific_src_install() {
+	emake DESTDIR="${D}" \
+		PYTHON="${PYTHON}" \
+		pythondir="$(python_get_sitedir)" \
+		-C src/redshift-gtk install
+}
+
+src_install() {
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
+
+	if use gtk; then
+		python_foreach_impl _impl_specific_src_install
+		python_replicate_script "${D}"/usr/bin/redshift-gtk
+		dosym redshift-gtk /usr/bin/gtk-redshift
+
+		python_foreach_impl python_optimize
+
+		# https://bugs.gentoo.org/784281
+		mv "${D}"/usr/share/{appdata,metainfo}/ || die
+	fi
+}
+
+pkg_postinst() {
+	use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && xdg_icon_cache_update
+}
diff --git a/x11-misc/screenkey/Manifest b/x11-misc/screenkey/Manifest
index b0184803b616..c39175101794 100644
--- a/x11-misc/screenkey/Manifest
+++ b/x11-misc/screenkey/Manifest
@@ -1,8 +1,6 @@
-DIST screenkey-1.3.tar.gz 82732 BLAKE2B 53cf700f7211783c360552667d5bc77dfa467137476c4ae57944fe7a1e3e9da9b4488cade9c2f091b2be51cb393e063509ae858f6cca1b34ceadd3e158586e05 SHA512 16aceeb1e1a0ed5add06ed2bfd1eca04b9909537bbb979f531a98270c33af3d5e667534e73546a85c3f58ef837795a35891f00f8cf41e5ea10c45b7992334e96
-DIST screenkey-1.4.tar.gz 83784 BLAKE2B 4d4264ff88fdd57b27709091c5bd79dba304f94209465e4bbaf3d6ee965b2088fcbf3afc96e0c785fa954b5bb96fc26d4d79e9aeb2dd774daf519055fc301030 SHA512 f22afbdeb2c7d7884f97faec3601bfe13f65d33a2e284cccda6d6851d0838e4a4c6860c93abd4c11f21170fb970e6cb12b52cb0cd4cb1fb58cfcf44f0945ad2d
 DIST screenkey-1.5.tar.gz 87449 BLAKE2B 1ca3a7d643c65e2a82ce51feb4de022ccb0bb35848c0bb63871343b499e4b7a677e7df379ad259c149ba4a93d98cc36a05d9fb58976cc96d20b3fe98b54301db SHA512 bc9457b17c9e2fea3cefc97546dfd89a019a527608ec79960d1a712c1f1bbc97cf37404a1d84ca1c4587ae4d52163e2de30797f75b9a4a1da45ac585b8b650cf
-EBUILD screenkey-1.3-r1.ebuild 1105 BLAKE2B 0899cedb14cbd01e2984e98e3fd2b8202eabf7da53e517efa780e1e3c469a097c61d2ccb29eb5e711a575ba9dcdf0a8481c8036cbaba9e164b1e08c3177f570c SHA512 b196070ff684f9a632a72f8c1847f4b7848ec7e945e2537e9fb55eefd655391ba49d5f501d5143adf95868e159b2b7a5b8cb5bb91a05292c6c584808624a0c82
-EBUILD screenkey-1.4-r1.ebuild 1105 BLAKE2B caa7e132be0d1e3cf2063ef2be873628d0fdc147928b064859e48311f29c622399456e45bd6ce5d631a6364bc4ac07b4623d9def17d95bc252e1588463fe5430 SHA512 fc52b1ad9f4c5018b1b21e442341c82c08e3a41cb00869e333720e2c148ff7bbad89a93b4c7b7889308892cead70fa2bce517a99742f9dfa1edf7ac3b4793656
-EBUILD screenkey-1.5-r2.ebuild 1146 BLAKE2B 3827bac61aae4571536e2391483e8771c1285114aa21320a248f74e28dc8f754f9222aa020daff8d7f741f4444e375ce49e792bfc10bf0203d4ffbf36ea7d841 SHA512 81e2151ed018d0b90abacbe6d020ea354486e471b8b427a94d3af5f51d3c62fe647f99adac8111cd2c21e4136ff67050bb008b296d0946c990f3c5f93df48b5e
-EBUILD screenkey-9999.ebuild 1147 BLAKE2B 83a04ffb18be292b01cd9d562dce6ffde01bc4bc017190009c37038b1c95efd82f3ec2982d887ad4d143946f1c46bd613c3e8bc4a5249287cf696015900cd003 SHA512 251f22d0f2c887f4975abb778b50365d11d939f524dd8a43150912e62f019ed2298b54589f66e367298361564d2f235ecbbd5448b0462af8f47bfcb3832abe14
+DIST screenkey-1.5_p20230109.tar.bz2 77229 BLAKE2B 8b6d089bdecbbd0d9057ccad12d72321de5b9c6df60785398e15e9196b21fec2b88e27b2e068c53caf5c699ed7b7dcd3bacfbdf86d14b3c4c4a3b2125dfa66c7 SHA512 b6b5121c2b4f68cd8df409176e32019b0747da637c6baa7f45d6268c1605144d32cb099aa16a91748ae672d6386be2579af1bef167488bcdc5e1b452d39d2eee
+EBUILD screenkey-1.5-r3.ebuild 1145 BLAKE2B 17ccbbb3ec9f77b92a9747f8b5e796f2578b223a3c8150c7abf7f65693cdf02b772a6f2c41ebde538679ca8ebf572d0085bfab78ff4e2e32f0c154cfea9d0a39 SHA512 b345776cc963da579516881a2715f983f7a18874e1fd25c3a3dce6ed9debd8ff447737b95b55e184aae320d3b3f6f074789c7caf8404eafd36670fde6e5ae2a0
+EBUILD screenkey-1.5_p20230109.ebuild 1355 BLAKE2B d2f3e0024e79b50ee3ad5527142a200f0791b98a9673ab912024d578649eecbd73719d24e03f3a6f4433009fe957794c1b0ba6e3ddac3a3373d835b36e829cf4 SHA512 a5055606fc45758ef5c42ac1a0b2e6cafe24dc54e069d276a216fd7567032f402e0e88dba035d4848ce88fef1a74868bb11657ecfe04f913ae6168b1c5d40926
+EBUILD screenkey-9999.ebuild 1135 BLAKE2B b65651d64929280dba1f59bb31a1f2128ca7d4fb52103e8bcfbf001f6eb42fb738a415edc94270336d71c31dcfc7a486f38829734a1bad839de36e631a7805d4 SHA512 b1ebda18b3f28afbaffa0c12e77e4ebd4dba528f126cbf2ab1c129c8b7f59685ad21a3810652bf932ac6b11e5447b733cde36848b203ed4ed2395c8f391c8c76
 MISC metadata.xml 1167 BLAKE2B 1f1ca63024956673f5c59d67e7068371801b667d888203e7c28ecb6c0d5d09fcb94385046cb6daef8fb04abb7b6445fcdd80d01a1a76e814df8bd32c40cbf50c SHA512 eed4308686053b4b093e99abae19c3eb4fe8941b4b098cb589be90dfacaed717e2f81a37769b358afc1c33474591baf1c3506a9d0914f523a855abe400974cc7
diff --git a/x11-misc/screenkey/screenkey-1.3-r1.ebuild b/x11-misc/screenkey/screenkey-1.3-r1.ebuild
deleted file mode 100644
index 9642f5a7a1f8..000000000000
--- a/x11-misc/screenkey/screenkey-1.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1 xdg
-
-DESCRIPTION="A screencast tool to display your keys inspired by Screenflick"
-HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
-else
-	SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-RESTRICT="test"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="appindicator"
-
-BDEPEND="
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	sys-devel/gettext
-"
-RDEPEND="
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	media-fonts/fontawesome
-	x11-libs/gtk+:3[X,introspection]
-	x11-misc/slop
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
-"
-
-src_prepare() {
-	# Change the doc install path
-	sed -i "s|share/doc/screenkey|share/doc/${PF}|g" setup.py || die
-
-	default
-}
diff --git a/x11-misc/screenkey/screenkey-1.5-r2.ebuild b/x11-misc/screenkey/screenkey-1.5-r3.ebuild
index 68c91936709d..83969fb16f75 100644
--- a/x11-misc/screenkey/screenkey-1.5-r2.ebuild
+++ b/x11-misc/screenkey/screenkey-1.5-r3.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1 xdg
 
diff --git a/x11-misc/screenkey/screenkey-1.4-r1.ebuild b/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild
index 025bdf8279a6..907a2a7510f5 100644
--- a/x11-misc/screenkey/screenkey-1.4-r1.ebuild
+++ b/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild
@@ -3,39 +3,48 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1 xdg
 
 DESCRIPTION="A screencast tool to display your keys inspired by Screenflick"
 HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
 
-if [[ "${PV}" == *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
 else
-	SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	if [[ ${PV} == *_p20230109 ]] ; then
+		H=7bdba66574244061c6e1934c4f204d02d570f182
+		SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/${H}/${PN}-${H}.tar.bz2
+			-> ${P}.tar.bz2"
+		S="${WORKDIR}"/${PN}-${H}
+	else
+		SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
+			-> ${P}.tar.bz2"
+		S="${WORKDIR}"/${PN}-v${PV}
+	fi
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="test"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="appindicator"
+RESTRICT="test"
 
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-"
 RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject[${PYTHON_USEDEP}]
 	media-fonts/fontawesome
 	x11-libs/gtk+:3[X,introspection]
 	x11-misc/slop
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	appindicator? ( dev-libs/libayatana-appindicator )
+"
+BDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
 "
 
 src_prepare() {
diff --git a/x11-misc/screenkey/screenkey-9999.ebuild b/x11-misc/screenkey/screenkey-9999.ebuild
index 002a571bcd93..dcc404244124 100644
--- a/x11-misc/screenkey/screenkey-9999.ebuild
+++ b/x11-misc/screenkey/screenkey-9999.ebuild
@@ -3,32 +3,29 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1 xdg
 
 DESCRIPTION="A screencast tool to display your keys inspired by Screenflick"
 HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
 
-if [[ "${PV}" == *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
 else
-	SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
+		-> ${P}.tar.bz2"
+	S="${WORKDIR}"/${PN}-v${PV}
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-RESTRICT="test"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="appindicator"
+RESTRICT="test"
 
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-"
 RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
@@ -36,7 +33,11 @@ RDEPEND="
 	media-fonts/fontawesome
 	x11-libs/gtk+:3[X,introspection]
 	x11-misc/slop
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	appindicator? ( dev-libs/libayatana-appindicator )
+"
+BDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
 "
 
 src_prepare() {