gentoo auto-resync : 03:02:2023 - 09:09:48

56 files changed, 115 insertions, 210 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 8b8984b522c4..6ba9da47a86b 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/bfm/Manifest b/x11-plugins/bfm/Manifest
index 8b6d0af3cd45..0b2cc89faa7f 100644
--- a/x11-plugins/bfm/Manifest
+++ b/x11-plugins/bfm/Manifest
@@ -1,4 +1,4 @@
 AUX bfm-0.6.4-makefile.patch 1695 BLAKE2B 99a97a6c8f883c78495f60e0e6d4bfa01203ddcb02f5ae47067f1d1bd21f6441d3cd4d67f592df14b1f715d785151e0b0eb54bf21f81538e7532dd1660b88a8e SHA512 19b5161ee9b43d22895ec1a964ced44f15434cc93357f466b410301c87398ea4bcb10c5cd23c186190a1009791056d8778ff4d1231c56b8aa9366b56d08f47b8
 DIST bfm-0.6.4.tar.gz 59288 BLAKE2B b70d98a944e2e6daaf694dc90a0f8cebc01afd8e11c46fde614e2b2affbe0e331cc15a308837fe987238182a3b4b631bb0d8f8d7f50b84c8705e113425cec7ec SHA512 1a039ef7448c610d2629b50bcac082e7d70eb755aa43e79e6b0868448f92aea5078548273c5f278fac878433cdcd9492589fb1612108807a4fd2afb0e07612a4
-EBUILD bfm-0.6.4-r3.ebuild 955 BLAKE2B 7fffa1b7f6949d39d3f2580748dfb6eabdfaf660d2eb97f449c0953397fd7aa44eb085e743875c55028c66a42f4c43e12fc3eeb81e55bab7b6eb44076ddf6388 SHA512 dbc98aa170e00b32412f9c6a9dfb4315b34a050894a3ca3f1a13a5e0731861b0fc39c5202e2d4f120b6a504fc34cb9757f799289189ada8e56c2f8d3a9a4488f
-MISC metadata.xml 349 BLAKE2B b920a5e5e82634986dd6699e7ea57b68066b1ed1723294d1f3b8a36f694e99b24f3cb7858b3b510acdabd3c33762dc06aa20898cda06d7ff268e664b8172656d SHA512 c0550a20adbbdf3662c4bcf3497be790978330cde9333fd968584b7c1b766964f15c029e3929515c59658abba4a3bf3d4eb506fba91e105c932de5975125a7a0
+EBUILD bfm-0.6.4-r4.ebuild 967 BLAKE2B f48ae6440339edada406c8a2349beed2fd3a9da1500f8e19980be0c3ff58f68e9a677f66f892546ace032b368933bcb3bd9d8cb94ba4803d88fe1bba0ccf6954 SHA512 5d3f2585b8069bc3b17ca7b7958552c4cab209f8afe28d5e607ce48e7da74ab512945148a2ce057bdfaf30d9fbcd525bcf5df1a71a2c4096c11e9968f42f3105
+MISC metadata.xml 435 BLAKE2B 7fd90ad9036cfcb107fbb31ebf278657a132b3e58836710cd7e0ad627b14ca35356dad8caa2688db9858c6aadc110f557c8be487839cab2aaf15eb391f002824 SHA512 6ac5d04428f3977b98328a1799f98ae77b437351ca9437961fb0af420a9b310fda232ecb3494d298dff6e99520bbec8792687351e5d7e78c0562a5c21439417d
diff --git a/x11-plugins/bfm/bfm-0.6.4-r3.ebuild b/x11-plugins/bfm/bfm-0.6.4-r4.ebuild
index d93d9ff88a99..1fd42525ff60 100644
--- a/x11-plugins/bfm/bfm-0.6.4-r3.ebuild
+++ b/x11-plugins/bfm/bfm-0.6.4-r4.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit toolchain-funcs
 
-DESCRIPTION="a dockapp and gkrellm plug-in combining timecop's bubblemon and wmfishtime"
+DESCRIPTION="Dockapp and gkrellm plug-in combining timecop's bubblemon and wmfishtime"
 HOMEPAGE="https://github.com/JNRowe-retired/bfm"
 SRC_URI="https://github.com/JNRowe-retired/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -13,14 +14,18 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gkrellm"
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	gkrellm? ( >=app-admin/gkrellm-2[X] )
+	x11-libs/gtk+:2
 	x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gkrellm? ( >=app-admin/gkrellm-2[X] )"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+	x11-libs/libXext
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)" GENTOO_LDFLAGS="${LDFLAGS}"
diff --git a/x11-plugins/bfm/metadata.xml b/x11-plugins/bfm/metadata.xml
index 5e8b4e0622fc..9b182362bb4f 100644
--- a/x11-plugins/bfm/metadata.xml
+++ b/x11-plugins/bfm/metadata.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>voyageur@gentoo.org</email>
-	<name>Bernard Cafarelli</name>
-</maintainer>
-
-<use>
-	<flag name="gkrellm">Enable building of <pkg>app-admin/gkrellm</pkg>
-		module</flag>
-</use>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<use>
+		<flag name="gkrellm">Enable building of <pkg>app-admin/gkrellm</pkg>module</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">JNRowe-retired/bfm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellaclock/Manifest b/x11-plugins/gkrellaclock/Manifest
index 889837fa94f6..01694572139a 100644
--- a/x11-plugins/gkrellaclock/Manifest
+++ b/x11-plugins/gkrellaclock/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellaclock-makefile.patch 1403 BLAKE2B 12d84d0a6bc4ddf26b90978ac4ed88d152e0ca46abd2462c89528bff25f70fcc901dcb3d4c554c4fe4a7fb9c5e7e78a10bf97a1df554cc6c39f4348af1380d40 SHA512 484a405ebc9174617b0c17bc0cceb8533bf581ea3cf7a9b3d36ab2f297f6ae51ce2bbf5e5e022f6813f269caadec46e5d17845e5951f3bbb92ddd137c5ad5227
 DIST gkrellaclock-0.3.4.tar.gz 18853 BLAKE2B b91b4cb9ae42f68d3a3d430f7713170c788515280330a1f785f11d4335e859dbd6f840fb7e47fe8f77676bb55e97dda628fa79d442d4be8a37c69bcea836aa52 SHA512 2e6002bc4d535899cc8b86377d596bcee5e64d05fe4239eaab2de8e387a40b8dee600d9fcd5f30feb68bb3e54bf6b4745d4c7b79ea9fee57b856eeb3dac12524
-EBUILD gkrellaclock-0.3.4-r1.ebuild 736 BLAKE2B 5ff7d83610cea583fb29458c7a65db4f06d98b62be6e6c72bf2e6bb6b1d8594829888c8ba190442d4f7faa02191b7c19a2ba6e870097b899f5e1264cfc0e15a0 SHA512 80512f42388c25b35ce956532d1e56b66216f48a36f07677a807f131238dd312b602ec0017c6cdd57496383f8d55a63c30280159b381f0827f69a34b64015415
+EBUILD gkrellaclock-0.3.4-r2.ebuild 733 BLAKE2B c3dd9814d55ae59a696d03997c27773eea413b21a98aaff190ba98e5990f58ddc81a6918948afc7d1294fc8594dab01dbb28d5e756a7da1dc31911a68f9eba02 SHA512 5bc30beea7475a6cdb4d508b15027adccc9c5bed255ec79c89ca5cbd2b976990869d53723399d64588ccd4f9f2499c1632b2819980050437ada69fd7290cbdae
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild b/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r2.ebuild
index 22d81a995f5f..1f0e8d375f1f 100644
--- a/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild
+++ b/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r2.ebuild
@@ -1,30 +1,31 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="Nice analog clock for GKrellM2"
-HOMEPAGE="http://www.gkrellm.net/"
+HOMEPAGE="http://gkrellm.srcbox.net/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
+S="${WORKDIR}/${P/a/A}"
 
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha amd64 ~ppc sparc x86"
-IUSE=""
 
 RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${P/a/A}"
-PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-makefile.patch
+)
 
 src_prepare() {
 	default
 
 	# The tarball contains a pre-compiled x86 object that needs to be
-	# removed if we're going to build it properly. See bug 166133.
+	# removed if we're going to build it properly. See bug #166133.
 	rm -f gkrellaclock.o || die 'failed to remove gkrellaclock.o'
 }
 
diff --git a/x11-plugins/gkrellfire/Manifest b/x11-plugins/gkrellfire/Manifest
index 77893c73c756..6836e9484e61 100644
--- a/x11-plugins/gkrellfire/Manifest
+++ b/x11-plugins/gkrellfire/Manifest
@@ -1,4 +1,4 @@
 AUX fix-CC-CFLAGS-LDFLAGS-handling.patch 1788 BLAKE2B 3cd9c4f40fe30fed10d7a3c14c8b9887e76220caab5073a27df66a84088fbed45910fb874f6b0d2976fb418ada32b564ab815a7439a99d900e46e31b0b4c62c4 SHA512 bf28ded021d3325df8fa725c0b264939e1d4e86bcd87e60e2bc010f1223a0371996516749d162a07d3661d6589c7b8f5a102a0ebe87f60aba36b913fd83cf3d2
 DIST gkrellfire-0.4.2.tgz 12474 BLAKE2B e4c488061e18200fd75cca991032d1d64d0bd36da74aab33b3075cc6e5fae9b890ff3d906713ceb4ce15ffc409fb0916e77e1edcd9b686410bc2c8e637941b9f SHA512 1b7f6229567819092cd2eb2e33e3b7fd8340b0e913f6bcd1d11e9dd604730e3ca4fc1adaa8ae36895d80000f61931da14a586be6929c141c64b8519f8dc328bf
-EBUILD gkrellfire-0.4.2-r1.ebuild 536 BLAKE2B 587bfee735fea7b0b2a517208a9ffdbb53517d00db17fe3a779dad1520f4ab12527cc9f17eedb39029908bf5dce7a3f4608a434fb6f7c1de266d9c657ac2a80e SHA512 4b842053327fbc2fcdf9c72bc405f88769245e909081678dab5cbb7fbb69524786c2bf5dad15aa3b95442775b932ba33239808d964de359e9a8025f8db9d5e79
+EBUILD gkrellfire-0.4.2-r2.ebuild 526 BLAKE2B f1eebba005cc4d391583a9449a467b515382c1ea5b3f933bb304bfb9c6466b2d82d2b0ec1fea10710b611c1bf9d4928984983927e88b9405c533b7d61f7b7d8a SHA512 aee86f936561480928fbbf6e0449c4619a4190890940b0e8764b2cfa752cea1a5c3702a19d03243566ac4afdd49453fbbdd93d9594b9ae479bc49ef23def989b
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellfire/gkrellfire-0.4.2-r1.ebuild b/x11-plugins/gkrellfire/gkrellfire-0.4.2-r2.ebuild
index 498b3ae4f309..bfb9e04f0dad 100644
--- a/x11-plugins/gkrellfire/gkrellfire-0.4.2-r1.ebuild
+++ b/x11-plugins/gkrellfire/gkrellfire-0.4.2-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit gkrellm-plugin toolchain-funcs
 
@@ -12,12 +12,13 @@ SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/fix-CC-CFLAGS-LDFLAGS-handling.patch )
+PATCHES=(
+	"${FILESDIR}"/fix-CC-CFLAGS-LDFLAGS-handling.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/x11-plugins/gkrellm-bluez/Manifest b/x11-plugins/gkrellm-bluez/Manifest
index b365ff73d49b..8afc05400457 100644
--- a/x11-plugins/gkrellm-bluez/Manifest
+++ b/x11-plugins/gkrellm-bluez/Manifest
@@ -1,4 +1,4 @@
-AUX gkrellm-bluez-0.2-notheme.patch 2115 BLAKE2B 1ce93d7a0d751c1b902f048aaedc12f459324303c52aeddd7100c02ff3a82d9bbb7ca3939c3d9b06ae85b57bc8c445949405eab06f511e423e80bd15f21e81a4 SHA512 caaf1d308c2c786bb54a1785509ff58ff29c22950ab0eee266adf07bf2ba1d37d35cb24cf748d255d13b7a48672234dc193baacf4dbb01ab955f86fe33d5c2d1
+AUX gkrellm-bluez-0.2-notheme.patch 1679 BLAKE2B f5b7fca3f36757733405f42e78bc7ae5f7e7c704f0d58a63c258f632ee4d61415ba201c619a9c425398195b44bf1cdaa82743e12ab1d710e6677f5754e3d0b3d SHA512 a754b0ea03a123c661574719e2e6e1afe75471aa1bc6be1cdf79066c0471396e68ed47ade6c340c446dec5e288f928b44172ea983744290831c5088dc35cf73d
 DIST gkrellm-bluez-0.2.tar.gz 330247 BLAKE2B 8fa585fdd10892018e749428afded5cfb6c94258befedfe2652bcc027210ea9bb0db7379e052b19d6dbeb6c3abdf51be9504078e8e135bb74fce52bcc4febf71 SHA512 56a288874bf7de9f09aaa49a3bbc1ccf71da95dded5baa4af20941866f5acf777234a7726c49d491f252e175fc34266abd068cac0ca204ca6d1785a1d7e230f9
-EBUILD gkrellm-bluez-0.2-r2.ebuild 748 BLAKE2B d57bb08f203cac985e13986b5b5378a1cc98251b8ff8b6c036ad312bad7ab265f41a8c11067ea25264a31d66ef70b3e34f630b047989e6432957ce483861fa73 SHA512 ee252b5a2ccb583f7b7e21ccb6112b4ec88a6bf84de9c5d607119aaa208516d92819f44c99ad03ec620e886fcae09647e7c99b0c7cd9dac0c1d7c4f2102b4721
+EBUILD gkrellm-bluez-0.2-r3.ebuild 736 BLAKE2B 23603c2e385fcc9c3079d44fd583b2cc8b3818a1409d7732459d194a2cc96f9c6dbc0a5d5b9f7d1e1ef045ca5d345caa2a9274114a5729d4a163629f2d52b48f SHA512 0563940115e8a620c32bcd08713f6783d8c56eaefeeba82ee673bdf8e9da6b6d72baac2737ae0af48e6626031dfe904100c592c02cc877b4f88920def21a26b4
 MISC metadata.xml 251 BLAKE2B 5dfb0bfe530fa3e325876191cd8cca6631b32832f7621a01461f914c3be1f12d663f2be59464e6069cfecfea817386baa6c71d8f924d5b59b04995940b55e955 SHA512 a7e4ca85f584cba8800f9a32f6179bd2c6a365f25d1f2d87c9d583e068ea25babdf8d47776495d2d4e498b9fc3e1b784593a8242c1d5c33c0a4cc37dd0c59470
diff --git a/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch b/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch
index 6a9841652dd2..548da1f0f46f 100644
--- a/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch
+++ b/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch
@@ -1,6 +1,5 @@
-diff -u --new-file gkrellm-bluez-0.2-orig/src/decal_net_leds.xpm gkrellm-bluez-0.2/src/decal_net_leds.xpm
---- gkrellm-bluez-0.2-orig/src/decal_net_leds.xpm	1969-12-31 18:00:00.000000000 -0600
-+++ gkrellm-bluez-0.2/src/decal_net_leds.xpm	2007-03-08 09:07:50.000000000 -0600
+--- a/src/decal_net_leds.xpm
++++ b/src/decal_net_leds.xpm
 @@ -0,0 +1,66 @@
 +/* XPM */
 +static char * decal_net_leds_xpm[] = {
@@ -68,9 +67,8 @@ diff -u --new-file gkrellm-bluez-0.2-orig/src/decal_net_leds.xpm gkrellm-bluez-0
 +"34567890ab",
 +"cdefghijkl",
 +"34567890ab"};
-diff -u --new-file gkrellm-bluez-0.2-orig/src/gkrellm-bluez-chart.c gkrellm-bluez-0.2/src/gkrellm-bluez-chart.c
---- gkrellm-bluez-0.2-orig/src/gkrellm-bluez-chart.c	2006-11-14 13:50:24.000000000 -0600
-+++ gkrellm-bluez-0.2/src/gkrellm-bluez-chart.c	2007-03-08 09:13:29.000000000 -0600
+--- a/src/gkrellm-bluez-chart.c
++++ b/src/gkrellm-bluez-chart.c
 @@ -22,6 +22,8 @@
  
  #include "gkrellm-bluez-chart.h"
diff --git a/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild b/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r3.ebuild
index dd151ebe1f93..af6b5cade5f1 100644
--- a/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild
+++ b/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit gkrellm-plugin
 
 DESCRIPTION="GKrellm plugin for monitoring bluetooth (Linux BlueZ) adapters"
-SRC_URI="mirror://sourceforge/gkrellm-bluez/${P}.tar.gz"
 HOMEPAGE="http://gkrellm-bluez.sourceforge.net"
+SRC_URI="mirror://sourceforge/gkrellm-bluez/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,15 +15,19 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-admin/gkrellm:2[X]
-	net-wireless/bluez"
+	net-wireless/bluez
+"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-notheme.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-notheme.patch
+)
 
 PLUGIN_DOCS=( THEMING NEWS )
 
 src_prepare() {
 	default
+
 	# Be a bit more future proof, bug #260948
 	sed "s/-Werror//" -i src/Makefile.am src/Makefile.in || die
 }
@@ -31,5 +35,5 @@ src_prepare() {
 src_configure() {
 	PLUGIN_SO=( src/.libs/gkrellmbluez$(get_modname) )
 
-	econf --disable-static
+	default
 }
diff --git a/x11-plugins/gkrellm-countdown/Manifest b/x11-plugins/gkrellm-countdown/Manifest
index 4a311df9f75c..0467f0693785 100644
--- a/x11-plugins/gkrellm-countdown/Manifest
+++ b/x11-plugins/gkrellm-countdown/Manifest
@@ -1,5 +1,5 @@
 AUX gkrellm-countdown-0.1.2-r2-pkgconfig.patch 476 BLAKE2B 7c55e464e84285c9a60c7752e1bcc0e35270a19680c936660672daa70bf2e4927b616635a22384c3b688d28299bc919d121604b00fbe2e83feab5ddc3893ff70 SHA512 7903e803b930deca0a114c29169507b117b5dc0f581098a3cf9790f2ebc1c62fed2be147fc0dfeac061f68b49722aeda47713929a3d07e3c977e87868ba063f5
-AUX gkrellm-countdown-makefile.patch 1005 BLAKE2B 80711f28134b9241e5844a30e84a1bf634c9c75a880c1a5dfdad32e427b7e50d802c049a424086d6bed05d50a5bd5b8d39e31265c900d7bcdc5111a95301b6b7 SHA512 ae7ed8c952698b8cf23f99ce18abff865ed0168df42a3b9db54326131dbbbc982ef3490b93fb0e76b05cbb746b34fe43fb98a7b0d18e459e773b723a80bc8178
+AUX gkrellm-countdown-makefile.patch 957 BLAKE2B beab6d1162df796b52057fea2c9bdc2de6783e13b76ef3af049a9a8dda6900ba996151280cf3d5ce554431ad6920186eaf4d59a85f2483b2860b1a16cab38579 SHA512 8bb2a852144590e648dc0309f1a15b3b84f9ee5fbb31150fb8765568d935ed2750f04bbc81aac3c3d70942c27582d4cafda5facd6e5522df8a4e1c75ef3c792f
 DIST gkrellm-countdown-0.1.2.tar.gz 12482 BLAKE2B eb619cc1da6ef90f843ab2a30e24da63d90988e85b4d48e2425f9c69a77ee64e7eaa674a7bed79da202633037aa56d5dd1f3b1c3ac9895172eed11af4b507dc0 SHA512 974a885ed56ffa95d2b5972fd309721e0043e8798fc1289fbb34bfd0320ec78db7a0572f8e43eee922b2823a2aa80789b8d24fdf106074e683b218e731b6de71
 EBUILD gkrellm-countdown-0.1.2-r2.ebuild 659 BLAKE2B 8117cbf44682decd1212bc438f8c9e9edf254b7c9c5cccb5e5cdf4badecefe0a464a3831731e6ad9f439618ec48b096d1403a889a45f859fe6f56f6aa20f5eb5 SHA512 54d3e2f33077000ab23ef9e423e68742d225443898ab506f1ee5521b2e2aa2b8d1e7ba92dc50e4764797978e60e6498dc8acc6f1f2af013c95d462e0ce964e86
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-plugins/gkrellm-countdown/files/gkrellm-countdown-makefile.patch b/x11-plugins/gkrellm-countdown/files/gkrellm-countdown-makefile.patch
index af241de73e92..e2a2dc54f68f 100644
--- a/x11-plugins/gkrellm-countdown/files/gkrellm-countdown-makefile.patch
+++ b/x11-plugins/gkrellm-countdown/files/gkrellm-countdown-makefile.patch
@@ -1,10 +1,10 @@
 This patch is by Michael Mair-Keimberger, as part of bug 339657. It
 teaches the Makefile to support the user's LDFLAGS.
 
-Gentoo-Bug: 339657
+Gentoo-Bug: https://bugs.gentoo.org/339657
 
---- a/Makefile	2003-12-30 23:07:29.000000000 +0100
-+++ b/Makefile	2013-03-16 14:23:47.671010566 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -9,7 +9,7 @@
  IMLIB_LIB ?= 
  PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
diff --git a/x11-plugins/gkrellm-cpupower/Manifest b/x11-plugins/gkrellm-cpupower/Manifest
index 5bb23893d240..f62ac651c815 100644
--- a/x11-plugins/gkrellm-cpupower/Manifest
+++ b/x11-plugins/gkrellm-cpupower/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellm-cpupower-0.2-makefile.patch 1061 BLAKE2B c83d00ce78314139b1f972cfd3167b8d5174e44ade0b97b9592e05fc289b64c793d711827cd615d37deed72ded62e81699e58ffd5aca32e3cb58d888b83f5a74 SHA512 a4143262f07e0bc15c4d8d71b03df7a0ae67ba3817ac227545a1932ab91d981ea76a053ebb0e67871c59b7083740aede2a3a920db9feb807a66d7d2417e9081f
 DIST gkrellm2-cpupower-0.2.tar.gz 14274 BLAKE2B 6ad0c0825743b3c37670e5b3f7390f601ee3ffc012cc658b0fbd72c4a195ec680eaef8a5dc8f9b72a17199a293865007fc60877addf7c811d9735116d600f934 SHA512 80cf86548c8329af41462cb5cdd0de67cfab05d8d9a7c3315fcc662e0b5e511ffc1f46d2eb3ccf13b9f1607c35860921658eb74970c241a4c56b74e32e4f779e
-EBUILD gkrellm-cpupower-0.2-r2.ebuild 1112 BLAKE2B 32087f26f5dec20889cc2857a918e0b3e4cf83449008c27ea664ca4eee1df15d6c1bd8f5da0624b55e679e35bd60629a84747aea997bd9891924ff0693647544 SHA512 f65a3039a940fad60b9f8a45cda77501aab182c85a2e64a865029e96a59351dd665139ac22cd529b7bb57a42ebabe6c6d7d1f6e04f0763de6d60804d616a758e
+EBUILD gkrellm-cpupower-0.2-r2.ebuild 1112 BLAKE2B 3a77e9f90581c169aba2f19b415083e73d8d4b847f00d9db19a1b9645afc285b218bffef2d1a92ac64c2615ce6e1f55e2a0328c3d7d8ad99b211fdd3c7609e2a SHA512 fdd6a91f989f4c33c83781a3646d889b103dbeeb13c685ec479c7f1b7a54a195a3b78b73933ecdfd449c95d7b58ee4f4b7b2119210730ee8aa11d2ff76354828
 MISC metadata.xml 264 BLAKE2B 06a1053b520abbb6b64ea5c6f29e4b5dd9777de179ad2fc2c511eeb9cd522d428d66280b61485f47dc8f2e7a57d4c657c15ff7434280cd890613c4ebe1b801e8 SHA512 59509f805dfc0c4c51cb28c097ecd8b8c24d103821661db7cbabec69d707a1e2911c9b8c7efd54e3059198ee294354055e2b87247ccde7a2cf5a5eded8da3df3
diff --git a/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r2.ebuild b/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r2.ebuild
index a3c27d5e817e..1b8250714ecd 100644
--- a/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r2.ebuild
+++ b/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit gkrellm-plugin toolchain-funcs
 MY_P="${P/gkrellm/gkrellm2}"
 
 DESCRIPTION="A Gkrellm2 plugin for displaying and manipulating CPU frequency"
-HOMEPAGE="https://github.com/sainsaar/gkrellm2-cpupower/"
+HOMEPAGE="https://github.com/sainsaar/gkrellm2-cpupower"
 SRC_URI="https://github.com/sainsaar/gkrellm2-cpupower/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
@@ -20,7 +20,8 @@ DEPEND="app-admin/gkrellm:2[X]"
 RDEPEND="
 	${DEPEND}
 	app-admin/sudo
-	sys-power/cpupower"
+	sys-power/cpupower
+"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
diff --git a/x11-plugins/gkrellm-mailwatch/Manifest b/x11-plugins/gkrellm-mailwatch/Manifest
index c28c91210c1f..b9329bb3740e 100644
--- a/x11-plugins/gkrellm-mailwatch/Manifest
+++ b/x11-plugins/gkrellm-mailwatch/Manifest
@@ -1,7 +1,7 @@
-AUX 2.4.3-0001-Respect-LDFLAGS.patch 998 BLAKE2B 63593a3e478b139e3aeaf640df80000226f315f64323e2c7a1f36d6531ed34dbef477f1aeb1627d87de3d066d324846b4b96d8f9ea4f5f5c819d8042c03497da SHA512 1c6677b285a42c557c0d09459c27b7a6354a5802ab30606fe786bf52a73b80ec7026c2cf365cfc6315dc82eada4eaa1f9697119b23d01fd4315d93c7aaa2479e
-AUX 2.4.3-0002-Use-gkrellm_gkd_string_width.patch 914 BLAKE2B 1dd49adf69b55c360d16fe96c32d4a89305efb3c83589e53bc1938056ea6318c39b58674fad41fb251054ac4564011bc28a1d3e267c5f6edc285f67bf223328f SHA512 05e9b1387df691ceab91791f7e3903137a0bfd77fc69c1d23707aac274f61e0ffe647f5114e3992ec8c512a2cbd63ce10610fa9f5efc269914829ff36ddb83da
-AUX 2.4.3-0003-Remove-a-few-more-GCC-warnings.patch 1227 BLAKE2B a3613b61b6b46a1b2b5540b607e28e8197edf618b49149d82e561cf5c9858de7c4b83d43397b1e9739dc9bce0b79b0234ea1b0f5de7f304d71d08f3c59f717cf SHA512 608088d86196397e8a43edabfae0bed2f44f0e6a0e8e6ff0607589365c53a0448a8a8207b53a9b7255b16a071cdc4c34a8c4abf3ffe1d1b603d0d4d29910dedb
-AUX 2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch 761 BLAKE2B 0192c481f2e2a49fc5c0954e75d67c39ea70a4739edb48d1ec83739a3b7b58dab1241feb1c2495b17d228dd4a1139759d7cbadf11a659baf01b9c1ae868820c4 SHA512 48381a81041befe925bb50fc7026e9543671242e824b8ccaadd7614778258af1dfd819aa4c0bdeb856b822a23af8f265463da1eb11e4340e328e13c969d42808
+AUX 2.4.3-0001-Respect-LDFLAGS.patch 858 BLAKE2B 5274ae5ca6677b93f98e7b94dfa92216c6aa27167f3a8da8ce94b4c8215c7bcf6ee7e89e4ecdd1570de0ca82a6550c36668e7e7c09c650af8d2386eb8cc72c8b SHA512 9910bffe616b2bab10b142ef2531fb3080c8e625e50b2213fa8dfccceba3f1388a3382836db16f57f29dd7e3959fbb7dea57ac3ea594222ce44028db621af880
+AUX 2.4.3-0002-Use-gkrellm_gkd_string_width.patch 767 BLAKE2B 7559bfd495b68ec9553f8ccc1d50020ab9fb05a9ff171543f8b98857af1345877beedabe8f1eb225dbd456ef9d193b1182344fe9cd3c7a932fe222f8ae88f0d0 SHA512 69674725bb86d4758d2bf0407dbe9549174159bac40b6247608ea59bf812c60d9411e0962ea916c7cca5fc331d049f2140910d35a59d8221b9c988546c6f77fe
+AUX 2.4.3-0003-Remove-a-few-more-GCC-warnings.patch 1077 BLAKE2B 28a1f044c30eb16fe53f36381364aca00910cbc5fde520da12149ccadbe27b749b3a987e6ac5df18f3512eec2f47fee5afdcff6a3a6b26d6b4be0fd9c234e6c2 SHA512 1d41fd328a7c582fe2d572c3c9e1a1c3a798e4ff2ea3552224a182deaff5bf70144621d5e9461ef768a5685faefa28dde66b7504fe043b1ef254f207797845e5
+AUX 2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch 622 BLAKE2B c14f0fcef8fdbb5d76f81463a2d34d600a091adde1d39d566a42b3cf78841612eb57062cdef7e43faacf7e2fb3bfb3124127e3f3f6fc6c12bf98e85d7e478884 SHA512 504de047da3a4b724ea27282d6da450dcddfe8fb349a487490a80ecc8733fe3c22d7fc38f5db34edfd929406f8c6e494866c5351075534a8173ec06e5bb5fbed
 AUX gkrellm-mailwatch-2.4.3-pkgconfig.patch 473 BLAKE2B a60fef834ed6de590c86b26060f821a53ac28e30a45ca608dbc58c3ff9ae72681879ec5b05f662a9674cc6552ef063fa36cdeb4ac8c900c67da2e47791d6c6bd SHA512 ecd46a50da1595ce70f416f2874d9a4f8e85c7117f2fbb8e2e62154856623ed52c4dd05c405ae4df219f60c9287422aae5862fcb27888661680cd8ddfccf82d9
 DIST gkrellm-mailwatch-2.4.3.tar.gz 27407 BLAKE2B 38c9559d2a36872e9c4203c7e6cef8cfaed7f41b944afa0e74091d09f3e812dcd8a59d58a426baa7d51f53bf6763b574aa383e1882b9e48755c880f4665b4dc4 SHA512 31ada9fa55a97a1c76e93f1130b5d84ce3c3db52608aaaeedcd8d482917c53e0c868ca2b61c58da966bdce7de74a88a6bdc5869c40b41e017014f34626df4bb9
 EBUILD gkrellm-mailwatch-2.4.3-r3.ebuild 879 BLAKE2B 70d7c860448389bc195a2caac76243c7c1d330050eefb8668aa399288e676edc3ab293f94d9443f57819ffa5d27df4dcb0508b3c50290c5fc72e406a600d40ba SHA512 45c8f35375b5e4955452213527810a3f7fffa8828981ad950df00680ae9c5954be574d3c0af52d50ae737d85adad978bfcf8815acd6a2f51e17e5a02aae5171f
diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch
index 158357dc4855..cbffef6c2def 100644
--- a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch
+++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch
@@ -5,12 +5,6 @@ Subject: [PATCH 1/3] Respect LDFLAGS
 
 Instead of using a non-standard varible name like LFLAGS, using LDFLAGS
 lets this play nice with Gentoo's build system.
----
- Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index b8cf927..02ca376 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -12,7 +12,7 @@ INSTALL=install -c -m 755
diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch
index 7edff1c74990..0b5f345f0bdb 100644
--- a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch
+++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch
@@ -7,12 +7,6 @@ This wrapper is designed to transition from GdkFont to
 PangoFontDescription.  Without it, there is a warning and a probable
 runtime crash, as we are feeding the wrong structure into
 'gdk_string_width'.
----
- mailwatch.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/mailwatch.c b/mailwatch.c
-index 3f0f0a2..5cca01e 100644
 --- a/mailwatch.c
 +++ b/mailwatch.c
 @@ -608,7 +608,7 @@ update_plugin(void) {
diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch
index 5cc76c6fc828..6e91c94e7a01 100644
--- a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch
+++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch
@@ -4,12 +4,6 @@ Date: Mon, 1 Nov 2010 08:44:17 -0400
 Subject: [PATCH 3/3] Remove a few more GCC warnings
 
 These are mostly harmless, but no harm in cleaning them up.
----
- mailwatch.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/mailwatch.c b/mailwatch.c
-index 5cca01e..fcb77a8 100644
 --- a/mailwatch.c
 +++ b/mailwatch.c
 @@ -198,7 +198,7 @@ check_mh(Mailbox * mbox) {
diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch
index 828c9dd2d5f4..f95fbe4dfbb0 100644
--- a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch
+++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch
@@ -5,12 +5,6 @@ Subject: [PATCH 4/4] Do not force -O2 in CFLAGS
 
 Only uses -O2 if the user has not specified any CFLAGS in the
 environment.
----
- Makefile |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 02ca376..c4ca35c 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -10,7 +10,8 @@ GKRELLM_INCLUDE= -I/usr/local/include
diff --git a/x11-plugins/gkrellm-plugins/Manifest b/x11-plugins/gkrellm-plugins/Manifest
index c40553634a78..4e3279b1a74c 100644
--- a/x11-plugins/gkrellm-plugins/Manifest
+++ b/x11-plugins/gkrellm-plugins/Manifest
@@ -1,2 +1,2 @@
-EBUILD gkrellm-plugins-2.0.ebuild 777 BLAKE2B afe9554243cf5c73f0dc98f95d02db91c63df11bf4c4d296b39a8604a74b1338e7bae5e24cb16f35959824245e92406859ca1a3aa00154eabe3ebe8d16a138fe SHA512 f1a6f22fc2f0ddfa1201039a9954e7491247e7e874d5912eb6718ae3749329d43c58dad138275133637abee45ba3f205269e61c84396ce60b1d3becf9964caf5
+EBUILD gkrellm-plugins-2.0-r1.ebuild 771 BLAKE2B 940750723e67f8cb3ca84d492c794e611fa2562787a33ab728ba06235ff6509401adde586ddc4df2090abf88cfe09df17d7db846998995c3f84983bd37d48f8e SHA512 a6743829d4ed03032af55e2967d787c3bdc675dda849b8874868cd536551a32d199ee7e499556962c7520a8d9ceaf7d81177436cec82eddd8df3ded405c61897
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild b/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0-r1.ebuild
index 5bc906f72683..0d3c7b4a1bb1 100644
--- a/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild
+++ b/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0-r1.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-DESCRIPTION="emerge this package to install all of the gkrellm plugins"
+DESCRIPTION="Meta-package for all of the gkrellm plugins"
 HOMEPAGE="http://gkrellm.srcbox.net/"
 
+LICENSE="metapackage"
 SLOT="0"
-LICENSE="GPL-2"
 KEYWORDS="~ppc ~x86"
 IUSE="wifi"
 
-RDEPEND="!<app-admin/gkrellm-2
+RDEPEND="
+	!<app-admin/gkrellm-2
 	>=x11-plugins/gkrellaclock-0.3.2
 	>=x11-plugins/gkrellkam-2.0.0
 	>=x11-plugins/gkrellm-leds-0.8.0
 	>=x11-plugins/gkrellm-volume-2.1.4
 	>=x11-plugins/gkrellmlaunch-0.5
 	>=x11-plugins/gkrellmoon-0.6
-	wifi? ( >=x11-plugins/gkrellmwireless-2.0.2 )
 	>=x11-plugins/gkrellshoot-0.4.1
 	>=x11-plugins/gkrellstock-0.5
 	>=x11-plugins/gkrellsun-0.12.2
@@ -26,4 +26,5 @@ RDEPEND="!<app-admin/gkrellm-2
 	>=x11-plugins/gkrellweather-2.0.6
 	x11-plugins/gkrellm-countdown
 	x11-plugins/gkrellm-trayicons
+	wifi? ( >=x11-plugins/gkrellmwireless-2.0.2 )
 "
diff --git a/x11-plugins/gkrellm-radio/Manifest b/x11-plugins/gkrellm-radio/Manifest
index 27b60e0d38bf..cc5402d8b2fa 100644
--- a/x11-plugins/gkrellm-radio/Manifest
+++ b/x11-plugins/gkrellm-radio/Manifest
@@ -1,4 +1,4 @@
-AUX gkrellm-radio-2.0.4-makefile.patch 554 BLAKE2B ed67079c01041db8fe8e5d53e96469286d9f04ca02fc65d380665622ae3060e9b9289caf1617c952f4476a516a3971e9f5a760cac48dd0221466d35b9b410e41 SHA512 a994bfb44d8c3d1844d309d792c1084ffa5c2bb37769b714511fb90f626ed9d636d8720bb32dd536c3ce616dd25ae460ae831099f8a5b5dc6880d382b2d949ff
+AUX gkrellm-radio-2.0.4-makefile.patch 482 BLAKE2B bc4ec0fb4ac7403ae2200808a956ce01015d713f5064eb8d25e0357606bb6ae4f01d7e12eb390e6a15423f5953547ec447b3e8592f5f8b25e42fe9d115cd1e25 SHA512 12552a5b551a5f335105d9bad9e946571250d6b0dcf868d9b39d68739112ad8ade75471c9f4bb3c18381913bd5658d7dd654aa0c721d6ae5c77e124bb277d6c5
 AUX gkrellm-radio-2.0.4-r1-pkgconfig.patch 578 BLAKE2B 413c85c649fb5e6bc2de13930fdf73a122cc6edce40681d0fdaa8abb6df0038dde448a7f149936070c17ffd39ce2f4946417739b686836d15d6914e1b745b8bc SHA512 c5b31868595d8adcc8992afe439a7805557dd9e0322d653a9c2dac7b4e9134efc96e17bc802cd8c4bd0cea2f803d6d899491db0b24dffb06474b7beabbf1fad7
 DIST gkrellm-radio-2.0.4.tar.gz 15685 BLAKE2B c23d9627e503f0853bfd403cbb17c5550cc572540f1e7544179a57501e5793fe19aa654d2b622d34aa68765d89cbc45810b0fececbe9e9a0cfe810795b918406 SHA512 0e5de0cc114c915dcc78f3588766a0a6d9c7bd75da5626fbf7959e539c1f505babc94a0054cceb5a67c8145174d49adb331eefae69ba1637c9121ebd630998de
 EBUILD gkrellm-radio-2.0.4-r1.ebuild 770 BLAKE2B 9bc5ef68102a630488977ec8daba00922641c152a39b3c35da3adc0cebdc31d0b8885555ebd64366858fb8dadd9cd231db91dada7b079128e7ec9b74dca33097 SHA512 ccf439c6e37d029c135ec6914cb7f715d9d6ce443b71806341e1cc7eddb7b6299ed75d20a37a184c3e48d609ba36e22d31c77b47974d8c3ec535bad744e33062
diff --git a/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch
index a5fcabfea07b..e718366fa093 100644
--- a/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch
+++ b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch
@@ -1,5 +1,5 @@
---- a/Makefile	2003-09-20 13:02:15.000000000 +0200
-+++ b/Makefile_new	2013-03-16 14:38:19.122375762 +0100
+--- a/Makefile
++++ b/Makefile_new
 @@ -9,8 +9,8 @@
  
  DISTFILES=gkrellm_radio.c radio.c radio.h videodev.h README Makefile CHANGES
diff --git a/x11-plugins/gkrellm-trayicons/Manifest b/x11-plugins/gkrellm-trayicons/Manifest
index 48fbc03bc0c1..a8badf68976b 100644
--- a/x11-plugins/gkrellm-trayicons/Manifest
+++ b/x11-plugins/gkrellm-trayicons/Manifest
@@ -1,4 +1,4 @@
-AUX gkrellm-trayicons-1.03-ldflags.patch 743 BLAKE2B 078ee5216b432592b136f812e24282c4e001d2399a11ce6768cf2122f24b0a90e169f51a7b4aa0b44b4e3b02b28669f0008df0177e1b0aedbd58deeb19318b1e SHA512 e122db6d9ae37a17d58c3a065f4b2210bf7e8f6832f8687c60efc54145fddf2e1f6898927b699f64194382dadd035710c7e3540221c3e229ec26d2ca8e01e785
+AUX gkrellm-trayicons-1.03-ldflags.patch 671 BLAKE2B da9dbdb827a300f6e01c4e5b112a6d8682e8659030396b7d341e285e2dc39025c517582028c4c7a0a17218853bc54ee97fcf69bc65ea64bde4ef7af561d5810a SHA512 b4a74fe9a0cacbcb4b4fa49f9d8d4248087dad05678405320734b23f321f7a6d11d2baa779e1a3272217e8f64a862815fed9376b3e63041b488faa145fc1e5bf
 AUX gkrellm-trayicons-1.03-pkgconfig.patch 574 BLAKE2B 40208feccf98cba8682bfad297117a71d33ecfa613ba00c3a52233a6845dd5065c109c93ea5ff31e0c3dff51ace4eadef9e80fbe2d8f7b433771db84b3fc199e SHA512 87f246a1e8265ba8c8a33d9675fd91f8b1b18b5f299bc17e9dc6c7e9a062a8e7e542aac089faec7d6a671880cf0df054e102b5f49ca19bbde17ba837bfe17ca4
 DIST gkrellm-trayicons-1.03.tar.gz 185474 BLAKE2B b291c13785e7c42e3e14ef987b4c29f47d91f993653653215afb254415827c437be32aec55b2c1465a8c6de9f08bd575c4b394b1d72fa46f5573ff29b57fe31f SHA512 2f80c7b18453b3cd9694dbd9854ab88fa94f4b4de52e779bc2fb7c13633deec096d0ed0146da3d52567569df9466aa64512f870b6e142a784779444a3e6a4a4b
 EBUILD gkrellm-trayicons-1.03-r2.ebuild 669 BLAKE2B cb20ad846e87e95ccc2f4005c091f7ebf8374bb11eeaaa3233531a24c8288379d96d162befc34ce4dd338814a68b1a685e59111c0f8228ff16aa0bb1e5c60f97 SHA512 06de2d29311126000dea31bacf8d557213c2c2ce44e60a54f4629bbf841f0e36204c231bdf7b49c7872fd0ab8e1ca5a0d01faf55ab06083ddb497d53c16f27d9
diff --git a/x11-plugins/gkrellm-trayicons/files/gkrellm-trayicons-1.03-ldflags.patch b/x11-plugins/gkrellm-trayicons/files/gkrellm-trayicons-1.03-ldflags.patch
index 92764a9b32af..06d28eed9ea3 100644
--- a/x11-plugins/gkrellm-trayicons/files/gkrellm-trayicons-1.03-ldflags.patch
+++ b/x11-plugins/gkrellm-trayicons/files/gkrellm-trayicons-1.03-ldflags.patch
@@ -1,5 +1,5 @@
---- a/Makefile	2003-11-26 00:27:29.000000000 +0100
-+++ b/Makefile_new	2013-03-15 21:36:05.331857288 +0100
+--- a/Makefile
++++ b/Makefile_new
 @@ -6,19 +6,18 @@
  GKRELLM_INCLUDE = -I$(PREFIX)/include
  GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
diff --git a/x11-plugins/gkrellm-volume/Manifest b/x11-plugins/gkrellm-volume/Manifest
index d78597c694bc..40d6fabb89a8 100644
--- a/x11-plugins/gkrellm-volume/Manifest
+++ b/x11-plugins/gkrellm-volume/Manifest
@@ -1,6 +1,6 @@
-AUX gkrellm-volume-2.1.13-makefile.patch 1293 BLAKE2B 1372f887a00955ea23789a9ff0ab1716544339cec69f6172e75052d08ef51ed88b5ca9b53a031e92e46d1f6b737115e08bc69c983a832a6e12165a26b50fd89c SHA512 2e4843be7f03b17fd7a496bc31509d83a6733e26231fcae683fcae4abb7ce21fb1465e2f5aa6d813d1f9fc449c4a8cddc738e12d6d93394fc472e5976d05fd4c
+AUX gkrellm-volume-2.1.13-makefile.patch 1221 BLAKE2B 965486be767ec96654222aafd9daece1c6ee01e7105e5e453b94d9fc448c6cf67f7ea4fc3b4d916627797cf89980eb2c7ec1817c6da1d836bf8614e98d52730b SHA512 eb1d4bf99f0c47102a7b163fa1dabe5eb66f298fdf60f9dfba8ddde4e8f23cff71efa2b66d728fa535393f37122e9336fbde6a6a5b1adcac0d6d50c81aa50162
 AUX gkrellm-volume-2.1.13-r3-pkgconfig.patch 744 BLAKE2B 3ef577e7a47fdcee80a54f88edc88ce40fb0c0b7374c0a6c05793ca83f63774f0b943c06c3c5937e2b981a2ea2d6578d0c29806ae3ac65b8ed04a2a8cb31e8a8 SHA512 a116b37631924c1151d8ddbff030826f043f14bbde715b26fba6e397674825efff770f9f99b83e59ac15fd7af371e51c072432a5b636dcd08714f0a0258fe8c0
-AUX gkrellm-volume-2.1.13-reenable.patch 463 BLAKE2B d20017a62eacfa42a9186697d98b02ea2924eb018b71cec952f5b7bf459f8ce20014ca6aa24de8f41bc08a295658596eef14faf2fef8bdbf9869d15311074c40 SHA512 e3d37f60094da39717309d3cfa644f51c0802dac624ab18e97a1303731f3c9c62561a9ab01e56d70af133fa0b8720fcd88eec0e4cc4bf53b312df997174b1a8f
+AUX gkrellm-volume-2.1.13-reenable.patch 400 BLAKE2B bdbc390634eee460484f2c87624d375ee9f1d6cee94781982ab5360a3e2917e611be6e923cbefa935d999445706020e74e190aa260b2371f65a73ee5d17d4c80 SHA512 4a78e7124bf2ed8ea192c71a74b29939a99337766a71f3517f4c245ab0c970781c7bc2e7e3016f2d5d72cafc8913f1efdcb1fd33b86178967c504186a7f2e66a
 DIST gkrellm-volume-2.1.13.tar.gz 42087 BLAKE2B fa4641a9a618ad341c81069231e7edb69390b82f2959f416d1f2c9cb757fd554a942c8e002330af06cca9a53b01525b17a2e913a86bd7a53d3875e43a95c8c5d SHA512 4f244978ea8b68994540b050244350c7c2389b227541822fde009408378ce0511c32956daea205465a4c4890c68e47f64dcd8b3eca8901963d38fd1852526eb5
 EBUILD gkrellm-volume-2.1.13-r3.ebuild 839 BLAKE2B f9cea61f732a903c6bad939d421601971a510a07d327d4ae9ddffe9900be9ccc8a05b7d1e17625f9367bad897854ac3bdf51e780eb315ae993f72475b4a830c8 SHA512 82a3c5208a0a0ca43a47d377ca615d79d93b5a8b65344bd849b6c7c4790e2bbbb9a3d4c887e9dfab1bbd843ed1181274e82a83f7e69539c857a3c90a63ac7942
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch
index 23d822ca7fc8..cc0a16e31b88 100644
--- a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch
+++ b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch
@@ -1,5 +1,5 @@
---- a/Makefile	2004-08-19 22:07:27.000000000 +0200
-+++ b/Makefile_new	2013-03-16 21:16:03.919755685 +0100
+--- a/Makefile
++++ b/Makefile_new
 @@ -3,7 +3,7 @@
  PACKAGE ?= gkrellm-volume
  LOCALEDIR ?= /usr/local/share/locale
diff --git a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch
index a3e3218dc02f..6aadd5c9248c 100644
--- a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch
+++ b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch
@@ -1,5 +1,3 @@
-diff --git a/volume.c b/volume.c
-index 18418d1..58708d4 100644
 --- a/volume.c
 +++ b/volume.c
 @@ -74,6 +74,9 @@ static void remove_all_mixers() {
diff --git a/x11-plugins/gkrellm-xkb/Manifest b/x11-plugins/gkrellm-xkb/Manifest
index d0dd700fc601..b5e3c22e99d7 100644
--- a/x11-plugins/gkrellm-xkb/Manifest
+++ b/x11-plugins/gkrellm-xkb/Manifest
@@ -1,5 +1,5 @@
-AUX gkrellm-xkb-1.05-r2-pkgconfig.patch 822 BLAKE2B dd522a931ba9fa01917afb9b1939078acc1dd65186bdccb63d3b861718290fa6765f69b37f2550f8d79088492688c01b6471f0700ee3266c91ec12c09ebaebad SHA512 e20e30a46e62a0f81b33a23eb0e120032eecdaa3f793c9bca9bf29e0faef4b277182c80b8f7ebf54b1675d57026ec79cbcb5d39fb200f3d13761402f432cfb47
-AUX gkrellm-xkb-makefile.patch 1030 BLAKE2B 24b53321c36b974541f77347a38da677a4b8b91408e7cdfb5de6f44bc07c3be9ff338937a957c3e9dcc1c6795d96addb020f4e5f4776d1c048dac549be9fd6de SHA512 2a9e3959ad0920126f1c93193f76b087590f5428fe2b8d1cd66670343547ed8030937723b4a0a71e620d1ac518ae4a36231aced63d88171976ea1cf1d3c2c4b7
+AUX gkrellm-xkb-1.05-r2-pkgconfig.patch 684 BLAKE2B d1be352c6293e1055a1d108cc10bfd66507e1b3b43426a708fa9061e2896f4c4ebc2c0c9250e62cf543b9f75c67da54a1fc233d3e52bfcf52d4b53a0356bd350 SHA512 ed9856366636812a403e461ef4a0391c4067ddfbda8a0d79acbf8b4be29943c239eb724ad677807ca6540b706a10d9578e2748eff614c6dc31ee86c151df835f
+AUX gkrellm-xkb-makefile.patch 958 BLAKE2B 9469ebdef0db9ec9f9cb0172b437bd53505ee44f46fba05108e5d91c4ee6ebf760cd4358be74e12e58b3ce9399537d5a3d45bf7d77f7db5582d9148f6ea8d279 SHA512 ea72f29b709bddf68e84347d4d65af99b5de71d548a0ef2c96c18ec4e04fb4bea57090edcdda3613cf77886b1e5c8fbc382c4ed004fd511b2f90c2b4ae9372d7
 DIST gkrellm-xkb-1.05.tar.gz 37775 BLAKE2B 5b074d2777c250d1f7aeca4402401f36f7aed29ca2c7bf286348e73687b85f53b152b4cdb862c38ff7325a718dc694c0a921e8ec3ecefb52ad6646e1345a2101 SHA512 451c66c875af8dcb6998ba1b6242332002328b81112315cd6eee453612cbd8e23f78d7b829224d623cee90b08445b721dfd60e2483a710f4f97860c82654ba2e
 EBUILD gkrellm-xkb-1.05-r2.ebuild 675 BLAKE2B 4f123b3f914026e6f530ab0dc92232b9e89996d14ec2cc4418410fd231cc95cd34cc6abf915fed402c3d411a12f65ce71c4892bf06b71a56c8ef2689d5432e03 SHA512 4f2516e75db70d7fb2b62b2a46404e8b192887688d38cd149ddfd4443f57fb83cf30e9fe582e3f6fe4ec7bc1312466b44009356888949cce5c9d4aa8a0d770bc
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-1.05-r2-pkgconfig.patch b/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-1.05-r2-pkgconfig.patch
index 59208c8814bb..55ff0e67e880 100644
--- a/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-1.05-r2-pkgconfig.patch
+++ b/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-1.05-r2-pkgconfig.patch
@@ -3,12 +3,6 @@ From: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
 Date: Sat, 26 Mar 2022 16:08:49 +0100
 Subject: [PATCH] pkgconfig
 
----
- Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 13f2dd3..a63b4ab 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,10 +1,10 @@
diff --git a/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-makefile.patch b/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-makefile.patch
index 425a0a0417ee..7c309be95b60 100644
--- a/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-makefile.patch
+++ b/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-makefile.patch
@@ -3,8 +3,8 @@ teaches the Makefile to support the user's LDFLAGS.
 
 Gentoo-Bug: 338786
 
---- a/Makefile	2004-01-05 07:34:36.000000000 +0100
-+++ b/Makefile	2013-03-15 22:11:58.105227982 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -5,18 +5,16 @@
  GKRELLM_INCLUDE = -I$(PREFIX)/include
  GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
diff --git a/x11-plugins/gkrellmoon/Manifest b/x11-plugins/gkrellmoon/Manifest
index 40e6c249f305..ce0b2f57d278 100644
--- a/x11-plugins/gkrellmoon/Manifest
+++ b/x11-plugins/gkrellmoon/Manifest
@@ -1,4 +1,4 @@
-AUX gkrellmoon-0.6-makefile.patch 798 BLAKE2B 2d1925d08e44e7fecab8bbf2c810e47c082d5ad7cbc94dccca88009585e825201bd007a87f7ecadba4b74b6ded2b5238e0a04d0949d2637db758065f04e379a9 SHA512 3e167144eca00fe855a7dd04a90b9a8eae7f3297d980fd838bd3391fa67f5e19af2de791e32669e24748552f33dcae8dd81766d43297d73c11e8ef16b1d74436
+AUX gkrellmoon-0.6-makefile.patch 726 BLAKE2B 4368d421e0656a45b85abfd22e24e5eb8f83b02210b31464e79287e0bbec0b18be159e370a4cc8106429b7370cca63f2ec785a53974febc12e621ee7c0cadcd0 SHA512 5a0e45db775c93264e2dd5e605006c90410953bf3c98e2ccea9ca0e2ba1e2b0258bd86d16c908aa77bef98712489dabf32703b6f688970c11c6dc75e57d44855
 AUX gkrellmoon-0.6-r3-include-stringh.patch 215 BLAKE2B cf7aa48b23f2196828b4e0d23a89c5f6074f5c6468d060e590fb175460ebcfb47c14096d0e1238d99f956092048df472b2a804f0dda56d3a746a77929ca4b56c SHA512 206fc699886bcfeb7c95c78a3cd3a958104c90fc981613af449183c5fa8c0993024063d9a7a43a3f389e7acbb8193403b5e4ea5163672ac5e26b813f8a8f9f61
 AUX gkrellmoon-0.6-r3-pkgconfig.patch 343 BLAKE2B 9dd91d5211957afa35070754e395ffd1efcfda5bb3631eeecb03f0bb6ced9de4f41d6938bedd8a1036502cb9fec38228e1a466e94f35997b39bae13f97cc49d4 SHA512 158a50c8569fbc012e7395b3858905563c258b0009666b4a7abb78d36cc5e4949ce6d97a10a01c4bc74fdaba4c095a819a750a0833350511a033a5b2fd285ea4
 DIST gkrellmoon-0.6.tar.gz 55035 BLAKE2B 1b72ffbb3f08bc7264d86cb1ff76ec65d79a5552c4857758ea5caffa8023fc1be4ff9fdfcc812ac48284af66c97fd4e4c6e3c19c0725cb422664621e3bd3a40b SHA512 d0f1008b4501c412817168f751c1d948dc4fdda97572a85c950c7595dfdb0466be964a04ccd8eb31b1bfd83709607fe6cb422ec15d144ef8615dd9700adf127d
diff --git a/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch
index 4f4bd0e403f3..7cf07197431f 100644
--- a/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch
+++ b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch
@@ -1,5 +1,5 @@
---- a/Makefile	2002-12-11 04:36:06.000000000 +0100
-+++ b/Makefile_new	2013-03-16 13:04:00.963512605 +0100
+--- a/Makefile
++++ b/Makefile_new
 @@ -4,23 +4,26 @@
  INSTALLDIR = ${DESTDIR}/usr/lib/gkrellm2/plugins
  
diff --git a/x11-plugins/gkrellmss/Manifest b/x11-plugins/gkrellmss/Manifest
index 1200ab83b5d0..ba0a8e3af1c6 100644
--- a/x11-plugins/gkrellmss/Manifest
+++ b/x11-plugins/gkrellmss/Manifest
@@ -1,6 +1,6 @@
-AUX gkrellmss-2.6-Respect-LDFLAGS.patch 498 BLAKE2B 2eb34f01a8f20325f34ba6176d68046645528fd7cddd3ee342be5df4c812e7f986b0d39d6a25e1d52d9521ca73cb30fc3784a1cf0aecc634b0618b3c09240bbd SHA512 8c050353c212ea0791b7e5160ba720ee1e91359612565bc9b074424de8d2da93a581696d54ec5210265609267c767eb8d5bb0678dcd9e1e9d7d61648a626e472
+AUX gkrellmss-2.6-Respect-LDFLAGS.patch 348 BLAKE2B f694daaa959412a095b54389089628821d50d1fa23ae011b0673c717d8709676a1d7753be4a3e78f32987ed68a17f3111e7091a80c131eed30e7b9276829a71d SHA512 7bdc12afab413786d2f40c49a950ef98e6a31798dcd4601fe5a9e09e5fe1edb924b9c42467a8e11e839e4e4ba3c269a82c701bd79092e86ce507417ae4f277f1
 AUX gkrellmss-2.6-fno-common.patch 195 BLAKE2B eaf45029a236aa63ac216d3a2d6e7f8481626b20f4caf3e5d24f83a09608c967cf162b261e87148911a72bab933ca799b0698f82971f90cbe156e1849d737e7d SHA512 40efc369491339139f8b54652aac155a995a078968b19d3a445d593510a655cbfc67098c0c8656ff22e5a3662824b3e9049d50a90a2a4c87b204887ad369206b
 AUX gkrellmss-2.6-r5-configure-makefile-fixes.patch 1656 BLAKE2B 37e96fc95069e98b8cb50ee7724b1ce733051d7ca9a6e500f3de00277ce7af8739ace3b9f3364fbe0e2f578894e684c2029fc4d66ef3f9e1baf184bfaad07894 SHA512 8a25784b09b35055c1c46f6310b8d71d009c9b95998119d562db93c43e57bce76a7dbfc8fe810243cea632e6ea6f197825932b59fbde718f4001f1d20ebeb464
 DIST gkrellmss-2.6.tar.gz 32082 BLAKE2B 73164229fbbf08fc781bf697653be19a41b63df46ea7fc2aac230c74ad042809f2f33d199a08ccbe20cdb5610ab2350ee32ec2a09803bb71e367d21f18e752bb SHA512 d9773cfed6e4de006df32102419773f9af5047e3fb5e7aa4c7a686b4775c3af30c14321fe404aa65ec27eb13bcd849dbd25ef4eaa2daa723177040da05c74f76
-EBUILD gkrellmss-2.6-r5.ebuild 907 BLAKE2B 39c467cbc112f9b4dcdcee5c1ab64c32ff6a2728da42ca9c91a461d783b6b2ae0e846b21e51f339cb55a5a7d8c65d38381d625db0da0a72a9bf42aab30c09611 SHA512 54b349fe646f458a0fe4d288b2c863da3e5a8099674f2b7e93a65a0f32957a5eeb68ff758ee852b37e352e597bd36dffc1b5fd77cbad0453253492a404c27e0d
+EBUILD gkrellmss-2.6-r5.ebuild 923 BLAKE2B ee16daea5ef569acbbde2225933229569d5293b629e15adcd7b737881b82083dac649057cd5423ebb6c2462ae413ead8ef3580a340aa9b538aec3fd3a94b5534 SHA512 9d10eff9c13ffc5514e44645819906f6eaea7b1081797ef8889bb0bc28ed27afc44e401a57fff91932cdbd06713475528ff63ece07160b4550b6d648d43b82e9
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch b/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch
index 59f1d0a200f9..83bcb283ff0e 100644
--- a/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch
+++ b/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch
@@ -3,12 +3,6 @@ From: Jim Ramsay <lack@gentoo.org>
 Date: Wed, 11 Aug 2010 08:37:20 -0400
 Subject: [PATCH] Respect LDFLAGS
 
----
- src/Makefile |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index e618bd4..35a1453 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -78,6 +78,8 @@ LFLAGS = -shared
diff --git a/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild b/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild
index 44913edd1d6b..889ef6c0d0f7 100644
--- a/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild
+++ b/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit gkrellm-plugin
+inherit gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="A plugin for GKrellM2 that has a VU meter and a sound chart"
 HOMEPAGE="http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html"
diff --git a/x11-plugins/gkrellshoot/Manifest b/x11-plugins/gkrellshoot/Manifest
index 9c7d59918197..628b098e58d1 100644
--- a/x11-plugins/gkrellshoot/Manifest
+++ b/x11-plugins/gkrellshoot/Manifest
@@ -1,7 +1,6 @@
-AUX gkrellshoot-0.4.4-r4-pkgconfig.patch 657 BLAKE2B 83d9168314c216241894fc7ef354c8e271d1a551d4809bb03aedc7265314778ec3ae08f9bcf5070742fe45e40b90769cf7691bc27223cca7facdc3fb429adfb1 SHA512 02afe801966bc62dbd90cf573a25c196e0b4f4b3c31c98a464214cdf52dd6b09d5e686e04226160c90dfc392005e0ba9d8e4b1beac83f54693d7af6c520a3f87
-AUX gkrellshoot-0.4.4-r5-fix-implicit-int.patch 582 BLAKE2B 6fe1af328d8680f335dec6a6964c2ef72750364bbb5eccebf7fca16c25802253531bbcd1061eedeb4574c56fc75df9ad32e03198b34f046a632b1eb0148556c3 SHA512 c7968dcbadab4f3f32d4aa7dea896b950146bac822a32f09823cef52a6b13513d339163b11984f693b23f9d98ae33022148cc9edea64e2caf586045c3143a739
-AUX makefile-respect-flags.patch 663 BLAKE2B 1129e147524560fd8a5ff2979453ed9aa0a8abb03b940d989106f18f887b571cd09a72454da05325b94c369ee72c4bfca2981945910ddd6e7c3e9ab1fe35b0cc SHA512 a58b16f0b95533be587f2fe1a63ba7c19ade8dfd9b432d2423aee3ff7b99789d662cb7ed0e04854ed1b315c106586c4cd527427b5ce395b3bbeffedf2c5fff80
+AUX gkrellshoot-0.4.4-r4-pkgconfig.patch 520 BLAKE2B 7722fc94cf39453442dd671a5b90bd2a08a3c35081a584d2cad6e7d4dc35123e6cfa4087697dcb45b1a88318ea7be8505c45aafc36ea0c443bfd8887c70772a6 SHA512 3c3256ddc34ee0a93f4ed3d608323c53f7ee4cdff2339d90eeddf3d181503b39ce8d3b565631f4627d9a9d5832cc57235177fe1f6e7dc341896a3eb0695e7c6d
+AUX gkrellshoot-0.4.4-r5-fix-implicit-int.patch 435 BLAKE2B add22b30afd5d8c6859a96dff690eace7279a8b68bc5cb2f904cb728bdfed8dfe53817908e9768c8929ba8a7936fb2a12b33b86c3bc9c8843d741b80b2f59155 SHA512 7035d72ec0562480033590d0f09fd316895a7279c6636281d94f4ad3a8460a802d4b00320be892c8920c62e2bfac7bffa57b01d4831fb4885cbb4b7fea73063a
+AUX makefile-respect-flags.patch 591 BLAKE2B 1292c511830ce2d3cef2fa3946e079d6ddac51e01176f5df80577190153bb77d9a1780bfd0371b1deae5060194b4ecc3a8eb4ca49220f97e3f26428d8a3ff4f9 SHA512 b35f49b231aabd80905db10350aabea42b19e8691fc8dff10bf85f89833b6f562b6dad53f61113fae024d40ce12c652fd7c55979696fb8b87af230884d76f322
 DIST gkrellshoot-0.4.4.tar.gz 16556 BLAKE2B 417217ffa500d8b0cc4ddd80849b2da83e3e55bc489db83fd7c8992f42af9ebb385c1ece17cae65cb7393bffadaaffd70e11a4dea16aa4d2b2f19e0b828a6833 SHA512 9363c045a99c23f8fedf95ac82c7bab4ce21acb675fdabdd831f174d9816a14a22ed6d7048d475b4c4199b9e6a88f3f663702ac2f9304f08860339beb323322a
-EBUILD gkrellshoot-0.4.4-r4.ebuild 667 BLAKE2B 11ed230548f847cc54c2e92ac257d8fbce8ca8bf6f043b7601c2629824ee7d12f93c84ca696ba233a09abe71f21b292d9d79166e5f35d2c48ca776cd3d1699e6 SHA512 65a5c296d64ccf7f43b2edc643bc3da84713b7d3357f43dbc87e8a40cf9f1e4c81c6daf3b999924b6cdf11af411c75373800e7c5c928239c8e8f870939ce51d7
 EBUILD gkrellshoot-0.4.4-r5.ebuild 713 BLAKE2B 7d5f3a720b95a7becb5aabe1b8293170533fad741307b13d5ce71408b569cc2d09464d120a0371bc3b202f91dff11509a19ae83380c92aab5948d66eaa9434f0 SHA512 039444a6234681551ca983994303ab6bf676c37d33e1c93e9ce5312b4e64dad8d3759c73b5bfe329b880c92841109425e87e0507b821618c658edbcbde4243a7
 MISC metadata.xml 249 BLAKE2B 3035b160871880c8efce1239c00a3560c8c7b2b8eda5ebe8dab078c77496de9815444cdb9e7440687681828490e7684c2794406444eedf71fa380f5cd3c35b05 SHA512 01584093d9f32130ab091c0101ca41fba98d46fc3670c9598f052ef4393659bc8fc964d4b6232c7724eb7d0e03e32901b231799a595fa7f6626b3367dd116a68
diff --git a/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch
index d6dfb54e4354..1f3186f652f4 100644
--- a/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch
+++ b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch
@@ -3,12 +3,6 @@ From: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
 Date: Sat, 26 Mar 2022 10:32:18 +0100
 Subject: [PATCH] pkgconfig
 
----
- Makefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index e5a4895..296f807 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,5 +1,6 @@
diff --git a/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r5-fix-implicit-int.patch b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r5-fix-implicit-int.patch
index fae0a519ba05..f9ee064b0a73 100644
--- a/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r5-fix-implicit-int.patch
+++ b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r5-fix-implicit-int.patch
@@ -3,12 +3,6 @@ By default clang16 will not allow implicit integer declarations in function para
 Bug: https://bugs.gentoo.org/874891
 
 Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
----
- gkrellshoot.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gkrellshoot.c b/gkrellshoot.c
-index 114a85e..0d74d1d 100755
 --- a/gkrellshoot.c
 +++ b/gkrellshoot.c
 @@ -436,7 +436,7 @@ double star_screenx[NUM_STARS];
diff --git a/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch b/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch
index 8de89009dbbc..9b3dd81c3d1b 100644
--- a/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch
+++ b/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch
@@ -1,5 +1,5 @@
---- a/Makefile	2006-12-09 04:24:36.000000000 +0100
-+++ b/Makefile	2013-03-16 13:50:00.147834790 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -1,16 +1,20 @@
  GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
  GTK_LIB = `pkg-config gtk+-2.0 --libs`
diff --git a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild
deleted file mode 100644
index dff19004a2c3..000000000000
--- a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="GKrellm2 plugin to take screen shots and lock screen"
-HOMEPAGE="http://gkrellshoot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gkrellshoot/${P}.tar.gz"
-S="${WORKDIR}/${P/s/S}"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~ppc sparc x86"
-
-DEPEND="app-admin/gkrellm:2[X]"
-RDEPEND="
-	${DEPEND}
-	virtual/imagemagick-tools"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/makefile-respect-flags.patch
-	"${FILESDIR}/${P}"-r4-pkgconfig.patch
-)
-
-src_compile() {
-	tc-export PKG_CONFIG
-	default
-}
diff --git a/x11-plugins/gkrellstock/Manifest b/x11-plugins/gkrellstock/Manifest
index 6d512ea67074..37b501116922 100644
--- a/x11-plugins/gkrellstock/Manifest
+++ b/x11-plugins/gkrellstock/Manifest
@@ -1,4 +1,4 @@
-AUX gkrellstock-0.5-ldflags.patch 412 BLAKE2B 93761f0b972727b6b20a74ac0fd14ec2f359557f2067a53ee7ced7d63f6f33921b58554597e2d50d0f3dfffb6dd9812fae9a1458ad610ceb7b00d06ab959dc28 SHA512 626b1953988ce00d76270a779fcf7c5a2c0b599cd57ec0873ce2328c6cbbaaf7042cb8d608da9b0398205d29879c37ef9179edadf980ad5601b6eecac5fb7613
+AUX gkrellstock-0.5-ldflags.patch 349 BLAKE2B c9e0f3f2a4a585816a8ac9ed216e6e27ae778620220e0c2f76d62b57e9350647c7857152bb5f6fd19d8407a53caf552a63c6f4b304851b627d1abe5b69cdd17b SHA512 a8c7215829bae74d7688c2038f6c784bf65223c885753f2c0bf4b85d2bd72f8407846a261b8df5cb5c1093157e4982ce25b628e27d7e838ce32d42c967e32ece
 AUX gkrellstock-0.5.1-r2-makefile-fixes.patch 738 BLAKE2B 27138c0c06fb68afac1c9969cf622fea840306ae43d560473c8582c72ffa1ef6b8cde669c44f987632902019323b3b5f4cfc02f2b194ebbceb7e0d1f58e726cc SHA512 82296fe20ea73cf946ffab587045a8aa8f5786cdd95eec231ecc7dc4f677b9b9f15cfc19c76cbaa756658aa77335795cb731e2538c83529e7f4ea7a14afd862c
 DIST gkrellstock-0.5.1.tar.gz 22385 BLAKE2B c948651631aba700a23fd3ef6c74b564662383ee2bb69cf9ee8a3dad2f35d9e45ae6839f0c576aab0f0aa9eb296ba624bf3077ba2312a6b853bf7174fda6a25e SHA512 040e6271a0b0ca3f7be52cc64076a8d1b538fc7607a9ae54acf1c9dc176b094c1483b10c1813a929dcf47dff4fee8c18b7ca58472343c83edfa58a32edc7776c
 EBUILD gkrellstock-0.5.1-r2.ebuild 890 BLAKE2B 9a4d67636500d4e95ff945b6133f423ec39c2571715fa7b3e62952f08a32ad34f24c3ca95f6f5c09d6a107eae3c13548b56ac87ce9f37b837ea490531938cb11 SHA512 dd97679e7e38ed96d9b4daae4e576552f525553e01efd2da5af0db54d67fef5ba3faa949b36f76a64a2714cf8e263e554ed773b9c926bce2ec2f7a08e18da37c
diff --git a/x11-plugins/gkrellstock/files/gkrellstock-0.5-ldflags.patch b/x11-plugins/gkrellstock/files/gkrellstock-0.5-ldflags.patch
index 116e6ec3e4bd..6ef942944ea9 100644
--- a/x11-plugins/gkrellstock/files/gkrellstock-0.5-ldflags.patch
+++ b/x11-plugins/gkrellstock/files/gkrellstock-0.5-ldflags.patch
@@ -1,8 +1,6 @@
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/Makefile b/Makefile
-index eb26b17..79e4391 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -10,7 +10,7 @@ CC = gcc $(CFLAGS) $(FLAGS)
diff --git a/x11-plugins/gkrellsun/Manifest b/x11-plugins/gkrellsun/Manifest
index beb83c6d5ade..2970ed94770b 100644
--- a/x11-plugins/gkrellsun/Manifest
+++ b/x11-plugins/gkrellsun/Manifest
@@ -1,6 +1,6 @@
-AUX gkrellsun-1.0.0-Respect-LDFLAGS.patch 334 BLAKE2B 18bc916fd4d6834731cc02a720347a49a926f57f8477c8ee91bf9711b92aecc85b427a77d53edc6658ffe6b918b61b7d52a0ca0d7215b2008ec71710a34a985f SHA512 093ab16f6852b9a75a9c2e31a7ddf3ad6a407fd5c0f881340980f3f59b3c9abe10fa1855e09e9a73bd53cd3b3d532e3372bb227d95614e7fcbc014637c3ee906
+AUX gkrellsun-1.0.0-Respect-LDFLAGS.patch 259 BLAKE2B 096b8d0ea9f27909ec5662f9e8d093c4b0df017668a5ce1d16e2410248ee73190b0291e67eef0a4fd38b051375503a5c3ace8c4b5f732bad93609944b8af9c59 SHA512 f1cd7919717f3eebe3482d44d82d98ee197fb95b1a198c649c88bac1da330cc2fcbdefeab3d7cfc09cb804bd6f5aba21bd73477b91df01c79d7d918847b402cc
 AUX gkrellsun-1.0.0-r5-makefile-fixes.patch 1508 BLAKE2B 558c23011152de5e63dd2238f489d34a06b20026a21a75b5b7bcb1f5757c826d1853a384949bc56622cdb98e39e0c5d7dfc816514e70ee6bb6706e85fd572556 SHA512 b2288158dcaaf1d9df341d7cac5b5e1448ed85d81384efb7e5f4b8dc2bcd28765be315c27cf35523ca5bd7b233726821a16f3b86b5150ff5c7faad88633dfe04
-AUX gkrellsun-1.0.0-reenable.patch 520 BLAKE2B fab0e90b893620b8d1724e21953845fbbc990948712f25ff0f4903ef51bcbcb00f3d3989cc8f9cbbc515daff3391c14a37a260f07309f3fe400915c293a8eefe SHA512 e4cfba81e20e08f2fc5fd005e5ff2e630a90f2cd1743334440b7f78f2de256959347d93f9e1c25416b9d151dd5465087dbf3e39a30429023cd9e9c635dcda229
+AUX gkrellsun-1.0.0-reenable.patch 439 BLAKE2B 39e7a365ceed5d355ac296910774495f0b725151011cbc8ac603f5d6773288b67de72307d314ba26d112d24f5654aa95a25c7b9f8e02e3bfad77eae6e8515a5e SHA512 a963b8aae820dc63eaac45f4fac4999ed2cd221392b89858f7a5418dfc435022e2d8116fe6d15e2a4f8e0f454ab8d9b92b013cf8a7420ce031049b58472c06c2
 DIST gkrellsun-1.0.0.tar.gz 96970 BLAKE2B aef5bed2a077c7dccb8573bafa9a14df53c52522872d77d08b6a8d29c824d3ef09c54ea5d0b6268dd502508fed264ebc250bd558a602e41dabddab9556158668 SHA512 1a34812e94f16d19311c23d44a0353dade50b802dd3ab115738959b9322c3bc6a28daa2bcea889700e6cc2ff8eb9400b989bf02c6f138bb878b94118ffd6e27a
 EBUILD gkrellsun-1.0.0-r5.ebuild 840 BLAKE2B 57000d9e534b6b040b84a414ac44a376fa48f98771339cf48c43a7c9e38be420da7a55cae62c9f8e6c16da007a98b86c56f8e458a31d9eea55ccb9c10de5ad08 SHA512 fe0fad9ca89f929337728196a1d6e7e108e0909d62404436ef9fd8be7fc386e7c08cf9710ac5e4a6ba6c7e431499dbf023558336d7942dca563ef9803f3b061e
 MISC metadata.xml 247 BLAKE2B 2a5e52fe46bb870c82fb6f16e032fca8d7ee30da5d39bc7deae966d57cbb8d79d2efa4b36da3c415e74cfd49a9e7553254fc9c575838c86f433a53283fe74254 SHA512 fe10588aacdd43055f05ef7a9fd5147056c5de9d813740995e152972185872b30a1781a5b7096085fac3eea6bd80a45cc1679904052dfc701a0885344a5ca599
diff --git a/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-Respect-LDFLAGS.patch b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-Respect-LDFLAGS.patch
index 548039dd0e0b..dc3ddaefab2a 100644
--- a/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-Respect-LDFLAGS.patch
+++ b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-Respect-LDFLAGS.patch
@@ -1,5 +1,3 @@
-diff --git a/src20/Makefile b/src20/Makefile
-index 3e8e62c..ef96fa2 100644
 --- a/src20/Makefile
 +++ b/src20/Makefile
 @@ -16,6 +16,8 @@ FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
diff --git a/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-reenable.patch b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-reenable.patch
index f47b96e88905..4b15d8467e64 100644
--- a/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-reenable.patch
+++ b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-reenable.patch
@@ -1,5 +1,3 @@
-diff --git a/src20/gkrellsun.c b/src20/gkrellsun.c
-index f3adff5..0738bfc 100644
 --- a/src20/gkrellsun.c
 +++ b/src20/gkrellsun.c
 @@ -1140,7 +1140,10 @@ cb_plugin_disabled()
diff --git a/x11-plugins/gkrelltop/Manifest b/x11-plugins/gkrelltop/Manifest
index 9674fd90d136..c77855813718 100644
--- a/x11-plugins/gkrelltop/Manifest
+++ b/x11-plugins/gkrelltop/Manifest
@@ -1,5 +1,5 @@
 AUX gkrelltop-2.2.13-fix-build-system.patch 1088 BLAKE2B 8b8b00fde60ace4fc98848eb436224419f7ec1a13a5da232a28081ecb47825be039aa9a515768478d1bc0fb7114ba040929d9ac05edcbd78bcd0b24562e824fc SHA512 d53dcd1cce67b6b18c5e6ab3cf679a16510cfb8f811d90f47315a5d2161364ee47f1c975c85b26886145c40a95ef7c77a944a0056ada470c176d8791b2b0f2b0
-AUX gkrelltop-2.2.13-r3-pkgconfig.patch 1993 BLAKE2B 96ed9ff7e38513586dfcdecf7e714e53867c50eadebd96061cd99f743add1c0571c00ec0ebe1431e78889ed1142e6c98bb538f483ecb81453ffbce435eb16767 SHA512 edfe721f4a184dd0dee5d23c3bf13444f9a5fc4a54df414461ddf8098a3ff5e07d1b38ac54d7c3311b1131e8683b24795bfb42df5e02625f7aeb47ce6f5efc6f
+AUX gkrelltop-2.2.13-r3-pkgconfig.patch 1928 BLAKE2B 6effe337609a99c41424127175f84b72b2190d1d464d8a08e0933a33dfcf13ad2132cd7e1b771eebdb75f2cecf597783c675134ae8b4c44812facfa68ee462d3 SHA512 4c113a990dcbac1be4e17cf76016d847bfad58e5308ae579849c0645d140bf350524b4d5722b2158ee9eaa6dd4b872601dd19d3c23541b9fc8a7d6f3431db2c8
 DIST gkrelltop_2.2.13.orig.tar.gz 49023 BLAKE2B d2857b6d73fca2a2933f4bcaa207dbf34f9bbc2bb9de922d564a865d2238b91d9bbcfbdf5753d7976d941d9ba98c9e7b81812018a2d9d1ac07984e26c3317382 SHA512 9479c5b860833671451b6fb8583e741b1ac755ed76b7e73dffd65d13d30d0b5da1916436901642f738e0d72f8c8696f4dea9c041a203e76d309f2782acf7024e
 EBUILD gkrelltop-2.2.13-r3.ebuild 1033 BLAKE2B 1badd5a8b37f4323ee7b9d33f49fc927301c25468876a0df20a3a10ca3caff38a8ad97b8554687644e141220c9549d155750c94856bc0b38c68c46103000affe SHA512 57fb73b4a65c452f91e99e3db6bd7ab84f9ff17853d6d03c8b22ecd38ccd5f1de05bf4666ebeb9e38bf2721da5034f342fc8cdd0c9305cdc69170129ae100314
 MISC metadata.xml 247 BLAKE2B 4c2928903af2aef15b40f59ae2cd005af84ac0552409301181fcededae0eedd5f7a7986106c9b25b25f6a170e18c9e5115ea14711a0639b351dac2cd6205bfbb SHA512 14c94ed4ec200fdcc265fbd2a1012c9cb143d98a6a28bfdad509c834a742803b1a62398034a36e4160b216f250f01292e642dc05621162008633e3ae4484faf1
diff --git a/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-r3-pkgconfig.patch b/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-r3-pkgconfig.patch
index 552190827da5..6351ffb9991b 100644
--- a/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-r3-pkgconfig.patch
+++ b/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-r3-pkgconfig.patch
@@ -35,8 +35,6 @@ Makefile and configure should respect user's pkg-config
  LIBSD = 
  endif
  INSTALLDIRD ?= $(PREFIXD)/$(DESTDIR)
-diff --git a/configure b/configure
-index f0b7366..99f58d8 100755
 --- a/configure
 +++ b/configure
 @@ -4,8 +4,9 @@
diff --git a/x11-plugins/gkrellweather/Manifest b/x11-plugins/gkrellweather/Manifest
index fe03fd3c8649..bf7b04020b06 100644
--- a/x11-plugins/gkrellweather/Manifest
+++ b/x11-plugins/gkrellweather/Manifest
@@ -1,7 +1,7 @@
-AUX gkrellweather-2.0.8-Move-GrabWeather.patch 2162 BLAKE2B d6a38021b10cf0ec97eaaa9dcf0c5e3b78599f57b008054d55bb64abaa2318620345a2bac43168da57af9660d895150d25f3ff248ceb1233ce221dd5910bb805 SHA512 9c078e68f28c829f19e4e8e2836795508f5b124aa2a7b8535857266d16b9ba6404604e1527751dee99e632237be106eed456bebc2b14f69799a46888ab9699ff
+AUX gkrellweather-2.0.8-Move-GrabWeather.patch 1909 BLAKE2B 4a45431dfaac51d0c6560ef6d41817dd01b2ee67ee49af050993f4d9a8ee4871c4fb627cd08d6d9ffdaee16219746c4fed4e994ce822bfe33cefaa57bdaa57bd SHA512 2d4d2ffd08b3a120a972739375d59eaa47faebb8fad691f71637173343671db74ce02b88e7b361688d6158c7a83442b2102867572cc71345d05878d204e59d0d
 AUX gkrellweather-2.0.8-Respect-LDFLAGS.patch 398 BLAKE2B bfcabffaf7c27dfeef18065f585f269ba003cf7370c5164e4fb23ad53baa1b497ab8c31abb70e3da301358138c1cdd8eb495a8e6623167d163175d5b37407b91 SHA512 09fb94ff819152970640bd4e0a6c2435bf2bf1d5f8ae8817efc195437f2103065bcd38142d3a412d8e509b7c020c674ea25bbc331148daab61ce3e70928712fa
 AUX gkrellweather-2.0.8-r2-makefile-fixes.patch 597 BLAKE2B 7f2f3a6718dce714203d02a42c04721c591c49b7ed4c1faeac2e190d700ae87b0edf5a0568984295c1763e620db8849c05673d73cb7c1877e7d19ff8af345097 SHA512 43a0f81a7884a37f7a3436004aa32ccffdcebbedd19027a01edb87e2e3447485d1eee33607787bf75586177e051c171435105a9e661ce1ac701d6800d5925eb2
-AUX gkrellweather-2.0.8-update-locations.patch 567 BLAKE2B aff5c3d4bb291d0a97c21c946c81aca539fed0076f553a8570d5a76ac597061fde58a4dcefcd3de6e5d2ecafcf3aabdcd7392fe3c07649534a09809e357ae318 SHA512 963e81b73812fb1bc18e2c29bb8f69b655032441b537dc7a3a083e2331e0337a5faec86940f2779546aa024d59944fd6d5fb7f88f474d2e22532bd85cbe37c6b
+AUX gkrellweather-2.0.8-update-locations.patch 456 BLAKE2B 191cfedaa84748e3f5bd33807d1845cb157c876ab00bb394d13919cbaf201b8c7a28f8fe5b41e141650f2d29faa40be5288bb7eb9be17b657f46415d25a8fe3a SHA512 64d1f1f939fc46537106fd8189d8d44ec427123bee20c10b9385d39389ad64e37b339ff484cf6c042ea932b529e0729479d9216f7e84acf59bdfe9e8bd8d5340
 DIST gkrellweather-2.0.8.tgz 20227 BLAKE2B 7c3fd369e323229359bc397e07b422b625a14038aff573cf7c3fd6218c733a1d69f5754dcb86ab2172a8a5ae08fbab022a87100a6422c5e8b3b3068e108fd9a7 SHA512 da9408ebc9518fe805d3f0dd9496b4aeb805a2ab6566b619b61fc25c91122c0ee45e2a7b804206b2ee08300309dd9b1e1c3b6605a41c594cf75fd39b58767264
 EBUILD gkrellweather-2.0.8-r2.ebuild 1074 BLAKE2B 338e37db6fbdc644b4144936ae17e63c7b53a9c235efb88de9088c8ffda62845515248ca7e78efeb902aa5c29e05ff4479d4ce4e1f651d6bec0e5a1401958626 SHA512 8a77fdebe5e9172a9e3e07fd202776551b77d0b6481ef698dc69753c30f46b70bf86c59725c705611a136f6105fea5798dc0aec7b3092e3f5c074b323681f6eb
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch
index 5e2eb95e33fc..10d7cfc994bc 100644
--- a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch
+++ b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch
@@ -4,13 +4,6 @@ Date: Tue, 24 Aug 2010 12:23:25 -0400
 Subject: [PATCH] Move GrabWeather script to $(PREFIX)/libexec/gkrellweather/
 
 This is to avoid a file collision with x11-misc/bbweather (Bug #333289)
----
- Makefile        |    4 ++--
- gkrellweather.c |    4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index d6dc404..693b4f2 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -38,13 +38,13 @@ install:
@@ -29,8 +22,6 @@ index d6dc404..693b4f2 100644
  
  dist:
  	rm -rf $(PKGNAME)-$(VERSION)
-diff --git a/gkrellweather.c b/gkrellweather.c
-index 1d4cf4e..224260a 100644
 --- a/gkrellweather.c
 +++ b/gkrellweather.c
 @@ -721,7 +721,7 @@ apply_air_config (void)
diff --git a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-update-locations.patch b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-update-locations.patch
index 0faf2627170f..b7190c04f9fe 100644
--- a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-update-locations.patch
+++ b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-update-locations.patch
@@ -1,5 +1,5 @@
---- gkrellweather-2.0.8/GrabWeather	2009-01-11 13:15:02.000000000 -0500
-+++ gkrellweather-2.0.8-r1/GrabWeather	2016-08-29 00:02:35.345041005 -0400
+--- a/GrabWeather
++++ b/GrabWeather
 @@ -12,7 +12,8 @@
  
  $ReportDir  = '.wmWeatherReports';
diff --git a/x11-plugins/gkwebmon/Manifest b/x11-plugins/gkwebmon/Manifest
index 496b901e577f..11b544ba598f 100644
--- a/x11-plugins/gkwebmon/Manifest
+++ b/x11-plugins/gkwebmon/Manifest
@@ -1,4 +1,4 @@
-AUX gkwebmon-0.2-cc-cflags-ldflags.patch 1238 BLAKE2B 49429c7abc390c47b4ddb145c5535c231449d159ff7513c1cfd5f43d163e1a2654d7ef17697cf9cab88f777791a54ed734747d7271af79634fc08e84d8d5de40 SHA512 a8b360331362b8e7e8bea301be2867728568297c16981eea0e66a002e7195aa97bc12346597ddc676d8bb7c2bef686bd1285447c405046de0ad3e308404d7b87
+AUX gkwebmon-0.2-cc-cflags-ldflags.patch 1086 BLAKE2B a2e2387cc8d263e11c480851bb77438166d5b6a8dad1f7bb564ba6fb53d873a2fe5ff99b9439f4e5411a09bf8c29f9b19ffda11935f3a6611c042d4c59fdcfa3 SHA512 566213a5e86857135f31f0528e84f4869440fe74ee7d8a2197ef74ef3e1a62931f06c99781fd10fbe091901aa7223466ff2980deb07424140fcb335a5b43c983
 AUX gkwebmon-0.2-fno-common.patch 1058 BLAKE2B 68205c69c36e48678886c3bea5b0b14d4755d05a389daa6c2ee450f4fb543eb3fbf30618ec99d315b34d0de379af4c7ad13174de364ca4b46ce09c3be49a7176 SHA512 225b7767284aebfbc1437810930442c342f977abfe8cd3af8ac1b8122cb17964bf63388a56265febe20914bf4893a258d4fddb9d895abe0048239d8ab78e208f
 DIST gkwebmon-0.2.tgz 14163 BLAKE2B c6c0c9352e2f68eca56f981abb8188a7a300604c8c0fc05c1b0b95f0cdc117c12e55aeace66f9c3dcc16a13acb2b44683a77de36a83d9e9b7c273ec619173235 SHA512 0af4eaa8636b43232e209e6381a3852eb92b9505da4b19e31137766f4bee7977bf4e4bed40518df0fcc3aef2dc62767c85169e70f1fbfc738bb428ae8affac63
 EBUILD gkwebmon-0.2-r3.ebuild 685 BLAKE2B 704f0acffb3d66b9bce11aa6a4264bfdd59d5ab228af204a61a725ddbce3cd90f6e4a79214365e16f7ba873fb5f660d01baad5d44c4732fd582dabb4d9cf7c89 SHA512 22dd74fa240b4349d60075e9db212f39795972ceefb3a0bb13752365b5b1fbbf340fd9d3ee8b218de042c1923984f8acc271ab7cbd97a751dc760198ebc358e5
diff --git a/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch b/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch
index 5ffe8f12ed42..4c5c786cfed6 100644
--- a/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch
+++ b/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch
@@ -4,12 +4,6 @@ Date: Mon, 29 Aug 2016 20:44:45 -0400
 Subject: [PATCH 1/1] Clean up variable usage in Makefile to support LDFLAGS
  and friends.
 
----
- Makefile | 18 +++++++-----------
- 1 file changed, 7 insertions(+), 11 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index b422e79..d89977f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -3,23 +3,19 @@
diff --git a/x11-plugins/i8krellm/Manifest b/x11-plugins/i8krellm/Manifest
index 9b951627824f..50e620494edf 100644
--- a/x11-plugins/i8krellm/Manifest
+++ b/x11-plugins/i8krellm/Manifest
@@ -1,4 +1,4 @@
-AUX i8krellm-2.5-Respect-LDFLAGS.patch 187 BLAKE2B 20c7ea678a56d705c2289bec2690e4254594fb1815101c4a4ac18f77a4de639b9a71392925d197db98033d716ba9cb604509da9858bd7d40f5cc5d7b23b2771c SHA512 78b953668ee6041f01f56c67cb0b2f3eb680585e833df0bdbc577c31b68d7155cd27e90ece352e50b6b93b189c6f996e5c45c93214f8a2fd31deecc26e22ec14
+AUX i8krellm-2.5-Respect-LDFLAGS.patch 124 BLAKE2B b709ea664d87db260f6e35e98792e2698624c1a158faad8e19647a30f4af208796dbf9abbcf8610a7908846ecd91bf8005fd68d37f862c8782a96bec1eca935e SHA512 aea7704efb9154f28acc4bf2bbd8d780b45b917236a47b173685bf66565c9c7a4c94eb844096e7c48b1ce26ac1bc93f7a824517b39715aa9b06e002a120aea6c
 AUX i8krellm-2.5-r3-makefile-fixes.patch 1459 BLAKE2B 3cc267b4ff16d339430d1d19dcc011a65dfb03c5db86d0806fe41f05f9c73736d9ec0dd4bcc541923fb9fb8aa796e942d030436fbb442ab8b04737d63c0a1b2f SHA512 7824a0682c25933152398f3e99f771db9f778e09a63344bffa8dda86968a862cc6b4f8d89893a9856bb133483b2437feb8c20d04644579ae25f0fb4f841e4aad
 AUX i8krellm-2.5-r3-rm-gkrellm1-support.patch 1319 BLAKE2B 825df0a3e71a48c84d79552090c4f3fb0fdca803f2420381c9caaf401f5f089a482cf7f54ecde086d5820f797ed204a9525d07d9e57c1c7a2fd0c52acf9f6daa SHA512 d5c6f417cf7486e05e621054c84dba13b174e33684e32a0d3554cb5c64477661691f9388904329ba71c928e5c580193ecb82a7fd2be9824ad1d675cdf08d582b
 DIST i8krellm-2.5.tar.gz 15378 BLAKE2B be6af7ce0ee2986fd5463fba2b747721407fe3d06bcd1ae7e30dc273a883fd2f9a092ab73b97b6f7d20dd87454eec28db9e12d701dcaec4dda9267af889e662b SHA512 d1cd452fc83c24369b4773d959e0182bd5c7fe317bed6a1df716c1576f5ba078a4e82d202ff641f0784532b77a51d466e57ffc675895a1875a868d92caf79576
diff --git a/x11-plugins/i8krellm/files/i8krellm-2.5-Respect-LDFLAGS.patch b/x11-plugins/i8krellm/files/i8krellm-2.5-Respect-LDFLAGS.patch
index bc740a415e35..1f879edce023 100644
--- a/x11-plugins/i8krellm/files/i8krellm-2.5-Respect-LDFLAGS.patch
+++ b/x11-plugins/i8krellm/files/i8krellm-2.5-Respect-LDFLAGS.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 443a911..ba83210 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -3,6 +3,7 @@