gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /x11-plugins
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
74 files changed, 298 insertions, 403 deletions
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 4a1a5a6faa57..1b5dfdf88798 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/asapm/Manifest b/x11-plugins/asapm/Manifest
index 04fa400b8a43..e2087dc23551 100644
--- a/x11-plugins/asapm/Manifest
+++ b/x11-plugins/asapm/Manifest
@@ -2,5 +2,5 @@ AUX asapm-3.1-autoconf.patch 550 BLAKE2B d8d5756a905d63c927c79055ca3279a29065862
 AUX asapm-3.1-include.patch 182 BLAKE2B e20dbd9d09cb48b5a2fe7f4f74c0ad6de46bbeecb99a83509a9733b4fdbb5616eb0e8155b255e528f4af8b45ff97eab25546db676cd5bf59a34a06e4f978bde0 SHA512 31308eb25b3ed6c409b38cb298e3bc411d47e28ead61605ce490e0698bacea4d741425259f3192958204899851e339716c99270216d094dd5554a2b54bf5feef
 AUX asapm-3.1-ldflags.patch 330 BLAKE2B 068181eb71add675b58766dd336618ebcd64253483d10771052fccf0726b81be6832aa60e99a1979bcdd620350ce6874a4c34551a03b50437dd727b3d9081bfb SHA512 6fbf3311c20ae647d52bcc37c741ba16d5f74d042811e0b97554979cae637fa74bc58fa9ad55ddb20399bee29efe46857bfacf90118207f97c1b3ca58935d89f
 DIST asapm-3.1.tar.gz 63203 BLAKE2B 9695c21066c3855a8d945af78751e3f5d0d06950cc199c60d886a5bd8b99fb2f9eb2e2035624f161b85b81bf58acf80b8a494753d74a4e9b1163f16b4037031e SHA512 01859deccba952428671fd77ce87251b1fe0c21221af13db9b14c9ef28babad11e1582fed02b076f16d66bdab398eeb7a48b5e3cdebcb4e153978e04f022a579
-EBUILD asapm-3.1-r1.ebuild 714 BLAKE2B 7686d7abe939aea4d3d512af1e39fa6fb8031e2d81a022f7c603db7cf63fca10de688cec7857ff334480cdafe8174187ced7aeb16d45d8abe3261fcdb63a0f45 SHA512 e79fd761521c4220ecdf23fde8d58546ef4316be496c59bf0b672438468cedbe3884ab09dff8f7f4f0e717f3bed2bd4febbff5e8013fd52b0efa6949bd6a58a1
+EBUILD asapm-3.1-r1.ebuild 794 BLAKE2B 08a69cb25b2d5c46ce5227e2a14d4a376b862644ff0be6a2e9161229deb8794857280a492ebde5f1fdc482473997e04b56a6bccfba24ca1e4260027b41f48c1a SHA512 1e89619002b18297f0bc2c7c0852c9adf13c838613dc2fb6f27c49b41ae63a140eb695b95449cca3f0d4ad48059cbf2dd1d494e77d71ab11dfc66793fdc9f8e5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/asapm/asapm-3.1-r1.ebuild b/x11-plugins/asapm/asapm-3.1-r1.ebuild
index 8d6ea14a2354..538bca9b0512 100644
--- a/x11-plugins/asapm/asapm-3.1-r1.ebuild
+++ b/x11-plugins/asapm/asapm-3.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="APM monitor for AfterStep"
 HOMEPAGE="http://tigr.net/afterstep/applets/"
@@ -12,19 +12,27 @@ SRC_URI="http://www.tigr.net/afterstep/download/asapm/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc -sparc ~x86"
-IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXpm"
-
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-include.patch
+	"${FILESDIR}"/${P}-autoconf.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-{ldflags,include,autoconf}.patch
-	cp autoconf/configure.in . || die
-	AT_M4DIR=autoconf eautoconf
+	default
+
 	tc-export CC
+
+	cp autoconf/configure.in . || die
+	mv configure.{in,ac} || die
+
+	AT_M4DIR=autoconf eautoreconf
 }
 
 src_install() {
diff --git a/x11-plugins/bfm/Manifest b/x11-plugins/bfm/Manifest
index 5e2b54233da0..7d1241b5fc1c 100644
--- a/x11-plugins/bfm/Manifest
+++ b/x11-plugins/bfm/Manifest
@@ -1,4 +1,4 @@
-AUX bfm-0.6.4-makefile.patch 1767 BLAKE2B 684136ca5d6efea77304fe735d8ae740c9d72c4aafed1f9ac9194320c800142902c2641c119a1c99aad753ed2032f63ff479888a3004ff37691b92e3fbb43428 SHA512 f5d1353e2ba61377ab03db53640df497eaa1287500d7eecb3b9b1e25f65a7ff9c73d04e48fd2395e5a0636b8db3750396d05f547be661834ee7d65f5fe7bf2b4
+AUX bfm-0.6.4-makefile.patch 1695 BLAKE2B 99a97a6c8f883c78495f60e0e6d4bfa01203ddcb02f5ae47067f1d1bd21f6441d3cd4d67f592df14b1f715d785151e0b0eb54bf21f81538e7532dd1660b88a8e SHA512 19b5161ee9b43d22895ec1a964ced44f15434cc93357f466b410301c87398ea4bcb10c5cd23c186190a1009791056d8778ff4d1231c56b8aa9366b56d08f47b8
 DIST bfm-0.6.4.tar.gz 59288 BLAKE2B b70d98a944e2e6daaf694dc90a0f8cebc01afd8e11c46fde614e2b2affbe0e331cc15a308837fe987238182a3b4b631bb0d8f8d7f50b84c8705e113425cec7ec SHA512 1a039ef7448c610d2629b50bcac082e7d70eb755aa43e79e6b0868448f92aea5078548273c5f278fac878433cdcd9492589fb1612108807a4fd2afb0e07612a4
 EBUILD bfm-0.6.4-r3.ebuild 952 BLAKE2B 8d43da45c852023f0c52930511ec580281b83ea56861cbd99836c72cbf35958c746311d63f33dd9677110d7ca2416143f06958a466b5584580abb15270eae037 SHA512 59182c3a12c0f4a552877d9982d727f548d81bf506d9adbf1dfbcae760932a8eab02bfdd0b5ae73eb91f7c2db749dfa6b01f6db5762c69e9ce29e1f74bc52b88
 MISC metadata.xml 348 BLAKE2B 97496aab8db3d8075f89e58745d4f988cc33fe4570ade80f97a5bfcda4ddad4be5f2de4fb695eb0b1a6f66af36986ec609bee10ee34fbef7a244489d6ed2e5c3 SHA512 fe0a9044c9c8d839007a04e0ed0012da1d22df3435f237620d49b0d1efa4bce533b116f15e6fa34d1c494d65729d0667ac29a2e06a4b2009ba24510b97f4f93f
diff --git a/x11-plugins/bfm/files/bfm-0.6.4-makefile.patch b/x11-plugins/bfm/files/bfm-0.6.4-makefile.patch
index 21c183c12079..ce1e4cf62c9b 100644
--- a/x11-plugins/bfm/files/bfm-0.6.4-makefile.patch
+++ b/x11-plugins/bfm/files/bfm-0.6.4-makefile.patch
@@ -1,5 +1,5 @@
---- a/Makefile	2015-01-20 10:56:34.791157688 +0100
-+++ b/Makefile	2015-01-20 10:56:48.135154215 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -26,21 +26,21 @@
  EXTRA += $(WMAN)
  
diff --git a/x11-plugins/bubblemon/Manifest b/x11-plugins/bubblemon/Manifest
index 8cf9956ca6f6..a52bae725172 100644
--- a/x11-plugins/bubblemon/Manifest
+++ b/x11-plugins/bubblemon/Manifest
@@ -1,6 +1,6 @@
 AUX bubblemon-1.46-asneeded.patch 513 BLAKE2B 28d10b30be6936c0e6df4ce208e3e480a363a590e7cfc61d59ced4d61adabb68d79e84ad68c97a754e10f065eb76c1850785142914dcb28f55cab2410fd3d005 SHA512 2c4585a344ea613ebb4b9aa804d3596b2aac1b44d016a07e7e1631f58fd600022ebe0abc6ab6a0612d69ff71a2a7482d3a2b9e16827ce9511a1744c04a92ae4f
-AUX bubblemon-1.46-gtk.patch 3035 BLAKE2B 409edca6249903ab0e5bf241a9282cc3fedf68ffbab4734e3f180c7ec5b97f123868a919d324c1bf6a9f3dffb25de28660ec7b6f0fb0b8c1d43459b622b625e8 SHA512 2b9b8a62983af72e87720c5ede8f81c73be978753ad7d130d57ea44675c2114dae9399c139a35d4a8a6738d7b35b5fbbf3ab2ec90a4b4b05fb2bf8be3d4d65ed
+AUX bubblemon-1.46-gtk.patch 3041 BLAKE2B 23eafda32f34e3110a55f441a5486283e172b1f941827fa67c8acd58d224baa140eec1f7e4e9c96df1ebd6e44ca1458b08333ab0a7b6549814dad7d4b7dce839 SHA512 0758a1cfd6ce3149ae2a620172451d6ee8590d03bde0daa284397b97b5bce0181a8fd0a2b39bc1c568294b5deb030192a1ed511b9f553fa00ed9d8c9c6359e39
 AUX bubblemon-1.46-no_display.patch 724 BLAKE2B 964793bc692ec4737e563c828c9a50fe9f71390b21d465dbfe63ecee342341b94da9de7d54f1f93cf831ef654c759afd2db7049474713c051cd36393ddf0ff83 SHA512 d00d43b8d7ba870fee5406b495d6577062e4bebd9864dfbf5a29a691dd85d65fab7956c4750e16aa06a4c85ec5f030c9ce22d2f12e77b816d0a80f7e61b06349
 DIST bubblemon-dockapp-1.46.tar.gz 40001 BLAKE2B 1b4bfb91d19d4e2cd653e7df258b248d0e101b431b5ce79900520d75ad39bd006ef583d148afecc1ba1b3f6ace44387f0f1ddf9ad803b47a9bf6481202353bca SHA512 c3d42f82ea7fb837839787a184a6198d7b092451e629562c90735a22166e75f55e8e1af1026e0314a4f06ff68bc48a22157e62bd19e54a4e38b4c12228396fa3
-EBUILD bubblemon-1.46-r3.ebuild 922 BLAKE2B c7258887f644a5bd8bad36614f020c9897fcf2e3f63c72f2a8ab8fa279e9edd7d99fa8160bb472e362dbca28c1f8f6ae17b06b71f23a7da55b680e63506a2690 SHA512 ed0c59c04df4e907f620265b438ebd0b3c0a8771b7dfcfeead97b4e058d6c823ce38fa61192fbafdc4cae4ed72ad2e7a04fecd7a851fe68af6403d62e94e6ef6
+EBUILD bubblemon-1.46-r3.ebuild 937 BLAKE2B f71dfb6a9ad7fe9936e6580c11cfbf4a731509807a5a1d765e52f057ea6dd3cb2f67bd38c5744e3920b6e620cebf9cfe04a2aa46d9a7b38c04794f57e6f079ed SHA512 17b55c9e69b01f8a56c22fe5741cce92764951e4fa395f33beb93f5a67694291d29d31cea9dbfd67278a9110070d7544b3dfb687341bb7e9dbdfa6e49666621e
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild b/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
index 196a466da0e0..ba410ab76f8e 100644
--- a/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
+++ b/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
@@ -1,30 +1,31 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="A fun monitoring applet for your desktop, complete with swimming duck"
 HOMEPAGE="http://www.ne.jp/asahi/linux/timecop"
 SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${PN}-dockapp-${PV}.tar.gz"
+S="${WORKDIR}"/${PN}-dockapp-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-dockapp-${PV}
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${P}-gtk.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-gtk.patch
 	"${FILESDIR}"/${P}-asneeded.patch
-	"${FILESDIR}"/${P}-no_display.patch )
+	"${FILESDIR}"/${P}-no_display.patch
+)
 
 src_compile() {
-	tc-export CC
+	tc-export CC PKG_CONFIG
 	emake GENTOO_CFLAGS="${CFLAGS}"
 }
 
diff --git a/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch b/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch
index 5a57624061c2..8b895c0e3b53 100644
--- a/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch
+++ b/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch
@@ -40,8 +40,8 @@
  # no user serviceable parts below
  EXTRA += $(WMAN)
 +# gtk cflags and gtk lib flags
-+GTK2_CFLAGS = $(shell pkg-config gtk+-2.0 --cflags)
-+GTK2_LIBS = $(shell pkg-config gtk+-2.0 --libs)
++GTK2_CFLAGS = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK2_LIBS = $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
 +
 +
  # optimization cflags
diff --git a/x11-plugins/docker/Manifest b/x11-plugins/docker/Manifest
index a5a1baf5ae10..02ac8fedb82b 100644
--- a/x11-plugins/docker/Manifest
+++ b/x11-plugins/docker/Manifest
@@ -1,5 +1,4 @@
-AUX docker-1.5-makefile_rename.patch 1484 BLAKE2B e5543ba0aa9557f76164f271b01ce1252ccdcbcb633b605c5250b698bbcf7b3e07476d1c474b716db75bfcda3f98dc29e820dfe581a578faa54db5502575c821 SHA512 6299d1bdea793d68212b65525b9b0f0548bdc379b7cd020c2f3d384fe629df42e2be4c29c3a26d06aa7f03abab83e82a33e9aba7edbe34dd1896604a2695622d
+AUX docker-1.5-makefile_rename.patch 1415 BLAKE2B 4c8e8d3eb49c857ad6b37096bfed717313bbb63b198c32724a21d40bf511b8da40658f4dddda6bff11bbe4f015ab8d3484d284eb12ca5fe0ba79492bc4162bc4 SHA512 28dccdcb24a74dc47c93678965084d97d6acaaa06c63169701a1463efd14a7807269186d7c224039631824fe26ec5ae8c3fafd26b5b989c4acd537f04ec4d769
 DIST docker-1.5.tar.gz 14863 BLAKE2B 258e0a8a4fbf5246480bb833bf8eca83a983d256b70b02f41123c3788a1381e93a793332b8e857a03bc8afd27aba2201825d290d1d3f3b42decac5fe9b1f06e6 SHA512 71b47156c31e5db5620612d3444eb298489fb33da296742c10543838e65677daa1b81bb054e6a7f57b9e2adef47406c32040983cb09988d93778a555e72cd861
-EBUILD docker-1.5-r1.ebuild 775 BLAKE2B f298d1783d0d3919bc1d616427d11001553c034ac0dd0691b328fd9d24970accabcf7a0411419a50be9289dec538446d86d669d7f886f1ea169b3f6310108201 SHA512 0d177cd38c2e5724ae42ccf357ef662aac39e07d1053e3c9a5fde5682ab393ddd7fa2f422d33c8796b9216466e6b5c3e7b04c0a96776a3bdadd64a8868cc8b6e
-EBUILD docker-1.5-r2.ebuild 690 BLAKE2B dfeefbb5077bf57d222be78b6d743436a71498bebbfcc0a56b954822efe10580a5c6a35600f61ac5fd2b003e98755d5dd395cea41d34a6eb631fe2ad07057bf9 SHA512 fd9a16410150284c15c7919e897487f2a85b32ce588e8ecb2ad7465c82a46d4b6720d2efa7bf3e47bdce8a885cfd981138c04b502549db3849082d914594d668
+EBUILD docker-1.5-r2.ebuild 714 BLAKE2B c592cf9bb313afe6e4d55303a478f6eec66af3a70af6e3f6ad1655b205d4c59af1d213b0b2c99c1bd6754c2c0155b81d8115e8afe2eca90905c76341ce4a5652 SHA512 6f3d0ac993130edb9a6ff0566c208420ae51535509bbc1ab87f85e9ec57e17dea2b9c4b6de2f5f40a3c8793e9a624d1242b9a1da8b2489e76c2744c50b442412
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/docker/docker-1.5-r1.ebuild b/x11-plugins/docker/docker-1.5-r1.ebuild
deleted file mode 100644
index d1ecaa22fe44..000000000000
--- a/x11-plugins/docker/docker-1.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Openbox app which acts as a system tray for KDE and GNOME2"
-HOMEPAGE="https://icculus.org/openbox/2/docker/"
-SRC_URI="https://icculus.org/openbox/2/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.0.4
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile_rename.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README
-}
-
-pkg_postinst() {
-	einfo "To avoid collision with app-emulation/docker, binary was renamed to wmdocker"
-}
diff --git a/x11-plugins/docker/docker-1.5-r2.ebuild b/x11-plugins/docker/docker-1.5-r2.ebuild
index 37de7b671cf3..9f742ebe552d 100644
--- a/x11-plugins/docker/docker-1.5-r2.ebuild
+++ b/x11-plugins/docker/docker-1.5-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Openbox app which acts as a system tray for KDE and GNOME2"
@@ -10,17 +11,19 @@ SRC_URI="https://icculus.org/openbox/2/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~ppc64 ~sparc x86"
-IUSE=""
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
 
 RDEPEND=">=dev-libs/glib-2.0.4
 	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-makefile_rename.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile_rename.patch
+)
 
 src_compile() {
+	tc-export PKG_CONFIG
 	emake CC="$(tc-getCC)"
 }
 
diff --git a/x11-plugins/docker/files/docker-1.5-makefile_rename.patch b/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
index cf20a9135aa5..36cc92b00bf0 100644
--- a/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
+++ b/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
@@ -1,5 +1,5 @@
---- a/Makefile	2015-01-19 20:10:47.762522964 +0100
-+++ b/Makefile	2015-01-19 20:11:11.463545692 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -5,12 +5,10 @@
  #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
  
@@ -33,7 +33,7 @@
 -	$(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \
 -		`pkg-config --libs glib-2.0` $^ -o $@
 +	$(CC) $(LDFLAGS) $(CFLAGS) $^ -lX11 \
-+		`pkg-config --libs glib-2.0` -o $@
++		`${PKG_CONFIG} --libs glib-2.0` -o $@
  
  %.o: %.c
  	$(CC) -c $(CFLAGS) `pkg-config --cflags glib-2.0` $<
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index b70dd0eeb7d8..3add3c596e48 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,10 +1,8 @@
 AUX enigmail-2.0.12-enable_seamonkey_support.patch 646 BLAKE2B a7c16bcc7f220997fec4309aaccc6e5ee62ec4ed1c82698a1aa7fbeb6badd0e972b8adcceaa1697d454c3f1d63bb913dce86fe5d85b184d78e3616c34d6c0122 SHA512 f775f3608b6078e51ba335eacf5858f03956c592f31fd9184341f773fd13376e8216cf05e762f83f04e47e251b2485657eb1f7cd8779cafbc8d2a321cb42b851
 AUX enigmail-no_pEp_auto_download.patch 1356 BLAKE2B 1e3c440e3bcaeed42b3de75130372343b7118ea3dc3c0a421d04a8a8b12a9695ba515b7dc3d566b4a0686c2bf4d12fc72b722ceb0d4dc9985eaeedaf67c90210 SHA512 1b5ff31a7ed8d17224ec915d56ee61e817dd41d035445d16a2b0caedd315215c37d2f98e42597fc599c60a39ba4d276a57c644268d12c2929a89f8802164a3d2
 DIST enigmail-2.0.12.tar.gz 2614589 BLAKE2B 3db6f595c14e02cfdc71bebc763d05926dc6e0abf4668d132fd0ce43204e681de5fce45db752c4f49b231bd7e217b75c0f23d4a7e204fa9a3a51f1c8097fb63d SHA512 f9f4f1ed4c7244280be2fade0ccb2f4b5e7075dd60f53953478ffb84012e687b7ac7bad489c0b0cb2d8937916c783fe9e1841174bf1e5bdb9ab8cb58b415db74
-DIST enigmail-2.1.8.tar.gz 2867390 BLAKE2B 8908705a05277b018d40260ea095d2a2d9dee9300c7c4b06a708846e93a68242f60599fd92a2dc4c6d53026723433b7548b55e9fc97fdbe667af38a526f03f8a SHA512 b21867c08b5e51af4e82a9ecc6e0a7fc056fb165e6cec8fc11d8ed54fd97b30ca5597b5a23243da0803d08aa04a4a3732d56eae9454db89ecd10fcd750b0b1fb
 DIST enigmail-2.2.4.tar.gz 432157 BLAKE2B e6d5eab4cba2cd66669ddf38f8152511606c48ce995be331551a7b403ecbd06967c22702a06e06aa89219b5c905e835ddb4d146c0fc2cb11e1a647e46854dd1f SHA512 bf23f52ed61002b05e2e432a0abd1f576fe6eb97d94ab2241e17be86138cee153d668747f5759b967d9a4977be3dc901ee78ddb168347bdbbfed9229d27f786d
 EBUILD enigmail-2.0.12-r1.ebuild 2181 BLAKE2B 50b69ab4765ae278d6222b45663bc1869d46142b7eb8f9fc89dbbd414b65857d49d836de6bee8fab65694b989a696bf2ca9b28e62ddc97a55ff72a1c443e770e SHA512 cad36763177ebcc2d40e57eb3c80143c08dfcfe0cbd3d8d7968bc0cbf6f0767c0503a1c4acee37e199ea52d562588031bed24e99dbb25e0f2963ce1d8c7a4937
-EBUILD enigmail-2.1.8.ebuild 2248 BLAKE2B 1dbb33edffcf265df548d5f9270f9a5b7d4665191678aeab247e04fc41ddbf2a7677fd05e27fc80e3f7b8fd1b8d486463a4250eaa943f13c5925d1e2f2ff46d4 SHA512 ae23ad551b697152d124bd905be0e1c4a295cc31668de1b25a127d7321aa8223de2356972dd94fcfa0ebe0dd447e90650c0e05148d3431f69af2cae3a91b0e48
 EBUILD enigmail-2.2.4.ebuild 2017 BLAKE2B bc2603dbc22df36296796287758f1990aadf75b7caa0b45369b6bc3541192160d0ae06c6b3fffc24300ae03b4f0ca09b2eebad3d89453bd29663e57c95f65256 SHA512 bd02f132dee39027c53945741f9df27b97afd95338387eee554f14b6bf8b67894097d984ac5fbced6c121e681ab71425b847326887369fc6c1a945f595487e5b
 EBUILD enigmail-9999.ebuild 2021 BLAKE2B 7e87588190d19241bf86688d4ae46276ed9d821a8fc3bf2a1bad4803036476eeedc809854781f334229546d66d80c04223aa471293529116b513214c706e6d60 SHA512 b4808139150437ba82caf53727cd6ff929bcb6fd0de21fe00dbe854de571fc26d0be2e7817297bb369c856b38d6aca155fb6996003629faad4cabf01f25dadac
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-2.1.8.ebuild b/x11-plugins/enigmail/enigmail-2.1.8.ebuild
deleted file mode 100644
index 233c4346cb08..000000000000
--- a/x11-plugins/enigmail/enigmail-2.1.8.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-any-r1
-
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="https://www.enigmail.net/"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-3"
-IUSE=""
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
-	S="${WORKDIR}/${P}"
-else
-	if [[ ${PV} = *_beta* ]] ; then
-		SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
-	else
-		SRC_URI="https://www.enigmail.net/download/source/${P}.tar.gz"
-		KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-	fi
-	S="${WORKDIR}/${PN}"
-fi
-
-RDEPEND="
-	( >=app-crypt/gnupg-2.0
-		|| (
-			app-crypt/pinentry[gtk(-)]
-			app-crypt/pinentry[qt5(-)]
-		)
-	)
-	!<mail-client/thunderbird-52.5.0
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	dev-lang/perl
-	"
-
-PATCHES=( "${FILESDIR}/enigmail-no_pEp_auto_download.patch" )
-
-src_compile() {
-	# Required or parallel make fails
-	emake -C stdlib createlib
-
-	emake ipc public ui package lang stdlib
-	emake xpi
-}
-
-src_install() {
-	local build_dir=build-tb
-	local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' ${build_dir}/dist/manifest.json)
-	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
-
-	mv ${build_dir}/enigmail*.xpi ${build_dir}/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
-
-	# thunderbird
-	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-	doins ${build_dir}/"${emid}.xpi"
-
-	# seamonkey
-	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
-	doins ${build_dir}/"${emid}.xpi"
-}
-
-pkg_postinst() {
-	local peimpl=$(eselect --brief --colour=no pinentry show)
-	case "${peimpl}" in
-	*gtk*|*qt*) ;;
-	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-		ewarn "You may be prompted for your password in an inaccessible shell!!"
-		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-		;;
-	esac
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "Please restart thunderbird and/or seamonkey in order for them to use"
-		elog "the newly installed version of enigmail."
-	fi
-}
diff --git a/x11-plugins/gkrellaclock/Manifest b/x11-plugins/gkrellaclock/Manifest
index 66604f20e044..afa543f163c2 100644
--- a/x11-plugins/gkrellaclock/Manifest
+++ b/x11-plugins/gkrellaclock/Manifest
@@ -1,4 +1,4 @@
-AUX gkrellaclock-makefile.patch 1599 BLAKE2B 611169960bfb154dc602fd3a35a4bdaec7cf6c8b078045872be05e8e49b52ff9058234f071fee256ba58f65a7fbc2da659d549df8cc3ddab6e601ca8254b0cae SHA512 7fa38a69f262f64dc8eca09179b56804ef3be20f52fef78b21cd001f34ecfff1c78c2e691da8441899e4f4e3a9d2d51418a02dde24cd144e64772026058872df
+AUX gkrellaclock-makefile.patch 1403 BLAKE2B 12d84d0a6bc4ddf26b90978ac4ed88d152e0ca46abd2462c89528bff25f70fcc901dcb3d4c554c4fe4a7fb9c5e7e78a10bf97a1df554cc6c39f4348af1380d40 SHA512 484a405ebc9174617b0c17bc0cceb8533bf581ea3cf7a9b3d36ab2f297f6ae51ce2bbf5e5e022f6813f269caadec46e5d17845e5951f3bbb92ddd137c5ad5227
 DIST gkrellaclock-0.3.4.tar.gz 18853 BLAKE2B b91b4cb9ae42f68d3a3d430f7713170c788515280330a1f785f11d4335e859dbd6f840fb7e47fe8f77676bb55e97dda628fa79d442d4be8a37c69bcea836aa52 SHA512 2e6002bc4d535899cc8b86377d596bcee5e64d05fe4239eaab2de8e387a40b8dee600d9fcd5f30feb68bb3e54bf6b4745d4c7b79ea9fee57b856eeb3dac12524
 EBUILD gkrellaclock-0.3.4-r1.ebuild 735 BLAKE2B 570e0fbb5a06b52dab55207225826474ef0ae7a928712c8ce415f989c282636d4abdf508ce4d8be449f59e431f23a727f0292487440a680951629e7a37ee2c1e SHA512 3f0d0fcd096b902f39b91ffac0f43fc2fd81eec18c41687b2a442ee1b0cff1b92d136911ba1d8788198919ce1ba46f90f190660e369def59db0b57ca4a5519db
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellaclock/files/gkrellaclock-makefile.patch b/x11-plugins/gkrellaclock/files/gkrellaclock-makefile.patch
index 6b48b6bf9015..0a94c40b27b0 100644
--- a/x11-plugins/gkrellaclock/files/gkrellaclock-makefile.patch
+++ b/x11-plugins/gkrellaclock/files/gkrellaclock-makefile.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index eb2b8ad..c89fa17 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,39 +1,12 @@
@@ -48,6 +46,3 @@ index eb2b8ad..c89fa17 100644
 -	rm -f $(HOME)/.gkrellm2/plugins/gkrellaclock.so
 -
 +	rm -f gkrellaclock.*o
-diff --git a/gkrellaclock.o b/gkrellaclock.o
-index e2db7c1..002ab3a 100644
-Binary files a/gkrellaclock.o and b/gkrellaclock.o differ
diff --git a/x11-plugins/gkrellm-bluez/Manifest b/x11-plugins/gkrellm-bluez/Manifest
index 8be92af71498..98711b4964c5 100644
--- a/x11-plugins/gkrellm-bluez/Manifest
+++ b/x11-plugins/gkrellm-bluez/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellm-bluez-0.2-notheme.patch 2115 BLAKE2B 1ce93d7a0d751c1b902f048aaedc12f459324303c52aeddd7100c02ff3a82d9bbb7ca3939c3d9b06ae85b57bc8c445949405eab06f511e423e80bd15f21e81a4 SHA512 caaf1d308c2c786bb54a1785509ff58ff29c22950ab0eee266adf07bf2ba1d37d35cb24cf748d255d13b7a48672234dc193baacf4dbb01ab955f86fe33d5c2d1
 DIST gkrellm-bluez-0.2.tar.gz 330247 BLAKE2B 8fa585fdd10892018e749428afded5cfb6c94258befedfe2652bcc027210ea9bb0db7379e052b19d6dbeb6c3abdf51be9504078e8e135bb74fce52bcc4febf71 SHA512 56a288874bf7de9f09aaa49a3bbc1ccf71da95dded5baa4af20941866f5acf777234a7726c49d491f252e175fc34266abd068cac0ca204ca6d1785a1d7e230f9
-EBUILD gkrellm-bluez-0.2-r2.ebuild 756 BLAKE2B e94a0355be85b94d455ea9965bcc3d86894863b12e44bb2470cc14c76ac20296751bd012bd4bcebf463e49ba39f60ab8e8f0a6fd313a8402fb10a31645d55940 SHA512 aafaa119a824a119c5a54265d7fcc4f2f39cf8df28e4051f710ded64db4ff1201d1678eb41b03d09ea05a8b8513bd6b2450ed02086c3cf237230175cff0fafff
+EBUILD gkrellm-bluez-0.2-r2.ebuild 746 BLAKE2B bd516f7fbe57784892f347613e0123744370f55a44f3fb98c6d9ec7ebe98c23e50badb176fdd9e7705da9864695c74a3a1a44273a0c215b8aa1ef1be27de8994 SHA512 adfe5143da8e5b1717ac53d3999c23263f53cbf21e581df03608037f8c5727f0b92094210d6e03386ab62f4dfa07328d37006cad1a48be7e9285e6c05ce3df44
 MISC metadata.xml 250 BLAKE2B 949f589de5cc44aad3371ea1fb19e7d0a5affd6d456a7b6040a303a2329d4597852d2bd4c94e2b25dccaac9215bd0a3e2c25d635a535d4b8f04deaa636eab283 SHA512 0b11486946f6ae39a0fd129a0eaefc07e5739f1ad79b3811bab15dd6d0b4543550ff8b814c0706a6d7be84be2888ec2a89fa976b702211be2c890bb453d99f7d
diff --git a/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild b/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild
index 47fafd1df54c..dee18874be2c 100644
--- a/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild
+++ b/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,12 +12,11 @@ HOMEPAGE="http://gkrellm-bluez.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
 	app-admin/gkrellm:2[X]
 	net-wireless/bluez"
-DEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-notheme.patch )
 
diff --git a/x11-plugins/gkrellm-imonc/Manifest b/x11-plugins/gkrellm-imonc/Manifest
index bcd461a9513e..bf99a4d6a4c5 100644
--- a/x11-plugins/gkrellm-imonc/Manifest
+++ b/x11-plugins/gkrellm-imonc/Manifest
@@ -1,4 +1,4 @@
-AUX gkrellm-imonc-makefile.patch 744 BLAKE2B 4eea5f69d20aed05a06f8e2b05429070bcf66b61ccedba70dd925629217bfcf093723aa1b38084c0ab79a0c04da388460ba1044f752e3b406855d513b9c6e90a SHA512 69181444d2d83c872d0f480db26f2538633556c5f63cb592de9d1aabe05581138aca93f8098147e2b56ec6ad79763bd7e876dea19aabab9d7ad80be08b7fd517
+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 651 BLAKE2B 08ef118968024e5560aedd015d69d8e1cab569c26876c82c717c6d63268dad130366a0f8742e57298015b97c1e45e66aca99518e0d677420da4b4ec8052cefaa SHA512 6f192cc78978ff99cdf643848700936a31ee3d10b0d62899cd1894af27b3058d5627e5adb7de315460df9d84b8754eab056e5b75845498bbca2b64e7dfc649ca
+EBUILD gkrellm-imonc-0.2-r1.ebuild 670 BLAKE2B f6e7af7868efbd91ccb9576af79991f056d131486b8364ce2ce449d8bf380617a8b1ca34bb25f23729a31fc15f73520306f146d4084c3849b6084353ca380487 SHA512 b531895e7813ccb426ff4c0b7a6e15d240847bb499d6cf17bb0e7d0c837ce04e6b167fe8efc861362843fe53e2552de3fd7d07e49906b01db4eddba553d1a546
 MISC metadata.xml 250 BLAKE2B f9bbd12e88f30431583c201e36a7922bedaadce514b19a76029ca5f3ec5bf55b15744814494bdd68a365a8b0bd1fa9126bfc2b1217a07e006e5f1517426626aa SHA512 ee33e9f804547c64d7fcf1fa34e38d84606cf6a11315fb0c2f765c278cbb70094d2bbad282cdcd198d04a949944bdd58bafbf0f6fd1597b30a6de8b3a79c2053
diff --git a/x11-plugins/gkrellm-imonc/files/gkrellm-imonc-makefile.patch b/x11-plugins/gkrellm-imonc/files/gkrellm-imonc-makefile.patch
index 598e5d8460c7..f5dd90f94ca7 100644
--- a/x11-plugins/gkrellm-imonc/files/gkrellm-imonc-makefile.patch
+++ b/x11-plugins/gkrellm-imonc/files/gkrellm-imonc-makefile.patch
@@ -1,5 +1,5 @@
---- a/Makefile	2003-05-17 20:08:29.000000000 +0200
-+++ b/Makefile	2013-03-13 18:24:24.552941672 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -9,12 +9,10 @@
  GTK_INCLUDE = $(shell pkg-config gtk+-2.0 --cflags)
  GTK_LIB = $(shell pkg-config gtk+-2.0 --libs)
diff --git a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild
index df78f4badaea..42c94a2c151c 100644
--- a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild
+++ b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,10 @@ KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}/${PN}-src-${PV}"
 
diff --git a/x11-plugins/gkrellm-vaiobright/Manifest b/x11-plugins/gkrellm-vaiobright/Manifest
index 0f3616b27c11..a7479b2dad29 100644
--- a/x11-plugins/gkrellm-vaiobright/Manifest
+++ b/x11-plugins/gkrellm-vaiobright/Manifest
@@ -1,5 +1,5 @@
-AUX gkrellm-vaiobright-2.5-fixinfo.patch 1774 BLAKE2B fd08b2b417147723d868b0b9062b66cbd22508e2f131f18c1ffdf087d2ac9e4a3f552282d7eb17ac1e0f0fcdc965207953a5533cb7955f89ea75f9dae9668ec4 SHA512 51c7983830a045f38dd08039dcc0e9c1fdc682394649761a998511e72ccd7e9ea6a2632312ed589967b1e3b02cd5c7764c7724da19fee770f71048d43818d160
-AUX gkrellm-vaiobright-2.5-textrel.patch 1053 BLAKE2B 2a8a14fb2bba01a46cfd137b55294d858a0a9688cd4b907cfb9f1999e7c35ff3a631ab629ab2c7810c1bb28b3c48de006fd675b150a6c60a1142c1ba4defa4c5 SHA512 2742b7e75af6f83ac6f5cc53116dee9802d12262eb4f2a3628740b2d5f50cdf6485aacfe36eb546e36d7800be0dfc874dc6f7dee0e09a5f269ec29cd52dc1943
+AUX gkrellm-vaiobright-2.5-fixinfo.patch 1428 BLAKE2B 268b0f1f335941be1d9b943f9f3412d1884cd4f82ce27b3ba899e6c2cd925c7a81b60c23df1f45a0ee34ae275151260f3d0640cf3220be22e635105114d8f3d3 SHA512 240b8876afbd843d47b6327fc8cffff639939182a9e1e18ce251ec3c905b1a14d063ebe6a02fef72887daeb24cd8c9d128e63cf2aecbad586182d3ccd54bad8b
+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 582 BLAKE2B 5d4775acd85a0e1e7649686f6e23776e5d3452dd416959e70b13f4e89f89782568a3628e72e3f4780e5c0754b25f5fe1ad27db5030bc70927fd8fe3a63bc225e SHA512 8ae63b5574d4ccc4e33a5451ac0e20dfd72df3904e3a76b6deb9df4bc450c554cb052b61dfa92cea2c743c8233e4e0e829b8dc338393023dd96b6feccdfa775c
+EBUILD gkrellm-vaiobright-2.5-r2.ebuild 654 BLAKE2B 926207b96002c6cf1c849fc3c77aeb4ea1670ef5cd33e8153b4972f1b1a7ced6d45f5420163694685a1d7c12c0f663b2c94b806ba4b3c1550e9c3fc333276bea SHA512 2792619056b49c858cbc59465454b869df47ab57440ed57b60a18e0dd11d60d5a53f43a478b4bbe03f228098e072be5772dccca258eea22893059944f0d8fae2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-fixinfo.patch b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-fixinfo.patch
index f2e4ac4c56e0..3ecf0e058ff7 100644
--- a/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-fixinfo.patch
+++ b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-fixinfo.patch
@@ -1,6 +1,5 @@
-diff -ur vaiobright-2.5/readme vaiobright-2.5-infofix/readme
---- vaiobright-2.5/README	2004-03-20 13:58:13.000000000 -0500
-+++ vaiobright-2.5-infofix/README	2004-03-20 13:59:30.000000000 -0500
+--- a/README
++++ b/README
 @@ -28,6 +28,7 @@
  bright or max dark depending on the current value.
  
@@ -9,9 +8,8 @@ diff -ur vaiobright-2.5/readme vaiobright-2.5-infofix/readme
  2.5           Sun 20 Oct 2002   Removed need for external helper applications
                                  entirely.  SonyPI is now required, but no suid
                                  or spicctrl binaries are needed.
-diff -ur vaiobright-2.5/vaiobright.c vaiobright-2.5-infofix/vaiobright.c
---- vaiobright-2.5/vaiobright.c	2002-10-20 19:22:26.000000000 -0400
-+++ vaiobright-2.5-infofix/vaiobright.c	2004-03-20 12:55:38.000000000 -0500
+--- a/vaiobright.c
++++ b/vaiobright.c
 @@ -422,21 +422,9 @@
                         (GtkSignalFunc) vaiobright_toggle_toggled, REVERSE_TOGGLE);
  
diff --git a/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-textrel.patch b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-textrel.patch
index 4cdaa1dd4c8e..2437cf8a430b 100644
--- a/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-textrel.patch
+++ b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-textrel.patch
@@ -1,5 +1,5 @@
---- vaiobright-2.5/Makefile.orig	2002-10-20 16:52:19.000000000 -0600
-+++ vaiobright-2.5/Makefile	2007-02-21 08:55:39.000000000 -0600
+--- a/Makefile
++++ b/Makefile
 @@ -1,10 +1,11 @@
  HOME	= .
  PREFIX  = /usr
@@ -7,11 +7,11 @@
 +CC	?= cc
  INCLUDE	= -I./ -I${PREFIX}/include
 -OPTS	= -shared `pkg-config gtk+-2.0 --cflags`
-+CFLAGS	+= -shared `pkg-config gtk+-2.0 --cflags` -fPIC
++CFLAGS	+= -shared `${PKG_CONFIG} gtk+-2.0 --cflags` -fPIC
 +LDFLAGS  += -shared -fPIC
  DEFINES = 
 -LIBS	= `pkg-config gtk+-2.0 --cflags`
-+LIBS	= `pkg-config gtk+-2.0 --libs`
++LIBS	= `${PKG_CONFIG} gtk+-2.0 --libs`
  
  GKVO	= vaiobright.o
  GKV	= vaiobright.so 
diff --git a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild
index efe7712aba51..2d377754fddb 100644
--- a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild
+++ b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild
@@ -1,28 +1,34 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit gkrellm-plugin
+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"
-IUSE=""
 
 RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
-S=${WORKDIR}/${MY_P}
 PATCHES=(
 	"${FILESDIR}"/${P}-textrel.patch
 	"${FILESDIR}"/${P}-fixinfo.patch
 )
 
 PLUGIN_SO=( vaiobright$(get_modname) )
+
+src_configure() {
+	tc-export PKG_CONFIG
+}
diff --git a/x11-plugins/gkrellweather/Manifest b/x11-plugins/gkrellweather/Manifest
index fe24eb5ab1b9..062a70bace3a 100644
--- a/x11-plugins/gkrellweather/Manifest
+++ b/x11-plugins/gkrellweather/Manifest
@@ -1,5 +1,5 @@
 AUX gkrellweather-2.0.8-Move-GrabWeather.patch 2162 BLAKE2B d6a38021b10cf0ec97eaaa9dcf0c5e3b78599f57b008054d55bb64abaa2318620345a2bac43168da57af9660d895150d25f3ff248ceb1233ce221dd5910bb805 SHA512 9c078e68f28c829f19e4e8e2836795508f5b124aa2a7b8535857266d16b9ba6404604e1527751dee99e632237be106eed456bebc2b14f69799a46888ab9699ff
-AUX gkrellweather-2.0.8-Respect-LDFLAGS.patch 537 BLAKE2B 1b73e7b152ade7dda78e4799a93320f644e54f68e80b1e02f37c4563c3291b252eb05ab39b3f2c1231876c329dda07ccbccbfe090b2e144b5fd0ce9a7e083a6d SHA512 0735a7ebdb322ea55ffb0204c2cf52d15638687f462dc5303f070d5ca8cd9218e083db1ff6f9d6eb2be345dd02580822612eaf1df0158b2e3683add34042eb2b
+AUX gkrellweather-2.0.8-Respect-LDFLAGS.patch 398 BLAKE2B bfcabffaf7c27dfeef18065f585f269ba003cf7370c5164e4fb23ad53baa1b497ab8c31abb70e3da301358138c1cdd8eb495a8e6623167d163175d5b37407b91 SHA512 09fb94ff819152970640bd4e0a6c2435bf2bf1d5f8ae8817efc195437f2103065bcd38142d3a412d8e509b7c020c674ea25bbc331148daab61ce3e70928712fa
 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
diff --git a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Respect-LDFLAGS.patch b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Respect-LDFLAGS.patch
index 9256cdd919c8..3e40f7174845 100644
--- a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Respect-LDFLAGS.patch
+++ b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Respect-LDFLAGS.patch
@@ -2,13 +2,6 @@ From 82c3a24ef34c5a5388ee9cc40126b3381fb8445a Mon Sep 17 00:00:00 2001
 From: Jim Ramsay <lack@gentoo.org>
 Date: Wed, 11 Aug 2010 09:03:13 -0400
 Subject: [PATCH] Respect LDFLAGS
-
----
- Makefile |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index d6dc404..46074ab 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -5,6 +5,8 @@ LIBS = `pkg-config gtk+-2.0 --libs`
diff --git a/x11-plugins/gkwebmon/Manifest b/x11-plugins/gkwebmon/Manifest
index 6f92e1bc4896..e136e4b9732b 100644
--- a/x11-plugins/gkwebmon/Manifest
+++ b/x11-plugins/gkwebmon/Manifest
@@ -1,5 +1,5 @@
-AUX gkwebmon-0.2-cc-cflags-ldflags.patch 1232 BLAKE2B e983a46154113d21586e0b59121f0798fc1d359dbbf7b5388421b88a46b018fcc740bcfc23fc6074ec985b7c377197fb431027d9a623ef381b540601e2908d72 SHA512 0ce0b0ed7832ede335447d4abb7cf3904e97f9dff334aeb14a03e09cfe042de47bca456b7fc38bd7171440bcefd0da8a17cc01f1d540b84ffbf644e216f273a2
+AUX gkwebmon-0.2-cc-cflags-ldflags.patch 1238 BLAKE2B 49429c7abc390c47b4ddb145c5535c231449d159ff7513c1cfd5f43d163e1a2654d7ef17697cf9cab88f777791a54ed734747d7271af79634fc08e84d8d5de40 SHA512 a8b360331362b8e7e8bea301be2867728568297c16981eea0e66a002e7195aa97bc12346597ddc676d8bb7c2bef686bd1285447c405046de0ad3e308404d7b87
 AUX gkwebmon-0.2-fno-common.patch 1058 BLAKE2B 68205c69c36e48678886c3bea5b0b14d4755d05a389daa6c2ee450f4fb543eb3fbf30618ec99d315b34d0de379af4c7ad13174de364ca4b46ce09c3be49a7176 SHA512 225b7767284aebfbc1437810930442c342f977abfe8cd3af8ac1b8122cb17964bf63388a56265febe20914bf4893a258d4fddb9d895abe0048239d8ab78e208f
 DIST gkwebmon-0.2.tgz 14163 BLAKE2B c6c0c9352e2f68eca56f981abb8188a7a300604c8c0fc05c1b0b95f0cdc117c12e55aeace66f9c3dcc16a13acb2b44683a77de36a83d9e9b7c273ec619173235 SHA512 0af4eaa8636b43232e209e6381a3852eb92b9505da4b19e31137766f4bee7977bf4e4bed40518df0fcc3aef2dc62767c85169e70f1fbfc738bb428ae8affac63
-EBUILD gkwebmon-0.2-r2.ebuild 604 BLAKE2B d8189d1cca01153717074d194cd0b6c0b1adce69804b4e0f6a6f055b05d94daa02154c9ec86961f8a16b295be4495534850996d3c941f39b70002ae9f478600f SHA512 4ba51be9baf94fd3d3a5b0bf316cd8ee6e8eabfbfb0001ed3cccfa6d70f32669a74f808394df76a19413556799736ee9c266197017139823e9589b94d333b145
+EBUILD gkwebmon-0.2-r2.ebuild 649 BLAKE2B 2517d33f5ce4c62a58249f3d9cd0b85d8040d62581507aaca537d935bc400d447213be1a2391b800eccd0677c7861060be48989fa755f26343a0ef9e8c7e2ebe SHA512 5795b0920dfc7c15c238f7fb7b5742eb44e8ad71b2ba44fbaf73b01569952d09e8433222d37221693e4393d351b720fe3fb90aec2292e0a4e5f763c336962d1f
 MISC metadata.xml 245 BLAKE2B 75768cbacfd8436bec6cd03c95eaf6aea36aad0fff02f24e9be259be1a01722d32c3cc84a7f54ab7da842fbf036aa4ac6a65ee3ea77a01ad8d0e55b89303d49d SHA512 9059fda6f95a78a0bb5334c05a118b9159d8dd28701bf6986574bb95ba897f1ff03257a8a939c6353136e5ab28f4614cd927cc593c41558ec8826b9c1ca1a015
diff --git a/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch b/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch
index 7b3ee50f5321..5ffe8f12ed42 100644
--- a/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch
+++ b/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch
@@ -18,8 +18,8 @@ index b422e79..d89977f 100644
  
 -GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
 -GTK_LIB = `pkg-config gtk+-2.0 --libs`
-+GTK_INCLUDE = $(shell pkg-config gtk+-2.0 --cflags)
-+GTK_LIB = $(shell pkg-config gtk+-2.0 --libs)
++GTK_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
  
  
 -#FLAGS = -O2 -Wall -fPIC -std=c99 -pedantic $(GTK_INCLUDE)
diff --git a/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild b/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
index 5a5387b6c02c..469e62b16153 100644
--- a/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
+++ b/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,10 @@ KEYWORDS="~alpha ~amd64 ppc ~sparc x86"
 RDEPEND="
 	app-admin/gkrellm:2[X]
 	dev-libs/openssl:0="
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-cc-cflags-ldflags.patch
@@ -25,5 +28,7 @@ PATCHES=(
 )
 
 src_compile() {
+	tc-export PKG_CONFIG
+
 	emake CC="$(tc-getCC)"
 }
diff --git a/x11-plugins/guifications/Manifest b/x11-plugins/guifications/Manifest
index 17931ddc27cf..8c4bfffff68e 100644
--- a/x11-plugins/guifications/Manifest
+++ b/x11-plugins/guifications/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-guifications-2.16.tar.bz2 543136 BLAKE2B dd34108210914386dbd2780b4f2a23cb615a51e8cabe39e16867721815b017b8f897906e06eb7cef1cb96e60e70ce3c02ad20d8a1a906159848cfaf64eaa7b76 SHA512 fee1741a37df102ed3620caed9024c1a2ac5919c1a9c4182bdb19685a4d3412a1ff72e5e58ce65fdc2689f1d90432ea22c3912a9ecda80a95af96d57c86c9cf0
-EBUILD guifications-2.16.ebuild 637 BLAKE2B 69216779b578cb63f4f0b1f883609ce44a0407ab5c5999a6f4f6733211c1e51e14c8b7acb3225aefcdb45cd53499739152e13a2f38b63de757eea21bd998d131 SHA512 1cd7e7857239139476164ba9bfb0a4030ef041a7f3e0d7d57c5cc227f526589f25a9d3082a7d253ebf6a8f0578275029168dfb3f972b5a916c4b0478f11d0891
+EBUILD guifications-2.16.ebuild 638 BLAKE2B 9878940ef235663654fbb6a1eb02905a9c44874d33c018901d0766e2cd396c31c680685bd5709a568bf2d0ffe709a6af4d4406fa4e993e7dfc68cbe1d6cefd53 SHA512 a78ecc71bacf08cb9ede789d6492961293fc58e02b4484209bbb786a78b4287972f4a205a61d5481ea3f0b3a1c95d5484a102b106c9cb09adba8c3b158b5b616
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/guifications/guifications-2.16.ebuild b/x11-plugins/guifications/guifications-2.16.ebuild
index f6ac6a1017d6..0c8a39b85b1b 100644
--- a/x11-plugins/guifications/guifications-2.16.ebuild
+++ b/x11-plugins/guifications/guifications-2.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ IUSE="debug nls"
 RDEPEND="net-im/pidgin[gtk]
 	x11-libs/gtk+:2"
 
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_configure() {
diff --git a/x11-plugins/lurch/Manifest b/x11-plugins/lurch/Manifest
index a5bc20c1181a..19919749afa9 100644
--- a/x11-plugins/lurch/Manifest
+++ b/x11-plugins/lurch/Manifest
@@ -5,5 +5,5 @@ DIST libomemo-0.7.0.tar.gz 23678 BLAKE2B 91b57f6c93d5f777996687ea0648d996950bc89
 DIST lurch-0.6.8.tar.gz 398267 BLAKE2B 23211e82b80e26105f0d62510dc321abdd818eae21dd9f3e24f6ab01458748df64283acb99371a8ece34248f06e9e04edd35da30c771f45779474b3b43c3a53d SHA512 8b93523049d05a00f1d7286ec9d0d8d03c7ae46793ac72ea08c0d12cb5193324be4805fb6278d6c0f906d9c63db9d7ce6ca2a21442236df51e0ee0b48de6ef1d
 DIST lurch-0.7.0.tar.gz 66885 BLAKE2B 1a3cc1dbfd8f999b677b23d02952a3c28c922d438cfe81a3bfd3a03cc49723fcc4d52a549bfc7ecb45616a0c939b0f78a39f73a4439bc5337d4da656e9d42b11 SHA512 082f85d25fbcb184b7b6d827e1e6bac073ad46064a144ca24245164558ca9e0cdfcdc4187ac3da5f8738e0476e759e67801d0fd24598b31e2d86053f8af576b6
 EBUILD lurch-0.6.8-r2.ebuild 2063 BLAKE2B 2742285436fab19c64317e57ea182e451966799a1724cf72e6b6977ef6d010f643e8ab32177cbeb0a69b96bfc8a37a16beea44b84b03e71fda61918853ea6edd SHA512 fdad83c1b8ee35ce10d87d1121c14e07661922095ddbbbc8529ec5692079d050f2de8f4481da6fbb309f963df8d692ee7d15507373244a9775a967df5b1d3690
-EBUILD lurch-0.7.0.ebuild 1221 BLAKE2B 143bd3bc6867957998c560f641f92e1bc8f30c4f24047ac6f00ef648b4f9f8e11be64bb074be9493f86f5d9f5f0088cc36fd5840c8e56b3480aeb49966cd4b5b SHA512 f77ec75ac4249a92257f20188206894504ded0db60e3626110d04f5686704311d60779113fecd84278b48341f2ae265c21045398d2894e43d7a649f65e635bdf
+EBUILD lurch-0.7.0.ebuild 1219 BLAKE2B 94cd29bf34ca93f9f97ddb2e0db10f476170a44f3e5217bdecfc15732e6034b41dcebfc67c2c7cc948866a5440e0e3639a736e1738a7da13b8e2562d71d7650f SHA512 37cfdd63e941c8b1b30cd054bf0eea111afbd453d3a61d8b717c6e77162e53e0f81451aeba86bda015bbe2738496000b7bc57a408dcf6d12dd870e20593cf4a9
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/x11-plugins/lurch/lurch-0.7.0.ebuild b/x11-plugins/lurch/lurch-0.7.0.ebuild
index 12f3106c5cca..dbdcaa1fc957 100644
--- a/x11-plugins/lurch/lurch-0.7.0.ebuild
+++ b/x11-plugins/lurch/lurch-0.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gkdr/lurch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"  # likely not GPL-3+, https://github.com/gkdr/lurch/issues/165
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 # NOTE: Some of these dependencies seem like leftovers in the build system
diff --git a/x11-plugins/pidgin-gnome-keyring/Manifest b/x11-plugins/pidgin-gnome-keyring/Manifest
index 106d45374133..15cd14badd43 100644
--- a/x11-plugins/pidgin-gnome-keyring/Manifest
+++ b/x11-plugins/pidgin-gnome-keyring/Manifest
@@ -1,4 +1,6 @@
-AUX pidgin-gnome-keyring-2.0-plugindir.patch 793 BLAKE2B d0310e76a928023cbe4093b979b1def64fd525e281e1d8bfcf55b1d6c59d8f7ff35d626632dc6b49d693e305b386b1fd74cfc43eef236b2864a228e04735e33d SHA512 70c4580f79d339c40a47ec8b8ff636649430f14627a9c88478f330c978781ac9252642c793eb155b26f366eb90cc00cf69e144a5cbf9903ae7be1a67441b59be
+AUX pidgin-gnome-keyring-2.0-pkgconfig_dirs.patch 1136 BLAKE2B 98e87c5680a0ba4caad6ae5a4b9f99d88603fc77dd484cfc1f6c75c9a8ca06b482f05a78d12ee8def125db48ecf36aab3a50b865c14cb8ed0d5fc752a672a3b0 SHA512 a0b1ce7e24872d10f8225fd2be27b8b561ad37bad97962170989ed50060062298c89f1c67c2d1f1a0459f56f7eef1b549553f4e93cd96987674bf3b0a3d1688b
+AUX pidgin-gnome-keyring-2.0-plugindir.patch 724 BLAKE2B 89423d2a8e1b8d4ba7508fc08c29231d136c3549606a8721a9ab517ea6c6f55d7546ee50bd2d0fdadaae84496f4c083852cb7efd6c0cba8d3f0874f86205ae31 SHA512 ba98b088ea91219075c4ee4e471505ef65c6a91fb34c4cc0806a9c376b378b30dc34f8c7013ba96090c3a48964f4716b6dddb685368b24137e212144ecc4e71d
 DIST pidgin-gnome-keyring-2.0.tar.gz 12066 BLAKE2B 466abfa59fea84acd63e03bd2b2b9e7c5e40b63baf5bc1b80bb17fa1b910b3b8be4c3e4ee7fd4687625101dcac8d43e872b1e3dc7e231306b6f26ee0c14484c2 SHA512 b1f83c107631a7105aa517312f13d745922b8033afc15069cba1c515caeee9e6ad89c4c7a5f96c561713d7f7a6ca3f03cff8fb11566a8ea0d8980f10e85d4610
+EBUILD pidgin-gnome-keyring-2.0-r1.ebuild 720 BLAKE2B e63f12a0f6dfad57a41db618570f177712354587f720027f2a60151c4e0dc83b813b8597f577c7e0b347e2f6d055d917bf2e58371ca1468767452b5d87896569 SHA512 ad6fbc7d4b9d23c5cc43ab240b180620478c7a95ec9e89c045444ede0d4f20ff0815cbc695e376cac7d1d20783fad27faf4dffb4b2470e6ca6e6c129cc97dac7
 EBUILD pidgin-gnome-keyring-2.0.ebuild 857 BLAKE2B a666a8083eada8405530d29c9de4abd0e9fc7e413b94c66f4a1d50d125eeb8410bc7daa28d55c88c01e266985e1724527d01651cd806911ba8fe0b41c5bd7552 SHA512 b80bf78c54a8b66449176940e9aaa17eb3569875fb6ff3fd06ecc045b392b9d2527b89ca58dea4153e7f54bb928b266bcca23ce60228ecece282fc5de67eb160
 MISC metadata.xml 601 BLAKE2B addada712eacbbc687e3483c3fa41e833ef1432dab4f13f1b5848e1b1bcdb09d176f989c8ff4ddb0eb85041cda73fa1369b716cd9e7129433c8e9ace7d76d93a SHA512 8c30a86da0a41a8e47009cfafecae861d6389c6dbe0d14c68200d1b2a6c83b047befca74f70ac8652ba22fd2c738a1ce41fe63186fc7a2e5762d348c08635970
diff --git a/x11-plugins/pidgin-gnome-keyring/files/pidgin-gnome-keyring-2.0-pkgconfig_dirs.patch b/x11-plugins/pidgin-gnome-keyring/files/pidgin-gnome-keyring-2.0-pkgconfig_dirs.patch
new file mode 100644
index 000000000000..4f33cee65318
--- /dev/null
+++ b/x11-plugins/pidgin-gnome-keyring/files/pidgin-gnome-keyring-2.0-pkgconfig_dirs.patch
@@ -0,0 +1,32 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,11 @@
+ TARGET = gnome-keyring
+ 
+-SECRETFLAGS = `pkg-config --libs --cflags libsecret-1`
+-PURPLEFLAGS = `pkg-config --cflags purple`
+-VERSION = $(shell cat VERSION)
++SECRETFLAGS := $(shell pkg-config --libs --cflags libsecret-1)
++PURPLEFLAGS := $(shell pkg-config --cflags purple)
++PLUGINDIR := $(shell pkg-config --variable=plugindir purple)
++VERSION := $(shell cat VERSION)
+ ifeq ($(strip $(VERSION)),)
+-	VERSION = `git describe --tags`
++	VERSION := $(shell git describe --tags)
+ endif
+ 
+ all: ${TARGET}.so
+@@ -15,11 +16,10 @@
+ 
+ ${TARGET}.so: ${TARGET}.c
+ 
+-	${CC} ${CFLAGS} ${LDFLAGS} -Wall -I. -g -O2 ${TARGET}.c -o ${TARGET}.so -shared -fPIC -DPIC -ggdb ${PURPLEFLAGS} ${SECRETFLAGS} -DVERSION=\"${VERSION}\"
++	${CC} ${CFLAGS} ${LDFLAGS} -Wall -I.   ${TARGET}.c -o ${TARGET}.so -shared -fPIC -DPIC  ${PURPLEFLAGS} ${SECRETFLAGS} -DVERSION=\"${VERSION}\"
+ 
+ install: ${TARGET}.so
+-	mkdir -p ${DESTDIR}/usr/lib/purple-2/
+-	cp ${TARGET}.so ${DESTDIR}/usr/lib/purple-2/
++	install -D ${TARGET}.so ${DESTDIR}/$(PLUGINDIR)/${TARGET}.so
+ 
+ install_local: ${TARGET}.so
+ 	mkdir -p ~/.purple/plugins
diff --git a/x11-plugins/pidgin-gnome-keyring/files/pidgin-gnome-keyring-2.0-plugindir.patch b/x11-plugins/pidgin-gnome-keyring/files/pidgin-gnome-keyring-2.0-plugindir.patch
index 6aa6ffca3c52..a96080fc6aa3 100644
--- a/x11-plugins/pidgin-gnome-keyring/files/pidgin-gnome-keyring-2.0-plugindir.patch
+++ b/x11-plugins/pidgin-gnome-keyring/files/pidgin-gnome-keyring-2.0-plugindir.patch
@@ -1,10 +1,10 @@
---- a/Makefile	2015-02-07 03:23:05.000000000 +0000
-+++ b/Makefile	2016-04-28 09:53:59.915565380 +0000
+--- a/Makefile
++++ b/Makefile
 @@ -2,6 +2,7 @@
  
  SECRETFLAGS = `pkg-config --libs --cflags libsecret-1`
  PURPLEFLAGS = `pkg-config --cflags purple`
-+PLUGINDIR = `pkg-config --variable=plugindir purple`
++PLUGINDIR = `${PKG_CONFIG} --variable=plugindir purple`
  VERSION = $(shell cat VERSION)
  ifeq ($(strip $(VERSION)),)
  	VERSION = `git describe --tags`
diff --git a/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0-r1.ebuild b/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0-r1.ebuild
new file mode 100644
index 000000000000..0bbf1d34fc26
--- /dev/null
+++ b/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Integrates Pidgin (and libpurple) with the system keyring"
+HOMEPAGE="https://github.com/aebrahim/pidgin-gnome-keyring"
+SRC_URI="https://github.com/aebrahim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-crypt/libsecret
+	net-im/pidgin"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-pkgconfig_dirs.patch"
+)
+
+src_prepare() {
+	default
+
+	# This file is used by the upstream Makefile yet as of 2.0 is still missing
+	# from release tarballs.
+	echo "${PV}" > VERSION || die "Failed to recreate version file"
+}
diff --git a/x11-plugins/pidgin-gpg/Manifest b/x11-plugins/pidgin-gpg/Manifest
index dab6f0e78ad2..2d6b40d32a13 100644
--- a/x11-plugins/pidgin-gpg/Manifest
+++ b/x11-plugins/pidgin-gpg/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-gpg-0.9.3.tar.gz 806492 BLAKE2B 67ca75307419fe25d6a7f90ce33f63e736eae59e0cab9fd2fafbf7f9ccd61569fb9906e755163400c462bcd63fa8e9b1e42deb98e459fb9e070d73de9cfb28ab SHA512 bff7ec08d7999d40b689aabc0b559b7eab1fae765b6ffc799e355601ac3a2bb05c3831c1e56e30b95f387c446f7d07d1576af7e7824094fca9ac6c6636d62f6c
-EBUILD pidgin-gpg-0.9.3.ebuild 594 BLAKE2B 366b0e3d89843e0bd13cc41301ab394fe120940c7efa8ca96a6ad7bac6c54d474aa700c7e3d632ed55fcb8d0b4046150fa57c3e8584871ea7ae4461db384a05f SHA512 e0faf081310613b0ad471404d05b30004344a9ebcd6ea6fd3c9f0a6084f4002197ca1bb0addd9fe916d46d08d6653c9f04da3bfcd9cc874f9baa6549197f9223
+EBUILD pidgin-gpg-0.9.3.ebuild 587 BLAKE2B 227a5be81c857baf27ee7fca8dae72559a48a933ec4d31d03880e0d157c77fc4b54d2b6ed9018f5ce89b1a856892f08b2829b1a1b9c15bd4af3ccaa9f84ea1a3 SHA512 d3e5fc8313d7947ba044cdd445a231c8d166d0e1febb47ae7f6dea553ba7b13937e8d46ed3c0b0237743205e1c2b04454c8a40902546499bcdf7c3fffb15bc13
 MISC metadata.xml 601 BLAKE2B a50fd4f65b5a35ced398de8cb427c1e8fb1969f9a594970b6178e4ba3b2e52bf1fffde004fe1bb51ab3a045a8acd0bd9e013e57608b9566aad942b27ecb1c8ec SHA512 b35e806fe2c3901cad3dda6adac3b6f76d45c23205e4cf1a4370d7501a3be11d4b7ea4825a9e802715caa8da416306dc09e075bf38fd8320435e0826b7928a71
diff --git a/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.3.ebuild b/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.3.ebuild
index 1d49c9c8eff5..653c0ced057d 100644
--- a/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.3.ebuild
+++ b/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit autotools eutils ltprune
+inherit autotools ltprune
 
 DESCRIPTION="Pidgin GPG/OpenPGP (XEP-0027) plugin"
 HOMEPAGE="https://github.com/Draghtnod/Pidgin-GPG"
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index b9713b2ed438..8cc7e478ba09 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -2,4 +2,4 @@ DIST pidgin-sipe-1.23.3.tar.gz 1298459 BLAKE2B e15ad7658771fc0d7f5320f6b145e67a6
 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 1367 BLAKE2B 1a7ceb9d5e281d41b9f4240d62c79050abd8577f105963fc2710e78f6f4e37475dcf8e5bca1e1509a4b908d6c57ff4d0fc39838f6127113c88f5dd1e7d15ca37 SHA512 0981b15c4ffc12d268629976b5c2c84528f7cc8fb846ca7afaeb5aac5cf59dd65e48e16f0bcb34c61e4315524649df6e373ce85162e8bde94144b5399f922478
-MISC metadata.xml 862 BLAKE2B a48a0574208ea31609e18d48b4676763e509d97e28f562bc7a103d99183ee75184b8d674245e24b19e0d1adcda6b8091fbfc1c7e3cdb42569094fb9aeb02e932 SHA512 ff38f1be40af0b781cb545c216873eff77f07f0142b1c3db8a1ce2ca43b53fa9f2ce6a9b4940ff8843f26bb5f024d2ed8d3917762cf74b4820550bb704cc4b14
+MISC metadata.xml 778 BLAKE2B 8128c3886d6f8ab54d3636954904e30fe4da25bf4bd7268fad499842cadd4a2c5104617b32fedcaaceb93c3a44691bb0815cf8d451e0c26a3380b5a4a2953b54 SHA512 e0d5228e0585c317f635838a2905a0354ecc3af1311e817fbdd0ba1703a13e9d4070a9f9db31891bcb819ac03dc93b2764e2f73bacdffb8318c599612b0cb21f
diff --git a/x11-plugins/pidgin-sipe/metadata.xml b/x11-plugins/pidgin-sipe/metadata.xml
index c52417e6dbe2..930d54b32213 100644
--- a/x11-plugins/pidgin-sipe/metadata.xml
+++ b/x11-plugins/pidgin-sipe/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>thev00d00@gentoo.org</email>
-    <name>Ian Whyman</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
 An Open Implementation of SIP/Simple protocol for Live Communications Server 2003/2005/2007 and Lync.
 </longdescription>
diff --git a/x11-plugins/pidgin-skypeweb/Manifest b/x11-plugins/pidgin-skypeweb/Manifest
index 7e45275753cf..650c6010e861 100644
--- a/x11-plugins/pidgin-skypeweb/Manifest
+++ b/x11-plugins/pidgin-skypeweb/Manifest
@@ -1,6 +1,4 @@
-DIST pidgin-skypeweb-1.5.tar.gz 295956 BLAKE2B 0a45c709570c9093df9f0e674e5556a21b832b5e73ab2f32d439aa4fe3ce224df0bab05e054ef352ed337113e6800020cf0da60a7b37a6f39a22fc95ad40d28b SHA512 93043b83132654144f333e90bdff88dec5efe2495412a0b40f0ab64ec96d9427acea553ff73dee054de87e77121cbfd1a7bcaddeb17ab4d91baef55d658b6478
 DIST pidgin-skypeweb-1.7.tar.gz 297565 BLAKE2B 94d4fe7b6408fe054bdb79729493929551aabce03c9157992c7cab283c360adfa20c0b9775d82ec7017d762e208259fbf365e6311df566eda033f5a8c71ce20a SHA512 0981aefe23a7bce423fbc447ae22f79077742ac5cc1fd235611acc34175b4a6d9fd4a4af38f7fc3aa7ff7442be71a70c68ca8c271adbe39c085d6ae599cb0871
-EBUILD pidgin-skypeweb-1.5.ebuild 658 BLAKE2B 4e608465edab12b481ebeab075d9cb9e5de9519c62856de3e2780abb06d302f1d91f4a259d162b7cdb0539ec93e26be57eb51c602e4bfabd09573d0463747552 SHA512 449de42850da9881b7451b5558efc50f3305808da197a30302c2bded746bb464134658f53bea3b54b4931444e6d1596fc25e375dc5a7ed8f4e8d103c2b2e1edb
 EBUILD pidgin-skypeweb-1.7.ebuild 667 BLAKE2B 99582ccea996c734104be87d4ae604288edf1590266538dec9eee721893d79cec8213b9cef244af8bcffad9edff862c9971fccd134e2efb2b99a0b186ead27ea SHA512 a92e21392bed475a432f7e80438947f866dae146a7ea18d03df229957c55dc5617c98f649dbedad154aaf6ff09856bc9a6d56f2f5c5385c3a2ec623cb49e7248
 EBUILD pidgin-skypeweb-9999.ebuild 408 BLAKE2B c50234601349c4107d201a14625b51c407201c4cee9bab54d8ca965d97eaa3ed5c871ea23dcc15b30ba66e96b8a218c98adf84716dc94c72c5e7297c27ab1bba SHA512 f9cafbad41529d2c308da61cbae62c9e38cb4cd42895d142c443ece9daf4bf47d471e0b7a1f017d45cd88b6414de02542ef8244b1856ae1135344a1fd1ae8398
 MISC metadata.xml 474 BLAKE2B 05aefac276394efa2739064dd4d97db4cca210c8cf8dc6032516f8a0d8596b8fe872004e5dfd50c24b2e695cc50f67da54718e1d03fcc6301f758cfd255864d3 SHA512 9e69489e9875db0978a1ba735b8a653f94f9345e62eddce5930081fcf8b9bfee80c5c555dfa8ce85371e508841cdd0193c2221a5bfdd3cf830ef7a53a3836eac
diff --git a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.5.ebuild b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.5.ebuild
deleted file mode 100644
index dec5c377b3ea..000000000000
--- a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="SkypeWeb Plugin for Pidgin"
-HOMEPAGE="https://github.com/EionRobb/skype4pidgin"
-SRC_URI="https://github.com/EionRobb/skype4pidgin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND="net-im/pidgin
-	dev-libs/json-glib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/skype4pidgin-${PV}/skypeweb"
-
-pkg_postinst() {
-	elog "If you get error message like 'Failed getting Magic T value':"
-	elog "Go to https://web.skype.com ; Log In and follow the instructions to enable your account!"
-}
diff --git a/x11-plugins/pidgin-xmpp-receipts/Manifest b/x11-plugins/pidgin-xmpp-receipts/Manifest
index 377a93ec052a..cb73110fc546 100644
--- a/x11-plugins/pidgin-xmpp-receipts/Manifest
+++ b/x11-plugins/pidgin-xmpp-receipts/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-xmpp-receipts-0.8.tar.gz 16021 BLAKE2B ba6eb7cb49ec75981e2c15f8aa471e6169ca4f9e6b03061248ff99669b7e31c838c466b1b476fed20bf3c1321954de13b053bbdd599f1ac4f58defacebabf383 SHA512 04113236d46066211d7e0f3c66f4bf1b6fb8a33ac675203f3cff15300eb97ffd3ee627e03fcc3ab3d1e9431fc107a9f7e9fca319f3debb773603d311b167b5a8
-EBUILD pidgin-xmpp-receipts-0.8.ebuild 886 BLAKE2B 0c3225f3ea6febf81693970007271c84a1ab8712f384aa5d125d000af7a6d43ca5b56c29ffadf0b757d8c6603ddacc47c67e4d4df9b200d0e6fe5470249bd652 SHA512 e263e4dd770d7b4605837d59bc8f909127ce1c1fdd3e5d123cb9ca0cfa277ab4ab0877c8b8f9e1b39cdb43373b89259b9fae5f5a896c86066c4819e06554b4c5
+EBUILD pidgin-xmpp-receipts-0.8.ebuild 875 BLAKE2B 8e50ac6124349edb98bbdc16d0657582cc2d730e71ed80bf944483b8bc8a74b9888e55d0eb2cd7b8efc12ccb16909bb6943414c3c07498ea38f636b2f6639f90 SHA512 90d22544e7347f16ccbc807690614348c30d331f6866a4d226d34bb572349e7a151e4cf39db5caeec79c7bd2d35410cc4939d5d1a517817e4a439bfd31746ed0
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.8.ebuild b/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.8.ebuild
index 601b7d04adf2..c62d3d1c907e 100644
--- a/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.8.ebuild
+++ b/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vcs-snapshot toolchain-funcs
 
@@ -12,20 +12,19 @@ SRC_URI="https://github.com/noonien-d/pidgin-xmpp-receipts/archive/release_${PV}
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64"
-IUSE=""
 
 RDEPEND="net-im/pidgin[gtk]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_compile() {
-	GTK_PIDGIN_INCLUDES=$(pkg-config --cflags gtk+-2.0 pidgin)
+	GTK_PIDGIN_INCLUDES="$($(tc-getPKG_CONFIG) --cflags gtk+-2.0 pidgin)"
 	$(tc-getCC) ${LDFLAGS} -shared ${CFLAGS} -fpic ${GTK_PIDGIN_INCLUDES} -o ${PN/pidgin-/}.so ${PN/pidgin-/}.c || die
 }
 
 src_install() {
-	PLUGIN_DIR_PIDGIN=$(pkg-config --variable=plugindir pidgin)
-	dodir "${PLUGIN_DIR_PIDGIN}"
+	PLUGIN_DIR_PIDGIN=$($(tc-getPKG_CONFIG) --variable=plugindir pidgin)
+
 	insinto "${PLUGIN_DIR_PIDGIN}"
 	doins ${PN/pidgin-/}.so
 }
diff --git a/x11-plugins/purple-facebook/Manifest b/x11-plugins/purple-facebook/Manifest
index b8b05f4236a5..8f4108f0809c 100644
--- a/x11-plugins/purple-facebook/Manifest
+++ b/x11-plugins/purple-facebook/Manifest
@@ -1,7 +1,7 @@
 DIST purple-facebook-20170608.tar.gz 459535 BLAKE2B 24dcb59496efde8f176c48872b30568ac50c09456056b564f692ad96ee0a76691f19c5282abc4af37fbea5cde7fa43f151cb80217e6dba694f10d0e2cd118eaa SHA512 50e8708afc059239347ccf1a5b92202469116848c63599cfc450d114f2b821a9c15ef340074e715ffebd46761b30f59ac8caf9bb2848af41c3ad0abc39fb39e2
 DIST purple-facebook-20170831.tar.gz 462381 BLAKE2B 06f2f53885b11842f76c6d04d5c85ba78461cbaef46962ff058432a491a3e0e47653c2d04b5b4f0cc77a21e0cea08d1b302fe0116341df70caa4416180965fba SHA512 0e90543b1b2ea24482b26b45ccd6b7d557f10cdcf1d5f535f8c47a0bc9721e5a1049d55705e2f360702d5ad52511f17cf1a7f353b69b62497890dd6b75f6cc83
 DIST purple-facebook-20190113.tar.gz 474005 BLAKE2B 5deb89724ed12280ae29274a03556cc0609f9bcae537786f702d59a35ee2c820bea44bad62a0f6393680da4ea86eb86a2aa8649ab5bdebc43ccc3d6325f8b9a3 SHA512 bf2284169f6765986279421ad9946610de6f58a79d0b70e7dbd43445f59dc518aabdb8a9b41c9f1c8441c12edce79ecfaf7e98bdc56abdc59bb2c46951ee50ce
-EBUILD purple-facebook-20170608.ebuild 618 BLAKE2B 5aed3bd119a07bdb2c9fc92de7a04b8d12c93cd73ca755296cc49ddb29cc788047ee943d31bdcfa729bcab61bc548abb4820e061df1975d1348ee5238d0195fb SHA512 edd3cadb176d8724234f7c25a3828afd1331979108085cb38efe8333f0b2caef51039a050a4078a4bc3bdc59fbd813d1e917ca8919f323f4523c747ba7619476
-EBUILD purple-facebook-20170831.ebuild 618 BLAKE2B 2108638dde9031550f0baf1f14c3cc2cb546a7fae5f7b347fcfe9a67288e4b78026cb8c40267bf6edf379b06de32fd4c952865f1f4a8066b9772d26af092fef1 SHA512 205bd150a07e0164aab1f2f6a1fa13d4382a053fc78a5b380592947993be19997b33e5ddf40a7941ab7a7150d0fa9c6707fc24f1a0b491d982e839cbb550b6ca
+EBUILD purple-facebook-20170608.ebuild 608 BLAKE2B 153ae8a3c5ddc6b82b2d94669e808dbde700d20e71d1460a864ea7ae816360266a8d04ba43f40e7a366b8f7a307ac2b5b1b1311b23d947536a55e48b3b17bf9c SHA512 42bcc1ea07f49faa1454d7c91570d8b12025732b799578b2fbcbc29d4bcf42f4a2e01ead77a50c59ced6089020c5b068c0af3883e7bba37df0f3aaff5b1d38c4
+EBUILD purple-facebook-20170831.ebuild 608 BLAKE2B f9a2aaefb00159f12744992bc4e7fe50745430ed138c092594d9a3aa2f0cab3cc6f3602071879702511e1ca6256058d5819bec0340862bfd6f363a38fc00a233 SHA512 2c701e401c323e3cbfda829e174977d38e86f7b625d394b6dc91887ec5bf4c6e890585d7e082ebd4f3b08d2b8f64bf92c9095d3add4ba44f88be3acd01f821fc
 EBUILD purple-facebook-20190113.ebuild 594 BLAKE2B ec94f4113e6df69eb91723a0aab85b963fbd2f5d0d1da83439dcd618f5b08415cddf0fb22705a34316dae0328f0c778238248e71f836a570e5827b89fc969f83 SHA512 403670e5eb033a7c7b5eab253fd25d706dcedc6fe8aa955e00985669cf9c88506c50783c9adccbcb86b53def910b77ca04664bc94f1257a4a0ad0ec6db8ea2b1
 MISC metadata.xml 344 BLAKE2B ed5c21f3780905490ec18c6d72c7be649912c1a7711d5c9f563d71c3d8ad2e3d92870b87834a45d17ef73f2b24fcbfec422c238a245c3e88166a7b427d8598c7 SHA512 9a385fff529b91501c676bc1d94fc20206b8270b5cbb7f9e6f23e41cf59d6ad9f18ae763706515e3715b22d62b52199453e52429f99dfbb21aa89277511d091e
diff --git a/x11-plugins/purple-facebook/purple-facebook-20170608.ebuild b/x11-plugins/purple-facebook/purple-facebook-20170608.ebuild
index 01961de6bd6a..b20d6833e213 100644
--- a/x11-plugins/purple-facebook/purple-facebook-20170608.ebuild
+++ b/x11-plugins/purple-facebook/purple-facebook-20170608.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils autotools
+inherit autotools
 
 MY_PV="0.9.4-c9b74a765767"
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/x11-plugins/purple-facebook/purple-facebook-20170831.ebuild b/x11-plugins/purple-facebook/purple-facebook-20170831.ebuild
index a4d48b79e1a5..328ecab206d4 100644
--- a/x11-plugins/purple-facebook/purple-facebook-20170831.ebuild
+++ b/x11-plugins/purple-facebook/purple-facebook-20170831.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils autotools
+inherit autotools
 
 MY_PV="0.9.5-9ff9acf9fa14"
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/x11-plugins/vicious/Manifest b/x11-plugins/vicious/Manifest
index 72b5eb56d322..6125e47a6760 100644
--- a/x11-plugins/vicious/Manifest
+++ b/x11-plugins/vicious/Manifest
@@ -1,5 +1,3 @@
-DIST vicious-2.3.1.tar.gz 47484 BLAKE2B 2ef6e51507faf7477800091c738e65184439caba9b79004b53f3a479f1370ca64046bc1664c6b746d8ab71370b36f29095406439e2a8fab7524e6bb190350fb7 SHA512 9e89d36d708a7ccdff206451dfb98db8455a16f9d2254167a446af91fadc2103a5274442f38ddf1eb919da23480b6790639cdbbde4a08bffc1cf9221622064c9
 DIST vicious-2.5.0.tar.gz 67557 BLAKE2B ffbc1b3c0e32b554cc367a51e5e17130e1b9f7fed2e8505aaa1845719ecd6d465d43ba839ac3a9b73a87e43ff3144c2074f3750d5f67b516d033a74144e9e12f SHA512 deb21587d1d7f2e6e4dd77c74abbfa337acf6c99ef9bebc0e505f1508afc6e3b03f043a639f866fcda0191447c103d3fba51376682201482fb669a263321dee5
-EBUILD vicious-2.3.1.ebuild 670 BLAKE2B a96e57a97480303b302d1c387de5f9ee8d86173af0c1ccbc3b100a8292a6bbe0b0e679f930eb881b66d655640bf10b3d95052e468181d1baf31e68cda6a3ae4c SHA512 0a1ae727bca18f54e06a4df1cea575328a10604dc85046e1f1ec242eeb22e4d57544ecc2bc6c349b538b1cead65840f75a2797aa41ee70595a33f5c3810d13d0
-EBUILD vicious-2.5.0.ebuild 2275 BLAKE2B a3e2daa7f23e73728c3816866468a067576c4b8078987ae01da81649955ae4bf8026be1656b4d5284630dc8d6ced41044df2d14eb0019c5d59dba17c5026a63b SHA512 12647416aa4d4c5685480d93ea43d0f10ae51b912693fe8b66e57b58fbf7d5ebf1d3a4f806b8d8f8c125bc0f23833675e93520740332f61554b27cd53306ac9c
+EBUILD vicious-2.5.0.ebuild 2288 BLAKE2B 576843becc26c16e87d2fc743b520d4e6022ddb3769c80f89925913a27a71b7160a96828b5618eb06292c3f9bf88d08feb5f4f85f808252b5015a2e8859881a1 SHA512 4200bd3de2875e94092776ab32b2180679c335c319770a2c695677e83a179189cb541e4a33b23c911b5434cbda6629bf7a9674f8d9d5b9bc312d18617f5fb229
 MISC metadata.xml 491 BLAKE2B 7cf50abefb4be51a254a68409ed9ba50d442ab1b5cb67b2f80d625827ea3a7802af6610c30e2e006d00cf69b425d9ad55d3d8cddfafdded74d49663ca24212bd SHA512 a4724818584f7345e3d6e0319cc1841745367bd134b10c37d2696db1e03f199e2e94f64f2ed76eeff964bda3174416a1777b023b1a4062d4830071a5ce6df162
diff --git a/x11-plugins/vicious/vicious-2.3.1.ebuild b/x11-plugins/vicious/vicious-2.3.1.ebuild
deleted file mode 100644
index c4959615581d..000000000000
--- a/x11-plugins/vicious/vicious-2.3.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Modular widget library for x11-wm/awesome"
-HOMEPAGE="https://github.com/Mic92/vicious"
-SRC_URI="https://github.com/Mic92/vicious/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="contrib"
-
-DEPEND=""
-RDEPEND="x11-wm/awesome"
-
-src_install() {
-	insinto /usr/share/awesome/lib/vicious
-	doins -r widgets helpers.lua init.lua
-	dodoc Changes.md README.md TODO
-
-	if use contrib; then
-		insinto /usr/share/awesome/lib/vicious/contrib
-		doins contrib/*.lua
-		newdoc contrib/README.md README.contrib
-	fi
-}
diff --git a/x11-plugins/vicious/vicious-2.5.0.ebuild b/x11-plugins/vicious/vicious-2.5.0.ebuild
index 72bec8a74f26..31dbb976d373 100644
--- a/x11-plugins/vicious/vicious-2.5.0.ebuild
+++ b/x11-plugins/vicious/vicious-2.5.0.ebuild
@@ -33,7 +33,7 @@ pkg_postinst() {
 	# only by searching for occurrences of vicious.spawn (the recommended way of calling
 	# external helpers because it supports async) and popen (still used by many contrib widgets).
 	# Moreover, dependencies of all non-Linux widgets have been excluded on purpose.
-	elog "These widgets need some dependencies:"
+	optfeature_header "These widgets need some dependencies:"
 	optfeature "cmus" "media-sound/cmus"
 	optfeature "fs" "sys-apps/coreutils" # df
 	optfeature "gmail" "net-misc/curl"
diff --git a/x11-plugins/wmSpaceWeather/Manifest b/x11-plugins/wmSpaceWeather/Manifest
index 271b4fae5b28..55429b5cb1c1 100644
--- a/x11-plugins/wmSpaceWeather/Manifest
+++ b/x11-plugins/wmSpaceWeather/Manifest
@@ -1,7 +1,7 @@
-AUX wmSpaceWeather-1.04_p19-gcc-10.patch 962 BLAKE2B 935948a401c6e5a1bf8bd3bf74721f3c0b099d072401051ab17eef2b95406f4e6b46a661944e003c8ddb3beb3c8ed90089f8a64e49c6372de2e3a9900baaa68b SHA512 46a1a069f6fff39e4771582576540693405759d9033ba3961b23eaa9f7d04f81bf91a8177c7fb75cc7fea78faed28fa561b849a425187a5a2a19783afa0babbd
-AUX wmSpaceWeather-1.04_p19-gentoo.patch 2034 BLAKE2B b81b73f9fb8c64c8ba9560f999f72b75a4c12aadb222a84903461adb3756ee991467f74a5b59ea96c3eb46e9ca479cbdd78a2cfa6f8dd2e929dc158201eb1c2c SHA512 7e8d76b6db7e6fd6b498712d0d06cee4a3550914f9c48844c6b3dfc77c1086ac119a097365fd5424e1c251f0e9088feec3c2a1e9ab53e146f3a5427786872982
-AUX wmSpaceWeather-1.04_p19-getkp.patch 1290 BLAKE2B dd350e57e2c0d40716ead4fb6bdc215f263bf5340c242550668ba252d78873a5ceab7cbf789209214daec41e33abea3a128b6cd5a5a83ee4e22b9de694ccecec SHA512 54f1ee8d2152bafc7895b2a626f27a4c5bf7b3702a2d14e2523952fcffb8e636f6f3ceb30d95b12b80470a58cb16dd50e04435ccae91e81c83097d41e2949b59
+AUX wmSpaceWeather-1.04_p19-gcc-10.patch 476 BLAKE2B 84a9a694371b40c2a3bb1a73331d8c008297d620c7bafe84f08b3e29c3e1318099510540a2bd9618d88a9dd6770dc957e26cf0b0e2043c601c23afa8d427d4f3 SHA512 ac96f54015aea470570b69e31b19fc0d363cefade86204d55c0eb41936f9e88d56d4f6d58d6d98fa5837a75797219685ce9bb6d09b0f2d51e25612ffede3dde5
+AUX wmSpaceWeather-1.04_p19-gentoo.patch 1880 BLAKE2B f874c9972baddeb5118d7ba00a5d469e9947824c052f3f459b55d40cbb7093fdf85853bf689ef702407749bba36327133ec2114718e916c179de377117a98099 SHA512 f0ebafcc49d37578173e5c097e78ecbc621a6fad4e4152c7e6c93751eee2826d3b85552ac3e7d5c8ea7780842408bd6fcf44bbfccbe28daaf8fb20e33af1a878
+AUX wmSpaceWeather-1.04_p19-getkp.patch 1213 BLAKE2B fee1aed8eec9ed13317a0ab43b8bd004108f9b13aa1ed4a4fa05b5861dbfca896d1c1b12d6b66f15a963874909ade2ccd01a492b416138d4448871072e9d02f6 SHA512 025bef6ab47aff79956996291b4cadbdbbb5a06d2cae58295c758ed2fedf9458602414790c303564b29434947773f8c98581723acc7b1904a2a625896ff112ee
 DIST wmspaceweather_1.04-19.diff.gz 9429 BLAKE2B c32b02d123783789962ef56f54b79b7afacc69573526cd5254b7083673a5ae0d70abaa82d84421c86d95139f9033a35de6511d131f73ff1360d43d1d0e320979 SHA512 f8228c15642b88b355f977a8ce73b474bf8874b4b64bce3f519e6ec6c5de1db7bbd1e5f40e57e367dc0a1dec47e5c32b87d4ce61e35043d71cee0005b06a5a78
 DIST wmspaceweather_1.04.orig.tar.gz 36295 BLAKE2B 8f12a4ba7dc55d06ab1b3c86f387c0f4dc930d89b8ccf151096d736adb80deaf647e47bb4592f309042e2273936996b215cb2fffe83dbbe20bd10d94b1b7c109 SHA512 d422806d44a2929cfdb3e36c7075a4e02b64416db7c528d08411944f574dc34bb5e5ee48c55a3b9e796b15529857bcb480dc650ebdfe23cf1079ba09e2749154
-EBUILD wmSpaceWeather-1.04_p19-r1.ebuild 1655 BLAKE2B f0fec1016e233b4a14cf8d1a3be96d8537e0f3d31548ff6ff1f8b8fdb0d62b33af56aa1cdbf03c5e6361574a664ebab641976efc9d6878c40acc09316767bd91 SHA512 33c67461d55fdfe6b8c9c57df9e2599340dc45c8fd92bb8bd2eeb60a834d106a1e2794fda90f47a02b14da83fa8f4ffaa64448ae3b18162e411a91add92dafc3
+EBUILD wmSpaceWeather-1.04_p19-r1.ebuild 1533 BLAKE2B 212707fa911e22e74203d6a0013bcf2f4144f4970675700a834de2b098214a2e58cf9ee744ea90eb7ce6bc87480f594b4de1a84eb526dc06383e37a6da4a02f6 SHA512 d807b4560e43c1f64530e65322d2e26729fd9634c240bc18c6f0f6dde804a842529cfbb25957ffa109b9eb81527045f4eb79dddbbdacb791af19b102b54f82b3
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch
index f95e7e5ccbe0..e40682abf8d2 100644
--- a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch
+++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch
@@ -1,6 +1,5 @@
-diff -Naur wmspaceweather-1.04.orig.orig/wmgeneral/wmgeneral.h wmspaceweather-1.04.orig/wmgeneral/wmgeneral.h
---- wmspaceweather-1.04.orig.orig/wmgeneral/wmgeneral.h	1999-04-11 07:35:53.000000000 +0200
-+++ wmspaceweather-1.04.orig/wmgeneral/wmgeneral.h	2020-03-01 16:13:29.843346352 +0100
+--- a/wmgeneral/wmgeneral.h
++++ b/wmgeneral/wmgeneral.h
 @@ -28,7 +28,7 @@
   /* Global variable */
  /*******************/
@@ -10,9 +9,8 @@ diff -Naur wmspaceweather-1.04.orig.orig/wmgeneral/wmgeneral.h wmspaceweather-1.
  
    /***********************/
   /* Function Prototypes */
-diff -Naur wmspaceweather-1.04.orig.orig/wmSpaceWeather/wmSpaceWeather.c wmspaceweather-1.04.orig/wmSpaceWeather/wmSpaceWeather.c
---- wmspaceweather-1.04.orig.orig/wmSpaceWeather/wmSpaceWeather.c	1999-04-11 07:35:53.000000000 +0200
-+++ wmspaceweather-1.04.orig/wmSpaceWeather/wmSpaceWeather.c	2020-03-01 16:13:38.172348429 +0100
+--- a/wmSpaceWeather/wmSpaceWeather.c
++++ b/wmSpaceWeather/wmSpaceWeather.c
 @@ -91,6 +91,7 @@
  char            URL[1024];
  int		ForceUpdate2;
diff --git a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch
index 29cb5f984f13..104003a9b4f0 100644
--- a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch
+++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch
@@ -1,5 +1,5 @@
---- wmSpaceWeather/Makefile.orig	2008-01-28 02:45:07.000000000 +0100
-+++ wmSpaceWeather/Makefile	2008-01-28 02:46:04.000000000 +0100
+--- wmSpaceWeather/Makefile
++++ wmSpaceWeather/Makefile
 @@ -1,8 +1,8 @@
 -CC     = gcc
 -CFLAGS = -O2 -Wall
@@ -48,8 +48,8 @@
 +	install -m 0755 GetKp $(DESTDIR)$(PREFIX)/share/wmspaceweather
 +	install -m 0644 wmSpaceWeather.1 $(DESTDIR)$(PREFIX)/share/man/man1
  
---- wmSpaceWeather/wmSpaceWeather.c.orig	2008-01-28 03:16:36.000000000 +0100
-+++ wmSpaceWeather/wmSpaceWeather.c	2008-01-28 03:22:12.000000000 +0100
+--- wmSpaceWeather/wmSpaceWeather.c
++++ wmSpaceWeather/wmSpaceWeather.c
 @@ -663,7 +663,7 @@
      if (GotDoubleClick1) {
          GotFirstClick1 = 0;
diff --git a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch
index 6d6d90137feb..aaea89f8ae05 100644
--- a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch
+++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch
@@ -1,5 +1,5 @@
---- wmSpaceWeather/GetKp.orig	2008-01-28 14:20:43.000000000 +0100
-+++ wmSpaceWeather/GetKp	2008-01-28 14:22:48.000000000 +0100
+--- wmSpaceWeather/GetKp
++++ wmSpaceWeather/GetKp
 @@ -17,10 +17,10 @@
      unlink(CUR_INDEX);
  
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
index 9bd5996db7f1..7fdcae9bcf96 100644
--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
+++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_PN="wmspaceweather"
 MY_PV_ORIG="${PV/_p*}"
@@ -33,16 +33,17 @@ RDEPEND="${CDEPEND}
 
 S="${WORKDIR}/${MY_P_ORIG/_/-}/${PN}"
 
-src_unpack() {
-	unpack ${MY_P_ORIG}.tar.gz
-	epatch "${DISTDIR}"/${MY_P_PATCH}.gz
-	epatch "${FILESDIR}"/${P}-gcc-10.patch
+src_prepare() {
+	default
+
+	cd .. || die
+
+	eapply "${WORKDIR}"/${MY_P_PATCH}
+	eapply "${FILESDIR}"/${P}-gcc-10.patch
 
 	# need to apply patches from Debian first, do NOT change the order
 	cd "${S}" || die
-	mv ../debian/patches "${WORKDIR}"/patch || die
-	EPATCH_SUFFIX="dpatch" EPATCH_FORCE="yes" \
-		EPATCH_MULTI_MSG="Applying Debian patches ..." epatch
+	eapply -p2 ../debian/patches/*.dpatch
 	eapply "${FILESDIR}"/${P}-gentoo.patch
 	eapply "${FILESDIR}"/${P}-getkp.patch
 }
diff --git a/x11-plugins/wmcalendar/Manifest b/x11-plugins/wmcalendar/Manifest
index 6ea86c5cce99..a92e18468304 100644
--- a/x11-plugins/wmcalendar/Manifest
+++ b/x11-plugins/wmcalendar/Manifest
@@ -1,5 +1,5 @@
-AUX wmcalendar-0.5.2-exit-sin-and-cos.patch 2051 BLAKE2B 2b24368f074ed9b806fb578a96d22c0479fff15607dcadcf71afa5f11f001543f69129bc1459e63062b3477cb19c19c5214705b51d2e23a2f581e367b7c82dc2 SHA512 55d2577e321d3261dcb8d9bf95e6d756d69952fd061109d4e93fa0cc5170cd1178efee1fa1d693aa826dbb5b659ca29e78b0f123af55ddfd83a37eef1c030d0e
-AUX wmcalendar-0.5.2-fno-common.patch 3891 BLAKE2B 73f2a7f6defc469f2130baafe5554716cf57f082e74b5dd9d2dd7442f95a94a4d0da50ee43d9f817c91938a66ac211a744d6fe015571e603ebfe1590dc87dc19 SHA512 a3c78e4af3236e31af9f7a597fbf8a0b52733bede9a2c3866a95b4fc886724e10d91899a973108555682d9e611f297316d4cd52d2ae584e7045ee4a6206adfed
+AUX wmcalendar-0.5.2-exit-sin-and-cos.patch 1835 BLAKE2B e85a288b71599ade23e00292c09eaa840eb271f1f96ca3e845462defbc3319912e33e7251b5d08b685a6fc81fab452fe12adff9b575f1ae13f3ed3224cacabc8 SHA512 dba719a3e12fca09f57e412a42e60b32e7d57590a76f606e4646e44bd783784b900e8323122191483f206c6b87e508801ad5c15810b4d98ce0624556b5ba92de
+AUX wmcalendar-0.5.2-fno-common.patch 3113 BLAKE2B 565792a4eb558e553a8c42affb630720b6275d98903094b1b9228b566cdae6bc50a7f91ee24cc1fe21ff514446912e56f47c31963860d116d5e1e1a58e452fac SHA512 8bd1a12b00005c0c9fe2402702034cc3cfef2b2cb76252c16e8315a8180d8f161ffb8c1dcad00a8a488061e0a25fd596bf78ac873131fe76257026890383f698
 AUX wmcalendar-0.5.2-ical.patch 387 BLAKE2B a9e8f848f29a2c83aae4e7f0efaec3efdcad6e56488ce8856a3ff19883b3a2c2ddf948148a8d7c45a3ba358f16274881a3ac8c93a081f4dac48e1ddc93ed334d SHA512 e7460227db5ca45ba3f909eba1ea95244d6464f496cbcbdb96e7879a728dbdcf64e8c25625ef05fb8f19713e400fc4b5c8f879526f734dd3e637d179e7186917
 AUX wmcalendar-0.5.2-rename_kill_func.patch 638 BLAKE2B b29503b9a3c6cfcac5cc970a6185c7a5f536a59baa9c2aae25b0f60507e20e6115889894dc82c336392d02c08d8cab4870352f32f94c5cf8656f470789ee12f6 SHA512 f81f3cdf3ea085dbd43e7b81d80c3d44c17945116996171a90f5823d711675851877e5474acdbd0f73989eb071d11826914e83420c596d1484fb4410a489e857
 DIST wmcalendar-0.5.2.tar.gz 42720 BLAKE2B b2de08905b368322013c3fd6fb4d87b5f7a986bee7b7de24fe2ce3be0003acc5e888dd01d9dedba85fa60ad211be23fb8623b432e5687e4ff2592b514dc549f0 SHA512 8d60a46f26657bf4876057ed092440018055e5a1ab6e2811a9c27f351533bfe6c941dbec10880daafe0858766cb890863cb66bfb70412e025a8d59ab96c663d7
diff --git a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch
index 1d68111fc261..6ea767a7a2da 100644
--- a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch
@@ -1,5 +1,5 @@
---- a/calendarfunc.c	2003-07-13 17:41:02.000000000 +0300
-+++ b/calendarfunc.c	2008-05-03 10:03:06.000000000 +0300
+--- a/calendarfunc.c
++++ b/calendarfunc.c
 @@ -22,7 +22,7 @@
  
  #include "calendarfunc.h"
@@ -9,8 +9,8 @@
  
  
  long persian_jdn(struct icaltimetype dt)
---- a/dockapp.c	2003-07-15 18:15:12.000000000 +0300
-+++ b/dockapp.c	2008-05-03 10:03:34.000000000 +0300
+--- a/dockapp.c
++++ b/dockapp.c
 @@ -23,6 +23,7 @@
   * modified by Seiichi SATO <ssato@sh.rim.or.jp>
   */
@@ -19,8 +19,8 @@
  #include "dockapp.h"
  
  #define WINDOWED_SIZE_W 64
---- a/Makefile	2003-07-15 18:19:26.000000000 +0300
-+++ b/Makefile	2008-05-03 10:11:48.000000000 +0300
+--- a/Makefile
++++ b/Makefile
 @@ -1,19 +1,15 @@
 -CC     = gcc
 +CC     ?= gcc
diff --git a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-fno-common.patch b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-fno-common.patch
index 9907634290a2..a889d4a9a9cc 100644
--- a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-fno-common.patch
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-fno-common.patch
@@ -1,6 +1,5 @@
-diff -Naur Src.orig/calendar.c Src/calendar.c
---- Src.orig/calendar.c	2007-01-15 01:14:32.000000000 +0100
-+++ Src/calendar.c	2020-03-29 13:25:39.390760510 +0200
+--- a/calendar.c
++++ b/calendar.c
 @@ -1,5 +1,10 @@
  #include "calendar.h"
  
@@ -12,9 +11,8 @@ diff -Naur Src.orig/calendar.c Src/calendar.c
  int  get_datetype(int day){return datetype[day][0];}
  
  /*------------------------------------------------------
-diff -Naur Src.orig/calendarfunc.c Src/calendarfunc.c
---- Src.orig/calendarfunc.c	2003-07-13 16:41:02.000000000 +0200
-+++ Src/calendarfunc.c	2020-03-29 13:24:07.630789052 +0200
+--- a/calendarfunc.c
++++ b/calendarfunc.c
 @@ -24,6 +24,7 @@
  #include <stdio.h>
  
@@ -23,9 +21,8 @@ diff -Naur Src.orig/calendarfunc.c Src/calendarfunc.c
  
  long persian_jdn(struct icaltimetype dt)
  {
-diff -Naur Src.orig/calendarfunc.h Src/calendarfunc.h
---- Src.orig/calendarfunc.h	2003-07-15 17:19:43.000000000 +0200
-+++ Src/calendarfunc.h	2020-03-29 13:23:23.468802848 +0200
+--- a/calendarfunc.h
++++ b/calendarfunc.h
 @@ -70,5 +70,5 @@
  
  int Ceil(float number);
@@ -33,9 +30,8 @@ diff -Naur Src.orig/calendarfunc.h Src/calendarfunc.h
 -int     datemoon[200][2];   /* hashtable for moonphase.[jdn%32][0] stores moonphase of day jdn, 
 +extern int     datemoon[200][2];   /* hashtable for moonphase.[jdn%32][0] stores moonphase of day jdn, 
  			    [jdn%32][1] stores jdn. */
-diff -Naur Src.orig/calendar.h Src/calendar.h
---- Src.orig/calendar.h	2007-01-15 01:13:50.000000000 +0100
-+++ Src/calendar.h	2020-03-29 13:25:57.657754851 +0200
+--- a/calendar.h
++++ b/calendar.h
 @@ -5,10 +5,10 @@
  #include <sys/stat.h>
  
@@ -51,9 +47,8 @@ diff -Naur Src.orig/calendar.h Src/calendar.h
  				 [jdn%32][1] stores jdn. */
  struct calobj{
      struct icaltimetype start;
-diff -Naur Src.orig/settings.c Src/settings.c
---- Src.orig/settings.c	2003-07-15 17:22:51.000000000 +0200
-+++ Src/settings.c	2020-03-29 13:26:31.673744323 +0200
+--- a/settings.c
++++ b/settings.c
 @@ -1,4 +1,14 @@
  #include "settings.h"
 +
@@ -69,9 +64,8 @@ diff -Naur Src.orig/settings.c Src/settings.c
  void set_lang(int language){lang = language;}
  void setAppicon(int app){appicon = app;}
  void enter_callback( GtkWidget *widget, GtkWidget *entry ){ 
-diff -Naur Src.orig/settings.h Src/settings.h
---- Src.orig/settings.h	2006-09-15 11:56:12.000000000 +0200
-+++ Src/settings.h	2020-03-29 13:26:37.732742450 +0200
+--- a/settings.h
++++ b/settings.h
 @@ -7,14 +7,14 @@
  
  
diff --git a/x11-plugins/wmclockmon/Manifest b/x11-plugins/wmclockmon/Manifest
index 798b4baaa865..732c40eb13a9 100644
--- a/x11-plugins/wmclockmon/Manifest
+++ b/x11-plugins/wmclockmon/Manifest
@@ -1,5 +1,5 @@
 AUX wmclockmon-0.8.1-gcc-10.patch 7348 BLAKE2B c953c2cf70b2991808d774c2916bef2d894d9bb7f895ae7541844df58a010ef3c0feec79a5445851975537729ff687ebdbe2db4de1a2b41fba777c8a3d5c1173 SHA512 65528c84701055f3e42ff30b32f1b52b9c5fb8e5d7ca49ba47c5fe31a2e78ccb30cf47ae91a40da54619b8bea6ba1f14889baadda5782110076db87e13d5e5da
-AUX wmclockmon-0.8.1-gtk.patch 11386 BLAKE2B f624a1720dc51db5af1298bdf334065e1e707f83a4561f94ad35ed32a057270db1a3a3234132d3d526c8cda50847b976c3ce9393f35c8460c6791b0b7fcec6aa SHA512 60e9cccabe142dae7cc24a3f6a261ed60f1b9c85dabb439fda8fc8657bc082997bd4558cc9e360b5911a6a8e1a46ada42eaccad6729b1e859fa9b81b60f2146c
+AUX wmclockmon-0.8.1-gtk.patch 10130 BLAKE2B 5cb15c22ab9cce779d8ccbb0733f581c8adca858074425ace973a435a5c5ba078ecdaafedd0361827e0ee1048e6d304702bd720123f515c35326915460fd84a0 SHA512 2db3deea64c1f7c6ad8468659601ab89112ac500d152e359e3784c8f5d598439af392e537e71a1b96d14582aaf9fed5284370a3300e7c9bb7daca54f2a4a26de
 DIST wmclockmon_0.8.1-1.tar.gz 139233 BLAKE2B fef6cc69afe54fc966008097c15ebf08db5dc585e3789f610b5f0d5d550312a6e0a00e5ee07d6e86d5efd78358e00a4d0fa44cd3b7ac69ecd9c7374037be61f4 SHA512 6216737b9df3ba2ec453570c477764b89b386bbaf954abcb5a5dc2e8841b08d4a8b0b9a4b7eaea73af59544a004cd685f15ce5a0cf098e4db29208151e5309a4
-EBUILD wmclockmon-0.8.1-r1.ebuild 811 BLAKE2B 2567e68c1cb1781f6edcc6dd5dff06a0a124f8ac35b1a8885ca1c9c003ec3f8710f5c6365d21454ac6b3f87d4c4b3b4ffd3cb1469fff7d4f00c3bb6e81bd6932 SHA512 901d151a214a375615007a4e8b9d6fca0a78b485933b5d43b718c94c124177c4dbd64e89fa0d28fa4679bc5f264803a05b74cf0f8d0617208a7464c58fc57047
+EBUILD wmclockmon-0.8.1-r1.ebuild 898 BLAKE2B ccc376fbcce31694070046613de84fdae8d3696d5e86307f341fad5f7a0459bc004843f60724d69e7d351d3c5ced088da53a25fc608f15c0928576f4ad7f4c91 SHA512 e7caecd8400b4876bda0720d1b85e4d86bfb34a8be76427c6e55fbb0273255708702ed6f4c17b00619b3a70c102fbdcae888d552a7fda77f369d0b659cdc2e8b
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmclockmon/files/wmclockmon-0.8.1-gtk.patch b/x11-plugins/wmclockmon/files/wmclockmon-0.8.1-gtk.patch
index a3b1b1fff9df..6d501934762d 100644
--- a/x11-plugins/wmclockmon/files/wmclockmon-0.8.1-gtk.patch
+++ b/x11-plugins/wmclockmon/files/wmclockmon-0.8.1-gtk.patch
@@ -1,12 +1,11 @@
-diff -ur wmclockmon-0.8.1.orig/wmclockmon-cal/Makefile.in wmclockmon-0.8.1/wmclockmon-cal/Makefile.in
---- wmclockmon-0.8.1.orig/wmclockmon-cal/Makefile.in	2005-06-15 16:55:27.000000000 +0300
-+++ wmclockmon-0.8.1/wmclockmon-cal/Makefile.in	2008-01-13 13:23:11.000000000 +0200
+--- a/wmclockmon-cal/Makefile.in
++++ b/wmclockmon-cal/Makefile.in
 @@ -96,17 +96,17 @@
  
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I..
 -LDFLAGS = @LDFLAGS@ `gtk-config --libs`
-+LIBS = @LIBS@ `pkg-config gtk+-2.0 --libs`
++LIBS = @LIBS@ `${PKG_CONFIG} gtk+-2.0 --libs`
  X_CFLAGS = @X_CFLAGS@
  X_LIBS = @X_LIBS@
  X_PRE_LIBS = @X_PRE_LIBS@
@@ -14,7 +13,7 @@ diff -ur wmclockmon-0.8.1.orig/wmclockmon-cal/Makefile.in wmclockmon-0.8.1/wmclo
  wmclockmon_DEPENDENCIES = 
  wmclockmon_LDFLAGS = 
 -CFLAGS = @CFLAGS@ `gtk-config --cflags`
-+CFLAGS = @CFLAGS@ `pkg-config gtk+-2.0 --cflags`
++CFLAGS = @CFLAGS@ `${PKG_CONFIG} gtk+-2.0 --cflags`
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
 -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
@@ -22,9 +21,8 @@ diff -ur wmclockmon-0.8.1.orig/wmclockmon-cal/Makefile.in wmclockmon-0.8.1/wmclo
  DIST_COMMON =  Makefile.am Makefile.in
  
  
-diff -ur wmclockmon-0.8.1.orig/wmclockmon-cal/mainwindow.c wmclockmon-0.8.1/wmclockmon-cal/mainwindow.c
---- wmclockmon-0.8.1.orig/wmclockmon-cal/mainwindow.c	2005-06-15 17:03:21.000000000 +0300
-+++ wmclockmon-0.8.1/wmclockmon-cal/mainwindow.c	2008-01-13 13:04:53.000000000 +0200
+--- a/wmclockmon-cal/mainwindow.c
++++ b/wmclockmon-cal/mainwindow.c
 @@ -51,7 +51,6 @@
      gtk_widget_hide(calendar);
      gtk_widget_hide(closewindow);
@@ -170,15 +168,14 @@ diff -ur wmclockmon-0.8.1.orig/wmclockmon-cal/mainwindow.c wmclockmon-0.8.1/wmcl
      gtk_widget_show(closewindow);
  
  
-diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/Makefile.in wmclockmon-0.8.1/wmclockmon-config/Makefile.in
---- wmclockmon-0.8.1.orig/wmclockmon-config/Makefile.in	2005-06-15 16:55:27.000000000 +0300
-+++ wmclockmon-0.8.1/wmclockmon-config/Makefile.in	2008-01-13 13:23:44.000000000 +0200
+--- a/wmclockmon-config/Makefile.in
++++ b/wmclockmon-config/Makefile.in
 @@ -96,17 +96,17 @@
  
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I..
 -LDFLAGS = @LDFLAGS@ `gtk-config --libs`
-+LIBS = @LIBS@ `pkg-config gtk+-2.0 --libs`
++LIBS = @LIBS@ `${PKG_CONFIG} gtk+-2.0 --libs`
  X_CFLAGS = @X_CFLAGS@
  X_LIBS = @X_LIBS@
  X_PRE_LIBS = @X_PRE_LIBS@
@@ -186,7 +183,7 @@ diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/Makefile.in wmclockmon-0.8.1/wm
  wmclockmon_DEPENDENCIES = 
  wmclockmon_LDFLAGS = 
 -CFLAGS = @CFLAGS@ `gtk-config --cflags`
-+CFLAGS = @CFLAGS@ `pkg-config gtk+-2.0 --cflags`
++CFLAGS = @CFLAGS@ `${PKG_CONFIG} gtk+-2.0 --cflags`
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
 -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
@@ -194,9 +191,8 @@ diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/Makefile.in wmclockmon-0.8.1/wm
  DIST_COMMON =  Makefile.am Makefile.in
  
  
-diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/dialogs.c wmclockmon-0.8.1/wmclockmon-config/dialogs.c
---- wmclockmon-0.8.1.orig/wmclockmon-config/dialogs.c	2005-06-15 16:55:27.000000000 +0300
-+++ wmclockmon-0.8.1/wmclockmon-config/dialogs.c	2008-01-13 13:04:53.000000000 +0200
+--- a/wmclockmon-config/dialogs.c
++++ b/wmclockmon-config/dialogs.c
 @@ -38,7 +38,6 @@
                         bouton, TRUE, TRUE, 0);
      GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
@@ -213,9 +209,8 @@ diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/dialogs.c wmclockmon-0.8.1/wmcl
      gtk_widget_show(bouton);
  
      gtk_container_set_border_width(GTK_CONTAINER
-diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/edit.c wmclockmon-0.8.1/wmclockmon-config/edit.c
---- wmclockmon-0.8.1.orig/wmclockmon-config/edit.c	2005-06-15 16:55:27.000000000 +0300
-+++ wmclockmon-0.8.1/wmclockmon-config/edit.c	2008-01-13 13:04:53.000000000 +0200
+--- a/wmclockmon-config/edit.c
++++ b/wmclockmon-config/edit.c
 @@ -76,7 +76,6 @@
                         bouton, TRUE, TRUE, 0);
      GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
@@ -224,9 +219,8 @@ diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/edit.c wmclockmon-0.8.1/wmclock
      gtk_widget_show(bouton);
  
      bouton = gtk_button_new_with_label("Cancel");
-diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/mainwindow.c wmclockmon-0.8.1/wmclockmon-config/mainwindow.c
---- wmclockmon-0.8.1.orig/wmclockmon-config/mainwindow.c	2005-06-15 16:55:27.000000000 +0300
-+++ wmclockmon-0.8.1/wmclockmon-config/mainwindow.c	2008-01-13 13:04:53.000000000 +0200
+--- a/wmclockmon-config/mainwindow.c
++++ b/wmclockmon-config/mainwindow.c
 @@ -10,9 +10,9 @@
  #include "actions.h"
  
diff --git a/x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild b/x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild
index 830ad8041b50..6f42f7bf0fab 100644
--- a/x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild
+++ b/x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DESCRIPTION="a nice digital clock with 7 different styles either in LCD or LED style"
+inherit toolchain-funcs
+
+DESCRIPTION="A nice digital clock with 7 different styles either in LCD or LED style"
 HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
 SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}-1.tar.gz"
 
@@ -17,16 +19,23 @@ RDEPEND="x11-libs/gtk+:2
 	x11-libs/libXpm
 	x11-libs/libICE"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto
 	x11-libs/libXt"
+BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${P}-gtk.patch
-	"${FILESDIR}"/${P}-gcc-10.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gtk.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
+)
 
 DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO \
 	doc/sample2.wmclockmonrc doc/sample1.wmclockmonrc )
 
+src_configure() {
+	tc-export PKG_CONFIG
+	default
+}
+
 src_install() {
 	default
 	newdoc debian/changelog ChangeLog.debian
diff --git a/x11-plugins/wmdrawer/Manifest b/x11-plugins/wmdrawer/Manifest
index 105b7a59bab1..5dc0188cf850 100644
--- a/x11-plugins/wmdrawer/Manifest
+++ b/x11-plugins/wmdrawer/Manifest
@@ -1,4 +1,4 @@
 AUX wmdrawer-0.10.5-gtk+-2.patch 370 BLAKE2B f308ef901a7d609bd257253ed092b2bf8a53e8b87afc973024b4249f56c4ae0a9b757a203ce5df180a31feb512bf6dff559a93081c0ae5314d6b3afe3785fa84 SHA512 4ee57e974cb4828a20fe5313746a0c646f793793a89ce70fb3bbdf28cf397fb4112121eb7f4274a67601f5e18487cbabf2b655161d575b8a58740eaa6aec87e6
 DIST wmdrawer-0.10.5.tar.gz 49413 BLAKE2B df77a7e7fedc1a648fccb6efc4315f1f7c4d316a475b3d0044578df0cc0ef5f5d481eec11a23a33682fd8f8bb5faeedb66e82916becb668546cbc5b9e5a61dd7 SHA512 f1e7cb7dc16841a7176e628f42ba5834200707dc162838e62fc7233e383d0aab6ce7fe22017286d26ce6ddc2e3cb6f1d0d21acd176fd36a0cdcd7ab04a2dbae1
-EBUILD wmdrawer-0.10.5-r3.ebuild 1197 BLAKE2B 24acc1b28d6b226790a3b9f4b5881e4de9b3201e5ad124e55249f65f664994e1b332433dd123b12c64e407e750d35c0dfacbf5434beff4edd75ea9016ddbc923 SHA512 f2018590a9a0d91e3da576daba013d6ee54e22fd19a0f42ee7221fbf71ef0800908923a3afc09b77befa591f282a57ed37b58be3a28b4328d4d5a0a10c9ad28f
+EBUILD wmdrawer-0.10.5-r3.ebuild 1182 BLAKE2B c9c0af7bfd790d38fb15b0b64042bbf6ffb93ba91646752d77b6aa3bdca73032ee1ae97dd7f2a7305e5beb9cdcafabbf81e70f7795d90ab2322e8b85f286f045 SHA512 a3e32a02315339ef851d6e58f3ccd883d678be30a55f1a907cba2fadb2178a35778195194afaece381425862c6be6202245acce37f3685c6fea1f2a91e9ac6de
 MISC metadata.xml 248 BLAKE2B 3bcf0ee104a13db738bdf65e81d29625755b774b02b80f25f9d3dc69527dcc7b866ebcc3816066aefe754b833106ac31a789ced1559af40f9f3fe674798eec75 SHA512 7c4fcd1eada270e859ab889e58c5c2cbe8359bc9cb90351c7245e2d211f8f62b5e27f355d2e311bf763062ad2ac9e885ac7f0c093bda0d20964bf67f6b712ed4
diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
index def55cb05f8c..8ed75478b444 100644
--- a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
+++ b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils
 
 DESCRIPTION="dockapp which provides a drawer (retractable button bar) to launch applications"
 HOMEPAGE="http://people.easter-eggs.org/~valos/wmdrawer/"
diff --git a/x11-plugins/wmfishtime/Manifest b/x11-plugins/wmfishtime/Manifest
index 0fec095d37f3..691136009cf5 100644
--- a/x11-plugins/wmfishtime/Manifest
+++ b/x11-plugins/wmfishtime/Manifest
@@ -1,5 +1,5 @@
-AUX wmfishtime-1.24-gtk.patch 1894 BLAKE2B 412589c02e0bd8e2cdfb3b06477637e50f481e6f3cb70ce289757293a87fc00259fa304af5f2293fc80be3f8767a3d27c2e6e0f0f6b5ca669f46fed0121fcd13 SHA512 db68887afee4e4bbce51e2beb82ef5586cb1c7e0acb2b7b84e914c5696cd87110680741ce449634e6034b46c4610f5af3e8018ef1d2614c5821816b03886489b
+AUX wmfishtime-1.24-gtk.patch 1560 BLAKE2B 507ea333ac03f1ee798111d47020c1a472f1fd7b5ba5ef66bb63abcec6fbb967e7e78cfbcc474c2df85765cf10dddcca4d80eb15aa675d1af3427d834bcb4f34 SHA512 88dfb8e6fcef55886fa517146fea58f524f63257d7bca154f03490a86b30f4c5a4a6a677000eedbc2a33aee020473aeb1359fa803aaeb41df67c61b6ee69e42f
 AUX wmfishtime-1.24-no_display.patch 516 BLAKE2B d81cd82250f74a3fda686cc49eb01ac2310470857a56ed950cac94f1b9a747fcbc98ee1b3083afe18f79e80f8db6c5983e480e3f7bfadad1dc55e5b682d38a9e SHA512 413c033262c6cbec6bd2ed8b709ec5d6988bea7ae2f5b26c7fca330e56b297041656e08cfc2d418c0e8d3c561e9ed10b4e672cf40a4779b254b76c7a5ff7151b
 DIST wmfishtime-1.24.tar.gz 21895 BLAKE2B d24d5400635223ffe4dbf7e63e5576083c6b5ab99563a24b9c36fe3e50821615998258f59bf6ec5cc630312c356b40210b0ab9091cb4350eb8fe6a1ca59d9b2c SHA512 7df3c6648b46c6f67cf094f634dc7699c1dd1ee4f4a18dbf63d74ebda74f322524b83d99f10a1c8c8c8a5040d78b071754a40ff162fdb13a5a00d01f1eb5c4e6
-EBUILD wmfishtime-1.24-r3.ebuild 821 BLAKE2B 0e4a95ddcfa71e371dbc854179441d448a60771390830a9daf9ce97aba2c9bebcfcdce6e7a776d2cc85bb7a0fba9fc439534ddb19c47805af162d27c13401119 SHA512 f2b4066f18f18617646145b139840f5beda615a0051e2f05a429db671ba1d24efb8e34d6d9dc73e2225d14e959d6f36bcbfc22ce337db39dfa1fd98b8d2f8e1a
+EBUILD wmfishtime-1.24-r3.ebuild 843 BLAKE2B c41ab6bc7b5e134e6bdc450cb03fb483e409d5d591f239150f52ff4991c050cf07da275e34b2e51e3248d10e6cf1e3526dfe58dfa16669a12f1eb02732246917 SHA512 03761e6e15026d9274d13b177c8515885daa469fa90d2d2f41fa6c27a2d4a8c3616bdc3f4dde277755c5ccbc1b96b958e32ff48bee9b1121295668a8ec9e03fb
 MISC metadata.xml 480 BLAKE2B c72218dce63a37d81c62b21d779a16de91591b4849d8ea7f8292cf4d73f88e3c6e98a64854133cfe6892ef3db464e4461f26b665f63f24e1efa3dd77128abd65 SHA512 3aebfb320d3d4cf32587efdeb26ba4bbf531c94fcf7c6c5a5c68a78939d8cabf40582d88661e490cba8e48f72f0885b426c69b8f55fba91f0ffa788dbc507220
diff --git a/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch b/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch
index 68d4c057c44e..91fb45ae8746 100644
--- a/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch
+++ b/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch
@@ -1,6 +1,5 @@
-diff -ur wmfishtime-1.24.orig/fishmon.c wmfishtime-1.24/fishmon.c
---- wmfishtime-1.24.orig/fishmon.c	2004-05-13 02:55:59.000000000 +0300
-+++ wmfishtime-1.24/fishmon.c	2008-01-12 16:19:34.000000000 +0200
+--- a/fishmon.c
++++ b/fishmon.c
 @@ -648,6 +648,7 @@
  
      /* make a copy for the iconwin - parameters are the same */
@@ -26,9 +25,8 @@ diff -ur wmfishtime-1.24.orig/fishmon.c wmfishtime-1.24/fishmon.c
  #undef MASK
  }				/* make_new_fishmon_dockapp */
  
-diff -ur wmfishtime-1.24.orig/Makefile wmfishtime-1.24/Makefile
---- wmfishtime-1.24.orig/Makefile	2001-05-26 23:49:41.000000000 +0300
-+++ wmfishtime-1.24/Makefile	2008-01-12 16:22:30.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -2,11 +2,11 @@
  DESTDIR =
  
@@ -39,7 +37,7 @@ diff -ur wmfishtime-1.24.orig/Makefile wmfishtime-1.24/Makefile
  # no user serviceable parts below this line
  # optimization cflags
 -CFLAGS = -O3 -Wall `gtk-config --cflags` ${EXTRA}
-+CFLAGS += -Wall `pkg-config gtk+-2.0 --cflags` ${EXTRA}
++CFLAGS += -Wall `${PKG_CONFIG} gtk+-2.0 --cflags` ${EXTRA}
  # profiling cflags
  # CFLAGS=-ansi -pedantic -Wall -pg -O3 `gtk-config --cflags` ${EXTRA} -DPRO
  # test coverage cflags
@@ -48,7 +46,7 @@ diff -ur wmfishtime-1.24.orig/Makefile wmfishtime-1.24/Makefile
  SHELL = sh
  OBJS = fishmon.o
 -LIBS = `gtk-config --libs | sed "s/-lgtk//g"`
-+LIBS = `pkg-config gtk+-2.0 --libs` -lm -lX11
++LIBS = `${PKG_CONFIG} gtk+-2.0 --libs` -lm -lX11
  INSTALL = -m 755
  
  all: wmfishtime
diff --git a/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild b/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild
index d031d7285b63..3b20412197ae 100644
--- a/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild
+++ b/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,6 +28,7 @@ src_prepare() {
 }
 
 src_compile() {
+	tc-export PKG_CONFIG
 	emake CC="$(tc-getCC)"
 }
 
diff --git a/x11-plugins/wmmand/Manifest b/x11-plugins/wmmand/Manifest
index f7e2cc15463a..51bead5bea8c 100644
--- a/x11-plugins/wmmand/Manifest
+++ b/x11-plugins/wmmand/Manifest
@@ -1,4 +1,4 @@
 AUX wmmand-1.3.2-gcc-10.patch 1105 BLAKE2B 414c9e8cc721f610818b181148a2cdde079a3c5f1bc6ef1a07239f03c0aa5919b28675ee2b4d950b16cdfed2c0a057be90afe3a98d6040cbf706b9b4f6a30150 SHA512 95f548b151b92f5d302e746f073b2b3695ae0bdeaf8db065f29e2bc0d98925c30c17bfe2592759e1aed812306dbdc58991f3e4f0e4f3766e282cdc760cf842fb
 DIST wmMand-1.3.2.tar.bz2 41268 BLAKE2B 75eb252c162d2403e15a7e4df9ed79e0af5d9835c5c6ffc0208ac20f856f148a513f48460aedee7d26053867f464dd1b1c13d3fabbb2151513eab6102dfaefe0 SHA512 03a06c114371bf98037ac8859010fcbd20ec675fdd563b655c1be58a384a48f59d36bcb795759e45dba798af765ae179df1bf591d2ee7fe245069af06c8b5587
-EBUILD wmmand-1.3.2-r1.ebuild 859 BLAKE2B 5fc4d432138ac2cdb74f7a553c2a04b4e4fd9bb282a2f9b66837fd076909ba79af944a43087cceae150ced0ed9174b3d5e1fa6189fa3bc574313b6be8b05fe60 SHA512 c432e4f2ad3f17d8ba62df80e0035c9d69c061ef210c22e7a2f5c5a02ed4f7469c42575c063eb85a0a72325c5745c424da6289877e56cc37e920c042869fab50
+EBUILD wmmand-1.3.2-r1.ebuild 860 BLAKE2B 6f0bea645c4f097cce3186e03cbad25917c8cd1401a2be90c9926528f5d96120d34a11f20251dadeccdbc822e40743c51040a0e981b2e8b29ebd4e31237392a4 SHA512 ae62d4920684950495edee82b6db9bbe8f69b05a62364bb1078fc9f0f68318c27950a056ff6a3ba3c5f71cb298a3ab35bdb1cac9fa720bc6ff93e883c06ac0f2
 MISC metadata.xml 328 BLAKE2B 2cafb02a6d098593306f48c13f5ed3d9c47028536aaef04558d65049c47f4b1469c29c19bd75580e42a2bb1a0f3ef083cd561451e442dab9d8d48944ecce9445 SHA512 40eb06ee0f23923822f16f7c14b0c608db8d1266ca3b58b30313f81a1cc82da4987f22d4f32dbd85b6ee0c152bce40108b4168402098792338ac05da68e9cdf8
diff --git a/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild b/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild
index fb66e91df2b3..02b4de944df1 100644
--- a/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild
+++ b/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils toolchain-funcs
+inherit desktop toolchain-funcs
 
 MY_P=wmMand-${PV}
 
diff --git a/x11-plugins/wmnet/Manifest b/x11-plugins/wmnet/Manifest
index eaa888a0ef32..04fb893a0b5d 100644
--- a/x11-plugins/wmnet/Manifest
+++ b/x11-plugins/wmnet/Manifest
@@ -1,4 +1,4 @@
 DIST wmnet-1.06-misc.patch.bz2 11327 BLAKE2B c03f25270c37e9a54731547a51c00983df802b5f4278d02b7051571de45bd326bb5eda330bbba8e09be6bcb4b3afca111956d6506e73c13f955afd40b9c967ea SHA512 34d08676cfa9415c1cc182b148364143589b13c6b060c55b4047fa417146b1939b84fa5e32fc86da92cd92c10a5f5f0abb602c9ba943ed077bc6529c0dbf0ea3
 DIST wmnet-1.06.tar.gz 27506 BLAKE2B 9cd5cb626406238e5dc20ff58f26b13389c5b8bff9569e3cc8fc4f083422d213702fc387521bffc003339ef4e0c6223f5cfcec8617ba3e71b516786c6950cdf8 SHA512 1e62db5e7e3b843d47459fcfa9cc932ba3df8f8498d1b24dcb77602a334d528b90e9c93886b8b330ac7bd5baa4ad1cd3bc94e96c14a841fba8bb9172f624e10a
-EBUILD wmnet-1.06-r2.ebuild 715 BLAKE2B fed5a65b224c1a88a82688ce4c36e481139ed95fd08c99d34767afec574d4835de5765742b7a6807b387f9e46c9a92acfd02cd53742aa10cfebbe11a6f507099 SHA512 b2aa40e72e17a96d0a8974520a303a7752a623607e3656f200de65259aea10b018d0a609142c7cf09bd16f02625a0201077bcebd1e974be311326229c66f3f7b
+EBUILD wmnet-1.06-r2.ebuild 892 BLAKE2B a323ec5793d1f0bcb8e46c05b8f99535f42d0ac848c9db1dc613ea6296f192fdd8b7b7f9312d94cd79ec846451e452b69233956a5b46c39940858cf58a7b8361 SHA512 0b7123e752123c0f3f2e3a4fdaa2f80f92fd48b4e7f1644a4a8f84d154bb888bfa8816a57fba175826445f3ea8543798ed6f8dfcd5f77a76efe83de3dbeb6a9f
 MISC metadata.xml 780 BLAKE2B 254fdfced5817ebf8e2594d8cdf77828066acd2b27c17bb8050dd7cb6d4ce848de69485064fab61473b3313b19bcd6b30fbad2cf0cdaca2cac72f802d1d1ac5e SHA512 c9382651f9b9aca829c4cbbb5d27451351f56b7ed9138ede20646c591a54711d3170b45b6c021ca7ca728e6bd22ae421ce8eb18d09a65ad69d37f3cff260b860
diff --git a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
index 21b7b7b3f0d1..df7520120959 100644
--- a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="WMnet is a dock.app network monitor"
 HOMEPAGE="https://www.dockapps.net/wmnet"
 SRC_URI="https://www.dockapps.net/download/${P}.tar.gz
@@ -15,16 +17,24 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	x11-base/xorg-proto
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 	app-text/rman"
 
 PATCHES=( "${WORKDIR}"/${P}-misc.patch )
 
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die "xmkmf failed"
+}
+
 src_compile() {
-	xmkmf || die "xmkmf failed."
-	emake CDEBUGFLAGS="${CFLAGS}" LDOPTIONS="${LDFLAGS}"
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LDOPTIONS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/x11-plugins/wmpop3/Manifest b/x11-plugins/wmpop3/Manifest
index f5df01066f5e..da04bcde6faa 100644
--- a/x11-plugins/wmpop3/Manifest
+++ b/x11-plugins/wmpop3/Manifest
@@ -1,5 +1,5 @@
 AUX wmpop3-0.5.6a-fno-common.patch 799 BLAKE2B 25c90a1dc1e1ebc21c439172ffcc67f985c521e130e83e9a623dd476d1b7f12969a4991958838a311244da293ccbc0000adf2fd4d6e9c4a2f28ab323f57ca4ab SHA512 3b896460877356b087344d86626ac088141e84fb2999240d76008e64389bc270ad2bea51f254e88158df5263814e3b3478a1dfa598c780c3a24c3b1f9270ce56
 AUX wmpop3-0.5.6a-list.patch 3057 BLAKE2B b9cd76c4e3b6f3643f2aacdb14e49a3d5ba8fdf51f94abeb7473e12923e72be32663870ac8b31475d95bf0dcd06ce8fb1cd007dc1d4fd3300fdf626a90d0eadf SHA512 f0d9a4efeb924dd7a0cae1169404c81529f1e7262684872845db9e3b5b415fe2b48061d778d9829526a1ee8ce66aba48018d9d8ab329f11652d692c322786c3c
 DIST WMPop3-0.5.6a.tar.gz 23532 BLAKE2B faef591c9280cb7e37a5071cd2226b84bfb7a49d8b4639085d5b6a44bac8bb3763ca51bd1923d47b8d971010f9b8a7d5d48c6f9a6c76fd3db5cbc00333edc63d SHA512 127dfd3d4dec8a58c991a9bc0d2d1d1c0e9c0ef36af9b2894283bbda129db9b3464c43aa053152f9c0d25eee31b94ffec329784ffa256ce04cb233b809791c2f
-EBUILD wmpop3-0.5.6a-r1.ebuild 773 BLAKE2B d9c0fecd5737600a78617cf5f3f908303c94d0305e11bceacba6d9025ea428987363d43ccf83541cc7795d410d2375e81cfec4f5148cf3258e992387b88a3da0 SHA512 e9cf18da0383d8fa2760fca82a640814339e368531f30b07d1eafc9ed572351cc1c2b179b11eda2ab114d58bafb26011fca7c4eb82d492b3f1a83e6bb86f59dd
+EBUILD wmpop3-0.5.6a-r1.ebuild 766 BLAKE2B 9fc55bfad5ec4cfc84b2dae8f551c68c6ea45b016d600203475fa81224539db7aa0997c76f39d758397a019acdb4af537a015530a3e43208caf0cbd1f0b1d1de SHA512 90be62e10fb3fe639b7ea2706421557ff5d49fcb8f5c2a816f8ece3b16ed3ac085d14449722f633bc3d24f699881335c5aaa2652cc5ecd6d396fa2df327fb66d
 MISC metadata.xml 432 BLAKE2B d5bc39fc935e5a260493e984847f81c7e446be86759cd64475717b989414254e9b5852a409b68c18de0dd7f6636e118a213a475fa1a5d7d4e91d8dca38e3e1ea SHA512 b2c9e06a435ec6744f3a98e4b78b3a4e3184ea65fa68e25befac9ed4d8ffa806e2c9b2b8565f49035959a1513ce9053a5902ba3cf11aa251d966d399f8fb9e18
diff --git a/x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild b/x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild
index 7a3f6094bc11..11956e32e29b 100644
--- a/x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild
+++ b/x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="dockapp for checking pop3 accounts"
 HOMEPAGE="https://www.dockapps.net/wmpop3"
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /x11-plugins
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)