gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /x11-plugins
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
75 files changed, 1417 insertions, 246 deletions
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index fa6219cacda4..3f3cb37a89f6 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/gkrellkam/Manifest b/x11-plugins/gkrellkam/Manifest
index 2d1c588a1a3b..20624411b4f0 100644
--- a/x11-plugins/gkrellkam/Manifest
+++ b/x11-plugins/gkrellkam/Manifest
@@ -1,4 +1,6 @@
 AUX gkrellkam-2.0.0-makefile.patch 664 BLAKE2B 314b6971723bd4342aa4640d685eecf3e247d43849d3d9d05fc8acfbf8c4eb5f0a04d35eb054bd5d35103d195c3f4e3486469023234414fd8070921fa2d36acd SHA512 0bd0cfb320119eb32019616f4e52a1c821116b6abfd0b0d45c7fa06a642cb980fd6f0e62769388885691e5a4ecb06d812541b7b7b6ac37c9dd2042fdc6fd3898
+AUX gkrellkam-2.0.0-r1-pkgconfig.patch 400 BLAKE2B 9c65c7d9e0eee676151a7d00559fddbb847e88926d6f09f87f646f3d326be3dd677dde1a86e502a0e5ba6dcd9afeb0fe89078b8d1b2d48f2dafc18c49d53ef48 SHA512 9abc516f95037de9d6591d1a4b774d04b50953ece4a384a1f03193261c4cf9b7e46741aab0ce4e180a4f98b929ebf61c63b491514341d9f0e4f0a44f62ef70a8
 DIST gkrellkam_2.0.0.tar.gz 27028 BLAKE2B 4bdfb89e2aa0f9001fbaedacb095e868497564612982cd3743547e1070bfbf173be5a441339d32e1be5146a511b840f6fd9a5450edad641895630d33eb5eb554 SHA512 a5a5d0a41de37b006c42150f0388ba573c968679f3f15c6b1d4837361d136cb529c2152723382e99bb46a76be5f1bde641137cea22e07a502402560dcd18699f
+EBUILD gkrellkam-2.0.0-r1.ebuild 809 BLAKE2B 7f5f41c5d8b9f1b39897b6934e33d0e9f00aa55405586b03cd56807ca76195e333aceafda5cb7d478056917b16781531d0e47eee26450d3905ee588366b1dfa1 SHA512 6ed25649d1387c6358dbf9ab861eed76d810aeffc8f2d64f563c88f2b6e5b296dacab4f64e90d8380153a4bc7ca02caad50a97348bf1fb372ab4c03144ffe5b3
 EBUILD gkrellkam-2.0.0.ebuild 726 BLAKE2B a9b1714fa15f12a2c930af5a659cca8b7b071b206dd33987ea5f7a81904f36253c57fd92496c199963fd17b77df2eea46a0c8ac55e5b49ffe05cf98e2dfdf8c6 SHA512 57ed198e4ddf418706cc3c200be753116b1e1ba3c4f3b34448b33ebb0f389189b91c1b1756366c931fbe36c851578c81045252c4abc33fda42926054980fb0b3
 MISC metadata.xml 247 BLAKE2B bc8a671dda571420b2fe59f271b65f7467459e7dc02f13c2c3d4ddbc2c9385473f6ebb735b90dffd21a4e2eb3d2035d34e23b0c01c621b724d5183eb4e34165f SHA512 5abf93f2dc4d80fecfce931af945e3c45fd7fc7e4e84ccf238a6aa8b2ff0d60e6ccd7b943d32613bdfdf3a9fdaef9aad7a4dbfe9f8040b6045134b003bd7e407
diff --git a/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-r1-pkgconfig.patch b/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-r1-pkgconfig.patch
new file mode 100644
index 000000000000..c5993890fe6e
--- /dev/null
+++ b/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-r1-pkgconfig.patch
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -12,8 +12,9 @@ DESTDIR =
+ # This should point to the GKrellM headers
+ GKRELLM_HDRS = /usr/include
+ 
++PKG_CONFIG ?= pkg-config
+ CC = $(CC)
+-GTKFLAGS := $(shell pkg-config gtk+-2.0 --cflags)
++GTKFLAGS := $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
+ CFLAGS := $(CFLAGS) -fPIC $(GTKFLAGS) -I$(GKRELLM_HDRS)
+ LFLAGS = -shared
+ INST_DIR := $(DESTDIR)/usr/lib/gkrellm2/plugins
diff --git a/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild b/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..951eb4818034
--- /dev/null
+++ b/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+MY_P=${P/-/_}
+
+DESCRIPTION="an Image-Watcher-Plugin for GKrellM2"
+HOMEPAGE="http://gkrellkam.sourceforge.net"
+SRC_URI="mirror://sourceforge/gkrellkam/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	net-misc/wget"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-r1-pkgconfig.patch
+)
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	local PLUGIN_SO=( ${PN}2$(get_modname) )
+	local PLUGIN_DOCS=( example.list )
+
+	gkrellm-plugin_src_install
+	doman gkrellkam-list.5
+}
diff --git a/x11-plugins/gkrellm-bgchanger/Manifest b/x11-plugins/gkrellm-bgchanger/Manifest
index ca30e4225a9e..99958a7095b9 100644
--- a/x11-plugins/gkrellm-bgchanger/Manifest
+++ b/x11-plugins/gkrellm-bgchanger/Manifest
@@ -1,4 +1,5 @@
 AUX gkrellm-bgchanger-0.1.11-fix-build-system.patch 245 BLAKE2B 742212aae7f59649481aac6868fc1648290ea623aa07d29cee4be2ca3992a359896da180161ade8ba8132621f48ed20ecb5fa8df386503eea70905cb58302e5b SHA512 b7d65deba2c6064c526dc0809e15773a3b4afc2c4be01ef44afa760037ea2fec80934f6d9ffa51455f1593e107e372fa88b31f48e8f1dababd825a5b3287f773
 DIST gkrellmbgchg2-0.1.11.tar.gz 24164 BLAKE2B 07b502ee8e86a26cc46b0d136241369cf26daa2c4ece3e2544ae14a6d69e11602e8d549769a342ead71e1838f9cdabf1f47c4ea79b69d65a26aa95411e0e5240 SHA512 648f56260e756d23ce616efb863e5746a7400a3fd7df135fc3b7548ac07ebb058e9c4f7c76af92cc2c4942ba6c1108b6e294b72afe831de6285e2329ca7c4803
 EBUILD gkrellm-bgchanger-0.1.11-r2.ebuild 753 BLAKE2B d431e0cf90ab8cf26e4f13f68373eef6b4a6ffa600d10d3b931d3e292db519fa98c10c44d9575e64e7c3a7c6a5d430b8692d7ebb2965ec9fac091fc84b3e4ac4 SHA512 2e4855ddbf0602eee0ca377085ba9285a03ae4f3c8f0d8cc0924fb3c2eb735e0909dace19d1ffce82e82aa03f64d2b001ac657380a1f94864eea840acc1a3d21
+EBUILD gkrellm-bgchanger-0.1.11-r3.ebuild 784 BLAKE2B f16530e2191e95424ce577faaaf6ac2b4fb44b8ab984305a0e027b0d61da420df4bff804b3cc80efb9fd11034a00c45d8768769b9be120c81d0f9067738eb1be SHA512 2c7f67ec68065a4516f2862f4a28dfdba3b07d7cb1275e2212d15a2e123e6ddbd0a7de9337e2b3b4ae9f270ffbd639a82e8d5aa1125c39f6ecc9d440be688124
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r3.ebuild b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r3.ebuild
new file mode 100644
index 000000000000..199b007d13d1
--- /dev/null
+++ b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+MY_PN="gkrellmbgchg2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Plugin for GKrellM2 to change your desktop background"
+HOMEPAGE="http://www.bender-suhl.de/stefan/english/comp/gkrellmbgchg.html"
+SRC_URI="http://www.bender-suhl.de/stefan/comp/sources/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.1.11-fix-build-system.patch )
+
+PLUGIN_DOCS=( bgchg_info.sh kdewallpaper.sh )
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+
+	PLUGIN_SO=( gkrellmbgchg$(get_modname) )
+}
diff --git a/x11-plugins/gkrellm-countdown/Manifest b/x11-plugins/gkrellm-countdown/Manifest
index 22f25f43dba2..951a1bee8990 100644
--- a/x11-plugins/gkrellm-countdown/Manifest
+++ b/x11-plugins/gkrellm-countdown/Manifest
@@ -1,4 +1,6 @@
+AUX gkrellm-countdown-0.1.2-r2-pkgconfig.patch 476 BLAKE2B 7c55e464e84285c9a60c7752e1bcc0e35270a19680c936660672daa70bf2e4927b616635a22384c3b688d28299bc919d121604b00fbe2e83feab5ddc3893ff70 SHA512 7903e803b930deca0a114c29169507b117b5dc0f581098a3cf9790f2ebc1c62fed2be147fc0dfeac061f68b49722aeda47713929a3d07e3c977e87868ba063f5
 AUX gkrellm-countdown-makefile.patch 1005 BLAKE2B 80711f28134b9241e5844a30e84a1bf634c9c75a880c1a5dfdad32e427b7e50d802c049a424086d6bed05d50a5bd5b8d39e31265c900d7bcdc5111a95301b6b7 SHA512 ae7ed8c952698b8cf23f99ce18abff865ed0168df42a3b9db54326131dbbbc982ef3490b93fb0e76b05cbb746b34fe43fb98a7b0d18e459e773b723a80bc8178
 DIST gkrellm-countdown-0.1.2.tar.gz 12482 BLAKE2B eb619cc1da6ef90f843ab2a30e24da63d90988e85b4d48e2425f9c69a77ee64e7eaa674a7bed79da202633037aa56d5dd1f3b1c3ac9895172eed11af4b507dc0 SHA512 974a885ed56ffa95d2b5972fd309721e0043e8798fc1289fbb34bfd0320ec78db7a0572f8e43eee922b2823a2aa80789b8d24fdf106074e683b218e731b6de71
 EBUILD gkrellm-countdown-0.1.2-r1.ebuild 575 BLAKE2B b87e4ff7307adc9a3e022ddfb3dfcb856107d75f33a4985133f1af3618664cf00aeec9bf018096f14c86771c42ac0dc56298b462b28737d4973e5f52a129518c SHA512 36d6c163872f5397c88e184ffbdfe4c9b9e86aa7e63f5f479e66d8fe9b66af2a859802f6850c6cc955ec02c9a49837cb1621857b287ff899757d87c237209520
+EBUILD gkrellm-countdown-0.1.2-r2.ebuild 660 BLAKE2B 9c6dda06ae935b993a547459a6b3a38760e0c9c55fbecf5f7941409353b4198a88a65b5db97dc047be29be83db97585b120bb7cd90a0ab0e740106ad93ba3aff SHA512 0b2b7ab84864381ba2a33bda6db5435bd57942625c95e31b7a8eb31fc957cbd5f1b58185e2028f1bf4f326ed5cee6d1aca821d0707adcd5551df340a7c01a7b6
 MISC metadata.xml 252 BLAKE2B 0aa50afcae852fb803810659beaec80f914ae93e0d7c73bb12a9dd18be3b460f7d989294f7cfe2da7f08e8b801edecec611ea82e4cb1ab13dd31ac98a643f280 SHA512 25a43b15f71f9fb0ee079a261524cb3313bb445648dcec385ed76ee3088b4ffba0aca46af9976c64febf46c784a660c374e9187f096d6e868d842c9d17e613c3
diff --git a/x11-plugins/gkrellm-countdown/files/gkrellm-countdown-0.1.2-r2-pkgconfig.patch b/x11-plugins/gkrellm-countdown/files/gkrellm-countdown-0.1.2-r2-pkgconfig.patch
new file mode 100644
index 000000000000..a8af1562391c
--- /dev/null
+++ b/x11-plugins/gkrellm-countdown/files/gkrellm-countdown-0.1.2-r2-pkgconfig.patch
@@ -0,0 +1,16 @@
+Have Makefile respect user chosen PKG_CONFIG
+--- a/Makefile
++++ b/Makefile
+@@ -3,8 +3,10 @@
+ # You may want to rename the binary-file.
+ BIN_FILENAME = gkrellm-countdown
+ 
+-GTK_INCLUDE ?= `pkg-config gtk+-2.0 --cflags`
+-GTK_LIB ?= `pkg-config gtk+-2.0 --libs`
++PKG_CONFIG ?= pkg-config
++
++GTK_INCLUDE ?= $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB ?= $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+ IMLIB_INCLUDE ?= 
+ IMLIB_LIB ?= 
+ PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
diff --git a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild
new file mode 100644
index 000000000000..29c9fb53247e
--- /dev/null
+++ b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A simple countdown clock for GKrellM2"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/gkrellm-countdown"
+SRC_URI="http://oss.pugsplace.net/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+BDPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-makefile.patch
+	"${FILESDIR}"/${P}-r2-pkgconfig.patch
+)
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
diff --git a/x11-plugins/gkrellm-cpupower/Manifest b/x11-plugins/gkrellm-cpupower/Manifest
index 4fb20288dffc..1c42a60db562 100644
--- a/x11-plugins/gkrellm-cpupower/Manifest
+++ b/x11-plugins/gkrellm-cpupower/Manifest
@@ -1,3 +1,5 @@
+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-r1.ebuild 927 BLAKE2B cfdbb89a487eaab3044d65b10a6758f82d1b4e03a773809b1fd8683d5962079625e7c622423a23154c310b3b2f8b1c4c85e00bc5d5be360a4887e3b339c2d73a SHA512 cc2c3506c11816a0b3b859e40dc89436b17cefa274363fbfb1a9f31e0eded98fb5c37a20b092e38084d191d27a6b3c534fb6207d279556bd63621c84465ee118
-MISC metadata.xml 353 BLAKE2B 590e96201b0d7408389373c9de31cb1d82501f425630d7bc5552bc8e398ed121c71fa4f01c8eea3c520de47e39475f42ed7fff127b9f929676b8f7d0f35fd830 SHA512 3c2194db6210c9912ac939fefdb806a2015d77d51b0aa592cddf1c1a0090bd7a063e4591e754dfb35982b736b388ce3f6b26ea5cd09c114801bc39bcbc5eff04
+EBUILD gkrellm-cpupower-0.2-r2.ebuild 1112 BLAKE2B 32087f26f5dec20889cc2857a918e0b3e4cf83449008c27ea664ca4eee1df15d6c1bd8f5da0624b55e679e35bd60629a84747aea997bd9891924ff0693647544 SHA512 f65a3039a940fad60b9f8a45cda77501aab182c85a2e64a865029e96a59351dd665139ac22cd529b7bb57a42ebabe6c6d7d1f6e04f0763de6d60804d616a758e
+MISC metadata.xml 264 BLAKE2B 06a1053b520abbb6b64ea5c6f29e4b5dd9777de179ad2fc2c511eeb9cd522d428d66280b61485f47dc8f2e7a57d4c657c15ff7434280cd890613c4ebe1b801e8 SHA512 59509f805dfc0c4c51cb28c097ecd8b8c24d103821661db7cbabec69d707a1e2911c9b8c7efd54e3059198ee294354055e2b87247ccde7a2cf5a5eded8da3df3
diff --git a/x11-plugins/gkrellm-cpupower/files/gkrellm-cpupower-0.2-makefile.patch b/x11-plugins/gkrellm-cpupower/files/gkrellm-cpupower-0.2-makefile.patch
new file mode 100644
index 000000000000..3ec485c7bb18
--- /dev/null
+++ b/x11-plugins/gkrellm-cpupower/files/gkrellm-cpupower-0.2-makefile.patch
@@ -0,0 +1,45 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,22 +1,29 @@
+ # Makefile for gkrellm cpupower plugin
+ 
+-GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
+-GTK_LIB = `pkg-config gtk+-2.0 --libs`
++PKG_CONFIG ?= pkg-config
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
++GTK_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
++
++FLAGS = -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
+ 
+ LFLAGS = -shared -lcpupower
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
++CC = $(CC)
+ 
+ OBJS = cpupower.o
+ 
++all: cpupower.so
++
++%.o: %.c
++	$(CC) $(CFLAGS) $(FLAGS) -c -o $@ $<
++
+ cpupower.so: $(OBJS)
+-	$(CC) $(OBJS) -o cpupower.so $(LFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) $(OBJS) -o cpupower.so $(LFLAGS) $(LIBS)
+ 
+ install: cpupower.so
+-	install -D -m 755 -s cpupower.so $(DESTDIR)/usr/lib/gkrellm2/plugins/cpupower.so
++	install -D -m 755 cpupower.so $(DESTDIR)/usr/lib/gkrellm2/plugins/cpupower.so
+ 
+ install-sudo:
+ 	mkdir -p $(DESTDIR)/etc/sudoers.d
+@@ -25,6 +32,3 @@ install-sudo:
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
+-
+-cpupower.o: cpupower.c
+-
diff --git a/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r2.ebuild b/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r2.ebuild
new file mode 100644
index 000000000000..a3c27d5e817e
--- /dev/null
+++ b/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/"
+SRC_URI="https://github.com/sainsaar/gkrellm2-cpupower/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-admin/gkrellm:2[X]"
+RDEPEND="
+	${DEPEND}
+	app-admin/sudo
+	sys-power/cpupower"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+)
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	local PLUGIN_SO=( cpupower$(get_modname) )
+	gkrellm-plugin_src_install
+	emake CC="$(tc-getCC)" DESTDIR="${D}" install-sudo
+}
+
+pkg_postinst() {
+	einfo
+	einfo "For changing the governor and CPU frequencies as a user, create the \"trusted\""
+	einfo "group, and add those users to that group who should be allowed to perform"
+	einfo "these changes."
+	einfo
+}
diff --git a/x11-plugins/gkrellm-cpupower/metadata.xml b/x11-plugins/gkrellm-cpupower/metadata.xml
index 625b14b52b45..8e381cab9236 100644
--- a/x11-plugins/gkrellm-cpupower/metadata.xml
+++ b/x11-plugins/gkrellm-cpupower/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">sainsaar/gkrellm2-cpupower</remote-id>
   </upstream>
diff --git a/x11-plugins/gkrellm-imonc/Manifest b/x11-plugins/gkrellm-imonc/Manifest
index e440f3b85897..89e4766ee713 100644
--- a/x11-plugins/gkrellm-imonc/Manifest
+++ b/x11-plugins/gkrellm-imonc/Manifest
@@ -1,4 +1,6 @@
+AUX gkrellm-imonc-0.2-r2-pkgconfig.patch 401 BLAKE2B e9d194209da9648d17ce606ed09379025d01f83154c5fa2c9b36da9adbb32904cdc7472b8ea8c1d306e86da49f6666621591df140d300f628c3a2affa015264c SHA512 ebef200c5371f9f478a85ef68417db66d9f3dde2df141cf4f53b9ca550a7ff86f389e6fcc3bf63e23ce001a6c68021df133d3671d0c3285356eeb2411669bb60
 AUX gkrellm-imonc-makefile.patch 672 BLAKE2B f29982a0461ae9ffd8b6c1cec43a220ea06d2d39397746cc4cee4140ca5a678dbf95ec3079465cbb26a16d91f64e789fc483ab0c64981fa1380090d7a21559d2 SHA512 76919a21b7dc38b56d31f94e718a5e66125712ebf70551c1ae522da23689bb9d6a5086010fbd3b072ae8612a878d8f32f0c621ef09ece2f3d44ad1d026656f59
 DIST gkrellm-imonc-src-0.2.tar.bz2 19189 BLAKE2B a0a2e48eca12dcdccedbc347e15f3cf72ae7be050e8f4b1ff71a48a2f53b6991119b413333620e9544f25337f966dd16742b280990364a69f9ef45a1a141cbaa SHA512 b6f5d8cfa90c708ed6e43d676c965ef0d850d12497adae35122fe07ac4ea235dd024b8415fbc40cf153e1bbcbeed1e632984b6f1e5ec9079a1fcfce915ace36e
 EBUILD gkrellm-imonc-0.2-r1.ebuild 670 BLAKE2B f6e7af7868efbd91ccb9576af79991f056d131486b8364ce2ce449d8bf380617a8b1ca34bb25f23729a31fc15f73520306f146d4084c3849b6084353ca380487 SHA512 b531895e7813ccb426ff4c0b7a6e15d240847bb499d6cf17bb0e7d0c837ce04e6b167fe8efc861362843fe53e2552de3fd7d07e49906b01db4eddba553d1a546
+EBUILD gkrellm-imonc-0.2-r2.ebuild 733 BLAKE2B 3331538c4ef7292835b481d7c45fcbd7e66a3de45012b6bf33c51d771745b0f182a068ece6ef260d7f0f9a433a1c9a485cfcf9216a865e55c01e438b563326e6 SHA512 0d16e49caba8ed78f3d0682ba512145c9f8baf0c911e16beaf5fd43927c4c12d1d0b0affd462a681ce683074d48e735811ea04521a1122e236243c4eba6cbffd
 MISC metadata.xml 251 BLAKE2B c569e245a84951e1da3acf2bc7bd4fddff868eb57c521be45f4437bb6aa834c7ff2a265d2fbaf841346a0c24f9addd1d196d8108fc877bd0eb9f3914f0f21f99 SHA512 912f4e9536eb42b728644472bdb0ac3ab585d97d67d256c1a305a92b69bd582bc4682df888aa393930a3a35e85db663a0cc5618a9163729434c7275fa71184cc
diff --git a/x11-plugins/gkrellm-imonc/files/gkrellm-imonc-0.2-r2-pkgconfig.patch b/x11-plugins/gkrellm-imonc/files/gkrellm-imonc-0.2-r2-pkgconfig.patch
new file mode 100644
index 000000000000..c8c1d8fe46ff
--- /dev/null
+++ b/x11-plugins/gkrellm-imonc/files/gkrellm-imonc-0.2-r2-pkgconfig.patch
@@ -0,0 +1,15 @@
+Respect user's pkg-config
+--- a/Makefile
++++ b/Makefile
+@@ -6,8 +6,9 @@ DISTRIB_DIR= gkrellm-imonc-$(VERSION)
+ #
+ #
+ 
+-GTK_INCLUDE = $(shell pkg-config gtk+-2.0 --cflags)
+-GTK_LIB = $(shell pkg-config gtk+-2.0 --libs)
++PKG_CONFIG ?= pkg-config
++GTK_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+ 
+ FLAGS = -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
diff --git a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r2.ebuild b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r2.ebuild
new file mode 100644
index 000000000000..a06fa4d4fd66
--- /dev/null
+++ b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A GKrellM2 plugin to control a fli4l router"
+HOMEPAGE="http://gkrellm-imonc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.bz2"
+S="${WORKDIR}/${PN}-src-${PV}"
+
+# The COPYING file contains the GPLv2, but the file headers say GPLv2+.
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-makefile.patch
+	"${FILESDIR}"/${P}-r2-pkgconfig.patch
+)
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
diff --git a/x11-plugins/gkrellm-leds/Manifest b/x11-plugins/gkrellm-leds/Manifest
index 3c11cc8df81b..580020033cb7 100644
--- a/x11-plugins/gkrellm-leds/Manifest
+++ b/x11-plugins/gkrellm-leds/Manifest
@@ -1,5 +1,5 @@
 AUX gkrellm-leds-0.8.2-r2-ldflags-typo.patch 533 BLAKE2B 78ed173b9c322cc90c625ed4d303240e94cc63eeda44e22aba10b4df49265f431b4386b3e3ac361c63d68fb19104413ce963ffba27854c7ef913882285c9328f SHA512 f53f26d6e35bcfab83a54709fd30a14aa6093ee73235701c62f5ba4f61c1bd93f04a72a498d1b6f9601f1bb302adb911764994ba41816e90bf2ebe88b93961af
 DIST gkleds-0.8.2.tar.gz 322409 BLAKE2B f5b3303069e923d69ca4c61261428c0d938aa1ed881ea7095ccacac2e01501cd6ec8b71724dc3587c64d79fd7d385532fa296d7127163037415778311f22c0c9 SHA512 0db2f7c62b799c262f1ef3af4bf3eb147717c567862d30c07033b77bc890a33afc40389afd1d4f0a5e05c344d4bc3b12a0b7d2c42044eb4c5be00c5ca5aa7191
 EBUILD gkrellm-leds-0.8.2-r1.ebuild 615 BLAKE2B db766e15847532f1c9cfc4910dea1e62a440075d70dcfe6184cd43ef35188b9e1923368b55e4d86f27a218e43db80bfa99178edf2eb4a09486852f7a560d1b8d SHA512 97d4d5ac0f264a827372ef21099cce58dfb52a495c27db2f2a344ef24924e04801e282c01eac4f29edb3c29ec4b7a5c0d85083ca0f0a54040460d9af64a2ed52
-EBUILD gkrellm-leds-0.8.2-r2.ebuild 741 BLAKE2B d03f701d00c538cc1ca1c8dea337ac1829778c6d54279223a98f72f66e32a3058348a2a0caa1709d0e123dc2972c857abccb125b515aba898b8ccfb8b61cb5b6 SHA512 68275cd23b78d9d1e1c5d9567b819de5db64a9cfc5172f2f01588f7f98adb34e18ab950ee3c8cb9b67a5e207b4bcb7487cf2ef65c04800a6b46e847c453aafec
+EBUILD gkrellm-leds-0.8.2-r2.ebuild 758 BLAKE2B 2e47891e8e53b76d7758781472defef6f5a75706e2e777be802cbb0b86651a632eaa3b58132d0f8960235ab486cbba41181e2f225ca866aadf06c7508f3a13c6 SHA512 f83482843d55e41c5a924bcfcb5352512951e1301e60c416b741b113eb26bbbdca771b1c0937d249db761d700ee075bd6a8b1e624b421b0fa51cf400a4805187
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r2.ebuild b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r2.ebuild
index fed6fcfc799b..6cb881e555ab 100644
--- a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r2.ebuild
+++ b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r2.ebuild
@@ -30,7 +30,7 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
+src_install() {
 	PLUGIN_SO=( src/.libs/gkleds$(get_modname) )
-	default
+	gkrellm-plugin_src_install
 }
diff --git a/x11-plugins/gkrellm-mailwatch/Manifest b/x11-plugins/gkrellm-mailwatch/Manifest
index 96faca922db1..9220cc1a8899 100644
--- a/x11-plugins/gkrellm-mailwatch/Manifest
+++ b/x11-plugins/gkrellm-mailwatch/Manifest
@@ -2,6 +2,8 @@ AUX 2.4.3-0001-Respect-LDFLAGS.patch 998 BLAKE2B 63593a3e478b139e3aeaf640df80000
 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 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-r2.ebuild 810 BLAKE2B d487dc5cb5d6ae3d15c33e23749860fd1116f6ff6e9060762a82c24edb86cc1145b9c7e123ffdc69c533d2b5627008736fd8e1beb70b657790fbb8ad8a6eb907 SHA512 55e2474b3bda53ae0f5fb83a3d3f141ad7051b6cc21ff70a266508794db03dce9b832fde91598bed5f6ca62353b220326453516c5b92b203d0f8b3ca7b88c308
+EBUILD gkrellm-mailwatch-2.4.3-r3.ebuild 879 BLAKE2B 70d7c860448389bc195a2caac76243c7c1d330050eefb8668aa399288e676edc3ab293f94d9443f57819ffa5d27df4dcb0508b3c50290c5fc72e406a600d40ba SHA512 45c8f35375b5e4955452213527810a3f7fffa8828981ad950df00680ae9c5954be574d3c0af52d50ae737d85adad978bfcf8815acd6a2f51e17e5a02aae5171f
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellm-mailwatch/files/gkrellm-mailwatch-2.4.3-pkgconfig.patch b/x11-plugins/gkrellm-mailwatch/files/gkrellm-mailwatch-2.4.3-pkgconfig.patch
new file mode 100644
index 000000000000..5607d1eae69d
--- /dev/null
+++ b/x11-plugins/gkrellm-mailwatch/files/gkrellm-mailwatch-2.4.3-pkgconfig.patch
@@ -0,0 +1,16 @@
+Have Makefile respect user-configured pkg-config
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,10 @@
+ # Makefile for the GKrellM mailwatch plugin
+ 
+-GTK_CONFIG ?=pkg-config gtk+-2.0
++PKG_CONFIG ?= pkg-config
+ PLUGIN_DIR ?=/usr/local/lib/gkrellm2/plugins
+ 
+-GTK_INCLUDE = `$(GTK_CONFIG) --cflags`
+-GTK_LIB = `$(GTK_CONFIG) --libs`
++GTK_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+ 
+ GKRELLM_INCLUDE= -I/usr/local/include
diff --git a/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r3.ebuild b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r3.ebuild
new file mode 100644
index 000000000000..54c18b282740
--- /dev/null
+++ b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A GKrellM2 plugin that shows the status of additional mail boxes"
+HOMEPAGE="http://gkrellm.luon.net/mailwatch.php"
+SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/2.4.3-0001-Respect-LDFLAGS.patch
+	"${FILESDIR}"/2.4.3-0002-Use-gkrellm_gkd_string_width.patch
+	"${FILESDIR}"/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch
+	"${FILESDIR}"/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch
+	"${FILESDIR}/${P}"-pkgconfig.patch
+)
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+
+	PLUGIN_SO=( mailwatch$(get_modname) )
+
+	default
+}
diff --git a/x11-plugins/gkrellm-radio/Manifest b/x11-plugins/gkrellm-radio/Manifest
index dbca6ff8bc9d..da0c05624c75 100644
--- a/x11-plugins/gkrellm-radio/Manifest
+++ b/x11-plugins/gkrellm-radio/Manifest
@@ -1,4 +1,6 @@
 AUX gkrellm-radio-2.0.4-makefile.patch 554 BLAKE2B ed67079c01041db8fe8e5d53e96469286d9f04ca02fc65d380665622ae3060e9b9289caf1617c952f4476a516a3971e9f5a760cac48dd0221466d35b9b410e41 SHA512 a994bfb44d8c3d1844d309d792c1084ffa5c2bb37769b714511fb90f626ed9d636d8720bb32dd536c3ce616dd25ae460ae831099f8a5b5dc6880d382b2d949ff
+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 772 BLAKE2B 82aa71913066a3044d26a04abb0d316b8decd123b4c6b1e097262570be89bb795db65313dfd0b512f8569b14ef64557982296eb56ba4575e8e3bc87634bc843f SHA512 5fecab90d82f3f42b587146ba752ca813439f68c900b201e85f47275a35a9a6cbeecb0794916d384f27b7e727547bf976c3d87033dd53fb4875d5dddf40d5c69
 EBUILD gkrellm-radio-2.0.4.ebuild 728 BLAKE2B b30b5a74fd283e7f875c606f5bf3597caa6a77a9d0732389d07fb88b54dd8cddb353cd9e3db909eb6a9a021d794e0e9698790b0b850d79f067330078bee5e301 SHA512 4e7a3a60d4f69d44ad7c4e1c3ce7300ae326eddbfc4c5b88bb57d2640a6dbea8ab9c397b607f14708dbd140e1c2dcaf898fa8b012ab56c547d18045b9893473e
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-r1-pkgconfig.patch b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-r1-pkgconfig.patch
new file mode 100644
index 000000000000..94405dc469df
--- /dev/null
+++ b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-r1-pkgconfig.patch
@@ -0,0 +1,15 @@
+Respect user's pkg-config
+--- a/Makefile
++++ b/Makefile
+@@ -15,8 +15,9 @@ OBJS=gkrellm_radio.o radio.o
+ PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
+ INSTALL = install -c
+ INSTALL_PROGRAM = $(INSTALL) -s
+-GTK_CONFIG = pkg-config gtk+-2.0
+-CFLAGS := ${CFLAGS} -fPIC -I$(GKRELLMDIR)/include `$(GTK_CONFIG) --cflags`  -DVERSION=\"$(VERSION)\" -Wall
++PKG_CONFIG ?= pkg-config
++GTK_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++CFLAGS := ${CFLAGS} -fPIC -I$(GKRELLMDIR)/include ${GTK_INCLUDE} -DVERSION=\"$(VERSION)\" -Wall
+ 
+ ifdef WITH_LIRC
+ CFLAGS := ${CFLAGS} -DHAVE_LIRC
diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild
new file mode 100644
index 000000000000..d5fcf32c4c2f
--- /dev/null
+++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A minimalistic GKrellM2 plugin to control radio tuners"
+HOMEPAGE="http://gkrellm.luon.net/gkrellm-radio.php"
+SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="lirc"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	lirc? ( app-misc/lirc )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-r1-pkgconfig.patch
+)
+
+src_configure() {
+	PLUGIN_SO=( radio$(get_modname) )
+	default
+}
+
+src_compile() {
+	use lirc && myconf="${myconf} WITH_LIRC=1"
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf}
+}
diff --git a/x11-plugins/gkrellm-trayicons/Manifest b/x11-plugins/gkrellm-trayicons/Manifest
index 9f4effc97f45..acdc6f0bd1ca 100644
--- a/x11-plugins/gkrellm-trayicons/Manifest
+++ b/x11-plugins/gkrellm-trayicons/Manifest
@@ -1,4 +1,6 @@
 AUX gkrellm-trayicons-1.03-ldflags.patch 743 BLAKE2B 078ee5216b432592b136f812e24282c4e001d2399a11ce6768cf2122f24b0a90e169f51a7b4aa0b44b4e3b02b28669f0008df0177e1b0aedbd58deeb19318b1e SHA512 e122db6d9ae37a17d58c3a065f4b2210bf7e8f6832f8687c60efc54145fddf2e1f6898927b699f64194382dadd035710c7e3540221c3e229ec26d2ca8e01e785
+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-r1.ebuild 590 BLAKE2B 56d71333d4ab869c6be03c5408ea39a75df95616420efc33501c8796a02cd648f5c88483317ffdb3cb15aac50255347d4fcb52c3b56f26c13ef061d39eda8a1f SHA512 0d5c176e1ff1450ee303eca6dd28b614bb47cd5b1e01475d3abcbcde7b4634399fbd3460dfbf85244b37bc9dc2e971c62a57a1012bbcf41457d937247c392401
+EBUILD gkrellm-trayicons-1.03-r2.ebuild 672 BLAKE2B 6d3225c78922c928ba72047d313bf8aa6f7a1fa88bf257ab479b3b1b18f55488416bb960603eb8461208d07256812f61af726836e79d46154159970cc5304b4d SHA512 cc302e0b82eea1daff5924d62aacd3056b8670addc61b7897545af34cbd88c7afe3cd0374f341f3d68453807dbdbc2f93d8740bfbf01d1218639702a66266f50
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellm-trayicons/files/gkrellm-trayicons-1.03-pkgconfig.patch b/x11-plugins/gkrellm-trayicons/files/gkrellm-trayicons-1.03-pkgconfig.patch
new file mode 100644
index 000000000000..02d4c150dd3e
--- /dev/null
+++ b/x11-plugins/gkrellm-trayicons/files/gkrellm-trayicons-1.03-pkgconfig.patch
@@ -0,0 +1,18 @@
+Have Makefile respect user-configured pkg-config
+--- a/Makefile
++++ b/Makefile
+@@ -1,11 +1,11 @@
+ 
+ VERSION = `cat VERSION`
+ PREFIX ?= /usr/local
+-GTK_CONFIG = pkg-config gtk+-2.0
++PKG_CONFIG ?= pkg-config
+ PLUGIN_DIR ?= $(PREFIX)/lib/gkrellm2/plugins
+ GKRELLM_INCLUDE = -I$(PREFIX)/include
+-GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
+-GTK_LIB = `$(GTK_CONFIG) --libs`
++GTK_CFLAGS = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+ FLAGS = -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+ CFLAGS += $(FLAGS)
+ CFLAGS += -DVERSION=\"$(VERSION)\"
diff --git a/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r2.ebuild b/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r2.ebuild
new file mode 100644
index 000000000000..7cd6220fe5a7
--- /dev/null
+++ b/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="Configurable Tray Icons for GKrellM"
+HOMEPAGE="http://gkrellm.srcbox.net/Plugins.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-pkgconfig.patch
+)
+
+src_configure() {
+	PLUGIN_SO=( trayicons$(get_modname) )
+	default
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
diff --git a/x11-plugins/gkrellm-vaiobright/Manifest b/x11-plugins/gkrellm-vaiobright/Manifest
index 7866eb86ecd3..883559a36b01 100644
--- a/x11-plugins/gkrellm-vaiobright/Manifest
+++ b/x11-plugins/gkrellm-vaiobright/Manifest
@@ -2,4 +2,5 @@ AUX gkrellm-vaiobright-2.5-fixinfo.patch 1428 BLAKE2B 268b0f1f335941be1d9b943f9f
 AUX gkrellm-vaiobright-2.5-textrel.patch 956 BLAKE2B 9016fef53211827fd6e2ba4aed4572bd6ad070e3c27035ee4e03e33795aaddee4893ab32d6e0cf3f1a1412a9fbd77c46352ab325c09fb3888e501bd4d8251466 SHA512 957bf1ef6fb8658c91886d495cae9f8ca9c40d7a61e0c54b9c93d0bc3bc8b62b4e37130ad548b59b4d89442442eb880dd0a915ae73f449c0c7d0f0c148d09f02
 DIST vaiobright-2.5.tar.gz 6178 BLAKE2B ed7add9147db7676e66cd51eee89e60a071896aeb33d1246b45918c2d63bf1b3cb074cb85b404a411e1cf93ffc244b8847b888a4b2f89957e282d4d41757fc0e SHA512 e58b74fe5dedd8ccc69cbcadf4b273aeb0e52fb2619e148121f79c53e41dcbff36e6ddf748b0c24a33e26c6d84ec84cf5e2cfa4d655443b9fe03d6e0150b5c3d
 EBUILD gkrellm-vaiobright-2.5-r2.ebuild 667 BLAKE2B 1cbf7032679325aa86c3a110a722a05716d2047a88ca4d1f24c4334cf78fc12031bbf785edac4b7efaa489d7ae8f0a2df3057264c55b1662f857e9530ea90285 SHA512 fc90befe324d7aea29d438d9a525229734f2f0031c2465aeee32ef3e79a3fab91baa83799bc209fede70b676632ba94dd7a65991c48bef1c22c0c0ffb8d568cb
+EBUILD gkrellm-vaiobright-2.5-r3.ebuild 674 BLAKE2B 6e6f1cd86c4b7014c37d7f022de258d121dd6646d37f1a469b3f582fc7b5373d2c2c7eb9bda77de03f74b259f5785c816a72590c4bdc269062907d50533de74a SHA512 06918eded5021694996612c275d082dc668bb3dba88eaa84f68b7e1cf798e9032d51a02f304a58e7732ba22f246b467acf0d22085e3e5fd8222984ea4b0a6128
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r3.ebuild b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r3.ebuild
new file mode 100644
index 000000000000..8593c3874109
--- /dev/null
+++ b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+MY_P=${P/gkrellm-/}
+
+DESCRIPTION="Superslim VAIO LCD Brightness Control Plugin for Gkrellm"
+SRC_URI="http://nerv-un.net/~dragorn/code/${MY_P}.tar.gz"
+HOMEPAGE="http://nerv-un.net/~dragorn/"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-textrel.patch
+	"${FILESDIR}"/${P}-fixinfo.patch
+)
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+
+	PLUGIN_SO=( vaiobright$(get_modname) )
+	default
+}
diff --git a/x11-plugins/gkrellm-volume/Manifest b/x11-plugins/gkrellm-volume/Manifest
index 8f6f33b661c7..c401e81a766c 100644
--- a/x11-plugins/gkrellm-volume/Manifest
+++ b/x11-plugins/gkrellm-volume/Manifest
@@ -1,5 +1,7 @@
 AUX gkrellm-volume-2.1.13-makefile.patch 1293 BLAKE2B 1372f887a00955ea23789a9ff0ab1716544339cec69f6172e75052d08ef51ed88b5ca9b53a031e92e46d1f6b737115e08bc69c983a832a6e12165a26b50fd89c SHA512 2e4843be7f03b17fd7a496bc31509d83a6733e26231fcae683fcae4abb7ce21fb1465e2f5aa6d813d1f9fc449c4a8cddc738e12d6d93394fc472e5976d05fd4c
+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
 DIST gkrellm-volume-2.1.13.tar.gz 42087 BLAKE2B fa4641a9a618ad341c81069231e7edb69390b82f2959f416d1f2c9cb757fd554a942c8e002330af06cca9a53b01525b17a2e913a86bd7a53d3875e43a95c8c5d SHA512 4f244978ea8b68994540b050244350c7c2389b227541822fde009408378ce0511c32956daea205465a4c4890c68e47f64dcd8b3eca8901963d38fd1852526eb5
 EBUILD gkrellm-volume-2.1.13-r2.ebuild 749 BLAKE2B 66751c446e5ea3c9da25f043da365f4302721533599644831694f77c44a4184ff8c06737c1aada476bed74a47bb80f06bb8e2cef1a1a90998de25b48e0f71da6 SHA512 a1c5c2995f31447b0b6ba5d4a4bba400d0bbb263ce09fe731c50c1c8095d6ca98a8c3aa28ed8ebe0999ecee721be30169bb735cef87c9387f8141904b51be2d7
+EBUILD gkrellm-volume-2.1.13-r3.ebuild 841 BLAKE2B 55136ab26deeca31099fcab4f5927163f90b1646c524e4ea5c6f2fbbee26ccfbb31755f1cf125c8687b85036575331292730192829bdf04ceb0a420d250d3327 SHA512 1e08f5a6fa7d3f4abe256a7c66b032810a1a7aaaea4b7382c194e38d41cd1d58ccf727f719aeee7f0465c1ddfb082f5e37491c49eb2a8d746287f9dd5f6fbeb4
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-r3-pkgconfig.patch b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-r3-pkgconfig.patch
new file mode 100644
index 000000000000..75defc76a9d0
--- /dev/null
+++ b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-r3-pkgconfig.patch
@@ -0,0 +1,27 @@
+Respect user's pkg-config
+--- a/Makefile
++++ b/Makefile
+@@ -6,13 +6,13 @@ LOCALEDIR ?= /usr/local/share/locale
+ CFLAGS += -DPACKAGE="\"$(PACKAGE)\"" 
+ export PACKAGE LOCALEDIR
+ 
+-GTK_CONFIG = pkg-config gtk+-2.0
++PKG_CONFIG ?= pkg-config
+ 
+ PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
+ GKRELLM_INCLUDE = -I/usr/local/include
+ 
+-GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
+-GTK_LIB = `$(GTK_CONFIG) --libs`
++GTK_CFLAGS = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+ 
+ CFLAGS := $(CFLAGS) -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+ LIBS = $(GTK_LIB)
+@@ -51,4 +51,4 @@ install:
+ 	(cd po && ${MAKE} install)
+ 	$(INSTALL_PROGRAM) volume.so $(PLUGIN_DIR)
+ 
+-%.c.o: %.c
+\ No newline at end of file
++%.c.o: %.c
diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r3.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r3.ebuild
new file mode 100644
index 000000000000..b3affa03f88b
--- /dev/null
+++ b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A mixer control plugin for gkrellm"
+HOMEPAGE="http://gkrellm.luon.net/volume.php"
+SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="alsa"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	alsa? ( media-libs/alsa-lib )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-reenable.patch"
+	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${P}-r3-pkgconfig.patch"
+)
+
+src_configure() {
+	PLUGIN_SO=( volume$(get_modname) )
+	default
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+	use alsa && local myconf="enable_alsa=1"
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf}
+}
diff --git a/x11-plugins/gkrellm-xkb/Manifest b/x11-plugins/gkrellm-xkb/Manifest
index 1a6ba96d56d7..7872888185f6 100644
--- a/x11-plugins/gkrellm-xkb/Manifest
+++ b/x11-plugins/gkrellm-xkb/Manifest
@@ -1,4 +1,6 @@
+AUX gkrellm-xkb-1.05-r2-pkgconfig.patch 822 BLAKE2B dd522a931ba9fa01917afb9b1939078acc1dd65186bdccb63d3b861718290fa6765f69b37f2550f8d79088492688c01b6471f0700ee3266c91ec12c09ebaebad SHA512 e20e30a46e62a0f81b33a23eb0e120032eecdaa3f793c9bca9bf29e0faef4b277182c80b8f7ebf54b1675d57026ec79cbcb5d39fb200f3d13761402f432cfb47
 AUX gkrellm-xkb-makefile.patch 1030 BLAKE2B 24b53321c36b974541f77347a38da677a4b8b91408e7cdfb5de6f44bc07c3be9ff338937a957c3e9dcc1c6795d96addb020f4e5f4776d1c048dac549be9fd6de SHA512 2a9e3959ad0920126f1c93193f76b087590f5428fe2b8d1cd66670343547ed8030937723b4a0a71e620d1ac518ae4a36231aced63d88171976ea1cf1d3c2c4b7
 DIST gkrellm-xkb-1.05.tar.gz 37775 BLAKE2B 5b074d2777c250d1f7aeca4402401f36f7aed29ca2c7bf286348e73687b85f53b152b4cdb862c38ff7325a718dc694c0a921e8ec3ecefb52ad6646e1345a2101 SHA512 451c66c875af8dcb6998ba1b6242332002328b81112315cd6eee453612cbd8e23f78d7b829224d623cee90b08445b721dfd60e2483a710f4f97860c82654ba2e
 EBUILD gkrellm-xkb-1.05-r1.ebuild 593 BLAKE2B 7f167d781e0eba76e6dfe4bf62e939f380ac062543cbc471e3c3a4061583b7d5e8c172e2ea3e26f1fa8f75e9582c9283792296ca51a831f123d9d7562144037a SHA512 7ca25520f0919d3482c577ab22bb5f76db74b67ad9527379e37e6976bfa4cc049521a7d13fce95c5317652361a14936b53963e3dd015aaebc7963ef7262a6331
+EBUILD gkrellm-xkb-1.05-r2.ebuild 677 BLAKE2B f36b9df5f570ae39f7f165ff2e8be708eda15bfd8182e6d2bad65b929c01756dea69c0d62bf8ae151f3ea1767d9ad3c0fab950c7b5f824a3b22f590197eb584a SHA512 91a26d5b2a7bb9d858a098bbc5a8d446da98a7813d4bee321f38e3d7cc46198963e1ab90eb83de77f8c699cd2d54ba0935eb65131f10ec13e5447df1fa53c311
 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
new file mode 100644
index 000000000000..59208c8814bb
--- /dev/null
+++ b/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-1.05-r2-pkgconfig.patch
@@ -0,0 +1,30 @@
+From f4cd320421d80075c280dc23115d00ecefb8501c Mon Sep 17 00:00:00 2001
+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 @@
+ 
+ PREFIX ?= /usr/local
+-GTK_CONFIG = pkg-config gtk+-2.0
++PKG_CONFIG ?= pkg-config
+ PLUGIN_DIR ?= $(PREFIX)/lib/gkrellm2/plugins
+ GKRELLM_INCLUDE = -I$(PREFIX)/include
+-GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
+-GTK_LIB = `$(GTK_CONFIG) --libs`
++GTK_CFLAGS = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+ FLAGS = -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+-- 
+2.34.1
+
diff --git a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild
new file mode 100644
index 000000000000..c148d04e190e
--- /dev/null
+++ b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="XKB keyboard switcher for gkrellm2"
+HOMEPAGE="http://tripie.sweb.cz/gkrellm/xkb/"
+SRC_URI="http://tripie.sweb.cz/gkrellm/xkb/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-makefile.patch
+	"${FILESDIR}"/${P}-r2-pkgconfig.patch
+)
+
+src_configure() {
+	PLUGIN_SO=( xkb$(get_modname) )
+	default
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
diff --git a/x11-plugins/gkrellmlaunch/Manifest b/x11-plugins/gkrellmlaunch/Manifest
index 00204df0040c..787b1831ef85 100644
--- a/x11-plugins/gkrellmlaunch/Manifest
+++ b/x11-plugins/gkrellmlaunch/Manifest
@@ -1,4 +1,6 @@
 AUX gkrellmlaunch-0.5-makefile.patch 736 BLAKE2B fef75b45fe35864a6d39c7c521c270d15593a391272984a10a0a268c417c6dc8faf9a79f8276dcba030c8904abf086302625598c0ce3e3a6c27190fe7a36f2c0 SHA512 8222a135c201cca99d9d7a03aa583f1a731e2d9ae7f131b3dcc22edc47f3d2cd6b1e751571f9f74fa0140380b099b7dec98d471a3a6de1f7240c8460721c3175
+AUX gkrellmlaunch-0.5-r1-pkgconfig.patch 522 BLAKE2B 58131e54d657a6d96cad835b78a6e788e1f74e7cae974f94b4eb5f257a11989228facacd992e8c8a8f9ca528635e9a42ba41a9fe890bb570892812a830f79866 SHA512 a4daf4967d6124b542e1d9be435791dedc8f7c8263b85882d3a0971e0852c238d4d492df08dd4fd7824a4a163cd9c2b52ae248176ab6c049cc9aeb6927f2eda3
 DIST gkrellmlaunch-0.5.tar.gz 22035 BLAKE2B 444dbd76c4bba420d7bd9977f2ce25b9d0260168ea6a730d1fd009eaa0ea064804028c2103efee3afe58b928d858475886fd90c6d77e5a03b3c97ab8bd8c79d2 SHA512 be3a6df6a1648a61103d389dcea24454a142d64b1192156787b42546c485ed592dca916394e46bc0413110a90fa1f4e952fef077e9014274e74610efe8573693
+EBUILD gkrellmlaunch-0.5-r1.ebuild 635 BLAKE2B 879c7a7d656680fe3949d7397503b2d5bfd0b269eae9b85d726ed1160824c88799a337645bbf35d3b23725f4d0294cfd0a7049605b23a6cf9b4e59bd82170ff3 SHA512 3af6bbe83a1013dccc6eed39c8f3cc5fbe30293682893a9390e3e44e458978d3d36f6d56861f631d94433c9733d6a066a93e45fc0e340d30846577c73a7a77f9
 EBUILD gkrellmlaunch-0.5.ebuild 550 BLAKE2B ecf5eb52c7a74ca09fc5bd4730bf39dbf7aa4f70b11d6bb1c21aa50f3967d1e77c41e4c6fa5b7f91c9c48cb1144dbb3bab6e31b514100dade28a4cacae0ce255 SHA512 c9baaee8ccd293fafdbb20a974e57a428d167f06e84cfb518758e6c12c77bb71336bf06e0ceef03d8d673b519de2978f06ea73cd07402bdbf3d6dc591f3fffcf
 MISC metadata.xml 251 BLAKE2B 09c88cd076345aaa3b80d5c3ddbccfce98bb684204d4aea0ee36216077a36ffb2027dd0ec5f9e9cb5a54578aec14245bd882d971e3742f3e95b3af747984811a SHA512 24ce090eda7993b4d5b28108664752950ee5db54e2628f43b8f73df213b593f8fdd6989fee948d104ff21d3cb332da5a770c793cbe40eb4ec48a56f238489d77
diff --git a/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-r1-pkgconfig.patch b/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-r1-pkgconfig.patch
new file mode 100644
index 000000000000..be77d1619c8b
--- /dev/null
+++ b/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-r1-pkgconfig.patch
@@ -0,0 +1,20 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,8 @@
+ # Sample Makefile for a GKrellM plugin
+ 
+-GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
+-GTK_LIB = `pkg-config gtk+-2.0 --libs`
++PKG_CONFIG ?= pkg-config
++GTK_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+ 
+ 
+ FLAGS = -fPIC $(GTK_INCLUDE)
+@@ -25,4 +26,4 @@ gkrellmlaunch.so: $(OBJS)
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
+ 
+-gkrellmlaunch.o: gkrellmlaunch.c
+\ No newline at end of file
++gkrellmlaunch.o: gkrellmlaunch.c
diff --git a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5-r1.ebuild b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5-r1.ebuild
new file mode 100644
index 000000000000..a3f3ab6d277b
--- /dev/null
+++ b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A Program-Launcher Plugin for GKrellM2"
+SRC_URI="mirror://sourceforge/gkrellmlaunch/${P}.tar.gz"
+HOMEPAGE="http://gkrellmlaunch.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-r1-pkgconfig.patch
+)
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
diff --git a/x11-plugins/gkrellmoon/Manifest b/x11-plugins/gkrellmoon/Manifest
index 550df526920e..8f0cd1e5c1ab 100644
--- a/x11-plugins/gkrellmoon/Manifest
+++ b/x11-plugins/gkrellmoon/Manifest
@@ -1,4 +1,7 @@
 AUX gkrellmoon-0.6-makefile.patch 798 BLAKE2B 2d1925d08e44e7fecab8bbf2c810e47c082d5ad7cbc94dccca88009585e825201bd007a87f7ecadba4b74b6ded2b5238e0a04d0949d2637db758065f04e379a9 SHA512 3e167144eca00fe855a7dd04a90b9a8eae7f3297d980fd838bd3391fa67f5e19af2de791e32669e24748552f33dcae8dd81766d43297d73c11e8ef16b1d74436
+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
 EBUILD gkrellmoon-0.6-r2.ebuild 680 BLAKE2B 4a897690763097c88a1894c2da2dcf2f5730d3af143cb8440a424662631a23124643e403a88d6c806cc825648b94204643648649502c2aaecf1c812911ec4364 SHA512 61910e0b9d8d4cebdcfdd119f4aef6b2c3e48f0a3b109f255d15c0045efeb3c4ab3179b94e7c5e09256480a4319042249084bca3ff52d0b457692ff35f39d143
+EBUILD gkrellmoon-0.6-r3.ebuild 708 BLAKE2B 85f77b4c7d6b5e168fae335b25a6dd322036c3a687c59c7771f57ec5efebbf6586a6f83a1413a8b2fa54ee9d4ce376266fceeb78fc64301e6869e78cc073ff22 SHA512 b14b50c6ad75963f0732b3b48f7e299614cd1bcfde2935169fb09ccbe269bfe35943fc96c6bfd054dea3d710a869ca643614c3c5a8027eda004c5ef6501428c7
 MISC metadata.xml 248 BLAKE2B 8dab82a6d0236055e054f2bc7f36caea9e7b113b0aab998e374681ebd8ad271bdc8588c4ad5bf11eb413e0984cb7cff7633c821bbfd2a6fbf25822f2ed9e5ac7 SHA512 a473fc9e669adb26f81e0223e6849d9afd5fcb0561ed81b6576d7b330184b6d2a1a92e32208155d8c405ae7f8eedf887e007b2fdb010ffe9011665cad26489c2
diff --git a/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-r3-include-stringh.patch b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-r3-include-stringh.patch
new file mode 100644
index 000000000000..fc07da13f75b
--- /dev/null
+++ b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-r3-include-stringh.patch
@@ -0,0 +1,14 @@
+Include string.h
+--- a/CalcEphem.h
++++ b/CalcEphem.h
+@@ -13,6 +13,7 @@
+ #include <glib.h>
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <math.h>
+ 
+ #define DegPerRad       57.29577951308232087680
+-- 
+2.34.1
+
diff --git a/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-r3-pkgconfig.patch b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-r3-pkgconfig.patch
new file mode 100644
index 000000000000..80f7fa1a9a3e
--- /dev/null
+++ b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-r3-pkgconfig.patch
@@ -0,0 +1,12 @@
+Respect user's pkg-config
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,6 @@
+-GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
+-GTK_LIB = `pkg-config gtk+-2.0 --libs`
++PKG_CONFIG ?= pkg-config
++GTK_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB = $(shel ${PKG_CONFIG} gtk+-2.0 --libs)
+ 
+ INSTALLDIR = ${DESTDIR}/usr/lib/gkrellm2/plugins
+ 
diff --git a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
new file mode 100644
index 000000000000..35005ac0c50a
--- /dev/null
+++ b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A GKrellM2 plugin of the famous wmMoonClock dockapp"
+HOMEPAGE="http://gkrellmoon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gkrellmoon/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	media-libs/imlib2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-r3-pkgconfig.patch
+	"${FILESDIR}"/${P}-r3-include-stringh.patch
+)
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
diff --git a/x11-plugins/gkrellmss/Manifest b/x11-plugins/gkrellmss/Manifest
index 4773658c535e..abae15590710 100644
--- a/x11-plugins/gkrellmss/Manifest
+++ b/x11-plugins/gkrellmss/Manifest
@@ -1,5 +1,7 @@
 AUX gkrellmss-2.6-Respect-LDFLAGS.patch 498 BLAKE2B 2eb34f01a8f20325f34ba6176d68046645528fd7cddd3ee342be5df4c812e7f986b0d39d6a25e1d52d9521ca73cb30fc3784a1cf0aecc634b0618b3c09240bbd SHA512 8c050353c212ea0791b7e5160ba720ee1e91359612565bc9b074424de8d2da93a581696d54ec5210265609267c767eb8d5bb0678dcd9e1e9d7d61648a626e472
 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-r4.ebuild 783 BLAKE2B f3ee89bcce9b1a9887cd65025ab8aea00a39595d7826bbc37e759ee5150c39a98b0b622d010ee9727a5e8a7e99e4396860b40aec766f6d53a4576f2bb56d7c1d SHA512 dd6565f756adaa5eb320849cedbd3c89201f6347e78fb4ba5972ffc1d4b3ac39d57c287dcfa8c865f388e9530c94229a3d5a36a62b38ae487f1a47f7acbcf65f
+EBUILD gkrellmss-2.6-r5.ebuild 892 BLAKE2B a78df295f0222e402e44e5435b10bb39ed1691f0fe3cd619037b6a530f629535b51395b60227c45ce0915eb6e219b55cb6fb7c7630a9e5371c93adf67a514dcc SHA512 922baf139c354c744369291308f23930f29ec791989461f519eaa1b41ea7b9a1cebd62844ef3873abb288239d7e1d527bcb7002ee76c83a3d64e5fe1a8f19782
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellmss/files/gkrellmss-2.6-r5-configure-makefile-fixes.patch b/x11-plugins/gkrellmss/files/gkrellmss-2.6-r5-configure-makefile-fixes.patch
new file mode 100644
index 000000000000..a3eeae49cd56
--- /dev/null
+++ b/x11-plugins/gkrellmss/files/gkrellmss-2.6-r5-configure-makefile-fixes.patch
@@ -0,0 +1,61 @@
+Respect the user's pkg-config, don't call cc directly, respect CFLAGS
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -7,9 +7,9 @@ endif
+ INSTALLDIR ?= $(INSTALLROOT)/lib/gkrellm2/plugins
+ INSTALL ?= install
+ 
+-
+-GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
+-GTK_LIB = `pkg-config gtk+-2.0 --libs`
++PKG_CONFIG ?= pkg-config
++GTK_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+ 
+ OS_NAME=$(shell uname -s)
+ 
+@@ -92,7 +92,7 @@ ifeq ($(alsa),1)
+ 	FLAGS += -DGKRELLM_ALSA
+ endif
+ 
+-CC = gcc $(FLAGS) $(CFLAGS)
++CC = $(CC)
+ 
+ OBJS = gkrellmss.o oscope.o spectrum.o sdlib.o option.o
+ 
+@@ -101,7 +101,7 @@ all:	gkrellmss.so
+ warn: ; $(WARN)
+ 
+ gkrellmss.so: $(OBJS) warn
+-	$(CC) $(OBJS) -o gkrellmss.so $(LFLAGS) $(LIBS)
++	$(CC) $(FLAGS) $(CFLAGS) $(OBJS) -o gkrellmss.so $(LFLAGS) $(LIBS)
+ 
+ 
+ clean:
+@@ -121,7 +121,12 @@ help:
+ 	@echo ""
+ 
+ gkrellmss.o: gkrellmss.c gkrellmss.h configure
++	$(CC) $(CFLAGS) $(FLAGS) -c -o $@ $<
+ oscope.o: oscope.c gkrellmss.h configure
++	$(CC) $(CFLAGS) $(FLAGS) -c -o $@ $<
+ spectrum.o: spectrum.c gkrellmss.h configure
++	$(CC) $(CFLAGS) $(FLAGS) -c -o $@ $<
+ sdlib.o: sdlib.c gkrellmss.h sdlib-esd.c sdlib-alsa.c configure
++	$(CC) $(CFLAGS) $(FLAGS) -c -o $@ $<
+ option.o: option.c gkrellmss.h configure
++	$(CC) $(CFLAGS) $(FLAGS) -c -o $@ $<
+--- a/src/configure
++++ b/src/configure
+@@ -18,8 +18,9 @@ do
+ done
+ 
+ 
+-PKG_INCLUDE=`pkg-config gtk+-2.0 --cflags`
+-PKG_LIB=`pkg-config gtk+-2.0 --libs`
++PKG_CONFIG=${PKG_CONFIG-pkg-config}
++PKG_INCLUDE=$(${PKG_CONFIG} gtk+-2.0 --cflags)
++PKG_LIB=$(${PKG_CONFIG} gtk+-2.0 --libs)
+ 
+ rm -f configure.h configure.log test test.o test.c
+ 
diff --git a/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild b/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild
new file mode 100644
index 000000000000..33ca3455e91c
--- /dev/null
+++ b/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin
+
+DESCRIPTION="A plugin for GKrellM2 that has a VU meter and a sound chart"
+HOMEPAGE="http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html"
+SRC_URI="http://web.wt.net/~billw/gkrellmss/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	media-libs/alsa-lib
+	sci-libs/fftw:3.0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-r5-configure-makefile-fixes.patch
+)
+
+PLUGIN_DOCS=( Themes )
+
+src_compile() {
+	tc-export PKG_CONFIG
+	PLUGIN_SO=( src/gkrellmss$(get_modname) )
+	addpredict /dev/snd
+	emake CC="$(tc-getCC)" enable_nls=$(usex nls 1 0) without-esd=yes
+}
diff --git a/x11-plugins/gkrellmwireless/Manifest b/x11-plugins/gkrellmwireless/Manifest
index 1910b81e9e63..657f2a273e22 100644
--- a/x11-plugins/gkrellmwireless/Manifest
+++ b/x11-plugins/gkrellmwireless/Manifest
@@ -1,4 +1,6 @@
 AUX gkrellmwireless-2.0.3-fix-build-system.patch 581 BLAKE2B faba9c577d0bb7f72458999481e9181933fa0103e2e55a6d06122dcf9546c2a9e269153962bab7bc0177a9b1eb1bf2f6e6651b3110038361550b46e6e592faae SHA512 0e4725e1550487d9305f2f2500c12401558e9a1509852276fa3f7e49a516459f70e189c15a25a6320d24b77decba9749184e0a5a39ccc43ccd17f5e1392f0f96
+AUX gkrellmwireless-2.0.3-r3-pkgconfig.patch 620 BLAKE2B e11fc16f5ebf8c27665f9a433bee03a1f68d6354e6aa7d547146c5a8e72ba054d79848ba5fdd776fdffdf9647c6652a5cc445f0aa8b29cdc9094d1515ef1fcfa SHA512 4bba4e34e18d4e6bef622c5718127b99e0ec336256b1720e12ec2bb4b35add76518dbbde829d1373d84faf262a38fe1a827be6afdd30ee8fef857b5bef0234ea
 DIST gkrellmwireless-2.0.3.tar.gz 9557 BLAKE2B 74ad963540597bddadc8a8e110ad441a2341a36b10f8620c392179909fe4582d973f51a4f0ffc2fc552ae1917e1c70373992a3801c9e1fec1f162194749e788c SHA512 7d005502bd65ea16f589f94fba38e67dffec69974177d4e7b83bf50d805e431d64a8cd0795f21547100487a9cb4ed7c01883514cb2d66165f0a7b8aa91162ab1
 EBUILD gkrellmwireless-2.0.3-r2.ebuild 621 BLAKE2B 61abd813de331e43f2754f5cadd262c66309dda023ca10f0bc6bdb1dde3666cd12a230c2de56e3c1cc3008db45d3c05d77f11bda4e4512826560cd46ec1dbf9b SHA512 dad24caf5e92e3b3b6f3cf142477e8da2ab945064b055ab12986c208fcabe08382db942d9fc301136307699c62acd491ebb4ab8c78cadcbc6206567096886a31
+EBUILD gkrellmwireless-2.0.3-r3.ebuild 703 BLAKE2B a483a25987e75f74daf552a3823b08cd28af2a2287cf74eeff655643d70ec8989e4d345dd76d9fc716c63e5d09812fe43d536c4ef878d827f87c6f0f3e52c35a SHA512 30eccd8a8d76ebaceb6ba63a23ec62cb4bc3a9ea43abe2622032b41754b0f9f81d55f3dc92d2dfee705370560962b4b5079a55f42eadcd29c195288bfb293b5c
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-r3-pkgconfig.patch b/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-r3-pkgconfig.patch
new file mode 100644
index 000000000000..79e72bf1ba3c
--- /dev/null
+++ b/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-r3-pkgconfig.patch
@@ -0,0 +1,27 @@
+Respect user's pkg-config
+--- a/Makefile
++++ b/Makefile
+@@ -1,20 +1,10 @@
+ # Depends on gmake..
+ #
+ OS = $(shell uname)
++PKG_CONFIG ?= pkg-config
+ 
+-ifeq ($(OS),FreeBSD)
+-	GTK_CONFIG = pkg-config gtk+-2.0
+-	INCLUDE = -I/usr/src/sys
+-elseif eq ($(OS),NetBSD)
+-	GTK_CONFIG = pkg-config gtk+-2.0
+-else
+-# default to the linux 
+-	GTK_CONFIG = pkg-config gtk+-2.0
+-endif
+-
+-
+-GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
+-GTK_LIB = `$(GTK_CONFIG) --libs`
++GTK_CFLAGS = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+ 
+ CFLAGS += -Wall -fPIC
+ CPPFLAGS += $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild
new file mode 100644
index 000000000000..45819d00691d
--- /dev/null
+++ b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A plugin for GKrellM that monitors your wireless network card"
+HOMEPAGE="http://gkrellm.luon.net/gkrellmwireless.php"
+SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.3-fix-build-system.patch
+	"${FILESDIR}"/${PN}-2.0.3-r3-pkgconfig.patch
+)
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+
+	PLUGIN_SO=( wireless$(get_modname) )
+	default
+}
diff --git a/x11-plugins/gkrellshoot/Manifest b/x11-plugins/gkrellshoot/Manifest
index a93b328d815f..0405b780b8be 100644
--- a/x11-plugins/gkrellshoot/Manifest
+++ b/x11-plugins/gkrellshoot/Manifest
@@ -1,4 +1,6 @@
+AUX gkrellshoot-0.4.4-r4-pkgconfig.patch 657 BLAKE2B 83d9168314c216241894fc7ef354c8e271d1a551d4809bb03aedc7265314778ec3ae08f9bcf5070742fe45e40b90769cf7691bc27223cca7facdc3fb429adfb1 SHA512 02afe801966bc62dbd90cf573a25c196e0b4f4b3c31c98a464214cdf52dd6b09d5e686e04226160c90dfc392005e0ba9d8e4b1beac83f54693d7af6c520a3f87
 AUX makefile-respect-flags.patch 663 BLAKE2B 1129e147524560fd8a5ff2979453ed9aa0a8abb03b940d989106f18f887b571cd09a72454da05325b94c369ee72c4bfca2981945910ddd6e7c3e9ab1fe35b0cc SHA512 a58b16f0b95533be587f2fe1a63ba7c19ade8dfd9b432d2423aee3ff7b99789d662cb7ed0e04854ed1b315c106586c4cd527427b5ce395b3bbeffedf2c5fff80
 DIST gkrellshoot-0.4.4.tar.gz 16556 BLAKE2B 417217ffa500d8b0cc4ddd80849b2da83e3e55bc489db83fd7c8992f42af9ebb385c1ece17cae65cb7393bffadaaffd70e11a4dea16aa4d2b2f19e0b828a6833 SHA512 9363c045a99c23f8fedf95ac82c7bab4ce21acb675fdabdd831f174d9816a14a22ed6d7048d475b4c4199b9e6a88f3f663702ac2f9304f08860339beb323322a
 EBUILD gkrellshoot-0.4.4-r3.ebuild 541 BLAKE2B 746f277ca038103ccb9c7b98c847491fe6e9f3ca6cda44cf90b4470bd7dc19bfbb20b6b773ada9aa8147fb12c45d4f75540fac087aac70bca0fb0bb895c157eb SHA512 8ea26318ee2156ec26d4cbe03bed76aa639440e02c1759a893328bbbdea0d45ccd79035ca915574369c9e8c5a9426f523ae0e3b5f2bbeec0930046a0a5f919e0
+EBUILD gkrellshoot-0.4.4-r4.ebuild 670 BLAKE2B 4ecf3398db9cadc52afd5a5065200f932127849a8a2ae597da7dd14a46729aa01ab7f53fcd35b9a699691f1e0a13746766b6cacda5f4c14adb65eedb0a5ec58c SHA512 f754d67d76029e16d7cbf4e9d335bcf467bdbed223ce9fe0209a28f45e2b16d905d7abc40839dcaac20b87cd2f2e1b4d82a4c0dd95f4141fca17814f9d1a506f
 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
new file mode 100644
index 000000000000..d6dfb54e4354
--- /dev/null
+++ b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch
@@ -0,0 +1,25 @@
+From 47a80a178b4ab0225ff0540376be5b5c740530a7 Mon Sep 17 00:00:00 2001
+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 @@
+-GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
+-GTK_LIB = `pkg-config gtk+-2.0 --libs`
++PKG_CONFIG ?= pkg-config
++GTK_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+ 
+ FLAGS = -fPIC $(GTK_INCLUDE) 
+ LIBS = $(GTK_LIB) 
+-- 
+2.34.1
+
diff --git a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild
new file mode 100644
index 000000000000..d5bff5dbad4b
--- /dev/null
+++ b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild
@@ -0,0 +1,31 @@
+# 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 a7580a842acf..cb3b2d3a7272 100644
--- a/x11-plugins/gkrellstock/Manifest
+++ b/x11-plugins/gkrellstock/Manifest
@@ -1,4 +1,6 @@
 AUX gkrellstock-0.5-ldflags.patch 412 BLAKE2B 93761f0b972727b6b20a74ac0fd14ec2f359557f2067a53ee7ced7d63f6f33921b58554597e2d50d0f3dfffb6dd9812fae9a1458ad610ceb7b00d06ab959dc28 SHA512 626b1953988ce00d76270a779fcf7c5a2c0b599cd57ec0873ce2328c6cbbaaf7042cb8d608da9b0398205d29879c37ef9179edadf980ad5601b6eecac5fb7613
+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-r1.ebuild 815 BLAKE2B b68e9617abac731b24c8e7592a1ee94926162bb31dfb6be0c4a994966900579efa98f366482ccaafcbdb2cd2752f7dea02bf9241669ea0b22bddbb20add58599 SHA512 d477f91245e229ccbb61dac07046f0ea86507a244c497d22e8767f580a3428829f5d33e9af6c10115882d4ae79bb76229f94ed2a56078c97cbc3b641b804a67e
+EBUILD gkrellstock-0.5.1-r2.ebuild 892 BLAKE2B 0e2728e2b8710ba467c8388f4b5faebac96b570f4ff559ccbe738d2f4ef0873b1603847c6623ade8749d57a2b920d67da3de90c852bd70a0075b4c77d3a8839c SHA512 4088f8c2b5b7f8cc54f11cbdb0359a36ce1c3781f742c59113e06497ac155d97085e3e2a43b22a2495c28bbf0b2b70146f47fefb3a92d44757a8bc196901d2f7
 MISC metadata.xml 254 BLAKE2B 49d91c777a85789ee0f89df10065775aa549cb6ae181946d5afa17289f935e07588f77a5a3ab8d4b3c4dc561284f8261935d904b9311745e9dae2e1f7c5390ed SHA512 105c93e1064549cd25550fc7f33e6f21394ab5e9a3117835a5d0ec4ef502fb662f1fae81cda787aea39b5da43d9c3dd65138ab3c2e14ac398e41344e87b4c8e7
diff --git a/x11-plugins/gkrellstock/files/gkrellstock-0.5.1-r2-makefile-fixes.patch b/x11-plugins/gkrellstock/files/gkrellstock-0.5.1-r2-makefile-fixes.patch
new file mode 100644
index 000000000000..1b827a749272
--- /dev/null
+++ b/x11-plugins/gkrellstock/files/gkrellstock-0.5.1-r2-makefile-fixes.patch
@@ -0,0 +1,26 @@
+Respect the user's pkg-config, remove "-O2 -Wall" flags, don't call gcc directly
+--- a/Makefile
++++ b/Makefile
+@@ -1,16 +1,17 @@
+-GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
+-GTK_LIB = `pkg-config gtk+-2.0 --libs`
++PKG_CONFIG ?= pkg-config
++GTK_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
++FLAGS = -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
++CC = $(CC)
+ 
+ OBJS = gkrellstock.o
+ 
+ gkrellstock.so: $(OBJS)
+-	$(CC) $(LDFLAGS) $(OBJS) -o gkrellstock.so $(LFLAGS) $(LIBS) 
++	$(CC) $(CFLAGS) $(FLAGS) $(LDFLAGS) $(OBJS) -o gkrellstock.so $(LFLAGS) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
diff --git a/x11-plugins/gkrellstock/gkrellstock-0.5.1-r2.ebuild b/x11-plugins/gkrellstock/gkrellstock-0.5.1-r2.ebuild
new file mode 100644
index 000000000000..6fcbaee5ee28
--- /dev/null
+++ b/x11-plugins/gkrellstock/gkrellstock-0.5.1-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="Get Stock quotes plugin for Gkrellm2"
+HOMEPAGE="http://gkrellstock.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gkrellstock/${P}.tar.gz"
+S="${WORKDIR}/${P/s/S}"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	dev-perl/libwww-perl
+	dev-perl/Finance-Quote"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5-ldflags.patch
+	"${FILESDIR}"/${PN}-0.5.1-r2-makefile-fixes.patch
+)
+
+src_configure() {
+	tc-export PKG_CONFIG
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags gtk+-2.0)
+	append-flags -fPIC
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	gkrellm-plugin_src_install
+	dobin GetQuote2
+}
diff --git a/x11-plugins/gkrellsun/Manifest b/x11-plugins/gkrellsun/Manifest
index 50d389653b53..4238ae4b8dfd 100644
--- a/x11-plugins/gkrellsun/Manifest
+++ b/x11-plugins/gkrellsun/Manifest
@@ -1,5 +1,7 @@
 AUX gkrellsun-1.0.0-Respect-LDFLAGS.patch 334 BLAKE2B 18bc916fd4d6834731cc02a720347a49a926f57f8477c8ee91bf9711b92aecc85b427a77d53edc6658ffe6b918b61b7d52a0ca0d7215b2008ec71710a34a985f SHA512 093ab16f6852b9a75a9c2e31a7ddf3ad6a407fd5c0f881340980f3f59b3c9abe10fa1855e09e9a73bd53cd3b3d532e3372bb227d95614e7fcbc014637c3ee906
+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
 DIST gkrellsun-1.0.0.tar.gz 96970 BLAKE2B aef5bed2a077c7dccb8573bafa9a14df53c52522872d77d08b6a8d29c824d3ef09c54ea5d0b6268dd502508fed264ebc250bd558a602e41dabddab9556158668 SHA512 1a34812e94f16d19311c23d44a0353dade50b802dd3ab115738959b9322c3bc6a28daa2bcea889700e6cc2ff8eb9400b989bf02c6f138bb878b94118ffd6e27a
 EBUILD gkrellsun-1.0.0-r4.ebuild 713 BLAKE2B 9805d4325f1fd913da2669f9571cd782bb79efe745136255ba54daf7ab40e7b9067313e5a7d8b957997204fd1b2b3a726f39d4515411421d2f9cf775690f3217 SHA512 be3a78bcaa82881393be99866a905bb93bd3d4462ae89002a49eea90f999bd792bd8c2d4cf4f98bcc2e3881482bffd6cce817f0c90a9edead5cab0b659a0a937
+EBUILD gkrellsun-1.0.0-r5.ebuild 843 BLAKE2B ba7c73df95285e6d7b7396dffefa45d6d4e03c7bac394f0c718fca8209b3d677c4eea14848dcec90e9201a26efcd690d6bce4ddfc355733b9aed693ff1a88bf2 SHA512 fc09573dc46020d8cf00f1ab680a1b0fd15cc31a6442d2bc9d2f11b3f1169efc455064530e9fd7ee26b93a9ee8a7b74e3819d03d55929b22a8f2f79c30a6dd63
 MISC metadata.xml 247 BLAKE2B 2a5e52fe46bb870c82fb6f16e032fca8d7ee30da5d39bc7deae966d57cbb8d79d2efa4b36da3c415e74cfd49a9e7553254fc9c575838c86f433a53283fe74254 SHA512 fe10588aacdd43055f05ef7a9fd5147056c5de9d813740995e152972185872b30a1781a5b7096085fac3eea6bd80a45cc1679904052dfc701a0885344a5ca599
diff --git a/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-r5-makefile-fixes.patch b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-r5-makefile-fixes.patch
new file mode 100644
index 000000000000..186933030860
--- /dev/null
+++ b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-r5-makefile-fixes.patch
@@ -0,0 +1,56 @@
+Don't call gcc directly, remove -O2 -Wall flags, respect user's pkg-config
+--- a/src20/Makefile
++++ b/src20/Makefile
+@@ -1,8 +1,8 @@
+ PACKAGE ?= gkrellsun
+ 
+-GTK_CONFIG ?=pkg-config gtk+-2.0
+-GTK_INCLUDE ?= `pkg-config gtk+-2.0 --cflags`
+-GTK_LIB ?= `pkg-config gtk+-2.0 --libs`
++PKG_CONFIG ?= pkg-config
++GTK_INCLUDE ?= $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB ?= $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+ 
+ INSTALL ?= install
+ 
+@@ -11,7 +11,7 @@ INSTALLDIR ?= $(DESTDIR)$(PREFIX)
+ PLUGINDIR ?= $(INSTALLDIR)/lib/gkrellm2/plugins
+ LOCALEDIR ?= $(INSTALLDIR)/share/locale
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
++FLAGS = -fPIC $(GTK_INCLUDE)
+ #FLAGS = -g -Wall -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+@@ -25,7 +25,7 @@ endif
+ FLAGS += -DPACKAGE="\"$(PACKAGE)\""
+ export PACKAGE LOCALEDIR
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
++CC = $(CC)
+ 
+ OBJS = gkrellsun.o CalcEphem.o Moon.o MoonRise.o
+ 
+@@ -37,10 +37,10 @@ all: gkrellsun.so
+ 
+ gkrellsun.so: $(OBJS)
+ 	(cd po && ${MAKE})
+-	$(CC) $(OBJS) -o gkrellsun.so $(LFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(FLAGS) $(OBJS) -o gkrellsun.so $(LFLAGS) $(LIBS)
+ 
+ suninfo: suninfo.o CalcEphem.o Moon.o MoonRise.o
+-	$(CC) $^ -o suninfo -lm $(LIBS)
++	$(CC) $(CFLAGS) $(FLAGS) $^ -o suninfo -lm $(LIBS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
+@@ -49,7 +49,8 @@ gkrellsun.o: gkrellsun.c $(IMAGES)
+ 
+ $(OBJS): CalcEphem.h Moon.h MoonRise.h
+ 
+-#%.o: %.c
++%.o: %.c
++	$(CC) $(CFLAGS) $(FLAGS) -c -o $@ $<
+ 
+ install: gkrellsun.so
+ 	(cd po && ${MAKE} install )
diff --git a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild
new file mode 100644
index 000000000000..4d5e865d0b77
--- /dev/null
+++ b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A GKrellM plugin that shows sunrise and sunset times"
+HOMEPAGE="http://gkrellsun.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gkrellsun/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-reenable.patch
+	"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
+	"${FILESDIR}"/${P}-r5-makefile-fixes.patch
+)
+
+src_configure() {
+	PLUGIN_SO=( src20/gkrellsun$(get_modname) )
+	default
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+	use nls && local myconf="enable_nls=1"
+	emake CC="$(tc-getCC)" ${myconf}
+}
diff --git a/x11-plugins/gkrelltop/Manifest b/x11-plugins/gkrelltop/Manifest
index 3302e26ffa61..e0195ca97df9 100644
--- a/x11-plugins/gkrelltop/Manifest
+++ b/x11-plugins/gkrelltop/Manifest
@@ -1,4 +1,6 @@
 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
 DIST gkrelltop_2.2.13.orig.tar.gz 49023 BLAKE2B d2857b6d73fca2a2933f4bcaa207dbf34f9bbc2bb9de922d564a865d2238b91d9bbcfbdf5753d7976d941d9ba98c9e7b81812018a2d9d1ac07984e26c3317382 SHA512 9479c5b860833671451b6fb8583e741b1ac755ed76b7e73dffd65d13d30d0b5da1916436901642f738e0d72f8c8696f4dea9c041a203e76d309f2782acf7024e
 EBUILD gkrelltop-2.2.13-r2.ebuild 945 BLAKE2B 73554d39c2cb6085814aa2fe940ee4d5e410aca555db717d1460aac8644c9e8b65aa525f937ff25b33bf17f09dba6345042e2003aa9b682d54b00509c34f006c SHA512 94bd96cd7100d8769e447d98689a8e9fca101fac5117d10133065064dabcb2d195ca0c4738a72dc77d159dea1b0a1d0cbdeb640a9d37a0e05f071e99c986eaee
+EBUILD gkrelltop-2.2.13-r3.ebuild 1035 BLAKE2B d213cb7ffe8ad0ca10f2037fc7d09b416d5be174ac47d6cbb4484d88c1a4554746ce608917a30cf4d4e7f14e36848f7d3417d5ba298792de711d1d3fe1856481 SHA512 ad8c5743ad1fa86bdca730644c1567c21f8c76c67aa66c638a00be5d15297ac8b2f0f49d3d8320bd79389a531f6709d0a4e1a1a03619ea316d777308338e1f06
 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
new file mode 100644
index 000000000000..552190827da5
--- /dev/null
+++ b/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-r3-pkgconfig.patch
@@ -0,0 +1,67 @@
+Makefile and configure should respect user's pkg-config
+--- a/Makefile
++++ b/Makefile
+@@ -28,9 +28,10 @@
+ OSFLAG = $(shell uname | tr '[:lower:]' '[:upper:]')
+ SHELL=/bin/sh
+ 
++PKG_CONFIG ?= pkg-config
+ GKRELL1FLAG=1
+ #find out if we have gkrellm 2 or 1 (from the gtk+ version)
+-GKRELL1FLAG=$(shell bash -c 'pkg-config gtk+-2.0 --cflags &>/dev/null && echo 0')
++GKRELL1FLAG=$(shell bash -c "${PKG_CONFIG} gtk+-2.0 --cflags &>/dev/null && echo 0")
+ GKRELLTOP = gkrelltop.so
+ OBJ = top_three.o gkrelltop.o 
+ EXTRA = krell_panel1.xpm
+@@ -43,7 +44,8 @@ endif
+ 
+ ifeq ($(GKRELL1FLAG),0)
+ # Parameters for gkrellm version 2.*
+-CFLAGS2 = -g -D$(OSFLAG) -DGKRELLM2 -fPIC -Wall `pkg-config gtk+-2.0 --cflags`
++GTK_INCLUDE=$(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++CFLAGS2 = -g -D$(OSFLAG) -DGKRELLM2 -fPIC -Wall ${GTK_INCLUDE}
+ LIBS =  
+ CC += $(CFLAGS) $(CFLAGS2)
+ 
+@@ -69,8 +71,9 @@ LIBSD = `glib-config --libs`
+ LIBSD = 
+ CONFIGURE_ARGS += --with-glib12
+ else
+-CFLAGSD = -D$(OSFLAG) -fPIC -Wall `pkg-config glib-2.0 --cflags`
+-LIBSD = `pkg-config glib-2.0 --libs`
++GLIB_INCLUDE=$(shell ${PKG_CONFIG} glib-2.0 --cflags)
++CFLAGSD = -D$(OSFLAG) -fPIC -Wall ${GLIB_INCLUDE}
++LIBSD = $(shell ${PKG_CONFIG} glib-2.0 --libs)
+ LIBSD = 
+ endif
+ INSTALLDIRD ?= $(PREFIXD)/$(DESTDIR)
+diff --git a/configure b/configure
+index f0b7366..99f58d8 100755
+--- a/configure
++++ b/configure
+@@ -4,8 +4,9 @@
+ # There is no need to run this configure before doing a make.
+ #
+ 
+-GLIB_INCLUDE=`pkg-config --cflags glib-2.0`
+-GLIB_LIBS=`pkg-config --libs glib-2.0`
++PKG_CONFIG=${PKG_CONFIG-pkg-config}
++GLIB_INCLUDE=$(${PKG_CONFIG} --cflags glib-2.0)
++GLIB_LIBS=$(${PKG_CONFIG} --libs glib-2.0)
+ 
+ for i
+ do
+@@ -17,8 +18,8 @@ do
+ done
+ 
+ 
+-PKG_INCLUDE=`pkg-config gkrellm --cflags --silence-errors`
+-PKG_LIBS=`pkg-config gkrellm --libs --silence-errors`
++PKG_INCLUDE=$(${PKG_CONFIG} gkrellm --cflags --silence-errors)
++PKG_LIBS=$(${PKG_CONFIG} gkrellm --libs --silence-errors)
+ 
+ if [ "$PKG_INCLUDE" = "" ]
+ then
+-- 
+2.34.1
+
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild
new file mode 100644
index 000000000000..c9faf9266655
--- /dev/null
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
+HOMEPAGE="https://sourceforge.net/projects/gkrelltop"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
+S="${WORKDIR}/${P}.orig"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	dev-libs/glib:2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.13-fix-build-system.patch
+	"${FILESDIR}"/${PN}-2.2.13-r3-pkgconfig.patch
+)
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+
+	PLUGIN_SERVER_SO=( gkrelltopd$(get_modname) )
+	PLUGIN_SO=( gkrelltop$(get_modname) )
+
+	default
+}
+
+src_compile() {
+	use X || local target="server"
+	emake ${target}
+}
+
+pkg_postinst() {
+	einfo "To enable the gkrelltopd server plugin, you must add the following"
+	einfo "line to /etc/gkrellmd.conf:"
+	einfo "\tplugin-enable gkrelltopd"
+}
diff --git a/x11-plugins/gkrellweather/Manifest b/x11-plugins/gkrellweather/Manifest
index 97bd61fe5b6e..0918b190ff89 100644
--- a/x11-plugins/gkrellweather/Manifest
+++ b/x11-plugins/gkrellweather/Manifest
@@ -1,6 +1,8 @@
 AUX gkrellweather-2.0.8-Move-GrabWeather.patch 2162 BLAKE2B d6a38021b10cf0ec97eaaa9dcf0c5e3b78599f57b008054d55bb64abaa2318620345a2bac43168da57af9660d895150d25f3ff248ceb1233ce221dd5910bb805 SHA512 9c078e68f28c829f19e4e8e2836795508f5b124aa2a7b8535857266d16b9ba6404604e1527751dee99e632237be106eed456bebc2b14f69799a46888ab9699ff
 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
 DIST gkrellweather-2.0.8.tgz 20227 BLAKE2B 7c3fd369e323229359bc397e07b422b625a14038aff573cf7c3fd6218c733a1d69f5754dcb86ab2172a8a5ae08fbab022a87100a6422c5e8b3b3068e108fd9a7 SHA512 da9408ebc9518fe805d3f0dd9496b4aeb805a2ab6566b619b61fc25c91122c0ee45e2a7b804206b2ee08300309dd9b1e1c3b6605a41c594cf75fd39b58767264
 EBUILD gkrellweather-2.0.8-r1.ebuild 1009 BLAKE2B 2bbc1ad4813f494603f36fea6299b4638b434a82ded3c68847d374d30816aa37dc9ecbf16c659a944351058e0c5860be86d77af3a6234f029bf74bafbf8f1fa0 SHA512 ba2136390538be84ab3c7351b9fdcd4f3c573445ae2e2285a6a3750083eb039d71e11a9a5f42a32d366c22e3c41c54dddb8b3979491c00eb489bdb2f908aa91f
+EBUILD gkrellweather-2.0.8-r2.ebuild 1076 BLAKE2B 07e0d18a50dafa92c8be53a43c9f854535892fc51a83958507b0e7ddc24ccdc0e0d7c2dab90ab17a4adb10d87bff3c963b039a830cbecb94ac018faf12f9ec4f SHA512 82ebf77294bd4c25bdaf45e8c00fc80dab8e005ed7553cc37130f3f5eb209b86421d48165b8938f9d8f66209177d9192c2acbd02dce8d6558bf467a34158ff16
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-r2-makefile-fixes.patch b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-r2-makefile-fixes.patch
new file mode 100644
index 000000000000..aa35e565e508
--- /dev/null
+++ b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-r2-makefile-fixes.patch
@@ -0,0 +1,24 @@
+Respect user's pkg-config, don't call gcc directly
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,9 @@
+ PKGNAME = gkrellweather
+ VERSION = 2.0.8
+-CFLAGS = -O2 -std=gnu99 -Wall -fPIC `pkg-config gtk+-2.0 --cflags`
+-LIBS = `pkg-config gtk+-2.0 --libs`
++PKG_CONFIG ?= pkg-config
++GTK_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++CFLAGS = -std=gnu99 -fPIC $(GTK_INCLUDE)
++LIBS =  $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+ LFLAGS = -shared
+ PREFIX = /usr/local
+ 
+@@ -16,7 +18,7 @@ endif
+ CFLAGS += -DPACKAGE="\"$(PKGNAME)\""
+ export PKGNAME LOCALEDIR
+ 
+-CC = gcc
++CC = $(CC)
+ 
+ OBJS = gkrellweather.o
+ 
diff --git a/x11-plugins/gkrellweather/gkrellweather-2.0.8-r2.ebuild b/x11-plugins/gkrellweather/gkrellweather-2.0.8-r2.ebuild
new file mode 100644
index 000000000000..1a70885d8d3c
--- /dev/null
+++ b/x11-plugins/gkrellweather/gkrellweather-2.0.8-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="GKrellM2 Plugin that monitors a METAR station and displays weatherinfo"
+HOMEPAGE="https://sites.google.com/site/makovick/gkrellm-plugins"
+SRC_URI="https://sites.google.com/site/makovick/projects/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	dev-lang/perl
+	net-misc/wget
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
+	"${FILESDIR}"/${P}-Move-GrabWeather.patch
+	"${FILESDIR}"/${P}-update-locations.patch
+	"${FILESDIR}"/${P}-r2-makefile-fixes.patch
+)
+
+src_configure() {
+	append-cflags $($(tc-getPKG_CONFIG) --cflags gtk+-2.0)
+	append-flags -fPIC
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake PREFIX="${EPREFIX}"/usr CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	gkrellm-plugin_src_install
+
+	exeinto /usr/libexec/gkrellweather
+	doexe GrabWeather
+}
diff --git a/x11-plugins/i8krellm/Manifest b/x11-plugins/i8krellm/Manifest
index fcdaeaf0c78c..96d23f5cc4e1 100644
--- a/x11-plugins/i8krellm/Manifest
+++ b/x11-plugins/i8krellm/Manifest
@@ -1,4 +1,7 @@
 AUX i8krellm-2.5-Respect-LDFLAGS.patch 187 BLAKE2B 20c7ea678a56d705c2289bec2690e4254594fb1815101c4a4ac18f77a4de639b9a71392925d197db98033d716ba9cb604509da9858bd7d40f5cc5d7b23b2771c SHA512 78b953668ee6041f01f56c67cb0b2f3eb680585e833df0bdbc577c31b68d7155cd27e90ece352e50b6b93b189c6f996e5c45c93214f8a2fd31deecc26e22ec14
+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
 EBUILD i8krellm-2.5-r2.ebuild 509 BLAKE2B fece596d5c46ac1b92a0a2db1ffedaa01a8501cab672a4983c267e0b5a221fee4ce20c9b2d442db5f66006e2d0c09f53723223a8a0b57b8c160031d9a9e3587f SHA512 dda3d7d3a229cb49908a9d2a9b828b95b9361dbcd20c9a2c2c1de0cb477672aa605aa42f64498ca125959afa668233074d06c6995624ed223700df1e2ec0b7d9
+EBUILD i8krellm-2.5-r3.ebuild 703 BLAKE2B 7fe6be4964ff3b2f220c43859c3bc5a08e082c06d439132671c3058a587b35361b48ed8c88c473ca4f06fd63b30ac3738943e7664ec1b8ee784c8926d3eadff2 SHA512 12bb2e69f2176a508e26895bf02cf86a88913de1f42f600f0c91e92a414e5b176ffc7a1ce06295308060a7b3d9d0fc4f23a939a01f6c30b6d226201b4ca9a420
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/i8krellm/files/i8krellm-2.5-r3-makefile-fixes.patch b/x11-plugins/i8krellm/files/i8krellm-2.5-r3-makefile-fixes.patch
new file mode 100644
index 000000000000..154c4f293179
--- /dev/null
+++ b/x11-plugins/i8krellm/files/i8krellm-2.5-r3-makefile-fixes.patch
@@ -0,0 +1,42 @@
+Respect user's pkg-config, don't call gcc directly, respect CFLAGS
+--- a/Makefile
++++ b/Makefile
+@@ -8,14 +8,14 @@ LFLAGS += $(LDFLAGS)
+ 
+ ## Support for GKrellM 2.0
+ #
+-GTK2_INCLUDE = `pkg-config gtk+-2.0 --cflags`
+-GTK2_LIB = `pkg-config gtk+-2.0 --libs`
++PKG_CONFIG ?= pkg-config
++GTK2_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK2_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+ SINSTALLDIR2 = /usr/share/gkrellm2/plugins
+ UINSTALLDIR2 = $(HOME)/.gkrellm2/plugins
+-FLAGS2 = -O2 -Wall -fPIC -I. $(GTK2_INCLUDE)
++FLAGS2 = -fPIC -I. $(GTK2_INCLUDE)
+ LIBS2 = $(GTK2_LIB)
+-CC2 = gcc $(FLAGS2) -DGKRELLM2
+-CC2F = gcc $(FLAGS2) -DFAKE -DGKRELLM2
++CC = $(CC)
+ OBJS2 = i8krellm.o
+ 
+ # seems to barf without the @echo....
+@@ -23,14 +23,14 @@ i8krellm: i8krellm.so
+ 	@echo ""
+ 
+ i8krellm.so: $(OBJS2)
+-	$(CC2) $(OBJS2) -o i8krellm.so $(LFLAGS) $(LIBS2)
++	$(CC) $(CFLAGS) $(CFLAGS) $(FLAGS2) -DGKRELLM2 $(OBJS2) -o i8krellm.so $(LFLAGS) $(LIBS2)
+ 
+ fake: i8krellm.c prop-anim.xpm
+-	$(CC2F) -c -o i8krellm.o i8krellm.c
+-	$(CC2F) $(OBJS2) -o i8krellm.so $(LFLAGS) $(LIBS2)
++	$(CC) $(CFLAGS) $(FLAGS2) -DFAKE -DGKRELLM2 -c -o i8krellm.o i8krellm.c
++	$(CC) $(CFLAGS) $(FLAGS2) -DFAKE -DGKRELLM2 $(OBJS2) -o i8krellm.so $(LFLAGS) $(LIBS2)
+ 
+ i8krellm.o: i8krellm.c prop-anim.xpm
+-	$(CC2) -c -o i8krellm.o i8krellm.c
++	$(CC) $(CFLAGS) $(FLAGS2) -DGKRELLM2 -c -o i8krellm.o i8krellm.c
+ 
+ site_install: i8krellm.so
+ 	install -c -s -m 644 i8krellm.so $(SINSTALLDIR2)
diff --git a/x11-plugins/i8krellm/files/i8krellm-2.5-r3-rm-gkrellm1-support.patch b/x11-plugins/i8krellm/files/i8krellm-2.5-r3-rm-gkrellm1-support.patch
new file mode 100644
index 000000000000..e46e0d6ac21c
--- /dev/null
+++ b/x11-plugins/i8krellm/files/i8krellm-2.5-r3-rm-gkrellm1-support.patch
@@ -0,0 +1,50 @@
+Remove support for gkrellm1
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,4 @@
+ # To build for GKrellM v2, just type 'make' and 'make install'
+-# For GKrellM v1, type 'make i8krellm1' and 'make install1'
+ # 
+ 
+ LFLAGS = -shared
+@@ -43,40 +42,3 @@ install: i8krellm.so
+ 
+ clean:
+ 	rm -f *.o core *.so
+-
+-
+-## Support for GKrellM 1.2
+-#
+-GTK_INCLUDE = `gtk-config --cflags`
+-GTK_LIB = `gtk-config --libs` -lpthread
+-IMLIB_INCLUDE = `imlib-config --cflags-gdk`
+-IMLIB_LIB = `imlib-config --libs-gdk`
+-SINSTALLDIR = /usr/share/gkrellm/plugins
+-UINSTALLDIR = $(HOME)/.gkrellm/plugins
+-FLAGS = -O2 -Wall -fPIC -I. $(GTK_INCLUDE) $(IMLIB_INCLUDE)
+-LIBS = $(GTK_LIB) $(IMLIB_LIB)
+-CC = gcc $(FLAGS)
+-CCF = gcc $(FLAGS) -DFAKE
+-OBJS = i8krellm.o
+-
+-i8krellm1.so: $(OBJS)
+-#	@echo "========> i8krellm1.so"
+-	$(CC) $(OBJS) -o i8krellm1.so $(LFLAGS) $(LIBS)
+-
+-i8krellm1.o: i8krellm.c prop-anim.xpm
+-#	@echo "========> i8krellm1.o"
+-	$(CC) -c -o i8krellm1.o i8krellm.c
+-
+-fake1: i8krellm.c prop-anim.xpm
+-	$(CCF) -c -o i8krellm1.o i8krellm.c
+-	$(CCF) $(OBJS) -o i8krellm1.so $(LFLAGS) $(LIBS)
+-
+-site_install1: i8krellm1.so
+-	install -c -s -m 644 i8krellm1.so $(SINSTALLDIR)
+-
+-user_install1: i8krellm1.so
+-	install -c -s -m 644 i8krellm1.so $(UINSTALLDIR)
+-
+-install1: i8krellm1.so
+-	install -c -s -m 644 i8krellm1.so $(UINSTALLDIR)
+-
diff --git a/x11-plugins/i8krellm/i8krellm-2.5-r3.ebuild b/x11-plugins/i8krellm/i8krellm-2.5-r3.ebuild
new file mode 100644
index 000000000000..5bdff0ee4969
--- /dev/null
+++ b/x11-plugins/i8krellm/i8krellm-2.5-r3.ebuild
@@ -0,0 +1,31 @@
+# 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 for the Dell Inspiron and Latitude notebooks"
+SRC_URI="http://www.coding-zone.com/${P}.tar.gz"
+HOMEPAGE="http://www.coding-zone.com/?page=i8krellm"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	>=app-laptop/i8kutils-1.5"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
+	"${FILESDIR}"/${P}-r3-makefile-fixes.patch
+	"${FILESDIR}"/${P}-r3-rm-gkrellm1-support.patch
+)
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake CC="$(tc-getCC)"
+}
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index 5caa55eee62a..4aaad7657d25 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -1,5 +1,3 @@
-DIST pidgin-sipe-1.23.3.tar.gz 1298459 BLAKE2B e15ad7658771fc0d7f5320f6b145e67a6f33603dfe49dd83edbf42fd2e57f117f4cdac53c6b6dba401266ae6c2593bb6078a604c164aa365aa94aa64eb94f1c7 SHA512 3c7481e02f9541818a980df31d135c3eefd8f1e921dcb6cfe3d1ce194b1591531db2c23364b545a912eb3818af207ffc0a19d3310d495db503de954f0547ea31
 DIST pidgin-sipe-1.25.0.tar.gz 1395316 BLAKE2B 854832768a5c6605c28fcc02abd2444cd15b58be3be89009ce08aad390664a09235ca4fc6c6288c0e0f8677ba920a30b7e3a418312308dcb229a08817bbf4a3c SHA512 e9f1f38bb27cfd8e464f2f03aea3153b7d9a1ff7c45876ff06fc8b391e5d69506b793edda5cef0f4b5f281ddd0281ad0f97c82457e1bcc977965805a323d6f0c
-EBUILD pidgin-sipe-1.23.3.ebuild 1339 BLAKE2B 6de8452d55f045ed0340663915734c83b010b965533d644c14305fc26471dfe005555d24881203692ff920eedaccfd0e841ed90c2e58a7ebbbbc21739568fc7b SHA512 d93ec9a9b02fbe093d0f3e607627eec09944cd6a7bc8528403c493bf71d1cbb6f5f57e4635d1f206f78a05f743fc79da8d4303b983bfe84245f7135ec839a816
 EBUILD pidgin-sipe-1.25.0-r1.ebuild 1365 BLAKE2B b02343bb14a30ecd1d1abc4b2e9d8704aa1c46ee0480cebf428c7be9ed75d72a4e3501985859d9e50ed47674dc249280182e098336908e425881e644a02228d4 SHA512 b7e502cd5805bc62b8dde5ea48a29efbae3a8c15b59d2869c27eb8cf88c86dbd4825ac0ee93b5b2516acfba9cc0a60eeea3feb4e9c8572945b832516f9ff7e0f
 MISC metadata.xml 779 BLAKE2B 3ee29396f7b5f58ff00c5949952a0f01ece5183371ebeaa87342102c7c05a336f0f6e166c02fe58057a2a01ae0a4a32422b23fe9285339a94caceb58dd5f6d49 SHA512 32607403d8c9b8b06444640fff1d141f439dbdc6bc878a749da72824e57455597f415c493b5546337077b857583b4cf0ae075ddbcb13ee5ab63d1ccf420509a9
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.3.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.3.ebuild
deleted file mode 100644
index 3e128eb9dcfd..000000000000
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)"
-HOMEPAGE="http://sipe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="dbus debug kerberos ocs2005-message-hack openssl telepathy voice"
-
-RDEPEND="
-	dev-libs/gmime:2.6
-	dev-libs/libxml2
-	openssl? ( dev-libs/openssl:= )
-	!openssl? ( dev-libs/nss )
-	kerberos? ( virtual/krb5 )
-	voice? (
-		>=dev-libs/glib-2.28.0
-		>=net-libs/libnice-0.1.0
-		media-libs/gstreamer:1.0
-		net-libs/farstream:0.2
-	)
-	!voice? (
-		>=dev-libs/glib-2.12.0:2
-	)
-	net-im/pidgin[dbus?]
-	telepathy? (
-		>=sys-apps/dbus-1.1.0
-		>=dev-libs/dbus-glib-0.61
-		>=dev-libs/glib-2.28:2
-		>=net-libs/telepathy-glib-0.18.0
-	)
-"
-
-DEPEND="dev-util/intltool
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-purple \
-		--disable-quality-check \
-		$(use_enable telepathy) \
-		$(use_enable debug) \
-		$(use_enable ocs2005-message-hack) \
-		$(use_with dbus) \
-		$(use_with kerberos krb5) \
-		$(use_with voice vv) \
-		$(use_enable !openssl nss) \
-		$(use_enable openssl)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS TODO README
-}
diff --git a/x11-plugins/purple-hangouts/Manifest b/x11-plugins/purple-hangouts/Manifest
index ee9655960ebd..d23ff3d4f05f 100644
--- a/x11-plugins/purple-hangouts/Manifest
+++ b/x11-plugins/purple-hangouts/Manifest
@@ -1,6 +1,3 @@
-AUX purple-hangouts-0_p20181202-makefile.patch 3436 BLAKE2B 6b572ff61aa158ebd7531df35e14a94947b5d6a90e284094f4a260828aa02b6a5afdf1fe7c52b725331b73952f0c902110285f88f4b2a3deb243f0c6aa4de45b SHA512 439c25f456ee7415b92d9ed82fec25fa4500299c77eaad20e0f1b9f8dcce5d7f466971da9a2b9f6966d366ddfb75cb4e19433015e7519eb97d17ea11dd4767d7
-DIST purple-hangouts-0_p20181202.tar.gz 151968 BLAKE2B ae487b77e2322fb2e02ceeb5c1cd5eb9eed1aaa71ea47d9f6e032802e2d17da1bf3160a11f4aaa64bd5a95aa67936b867e5a31958efdbdcc80736a96335f3b24 SHA512 4b7ec1b26040f706d2d7badeb667967ac7da1bbabab259c630cec0460ed275ae20e1c4d8303205c757bade38cd23f57d6f7d6f61735a5d189f69f423ed972227
 DIST purple-hangouts-0_p20200710.tar.gz 153541 BLAKE2B 7a71cb5fdb7ca0636b4eb3d4245347e057e879a6b855451b9330f33cec6ba1a15da071e916a3e3d38094700cd61178947e5aa749e6182d3d0488e01c673568f5 SHA512 ce650c1ee1052803576e163905e906bb6202ce04ea380b52ae7524ec896ad785c1a89a5bc713242e3ad5df2d3ae677e0bd5323c7533daedaf6ac333d8e2f5b34
-EBUILD purple-hangouts-0_p20181202.ebuild 954 BLAKE2B bf961017bd39d5480d9788ed9091b4166b0d9797c23b0ca54e171976328a8b9a5553d70dc0e19d298ea88f25754551a39200845f727ea14146028306e9c241e6 SHA512 0537b1f5d438fb72bf28cec5f1ebb551852e7ed50c642cab0985f5b0fd9486aceb493f0aba67acdaf642b1c9c65e34c0d370c3eca066f9d25de03bd57c927c27
 EBUILD purple-hangouts-0_p20200710.ebuild 908 BLAKE2B 1f24fc2c710cc98e272b131e04c60c968cb2184e47f8ed5deb2d064e83ed0bf776c9b1768afa3dcc1b176877bfec654f9e8b5c7fb824b777ddb3148acc43da7a SHA512 c8de10160b87cda29d542990ad1f4c7186158fc7145adb174b595f17936ad45652d783184b7d44979ec7ba608e9b6281a28c1d984704edaba75107a93842b66c
 MISC metadata.xml 257 BLAKE2B 83a13a4bd728b69f9b80a22401842e6e5c3408d681e8818071e586b5335b4d7f927803a24d3768c560222fbf7b1fd48fdf6c76bf77f65149846d81844d09d83d SHA512 7be3477437879835856da292d7aeb70e477cb93c41d94ddfd8ec2028e34f4a482fc2e7e8479e09061277b063a3abacc90aa1958ec59acc711c67d61b2c90105f
diff --git a/x11-plugins/purple-hangouts/files/purple-hangouts-0_p20181202-makefile.patch b/x11-plugins/purple-hangouts/files/purple-hangouts-0_p20181202-makefile.patch
deleted file mode 100644
index a575a449c2aa..000000000000
--- a/x11-plugins/purple-hangouts/files/purple-hangouts-0_p20181202-makefile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# HG changeset patch
-# User Stefan Strogin <stefan.strogin@gmail.com>
-# Date 1544083567 -7200
-#      Thu Dec 06 10:06:07 2018 +0200
-# Branch make
-# Node ID 938b9b0dc4fb7b22f8d110e9259899602fe7c1ba
-# Parent  cccf2f62d439fc3dd6248014d171efc811f89f2b
-Compile source files separately. Fixes issue #192
-
-diff -r cccf2f62d439 -r 938b9b0dc4fb Makefile
---- a/Makefile	Sun Dec 02 22:34:01 2018 +1300
-+++ b/Makefile	Thu Dec 06 10:06:07 2018 +0200
-@@ -57,11 +57,13 @@
-       HANGOUTS_DEST =
- 	  HANGOUTS_ICONS_DEST =
-     else
-+      CFLAGS := $(CFLAGS) -fPIC $(INCLUDES) -Ipurple2compat $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple glib-2.0 json-glib-1.0 zlib --libs --cflags`
-       HANGOUTS_TARGET = libhangouts.so
-       HANGOUTS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=plugindir purple`
- 	  HANGOUTS_ICONS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=datadir purple`/pixmaps/pidgin/protocols
-     endif
-   else
-+    CFLAGS := $(CFLAGS) -fPIC $(INCLUDES) $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple-3 glib-2.0 json-glib-1.0 zlib --libs --cflags`
-     HANGOUTS_TARGET = libhangouts3.so
-     HANGOUTS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=plugindir purple-3`
- 	HANGOUTS_ICONS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=datadir purple-3`/pixmaps/pidgin/protocols
-@@ -75,12 +77,10 @@
- WIN32_PIDGIN2_LDFLAGS = -L$(PIDGIN_TREE_TOP)/libpurple $(WIN32_LDFLAGS)
- WIN32_PIDGIN3_LDFLAGS = -L$(PIDGIN3_TREE_TOP)/libpurple -L$(WIN32_DEV_TOP)/gplugin-dev/gplugin $(WIN32_LDFLAGS) -lgplugin
- 
--C_FILES := hangouts.pb-c.c hangout_media.pb-c.c gmail.pb-c.c hangouts_json.c hangouts_pblite.c hangouts_connection.c hangouts_auth.c hangouts_events.c hangouts_conversation.c hangouts_media.c
--PURPLE_COMPAT_FILES := purple2compat/http.c purple2compat/purple-socket.c
--PURPLE_C_FILES := libhangouts.c $(C_FILES)
--TEST_C_FILES := hangouts_test.c $(C_FILES)
--
--
-+OBJ := hangouts.pb-c.o hangout_media.pb-c.o gmail.pb-c.o hangouts_json.o hangouts_pblite.o hangouts_connection.o hangouts_auth.o hangouts_events.o hangouts_conversation.o hangouts_media.o
-+PURPLE_COMPAT_FILES := purple2compat/http.o purple2compat/purple-socket.o
-+PURPLE_C_FILES := libhangouts.c $(OBJ)
-+TEST_C_FILES := hangouts_test.c $(OBJ)
- 
- .PHONY:	all install FAILNOPURPLE clean
- 
-@@ -96,10 +96,10 @@
- 	$(PROTOC_C) --c_out=. gmail.proto
- 
- libhangouts.so: $(PURPLE_C_FILES) $(PURPLE_COMPAT_FILES)
--	$(CC) -fPIC $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple glib-2.0 json-glib-1.0 zlib --libs --cflags` -ldl $(INCLUDES) -Ipurple2compat -g -ggdb
-+	$(CC) $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) -ggdb -ldl
- 
- libhangouts3.so: $(PURPLE_C_FILES)
--	$(CC) -fPIC $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple-3 glib-2.0 json-glib-1.0 zlib --libs --cflags` -ldl $(INCLUDES) -g -ggdb
-+	$(CC) $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) -ggdb -ldl
- 
- libhangouts.dll: $(PURPLE_C_FILES) $(PURPLE_COMPAT_FILES)
- 	$(WIN32_CC) -shared -o $@ $^ $(WIN32_PIDGIN2_CFLAGS) $(WIN32_PIDGIN2_LDFLAGS) -Ipurple2compat
-@@ -126,7 +126,7 @@
- 	echo "You need libpurple development headers installed to be able to compile this plugin"
- 
- clean:
--	rm -f $(HANGOUTS_TARGET) hangouts.pb-c.h hangouts.pb-c.c hangout_media.pb-c.h hangout_media.pb-c.c
-+	rm -f $(HANGOUTS_TARGET) $(OBJ) $(PURPLE_COMPAT_FILES) hangouts.pb-c.h hangouts.pb-c.c hangout_media.pb-c.h hangout_media.pb-c.c
- 
- 
- installer: purple-hangouts.nsi libhangouts.dll
diff --git a/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild
deleted file mode 100644
index 9b57ae98908d..000000000000
--- a/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Hangouts Plugin for libpurple"
-HOMEPAGE="https://bitbucket.org/EionRobb/purple-hangouts"
-
-COMMIT_ID="cccf2f62d439"
-SRC_URI="https://bitbucket.org/EionRobb/purple-hangouts/get/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-S="${WORKDIR}/EionRobb-${PN}-${COMMIT_ID}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/protobuf-c:=
-	net-im/pidgin
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-0_p20181202-makefile.patch" )
-
-src_prepare() {
-	default
-
-	# Does not respect CFLAGS
-	sed -i Makefile -e 's/-g -ggdb//g' || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	emake \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		DESTDIR="${ED}" \
-		install
-
-	einstalldocs
-}
diff --git a/x11-plugins/wmstickynotes/Manifest b/x11-plugins/wmstickynotes/Manifest
index 9e3f10aee34f..fc0aaa77d594 100644
--- a/x11-plugins/wmstickynotes/Manifest
+++ b/x11-plugins/wmstickynotes/Manifest
@@ -1,6 +1,3 @@
-AUX wmstickynotes-0.2-gold.patch 936 BLAKE2B 73720102f99d3dd2142678f5c5ce3051081f12aac36d0935fae94ecfd8dfb385a2faa3767bf226348691f967a3e77cc52e4e5e3a4f1c772eb80d476bc9d3be49 SHA512 ef17d30f9057dfde9dea18e2ceab04ef36956d5561af3884cf2ad5ca133c0ad164b2f857564d5db1d2cf65785cf91e4fb7791fad22b703f0d60ae695fefe4d96
-DIST wmstickynotes-0.2.tar.gz 107432 BLAKE2B 2164c351adc723caa22689cbec277554b4adc1d73dce67b52f3ba30ce14a6cc70c39762ae6eb00f2d51b4c365738edfe5713580aa1c30d9256cf112efe579a4b SHA512 59e54e64157a04296f12c1c8c224c5c4b05685f2f0e05abe2a23a1c2137c0656c30e7befc4e5a39b4cb97f99e2ff68f53173cf6456b95f3fef80441661d19b63
 DIST wmstickynotes-0.7.tar.gz 121562 BLAKE2B b589f157d53791e3edbf409932616bcdc9d8915d6c2cce1d5901c04e73d76cffa5eb321c2f9b0a0ceecb8aeef3985637195d8a027687f0a94e6bd5544d56335c SHA512 986ca0bbd726488795559be9ca65390eb0d091834335d89f590cc67c40aeb14f2b48b7a61cf3170c4287a98ecf44f1a55d85b6b5d03d2d7df1cb6fe5b7ac3d0d
-EBUILD wmstickynotes-0.2-r1.ebuild 434 BLAKE2B e9f5263336330f5c247182603fd54d16b90269e012343fbbff5dfc17778fe3e0e0deae7e667a484fd286bf92671cca0371d14a8c10cb0edd7a76d8cc9aead562 SHA512 e10014ad8e530b2c6a3710c466171abe53920cc483cb520e846c15c57f7bf56dd782e4729ed2bf9bde0643eb007739b75bf813d49f325dfc3d4ad79b9ce9048e
 EBUILD wmstickynotes-0.7.ebuild 391 BLAKE2B 5a402e0624b27e1c54b654aacd779fe0c71a853c856f134f419c3a7bce48addcbd5f981e2f4c01d24675c11cf52c73216fc83b2714581a2b6da85589caab5b6b SHA512 d8c7fa39645383365a649064e26ed164632ec0f235a452c73d9ea3c354fbfdf8f925af173182e12bb5a91e79a50fe0b86c89d06679a7134c6003797934ddea53
 MISC metadata.xml 251 BLAKE2B 82b714e8cad00786feeb0767f01f0336ce8b181c4b94d8b3006b9955ed1af6524f23e0180349e21195ee7b77ec5e3594a50dd450447ebf05840db9e43db9fe0b SHA512 12e65b976f16501126ac85035ee1ed2d4e7adcfa955eabadfcfffbb95313125d3f5a200c003d1426615a6a9765c49f563308ca5bf479476226e71370886342f9
diff --git a/x11-plugins/wmstickynotes/files/wmstickynotes-0.2-gold.patch b/x11-plugins/wmstickynotes/files/wmstickynotes-0.2-gold.patch
deleted file mode 100644
index 360140a85ed6..000000000000
--- a/x11-plugins/wmstickynotes/files/wmstickynotes-0.2-gold.patch
+++ /dev/null
@@ -1,28 +0,0 @@
- Makefile.am |    2 +-
- Makefile.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 7c69428..bccf1d4 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -10,5 +10,5 @@ AUTOMAKE_OPTIONS = gnu
- bin_PROGRAMS = wmstickynotes
- wmstickynotes_SOURCES = wmstickynotes.c wmstickynotes.h wmstickynotes.xpm delete_button.xpm resize_button.xpm
- 
--wmstickynotes_LDADD = @GTK_LIBS@
-+wmstickynotes_LDADD = @GTK_LIBS@ -lX11
- EXTRA_DIST = THANKS
-diff --git a/Makefile.in b/Makefile.in
-index 91b19bd..fd883f2 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -182,7 +182,7 @@ top_srcdir = @top_srcdir@
- AM_CFLAGS = @GTK_CFLAGS@
- AUTOMAKE_OPTIONS = gnu
- wmstickynotes_SOURCES = wmstickynotes.c wmstickynotes.h wmstickynotes.xpm delete_button.xpm resize_button.xpm
--wmstickynotes_LDADD = @GTK_LIBS@
-+wmstickynotes_LDADD = @GTK_LIBS@ -lX11
- EXTRA_DIST = THANKS
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/x11-plugins/wmstickynotes/wmstickynotes-0.2-r1.ebuild b/x11-plugins/wmstickynotes/wmstickynotes-0.2-r1.ebuild
deleted file mode 100644
index 61bae078ca75..000000000000
--- a/x11-plugins/wmstickynotes/wmstickynotes-0.2-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A dockapp for keeping small notes around on the desktop"
-HOMEPAGE="https://sourceforge.net/projects/wmstickynotes/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="x11-libs/gtk+:2"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-gold.patch )
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /x11-plugins
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)