gentoo resync : 29.12.2022

27 files changed, 228 insertions, 105 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 3f3cb37a89f6..83360a5a8c10 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/asclock/Manifest b/x11-plugins/asclock/Manifest
index 59b16ce08503..5d45c4cf8e44 100644
--- a/x11-plugins/asclock/Manifest
+++ b/x11-plugins/asclock/Manifest
@@ -1,5 +1,7 @@
+AUX asclock-2.0.12-fix-implicit-func-decl.patch 286 BLAKE2B 8e3b43e435182ad92547591336b1866f150fa53918f5c65b1f22d40ca6291d11ab530c19ed56af27e32ec269975dae6c738760db658ea31826e1686cd4604eb2 SHA512 069278ba350eda39b5d633462a9d7536c716331501b8e992295c9233559d101788b30da1d956d78cd90bb663485717d6691a20df45442b68c79e742f3cc8b8b5
 AUX asclock-2.0.12-fno-common.patch 421 BLAKE2B 65befa6f59c55e7fcc4bef4f7370d48bee7d3ba1c219396eb9b767302f7b69284d5e64e0bf392cc981de06fb8b2fe629b346699fbe3081b777582538314fb2c2 SHA512 1244ed512b76c55ad9c37cd9a50321878e2d7ebe02f8958dc6548b2aaece8bf2b4abf93783bb2e6dc9947fea81b0a792fd8e2f9763eeffe85474b49b0dc6c50e
 AUX asclock-gcc41.patch 1528 BLAKE2B ec7f3e2361f06bd995128234fc60ceb9e3998054912f78a954eb05a04f376d231a59eb6e9d583940694f01388f81b0f0c2e33a098a2032d5e3917e629421ab57 SHA512 73d5edb1c3b1a287c9f00ad35491994f5d51bf0d5df2d81c3d428da0ed53eb4a73c0da1fe979d7479df103164e440b8a3472e18306c9fc5f85fd313d29f34b0d
 DIST asclock-2.0.12.tar.gz 111858 BLAKE2B acc5e25c268f013c30e7c35e5f162246839b6ffdd049e041e47bd9eee5a9fd6f62b27bb5f8eec157a2b19f6a930f9084531d3c1a7e9cd19cdfdd4ba33005f952 SHA512 408c0cbd7d8c19e8cda450ed1e3e0857dd908768557221b5707bda4eaa56170899bb3ecbe1d9f487ad7cbe7ebe36019cfe7a19f58dae2b918fb1179d67a8bb0e
 EBUILD asclock-2.0.12-r3.ebuild 1515 BLAKE2B f232f19e4b2cabc6766bf6e531fb97066a539f63f9c1f548933cdf940f14e607dc9c6a11de52a0f9566c4b1e1564a67c4a207f12109e10190b6d5f0c88fa82db SHA512 b8d55247c2f51b2c4608fa3fff8cd00f2e0826b3d879921bab640d3899c94ded609642d97e5c1da54c343f0624cea49b6d1d25ee2e59cbcc18d9c27e263c5b25
+EBUILD asclock-2.0.12-r4.ebuild 1540 BLAKE2B f2159e088bf6c6e2616ad84498dfad4e0cdcfeb23fd30acb329a7a3195d9aee3eaaeb83d8c276fd56d7d56c1e2e1aa01004a5836604b6b32bcf1228de1ffebcb SHA512 873038b6ff08184b5a5f4a8021a0ab201e958bbd0d373eafdbccbdd40f2737d722104ca23ec07129ee9f6b9d7017c2472d04eb0cbea1108c93c2909bdeca06e5
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/asclock/asclock-2.0.12-r4.ebuild b/x11-plugins/asclock/asclock-2.0.12-r4.ebuild
new file mode 100644
index 000000000000..4d5b8555b83d
--- /dev/null
+++ b/x11-plugins/asclock/asclock-2.0.12-r4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+DESCRIPTION="Clock applet for AfterStep"
+HOMEPAGE="http://tigr.net/afterstep/applets/"
+SRC_URI="http://www.tigr.net/afterstep/download/asclock/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+DEPEND="x11-libs/libXpm"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gcc41.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-fix-implicit-func-decl.patch
+)
+
+src_prepare() {
+	default
+
+	ln -s themes/classic default_theme || die
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	local x
+
+	# Will break Solaris
+	[[ ${CHOST} == *-linux-gnu ]] && CFLAGS="${CFLAGS} \
+		-Dlinux \
+		-D_POSIX_C_SOURCE=199309L \
+		-D_POSIX_SOURCE \
+		-D_XOPEN_SOURCE"
+
+	for x in asclock parser symbols config; do
+		edo $(tc-getCC) \
+			${CPPFLAGS} ${CFLAGS} ${ASFLAGS} \
+			-I"${EPREFIX}"/usr/include \
+			-D_BSD_SOURCE \
+			-D_SVID_SOURCE \
+			-DFUNCPROTO=15 \
+			-DNARROWPROTO \
+			-c -o ${x}.o ${x}.c
+	done
+
+	edo $(tc-getCC) \
+		${LDFLAGS} \
+		-o asclock \
+		asclock.o parser.o symbols.o config.o \
+		-L"${ESYSROOT}/usr/$(get_libdir)" \
+		-L"${ESYSROOT}"/usr/lib/X11 \
+		-lXpm -lXext -lX11
+}
+
+src_install() {
+	dobin asclock
+	local themesdir="/usr/share/${PN}/themes"
+	insinto ${themesdir}
+	doins -r themes/*
+	dodoc README README.THEMES TODO
+	cd "${ED}"/${themesdir} || die
+	rm Freeamp/Makefile{,.*} || die
+	ln -s classic default_theme || die
+}
diff --git a/x11-plugins/asclock/files/asclock-2.0.12-fix-implicit-func-decl.patch b/x11-plugins/asclock/files/asclock-2.0.12-fix-implicit-func-decl.patch
new file mode 100644
index 000000000000..b0379a396129
--- /dev/null
+++ b/x11-plugins/asclock/files/asclock-2.0.12-fix-implicit-func-decl.patch
@@ -0,0 +1,13 @@
+diff --git a/asclock.h b/asclock.h
+index 7580df8..ec6883b 100644
+--- a/asclock.h
++++ b/asclock.h
+@@ -137,6 +137,8 @@ extern char *hour_map;
+ extern char *min_map;
+ extern char *sec_map;
+ 
++int mytime();
++
+ /********* symbols.c ***************/
+ void init_symbols();
+ void postconfig();
diff --git a/x11-plugins/cputnik/Manifest b/x11-plugins/cputnik/Manifest
index 1b40f63ae7ed..116f3f7b6b5e 100644
--- a/x11-plugins/cputnik/Manifest
+++ b/x11-plugins/cputnik/Manifest
@@ -1,5 +1,6 @@
 AUX cputnik-0.2.0-fno-common.patch 1429 BLAKE2B 564cd629a6782aa9747be1460185cd612758b701db6700f21800ce9c9425e9e1cac883f7beb540ce525e9b601f451457c6dab6188a2bf9cee4002c59e3d98202 SHA512 bfc90e8e43b4be13d36e546b4d03bb1a1456c03d9602d7802dbfc6a3f0fa0b68b8deb82f9f5e7f0d7d8224667c2caf9f70c82cae29a662ee748fc6678ca62976
+AUX cputnik-0.2.0-libdir.patch 223 BLAKE2B 6e69d17c34571f8bf1b5492788a04f76ab3542c5379f03828c0576f3350886d419165b61951c40324ba006a8c69f9433c4066683e41890ea55960a6cc5c19ab6 SHA512 4806159dcdd10d52fbe2a48a62c21247d36f69b41c9680f8394336aef1865aff06058ec393b7d2e47653d42be211dd97ee3bdff01f17247d0669e02c413f2cfd
 AUX cputnik-0.2.0-makefile.patch 709 BLAKE2B d40b5743f8bedf589d18e020374a38daf10563542c5e9f93514013880dceb16629c7ee83737ecdb6ff7dbde189697bebe6679b931e4cf5996245f2049a811f31 SHA512 4aff01e83540a7c08e777be8726b07fdb9d34798da957c85b9c27c87760854db335ed9f45b1dd250f63ae16c1e96c59615db79ca818f7233822103695458744d
 DIST cputnik-0.2.0.tar.gz 17850 BLAKE2B 90824218a349d9b6cdf592cafe8dd29674f975a190a19a3dd6b941383d47f4fc492af339cbbb88240499363a1048b2564855d5a17caeaf53437fe34bf0d55ee1 SHA512 829d9d63f82a2d41c0160be575b3fb7840a5c295c6dd16702240a6aa104e557bff83936c46243e850edf918b41ddc22fd123dab7f5ffd6492302d60c374df55f
-EBUILD cputnik-0.2.0-r1.ebuild 673 BLAKE2B 8a4cd4828e036461ee72518e8a712cd2e22a5bc362958cbd1f9267708b7ff11c4759536d78611f935d75e15b774721757f432a8744c58113487f9ec016d43097 SHA512 ac27e947b81f04db7d2d32101aa8a79ec2f03dd060bb15ad5f372bc74006ac1e7b3771c39aaf2405505926297f70c60f981a411221de789827693a0d35b880d4
+EBUILD cputnik-0.2.0-r1.ebuild 706 BLAKE2B 3b03340ad743b37fa88958590b920d75a2c7013f589e89070e5a645cee55ed007333c8fb433f3f6b8dc26f595999de661a1f59709684e0b57fac5fd1cdeeb341 SHA512 783deaf3cc35c82d767edfdfdfd381ad4e78e3fd22f852d8c50008eecf1d47af886dfca1937c1e6b44b35a48a76123628503f86035b5d0dd25dcc6cbc56337b3
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
index eb195d5a676b..031cf79deae7 100644
--- a/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
+++ b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,9 +22,11 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P}/src
 
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
 	"${FILESDIR}"/${P}-fno-common.patch
-	)
+	"${FILESDIR}"/${P}-libdir.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/x11-plugins/cputnik/files/cputnik-0.2.0-libdir.patch b/x11-plugins/cputnik/files/cputnik-0.2.0-libdir.patch
new file mode 100644
index 000000000000..4c613d739f08
--- /dev/null
+++ b/x11-plugins/cputnik/files/cputnik-0.2.0-libdir.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/732444
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ 
+ CFLAGS			+= -Wall
+ INCS			= -I/usr/include/X11
+-LIBS			= -L/usr/lib -lXpm -lXext -lX11
++LIBS			= -lXpm -lXext -lX11
+ INSTALL_PREFIX	= /usr
+ 
+ 
diff --git a/x11-plugins/gkrellm-countdown/Manifest b/x11-plugins/gkrellm-countdown/Manifest
index 951a1bee8990..30b0a130bb48 100644
--- a/x11-plugins/gkrellm-countdown/Manifest
+++ b/x11-plugins/gkrellm-countdown/Manifest
@@ -3,4 +3,4 @@ AUX gkrellm-countdown-makefile.patch 1005 BLAKE2B 80711f28134b9241e5844a30e84a1b
 DIST gkrellm-countdown-0.1.2.tar.gz 12482 BLAKE2B eb619cc1da6ef90f843ab2a30e24da63d90988e85b4d48e2425f9c69a77ee64e7eaa674a7bed79da202633037aa56d5dd1f3b1c3ac9895172eed11af4b507dc0 SHA512 974a885ed56ffa95d2b5972fd309721e0043e8798fc1289fbb34bfd0320ec78db7a0572f8e43eee922b2823a2aa80789b8d24fdf106074e683b218e731b6de71
 EBUILD gkrellm-countdown-0.1.2-r1.ebuild 575 BLAKE2B b87e4ff7307adc9a3e022ddfb3dfcb856107d75f33a4985133f1af3618664cf00aeec9bf018096f14c86771c42ac0dc56298b462b28737d4973e5f52a129518c SHA512 36d6c163872f5397c88e184ffbdfe4c9b9e86aa7e63f5f479e66d8fe9b66af2a859802f6850c6cc955ec02c9a49837cb1621857b287ff899757d87c237209520
 EBUILD gkrellm-countdown-0.1.2-r2.ebuild 660 BLAKE2B 9c6dda06ae935b993a547459a6b3a38760e0c9c55fbecf5f7941409353b4198a88a65b5db97dc047be29be83db97585b120bb7cd90a0ab0e740106ad93ba3aff SHA512 0b2b7ab84864381ba2a33bda6db5435bd57942625c95e31b7a8eb31fc957cbd5f1b58185e2028f1bf4f326ed5cee6d1aca821d0707adcd5551df340a7c01a7b6
-MISC metadata.xml 252 BLAKE2B 0aa50afcae852fb803810659beaec80f914ae93e0d7c73bb12a9dd18be3b460f7d989294f7cfe2da7f08e8b801edecec611ea82e4cb1ab13dd31ac98a643f280 SHA512 25a43b15f71f9fb0ee079a261524cb3313bb445648dcec385ed76ee3088b4ffba0aca46af9976c64febf46c784a660c374e9187f096d6e868d842c9d17e613c3
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-plugins/gkrellm-countdown/metadata.xml b/x11-plugins/gkrellm-countdown/metadata.xml
index f4b972370205..115e9d64a669 100644
--- a/x11-plugins/gkrellm-countdown/metadata.xml
+++ b/x11-plugins/gkrellm-countdown/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="freecode">gkrellm-countdown</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/pidgin-otr/Manifest b/x11-plugins/pidgin-otr/Manifest
index 029cf487e45b..9494549fc5ed 100644
--- a/x11-plugins/pidgin-otr/Manifest
+++ b/x11-plugins/pidgin-otr/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-otr-4.0.2.tar.gz 515627 BLAKE2B e4ee9887d755f27f121c86337df596939eb1ae83ae91d1a396140be27558ee086cca54e2fb7e2337603fc78df00228e8a5759c3adc8b6c68bfdb3f3fa9476163 SHA512 6815f1d2be5786726602a924ae6ead5371543a53bd36231dc3239fa580f73a6136836df0c1beb64d83b76e6bd0d80ffe6750ca6e9ddd2a6a94841a9a678925ad
-EBUILD pidgin-otr-4.0.2.ebuild 571 BLAKE2B 4d6c0cc645f7c265534bb3f247ba78701d3d9830c6f3a6aefe8f8ccf11b599d68d3c1993d08a0ad688f58e549b11227fbb320e86e46c794c255281286534bf3e SHA512 182355e8162dcf159d5b1cda6694160ecda535de9b20580a226d650368b07076561e6f2310898388d61089a3c480588f996a898316b624cd7605f1ebcd8e8b40
-MISC metadata.xml 252 BLAKE2B 5dd8d0c83d6c9c396753f4e6674725483e0c7a005b4c529d3bd1fba5de36cee7f2b33e53aec48aa75f35ec663173677c2c964fb73f7f954b20631cc9c59533ca SHA512 afee4a606f4b70f265eb14178037c0459e32ddd98378c6c2978b829e906f83dc3607385173bd8f84ad988d307f8e44e1320310c92c070c802a4ccba93a96ae18
+EBUILD pidgin-otr-4.0.2-r1.ebuild 662 BLAKE2B 74db967cf73ad2b59b4e6238c689cb879eb7e3f792207c32ab91e8c3da0bdb08a08c374c8e32f9bc4ca05e65dd3d5948ca880b84c0daf98a3f89871610b5e7f8 SHA512 eae349e9f0b6a1d89215fffcf32d4215c5bf88424c323563e265d7a89da7569c636fc4cce373139b7b800b880432ef3bda81c5ab07fb96e12c60929d64051e8d
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-plugins/pidgin-otr/metadata.xml b/x11-plugins/pidgin-otr/metadata.xml
index 99e2666c588b..115e9d64a669 100644
--- a/x11-plugins/pidgin-otr/metadata.xml
+++ b/x11-plugins/pidgin-otr/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-plugins/pidgin-otr/pidgin-otr-4.0.2.ebuild b/x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r1.ebuild
index 13cd6b3ec41f..fce6c905d795 100644
--- a/x11-plugins/pidgin-otr/pidgin-otr-4.0.2.ebuild
+++ b/x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging"
 HOMEPAGE="http://www.cypherpunks.ca/otr/"
@@ -16,8 +16,16 @@ RDEPEND="dev-libs/libgcrypt:0
 	net-im/pidgin[gtk]
 	>=net-libs/libotr-4.0.0
 	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
deleted file mode 100644
index 701d03eed5cf..000000000000
--- a/x11-plugins/pidgin-telegram/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST telegram-purple_1.4.7.orig.tar.gz 498573 BLAKE2B 37f741f1e2106db55eaadab70e2bf226609ebd85fa3df28a60b686e207c341f7279ea36ef87137d465b5bedac63e6ec0388714171dd5a594fb28ae02f66bebc4 SHA512 ae3032b33bd2a20b58b2d66c83fbc405f43c38c0e93b00394ad3165b0bc5d5aba02a8e1946872e4bd082894679737fa20f3e1991e9bb16c3c3aba4c7abbbf7d8
-EBUILD pidgin-telegram-1.4.7.ebuild 1132 BLAKE2B 05e6c0debc9af769f26c297e9714ff4364ffbfcd2fd360d5a44d360a58d68c4ed3ecc4bedda5d511a8a07d0613cc7a4ab323a4d0f17bdf5e8e3f8f2290263eea SHA512 2c803fe67f9b4e4791158446054c6ffa86a1f617c1c294f34ea13dd50ae7af8a78d9690fc697639d6ddc6b650c262d244ab9e42f0b3c3010622484569a23d23a
-MISC metadata.xml 723 BLAKE2B 48dc2064fc3640a8b346482ca0c36c4976e6310567269036f8a66c36b9b2a49e8633fd26bfc2505ff46042d24afc53641d2339caf71686a7c42d06f821706665 SHA512 59dfd38a0e760d57958e188148ac731a24944f971b0ad0ce92ebfee63e7e06750b9d2ed18671a9dfb9fc8a6696a55c35eaf1e653d54f895d236153e0093dcd0c
diff --git a/x11-plugins/pidgin-telegram/metadata.xml b/x11-plugins/pidgin-telegram/metadata.xml
deleted file mode 100644
index 129a3ef223f5..000000000000
--- a/x11-plugins/pidgin-telegram/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>conikost@gentoo.org</email>
-		<name>Conrad Kostecki</name>
-	</maintainer>
-	<longdescription>
-		This plugin adds support for the Telegram messenger protocol,
-		which can be used directly in net-im/pidgin.
-		Telegram is a cloud-based instant messaging and voice over IP service.
-	</longdescription>
-	<upstream>
-		<bugs-to>https://github.com/majn/telegram-purple/issues</bugs-to>
-		<remote-id type="github">majn/telegram-purple</remote-id>
-	</upstream>
-	<use>
-		<flag name="gcrypt">Use dev-libs/libgcrypt instead of dev-libs/openssl.</flag>
-	</use>
-</pkgmetadata>
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.7.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.7.ebuild
deleted file mode 100644
index 038d5a5cde89..000000000000
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A libpurple protocol plugin that adds support for the Telegram messenger"
-HOMEPAGE="https://github.com/majn/telegram-purple"
-SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegram-purple_${PV}.orig.tar.gz"
-S="${WORKDIR}/telegram-purple"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~riscv x86"
-SLOT="0"
-IUSE="gcrypt +nls +png +webp"
-
-RDEPEND="
-	net-im/pidgin
-	sys-libs/zlib:=
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	!gcrypt? ( dev-libs/openssl:0= )
-	png? ( media-libs/libpng:0= )
-	webp? ( media-libs/libwebp:= )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" )
-
-src_prepare() {
-	default
-
-	# Remove '-Werror' to make it compile
-	find -name 'Makefile*' -exec sed -i -e 's/-Werror //' {} + || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable gcrypt)
-		$(use_enable nls translation)
-		$(use_enable png libpng)
-		$(use_enable webp libwebp)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/x11-plugins/purple-libnotify-plus/Manifest b/x11-plugins/purple-libnotify-plus/Manifest
index 72fdc7ee5bd8..41414c8226c6 100644
--- a/x11-plugins/purple-libnotify-plus/Manifest
+++ b/x11-plugins/purple-libnotify-plus/Manifest
@@ -1,4 +1,4 @@
 AUX purple-libnotify-plus-2.99.1-fno-common.patch 209 BLAKE2B bf9349d0700913d19d0d39372d439fc37d6e17c20951183f8ab7cb025531742dd752ea46b7bd30096fd10dc30afcb65b0a84dac30d72ad633cf8c01002ab488f SHA512 e635f984846b25d24172b138928cc9c7e8f87c953ef45d8bcfc10f0ead18c87bd0c7c700d9973606d040d123fa68675cbcdc21c7d916d90216651222390b3460
 DIST purple-libnotify-plus-2.99.1.tar.gz 20168 BLAKE2B bab24be1a541ae50fbbbacb0fa507f0e6000c3e74f1fa75ccceb809de88012f7492ec29ae96cf303cb38463e3af0c916aaead9365d5dce18904b34844e1e8c64 SHA512 436c2363c05b21f0a980e020fe09f3f285e8c9a4d131377f20ec13ecf5ce6ef1bea8ca6ae16de6154657e5d4a9b0229204e7f48a6807d36e516b95248daf11bf
-EBUILD purple-libnotify-plus-2.99.1.ebuild 679 BLAKE2B 3c34bb1090d54a9b9a9de889ae61ece45b57ef71aa9e878e815c398a6083da900b6e5185be7b00162afef958df3904f186ef3b3a7de30b14b12ae84b786def85 SHA512 69160b0a9911b6856b512e17a4b97bccfae4181c99afbc502a2617b318d3de6888d82534561c7251040f6b5edc32a5ec6ce43e10f9be4b37e289942b9028c9a3
+EBUILD purple-libnotify-plus-2.99.1.ebuild 686 BLAKE2B 8d9285554da71b8e13a2e4472d5539a7856e89f24f049bf6966de8af3f76aabef7c2da02cd70627b5d2d240e5d99567f1967525377dd4146fd5455f0aac39901 SHA512 94c800f152efb228d19beb5d9b394f35b075cbd46a699a2a9c8a3cdc99f93942946f3b3aeb24c438c3871b69fb801c1c264900555a9c8b0dab5cd279145dc425
 MISC metadata.xml 406 BLAKE2B 93943505ecb6c40b0530d6e632fbf6c62d54d3975b36b217a23c9cdde770261da90f3d4c88759972dca50cf2f2d39c4a42bf6dc93c6f916a576e8a70d94c0bf9 SHA512 2085bb3cbcc07d2e2b736b15d70f0da5c9ff92423deda3ad124acfbd4a11d0301ab9f6c51d2c4b6ea7d5f4974f5ab00caec1d7589f7814c47e7b83d43534fa75
diff --git a/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild b/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
index 54ed903d1c51..04b255be574f 100644
--- a/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
+++ b/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="Provide libnotify interface to Pidgin and Finch"
-HOMEPAGE="http://purple-libnotify-plus.sardemff7.net/"
+HOMEPAGE="https://github.com/sardemff7/purple-libnotify-plus"
 SRC_URI="https://github.com/sardemff7/purple-libnotify-plus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/x11-plugins/vicious/Manifest b/x11-plugins/vicious/Manifest
index 2559a7651821..29cf84fdfd08 100644
--- a/x11-plugins/vicious/Manifest
+++ b/x11-plugins/vicious/Manifest
@@ -1,3 +1,5 @@
 DIST vicious-2.5.0.tar.gz 67557 BLAKE2B ffbc1b3c0e32b554cc367a51e5e17130e1b9f7fed2e8505aaa1845719ecd6d465d43ba839ac3a9b73a87e43ff3144c2074f3750d5f67b516d033a74144e9e12f SHA512 deb21587d1d7f2e6e4dd77c74abbfa337acf6c99ef9bebc0e505f1508afc6e3b03f043a639f866fcda0191447c103d3fba51376682201482fb669a263321dee5
+DIST vicious-2.5.1.tar.gz 68635 BLAKE2B fa952f878140e76a44bde98ab928fe2a01a12f0e931a4f8ee366acba584661a0e42b150d4f69bfaaf7c58c68d57d2e261d8b586fb1abbd329d9f30fe90c2e21d SHA512 63de92a4e7d666d5737bfc0f50857c48f40818e5f1cf81ba672284db764c68d151f73afd6507b7392b38ae91cf1d18104284618430d15dd8837c56a0283571fe
 EBUILD vicious-2.5.0.ebuild 2288 BLAKE2B 576843becc26c16e87d2fc743b520d4e6022ddb3769c80f89925913a27a71b7160a96828b5618eb06292c3f9bf88d08feb5f4f85f808252b5015a2e8859881a1 SHA512 4200bd3de2875e94092776ab32b2180679c335c319770a2c695677e83a179189cb541e4a33b23c911b5434cbda6629bf7a9674f8d9d5b9bc312d18617f5fb229
+EBUILD vicious-2.5.1.ebuild 2297 BLAKE2B bbe6480ede926414e834b4abcaa99148c7997249ff9135f2b9fc14cfefd979b4c9fa309c569cc59857c1bb42d23738101220d50c4665cd66a1aba18ae903e441 SHA512 d600533f7e47a305486730ee7a407fc0a435d93d9e05a5bde045bf298b9d13c8930eb1f376101549e14ee276ca36d460e15070d4703a8fbfade4cd22fdeb4dea
 MISC metadata.xml 492 BLAKE2B 21caf589f9a40c2b9203b2a45a4f0b60c6ce52e78a8fec7173c1a8467cb92a4891c28e412324f5652d1fd17b3fb07780b800bac643c3476e5b2d962124f86066 SHA512 5882c4db0ceea18943171338a23ffe8b31431a63d255cac0ef3544a3a267699969f9a735b5cb30d834f053c4bd574cb5aaa45c991c1b919c986683d991aacdba
diff --git a/x11-plugins/vicious/vicious-2.5.1.ebuild b/x11-plugins/vicious/vicious-2.5.1.ebuild
new file mode 100644
index 000000000000..83e8fe901cd2
--- /dev/null
+++ b/x11-plugins/vicious/vicious-2.5.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="Modular widget library for x11-wm/awesome"
+HOMEPAGE="https://github.com/vicious-widgets/vicious"
+SRC_URI="https://github.com/${PN}-widgets/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="contrib"
+
+RDEPEND="x11-wm/awesome"
+
+src_install() {
+	insinto /usr/share/awesome/lib/vicious
+	doins -r widgets spawn.lua helpers.lua init.lua
+
+	if use contrib; then
+		insinto /usr/share/awesome/lib/vicious/contrib
+		doins contrib/*.lua
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	# Note that as of 2.5.1 this list may or may not be incomplete  - it has been produced
+	# 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.
+	optfeature_header "These widgets need some dependencies:"
+	optfeature "cmus" "media-sound/cmus"
+	optfeature "fs" "sys-apps/coreutils" # df
+	optfeature "gmail" "net-misc/curl"
+	optfeature "hddtemp" "net-misc/curl[telnet] app-admin/hddtemp"
+	optfeature "hwmontemp" "sys-apps/grep"
+	optfeature "mdir" "sys-apps/findutils"
+	optfeature "mpd" "net-misc/curl[telnet] media-sound/mpd"
+	optfeature "notmuch" "net-mail/notmuch"
+	optfeature "volume" "media-sound/alsa-utils" # amixer
+	optfeature "weather" "net-misc/curl"
+	optfeature "wifi" "net-wireless/wireless-tools"
+	optfeature "wifiiw" "net-wireless/iw"
+	if use contrib; then
+		optfeature "contrib/btc" "net-misc/curl"
+		optfeature "contrib/buildbot" "net-misc/curl"
+		optfeature "contrib/countfiles" "sys-apps/findutils"
+		optfeature "contrib/mpc" "media-sound/mpc"
+		optfeature "contrib/openweather" "net-misc/curl"
+		optfeature "contrib/netcfg" "sys-apps/coreutils" # ls
+		optfeature "contrib/nvinf" "x11-drivers/nvidia-drivers" # nvidia-settings
+		# ossvol needs 'ossmix' - not packaged?
+		optfeature "contrib/pulse" "media-sound/pulseaudio" # pacmd
+		optfeature "contrib/rss" "net-misc/curl"
+		optfeature "contrib/sensors" "sys-apps/lm-sensors"
+		optfeature "contrib/wpa" "net-wireless/wpa_supplicant" # wpa-cli
+	fi
+	elog
+}
diff --git a/x11-plugins/wmbattery/Manifest b/x11-plugins/wmbattery/Manifest
index 3f36ba8ca54f..31d58bcc17cb 100644
--- a/x11-plugins/wmbattery/Manifest
+++ b/x11-plugins/wmbattery/Manifest
@@ -1,3 +1,5 @@
 DIST wmbattery-2.54.tar.gz 87925 BLAKE2B 692549909d52096ecf7997de5122f07d9fd59b3e2d99c1421b871671a9e43f2bbdb9742e89f835a58114238509b8f8b03fd0619da4a66d8e43b6b787d4e5f6a9 SHA512 58c901ed85d3ea7e0c750bb968c3250706ed693162fe4684d75683a3897df7ff02ee4afbe12a5d26b1f1b632d4c6f9902713a632e6784173ea49bad312fd30aa
+DIST wmbattery-2.56.tar.gz 120578 BLAKE2B 992b3f2964b1ca06aabcc1727a972dcc3e7fbc294b2265c9d0435b3bb7d0c425cded78d4057d7d33ac6b3e70322d5b4b3c0cf4ce8142fb6b3222e85100937eb3 SHA512 834dd4b8b5f880c31c0c1c95c5f9580e8cc795ae8f5c56cf94957bd8d7383d4b3c0903063430a329533ae8b5eff8eed1a464cdcf3ad67bc9f6ef3c35cc9d5662
 EBUILD wmbattery-2.54.ebuild 634 BLAKE2B 167e52a49959cc72dfd725db537f0a386fba1a7bd167c24c1345b0dbb2e4ae49f6473baebde8a9fc5dfaafd60cce9422199d0dd34b8f3586e25acd021fba41a2 SHA512 aaae4667babd19495167ed343e15b4fb66cf540b8a2c20b869fac6133be184c79cdca656640a5d989e3ae68f0ef7b73556f5e4ce3d7f2a4eeebacb31dfdc16df
+EBUILD wmbattery-2.56.ebuild 636 BLAKE2B 9a077d8c30b115f8bdcabf04e939bf3a956c18e5c2c8631ead7cacc610c60e55a2bb51a8440178866a3d6a8081171c5447b02a8d48549628cefbfb940e6ff2e2 SHA512 dd24653d56999fa4ffe884464a7fdfd48130232a1f27e739aabf927b9dcc4410b2d96c95d5a1efab5386ce919e63ab3d4bfbe4dd6ffc7df62b2076f06ba54af5
 MISC metadata.xml 678 BLAKE2B 393744a240c18a5c2a03d06d64947b0eb9121511d102cc423411d51f8f1628b5a39504095ec19fe2fe0f23a52c297582ce1db89f08c9087a33ae3bf95dba2a62 SHA512 416e3ad8159e8390780d3313c67aa0918788b4a7889fcd85fdfbb2d88b4c8f711516735d3971bfffb4560a89740e14dc737aedccc9e8ff0ede1b400ccc435fa6
diff --git a/x11-plugins/wmbattery/wmbattery-2.56.ebuild b/x11-plugins/wmbattery/wmbattery-2.56.ebuild
new file mode 100644
index 000000000000..aef01b77a878
--- /dev/null
+++ b/x11-plugins/wmbattery/wmbattery-2.56.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A dockable app to report APM, ACPI, or SPIC battery status"
+HOMEPAGE="https://www.dockapps.net/wmbattery"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc -sparc ~x86"
+IUSE="apm +upower"
+
+RDEPEND="apm? ( sys-apps/apmd )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	upower? ( >=sys-power/upower-0.9.23 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ChangeLog README TODO )
+
+src_configure() {
+	econf --disable-hal $(use_enable upower)
+}
diff --git a/x11-plugins/wmblob/Manifest b/x11-plugins/wmblob/Manifest
index 849e82fb0f5c..e0039913a80d 100644
--- a/x11-plugins/wmblob/Manifest
+++ b/x11-plugins/wmblob/Manifest
@@ -1,3 +1,3 @@
 DIST wmblob-1.0.4.tar.bz2 179284 BLAKE2B 79025a4d80c05bd8f9d1a962762680e24ae0eb09c8bf961833f4f4c59b086ecc8563ef71c28678c969da75f1f074c691c9fd6a6919358886e64f7fcb814611a3 SHA512 d325711e6c6c865a97386793a7c3f0e0833044001ccc336f2a4e9974799e5ff00936b0d90a0dc4a3280ba27a8d1f97239ba51d61e6e5b104e7cf82c8aeed5ec1
 EBUILD wmblob-1.0.4.ebuild 731 BLAKE2B 49c635a6beb8cc353e79f93a2bfd53d4409df9641456ff3365bb10c4eea241d2750108b590120ab48d704eee7262294700e90e8117d4a0a206c5a23a0de251c8 SHA512 b0818713ca81d57ddd67f440f5ed9c9546fc21b13a5e36ded78caa78ce0024ea30145df217e7bdaebc981709baa892c8f04f11981f3515f192bc8b74632c3212
-MISC metadata.xml 327 BLAKE2B 160ff7a659d6618cddab804593c87d8946bc6001918bfe4c3bad7f50da136738f02b49a0b047e1199f9600081e5a736c9db3b89e5d63941d7d3e8fbf18c0eeae SHA512 9889ce84aad14b5517c626bf6de1f3441cc1644f0ef15f757448d1461363926ae9f9ea10efabd944ea7ed54cc203889d2125d1b2ccb4a4d4b8b7d0b0a9823a10
+MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/x11-plugins/wmblob/metadata.xml b/x11-plugins/wmblob/metadata.xml
index 0ff962f909a3..8a473e90e026 100644
--- a/x11-plugins/wmblob/metadata.xml
+++ b/x11-plugins/wmblob/metadata.xml
@@ -5,7 +5,4 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">wmblob</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/wmnet/Manifest b/x11-plugins/wmnet/Manifest
index 2d0fa99b659f..30d0754b88f5 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 892 BLAKE2B a323ec5793d1f0bcb8e46c05b8f99535f42d0ac848c9db1dc613ea6296f192fdd8b7b7f9312d94cd79ec846451e452b69233956a5b46c39940858cf58a7b8361 SHA512 0b7123e752123c0f3f2e3a4fdaa2f80f92fd48b4e7f1644a4a8f84d154bb888bfa8816a57fba175826445f3ea8543798ed6f8dfcd5f77a76efe83de3dbeb6a9f
+EBUILD wmnet-1.06-r2.ebuild 927 BLAKE2B 67144fd3c6b282d924930a5283eab797f4a435ca220c520a73ac614e7d0752aab141342405a9264ac633a1b9e6a74377b0a1fd7469c18b91420c115bf88888d2 SHA512 633519043358dcd7ee3508438ea76de2a1362003f822cbfcfe7a25d65615551dbf9761c7c5b2340d566f596b8a34ee55e6d76bdc8c19fbfe6a16281d0470675d
 MISC metadata.xml 781 BLAKE2B 8a50e84357c1453851451c76006709e9da608d0fa085e0fc0c749fe5e82bace9dd8e0888eb9409784dd764a45604e779736b233cf76d34871f0d7f25050cc2a5 SHA512 b7f79fd9b2cf1a3bb70348f7bb9c341c5600738489db4ded41751848b2eb46f3dcd0279a472d22f8ea5301351f1ae09bee8fbb2b760d96cf5caa866f1881f628
diff --git a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
index df7520120959..1b2ce83086b5 100644
--- a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,8 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	elibc_musl? ( net-libs/ppp-defs )"
 BDEPEND="
 	x11-base/xorg-proto
 	>=x11-misc/imake-1.0.8-r1
diff --git a/x11-plugins/wmnetload/Manifest b/x11-plugins/wmnetload/Manifest
index ade6d2e7e739..107c1456807d 100644
--- a/x11-plugins/wmnetload/Manifest
+++ b/x11-plugins/wmnetload/Manifest
@@ -1,4 +1,4 @@
 AUX wmnetload-1.3-r4-configure.patch 2138 BLAKE2B c20dc1ded8ae844b343c41f8b6424e4185ec07fb8413b26d8d9739a2966435b3eea69835b88f72fdfb4b17106484595c2755e3124c3be972dbd83c6032c5489b SHA512 1fcbf063b466618c1d73d2a658730ce906d040e70224e458f331184694ef6b70acf8a950a1716a2cbd40293c985e258998ff4b30b6a6bec7b5a7240e5ff32f3b
 DIST wmnetload-1.3.tar.gz 105588 BLAKE2B 21c56ef3d6b9e13f9e7d7a1eeb4ad79693134a74d7b864a45f76e174a8f8fef46efc0444bce9a5422d698b8b966768914fe6fb9fb4eda29c8e0dd6f6892daf40 SHA512 67f28100fefea54a21f82be3acde9a457779b2dd1eb1c2f0c074c0a956a8f7b43a6c7ed39b97f8bdd1f51adfc1c21d197c1a7dfd84d8aeb562e46d58fd06b3f7
 EBUILD wmnetload-1.3-r6.ebuild 595 BLAKE2B 86c6ca9db82c88f15ff997e0b5392bc8e8a9a64362648cc8054d06a8832559959c945cceeb39eb78a8c68a0b7dafa4d87113e4373955050dc3cd2df4c4daa15b SHA512 8a3aca08ad7abffc46c22cff1b19bef5713fe9f509b6bec31ea3afcca5452107412bd0a634b532e987deea9fefb6dc7e31ea9f12cb6c0709a8547b24918ccdf0
-MISC metadata.xml 766 BLAKE2B fc63dbd9772d62b3ef6808b1c85b9e356e600d0e04b4500d5fda14a60045bed56a5dda99636168175a270b8a8fff6be32fd4c72bd5ec69769e7b1c1a1c9c83bd SHA512 d83f9449dc4abf8f5b754d492dd9ce5e0c0a64018dc253fccdd40cdba4ee65858539ba46962292dfe05a543b4f47cb7b9e2ab1b1d154b61a28b110bf4bf038d9
+MISC metadata.xml 689 BLAKE2B 1333dde581000f7a4b108439bb4f168a8b5069914e29fd9779c757f43fd9c8dc7606d0d5ec8316ebe356a6990f42136cb75ecd3f4631234c02c3b0507ce350d4 SHA512 6630717e8315c7c59d329f1fce3e9f25c420fda6eccd1ed8329c1c14ef6a8a985929475ebb91b1e22dac5b3fc3fe8a75e91c1223d1e98f14a1114a25f8858be6
diff --git a/x11-plugins/wmnetload/metadata.xml b/x11-plugins/wmnetload/metadata.xml
index b86cbf3cb450..cd9959ef1348 100644
--- a/x11-plugins/wmnetload/metadata.xml
+++ b/x11-plugins/wmnetload/metadata.xml
@@ -13,7 +13,4 @@ throughput, along with an auto-scaling graph of recent network activity (the
 graph separates upstream and downstream traffic load cleanly without resorting 
 to colors).
 </longdescription>
-	<upstream>
-		<remote-id type="freshmeat">wmnetload</remote-id>
-	</upstream>
 </pkgmetadata>