Updating liguros repo

author: Palica <palica+gitlab@liguros.net> 2020-06-23 22:35:08 +0200
committer: Palica <palica+gitlab@liguros.net> 2020-06-23 22:35:08 +0200
commit: ecdac123787b96ce6649f0f91da12ea6458cc2b1 (patch)
tree: b89c74d9e6fe6e8aebc4c77bcbeb4ab73214127d /x11-plugins
parent: 1be72aa41cf41dedadeecf59dca9f01de6381f5e (diff)
download: baldeagleos-repo-ecdac123787b96ce6649f0f91da12ea6458cc2b1.tar.gz
baldeagleos-repo-ecdac123787b96ce6649f0f91da12ea6458cc2b1.tar.xz
baldeagleos-repo-ecdac123787b96ce6649f0f91da12ea6458cc2b1.zip
708 files changed, 16741 insertions, 0 deletions
diff --git a/x11-plugins/allin1/Manifest b/x11-plugins/allin1/Manifest
new file mode 100644
index 000000000000..34b0b7dafaa4
--- /dev/null
+++ b/x11-plugins/allin1/Manifest
@@ -0,0 +1 @@
+DIST allin1-0.5.0.tar.gz 43905 BLAKE2B e914d174d4b1c15e8df53deb793388d8d5cbe9e1a663663b08aad052654b6b759670310d1276f0705bd8faa459c33144a6656cb64610b9d6814809e65ea34798 SHA512 2728bc86b59850dd3e928ea62f00e32bb06a1ea4b8dc3611b2fdc952de8decef7d9ac3c51ed3676d242b5de670270e19bf5783658c6651ae534154249d99a4e7
diff --git a/x11-plugins/allin1/allin1-0.5.0-r2.ebuild b/x11-plugins/allin1/allin1-0.5.0-r2.ebuild
new file mode 100644
index 000000000000..8fbbd58b567a
--- /dev/null
+++ b/x11-plugins/allin1/allin1-0.5.0-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="All in one monitoring dockapp: RAM, CPU, Net, Power, df, seti"
+HOMEPAGE="http://ilpettegolo.altervista.org/linux_allin1.en.shtml"
+SRC_URI="mirror://sourceforge/allinone/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=( "${FILESDIR}/makefile-r2.patch" )
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin src/allin1
+	doman docs/allin1.1
+	dodoc README README.it TODO ChangeLog BUGS src/allin1.conf.example
+}
diff --git a/x11-plugins/allin1/files/makefile-r2.patch b/x11-plugins/allin1/files/makefile-r2.patch
new file mode 100644
index 000000000000..9d0b2ab028fa
--- /dev/null
+++ b/x11-plugins/allin1/files/makefile-r2.patch
@@ -0,0 +1,23 @@
+--- a/src/Makefile.old	2012-10-24 13:12:48.128285694 +0200
++++ b/src/Makefile	2012-10-24 13:19:56.135247071 +0200
+@@ -11,8 +11,9 @@
+ 
+ CC = gcc
+ FLEX = flex
+-LIBFLAGS = -ggdb -Wall -O2 -fPIC
+-CFLAGS = -ggdb -Wall -O2
++LIBFLAGS = -fPIC
++CFLAGS =
++LDFLAGS =
+ GENERATED = allin1 confparse.c
+ LIBRARIES = -L/usr/X11R6/lib -lXext -lX11 -lXpm -lm
+ MODULES = allin1.o dockhelper.o memory.o battery.o cpu.o \
+@@ -58,7 +59,7 @@
+ 
+ 
+ allin1: $(MODULES)
+-	$(CC) $(CFLAGS) -o $@ $(MODULES) -DDEBUG $(LIBRARIES)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MODULES) -DDEBUG $(LIBRARIES)
+ 
+ 
+ install: allin1
diff --git a/x11-plugins/allin1/metadata.xml b/x11-plugins/allin1/metadata.xml
new file mode 100644
index 000000000000..7abd58dbe041
--- /dev/null
+++ b/x11-plugins/allin1/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>Allin1 is a little dock applet for FluxBox and similar window managers which monitors CPU load with a moving graph, memory and swap usage with histograms, battery and power status with histogram and icons, and ethernet/PPP interfaces with icons and histograms (linear or logaritmic).</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">allinone</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/asapm/Manifest b/x11-plugins/asapm/Manifest
new file mode 100644
index 000000000000..899415af95f2
--- /dev/null
+++ b/x11-plugins/asapm/Manifest
@@ -0,0 +1 @@
+DIST asapm-3.1.tar.gz 63203 BLAKE2B 9695c21066c3855a8d945af78751e3f5d0d06950cc199c60d886a5bd8b99fb2f9eb2e2035624f161b85b81bf58acf80b8a494753d74a4e9b1163f16b4037031e SHA512 01859deccba952428671fd77ce87251b1fe0c21221af13db9b14c9ef28babad11e1582fed02b076f16d66bdab398eeb7a48b5e3cdebcb4e153978e04f022a579
diff --git a/x11-plugins/asapm/asapm-3.1-r1.ebuild b/x11-plugins/asapm/asapm-3.1-r1.ebuild
new file mode 100644
index 000000000000..8d6ea14a2354
--- /dev/null
+++ b/x11-plugins/asapm/asapm-3.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="APM monitor for AfterStep"
+HOMEPAGE="http://tigr.net/afterstep/applets/"
+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"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-{ldflags,include,autoconf}.patch
+	cp autoconf/configure.in . || die
+	AT_M4DIR=autoconf eautoconf
+	tc-export CC
+}
+
+src_install() {
+	dobin asapm
+	newman asapm.man asapm.1
+	dodoc CHANGES README TODO NOTES
+}
diff --git a/x11-plugins/asapm/files/asapm-3.1-autoconf.patch b/x11-plugins/asapm/files/asapm-3.1-autoconf.patch
new file mode 100644
index 000000000000..0051d49ac8a8
--- /dev/null
+++ b/x11-plugins/asapm/files/asapm-3.1-autoconf.patch
@@ -0,0 +1,21 @@
+--- a/autoconf/configure.in
++++ b/autoconf/configure.in
+@@ -59,7 +59,6 @@
+ AC_CHECK_HEADERS(sys/wait.h sys/time.h)
+ AC_CHECK_HEADERS(sys/statvfs.h sys/vfs.h sys/mount.h ustat.h)
+ AC_CHECK_HEADERS(machine/soundcard.h linux/soundcard.h linux/radio.h)
+-AC_CONFIG_HEADER(config.h)
+ 
+ dnl# Check for X
+ 
+@@ -117,10 +116,6 @@
+ AC_SUBST(with_gnustep_lib)
+ AC_SUBST(with_afterdir)
+ 
+-dnl# Write results
+-
+-AC_CONFIG_HEADER(config.h)
+-
+ dnl# Common parts of the Makefile
+ MAKEFILEDEFINES=./autoconf/Makefile.defines
+ MAKEFILECOMMON=./autoconf/Makefile.common
diff --git a/x11-plugins/asapm/files/asapm-3.1-include.patch b/x11-plugins/asapm/files/asapm-3.1-include.patch
new file mode 100644
index 000000000000..529d994ef122
--- /dev/null
+++ b/x11-plugins/asapm/files/asapm-3.1-include.patch
@@ -0,0 +1,10 @@
+--- a/apm_read.c
++++ b/apm_read.c
+@@ -13,6 +13,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h> /* exit(), free() */
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <unistd.h>
diff --git a/x11-plugins/asapm/files/asapm-3.1-ldflags.patch b/x11-plugins/asapm/files/asapm-3.1-ldflags.patch
new file mode 100644
index 000000000000..a90d7baf2e4e
--- /dev/null
+++ b/x11-plugins/asapm/files/asapm-3.1-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/autoconf/Makefile.common.in
++++ b/autoconf/Makefile.common.in
+@@ -34,7 +34,7 @@
+ 		done
+ 
+ $(PROG):        $(OBJS)
+-		$(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
++		$(CC) $(LDFLAGS) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
+ 
+ .c.o:
+ 		$(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
diff --git a/x11-plugins/asapm/metadata.xml b/x11-plugins/asapm/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/asapm/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/asclock/Manifest b/x11-plugins/asclock/Manifest
new file mode 100644
index 000000000000..3c70ea5e5f76
--- /dev/null
+++ b/x11-plugins/asclock/Manifest
@@ -0,0 +1 @@
+DIST asclock-2.0.12.tar.gz 111858 BLAKE2B acc5e25c268f013c30e7c35e5f162246839b6ffdd049e041e47bd9eee5a9fd6f62b27bb5f8eec157a2b19f6a930f9084531d3c1a7e9cd19cdfdd4ba33005f952 SHA512 408c0cbd7d8c19e8cda450ed1e3e0857dd908768557221b5707bda4eaa56170899bb3ecbe1d9f487ad7cbe7ebe36019cfe7a19f58dae2b918fb1179d67a8bb0e
diff --git a/x11-plugins/asclock/asclock-2.0.12-r3.ebuild b/x11-plugins/asclock/asclock-2.0.12-r3.ebuild
new file mode 100644
index 000000000000..96b5e7d11f71
--- /dev/null
+++ b/x11-plugins/asclock/asclock-2.0.12-r3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+IUSE=""
+DESCRIPTION="Clock applet for AfterStep"
+SRC_URI="http://www.tigr.net/afterstep/download/asclock/${P}.tar.gz"
+HOMEPAGE="http://tigr.net/afterstep/applets/"
+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 )
+
+src_prepare() {
+	default
+	ln -s themes/classic default_theme
+}
+
+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
+		$(tc-getCC) \
+			${CPPFLAGS} ${CFLAGS} ${ASFLAGS} \
+			-I"${EPREFIX}"/usr/include \
+			-D_BSD_SOURCE \
+			-D_SVID_SOURCE \
+			-DFUNCPROTO=15 \
+			-DNARROWPROTO \
+			-c -o ${x}.o ${x}.c || die "compile asclock failed"
+	done
+	$(tc-getCC) \
+		${LDFLAGS} \
+		-o asclock \
+		asclock.o parser.o symbols.o config.o \
+		-L"${EPREFIX}"/usr/lib \
+		-L"${EPREFIX}"/usr/lib/X11 \
+		-lXpm -lXext -lX11 || die "link asclock failed"
+}
+
+src_install() {
+	dobin asclock
+	local themesdir="/usr/share/${PN}/themes"
+	insinto ${themesdir}
+	doins -r themes/*
+	dodoc README README.THEMES TODO
+	cd "${D}"/${themesdir} || die
+	rm -f Freeamp/Makefile{,.*} || die
+	ln -s classic default_theme || die
+}
diff --git a/x11-plugins/asclock/files/asclock-gcc41.patch b/x11-plugins/asclock/files/asclock-gcc41.patch
new file mode 100644
index 000000000000..5a5291219ee5
--- /dev/null
+++ b/x11-plugins/asclock/files/asclock-gcc41.patch
@@ -0,0 +1,44 @@
+diff -ur asclock-2.0.12-orig/asclock.h asclock-2.0.12/asclock.h
+--- asclock-2.0.12-orig/asclock.h	2006-06-03 15:31:58.000000000 -0400
++++ asclock-2.0.12/asclock.h	2006-06-03 15:35:51.000000000 -0400
+@@ -38,15 +38,15 @@
+ #define INT_TYPE 0;
+ 
+ /* the xpm data */
+-extern char *clock_xpm[];
+-extern char *month_xpm[];
+-extern char *weekday_xpm[];
+-extern char *led_xpm[];
+-extern char *date_xpm[];
+-extern char *hour_xpm[];
+-extern char *minute_xpm[];
+-extern char *second_xpm[];
+-extern char *beats_xpm[];
++static char *clock_xpm[];
++static char *month_xpm[];
++static char *weekday_xpm[];
++static char *led_xpm[];
++static char *date_xpm[];
++static char *hour_xpm[];
++static char *minute_xpm[];
++static char *second_xpm[];
++static char *beats_xpm[];
+ 
+ /* the filenames */
+ extern char clock_xpm_fn[MAX_PATH_LEN];
+diff -ur asclock-2.0.12-orig/themes/classic/beats.xpm asclock-2.0.12/themes/classic/beats.xpm
+--- asclock-2.0.12-orig/themes/classic/beats.xpm	2006-06-03 15:31:58.000000000 -0400
++++ asclock-2.0.12/themes/classic/beats.xpm	2006-06-03 15:37:04.000000000 -0400
+@@ -1 +1 @@
+-char *beats_xpm[] = { NULL };
++static char *beats_xpm[] = { NULL };
+diff -ur asclock-2.0.12-orig/themes/classic/led.xpm asclock-2.0.12/themes/classic/led.xpm
+--- asclock-2.0.12-orig/themes/classic/led.xpm	2006-06-03 15:31:58.000000000 -0400
++++ asclock-2.0.12/themes/classic/led.xpm	2006-06-03 15:36:53.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-char * led_xpm[] = {
++static char * led_xpm[] = {
+ "135 11 3 1",
+ " 	c #282828",
+ "O	c #00df00",
diff --git a/x11-plugins/asclock/metadata.xml b/x11-plugins/asclock/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/asclock/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/ascpu/Manifest b/x11-plugins/ascpu/Manifest
new file mode 100644
index 000000000000..1167dffc60d1
--- /dev/null
+++ b/x11-plugins/ascpu/Manifest
@@ -0,0 +1 @@
+DIST ascpu-1.11.tar.gz 43867 BLAKE2B 208b2c35ac233a3b33a48f27c3173ba05f321b0f235e199d7165e4be3ed5b638f820685847affb12a576a3ed03e684ed99448ce6557e7e7e4416f9b1eeb1a769 SHA512 fd2b4b7f27a9b585b4454237b39f5a8e662e309274a350d55e0c6f552c3d7a9626b47b84d889fd773d3785076fac08d5a595c92f81947e601d23f1f96421eb61
diff --git a/x11-plugins/ascpu/ascpu-1.11-r1.ebuild b/x11-plugins/ascpu/ascpu-1.11-r1.ebuild
new file mode 100644
index 000000000000..3fd3792e775f
--- /dev/null
+++ b/x11-plugins/ascpu/ascpu-1.11-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="CPU statistics monitor utility for X Windows"
+SRC_URI="http://www.tigr.net/afterstep/download/ascpu/${P}.tar.gz"
+HOMEPAGE="http://www.tigr.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~mips ppc ppc64 sparc x86"
+IUSE="jpeg"
+
+RDEPEND="x11-libs/libXpm
+	x11-libs/libSM
+	jpeg? ( virtual/jpeg:0 )"
+
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=( "${FILESDIR}/${P}-gentoo-r1.patch" )
+
+src_configure() {
+	econf $(use_enable jpeg)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+	dodoc README
+	default
+}
diff --git a/x11-plugins/ascpu/files/ascpu-1.11-gentoo-r1.patch b/x11-plugins/ascpu/files/ascpu-1.11-gentoo-r1.patch
new file mode 100644
index 000000000000..868c1d53b96a
--- /dev/null
+++ b/x11-plugins/ascpu/files/ascpu-1.11-gentoo-r1.patch
@@ -0,0 +1,46 @@
+--- a/autoconf/Makefile.common.in	1999-05-06 23:35:32.000000000 +0200
++++ b/autoconf/Makefile.common.in	2006-09-11 23:07:41.000000000 +0200
+@@ -9,11 +9,10 @@
+ install:	install.bin install.man
+ 
+ install.bin:	$(PROG)
+-		$(STRIP) $(PROG)
+-		$(INSTALL_PROGRAM) $(PROG) $(AFTER_BIN_DIR)
++		$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(AFTER_BIN_DIR)
+ 
+ install.man:
+-		$(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1x
++		$(INSTALL_DATA) $(PROG).man $(DESTDIR)$(AFTER_MAN_DIR)/$(PROG).1x
+ 
+ uninstall:
+ 		$(RMF) $(AFTER_BIN_DIR)/$(PROG)
+--- a/autoconf/Makefile.defines.in	1999-05-06 23:35:32.000000000 +0200
++++ b/autoconf/Makefile.defines.in	2006-09-11 23:17:40.000000000 +0200
+@@ -2,6 +2,7 @@
+ # Copyright (c) 1998, Guylhem AZNAR <guylhem@oeil.qc.ca>
+ #
+ 
++DESTDIR		=
+ CC		= @CC@
+ CCFLAGS         = @CFLAGS@
+ # -march=pentiumpro -mcpu=pentiumpro
+@@ -21,7 +22,7 @@
+ LEXFLAGS	=
+ 
+ INSTALL		= @INSTALL@
+-INSTALL_PROGRAM	= @INSTALL@ -s -m 755
++INSTALL_PROGRAM	= @INSTALL@ -m 755
+ INSTALL_DATA	= @INSTALL@ -m 644
+ 
+ INCS_X		= @X_CFLAGS@
+--- a/autoconf/Makefile.common.in	1999-05-06 23:35:32.000000000 +0200
++++ b/autoconf/Makefile.common.in	2013-03-18 18:13:05.550047149 +0100
+@@ -34,7 +34,7 @@
+ 		done
+ 
+ $(PROG):        $(OBJS)
+-		$(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
++		$(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@) $(LDFLAGS)
+ 
+ .c.o:
+ 		$(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
diff --git a/x11-plugins/ascpu/metadata.xml b/x11-plugins/ascpu/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/ascpu/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/asmem/Manifest b/x11-plugins/asmem/Manifest
new file mode 100644
index 000000000000..1513fd54fbdf
--- /dev/null
+++ b/x11-plugins/asmem/Manifest
@@ -0,0 +1 @@
+DIST asmem-1.12.tar.gz 48058 BLAKE2B 8211791d8a7ef2b664552ff89802d84b3fb2cc8b6e1780319e6ea4a3530ad172da439a7ec9ef691fef42b0ec98e5b57af256762c98d03857ad6333fb8234862f SHA512 3f086c55b6ef2804b8c32cf2eb8c9937a6f69886d89bdf09cab29a6f567a9620adb86a7c9ec19d88feece1e03eee3507601d520fe1eca1588a28494516b2e1f0
diff --git a/x11-plugins/asmem/asmem-1.12-r1.ebuild b/x11-plugins/asmem/asmem-1.12-r1.ebuild
new file mode 100644
index 000000000000..097aecda86b1
--- /dev/null
+++ b/x11-plugins/asmem/asmem-1.12-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Monitor the utilization level of memory, cache and swap space"
+HOMEPAGE="http://www.tigr.net/"
+SRC_URI="http://www.tigr.net/afterstep/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="jpeg"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXpm
+	x11-libs/libXext
+	jpeg? ( virtual/jpeg:0 )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=( "${FILESDIR}/respect-ldflags.patch" )
+
+src_configure() {
+	econf $(use_enable jpeg)
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin "${PN}"
+	newman "${PN}.man" "${PN}.1"
+	einstalldocs
+}
diff --git a/x11-plugins/asmem/files/respect-ldflags.patch b/x11-plugins/asmem/files/respect-ldflags.patch
new file mode 100644
index 000000000000..75deb42eb75a
--- /dev/null
+++ b/x11-plugins/asmem/files/respect-ldflags.patch
@@ -0,0 +1,27 @@
+From 1f02c866884bd08dda27aada5ebaa92e560144d4 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 28 Aug 2016 12:15:34 -0400
+Subject: [PATCH 1/1] autoconf/Makefile.common.in: add $LDFLAGS to the linker
+ command.
+
+Gentoo-Bug: 334771
+---
+ autoconf/Makefile.common.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/autoconf/Makefile.common.in b/autoconf/Makefile.common.in
+index 2409579..08e01a9 100644
+--- a/autoconf/Makefile.common.in
++++ b/autoconf/Makefile.common.in
+@@ -34,7 +34,7 @@ indent:
+ 		done
+ 
+ $(PROG):        $(OBJS)
+-		$(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
++		$(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@) $(LDFLAGS)
+ 
+ .c.o:
+ 		$(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
+-- 
+2.7.3
+
diff --git a/x11-plugins/asmem/metadata.xml b/x11-plugins/asmem/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/asmem/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/asmon/Manifest b/x11-plugins/asmon/Manifest
new file mode 100644
index 000000000000..d2fec4ee0506
--- /dev/null
+++ b/x11-plugins/asmon/Manifest
@@ -0,0 +1 @@
+DIST asmon-0.71.tar.bz2 42235 BLAKE2B 5e82638ae115ea088e4936615e8a67074cb8a1bde42607f37837edb1d774f24bb71d3db1d69780e4810eafcdaef681306fc07ce50e8eed1a96edf610cc081cbc SHA512 20d321b228e0157e9e2611eeac017fdf6a9e9eb8ba6e02c7c30adadb411529da408b7a543e18b30de0659ccf4f86bfde21bef392e2a4756803c58a9f28c31c45
diff --git a/x11-plugins/asmon/asmon-0.71-r1.ebuild b/x11-plugins/asmon/asmon-0.71-r1.ebuild
new file mode 100644
index 000000000000..2c91504fc699
--- /dev/null
+++ b/x11-plugins/asmon/asmon-0.71-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="WindowMaker/AfterStep system monitor dockapp"
+HOMEPAGE="http://rio.vg/asmon"
+SRC_URI="http://rio.vg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_prepare() {
+	sed -i -e "s:gcc:$(tc-getCC):g" Makefile || die
+
+	cd "${WORKDIR}"/${P} || die
+	epatch "${FILESDIR}"/${P}-list.patch
+}
+
+src_compile() {
+	emake clean
+	emake SOLARIS="${CFLAGS}" LIBDIR="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc ../Changelog
+}
diff --git a/x11-plugins/asmon/files/asmon-0.71-list.patch b/x11-plugins/asmon/files/asmon-0.71-list.patch
new file mode 100644
index 000000000000..1b1ac317669e
--- /dev/null
+++ b/x11-plugins/asmon/files/asmon-0.71-list.patch
@@ -0,0 +1,127 @@
+diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
+--- wmgeneral.orig/list.c	2016-01-04 13:28:36.583339716 +0100
++++ wmgeneral/list.c	2016-01-04 13:28:48.694343645 +0100
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail)
+ 
+-INLINE LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned 
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -101,7 +101,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@
+     }
+ 
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -132,7 +132,7 @@
+ 
+ /* Return element that has ELEM as car
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@
+ 
+ /* Free list (backwards recursive)
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
+--- wmgeneral.orig/list.h	2016-01-04 13:28:36.583339716 +0100
++++ wmgeneral/list.h	2016-01-04 13:28:39.471340654 +0100
+@@ -29,31 +29,25 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-plugins/asmon/metadata.xml b/x11-plugins/asmon/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/asmon/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/astime/Manifest b/x11-plugins/astime/Manifest
new file mode 100644
index 000000000000..49182858fbc5
--- /dev/null
+++ b/x11-plugins/astime/Manifest
@@ -0,0 +1 @@
+DIST astime-2.8.tar.gz 49679 BLAKE2B 3c0aeee5ae2202b682c6cc0c08704f047e9d1204802fbbfaac78dee2821aa59924fd08cab1ded0167be65c05877ef2a8fe527c3371a2e1a871cd3eb18767ae8f SHA512 e1bd185343c5c55cc6e4fc64599c71a8a523f02eb3d8aa0e4f69d8fbf9038d217a8b9fa943916a97759fa2c9827cab6159c1b497fa78b366f3641b46dd71e792
diff --git a/x11-plugins/astime/astime-2.8-r2.ebuild b/x11-plugins/astime/astime-2.8-r2.ebuild
new file mode 100644
index 000000000000..030c08793e3d
--- /dev/null
+++ b/x11-plugins/astime/astime-2.8-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Analogue clock utility for X Windows"
+HOMEPAGE="http://www.tigr.net/"
+SRC_URI="http://www.tigr.net/afterstep/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="jpeg"
+
+RDEPEND="x11-libs/libXpm
+	x11-libs/libSM
+	jpeg? ( virtual/jpeg:0 )"
+
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=( "${FILESDIR}/respect-ldflags.patch" )
+
+src_configure() {
+	econf $(use_enable jpeg)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin "${PN}"
+	newman "${PN}.man" "${PN}.1"
+	einstalldocs
+}
diff --git a/x11-plugins/astime/files/respect-ldflags.patch b/x11-plugins/astime/files/respect-ldflags.patch
new file mode 100644
index 000000000000..09325594f242
--- /dev/null
+++ b/x11-plugins/astime/files/respect-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/autoconf/Makefile.common.in	1999-05-02 17:12:39.000000000 +0200
++++ b/autoconf/Makefile.common.in	2013-03-24 16:16:27.494987496 +0100
+@@ -34,7 +33,7 @@
+ 		done
+ 
+ $(PROG):        $(OBJS)
+-		$(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
++		$(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@) $(LDFLAGS)
+ 
+ .c.o:
+ 		$(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
diff --git a/x11-plugins/astime/metadata.xml b/x11-plugins/astime/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/astime/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/bfm/Manifest b/x11-plugins/bfm/Manifest
new file mode 100644
index 000000000000..ab423d6a5ae5
--- /dev/null
+++ b/x11-plugins/bfm/Manifest
@@ -0,0 +1 @@
+DIST bfm-0.6.4.tar.gz 59288 BLAKE2B b70d98a944e2e6daaf694dc90a0f8cebc01afd8e11c46fde614e2b2affbe0e331cc15a308837fe987238182a3b4b631bb0d8f8d7f50b84c8705e113425cec7ec SHA512 1a039ef7448c610d2629b50bcac082e7d70eb755aa43e79e6b0868448f92aea5078548273c5f278fac878433cdcd9492589fb1612108807a4fd2afb0e07612a4
diff --git a/x11-plugins/bfm/bfm-0.6.4-r3.ebuild b/x11-plugins/bfm/bfm-0.6.4-r3.ebuild
new file mode 100644
index 000000000000..0418d5e6eb4e
--- /dev/null
+++ b/x11-plugins/bfm/bfm-0.6.4-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="a dockapp and gkrellm plug-in combining timecop's bubblemon and wmfishtime"
+HOMEPAGE="https://github.com/JNRowe-retired/bfm"
+SRC_URI="https://github.com/JNRowe-retired/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="gkrellm"
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	gkrellm? ( >=app-admin/gkrellm-2 )"
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_compile() {
+	emake CC="$(tc-getCC)" GENTOO_LDFLAGS="${LDFLAGS}"
+	use gkrellm && emake gkrellm CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin bubblefishymon
+
+	doman doc/*.1
+	dodoc ChangeLog* README* doc/*.sample
+
+	if use gkrellm; then
+		insinto /usr/$(get_libdir)/gkrellm2/plugins
+		doins gkrellm-bfm.so
+	fi
+}
diff --git a/x11-plugins/bfm/files/bfm-0.6.4-makefile.patch b/x11-plugins/bfm/files/bfm-0.6.4-makefile.patch
new file mode 100644
index 000000000000..21c183c12079
--- /dev/null
+++ b/x11-plugins/bfm/files/bfm-0.6.4-makefile.patch
@@ -0,0 +1,66 @@
+--- a/Makefile	2015-01-20 10:56:34.791157688 +0100
++++ b/Makefile	2015-01-20 10:56:48.135154215 +0100
+@@ -26,21 +26,21 @@
+ EXTRA += $(WMAN)
+ 
+ # gtk cflags and gtk lib flags
+-GTK_CFLAGS = $(shell gtk-config --cflags)
++GTK_CFLAGS += $(shell gtk-config --cflags)
+ GTK_LIBS = $(shell gtk-config --libs)
+ 
+-GTK2_CFLAGS = $(shell pkg-config gtk+-2.0 --cflags)
++GTK2_CFLAGS += $(shell pkg-config gtk+-2.0 --cflags)
+ GTK2_LIBS = $(shell pkg-config gtk+-2.0 --libs)
+ 
+ 
+ # optimization cflags
+-#CFLAGS = -O3 -Wall ${EXTRA}
+-CFLAGS = ${EXTRA}
++#CFLAGS += -O3 -Wall ${EXTRA}
++CFLAGS += ${EXTRA}
+ 
+ # profiling cflags
+-# CFLAGS = -ansi -Wall -pg -O3 ${EXTRA} -DPRO
++# CFLAGS += -ansi -Wall -pg -O3 ${EXTRA} -DPRO
+ # test coverage cflags
+-# CFLAGS = -fprofile-arcs -ftest-coverage -Wall -ansi -g ${EXTRA} -DPRO
++# CFLAGS += -fprofile-arcs -ftest-coverage -Wall -ansi -g ${EXTRA} -DPRO
+ 
+ 
+ SHELL = sh
+@@ -53,9 +53,9 @@
+ GKRELLM_SRCS = gkrellm-bfm.c
+ GKRELLM_OBJS = gkrellm-bfm.o
+ GKRELLM_BFM = gkrellm-bfm.so
+-LDFLAGS = -shared -Wl
++LDFLAGS += -shared
+ 
+-STRIP = strip
++STRIP = true
+ 
+ CC = gcc
+ 
+@@ -70,6 +70,7 @@
+ else
+ 	CFLAGS+=-DNET_DEVICE=\"$(NET_DEVICE)\"
+ endif
++	LIBS = -lm -lX11
+ 	SRCS += sys_linux.c
+ 	OBJS += sys_linux.o
+ 	INSTALL = -m 755
+@@ -129,12 +130,12 @@
+ 	$(STRIP) $(GKRELLM_BFM)
+ 
+ bubblefishymon: clean_obj
+-	$(CC) $(GTK2_CFLAGS) $(CFLAGS) -o $(BUBBLEFISHYMON) \
+-		$(LIBS) $(GTK2_LIBS) $(SRCS)
++	$(CC) $(GTK2_CFLAGS) $(CFLAGS) $(SRCS) $(GENTOO_LDFLAGS) -o $(BUBBLEFISHYMON) \
++		$(LIBS) $(GTK2_LIBS)
+ 	$(STRIP) $(BUBBLEFISHYMON)
+ 
+ bubblefishymon1: clean_obj
+-	$(CC) $(GTK_CFLAGS) $(CFLAGS) -o $(BUBBLEFISHYMON) \
++	$(CC) $(GTK_CFLAGS) $(CFLAGS) $(SRCS) $(GENTOO_LDFLAGS) -o $(BUBBLEFISHYMON) \
+ 		$(LIBS) $(GTK_LIBS) $(SRCS)
+ 	$(STRIP) $(BUBBLEFISHYMON)
+ 
diff --git a/x11-plugins/bfm/metadata.xml b/x11-plugins/bfm/metadata.xml
new file mode 100644
index 000000000000..95dde1be5242
--- /dev/null
+++ b/x11-plugins/bfm/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<use>
+	<flag name="gkrellm">Enable building of <pkg>app-admin/gkrellm</pkg>
+		module</flag>
+</use>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/bubblemon/Manifest b/x11-plugins/bubblemon/Manifest
new file mode 100644
index 000000000000..b369a7729642
--- /dev/null
+++ b/x11-plugins/bubblemon/Manifest
@@ -0,0 +1 @@
+DIST bubblemon-dockapp-1.46.tar.gz 40001 BLAKE2B 1b4bfb91d19d4e2cd653e7df258b248d0e101b431b5ce79900520d75ad39bd006ef583d148afecc1ba1b3f6ace44387f0f1ddf9ad803b47a9bf6481202353bca SHA512 c3d42f82ea7fb837839787a184a6198d7b092451e629562c90735a22166e75f55e8e1af1026e0314a4f06ff68bc48a22157e62bd19e54a4e38b4c12228396fa3
diff --git a/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild b/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
new file mode 100644
index 000000000000..196a466da0e0
--- /dev/null
+++ b/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 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"
+
+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}
+
+PATCHES=( "${FILESDIR}"/${P}-gtk.patch
+	"${FILESDIR}"/${P}-asneeded.patch
+	"${FILESDIR}"/${P}-no_display.patch )
+
+src_compile() {
+	tc-export CC
+	emake GENTOO_CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin bubblemon
+	dodoc ChangeLog README doc/Xdefaults.sample
+
+	insinto /usr/share/${PN}
+	doins misc/*.{xcf,wav}
+	exeinto /usr/share/${PN}
+	doexe misc/wakwak.sh
+}
diff --git a/x11-plugins/bubblemon/files/bubblemon-1.46-asneeded.patch b/x11-plugins/bubblemon/files/bubblemon-1.46-asneeded.patch
new file mode 100644
index 000000000000..15f323fc471d
--- /dev/null
+++ b/x11-plugins/bubblemon/files/bubblemon-1.46-asneeded.patch
@@ -0,0 +1,30 @@
+--- a/Makefile
++++ b/Makefile
+@@ -32,14 +32,12 @@
+ OBJS = bubblemon.o
+ BUBBLEMON = bubblemon
+ 
+-LDFLAGS = -shared -Wl
+-
+ STRIP = strip
+ 
+-CC = gcc
++CC ?= gcc
+ INSTALLMAN = -m 644
+ 
+-
++LIBS = -lX11
+ 
+ # special things for Linux
+ ifeq ($(OS), Linux)
+@@ -91,8 +89,8 @@
+ all: $(BUBBLEMON)
+ 
+ bubblemon: clean_obj
+-	$(CC) $(GTK2_CFLAGS) $(CFLAGS) -o $(BUBBLEMON) \
+-		$(LIBS) $(GTK2_LIBS) $(SRCS)
++	$(CC) $(LDFLAGS) $(GTK2_CFLAGS) $(CFLAGS) -o $(BUBBLEMON) \
++		$(SRCS) $(LIBS) $(GTK2_LIBS)
+ 
+ clean_obj:
+ 	rm -rf *.o
diff --git a/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch b/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch
new file mode 100644
index 000000000000..5a57624061c2
--- /dev/null
+++ b/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch
@@ -0,0 +1,122 @@
+--- a/bubblemon.c
++++ b/bubblemon.c
+@@ -58,6 +58,7 @@
+ #include <gdk/gdk.h>
+ #include <gdk/gdkx.h>
+ #include <X11/Xresource.h>
++#include <gtk/gtk.h>
+ 
+ #include "include/master.xpm"
+ #include "include/bubblemon.h"
+@@ -575,7 +576,7 @@
+     attri.colormap = gdk_colormap_get_system();
+     attri.wmclass_name = "bubblemon";
+     attri.wmclass_class = "bubblemon";
+-    attri.window_type = GDK_WINDOW_TOPLEVEL;
++    attri.window_type = GDK_WINDOW_CHILD;
+ 
+     bm.iconwin = gdk_window_new(bm.win, &attri,
+ 				GDK_WA_TITLE | GDK_WA_WMCLASS);
+@@ -593,7 +594,6 @@
+     wmhints.window_group = win;
+     wmhints.flags =
+ 	StateHint | IconWindowHint | IconPositionHint | WindowGroupHint;
+-    XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
+ 
+     bm.gc = gdk_gc_new(bm.win);
+ 
+@@ -606,6 +606,7 @@
+     gdk_window_set_back_pixmap(bm.iconwin, bm.pixmap, False);
+ 
+     gdk_window_show(bm.win);
++    XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
+ #ifdef KDE_DOCKAPP
+     /* makes the dockapp visible inside KDE wm */
+     gdk_window_show(bm.iconwin);
+--- a/Makefile
++++ b/Makefile
+@@ -11,30 +11,49 @@
+ 
+ # 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)
++
++
+ # optimization cflags
+-CFLAGS = -O3 -ansi -Wall `gtk-config --cflags` ${EXTRA}
++#CFLAGS = -O3 -Wall ${EXTRA}
++CFLAGS = ${GENTOO_CFLAGS} ${EXTRA}
++
+ # profiling cflags
+-# CFLAGS = -ansi -Wall -pg -O3 `gtk-config --cflags` ${EXTRA} -DPRO
++# CFLAGS = -ansi -Wall -pg -O3 ${EXTRA} -DPRO
+ # test coverage cflags
+-# CFLAGS = -fprofile-arcs -ftest-coverage -Wall -ansi -g `gtk-config --cflags` ${EXTRA} -DPRO
++# CFLAGS = -fprofile-arcs -ftest-coverage -Wall -ansi -g ${EXTRA} -DPRO
+ 
+ 
+-SHELL=sh
++SHELL = sh
+ OS = $(shell uname -s)
++SRCS = bubblemon.c
+ OBJS = bubblemon.o
++BUBBLEMON = bubblemon
++
++LDFLAGS = -shared -Wl
++
++STRIP = strip
++
+ CC = gcc
++INSTALLMAN = -m 644
++
++
+ 
+ # special things for Linux
+ ifeq ($(OS), Linux)
+-    OBJS += sys_linux.o
+-    LIBS = `gtk-config --libs | sed "s/-lgtk//g"`
+-    INSTALL = -m 755
++	SRCS += sys_linux.c
++	OBJS += sys_linux.o
++	INSTALL = -m 755
++	INSTALLMAN = -m 644
+ endif
+ 
+ # special things for FreeBSD
+ ifeq ($(OS), FreeBSD)
++	SRCS += sys_freebsd.c
+     OBJS += sys_freebsd.o
+-    LIBS = `gtk-config --libs | sed "s/-lgtk//g"` -lkvm
++    LIBS = -lkvm
+     INSTALL = -c -g kmem -m 2755 -o root
+ endif
+ 
+@@ -62,17 +81,21 @@
+     ifeq ($(COMPILER), gcc)
+ 	CFLAGS=-O3 -Wall
+     endif
+-    CFLAGS +=`gtk-config --cflags` ${EXTRA}
++    CFLAGS += ${EXTRA}
++	SRCS += sys_sunos.c
+     OBJS += sys_sunos.o
+-    LIBS = `gtk-config --libs` -lkstat -lm
++    LIBS = -lkstat -lm
+     INSTALL = -m 755
+ endif
+ 
++all: $(BUBBLEMON)
+ 
+-all: bubblemon
++bubblemon: clean_obj
++	$(CC) $(GTK2_CFLAGS) $(CFLAGS) -o $(BUBBLEMON) \
++		$(LIBS) $(GTK2_LIBS) $(SRCS)
+ 
+-bubblemon: $(OBJS)
+-	$(CC) $(CFLAGS) -o bubblemon $(OBJS) $(LIBS)
++clean_obj:
++	rm -rf *.o
+ 
+ clean:
+ 	rm -f bubblemon *.o *.bb* *.gcov gmon.* *.da *~
diff --git a/x11-plugins/bubblemon/files/bubblemon-1.46-no_display.patch b/x11-plugins/bubblemon/files/bubblemon-1.46-no_display.patch
new file mode 100644
index 000000000000..3d52cbb43c06
--- /dev/null
+++ b/x11-plugins/bubblemon/files/bubblemon-1.46-no_display.patch
@@ -0,0 +1,33 @@
+http://bugs.gentoo.org/310399
+
+--- a/bubblemon.c
++++ b/bubblemon.c
+@@ -44,7 +44,7 @@
+  */
+ #define _GNU_SOURCE
+ 
+-#define VERSION "1.41"
++#define VERSION "1.46"
+ 
+ /* general includes */
+ #include <stdio.h>
+@@ -276,6 +276,8 @@
+ 
+ int main(int argc, char **argv)
+ {
++    /* This is needed to proper dockapp work on >=GTK+-2.18 */
++    setenv("GDK_NATIVE_WINDOWS", "1", 0);
+     char execute[256];
+     int proximity = 0;
+     int ch;
+@@ -607,10 +609,7 @@
+ 
+     gdk_window_show(bm.win);
+     XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
+-#ifdef KDE_DOCKAPP
+-    /* makes the dockapp visible inside KDE wm */
+     gdk_window_show(bm.iconwin);
+-#endif
+ 
+     /* We begin with zero bubbles */
+     bm.n_bubbles = 0;
diff --git a/x11-plugins/bubblemon/metadata.xml b/x11-plugins/bubblemon/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/bubblemon/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/cputnik/Manifest b/x11-plugins/cputnik/Manifest
new file mode 100644
index 000000000000..851a98bcf9e5
--- /dev/null
+++ b/x11-plugins/cputnik/Manifest
@@ -0,0 +1 @@
+DIST cputnik-0.2.0.tar.gz 17850 BLAKE2B 90824218a349d9b6cdf592cafe8dd29674f975a190a19a3dd6b941383d47f4fc492af339cbbb88240499363a1048b2564855d5a17caeaf53437fe34bf0d55ee1 SHA512 829d9d63f82a2d41c0160be575b3fb7840a5c295c6dd16702240a6aa104e557bff83936c46243e850edf918b41ddc22fd123dab7f5ffd6492302d60c374df55f
diff --git a/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..eb195d5a676b
--- /dev/null
+++ b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="cputnik is a simple cpu monitor dockapp"
+HOMEPAGE="https://www.dockapps.net/cputnik"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S=${WORKDIR}/${P}/src
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	)
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin cputnik
+	dodoc ../{AUTHORS,NEWS,README}
+}
diff --git a/x11-plugins/cputnik/files/cputnik-0.2.0-fno-common.patch b/x11-plugins/cputnik/files/cputnik-0.2.0-fno-common.patch
new file mode 100644
index 000000000000..d774b600a134
--- /dev/null
+++ b/x11-plugins/cputnik/files/cputnik-0.2.0-fno-common.patch
@@ -0,0 +1,67 @@
+diff -Naur src.orig/docklib.c src/docklib.c
+--- src.orig/docklib.c	2005-03-26 22:53:38.000000000 +0100
++++ src/docklib.c	2020-05-08 19:21:45.930313064 +0200
+@@ -40,6 +40,29 @@
+ char            *Geometry = "";
+ char            *fonts_xpm[], *leds_xpm[];
+ 
++enum {          /* don't change the order! */
++    GRAY = 0,
++    YELLOW,
++    GREEN,
++    CYAN,
++    SKYBLUE,
++    ORANGE,
++    RED,
++    MAGENTA,
++    BROWN,
++    WHITE   
++} led_colors;
++
++enum {
++    F_NOT_AVAILABLE = 0,
++    F_REGULAR,
++    F_DIRECTORY,
++    F_CHAR_DEVICE,
++    F_BLOCK_DEVICE,
++    F_LINK,
++    F_FIFO,
++    F_SOCK
++} file_types;
+ 
+ /******************************************************************************
+  *
+diff -Naur src.orig/docklib.h src/docklib.h
+--- src.orig/docklib.h	2005-03-26 22:53:50.000000000 +0100
++++ src/docklib.h	2020-05-08 19:21:22.600284802 +0200
+@@ -79,30 +79,6 @@
+ 
+ #define NUM_COLORS  10
+ 
+-enum {          /* don't change the order! */
+-    GRAY = 0,
+-    YELLOW,
+-    GREEN,
+-    CYAN,
+-    SKYBLUE,
+-    ORANGE,
+-    RED,
+-    MAGENTA,
+-    BROWN,
+-    WHITE   
+-} led_colors;
+-
+-enum {
+-    F_NOT_AVAILABLE = 0,
+-    F_REGULAR,
+-    F_DIRECTORY,
+-    F_CHAR_DEVICE,
+-    F_BLOCK_DEVICE,
+-    F_LINK,
+-    F_FIFO,
+-    F_SOCK
+-} file_types;
+-
+ /*-------------------------------------------------------------------------------*/
+ 
+ void    dcl_open_x_window       (int argc, char *argv[], char **, char *, int, int);
diff --git a/x11-plugins/cputnik/files/cputnik-0.2.0-makefile.patch b/x11-plugins/cputnik/files/cputnik-0.2.0-makefile.patch
new file mode 100644
index 000000000000..b0c39ef2898b
--- /dev/null
+++ b/x11-plugins/cputnik/files/cputnik-0.2.0-makefile.patch
@@ -0,0 +1,24 @@
+--- a/Makefile	2005-03-26 22:29:48.000000000 +0100
++++ b/Makefile	2008-01-27 19:43:33.000000000 +0100
+@@ -1,15 +1,15 @@
+ 
+-CFLAGS			= -Wall -Os
+-INCS			= -I/usr/X11R6/include/X11
+-LIBS			= -L/usr/X11R6/lib -lXpm -lXext -lX11
+-INSTALL_PREFIX	= /usr/local
++CFLAGS			+= -Wall
++INCS			= -I/usr/include/X11
++LIBS			= -L/usr/lib -lXpm -lXext -lX11
++INSTALL_PREFIX	= /usr
+ 
+ 
+ all: cputnik.c docklib.o master.h mask.h
+-	gcc $(CFLAGS) $(INCS) docklib.o cputnik.c -o cputnik $(LIBS)
++	$(CC) $(CFLAGS) $(INCS) docklib.o cputnik.c -o cputnik $(LDFLAGS) $(LIBS)
+ 
+ docklib.o: docklib.c docklib.h
+-	gcc $(CFLAGS) $(INCS) -c docklib.c
++	$(CC) $(CFLAGS) $(INCS) -c docklib.c
+ 
+ install:
+ 	cp ./cputnik $(INSTALL_PREFIX)/bin
diff --git a/x11-plugins/cputnik/metadata.xml b/x11-plugins/cputnik/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/cputnik/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/docker/Manifest b/x11-plugins/docker/Manifest
new file mode 100644
index 000000000000..63f49819c967
--- /dev/null
+++ b/x11-plugins/docker/Manifest
@@ -0,0 +1 @@
+DIST docker-1.5.tar.gz 14863 BLAKE2B 258e0a8a4fbf5246480bb833bf8eca83a983d256b70b02f41123c3788a1381e93a793332b8e857a03bc8afd27aba2201825d290d1d3f3b42decac5fe9b1f06e6 SHA512 71b47156c31e5db5620612d3444eb298489fb33da296742c10543838e65677daa1b81bb054e6a7f57b9e2adef47406c32040983cb09988d93778a555e72cd861
diff --git a/x11-plugins/docker/docker-1.5-r1.ebuild b/x11-plugins/docker/docker-1.5-r1.ebuild
new file mode 100644
index 000000000000..d1ecaa22fe44
--- /dev/null
+++ b/x11-plugins/docker/docker-1.5-r1.ebuild
@@ -0,0 +1,36 @@
+# 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
new file mode 100644
index 000000000000..37de7b671cf3
--- /dev/null
+++ b/x11-plugins/docker/docker-1.5-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 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"
+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"
+
+PATCHES=( "${FILESDIR}/${P}-makefile_rename.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+pkg_postinst() {
+	einfo "To avoid collision with app-emulation/docker, binary was renamed to wmdocker"
+}
diff --git a/x11-plugins/docker/files/docker-1.5-makefile_rename.patch b/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
new file mode 100644
index 000000000000..cf20a9135aa5
--- /dev/null
+++ b/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
@@ -0,0 +1,49 @@
+--- a/Makefile	2015-01-19 20:10:47.762522964 +0100
++++ b/Makefile	2015-01-19 20:11:11.463545692 +0100
+@@ -5,12 +5,10 @@
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ 
+ # Change this PREFIX to where you want docker to be installed
+-PREFIX=/usr/local
+-# Change this XLIBPATH to point to your X11 development package's installation
+-XLIBPATH=/usr/X11R6/lib
++PREFIX = /usr
+ 
+ # Sets some flags for stricter compiling
+-CFLAGS=-pedantic -Wall -W -O
++CFLAGS += -pedantic -Wall -W
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                 #
+@@ -21,17 +19,17 @@
+ PACKAGE=docker
+ VERSION=1.5
+ 
+-target=docker
++target=wmdocker
+ sources=docker.c kde.c icons.c xproperty.c net.c
+ headers=docker.h kde.h icons.h xproperty.h net.h version.h
+-extra=README COPYING version.h.in
++extra=README version.h.in
+ 
+ all: $(target) $(sources) $(headers)
+ 	@echo Build Successful
+ 
+ $(target): $(sources:.c=.o)
+-	$(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \
+-		`pkg-config --libs glib-2.0` $^ -o $@
++	$(CC) $(LDFLAGS) $(CFLAGS) $^ -lX11 \
++		`pkg-config --libs glib-2.0` -o $@
+ 
+ %.o: %.c
+ 	$(CC) -c $(CFLAGS) `pkg-config --cflags glib-2.0` $<
+@@ -40,7 +38,8 @@
+ 	sed -e "s/@VERSION@/$(VERSION)/" version.h.in > $@
+ 
+ install: all
+-	install $(target) $(PREFIX)/bin/$(target)
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install $(target) $(DESTDIR)$(PREFIX)/bin/$(target)
+ 
+ uninstall:
+ 	rm -f $(PREFIX)/$(target)
diff --git a/x11-plugins/docker/metadata.xml b/x11-plugins/docker/metadata.xml
new file mode 100644
index 000000000000..9a1671cbccb1
--- /dev/null
+++ b/x11-plugins/docker/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+		Openbox app which acts as a system tray for KDE and GNOME2.
+	</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/e16-epplets/Manifest b/x11-plugins/e16-epplets/Manifest
new file mode 100644
index 000000000000..5fbf1f3995b3
--- /dev/null
+++ b/x11-plugins/e16-epplets/Manifest
@@ -0,0 +1 @@
+DIST e16-epplets-0.16.tar.xz 800796 BLAKE2B 70785fce2949bb5e3b0f950436e63246b576dc2dc13ac392e2d884f913e0f22e68b428b416e20807adfb47ca7a148bb3242efff6dbeac8c734ed645ff3f1c705 SHA512 2cc90dee741a50f54665078db6197d7736d5423419439e640d5170057b80111458dbf4b7c9a92898e96654b1af4a986e5cedb88a565616e70ed0fba6ec82cd9b
diff --git a/x11-plugins/e16-epplets/e16-epplets-0.16.ebuild b/x11-plugins/e16-epplets/e16-epplets-0.16.ebuild
new file mode 100644
index 000000000000..680729e55145
--- /dev/null
+++ b/x11-plugins/e16-epplets/e16-epplets-0.16.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Enlightenment DR16 epplets"
+HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/"
+SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2+ BSD public-domain"
+SLOT="0"
+IUSE="cdaudio libgtop opengl"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+CDEPEND="
+	cdaudio? ( media-libs/libcdaudio )
+	libgtop? ( gnome-base/libgtop )
+	opengl? ( media-libs/glu media-libs/mesa[X(+)] )
+	>=media-libs/imlib2-1.2.0
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-wm/e16
+"
+RDEPEND="${CDEPEND}
+	!x11-plugins/epplets
+"
+DEPEND="${CDEPEND}
+	x11-base/xorg-proto
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable cdaudio)
+		$(use_enable opengl glx)
+		$(use_with libgtop)
+		--disable-esd
+		--disable-static
+		--disable-werror
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}"/usr -name '*.la' -delete || die
+}
diff --git a/x11-plugins/e16-epplets/metadata.xml b/x11-plugins/e16-epplets/metadata.xml
new file mode 100644
index 000000000000..575ebc45908c
--- /dev/null
+++ b/x11-plugins/e16-epplets/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
+  <use>
+    <flag name="cdaudio">Enable CD Audio support using <pkg>media-libs/libcdaudio</pkg></flag>
+    <flag name="libgtop">Use <pkg>gnome-base/libgtop</pkg> to obtain system load information</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">enlightenment</remote-id>
+  </upstream>
+  <longdescription>
+    Epplets are small, handy Enlightenment applets, similar to "dockapps"
+    or "applets" for other packages.  The epplets package contains the
+    base epplet API library and header files, as well as the core set of
+    epplets, including CPU monitors, clocks, a mail checker, mixers, a
+    slideshow, a URL grabber, a panel-like toolbar, and more.
+  </longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
new file mode 100644
index 000000000000..28281cc3c541
--- /dev/null
+++ b/x11-plugins/enigmail/Manifest
@@ -0,0 +1,3 @@
+DIST enigmail-2.0.12.tar.gz 2614589 BLAKE2B 3db6f595c14e02cfdc71bebc763d05926dc6e0abf4668d132fd0ce43204e681de5fce45db752c4f49b231bd7e217b75c0f23d4a7e204fa9a3a51f1c8097fb63d SHA512 f9f4f1ed4c7244280be2fade0ccb2f4b5e7075dd60f53953478ffb84012e687b7ac7bad489c0b0cb2d8937916c783fe9e1841174bf1e5bdb9ab8cb58b415db74
+DIST enigmail-2.1.5.tar.gz 2838286 BLAKE2B e86a340a916a7ac7ef39230e5bb5730198b672ab6c466db5085aa8a818da38e3681a6f22810355db986978c7d547ae50f6d70260a3ccdc9758861d03f3c4e5d5 SHA512 0ed104306ee998b368d4a5779c2daf7c20a112c9a37f357bbe10d8c64dd435448c71e83a0e1a1dc9eb10efcf654b1524676f2b490bf6a065e6dd66de0861baea
+DIST enigmail-2.1.6.tar.gz 2838221 BLAKE2B e95569dcd58f16e64079436a24b152e7d5e3cfbc2067fe909b0f714a8acbcf80db7b1c288302c0ca11b2536fb2ff4f4376bd5de582f3b65fd01938182c9e8f9c SHA512 72159287601ed95052fcdeb3c973714e775150ba41894ecb6474798fd5109ab18dee0e3b8874a920fd07d3b184ed2034cf75f7baff4e14307d8739a312193919
diff --git a/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
new file mode 100644
index 000000000000..be2ff9a0c6a1
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+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
+	"${FILESDIR}/${PN}-2.0.12-enable_seamonkey_support.patch"
+)
+
+src_compile() {
+	emake ipc public ui package lang stdlib
+	emake xpi
+
+}
+
+src_install() {
+	local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf)
+	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
+
+	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
+
+	# thunderbird
+	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+	doins build/"${emid}.xpi"
+
+	# seamonkey
+	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
+	doins build/"${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/enigmail/enigmail-2.1.5.ebuild b/x11-plugins/enigmail/enigmail-2.1.5.ebuild
new file mode 100644
index 000000000000..53f90a93be8c
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-2.1.5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,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/enigmail/enigmail-2.1.6.ebuild b/x11-plugins/enigmail/enigmail-2.1.6.ebuild
new file mode 100644
index 000000000000..665dd902895c
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-2.1.6.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,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/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild
new file mode 100644
index 000000000000..7369918278b0
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-9999.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+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 emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/manifest.json)
+	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
+
+	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
+
+	# thunderbird
+	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+	doins build/"${emid}.xpi"
+
+	# seamonkey
+	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
+	doins build/"${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/enigmail/files/enigmail-2.0.12-enable_seamonkey_support.patch b/x11-plugins/enigmail/files/enigmail-2.0.12-enable_seamonkey_support.patch
new file mode 100644
index 000000000000..11d9702eb970
--- /dev/null
+++ b/x11-plugins/enigmail/files/enigmail-2.0.12-enable_seamonkey_support.patch
@@ -0,0 +1,20 @@
+--- enigmail/package/install.rdf
++++ enigmail/package/install.rdf
+@@ -19,14 +19,14 @@
+         <em:maxVersion>60.*</em:maxVersion>
+       </Description>
+     </em:targetApplication>
+-    <!--em:targetApplication>
+-      < ! - - Seamonkey is no longer supported - - >
++    <em:targetApplication>
++      <!-- Seamonkey -->
+       <Description>
+         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+         <em:minVersion>2.49</em:minVersion>
+         <em:maxVersion>2.57</em:maxVersion>
+       </Description>
+-    </em:targetApplication -->
++    </em:targetApplication>
+ 
+     <!-- Front End MetaData -->
+     <em:name>Enigmail</em:name>
diff --git a/x11-plugins/enigmail/files/enigmail-no_pEp_auto_download.patch b/x11-plugins/enigmail/files/enigmail-no_pEp_auto_download.patch
new file mode 100644
index 000000000000..086e00e649ae
--- /dev/null
+++ b/x11-plugins/enigmail/files/enigmail-no_pEp_auto_download.patch
@@ -0,0 +1,33 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Wed, 7 Mar 2018 11:31:50 +0100
+Subject: Avoid auto-download of pEpEngine (Closes: #891882)
+
+When pEpEngine is available in debian, enigmail should Depend: or
+Recommend: it.  In the meantime, we should disable auto-download of
+the pEp engine and prefer enigmail.
+---
+ package/prefs/defaultPrefs.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/prefs/defaultPrefs.js b/package/prefs/defaultPrefs.js
+index a1f031e..10f2c25 100755
+--- a/package/prefs/defaultPrefs.js
++++ b/package/prefs/defaultPrefs.js
+@@ -14,7 +14,7 @@
+ // 0: force using Enigmail
+ // 1: automatic mode (use pEp if Enigmail and S/MIME are not configured for any identity)
+ // 2: force using pEp
+-pref("extensions.enigmail.juniorMode", 1);
++pref("extensions.enigmail.juniorMode", 0);
+ 
+ // the last configured Enigmail version
+ pref("extensions.enigmail.configuredVersion", "");
+@@ -204,7 +204,7 @@ pref("extensions.enigmail.warnDownloadContactKeys", true);
+ pref("extensions.enigmail.wrapHtmlBeforeSend", true);
+ 
+ // automatically download pepmda if it is available (without askin user)
+-pref("extensions.enigmail.pEpAutoDownload", true);
++pref("extensions.enigmail.pEpAutoDownload", false);
+ 
+ // holds the last result of the last check for pEp updates
+ pref("extensions.enigmail.pEpLastUpdate", 0);
diff --git a/x11-plugins/enigmail/metadata.xml b/x11-plugins/enigmail/metadata.xml
new file mode 100644
index 000000000000..a54f5da82c19
--- /dev/null
+++ b/x11-plugins/enigmail/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>mozilla@gentoo.org</email>
+	<name>Gentoo Mozilla Team</name>
+</maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellaclock/Manifest b/x11-plugins/gkrellaclock/Manifest
new file mode 100644
index 000000000000..a9d090ab4919
--- /dev/null
+++ b/x11-plugins/gkrellaclock/Manifest
@@ -0,0 +1 @@
+DIST gkrellaclock-0.3.4.tar.gz 18853 BLAKE2B b91b4cb9ae42f68d3a3d430f7713170c788515280330a1f785f11d4335e859dbd6f840fb7e47fe8f77676bb55e97dda628fa79d442d4be8a37c69bcea836aa52 SHA512 2e6002bc4d535899cc8b86377d596bcee5e64d05fe4239eaab2de8e387a40b8dee600d9fcd5f30feb68bb3e54bf6b4745d4c7b79ea9fee57b856eeb3dac12524
diff --git a/x11-plugins/gkrellaclock/files/gkrellaclock-makefile.patch b/x11-plugins/gkrellaclock/files/gkrellaclock-makefile.patch
new file mode 100644
index 000000000000..6b48b6bf9015
--- /dev/null
+++ b/x11-plugins/gkrellaclock/files/gkrellaclock-makefile.patch
@@ -0,0 +1,53 @@
+diff --git a/Makefile b/Makefile
+index eb2b8ad..c89fa17 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,39 +1,12 @@
+ GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
+ GTK_LIB = `pkg-config gtk+-2.0 --libs`
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) 
+-LIBS = $(GTK_LIB) 
+-LFLAGS = -shared
++CFLAGS += -fPIC $(GTK_INCLUDE)
++LIBS = $(GTK_LIB)
++LDFLAGS += -shared
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
+-
+-OBJS = gkrellaclock.o
+-
+-gkrellaclock.so: $(OBJS)
+-	$(CC) $(OBJS) -o gkrellaclock.so $(LFLAGS) $(LIBS) 
++gkrellaclock.so: gkrellaclock.o
++	$(CC) $(CFLAGS) $(OBJS) -o gkrellaclock.so $(LDFLAGS) $(LIBS)
+ 
+ clean:
+-	rm -f *.o core *.so* *.bak *~
+-
+-gkrellaclock.o: gkrellaclock.c
+-
+-install:
+-	if [ -d /usr/local/lib/gkrellm2/plugins/ ] ; then \
+-		install -c -s -m 644 gkrellaclock.so /usr/local/lib/gkrellm2/plugins/ ; \
+-	elif [ -d /usr/lib/gkrellm2/plugins/ ] ; then \
+-        	install -c -s -m 644 gkrellaclock.so /usr/lib/gkrellm2/plugins/ ; \
+-	else \
+-		install -D -c -s -m 644 gkrellaclock.so /usr/lib/gkrellm2/plugins/gkrellaclock.so ; \
+-	fi
+-userinstall:
+-	if [ -d $(HOME)/.gkrellm2/plugins/ ] ; then \
+-		install -c -s -m 644 gkrellaclock.so $(HOME)/.gkrellm2/plugins/ ; \
+-	else \
+-		install -D -c -s -m 644 gkrellaclock.so $(HOME)/.gkrellm2/plugins/gkrellaclock.so ; \
+-	fi
+-
+-uninstall:
+-	rm -f /usr/local/lib/gkrellm2/plugins/gkrellaclock.so
+-	rm -f /usr/lib/gkrellm2/plugins/gkrellaclock.so
+-	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/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild b/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild
new file mode 100644
index 000000000000..ee3d76cde2f7
--- /dev/null
+++ b/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="Nice analog clock for GKrellM2"
+HOMEPAGE="http://www.gkrellm.net/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/a/A}"
+PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
+
+src_prepare() {
+	default
+
+	# The tarball contains a pre-compiled x86 object that needs to be
+	# removed if we're going to build it properly. See bug 166133.
+	rm -f gkrellaclock.o || die 'failed to remove gkrellaclock.o'
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/x11-plugins/gkrellaclock/metadata.xml b/x11-plugins/gkrellaclock/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/gkrellaclock/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellfire/Manifest b/x11-plugins/gkrellfire/Manifest
new file mode 100644
index 000000000000..ea4b343d79db
--- /dev/null
+++ b/x11-plugins/gkrellfire/Manifest
@@ -0,0 +1 @@
+DIST gkrellfire-0.4.2.tgz 12474 BLAKE2B e4c488061e18200fd75cca991032d1d64d0bd36da74aab33b3075cc6e5fae9b890ff3d906713ceb4ce15ffc409fb0916e77e1edcd9b686410bc2c8e637941b9f SHA512 1b7f6229567819092cd2eb2e33e3b7fd8340b0e913f6bcd1d11e9dd604730e3ca4fc1adaa8ae36895d80000f61931da14a586be6929c141c64b8519f8dc328bf
diff --git a/x11-plugins/gkrellfire/files/fix-CC-CFLAGS-LDFLAGS-handling.patch b/x11-plugins/gkrellfire/files/fix-CC-CFLAGS-LDFLAGS-handling.patch
new file mode 100644
index 000000000000..120f459587ba
--- /dev/null
+++ b/x11-plugins/gkrellfire/files/fix-CC-CFLAGS-LDFLAGS-handling.patch
@@ -0,0 +1,69 @@
+From 822bb45acf93b63e59071903aad842a3dd92a915 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Fri, 26 Aug 2016 08:43:12 -0400
+Subject: [PATCH 1/1] Rewrite the Makefile to fix CC, CFLAGS, and LDFLAGS
+ support.
+
+The existing Makefile did not allow the user to set CC, CFLAGS, or
+LDFLAGS (or at least, they were ignored). This was fixed somewhat
+easily by deleting most of the Makefile, and by appending the
+necessary flags to CFLAGS and LDFLAGS. The installation target didn't
+do the right thing anyway, so it has been removed.
+
+The resulting Makefile is probably only useful on Gentoo, but upstream
+is long gone so maybe that's not a problem.
+
+Gentoo-Bug: 335033
+---
+ Makefile | 34 +++++-----------------------------
+ 1 file changed, 5 insertions(+), 29 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7916cab..43a0527 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,36 +1,12 @@
+ GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
+ GTK_LIB = `pkg-config gtk+-2.0 --libs`
+ 
+-INSTALLDIR = /usr/lib/gkrellm2/plugins
+-
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
++CFLAGS += -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
+-LFLAGS = -shared
+-
+-CC = gcc
+-
+-OBJS = gkrellfire.o
+-
+-all: gkrellfire.so
+-
+-%.o: %.c
+-	$(CC) $(CFLAGS) $(FLAGS) -c -o $@ $<
++LDFLAGS += -shared
+ 
+-
+-gkrellfire.so: $(OBJS)
+-	$(CC) $(CFLAGS) $(OBJS) -o gkrellfire.so $(LFLAGS) $(LIBS)
++gkrellfire.so: gkrellfire.o
++	$(CC) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS) $(LIBS)
+ 
+ clean:
+-	rm -f *.o core *.so* *.bak *~
+-
+-gkrellfire.o: gkrellfire.c
+-
+-install:
+-	if [ -d $(INSTALLDIR) ] ; then \
+-		install -c -s -m 644 gkrellfire.so $(INSTALLDIR) ; \
+-	else \
+-		install -D -c -s -m 644 gkrellfire.so $(INSTALLDIR)/gkrellfire.so ; \
+-	fi
+-
+-uninstall:
+-	rm -f $(INSTALLDIR)/gkrellfire.so
++	rm -f gkrellfire.*o
+-- 
+2.7.3
+
diff --git a/x11-plugins/gkrellfire/gkrellfire-0.4.2-r1.ebuild b/x11-plugins/gkrellfire/gkrellfire-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..498b3ae4f309
--- /dev/null
+++ b/x11-plugins/gkrellfire/gkrellfire-0.4.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="CPU load flames for GKrellM 2"
+HOMEPAGE="http://people.freenet.de/thomas-steinke"
+SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/fix-CC-CFLAGS-LDFLAGS-handling.patch )
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/x11-plugins/gkrellfire/metadata.xml b/x11-plugins/gkrellfire/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/gkrellfire/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellkam/Manifest b/x11-plugins/gkrellkam/Manifest
new file mode 100644
index 000000000000..8a7445e96065
--- /dev/null
+++ b/x11-plugins/gkrellkam/Manifest
@@ -0,0 +1 @@
+DIST gkrellkam_2.0.0.tar.gz 27028 BLAKE2B 4bdfb89e2aa0f9001fbaedacb095e868497564612982cd3743547e1070bfbf173be5a441339d32e1be5146a511b840f6fd9a5450edad641895630d33eb5eb554 SHA512 a5a5d0a41de37b006c42150f0388ba573c968679f3f15c6b1d4837361d136cb529c2152723382e99bb46a76be5f1bde641137cea22e07a502402560dcd18699f
diff --git a/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch b/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch
new file mode 100644
index 000000000000..f897f4102b6c
--- /dev/null
+++ b/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch
@@ -0,0 +1,25 @@
+--- a/Makefile
++++ b/Makefile
+@@ -12,10 +12,10 @@
+ # This should point to the GKrellM headers
+ GKRELLM_HDRS = /usr/include
+ 
+-CC := gcc
++CC = $(CC)
+ GTKFLAGS := $(shell pkg-config gtk+-2.0 --cflags)
+-CFLAGS := $(CFLAGS) -fPIC -Wall $(GTKFLAGS) -I$(GKRELLM_HDRS)
+-LDFLAGS := -shared -Wl
++CFLAGS := $(CFLAGS) -fPIC $(GTKFLAGS) -I$(GKRELLM_HDRS)
++LFLAGS = -shared
+ INST_DIR := $(DESTDIR)/usr/lib/gkrellm2/plugins
+ USER_INST_DIR := $(DESTDIR)$(HOME)/.gkrellm2/plugins
+ MANPAGES := gkrellkam-list.5
+@@ -26,7 +26,7 @@
+ all: $(TARGET).so
+ 
+ %.so: %.o
+-	$(CC) $(LDFLAGS) -o $@ $<
++	$(CC) $(CFLAGS) $(LDFLAGS) $(LFLAGS) -o $@ $<
+ 
+ clean:
+ 	-rm -f $(TARGET).so $(TARGET).o
diff --git a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
new file mode 100644
index 000000000000..8368f8cbc6e5
--- /dev/null
+++ b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+MY_P=${P/-/_}
+
+DESCRIPTION="an Image-Watcher-Plugin for GKrellM2"
+SRC_URI="mirror://sourceforge/gkrellkam/${MY_P}.tar.gz"
+HOMEPAGE="http://gkrellkam.sourceforge.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="
+	 app-admin/gkrellm:2[X]
+	 net-misc/wget"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	local PLUGIN_SO=( ${PN}2$(get_modname) )
+	local PLUGIN_DOCS=( example.list )
+
+	gkrellm-plugin_src_install
+	doman gkrellkam-list.5
+}
diff --git a/x11-plugins/gkrellkam/metadata.xml b/x11-plugins/gkrellkam/metadata.xml
new file mode 100644
index 000000000000..54229056b62b
--- /dev/null
+++ b/x11-plugins/gkrellkam/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">gkrellkam</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellm-bgchanger/Manifest b/x11-plugins/gkrellm-bgchanger/Manifest
new file mode 100644
index 000000000000..c198bad2e0f7
--- /dev/null
+++ b/x11-plugins/gkrellm-bgchanger/Manifest
@@ -0,0 +1 @@
+DIST gkrellmbgchg2-0.1.11.tar.gz 24164 BLAKE2B 07b502ee8e86a26cc46b0d136241369cf26daa2c4ece3e2544ae14a6d69e11602e8d549769a342ead71e1838f9cdabf1f47c4ea79b69d65a26aa95411e0e5240 SHA512 648f56260e756d23ce616efb863e5746a7400a3fd7df135fc3b7548ac07ebb058e9c4f7c76af92cc2c4942ba6c1108b6e294b72afe831de6285e2329ca7c4803
diff --git a/x11-plugins/gkrellm-bgchanger/files/gkrellm-bgchanger-0.1.11-fix-build-system.patch b/x11-plugins/gkrellm-bgchanger/files/gkrellm-bgchanger-0.1.11-fix-build-system.patch
new file mode 100644
index 000000000000..30eb43d3b83d
--- /dev/null
+++ b/x11-plugins/gkrellm-bgchanger/files/gkrellm-bgchanger-0.1.11-fix-build-system.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@
+ GTK_INCLUDE = `$(GTK_CONFIG) gtk+-2.0 --cflags`
+ GTK_LIB = `$(GTK_CONFIG) gtk+-2.0 --libs`
+ 
+-GKRELLM_INCLUDE= -I/usr/local/include
++GKRELLM_INCLUDE= -I/usr/include
+ 
+ INSTALL=install -c -m 755
+ 
diff --git a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild
new file mode 100644
index 000000000000..e1853d3a37f8
--- /dev/null
+++ b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+MY_PN="gkrellmbgchg2"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Plugin for GKrellM2 to change your desktop background"
+HOMEPAGE="http://www.bender-suhl.de/stefan/english/comp/gkrellmbgchg.html"
+SRC_URI="http://www.bender-suhl.de/stefan/comp/sources/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.1.11-fix-build-system.patch )
+
+PLUGIN_SO=( gkrellmbgchg$(get_modname) )
+PLUGIN_DOCS=( bgchg_info.sh kdewallpaper.sh )
+
+src_configure() {
+	tc-export CC
+}
diff --git a/x11-plugins/gkrellm-bgchanger/metadata.xml b/x11-plugins/gkrellm-bgchanger/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/gkrellm-bgchanger/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellm-bluez/Manifest b/x11-plugins/gkrellm-bluez/Manifest
new file mode 100644
index 000000000000..785b8af9ddab
--- /dev/null
+++ b/x11-plugins/gkrellm-bluez/Manifest
@@ -0,0 +1 @@
+DIST gkrellm-bluez-0.2.tar.gz 330247 BLAKE2B 8fa585fdd10892018e749428afded5cfb6c94258befedfe2652bcc027210ea9bb0db7379e052b19d6dbeb6c3abdf51be9504078e8e135bb74fce52bcc4febf71 SHA512 56a288874bf7de9f09aaa49a3bbc1ccf71da95dded5baa4af20941866f5acf777234a7726c49d491f252e175fc34266abd068cac0ca204ca6d1785a1d7e230f9
diff --git a/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch b/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch
new file mode 100644
index 000000000000..6a9841652dd2
--- /dev/null
+++ b/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch
@@ -0,0 +1,91 @@
+diff -u --new-file gkrellm-bluez-0.2-orig/src/decal_net_leds.xpm gkrellm-bluez-0.2/src/decal_net_leds.xpm
+--- gkrellm-bluez-0.2-orig/src/decal_net_leds.xpm	1969-12-31 18:00:00.000000000 -0600
++++ gkrellm-bluez-0.2/src/decal_net_leds.xpm	2007-03-08 09:07:50.000000000 -0600
+@@ -0,0 +1,66 @@
++/* XPM */
++static char * decal_net_leds_xpm[] = {
++"10 12 51 1",
++" 	c None",
++".	c #222323",
++"+	c #3A3A3A",
++"@	c #4C4F4F",
++"#	c #3E3F3F",
++"$	c #262727",
++"%	c #334735",
++"&	c #335E4F",
++"*	c #337568",
++"=	c #2C857C",
++"-	c #259790",
++";	c #1EA8A4",
++">	c #18B5B4",
++",	c #20A39E",
++"'	c #2A786D",
++")	c #314E3E",
++"!	c #526E55",
++"~	c #48846F",
++"{	c #3F9988",
++"]	c #36B0A2",
++"^	c #2CC8BF",
++"/	c #22E0DA",
++"(	c #1BF1EF",
++"_	c #25D8D2",
++":	c #3AA595",
++"<	c #4E765F",
++"[	c #141414",
++"}	c #272929",
++"|	c #3D3F3F",
++"1	c #2D2E2E",
++"2	c #171717",
++"3	c #5D421D",
++"4	c #84612F",
++"5	c #AD8643",
++"6	c #D0A456",
++"7	c #CDA255",
++"8	c #BA914B",
++"9	c #A68040",
++"0	c #936E37",
++"a	c #805F2E",
++"b	c #6E5125",
++"c	c #7F643C",
++"d	c #A48350",
++"e	c #CDA666",
++"f	c #F1C479",
++"g	c #EEC277",
++"h	c #DAB16D",
++"i	c #C6A062",
++"j	c #B39058",
++"k	c #A0814F",
++"l	c #8F7345",
++".+@@@@@@#$",
++".+@@@@@@#$",
++".+@@@@@@#$",
++"%&*=-;>,')",
++"!~{]^/(_:<",
++"%&*=-;>,')",
++"[}||||||12",
++"[}||||||12",
++"[}||||||12",
++"34567890ab",
++"cdefghijkl",
++"34567890ab"};
+diff -u --new-file gkrellm-bluez-0.2-orig/src/gkrellm-bluez-chart.c gkrellm-bluez-0.2/src/gkrellm-bluez-chart.c
+--- gkrellm-bluez-0.2-orig/src/gkrellm-bluez-chart.c	2006-11-14 13:50:24.000000000 -0600
++++ gkrellm-bluez-0.2/src/gkrellm-bluez-chart.c	2007-03-08 09:13:29.000000000 -0600
+@@ -22,6 +22,8 @@
+ 
+ #include "gkrellm-bluez-chart.h"
+ 
++#include "decal_net_leds.xpm"
++
+ #define DECAL_NET_LEDS      "decal_net_leds"
+ 
+ #define GRID_RESOLUTION_MIN 0
+@@ -237,7 +239,7 @@
+ 
+     /* Check for theme_dir/net/decal_net_leds.png.
+      */
+-    gkrellm_load_piximage(DECAL_NET_LEDS, NULL,
++    gkrellm_load_piximage(DECAL_NET_LEDS, decal_net_leds_xpm,
+ 			  &decal_net_led_piximage, NET_STYLE_NAME);
+     
+     w = gdk_pixbuf_get_width(decal_net_led_piximage->pixbuf);
diff --git a/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild b/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild
new file mode 100644
index 000000000000..47fafd1df54c
--- /dev/null
+++ b/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin
+
+DESCRIPTION="GKrellm plugin for monitoring bluetooth (Linux BlueZ) adapters"
+SRC_URI="mirror://sourceforge/gkrellm-bluez/${P}.tar.gz"
+HOMEPAGE="http://gkrellm-bluez.sourceforge.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	net-wireless/bluez"
+DEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-notheme.patch )
+
+PLUGIN_SO=( src/.libs/gkrellmbluez$(get_modname) )
+PLUGIN_DOCS=( THEMING NEWS )
+
+src_prepare() {
+	default
+	# Be a bit more future proof, bug #260948
+	sed "s/-Werror//" -i src/Makefile.am src/Makefile.in || die
+}
+
+src_configure() {
+	econf --disable-static
+}
diff --git a/x11-plugins/gkrellm-bluez/metadata.xml b/x11-plugins/gkrellm-bluez/metadata.xml
new file mode 100644
index 000000000000..ce48193112c7
--- /dev/null
+++ b/x11-plugins/gkrellm-bluez/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">gkrellm-bluez</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellm-countdown/Manifest b/x11-plugins/gkrellm-countdown/Manifest
new file mode 100644
index 000000000000..6e9d8b9ea3e4
--- /dev/null
+++ b/x11-plugins/gkrellm-countdown/Manifest
@@ -0,0 +1 @@
+DIST gkrellm-countdown-0.1.2.tar.gz 12482 BLAKE2B eb619cc1da6ef90f843ab2a30e24da63d90988e85b4d48e2425f9c69a77ee64e7eaa674a7bed79da202633037aa56d5dd1f3b1c3ac9895172eed11af4b507dc0 SHA512 974a885ed56ffa95d2b5972fd309721e0043e8798fc1289fbb34bfd0320ec78db7a0572f8e43eee922b2823a2aa80789b8d24fdf106074e683b218e731b6de71
diff --git a/x11-plugins/gkrellm-countdown/files/gkrellm-countdown-makefile.patch b/x11-plugins/gkrellm-countdown/files/gkrellm-countdown-makefile.patch
new file mode 100644
index 000000000000..af241de73e92
--- /dev/null
+++ b/x11-plugins/gkrellm-countdown/files/gkrellm-countdown-makefile.patch
@@ -0,0 +1,40 @@
+This patch is by Michael Mair-Keimberger, as part of bug 339657. It
+teaches the Makefile to support the user's LDFLAGS.
+
+Gentoo-Bug: 339657
+
+--- a/Makefile	2003-12-30 23:07:29.000000000 +0100
++++ b/Makefile	2013-03-16 14:23:47.671010566 +0100
+@@ -9,7 +9,7 @@
+ IMLIB_LIB ?= 
+ PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE)
++FLAGS = -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE)
+ LIBS = $(GTK_LIB) $(IMLIB_LIB)
+ LFLAGS = -shared -lpthread
+ 
+@@ -22,8 +22,8 @@
+ FLAGS += -DPACKAGE="\"$(PACKAGE)\"" 
+ export PACKAGE LOCALEDIR
+ 
+-CC ?= gcc 
+-CC += $(CFLAGS) $(FLAGS)
++
++CC = $(CC)
+ 
+ INSTALL = install -c
+ INSTALL_PROGRAM = $(INSTALL) -s
+@@ -32,8 +32,11 @@
+ 
+ all:	$(BIN_FILENAME).so
+ 
++%.o: %.c
++	$(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) -c -o $@ $<
++
+ $(BIN_FILENAME).so: $(OBJS)
+-	$(CC) $(OBJS) -o $(BIN_FILENAME).so $(LFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) $(OBJS) -o $(BIN_FILENAME).so $(LFLAGS) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
diff --git a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..ba2f0c934ba6
--- /dev/null
+++ b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A simple countdown clock for GKrellM2"
+SRC_URI="http://oss.pugsplace.net/${P}.tar.gz"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/gkrellm-countdown"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
diff --git a/x11-plugins/gkrellm-countdown/metadata.xml b/x11-plugins/gkrellm-countdown/metadata.xml
new file mode 100644
index 000000000000..0252c7ce7ba6
--- /dev/null
+++ b/x11-plugins/gkrellm-countdown/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="freecode">gkrellm-countdown</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellm-cpupower/Manifest b/x11-plugins/gkrellm-cpupower/Manifest
new file mode 100644
index 000000000000..4e4e624a2eba
--- /dev/null
+++ b/x11-plugins/gkrellm-cpupower/Manifest
@@ -0,0 +1 @@
+DIST gkrellm2-cpupower-0.2.tar.gz 14274 BLAKE2B 6ad0c0825743b3c37670e5b3f7390f601ee3ffc012cc658b0fbd72c4a195ec680eaef8a5dc8f9b72a17199a293865007fc60877addf7c811d9735116d600f934 SHA512 80cf86548c8329af41462cb5cdd0de67cfab05d8d9a7c3315fcc662e0b5e511ffc1f46d2eb3ccf13b9f1607c35860921658eb74970c241a4c56b74e32e4f779e
diff --git a/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r1.ebuild b/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r1.ebuild
new file mode 100644
index 000000000000..dcf420b95721
--- /dev/null
+++ b/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin
+
+MY_P="${P/gkrellm/gkrellm2}"
+
+DESCRIPTION="A Gkrellm2 plugin for displaying and manipulating CPU frequency"
+HOMEPAGE="https://github.com/sainsaar/gkrellm2-cpupower/"
+SRC_URI="https://github.com/sainsaar/gkrellm2-cpupower/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-admin/gkrellm:2[X]"
+RDEPEND="
+	${DEPEND}
+	app-admin/sudo
+	sys-power/cpupower"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	local PLUGIN_SO=( cpupower$(get_modname) )
+	gkrellm-plugin_src_install
+	emake DESTDIR="${D}" install-sudo
+}
+
+pkg_postinst() {
+	einfo
+	einfo "For changing the governor and CPU frequencies as a user, create the \"trusted\""
+	einfo "group, and add those users to that group who should be allowed to perform"
+	einfo "these changes."
+	einfo
+}
diff --git a/x11-plugins/gkrellm-cpupower/metadata.xml b/x11-plugins/gkrellm-cpupower/metadata.xml
new file mode 100644
index 000000000000..351c18019e5b
--- /dev/null
+++ b/x11-plugins/gkrellm-cpupower/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sainsaar/gkrellm2-cpupower</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellm-imonc/Manifest b/x11-plugins/gkrellm-imonc/Manifest
new file mode 100644
index 000000000000..73197d15e15a
--- /dev/null
+++ b/x11-plugins/gkrellm-imonc/Manifest
@@ -0,0 +1 @@
+DIST gkrellm-imonc-src-0.2.tar.bz2 19189 BLAKE2B a0a2e48eca12dcdccedbc347e15f3cf72ae7be050e8f4b1ff71a48a2f53b6991119b413333620e9544f25337f966dd16742b280990364a69f9ef45a1a141cbaa SHA512 b6f5d8cfa90c708ed6e43d676c965ef0d850d12497adae35122fe07ac4ea235dd024b8415fbc40cf153e1bbcbeed1e632984b6f1e5ec9079a1fcfce915ace36e
diff --git a/x11-plugins/gkrellm-imonc/files/gkrellm-imonc-makefile.patch b/x11-plugins/gkrellm-imonc/files/gkrellm-imonc-makefile.patch
new file mode 100644
index 000000000000..598e5d8460c7
--- /dev/null
+++ b/x11-plugins/gkrellm-imonc/files/gkrellm-imonc-makefile.patch
@@ -0,0 +1,35 @@
+--- a/Makefile	2003-05-17 20:08:29.000000000 +0200
++++ b/Makefile	2013-03-13 18:24:24.552941672 +0100
+@@ -9,12 +9,10 @@
+ GTK_INCLUDE = $(shell pkg-config gtk+-2.0 --cflags)
+ GTK_LIB = $(shell pkg-config gtk+-2.0 --libs)
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
++FLAGS = -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
+ 
+-LFLAGS = -shared
+-
+-CC = gcc 
++LFLAGS = -shared 
+ 
+ #
+ # files
+@@ -30,7 +28,7 @@
+ 
+ 
+ %.o : %.c
+-	$(CC) $(CFLAGS) $(FLAGS) -c $< -o $@ 
++	$(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) -c $< -o $@ 
+ 
+ 
+ all:
+@@ -41,7 +39,7 @@
+ 
+ $(TARGET): $(OBJECTS)
+ 	@echo -e "\n\n>> linking\n"
+-	$(CC) $(OBJECTS) -o $@ $(LFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) -o $@ $(LFLAGS) $(LIBS)
+ 	@echo -e "\n<< done "
+ 
+ install: gkrellm-imonc.so
diff --git a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild
new file mode 100644
index 000000000000..df78f4badaea
--- /dev/null
+++ b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A GKrellM2 plugin to control a fli4l router"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.bz2"
+HOMEPAGE="http://gkrellm-imonc.sourceforge.net/"
+
+# The COPYING file contains the GPLv2, but the file headers say GPLv2+.
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-src-${PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
diff --git a/x11-plugins/gkrellm-imonc/metadata.xml b/x11-plugins/gkrellm-imonc/metadata.xml
new file mode 100644
index 000000000000..b2d8e11bda24
--- /dev/null
+++ b/x11-plugins/gkrellm-imonc/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">gkrellm-imonc</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellm-leds/Manifest b/x11-plugins/gkrellm-leds/Manifest
new file mode 100644
index 000000000000..f7cd309fdf91
--- /dev/null
+++ b/x11-plugins/gkrellm-leds/Manifest
@@ -0,0 +1 @@
+DIST gkleds-0.8.2.tar.gz 322409 BLAKE2B f5b3303069e923d69ca4c61261428c0d938aa1ed881ea7095ccacac2e01501cd6ec8b71724dc3587c64d79fd7d385532fa296d7127163037415778311f22c0c9 SHA512 0db2f7c62b799c262f1ef3af4bf3eb147717c567862d30c07033b77bc890a33afc40389afd1d4f0a5e05c344d4bc3b12a0b7d2c42044eb4c5be00c5ca5aa7191
diff --git a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..d2d908d099b8
--- /dev/null
+++ b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin
+
+MY_P="${P/rellm-/}"
+
+DESCRIPTION="GKrellM2 plugin for monitoring keyboard LEDs"
+HOMEPAGE="http://heim.ifi.uio.no/~oyvinha/gkleds/"
+SRC_URI="http://heim.ifi.uio.no/~oyvinha/e107_files/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	x11-libs/libXtst"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S="${WORKDIR}/${MY_P}"
+
+PLUGIN_SO=( src/.libs/gkleds$(get_modname) )
diff --git a/x11-plugins/gkrellm-leds/metadata.xml b/x11-plugins/gkrellm-leds/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/gkrellm-leds/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellm-mailwatch/Manifest b/x11-plugins/gkrellm-mailwatch/Manifest
new file mode 100644
index 000000000000..bc94890a34b6
--- /dev/null
+++ b/x11-plugins/gkrellm-mailwatch/Manifest
@@ -0,0 +1 @@
+DIST gkrellm-mailwatch-2.4.3.tar.gz 27407 BLAKE2B 38c9559d2a36872e9c4203c7e6cef8cfaed7f41b944afa0e74091d09f3e812dcd8a59d58a426baa7d51f53bf6763b574aa383e1882b9e48755c880f4665b4dc4 SHA512 31ada9fa55a97a1c76e93f1130b5d84ce3c3db52608aaaeedcd8d482917c53e0c868ca2b61c58da966bdce7de74a88a6bdc5869c40b41e017014f34626df4bb9
diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch
new file mode 100644
index 000000000000..158357dc4855
--- /dev/null
+++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch
@@ -0,0 +1,36 @@
+From 139912e0cf5d9714e5e1fe4576d01251491701f5 Mon Sep 17 00:00:00 2001
+From: Jim Ramsay <jim_ramsay@dell.com>
+Date: Mon, 1 Nov 2010 08:36:17 -0400
+Subject: [PATCH 1/3] Respect LDFLAGS
+
+Instead of using a non-standard varible name like LFLAGS, using LDFLAGS
+lets this play nice with Gentoo's build system.
+---
+ Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b8cf927..02ca376 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,7 +12,7 @@ INSTALL=install -c -m 755
+ 
+ CFLAGS += -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE)
+ LIBS = $(GTK_LIB) $(IMLIB_LIB)
+-LFLAGS += -shared
++LDFLAGS += -shared
+ 
+ LOCALEDIR := $(DESTDIR)/usr/share/locale
+ PACKAGE ?= gkrellm-mailwatch
+@@ -30,7 +30,7 @@ all: mailwatch.so
+ 
+ mailwatch.so: $(OBJS)
+ 	(cd po && ${MAKE})
+-	$(CC) $(CFLAGS) $(OBJS) -o mailwatch.so $(LFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(OBJS) -o mailwatch.so $(LDFLAGS) $(LIBS)
+ 
+ clean:
+ 	(cd po && ${MAKE} clean )
+-- 
+1.7.3.1
+
diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch
new file mode 100644
index 000000000000..7edff1c74990
--- /dev/null
+++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch
@@ -0,0 +1,29 @@
+From c9db9953296709ba3c86a7b0471fcd60469225ed Mon Sep 17 00:00:00 2001
+From: Jim Ramsay <jim_ramsay@dell.com>
+Date: Mon, 1 Nov 2010 08:43:17 -0400
+Subject: [PATCH 2/3] Use gkrellm_gkd_string_width
+
+This wrapper is designed to transition from GdkFont to
+PangoFontDescription.  Without it, there is a warning and a probable
+runtime crash, as we are feeding the wrong structure into
+'gdk_string_width'.
+---
+ mailwatch.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/mailwatch.c b/mailwatch.c
+index 3f0f0a2..5cca01e 100644
+--- a/mailwatch.c
++++ b/mailwatch.c
+@@ -608,7 +608,7 @@ update_plugin(void) {
+ 
+       p->statstext->x_off =
+         gkrellm_chart_width() -
+-        gdk_string_width(p->panel->textstyle->font,
++        gkrellm_gdk_string_width(p->panel->textstyle->font,
+                          buf) -
+         2 * gkrellm_get_style_margins(p->panel->style)->left;
+ 
+-- 
+1.7.3.1
+
diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch
new file mode 100644
index 000000000000..5cc76c6fc828
--- /dev/null
+++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch
@@ -0,0 +1,41 @@
+From 873186988c7b7cbde50d1f44ad0e745ddadf0e18 Mon Sep 17 00:00:00 2001
+From: Jim Ramsay <jim_ramsay@dell.com>
+Date: Mon, 1 Nov 2010 08:44:17 -0400
+Subject: [PATCH 3/3] Remove a few more GCC warnings
+
+These are mostly harmless, but no harm in cleaning them up.
+---
+ mailwatch.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/mailwatch.c b/mailwatch.c
+index 5cca01e..fcb77a8 100644
+--- a/mailwatch.c
++++ b/mailwatch.c
+@@ -198,7 +198,7 @@ check_mh(Mailbox * mbox) {
+     return TRUE;
+ 
+   /* Check the unseen mail */
+-  while (fgets(buf, sizeof(buf), f), !feof(f))
++  while (fgets(buf, sizeof(buf), f) && !feof(f))
+     if (!strncmp(buf, "unseen", sizeof("unseen") - 1)) {
+       found = 1;
+       break;
+@@ -444,12 +444,13 @@ plug_expose_event(GtkWidget * widget, GdkEventExpose * event) {
+ static gint
+ button_release(GtkWidget * widget, GdkEventButton * ev, Mailpanel * panel) {
+   gchar *command;
++  int retcode;
+ 
+   if (panel->command == NULL)
+     return FALSE;
+   command = malloc((strlen(panel->command) + 4) * sizeof(char));
+   strcpy(command, panel->command);
+-  system(strcat(command, " &"));
++  retcode = system(strcat(command, " &"));
+   free(command);
+   return FALSE;
+ }
+-- 
+1.7.3.1
+
diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch
new file mode 100644
index 000000000000..828c9dd2d5f4
--- /dev/null
+++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch
@@ -0,0 +1,28 @@
+From 68bd98eb4144ce1f784e9c7aee4735a3f668453e Mon Sep 17 00:00:00 2001
+From: Jim Ramsay <jim_ramsay@dell.com>
+Date: Mon, 1 Nov 2010 10:11:30 -0400
+Subject: [PATCH 4/4] Do not force -O2 in CFLAGS
+
+Only uses -O2 if the user has not specified any CFLAGS in the
+environment.
+---
+ Makefile |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 02ca376..c4ca35c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,7 +10,8 @@ GKRELLM_INCLUDE= -I/usr/local/include
+ 
+ INSTALL=install -c -m 755
+ 
+-CFLAGS += -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE)
++CFLAGS ?= -O2
++CFLAGS += -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE)
+ LIBS = $(GTK_LIB) $(IMLIB_LIB)
+ LDFLAGS += -shared
+ 
+-- 
+1.7.3.1
+
diff --git a/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r2.ebuild b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r2.ebuild
new file mode 100644
index 000000000000..2fb046fa1453
--- /dev/null
+++ b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A GKrellM2 plugin that shows the status of additional mail boxes"
+SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
+HOMEPAGE="http://gkrellm.luon.net/mailwatch.php"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+PATCHES=(
+	"${FILESDIR}"/2.4.3-0001-Respect-LDFLAGS.patch
+	"${FILESDIR}"/2.4.3-0002-Use-gkrellm_gkd_string_width.patch
+	"${FILESDIR}"/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch
+	"${FILESDIR}"/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch
+)
+
+PLUGIN_SO=( mailwatch$(get_modname) )
+
+src_configure() {
+	tc-export CC
+}
diff --git a/x11-plugins/gkrellm-mailwatch/metadata.xml b/x11-plugins/gkrellm-mailwatch/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/gkrellm-mailwatch/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild b/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild
new file mode 100644
index 000000000000..5bc906f72683
--- /dev/null
+++ b/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="emerge this package to install all of the gkrellm plugins"
+HOMEPAGE="http://gkrellm.srcbox.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~x86"
+IUSE="wifi"
+
+RDEPEND="!<app-admin/gkrellm-2
+	>=x11-plugins/gkrellaclock-0.3.2
+	>=x11-plugins/gkrellkam-2.0.0
+	>=x11-plugins/gkrellm-leds-0.8.0
+	>=x11-plugins/gkrellm-volume-2.1.4
+	>=x11-plugins/gkrellmlaunch-0.5
+	>=x11-plugins/gkrellmoon-0.6
+	wifi? ( >=x11-plugins/gkrellmwireless-2.0.2 )
+	>=x11-plugins/gkrellshoot-0.4.1
+	>=x11-plugins/gkrellstock-0.5
+	>=x11-plugins/gkrellsun-0.12.2
+	x11-plugins/gkrelltop
+	>=x11-plugins/gkrellweather-2.0.6
+	x11-plugins/gkrellm-countdown
+	x11-plugins/gkrellm-trayicons
+"
diff --git a/x11-plugins/gkrellm-plugins/metadata.xml b/x11-plugins/gkrellm-plugins/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/gkrellm-plugins/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellm-radio/Manifest b/x11-plugins/gkrellm-radio/Manifest
new file mode 100644
index 000000000000..74baac57e998
--- /dev/null
+++ b/x11-plugins/gkrellm-radio/Manifest
@@ -0,0 +1 @@
+DIST gkrellm-radio-2.0.4.tar.gz 15685 BLAKE2B c23d9627e503f0853bfd403cbb17c5550cc572540f1e7544179a57501e5793fe19aa654d2b622d34aa68765d89cbc45810b0fececbe9e9a0cfe810795b918406 SHA512 0e5de0cc114c915dcc78f3588766a0a6d9c7bd75da5626fbf7959e539c1f505babc94a0054cceb5a67c8145174d49adb331eefae69ba1637c9121ebd630998de
diff --git a/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch
new file mode 100644
index 000000000000..a5fcabfea07b
--- /dev/null
+++ b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch
@@ -0,0 +1,22 @@
+--- a/Makefile	2003-09-20 13:02:15.000000000 +0200
++++ b/Makefile_new	2013-03-16 14:38:19.122375762 +0100
+@@ -9,8 +9,8 @@
+ 
+ DISTFILES=gkrellm_radio.c radio.c radio.h videodev.h README Makefile CHANGES
+ 
+-CC=gcc
+-LDFLAGS=
++CC=$(CC)
++LDFLAGS=$(LDFLAGS)
+ OBJS=gkrellm_radio.o radio.o
+ PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
+ INSTALL = install -c
+@@ -35,7 +35,7 @@
+ export PACKAGE LOCALEDIR
+ 
+ radio.so: $(OBJS)
+-	$(CC) -shared -Wl -o radio.so $(OBJS) $(LDFLAGS) 
++	$(CC) -shared -o radio.so $(OBJS) $(LDFLAGS) 
+ 	(cd po && ${MAKE} all )
+ 
+ %.o: %.c
diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild
new file mode 100644
index 000000000000..5f7915f98273
--- /dev/null
+++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A minimalistic GKrellM2 plugin to control radio tuners"
+SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
+HOMEPAGE="http://gkrellm.luon.net/gkrellm-radio.php"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ppc sparc x86"
+IUSE="lirc"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	lirc? ( app-misc/lirc )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+PLUGIN_SO=( radio$(get_modname) )
+
+src_compile() {
+	use lirc && myconf="${myconf} WITH_LIRC=1"
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf}
+}
diff --git a/x11-plugins/gkrellm-radio/metadata.xml b/x11-plugins/gkrellm-radio/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/gkrellm-radio/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellm-trayicons/Manifest b/x11-plugins/gkrellm-trayicons/Manifest
new file mode 100644
index 000000000000..059ea7bde841
--- /dev/null
+++ b/x11-plugins/gkrellm-trayicons/Manifest
@@ -0,0 +1 @@
+DIST gkrellm-trayicons-1.03.tar.gz 185474 BLAKE2B b291c13785e7c42e3e14ef987b4c29f47d91f993653653215afb254415827c437be32aec55b2c1465a8c6de9f08bd575c4b394b1d72fa46f5573ff29b57fe31f SHA512 2f80c7b18453b3cd9694dbd9854ab88fa94f4b4de52e779bc2fb7c13633deec096d0ed0146da3d52567569df9466aa64512f870b6e142a784779444a3e6a4a4b
diff --git a/x11-plugins/gkrellm-trayicons/files/gkrellm-trayicons-1.03-ldflags.patch b/x11-plugins/gkrellm-trayicons/files/gkrellm-trayicons-1.03-ldflags.patch
new file mode 100644
index 000000000000..92764a9b32af
--- /dev/null
+++ b/x11-plugins/gkrellm-trayicons/files/gkrellm-trayicons-1.03-ldflags.patch
@@ -0,0 +1,25 @@
+--- a/Makefile	2003-11-26 00:27:29.000000000 +0100
++++ b/Makefile_new	2013-03-15 21:36:05.331857288 +0100
+@@ -6,19 +6,18 @@
+ GKRELLM_INCLUDE = -I$(PREFIX)/include
+ GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
+ GTK_LIB = `$(GTK_CONFIG) --libs`
+-FLAGS = -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+-CFLAGS ?= -O -g
++FLAGS = -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+ CFLAGS += $(FLAGS)
+ CFLAGS += -DVERSION=\"$(VERSION)\"
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+-CC ?= gcc
++CC = $(CC)
+ INSTALL = install -c
+ INSTALL_PROGRAM = $(INSTALL) -s
+ OBJS = trayicons.o
+ 
+ trayicons.so: $(OBJS)
+-	$(CC) $(FLAGS) $(OBJS) -o trayicons.so $(LIBS) $(LFLAGS)
++	$(CC) $(FLAGS) $(LDFLAGS) $(OBJS) -o trayicons.so $(LIBS) $(LFLAGS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
diff --git a/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r1.ebuild b/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r1.ebuild
new file mode 100644
index 000000000000..9600e6cfeb20
--- /dev/null
+++ b/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="Configurable Tray Icons for GKrellM"
+HOMEPAGE="http://gkrellm.srcbox.net/Plugins.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
+
+PLUGIN_SO=( trayicons$(get_modname) )
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
diff --git a/x11-plugins/gkrellm-trayicons/metadata.xml b/x11-plugins/gkrellm-trayicons/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/gkrellm-trayicons/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellm-vaiobright/Manifest b/x11-plugins/gkrellm-vaiobright/Manifest
new file mode 100644
index 000000000000..0877b01f0bd3
--- /dev/null
+++ b/x11-plugins/gkrellm-vaiobright/Manifest
@@ -0,0 +1 @@
+DIST vaiobright-2.5.tar.gz 6178 BLAKE2B ed7add9147db7676e66cd51eee89e60a071896aeb33d1246b45918c2d63bf1b3cb074cb85b404a411e1cf93ffc244b8847b888a4b2f89957e282d4d41757fc0e SHA512 e58b74fe5dedd8ccc69cbcadf4b273aeb0e52fb2619e148121f79c53e41dcbff36e6ddf748b0c24a33e26c6d84ec84cf5e2cfa4d655443b9fe03d6e0150b5c3d
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
new file mode 100644
index 000000000000..f2e4ac4c56e0
--- /dev/null
+++ b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-fixinfo.patch
@@ -0,0 +1,38 @@
+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
+@@ -28,6 +28,7 @@
+ bright or max dark depending on the current value.
+ 
+ Changelog:
++              Sat 20 Mar 2004   Fixed the "Info" tab (Billy Goto)
+ 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
+@@ -422,21 +422,9 @@
+                        (GtkSignalFunc) vaiobright_toggle_toggled, REVERSE_TOGGLE);
+ 
+     /* Help tab */
+-    frame = gtk_frame_new(NULL);
+-    gtk_container_border_width(GTK_CONTAINER(frame),3);
+-    scrolled = gtk_scrolled_window_new(NULL,NULL);
+-    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
+-                                   GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
+-
+-    gtk_container_add(GTK_CONTAINER(frame),scrolled);
+-    label = gtk_label_new("Info");
+-    gtk_notebook_append_page(GTK_NOTEBOOK(tabs),frame,label);
+-
+-    text = gtk_text_view_new();
+-    gtk_text_view_set_editable(GTK_TEXT_VIEW(text),FALSE);
++    vbox = gkrellm_gtk_framed_notebook_page(tabs,"Info");
++    text = gkrellm_gtk_scrolled_text_view(vbox, NULL, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+     vaiobright_create_help_text(text);
+-    gtk_container_add(GTK_CONTAINER(scrolled),text);
+-
+ 
+     /* About tab */
+     plugin_about_text = g_strdup_printf(
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
new file mode 100644
index 000000000000..4cdaa1dd4c8e
--- /dev/null
+++ b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-textrel.patch
@@ -0,0 +1,38 @@
+--- 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
+@@ -1,10 +1,11 @@
+ HOME	= .
+ PREFIX  = /usr
+-CC	= cc
++CC	?= cc
+ INCLUDE	= -I./ -I${PREFIX}/include
+-OPTS	= -shared `pkg-config gtk+-2.0 --cflags`
++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`
+ 
+ GKVO	= vaiobright.o
+ GKV	= vaiobright.so 
+@@ -12,7 +13,7 @@
+ all:	$(GKV)
+ 
+ $(GKV): $(GKVO)
+-	$(CC) $(OPTS) -o $(GKV) $(GKVO) $(LIBS)
++	$(CC) $(LDFLAGS) -o $(GKV) $(GKVO) $(LIBS)
+ 
+ install:
+ 	@-echo "Copy the plugin ($(GKV) to ~/.gkrellm2/plugins/$(GKV) and restart gkrellm."
+@@ -22,9 +23,9 @@
+ 	@-rm *.o *.so
+ 
+ .c.so:	$(DEPEND)
+-	$(CC) $(OPTS) $(INCLUDE) $(DEFINES) -fPIC -c $*.c -o $@ 
++	$(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -fPIC -c $*.c -o $@ 
+ 
+ .c.o:	$(DEPEND)
+-	$(CC) $(OPTS) $(INCLUDE) $(DEFINES) -c $*.c -o $@
++	$(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c $*.c -o $@
+ 
+ .SUFFIXES: .c .so .o
diff --git a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild
new file mode 100644
index 000000000000..efe7712aba51
--- /dev/null
+++ b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin
+
+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/"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}"/${P}-textrel.patch
+	"${FILESDIR}"/${P}-fixinfo.patch
+)
+
+PLUGIN_SO=( vaiobright$(get_modname) )
diff --git a/x11-plugins/gkrellm-vaiobright/metadata.xml b/x11-plugins/gkrellm-vaiobright/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/gkrellm-vaiobright/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellm-volume/Manifest b/x11-plugins/gkrellm-volume/Manifest
new file mode 100644
index 000000000000..f3a24b3a0d32
--- /dev/null
+++ b/x11-plugins/gkrellm-volume/Manifest
@@ -0,0 +1 @@
+DIST gkrellm-volume-2.1.13.tar.gz 42087 BLAKE2B fa4641a9a618ad341c81069231e7edb69390b82f2959f416d1f2c9cb757fd554a942c8e002330af06cca9a53b01525b17a2e913a86bd7a53d3875e43a95c8c5d SHA512 4f244978ea8b68994540b050244350c7c2389b227541822fde009408378ce0511c32956daea205465a4c4890c68e47f64dcd8b3eca8901963d38fd1852526eb5
diff --git a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch
new file mode 100644
index 000000000000..23d822ca7fc8
--- /dev/null
+++ b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch
@@ -0,0 +1,57 @@
+--- a/Makefile	2004-08-19 22:07:27.000000000 +0200
++++ b/Makefile_new	2013-03-16 21:16:03.919755685 +0100
+@@ -3,7 +3,7 @@
+ PACKAGE ?= gkrellm-volume
+ LOCALEDIR ?= /usr/local/share/locale
+ 
+-FLAGS += -DPACKAGE="\"$(PACKAGE)\"" 
++CFLAGS += -DPACKAGE="\"$(PACKAGE)\"" 
+ export PACKAGE LOCALEDIR
+ 
+ GTK_CONFIG = pkg-config gtk+-2.0
+@@ -14,31 +14,32 @@
+ GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
+ GTK_LIB = `$(GTK_CONFIG) --libs`
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
++CFLAGS := $(CFLAGS) -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
++LFLAGS += $(LDFLAGS)
+ 
+ OBJS = volume.o mixer.o oss_mixer.o
+ 
+ ifeq ($(enable_alsa),1)
+-  FLAGS += -DALSA
++  CFLAGS += -DALSA
+   LIBS += -lasound
+   OBJS += alsa_mixer.o 
+ endif
+ 
+ ifeq ($(enable_nls),1)
+-    FLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"
++    CFLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"
+     export enable_nls
+ endif
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
++CC = $(CC)
+ 
+ INSTALL = install -c
+ INSTALL_PROGRAM = $(INSTALL) -s
+ 
+ all:	volume.so
+ 	(cd po && ${MAKE} all )
+-
++	
+ volume.so: $(OBJS)
+ 	$(CC) $(OBJS) -o volume.so $(LIBS) $(LFLAGS)
+ 
+@@ -50,5 +51,4 @@
+ 	(cd po && ${MAKE} install)
+ 	$(INSTALL_PROGRAM) volume.so $(PLUGIN_DIR)
+ 
+-%.c.o: %.c
+-
++%.c.o: %.c
+\ No newline at end of file
diff --git a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch
new file mode 100644
index 000000000000..a3e3218dc02f
--- /dev/null
+++ b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch
@@ -0,0 +1,14 @@
+diff --git a/volume.c b/volume.c
+index 18418d1..58708d4 100644
+--- a/volume.c
++++ b/volume.c
+@@ -74,6 +74,9 @@ static void remove_all_mixers() {
+ static Slider *add_slider(Mixer *m, int dev) {
+   Slider *result,*s;
+   if (dev < 0 || dev >= mixer_get_nr_devices(m->mixer)) return NULL;
++  for (s = m->Sliderz ; s != NULL; s = s->next)
++    if (s->dev == dev)
++      return s;
+   result = malloc(sizeof(Slider));
+   result->mixer = m->mixer;
+   result->parent = m;
diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild
new file mode 100644
index 000000000000..208a9d80056f
--- /dev/null
+++ b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A mixer control plugin for gkrellm"
+HOMEPAGE="http://gkrellm.luon.net/volume.php"
+SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+IUSE="alsa"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	alsa? ( media-libs/alsa-lib )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+PATCHES=(
+	"${FILESDIR}/${P}-reenable.patch"
+	"${FILESDIR}/${P}-makefile.patch"
+)
+
+PLUGIN_SO=( volume$(get_modname) )
+
+src_compile() {
+	use alsa && local myconf="enable_alsa=1"
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf}
+}
diff --git a/x11-plugins/gkrellm-volume/metadata.xml b/x11-plugins/gkrellm-volume/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/gkrellm-volume/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellm-xkb/Manifest b/x11-plugins/gkrellm-xkb/Manifest
new file mode 100644
index 000000000000..9fb7c3f9e7d9
--- /dev/null
+++ b/x11-plugins/gkrellm-xkb/Manifest
@@ -0,0 +1 @@
+DIST gkrellm-xkb-1.05.tar.gz 37775 BLAKE2B 5b074d2777c250d1f7aeca4402401f36f7aed29ca2c7bf286348e73687b85f53b152b4cdb862c38ff7325a718dc694c0a921e8ec3ecefb52ad6646e1345a2101 SHA512 451c66c875af8dcb6998ba1b6242332002328b81112315cd6eee453612cbd8e23f78d7b829224d623cee90b08445b721dfd60e2483a710f4f97860c82654ba2e
diff --git a/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-makefile.patch b/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-makefile.patch
new file mode 100644
index 000000000000..425a0a0417ee
--- /dev/null
+++ b/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-makefile.patch
@@ -0,0 +1,35 @@
+This patch is by Michael Mair-Keimberger, as part of bug 338786. It
+teaches the Makefile to support the user's LDFLAGS.
+
+Gentoo-Bug: 338786
+
+--- a/Makefile	2004-01-05 07:34:36.000000000 +0100
++++ b/Makefile	2013-03-15 22:11:58.105227982 +0100
+@@ -5,18 +5,16 @@
+ GKRELLM_INCLUDE = -I$(PREFIX)/include
+ GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
+ GTK_LIB = `$(GTK_CONFIG) --libs`
+-FLAGS = -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+-CFLAGS ?= -O -g
+-CFLAGS += $(FLAGS)
++FLAGS = -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+-CC ?= gcc
++CC = $(CC)
+ INSTALL = install -c
+ INSTALL_PROGRAM = $(INSTALL) -s
+ PIX = caps_off.xpm caps_on.xpm num_off.xpm num_on.xpm
+ 
+ xkb.so: main.o
+-	$(CC) $(FLAGS) main.o -o xkb.so $(LIBS) $(LFLAGS)
++	$(CC) $(CFLAGS) $(FLAGS) $(LDFLAGS) main.o -o xkb.so $(LIBS) $(LFLAGS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
+@@ -25,4 +23,4 @@
+ 	$(INSTALL_PROGRAM) xkb.so $(PLUGIN_DIR)	
+ 	
+ main.o: main.c $(PIX)
+-	$(CC) $(FLAGS) -c main.c
++	$(CC) $(CFLAGS) $(FLAGS) $(LDFLAGS) -c main.c
diff --git a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild
new file mode 100644
index 000000000000..ab92387a631d
--- /dev/null
+++ b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="XKB keyboard switcher for gkrellm2"
+HOMEPAGE="http://tripie.sweb.cz/gkrellm/xkb/"
+SRC_URI="http://tripie.sweb.cz/gkrellm/xkb/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
+
+PLUGIN_SO=( xkb$(get_modname) )
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
diff --git a/x11-plugins/gkrellm-xkb/metadata.xml b/x11-plugins/gkrellm-xkb/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/gkrellm-xkb/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellmlaunch/Manifest b/x11-plugins/gkrellmlaunch/Manifest
new file mode 100644
index 000000000000..84ef0ce5686a
--- /dev/null
+++ b/x11-plugins/gkrellmlaunch/Manifest
@@ -0,0 +1 @@
+DIST gkrellmlaunch-0.5.tar.gz 22035 BLAKE2B 444dbd76c4bba420d7bd9977f2ce25b9d0260168ea6a730d1fd009eaa0ea064804028c2103efee3afe58b928d858475886fd90c6d77e5a03b3c97ab8bd8c79d2 SHA512 be3a6df6a1648a61103d389dcea24454a142d64b1192156787b42546c485ed592dca916394e46bc0413110a90fa1f4e952fef077e9014274e74610efe8573693
diff --git a/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-makefile.patch b/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-makefile.patch
new file mode 100644
index 000000000000..8b0a4fee6669
--- /dev/null
+++ b/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-makefile.patch
@@ -0,0 +1,35 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,21 +4,25 @@
+ GTK_LIB = `pkg-config gtk+-2.0 --libs`
+ 
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) -g
++FLAGS = -fPIC $(GTK_INCLUDE)
+ #LIBS = $(GTK_LIB) $(IMLIB_LIB) -lefence
+ LIBS = $(GTK_LIB) $(IMLIB_LIB)
+ 
+-LFLAGS = -shared -W1 
++LFLAGS = -shared
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
++CC = $(CC)
+ 
+ OBJS = gkrellmlaunch.o
+ 
++all: gkrellmlaunch.so
++
++%.o: %.c
++	$(CC) $(CFLAGS) $(FLAGS) -c -o $@ $<
++
+ gkrellmlaunch.so: $(OBJS)
+-	$(CC) $(OBJS) -o gkrellmlaunch.so $(LFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) $(OBJS) -o gkrellmlaunch.so $(LFLAGS) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
+ 
+-gkrellmlaunch.o: gkrellmlaunch.c
+-
++gkrellmlaunch.o: gkrellmlaunch.c
+\ No newline at end of file
diff --git a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
new file mode 100644
index 000000000000..cdd4c05c7fd5
--- /dev/null
+++ b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A Program-Launcher Plugin for GKrellM2"
+SRC_URI="mirror://sourceforge/gkrellmlaunch/${P}.tar.gz"
+HOMEPAGE="http://gkrellmlaunch.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
diff --git a/x11-plugins/gkrellmlaunch/metadata.xml b/x11-plugins/gkrellmlaunch/metadata.xml
new file mode 100644
index 000000000000..0086eda0428a
--- /dev/null
+++ b/x11-plugins/gkrellmlaunch/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">gkrellmlaunch</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellmoon/Manifest b/x11-plugins/gkrellmoon/Manifest
new file mode 100644
index 000000000000..6e2131ad6926
--- /dev/null
+++ b/x11-plugins/gkrellmoon/Manifest
@@ -0,0 +1 @@
+DIST gkrellmoon-0.6.tar.gz 55035 BLAKE2B 1b72ffbb3f08bc7264d86cb1ff76ec65d79a5552c4857758ea5caffa8023fc1be4ff9fdfcc812ac48284af66c97fd4e4c6e3c19c0725cb422664621e3bd3a40b SHA512 d0f1008b4501c412817168f751c1d948dc4fdda97572a85c950c7595dfdb0466be964a04ccd8eb31b1bfd83709607fe6cb422ec15d144ef8615dd9700adf127d
diff --git a/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch
new file mode 100644
index 000000000000..4f4bd0e403f3
--- /dev/null
+++ b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch
@@ -0,0 +1,34 @@
+--- a/Makefile	2002-12-11 04:36:06.000000000 +0100
++++ b/Makefile_new	2013-03-16 13:04:00.963512605 +0100
+@@ -4,23 +4,26 @@
+ INSTALLDIR = ${DESTDIR}/usr/lib/gkrellm2/plugins
+ 
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
++FLAGS = -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
++CC = $(CC)
+ 
+ OBJS = gkrellmoon.o MoonRise.o CalcEphem.o Moon.o
+ 
++all: gkrellmoon.so
++
++%.o: %.c
++	$(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) -c -o $@ $<
++
+ gkrellmoon.so: $(OBJS)
+-	$(CC) $(OBJS) -o gkrellmoon.so $(LFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(FLAGS) $(LDFLAGS) $(OBJS) -o gkrellmoon.so $(LFLAGS) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
+ 
+ gkrellmoon.o: gkrellmoon.c moon_60.xpm
+ 
+-# %.o: %.c
+-
+ install: gkrellmoon.so
+ 	install -c -s -m 644 gkrellmoon.so $(INSTALLDIR)
diff --git a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild
new file mode 100644
index 000000000000..cb90c7641420
--- /dev/null
+++ b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A GKrellM2 plugin of the famous wmMoonClock dockapp"
+SRC_URI="mirror://sourceforge/gkrellmoon/${P}.tar.gz"
+HOMEPAGE="http://gkrellmoon.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	media-libs/imlib2"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_prepare() {
+	default
+	sed -i -e '/^#include <stdio.h>/a#include <string.h>' CalcEphem.h || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
diff --git a/x11-plugins/gkrellmoon/metadata.xml b/x11-plugins/gkrellmoon/metadata.xml
new file mode 100644
index 000000000000..1de118b758a1
--- /dev/null
+++ b/x11-plugins/gkrellmoon/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">gkrellmoon</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellmss/Manifest b/x11-plugins/gkrellmss/Manifest
new file mode 100644
index 000000000000..170f19dfe26d
--- /dev/null
+++ b/x11-plugins/gkrellmss/Manifest
@@ -0,0 +1 @@
+DIST gkrellmss-2.6.tar.gz 32082 BLAKE2B 73164229fbbf08fc781bf697653be19a41b63df46ea7fc2aac230c74ad042809f2f33d199a08ccbe20cdb5610ab2350ee32ec2a09803bb71e367d21f18e752bb SHA512 d9773cfed6e4de006df32102419773f9af5047e3fb5e7aa4c7a686b4775c3af30c14321fe404aa65ec27eb13bcd849dbd25ef4eaa2daa723177040da05c74f76
diff --git a/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch b/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch
new file mode 100644
index 000000000000..59f1d0a200f9
--- /dev/null
+++ b/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch
@@ -0,0 +1,25 @@
+From 88d25e2e4fe3edbb832d0bb2b44cd705b060360a Mon Sep 17 00:00:00 2001
+From: Jim Ramsay <lack@gentoo.org>
+Date: Wed, 11 Aug 2010 08:37:20 -0400
+Subject: [PATCH] Respect LDFLAGS
+
+---
+ src/Makefile |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index e618bd4..35a1453 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -78,6 +78,8 @@ LFLAGS = -shared
+ STRIP ?= -s
+ endif
+ 
++LFLAGS += $(LDFLAGS)
++
+ ifeq ($(debug),1)
+ 	FLAGS += -g
+ endif
+-- 
+1.7.2
+
diff --git a/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild b/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild
new file mode 100644
index 000000000000..473087da1408
--- /dev/null
+++ b/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin
+
+DESCRIPTION="A plugin for GKrellM2 that has a VU meter and a sound chart"
+HOMEPAGE="http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html"
+SRC_URI="http://web.wt.net/~billw/gkrellmss/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+IUSE="nls"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	media-libs/alsa-lib
+	sci-libs/fftw:3.0="
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-Respect-LDFLAGS.patch )
+
+PLUGIN_SO=( src/gkrellmss$(get_modname) )
+PLUGIN_DOCS=( Themes )
+
+src_compile() {
+	addpredict /dev/snd
+	emake enable_nls=$(usex nls 1 0)
+}
diff --git a/x11-plugins/gkrellmss/metadata.xml b/x11-plugins/gkrellmss/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/gkrellmss/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellmwireless/Manifest b/x11-plugins/gkrellmwireless/Manifest
new file mode 100644
index 000000000000..aa8c22f0b874
--- /dev/null
+++ b/x11-plugins/gkrellmwireless/Manifest
@@ -0,0 +1 @@
+DIST gkrellmwireless-2.0.3.tar.gz 9557 BLAKE2B 74ad963540597bddadc8a8e110ad441a2341a36b10f8620c392179909fe4582d973f51a4f0ffc2fc552ae1917e1c70373992a3801c9e1fec1f162194749e788c SHA512 7d005502bd65ea16f589f94fba38e67dffec69974177d4e7b83bf50d805e431d64a8cd0795f21547100487a9cb4ed7c01883514cb2d66165f0a7b8aa91162ab1
diff --git a/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-fix-build-system.patch b/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-fix-build-system.patch
new file mode 100644
index 000000000000..eb821e9b2de0
--- /dev/null
+++ b/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-fix-build-system.patch
@@ -0,0 +1,26 @@
+--- a/Makefile
++++ b/Makefile
+@@ -16,12 +16,11 @@
+ GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
+ GTK_LIB = `$(GTK_CONFIG) --libs`
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
++CFLAGS += -Wall -fPIC
++CPPFLAGS += $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
+-
+ OBJS = wireless.o
+ 
+ PLUGIN_DIR = /usr/lib/gkrellm2/plugins
+@@ -32,7 +31,7 @@
+ all:	wireless.so
+ 
+ wireless.so: $(OBJS)
+-	$(CC) $(OBJS) -o wireless.so $(LFLAGS) $(LIBS)
++	$(CC) $(LDFLAGS) $^ -o $@ $(LFLAGS) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild
new file mode 100644
index 000000000000..d3956e0aa0d0
--- /dev/null
+++ b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A plugin for GKrellM that monitors your wireless network card"
+SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
+HOMEPAGE="http://gkrellm.luon.net/gkrellmwireless.php"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}"/${PN}-2.0.3-fix-build-system.patch )
+
+PLUGIN_SO=( wireless$(get_modname) )
+
+src_configure() {
+	tc-export CC
+}
diff --git a/x11-plugins/gkrellmwireless/metadata.xml b/x11-plugins/gkrellmwireless/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/gkrellmwireless/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellshoot/Manifest b/x11-plugins/gkrellshoot/Manifest
new file mode 100644
index 000000000000..ede0643f0e62
--- /dev/null
+++ b/x11-plugins/gkrellshoot/Manifest
@@ -0,0 +1 @@
+DIST gkrellshoot-0.4.4.tar.gz 16556 BLAKE2B 417217ffa500d8b0cc4ddd80849b2da83e3e55bc489db83fd7c8992f42af9ebb385c1ece17cae65cb7393bffadaaffd70e11a4dea16aa4d2b2f19e0b828a6833 SHA512 9363c045a99c23f8fedf95ac82c7bab4ce21acb675fdabdd831f174d9816a14a22ed6d7048d475b4c4199b9e6a88f3f663702ac2f9304f08860339beb323322a
diff --git a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r2.ebuild b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r2.ebuild
new file mode 100644
index 000000000000..ad424be2249b
--- /dev/null
+++ b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin
+
+DESCRIPTION="GKrellm2 plugin to take screen shots and lock screen"
+HOMEPAGE="http://gkrellshoot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gkrellshoot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha amd64 ppc sparc x86"
+IUSE=""
+
+DEPEND="app-admin/gkrellm:2[X]"
+RDEPEND="
+	${DEPEND}
+	virtual/imagemagick-tools"
+
+S=${WORKDIR}/${P/s/S}
diff --git a/x11-plugins/gkrellshoot/metadata.xml b/x11-plugins/gkrellshoot/metadata.xml
new file mode 100644
index 000000000000..18ac1cee7eda
--- /dev/null
+++ b/x11-plugins/gkrellshoot/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">gkrellshoot</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellstock/Manifest b/x11-plugins/gkrellstock/Manifest
new file mode 100644
index 000000000000..5c99b011fa2b
--- /dev/null
+++ b/x11-plugins/gkrellstock/Manifest
@@ -0,0 +1 @@
+DIST gkrellstock-0.5.1.tar.gz 22385 BLAKE2B c948651631aba700a23fd3ef6c74b564662383ee2bb69cf9ee8a3dad2f35d9e45ae6839f0c576aab0f0aa9eb296ba624bf3077ba2312a6b853bf7174fda6a25e SHA512 040e6271a0b0ca3f7be52cc64076a8d1b538fc7607a9ae54acf1c9dc176b094c1483b10c1813a929dcf47dff4fee8c18b7ca58472343c83edfa58a32edc7776c
diff --git a/x11-plugins/gkrellstock/files/gkrellstock-0.5-ldflags.patch b/x11-plugins/gkrellstock/files/gkrellstock-0.5-ldflags.patch
new file mode 100644
index 000000000000..116e6ec3e4bd
--- /dev/null
+++ b/x11-plugins/gkrellstock/files/gkrellstock-0.5-ldflags.patch
@@ -0,0 +1,16 @@
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index eb26b17..79e4391 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,7 +10,7 @@ CC = gcc $(CFLAGS) $(FLAGS)
+ OBJS = gkrellstock.o
+ 
+ gkrellstock.so: $(OBJS)
+-	$(CC) $(OBJS) -o gkrellstock.so $(LFLAGS) $(LIBS) 
++	$(CC) $(LDFLAGS) $(OBJS) -o gkrellstock.so $(LFLAGS) $(LIBS) 
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
diff --git a/x11-plugins/gkrellstock/gkrellstock-0.5.1-r1.ebuild b/x11-plugins/gkrellstock/gkrellstock-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..374d957180b7
--- /dev/null
+++ b/x11-plugins/gkrellstock/gkrellstock-0.5.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="Get Stock quotes plugin for Gkrellm2"
+HOMEPAGE="http://gkrellstock.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gkrellstock/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	dev-perl/libwww-perl
+	dev-perl/Finance-Quote"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${P/s/S}"
+PATCHES=( "${FILESDIR}"/${PN}-0.5-ldflags.patch )
+
+src_configure() {
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags gtk+-2.0)
+	append-flags -fPIC
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	gkrellm-plugin_src_install
+	dobin GetQuote2
+}
diff --git a/x11-plugins/gkrellstock/metadata.xml b/x11-plugins/gkrellstock/metadata.xml
new file mode 100644
index 000000000000..ae4a63c1c081
--- /dev/null
+++ b/x11-plugins/gkrellstock/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="sourceforge">gkrellstock</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellsun/Manifest b/x11-plugins/gkrellsun/Manifest
new file mode 100644
index 000000000000..17b8de5b772d
--- /dev/null
+++ b/x11-plugins/gkrellsun/Manifest
@@ -0,0 +1 @@
+DIST gkrellsun-1.0.0.tar.gz 96970 BLAKE2B aef5bed2a077c7dccb8573bafa9a14df53c52522872d77d08b6a8d29c824d3ef09c54ea5d0b6268dd502508fed264ebc250bd558a602e41dabddab9556158668 SHA512 1a34812e94f16d19311c23d44a0353dade50b802dd3ab115738959b9322c3bc6a28daa2bcea889700e6cc2ff8eb9400b989bf02c6f138bb878b94118ffd6e27a
diff --git a/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-Respect-LDFLAGS.patch b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-Respect-LDFLAGS.patch
new file mode 100644
index 000000000000..548039dd0e0b
--- /dev/null
+++ b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-Respect-LDFLAGS.patch
@@ -0,0 +1,13 @@
+diff --git a/src20/Makefile b/src20/Makefile
+index 3e8e62c..ef96fa2 100644
+--- a/src20/Makefile
++++ b/src20/Makefile
+@@ -16,6 +16,8 @@ FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+ 
++LFLAGS += $(LDFLAGS)
++
+ ifeq ($(enable_nls),1)
+ 	FLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"
+ 	export enable_nls
diff --git a/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-reenable.patch b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-reenable.patch
new file mode 100644
index 000000000000..f47b96e88905
--- /dev/null
+++ b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-reenable.patch
@@ -0,0 +1,16 @@
+diff --git a/src20/gkrellsun.c b/src20/gkrellsun.c
+index f3adff5..0738bfc 100644
+--- a/src20/gkrellsun.c
++++ b/src20/gkrellsun.c
+@@ -1140,7 +1140,10 @@ cb_plugin_disabled()
+ 
+    save_sun_data();
+ 
+-   if (textOptions.fontDesc) pango_font_description_free (textOptions.fontDesc);
++   if (textOptions.fontDesc) {
++      pango_font_description_free (textOptions.fontDesc);
++      textOptions.fontDesc = NULL;
++   }
+ 
+    /* This happens when user quits X Windows and gkrellm2 is still running */
+    if (colormap == NULL)
diff --git a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild
new file mode 100644
index 000000000000..627be679d1b3
--- /dev/null
+++ b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin
+
+DESCRIPTION="A GKrellM plugin that shows sunrise and sunset times"
+HOMEPAGE="http://gkrellsun.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gkrellsun/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86"
+IUSE="nls"
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-reenable.patch
+	"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
+)
+
+PLUGIN_SO=( src20/gkrellsun$(get_modname) )
+
+src_compile() {
+	use nls && local myconf="enable_nls=1"
+	emake ${myconf}
+}
diff --git a/x11-plugins/gkrellsun/metadata.xml b/x11-plugins/gkrellsun/metadata.xml
new file mode 100644
index 000000000000..c6a5a04669e7
--- /dev/null
+++ b/x11-plugins/gkrellsun/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">gkrellsun</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrelltop/Manifest b/x11-plugins/gkrelltop/Manifest
new file mode 100644
index 000000000000..d93db9f22285
--- /dev/null
+++ b/x11-plugins/gkrelltop/Manifest
@@ -0,0 +1 @@
+DIST gkrelltop_2.2.13.orig.tar.gz 49023 BLAKE2B d2857b6d73fca2a2933f4bcaa207dbf34f9bbc2bb9de922d564a865d2238b91d9bbcfbdf5753d7976d941d9ba98c9e7b81812018a2d9d1ac07984e26c3317382 SHA512 9479c5b860833671451b6fb8583e741b1ac755ed76b7e73dffd65d13d30d0b5da1916436901642f738e0d72f8c8696f4dea9c041a203e76d309f2782acf7024e
diff --git a/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-fix-build-system.patch b/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-fix-build-system.patch
new file mode 100644
index 000000000000..9eaa9cc3d4e8
--- /dev/null
+++ b/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-fix-build-system.patch
@@ -0,0 +1,41 @@
+--- a/Makefile
++++ b/Makefile
+@@ -45,11 +45,10 @@
+ # Parameters for gkrellm version 2.*
+ CFLAGS2 = -g -D$(OSFLAG) -DGKRELLM2 -fPIC -Wall `pkg-config gtk+-2.0 --cflags`
+ LIBS =  
+-CC=/usr/bin/gcc $(CFLAGS2)
++CC += $(CFLAGS) $(CFLAGS2)
+ 
+ else 
+ # Parameters for gkrellm version 1.*
+-CC=/usr/bin/cc
+ CFLAGS = -D$(OSFLAG) -Wall -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk` 
+ LIBS=
+ 
+@@ -78,7 +77,7 @@
+ ifeq ($(INSTALLDIRD),)
+ 	INSTALLDIRD=$(HOME)/.gkrellm2/plugins-gkrellmd
+ endif
+-CCD=/usr/bin/gcc $(CFLAGSD)
++CCD = $(CC) $(CFLAGS) $(CFLAGSD)
+ OBJD = gkrelltopd.o top_three.o
+ 
+ DUMMY_VAR := $(shell ./configure $(CONFIGURE_ARGS))
+@@ -100,14 +99,14 @@
+ warn: ; $(WARN)
+ 
+ $(GKRELLTOP): $(OBJ) warn
+-	$(CC)  -shared $(OBJ) -o $(GKRELLTOP) 
++	$(CC)  $(LDFLAGS) -shared $(OBJ) -o $(GKRELLTOP) 
+ 
+ # Compile gkrelltopd.so server plugin
+ server: $(GKRELLTOPD) warn
+ 	@echo ""
+ 
+ $(GKRELLTOPD): $(OBJD) 
+-	$(CCD)  $(LIBSD) -shared $(OBJD) -o $(GKRELLTOPD)
++	$(CCD)  $(LIBSD) $(LDFLAGS) -shared $(OBJD) -o $(GKRELLTOPD)
+ 
+ gkrelltop.o: gkrelltop.c
+ 	$(CC) -c gkrelltop.c -o gkrelltop.o
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild
new file mode 100644
index 000000000000..059b7d824e5b
--- /dev/null
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
+HOMEPAGE="https://sourceforge.net/projects/gkrelltop"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="X"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	dev-libs/glib:2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}.orig
+PATCHES=( "${FILESDIR}"/${PN}-2.2.13-fix-build-system.patch )
+
+PLUGIN_SERVER_SO=( gkrelltopd$(get_modname) )
+PLUGIN_SO=( gkrelltop$(get_modname) )
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	use X || local target="server"
+	emake ${target}
+}
+
+pkg_postinst() {
+	einfo "To enable the gkrelltopd server plugin, you must add the following"
+	einfo "line to /etc/gkrellmd.conf:"
+	einfo "\tplugin-enable gkrelltopd"
+}
diff --git a/x11-plugins/gkrelltop/metadata.xml b/x11-plugins/gkrelltop/metadata.xml
new file mode 100644
index 000000000000..4764dfd621c6
--- /dev/null
+++ b/x11-plugins/gkrelltop/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">gkrelltop</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkrellweather/Manifest b/x11-plugins/gkrellweather/Manifest
new file mode 100644
index 000000000000..cc499c8f001b
--- /dev/null
+++ b/x11-plugins/gkrellweather/Manifest
@@ -0,0 +1 @@
+DIST gkrellweather-2.0.8.tgz 20227 BLAKE2B 7c3fd369e323229359bc397e07b422b625a14038aff573cf7c3fd6218c733a1d69f5754dcb86ab2172a8a5ae08fbab022a87100a6422c5e8b3b3068e108fd9a7 SHA512 da9408ebc9518fe805d3f0dd9496b4aeb805a2ab6566b619b61fc25c91122c0ee45e2a7b804206b2ee08300309dd9b1e1c3b6605a41c594cf75fd39b58767264
diff --git a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch
new file mode 100644
index 000000000000..5e2eb95e33fc
--- /dev/null
+++ b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch
@@ -0,0 +1,56 @@
+From dc0fed370865b49e9bcb2db2eb7ff21adec904a8 Mon Sep 17 00:00:00 2001
+From: Jim Ramsay <lack@gentoo.org>
+Date: Tue, 24 Aug 2010 12:23:25 -0400
+Subject: [PATCH] Move GrabWeather script to $(PREFIX)/libexec/gkrellweather/
+
+This is to avoid a file collision with x11-misc/bbweather (Bug #333289)
+---
+ Makefile        |    4 ++--
+ gkrellweather.c |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d6dc404..693b4f2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -38,13 +38,13 @@ install:
+ 	else \
+ 		install -D -c -s -m 644 gkrellweather.so $(PREFIX)/lib/gkrellm2/plugins/gkrellweather.so ; \
+ 	fi
+-	install -c -m 755 GrabWeather $(PREFIX)/bin
++	install -D -c -m 755 GrabWeather $(PREFIX)/libexec/gkrellweather/
+ 
+ uninstall:
+ 	(cd po && ${MAKE} uninstall )
+ 	rm -f /usr/lib/gkrellm2/plugins/gkrellweather.so
+ 	rm -f $(PREFIX)/lib/gkrellm2/plugins/gkrellweather.so
+-	rm -f $(PREFIX)/bin/GrabWeather
++	rm -f $(PREFIX)/libexec/gkrellweather/GrabWeather
+ 
+ dist:
+ 	rm -rf $(PKGNAME)-$(VERSION)
+diff --git a/gkrellweather.c b/gkrellweather.c
+index 1d4cf4e..224260a 100644
+--- a/gkrellweather.c
++++ b/gkrellweather.c
+@@ -721,7 +721,7 @@ apply_air_config (void)
+         options.station[1] = c[1];
+         options.station[2] = c[2];
+         options.station[3] = c[3];
+-        snprintf(options.command, 512, PREFIX "/bin/GrabWeather %s", options.station);
++        snprintf(options.command, 512, PREFIX "/libexec/gkrellweather/GrabWeather %s", options.station);
+         options.command[511] = 0;
+         snprintf(options.filename, 512, "%s/.wmWeatherReports/%s.dat",
+                 getenv("HOME"), options.station);
+@@ -986,7 +986,7 @@ read_default(void)
+     options.windspeed_unit = 1;
+     options.pressure_unit = 1;
+     strcpy(options.station, DEFAULT_STATION_ID);
+-    snprintf(options.command, 512, "/usr/share/gkrellm/GrabWeather %s", options.station);
++    snprintf(options.command, 512, PREFIX "/libexec/gkrellweather/GrabWeather %s", options.station);
+     options.command[511] = 0;
+     snprintf(options.filename, 512, "%s/.wmWeatherReports/%s.dat",
+              getenv("HOME"), options.station);
+-- 
+1.7.2
+
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
new file mode 100644
index 000000000000..9256cdd919c8
--- /dev/null
+++ b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Respect-LDFLAGS.patch
@@ -0,0 +1,25 @@
+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`
+ LFLAGS = -shared
+ PREFIX = /usr/local
+ 
++LFLAGS += $(LDFLAGS)
++
+ LOCALEDIR := $(PREFIX)/share/locale
+ 
+ ifeq ($(enable_nls),1)
+-- 
+1.7.2
+
diff --git a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-update-locations.patch b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-update-locations.patch
new file mode 100644
index 000000000000..0faf2627170f
--- /dev/null
+++ b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-update-locations.patch
@@ -0,0 +1,12 @@
+--- gkrellweather-2.0.8/GrabWeather	2009-01-11 13:15:02.000000000 -0500
++++ gkrellweather-2.0.8-r1/GrabWeather	2016-08-29 00:02:35.345041005 -0400
+@@ -12,7 +12,8 @@
+ 
+ $ReportDir  = '.wmWeatherReports';
+ #$WeatherSrc = 'ftp://weather.noaa.gov/data/observations/metar/decoded';
+-$WeatherSrc = 'http://weather.noaa.gov/pub/data/observations/metar/decoded';
++#$WeatherSrc = 'http://weather.noaa.gov/pub/data/observations/metar/decoded';
++$WeatherSrc = 'http://tgftp.nws.noaa.gov/data/observations/metar/decoded/';
+ 
+ use strict; 
+ use vars qw( $ReportDir $WeatherSrc );
diff --git a/x11-plugins/gkrellweather/gkrellweather-2.0.8-r1.ebuild b/x11-plugins/gkrellweather/gkrellweather-2.0.8-r1.ebuild
new file mode 100644
index 000000000000..4e0e596730f9
--- /dev/null
+++ b/x11-plugins/gkrellweather/gkrellweather-2.0.8-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="GKrellM2 Plugin that monitors a METAR station and displays weatherinfo"
+HOMEPAGE="https://sites.google.com/site/makovick/gkrellm-plugins"
+SRC_URI="https://sites.google.com/site/makovick/projects/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	dev-lang/perl
+	net-misc/wget
+	x11-libs/gtk+:2"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
+	"${FILESDIR}"/${P}-Move-GrabWeather.patch
+	"${FILESDIR}"/${P}-update-locations.patch
+)
+
+src_configure() {
+	append-cflags $($(tc-getPKG_CONFIG) --cflags gtk+-2.0)
+	append-flags -fPIC
+}
+
+src_compile() {
+	emake PREFIX="${EPREFIX}"/usr CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	gkrellm-plugin_src_install
+
+	exeinto /usr/libexec/gkrellweather
+	doexe GrabWeather
+}
diff --git a/x11-plugins/gkrellweather/metadata.xml b/x11-plugins/gkrellweather/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/gkrellweather/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/gkwebmon/Manifest b/x11-plugins/gkwebmon/Manifest
new file mode 100644
index 000000000000..d8d8da7ff8de
--- /dev/null
+++ b/x11-plugins/gkwebmon/Manifest
@@ -0,0 +1 @@
+DIST gkwebmon-0.2.tgz 14163 BLAKE2B c6c0c9352e2f68eca56f981abb8188a7a300604c8c0fc05c1b0b95f0cdc117c12e55aeace66f9c3dcc16a13acb2b44683a77de36a83d9e9b7c273ec619173235 SHA512 0af4eaa8636b43232e209e6381a3852eb92b9505da4b19e31137766f4bee7977bf4e4bed40518df0fcc3aef2dc62767c85169e70f1fbfc738bb428ae8affac63
diff --git a/x11-plugins/gkwebmon/files/respect-cc-cflags-ldflags.patch b/x11-plugins/gkwebmon/files/respect-cc-cflags-ldflags.patch
new file mode 100644
index 000000000000..7b3ee50f5321
--- /dev/null
+++ b/x11-plugins/gkwebmon/files/respect-cc-cflags-ldflags.patch
@@ -0,0 +1,48 @@
+From ef7dcbf8495d03c8cf96d4fb30adf38b15e1ca74 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 29 Aug 2016 20:44:45 -0400
+Subject: [PATCH 1/1] Clean up variable usage in Makefile to support LDFLAGS
+ and friends.
+
+---
+ Makefile | 18 +++++++-----------
+ 1 file changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b422e79..d89977f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,23 +3,19 @@
+ 
+ PLUGIN_DIR = /usr/local/lib/gkrellm2/plugins
+ 
+-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)
+ 
+ 
+-#FLAGS = -O2 -Wall -fPIC -std=c99 -pedantic $(GTK_INCLUDE)
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
+-LIBS = $(GTK_LIB)
+-
+-LFLAGS = -shared -lssl -lpthread
+-
+-CC = gcc $(CFLAGS) $(FLAGS)
+-#CC = gcc -DDEBUG $(CFLAGS) $(FLAGS)
++CFLAGS += -Wall -fPIC
++CPPFLAGS += $(GTK_INCLUDE)
++LDLIBS += $(GTK_LIB) -lssl -lpthread
++LDFLAGS += -shared
+ 
+ OBJS = webmon.o gk.o
+ 
+ gkwebmon.so: $(OBJS)
+-	$(CC) $(OBJS) -o gkwebmon.so $(LFLAGS) $(LIBS)
++	$(CC) $(OBJS) -o $(@) $(LDFLAGS) $(LDLIBS)
+ 
+ install: gkwebmon.so
+ 	install gkwebmon.so $(PLUGIN_DIR)
+-- 
+2.7.3
+
diff --git a/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild b/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
new file mode 100644
index 000000000000..d7fc617e9437
--- /dev/null
+++ b/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A web monitor plugin for GKrellM2"
+HOMEPAGE="http://gkwebmon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ppc ~sparc x86"
+IUSE=""
+
+# The Makefile links with -lssl.
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/respect-cc-cflags-ldflags.patch )
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/x11-plugins/gkwebmon/metadata.xml b/x11-plugins/gkwebmon/metadata.xml
new file mode 100644
index 000000000000..6142b9f6eda1
--- /dev/null
+++ b/x11-plugins/gkwebmon/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">gkwebmon</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/guifications/Manifest b/x11-plugins/guifications/Manifest
new file mode 100644
index 000000000000..a33a247bf991
--- /dev/null
+++ b/x11-plugins/guifications/Manifest
@@ -0,0 +1 @@
+DIST pidgin-guifications-2.16.tar.bz2 543136 BLAKE2B dd34108210914386dbd2780b4f2a23cb615a51e8cabe39e16867721815b017b8f897906e06eb7cef1cb96e60e70ce3c02ad20d8a1a906159848cfaf64eaa7b76 SHA512 fee1741a37df102ed3620caed9024c1a2ac5919c1a9c4182bdb19685a4d3412a1ff72e5e58ce65fdc2689f1d90432ea22c3912a9ecda80a95af96d57c86c9cf0
diff --git a/x11-plugins/guifications/guifications-2.16.ebuild b/x11-plugins/guifications/guifications-2.16.ebuild
new file mode 100644
index 000000000000..f6ac6a1017d6
--- /dev/null
+++ b/x11-plugins/guifications/guifications-2.16.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=pidgin-${PN}
+MY_PV=${PV/_beta/beta}
+MY_P=${MY_PN}-${MY_PV}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Guifications is a graphical notification plugin for pidgin"
+HOMEPAGE="http://plugins.guifications.org/"
+SRC_URI="http://downloads.guifications.org/plugins//Guifications2/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="debug nls"
+
+RDEPEND="net-im/pidgin[gtk]
+	x11-libs/gtk+:2"
+
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_enable debug ) \
+		$(use_enable nls)
+}
diff --git a/x11-plugins/guifications/metadata.xml b/x11-plugins/guifications/metadata.xml
new file mode 100644
index 000000000000..2b28086cf0e4
--- /dev/null
+++ b/x11-plugins/guifications/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>Guifications are graphical notification plugin for the open source instant message client gaim</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/hexchat-javascript/Manifest b/x11-plugins/hexchat-javascript/Manifest
new file mode 100644
index 000000000000..e1d2d22ca393
--- /dev/null
+++ b/x11-plugins/hexchat-javascript/Manifest
@@ -0,0 +1,2 @@
+DIST hexchat-javascript-0.3.1.tar.gz 27150 BLAKE2B 6e898483cfb620477cacd423d70d08bd3343b423efce4f858026fc22ce8eb92d76dfd746fd30a8996c1a64377cc67b1578e77571ca6079dbc41f43645f91c824 SHA512 8a59d26d9aa4fba19f3058b646a0a7da4facb936a88cec9a8f7c8f4ff4a865263665377edec5acbc33890786b7d576667d39323ba35e9b0ce05dc4d132a50502
+DIST hexchat-javascript-0.3.2.tar.gz 27542 BLAKE2B ebd5ddef39a744a3149f562ad235ecd97fef3326e13558a00f9308ff7a078bf03d64564198e003d7730e55c20df6a48a0bab9b3fba66be57d032548c614d23e5 SHA512 2829ddda5d35e50c4528b56c898c96a51d5b416d55e1631f97104fa8326952ae2bde041d07d9ef652a3b92a7d33ae99307d30605c2deaacd317e71599c9708a0
diff --git a/x11-plugins/hexchat-javascript/hexchat-javascript-0.3.1.ebuild b/x11-plugins/hexchat-javascript/hexchat-javascript-0.3.1.ebuild
new file mode 100644
index 000000000000..7756e2e41eda
--- /dev/null
+++ b/x11-plugins/hexchat-javascript/hexchat-javascript-0.3.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Javascript interface for HexChat"
+HOMEPAGE="https://github.com/TingPing/hexchat-javascript"
+SRC_URI="https://github.com/TingPing/hexchat-javascript/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-lang/spidermonkey:0
+	>=net-irc/hexchat-2.9.6[plugins(+)]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		tc-export CXX PKG_CONFIG
+	fi
+}
+
+src_install() {
+	default
+	if use examples ; then
+		dodoc -r examples
+	fi
+}
diff --git a/x11-plugins/hexchat-javascript/hexchat-javascript-0.3.2.ebuild b/x11-plugins/hexchat-javascript/hexchat-javascript-0.3.2.ebuild
new file mode 100644
index 000000000000..65978b6b7f10
--- /dev/null
+++ b/x11-plugins/hexchat-javascript/hexchat-javascript-0.3.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Javascript interface for HexChat"
+HOMEPAGE="https://github.com/TingPing/hexchat-javascript"
+SRC_URI="https://github.com/TingPing/hexchat-javascript/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-lang/spidermonkey:0
+	>=net-irc/hexchat-2.9.6[plugins(+)]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		tc-export CXX PKG_CONFIG
+	fi
+}
+
+src_install() {
+	dodir /usr/share/appdata
+	default
+	if use examples ; then
+		dodoc -r examples
+	fi
+}
diff --git a/x11-plugins/hexchat-javascript/metadata.xml b/x11-plugins/hexchat-javascript/metadata.xml
new file mode 100644
index 000000000000..a0fe8a352f18
--- /dev/null
+++ b/x11-plugins/hexchat-javascript/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!--maintainer-needed-->
+	<upstream>
+		<maintainer status="active">
+			<email>tingping@fedoraproject.org</email>
+			<name>TingPing</name>
+		</maintainer>
+		<bugs-to>https://github.com/TingPing/hexchat-javascript/issues</bugs-to>
+		<doc lang="en">https://github.com/TingPing/hexchat-javascript/wiki</doc>
+		<remote-id type="github">TingPing/hexchat-javascript</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/i8krellm/Manifest b/x11-plugins/i8krellm/Manifest
new file mode 100644
index 000000000000..b84cffe0cd27
--- /dev/null
+++ b/x11-plugins/i8krellm/Manifest
@@ -0,0 +1 @@
+DIST i8krellm-2.5.tar.gz 15378 BLAKE2B be6af7ce0ee2986fd5463fba2b747721407fe3d06bcd1ae7e30dc273a883fd2f9a092ab73b97b6f7d20dd87454eec28db9e12d701dcaec4dda9267af889e662b SHA512 d1cd452fc83c24369b4773d959e0182bd5c7fe317bed6a1df716c1576f5ba078a4e82d202ff641f0784532b77a51d466e57ffc675895a1875a868d92caf79576
diff --git a/x11-plugins/i8krellm/files/i8krellm-2.5-Respect-LDFLAGS.patch b/x11-plugins/i8krellm/files/i8krellm-2.5-Respect-LDFLAGS.patch
new file mode 100644
index 000000000000..bc740a415e35
--- /dev/null
+++ b/x11-plugins/i8krellm/files/i8krellm-2.5-Respect-LDFLAGS.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile b/Makefile
+index 443a911..ba83210 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,6 +3,7 @@
+ # 
+ 
+ LFLAGS = -shared
++LFLAGS += $(LDFLAGS)
+ 
+ 
+ ## Support for GKrellM 2.0
diff --git a/x11-plugins/i8krellm/i8krellm-2.5-r2.ebuild b/x11-plugins/i8krellm/i8krellm-2.5-r2.ebuild
new file mode 100644
index 000000000000..3940327a3c51
--- /dev/null
+++ b/x11-plugins/i8krellm/i8krellm-2.5-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gkrellm-plugin
+
+DESCRIPTION="GKrellM2 Plugin for the Dell Inspiron and Latitude notebooks"
+SRC_URI="http://www.coding-zone.com/${P}.tar.gz"
+HOMEPAGE="http://www.coding-zone.com/?page=i8krellm"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	>=app-laptop/i8kutils-1.5"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-Respect-LDFLAGS.patch )
diff --git a/x11-plugins/i8krellm/metadata.xml b/x11-plugins/i8krellm/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/i8krellm/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/lurch/Manifest b/x11-plugins/lurch/Manifest
new file mode 100644
index 000000000000..124d5219be31
--- /dev/null
+++ b/x11-plugins/lurch/Manifest
@@ -0,0 +1 @@
+DIST lurch-0.6.8.tar.gz 398267 BLAKE2B 23211e82b80e26105f0d62510dc321abdd818eae21dd9f3e24f6ab01458748df64283acb99371a8ece34248f06e9e04edd35da30c771f45779474b3b43c3a53d SHA512 8b93523049d05a00f1d7286ec9d0d8d03c7ae46793ac72ea08c0d12cb5193324be4805fb6278d6c0f906d9c63db9d7ce6ca2a21442236df51e0ee0b48de6ef1d
diff --git a/x11-plugins/lurch/lurch-0.6.8.ebuild b/x11-plugins/lurch/lurch-0.6.8.ebuild
new file mode 100644
index 000000000000..cb4e4a97bace
--- /dev/null
+++ b/x11-plugins/lurch/lurch-0.6.8.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CMAKE_MAKEFILE_GENERATOR=emake  # since top-level Makefile expects a child Makefile
+
+inherit toolchain-funcs cmake-utils
+
+DESCRIPTION="OMEMO encryption for libpurple (XEP-0384)"
+HOMEPAGE="https://github.com/gkdr/lurch"
+SRC_URI="https://github.com/gkdr/lurch/releases/download/v${PV}/lurch-${PV}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# NOTE
+# - We cannot unbundle net-libs/libsignal-protocol-c
+#   because upstream uses non-API/internal function
+#   session_builder_process_pre_key_signal_message
+# - The build systems of axc (ex-libaxolotl)
+#   at https://github.com/gkdr/axc and libomemo
+#   at https://github.com/gkdr/libomemo build static
+#   libraries only (*.a) so it is not clear when or
+#   how to best unbundle them, either
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib
+	dev-libs/libgcrypt:=
+	dev-libs/libxml2
+	dev-libs/mxml
+	net-im/pidgin:=
+	"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	"
+
+CMAKE_USE_DIR="${S}"/lib/axc/lib/libsignal-protocol-c
+BUILD_DIR="${CMAKE_USE_DIR}"/build
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF  # top-level Makefile expects .a file
+		-DCMAKE_C_FLAGS=-fPIC
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		LIBGCRYPT_CONFIG="$(tc-getPROG LIBGCRYPT_CONFIG libgcrypt-config)"
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		XML2_CONFIG="$(tc-getPROG XML2_CONFIG xml2-config)"
+
+		CMAKE=/bin/true  # to stop Makefile from calling CMake, once more
+	)
+	emake "${makeargs[@]}"
+}
+
+src_install() {
+	default  # use top-level Makefile, not cmake-utils_src_install
+}
diff --git a/x11-plugins/lurch/metadata.xml b/x11-plugins/lurch/metadata.xml
new file mode 100644
index 000000000000..bb226794abb7
--- /dev/null
+++ b/x11-plugins/lurch/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/metadata.xml b/x11-plugins/metadata.xml
new file mode 100644
index 000000000000..5c4b98e8113d
--- /dev/null
+++ b/x11-plugins/metadata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The x11-plugins category contains plugin packages for various X11
+		applications.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie x11-plugins enthält Plugins für verschiedene 
+		X11-Applikationen.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría x11-plugins contiene paquetes de extensiones para
+		varias aplicaciones X11.
+	</longdescription>
+	<longdescription lang="ja">
+		x11-pluginsカテゴリーには様々なX11アプリケーションの
+		プラグイン・パッケージが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De x11-plugins categorie bevat plugins voor verschillende 
+		X11-applicaties.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm x11-plugins chứa các gói plugin cho các ứng dụng X11 khác nhau.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria x11-plugins contiene plugins per varie applicazioni X11.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria x11-plugins contém pacotes de plugins para várias
+		aplicações X11.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria x11-plugins zawiera rozszerzenia dla aplikacji X11.
+	</longdescription>
+</catmetadata>
+
diff --git a/x11-plugins/pidgin-birthday-reminder/Manifest b/x11-plugins/pidgin-birthday-reminder/Manifest
new file mode 100644
index 000000000000..639b877d7be2
--- /dev/null
+++ b/x11-plugins/pidgin-birthday-reminder/Manifest
@@ -0,0 +1 @@
+DIST pidgin-birthday-reminder-1.7.tar.gz 470361 BLAKE2B ea97e495fa04b5a4860b5363034058defcecd0ae7d911ed2f0eb0e56331ece6d66063ae83a2ec0fd346d935a122b35f45818f58755676c7fc598bbd52e5be5be SHA512 1213c193b141f006caf9cfa7b55b052f54f00426414353e758224a1aa35a70436c452b52ea25fa088c346f4f0da25af40b2f4991452a2d3aabf13d40c8438e47
diff --git a/x11-plugins/pidgin-birthday-reminder/metadata.xml b/x11-plugins/pidgin-birthday-reminder/metadata.xml
new file mode 100644
index 000000000000..8c2d82609804
--- /dev/null
+++ b/x11-plugins/pidgin-birthday-reminder/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<bugs-to>https://bugs.launchpad.net/pidgin-birthday-reminder</bugs-to>
+		<remote-id type="launchpad">pidgin-birthday-reminder</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-birthday-reminder/pidgin-birthday-reminder-1.7-r1.ebuild b/x11-plugins/pidgin-birthday-reminder/pidgin-birthday-reminder-1.7-r1.ebuild
new file mode 100644
index 000000000000..27bae531e0e7
--- /dev/null
+++ b/x11-plugins/pidgin-birthday-reminder/pidgin-birthday-reminder-1.7-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Plugin for Pidgin that reminds you of your buddies birthdays"
+HOMEPAGE="https://launchpad.net/pidgin-birthday-reminder"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="static-libs"
+
+RDEPEND="net-im/pidgin[gtk]"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	if ! use static-libs ; then
+		find "${D}" -type f -name '*.la' -delete || die "la removal failed"
+	fi
+}
diff --git a/x11-plugins/pidgin-bot-sentry/Manifest b/x11-plugins/pidgin-bot-sentry/Manifest
new file mode 100644
index 000000000000..403437abc061
--- /dev/null
+++ b/x11-plugins/pidgin-bot-sentry/Manifest
@@ -0,0 +1 @@
+DIST bot-sentry-1.3.0.tar.bz2 280673 BLAKE2B 30dd8b7811b6cb6e9779fd15cb32f94c7f01302ccb1c827aa9033c1784d5ea501a569561419796fcedfabf2e6e9cf64e3bf8f0f311e272327c534cde6237567b SHA512 ec665eee2f9b64eccabd10116cb1d1e4be046bc9a6132cb815373be915d265b29b33d41298047f82f920f5daac70a966169ecb201450ba47d76d090c581ee788
diff --git a/x11-plugins/pidgin-bot-sentry/metadata.xml b/x11-plugins/pidgin-bot-sentry/metadata.xml
new file mode 100644
index 000000000000..c3e1030f2d0f
--- /dev/null
+++ b/x11-plugins/pidgin-bot-sentry/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<longdescription lang="en">
+		Bot Sentry is a Pidgin (libpurple) plugin to prevent Instant Message (IM)
+		spam. It allows you to ignore IMs unless the sender is in your Buddy List,
+		the sender is in your Allow List, or the sender correctly answers a question
+		you have predefined.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pidgin-bs</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-bot-sentry/pidgin-bot-sentry-1.3.0.ebuild b/x11-plugins/pidgin-bot-sentry/pidgin-bot-sentry-1.3.0.ebuild
new file mode 100644
index 000000000000..576645b15f09
--- /dev/null
+++ b/x11-plugins/pidgin-bot-sentry/pidgin-bot-sentry-1.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P#pidgin-}"
+
+DESCRIPTION="Bot Sentry is a Pidgin plugin to prevent Instant Message (IM) spam"
+HOMEPAGE="http://pidgin-bs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pidgin-bs/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="net-im/pidgin[gtk]
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-plugins/pidgin-encryption/Manifest b/x11-plugins/pidgin-encryption/Manifest
new file mode 100644
index 000000000000..904b7a26549b
--- /dev/null
+++ b/x11-plugins/pidgin-encryption/Manifest
@@ -0,0 +1 @@
+DIST pidgin-encryption-3.1.tar.gz 604129 BLAKE2B d42c6baf9e1b0adcb8e88a611279fa66f6c37ce3e89c742c6a8e2662662576cc9e08c8e3fa08c19e857b88165b840826f9118c5bcca0098b7eb02fac0a8ae159 SHA512 681e719dacc6812f6e965b5025631b02dc6abe4694c4dfc3034d5c07e97798707f28920c142b99f9d428470ef5c14bffe5d7c62d2d5fce01ad0e7567ab60b32d
diff --git a/x11-plugins/pidgin-encryption/files/pidgin-encryption-3.1-glib2.32.patch b/x11-plugins/pidgin-encryption/files/pidgin-encryption-3.1-glib2.32.patch
new file mode 100644
index 000000000000..1262056bd27c
--- /dev/null
+++ b/x11-plugins/pidgin-encryption/files/pidgin-encryption-3.1-glib2.32.patch
@@ -0,0 +1,12 @@
+diff -urN pidgin-encryption-3.1.orig/rsa_nss.c pidgin-encryption-3.1/rsa_nss.c
+--- pidgin-encryption-3.1.orig/rsa_nss.c	2010-04-26 04:53:46.000000000 +0300
++++ pidgin-encryption-3.1/rsa_nss.c	2012-04-15 13:16:21.438852032 +0300
+@@ -24,7 +24,7 @@
+ #include <debug.h>
+ #include <gtkdialogs.h>
+ 
+-#include "glib/gmain.h"
++#include <glib.h>
+ 
+ #include <string.h>
+ #include <assert.h>
diff --git a/x11-plugins/pidgin-encryption/metadata.xml b/x11-plugins/pidgin-encryption/metadata.xml
new file mode 100644
index 000000000000..f8960bceaf12
--- /dev/null
+++ b/x11-plugins/pidgin-encryption/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+Pidgin-Encryption uses NSS or GNUTLSto provide transparent RSA encryption as a Pidgin plugin.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pidgin-encrypt</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild b/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild
new file mode 100644
index 000000000000..561a3df71d68
--- /dev/null
+++ b/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Pidgin IM Encryption PlugIn"
+HOMEPAGE="http://pidgin-encrypt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pidgin-encrypt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
+IUSE="nls"
+
+RDEPEND="net-im/pidgin[gtk]
+	x11-libs/gtk+:2
+	>=dev-libs/nss-3.11"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-glib2.32.patch"
+}
+
+src_configure() {
+	strip-flags
+	replace-flags -O? -O2
+	econf $(use_enable nls)
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc CHANGELOG INSTALL NOTES README TODO VERSION WISHLIST
+}
diff --git a/x11-plugins/pidgin-extprefs/Manifest b/x11-plugins/pidgin-extprefs/Manifest
new file mode 100644
index 000000000000..c7c27661e1a1
--- /dev/null
+++ b/x11-plugins/pidgin-extprefs/Manifest
@@ -0,0 +1 @@
+DIST pidgin-extprefs-0.7.tar.gz 332742 BLAKE2B 39a12a595f6eb7a66b071ef4d3e94d7e4d54201baa29280f3dc24e790976dfd57e7f3a656cea398c76759d02b258429b0cae46fd4ed7c07ec9f2219f5b0e97e4 SHA512 f2157403463c1a9621396c84ea71c4e02a853796d5c7b7aa33def03f9b6eccc52a0fad7f5edcfa1506cdc2c6e9dfb056a445cdfa985b0c3885d7ffe666150c3a
diff --git a/x11-plugins/pidgin-extprefs/metadata.xml b/x11-plugins/pidgin-extprefs/metadata.xml
new file mode 100644
index 000000000000..d3fe94e340a4
--- /dev/null
+++ b/x11-plugins/pidgin-extprefs/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+A plugin that takes advantage of existing pidgin functionality to provide preferences that are often desired but are not included in pidgin.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gaim-extprefs</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild b/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild
new file mode 100644
index 000000000000..eaa00ed1dce3
--- /dev/null
+++ b/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Extra preferences that are desired but are not worthy for Pidgin"
+HOMEPAGE="http://gaim-extprefs.sourceforge.net"
+SRC_URI="mirror://sourceforge/gaim-extprefs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="net-im/pidgin[gtk]"
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}"
diff --git a/x11-plugins/pidgin-funyahoo-plusplus/metadata.xml b/x11-plugins/pidgin-funyahoo-plusplus/metadata.xml
new file mode 100644
index 000000000000..cd6d363df9b8
--- /dev/null
+++ b/x11-plugins/pidgin-funyahoo-plusplus/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lori@icanhas.net</email>
+    <name>Lori Jakab</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">EionRobb/funyahoo-plusplus</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-funyahoo-plusplus/pidgin-funyahoo-plusplus-9999.ebuild b/x11-plugins/pidgin-funyahoo-plusplus/pidgin-funyahoo-plusplus-9999.ebuild
new file mode 100644
index 000000000000..549de1ad1ec3
--- /dev/null
+++ b/x11-plugins/pidgin-funyahoo-plusplus/pidgin-funyahoo-plusplus-9999.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit git-r3
+
+DESCRIPTION="Yahoo! (2016) Protocol Plugin for Pidgin"
+HOMEPAGE="https://github.com/EionRobb/funyahoo-plusplus"
+EGIT_REPO_URI="https://github.com/EionRobb/funyahoo-plusplus"
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="net-im/pidgin
+	dev-libs/json-glib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/x11-plugins/pidgin-gnome-keyring/Manifest b/x11-plugins/pidgin-gnome-keyring/Manifest
new file mode 100644
index 000000000000..2784e92b2f89
--- /dev/null
+++ b/x11-plugins/pidgin-gnome-keyring/Manifest
@@ -0,0 +1 @@
+DIST pidgin-gnome-keyring-2.0.tar.gz 12066 BLAKE2B 466abfa59fea84acd63e03bd2b2b9e7c5e40b63baf5bc1b80bb17fa1b910b3b8be4c3e4ee7fd4687625101dcac8d43e872b1e3dc7e231306b6f26ee0c14484c2 SHA512 b1f83c107631a7105aa517312f13d745922b8033afc15069cba1c515caeee9e6ad89c4c7a5f96c561713d7f7a6ca3f03cff8fb11566a8ea0d8980f10e85d4610
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
new file mode 100644
index 000000000000..6aa6ffca3c52
--- /dev/null
+++ b/x11-plugins/pidgin-gnome-keyring/files/pidgin-gnome-keyring-2.0-plugindir.patch
@@ -0,0 +1,21 @@
+--- a/Makefile	2015-02-07 03:23:05.000000000 +0000
++++ b/Makefile	2016-04-28 09:53:59.915565380 +0000
+@@ -2,6 +2,7 @@
+ 
+ SECRETFLAGS = `pkg-config --libs --cflags libsecret-1`
+ PURPLEFLAGS = `pkg-config --cflags purple`
++PLUGINDIR = `pkg-config --variable=plugindir purple`
+ VERSION = $(shell cat VERSION)
+ ifeq ($(strip $(VERSION)),)
+ 	VERSION = `git describe --tags`
+@@ -18,8 +19,8 @@
+ 	${CC} ${CFLAGS} ${LDFLAGS} -Wall -I. -g -O2 ${TARGET}.c -o ${TARGET}.so -shared -fPIC -DPIC -ggdb ${PURPLEFLAGS} ${SECRETFLAGS} -DVERSION=\"${VERSION}\"
+ 
+ install: ${TARGET}.so
+-	mkdir -p ${DESTDIR}/usr/lib/purple-2/
+-	cp ${TARGET}.so ${DESTDIR}/usr/lib/purple-2/
++	mkdir -p ${DESTDIR}/$(PLUGINDIR)/
++	cp ${TARGET}.so ${DESTDIR}/$(PLUGINDIR)/
+ 
+ install_local: ${TARGET}.so
+ 	mkdir -p ~/.purple/plugins
diff --git a/x11-plugins/pidgin-gnome-keyring/metadata.xml b/x11-plugins/pidgin-gnome-keyring/metadata.xml
new file mode 100644
index 000000000000..e404242aa216
--- /dev/null
+++ b/x11-plugins/pidgin-gnome-keyring/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="en">
+	Pidgin usually stores passwords as plaintext with the "save password"
+	function. This plugin instead saves all passwords to the system
+	keyring, which some would argue is a more secure form of password
+	storage.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">aebrahim/pidgin-gnome-keyring</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0.ebuild b/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0.ebuild
new file mode 100644
index 000000000000..221d0975bdde
--- /dev/null
+++ b/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-plugindir.patch"
+)
+
+src_prepare() {
+	default
+
+	# This file is used by the upstream Makefile yet is missing from at least
+	# some release tarballs.
+	if [ ! -f VERSION ]; then
+		echo "${PV}" > VERSION || die "failed to recreate VERSION file"
+	fi
+
+	sed -i \
+		-e 's|-O2||g' \
+		-e 's|-ggdb||g' \
+		-e 's|-g||g' \
+		Makefile || die "stripping hard-coded flags failed"
+}
diff --git a/x11-plugins/pidgin-gpg/Manifest b/x11-plugins/pidgin-gpg/Manifest
new file mode 100644
index 000000000000..df2f2ce9ad1b
--- /dev/null
+++ b/x11-plugins/pidgin-gpg/Manifest
@@ -0,0 +1 @@
+DIST pidgin-gpg-0.9.3.tar.gz 806492 BLAKE2B 67ca75307419fe25d6a7f90ce33f63e736eae59e0cab9fd2fafbf7f9ccd61569fb9906e755163400c462bcd63fa8e9b1e42deb98e459fb9e070d73de9cfb28ab SHA512 bff7ec08d7999d40b689aabc0b559b7eab1fae765b6ffc799e355601ac3a2bb05c3831c1e56e30b95f387c446f7d07d1576af7e7824094fca9ac6c6636d62f6c
diff --git a/x11-plugins/pidgin-gpg/metadata.xml b/x11-plugins/pidgin-gpg/metadata.xml
new file mode 100644
index 000000000000..94c436f73e7e
--- /dev/null
+++ b/x11-plugins/pidgin-gpg/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">segler-alex/Pidgin-GPG</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.3.ebuild b/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.3.ebuild
new file mode 100644
index 000000000000..1d49c9c8eff5
--- /dev/null
+++ b/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils ltprune
+
+DESCRIPTION="Pidgin GPG/OpenPGP (XEP-0027) plugin"
+HOMEPAGE="https://github.com/Draghtnod/Pidgin-GPG"
+SRC_URI="https://github.com/Draghtnod/Pidgin-GPG/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-crypt/gpgme
+	net-im/pidgin"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/Pidgin-GPG-${PV}"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/x11-plugins/pidgin-hotkeys/Manifest b/x11-plugins/pidgin-hotkeys/Manifest
new file mode 100644
index 000000000000..2e5948bd1408
--- /dev/null
+++ b/x11-plugins/pidgin-hotkeys/Manifest
@@ -0,0 +1 @@
+DIST pidgin-hotkeys-0.2.4.tar.gz 341912 BLAKE2B fe4b6d841010df2bfc17febbbc54d0dc10eb65f3c414b17728a92afb856232df1a7a9996631dc2564102346236cb5e7ae2fb3b10f67679dbaed11f3d83b03372 SHA512 99897a47f91c5ceacabdec13859526f6af6270e171b94b49183ad5cc5118b5e3f5377d02ffd0bdbdbaafdd6f23f400deb604a8fe686cd29103187276f20aca86
diff --git a/x11-plugins/pidgin-hotkeys/metadata.xml b/x11-plugins/pidgin-hotkeys/metadata.xml
new file mode 100644
index 000000000000..6f131ebb28bd
--- /dev/null
+++ b/x11-plugins/pidgin-hotkeys/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">pidgin-hotkeys</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-hotkeys/pidgin-hotkeys-0.2.4.ebuild b/x11-plugins/pidgin-hotkeys/pidgin-hotkeys-0.2.4.ebuild
new file mode 100644
index 000000000000..3fae8d3cd795
--- /dev/null
+++ b/x11-plugins/pidgin-hotkeys/pidgin-hotkeys-0.2.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Pidgin plugin to define global hotkeys for various actions"
+HOMEPAGE="http://pidgin-hotkeys.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="net-im/pidgin[gtk]
+	x11-libs/gtk+:2"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/x11-plugins/pidgin-latex/Manifest b/x11-plugins/pidgin-latex/Manifest
new file mode 100644
index 000000000000..51e1779ae504
--- /dev/null
+++ b/x11-plugins/pidgin-latex/Manifest
@@ -0,0 +1 @@
+DIST pidgin-latex_1.5.0.tar.bz2 17585 BLAKE2B d9d77a3623199f65a8ee6621c8117c1dd5402375948d9ca2147fc27fa5bdab3f5a2899674f4ee5bf37e42bdc4d3517f642518705ff8d5f57e7bc511897b0b946 SHA512 e9f81f948eb70880e027d3b83a058b509b860664f3c8fb39c95fa1ac5c0c843bf37f9b5abcf095ff30942dad7b55262c27494419d55af1c14898be4caddec912
diff --git a/x11-plugins/pidgin-latex/metadata.xml b/x11-plugins/pidgin-latex/metadata.xml
new file mode 100644
index 000000000000..f77d955fb1ef
--- /dev/null
+++ b/x11-plugins/pidgin-latex/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+A plugin for Pidgin which translates LaTeX code into images in your IM and Chat
+conversations. 
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pidgin-latex</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-latex/pidgin-latex-1.5.0.ebuild b/x11-plugins/pidgin-latex/pidgin-latex-1.5.0.ebuild
new file mode 100644
index 000000000000..45e131099e73
--- /dev/null
+++ b/x11-plugins/pidgin-latex/pidgin-latex-1.5.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit multilib toolchain-funcs
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Pidgin plugin that renders latex formulae"
+HOMEPAGE="https://sourceforge.net/projects/pidgin-latex/"
+SRC_URI="mirror://sourceforge/pidgin-latex/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+COMMON_DEPEND="
+	net-im/pidgin[gtk]
+	x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/libtool
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/dvipng"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	sed -e "s:\(CC.*=\).*:\1 $(tc-getCC):" \
+		-e "/LIB_INSTALL_DIR/{s:/lib/pidgin:/$(get_libdir)/pidgin:;}" \
+			-i Makefile || die
+}
+
+src_install() {
+	emake PREFIX="${D}/usr" install
+	dodoc README CHANGELOG TODO
+}
+
+pkg_postinst() {
+	elog 'Note, to see formulas either disable "Conversation Colors" plugin or'
+	elog 'switch off "ignore incoming format" option in plugin configuration.'
+	elog 'For details, take a look (and vote) at http://developer.pidgin.im/ticket/2772'
+}
diff --git a/x11-plugins/pidgin-led-notification/Manifest b/x11-plugins/pidgin-led-notification/Manifest
new file mode 100644
index 000000000000..7c11902baf5a
--- /dev/null
+++ b/x11-plugins/pidgin-led-notification/Manifest
@@ -0,0 +1 @@
+DIST led-notification-0.1.tar.bz2 8848 BLAKE2B e609c61105a8ef00244be5f21fec6c55cadde3b79c22bf6c42886973089aa88ae4149270d5f71a4940025179f950c92aebac92e2dd20f687042b312d304f1b4b SHA512 40773a14c42e3c723d6cb693288378184b291df106810de99d7887c3ef8e938633498326419febb17d80e0aa4fb4e4cf7ced16ce5186f30df1ee84b38c0f6ed2
diff --git a/x11-plugins/pidgin-led-notification/files/pidgin-led-notification-0.1-hardware.patch b/x11-plugins/pidgin-led-notification/files/pidgin-led-notification-0.1-hardware.patch
new file mode 100644
index 000000000000..aaabada116db
--- /dev/null
+++ b/x11-plugins/pidgin-led-notification/files/pidgin-led-notification-0.1-hardware.patch
@@ -0,0 +1,34 @@
+--- led-notification-0.1/led-notification.c
++++ led-notification-0.1/led-notification.c
+@@ -54,9 +54,9 @@
+ 	}
+ 
+ 	if(state) {
+-		fputs("1", file);
++		fputs(purple_prefs_get_string("/plugins/gtk/gtk-simom-lednot/led_on"), file);
+ 	} else {
+-		fputs("0", file);
++		fputs(purple_prefs_get_string("/plugins/gtk/gtk-simom-lednot/led_off"), file);
+ 	}
+ 
+ 	fclose(file);
+@@ -155,6 +155,10 @@
+ 
+ 	ent=pidgin_prefs_labeled_entry(vbox2,"File to control led:",
+ 	                              "/plugins/gtk/gtk-simom-lednot/filename",sg);
++	ent=pidgin_prefs_labeled_entry(vbox2,"String to turn led on:",
++		"/plugins/gtk/gtk-simom-lednot/led_on",sg);
++	ent=pidgin_prefs_labeled_entry(vbox2,"String to turn led off:",
++		"/plugins/gtk/gtk-simom-lednot/led_off",sg);
+ 
+ 	gtk_widget_show_all(frame);
+ 	return frame;
+@@ -166,6 +170,8 @@
+ 	purple_prefs_add_string("/plugins/gtk/gtk-simom-lednot/chat", "nick");
+ 	purple_prefs_add_string("/plugins/gtk/gtk-simom-lednot/filename",
+ 	                        "/proc/acpi/asus/mled");
++	purple_prefs_add_string("/plugins/gtk/gtk-simom-lednot/led_on", "1");
++	purple_prefs_add_string("/plugins/gtk/gtk-simom-lednot/led_off", "0");
+ }
+ 
+ static gboolean plugin_load(PurplePlugin *plugin) {
diff --git a/x11-plugins/pidgin-led-notification/metadata.xml b/x11-plugins/pidgin-led-notification/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/pidgin-led-notification/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-led-notification/pidgin-led-notification-0.1.ebuild b/x11-plugins/pidgin-led-notification/pidgin-led-notification-0.1.ebuild
new file mode 100644
index 000000000000..bcfaf3ba9a2a
--- /dev/null
+++ b/x11-plugins/pidgin-led-notification/pidgin-led-notification-0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_PN=${PN/pidgin-/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Pidgin plugin to notify by writing user defined strings to (led control) files"
+HOMEPAGE="https://sites.google.com/site/simohmattila/led-notification"
+SRC_URI="https://sites.google.com/site/simohmattila/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	net-im/pidgin[gtk]
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-hardware.patch )
+
+src_compile() {
+	$(tc-getCC) \
+		${CFLAGS} -fPIC \
+		${CPPFLAGS} \
+		${LDFLAGS} \
+		$($(tc-getPKG_CONFIG) --cflags gtk+-2.0 pidgin) \
+		-shared ${MY_PN}.c -o ${MY_PN}.so \
+		$($(tc-getPKG_CONFIG) --libs gtk+-2.0 pidgin) || die
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/pidgin
+	doexe ${MY_PN}.so
+
+	einstalldocs
+}
diff --git a/x11-plugins/pidgin-libnotify/Manifest b/x11-plugins/pidgin-libnotify/Manifest
new file mode 100644
index 000000000000..9f81e33364c4
--- /dev/null
+++ b/x11-plugins/pidgin-libnotify/Manifest
@@ -0,0 +1,2 @@
+DIST pidgin-libnotify-0.14.tar.gz 316365 BLAKE2B 0635df1858f0893405ebd38049527bf9ea0e36bc599718677f35644fc29b458c375fb7bef33de9b3eb071c4591c5effcc682f143759a050f6a9ad9e9d51d43c9 SHA512 2ff6b2bad74cb2fd9a3de94c06a2261fa07938bc1971baa578b9a9ae120175943592bf773ec5f00857c5ea35771a7fd1943299521626ce49f410cfd70ea2b399
+DIST pidgin-libnotify_0.14-4.debian.tar.gz 4722 BLAKE2B c3e83636716ae84b1669a80b09d6776d0d8fbe0633c496022780d55bf9fe8fe0af661c35c9d99d4b53f736ee1e7f5b31cb59291319e5d3428009619b51da1616 SHA512 a95aab2e29b658650321ab794561fe085c619638c251d8555dfc6f79ddf298d4893671f43827ce742ebc5aa594324aeff12a57c51f3ca0a0454590195c760530
diff --git a/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-libnotify-0.7.patch b/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-libnotify-0.7.patch
new file mode 100644
index 000000000000..7279c3ad7eaa
--- /dev/null
+++ b/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-libnotify-0.7.patch
@@ -0,0 +1,18 @@
+--- a/src/pidgin-libnotify.c
++++ b/src/pidgin-libnotify.c
+@@ -286,7 +286,15 @@
+ 		g_free (tr_body);
+ 		return;
+ 	}
++#ifdef NOTIFY_CHECK_VERSION
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	notification = notify_notification_new (title, tr_body, NULL);
++#else
+ 	notification = notify_notification_new (title, tr_body, NULL, NULL);
++#endif
++#else
++	notification = notify_notification_new (title, tr_body, NULL, NULL);
++#endif
+ 	purple_debug_info (PLUGIN_ID, "notify(), new: "
+ 					 "title: '%s', body: '%s', buddy: '%s'\n",
+ 					 title, tr_body, best_name (buddy));
diff --git a/x11-plugins/pidgin-libnotify/metadata.xml b/x11-plugins/pidgin-libnotify/metadata.xml
new file mode 100644
index 000000000000..48c97b5fdf54
--- /dev/null
+++ b/x11-plugins/pidgin-libnotify/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">gaim-libnotify</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r1.ebuild b/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r1.ebuild
new file mode 100644
index 000000000000..17b95492ef40
--- /dev/null
+++ b/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="pidgin-libnotify provides popups for pidgin via a libnotify interface"
+HOMEPAGE="http://gaim-libnotify.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gaim-libnotify/${P}.tar.gz
+	mirror://debian/pool/main/p/${PN}/${PN}_${PV}-4.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nls debug"
+
+RDEPEND=">=x11-libs/libnotify-0.3.2
+	net-im/pidgin[gtk]
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${WORKDIR}/debian/patches"
+	"${FILESDIR}/${P}-libnotify-0.7.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e '/CFLAGS/s:-g3::' configure || die "sed failed"
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die "Pruning failed"
+}
diff --git a/x11-plugins/pidgin-mbpurple/Manifest b/x11-plugins/pidgin-mbpurple/Manifest
new file mode 100644
index 000000000000..17a3f6dc5ab4
--- /dev/null
+++ b/x11-plugins/pidgin-mbpurple/Manifest
@@ -0,0 +1 @@
+DIST mbpurple-0.3.0.tar.gz 83685 BLAKE2B d1d39b659c0ecd0c81e749d81b8681d83202845232d906c665eec5bf18bc708acda087b117a16eecb510efa13f411ed4816ab4a686b6d38795d8d0cc2f78391b SHA512 9152ce783efd9d1841ec172ccc0f50f2fe0a5d64e9363fdc14150d40d0ec3ef642ed59662f4255dead1d32ce3ae2a47098c993c15c9d2c40b297ddc5f8fe110e
diff --git a/x11-plugins/pidgin-mbpurple/metadata.xml b/x11-plugins/pidgin-mbpurple/metadata.xml
new file mode 100644
index 000000000000..fd1c223053a3
--- /dev/null
+++ b/x11-plugins/pidgin-mbpurple/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<use>
+		<flag name="twitgin">Enable graphical plugin for Gtk+ interface of Pidgin.</flag>
+	</use>
+	<upstream>
+		<remote-id type="google-code">microblog-purple</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-mbpurple/pidgin-mbpurple-0.3.0-r2.ebuild b/x11-plugins/pidgin-mbpurple/pidgin-mbpurple-0.3.0-r2.ebuild
new file mode 100644
index 000000000000..4d1b4a1b27c1
--- /dev/null
+++ b/x11-plugins/pidgin-mbpurple/pidgin-mbpurple-0.3.0-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_P="${P/pidgin-/}"
+
+DESCRIPTION="Pidgin plug-in supporting microblog services like Twitter or identi.ca"
+HOMEPAGE="https://code.google.com/p/microblog-purple/"
+SRC_URI="https://microblog-purple.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+twitgin"
+
+RDEPEND="net-im/pidgin
+	twitgin? ( net-im/pidgin[gtk] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# upstream Issue 226 (Respect LDFLAGS)
+	sed -i "/^LDFLAGS/d" global.mak || die "sed for LDFLAGS failed"
+
+	# upstream Issue 225 (Warnings during compilation using make -j2)
+	sed -i "s/make /\$(MAKE) /g" Makefile || die "sed #2 failed"
+
+	# upstream Issue 224 (configurable twitgin)
+	if ! use twitgin; then
+		sed -i 's/twitgin//g' Makefile || die
+	fi
+}
+
+src_configure() {
+	tc-export CC
+}
diff --git a/x11-plugins/pidgin-mpris/Manifest b/x11-plugins/pidgin-mpris/Manifest
new file mode 100644
index 000000000000..1b1696daac46
--- /dev/null
+++ b/x11-plugins/pidgin-mpris/Manifest
@@ -0,0 +1 @@
+DIST pidgin-mpris-0.2.6.tar.bz2 211675 BLAKE2B 412e66a02303ab45fff6e76207330ea4b2b310b9ba608ec33d043365b3cd2ed2ef46cc9823e4914be97f4be42d9f66ffe3659e24da8f554a7ee30b50c4604bea SHA512 19d27a9bfbbb359e8874eb42bb02eaa63f7a7e2805b80992ee77d26c994256b62b95bd19ac016f3194bc8f2b4da6982760405718752f15105a8bf43bde69bcb7
diff --git a/x11-plugins/pidgin-mpris/metadata.xml b/x11-plugins/pidgin-mpris/metadata.xml
new file mode 100644
index 000000000000..dd1175e72548
--- /dev/null
+++ b/x11-plugins/pidgin-mpris/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-mpris/pidgin-mpris-0.2.6.ebuild b/x11-plugins/pidgin-mpris/pidgin-mpris-0.2.6.ebuild
new file mode 100644
index 000000000000..3d72a02de6db
--- /dev/null
+++ b/x11-plugins/pidgin-mpris/pidgin-mpris-0.2.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Gets current song from MPRIS-aware media players"
+HOMEPAGE="http://m0n5t3r.info/work/pidgin-mpris/"
+SRC_URI="http://m0n5t3r.info/stuff/pidgin-mpris//${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-im/pidgin[gtk]
+	x11-libs/gtk+:2
+	sys-apps/dbus"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/x11-plugins/pidgin-musictracker/Manifest b/x11-plugins/pidgin-musictracker/Manifest
new file mode 100644
index 000000000000..0c16e7f878a9
--- /dev/null
+++ b/x11-plugins/pidgin-musictracker/Manifest
@@ -0,0 +1 @@
+DIST pidgin-musictracker-0.4.22.tar.bz2 727051 BLAKE2B a9d265ca0305b9b80b2354e39469be585cedf0a0e0226fcd23b3c6c9250f9b01a7882c55dc74acc1ce05effb7af954777eadb2192bc14b3846b1152e745aa359 SHA512 5a39311c4b4c8ceb4d2535b4aacb1427d9e1b004d34bc342ae3da6c60bd50e0b58a89ef52d02f3a431e8839cc647e23082bdf18b250135e95da5e6ea78c7b790
diff --git a/x11-plugins/pidgin-musictracker/metadata.xml b/x11-plugins/pidgin-musictracker/metadata.xml
new file mode 100644
index 000000000000..62d63ec9397c
--- /dev/null
+++ b/x11-plugins/pidgin-musictracker/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="google-code">pidgin-musictracker</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.22.ebuild b/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.22.ebuild
new file mode 100644
index 000000000000..e576da2c7f0d
--- /dev/null
+++ b/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.22.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A Pidgin now playing plugin to publicise the songs you are listening"
+HOMEPAGE="https://code.google.com/p/pidgin-musictracker/"
+SRC_URI="https://pidgin-musictracker.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="debug"
+
+DEPEND=">=net-im/pidgin-2.0.0[gtk]
+	>=dev-libs/dbus-glib-0.73
+	dev-libs/libpcre
+	>=sys-devel/gettext-0.17"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e "s/DOMAIN/PACKAGE/g" po/Makefile.in.in || die "sed failed"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		--disable-werror
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die "error cleaning la file."
+}
diff --git a/x11-plugins/pidgin-opensteamworks/Manifest b/x11-plugins/pidgin-opensteamworks/Manifest
new file mode 100644
index 000000000000..f1c6af4cf884
--- /dev/null
+++ b/x11-plugins/pidgin-opensteamworks/Manifest
@@ -0,0 +1,2 @@
+DIST pidgin-opensteamworks-1.6.1.tar.gz 750495 BLAKE2B 890e1765eda10c31e927be320a8bf8af0da4c9e01b8cea31810c0ff7a0c27d1a8f54b213b323132a6c1087dd853937a0b5cce93eeef308412a505cd1696eb5f4 SHA512 9f025538460dda01d769501326cf7ac597e069bdef3437eea89f392bede7e620e854a8c0b0659315a0834c8f2f60a38680f1f1bdccdb65d3b13f64f7981ee55b
+DIST pidgin-opensteamworks-1.7.tar.gz 236181 BLAKE2B 738285b566558ecbdbaf4960e2cead6bb57721dec901e656c6a78f3e5e16aecfa0f88045dd8fe78decef013866dcf255b82873021fb4ac9c484ed3bed8d0c655 SHA512 6369d8fb49fca3c8ad760d379c413da0be8bf58cbfdc5a4bb41ea6d803493110da8b0e1e3743c81b5068799b3a0ba6f57a90ba6208a5b112eb58434d134b1ba6
diff --git a/x11-plugins/pidgin-opensteamworks/files/pidgin-opensteamworks-1.3-Makefile b/x11-plugins/pidgin-opensteamworks/files/pidgin-opensteamworks-1.3-Makefile
new file mode 100644
index 000000000000..a71ece054234
--- /dev/null
+++ b/x11-plugins/pidgin-opensteamworks/files/pidgin-opensteamworks-1.3-Makefile
@@ -0,0 +1,33 @@
+CC ?= gcc
+PKG_CONFIG ?= pkg-config
+INSTALL = install
+INSTALL_PROGRAM = $(INSTALL) -Dm755
+
+PLUGINDIR ?= $(shell $(PKG_CONFIG) --variable=plugindir purple)
+
+CFLAGS ?= -O2 -pipe
+CFLAGS += -Wall -fPIC
+LDFLAGS += -shared
+CPPFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0 json-glib-1.0 purple nss gnome-keyring-1)
+LIBS += $(shell $(PKG_CONFIG) --libs glib-2.0 json-glib-1.0 purple nss)
+
+TARGET = libsteam.so
+
+OBJS = libsteam.o steam_connection.o
+
+%.o: %.c %.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $*.c
+
+$(TARGET): $(OBJS)
+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
+
+install: $(TARGET)
+	$(INSTALL_PROGRAM) $(TARGET) "$(DESTDIR)$(PLUGINDIR)/$(TARGET)"
+
+uninstall:
+	rm -f "$(DESTDIR)$(PLUGINDIR)/$(TARGET)"
+
+clean:
+	rm -f $(OBJS) $(TARGET)
+
+.PHONY: uninstall clean
diff --git a/x11-plugins/pidgin-opensteamworks/metadata.xml b/x11-plugins/pidgin-opensteamworks/metadata.xml
new file mode 100644
index 000000000000..4e497718eac6
--- /dev/null
+++ b/x11-plugins/pidgin-opensteamworks/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<maintainer status="active">
+			<email>eionrobb@gmail.com</email>
+			<name>Eion Robb</name>
+		</maintainer>
+		<bugs-to>https://code.google.com/p/pidgin-opensteamworks/issues/list</bugs-to>
+		<remote-id type="github">EionRobb/pidgin-opensteamworks</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1.ebuild b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1.ebuild
new file mode 100644
index 000000000000..4cbbdc43091c
--- /dev/null
+++ b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Steam protocol plugin for pidgin"
+HOMEPAGE="https://github.com/eionrobb/pidgin-opensteamworks"
+SRC_URI="https://github.com/EionRobb/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/nss
+	gnome-base/libgnome-keyring
+	net-im/pidgin"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	virtual/pkgconfig"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		tc-export CC PKG_CONFIG
+	fi
+}
+
+src_prepare() {
+	# see https://code.google.com/p/pidgin-opensteamworks/issues/detail?id=31
+	cp "${FILESDIR}"/${PN}-1.3-Makefile "${S}"/${P}/steam-mobile/Makefile || die
+	unzip "${S}"/${P}/steam-mobile/releases/icons.zip || die
+}
+
+src_compile() {
+	pushd ${P}/steam-mobile || die
+	default
+	popd || die
+}
+
+src_install() {
+	pushd ${P}/steam-mobile || die
+	default
+	popd || die
+	insinto /usr/share/pixmaps/pidgin/protocols
+	doins -r "${WORKDIR}"/{16,48}
+	dodoc ${P}/README.md
+}
diff --git a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.7.ebuild b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.7.ebuild
new file mode 100644
index 000000000000..713d7108b752
--- /dev/null
+++ b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Steam protocol plugin for pidgin"
+HOMEPAGE="https://github.com/eionrobb/pidgin-opensteamworks"
+SRC_URI="https://github.com/EionRobb/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	app-crypt/libsecret
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/nss
+	net-im/pidgin"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		tc-export CC PKG_CONFIG
+	fi
+}
+
+src_prepare() {
+	default
+
+	unzip "${S}"/${P}/steam-mobile/releases/icons.zip || die
+}
+
+src_compile() {
+	pushd ${P}/steam-mobile || die
+	default
+	popd || die
+}
+
+src_install() {
+	pushd ${P}/steam-mobile || die
+	default
+	popd || die
+	insinto /usr/share/pixmaps/pidgin/protocols
+	doins -r "${WORKDIR}"/{16,48}
+	dodoc ${P}/README.md
+}
diff --git a/x11-plugins/pidgin-otr/Manifest b/x11-plugins/pidgin-otr/Manifest
new file mode 100644
index 000000000000..a026173a698a
--- /dev/null
+++ b/x11-plugins/pidgin-otr/Manifest
@@ -0,0 +1 @@
+DIST pidgin-otr-4.0.2.tar.gz 515627 BLAKE2B e4ee9887d755f27f121c86337df596939eb1ae83ae91d1a396140be27558ee086cca54e2fb7e2337603fc78df00228e8a5759c3adc8b6c68bfdb3f3fa9476163 SHA512 6815f1d2be5786726602a924ae6ead5371543a53bd36231dc3239fa580f73a6136836df0c1beb64d83b76e6bd0d80ffe6750ca6e9ddd2a6a94841a9a678925ad
diff --git a/x11-plugins/pidgin-otr/metadata.xml b/x11-plugins/pidgin-otr/metadata.xml
new file mode 100644
index 000000000000..ff1cb050c636
--- /dev/null
+++ b/x11-plugins/pidgin-otr/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-otr/pidgin-otr-4.0.2.ebuild b/x11-plugins/pidgin-otr/pidgin-otr-4.0.2.ebuild
new file mode 100644
index 000000000000..316ef1779083
--- /dev/null
+++ b/x11-plugins/pidgin-otr/pidgin-otr-4.0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging"
+HOMEPAGE="http://www.cypherpunks.ca/otr/"
+SRC_URI="http://www.cypherpunks.ca/otr/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="dev-libs/libgcrypt:0
+	net-im/pidgin[gtk]
+	>=net-libs/libotr-4.0.0
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
diff --git a/x11-plugins/pidgin-privacy-please/Manifest b/x11-plugins/pidgin-privacy-please/Manifest
new file mode 100644
index 000000000000..2592e5a26345
--- /dev/null
+++ b/x11-plugins/pidgin-privacy-please/Manifest
@@ -0,0 +1 @@
+DIST pidgin-privacy-please-0.7.1.tar.gz 346421 BLAKE2B 051dca780d11eb6c8e4fed65a0dc6d660185f6210fd5c76021dd80bfa89894ee3dfbc829344498f87b8af25dd048d19bcaa4070f669b723a9374fe62685b8acd SHA512 4acec4556c209b6ff5b059244d79894efba984cdebaaf5893c67ba384126127614aea676af6deb89561f6d5776abdbdc915061db9e1004c0fea3339d45a6646a
diff --git a/x11-plugins/pidgin-privacy-please/metadata.xml b/x11-plugins/pidgin-privacy-please/metadata.xml
new file mode 100644
index 000000000000..93f5fc2bfcb9
--- /dev/null
+++ b/x11-plugins/pidgin-privacy-please/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="google-code">pidgin-privacy-please</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-privacy-please/pidgin-privacy-please-0.7.1.ebuild b/x11-plugins/pidgin-privacy-please/pidgin-privacy-please-0.7.1.ebuild
new file mode 100644
index 000000000000..0af2b95d9d4e
--- /dev/null
+++ b/x11-plugins/pidgin-privacy-please/pidgin-privacy-please-0.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="pidgin plugin to stop spammers from annoying you"
+HOMEPAGE="https://code.google.com/p/pidgin-privacy-please/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64"
+
+RDEPEND="<net-im/pidgin-3[gtk]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	default
+	sed -e 's: -Wall -g3::' -i configure.ac || die
+	eautoreconf
+}
diff --git a/x11-plugins/pidgin-rhythmbox/Manifest b/x11-plugins/pidgin-rhythmbox/Manifest
new file mode 100644
index 000000000000..4b02aeea5816
--- /dev/null
+++ b/x11-plugins/pidgin-rhythmbox/Manifest
@@ -0,0 +1 @@
+DIST pidgin-rhythmbox-2.0.tar.gz 320758 BLAKE2B b2d69803e25fce14f6a6ae79e44dbed8c15149b78450574972aaae0565fdbc77546da8e0a7416977b7823af41a7ee3604f411ef01e3bce3ada90d64b02459edf SHA512 7672bac993d2fa07be6f456c9dc32281689456cd5541245e1a3819592d333fec12afbd7ca42e517f02a0f1415e1fe5c3a3d25aa6fa032b8bdbca0d7d2dbda7d4
diff --git a/x11-plugins/pidgin-rhythmbox/metadata.xml b/x11-plugins/pidgin-rhythmbox/metadata.xml
new file mode 100644
index 000000000000..d85b4252fc33
--- /dev/null
+++ b/x11-plugins/pidgin-rhythmbox/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-rhythmbox/pidgin-rhythmbox-2.0.ebuild b/x11-plugins/pidgin-rhythmbox/pidgin-rhythmbox-2.0.ebuild
new file mode 100644
index 000000000000..242ddbd16662
--- /dev/null
+++ b/x11-plugins/pidgin-rhythmbox/pidgin-rhythmbox-2.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="automatically update your pidgin profile with current info from Rhythmbox"
+HOMEPAGE="http://jon.oberheide.org/pidgin-rhythmbox/"
+SRC_URI="http://jon.oberheide.org/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
+IUSE=""
+
+RDEPEND="net-im/pidgin
+	media-sound/rhythmbox
+	>=x11-libs/gtk+-2.4:2
+	dev-libs/dbus-glib"
+DEPEND="${RDEPEND}"
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
new file mode 100644
index 000000000000..a0ed31fedff9
--- /dev/null
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -0,0 +1,2 @@
+DIST pidgin-sipe-1.23.3.tar.gz 1298459 BLAKE2B e15ad7658771fc0d7f5320f6b145e67a6f33603dfe49dd83edbf42fd2e57f117f4cdac53c6b6dba401266ae6c2593bb6078a604c164aa365aa94aa64eb94f1c7 SHA512 3c7481e02f9541818a980df31d135c3eefd8f1e921dcb6cfe3d1ce194b1591531db2c23364b545a912eb3818af207ffc0a19d3310d495db503de954f0547ea31
+DIST pidgin-sipe-1.25.0.tar.gz 1395316 BLAKE2B 854832768a5c6605c28fcc02abd2444cd15b58be3be89009ce08aad390664a09235ca4fc6c6288c0e0f8677ba920a30b7e3a418312308dcb229a08817bbf4a3c SHA512 e9f1f38bb27cfd8e464f2f03aea3153b7d9a1ff7c45876ff06fc8b391e5d69506b793edda5cef0f4b5f281ddd0281ad0f97c82457e1bcc977965805a323d6f0c
diff --git a/x11-plugins/pidgin-sipe/metadata.xml b/x11-plugins/pidgin-sipe/metadata.xml
new file mode 100644
index 000000000000..566e01071685
--- /dev/null
+++ b/x11-plugins/pidgin-sipe/metadata.xml
@@ -0,0 +1,21 @@
+<?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>
+  <longdescription lang="en">
+An Open Implementation of SIP/Simple protocol for Live Communications Server 2003/2005/2007 and Lync.
+</longdescription>
+  <use>
+    <flag name="ocs2005-message-hack">Disable message timeout for OCS2005 clients which causes "false" not delivered error messages</flag>
+    <flag name="telepathy">Support use as a telepathy backend</flag>
+    <flag name="voice">Enable experimental voice/video support</flag>
+    <flag name="openssl">Enable crypto support via <pkg>dev-libs/openssl</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">sipe</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.3.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.3.ebuild
new file mode 100644
index 000000000000..3e128eb9dcfd
--- /dev/null
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)"
+HOMEPAGE="http://sipe.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="dbus debug kerberos ocs2005-message-hack openssl telepathy voice"
+
+RDEPEND="
+	dev-libs/gmime:2.6
+	dev-libs/libxml2
+	openssl? ( dev-libs/openssl:= )
+	!openssl? ( dev-libs/nss )
+	kerberos? ( virtual/krb5 )
+	voice? (
+		>=dev-libs/glib-2.28.0
+		>=net-libs/libnice-0.1.0
+		media-libs/gstreamer:1.0
+		net-libs/farstream:0.2
+	)
+	!voice? (
+		>=dev-libs/glib-2.12.0:2
+	)
+	net-im/pidgin[dbus?]
+	telepathy? (
+		>=sys-apps/dbus-1.1.0
+		>=dev-libs/dbus-glib-0.61
+		>=dev-libs/glib-2.28:2
+		>=net-libs/telepathy-glib-0.18.0
+	)
+"
+
+DEPEND="dev-util/intltool
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-purple \
+		--disable-quality-check \
+		$(use_enable telepathy) \
+		$(use_enable debug) \
+		$(use_enable ocs2005-message-hack) \
+		$(use_with dbus) \
+		$(use_with kerberos krb5) \
+		$(use_with voice vv) \
+		$(use_enable !openssl nss) \
+		$(use_enable openssl)
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc AUTHORS ChangeLog NEWS TODO README
+}
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0.ebuild
new file mode 100644
index 000000000000..dcc5117625f6
--- /dev/null
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)"
+HOMEPAGE="http://sipe.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="dbus debug kerberos ocs2005-message-hack openssl telepathy voice"
+
+RDEPEND="
+	dev-libs/gmime:2.6
+	dev-libs/libxml2
+	openssl? ( dev-libs/openssl:= )
+	!openssl? ( dev-libs/nss )
+	kerberos? ( virtual/krb5 )
+	voice? (
+		>=dev-libs/glib-2.28.0
+		>=net-libs/libnice-0.1.0
+		media-libs/gstreamer:1.0
+		net-libs/farstream:0.2
+	)
+	!voice? (
+		>=dev-libs/glib-2.12.0:2
+	)
+	net-im/pidgin[dbus?]
+	telepathy? (
+		>=sys-apps/dbus-1.1.0
+		>=dev-libs/dbus-glib-0.61
+		>=dev-libs/glib-2.28:2
+		>=net-libs/telepathy-glib-0.18.0
+	)
+"
+
+DEPEND="dev-util/intltool
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+src_configure() {
+	econf \
+		--enable-purple \
+		--disable-quality-check \
+		$(use_enable telepathy) \
+		$(use_enable debug) \
+		$(use_enable ocs2005-message-hack) \
+		$(use_with dbus) \
+		$(use_with kerberos krb5) \
+		$(use_with voice vv) \
+		$(use_enable !openssl nss) \
+		$(use_enable openssl)
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc AUTHORS ChangeLog NEWS TODO README
+}
diff --git a/x11-plugins/pidgin-skypeweb/Manifest b/x11-plugins/pidgin-skypeweb/Manifest
new file mode 100644
index 000000000000..ba5d628ba8ba
--- /dev/null
+++ b/x11-plugins/pidgin-skypeweb/Manifest
@@ -0,0 +1,5 @@
+DIST pidgin-skypeweb-1.1.tar.gz 321761 BLAKE2B 5968946352c272bea84bde3bf5bcc04a9f84babaa5758aaf1caff460b7b282c06d3d4355f7f69f2fdd08f3749f7181362496ca98b5ce5a98a8ae5f5c71bc7d40 SHA512 bf293ddfac8839c720e6a1e3c594d764d9a2ec876ed201dfcaf62c3f6eba4d6260dcd0bd06e8af60e2c61942396cad9ff76c7be3f5586927ae6ebcd2971d7280
+DIST pidgin-skypeweb-1.2.2.tar.gz 410637 BLAKE2B 4766042f31159c3165e54267cd108d91e8fb1f8997a5e401843ee419126b312cd21bff72d27009064f34fa3549b6635516214dca8e1901ad451b24b1b210b2dc SHA512 4a042e70e6ae1b5f4c5047589d9298d74653513dbb6556d4f786ee5c528e8bbfaf7f9934653fa16a9a3e43197bcbcb168e64e090ccb5ed05a761334a6d88f59d
+DIST pidgin-skypeweb-1.2.tar.gz 323263 BLAKE2B 3a460fc53f53cb82608a9e09bfaa52c5ccd28350a485631725de953e020e9d05fb87a19e5e62198fe37e5590e763798ef8e20efd63ba84b46aeaf1ae314cb02a SHA512 12ff1d67e1eaaf075be49801031f7cd19351a40a599b7495bdb1003557defb72238cbba749d3eb18b5479df63291914a91a0b942ce5ba14f9362eca55428002c
+DIST pidgin-skypeweb-1.4.tar.gz 436177 BLAKE2B 1d78456a12d2ac52b7c0c6019148fad14ecb5a85f4d113dfa5c5916d64ecfaf6035b11cc348b8f3b0a7254a92ee0e35fef0fcacdb0ea69b092e528fab461728d SHA512 58a5bc0db5ddaeb3614366eecbb0d72f02e504bb10278a5df3075c8d2aa29e2f9cc18242616d8380044982a76440f51bdceec20b277d826e8b3066b1e303145e
+DIST pidgin-skypeweb-1.5.tar.gz 295956 BLAKE2B 0a45c709570c9093df9f0e674e5556a21b832b5e73ab2f32d439aa4fe3ce224df0bab05e054ef352ed337113e6800020cf0da60a7b37a6f39a22fc95ad40d28b SHA512 93043b83132654144f333e90bdff88dec5efe2495412a0b40f0ab64ec96d9427acea553ff73dee054de87e77121cbfd1a7bcaddeb17ab4d91baef55d658b6478
diff --git a/x11-plugins/pidgin-skypeweb/metadata.xml b/x11-plugins/pidgin-skypeweb/metadata.xml
new file mode 100644
index 000000000000..dbcecc553ba0
--- /dev/null
+++ b/x11-plugins/pidgin-skypeweb/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hoax@list.ru</email>
+		<name>Igor Mikeshin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">EionRobb/skype4pidgin</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.1.ebuild b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.1.ebuild
new file mode 100644
index 000000000000..2ed0e40e9b04
--- /dev/null
+++ b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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"
diff --git a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.2.2.ebuild b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.2.2.ebuild
new file mode 100644
index 000000000000..32367dcf1bf9
--- /dev/null
+++ b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.2.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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"
diff --git a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.2.ebuild b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.2.ebuild
new file mode 100644
index 000000000000..21a1c4068d5b
--- /dev/null
+++ b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="SkypeWeb Plugin for Pidgin"
+HOMEPAGE="https://github.com/EionRobb/skype4pidgin"
+SRC_URI="https://github.com/EionRobb/skype4pidgin/archive/v${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"
diff --git a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.4.ebuild b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.4.ebuild
new file mode 100644
index 000000000000..558c4ba3ee66
--- /dev/null
+++ b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.4.ebuild
@@ -0,0 +1,23 @@
+# 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-skypeweb/pidgin-skypeweb-1.5.ebuild b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.5.ebuild
new file mode 100644
index 000000000000..dec5c377b3ea
--- /dev/null
+++ b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.5.ebuild
@@ -0,0 +1,24 @@
+# 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-skypeweb/pidgin-skypeweb-9999.ebuild b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-9999.ebuild
new file mode 100644
index 000000000000..667cb2b00445
--- /dev/null
+++ b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-9999.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit git-r3
+
+DESCRIPTION="SkypeWeb Plugin for Pidgin"
+HOMEPAGE="https://github.com/EionRobb/skype4pidgin"
+EGIT_REPO_URI="https://github.com/EionRobb/skype4pidgin"
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="net-im/pidgin
+	dev-libs/json-glib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="$S/skypeweb"
diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
new file mode 100644
index 000000000000..6e29d4800e5c
--- /dev/null
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -0,0 +1,2 @@
+DIST telegram-purple_1.4.2.orig.tar.gz 484790 BLAKE2B d198ce3d1a5f4d226d48b6ff1cdf6f0899a5a1b79ef74c8ac77afa613aae5ec1cf53c8de69cfbab6b2f70df896be0315a90470f2b0da34d1644103be8e7d96ad SHA512 f2f88de8dd4038adaa1a63f2fa3678dd45ddda051be700d6eca563f4bd5b7c8dcb61fdf60bffb01b3fce0ffd01f7b2524686d997bfe4ca8b191cc7b6ce7375a1
+DIST telegram-purple_1.4.3.orig.tar.gz 491997 BLAKE2B 30d42b34525c6553498c67f8a28cfe789442555a3a135a116195edc982611b8ccae6d7c53006358ebdca679258ae6a40b29a1d2ebb764e082bc2ee77d39584db SHA512 697d070da5c6671dd54a1709b37153d4b569ae1cd19d574a2d92a777a89ebd7884596b35829564a7f6fd49104f5d26e35cbe9634f64c678b5f061af8197fba16
diff --git a/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-change-metadata-location.patch b/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-change-metadata-location.patch
new file mode 100644
index 000000000000..6971fb8d5075
--- /dev/null
+++ b/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-change-metadata-location.patch
@@ -0,0 +1,33 @@
+From d18d4c7a46539c37eec30fdbdbb7b56b08469f12 Mon Sep 17 00:00:00 2001
+From: mirabilos <tg@debian.org>
+Date: Sat, 25 Apr 2020 19:29:28 +0200
+Subject: [PATCH] Use newer AppStream metadata location
+
+---
+ Makefile.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 48bfae92..bbaed9df 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -216,15 +216,16 @@ install: noicon_install
+ 	install -m $(FILE_PERM) imgs/telegram22.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/22/telegram.png
+ 	mkdir -m $(DIR_PERM) -p $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48
+ 	install -m $(FILE_PERM) imgs/telegram48.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48/telegram.png
+-	mkdir -m $(DIR_PERM) -p $(DESTDIR)$(datarootdir)/appdata
+-	install -m $(FILE_PERM) AppStream/telegram-purple.metainfo.xml $(DESTDIR)$(datarootdir)/appdata/telegram-purple.metainfo.xml
++	mkdir -m $(DIR_PERM) -p $(DESTDIR)$(datarootdir)/metainfo
++	install -m $(FILE_PERM) AppStream/telegram-purple.metainfo.xml $(DESTDIR)$(datarootdir)/metainfo/telegram-purple.metainfo.xml
+ 
+ .PHONY: uninstall
+ uninstall: noicon_uninstall
+ 	rm -f $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/16/telegram.png
+ 	rm -f $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/22/telegram.png
+ 	rm -f $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48/telegram.png
+-	rm -f $(DESTDIR)$(datarootdir)/appdata/telegram-purple.metainfo.xml
++	rm -f $(DESTDIR)$(datarootdir)/appdata/telegram-purple.metainfo.xml # old location
++	rm -f $(DESTDIR)$(datarootdir)/metainfo/telegram-purple.metainfo.xml # new location
+ 
+ 
+ ### == The local_{,un}install targets, in case you're not root. == ###
diff --git a/x11-plugins/pidgin-telegram/metadata.xml b/x11-plugins/pidgin-telegram/metadata.xml
new file mode 100644
index 000000000000..b6cac1cd1451
--- /dev/null
+++ b/x11-plugins/pidgin-telegram/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.2.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.2.ebuild
new file mode 100644
index 000000000000..21c27ac8d19b
--- /dev/null
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 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"
+
+LICENSE="GPL-2+"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE="gcrypt libressl +nls +webp"
+
+RDEPEND="net-im/pidgin
+	sys-libs/zlib:=
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	!gcrypt? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+	webp? ( media-libs/libwebp:= )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/telegram-purple"
+
+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 webp libwebp)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
new file mode 100644
index 000000000000..dbf8c2bf6f00
--- /dev/null
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 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"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="gcrypt libressl +nls +webp"
+
+RDEPEND="
+	net-im/pidgin
+	sys-libs/zlib:=
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	!gcrypt? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+	webp? ( media-libs/libwebp:= )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/telegram-purple"
+
+DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" )
+
+PATCHES="${FILESDIR}/${P}-change-metadata-location.patch"
+
+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 webp libwebp)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/x11-plugins/pidgin-window_merge/Manifest b/x11-plugins/pidgin-window_merge/Manifest
new file mode 100644
index 000000000000..3158a74541ab
--- /dev/null
+++ b/x11-plugins/pidgin-window_merge/Manifest
@@ -0,0 +1 @@
+DIST window_merge-0.3.tar.gz 328953 BLAKE2B 2277f2c5cb83d98ed34b4e0961281b7c8ebf8209b31471447bf64e9405c9cd0c2e0edc0388f64904f377d77a9916c411cecbc9c6cf235f2127685cf553906c69 SHA512 6863c58b3054aac51ed109ca8fff5e02459220648e6afa700c7231e259e71893ec7ca237263c230632a512d470c6907d3e8cfc9516cb752c1e78bbfdb05a50d3
diff --git a/x11-plugins/pidgin-window_merge/metadata.xml b/x11-plugins/pidgin-window_merge/metadata.xml
new file mode 100644
index 000000000000..b6dbd11ced48
--- /dev/null
+++ b/x11-plugins/pidgin-window_merge/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dm0-/window_merge</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild b/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild
new file mode 100644
index 000000000000..95abeb686964
--- /dev/null
+++ b/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A Pidgin plugin that merges the Buddy List window with a conversation window"
+HOMEPAGE="https://github.com/dm0-/window_merge"
+SRC_URI="https://github.com/downloads/dm0-/${PN#pidgin-}/${P#pidgin-}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2=
+	net-im/pidgin:0=[gtk]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P#pidgin-}
+
+pkg_postinst() {
+	ewarn "This plugin and infopane plugin (purple-plugin_pack) activated"
+	ewarn "at the same time cause a segfault in pidgin"
+	ewarn "see https://github.com/dm0-/window_merge/issues/4"
+}
diff --git a/x11-plugins/pidgin-xmpp-receipts/Manifest b/x11-plugins/pidgin-xmpp-receipts/Manifest
new file mode 100644
index 000000000000..95a4f56556ad
--- /dev/null
+++ b/x11-plugins/pidgin-xmpp-receipts/Manifest
@@ -0,0 +1 @@
+DIST pidgin-xmpp-receipts-0.8.tar.gz 16021 BLAKE2B ba6eb7cb49ec75981e2c15f8aa471e6169ca4f9e6b03061248ff99669b7e31c838c466b1b476fed20bf3c1321954de13b053bbdd599f1ac4f58defacebabf383 SHA512 04113236d46066211d7e0f3c66f4bf1b6fb8a33ac675203f3cff15300eb97ffd3ee627e03fcc3ab3d1e9431fc107a9f7e9fca319f3debb773603d311b167b5a8
diff --git a/x11-plugins/pidgin-xmpp-receipts/metadata.xml b/x11-plugins/pidgin-xmpp-receipts/metadata.xml
new file mode 100644
index 000000000000..c99320e026bb
--- /dev/null
+++ b/x11-plugins/pidgin-xmpp-receipts/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
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
new file mode 100644
index 000000000000..601b7d04adf2
--- /dev/null
+++ b/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vcs-snapshot toolchain-funcs
+
+DESCRIPTION="Implementation of xmpp message delivery receipts (XEP-0184) for Pidgin"
+HOMEPAGE="https://github.com/noonien-d/pidgin-xmpp-receipts"
+SRC_URI="https://github.com/noonien-d/pidgin-xmpp-receipts/archive/release_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+RDEPEND="net-im/pidgin[gtk]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	GTK_PIDGIN_INCLUDES=$(pkg-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}"
+	insinto "${PLUGIN_DIR_PIDGIN}"
+	doins ${PN/pidgin-/}.so
+}
diff --git a/x11-plugins/pidgintex/Manifest b/x11-plugins/pidgintex/Manifest
new file mode 100644
index 000000000000..107abae69644
--- /dev/null
+++ b/x11-plugins/pidgintex/Manifest
@@ -0,0 +1 @@
+DIST pidgintex-1.1.2_p20170107.tar.gz 50671 BLAKE2B effd913101106bc9598e69f19179ee983454f029dcfa5e1b28ce3ca8689de82175004bbfa357d336773d22f6adb4c4a73f9884d9d1dc95943d9a0fdb842c6469 SHA512 fbbe6eb4e2a0a5c9086e65d967133ab1cdd09292ce0b0cc474b82fbbcfc6b9abbb49ed3828c8e7094b7fef629a372833ec6f143ed4eb1b7d5c4fbd32e98a0271
diff --git a/x11-plugins/pidgintex/metadata.xml b/x11-plugins/pidgintex/metadata.xml
new file mode 100644
index 000000000000..0fd7bc3f4dad
--- /dev/null
+++ b/x11-plugins/pidgintex/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>pidginTeX is a fast plugin for the instant messaging client Pidgin and uses
+mimeTeX or mathTeX to render LaTeX expressions in messages and chat. It is
+intended for math but mathTeX is fully compatible with LaTeX and any package can
+be used and mimeTeX also supports many other features.</longdescription>
+	<upstream>
+		<remote-id type="github">Micket/pidgintex</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/pidgintex/pidgintex-1.1.2_p20170107.ebuild b/x11-plugins/pidgintex/pidgintex-1.1.2_p20170107.ebuild
new file mode 100644
index 000000000000..d4ee0bc14c58
--- /dev/null
+++ b/x11-plugins/pidgintex/pidgintex-1.1.2_p20170107.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs vcs-snapshot
+
+MY_COMMIT_HASH="a8f618cf1bf92279b43c7b737010fd7e42c8e5d3"
+
+DESCRIPTION="Pidgin plugin to render LaTeX expressions in messages"
+HOMEPAGE="https://github.com/Micket/pidgintex"
+SRC_URI="https://github.com/Micket/${PN}/archive/${MY_COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+RDEPEND="net-im/pidgin[gtk]
+	app-text/mathtex
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -e "s:\(^CC.*=\).*:\1 $(tc-getCC):" \
+		-e "s:\(^STRIP.*=\).*:\1 true:" \
+		-e "s:\(^CFLAGS[[:space:]]*\)=:\1+=:" \
+		-e "/LIB_INSTALL_DIR/{s:/lib/purple-2:/$(get_libdir)/pidgin:;}" \
+			-i Makefile || die
+	# set default renderer to mathtex
+	sed -e "/purple_prefs_add_string.*PREFS_RENDERER/{s:mimetex:mathtex:;}" \
+		-i pidginTeX.c || die
+
+	if ! use nls; then
+		sed -e '/ENABLE_NLS = 1/ d;' -i Makefile || die
+	fi
+
+	default
+}
+
+src_compile() {
+	emake PREFIX=/usr
+}
+
+src_install() {
+	emake PREFIX="${ED%/}/usr" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog 'Note, to see formulas either disable "Conversation Colors" plugin or'
+	elog 'switch off "ignore incoming format" option in plugin configuration.'
+	elog 'For details, take a look (and vote) at http://developer.pidgin.im/ticket/2772'
+}
diff --git a/x11-plugins/purple-facebook/Manifest b/x11-plugins/purple-facebook/Manifest
new file mode 100644
index 000000000000..908c8263b13e
--- /dev/null
+++ b/x11-plugins/purple-facebook/Manifest
@@ -0,0 +1,3 @@
+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
diff --git a/x11-plugins/purple-facebook/metadata.xml b/x11-plugins/purple-facebook/metadata.xml
new file mode 100644
index 000000000000..0422aa4afa18
--- /dev/null
+++ b/x11-plugins/purple-facebook/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jgeboski/purple-facebook</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/purple-facebook/purple-facebook-20170608.ebuild b/x11-plugins/purple-facebook/purple-facebook-20170608.ebuild
new file mode 100644
index 000000000000..01961de6bd6a
--- /dev/null
+++ b/x11-plugins/purple-facebook/purple-facebook-20170608.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools
+
+MY_PV="0.9.4-c9b74a765767"
+S="${WORKDIR}/${PN}-${MY_PV}"
+DESCRIPTION="Facebook protocol plugin for libpurple"
+HOMEPAGE="https://github.com/dequis/purple-facebook"
+SRC_URI="https://github.com/dequis/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/json-glib
+	 net-im/pidgin"
+DEPEND="${RDEPEND}"
+DOCS=( AUTHORS ChangeLog NEWS README VERSION )
+
+src_prepare() {
+	eautoreconf
+	default
+}
diff --git a/x11-plugins/purple-facebook/purple-facebook-20170831.ebuild b/x11-plugins/purple-facebook/purple-facebook-20170831.ebuild
new file mode 100644
index 000000000000..a4d48b79e1a5
--- /dev/null
+++ b/x11-plugins/purple-facebook/purple-facebook-20170831.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools
+
+MY_PV="0.9.5-9ff9acf9fa14"
+S="${WORKDIR}/${PN}-${MY_PV}"
+DESCRIPTION="Facebook protocol plugin for libpurple"
+HOMEPAGE="https://github.com/dequis/purple-facebook"
+SRC_URI="https://github.com/dequis/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/json-glib
+	 net-im/pidgin"
+DEPEND="${RDEPEND}"
+DOCS=( AUTHORS ChangeLog NEWS README VERSION )
+
+src_prepare() {
+	eautoreconf
+	default
+}
diff --git a/x11-plugins/purple-facebook/purple-facebook-20190113.ebuild b/x11-plugins/purple-facebook/purple-facebook-20190113.ebuild
new file mode 100644
index 000000000000..5954a74a3264
--- /dev/null
+++ b/x11-plugins/purple-facebook/purple-facebook-20190113.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_PV="0.9.6"
+S="${WORKDIR}/${PN}-${MY_PV}"
+DESCRIPTION="Facebook protocol plugin for libpurple"
+HOMEPAGE="https://github.com/dequis/purple-facebook"
+SRC_URI="https://github.com/dequis/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/json-glib
+	 net-im/pidgin"
+DEPEND="${RDEPEND}"
+DOCS=( AUTHORS ChangeLog NEWS README VERSION )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/x11-plugins/purple-hangouts/Manifest b/x11-plugins/purple-hangouts/Manifest
new file mode 100644
index 000000000000..026a8d96c20a
--- /dev/null
+++ b/x11-plugins/purple-hangouts/Manifest
@@ -0,0 +1,3 @@
+DIST purple-hangouts-0_p20181024.tar.gz 150600 BLAKE2B 4dc9b689642b73d242d89f780188d581aac2524665048ef2c35606b2d15a852e6ef111238d1f7a3c65895555d8169c96a7158767ec2a6fa5fb6645fc3f5260eb SHA512 e1200845e64f20aef1b75bd8d7a128fa6b1fe2b731c7d83db876900e2bac988007f04d59996c86c78190770186210401af5a51e0ed490c0027a0933445ce125b
+DIST purple-hangouts-0_p20181108.tar.gz 150585 BLAKE2B faf357ed7f6e58fab49d18dce65b181b5462cfb2c60f074d4a3a9bdfe7fcf0df179e842d7ec4053c323902b214e299b4be7c336bb1fa65257c95babecef1940f SHA512 eb7c522eb51fe82607a643d2b9f817ec5671e4b98a727de8ba73863cda213b8744dd601875febc9cd24eaf6b7213c22034d23d9f6093c542c29524a430ffe464
+DIST purple-hangouts-0_p20181202.tar.gz 151968 BLAKE2B ae487b77e2322fb2e02ceeb5c1cd5eb9eed1aaa71ea47d9f6e032802e2d17da1bf3160a11f4aaa64bd5a95aa67936b867e5a31958efdbdcc80736a96335f3b24 SHA512 4b7ec1b26040f706d2d7badeb667967ac7da1bbabab259c630cec0460ed275ae20e1c4d8303205c757bade38cd23f57d6f7d6f61735a5d189f69f423ed972227
diff --git a/x11-plugins/purple-hangouts/files/purple-hangouts-0_p20181202-makefile.patch b/x11-plugins/purple-hangouts/files/purple-hangouts-0_p20181202-makefile.patch
new file mode 100644
index 000000000000..a575a449c2aa
--- /dev/null
+++ b/x11-plugins/purple-hangouts/files/purple-hangouts-0_p20181202-makefile.patch
@@ -0,0 +1,65 @@
+# HG changeset patch
+# User Stefan Strogin <stefan.strogin@gmail.com>
+# Date 1544083567 -7200
+#      Thu Dec 06 10:06:07 2018 +0200
+# Branch make
+# Node ID 938b9b0dc4fb7b22f8d110e9259899602fe7c1ba
+# Parent  cccf2f62d439fc3dd6248014d171efc811f89f2b
+Compile source files separately. Fixes issue #192
+
+diff -r cccf2f62d439 -r 938b9b0dc4fb Makefile
+--- a/Makefile	Sun Dec 02 22:34:01 2018 +1300
++++ b/Makefile	Thu Dec 06 10:06:07 2018 +0200
+@@ -57,11 +57,13 @@
+       HANGOUTS_DEST =
+ 	  HANGOUTS_ICONS_DEST =
+     else
++      CFLAGS := $(CFLAGS) -fPIC $(INCLUDES) -Ipurple2compat $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple glib-2.0 json-glib-1.0 zlib --libs --cflags`
+       HANGOUTS_TARGET = libhangouts.so
+       HANGOUTS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=plugindir purple`
+ 	  HANGOUTS_ICONS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=datadir purple`/pixmaps/pidgin/protocols
+     endif
+   else
++    CFLAGS := $(CFLAGS) -fPIC $(INCLUDES) $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple-3 glib-2.0 json-glib-1.0 zlib --libs --cflags`
+     HANGOUTS_TARGET = libhangouts3.so
+     HANGOUTS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=plugindir purple-3`
+ 	HANGOUTS_ICONS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=datadir purple-3`/pixmaps/pidgin/protocols
+@@ -75,12 +77,10 @@
+ WIN32_PIDGIN2_LDFLAGS = -L$(PIDGIN_TREE_TOP)/libpurple $(WIN32_LDFLAGS)
+ WIN32_PIDGIN3_LDFLAGS = -L$(PIDGIN3_TREE_TOP)/libpurple -L$(WIN32_DEV_TOP)/gplugin-dev/gplugin $(WIN32_LDFLAGS) -lgplugin
+ 
+-C_FILES := hangouts.pb-c.c hangout_media.pb-c.c gmail.pb-c.c hangouts_json.c hangouts_pblite.c hangouts_connection.c hangouts_auth.c hangouts_events.c hangouts_conversation.c hangouts_media.c
+-PURPLE_COMPAT_FILES := purple2compat/http.c purple2compat/purple-socket.c
+-PURPLE_C_FILES := libhangouts.c $(C_FILES)
+-TEST_C_FILES := hangouts_test.c $(C_FILES)
+-
+-
++OBJ := hangouts.pb-c.o hangout_media.pb-c.o gmail.pb-c.o hangouts_json.o hangouts_pblite.o hangouts_connection.o hangouts_auth.o hangouts_events.o hangouts_conversation.o hangouts_media.o
++PURPLE_COMPAT_FILES := purple2compat/http.o purple2compat/purple-socket.o
++PURPLE_C_FILES := libhangouts.c $(OBJ)
++TEST_C_FILES := hangouts_test.c $(OBJ)
+ 
+ .PHONY:	all install FAILNOPURPLE clean
+ 
+@@ -96,10 +96,10 @@
+ 	$(PROTOC_C) --c_out=. gmail.proto
+ 
+ libhangouts.so: $(PURPLE_C_FILES) $(PURPLE_COMPAT_FILES)
+-	$(CC) -fPIC $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple glib-2.0 json-glib-1.0 zlib --libs --cflags` -ldl $(INCLUDES) -Ipurple2compat -g -ggdb
++	$(CC) $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) -ggdb -ldl
+ 
+ libhangouts3.so: $(PURPLE_C_FILES)
+-	$(CC) -fPIC $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple-3 glib-2.0 json-glib-1.0 zlib --libs --cflags` -ldl $(INCLUDES) -g -ggdb
++	$(CC) $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) -ggdb -ldl
+ 
+ libhangouts.dll: $(PURPLE_C_FILES) $(PURPLE_COMPAT_FILES)
+ 	$(WIN32_CC) -shared -o $@ $^ $(WIN32_PIDGIN2_CFLAGS) $(WIN32_PIDGIN2_LDFLAGS) -Ipurple2compat
+@@ -126,7 +126,7 @@
+ 	echo "You need libpurple development headers installed to be able to compile this plugin"
+ 
+ clean:
+-	rm -f $(HANGOUTS_TARGET) hangouts.pb-c.h hangouts.pb-c.c hangout_media.pb-c.h hangout_media.pb-c.c
++	rm -f $(HANGOUTS_TARGET) $(OBJ) $(PURPLE_COMPAT_FILES) hangouts.pb-c.h hangouts.pb-c.c hangout_media.pb-c.h hangout_media.pb-c.c
+ 
+ 
+ installer: purple-hangouts.nsi libhangouts.dll
diff --git a/x11-plugins/purple-hangouts/metadata.xml b/x11-plugins/purple-hangouts/metadata.xml
new file mode 100644
index 000000000000..2053644053b1
--- /dev/null
+++ b/x11-plugins/purple-hangouts/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>steils@gentoo.org</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">EionRobb/purple-hangouts</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/purple-hangouts/purple-hangouts-0_p20181024.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181024.ebuild
new file mode 100644
index 000000000000..3954afa7a3b2
--- /dev/null
+++ b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181024.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Hangouts Plugin for libpurple"
+HOMEPAGE="https://bitbucket.org/EionRobb/purple-hangouts"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/EionRobb/purple-hangouts"
+else
+	COMMIT_ID="a044363c1883"
+	SRC_URI="https://bitbucket.org/EionRobb/purple-hangouts/get/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/EionRobb-${PN}-${COMMIT_ID}"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/protobuf-c:=
+	net-im/pidgin
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Does not respect CFLAGS
+	sed -i Makefile -e 's/-g -ggdb//g' || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		DESTDIR="${ED}" \
+		install
+
+	einstalldocs
+}
diff --git a/x11-plugins/purple-hangouts/purple-hangouts-0_p20181108.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181108.ebuild
new file mode 100644
index 000000000000..71e7284503d2
--- /dev/null
+++ b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181108.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Hangouts Plugin for libpurple"
+HOMEPAGE="https://bitbucket.org/EionRobb/purple-hangouts"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/EionRobb/purple-hangouts"
+else
+	COMMIT_ID="cd38fcd6082d"
+	SRC_URI="https://bitbucket.org/EionRobb/purple-hangouts/get/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/EionRobb-${PN}-${COMMIT_ID}"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/protobuf-c:=
+	net-im/pidgin
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Does not respect CFLAGS
+	sed -i Makefile -e 's/-g -ggdb//g' || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		DESTDIR="${ED}" \
+		install
+
+	einstalldocs
+}
diff --git a/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild
new file mode 100644
index 000000000000..9b57ae98908d
--- /dev/null
+++ b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Hangouts Plugin for libpurple"
+HOMEPAGE="https://bitbucket.org/EionRobb/purple-hangouts"
+
+COMMIT_ID="cccf2f62d439"
+SRC_URI="https://bitbucket.org/EionRobb/purple-hangouts/get/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+S="${WORKDIR}/EionRobb-${PN}-${COMMIT_ID}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/protobuf-c:=
+	net-im/pidgin
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-0_p20181202-makefile.patch" )
+
+src_prepare() {
+	default
+
+	# Does not respect CFLAGS
+	sed -i Makefile -e 's/-g -ggdb//g' || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		DESTDIR="${ED}" \
+		install
+
+	einstalldocs
+}
diff --git a/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild
new file mode 100644
index 000000000000..df8116adca8c
--- /dev/null
+++ b/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs mercurial
+
+DESCRIPTION="Hangouts Plugin for libpurple"
+HOMEPAGE="https://bitbucket.org/EionRobb/purple-hangouts"
+EHG_REPO_URI="https://bitbucket.org/EionRobb/purple-hangouts"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/protobuf-c:=
+	net-im/pidgin
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-0_p20181202-makefile.patch" )
+
+src_prepare() {
+	default
+
+	# Does not respect CFLAGS
+	sed -i Makefile -e 's/-g -ggdb//g' || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		DESTDIR="${ED}" \
+		install
+
+	einstalldocs
+}
diff --git a/x11-plugins/purple-libnotify-plus/Manifest b/x11-plugins/purple-libnotify-plus/Manifest
new file mode 100644
index 000000000000..72d8e1a41498
--- /dev/null
+++ b/x11-plugins/purple-libnotify-plus/Manifest
@@ -0,0 +1 @@
+DIST purple-libnotify-plus-2.99.1.tar.gz 20168 BLAKE2B bab24be1a541ae50fbbbacb0fa507f0e6000c3e74f1fa75ccceb809de88012f7492ec29ae96cf303cb38463e3af0c916aaead9365d5dce18904b34844e1e8c64 SHA512 436c2363c05b21f0a980e020fe09f3f285e8c9a4d131377f20ec13ecf5ce6ef1bea8ca6ae16de6154657e5d4a9b0229204e7f48a6807d36e516b95248daf11bf
diff --git a/x11-plugins/purple-libnotify-plus/metadata.xml b/x11-plugins/purple-libnotify-plus/metadata.xml
new file mode 100644
index 000000000000..32f58ab64736
--- /dev/null
+++ b/x11-plugins/purple-libnotify-plus/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!--maintainer-needed-->
+	<upstream>
+		<maintainer status="active">
+			<email>sardemff7+gentoo@sardemff7.net</email>
+			<name>Quentin “Sardem FF7” Glidic</name>
+		</maintainer>
+		<remote-id type="github">sardemff7/purple-libnotify-plus</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
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
new file mode 100644
index 000000000000..5a3198f74a14
--- /dev/null
+++ b/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Provide libnotify interface to Pidgin and Finch"
+HOMEPAGE="http://purple-libnotify-plus.sardemff7.net/"
+SRC_URI="https://github.com/sardemff7/purple-libnotify-plus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	net-im/pidgin
+	>=net-im/purple-events-0.99.1
+	x11-libs/gdk-pixbuf
+	>=x11-libs/libnotify-0.7.0"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	eautoreconf
+}
diff --git a/x11-plugins/purple-mattermost/Manifest b/x11-plugins/purple-mattermost/Manifest
new file mode 100644
index 000000000000..01aa7e509d14
--- /dev/null
+++ b/x11-plugins/purple-mattermost/Manifest
@@ -0,0 +1 @@
+DIST purple-mattermost-1.2.tar.gz 65402 BLAKE2B c9f99d61622e0ce1a7aded42f3da44c414615f24a7265b9a2e2bda82dd6afa2ddf6a5063453eead902b140f7e415a043fee2d2f5ff1015bc34f746de5d1793ea SHA512 75e80c1021393c5fe78404a4439b5454f8a4495c1510bf8a3a449acdf1807b8620ac19680607de29bd1599eb0f1354f93c6fa7b21b4294b36649b6e1455760d6
diff --git a/x11-plugins/purple-mattermost/metadata.xml b/x11-plugins/purple-mattermost/metadata.xml
new file mode 100644
index 000000000000..67ce0caadefb
--- /dev/null
+++ b/x11-plugins/purple-mattermost/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">EionRobb/purple-mattermost</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/purple-mattermost/purple-mattermost-1.2-r1.ebuild b/x11-plugins/purple-mattermost/purple-mattermost-1.2-r1.ebuild
new file mode 100644
index 000000000000..b7032a565aa9
--- /dev/null
+++ b/x11-plugins/purple-mattermost/purple-mattermost-1.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A libpurple/Pidgin plugin for Mattermost"
+HOMEPAGE="https://github.com/EionRobb/purple-mattermost"
+SRC_URI="https://github.com/EionRobb/purple-mattermost/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-text/discount
+	dev-libs/glib
+	dev-libs/json-glib
+	net-im/pidgin
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	tc-export CC CPP
+}
diff --git a/x11-plugins/purple-plugin_pack/Manifest b/x11-plugins/purple-plugin_pack/Manifest
new file mode 100644
index 000000000000..2c56c8fc066c
--- /dev/null
+++ b/x11-plugins/purple-plugin_pack/Manifest
@@ -0,0 +1 @@
+DIST purple-plugin-pack-2.7.0.tar.bz2 761618 BLAKE2B 29508a18eda2dab9b9dbb9af5a4ea456f79fe97259afc86a1131370b4b90d5544d8537d8aa2738823c1455632318812478ffeb3583490b041b82e6e631175748 SHA512 fffe1b8c38bff9ce88ae26426110923cc4722bf77fe59f6cf1123931558b06d830a842a6fe4d4f47295beec12f82cf5c25ac03d84944bb2629423ebac4399caf
diff --git a/x11-plugins/purple-plugin_pack/metadata.xml b/x11-plugins/purple-plugin_pack/metadata.xml
new file mode 100644
index 000000000000..ae7b95231ef1
--- /dev/null
+++ b/x11-plugins/purple-plugin_pack/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="talkfilters">Enable support for
+		<pkg>app-text/talkfilters</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="bitbucket">rekkanoryo/purple-plugin-pack</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.7.0-r1.ebuild b/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.7.0-r1.ebuild
new file mode 100644
index 000000000000..0bfcbcf69646
--- /dev/null
+++ b/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.7.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1
+
+MY_PN=${PN/_/-}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="A package with many different plugins for pidgin and libpurple"
+HOMEPAGE="https://bitbucket.org/rekkanoryo/purple-plugin-pack/"
+SRC_URI="https://bitbucket.org/rekkanoryo/${MY_PN}/downloads/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="debug gtk ncurses spell talkfilters"
+
+RDEPEND="
+	dev-libs/json-glib
+	net-im/pidgin[gtk?,ncurses?]
+	talkfilters? ( app-text/talkfilters )
+	spell? ( app-text/gtkspell:2 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	sed -e '/CFLAGS=/{s| -g3||}' -i configure || die
+}
+
+list_plugins_dep() {
+	local dependency=${1}
+	grep -EH "depends.*$dependency" */plugins.cfg | sed 's:/.*::'
+}
+
+src_configure() {
+	local plugins=""
+
+	# list all plugins, then pull DISABLED_PLUGINS with the ones we don't need
+	plugins="$(${EPYTHON} plugin_pack.py -d dist_dirs)"
+	einfo "List of all possible plugins:"
+	einfo "${plugins}"
+
+	eval DISABLED_PLUGINS="\$${PN//[^a-z]/_}_DISABLED_PLUGINS"
+	# disable known broken plugins
+	DISABLED_PLUGINS+=" schedule findip xmmsremote"
+	use gtk || DISABLED_PLUGINS+=" $(list_plugins_dep pidgin)"
+	use ncurses || DISABLED_PLUGINS+=" $(list_plugins_dep finch)"
+	use spell || DISABLED_PLUGINS+=" $(list_plugins_dep gtkspell)"
+	use talkfilters || DISABLED_PLUGINS+=" $(list_plugins_dep talkfiltersbin)"
+
+	for plug in ${DISABLED_PLUGINS}; do
+		plugins="${plugins//${plug}}"
+	done
+
+	plugins="$(echo ${plugins} | sed 's:[ \t]\+:,:g;s:,$::;s:^,::')"
+
+	econf \
+		--with-plugins="${plugins}" \
+		$(use_enable debug)
+}
+
+pkg_preinst() {
+	elog "Note: if you want to disable some plugins in pack, define"
+	elog "${PN//[^a-z]/_}_DISABLED_PLUGINS with a list of plugins to"
+	elog "skip during install (for list see einfo in build output)."
+}
diff --git a/x11-plugins/vicious/Manifest b/x11-plugins/vicious/Manifest
new file mode 100644
index 000000000000..e6d51bb8110b
--- /dev/null
+++ b/x11-plugins/vicious/Manifest
@@ -0,0 +1,2 @@
+DIST vicious-2.3.1.tar.gz 47484 BLAKE2B 2ef6e51507faf7477800091c738e65184439caba9b79004b53f3a479f1370ca64046bc1664c6b746d8ab71370b36f29095406439e2a8fab7524e6bb190350fb7 SHA512 9e89d36d708a7ccdff206451dfb98db8455a16f9d2254167a446af91fadc2103a5274442f38ddf1eb919da23480b6790639cdbbde4a08bffc1cf9221622064c9
+DIST vicious-2.3.3.tar.gz 50564 BLAKE2B f472b9e1514c9f731734e6512496da6ebb516a190225035811333ca7a275509828b8b4078d72856b5a488eeaee612e3070406138f1abd9de61aaa0f01ca370b9 SHA512 2549fa168a8c8cebcb9ecf1eafbc7658213b6a5487839e8acbc2aaed18f0d0b8081550ee7beb93770ae7e600158e12b99b9e1c29af8a8807bb200cc1cdf75807
diff --git a/x11-plugins/vicious/metadata.xml b/x11-plugins/vicious/metadata.xml
new file mode 100644
index 000000000000..eba6c3352f05
--- /dev/null
+++ b/x11-plugins/vicious/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<use>
+		<flag name="contrib">Install extra widgets, some for less common hardware, some contributed by Vicious users.</flag>
+	</use>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/vicious/vicious-2.3.1.ebuild b/x11-plugins/vicious/vicious-2.3.1.ebuild
new file mode 100644
index 000000000000..c4959615581d
--- /dev/null
+++ b/x11-plugins/vicious/vicious-2.3.1.ebuild
@@ -0,0 +1,28 @@
+# 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.3.3.ebuild b/x11-plugins/vicious/vicious-2.3.3.ebuild
new file mode 100644
index 000000000000..4934c0636f0d
--- /dev/null
+++ b/x11-plugins/vicious/vicious-2.3.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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/wmCalClock/Manifest b/x11-plugins/wmCalClock/Manifest
new file mode 100644
index 000000000000..9ebe287e3671
--- /dev/null
+++ b/x11-plugins/wmCalClock/Manifest
@@ -0,0 +1 @@
+DIST wmCalClock-1.25.tar.gz 71574 BLAKE2B b1e308d99ee1b66fa9bb7cfcf0c83ae5e637ff7f17a2d07bb43a57d941c654d53f37ee9941e0fafedd617d64cde8c2880cfcbf664c03e109e80fa523ea9a6e09 SHA512 499f91856e79fee4fb776b3fa8cbcc70cae2e28a1e9ea5d2c1dbf5a7684cff4be4e5e9362d672aa7cf459d0bfe14f68ec51a10376558a9635d77e5e6ce7f149f
diff --git a/x11-plugins/wmCalClock/files/wmCalClock-1.25-gcc-10.patch b/x11-plugins/wmCalClock/files/wmCalClock-1.25-gcc-10.patch
new file mode 100644
index 000000000000..c6a737e6b443
--- /dev/null
+++ b/x11-plugins/wmCalClock/files/wmCalClock-1.25-gcc-10.patch
@@ -0,0 +1,35 @@
+diff -Naur wmCalClock-1.25.orig/Src/xutils.c wmCalClock-1.25/Src/xutils.c
+--- a/xutils.c	1999-03-27 07:46:38.000000000 +0100
++++ b/xutils.c	2020-01-29 18:55:05.062360592 +0100
+@@ -52,6 +52,11 @@
+ GC		NormalGC;
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
++Display		*display;
++Window      Root;
++Window      iconwin, win;
++int         screen; 
++int         DisplayDepth;
+ 
+ 
+ /*
+diff -Naur wmCalClock-1.25.orig/Src/xutils.h wmCalClock-1.25/Src/xutils.h
+--- a/xutils.h	1999-03-27 07:46:38.000000000 +0100
++++ b/xutils.h	2020-01-29 18:54:54.360359886 +0100
+@@ -18,11 +18,11 @@
+ /*
+  *   Global variable
+  */
+-Display		*display;
+-Window          Root;
+-Window          iconwin, win;
+-int             screen; 
+-int             DisplayDepth;
++extern Display	*display;
++extern Window   Root;
++extern Window   iconwin, win;
++extern int      screen; 
++extern int      DisplayDepth;
+ 
+ 
+ 
diff --git a/x11-plugins/wmCalClock/files/wmCalClock-1.25-makefile.patch b/x11-plugins/wmCalClock/files/wmCalClock-1.25-makefile.patch
new file mode 100644
index 000000000000..68756636be27
--- /dev/null
+++ b/x11-plugins/wmCalClock/files/wmCalClock-1.25-makefile.patch
@@ -0,0 +1,35 @@
+--- a/Makefile	1999-03-27 07:46:38.000000000 +0100
++++ b/Makefile	2008-01-27 22:45:09.000000000 +0100
+@@ -1,8 +1,8 @@
+-CC     = gcc
+-CFLAGS = -O2 -Wall
+-INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
+-DESTDIR= /usr/X11R6
+-LIBDIR = -L/usr/X11R6/lib
++CC     ?= gcc
++CFLAGS += -Wall
++INCDIR = -I/usr/include/X11 -I/usr/include
++PREFIX ?= /usr
++LIBDIR ?= /usr/lib
+ 
+ # for Linux
+ LIBS   = -lXpm -lX11 -lXext
+@@ -22,7 +22,7 @@
+ 
+ wmCalClock.o: wmCalClock_master.xpm wmCalClock_mask.xbm
+ wmCalClock:	$(OBJS) 
+-	$(CC) $(COPTS) $(SYSTEM) -o wmCalClock $^ $(INCDIR) $(LIBDIR) $(LIBS)
++	$(CC) $(CFLAGS) -o wmCalClock $^ $(INCDIR) -L$(LIBDIR) $(LDFLAGS) $(LIBS)
+ 
+ clean:
+ 	for i in $(OBJS) ; do \
+@@ -31,6 +31,7 @@
+ 	rm -f wmCalClock
+ 
+ install:: wmCalClock
+-	install -c -s -m 0755 wmCalClock $(DESTDIR)/bin
+-	install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1 
++	install -d $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/man/man1
++	install -m 0755 wmCalClock $(DESTDIR)$(PREFIX)/bin
++	install -m 0644 wmCalClock.1 $(DESTDIR)$(PREFIX)/share/man/man1
+ 
diff --git a/x11-plugins/wmCalClock/metadata.xml b/x11-plugins/wmCalClock/metadata.xml
new file mode 100644
index 000000000000..5d2d9a9479a9
--- /dev/null
+++ b/x11-plugins/wmCalClock/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+wmCalClock is a calendar clock with anti-aliased text and drop shadows. Colors 
+and fonts in the time field are user configurable. It displays local time, 
+universal time and sidereal time.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild
new file mode 100644
index 000000000000..c7508ab5e8e8
--- /dev/null
+++ b/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="WMaker DockApp: A Calendar clock with antialiased text"
+HOMEPAGE="https://www.dockapps.net/wmcalclock"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 ~mips ppc ppc64 ~sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${P}/Src"
+
+DOCS=( ../{BUGS,CHANGES,HINTS,README,TODO} )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
+	)
+
+src_compile() {
+	emake CC="$(tc-getCC)" LIBDIR="-L/usr/$(get_libdir)/"
+}
diff --git a/x11-plugins/wmDownload/Manifest b/x11-plugins/wmDownload/Manifest
new file mode 100644
index 000000000000..0930bde3b7dc
--- /dev/null
+++ b/x11-plugins/wmDownload/Manifest
@@ -0,0 +1 @@
+DIST wmDownload-0.1.2a.tar.gz 11449 BLAKE2B abbb01eec5dc9dc2932d4e7857b850ba64b564618e6643282b9659623444062d785bcde41ddfc0684d02cee6ca62df847a341ecdab8d48de9dc751d906563a0a SHA512 95bc3f7c9be344d88146fd0b2407afe43f5975bbf2158fc54c9d9200a7f09b53af3a8cae790b2e26f8e34792317a28524422e0d4f96e0e603e05af92d6354752
diff --git a/x11-plugins/wmDownload/files/wmDownload-0.1.2a-makefile.patch b/x11-plugins/wmDownload/files/wmDownload-0.1.2a-makefile.patch
new file mode 100644
index 000000000000..67fe981d0c4d
--- /dev/null
+++ b/x11-plugins/wmDownload/files/wmDownload-0.1.2a-makefile.patch
@@ -0,0 +1,28 @@
+--- a/Makefile	2000-04-14 15:39:52.000000000 +0200
++++ b/Makefile	2008-01-27 23:07:51.000000000 +0100
+@@ -1,17 +1,17 @@
+-CC     = gcc
+-CFLAGS = -O2 -Wall -fomit-frame-pointer -s
+-INCDIR = -I/usr/X11R6/include/X11
+-DESTDIR= /usr/bin
+-LIBDIR = -L/usr/X11R6/lib
++CC     ?= gcc
++CFLAGS += -Wall
++INCDIR = -I/usr/include/X11
++PREFIX = /usr
++LIBDIR ?= /usr/lib
+ LIBS   = -ldockapp -lX11 -lXext -lXpm
+ OBJS   = wmDownload.o
+ 
+ wmDownload: $(OBJS) 
+-	$(CC) $(CFLAGS) $(OBJS) -o wmDownload $(INCDIR) $(LIBDIR) $(LIBS)
++	$(CC) $(CFLAGS) $(OBJS) -o wmDownload $(INCDIR) -L$(LIBDIR) $(LDFLAGS) $(LIBS)
+ 
+ install: wmDownload
+-	strip wmDownload
+-	install -s wmDownload $(DESTDIR)
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install -m 0755 wmDownload $(DESTDIR)$(PREFIX)/bin
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)/wmDownload
diff --git a/x11-plugins/wmDownload/metadata.xml b/x11-plugins/wmDownload/metadata.xml
new file mode 100644
index 000000000000..17fd2d4cac89
--- /dev/null
+++ b/x11-plugins/wmDownload/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+		wmDownload is a small WindowMaker dockapp that sits there and displays how much
+		data you've received on each eth and ppp device installed on your machine.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">wmdownload</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmDownload/wmDownload-0.1.2a-r3.ebuild b/x11-plugins/wmDownload/wmDownload-0.1.2a-r3.ebuild
new file mode 100644
index 000000000000..ca74298aa724
--- /dev/null
+++ b/x11-plugins/wmDownload/wmDownload-0.1.2a-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="dockapp that displays how much data you've received on each eth and ppp device"
+SRC_URI="mirror://sourceforge/wmdownload/${P}.tar.gz"
+HOMEPAGE="http://wmdownload.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+DOCS=( CHANGELOG CREDITS HINTS README TODO )
+
+src_prepare() {
+	sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
+}
diff --git a/x11-plugins/wmMatrix/Manifest b/x11-plugins/wmMatrix/Manifest
new file mode 100644
index 000000000000..6287794ad8ad
--- /dev/null
+++ b/x11-plugins/wmMatrix/Manifest
@@ -0,0 +1 @@
+DIST wmMatrix-0.2.tar.gz 225343 BLAKE2B 4d649ac8e9691a75c7e9a32266074a5624ef83e4f91a6474bfef67df1e3d5b653b63b5909a5bb5460312b36ea661404aa843e2d7ba56a39e43b9a815e734d121 SHA512 4cc65c90e5279645163833f6c8a57bce0d81428c1e5106a98dd74c1b0d693f2dfd3b230e49f9ce710ecc8073477750db94dd9b3c2b96ee026ef0c666f4bc3c4c
diff --git a/x11-plugins/wmMatrix/files/wmMatrix-0.2-fno-common.patch b/x11-plugins/wmMatrix/files/wmMatrix-0.2-fno-common.patch
new file mode 100644
index 000000000000..1bb92d66a6c2
--- /dev/null
+++ b/x11-plugins/wmMatrix/files/wmMatrix-0.2-fno-common.patch
@@ -0,0 +1,37 @@
+--- a/xutils.h
++++ b/xutils.h
+@@ -18,11 +18,11 @@
+ /*
+  *   Global variable
+  */
+-Display		*display;
+-Window          Root;
+-Window          iconwin, win;
+-int             screen; 
+-int             DisplayDepth;
++extern Display		*display;
++extern Window          Root;
++extern Window          iconwin, win;
++extern int             screen; 
++extern int             DisplayDepth;
+ 
+ 
+ 
+--- a/xutils.c
++++ b/xutils.c
+@@ -42,6 +42,15 @@
+ #include "xutils.h"
+ 
+ 
++/*
++ *   Global variable
++ */
++Display		*display;
++Window          Root;
++Window          iconwin, win;
++int             screen; 
++int             DisplayDepth;
++
+ 
+ /*
+  *   X11 Variables 
diff --git a/x11-plugins/wmMatrix/files/wmMatrix-0.2-makefile.patch b/x11-plugins/wmMatrix/files/wmMatrix-0.2-makefile.patch
new file mode 100644
index 000000000000..691ff7e424d7
--- /dev/null
+++ b/x11-plugins/wmMatrix/files/wmMatrix-0.2-makefile.patch
@@ -0,0 +1,34 @@
+--- a/Makefile	1999-08-16 18:01:58.000000000 +0200
++++ b/Makefile	2008-01-27 23:23:36.000000000 +0100
+@@ -1,8 +1,8 @@
+-CC     = gcc
+-CFLAGS = -O2 -Wall 
+-INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
+-DESTDIR= /usr/X11R6
+-LIBDIR = -L/usr/X11R6/lib
++CC     ?= gcc
++CFLAGS += -Wall 
++INCDIR = -I/usr/include/X11 -I/usr/include
++PREFIX ?= /usr
++LIBDIR ?= /usr/lib
+ 
+ # for Linux
+ LIBS   = -lXpm -lX11 -lXext
+@@ -24,7 +24,7 @@
+ 
+ wmMatrix.o: wmMatrix_master.xpm wmMatrix_mask.xbm
+ wmMatrix:	$(OBJS) 
+-	$(CC) $(COPTS) $(SYSTEM) -o wmMatrix $^ $(INCDIR) $(LIBDIR) $(LIBS)
++	$(CC) $(COPTS) $(SYSTEM) -o wmMatrix $^ $(INCDIR) -L$(LIBDIR) $(LDFLAGS) $(LIBS)
+ 
+ 
+ clean:
+@@ -34,5 +34,6 @@
+ 	rm -f wmMatrix
+ 
+ install:: wmMatrix
+-	install -c -s -m 0755 wmMatrix $(DESTDIR)/bin
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install -m 0755 wmMatrix $(DESTDIR)$(PREFIX)/bin
+ 
+
diff --git a/x11-plugins/wmMatrix/metadata.xml b/x11-plugins/wmMatrix/metadata.xml
new file mode 100644
index 000000000000..fe8e2ad21d02
--- /dev/null
+++ b/x11-plugins/wmMatrix/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+		wmMatrix is an early beta version of a cpu monitor built around the display
+		from the movie"The Matrix".
+	</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild
new file mode 100644
index 000000000000..5b686f451ee5
--- /dev/null
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="WMaker DockApp: Slightly modified version of Jamie Zawinski's xmatrix screenhack"
+HOMEPAGE="https://www.dockapps.net/wmmatrix"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+CDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${CDEPEND}
+	x11-base/xorg-proto"
+RDEPEND="${CDEPEND}
+	x11-misc/xscreensaver"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	)
+
+src_compile() {
+	# this version is distributed with compiled binaries!
+	make clean
+	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
+}
diff --git a/x11-plugins/wmSMPmon/Manifest b/x11-plugins/wmSMPmon/Manifest
new file mode 100644
index 000000000000..936394c2a37f
--- /dev/null
+++ b/x11-plugins/wmSMPmon/Manifest
@@ -0,0 +1 @@
+DIST wmSMPmon-3.1.tar.gz 24834 BLAKE2B c02c49810f69b9d28d42f24e7fde6556d46f214d4cb5b47cd705bed2ff5c2c00205829018179ecd6c63162a58d0a957d5fa35d33f0075532c72d3d6876ac6c40 SHA512 b13caa3c4bc7971d35bc52bb66c1f6da482b55a5073b61b3f059fac97f6affbf091816c933981c1c88c17127ab8d21c09c59d0f3c93364e659ca409f13de43b7
diff --git a/x11-plugins/wmSMPmon/files/wmSMPmon-3.1-fno-common.patch b/x11-plugins/wmSMPmon/files/wmSMPmon-3.1-fno-common.patch
new file mode 100644
index 000000000000..f1416fcc0248
--- /dev/null
+++ b/x11-plugins/wmSMPmon/files/wmSMPmon-3.1-fno-common.patch
@@ -0,0 +1,36 @@
+diff -Naur wmSMPmon-3.1.orig/wmgeneral/wmgeneral.h wmSMPmon-3.1/wmgeneral/wmgeneral.h
+--- wmSMPmon-3.1.orig/wmgeneral/wmgeneral.h	1999-04-25 05:08:22.000000000 +0200
++++ wmSMPmon-3.1/wmgeneral/wmgeneral.h	2020-03-29 13:32:55.253627166 +0200
+@@ -36,7 +36,7 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
+diff -Naur wmSMPmon-3.1.orig/wmSMPmon/standards.h wmSMPmon-3.1/wmSMPmon/standards.h
+--- wmSMPmon-3.1.orig/wmSMPmon/standards.h	2004-11-19 14:57:30.000000000 +0100
++++ wmSMPmon-3.1/wmSMPmon/standards.h	2020-03-29 13:32:14.666639432 +0200
+@@ -37,7 +37,7 @@
+ #define	HAUTEUR  31 /* Max. height of CPU Load Bar+Graph */
+ 
+ /* Program name used in error messages */
+-char *Myname;
++extern char *Myname;
+ 
+ /* NumCPUs_DoInit returns the number of CPUs present in the system and
+    performs any initialization necessary for the sysinfo-XXX module */
+diff -Naur wmSMPmon-3.1.orig/wmSMPmon/wmSMPmon.c wmSMPmon-3.1/wmSMPmon/wmSMPmon.c
+--- wmSMPmon-3.1.orig/wmSMPmon/wmSMPmon.c	2005-11-07 01:24:32.000000000 +0100
++++ wmSMPmon-3.1/wmSMPmon/wmSMPmon.c	2020-03-29 13:33:03.630624637 +0200
+@@ -35,6 +35,8 @@
+ /*###### Funcition definitions ##########################################*/
+ void usage(int cpus, const char *str);
+ 
++char *Myname;
++Display *display;
+ 
+ /*###### MAIN PROGRAM ###################################################*/
+ int main(int argc, char **argv)
diff --git a/x11-plugins/wmSMPmon/files/wmSMPmon-3.1-makefile.patch b/x11-plugins/wmSMPmon/files/wmSMPmon-3.1-makefile.patch
new file mode 100644
index 000000000000..3dd1b0636d86
--- /dev/null
+++ b/x11-plugins/wmSMPmon/files/wmSMPmon-3.1-makefile.patch
@@ -0,0 +1,45 @@
+--- a/Makefile	2005-02-22 23:24:23.000000000 +0100
++++ b/Makefile	2008-01-28 00:12:33.000000000 +0100
+@@ -2,22 +2,24 @@
+ # Adapted for wmSMPmon 2.9.x and higher: Thomas Ribbrock
+ 
+ # Change the following two to determine installation location
+-BINDIR=/usr/local/bin/
+-MANDIR=/usr/local/share/man/
++PREFIX=/usr
++BINDIR=$(PREFIX)/bin
++MANDIR=$(PREFIX)/share/man
+ 
+ SRC = general.c sysinfo-linux.c ../wmgeneral/wmgeneral.c wmSMPmon.c 
+ EXE = wmSMPmon
+ MAN = wmSMPmon.1
+ OBJ = $(SRC:.c=.o)
+ INSTALL = /usr/bin/install
+-INSTALLEXEFLAGS = -m 755 -s
++INSTALLEXEFLAGS = -m 755
+ INSTALLMANFLAGS = -m 644
+-CC = gcc
+-CFLAGS = -Wall -O2 -g
+-LIB = -L/usr/X11R6/lib -lXpm -lXext -lX11
++CC ?= gcc
++CFLAGS += -Wall
++LIBDIR ?= /usr/lib
++LIBS= -lXpm -lXext -lX11
+ 
+ all: $(OBJ)
+-	$(CC) -o $(EXE) $(OBJ) $(LIB)
++	$(CC) $(CFLAGS) -o $(EXE) $(OBJ) -L$(LIBDIR) $(LDFLAGS) $(LIBS)
+ 
+ $(OBJ): %.o : %.c 
+ 	$(CC) $(CFLAGS) -c -o $@ $<
+@@ -28,6 +31,7 @@
+ 	rm -rf ../wmgeneral/*.o
+ 
+ install:
+-	$(INSTALL) $(INSTALLEXEFLAGS) $(EXE) $(BINDIR)
+-	$(INSTALL) -d $(MANDIR)/man1
+-	$(INSTALL) $(INSTALLMANFLAGS) $(MAN) $(MANDIR)/man1
++	$(INSTALL) -d $(DESTDIR)$(BINDIR)
++	$(INSTALL) $(INSTALLEXEFLAGS) $(EXE) $(DESTDIR)$(BINDIR)
++	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
++	$(INSTALL) $(INSTALLMANFLAGS) $(MAN) $(DESTDIR)$(MANDIR)/man1
diff --git a/x11-plugins/wmSMPmon/metadata.xml b/x11-plugins/wmSMPmon/metadata.xml
new file mode 100644
index 000000000000..573088e79f4c
--- /dev/null
+++ b/x11-plugins/wmSMPmon/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+wmSMPmon is a Window Maker applet for monitoring
+the CPUs, memory, and swap of SMP systems. 
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
new file mode 100644
index 000000000000..cc153566aa1a
--- /dev/null
+++ b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="SMP system monitor dockapp"
+HOMEPAGE="https://www.dockapps.net/wmsmpmon"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+DOCS=( ../Changelog )
+
+S=${WORKDIR}/${P}/${PN}
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_prepare() {
+	default
+
+	pushd "${WORKDIR}"/${P} || die
+	eapply "${FILESDIR}"/${P}-fno-common.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
+}
diff --git a/x11-plugins/wmSpaceWeather/Manifest b/x11-plugins/wmSpaceWeather/Manifest
new file mode 100644
index 000000000000..5fd3f073bec6
--- /dev/null
+++ b/x11-plugins/wmSpaceWeather/Manifest
@@ -0,0 +1,2 @@
+DIST wmspaceweather_1.04-19.diff.gz 9429 BLAKE2B c32b02d123783789962ef56f54b79b7afacc69573526cd5254b7083673a5ae0d70abaa82d84421c86d95139f9033a35de6511d131f73ff1360d43d1d0e320979 SHA512 f8228c15642b88b355f977a8ce73b474bf8874b4b64bce3f519e6ec6c5de1db7bbd1e5f40e57e367dc0a1dec47e5c32b87d4ce61e35043d71cee0005b06a5a78
+DIST wmspaceweather_1.04.orig.tar.gz 36295 BLAKE2B 8f12a4ba7dc55d06ab1b3c86f387c0f4dc930d89b8ccf151096d736adb80deaf647e47bb4592f309042e2273936996b215cb2fffe83dbbe20bd10d94b1b7c109 SHA512 d422806d44a2929cfdb3e36c7075a4e02b64416db7c528d08411944f574dc34bb5e5ee48c55a3b9e796b15529857bcb480dc650ebdfe23cf1079ba09e2749154
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
new file mode 100644
index 000000000000..f95e7e5ccbe0
--- /dev/null
+++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch
@@ -0,0 +1,23 @@
+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
+@@ -28,7 +28,7 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* 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
+@@ -91,6 +91,7 @@
+ char            URL[1024];
+ int		ForceUpdate2;
+ 
++Display		*display;
+ 
+ void ParseCMDLine(int argc, char *argv[]);
+ void pressEvent(XButtonEvent *xev);
diff --git a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch
new file mode 100644
index 000000000000..29cb5f984f13
--- /dev/null
+++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch
@@ -0,0 +1,61 @@
+--- wmSpaceWeather/Makefile.orig	2008-01-28 02:45:07.000000000 +0100
++++ wmSpaceWeather/Makefile	2008-01-28 02:46:04.000000000 +0100
+@@ -1,8 +1,8 @@
+-CC     = gcc
+-CFLAGS = -O2 -Wall
+-INCDIR = -I/usr/X11R6/include/X11
+-DESTDIR= /usr/X11R6
+-LIBDIR = -L/usr/X11R6/lib
++CC     ?= gcc
++CFLAGS += -Wall
++INCDIR = -I/usr/include/X11
++PREFIX = /usr
++LIBDIR ?= /usr/lib
+ # for linux
+ LIBS   = -lXpm -lX11 -lXext
+ # for Solaris
+@@ -12,14 +12,14 @@
+ 
+ 
+ .c.o:
+-	$(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
++	$(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
+ 
+ 
+ all:	wmSpaceWeather.o wmSpaceWeather
+ 
+ wmSpaceWeather.o: wmSpaceWeather_master.xpm wmSpaceWeather_mask.xbm
+ wmSpaceWeather:	$(OBJS) 
+-	$(CC) $(COPTS) $(SYSTEM) -o wmSpaceWeather $^ $(INCDIR) $(LIBDIR) $(LIBS)
++	$(CC) $(CFLAGS) -o wmSpaceWeather $^ $(INCDIR) -L$(LIBDIR) $(LDFLAGS) $(LIBS)
+ 
+ clean:
+ 	for i in $(OBJS) ; do \
+@@ -28,10 +28,10 @@
+ 	rm -f wmSpaceWeather
+ 
+ install:: wmSpaceWeather
+-	install -d $(DESTDIR)/usr/bin
+-	install -d $(DESTDIR)/usr/share/wmspaceweather
+-	install -d $(DESTDIR)/usr/share/man/man1 
+-	install -m 0755 wmSpaceWeather $(DESTDIR)/usr/bin
+-	install -m 0755 GetKp $(DESTDIR)/usr/share/wmspaceweather
+-	install -m 0644 wmSpaceWeather.1 $(DESTDIR)/usr/share/man/man1 
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install -d $(DESTDIR)$(PREFIX)/share/wmspaceweather
++	install -d $(DESTDIR)$(PREFIX)/share/man/man1 
++	install -m 0755 wmSpaceWeather $(DESTDIR)$(PREFIX)/bin
++	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
+@@ -663,7 +663,7 @@
+     if (GotDoubleClick1) {
+         GotFirstClick1 = 0;
+         GotDoubleClick1 = 0;
+-        sprintf(Command, "sensible-browser '%s' &", URL);
++	sprintf(Command, "firefox -remote 'openURL(%s)'", URL);
+         system(Command);
+     }
+ 
diff --git a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch
new file mode 100644
index 000000000000..6d6d90137feb
--- /dev/null
+++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch
@@ -0,0 +1,27 @@
+--- wmSpaceWeather/GetKp.orig	2008-01-28 14:20:43.000000000 +0100
++++ wmSpaceWeather/GetKp	2008-01-28 14:22:48.000000000 +0100
+@@ -17,10 +17,10 @@
+     unlink(CUR_INDEX);
+ 
+ 
+-#   $grabcmd = "cd /tmp; /usr/bin/wget -q ftp://www.sec.noaa.gov/pub/indices/DGD.txt";
++#   $grabcmd = "cd /tmp; /usr/bin/wget -q http://www.swpc.noaa.gov/ftpdir/indices/DGD.txt";
+ #   system "$grabcmd";
+ #
+-	$grabcmd = "/usr/bin/curl -f -s -o " . DGD_FILE . " http://www.sec.noaa.gov/ftpdir/indices/DGD.txt";
++	$grabcmd = "/usr/bin/curl -f -s -o " . DGD_FILE . " http://www.swpc.noaa.gov/ftpdir/indices/DGD.txt";
+ 	exit 1 if (system "$grabcmd");
+ 
+ 
+@@ -69,9 +69,9 @@
+     #
+     # Add in very latest stuff
+     #
+-#   $grabcmd = "cd /tmp; /usr/bin/wget -q ftp://www.sec.noaa.gov/pub/latest/curind.txt";
++#   $grabcmd = "cd /tmp; /usr/bin/wget -q http://www.swpc.noaa.gov/ftpdir/latest/curind.txt";
+ #   system "$grabcmd";
+-	$grabcmd = "/usr/bin/curl -f -s -o " . CUR_INDEX . " http://www.sec.noaa.gov/ftpdir/latest/curind.txt";
++	$grabcmd = "/usr/bin/curl -f -s -o " . CUR_INDEX . " http://www.swpc.noaa.gov/ftpdir/latest/curind.txt";
+ 	exit 1 if (system "$grabcmd");
+     %lmonstr = ( "Jan", 1, "Feb", 2, "Mar", 3, "Apr", 4, "May", 5, "Jun", 6, "Jul", 7, "Aug", 8, "Sep", 9, "Oct", 10, "Nov", 11, "Dec", 12);
+ 
diff --git a/x11-plugins/wmSpaceWeather/metadata.xml b/x11-plugins/wmSpaceWeather/metadata.xml
new file mode 100644
index 000000000000..776bb6b1bfc3
--- /dev/null
+++ b/x11-plugins/wmSpaceWeather/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+		wmSpaceWeather shows environmental conditions in space.
+	</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
new file mode 100644
index 000000000000..9bd5996db7f1
--- /dev/null
+++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+MY_PN="wmspaceweather"
+MY_PV_ORIG="${PV/_p*}"
+MY_PV_PATCH="${PV/_p/-}"
+MY_P_ORIG="${MY_PN}_${MY_PV_ORIG}.orig"
+MY_P_PATCH="${MY_PN}_${MY_PV_PATCH}.diff"
+
+DESCRIPTION="dockapp showing weather at geosynchronous orbit"
+HOMEPAGE="https://www.dockapps.net/wmspaceweather"
+SRC_URI="mirror://debian/pool/main/w/${MY_PN}/${MY_P_ORIG}.tar.gz
+	    mirror://debian/pool/main/w/${MY_PN}/${MY_P_PATCH}.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~hppa ~mips ppc ~sparc x86"
+
+DOCS=( ../{BUGS,CHANGES,HINTS,README} )
+
+CDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${CDEPEND}
+	x11-base/xorg-proto"
+RDEPEND="${CDEPEND}
+	net-misc/curl
+	dev-lang/perl"
+
+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
+
+	# 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 "${FILESDIR}"/${P}-gentoo.patch
+	eapply "${FILESDIR}"/${P}-getkp.patch
+}
+
+src_compile() {
+	emake clean
+	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
+}
+
+pkg_postinst() {
+	elog "You need to emerge www-client/firefox or www-client/firefox-bin"
+	elog "to use the -url functionality - see man ${PN} for more info."
+	elog
+	elog "This version uses curl instead of wget. You may edit /usr/share/wmspaceweather/GetKp"
+	elog "if you don't like it."
+}
diff --git a/x11-plugins/wmSun/Manifest b/x11-plugins/wmSun/Manifest
new file mode 100644
index 000000000000..c0006533da1a
--- /dev/null
+++ b/x11-plugins/wmSun/Manifest
@@ -0,0 +1 @@
+DIST wmsun-1.05.tar.gz 20680 BLAKE2B 86e75467133b23e3f062203df6bbd8fe0aa1ca90c468bd91f3de3ec360e4d677bf5a117becf63e111557a17dbf346a1b23a61b78030d197264d71989097c9d77 SHA512 baa610db04ba67ca09112765e28c0fa945a98a61b642925dbaaa56a5b3e7da7424d8dd15097dcec932e3b603219d1f8806c0e50c025370226a157791f16911da
diff --git a/x11-plugins/wmSun/metadata.xml b/x11-plugins/wmSun/metadata.xml
new file mode 100644
index 000000000000..849d8cc554d6
--- /dev/null
+++ b/x11-plugins/wmSun/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+		wmSun shows rise/set times for the Sun. The user needs to supply his/her
+		latitude and longitude. wmSun works for all latitudes (when Sun does not rise
+		or set, a --:-- is shown for the relevant entry).
+	</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmSun/wmSun-1.05-r1.ebuild b/x11-plugins/wmSun/wmSun-1.05-r1.ebuild
new file mode 100644
index 000000000000..a68c23d6c316
--- /dev/null
+++ b/x11-plugins/wmSun/wmSun-1.05-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+MY_P=${P/S/s}
+DESCRIPTION="dockapp which displays the rise/set time of the sun"
+HOMEPAGE="https://www.dockapps.net/wmsun"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ~ppc ~sparc x86"
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc README {BUGS,TODO}
+}
diff --git a/x11-plugins/wmXName/Manifest b/x11-plugins/wmXName/Manifest
new file mode 100644
index 000000000000..040ddc3152ab
--- /dev/null
+++ b/x11-plugins/wmXName/Manifest
@@ -0,0 +1 @@
+DIST wmXName-0.01.tgz 10757 BLAKE2B cebe95354227f7a47fca90dd96225f4972edbcecbaf207d4275993cf1d5acff2fa85fb9ef4322130b98d62d2688317d94a6f513d9106d7fe7f1aa92f5e294055 SHA512 1b94e70fd1cb89b0fa47d488d85d981316efc636d4ef743e9445add38b48d33b1baa1ce38192e6d3b476c0f65aa312394b7dd9edc3f43ccef4f7bae807828b0b
diff --git a/x11-plugins/wmXName/files/wmXName-0.1-fno-common.patch b/x11-plugins/wmXName/files/wmXName-0.1-fno-common.patch
new file mode 100644
index 000000000000..a4cb9c0cb043
--- /dev/null
+++ b/x11-plugins/wmXName/files/wmXName-0.1-fno-common.patch
@@ -0,0 +1,35 @@
+diff -Naur wmXName-0.01.orig/xutils.c wmXName-0.01/xutils.c
+--- wmXName-0.01.orig/xutils.c	2002-06-28 11:34:26.000000000 +0200
++++ wmXName-0.01/xutils.c	2020-06-13 11:02:20.393108819 +0200
+@@ -52,6 +52,11 @@
+ GC		NormalGC;
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
++Display		*display;
++Window          Root;
++Window          iconwin, win;
++int             screen; 
++int             DisplayDepth;
+ 
+ 
+ 
+diff -Naur wmXName-0.01.orig/xutils.h wmXName-0.01/xutils.h
+--- wmXName-0.01.orig/xutils.h	2002-06-28 11:34:59.000000000 +0200
++++ wmXName-0.01/xutils.h	2020-06-13 11:02:25.886113159 +0200
+@@ -18,11 +18,11 @@
+ /*
+  *   Global variable
+  */
+-Display		*display;
+-Window          Root;
+-Window          iconwin, win;
+-int             screen; 
+-int             DisplayDepth;
++extern Display		*display;
++extern Window          Root;
++extern Window          iconwin, win;
++extern int             screen; 
++extern int             DisplayDepth;
+ 
+ 
+ 
diff --git a/x11-plugins/wmXName/metadata.xml b/x11-plugins/wmXName/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmXName/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmXName/wmXName-0.1-r1.ebuild b/x11-plugins/wmXName/wmXName-0.1-r1.ebuild
new file mode 100644
index 000000000000..793841b97984
--- /dev/null
+++ b/x11-plugins/wmXName/wmXName-0.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="0.01"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="dock-app showing you status of your XName hosted zones"
+HOMEPAGE="http://source.xname.org/"
+SRC_URI="http://source.xname.org/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+
+COMMON_DEPEND=">=x11-libs/libXpm-3.5.7
+	>=x11-libs/libX11-1.1.4
+	>=x11-libs/libXext-1.0.3"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5.8.8-r5
+	>=www-client/lynx-2.8.6-r2"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	#some magic sed to fix CFLAGS
+	sed -i "s/-O2 -Wall/$CFLAGS/" "${S}/Makefile" || die
+
+	#INSTALL file actually contains use instructions
+	mv "${S}/INSTALL" "${S}/README" || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" SYSTEM="${LDFLAGS}"
+}
+
+src_install() {
+	dobin wmXName GrabXName
+	dodoc README config.sample
+}
diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
new file mode 100644
index 000000000000..faffd59389db
--- /dev/null
+++ b/x11-plugins/wmacpi/Manifest
@@ -0,0 +1,2 @@
+DIST wmacpi-2.3.tar.gz 39374 BLAKE2B bcf55a801fbc7b7c4484cc8987366786e1a1dbaf4d9ff6800975de14bd295ced774eaeedfe0c9da524b774de7633d5d250e7be55742fca7893f7314b8b4fe6fc SHA512 47c260989cd3fdb8d7ceadba19224e6350056741b03c6f1b73a38b06d7e471a08972dfbcaeacdcbc460bc19b0f952641eda75e11468b4d7155eecd07e1e14cd9
+DIST wmacpi-2.4.tar.gz 40265 BLAKE2B 5acd0b8506b762909893bb8d3ac28dc193166db67195bc14fb321b1d7f3a177cf60412b5d854d039ec0d6289dfefd9ea660a98e69a41148930b71437405ca65a SHA512 56a2967354a16f1ae03ee159dfe787a96c0d7ecf654852833ed71c7f65ca9a3717d9a582f2900a9fd925b0648ef5fcdf08cc4c68e78e75dedbd44a0a35ce752b
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch b/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch
new file mode 100644
index 000000000000..49ee8446fc44
--- /dev/null
+++ b/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch
@@ -0,0 +1,27 @@
+diff -Naur dockapps.orig/libacpi.c dockapps/libacpi.c
+--- dockapps.orig/libacpi.c	2015-01-12 11:24:15.000000000 +0100
++++ dockapps/libacpi.c	2020-05-29 22:33:52.526826841 +0200
+@@ -17,6 +17,9 @@
+ #define SYSFS_DATA_SOURCE   1
+ static int data_source;
+ 
++battery_t batteries[MAXBATT];
++int verbosity;
++
+ /* local proto */
+ int acpi_get_design_cap(int batt);
+ 
+diff -Naur dockapps.orig/libacpi.h dockapps/libacpi.h
+--- dockapps.orig/libacpi.h	2015-01-12 11:24:15.000000000 +0100
++++ dockapps/libacpi.h	2020-05-29 22:33:36.393811163 +0200
+@@ -128,8 +128,8 @@
+ 
+ 
+ /* Since these /are/ needed here . . . */
+-battery_t batteries[MAXBATT];
+-int verbosity;
++extern battery_t batteries[MAXBATT];
++extern int verbosity;
+ 
+ /* check if apm/acpi is enabled, etc */
+ int power_init(global_t *globals);
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch b/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch
new file mode 100644
index 000000000000..2bf80a3190db
--- /dev/null
+++ b/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch
@@ -0,0 +1,47 @@
+--- a/Makefile	2015-01-12 11:27:07.396319323 +0100
++++ b/Makefile	2015-01-12 11:29:21.531298827 +0100
+@@ -13,8 +13,8 @@
+ #OPT	= -pg -g
+ 
+ CC	:= gcc
+-CFLAGS	+= $(OPT) -Wall -W -g -ansi
+-LDFLAGS += $(OPT) -lX11 -ldockapp
++CFLAGS	:= -Wall -W -g -ansi
++LIBS := -lX11 -ldockapp
+ 
+ WMSRC	:= wmacpi.c libacpi.c
+ HEADERS := libacpi.h wmacpi.h
+@@ -26,7 +26,7 @@
+ doc_targets += wmacpi-cli.1
+ endif
+ 
+-PREFIX := /usr/local
++PREFIX := /usr
+ 
+ all: $(targets)
+ 
+@@ -37,7 +37,7 @@
+ -include $(WMOBJ:.o=.d)
+ 
+ wmacpi:	$(WMOBJ)
+-	$(CC) -o $@ $^ $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ # for the Debian package, we want to make building the command line tools
+ # optional. So, we hide all the necessary stuff here . . .
+@@ -47,13 +47,13 @@
+ -include $(CLOBJ:.o=.d)
+ 
+ wmacpi-cli: $(CLOBJ)
+-	$(CC) $(LDFLAGS) -o $@ $^
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ endif
+ 
+ # build per-file dependencies - note that -MM may not be supported
+ # in gcc versions older than 2.95.4, but most likely is.
+ %.d: %.c
+-	gcc -MM $(CFLAGS) $< > $@
++	$(CC) -MM $(CFLAGS) $< > $@
+ 
+ clean:
+ 	rm -f TAGS *.o *~ trace *.out *.bb *.bbg
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.4-makefile.patch b/x11-plugins/wmacpi/files/wmacpi-2.4-makefile.patch
new file mode 100644
index 000000000000..d772c99b6ed4
--- /dev/null
+++ b/x11-plugins/wmacpi/files/wmacpi-2.4-makefile.patch
@@ -0,0 +1,48 @@
+diff -Naur wmacpi-2.4.orig/Makefile wmacpi-2.4/Makefile
+--- wmacpi-2.4.orig/Makefile	2020-05-03 14:30:36.000000000 +0200
++++ wmacpi-2.4/Makefile	2020-06-15 17:32:49.549006100 +0200
+@@ -15,8 +15,8 @@
+ #OPT	= -pg -g
+ 
+ CC	:= gcc
+-CFLAGS	+= $(OPT) -Wall -W -g -ansi -DWMACPI_VER='"$(WMACPI_VER)"'
+-LDFLAGS += $(OPT) -lX11 -ldockapp
++CFLAGS	+= -DWMACPI_VER='"$(WMACPI_VER)"'
++LIBS := -lX11 -ldockapp
+ 
+ WMSRC	:= wmacpi.c libacpi.c
+ HEADERS := libacpi.h
+@@ -28,7 +28,7 @@
+ doc_targets += wmacpi-cli.1
+ endif
+ 
+-PREFIX := /usr/local
++PREFIX := /usr
+ 
+ all: $(targets)
+ 
+@@ -39,7 +39,7 @@
+ -include $(WMOBJ:.o=.d)
+ 
+ wmacpi:	$(WMOBJ)
+-	$(CC) -o $@ $^ $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ # for the Debian package, we want to make building the command line tools
+ # optional. So, we hide all the necessary stuff here . . .
+@@ -49,13 +49,13 @@
+ -include $(CLOBJ:.o=.d)
+ 
+ wmacpi-cli: $(CLOBJ)
+-	$(CC) $(LDFLAGS) -o $@ $^
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ endif
+ 
+ # build per-file dependencies - note that -MM may not be supported
+ # in gcc versions older than 2.95.4, but most likely is.
+ %.d: %.c
+-	gcc -MM $(CFLAGS) $< > $@
++	$(CC) -MM $(CFLAGS) $< > $@
+ 
+ clean:
+ 	rm -f TAGS *.o *~ trace *.out *.bb *.bbg
diff --git a/x11-plugins/wmacpi/metadata.xml b/x11-plugins/wmacpi/metadata.xml
new file mode 100644
index 000000000000..7fa6a2f919f8
--- /dev/null
+++ b/x11-plugins/wmacpi/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+WMaker DockApp: ACPI status monitor for laptops
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
new file mode 100644
index 000000000000..9ee992963caf
--- /dev/null
+++ b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="DockApp ACPI status monitor for laptops"
+HOMEPAGE="https://www.dockapps.net/wmacpi"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 -ppc -sparc x86"
+
+DEPEND=">=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11"
+
+S=${WORKDIR}/dockapps
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	)
+
+src_prepare() {
+	default
+
+	sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/x11-plugins/wmacpi/wmacpi-2.4.ebuild b/x11-plugins/wmacpi/wmacpi-2.4.ebuild
new file mode 100644
index 000000000000..b2ad3b89acca
--- /dev/null
+++ b/x11-plugins/wmacpi/wmacpi-2.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="DockApp ACPI status monitor for laptops"
+HOMEPAGE="https://www.dockapps.net/wmacpi"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 -ppc -sparc ~x86"
+
+DEPEND=">=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	)
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/x11-plugins/wmacpiload-ac/Manifest b/x11-plugins/wmacpiload-ac/Manifest
new file mode 100644
index 000000000000..aa91cd0bdb0d
--- /dev/null
+++ b/x11-plugins/wmacpiload-ac/Manifest
@@ -0,0 +1 @@
+DIST wmacpiload-0.2.0.tar.bz2 112858 BLAKE2B a981f43e4a4738b662f8a302a0737d9f7ab9ce18fb5cbc40a84608ab75916af3b47cb2da93c130461280492f2624b23712a81d6cabc786a73e4bc83c043b3358 SHA512 f0256ae313ad4ecbaf1604578321b45173912f250ba6fb7abf88edbcf6875dee30f8d2f7547cc207768c9229697dbfd48e77617c590e0ca27113b8c675e32714
diff --git a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch
new file mode 100644
index 000000000000..d0eabc166377
--- /dev/null
+++ b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch
@@ -0,0 +1,30 @@
+--- a/src/battery.c	2012-10-18 15:42:04.000000000 +0200
++++ b/src/battery.c	2012-10-18 15:43:33.000000000 +0200
+@@ -42,7 +42,8 @@
+  ************************************************************************/
+ 
+ /* used to parse the battery state file */
+-#define CAPACITY_UNIT " mAh"
++#define CAPACITY_UNIT1 " mAh"
++#define CAPACITY_UNIT2 " mWh"
+ 
+ /************************************************************************
+  * Global constants definitions
+@@ -164,7 +165,7 @@
+             char *endptr;
+ 
+             capacity = strtoul(buf, &endptr, 10);
+-            if (strcmp(endptr, CAPACITY_UNIT) != 0) {
++            if (strcmp(endptr, CAPACITY_UNIT1) != 0 && strcmp(endptr, CAPACITY_UNIT2) != 0) {
+                 fprintf(stderr,
+                         "%s : Battery %s unplugged or unconsistent data\n",
+                         PACKAGE, bat->name);
+@@ -238,7 +239,7 @@
+             char *endptr;
+ 
+             remain = strtol(buf, &endptr, 10);
+-            if (strcmp(endptr, CAPACITY_UNIT) == 0)
++            if (strcmp(endptr, CAPACITY_UNIT1) == 0 || strcmp(endptr, CAPACITY_UNIT2) == 0)
+                 bat->percentage = (int) ((remain * 100.0) / bat->capacity);
+             else
+                 bat->percentage = -1;
diff --git a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch
new file mode 100644
index 000000000000..2f43cd358b70
--- /dev/null
+++ b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch
@@ -0,0 +1,22 @@
+diff -ru a/include/lib_acpi.h b/include/lib_acpi.h
+--- a/include/lib_acpi.h	2005-07-21 21:33:19.000000000 -0400
++++ b/include/lib_acpi.h	2011-06-20 19:53:30.458953984 -0400
+@@ -32,7 +32,7 @@
+  * Macros
+  ************************************************************************/
+ 
+-#  define ACPIDEV "/proc/acpi/info"
++#  define ACPIDEV "/proc/acpi/battery"
+ 
+   /* use ? */
+ #  ifndef ACPI_32_BIT_SUPPORT
+diff -ru a/src/dockapp.c b/src/dockapp.c
+--- a/src/dockapp.c	2005-08-16 18:38:36.000000000 -0400
++++ b/src/dockapp.c	2011-06-20 19:44:20.022684448 -0400
+@@ -431,5 +431,6 @@
+ void
+ dockapp_cleanup(void)
+ {
++  if (display != NULL)
+     XCloseDisplay(display);
+ }
diff --git a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch
new file mode 100644
index 000000000000..7fb8586ed1ee
--- /dev/null
+++ b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch
@@ -0,0 +1,121 @@
+diff -ru a/src/lib_acpi.c b/src/lib_acpi.c
+--- a/src/lib_acpi.c	2005-07-21 21:41:31.000000000 -0400
++++ b/src/lib_acpi.c	2011-06-28 23:37:50.148092904 -0400
+@@ -83,7 +83,7 @@
+         if (!k->ac)
+             fprintf(stderr, "%s : no AC adapter detected\n", PACKAGE);
+ 
+-        n = snprintf(dir, FILENAME_MAX + 1, "%s%s", "/proc/acpi",
++        n = snprintf(dir, FILENAME_MAX + 1, "%s%s", "/sys/class",
+                      thermal_zone_dir);
+         if (n > FILENAME_MAX) {
+             fprintf(stderr, "%s : file name too long, "
+@@ -322,10 +322,10 @@
+     n = strlen(searched);
+ 
+     if (dest != NULL && dest_size > 0
+-        && n > 0 && n < (sizeof buffer) - 1
++        && n < (sizeof buffer) - 1
+         && file_name != NULL && (fd = fopen(file_name, "r")) != NULL) {
+         while (fgets(buffer, sizeof buffer, fd) != NULL)
+-            if (strncmp(buffer, searched, n) == 0) {
++            if (n == 0 || strncmp(buffer, searched, n) == 0) {
+                 char *src;
+                 char *end;
+                 size_t len;
+diff -ru a/src/thermal.c b/src/thermal.c
+--- a/src/thermal.c	2005-09-29 19:32:46.000000000 -0400
++++ b/src/thermal.c	2011-06-29 00:18:24.851904854 -0400
+@@ -30,12 +30,17 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <errno.h>
++#include <limits.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <dirent.h>
+ #include "lib_acpi.h"
+ #include "wmacpiload.h"
+ #include "thermal.h"
++#include <unistd.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+ 
+ /************************************************************************
+  * Macro definitions
+@@ -48,8 +53,10 @@
+  * Global constants definitions
+  ************************************************************************/
+ 
+-const char *const thermal_zone_dir = "/thermal_zone/";
+-const char *const thermal_zone_status_file = "/temperature";
++const char *const thermal_zone_dir = "/hwmon/";
++const char *const thermal_zone_status_file = "/temp1_input";
++const char *const thermal_zone_search[] = { "", "/device" };
++const int thermal_zone_MAX_SEARCH = 2;
+ 
+ /************************************************************************
+  * Function definitions
+@@ -86,9 +93,24 @@
+     }
+     strcpy(tz->name, fd->d_name);
+ 
+-    tz->tempfile =
+-        strcat4("/proc/acpi", thermal_zone_dir, tz->name,
+-                thermal_zone_status_file);
++    int i;
++    for (i=0; i < thermal_zone_MAX_SEARCH ; i++) {
++      char device_name[MAXSTRLEN+1];
++      char *tempfile;
++      struct stat tempstat;
++      snprintf(device_name, MAXSTRLEN, "%s%s", tz->name, thermal_zone_search[i]);
++      tempfile = 
++	strcat4("/sys/class", thermal_zone_dir, device_name, 
++	    thermal_zone_status_file);
++      if (stat(tempfile, &tempstat) == -1) {
++	if (verbose)
++		printf("Unable to read thermal zone '%s'\n", tempfile);
++      } else {
++	tz->tempfile = tempfile;
++	break;
++      }
++    }
++
+     if (!tz->tempfile) {
+         fprintf(stderr, "%s : could not allocate memory "
+                 "for thermal zone tempfile concerning "
+@@ -127,16 +149,19 @@
+ 
+     if (tz != NULL) {
+         if (parse_file(tz->tempfile,
+-                       "temperature:", buf, sizeof buf) != NULL) {
++                       "", buf, sizeof buf) != NULL) {
+             char *endptr;
+ 
+             temp = strtoul(buf, &endptr, 10);
+             /*
+-             * The format is "temperature:    xx C" where xx is the
+-             * temperature in celcius degrees. So we check if we have the
+-             * " C" left in the buffer to see if all went well. 
++             * The format is "xxxxxx" where xx is the
++             * temperature in celcius degrees times 1000.
+              */
+-            if (strcmp(endptr, TEMP_UNIT) != 0) {
++	    errno = 0;
++	    if ((errno == ERANGE && (temp == LONG_MAX || temp == LONG_MIN) ) ||
++		(errno != 0 && temp == 0) ||
++		endptr == buf) {
++	      perror("strtol");
+                 fprintf(stderr, "%s : Unconsistent temperature  "
+                         "about thermal zone %s\n", PACKAGE, tz->name);
+                 temp = 0;
+@@ -144,7 +169,7 @@
+         } else {
+             temp = 0;
+         }
+-        tz->temp = temp;
++        tz->temp = temp / 1000;
+     }
+ }
+ 
diff --git a/x11-plugins/wmacpiload-ac/metadata.xml b/x11-plugins/wmacpiload-ac/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmacpiload-ac/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..05c5ee785dea
--- /dev/null
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${P/-ac}
+
+DESCRIPTION="WMACPILoad based dockapp to monitor CPU temp and battery time on ACPI kernels"
+HOMEPAGE="http://wmacpiload.tuxfamily.org/"
+SRC_URI="http://wmacpiload.tuxfamily.org/download/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
+
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-acpi-segfault.patch"
+	"${FILESDIR}/${PN}-acpi-sys-temp-hwmon.patch"
+	"${FILESDIR}/${PN}-acpi-fix-battery-unit.patch"
+)
+
+src_configure() {
+	econf $(use_enable debug)
+}
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
new file mode 100644
index 000000000000..5dd7b6116524
--- /dev/null
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${P/-ac}
+
+DESCRIPTION="WMACPILoad based dockapp to monitor CPU temp and battery time on ACPI kernels"
+HOMEPAGE="http://wmacpiload.tuxfamily.org/"
+SRC_URI="http://wmacpiload.tuxfamily.org/download/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 x86"
+IUSE="debug"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf $(use_enable debug)
+}
diff --git a/x11-plugins/wmacpimon/Manifest b/x11-plugins/wmacpimon/Manifest
new file mode 100644
index 000000000000..05bef6cb954a
--- /dev/null
+++ b/x11-plugins/wmacpimon/Manifest
@@ -0,0 +1 @@
+DIST wmacpimon-0.2.1.tar.gz 26498 BLAKE2B db1d308b24786a0db0fed5763ab5191f6ac2654c62d75996acaa93867cf7bc588da1f763b5483d64563b1e26b8d48063f143c28a61b61c4cbdb8de6c7ad58d1b SHA512 2b2d1da7608272969f0a2c98fae6398ebaa663a847acb79c795870cad85ca8d1317f5dfde6443634419c0c59b7457356bb8c195c1e7936f3cd8f3b251406084b
diff --git a/x11-plugins/wmacpimon/files/Makefile.patch b/x11-plugins/wmacpimon/files/Makefile.patch
new file mode 100644
index 000000000000..73646d10fa93
--- /dev/null
+++ b/x11-plugins/wmacpimon/files/Makefile.patch
@@ -0,0 +1,24 @@
+--- a/Makefile	2010-09-06 11:33:16.000000000 +0200
++++ b/Makefile	2010-09-06 11:36:28.000000000 +0200
+@@ -1,8 +1,5 @@
+-OPT	= -O3 -DACPI
+-
+-CC	= gcc
+-CFLAGS	= $(OPT) -Wall -I/usr/X11R6/include
+-LDFLAGS = $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext
++CFLAGS	+= -DACPI -Wall -I/usr/X11R6/include
++LIBS = -DACPI -L/usr/X11R6/lib -lX11 -lXpm -lXext
+ 
+ SRCS	= wmacpimon.c libacpi.c
+ OBJS	= wmacpimon.o libacpi.o
+@@ -11,8 +8,10 @@
+ all:	wmacpimon wmacpimond
+ 
+ wmacpimon:	$(OBJS)
++	$(CC) $(LDFLAGS) -o wmacpimon $^ $(LIBS)
+ 
+ wmacpimond:	$(OBJZ)
++	$(CC) $(LDFLAGS) -o wmacpimond $^ $(LIBS)
+ 
+ clean:
+ 	rm -f *.o *~ wmacpimon wmacpimond trace *.out *.bb *.bbg
diff --git a/x11-plugins/wmacpimon/files/wmacpimon.c.patch b/x11-plugins/wmacpimon/files/wmacpimon.c.patch
new file mode 100644
index 000000000000..adc03ce3fd0c
--- /dev/null
+++ b/x11-plugins/wmacpimon/files/wmacpimon.c.patch
@@ -0,0 +1,20 @@
+--- a/wmacpimon.c	2004-07-08 14:16:22.184359328 +0200
++++ b/wmacpimon.c	2004-07-08 14:15:59.677780848 +0200
+@@ -314,7 +314,7 @@
+     acpinfo = calloc(1, sizeof(ACPInfo));
+     dockapp->blink = OFF;
+     init_acpinfo();
+-	strcpy(prcfile, ".wmacpimon.prc");
++	strcpy(prcfile, "/var/tmp/wmacpimon.prc");
+ 	
+     /* parse command-line options */
+     while ((ch = getopt(argc, argv, "pd:b:c:s:h")) != EOF) {
+@@ -345,7 +345,7 @@
+ 	    		printf("wmacpimon v%s (c) 2002 Costantino Pistagna (valvoline@vrlteam.org)\n"
+ 					"usage: wmacpimon [-d] [-b] [-p] [-c] [-s]\n\n"
+ 		   			"-d display\tdisplay on remote display <display>\n"
+-		   			"-b value\tprcfile for wmacpimond comunication (default: ~/.wmacpimon.prc)\n"
++		   			"-b value\tprcfile for wmacpimond comunication (default: /var/tmp/wmacpimon.prc)\n"
+ 		  			"-p\t\tset powersave mode\n"
+ 		  			"-c value\tset critical level (default to 10)\n"
+ 					"-s value\tshutdown pc when battery value (percent) has reached\n"
diff --git a/x11-plugins/wmacpimon/files/wmacpimon.initscript b/x11-plugins/wmacpimon/files/wmacpimon.initscript
new file mode 100644
index 000000000000..b7972565d00d
--- /dev/null
+++ b/x11-plugins/wmacpimon/files/wmacpimon.initscript
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+
+start() {
+  ebegin "Starting up wmacpimond daemon"
+	touch /var/tmp/wmacpimon.prc
+  start-stop-daemon --start --quiet --exec /usr/bin/wmacpimond -- /var/tmp/wmacpimon.prc >/dev/null
+  eend $? "Failed to start wmacpimond"
+}
+
+stop() {
+  ebegin "Shutting down wmacpimond daemon"
+	killall wmacpimonmd &>/dev/null
+	rm /var/tmp/wmacpimon.prc &>/dev/null
+  eend $? "Failed to stop wmacpimond"
+}
diff --git a/x11-plugins/wmacpimon/metadata.xml b/x11-plugins/wmacpimon/metadata.xml
new file mode 100644
index 000000000000..701e67a7a7e3
--- /dev/null
+++ b/x11-plugins/wmacpimon/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+wmacpimon is a Windowmaker dockapp that monitors
+the temperature and Speedstep features in new ACPI-based systems.
+It supports batteries, automatic shutdown when the power is low,
+and multiple screens.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">wmacpimon</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
new file mode 100644
index 000000000000..e076f7013f39
--- /dev/null
+++ b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="DockApp monitors the temperature and Speedstep features in ACPI-based systems"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	# patch wmacpimon.c file to set default path for
+	# wmacpimon.prc to /var/tmp/
+	"${FILESDIR}/wmacpimon.c.patch"
+
+	# fix LDFLAGS ordering. See bug #248618.
+	# fix LDFLAGS ordering again and other stuff. See bug #336091.
+	"${FILESDIR}/Makefile.patch"
+)
+
+src_install() {
+	dobin wmacpimond wmacpimon
+	dodoc AUTHORS ChangeLog README
+	newinitd "${FILESDIR}"/wmacpimon.initscript wmacpimon
+}
+
+pkg_postinst() {
+	elog "Remember to start the wmacpimond daemon"
+	elog "(by issuing the \"/etc/init.d/wmacpimon start\" command)"
+	elog "before you attempt to run wmacpimon..."
+}
diff --git a/x11-plugins/wmail/Manifest b/x11-plugins/wmail/Manifest
new file mode 100644
index 000000000000..d5aee35e6a1e
--- /dev/null
+++ b/x11-plugins/wmail/Manifest
@@ -0,0 +1,3 @@
+DIST wmail-2.0.tar.gz 46468 BLAKE2B 316743065f72e14339e4c7d9bc1d394d0f5ccfa5772efd94856bef184fa3a60a1892c510f07655dacbf0b470492e085e413dcb29e3ec166c5d1a1f03d388636e SHA512 62ca761619af006221ac64003246b8d7b0dacee65cd4dd6a5c31e6fc152f9f97646ceb7e757bd81333a792c73280479591dc24bb29f9da2023f2927ec2827039
+DIST wmail-2.2.tar.gz 127443 BLAKE2B fc94f94e9a87ccf038bf75eb8c01e9cca738dbb468b60632ba9a04c1ca0f4266ee5be032cca37ae14a58a444f733dd9d20bad57789c24d497f2af87c80d801d2 SHA512 59217e190e6c296ee457e0c0e06297c4b7f9e627a52848f0012c4158a0c7a6a39415e63fffe722a5c2ba79ff8f59721b5e1ecbd25219f10c24fdde401e6556e8
+DIST wmail-2.3.tar.gz 128013 BLAKE2B cef12b8546bd68c6bc7a191fafc325a3bdab853b458dafe03a3960b2de198222b4d903272ea27a20d4a635e97647fa1d1c7ed8316f84aba821bb77cfac3e2276 SHA512 f8c2aacf4cb0b798f6c67641417d9242a7d23ed5e9b1144899fc9f574f2e25099feeafda9d3ee9ce8227dcbbeb19c6092e79f96748ffb6b9e989074285e43c0a
diff --git a/x11-plugins/wmail/files/wmail-2.0.maildir-parse-from.patch b/x11-plugins/wmail/files/wmail-2.0.maildir-parse-from.patch
new file mode 100644
index 000000000000..abdfd489412e
--- /dev/null
+++ b/x11-plugins/wmail/files/wmail-2.0.maildir-parse-from.patch
@@ -0,0 +1,12 @@
+--- a/src/wmail.c	2007-01-26 19:17:08.000000000 +0100
++++ b/src/wmail.c	2007-01-26 19:17:02.000000000 +0100
+@@ -871,6 +871,9 @@
+ 			InsertName( ParseFromField( buf+6 ), checksum,
+ 						isNewMail ? FLAG_INITIAL : FLAG_READ );
+ 
++			// got name, address: do not parse the rest of email
++			break;
++
+ 			//++numMails;
+ 		}
+ 	}
diff --git a/x11-plugins/wmail/files/wmail-2.0.support-libdockapp-0.5.0.patch b/x11-plugins/wmail/files/wmail-2.0.support-libdockapp-0.5.0.patch
new file mode 100644
index 000000000000..593cf640b7e1
--- /dev/null
+++ b/x11-plugins/wmail/files/wmail-2.0.support-libdockapp-0.5.0.patch
@@ -0,0 +1,26 @@
+--- a/configure	2002-08-12 22:59:48.000000000 +0200
++++ b/configure	2004-08-31 15:42:52.979115744 +0200
+@@ -2386,8 +2386,8 @@
+ fi
+ 
+ echo $ac_n "checking for DAInitialize in -ldockapp""... $ac_c" 1>&6
+-echo "configure:2390: checking for DAInitialize in -ldockapp" >&5
+-ac_lib_var=`echo dockapp'_'DAInitialize | sed 'y%./+-%__p_%'`
++echo "configure:2390: checking for DAOpenDisplay in -ldockapp" >&5
++ac_lib_var=`echo dockapp'_'DAOpenDisplay | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2399,10 +2399,10 @@
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char DAInitialize();
++char DAOpenDisplay();
+ 
+ int main() {
+-DAInitialize()
++DAOpenDisplay()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:2409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
diff --git a/x11-plugins/wmail/metadata.xml b/x11-plugins/wmail/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmail/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmail/wmail-2.0-r5.ebuild b/x11-plugins/wmail/wmail-2.0-r5.ebuild
new file mode 100644
index 000000000000..a354d9fb7740
--- /dev/null
+++ b/x11-plugins/wmail/wmail-2.0-r5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Window Maker dock application showing incoming mail"
+HOMEPAGE="https://www.dockapps.net/wmail"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=x11-libs/libdockapp-0.7:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${P}.support-libdockapp-0.5.0.patch
+
+	# make from parsing in maildir format faster, thanks
+	# to Stanislav Kuchar
+	eapply "${FILESDIR}"/${P}.maildir-parse-from.patch
+
+	# fix LDFLAGS ordering, see bug #248620
+	sed -i 's/$(LIBS) -o $@ $^/-o $@ $^ $(LIBS)/' "${S}/src/Makefile.in" || die
+
+	# Honour Gentoo LDFLAGS, see bug #337407
+	sed -i 's/-o $@ $^ $(LIBS)/$(LDFLAGS) -o $@ $^ $(LIBS)/' "${S}/src/Makefile.in" || die
+	sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i src/*.c || die
+}
+
+src_configure() {
+	econf --enable-delt-xpms
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin src/wmail
+	dodoc README wmailrc-sample
+}
diff --git a/x11-plugins/wmail/wmail-2.2.ebuild b/x11-plugins/wmail/wmail-2.2.ebuild
new file mode 100644
index 000000000000..6491f6f02064
--- /dev/null
+++ b/x11-plugins/wmail/wmail-2.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Window Maker dock application showing incoming mail"
+HOMEPAGE="https://www.dockapps.net/wmail"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=x11-libs/libdockapp-0.7:="
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README wmailrc-sample)
+
+src_configure() {
+	econf --enable-delt-xpms
+}
diff --git a/x11-plugins/wmail/wmail-2.3.ebuild b/x11-plugins/wmail/wmail-2.3.ebuild
new file mode 100644
index 000000000000..6491f6f02064
--- /dev/null
+++ b/x11-plugins/wmail/wmail-2.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Window Maker dock application showing incoming mail"
+HOMEPAGE="https://www.dockapps.net/wmail"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=x11-libs/libdockapp-0.7:="
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README wmailrc-sample)
+
+src_configure() {
+	econf --enable-delt-xpms
+}
diff --git a/x11-plugins/wmamixer/Manifest b/x11-plugins/wmamixer/Manifest
new file mode 100644
index 000000000000..040afc6a92f7
--- /dev/null
+++ b/x11-plugins/wmamixer/Manifest
@@ -0,0 +1 @@
+DIST wmamixer-1.0.tar.gz 93181 BLAKE2B 16370da2c1f408b3b584a649e1317850963f2446997e1027cfa7b2cdfa1351807761d3981e2a2cc91ef42272df1146550b3943862d1cf03af5f96d83e6c2c42f SHA512 a5eac2ea3f63770f64f6d2c921aec0d38c54e953c7f5bf1d7ba14c510cc21927751d6939571eb3aede2c7bd0e44bfc84f8dd06ae1af0ef71f2bce8f1b6614708
diff --git a/x11-plugins/wmamixer/metadata.xml b/x11-plugins/wmamixer/metadata.xml
new file mode 100644
index 000000000000..50a228cf3cbf
--- /dev/null
+++ b/x11-plugins/wmamixer/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+Wmamixer is a fork of wmsmixer and is an ALSA mixer dockapp for Window Maker.
+
+The code for the ALSA part was taken and adapted from amixer and alsamixer programs from alsa-utils package.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmamixer/wmamixer-1.0-r1.ebuild b/x11-plugins/wmamixer/wmamixer-1.0-r1.ebuild
new file mode 100644
index 000000000000..a73c156da7f8
--- /dev/null
+++ b/x11-plugins/wmamixer/wmamixer-1.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="ALSA mixer dockapp, fork of wmsmixer"
+HOMEPAGE="https://github.com/gryf/wmamixer"
+SRC_URI="https://github.com/gryf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib
+	x11-libs/libXpm
+	x11-libs/libXext
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+DOCS=( README.rst )
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} -c -o wmamixer.o wmamixer.c
+	$(tc-getCC) ${LDFLAGS} -o wmamixer wmamixer.o -lm -lXpm -lXext -lX11 -lasound
+}
+
+src_install() {
+	dobin wmamixer
+	einstalldocs
+}
diff --git a/x11-plugins/wmamixer/wmamixer-1.0.ebuild b/x11-plugins/wmamixer/wmamixer-1.0.ebuild
new file mode 100644
index 000000000000..3e72430e43b8
--- /dev/null
+++ b/x11-plugins/wmamixer/wmamixer-1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="ALSA mixer dockapp, fork of wmsmixer"
+HOMEPAGE="https://github.com/gryf/wmamixer"
+SRC_URI="https://github.com/gryf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXpm
+	x11-libs/libXext
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+DOCS=( README.rst )
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} -c -o wmamixer.o wmamixer.c
+	$(tc-getCC) ${LDFLAGS} -o wmamixer wmamixer.o -lm -lXpm -lXext -lX11 -lasound
+}
+
+src_install() {
+	dobin wmamixer
+	einstalldocs
+}
diff --git a/x11-plugins/wmapm/Manifest b/x11-plugins/wmapm/Manifest
new file mode 100644
index 000000000000..f21a2153c3c9
--- /dev/null
+++ b/x11-plugins/wmapm/Manifest
@@ -0,0 +1 @@
+DIST wmapm-3.1.tar.gz 28321 BLAKE2B 13373f675bb2561c6034268d4afab12bfb6b5ef99da7fd975842392519a8f87726455e807baecc29f15403a0c711228be8513125def3b32b36683dd386b91f54 SHA512 478edf6b48d4c44017f5f2d50efc7e757b33b14d283dfa062dcf2084c9bffe1e7624651dfd22236a98ca9aa49306849cabd1a1fd09d1d3f709e715cf0fa2f84e
diff --git a/x11-plugins/wmapm/files/wmapm-3.1-fno-common.patch b/x11-plugins/wmapm/files/wmapm-3.1-fno-common.patch
new file mode 100644
index 000000000000..74b8cb1c9c91
--- /dev/null
+++ b/x11-plugins/wmapm/files/wmapm-3.1-fno-common.patch
@@ -0,0 +1,23 @@
+diff -Naur wmapm-3.1.orig/wmgeneral/wmgeneral.c wmapm-3.1/wmgeneral/wmgeneral.c
+--- wmapm-3.1.orig/wmgeneral/wmgeneral.c	1998-08-04 03:49:00.000000000 +0200
++++ wmapm-3.1/wmgeneral/wmgeneral.c	2020-06-13 10:46:38.921354685 +0200
+@@ -50,6 +50,7 @@
+ GC			NormalGC;
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
++Display		*display;
+ 
+   /*****************/
+  /* Mouse Regions */
+diff -Naur wmapm-3.1.orig/wmgeneral/wmgeneral.h wmapm-3.1/wmgeneral/wmgeneral.h
+--- wmapm-3.1.orig/wmgeneral/wmgeneral.h	1998-08-04 03:49:00.000000000 +0200
++++ wmapm-3.1/wmgeneral/wmgeneral.h	2020-06-13 10:46:31.276348472 +0200
+@@ -28,7 +28,7 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
diff --git a/x11-plugins/wmapm/metadata.xml b/x11-plugins/wmapm/metadata.xml
new file mode 100644
index 000000000000..90042159d35e
--- /dev/null
+++ b/x11-plugins/wmapm/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+		wmapm is a small dock-app for WindowMaker that shows
+		continually-updated APM statistics. It's a must have for Laptop
+		users. Features include status of power supply, percentage of
+		battery remaining, battery charging, time left to battery depletion
+		and high/low/critical battery status.
+	</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmapm/wmapm-3.1-r2.ebuild b/x11-plugins/wmapm/wmapm-3.1-r2.ebuild
new file mode 100644
index 000000000000..90652b1aee08
--- /dev/null
+++ b/x11-plugins/wmapm/wmapm-3.1-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="WindowMaker DockApp: Battery/Power status monitor for laptops"
+HOMEPAGE="https://www.dockapps.net/wmapm"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S="${WORKDIR}/${P}/${PN}"
+
+src_prepare() {
+	#Respect LDFLAGS, see bug #334747
+	sed -i 's/ -o wmapm/ ${LDFLAGS} -o wmapm/' "Makefile"
+	default
+
+	pushd "${WORKDIR}"/${P} || die
+	eapply "${FILESDIR}"/${P}-fno-common.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" COPTS="${CFLAGS}"
+}
+
+src_install() {
+	dobin wmapm
+	doman wmapm.1
+	dodoc ../{BUGS,CHANGES,HINTS,README,TODO}
+}
diff --git a/x11-plugins/wmapmload/Manifest b/x11-plugins/wmapmload/Manifest
new file mode 100644
index 000000000000..b6e74ecbe978
--- /dev/null
+++ b/x11-plugins/wmapmload/Manifest
@@ -0,0 +1 @@
+DIST wmapmload-0.3.4.tar.gz 91667 BLAKE2B 09fc05c918456d7e6654980181124da3caee3e9e1585501a4baa1d6f9d3eff0e5bb9a4173dc73bcdb3e4cf2072abf06b4da6019da20ceea8ecec1d544943acfc SHA512 8e7e879c9f7bd4ac976c63ebc50232c0123621118c22c96803ced86ee4d0f934a75369cc5949e5b11402db02f57b527a32e5c5db16a8002cccdc0a2a4dc3904d
diff --git a/x11-plugins/wmapmload/metadata.xml b/x11-plugins/wmapmload/metadata.xml
new file mode 100644
index 000000000000..b37eab6956dc
--- /dev/null
+++ b/x11-plugins/wmapmload/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmapmload/wmapmload-0.3.4-r1.ebuild b/x11-plugins/wmapmload/wmapmload-0.3.4-r1.ebuild
new file mode 100644
index 000000000000..4d08e881baf4
--- /dev/null
+++ b/x11-plugins/wmapmload/wmapmload-0.3.4-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="dockapp that monitors your apm battery status"
+HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
+SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
diff --git a/x11-plugins/wmappl/Manifest b/x11-plugins/wmappl/Manifest
new file mode 100644
index 000000000000..751689129eb5
--- /dev/null
+++ b/x11-plugins/wmappl/Manifest
@@ -0,0 +1 @@
+DIST wmappl-0.71.tar.gz 139219 BLAKE2B 0c28182608e446f1d65441ba57a86105a745b374b9e54c84d52bee58876097b83520a33a7413358ccf0d687696cee11541cbf6536c42442f85b64aae6e70b451 SHA512 dbcf1441960fd22b5436515c28c6870ff8400cfbe0b2aa4129ff1eaad6faeb5e0a3500b4c6f19b6ce3ea3dc8b52bc38a6fc591b93e6cb12e13d8447c3eb371d2
diff --git a/x11-plugins/wmappl/metadata.xml b/x11-plugins/wmappl/metadata.xml
new file mode 100644
index 000000000000..37c1e19d4046
--- /dev/null
+++ b/x11-plugins/wmappl/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">wmappl</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmappl/wmappl-0.71-r1.ebuild b/x11-plugins/wmappl/wmappl-0.71-r1.ebuild
new file mode 100644
index 000000000000..58df593547ac
--- /dev/null
+++ b/x11-plugins/wmappl/wmappl-0.71-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Simple application launcher for the Window Maker dock"
+HOMEPAGE="https://www.dockapps.net/wmappl"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
diff --git a/x11-plugins/wmbatteries/Manifest b/x11-plugins/wmbatteries/Manifest
new file mode 100644
index 000000000000..37dd6adabe3b
--- /dev/null
+++ b/x11-plugins/wmbatteries/Manifest
@@ -0,0 +1 @@
+DIST wmbatteries-0.1.3.tar.bz2 113695 BLAKE2B 5da5dcd5a524fe61e7b51d6811fe2c582284cd0e7cc8d075b526e29483c41019de2f306b8a595358cf0729274a6037e15429923e35e21b2e5cc1a764c9b954f9 SHA512 0a553f12bcf9a673d2a956da04b14fd6d80cf75f47e912f01893ec06880d63275bc31bc8bc1655a13f11dc1361e96f9023290006e134956b625401a03f92575c
diff --git a/x11-plugins/wmbatteries/metadata.xml b/x11-plugins/wmbatteries/metadata.xml
new file mode 100644
index 000000000000..381b939986f8
--- /dev/null
+++ b/x11-plugins/wmbatteries/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">wmbatteries</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmbatteries/wmbatteries-0.1.3-r1.ebuild b/x11-plugins/wmbatteries/wmbatteries-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..49e00fb7d980
--- /dev/null
+++ b/x11-plugins/wmbatteries/wmbatteries-0.1.3-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Dock app for monitoring the current battery status and CPU temperature"
+HOMEPAGE="https://sourceforge.net/projects/wmbatteries"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+DOCS=( AUTHORS THANKS README example/wmbatteriesrc )
diff --git a/x11-plugins/wmbattery/Manifest b/x11-plugins/wmbattery/Manifest
new file mode 100644
index 000000000000..ab78250d2104
--- /dev/null
+++ b/x11-plugins/wmbattery/Manifest
@@ -0,0 +1,3 @@
+DIST wmbattery-2.50.tar.gz 40938 BLAKE2B 1193e164af78d1839ed3f6ac251cb01fe36f8630d418aefa3c2f485e03ac37b027274d4146c139afacbb4f59ffbbb4c7471620bf8cb9806a4ddcd95613ce2b50 SHA512 f96b98d2819a9ecf189b9ebc60c107abc6715cf76bb73c98f1d3649dd2ef6112e052559f13fc5620ec7d71466f2e4d6a5e7e86b0f5f0675e02d6e038a9411794
+DIST wmbattery-2.51.tar.gz 164657 BLAKE2B f2432c9d31f4440a88ed67a0aa1b3bc494df2584175df9269c12e08430783777e46ec882bd2d71a1bc5530d2dbb1e277ccc8d1bd8dce2136df8584aaa2013a8b SHA512 2ad508e796a4f5c826bd7c785c3cf1c2ee77923db92c99e75031cd305b351d82fbce158c69cc5393b904afe639574aea38186438fbedfa20243ff03c7824186b
+DIST wmbattery-2.54.tar.gz 87925 BLAKE2B 692549909d52096ecf7997de5122f07d9fd59b3e2d99c1421b871671a9e43f2bbdb9742e89f835a58114238509b8f8b03fd0619da4a66d8e43b6b787d4e5f6a9 SHA512 58c901ed85d3ea7e0c750bb968c3250706ed693162fe4684d75683a3897df7ff02ee4afbe12a5d26b1f1b632d4c6f9902713a632e6784173ea49bad312fd30aa
diff --git a/x11-plugins/wmbattery/metadata.xml b/x11-plugins/wmbattery/metadata.xml
new file mode 100644
index 000000000000..8b2643214e13
--- /dev/null
+++ b/x11-plugins/wmbattery/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<use>
+	<flag name="apm">Add APM (Advanced Power Management) support</flag>
+</use>
+
+<longdescription>
+Wmbattery displays the status of your laptop's battery in a small icon. This 
+includes if it is plugged in, if the battery is charging, how many minutes of 
+battery life remain, battery life remaining (with both a percentage and a 
+graph), and battery status (high - green, low - yellow, or critical - red).
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmbattery/wmbattery-2.50.ebuild b/x11-plugins/wmbattery/wmbattery-2.50.ebuild
new file mode 100644
index 000000000000..82511c3347c3
--- /dev/null
+++ b/x11-plugins/wmbattery/wmbattery-2.50.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools
+
+DESCRIPTION="A dockable app to report APM, ACPI, or SPIC battery status"
+HOMEPAGE="https://www.dockapps.net/wmbattery"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${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}
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog README TODO )
+
+src_prepare() {
+	sed -i \
+		-e '/^icondir/s:icons:pixmaps:' \
+		autoconf/makeinfo.in || die
+
+	use upower || { sed -i -e 's:USE_UPOWER = 1:#&:' autoconf/makeinfo.in || die; }
+
+	eautoreconf
+}
diff --git a/x11-plugins/wmbattery/wmbattery-2.51.ebuild b/x11-plugins/wmbattery/wmbattery-2.51.ebuild
new file mode 100644
index 000000000000..686ef8df70ea
--- /dev/null
+++ b/x11-plugins/wmbattery/wmbattery-2.51.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+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}
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog README TODO )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^icondir/s:icons:pixmaps:' \
+		autoconf/makeinfo.in || die
+
+	use upower || { sed -i -e 's:USE_UPOWER = 1:#&:' autoconf/makeinfo.in || die; }
+
+	eautoreconf
+}
diff --git a/x11-plugins/wmbattery/wmbattery-2.54.ebuild b/x11-plugins/wmbattery/wmbattery-2.54.ebuild
new file mode 100644
index 000000000000..8d5e4ad61989
--- /dev/null
+++ b/x11-plugins/wmbattery/wmbattery-2.54.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
new file mode 100644
index 000000000000..897f8bac2c2a
--- /dev/null
+++ b/x11-plugins/wmbiff/Manifest
@@ -0,0 +1,3 @@
+DIST wmbiff-0.4.28.tar.gz 111398 BLAKE2B 39ba4dbf50639b02c8969ae72b696fa83353ec3dcd46802f8333eb597f068d3d0d209f39a352a8f53830695c19c897b7d6f970c5362c2910128b80b0cdb24d32 SHA512 a17fd4b4c3de09a907b7ffccc50f4560a7fddd5cb4dd01c72460806dc55259ba0b587d75f7505171a2a833f6735ddc4ded0a484d4227bfd552cc7343d79d7720
+DIST wmbiff-0.4.35.tar.gz 265332 BLAKE2B 049f01dafaf71af614c47379fa1e59593e6d7904ecc7e63721edc06d06a4705141c5a339f773b7352984b288c32cb7d324fcca72c4459890328672b0d0a4b4e8 SHA512 7a276c33545351dd1e3c072b4b702fabb293744c3b26326739ebc278f18eda3fe971eeaa8392445eb49514eeb430677638b100076409ec6216915a1388a491c4
+DIST wmbiff-0.4.36.tar.gz 266288 BLAKE2B 7f90ae23ff228ed775c4693beffb3e71930bc594083d75cbe25d9eb992cae3a35bc8d57699da53b034a19486846d05625dee607b0da38519ddfc50faac4cf6da SHA512 b8b14f9676ebd576f9e568bd59638c3000337713c6ef8cf5d7799ed0adea59d1ca1fe0d9c67ceb997814b1e6d26590a0c4052b1f031cee28601d7273bbd3fd23
diff --git a/x11-plugins/wmbiff/files/wmbiff-0.4.27-invalid-strncpy.patch b/x11-plugins/wmbiff/files/wmbiff-0.4.27-invalid-strncpy.patch
new file mode 100644
index 000000000000..07f9bad989d6
--- /dev/null
+++ b/x11-plugins/wmbiff/files/wmbiff-0.4.27-invalid-strncpy.patch
@@ -0,0 +1,17 @@
+This corrupted the path for me before, so it couldn't find the file. Presumably since the glibc change to copy stuff backwards.
+
+diff -pudr wmbiff-0.4.27/wmbiff/mboxClient.c wmbiff-0.4.27-mik/wmbiff/mboxClient.c
+--- wmbiff-0.4.27/wmbiff/mboxClient.c	2004-03-28 01:28:58.000000000 +0100
++++ wmbiff-0.4.27-mik/wmbiff/mboxClient.c	2011-09-16 09:54:22.834144487 +0200
+@@ -149,7 +149,10 @@ int mboxCreate(Pop3 pc, const char *str)
+ 			DM(pc, DEBUG_ERROR, "mbox '%s' is too long.\n", str + 5);
+ 			memset(pc->path, 0, BUF_BIG);
+ 		} else {
+-			strncpy(pc->path, str + 5, BUF_BIG - 1);	/* cut off ``mbox:'' */
++      /* str is always pc.path, so we can't use strncpy */
++      int len = strlen(str + 5);
++			memmove(pc->path, str + 5, min(len, BUF_BIG - 1));	/* cut off ``mbox:'' */
++      pc->path[len] = '\0';
+ 		}
+ 	}
+ 
diff --git a/x11-plugins/wmbiff/files/wmbiff-0.4.35-fno-common.patch b/x11-plugins/wmbiff/files/wmbiff-0.4.35-fno-common.patch
new file mode 100644
index 000000000000..2320f17143de
--- /dev/null
+++ b/x11-plugins/wmbiff/files/wmbiff-0.4.35-fno-common.patch
@@ -0,0 +1,24 @@
+diff -Naur wmbiff-0.4.35.orig/wmbiff/wmbiff.c wmbiff-0.4.35/wmbiff/wmbiff.c
+--- wmbiff-0.4.35.orig/wmbiff/wmbiff.c	2019-07-23 15:58:58.000000000 +0200
++++ wmbiff-0.4.35/wmbiff/wmbiff.c	2020-03-08 12:25:32.766264038 +0100
+@@ -104,6 +104,8 @@
+ 
+ Cursor busy_cursor, ready_cursor;
+ 
++Display *display;
++
+ static __inline /*@out@ */ void *
+ malloc_ordie(size_t len)
+ {
+diff -Naur wmbiff-0.4.35.orig/wmgeneral/wmgeneral.h wmbiff-0.4.35/wmgeneral/wmgeneral.h
+--- wmbiff-0.4.35.orig/wmgeneral/wmgeneral.h	2019-07-23 15:57:57.000000000 +0200
++++ wmbiff-0.4.35/wmgeneral/wmgeneral.h	2020-03-08 12:25:16.223256712 +0100
+@@ -36,7 +36,7 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display *display;
++extern Display *display;
+ 
+   /***********************/
+  /* Function Prototypes */
diff --git a/x11-plugins/wmbiff/metadata.xml b/x11-plugins/wmbiff/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmbiff/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
new file mode 100644
index 000000000000..8e73b022cf3e
--- /dev/null
+++ b/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes"
+HOMEPAGE="https://www.dockapps.net/wmbiff"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="crypt"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	crypt? (
+		>=dev-libs/libgcrypt-1.2.1:0
+		>=net-libs/gnutls-2.2.0
+		)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+S=${WORKDIR}/dockapps
+
+DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.4.27-invalid-strncpy.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable crypt crypto)
+}
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.35.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.35.ebuild
new file mode 100644
index 000000000000..9200caafc51c
--- /dev/null
+++ b/x11-plugins/wmbiff/wmbiff-0.4.35.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils
+
+DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes"
+HOMEPAGE="https://www.dockapps.net/wmbiff"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="crypt"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	crypt? (
+		>=dev-libs/libgcrypt-1.2.1:0
+		>=net-libs/gnutls-2.2.0
+		)"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.27-invalid-strncpy.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable crypt crypto)
+}
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
new file mode 100644
index 000000000000..440e743d6035
--- /dev/null
+++ b/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes"
+HOMEPAGE="https://www.dockapps.net/wmbiff"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="crypt"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	crypt? (
+		>=dev-libs/libgcrypt-1.2.1:0
+		>=net-libs/gnutls-2.2.0
+		)"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.27-invalid-strncpy.patch
+	)
+
+src_configure() {
+	econf $(use_enable crypt crypto)
+}
diff --git a/x11-plugins/wmbinclock/Manifest b/x11-plugins/wmbinclock/Manifest
new file mode 100644
index 000000000000..8af14cabb4c6
--- /dev/null
+++ b/x11-plugins/wmbinclock/Manifest
@@ -0,0 +1 @@
+DIST wmbinclock-0.5.tar.bz2 15909 BLAKE2B 71a5e53fea8f042bd8e01c0a8dde9057b22e398a4d483b556221d8344b5542f097e835f0d4eafd7cf24964b4b08f04f844c476cddc443ebc8f469e8fbb5142ec SHA512 f0f1f46b19e9c34f9168e03df2d4be2f9c7a73b09dd8247a7bc977309a3354069adf34032f3c0106aa763fe259993176edd84b029941191d05a11505e27de695
diff --git a/x11-plugins/wmbinclock/files/wmbinclock-0.5-gcc-10.patch b/x11-plugins/wmbinclock/files/wmbinclock-0.5-gcc-10.patch
new file mode 100644
index 000000000000..9656e5cd837d
--- /dev/null
+++ b/x11-plugins/wmbinclock/files/wmbinclock-0.5-gcc-10.patch
@@ -0,0 +1,39 @@
+diff -Naur wmbinclock-0.5.orig/wmBinClock.c wmbinclock-0.5/wmBinClock.c
+--- wmbinclock-0.5.orig/wmBinClock.c	2005-06-21 19:57:58.000000000 +0200
++++ wmbinclock-0.5/wmBinClock.c	2020-03-01 16:01:16.622171968 +0100
+@@ -72,6 +72,13 @@
+ int GotFirstClick3, GotDoubleClick3;
+ int DblClkDelay;
+ 
++Display		*display;
++Window          Root;
++Window          iconwin, win;
++int             screen; 
++int             DisplayDepth;
++GC NormalGC;
++
+ void IntToBinary(int x, int *str[]);
+ void PrintHelp(char err[]);
+ 
+diff -Naur wmbinclock-0.5.orig/xutils.h wmbinclock-0.5/xutils.h
+--- wmbinclock-0.5.orig/xutils.h	2005-02-04 23:06:34.000000000 +0100
++++ wmbinclock-0.5/xutils.h	2020-03-01 16:01:24.721173796 +0100
+@@ -18,12 +18,12 @@
+ /*
+  *   Global variable
+  */
+-Display		*display;
+-Window          Root;
+-Window          iconwin, win;
+-int             screen; 
+-int             DisplayDepth;
+-GC NormalGC;
++extern Display		*display;
++extern Window          Root;
++extern Window          iconwin, win;
++extern int             screen; 
++extern int             DisplayDepth;
++extern GC NormalGC;
+ 
+ 
+ 
diff --git a/x11-plugins/wmbinclock/metadata.xml b/x11-plugins/wmbinclock/metadata.xml
new file mode 100644
index 000000000000..1a5562311729
--- /dev/null
+++ b/x11-plugins/wmbinclock/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+The windowmaker Binary Clock applet shows the
+actual system time as a binary clock. You have to
+add up the bits to get the time. The clock has a
+24-hour format.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">wmbinclock</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild b/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild
new file mode 100644
index 000000000000..5d9f17b2c38f
--- /dev/null
+++ b/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="a nifty little binary clock dockapp"
+HOMEPAGE="https://www.dockapps.net/wmbinclock"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
+		INCDIR="-I/usr/include/X11" LIBDIR="" \
+		SYSTEM="${LDFLAGS}"
+}
+
+src_install() {
+	dobin wmBinClock
+	dosym wmBinClock /usr/bin/${PN}
+	dodoc CHANGELOG README
+}
diff --git a/x11-plugins/wmbio/Manifest b/x11-plugins/wmbio/Manifest
new file mode 100644
index 000000000000..d4baad65ab19
--- /dev/null
+++ b/x11-plugins/wmbio/Manifest
@@ -0,0 +1 @@
+DIST wmbio-1.02.tar.gz 21799 BLAKE2B f3736ad83e4441f027b8091d398f7f819de79d29d9d48dff0f1ab3c159e1da2fc367f8faa92addedb770d7137e7a93f8e91a29935264a6505d16c9598daad64b SHA512 bebe8de364f782c38164fdd3910c3f63ff8313fa46fce1215218a4d14b9be0c793ee1d234fdb694798c1ab49b17eca90957d22c076920bf50ecf24b563a07d5b
diff --git a/x11-plugins/wmbio/files/wmbio-1.02-fno-common.patch b/x11-plugins/wmbio/files/wmbio-1.02-fno-common.patch
new file mode 100644
index 000000000000..ce53876b7ecd
--- /dev/null
+++ b/x11-plugins/wmbio/files/wmbio-1.02-fno-common.patch
@@ -0,0 +1,26 @@
+diff -Naur src.orig/wmbio.c src/wmbio.c
+--- src.orig/wmbio.c	2004-01-21 13:58:12.000000000 +0100
++++ src/wmbio.c	2020-03-08 12:13:32.177944932 +0100
+@@ -78,6 +78,8 @@
+ struct tm *local;  // for the local time
+ time_t tempo;
+ 
++Display		*display;
++Window          Root, iconwin, win;
+ 
+ /* MAIN */
+ int	 main (int argc, char *argv[]);
+diff -Naur src.orig/wmgeneral.h src/wmgeneral.h
+--- src.orig/wmgeneral.h	2002-04-27 16:02:09.000000000 +0200
++++ src/wmgeneral.h	2020-03-08 12:13:24.853941688 +0100
+@@ -24,8 +24,8 @@
+ } XpmIcon;
+ 
+ 
+-Display		*display;
+-Window          Root, iconwin, win;
++extern Display		*display;
++extern Window          Root, iconwin, win;
+ 
+ 
+ void AddMouseRegion(int index, int left, int top, int right, int bottom);
diff --git a/x11-plugins/wmbio/metadata.xml b/x11-plugins/wmbio/metadata.xml
new file mode 100644
index 000000000000..1e997819c05e
--- /dev/null
+++ b/x11-plugins/wmbio/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+Wmbio is a dockapp designed for WindowMaker. 
+Given your birth date, it can show you your 
+biorhythms, allows you to see the progress in time 
+of your biorhythms, and calculates your next totally 
+positive or negative biorhythmic level.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">wmbio</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmbio/wmbio-1.02.ebuild b/x11-plugins/wmbio/wmbio-1.02.ebuild
new file mode 100644
index 000000000000..d2d2e7ccc5fb
--- /dev/null
+++ b/x11-plugins/wmbio/wmbio-1.02.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A Window Maker applet that shows your biorhythm"
+HOMEPAGE="http://wmbio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wmbio/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+S=${WORKDIR}/${P}/src
+
+src_prepare() {
+	default
+	# Honour Gentoo CFLAGS
+	sed -i "s/-g -O2/\$(CFLAGS)/" Makefile || die
+	# Honour Gentoo LDFLAGS
+	sed -i "s/-o wmbio/\$(LDFLAGS) -o wmbio/" Makefile || die
+}
+
+src_install() {
+	dobin wmbio
+	dodoc ../{AUTHORS,Changelog,NEWS,README}
+}
diff --git a/x11-plugins/wmblob/Manifest b/x11-plugins/wmblob/Manifest
new file mode 100644
index 000000000000..cdc2ee8d0de6
--- /dev/null
+++ b/x11-plugins/wmblob/Manifest
@@ -0,0 +1,2 @@
+DIST wmblob-1.0.3.tar.bz2 160657 BLAKE2B e36f7b8c6dd38466da490bd85d03ff2f378caced8d5908b00422428223aaa1fc3754bfd35dcacb2f162b0d44c8c04b509cf5c00d678d687e5b90cad886ce98a6 SHA512 4d8c7e30218d9ec7dc965c69e69b0fb5839c468f695ec2cc9fd9bb0b8fbc89b1386122e11b75906169bb16d13dae16cd8287c5bcf8bd28ccbbad4d4f057b3414
+DIST wmblob-1.0.4.tar.bz2 179284 BLAKE2B 79025a4d80c05bd8f9d1a962762680e24ae0eb09c8bf961833f4f4c59b086ecc8563ef71c28678c969da75f1f074c691c9fd6a6919358886e64f7fcb814611a3 SHA512 d325711e6c6c865a97386793a7c3f0e0833044001ccc336f2a4e9974799e5ff00936b0d90a0dc4a3280ba27a8d1f97239ba51d61e6e5b104e7cf82c8aeed5ec1
diff --git a/x11-plugins/wmblob/metadata.xml b/x11-plugins/wmblob/metadata.xml
new file mode 100644
index 000000000000..15f8d18cb12c
--- /dev/null
+++ b/x11-plugins/wmblob/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="freshmeat">wmblob</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmblob/wmblob-1.0.3.ebuild b/x11-plugins/wmblob/wmblob-1.0.3.ebuild
new file mode 100644
index 000000000000..4d31557be81d
--- /dev/null
+++ b/x11-plugins/wmblob/wmblob-1.0.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools multilib
+
+DESCRIPTION="a fancy but useless dockapp with moving blobs"
+HOMEPAGE="https://github.com/bbidulock/wmblob"
+SRC_URI="https://github.com/bbidulock/wmblob/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libXt"
+
+DOCS="AUTHORS ChangeLog NEWS README doc/how_it_works"
+
+src_prepare() {
+	sed -i \
+		-e "s|-O2|${CFLAGS}|g" \
+		-e "s|\$x_libraries|/usr/$(get_libdir)|" \
+		configure.ac || die
+
+	eautoreconf
+}
diff --git a/x11-plugins/wmblob/wmblob-1.0.4.ebuild b/x11-plugins/wmblob/wmblob-1.0.4.ebuild
new file mode 100644
index 000000000000..36809096937f
--- /dev/null
+++ b/x11-plugins/wmblob/wmblob-1.0.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib
+
+DESCRIPTION="a fancy but useless dockapp with moving blobs"
+HOMEPAGE="https://github.com/bbidulock/wmblob"
+SRC_URI="https://github.com/bbidulock/wmblob/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-libs/libXt"
+
+DOCS="AUTHORS ChangeLog NEWS README doc/how_it_works"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s|-O2|${CFLAGS}|g" \
+		-e "s|\$x_libraries|/usr/$(get_libdir)|" \
+		configure.ac || die
+
+	eautoreconf
+}
diff --git a/x11-plugins/wmbutton/Manifest b/x11-plugins/wmbutton/Manifest
new file mode 100644
index 000000000000..42a221c11360
--- /dev/null
+++ b/x11-plugins/wmbutton/Manifest
@@ -0,0 +1,3 @@
+DIST wmbutton-0.7.0.tar.gz 48381 BLAKE2B 051a6da83e575425aca44c88e3011e1c9413d2321ecf3d2387520270d4f5f23eb23df0526332d8913d9a5aaa5f813e5d179f8deca39b705d64687506d9e3da8b SHA512 dc631caca0b1ed6daf8781a0893464b91d788b3d0f81dc22a33d13715cda7becbb145d2d3d34ab93a9a343ed178171c376f81e2eb25e9436d1da8ee2d6455ce2
+DIST wmbutton-0.7.1.tar.gz 140293 BLAKE2B 55ab4926b833ae4e57e73cbd4e0fdb6177510099a140bd17d1378c31fe4f42a5fa35c1dbe58398412d465ceb99065a3c7a45a496dc3cb71d045edd879bd70f18 SHA512 61e846c2c7edf6375fdf7e86490ef80feab986b24ce83110283b7e336562a670142e326bfda24ddad832c563da0cb4bc2c3d7379e88e647954c6d93a4dcf6068
+DIST wmbutton-buttons.xpm 25003 BLAKE2B 84830b939cf22605977796ab756d03c110bae8e565eec2b75f479a5b19d9027851ef0178e170da34537b0725073f24544dc0f9c1c701f0f0089701bdfaffd87b SHA512 eb73812b8a4060a6bb13a477275224a2e6d50f7b77944f2f674c4995e0053f3d3c667d483c86dda98b69f398fd332e4c836ddf9eb3410e1e29b69449b874537c
diff --git a/x11-plugins/wmbutton/files/sample.wmbutton b/x11-plugins/wmbutton/files/sample.wmbutton
new file mode 100644
index 000000000000..a4177a24e081
--- /dev/null
+++ b/x11-plugins/wmbutton/files/sample.wmbutton
@@ -0,0 +1,43 @@
+# Buttons are numbered as follows 
+# 	Left	1 2 3	Middle	11 12 13	Right	21 22 23
+# 	button	4 5 6	button	14 15 16	button	24 25 26
+#		7 8 9		17 18 19		27 28 29
+#
+
+1	mozilla &
+11	firefox &
+21	opera &
+
+2	evolution &
+12	mozilla -mail &
+22	gftp &
+
+3	xterm -T 'xterm' &
+13	Eterm -T 'Eterm' &
+23	aterm -T 'Aterm' &
+
+4	psi &
+14	gaim &
+24	kadu &
+
+5	gentoo &
+15	xterm -T 'Midnight Commander' -e mc &
+25	xffm &
+
+6	ooffice &
+16	gnumeric &
+26	acroread &
+
+7	xmms &
+17	gmplayer &
+27	audacity &
+
+8	gimp-2.0 &
+18	sodipodi &
+28	kpaint &
+
+9       kghostview &
+19      ggv &
+29      xpdf &
+# The above don't need to be in any particular order.
+# Repeated entries should be ignored
diff --git a/x11-plugins/wmbutton/files/wmbutton-0.7.0-Makefile.patch b/x11-plugins/wmbutton/files/wmbutton-0.7.0-Makefile.patch
new file mode 100644
index 000000000000..f9197842b44a
--- /dev/null
+++ b/x11-plugins/wmbutton/files/wmbutton-0.7.0-Makefile.patch
@@ -0,0 +1,26 @@
+--- Makefile.orig	2014-10-06 15:20:41.300883734 +0200
++++ Makefile	2014-10-06 15:22:08.936939085 +0200
+@@ -1,6 +1,6 @@
+ INCLUDES =-I/usr/include -I/usr/local/include
+-LIBINC =-L/usr/X11R6/lib -L/usr/include/lib
+ LIBS = -lX11 -lXpm -lXext
++CC = gcc
+ 
+ TARGET = wmbutton
+ OBJECTS = wmbutton.o wmb_libs.o
+@@ -14,13 +14,11 @@
+ INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
+ INSTALL_FILE    = $(INSTALL) -p -o root -g root -m 644
+ 
+-CFLAGS += -Wall -O2
+-
+ .c.o:
+-	gcc -c ${CFLAGS} ${INCLUDES} $< -o $*.o
++	${CC} -c ${CFLAGS} ${INCLUDES} $< -o $*.o
+ 
+ ${TARGET}: ${OBJECTS}
+-	gcc -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
++	${CC} ${LDFLAGS} ${OBJECTS} ${LIBS} -o ${TARGET} 
+ 
+ clean::
+ 	for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done 
diff --git a/x11-plugins/wmbutton/metadata.xml b/x11-plugins/wmbutton/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmbutton/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild b/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
new file mode 100644
index 000000000000..4a5bc61a5db6
--- /dev/null
+++ b/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a dockapp application that displays nine configurable buttons"
+HOMEPAGE="https://www.dockapps.net/wmbutton"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz
+	branding? ( mirror://gentoo/${PN}-buttons.xpm )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE="branding"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S=${WORKDIR}/dockapps
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	use branding && cp "${DISTDIR}"/${PN}-buttons.xpm buttons.xpm
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README
+	use branding && dodoc "${FILESDIR}"/sample.wmbutton
+	use branding || dodoc sample.wmbutton
+}
diff --git a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
new file mode 100644
index 000000000000..a681773c8a4f
--- /dev/null
+++ b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="a dockapp application that displays nine configurable buttons"
+HOMEPAGE="https://www.dockapps.net/wmbutton"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="branding"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-plugins/wmcalc/Manifest b/x11-plugins/wmcalc/Manifest
new file mode 100644
index 000000000000..946f937f6fa1
--- /dev/null
+++ b/x11-plugins/wmcalc/Manifest
@@ -0,0 +1,2 @@
+DIST wmcalc-0.6.tar.gz 44250 BLAKE2B ddcc90bb9d8cf203e1c24b73ff5556d7d11265eaaa93d70908c4e300cbd91bf7fbdca87b67bbd07d7e95439c5326c4853c60d80cfc3401507968fb80b2dd3bb7 SHA512 bdde94f44462733bfede021329b44f21d377fe8a6089c1c457d71f35481b8a01918d92aa79f60d47c791ddf8ee2a9abdb4185ab30584afba558a289a3e786841
+DIST wmcalc-0.7.tar.gz 119785 BLAKE2B fbb6dff279282e3a383eb3a5c2eca31aee453968040838bbc418d64e27f573555218f6ca3f549c92aa09900389e1a3087e1856d24ed757145ad19410caf87811 SHA512 8cffc55b58900090eecd528daec85238d14294dc294bb042c8a6ed0beb3f4cec0ce9f072e5b124e2eb787afb80f24011576130075c8f9b2ddb2f670550c9328c
diff --git a/x11-plugins/wmcalc/metadata.xml b/x11-plugins/wmcalc/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmcalc/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmcalc/wmcalc-0.6-r1.ebuild b/x11-plugins/wmcalc/wmcalc-0.6-r1.ebuild
new file mode 100644
index 000000000000..2da684ee5944
--- /dev/null
+++ b/x11-plugins/wmcalc/wmcalc-0.6-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A WindowMaker DockApp calculator"
+HOMEPAGE="https://www.dockapps.net/wmcalc"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+# Specific to this tarball
+S=${WORKDIR}/dockapps-43ddcdf
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc README
+}
diff --git a/x11-plugins/wmcalc/wmcalc-0.7.ebuild b/x11-plugins/wmcalc/wmcalc-0.7.ebuild
new file mode 100644
index 000000000000..ec6e2182ba7d
--- /dev/null
+++ b/x11-plugins/wmcalc/wmcalc-0.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A WindowMaker DockApp calculator"
+HOMEPAGE="https://www.dockapps.net/wmcalc"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-plugins/wmcalendar/Manifest b/x11-plugins/wmcalendar/Manifest
new file mode 100644
index 000000000000..0e9394eb7888
--- /dev/null
+++ b/x11-plugins/wmcalendar/Manifest
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..1d68111fc261
--- /dev/null
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch
@@ -0,0 +1,67 @@
+--- a/calendarfunc.c	2003-07-13 17:41:02.000000000 +0300
++++ b/calendarfunc.c	2008-05-03 10:03:06.000000000 +0300
+@@ -22,7 +22,7 @@
+ 
+ #include "calendarfunc.h"
+ #include <stdio.h>
+-
++#include <math.h>
+ 
+ 
+ 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
+@@ -23,6 +23,7 @@
+  * modified by Seiichi SATO <ssato@sh.rim.or.jp>
+  */
+ 
++#include <stdlib.h>
+ #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
+@@ -1,19 +1,15 @@
+-CC     = gcc
++CC     ?= gcc
+ INCLUDES  = `pkg-config --cflags gtk+-2.0` -I. 
+-LFLAGS = `pkg-config --libs gtk+-2.0`
+ 
+ # for BSD
+ #INCLUDES = `gtk12-config --cflags` -I. 
+ #LFLAGS = `gtk12-config --libs`
+-X11BASE = /usr/X11R6
+-CFLAGS =  $(INCLUDES) -DICON_TYPE=$(ICON_TYPE)
+-INCDIR = -I$(X11BASE)/include/X11 -I$(X11BASE)/include -I$/usr/include -I$/usr/local/include
+-DESTDIR= /usr/local
+-LIBDIR = -L/usr/lib -L${X11BASE}/lib -L/usr/local/lib
++CFLAGS +=  $(INCLUDES) -DICON_TYPE=$(ICON_TYPE)
++PREFIX = /usr
+ PACKAGE = wmCalendar
+ 
+ # for Linux
+-LIBS   = $(LIBDIR) -lXpm -lical -lpthread
++LIBS   = -lpthread -lm $(shell $(PKG_CONFIG) --libs gtk+-2.0 x11 xpm xext libical)
+ # for Solaris (untested!!!)
+ # LIBS   = -lXpm -lX11 -lXext -lsocket -lnsl -lical
+ 
+@@ -30,7 +26,7 @@
+ all:	wmCalendar.o wmCalendar 
+ 
+ wmCalendar: $(OBJECTS) 
+-	 $(CC) $(COPTS)  $(SYSTEM) $(LFLAGS) -o $@ $(OBJECTS) -o wmCalendar $(INCDIR)$(LIBDIR) $(LIBS)
++	 $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
+ 
+ wmCalendar.o: wmCalendar_master.xpm   wmCalendar_master2.xpm
+ clean:
+@@ -40,6 +36,8 @@
+ 	rm -f wmCalendar
+ 
+ install:: wmCalendar
+-	install -c -s -m 0755 wmCalendar $(DESTDIR)/bin/
+-	install -c -m 0644 wmCalendar.1 $(DESTDIR)/man/man1 
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install -m 0755 wmCalendar $(DESTDIR)$(PREFIX)/bin
++	install -d $(DESTDIR)$(PREFIX)/share/man/man1
++	install -m 0644 wmCalendar.1 $(DESTDIR)$(PREFIX)/share/man/man1 
+ 
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
new file mode 100644
index 000000000000..9907634290a2
--- /dev/null
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-fno-common.patch
@@ -0,0 +1,97 @@
+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
+@@ -1,5 +1,10 @@
+ #include "calendar.h"
+ 
++time_t  modtime;
++struct  calobj* calRoot;
++int     xr, yr;
++int     datetype[32][2];
++
+ 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
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ 
+ 
++int     datemoon[200][2];
+ 
+ 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
+@@ -70,5 +70,5 @@
+ 
+ int Ceil(float number);
+ 
+-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
+@@ -5,10 +5,10 @@
+ #include <sys/stat.h>
+ 
+ 
+-time_t  modtime;              /* modified time of icalendar file */
+-struct  calobj* calRoot;  /* 1st element in list of calendar obj*/
+-int     xr, yr;               /*evil hack for moving dayview window*/
+-int     datetype[32][2];      /* hashtable for coloring days.[jdn%32][0] stores color of day jdn, 
++extern time_t  modtime;              /* modified time of icalendar file */
++extern struct  calobj* calRoot;  /* 1st element in list of calendar obj*/
++extern int     xr, yr;               /*evil hack for moving dayview window*/
++extern int     datetype[32][2];      /* hashtable for coloring days.[jdn%32][0] stores color of day jdn, 
+ 				 [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
+@@ -1,4 +1,14 @@
+ #include "settings.h"
++
++char    rcfile[250];
++char    icsfile[250];
++char    application[250];
++int     start_of_week;
++char*   daystr[8];
++int     appicon;
++int     lang;
++int     debug;
++
+ 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
+@@ -7,14 +7,14 @@
+ 
+ 
+ 
+-char    rcfile[250];       /* location of settings file */
+-char    icsfile[250];      /* location of icalendar file */
+-char    application[250];  /* command for starting external application */
+-int     start_of_week; /* defines the first day of week */
+-char*   daystr[8];
+-int     appicon;       /* sets the application icon evol(0) moz(1) other(2)*/
+-int     lang;          /* defines the language 0:english(default) 1:farsi */
+-int     debug;         /* debug mode off(0) or on(1) */
++extern char    rcfile[250];       /* location of settings file */
++extern char    icsfile[250];      /* location of icalendar file */
++extern char    application[250];  /* command for starting external application */
++extern int     start_of_week; /* defines the first day of week */
++extern char*   daystr[8];
++extern int     appicon;       /* sets the application icon evol(0) moz(1) other(2)*/
++extern int     lang;          /* defines the language 0:english(default) 1:farsi */
++extern int     debug;         /* debug mode off(0) or on(1) */
+ 
+ 
+ void destroy (GtkWidget * widget, gpointer data);
diff --git a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-ical.patch b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-ical.patch
new file mode 100644
index 000000000000..9297717a3558
--- /dev/null
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-ical.patch
@@ -0,0 +1,19 @@
+--- a/calendar.h
++++ b/calendar.h
+@@ -1,4 +1,4 @@
+-#include <ical.h>
++#include <libical/ical.h>
+ #include <stdlib.h>
+ #include <gtk/gtk.h>
+ #include <string.h>
+--- a/calendarfunc.h
++++ b/calendarfunc.h
+@@ -22,7 +22,7 @@
+ 
+ #include <unistd.h>
+ #include <stdlib.h>
+-#include <ical.h>
++#include <libical/ical.h>
+ #define TIMZ 3.0
+ #define MINAGE 13.5
+ #define SUNSET 19.5 /*approximate */
diff --git a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-rename_kill_func.patch b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-rename_kill_func.patch
new file mode 100644
index 000000000000..e11a8b1b98cf
--- /dev/null
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-rename_kill_func.patch
@@ -0,0 +1,20 @@
+--- a/calendar.c
++++ b/calendar.c
+@@ -48,7 +48,7 @@
+ 
+ 
+ 
+-void kill (GtkWidget * widget)
++void close_app (GtkWidget * widget)
+ {
+     gtk_widget_destroy ((GtkWidget*)gtk_widget_get_toplevel(widget));
+     gtk_main_quit ();
+@@ -193,7 +193,7 @@
+ 	gtk_signal_connect(GTK_OBJECT (event_box), "button_press_event",
+ 			   GTK_SIGNAL_FUNC (move), NULL);
+ 	gtk_signal_connect(GTK_OBJECT (event_box2), "button_press_event",
+-			   (GtkSignalFunc) kill, GTK_OBJECT(dayView));
++			   (GtkSignalFunc) close_app, GTK_OBJECT(dayView));
+ 
+ 	gtk_widget_realize(dayView);
+ 	//	gtk_window_set_position(GTK_WINDOW (dayView),GTK_WIN_POS_CENTER_ON_PARENT);
diff --git a/x11-plugins/wmcalendar/metadata.xml b/x11-plugins/wmcalendar/metadata.xml
new file mode 100644
index 000000000000..30eb799ff33b
--- /dev/null
+++ b/x11-plugins/wmcalendar/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">wmcalendar</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild b/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild
new file mode 100644
index 000000000000..1bbb79c3f80c
--- /dev/null
+++ b/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="a calendar dockapp"
+HOMEPAGE="http://wmcalendar.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc ~sparc x86"
+
+RDEPEND="
+	dev-libs/libical
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ../{BUGS,CHANGES,HINTS,README,TODO} )
+
+S=${WORKDIR}/${P}/Src
+
+PATCHES=( "${FILESDIR}"/${P}-exit-sin-and-cos.patch
+	"${FILESDIR}"/${P}-rename_kill_func.patch
+	"${FILESDIR}"/${P}-ical.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+	default
+}
diff --git a/x11-plugins/wmcdplay/Manifest b/x11-plugins/wmcdplay/Manifest
new file mode 100644
index 000000000000..ad79d178d9d4
--- /dev/null
+++ b/x11-plugins/wmcdplay/Manifest
@@ -0,0 +1 @@
+DIST wmcdplay-1.1.tar.gz 32082 BLAKE2B 5fd8f57aca1d3d53d34a31f9814c132a98241b848ac04e69c367065ea291add5f025598b7b03c44033024d20e24271690cdb38830e56d3795f6232b02f1d81c6 SHA512 db657ee2cf0a1a7e323e1a6fbf2ec70251005b84fb18808661cd44a50b4203786e56e90329d81957d2496a6e79d76e9d87620680186c85e476b7f94d8f234133
diff --git a/x11-plugins/wmcdplay/files/wmcdplay.desktop b/x11-plugins/wmcdplay/files/wmcdplay.desktop
new file mode 100644
index 000000000000..c289ac8dd16c
--- /dev/null
+++ b/x11-plugins/wmcdplay/files/wmcdplay.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=WmCDPlay
+Comment=Dockable CD player applet
+Comment[pl]=Dokowalny aplet CD playera
+Exec=wmcdplay
+Type=Application
+Terminal=false
+Categories=AudioVideo;Audio;
diff --git a/x11-plugins/wmcdplay/metadata.xml b/x11-plugins/wmcdplay/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmcdplay/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild b/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
new file mode 100644
index 000000000000..4751907aadbf
--- /dev/null
+++ b/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop
+
+DESCRIPTION="CD player applet for WindowMaker"
+HOMEPAGE="https://www.dockapps.net/wmcdplay"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S="${WORKDIR}/dockapps"
+
+DOCS=( ARTWORK README )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	domenu "${FILESDIR}"/${PN}.desktop
+}
diff --git a/x11-plugins/wmcliphist/Manifest b/x11-plugins/wmcliphist/Manifest
new file mode 100644
index 000000000000..0a4b89d91801
--- /dev/null
+++ b/x11-plugins/wmcliphist/Manifest
@@ -0,0 +1 @@
+DIST wmcliphist-2.1.tar.gz 61459 BLAKE2B 5fc8bd635b83c0ab6ea937d5c8cd26e459c7a7caa25196e45b29b42b22243d7bad246741269b8def9fdfbf574c187a2595a9676b17c9ebb236e296c3297a3460 SHA512 92ffe45fce7da09cffb769e4c97a36309fe2d373f514708e5bffc7877324080d3116e30f84de7a9addc648c38d43c678e4e2fccae451d93a02a57e7f9e319e03
diff --git a/x11-plugins/wmcliphist/metadata.xml b/x11-plugins/wmcliphist/metadata.xml
new file mode 100644
index 000000000000..efd3ab6e7693
--- /dev/null
+++ b/x11-plugins/wmcliphist/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+wmcliphist is dockable clipboard history application for Window Maker. It is
+similar to klipper from KDE. wmcliphist keeps history of clipboard operations
+and allows you to put previously copied items back to the clipboard for pasting
+to other applications.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmcliphist/wmcliphist-2.1-r2.ebuild b/x11-plugins/wmcliphist/wmcliphist-2.1-r2.ebuild
new file mode 100644
index 000000000000..430468e706bd
--- /dev/null
+++ b/x11-plugins/wmcliphist/wmcliphist-2.1-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Dockable clipboard history application for Window Maker"
+HOMEPAGE="https://www.dockapps.net/wmcliphist"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:3[X]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/dockapps
+
+src_prepare() {
+	default
+
+	sed -e '/^PREFIX/s:=.*:=/usr:' \
+		-i Makefile || die
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	newdoc ${PN}rc ${PN}rc.sample
+}
diff --git a/x11-plugins/wmclock/Manifest b/x11-plugins/wmclock/Manifest
new file mode 100644
index 000000000000..b57ddd585bd1
--- /dev/null
+++ b/x11-plugins/wmclock/Manifest
@@ -0,0 +1 @@
+DIST wmclock-1.0.16.tar.gz 35448 BLAKE2B 2a6ee148664b10850a31bb7f20f68b8f2d0c7e1e9d353f6823e9280b40ab7e43ebf1e824428e233d03608217a2cdb7f7463480530ca89d5bd7278ffeabf2de80 SHA512 1325a3a25d03a04e5321bf99bbd6ffac0e08f9f2a635425689458cf74219a9338d60d832143031639f75575dfc63fd307a15e651f90345887cf95de90cc8fbe0
diff --git a/x11-plugins/wmclock/metadata.xml b/x11-plugins/wmclock/metadata.xml
new file mode 100644
index 000000000000..2375b3e1ef29
--- /dev/null
+++ b/x11-plugins/wmclock/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+Wmclock is an applet which displays the date and time in a dockable tile. 
+Wmclock is specially designed for Window Maker, and features multiple language 
+support, twenty-four-hour and twelve-hour (am/pm) time display, and, 
+optionally, can run a user-specified program on a mouse click. Wmclock is 
+derived from ASClock (now called ASClock classic), a similar clock for the 
+AfterStep window manager.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmclock/wmclock-1.0.16-r1.ebuild b/x11-plugins/wmclock/wmclock-1.0.16-r1.ebuild
new file mode 100644
index 000000000000..7581fe60d515
--- /dev/null
+++ b/x11-plugins/wmclock/wmclock-1.0.16-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="a dockapp that displays time and date (same style as NEXTSTEP(tm) OS)"
+HOMEPAGE="https://www.dockapps.net/wmclock"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+# Specific path for this version
+S="${WORKDIR}/dockapps-daaf3aa"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/x11-plugins/wmclockmon/Manifest b/x11-plugins/wmclockmon/Manifest
new file mode 100644
index 000000000000..25f113ebffa6
--- /dev/null
+++ b/x11-plugins/wmclockmon/Manifest
@@ -0,0 +1 @@
+DIST wmclockmon_0.8.1-1.tar.gz 139233 BLAKE2B fef6cc69afe54fc966008097c15ebf08db5dc585e3789f610b5f0d5d550312a6e0a00e5ee07d6e86d5efd78358e00a4d0fa44cd3b7ac69ecd9c7374037be61f4 SHA512 6216737b9df3ba2ec453570c477764b89b386bbaf954abcb5a5dc2e8841b08d4a8b0b9a4b7eaea73af59544a004cd685f15ce5a0cf098e4db29208151e5309a4
diff --git a/x11-plugins/wmclockmon/files/wmclockmon-0.8.1-gcc-10.patch b/x11-plugins/wmclockmon/files/wmclockmon-0.8.1-gcc-10.patch
new file mode 100644
index 000000000000..f891c27e1a0f
--- /dev/null
+++ b/x11-plugins/wmclockmon/files/wmclockmon-0.8.1-gcc-10.patch
@@ -0,0 +1,247 @@
+diff -Naur wmclockmon-0.8.1.orig/src/main.c wmclockmon-0.8.1/src/main.c
+--- wmclockmon-0.8.1.orig/src/main.c	2005-06-15 16:04:57.000000000 +0200
++++ wmclockmon-0.8.1/src/main.c	2020-02-24 22:27:45.957224984 +0100
+@@ -221,6 +221,7 @@
+ static char*     label             = NULL;
+ 
+ 
++
+ /* prototypes */
+ static void rotate_style();
+ static Bool stringdiff(const char *s1, const char *s2);
+diff -Naur wmclockmon-0.8.1.orig/wmclockmon-cal/main.c wmclockmon-0.8.1/wmclockmon-cal/main.c
+--- wmclockmon-0.8.1.orig/wmclockmon-cal/main.c	2005-06-15 15:55:27.000000000 +0200
++++ wmclockmon-0.8.1/wmclockmon-cal/main.c	2020-02-24 22:35:38.832391977 +0100
+@@ -15,6 +15,22 @@
+ #include "mainwindow.h"
+ #include "main.h"
+ 
++GtkWidget *application;
++GtkWidget *alarmlist;
++GtkWidget *wid_backlight;
++GtkWidget *wid_blink;
++GtkWidget *wid_styledir;
++GtkWidget *wid_stylename;
++GtkWidget *wid_color;
++GtkWidget *wid_command;
++GtkWidget *wid_msgcmd;
++GtkWidget *wid_h12;
++GtkWidget *wid_itm;
++GtkWidget *wid_locale;
++
++int selected_row;
++
++struct tm *timeinfos;
+ 
+ void Usage () {
+     printf("Usage: "PACKAGE"-cal [-h] [-v]\n"
+diff -Naur wmclockmon-0.8.1.orig/wmclockmon-cal/main.h wmclockmon-0.8.1/wmclockmon-cal/main.h
+--- wmclockmon-0.8.1.orig/wmclockmon-cal/main.h	2005-06-15 15:55:27.000000000 +0200
++++ wmclockmon-0.8.1/wmclockmon-cal/main.h	2020-02-24 22:35:32.799388390 +0100
+@@ -9,7 +9,7 @@
+ #include <sys/time.h>
+ 
+ 
+-struct tm *timeinfos;
++extern struct tm *timeinfos;
+ 
+ void quit_app();
+ 
+diff -Naur wmclockmon-0.8.1.orig/wmclockmon-cal/mainwindow.h wmclockmon-0.8.1/wmclockmon-cal/mainwindow.h
+--- wmclockmon-0.8.1.orig/wmclockmon-cal/mainwindow.h	2005-06-15 15:55:27.000000000 +0200
++++ wmclockmon-0.8.1/wmclockmon-cal/mainwindow.h	2020-02-24 22:34:22.609356664 +0100
+@@ -7,20 +7,20 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-GtkWidget *application;
+-GtkWidget *alarmlist;
+-GtkWidget *wid_backlight;
+-GtkWidget *wid_blink;
+-GtkWidget *wid_styledir;
+-GtkWidget *wid_stylename;
+-GtkWidget *wid_color;
+-GtkWidget *wid_command;
+-GtkWidget *wid_msgcmd;
+-GtkWidget *wid_h12;
+-GtkWidget *wid_itm;
+-GtkWidget *wid_locale;
++extern GtkWidget *application;
++extern GtkWidget *alarmlist;
++extern GtkWidget *wid_backlight;
++extern GtkWidget *wid_blink;
++extern GtkWidget *wid_styledir;
++extern GtkWidget *wid_stylename;
++extern GtkWidget *wid_color;
++extern GtkWidget *wid_command;
++extern GtkWidget *wid_msgcmd;
++extern GtkWidget *wid_h12;
++extern GtkWidget *wid_itm;
++extern GtkWidget *wid_locale;
+ 
+-int selected_row;
++extern int selected_row;
+ 
+ gint list_unsel_cb (GtkCList *clist,
+         gint row,
+diff -Naur wmclockmon-0.8.1.orig/wmclockmon-config/actions.c wmclockmon-0.8.1/wmclockmon-config/actions.c
+--- wmclockmon-0.8.1.orig/wmclockmon-config/actions.c	2005-06-15 15:55:27.000000000 +0200
++++ wmclockmon-0.8.1/wmclockmon-config/actions.c	2020-02-24 22:32:59.929329239 +0100
+@@ -19,6 +19,24 @@
+ #include "edit.h"
+ #include "actions.h"
+ 
++GtkWidget *application;
++GtkWidget *alarmlist;
++GtkWidget *wid_backlight;
++GtkWidget *wid_blink;
++GtkWidget *wid_styledir;
++GtkWidget *wid_stylename;
++GtkWidget *wid_color;
++GtkWidget *wid_command;
++GtkWidget *wid_msgcmd;
++GtkWidget *wid_h12;
++GtkWidget *wid_clk;
++GtkWidget *wid_itm;
++GtkWidget *wid_bin;
++GtkWidget *wid_locale;
++GtkWidget *wid_showcal;
++GtkWidget *wid_calalrms;
++
++int selected_row;
+ 
+ void quit_app() {
+     FREE(command);
+diff -Naur 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 15:55:27.000000000 +0200
++++ wmclockmon-0.8.1/wmclockmon-config/edit.c	2020-02-24 22:30:01.651270068 +0100
+@@ -16,6 +16,8 @@
+ static GtkWidget *wid_date;
+ static GtkWidget *wid_mesg;
+ 
++char *newalarm;
++
+ void set_data(GtkWidget *widget, GtkWidget *data) {
+     char *wstat = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(wid_status)->entry));
+     char *wtime = gtk_entry_get_text(GTK_ENTRY(wid_time));
+diff -Naur wmclockmon-0.8.1.orig/wmclockmon-config/edit.h wmclockmon-0.8.1/wmclockmon-config/edit.h
+--- wmclockmon-0.8.1.orig/wmclockmon-config/edit.h	2005-06-15 15:55:27.000000000 +0200
++++ wmclockmon-0.8.1/wmclockmon-config/edit.h	2020-02-24 22:29:53.652267413 +0100
+@@ -5,7 +5,7 @@
+ #ifndef EDIT_H
+ #define EDIT_H
+ 
+-char *newalarm;
++extern char *newalarm;
+ 
+ void edit_dialog(const char *title,
+         int on,
+diff -Naur wmclockmon-0.8.1.orig/wmclockmon-config/mainwindow.h wmclockmon-0.8.1/wmclockmon-config/mainwindow.h
+--- wmclockmon-0.8.1.orig/wmclockmon-config/mainwindow.h	2005-06-15 15:55:27.000000000 +0200
++++ wmclockmon-0.8.1/wmclockmon-config/mainwindow.h	2020-02-24 22:33:31.864339834 +0100
+@@ -7,24 +7,24 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-GtkWidget *application;
+-GtkWidget *alarmlist;
+-GtkWidget *wid_backlight;
+-GtkWidget *wid_blink;
+-GtkWidget *wid_styledir;
+-GtkWidget *wid_stylename;
+-GtkWidget *wid_color;
+-GtkWidget *wid_command;
+-GtkWidget *wid_msgcmd;
+-GtkWidget *wid_h12;
+-GtkWidget *wid_clk;
+-GtkWidget *wid_itm;
+-GtkWidget *wid_bin;
+-GtkWidget *wid_locale;
+-GtkWidget *wid_showcal;
+-GtkWidget *wid_calalrms;
++extern GtkWidget *application;
++extern GtkWidget *alarmlist;
++extern GtkWidget *wid_backlight;
++extern GtkWidget *wid_blink;
++extern GtkWidget *wid_styledir;
++extern GtkWidget *wid_stylename;
++extern GtkWidget *wid_color;
++extern GtkWidget *wid_command;
++extern GtkWidget *wid_msgcmd;
++extern GtkWidget *wid_h12;
++extern GtkWidget *wid_clk;
++extern GtkWidget *wid_itm;
++extern GtkWidget *wid_bin;
++extern GtkWidget *wid_locale;
++extern GtkWidget *wid_showcal;
++extern GtkWidget *wid_calalrms;
+ 
+-int selected_row;
++extern int selected_row;
+ 
+ gint list_unsel_cb (GtkCList *clist,
+         gint row,
+diff -Naur wmclockmon-0.8.1.orig/wmclockmon-config/tools.c wmclockmon-0.8.1/wmclockmon-config/tools.c
+--- wmclockmon-0.8.1.orig/wmclockmon-config/tools.c	2005-06-15 15:55:27.000000000 +0200
++++ wmclockmon-0.8.1/wmclockmon-config/tools.c	2020-02-24 22:28:02.883230608 +0100
+@@ -17,6 +17,21 @@
+ #include <sys/types.h>
+ #include "configfile.h"
+ 
++int    backlight;
++int    switch_authorized;
++int    h12;
++int    time_mode;
++int    use_leds;
++int    use_locale;
++int    showcal;
++int    calalrms;
++char  *style_name;
++char  *style_dir;
++char  *config_file;
++char  *light_color;
++char  *command;
++char  *msgcmd;
++Alarm *alarms;
+ 
+ int fexist(const char *filename) {
+     FILE *file;
+diff -Naur wmclockmon-0.8.1.orig/wmclockmon-config/variables.h wmclockmon-0.8.1/wmclockmon-config/variables.h
+--- wmclockmon-0.8.1.orig/wmclockmon-config/variables.h	2005-06-15 15:55:27.000000000 +0200
++++ wmclockmon-0.8.1/wmclockmon-config/variables.h	2020-02-24 22:18:40.479043297 +0100
+@@ -7,20 +7,20 @@
+ 
+ #include "defines.h"
+ 
+-int    backlight;
+-int    switch_authorized;
+-int    h12;
+-int    time_mode;
+-int    use_leds;
+-int    use_locale;
+-int    showcal;
+-int    calalrms;
+-char  *style_name;
+-char  *style_dir;
+-char  *config_file;
+-char  *light_color;
+-char  *command;
+-char  *msgcmd;
+-Alarm *alarms;
++extern int    backlight;
++extern int    switch_authorized;
++extern int    h12;
++extern int    time_mode;
++extern int    use_leds;
++extern int    use_locale;
++extern int    showcal;
++extern int    calalrms;
++extern char  *style_name;
++extern char  *style_dir;
++extern char  *config_file;
++extern char  *light_color;
++extern char  *command;
++extern char  *msgcmd;
++extern Alarm *alarms;
+ 
+ #endif
diff --git a/x11-plugins/wmclockmon/files/wmclockmon-0.8.1-gtk.patch b/x11-plugins/wmclockmon/files/wmclockmon-0.8.1-gtk.patch
new file mode 100644
index 000000000000..a3b1b1fff9df
--- /dev/null
+++ b/x11-plugins/wmclockmon/files/wmclockmon-0.8.1-gtk.patch
@@ -0,0 +1,303 @@
+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
+@@ -96,17 +96,17 @@
+ 
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+-LDFLAGS = @LDFLAGS@ `gtk-config --libs`
++LIBS = @LIBS@ `pkg-config gtk+-2.0 --libs`
+ X_CFLAGS = @X_CFLAGS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ wmclockmon_OBJECTS = main.o mainwindow.o tools.o
+ wmclockmon_DEPENDENCIES = 
+ wmclockmon_LDFLAGS = 
+-CFLAGS = @CFLAGS@ `gtk-config --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 $@
++LINK = $(CCLD) $(LDFLAGS) $(AM_CFLAGS) $(CFLAGS) $(LIBS) -o $@
+ 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
+@@ -51,7 +51,6 @@
+     gtk_widget_hide(calendar);
+     gtk_widget_hide(closewindow);
+     gtk_widget_grab_default(GTK_WIDGET(cancel));
+-    gtk_widget_draw_default(GTK_WIDGET(cancel));
+     gtk_widget_grab_focus(GTK_WIDGET(edit));
+     gtk_widget_show(text_buttons);
+     gtk_widget_show(edit);
+@@ -69,7 +68,6 @@
+     gtk_widget_hide(cancel);
+     gtk_widget_show(calendar);
+     gtk_widget_grab_default(GTK_WIDGET(closewindow));
+-    gtk_widget_draw_default(GTK_WIDGET(closewindow));
+     gtk_widget_grab_focus(GTK_WIDGET(closewindow));
+     gtk_widget_show(closewindow);
+ }
+@@ -93,13 +91,20 @@
+     FILE *file;
+     char *filename = get_file(datestr);
+ 
++    GtkTextIter iter;
++    GtkTextBuffer *buf;
++
++    buf = GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit)));
++    gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &iter);
++    gtk_text_buffer_place_cursor(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &iter);
++
+     if ((file = fopen(filename, "r")) != NULL) {
+         while (! feof(file)) {
+             char line[MAXSTRLEN + 1];
+             bzero(line, MAXSTRLEN + 1);
+             fgets(line, MAXSTRLEN, file);
+             if (line[0] != 0)
+-                gtk_text_insert(GTK_TEXT(edit), NULL, NULL, NULL, line, -1);
++	      gtk_text_buffer_insert(buf, &iter, line, -1);
+         }
+         fclose(file);
+     }
+@@ -154,21 +159,14 @@
+ 
+ 
+ static void editor_flush() {
+-    int cont = TRUE;
+-
+-    while (cont) {
+-       cont = gtk_text_backward_delete(GTK_TEXT(edit), 1);
+-    }
+-    cont = TRUE;
+-    while (cont) {
+-       cont = gtk_text_forward_delete(GTK_TEXT(edit), 1);
+-    }
++  gtk_text_buffer_set_text(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), "", 0);
+ }
+ 
+ 
+ static void editor_fill(int which) {
+     char *dstr;
+     GtkWidget *label = NULL;
++    GtkTextIter iter;
+ 
+     switch (which) {
+         case UNIQUE: label = label_u; break;
+@@ -179,11 +177,10 @@
+     gtk_label_get(GTK_LABEL(label), &dstr);
+     strcpy(daystr, dstr);
+     to_button(which);
+-    gtk_text_freeze(GTK_TEXT(edit));
+     editor_flush();
+     load_file(daystr);
+-    gtk_text_set_point(GTK_TEXT(edit), gtk_text_get_length(GTK_TEXT(edit)));
+-    gtk_text_thaw(GTK_TEXT(edit));
++    gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &iter);
++    gtk_text_buffer_place_cursor(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &iter);
+ }
+ 
+ 
+@@ -225,8 +222,15 @@
+     char *dirname  = xmalloc(len + 2);
+     struct stat stat_buf;
+ 
++    GtkTextIter ts, te;
++    gchar *tbuf;
++    int tlen;
++
++    tlen = gtk_text_buffer_get_char_count(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))));
++    gtk_text_buffer_get_bounds(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &ts, &te);
++
+     sprintf(dirname, "%s/%s", robust_home(), DEFAULT_CONFIGDIR);
+-    if (gtk_text_get_length(GTK_TEXT(edit)) > 0) {
++    if (tlen > 0) {
+         if (! ((stat(dirname, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)))
+             mkdir(dirname, 0755);
+ 
+@@ -235,13 +239,11 @@
+             unsigned int year, month, day;
+ 
+             if (file) {
+-                int i;
+-                for (i = 0 ; i < gtk_text_get_length(GTK_TEXT(edit)) ; i++) {
+-                    char t = GTK_TEXT_INDEX(GTK_TEXT(edit), i);
+-                    fprintf(file, "%c", t);
+-                }
+-                fflush(file);
+-                fclose(file);
++	      tbuf = gtk_text_buffer_get_text(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &ts, &te, TRUE);
++	      fprintf(file, "%s", tbuf);
++	      g_free(tbuf);
++	      fflush(file);
++	      fclose(file);
+             }
+             gtk_calendar_get_date(GTK_CALENDAR(calendar), &year, &month, &day);
+             gtk_calendar_mark_day(GTK_CALENDAR(calendar), day);
+@@ -259,9 +261,7 @@
+     gtk_calendar_get_date(GTK_CALENDAR(calendar), &year, &month, &day);
+     gtk_calendar_unmark_day(GTK_CALENDAR(calendar), day);
+     FREE(filename);
+-    gtk_text_freeze(GTK_TEXT(edit));
+     editor_flush();
+-    gtk_text_thaw(GTK_TEXT(edit));
+ }
+ 
+ 
+@@ -357,10 +357,10 @@
+             GTK_SIGNAL_FUNC(mark_days), NULL);
+     gtk_widget_show(calendar);
+ 
+-    edit = gtk_text_new(NULL, NULL);
+-    gtk_text_set_editable(GTK_TEXT(edit), TRUE);
+-    gtk_text_set_word_wrap(GTK_TEXT(edit), TRUE);
+-    gtk_text_set_line_wrap(GTK_TEXT(edit), TRUE);
++    edit = gtk_text_view_new();
++    gtk_text_view_set_editable(GTK_TEXT_VIEW(edit), TRUE);
++    gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(edit), GTK_WRAP_WORD_CHAR);
++
+     gtk_box_pack_start(GTK_BOX(main_vbox), edit, TRUE, TRUE, 1);
+ 
+ 
+@@ -413,7 +413,6 @@
+     gtk_box_pack_start(GTK_BOX(buttons_hbox), closewindow, TRUE, TRUE, 0);
+     GTK_WIDGET_SET_FLAGS(GTK_WIDGET(closewindow), GTK_CAN_DEFAULT);
+     gtk_widget_grab_default(GTK_WIDGET(closewindow));
+-    gtk_widget_draw_default(GTK_WIDGET(closewindow));
+     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
+@@ -96,17 +96,17 @@
+ 
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+-LDFLAGS = @LDFLAGS@ `gtk-config --libs`
++LIBS = @LIBS@ `pkg-config gtk+-2.0 --libs`
+ X_CFLAGS = @X_CFLAGS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ wmclockmon_OBJECTS = actions.o dialogs.o edit.o main.o mainwindow.o tools.o
+ wmclockmon_DEPENDENCIES = 
+ wmclockmon_LDFLAGS = 
+-CFLAGS = @CFLAGS@ `gtk-config --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 $@
++LINK = $(CCLD) $(LDFLAGS) $(AM_CFLAGS) $(CFLAGS) $(LIBS) -o $@
+ 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
+@@ -38,7 +38,6 @@
+                        bouton, TRUE, TRUE, 0);
+     GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
+     gtk_widget_grab_default(GTK_WIDGET(bouton));
+-    gtk_widget_draw_default(GTK_WIDGET(bouton));
+     gtk_widget_show(bouton);
+ 
+     bouton = gtk_button_new_with_label("No");
+@@ -96,7 +95,6 @@
+                        bouton, TRUE, TRUE, 0);
+     GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
+     gtk_widget_grab_default(GTK_WIDGET(bouton));
+-    gtk_widget_draw_default(GTK_WIDGET(bouton));
+     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
+@@ -76,7 +76,6 @@
+                        bouton, TRUE, TRUE, 0);
+     GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
+     gtk_widget_grab_default(GTK_WIDGET(bouton));
+-    gtk_widget_draw_default(GTK_WIDGET(bouton));
+     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
+@@ -10,9 +10,9 @@
+ #include "actions.h"
+ 
+ 
+-static GtkWidget *edit;
+-static GtkWidget *set;
+-static GtkWidget *remove;
++static GtkWidget *b_edit;
++static GtkWidget *b_set;
++static GtkWidget *b_remove;
+ 
+ static gint list_sel_cb (GtkCList *clist,
+                          gint row,
+@@ -20,9 +20,9 @@
+                          GdkEventButton *event,
+                          void *data) {
+     selected_row = row;
+-    gtk_widget_set_sensitive(edit,   TRUE);
+-    gtk_widget_set_sensitive(set,    TRUE);
+-    gtk_widget_set_sensitive(remove, TRUE);
++    gtk_widget_set_sensitive(b_edit,   TRUE);
++    gtk_widget_set_sensitive(b_set,    TRUE);
++    gtk_widget_set_sensitive(b_remove, TRUE);
+     return TRUE;
+ }
+ 
+@@ -33,9 +33,9 @@
+                            GdkEventButton *event,
+                            void *data) {
+     selected_row = -1;
+-    gtk_widget_set_sensitive(edit,   FALSE);
+-    gtk_widget_set_sensitive(set,    FALSE);
+-    gtk_widget_set_sensitive(remove, FALSE);
++    gtk_widget_set_sensitive(b_edit,   FALSE);
++    gtk_widget_set_sensitive(b_set,    FALSE);
++    gtk_widget_set_sensitive(b_remove, FALSE);
+     return TRUE;
+ }
+ 
+@@ -267,7 +267,7 @@
+     gtk_table_attach_defaults(GTK_TABLE(table), bouton, 0, 1, 1, 2);
+     gtk_widget_set_sensitive(bouton, FALSE);
+     gtk_widget_show(bouton);
+-    edit = bouton;
++    b_edit = bouton;
+ 
+     bouton = gtk_button_new_with_label(" Switch On/Off ");
+     gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
+@@ -275,7 +275,7 @@
+     gtk_table_attach_defaults(GTK_TABLE(table), bouton, 1, 2, 1, 2);
+     gtk_widget_set_sensitive(bouton, FALSE);
+     gtk_widget_show(bouton);
+-    set = bouton;
++    b_set = bouton;
+ 
+     bouton = gtk_button_new_with_label(" Remove alarm ");
+     gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
+@@ -283,7 +283,7 @@
+     gtk_table_attach_defaults(GTK_TABLE(table), bouton, 1, 2, 0, 1);
+     gtk_widget_set_sensitive(bouton, FALSE);
+     gtk_widget_show(bouton);
+-    remove = bouton;
++    b_remove = bouton;
+ 
+ 
+     label = gtk_label_new(" Alarms ");
+@@ -312,7 +312,6 @@
+     gtk_box_pack_start(GTK_BOX(buttons_hbox), bouton, TRUE, TRUE, 0);
+     GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
+     gtk_widget_grab_default(GTK_WIDGET(bouton));
+-    gtk_widget_draw_default(GTK_WIDGET(bouton));
+     gtk_widget_show(bouton);
+ 
+     bouton = gtk_button_new_with_label(" Cancel ");
diff --git a/x11-plugins/wmclockmon/metadata.xml b/x11-plugins/wmclockmon/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmclockmon/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild b/x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..830ad8041b50
--- /dev/null
+++ b/x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 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"
+HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
+SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}-1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libICE"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libXt"
+
+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_install() {
+	default
+	newdoc debian/changelog ChangeLog.debian
+}
diff --git a/x11-plugins/wmcms/Manifest b/x11-plugins/wmcms/Manifest
new file mode 100644
index 000000000000..44965393fa59
--- /dev/null
+++ b/x11-plugins/wmcms/Manifest
@@ -0,0 +1 @@
+DIST wmcms-0.3.5.tar.gz 19855 BLAKE2B ac97dc403e6adeebc85b386ae7c78a8537c33858950f41059aadb750909b22fabef5bed3114e9552b381d3fb9d603e90236c88a614ee168a46214f64b9ca50f5 SHA512 ef57e6b278c14163de0792e6af8be40ef721020594fb2871aad34543471869ecf468210c173861a93b4f22e1dfca8f1e4254aec6508adfdf143f3a0f1a49f549
diff --git a/x11-plugins/wmcms/files/wmcms-0.3.5-s4t4n.patch b/x11-plugins/wmcms/files/wmcms-0.3.5-s4t4n.patch
new file mode 100644
index 000000000000..522add1e7690
--- /dev/null
+++ b/x11-plugins/wmcms/files/wmcms-0.3.5-s4t4n.patch
@@ -0,0 +1,274 @@
+diff -Naur wmcms-0.3.5/state_linux.h wmcms-0.3.5/state_linux.h
+--- wmcms-0.3.5/state_linux.h	2001-09-24 00:56:28.000000000 +0200
++++ wmcms-0.3.5/state_linux.h	1970-01-01 01:00:00.000000000 +0100
+@@ -1,47 +0,0 @@
+-/* wmcms - WindowMaker CPU / Mem Usage Monitor DockApp
+- * state_linux.h
+- * Linux specific functions to get system usage, may someone write it to another plataform
+- * Copyright (C) 2001 Fabio Pugliese Ornellas <fabio.ornellas@poli.usp.br>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- */
+-
+-int cpu_user;
+-int cpu_nice;
+-int cpu_kernel;
+-int cpu_idle;
+-
+-int mem_total;
+-int mem_used;
+-int mem_buffers;
+-int mem_cached;
+-
+-int swap_total;
+-int swap_used;
+-
+-void get_cpuinfo ( void )
+-{
+-  FILE *fp;
+-  fp = fopen ( "/proc/stat", "r" );
+-  fscanf ( fp, "%*s %d %d %d %d", &cpu_user, &cpu_nice, &cpu_kernel, &cpu_idle );
+-  fclose ( fp );
+-}
+-
+-void get_meminfo ( void )
+-{
+-  FILE *fp;
+-  fp = fopen ( "/proc/meminfo", "r" );
+-  fscanf ( fp, "%*s %*s %*s %*s %*s %*s %*s %d %d %*d %*d %d %d %*s %d %d", &mem_total, &mem_used, &mem_buffers, &mem_cached, &swap_total, &swap_used );
+-  fclose ( fp );
+-}
+diff -Naur wmcms-0.3.5/state_linux_2.4.h wmcms-0.3.5/state_linux_2.4.h
+--- wmcms-0.3.5/state_linux_2.4.h	1970-01-01 01:00:00.000000000 +0100
++++ wmcms-0.3.5/state_linux_2.4.h	2004-07-20 22:09:11.157182296 +0200
+@@ -0,0 +1,47 @@
++/* wmcms - WindowMaker CPU / Mem Usage Monitor DockApp
++ * state_linux.h
++ * Linux specific functions to get system usage, may someone write it to another plataform
++ * Copyright (C) 2001 Fabio Pugliese Ornellas <fabio.ornellas@poli.usp.br>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ */
++
++int cpu_user;
++int cpu_nice;
++int cpu_kernel;
++int cpu_idle;
++
++int mem_total;
++int mem_used;
++int mem_buffers;
++int mem_cached;
++
++int swap_total;
++int swap_used;
++
++void get_cpuinfo_24 ( void )
++{
++  FILE *fp;
++  fp = fopen ( "/proc/stat", "r" );
++  fscanf ( fp, "%*s %d %d %d %d", &cpu_user, &cpu_nice, &cpu_kernel, &cpu_idle );
++  fclose ( fp );
++}
++
++void get_meminfo_24 ( void )
++{
++  FILE *fp;
++  fp = fopen ( "/proc/meminfo", "r" );
++  fscanf ( fp, "%*s %*s %*s %*s %*s %*s %*s %d %d %*d %*d %d %d %*s %d %d", &mem_total, &mem_used, &mem_buffers, &mem_cached, &swap_total, &swap_used );
++  fclose ( fp );
++}
+diff -Naur wmcms-0.3.5/state_linux_2.6.h wmcms-0.3.5/state_linux_2.6.h
+--- wmcms-0.3.5/state_linux_2.6.h	1970-01-01 01:00:00.000000000 +0100
++++ wmcms-0.3.5/state_linux_2.6.h	2004-07-20 22:08:54.256751552 +0200
+@@ -0,0 +1,55 @@
++/* wmcms - WindowMaker CPU / Mem Usage Monitor DockApp
++ * state_linux.h
++ * Linux specific functions to get system usage, may someone write it to another plataform
++ * Copyright (C) 2001 Fabio Pugliese Ornellas <fabio.ornellas@poli.usp.br>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ */
++
++int cpu_user;
++int cpu_nice;
++int cpu_kernel;
++int cpu_idle;
++
++int mem_total;
++int mem_free;
++int mem_used;
++int mem_buffers;
++int mem_cached;
++
++int swap_total;
++int swap_free;
++int swap_used;
++
++void get_cpuinfo_26 ( void )
++{
++  FILE *fp;
++  fp = fopen ( "/proc/stat", "r" );
++  fscanf ( fp, "%*s %d %d %d %d", &cpu_user, &cpu_nice, &cpu_kernel, &cpu_idle );
++  fclose ( fp );
++}
++
++void get_meminfo_26 ( void )
++{
++  FILE *fp;
++  fp = fopen ( "/proc/meminfo", "r" );
++/*  The format of /proc/meminfo has changed with the 2.6 kernel; this new line will work for 2.6 -- idh
++    fscanf ( fp, "%*s %*s %*s %*s %*s %*s %*s %d %d %*d %*d %d %d %*s %d %d", &mem_total, &mem_used, &mem_buffers, &mem_cached, &swap_total, &swap_used ); */
++  fscanf ( fp, "%*s %d %*s %*s %d %*s %*s %d %*s %*s %d %*s %*s %*d %*s %*s %*d %*s %*s %*d %*s %*s %*d %*s %*s %*d %*s %*s %*d %*s %*s %*d %*s %*s %d %*s %*s %d %*s",
++      &mem_total, &mem_free, &mem_buffers, &mem_cached, &swap_total, &swap_free );
++  fclose ( fp );
++
++  mem_used  = mem_total  - mem_free;
++  swap_used = swap_total - swap_free;
++}
+diff -Naur wmcms-0.3.5/wmcms.c wmcms-0.3.5/wmcms.c
+--- wmcms-0.3.5/wmcms.c	2001-09-24 00:57:06.000000000 +0200
++++ wmcms-0.3.5/wmcms.c	2004-07-20 22:34:26.917751664 +0200
+@@ -19,7 +19,8 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <dockapp.h>
+-#include "state_linux.h"
++#include "state_linux_2.6.h"
++#include "state_linux_2.4.h"
+ #include "wmcms.xpm"
+ 
+ char *displayName = "";
+@@ -34,6 +35,13 @@
+ int no_nice;
+ char *exe = "";
+ 
++typedef enum
++{
++	IS_2_6 = 0,
++	IS_OTHER
++} kernel_versions;
++kernel_versions kernel_version;
++
+ /* command line */
+ static DAProgramOption options[] = {
+      {"-d", "--display", "display to use", DOString, False, {&displayName} },
+@@ -44,6 +52,8 @@
+      {"-p", "--program", "program to run on CPU click", DOString, False, {&exe} }
+      };
+ 
++kernel_versions Get_Kernel_version(void);
++
+ /* draw bars */
+ void bar ( int size, int x, int y, int barx, int bary )
+ {
+@@ -156,6 +166,9 @@
+   /* define callbacks */
+   DACallbacks callbacks = { NULL, change, NULL, NULL, NULL, NULL };
+ 
++	/* determine kernel version */
++	kernel_version = Get_Kernel_version();
++
+   advanced = 0;
+   up = 0;
+   no_nice = 0;
+@@ -204,14 +217,23 @@
+   XCopyArea ( DADisplay, backdrop, pixmap, gc, 3, 140, 58, 58, 0, 0);
+   DASetPixmap(pixmap);
+ 
+-  /* initial cpu total while splash */
+-  get_cpuinfo();
++  /* initial cpu total while splash */	
++	if (kernel_version == IS_2_6)
++		get_cpuinfo_26();
++	else
++		get_cpuinfo_24();
++
+   old_cpu_user = cpu_user;
+   old_cpu_nice = cpu_nice;
+   old_cpu_kernel = cpu_kernel;
+   old_cpu_idle = cpu_idle;
+   usleep ( delay );
+-  get_cpuinfo();
++
++	if (kernel_version == IS_2_6)
++		get_cpuinfo_26();
++	else
++		get_cpuinfo_24();
++
+   cpu_total = cpu_user - old_cpu_user + cpu_nice - old_cpu_nice + cpu_kernel - old_cpu_kernel + cpu_idle - old_cpu_idle;
+ 
+   /* draw background */
+@@ -230,8 +252,16 @@
+     XCopyArea ( DADisplay, backdrop, pixmap, gc, 4, 14, 56, 8, 1, 49 );
+ 
+     /* read values */
+-    get_cpuinfo ();
+-    get_meminfo ();
++		if (kernel_version == IS_2_6)
++		{
++			get_cpuinfo_26 ();
++			get_meminfo_26 ();
++		}
++		else
++		{
++			get_cpuinfo_24 ();
++			get_meminfo_24 ();
++		}
+ 
+     /* cpu total */
+     cpu_total = cpu_user - old_cpu_user + cpu_nice - old_cpu_nice + cpu_kernel - old_cpu_kernel + cpu_idle - old_cpu_idle;
+@@ -328,3 +358,20 @@
+   fprintf(stderr, "Congratulations, something truely awful has happened.\n");
+   return -1;
+ }
++
++kernel_versions Get_Kernel_version(void)
++{
++	FILE *fp = fopen("/proc/version", "r");
++	char buf[512];
++
++	if (!fp) return IS_OTHER;
++	if (!fgets(buf, 512, fp))
++	{
++		fclose(fp);
++		return IS_OTHER;
++	}
++	fclose(fp);
++
++	if (strstr(buf, "2.6.")) return IS_2_6;
++	return IS_OTHER;
++}
diff --git a/x11-plugins/wmcms/metadata.xml b/x11-plugins/wmcms/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmcms/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild b/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild
new file mode 100644
index 000000000000..70c2fcf3f058
--- /dev/null
+++ b/x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WindowMaker CPU and Memory Usage Monitor Dock App"
+HOMEPAGE="https://www.geocities.ws/neofpo/wmcms.html"
+SRC_URI="https://www.geocities.ws/neofpo/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=x11-libs/libdockapp-0.7:="
+
+PATCHES=(
+	"${FILESDIR}"/${P}-s4t4n.patch
+)
+
+src_prepare() {
+	default
+
+	# Respect LDFLAGS, see bug #335031
+	sed -e 's/ -o wmcms/ ${LDFLAGS} -o wmcms/' -i Makefile || die
+
+	sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin wmcms
+}
diff --git a/x11-plugins/wmcoincoin/Manifest b/x11-plugins/wmcoincoin/Manifest
new file mode 100644
index 000000000000..83dc8187dd21
--- /dev/null
+++ b/x11-plugins/wmcoincoin/Manifest
@@ -0,0 +1,2 @@
+DIST wmcoincoin-2.6.2_p20140602.tar.gz 972358 BLAKE2B a30acaa7b20e88c1d2f4b5329f02321d6a7431bf22379e9d8074b48c1953bcd411b011097546b905f406e21f5de3e9057923109f0e63136cc19d5b5bdfbc47ef SHA512 ddf1b24d9c9021e9cb02817e80f3327074ef7d09ba7d8033d5d0c8b39a25106a1d54d32f211d31a910e2175d98bbda940f309cc137edd1b02b5a656891e89b2c
+DIST wmcoincoin-2.6.3.tar.gz 973973 BLAKE2B 4dcbb79ddb23c47fb891fde56137bb385ccf841eb54ce7a34cf060d4924d859a5a2ac40d504a26e763f1fe075796e09ec6a00a0080d214add2469db6b2f3a4d4 SHA512 daffd94387a03e780250877ae43e5431a7c0710862dd9fab04efc254e02e648215fa9c301bf1ed6d1a9ca5182a2a88d10ea4c385d92752d047492e6e9ad01d2d
diff --git a/x11-plugins/wmcoincoin/metadata.xml b/x11-plugins/wmcoincoin/metadata.xml
new file mode 100644
index 000000000000..7605fe5c45fb
--- /dev/null
+++ b/x11-plugins/wmcoincoin/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+wmCoinCoin is a WindowMaker dockapp that lets you see the latest news from 
+linuxfr.org. It also graphically represents some statistics about the oneliner 
+and the clients used to post on it. It also has the ability to post a 
+customized message to this oneliner. 
+</longdescription>
+	<upstream>
+		<remote-id type="github">d-torrance/wmcoincoin</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
new file mode 100644
index 000000000000..a8546bdbafa0
--- /dev/null
+++ b/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="a dockapp for browsing dacode news and board sites"
+HOMEPAGE="http://hules.free.fr/wmcoincoin"
+# Grab matching tag and Debian patches
+SRC_URI="https://github.com/d-torrance/${PN}/archive/debian/${PV/_p/+}-1.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nls xinerama"
+
+RDEPEND="x11-libs/gtk+:2
+	media-libs/imlib2
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libX11
+	x11-libs/libXft
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libXt
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${PN}-debian-${PV/_p/-}-1
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	EPATCH_SOURCE="${S}/debian/patches" EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama)
+}
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
new file mode 100644
index 000000000000..6b23f379b40f
--- /dev/null
+++ b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="a dockapp for browsing dacode news and board sites"
+HOMEPAGE="http://hules.free.fr/wmcoincoin"
+SRC_URI="http://hules.free.fr/${PN}/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls xinerama"
+
+RDEPEND="x11-libs/gtk+:2
+	media-libs/imlib2[X]
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libX11
+	x11-libs/libXft
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libXt
+	nls? ( sys-devel/gettext )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama)
+}
diff --git a/x11-plugins/wmcp/Manifest b/x11-plugins/wmcp/Manifest
new file mode 100644
index 000000000000..6318c263ec66
--- /dev/null
+++ b/x11-plugins/wmcp/Manifest
@@ -0,0 +1 @@
+DIST wmcp-1.2.8.tar.gz 8673 BLAKE2B 28cad145f6c41829a740cbcef043fe54d940019ea42cbc6aebbc6b8022cf15c642f1c1dbbc0e34721442d4c3974224b498e436b5eae4ea30c766b2512f58939d SHA512 ac8db45800573810389d8103b5086966bd6bd5b03620338e736e05633fca570639d94e1ceaf24f882619f7de048c70e5ba9996849e0062407e32a74d971a3b01
diff --git a/x11-plugins/wmcp/files/wmcp-1.2.8-gcc33.patch b/x11-plugins/wmcp/files/wmcp-1.2.8-gcc33.patch
new file mode 100644
index 000000000000..018d28217971
--- /dev/null
+++ b/x11-plugins/wmcp/files/wmcp-1.2.8-gcc33.patch
@@ -0,0 +1,74 @@
+diff -urN wmcp-1.2.8/wmcp.c wmcp-1.2.8-new/wmcp.c
+--- wmcp-1.2.8/wmcp.c	1999-05-26 23:38:49.000000000 -0700
++++ wmcp-1.2.8-new/wmcp.c	2003-09-24 15:22:25.000000000 -0700
+@@ -806,38 +806,38 @@
+ void show_usage()
+ {
+ 
+-fprintf(stderr,"
+-
+-%s
+-This software is GPL -- do as you wish with it.
+-
+-Origional Author:
+-   Ben Cohen <buddog@aztec.asu.edu>
+-
+-Contributors:
+-   Thomas Nemeth <tnemeth@multimania.com>
+-   Craig Maloney <craig@ic.net>
+-   Gert Beumer <Gert@scintilla.utwente.nl>
+-
+-
+-
+-usage: wmcp [-g geometry] [-d dpy] [-n workspaces] [-a alt key] [-v]
+-            [-c] [-w i/n/w] [-s y/n] [-x #] [-y #] [-h]
+-
+-
+--g    geometry:    ie: 64x64+10+10
+--d    dpy:         Display. ie: 127.0.0.1:0.0
+--n    workspaces:  How many buttons to start with.
+--a    alt key:     integer 1-4 defining ModXMask (default 1 Mod1Mask).
+--w    i/n/w:       Window State: Iconic, Normal, Withdrawn (default Withdrawn)
+--s    y/n:         Shaped window: yes or no (default y)
+--c                 Sends CTRL + ALT + Key (default only sends ALT + key)
+--v                 Verbose. 0=off, 1=on (default 0)
+--x                 Number of buttons on the x-direction (1,2,3, or 4)
+--y                 Number of buttons in the y-direction (1,2,3, or 4)
+--h                 Help. This screen.
+-
+-
++fprintf(stderr," \
++\
++%s\
++This software is GPL -- do as you wish with it.\
++\
++Origional Author:\
++   Ben Cohen <buddog@aztec.asu.edu>\
++\
++Contributors:\
++   Thomas Nemeth <tnemeth@multimania.com>\
++   Craig Maloney <craig@ic.net>\
++   Gert Beumer <Gert@scintilla.utwente.nl>\
++\
++\
++\
++usage: wmcp [-g geometry] [-d dpy] [-n workspaces] [-a alt key] [-v]\
++            [-c] [-w i/n/w] [-s y/n] [-x #] [-y #] [-h]\
++\
++\
++-g    geometry:    ie: 64x64+10+10\
++-d    dpy:         Display. ie: 127.0.0.1:0.0\
++-n    workspaces:  How many buttons to start with.\
++-a    alt key:     integer 1-4 defining ModXMask (default 1 Mod1Mask).\
++-w    i/n/w:       Window State: Iconic, Normal, Withdrawn (default Withdrawn)\
++-s    y/n:         Shaped window: yes or no (default y)\
++-c                 Sends CTRL + ALT + Key (default only sends ALT + key)\
++-v                 Verbose. 0=off, 1=on (default 0)\
++-x                 Number of buttons on the x-direction (1,2,3, or 4)\
++-y                 Number of buttons in the y-direction (1,2,3, or 4)\
++-h                 Help. This screen.\
++\
++\
+ ",VERSION);
+ 
+ exit(-1);
diff --git a/x11-plugins/wmcp/files/wmcp-1.2.8-stdlibh.patch b/x11-plugins/wmcp/files/wmcp-1.2.8-stdlibh.patch
new file mode 100644
index 000000000000..70d1c7c4e225
--- /dev/null
+++ b/x11-plugins/wmcp/files/wmcp-1.2.8-stdlibh.patch
@@ -0,0 +1,11 @@
+diff -ur wmcp-1.2.8.orig/wmcp.c wmcp-1.2.8/wmcp.c
+--- wmcp-1.2.8.orig/wmcp.c	1999-05-27 09:38:49.000000000 +0300
++++ wmcp-1.2.8/wmcp.c	2008-01-06 16:16:17.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include <xpm.h>
+ #include <extensions/shape.h>
+ #include <keysym.h>
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <math.h>
+ 
diff --git a/x11-plugins/wmcp/metadata.xml b/x11-plugins/wmcp/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmcp/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmcp/wmcp-1.2.8-r1.ebuild b/x11-plugins/wmcp/wmcp-1.2.8-r1.ebuild
new file mode 100644
index 000000000000..9a25d8b8e58f
--- /dev/null
+++ b/x11-plugins/wmcp/wmcp-1.2.8-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A pager dockapp"
+HOMEPAGE="https://www.dockapps.net/wmcp"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${P}-gcc33.patch
+	eapply "${FILESDIR}"/${P}-stdlibh.patch
+	sed -i \
+		-e "s:gcc:$(tc-getCC):g" \
+		-e "s:i686-pc-linux-gnu-gcc -g:i686-pc-linux-gnu-gcc:g" \
+		-e "s:i686-pc-linux-gnu-gcc -o:i686-pc-linux-gnu-gcc ${LDFLAGS} -o:" \
+		Makefile || die
+}
+
+src_compile() {
+	emake -j1 INCLUDES="-I/usr/include/X11" \
+		LIBINC="-L/usr/$(get_libdir)" \
+		FLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin wmcp
+	dodoc README
+}
diff --git a/x11-plugins/wmcpuload/Manifest b/x11-plugins/wmcpuload/Manifest
new file mode 100644
index 000000000000..373b0af2aaba
--- /dev/null
+++ b/x11-plugins/wmcpuload/Manifest
@@ -0,0 +1 @@
+DIST wmcpuload-1.1.1.tar.gz 167751 BLAKE2B e3e80edbf969a849798ee665e6d8f28a3869f4a6125e99f2e3793d9397574549c8462c53d835d2c18b6817e797bb89d1614a66d7fb84e3241b36ee947b38f0eb SHA512 7271a9216d52a8bc904be9ea401f52b35f0086da4bfc16c76a8348b58818199ecfcf8fb7768fe4d5a1e5cbb986e8d89a92f81f2f1aeea59f84d564607be73b6e
diff --git a/x11-plugins/wmcpuload/metadata.xml b/x11-plugins/wmcpuload/metadata.xml
new file mode 100644
index 000000000000..51090eb872a2
--- /dev/null
+++ b/x11-plugins/wmcpuload/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+WMCPULoad is a program to monitor CPU usage. It is a dockapp that is supported 
+by X window managers such as Window Maker, AfterStep, BlackBox, and 
+Enlightenment. It dispalys the current usage, expressed as a percentile and a 
+chart, and has an LCD look-alike user interface. The back light may be turned 
+on/off by clicking the mouse button over the application. If the CPU usage hits 
+a certain threshold, an alarm-mode will alert you by turning the back light on. 
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmcpuload/wmcpuload-1.1.1.ebuild b/x11-plugins/wmcpuload/wmcpuload-1.1.1.ebuild
new file mode 100644
index 000000000000..eb78e9b41ec3
--- /dev/null
+++ b/x11-plugins/wmcpuload/wmcpuload-1.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="a dockapp for monitoring CPU usage with a LCD display"
+HOMEPAGE="https://www.dockapps.net/wmcpuload"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~mips ppc ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-libs/libICE"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
diff --git a/x11-plugins/wmcpuwatch/Manifest b/x11-plugins/wmcpuwatch/Manifest
new file mode 100644
index 000000000000..8030cb75dd4f
--- /dev/null
+++ b/x11-plugins/wmcpuwatch/Manifest
@@ -0,0 +1 @@
+DIST wmcpuwatch-0.2.tar.bz2 55621 BLAKE2B 5be49c22b7f063fe2cf4fb91358665903018500d51f56731b0f3584fec011031ec03fdb650722634aaf3b8b9a29e9f7d048b73fcc88b20e469607472cf827e69 SHA512 25aa3fb2d416035a7f3afbec58b2166338009e57310166e91719f6b5cfc4a1e05600ef0ec381c1ff56964848dac1e8ed272cbc4e352dbcc2751addd2cddd2e6e
diff --git a/x11-plugins/wmcpuwatch/files/wmcpuwatch-0.2-cmake.patch b/x11-plugins/wmcpuwatch/files/wmcpuwatch-0.2-cmake.patch
new file mode 100644
index 000000000000..bd3ddac62403
--- /dev/null
+++ b/x11-plugins/wmcpuwatch/files/wmcpuwatch-0.2-cmake.patch
@@ -0,0 +1,33 @@
+diff -Naur wmcpuwatch-0.2.orig/CMakeLists.txt wmcpuwatch-0.2/CMakeLists.txt
+--- wmcpuwatch-0.2.orig/CMakeLists.txt	2017-09-03 13:58:43.000000000 +0200
++++ wmcpuwatch-0.2/CMakeLists.txt	2018-01-01 22:28:19.108393247 +0100
+@@ -26,6 +26,7 @@
+ #
+ # Define include directories
+ include_directories(
++	"${PROJECT_BINARY_DIR}"
+     ${DOCKAPP_INCLUDE_DIR}
+     ${X11_X11_INCLUDE_PATH})
+ 
+@@ -56,8 +57,6 @@
+ install(TARGETS wmcpuwatch RUNTIME DESTINATION bin)
+ install(FILES wmcpuwatch.1 DESTINATION share/man/man1)
+ install(FILES wmcpuwatch.desktop DESTINATION share/applications)
+-install(FILES README.md DESTINATION share/doc/${CMAKE_PROJECT_NAME})
+-install(FILES ChangeLog DESTINATION share/doc/${CMAKE_PROJECT_NAME} RENAME changelog)
+ 
+ #
+ # Create a source tarball using CPack
+diff -Naur wmcpuwatch-0.2.orig/doc/CMakeLists.txt wmcpuwatch-0.2/doc/CMakeLists.txt
+--- wmcpuwatch-0.2.orig/doc/CMakeLists.txt	2017-09-03 12:00:37.000000000 +0200
++++ wmcpuwatch-0.2/doc/CMakeLists.txt	2018-01-01 22:33:00.690614708 +0100
+@@ -20,9 +20,6 @@
+         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+         COMMENT "Generating code documentation"
+         VERBATIM)
+-
+-    # Install the documentation
+-    install(DIRECTORY html DESTINATION share/doc/${CMAKE_PROJECT_NAME})
+ else (DOXYGEN_FOUND)
+     message("doxygen not installed: Not creating code documentation")
+ endif (DOXYGEN_FOUND)
diff --git a/x11-plugins/wmcpuwatch/metadata.xml b/x11-plugins/wmcpuwatch/metadata.xml
new file mode 100644
index 000000000000..dc9e3947db7f
--- /dev/null
+++ b/x11-plugins/wmcpuwatch/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+<longdescription>
+wmcpuwatch aims to show the load of every logical CPU on the system.
+
+It is a fork of wmmon. wmmon shows the load of up to 10 CPUs. With a little tweaking it is possible to show 12 with wmmon, but when in 2017 Intel announced a 18 core CPU (and AMD was with their Ryzen even earlier), there was time for a new dockapp.
+
+wmcpuwatch now shows the load of all CPUs in the lower frame which allows 40 CPUs at max.
+</longdescription>
+<upstream>
+	<remote-id type="bitbucket">StarFire/wmcpuwatch</remote-id>
+</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmcpuwatch/wmcpuwatch-0.2-r1.ebuild b/x11-plugins/wmcpuwatch/wmcpuwatch-0.2-r1.ebuild
new file mode 100644
index 000000000000..e758ba522eee
--- /dev/null
+++ b/x11-plugins/wmcpuwatch/wmcpuwatch-0.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="dockapp showing the load of every logical CPU on the system"
+HOMEPAGE="https://bitbucket.org/StarFire/wmcpuwatch"
+SRC_URI="https://bitbucket.org/StarFire/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=x11-libs/libdockapp-0.7:="
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[dot] )"
+
+DOCS=( ChangeLog README.md )
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use doc || sed -e "s/add_subdirectory(doc)//" -i CMakeLists.txt || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dodoc -r "${BUILD_DIR}"/doc/html
+}
diff --git a/x11-plugins/wmcube/Manifest b/x11-plugins/wmcube/Manifest
new file mode 100644
index 000000000000..7d764d1c2dc2
--- /dev/null
+++ b/x11-plugins/wmcube/Manifest
@@ -0,0 +1 @@
+DIST wmcube-1.0.2.tar.gz 56908 BLAKE2B 4ce373b3822e9d515d611e577214a2c51a8e4fb62cc47cf9f64ad49441bd3c53ba09d301c898a37f6ffafecf984ae04cefce9890c593797719b29fb54425f6c7 SHA512 171700848a9d674ced3ee33468b967b2be706e72863f8356f0d8d72785c06a1c34b5be3597e5604bf74e97ee911ca05b68a28bfe67c1171a61c7084450d622de
diff --git a/x11-plugins/wmcube/files/wmcube-1.0.2-gcc-10.patch b/x11-plugins/wmcube/files/wmcube-1.0.2-gcc-10.patch
new file mode 100644
index 000000000000..5beb41552562
--- /dev/null
+++ b/x11-plugins/wmcube/files/wmcube-1.0.2-gcc-10.patch
@@ -0,0 +1,21 @@
+--- a/wmgeneral/wmgeneral.c
++++ b/wmgeneral/wmgeneral.c
+@@ -45,6 +45,7 @@ Window		iconwin, win;
+ GC			NormalGC;
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
++Display		*display;
+ 
+   /*****************/
+  /* Mouse Regions */
+--- a/wmgeneral/wmgeneral.h
++++ b/wmgeneral/wmgeneral.h
+@@ -21,7 +21,7 @@ typedef struct {
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
diff --git a/x11-plugins/wmcube/metadata.xml b/x11-plugins/wmcube/metadata.xml
new file mode 100644
index 000000000000..a93006ef139e
--- /dev/null
+++ b/x11-plugins/wmcube/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+wmCube is a dockapp that displays a realtime rotating 3D object and the current 
+CPU load. You can design your own objects for it.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmcube/wmcube-1.0.2.ebuild b/x11-plugins/wmcube/wmcube-1.0.2.ebuild
new file mode 100644
index 000000000000..1a9633dc99cc
--- /dev/null
+++ b/x11-plugins/wmcube/wmcube-1.0.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="a dockapp cpu monitor with spinning 3d objects"
+HOMEPAGE="http://linux-bsd-unix.strefa.pl/index.en.html"
+# Upstream: http://linux-bsd-unix.strefa.pl/${P}.tar.gz
+# Mirrored for bug #641686 (invalid gzip server config)
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+DOCS=(
+	"${WORKDIR}"/${P}/CHANGES
+	"${WORKDIR}"/${P}/README
+	)
+S="${WORKDIR}/${P}/wmcube"
+
+src_prepare() {
+	default
+
+	pushd "${WORKDIR}"/${P} || die
+	eapply "${FILESDIR}"/${P}-gcc-10.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	einstalldocs
+	doman ${PN}.1
+
+	insinto /usr/share/${PN}
+	doins "${WORKDIR}"/${P}/3D-objects/*.wmc
+}
diff --git a/x11-plugins/wmdiskmon/Manifest b/x11-plugins/wmdiskmon/Manifest
new file mode 100644
index 000000000000..aa10ad9420c5
--- /dev/null
+++ b/x11-plugins/wmdiskmon/Manifest
@@ -0,0 +1 @@
+DIST wmdiskmon-0.0.2.tar.gz 91996 BLAKE2B ecf4b9ed151dc9bef1dd6e68f7b62af77774b6527d37b833527a45caf56cf7f58e70cb2b78e4e2c13cee063532fcc81418ce0b5e0f4c8b7d177cf03a11e21c0f SHA512 c39c298961129fc6951d27096c2993b0cafcba52b5898518fdb6f446b6fd6332db1df36bd1c812f1b1ab7fb0c59759f749176a675a29eb271a72430709ef550b
diff --git a/x11-plugins/wmdiskmon/metadata.xml b/x11-plugins/wmdiskmon/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmdiskmon/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmdiskmon/wmdiskmon-0.0.2-r1.ebuild b/x11-plugins/wmdiskmon/wmdiskmon-0.0.2-r1.ebuild
new file mode 100644
index 000000000000..3c0f435a628e
--- /dev/null
+++ b/x11-plugins/wmdiskmon/wmdiskmon-0.0.2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="a dockapp to display disk space usage"
+HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
+SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt"
diff --git a/x11-plugins/wmdots/Manifest b/x11-plugins/wmdots/Manifest
new file mode 100644
index 000000000000..324d4f393de6
--- /dev/null
+++ b/x11-plugins/wmdots/Manifest
@@ -0,0 +1 @@
+DIST wmdots-0.2beta.tar.gz 94933 BLAKE2B 76a722b60989855b47dcf08539299c7bdf57485595d0f452d8ec10ef57f350810396bda396757c266dda8cb1db9bb3f1823b0f9759b1cb85c7e1ff469f5d2a60 SHA512 2e9d42c4086f240ece0a29cb6131bad2d499bb7f08e8a444cf72ce1a9813f9919f9d47c4dd5ae015e6c2e76601f1e7ab421a67daed1cefed45dcb06e4cbd8488
diff --git a/x11-plugins/wmdots/files/wmdots-0.2_beta-gcc-10.patch b/x11-plugins/wmdots/files/wmdots-0.2_beta-gcc-10.patch
new file mode 100644
index 000000000000..f4e522fe5cff
--- /dev/null
+++ b/x11-plugins/wmdots/files/wmdots-0.2_beta-gcc-10.patch
@@ -0,0 +1,27 @@
+diff -Naur wmdots.orig/wmdots/wmdots.c wmdots/wmdots/wmdots.c
+--- wmdots.orig/wmdots/wmdots.c	1999-10-11 21:39:11.000000000 +0200
++++ wmdots/wmdots/wmdots.c	2020-03-01 16:08:39.492275206 +0100
+@@ -315,6 +315,9 @@
+ //   10,30,&y_off,-5,30,10
+ // };
+ 
++Display		*display;
++Window          Root, iconwin, win;
++
+ // -----------------------------------------------------------------------
+ // draw a point at x/y in specified colour
+ 
+diff -Naur wmdots.orig/wmgeneral/wmgeneral.h wmdots/wmgeneral/wmgeneral.h
+--- wmdots.orig/wmgeneral/wmgeneral.h	1998-10-16 02:16:59.000000000 +0200
++++ wmdots/wmgeneral/wmgeneral.h	2020-03-01 16:08:45.412276631 +0100
+@@ -36,8 +36,8 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
+-Window          Root, iconwin, win;
++extern Display		*display;
++extern Window          Root, iconwin, win;
+ 
+ 
+   /***********************/
diff --git a/x11-plugins/wmdots/files/wmdots-0.2_beta-stringh.patch b/x11-plugins/wmdots/files/wmdots-0.2_beta-stringh.patch
new file mode 100644
index 000000000000..129b938619ee
--- /dev/null
+++ b/x11-plugins/wmdots/files/wmdots-0.2_beta-stringh.patch
@@ -0,0 +1,11 @@
+diff -ur wmdots.orig/wmdots.c wmdots/wmdots.c
+--- wmdots.orig/wmdots.c	1999-10-11 22:39:11.000000000 +0300
++++ wmdots/wmdots.c	2008-01-06 15:18:26.000000000 +0200
+@@ -83,6 +83,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <string.h>
+ 
+ #include <X11/xpm.h>
+ #include "../wmgeneral/wmgeneral.h"
diff --git a/x11-plugins/wmdots/metadata.xml b/x11-plugins/wmdots/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmdots/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild b/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild
new file mode 100644
index 000000000000..7c4b91c7072a
--- /dev/null
+++ b/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="multishape 3d rotating dots"
+HOMEPAGE="https://www.dockapps.net/wmdots"
+SRC_URI="https://www.dockapps.net/download/${P/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	pushd "${WORKDIR}" || die
+	eapply "${FILESDIR}"/${P}-gcc-10.patch
+	popd || die
+
+	default
+	eapply "${FILESDIR}"/${P}-stringh.patch
+	sed -e "s|cc|$(tc-getCC)|g" \
+		-e "s|-g -O2|${CFLAGS}|g" -i Makefile || die
+
+	#Fix compilation target
+	sed -e "s|wmifs|wmdots|" -i Makefile || die
+
+	#Honour Gentoo LDFLAGS, see bug #336982
+	sed -e "s|-o wmdots|\$(LDFLAGS) -o wmdots|" -i Makefile || die
+}
+
+src_compile() {
+	emake clean
+	emake LIBDIR="-L/usr/$(get_libdir)"
+}
+
+src_install() {
+	dobin wmdots
+}
diff --git a/x11-plugins/wmdrawer/Manifest b/x11-plugins/wmdrawer/Manifest
new file mode 100644
index 000000000000..89675dbaa01b
--- /dev/null
+++ b/x11-plugins/wmdrawer/Manifest
@@ -0,0 +1 @@
+DIST wmdrawer-0.10.5.tar.gz 49413 BLAKE2B df77a7e7fedc1a648fccb6efc4315f1f7c4d316a475b3d0044578df0cc0ef5f5d481eec11a23a33682fd8f8bb5faeedb66e82916becb668546cbc5b9e5a61dd7 SHA512 f1e7cb7dc16841a7176e628f42ba5834200707dc162838e62fc7233e383d0aab6ce7fe22017286d26ce6ddc2e3cb6f1d0d21acd176fd36a0cdcd7ab04a2dbae1
diff --git a/x11-plugins/wmdrawer/files/wmdrawer-0.10.5-gtk+-2.patch b/x11-plugins/wmdrawer/files/wmdrawer-0.10.5-gtk+-2.patch
new file mode 100644
index 000000000000..f378c73400ba
--- /dev/null
+++ b/x11-plugins/wmdrawer/files/wmdrawer-0.10.5-gtk+-2.patch
@@ -0,0 +1,14 @@
+diff -ur wmdrawer-0.10.5/Makefile wmdrawer-0.10.5~/Makefile
+--- wmdrawer-0.10.5/Makefile	2004-06-26 20:16:04.000000000 +0200
++++ wmdrawer-0.10.5~/Makefile	2005-03-25 22:08:08.000000000 +0100
+@@ -16,8 +16,8 @@
+ DOCDIR = $(PREFIX)/share/doc
+ 
+ # Image library
+-USE_GDKPIXBUF = 1
+-#USE_GDKPIXBUF2 = 1
++#USE_GDKPIXBUF = 1
++USE_GDKPIXBUF2 = 1
+ #USE_IMLIB = 1
+ 
+ DEFS = $(OS)
diff --git a/x11-plugins/wmdrawer/metadata.xml b/x11-plugins/wmdrawer/metadata.xml
new file mode 100644
index 000000000000..3f94a0da6b9f
--- /dev/null
+++ b/x11-plugins/wmdrawer/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+wmDrawer is a dockapp which provides a drawer
+(button bar) from which applications can be launched.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
new file mode 100644
index 000000000000..9bec6c6314a4
--- /dev/null
+++ b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 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/"
+SRC_URI="http://people.easter-eggs.org/~valos/wmdrawer/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/gdk-pixbuf:2[X]
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( README TODO AUTHORS ChangeLog wmdrawerrc.example )
+PATCHES=( "${FILESDIR}"/${P}-gtk+-2.patch )
+
+src_prepare() {
+	default
+
+	gunzip doc/wmdrawer.1x.gz || die
+
+	# Honour Gentoo CFLAGS
+	sed -i -e "s|-O3|${CFLAGS}|" Makefile || die
+	# Fix LDFLAGS ordering per bug #248640
+	sed -i -e 's/$(CC) $(LDFLAGS) -o $@ $(OBJS)/$(CC) -o $@ $(OBJS) $(LDFLAGS)/' Makefile || die
+	# Do not auto-strip binaries
+	sed -i -e 's/	strip $@//' Makefile || die
+	# Honour Gentoo LDFLAGS
+	sed -i -e 's/$(CC) -o/$(CC) $(REAL_LDFLAGS) -o/' Makefile || die
+}
+
+src_compile() {
+	emake REAL_LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin wmdrawer
+	doman doc/wmdrawer.1x
+	einstalldocs
+}
diff --git a/x11-plugins/wmfire/Manifest b/x11-plugins/wmfire/Manifest
new file mode 100644
index 000000000000..340e11e0a071
--- /dev/null
+++ b/x11-plugins/wmfire/Manifest
@@ -0,0 +1 @@
+DIST wmfire-1.2.4.tar.gz 91144 BLAKE2B b51595dfbafefb26cfb28c729683e01e8eee5683c0379bc831fd5c9172576c4375b3262da9a167ce157a67317e15d25179d6fba067c70d04ebe3e362fc3db315 SHA512 391a76c5f7292751591becebdb6267c29270e24cf9faff7e748431ffa51e74806a7b407a6493f9d4cfdc7865e4d8e8b803567b0a54caddb9b42f82160938c82b
diff --git a/x11-plugins/wmfire/files/wmfire-1.2.3-stringh.patch b/x11-plugins/wmfire/files/wmfire-1.2.3-stringh.patch
new file mode 100644
index 000000000000..a0fcfdcdc6e3
--- /dev/null
+++ b/x11-plugins/wmfire/files/wmfire-1.2.3-stringh.patch
@@ -0,0 +1,11 @@
+diff -ur wmfire-1.2.3.orig/src/session.c wmfire-1.2.3/src/session.c
+--- wmfire-1.2.3.orig/src/session.c	2005-12-04 12:39:16.000000000 +0200
++++ wmfire-1.2.3/src/session.c	2008-01-12 13:26:04.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <pwd.h>
+ 
diff --git a/x11-plugins/wmfire/files/wmfire-1.2.4-inline_c99.patch b/x11-plugins/wmfire/files/wmfire-1.2.4-inline_c99.patch
new file mode 100644
index 000000000000..34846bf86bdc
--- /dev/null
+++ b/x11-plugins/wmfire/files/wmfire-1.2.4-inline_c99.patch
@@ -0,0 +1,21 @@
+diff -Naur wmfire-1.2.4.orig/src/wmfire.c wmfire-1.2.4/src/wmfire.c
+--- wmfire-1.2.4.orig/src/wmfire.c	2005-12-04 11:39:16.000000000 +0100
++++ wmfire-1.2.4/src/wmfire.c	2019-07-30 22:43:03.306268675 +0200
+@@ -108,7 +108,7 @@
+ void change_flame(int);
+ GdkCursor *setup_cursor();
+ void burn_spot(int, int, int);
+-inline void draw_fire(unsigned int);
++void draw_fire(unsigned int);
+ static void make_wmfire_dockapp();
+ void read_config(int, char **);
+ void do_help(void);
+@@ -470,7 +470,7 @@
+ /* Draw fire                              */
+ /******************************************/
+ 
+-inline void
++void
+ draw_fire(unsigned int load)
+ {
+ 	int x, y, i, j;
diff --git a/x11-plugins/wmfire/files/wmfire-1.2.4-lastprocessor_SMP.patch b/x11-plugins/wmfire/files/wmfire-1.2.4-lastprocessor_SMP.patch
new file mode 100644
index 000000000000..2b389fecdd68
--- /dev/null
+++ b/x11-plugins/wmfire/files/wmfire-1.2.4-lastprocessor_SMP.patch
@@ -0,0 +1,130 @@
+--- wmfire-1.2.4/src/wmfire.c.orig	2005-12-04 11:39:16.000000000 +0100
++++ wmfire-1.2.4/src/wmfire.c	2012-02-27 15:48:05.136807354 +0100
+@@ -63,6 +63,10 @@
+ #define FIRE_NET	3
+ #define FIRE_FILE	4
+ 
++/* wbk 20120220 - cleaning up "next cpu" logic          */
++#define CPU_AV    -1 /* needs to be 1st CPU - 1         */
++#define CPU_NEXT  -2 /* arbitrary but must be < CPU_AV  */
++
+ #define NET_SPD_PPP	56
+ #define NET_SPD_ETH	100
+ 
+@@ -104,7 +108,8 @@
+ int update_mem();
+ int update_net();
+ int update_file();
+-int change_cpu(int);
++void change_cpu(int);
++int more_cpus();
+ void change_flame(int);
+ GdkCursor *setup_cursor();
+ void burn_spot(int, int, int);
+@@ -130,8 +135,7 @@
+ 
+ int monitor = FIRE_CPU;
+ int load = 100;
+-int cpu_av = 1;
+-int cpu_id = 0;
++int cpu_id = CPU_AV; /* wbk - special value instead of separate flag */
+ int cpu_nice = 1;
+ char net_dev[16] = "ppp0";
+ int net_spd = 0;
+@@ -224,8 +228,15 @@
+ 			next = 0;
+ 			
+ 			if (!lock) {
+-				if (monitor == FIRE_CPU && change_cpu(-1))
+-					monitor = FIRE_MEM;
++				if (monitor == FIRE_CPU)
++        {
++          /* First, check if we have more CPU's to monitor. If none,  *
++           * move along to FIRE_MEM. Regardless, after this check, we *
++           * call change_cpu() to increment or reset CPU number.      */
++          if (!more_cpus()) 
++            monitor = FIRE_MEM; 
++          change_cpu(CPU_NEXT);
++        }
+ 				else if (monitor == FIRE_MEM)
+ 					monitor = FIRE_NET;
+ 				else if (monitor == FIRE_NET)
+@@ -285,7 +296,7 @@
+ 
+ 	glibtop_get_cpu(&cpu);
+ 
+-	if (cpu_av) {
++	if (cpu_id == CPU_AV) {
+ 		if (cpu_nice)
+ 			load = cpu.user + cpu.nice + cpu.sys;
+ 		else
+@@ -383,30 +394,46 @@
+ /* Change CPU monitor                     */
+ /******************************************/
+ 
+-int
++void
+ change_cpu(int which)
+ {
+-	glibtop_cpu cpu;
++  /* wbk 20120221 - Changed return type to void. Use more_cpus()  *
++   * for tests instead. Mixing test logic with changing the CPU   *
++   * was causing CPU's to be skipped in calling function.         */
+ 
++  /* wbk - Even though we never use the cpu struct, I think this  *
++   * call may be necessary to set up glibtop_global_server?       */
++	glibtop_cpu cpu;
+ 	glibtop_get_cpu(&cpu);
+ 
+ 	/* This should work, but I have a lonely uniprocessor system */
++  /* wbk - tested with a quad core.                            */
+ 
+-	if (which >= 0) {
++	if (which != CPU_NEXT) /* was run with command-line CPU specifier */
+ 		cpu_id = which;
+-		cpu_av = 0;
+-	} else {
+-		cpu_id++;
+-		cpu_av = 0;
+-	}
++  else                   /* negative value "special case" for which */
++    cpu_id++; 
+ 
+-	if (cpu_id >= glibtop_global_server->ncpu || cpu_id >= GLIBTOP_NCPU) {
+-		cpu_id = 0;
+-		cpu_av = 1;
+-		return 1;
+-	}
++  /* Since we already incremented cpu_id, we are comparing a        *
++   * 1-index with 0-index value essentially. But since GLIBTOP_NCPU *
++   * is 1-indexed, keep >= for it. (a bit of an oversimplification: *
++   * cpu_id is still definitely regarded as 0-indexed elsewhere. We *
++   * index an array with it later, so this is important)            */
++	if (cpu_id > glibtop_global_server->ncpu || cpu_id >= GLIBTOP_NCPU) 
++		cpu_id = CPU_AV;
+ 	
+-	return 0;
++	return;
++}
++
++int 
++more_cpus()
++{
++  /* returns positive if next CPU would be valid, Negative if       *
++   * already monitoring highest-numbered CPU or if more cores than  *
++   * glibtop supports.                                              */
++  int next_cpu = cpu_id + 1;
++  return !(next_cpu > glibtop_global_server->ncpu
++            || next_cpu >= GLIBTOP_NCPU);
+ }
+ 
+ /******************************************/
+@@ -494,7 +521,7 @@
+ 		if (proximity++ > 100) {
+ 
+ 			if (monitor == FIRE_CPU) {
+-				if (cpu_av) {
++        if (cpu_id == CPU_AV) {
+ 					/* Horizontal bar for average cpu */
+ 					memset(&bm.cmap[27 * XMAX + 20], 255, 16);
+ 					memset(&bm.cmap[28 * XMAX + 20], 255, 16);
diff --git a/x11-plugins/wmfire/files/wmfire-1.2.4-no_display.patch b/x11-plugins/wmfire/files/wmfire-1.2.4-no_display.patch
new file mode 100644
index 000000000000..d69e6c386338
--- /dev/null
+++ b/x11-plugins/wmfire/files/wmfire-1.2.4-no_display.patch
@@ -0,0 +1,19 @@
+--- a/src/wmfire.c	2010-06-28 23:53:35.000000000 +0200
++++ b/src/wmfire.c	2010-06-28 23:54:35.000000000 +0200
+@@ -150,6 +150,8 @@
+ int
+ main(int argc, char **argv)
+ {
++	/* This is needed to proper dockapp work on >=GTK+-2.18 */
++	setenv("GDK_NATIVE_WINDOWS", "1", 0);
+ 	GdkEvent *event;
+ 	GdkCursor *cursor;
+ 	int i;
+@@ -632,6 +634,7 @@
+ 
+ 	/* Moved after gdk_window_show due to change in GTK 2.4 */
+ 	XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
++	gdk_window_show(bm.iconwin);
+ 
+ 	if (bm.x > 0 || bm.y > 0)
+ 		gdk_window_move(bm.win, bm.x, bm.y);
diff --git a/x11-plugins/wmfire/metadata.xml b/x11-plugins/wmfire/metadata.xml
new file mode 100644
index 000000000000..67ec2178215e
--- /dev/null
+++ b/x11-plugins/wmfire/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+wmfire is an eye-candy dock applet for Window Maker that displays generated 
+fire, possibly according to how much load the system is experiencing, or from a 
+number somewhere in a file. wmfire requires very little CPU.
+</longdescription>
+<use>
+	<flag name="session">Enable session management</flag>
+</use>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild b/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild
new file mode 100644
index 000000000000..7058dc5281e5
--- /dev/null
+++ b/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Load monitoring dockapp displaying dancing flame"
+HOMEPAGE="http://www.improbability.net/#wmfire"
+SRC_URI="http://www.improbability.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="session"
+
+RDEPEND="x11-libs/gtk+:2
+	gnome-base/libgtop:2
+	x11-libs/libX11
+	x11-libs/libXext
+	session? ( x11-libs/libSM
+		x11-libs/libICE )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ALL_I_GET_IS_A_GREY_BOX AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${PN}-1.2.3-stringh.patch
+	eapply "${FILESDIR}"/${P}-no_display.patch
+	eapply "${FILESDIR}"/${P}-lastprocessor_SMP.patch
+	eapply "${FILESDIR}"/${P}-inline_c99.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable session)
+}
diff --git a/x11-plugins/wmfishtime/Manifest b/x11-plugins/wmfishtime/Manifest
new file mode 100644
index 000000000000..f26246c74407
--- /dev/null
+++ b/x11-plugins/wmfishtime/Manifest
@@ -0,0 +1 @@
+DIST wmfishtime-1.24.tar.gz 21895 BLAKE2B d24d5400635223ffe4dbf7e63e5576083c6b5ab99563a24b9c36fe3e50821615998258f59bf6ec5cc630312c356b40210b0ab9091cb4350eb8fe6a1ca59d9b2c SHA512 7df3c6648b46c6f67cf094f634dc7699c1dd1ee4f4a18dbf63d74ebda74f322524b83d99f10a1c8c8c8a5040d78b071754a40ff162fdb13a5a00d01f1eb5c4e6
diff --git a/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch b/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch
new file mode 100644
index 000000000000..68d4c057c44e
--- /dev/null
+++ b/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch
@@ -0,0 +1,60 @@
+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
+@@ -648,6 +648,7 @@
+ 
+     /* make a copy for the iconwin - parameters are the same */
+     memcpy(&attri, &attr, sizeof(GdkWindowAttr));
++    attri.window_type = GDK_WINDOW_CHILD;
+ 
+     sizehints.flags = USSize;
+     sizehints.width = 64;
+@@ -679,7 +680,6 @@
+     wmhints.window_group = win;
+     wmhints.flags =
+ 	StateHint | IconWindowHint | IconPositionHint | WindowGroupHint;
+-    XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
+ 
+     bm.gc = gdk_gc_new(bm.win);
+ 
+@@ -693,6 +693,8 @@
+ 
+     gdk_window_show(bm.win);
+ 
++    XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
++
+ #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
+@@ -2,11 +2,11 @@
+ DESTDIR =
+ 
+ # where to install this program
+-PREFIX = $(DESTDIR)/usr/X11R6
++PREFIX = $(DESTDIR)/usr
+ 
+ # 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}
+ # profiling cflags
+ # CFLAGS=-ansi -pedantic -Wall -pg -O3 `gtk-config --cflags` ${EXTRA} -DPRO
+ # test coverage cflags
+@@ -16,7 +16,7 @@
+ CC = gcc
+ SHELL = sh
+ OBJS = fishmon.o
+-LIBS = `gtk-config --libs | sed "s/-lgtk//g"`
++LIBS = `pkg-config gtk+-2.0 --libs` -lm -lX11
+ INSTALL = -m 755
+ 
+ all: wmfishtime
+@@ -30,4 +30,4 @@
+ # You're going to have to be root to do this!
+ install:
+ 	install $(INSTALL) wmfishtime $(PREFIX)/bin
+-	install $(INSTALL) wmfishtime.1 $(PREFIX)/man/man1
++	install $(INSTALL) wmfishtime.1 $(PREFIX)/share/man/man1
diff --git a/x11-plugins/wmfishtime/files/wmfishtime-1.24-no_display.patch b/x11-plugins/wmfishtime/files/wmfishtime-1.24-no_display.patch
new file mode 100644
index 000000000000..8ae99b049f69
--- /dev/null
+++ b/x11-plugins/wmfishtime/files/wmfishtime-1.24-no_display.patch
@@ -0,0 +1,19 @@
+--- a/fishmon.c	2010-06-27 18:38:42.000000000 +0200
++++ b/fishmon.c	2010-06-27 18:40:56.000000000 +0200
+@@ -152,6 +152,8 @@
+ 
+ int main(int argc, char **argv)
+ {
++    /* This is needed to proper dockapp work on >=GTK+-2.18 */
++    setenv("GDK_NATIVE_WINDOWS", "1", 0);
+     int ch;
+     GdkEvent *event;
+ #ifdef PRO
+@@ -694,6 +696,7 @@
+     gdk_window_show(bm.win);
+ 
+     XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
++    gdk_window_show(bm.iconwin);
+ 
+ #undef MASK
+ }				/* make_new_fishmon_dockapp */
diff --git a/x11-plugins/wmfishtime/metadata.xml b/x11-plugins/wmfishtime/metadata.xml
new file mode 100644
index 000000000000..632979b28158
--- /dev/null
+++ b/x11-plugins/wmfishtime/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+WMFishTime is a silly little dockapp that displays current time, date, and day
+of the week. It features alpha-blended bubbles, anti-aliased clock hands, and
+fish swimming behind the clock face.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild b/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild
new file mode 100644
index 000000000000..d031d7285b63
--- /dev/null
+++ b/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A fun clock applet for your desktop featuring swimming fish"
+HOMEPAGE="http://www.ne.jp/asahi/linux/timecop"
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-gtk.patch
+	"${FILESDIR}"/${P}-no_display.patch )
+
+DOCS=( ALL_I_GET_IS_A_GRAY_BOX AUTHORS ChangeLog CODING README )
+
+src_prepare() {
+	default
+	sed -i -e "s/\$(CC)/& \$(LDFLAGS)/" Makefile || die #331891
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	einstalldocs
+}
diff --git a/x11-plugins/wmforkplop/Manifest b/x11-plugins/wmforkplop/Manifest
new file mode 100644
index 000000000000..e6a2f24000dd
--- /dev/null
+++ b/x11-plugins/wmforkplop/Manifest
@@ -0,0 +1 @@
+DIST wmforkplop-0.9.3.tar.gz 228451 BLAKE2B c246839aa410f6c58bca6bbfeebd86c4e870fb3fbeed798c6eff6eff0ea7d553dc49655734c05c06847ce6b4cc7766154844a2cd51a3f33ae7843b0337105673 SHA512 169a83afc60978856fa93ec83fa7ebd3efdff377b0bf6a957e5ae75fd1512b5a33cf08b47ab20126aa6e10eb05f5d6364212f853798b722d415e898a5edac0e9
diff --git a/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-cflags.patch b/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-cflags.patch
new file mode 100644
index 000000000000..8846e46e2b99
--- /dev/null
+++ b/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-cflags.patch
@@ -0,0 +1,12 @@
+--- a/configure	2012-10-23 15:54:48.098767586 +0200
++++ b/configure	2012-10-23 15:54:56.946510053 +0200
+@@ -3483,9 +3483,6 @@
+ 
+ 
+ 
+-if test x$GCC = xyes; then
+-  CFLAGS="-O3 -fomit-frame-pointer -ffast-math -Wall -W";
+-fi
+ 
+ echo "$as_me:$LINENO: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
diff --git a/x11-plugins/wmforkplop/metadata.xml b/x11-plugins/wmforkplop/metadata.xml
new file mode 100644
index 000000000000..aec3ef94537e
--- /dev/null
+++ b/x11-plugins/wmforkplop/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+		wmforkplop is yet another dockapp for WindowMaker, or any windowmanager/desktop environment that handles dockapps. It is a mixture between wmhdplop and the great wmtop: wmforkplop monitors your processes by sending visual stimuli to your cortex each time your kernel forks or kills a process. Try to compile a kernel and enjoy the wmforkplop show!
+	</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild b/x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild
new file mode 100644
index 000000000000..3878d594dd31
--- /dev/null
+++ b/x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="monitors the forking activity of the kernel and most active processes"
+HOMEPAGE="http://hules.free.fr/wmforkplop"
+SRC_URI="http://hules.free.fr/wmforkplop/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+DEPEND="gnome-base/libgtop
+	media-libs/imlib2[X]"
+RDEPEND="${DEPEND}"
+
+# Easier to patch configure directly here
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
diff --git a/x11-plugins/wmfortune/Manifest b/x11-plugins/wmfortune/Manifest
new file mode 100644
index 000000000000..d953ae280954
--- /dev/null
+++ b/x11-plugins/wmfortune/Manifest
@@ -0,0 +1 @@
+DIST wmfortune-0.241.tar.gz 23406 BLAKE2B 2a104d4f5d9ca1865618b95c2d6e4bb49cb841325442f58712c4bca1d971b9ef6512d509e80753b8a96e7978d5198b3a4f6fc2d54c6182b439b4d30cbe73d6df SHA512 d5640090c2f2ba788ab9367b70d948d4f1d846174714e2415e81500f5fef6c3e7e81b12575274bdb3a760fa3e2e9ab499880713a923add136089969b394f9409
diff --git a/x11-plugins/wmfortune/files/wmfortune-0.241-stringh.patch b/x11-plugins/wmfortune/files/wmfortune-0.241-stringh.patch
new file mode 100644
index 000000000000..35db475df300
--- /dev/null
+++ b/x11-plugins/wmfortune/files/wmfortune-0.241-stringh.patch
@@ -0,0 +1,11 @@
+diff -ur a/wmfortune.c b/wmfortune.c
+--- a/wmfortune.c	2001-09-01 03:25:39.000000000 +0300
++++ b/wmfortune.c	2008-01-15 10:21:17.000000000 +0200
+@@ -25,6 +25,7 @@
+ 
+ #include <unistd.h>
+ #include <stdio.h>
++#include <string.h>
+ #include "dockapp.h"
+ #include "XPM/panel.xpm"
+ #include "XPM/panel_button_pressed.xpm"
diff --git a/x11-plugins/wmfortune/metadata.xml b/x11-plugins/wmfortune/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmfortune/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmfortune/wmfortune-0.241-r1.ebuild b/x11-plugins/wmfortune/wmfortune-0.241-r1.ebuild
new file mode 100644
index 000000000000..ecf621d042fe
--- /dev/null
+++ b/x11-plugins/wmfortune/wmfortune-0.241-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="a dockapp showing fortune-mod messages"
+HOMEPAGE="https://www.dockapps.net/wmfortune"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="games-misc/fortune-mod
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=( "${FILESDIR}"/${P}-stringh.patch )
+
+src_prepare() {
+	# Honour Gentoo LDFLAGS. Closes bug #336446.
+	sed -i 's/-o $(DEST)/$(LDFLAGS) -o $(DEST)/' Makefile || die
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" OPTIMIZE="${CFLAGS}" \
+		XLIBDIR="/usr/$(get_libdir)"
+}
+
+src_install() {
+	dobin ${PN}
+	einstalldocs
+}
diff --git a/x11-plugins/wmfrog/Manifest b/x11-plugins/wmfrog/Manifest
new file mode 100644
index 000000000000..e36da29c94e6
--- /dev/null
+++ b/x11-plugins/wmfrog/Manifest
@@ -0,0 +1 @@
+DIST wmfrog-0.3.1.tgz 128499 BLAKE2B 5bde4ccf41fda8e1a7e4fe9d40727e0d86d65830cc749955f5b1c97949c543f8f7253ddc6fffa48fc606e23c2ff6b4c66e07c66807a43e02f68961dfbb20d683 SHA512 35cd7da8ec0173f4799119191cd28befaed0fd5ea09c0dd2e9789ce37e9a1a4a83a9fb4562051a8da9c1449eafc8299c86914cb6f0e5bc35bd051560442af7ee
diff --git a/x11-plugins/wmfrog/files/wmfrog-0.3.1-gcc-10.patch b/x11-plugins/wmfrog/files/wmfrog-0.3.1-gcc-10.patch
new file mode 100644
index 000000000000..9d25464c8eac
--- /dev/null
+++ b/x11-plugins/wmfrog/files/wmfrog-0.3.1-gcc-10.patch
@@ -0,0 +1,36 @@
+diff -Naur Src.orig/wmFrog.c Src/wmFrog.c
+--- Src.orig/wmFrog.c	2010-12-01 19:48:50.000000000 +0100
++++ Src/wmFrog.c	2020-03-01 15:54:30.428083446 +0100
+@@ -77,6 +77,12 @@
+ char* folder;
+ int needsUpdate = 1;
+ 
++Display		*display;
++Window          Root;
++Window          iconwin, win;
++int             screen; 
++int             DisplayDepth;
++
+ /*
+  *   main
+  */
+diff -Naur Src.orig/xutils.h Src/xutils.h
+--- Src.orig/xutils.h	2010-08-04 20:28:46.000000000 +0200
++++ Src/xutils.h	2020-03-01 15:54:37.027084834 +0100
+@@ -18,11 +18,11 @@
+ /*
+  *   Global variable
+  */
+-Display		*display;
+-Window          Root;
+-Window          iconwin, win;
+-int             screen; 
+-int             DisplayDepth;
++extern Display		*display;
++extern Window          Root;
++extern Window          iconwin, win;
++extern int             screen; 
++extern int             DisplayDepth;
+ 
+ 
+ 
diff --git a/x11-plugins/wmfrog/metadata.xml b/x11-plugins/wmfrog/metadata.xml
new file mode 100644
index 000000000000..ef8cf4c3b2be
--- /dev/null
+++ b/x11-plugins/wmfrog/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">wmfrog</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild b/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..fa1b1ed45fc2
--- /dev/null
+++ b/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="a weather application, it shows the weather in a graphical way"
+HOMEPAGE="http://wiki.colar.net/wmfrog_dockapp"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S="${WORKDIR}/Src"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
+DOCS=( ../{CHANGES,HINTS} )
+
+src_prepare() {
+	default
+	emake clean
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" INCDIR="" \
+		LIBDIR="" SYSTEM="${LDFLAGS}"
+}
diff --git a/x11-plugins/wmfsm/Manifest b/x11-plugins/wmfsm/Manifest
new file mode 100644
index 000000000000..d69edac010b9
--- /dev/null
+++ b/x11-plugins/wmfsm/Manifest
@@ -0,0 +1 @@
+DIST wmfsm-0.36.tar.gz 20456 BLAKE2B a9832bb4d6ae45b451c564d45ab2af085a17b3089b2f62411b70dab8f78e9c8725f6e1abfed75aa9334969dcea8258b6746c07e5a1e43cc021ab2083ae897de3 SHA512 d5d148f67f226e38a8b3c2475cdae9d93cb545ca79afe93060137b36f09a328db82b4561a6dd76abe7f5d59e944e8c8ed0f85ab1ff1727c659195c88d1d7406b
diff --git a/x11-plugins/wmfsm/metadata.xml b/x11-plugins/wmfsm/metadata.xml
new file mode 100644
index 000000000000..85f90cb5a349
--- /dev/null
+++ b/x11-plugins/wmfsm/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+Wmfsm monitors your filesystem usage. It features three display modes, 
+different colorschemes and exclusion of filesystems (eg /cdrom).
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmfsm/wmfsm-0.36-r1.ebuild b/x11-plugins/wmfsm/wmfsm-0.36-r1.ebuild
new file mode 100644
index 000000000000..c350aba89612
--- /dev/null
+++ b/x11-plugins/wmfsm/wmfsm-0.36-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="dockapp for monitoring filesystem usage"
+HOMEPAGE="https://www.dockapps.net/wmfsm"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_prepare() {
+	default
+	sed -e "/^X11LIBS/s/-I$x_includes //" -i configure.ac || die "sed failed"
+
+	eautoreconf
+}
diff --git a/x11-plugins/wmfsm/wmfsm-0.36.ebuild b/x11-plugins/wmfsm/wmfsm-0.36.ebuild
new file mode 100644
index 000000000000..43937a34e436
--- /dev/null
+++ b/x11-plugins/wmfsm/wmfsm-0.36.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools
+
+IUSE=""
+DESCRIPTION="dockapp for monitoring filesystem usage"
+HOMEPAGE="https://www.dockapps.net/wmfsm"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_prepare() {
+	sed -e "/^X11LIBS/s/-I$x_includes //" -i configure.ac || die "sed failed"
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog
+}
diff --git a/x11-plugins/wmget/Manifest b/x11-plugins/wmget/Manifest
new file mode 100644
index 000000000000..7b3ea9059efe
--- /dev/null
+++ b/x11-plugins/wmget/Manifest
@@ -0,0 +1 @@
+DIST wmget-0.6.1.tar.gz 35538 BLAKE2B 5e7b8bd7504fc23a7ebca04b8628f9c847888ae9a9161f78446ca8976151344d4c2aec5fb422df9069f4c6a1480bb347ba19f7e5d3a7a9ca4e6dc4560bc810b9 SHA512 7e8db4610eb6d57181d10ed46e09aaba8b4f1672f1a8846dd97beb7eb6dd5bbac9a38ed7c33dc7ff7198001660500c2543402b000574d43ef3026682bf4d06e0
diff --git a/x11-plugins/wmget/metadata.xml b/x11-plugins/wmget/metadata.xml
new file mode 100644
index 000000000000..4c8167a81b45
--- /dev/null
+++ b/x11-plugins/wmget/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+wmget lets you run multiple downloads and monitor or control them from within a 
+dockapp. This makes it easy to see their progress without keeping extra windows 
+open. wmget uses the libcurl library to support HTTP and FTP downloads.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmget/wmget-0.6.1.ebuild b/x11-plugins/wmget/wmget-0.6.1.ebuild
new file mode 100644
index 000000000000..7c6f99f0c6dc
--- /dev/null
+++ b/x11-plugins/wmget/wmget-0.6.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="a libcurl based dockapp for automated downloads"
+HOMEPAGE="https://www.dockapps.net/wmget"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	>=net-misc/curl-7.9.7"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+# Specific to this tarball
+S=${WORKDIR}/dockapps-5aaf842
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/x11-plugins/wmgrabimage/Manifest b/x11-plugins/wmgrabimage/Manifest
new file mode 100644
index 000000000000..797850ffac0a
--- /dev/null
+++ b/x11-plugins/wmgrabimage/Manifest
@@ -0,0 +1 @@
+DIST wmGrabImage-0.72.tgz 19902 BLAKE2B d9000c03e4f9a3584f356c18fd4e4767ccc235708e0d3554fd6a0defa6108de3f52a90825b4ed7d334b545340ec9e463e67aae89062f5b0e2622c9e6d851a796 SHA512 64909db71d141ccf849eacbb100072a53770601fdf23949f76a45d1d25f5015ebb8f3a3da99e8f311977967d44a6db6596c2bcbe961fb8e313e41cad4960c92e
diff --git a/x11-plugins/wmgrabimage/files/wmgrabimage-0.72-gcc-10.patch b/x11-plugins/wmgrabimage/files/wmgrabimage-0.72-gcc-10.patch
new file mode 100644
index 000000000000..f7b85c9d1bc5
--- /dev/null
+++ b/x11-plugins/wmgrabimage/files/wmgrabimage-0.72-gcc-10.patch
@@ -0,0 +1,32 @@
+diff -Naur wmGrabImage-0.72.orig/wmgeneral/wmgeneral.c wmGrabImage-0.72/wmgeneral/wmgeneral.c
+--- wmGrabImage-0.72.orig/wmgeneral/wmgeneral.c	2001-05-27 21:02:18.000000000 +0200
++++ wmGrabImage-0.72/wmgeneral/wmgeneral.c	2020-02-02 12:25:53.013879815 +0100
+@@ -47,6 +47,10 @@
+ char		*Geometry = "";
+ Window		iconwin, win;
+ Pixmap		pixmask;
++Display		*display;
++Window		Root;
++GC			NormalGC;
++XpmIcon		wmgen;
+ 
+   /*****************/
+  /* Mouse Regions */
+diff -Naur wmGrabImage-0.72.orig/wmgeneral/wmgeneral.h wmGrabImage-0.72/wmgeneral/wmgeneral.h
+--- wmGrabImage-0.72.orig/wmgeneral/wmgeneral.h	2001-05-27 21:02:18.000000000 +0200
++++ wmGrabImage-0.72/wmgeneral/wmgeneral.h	2020-02-02 12:25:31.926869125 +0100
+@@ -28,10 +28,10 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
+-Window          Root;
+-GC              NormalGC;
+-XpmIcon         wmgen;
++extern Display  *display;
++extern Window   Root;
++extern GC       NormalGC;
++extern XpmIcon  wmgen;
+ 
+ 
+   /***********************/
diff --git a/x11-plugins/wmgrabimage/files/wmgrabimage-noman.patch b/x11-plugins/wmgrabimage/files/wmgrabimage-noman.patch
new file mode 100644
index 000000000000..27b2f71b5b8e
--- /dev/null
+++ b/x11-plugins/wmgrabimage/files/wmgrabimage-noman.patch
@@ -0,0 +1,8 @@
+--- a/Makefile	2001-05-27 19:02:18.000000000 +0000
++++ b/Makefile	2004-06-22 21:05:36.711363520 +0000
+@@ -30,5 +30,4 @@
+ install:: wmGrabImage
+ 	install -s -m 0755 wmGrabImage $(DESTDIR)/bin
+ 	install    -m 0755 GrabImage $(DESTDIR)/bin
+-	install    -m 0644 wmGrabImage.1 $(DESTDIR)/man/man1 
+ 
diff --git a/x11-plugins/wmgrabimage/files/wmgrabimage.desktop b/x11-plugins/wmgrabimage/files/wmgrabimage.desktop
new file mode 100644
index 000000000000..60bd074e2cc2
--- /dev/null
+++ b/x11-plugins/wmgrabimage/files/wmgrabimage.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=WmGragImage
+Comment=Image Grabber
+Comment[pl]=Wyłapywacz obrazów
+Exec=wmgrabimage
+Type=Application
+Terminal=false
+Categories=Graphics;Viewer;
diff --git a/x11-plugins/wmgrabimage/metadata.xml b/x11-plugins/wmgrabimage/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmgrabimage/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
new file mode 100644
index 000000000000..b1d7ff43dabc
--- /dev/null
+++ b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop
+
+MY_PN=${PN/grabi/GrabI}
+
+DESCRIPTION="wmGrabImage grabs an image from the WWW and displays it"
+HOMEPAGE="https://www.dockapps.net/wmgrabimage"
+SRC_URI="https://www.dockapps.net/download/${MY_PN}-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+RDEPEND=">=net-misc/wget-1.9-r2
+	>=media-gfx/imagemagick-5.5.7.15
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S=${WORKDIR}/${MY_PN}-${PV}/${MY_PN}
+
+PATCHES=( "${FILESDIR}"/${PN}-noman.patch )
+
+src_prepare() {
+	sed -i -e 's/-geom /-geometry /' GrabImage || die
+	sed -i -e 's/install -s -m /install -m /' Makefile || die
+	default
+
+	pushd "${WORKDIR}"/${MY_PN}-${PV} || die
+	eapply "${FILESDIR}"/${P}-gcc-10.patch
+}
+
+src_compile() {
+	emake clean
+	emake CFLAGS="${CFLAGS} -Wall" SYSTEM="${LDFLAGS}"
+}
+
+src_install() {
+	dodir /usr/bin
+	emake DESTDIR="${D}/usr" install
+
+	doman wmGrabImage.1
+	domenu "${FILESDIR}"/${PN}.desktop
+	dodoc ../{BUGS,CHANGES,HINTS,TODO}
+}
diff --git a/x11-plugins/wmgtemp/Manifest b/x11-plugins/wmgtemp/Manifest
new file mode 100644
index 000000000000..90703747599e
--- /dev/null
+++ b/x11-plugins/wmgtemp/Manifest
@@ -0,0 +1 @@
+DIST wmgtemp-1.2.tar.gz 96949 BLAKE2B c578666451260e49ebfd0986b4961586f9425ef3e7426168a0dc14aa9b6ddf65097f69da6a3871711ab96f3d678285e538bff17780f57437aa5835aeb61e8d24 SHA512 ab76eabb5459b6a8dde28c23b8c8d39587e7874daaf368afcbe7aabe57ce499285d4151b53afa8295991742c481ca18617e71107ae264c05ab28b24b67c00b9b
diff --git a/x11-plugins/wmgtemp/metadata.xml b/x11-plugins/wmgtemp/metadata.xml
new file mode 100644
index 000000000000..69d16d43c6f0
--- /dev/null
+++ b/x11-plugins/wmgtemp/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+wmgtemp is a dock-app for Window Maker that graphically displays the CPU and 
+System temperatures using the lm-sensors package. It was originally intended to 
+work with the VIA686A chipset although it can dynamically detect chipset 
+features to work with other sensors. It displays the CPU and System temperature 
+values, a scaling graph of temperature history, and high-temperature warning 
+lights. It should also work fine with other window managers.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild b/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild
new file mode 100644
index 000000000000..5040d25087d5
--- /dev/null
+++ b/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="CPU and SYS temperature dockapp"
+HOMEPAGE="https://www.dockapps.net/wmgtemp"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/lm-sensors:=
+	>=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11"
+RDEPEND="${DEPEND}"
diff --git a/x11-plugins/wmhdplop/Manifest b/x11-plugins/wmhdplop/Manifest
new file mode 100644
index 000000000000..ff0775b3fe8b
--- /dev/null
+++ b/x11-plugins/wmhdplop/Manifest
@@ -0,0 +1,2 @@
+DIST wmhdplop-0.9.10.tar.gz 163491 BLAKE2B dd05bcddd4be666e403e7d0ccdbdba9048af6eb15dd72657b657bc4eb8eea1a6a7a78da820f143f6f377949bd9d8df89c5ae129f40374586633f8cdb174b9146 SHA512 9bd79ab5c271e2fbd7d415a1ea20eda5412d7657d9ccfd4781a6d42b834107b65e110231718ad686355e76590cd39f556ebfc9b14e7a4048a68d62503df94f46
+DIST wmhdplop-0.9.11.tar.gz 163931 BLAKE2B 9a30f0ea11fd9abd5419612a413187299945b415ed9231e878aeea5a395627b21d77b99bbac3bd8d2b0673069c2011974355c9056d2dbe46688ed7606e8f9b8c SHA512 e77802945b0c4213212922307416e8f99f1fe99de4ade6200bdd9cd8687926ddc7e67b437109174fb8544eebd8a6aea22ba685624842b54134bff48ea8aaa540
diff --git a/x11-plugins/wmhdplop/files/wmhdplop-0.9.10-cflags.patch b/x11-plugins/wmhdplop/files/wmhdplop-0.9.10-cflags.patch
new file mode 100644
index 000000000000..999379988317
--- /dev/null
+++ b/x11-plugins/wmhdplop/files/wmhdplop-0.9.10-cflags.patch
@@ -0,0 +1,14 @@
+diff -Naur wmhdplop-0.9.10.orig/configure.ac wmhdplop-0.9.10/configure.ac
+--- wmhdplop-0.9.10.orig/configure.ac	2016-11-24 16:18:21.000000000 +0100
++++ wmhdplop-0.9.10/configure.ac	2016-12-02 11:58:28.276017676 +0100
+@@ -19,10 +19,6 @@
+ AC_DEFINE(_GNU_SOURCE,[],[uses GNU extensions])
+ 
+ 
+-if test x$GCC = xyes; then
+-  CFLAGS="-O3 -fomit-frame-pointer -ffast-math -Wall -W";
+-fi
+-
+ dnl check for X
+ AC_PATH_X
+ AC_PATH_XTRA
diff --git a/x11-plugins/wmhdplop/files/wmhdplop-0.9.10-sysmacros.patch b/x11-plugins/wmhdplop/files/wmhdplop-0.9.10-sysmacros.patch
new file mode 100644
index 000000000000..1346cd2e3641
--- /dev/null
+++ b/x11-plugins/wmhdplop/files/wmhdplop-0.9.10-sysmacros.patch
@@ -0,0 +1,11 @@
+diff -Naur wmhdplop-0.9.10.orig/devnames.c wmhdplop-0.9.10/devnames.c
+--- wmhdplop-0.9.10.orig/devnames.c	2016-11-24 15:49:55.000000000 +0100
++++ wmhdplop-0.9.10/devnames.c	2017-02-16 15:03:08.946447885 +0100
+@@ -4,6 +4,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <unistd.h>
+ #include <linux/major.h>
+ #include <ctype.h>
diff --git a/x11-plugins/wmhdplop/files/wmhdplop-0.9.9-64bit.patch b/x11-plugins/wmhdplop/files/wmhdplop-0.9.9-64bit.patch
new file mode 100644
index 000000000000..13650e9bb7d9
--- /dev/null
+++ b/x11-plugins/wmhdplop/files/wmhdplop-0.9.9-64bit.patch
@@ -0,0 +1,94 @@
+diff -pudr wmhdplop-0.9.9/devnames.h wmhdplop-0.9.9-fixed/devnames.h
+--- wmhdplop-0.9.9/devnames.h	2004-04-07 01:14:01.000000000 +0200
++++ wmhdplop-0.9.9-fixed/devnames.h	2010-06-25 21:56:10.662190796 +0200
+@@ -9,7 +9,7 @@ typedef struct DiskList {
+   unsigned major, minor;
+   int hd_id, part_id; /* part_id = 0 for disks */
+   int enable_hddtemp;
+-  int nr, nw, touched_r, touched_w;
++  long nr, nw, touched_r, touched_w;
+   struct DiskList *next;
+ } DiskList;
+ 
+diff -pudr wmhdplop-0.9.9/procstat.c wmhdplop-0.9.9-fixed/procstat.c
+--- wmhdplop-0.9.9/procstat.c	2007-04-20 11:12:16.000000000 +0200
++++ wmhdplop-0.9.9-fixed/procstat.c	2010-06-25 21:55:37.086191145 +0200
+@@ -8,7 +8,7 @@
+ static ProcStats ps;
+ int use_proc_diskstats;
+ 
+-void pstat_init(struct pstat *pst, int nslice, float update_interval) {
++void pstat_init(struct pstat *pst, long nslice, float update_interval) {
+   pst->nslice = nslice;
+   ALLOC_VEC(pst->slices, nslice);
+   pst->cur_slice = 0;
+@@ -17,7 +17,7 @@ void pstat_init(struct pstat *pst, int n
+ }
+ 
+ float pstat_current(struct pstat *pst) {
+-  int idx = pst->cur_slice ? pst->cur_slice-1 : pst->nslice-1;
++  long idx = pst->cur_slice ? pst->cur_slice-1 : pst->nslice-1;
+   return pst->slices[idx]/pst->update_interval;
+ }
+ 
+@@ -101,13 +101,13 @@ void update_stats() {
+             if (!Prefs.debug_disk_rd) {
+               pstat_add(&ps.disk_read, nr);
+             } else {
+-              static int cntr = 0; cntr+=(rand()%30) == 0 ? Prefs.debug_disk_rd : 0;
++              static long cntr = 0; cntr+=(rand()%30) == 0 ? Prefs.debug_disk_rd : 0;
+               pstat_add(&ps.disk_read, nr + cntr);
+             }
+             if (!Prefs.debug_disk_wr) {
+               pstat_add(&ps.disk_write, nw);
+             } else {
+-              static int cntw = 0; cntw+=(rand()%30) == 0 ? Prefs.debug_disk_wr : 0;
++              static long cntw = 0; cntw+=(rand()%30) == 0 ? Prefs.debug_disk_wr : 0;
+               pstat_add(&ps.disk_write, nw + cntw);
+             }
+             readok = 2;
+@@ -121,7 +121,7 @@ void update_stats() {
+               pstat_add(&ps.swap_in, nr);
+               pstat_add(&ps.swap_out, nw);
+             } else {
+-              static int cnt = 0; cnt+=Prefs.debug_swapio;
++              static long cnt = 0; cnt+=Prefs.debug_swapio;
+               pstat_add(&ps.swap_in, nr + cnt);
+               pstat_add(&ps.swap_out, nw + cnt);
+             }
+@@ -144,10 +144,10 @@ void init_stats(float update_interval) {
+   char s[512];
+   FILE *f;
+ 
+-  pstat_init(&ps.swap_in, (int)(0.5/update_interval)+1, update_interval);
+-  pstat_init(&ps.swap_out, (int)(0.5/update_interval)+1, update_interval);
+-  pstat_init(&ps.disk_read, (int)(0.5/update_interval)+1, update_interval);
+-  pstat_init(&ps.disk_write, (int)(0.5/update_interval)+1, update_interval);
++  pstat_init(&ps.swap_in, (long)(0.5/update_interval)+1, update_interval);
++  pstat_init(&ps.swap_out, (long)(0.5/update_interval)+1, update_interval);
++  pstat_init(&ps.disk_read, (long)(0.5/update_interval)+1, update_interval);
++  pstat_init(&ps.disk_write, (long)(0.5/update_interval)+1, update_interval);
+   f = fopen("/proc/swaps","r");
+   //if (!f) { perror("/proc/swaps"); exit(1); }
+   if (f) {
+diff -pudr wmhdplop-0.9.9/procstat.h wmhdplop-0.9.9-fixed/procstat.h
+--- wmhdplop-0.9.9/procstat.h	2004-03-14 12:07:15.000000000 +0100
++++ wmhdplop-0.9.9-fixed/procstat.h	2010-06-25 21:45:52.146334994 +0200
+@@ -4,7 +4,7 @@
+ 
+ struct pstat {
+   unsigned long total;
+-  int nslice, cur_slice;
++  long nslice, cur_slice;
+   unsigned long *slices;
+   float update_interval;
+ };
+@@ -15,7 +15,7 @@ typedef struct {
+   struct pstat disk_read, disk_write;
+ } ProcStats;
+ 
+-void pstat_init(struct pstat *pst, int nslice, float update_interval);
++void pstat_init(struct pstat *pst, long nslice, float update_interval);
+ float pstat_current(struct pstat *pst);
+ void pstat_add(struct pstat *pst, unsigned long v);
+ void pstat_advance(struct pstat *pst);
diff --git a/x11-plugins/wmhdplop/metadata.xml b/x11-plugins/wmhdplop/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmhdplop/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmhdplop/wmhdplop-0.9.10.ebuild b/x11-plugins/wmhdplop/wmhdplop-0.9.10.ebuild
new file mode 100644
index 000000000000..d8f6755165d8
--- /dev/null
+++ b/x11-plugins/wmhdplop/wmhdplop-0.9.10.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="a dockapp for monitoring disk activities with fancy visuals"
+HOMEPAGE="https://www.dockapps.net/wmhdplop"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/imlib2[X]
+	x11-libs/libX11
+	x11-libs/libXext
+	media-fonts/corefonts
+	>=media-libs/freetype-2"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.9-64bit.patch
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-sysmacros.patch
+	)
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	eautoreconf
+	default
+}
+
+src_configure() {
+	econf --disable-gkrellm
+}
diff --git a/x11-plugins/wmhdplop/wmhdplop-0.9.11.ebuild b/x11-plugins/wmhdplop/wmhdplop-0.9.11.ebuild
new file mode 100644
index 000000000000..2806056295d9
--- /dev/null
+++ b/x11-plugins/wmhdplop/wmhdplop-0.9.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="a dockapp for monitoring disk activities with fancy visuals"
+HOMEPAGE="https://www.dockapps.net/wmhdplop"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/imlib2[X]
+	x11-libs/libX11
+	x11-libs/libXext
+	media-fonts/corefonts
+	>=media-libs/freetype-2"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.10-cflags.patch
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	eautoreconf
+	default
+}
+
+src_configure() {
+	econf --disable-gkrellm
+}
diff --git a/x11-plugins/wmifinfo/Manifest b/x11-plugins/wmifinfo/Manifest
new file mode 100644
index 000000000000..3b6947d63963
--- /dev/null
+++ b/x11-plugins/wmifinfo/Manifest
@@ -0,0 +1 @@
+DIST wmifinfo-0.10.tar.gz 17418 BLAKE2B 74debc88268e45779131ad6587733343e8be51cfa871ea368ca305a755008fb0a7e3faa332157e79ecea7553d3e523cce4bb9b4a650c2ee73dc1b6acb3db4ff9 SHA512 57731f482b950e968e760315b99ceb715c3aa101f77e5363ee08db231369c5addc4d9cf4da4a24f624313073bc67cd8742030956c5f866fb02c1b24b3cc4e965
diff --git a/x11-plugins/wmifinfo/files/wmifinfo-0.10-fno-common.patch b/x11-plugins/wmifinfo/files/wmifinfo-0.10-fno-common.patch
new file mode 100644
index 000000000000..296c88a3541f
--- /dev/null
+++ b/x11-plugins/wmifinfo/files/wmifinfo-0.10-fno-common.patch
@@ -0,0 +1,35 @@
+diff -Naur dockapps.orig/xutils.c dockapps/xutils.c
+--- dockapps.orig/xutils.c	2014-12-09 20:31:13.000000000 +0100
++++ dockapps/xutils.c	2020-03-29 13:29:01.027698381 +0200
+@@ -54,6 +54,11 @@
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
+ 
++Display		*display;
++Window          Root;
++Window          iconwin, win;
++int             screen;
++int             DisplayDepth;
+ 
+ 
+ 
+diff -Naur dockapps.orig/xutils.h dockapps/xutils.h
+--- dockapps.orig/xutils.h	2014-12-09 20:31:13.000000000 +0100
++++ dockapps/xutils.h	2020-03-29 13:29:10.728695410 +0200
+@@ -18,11 +18,11 @@
+ /*
+  *   Global variable
+  */
+-Display		*display;
+-Window          Root;
+-Window          iconwin, win;
+-int             screen;
+-int             DisplayDepth;
++extern Display		*display;
++extern Window          Root;
++extern Window          iconwin, win;
++extern int             screen;
++extern int             DisplayDepth;
+ 
+ 
+ 
diff --git a/x11-plugins/wmifinfo/metadata.xml b/x11-plugins/wmifinfo/metadata.xml
new file mode 100644
index 000000000000..b37eab6956dc
--- /dev/null
+++ b/x11-plugins/wmifinfo/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmifinfo/wmifinfo-0.10-r1.ebuild b/x11-plugins/wmifinfo/wmifinfo-0.10-r1.ebuild
new file mode 100644
index 000000000000..f02294e77cdf
--- /dev/null
+++ b/x11-plugins/wmifinfo/wmifinfo-0.10-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="a dockapp for monitoring network interfaces"
+HOMEPAGE="https://www.dockapps.net/wmifinfo"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+S="${WORKDIR}/dockapps"
+
+src_compile() {
+	emake CC="$(tc-getCC)" LD="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc README Changelog
+}
diff --git a/x11-plugins/wmifs/Manifest b/x11-plugins/wmifs/Manifest
new file mode 100644
index 000000000000..52fcb30217b3
--- /dev/null
+++ b/x11-plugins/wmifs/Manifest
@@ -0,0 +1 @@
+DIST wmifs-1.8.tar.gz 107020 BLAKE2B 54b73bf2a49a9c9dd0d16f907cf2211eafb7199d7b77e4cd7e86364ff8bc438d27a57e95c97b47b2dbe308b2d9e6797df287f608dca89ed4b3d6dfb27195b932 SHA512 c88092e8c83ab5bc65813b6fbfe348b3b56eae28885199ba1cc681ba3db7f801f90f5d385cfdbb7304327e085471f6fdc0f712690211dc192763739619c46abb
diff --git a/x11-plugins/wmifs/metadata.xml b/x11-plugins/wmifs/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmifs/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmifs/wmifs-1.8.ebuild b/x11-plugins/wmifs/wmifs-1.8.ebuild
new file mode 100644
index 000000000000..906cf312e2c2
--- /dev/null
+++ b/x11-plugins/wmifs/wmifs-1.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Network monitoring dockapp"
+HOMEPAGE="https://www.dockapps.net/wmifs"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~mips ppc sparc x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+DOCS=( BUGS CHANGES HINTS README TODO )
diff --git a/x11-plugins/wminet/Manifest b/x11-plugins/wminet/Manifest
new file mode 100644
index 000000000000..ef81a698d880
--- /dev/null
+++ b/x11-plugins/wminet/Manifest
@@ -0,0 +1 @@
+DIST wminet-3.0.0.tar.gz 47576 BLAKE2B 318a180998f815e4ac274b98fdc14914f2d69eac1a5bf6c4382b0f8b01594d56dece8f168a069fd45cb6be373f1c3507aa0a0e5fd27ab571ee21912d0c02e5e6 SHA512 594d4a2019e424b27e717d3ffd64071f7888b40bf9b31332a877e71d85c0eb89f65490268276def30f530f187f3796a14c5e412af8cb461311e3f1e0a6478e51
diff --git a/x11-plugins/wminet/files/wminet-3.0.0-list.patch b/x11-plugins/wminet/files/wminet-3.0.0-list.patch
new file mode 100644
index 000000000000..9b94f51c6a9a
--- /dev/null
+++ b/x11-plugins/wminet/files/wminet-3.0.0-list.patch
@@ -0,0 +1,300 @@
+diff -Naur wminet-3.0.0.orig/src/list.c wminet-3.0.0/src/list.c
+--- wminet-3.0.0.orig/src/list.c	2001-11-24 12:03:32.000000000 +0100
++++ wminet-3.0.0/src/list.c	2016-01-04 13:45:02.137642820 +0100
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail) */
+ 
+-INLINE LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero */
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned  */
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor */
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -101,7 +101,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT */
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@
+     }
+ }*/
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -132,7 +132,7 @@
+ 
+ /* Return element that has ELEM as car */
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@
+ 
+ /* Free list (backwards recursive) */
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST */
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur wminet-3.0.0.orig/src/list.c.orig wminet-3.0.0/src/list.c.orig
+--- wminet-3.0.0.orig/src/list.c.orig	1970-01-01 01:00:00.000000000 +0100
++++ wminet-3.0.0/src/list.c.orig	2001-11-24 12:03:32.000000000 +0100
+@@ -0,0 +1,169 @@
++/* Generic single linked list to keep various information 
++   Copyright (C) 1993, 1994 Free Software Foundation, Inc.
++
++
++Author: Kresten Krab Thorup
++
++Many modifications by Alfredo K. Kojima
++ 
++
++This file is part of GNU CC.
++
++GNU CC is free software; you can redistribute it and/or modify
++it under the terms of the GNU General Public License as published by
++the Free Software Foundation; either version 2, or (at your option)
++any later version.
++
++GNU CC is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++GNU General Public License for more details.
++
++You should have received a copy of the GNU General Public License
++along with GNU CC; see the file COPYING.  If not, write to
++the Free Software Foundation, 59 Temple Place - Suite 330,
++Boston, MA 02111-1307, USA.  */
++
++/* As a special exception, if you link this library with files compiled with
++   GCC to produce an executable, this does not cause the resulting executable
++   to be covered by the GNU General Public License. This exception does not
++   however invalidate any other reasons why the executable file might be
++   covered by the GNU General Public License.  */
++
++#include "list.h"
++#ifdef HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
++#include <stdlib.h>
++
++/* Return a cons cell produced from (head . tail) */
++
++INLINE LinkedList* 
++list_cons(void* head, LinkedList* tail)
++{
++  LinkedList* cell;
++
++  cell = (LinkedList*)malloc(sizeof(LinkedList));
++  cell->head = head;
++  cell->tail = tail;
++  return cell;
++}
++
++/* Return the length of a list, list_length(NULL) returns zero */
++
++INLINE int
++list_length(LinkedList* list)
++{
++  int i = 0;
++  while(list)
++    {
++      i += 1;
++      list = list->tail;
++    }
++  return i;
++}
++
++/* Return the Nth element of LIST, where N count from zero.  If N 
++   larger than the list length, NULL is returned  */
++
++INLINE void*
++list_nth(int index, LinkedList* list)
++{
++  while(index-- != 0)
++    {
++      if(list->tail)
++	list = list->tail;
++      else
++	return 0;
++    }
++  return list->head;
++}
++
++/* Remove the element at the head by replacing it by its successor */
++
++INLINE void
++list_remove_head(LinkedList** list)
++{
++  if (!*list) return;  
++  if ((*list)->tail)
++    {
++      LinkedList* tail = (*list)->tail; /* fetch next */
++      *(*list) = *tail;		/* copy next to list head */
++      free(tail);			/* free next */
++    }
++  else				/* only one element in list */
++    {
++      free(*list);
++      (*list) = 0;
++    }
++}
++
++
++/* Remove the element with `car' set to ELEMENT */
++/*
++INLINE void
++list_remove_elem(LinkedList** list, void* elem)
++{
++  while (*list)
++    {
++      if ((*list)->head == elem)
++        list_remove_head(list);
++      *list = (*list ? (*list)->tail : NULL);
++    }
++}*/
++
++INLINE LinkedList *
++list_remove_elem(LinkedList* list, void* elem)
++{
++    LinkedList *tmp;
++    
++    if (list) {
++	if (list->head == elem) {
++	    tmp = list->tail;
++	    free(list);
++	    return tmp;
++	}
++	list->tail = list_remove_elem(list->tail, elem);
++	return list;
++    }
++    return NULL;
++}
++
++
++/* Return element that has ELEM as car */
++
++INLINE LinkedList*
++list_find(LinkedList* list, void* elem)
++{
++  while(list)
++    {
++    if (list->head == elem)
++      return list;
++    list = list->tail;
++    }
++  return NULL;
++}
++
++/* Free list (backwards recursive) */
++
++INLINE void
++list_free(LinkedList* list)
++{
++  if(list)
++    {
++      list_free(list->tail);
++      free(list);
++    }
++}
++
++/* Map FUNCTION over all elements in LIST */
++
++INLINE void
++list_mapcar(LinkedList* list, void(*function)(void*))
++{
++  while(list)
++    {
++      (*function)(list->head);
++      list = list->tail;
++    }
++}
+diff -Naur wminet-3.0.0.orig/src/list.h wminet-3.0.0/src/list.h
+--- wminet-3.0.0.orig/src/list.h	2001-11-24 12:03:32.000000000 +0100
++++ wminet-3.0.0/src/list.h	2016-01-04 13:45:02.137642820 +0100
+@@ -29,31 +29,25 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-plugins/wminet/metadata.xml b/x11-plugins/wminet/metadata.xml
new file mode 100644
index 000000000000..15cf1ffec3e6
--- /dev/null
+++ b/x11-plugins/wminet/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+WMiNET is a dockable applet for monitoring all your inet daemon activity, it's 
+designed for WindowMaker's dock, but of course, it works with other 
+windowmanagers too.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wminet/wminet-3.0.0-r2.ebuild b/x11-plugins/wminet/wminet-3.0.0-r2.ebuild
new file mode 100644
index 000000000000..e4fc9ee0d5ad
--- /dev/null
+++ b/x11-plugins/wminet/wminet-3.0.0-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="dockapp for monitoring internet connections to and from your computer"
+HOMEPAGE="http://www.improbability.net/#wminet"
+SRC_URI="http://www.improbability.net/wmdock//${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=( "${FILESDIR}"/${P}-list.patch )
+
+DOCS=( AUTHORS ChangeLog NEWS README wminetrc )
+
+src_compile() {
+	tc-export CC
+	emake LDFLAGS="${LDFLAGS}"
+}
diff --git a/x11-plugins/wmitime/Manifest b/x11-plugins/wmitime/Manifest
new file mode 100644
index 000000000000..741c81951815
--- /dev/null
+++ b/x11-plugins/wmitime/Manifest
@@ -0,0 +1 @@
+DIST wmitime-0.5.tar.gz 15099 BLAKE2B 5e5197054d8dd716550235709b86bc4a6de707d04c61a9492e7dd7405dc0940cc2f3b637ce542059f549a512e19fd1b72047fbd4ad29de46c936d6c07af91daa SHA512 ae7d36eaf92e1a5f7481fc92685b87c2ee1092e73ed85450686b0c22e3502cd2ff82787a24bf396bf346d6e3bdb3950306fd237ea750c4ada87f0b56d3b23cab
diff --git a/x11-plugins/wmitime/metadata.xml b/x11-plugins/wmitime/metadata.xml
new file mode 100644
index 000000000000..f2107a1af5fe
--- /dev/null
+++ b/x11-plugins/wmitime/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+WMitime is an (overglorified) clock for the Windowmaker/Afterstep dock. It 
+displays standard 12/24 hour time and date, as well as Swatch's new internet 
+time.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmitime/wmitime-0.5-r1.ebuild b/x11-plugins/wmitime/wmitime-0.5-r1.ebuild
new file mode 100644
index 000000000000..c6fb25531b12
--- /dev/null
+++ b/x11-plugins/wmitime/wmitime-0.5-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Overglorified clock dockapp w/time, date, and internet time"
+HOMEPAGE="https://www.dockapps.net/wmitime"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	einstalldocs
+}
diff --git a/x11-plugins/wmix/Manifest b/x11-plugins/wmix/Manifest
new file mode 100644
index 000000000000..bf77a69bdd0e
--- /dev/null
+++ b/x11-plugins/wmix/Manifest
@@ -0,0 +1,3 @@
+DIST wmix-3.2.tar.gz 33504 BLAKE2B cafc6d4d1d52094edc459db8ab82b46ea0a216ca8035a2882be7ab2dba6945c155a73c2fc3601e9697076f8cf032b7943617680fd70ef889590a9976c2b147a8 SHA512 8382ab849aeacfc88d28cd094c0d9a3218f8aa26b763d9fb4fd8b9837c275a835cc3e29df0659c244fa94b884ebc36b571fe824eaa785a736e630dc2e0081417
+DIST wmix-3.4.tar.gz 116220 BLAKE2B 01aac1603c34298d9b4aa45ec3425ec52e75965634f6c64ae554c44b95a9bea08021527519fe15729f103d2b8aa93757d6dbabbc2223b35cbb37520554fdfa2b SHA512 791e0f22c73d48fd97ce59a0a8d740a2647626fd6d5f172238ae41abac700fb40d7cd95e28463199fd20d14eae3807428949b78c095ee5bd0a347c26aaed1e75
+DIST wmix-3.5.tar.gz 118052 BLAKE2B 54461c59d46a2ccf7f81aaf422b9e9fadf260001621396543deb996cb346a1dea5d100b38517b79974acc4d429d6a2f4fcde10e88d114e9f6978d1c0bb599d2e SHA512 ca702368cd5db55958e5f25c9703bf6659987534795fe58fd1ade426220f468ae3979e98ed1a00ffa162b094e53e37974d626a6bc48e2f6099c8c6eaa1f3dfd6
diff --git a/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch b/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch
new file mode 100644
index 000000000000..4e91a1a53d78
--- /dev/null
+++ b/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch
@@ -0,0 +1,89 @@
+diff -Naur wmix-3.4.orig/include/mixer.h wmix-3.4/include/mixer.h
+--- wmix-3.4.orig/include/mixer.h	2018-04-30 14:17:50.000000000 +0200
++++ wmix-3.4/include/mixer.h	2020-01-29 19:07:14.932404252 +0100
+@@ -55,28 +55,28 @@
+  * - Muting must occur independently of the volume level.
+  */
+ 
+-void (*mixer_init)(const char *mixer_device,
++extern void (*mixer_init)(const char *mixer_device,
+                    bool verbose,
+                    const char *exclude[]);
+-bool (*mixer_is_changed)(void);
+-int (*mixer_get_channel_count)(void);
+-int (*mixer_get_channel)(void);
+-const char *(*mixer_get_channel_name)(void);
+-const char *(*mixer_get_short_name)(void);
+-void (*mixer_set_channel)(int channel);
+-void (*mixer_set_channel_rel)(int delta_channel);
+-float (*mixer_get_volume)(void);
+-void (*mixer_set_volume)(float volume);
+-void (*mixer_set_volume_rel)(float delta_volume);
+-float (*mixer_get_balance)(void);
+-void (*mixer_set_balance)(float balance);
+-void (*mixer_set_balance_rel)(float delta_balance);
+-void (*mixer_toggle_mute)(void);
+-void (*mixer_toggle_rec)(void);
+-bool (*mixer_is_muted)(void);
+-bool (*mixer_is_stereo)(void);
+-bool (*mixer_is_rec)(void);
+-bool (*mixer_can_rec)(void);
+-bool (*is_exclude)(const char *short_name,
++extern bool (*mixer_is_changed)(void);
++extern int (*mixer_get_channel_count)(void);
++extern int (*mixer_get_channel)(void);
++extern const char *(*mixer_get_channel_name)(void);
++extern const char *(*mixer_get_short_name)(void);
++extern void (*mixer_set_channel)(int channel);
++extern void (*mixer_set_channel_rel)(int delta_channel);
++extern float (*mixer_get_volume)(void);
++extern void (*mixer_set_volume)(float volume);
++extern void (*mixer_set_volume_rel)(float delta_volume);
++extern float (*mixer_get_balance)(void);
++extern void (*mixer_set_balance)(float balance);
++extern void (*mixer_set_balance_rel)(float delta_balance);
++extern void (*mixer_toggle_mute)(void);
++extern void (*mixer_toggle_rec)(void);
++extern bool (*mixer_is_muted)(void);
++extern bool (*mixer_is_stereo)(void);
++extern bool (*mixer_is_rec)(void);
++extern bool (*mixer_can_rec)(void);
++extern bool (*is_exclude)(const char *short_name,
+                    const char *exclude[]);
+-void (*mixer_tick)(void);
++extern void (*mixer_tick)(void);
+diff -Naur wmix-3.4.orig/wmix.c wmix-3.4/wmix.c
+--- wmix-3.4.orig/wmix.c	2019-07-12 18:44:38.000000000 +0200
++++ wmix-3.4/wmix.c	2020-01-29 19:06:52.685402994 +0100
+@@ -53,6 +53,31 @@
+ static int mouse_drag_home_y;
+ static int idle_loop;
+ 
++void (*mixer_init)(const char *mixer_device,
++                   bool verbose,
++                   const char *exclude[]);
++bool (*mixer_is_changed)(void);
++int (*mixer_get_channel_count)(void);
++int (*mixer_get_channel)(void);
++const char *(*mixer_get_channel_name)(void);
++const char *(*mixer_get_short_name)(void);
++void (*mixer_set_channel)(int channel);
++void (*mixer_set_channel_rel)(int delta_channel);
++float (*mixer_get_volume)(void);
++void (*mixer_set_volume)(float volume);
++void (*mixer_set_volume_rel)(float delta_volume);
++float (*mixer_get_balance)(void);
++void (*mixer_set_balance)(float balance);
++void (*mixer_set_balance_rel)(float delta_balance);
++void (*mixer_toggle_mute)(void);
++void (*mixer_toggle_rec)(void);
++bool (*mixer_is_muted)(void);
++bool (*mixer_is_stereo)(void);
++bool (*mixer_is_rec)(void);
++bool (*mixer_can_rec)(void);
++bool (*is_exclude)(const char *short_name,
++                   const char *exclude[]);
++void (*mixer_tick)(void);
+ /* local stuff */
+ static void signal_catch(int sig);
+ static void button_press_event(XButtonEvent *event);
diff --git a/x11-plugins/wmix/files/wmix.1 b/x11-plugins/wmix/files/wmix.1
new file mode 100644
index 000000000000..afd65224bbe5
--- /dev/null
+++ b/x11-plugins/wmix/files/wmix.1
@@ -0,0 +1,68 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\"
+.\" This documentation may be distributed under the terms of
+.\" the GNU General Public Licence version 2.
+.\"
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH wmix 1 "Jul 19, 2004" "Michele Noberasco"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+wmix \- Dockapp mixer for OSS or ALSA
+
+
+.SH SYNOPSIS
+.B wmix
+.RI "{ " options " }"
+
+
+.SH DESCRIPTION
+.B wmix
+Dockapp mixer for OSS or ALSA. Allows toggling record source,
+muting individual channels, adjusting volume and balance, all in a
+compact dockapp size, with TV\-like on\-screen\-display for volume levels.
+.LP 
+Supports mousewheel to adjust current channelvolume
+and can be controlled remotely with SIGUSR1 / SIGUSR2 to adjust the volume.
+Keeps a simple configuration file for user\-defined settings.
+
+
+.SH OPTIONS
+.TP 
+.BI "\-d " dsp
+Connect to remote X display.
+.TP 
+.BI "\-f " file
+Use alternate config file (default is \fI~/.wmixrc\fP)
+.TP 
+.BI "\-m " dev
+Use this mixer device (default  is \fI/dev/mixer\fP)
+.TP 
+.BI "\-h"
+Display list of command line options.
+.TP 
+.BI "\-v"
+Use verbose output messages.
+.TP 
+.BI "\-e " name
+Exclude a channel, can be used many times.
+
+
+.SH AUTHORS
+wmix was written by <timecop@japan.co.jp> and <skunk@mit.edu>
+.LP 
+This man page was written by Fredrik Steen <stone@debian.org> for the Debian
+distribution. Updated and fixed by Michele Noberasco <s4t4n@gentoo.org>
+for the Gentoo distribution.
diff --git a/x11-plugins/wmix/metadata.xml b/x11-plugins/wmix/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmix/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmix/wmix-3.2.ebuild b/x11-plugins/wmix/wmix-3.2.ebuild
new file mode 100644
index 000000000000..6164f74253cb
--- /dev/null
+++ b/x11-plugins/wmix/wmix-3.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Dockapp mixer for OSS or ALSA"
+HOMEPAGE="https://www.dockapps.net/wmix"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S=${WORKDIR}/dockapps
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman "${FILESDIR}"/${PN}.1
+	dodoc AUTHORS BUGS NEWS README sample.wmixrc
+}
diff --git a/x11-plugins/wmix/wmix-3.4.ebuild b/x11-plugins/wmix/wmix-3.4.ebuild
new file mode 100644
index 000000000000..5f69dde7b3ac
--- /dev/null
+++ b/x11-plugins/wmix/wmix-3.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Dockapp mixer for OSS or ALSA"
+HOMEPAGE="https://www.dockapps.net/wmix"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
diff --git a/x11-plugins/wmix/wmix-3.5.ebuild b/x11-plugins/wmix/wmix-3.5.ebuild
new file mode 100644
index 000000000000..a1206be91a66
--- /dev/null
+++ b/x11-plugins/wmix/wmix-3.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Dockapp mixer for OSS or ALSA"
+HOMEPAGE="https://www.dockapps.net/wmix"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-plugins/wmlife/Manifest b/x11-plugins/wmlife/Manifest
new file mode 100644
index 000000000000..feb4fad36561
--- /dev/null
+++ b/x11-plugins/wmlife/Manifest
@@ -0,0 +1 @@
+DIST wmlife-1.0.1.tar.gz 92142 BLAKE2B 8f5415ef2cc30e1ac58bb3c93aa764290ef28da8d2919cfb15c644070e0cfa8f3bd5e3bdef0f8ab06f01f40ab62af2611242fe58c95a492d85ab018f387fbe77 SHA512 07cf6428e4d103e203b2e228e35bea13fe580de674d0ea61ab227e5e9bbc406495dbe0f2b7d6647b5d48930cc2d4c3fc097da115995619fdf25a7367b4fd9e84
diff --git a/x11-plugins/wmlife/files/wmlife-1.0.0-stringh.patch b/x11-plugins/wmlife/files/wmlife-1.0.0-stringh.patch
new file mode 100644
index 000000000000..8994827d63eb
--- /dev/null
+++ b/x11-plugins/wmlife/files/wmlife-1.0.0-stringh.patch
@@ -0,0 +1,11 @@
+diff -ur wmlife-1.0.0.orig/src/session.c wmlife-1.0.0/src/session.c
+--- wmlife-1.0.0.orig/src/session.c	2005-09-23 00:18:09.000000000 +0300
++++ wmlife-1.0.0/src/session.c	2008-01-12 14:39:52.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <pwd.h>
+ 
diff --git a/x11-plugins/wmlife/files/wmlife-1.0.1-configure.patch b/x11-plugins/wmlife/files/wmlife-1.0.1-configure.patch
new file mode 100644
index 000000000000..35ba4029554f
--- /dev/null
+++ b/x11-plugins/wmlife/files/wmlife-1.0.1-configure.patch
@@ -0,0 +1,11 @@
+diff -Naur wmlife-1.0.0-orig/configure.in wmlife-1.0.0/configure.in
+--- wmlife-1.0.0-orig/configure.in	2005-09-23 00:18:09.000000000 +0300
++++ wmlife-1.0.0/configure.in	2014-04-28 23:52:09.701103219 +0300
+@@ -38,6 +38,6 @@
+ AC_CACHE_CHECK([for gdk2 libs], GDKLIBS, [GDKLIBS=`$config --libs gtk+-2.0 | sed -e "s/-lgtk-x11-2.0//g" -e "s/-latk-1.0//g"`])
+ 
+ CFLAGS="$CFLAGS $GDKINCS"
+-LDFLAGS="$LDFLAGS $GDKLIBS"
++LDFLAGS="$LDFLAGS $GDKLIBS -lm"
+ 
+ AC_OUTPUT(Makefile src/Makefile)
diff --git a/x11-plugins/wmlife/metadata.xml b/x11-plugins/wmlife/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmlife/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmlife/wmlife-1.0.1-r1.ebuild b/x11-plugins/wmlife/wmlife-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..d3e3ba865bcc
--- /dev/null
+++ b/x11-plugins/wmlife/wmlife-1.0.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="dockapp running Conway's Game of Life (and program launcher)"
+HOMEPAGE="http://www.improbability.net/#wmlife"
+SRC_URI="http://www.improbability.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.0-stringh.patch
+	"${FILESDIR}"/${P}-configure.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-session
+}
diff --git a/x11-plugins/wmload/Manifest b/x11-plugins/wmload/Manifest
new file mode 100644
index 000000000000..5cf3c25f20f4
--- /dev/null
+++ b/x11-plugins/wmload/Manifest
@@ -0,0 +1 @@
+DIST wmload-0.9.7.tar.gz 17648 BLAKE2B 418b18390035eec14fdd2d715519aff0807c7c5171448818e113ebe27ba908c5416baaa2e605daf3701c7acac6cde6d76c2b26a85f8cae18efd95b000d0e510a SHA512 5d08f34013c23c85de88adbfeca31e8399f0f9ce5573845aa50c1f4a06488d729de637b1d0f8b5739194b30ba8e085d40022926a3a8328d3cdab462f9e649801
diff --git a/x11-plugins/wmload/files/wmload-0.9.6-solaris.patch b/x11-plugins/wmload/files/wmload-0.9.6-solaris.patch
new file mode 100644
index 000000000000..ec5e4c84abb2
--- /dev/null
+++ b/x11-plugins/wmload/files/wmload-0.9.6-solaris.patch
@@ -0,0 +1,132 @@
+* original: http://www.rampant.org/~dp/software/wmload.solaris.patch
+
+--- a/wmload.c
++++ b/wmload.c
+@@ -6,6 +6,11 @@
+ #include <math.h>
+ #include <fcntl.h>
+ #include <X11/Xatom.h>
++#ifdef sun
++#include <sys/types.h>
++#include <sys/sysinfo.h>
++#include <kstat.h>
++#endif
+ 
+ #include "back.xpm"
+ #include "mask2.xbm"
+@@ -410,6 +415,107 @@
+     return (char *)p;
+ }
+ 
++#ifdef sun
++
++static kstat_ctl_t *kc;
++static kstat_t **cpu_ksp_list;
++static int ncpus;
++
++void
++cpu_stats_init()
++{
++	int i = 0;
++	kstat_t *ksp;
++	static int kstats_ready = 0;
++
++	if (!kstats_ready) {
++		if ((kc = kstat_open()) == NULL) {
++		      fprintf(stderr,"wmload: can't open /dev/kstat\n");
++		      exit (1);
++		}
++		kstats_ready = 1;
++	}
++
++	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
++                if (strcmp(ksp->ks_module, "cpu_stat") == 0)
++			i++;
++	}
++
++	if (cpu_ksp_list) {
++		free(cpu_ksp_list);
++	}
++	cpu_ksp_list = (kstat_t **) calloc(i * sizeof (kstat_t *), 1); 
++	ncpus = i;
++
++	/*
++	 * stash the ksp for each CPU.
++	 */
++	i = 0;
++	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
++                if (strcmp(ksp->ks_module, "cpu_stat") == 0) {
++			cpu_ksp_list[i] = ksp;
++			i++;
++		}
++	}
++}
++
++int
++get_cpu_stats()
++{
++	int i;
++	cpu_stat_t stat;
++	static int firsttime = 1;
++
++	if (firsttime) {
++		firsttime = 0;
++		return (1);	/* force code to go initialize kstat stuff */
++	}
++
++	/*
++	 * Read each cpu's data.  If the chain has changed (a state change
++	 * has happened, maybe a new cpu was added to the system), then
++	 * return 1.  This will cause the code to reinitialize the cpu_ksp_list
++	 * array.  word.
++	 */
++	cp_time[0] = cp_time[1] = cp_time[2] = cp_time[3] = 0;
++	for (i = 0; i < ncpus; i++) {
++		if (kstat_read(kc, cpu_ksp_list[i], (void *) &stat) == -1)
++			return (1);
++		cp_time[0] += stat.cpu_sysinfo.cpu[CPU_USER]; /* user */
++		cp_time[1] += stat.cpu_sysinfo.cpu[CPU_WAIT]; /* "nice" */
++		cp_time[2] += stat.cpu_sysinfo.cpu[CPU_KERNEL]; /* sys */
++		cp_time[3] += stat.cpu_sysinfo.cpu[CPU_IDLE]; /* idle ("free")*/
++	}
++	return (0);
++}
++
++void GetLoad(int Maximum, int *usr, int *nice, int *sys, int *free)
++{
++  int total;
++
++  while (get_cpu_stats() != 0) {
++	  cpu_stats_init();
++  }
++
++  *usr  = cp_time[0] - last[0];
++  *nice = cp_time[1] - last[1];
++  *sys  = cp_time[2] - last[2];
++  *free = cp_time[3] - last[3];
++
++  /* printf("[%d %d %d %d]\n", *usr, *nice, *sys, *free); */
++
++  total = *usr + *nice + *sys + *free;
++  last[0] = cp_time[0];
++  last[1] = cp_time[1];
++  last[2] = cp_time[2];
++  last[3] = cp_time[3];
++
++  *usr = rint(Maximum * (float)(*usr)   /total);
++  *nice =rint(Maximum * (float)(*nice)  /total);
++  *sys = rint(Maximum * (float)(*sys)   /total);
++  *free = rint(Maximum * (float)(*free) /total);
++}
++#else /* sun */
+ void GetLoad(int Maximum, int *usr, int *nice, int *sys, int *free)
+ { 
+   char buffer[100];/*[4096+1];*/
+@@ -445,6 +551,7 @@
+   *sys = rint(Maximum * (float)(*sys)   /total);
+   *free = rint(Maximum * (float)(*free) /total);
+ }
++#endif
+ 
+ void InsertLoad()
+ {
diff --git a/x11-plugins/wmload/files/wmload.desktop b/x11-plugins/wmload/files/wmload.desktop
new file mode 100644
index 000000000000..b9b02e9dc2a4
--- /dev/null
+++ b/x11-plugins/wmload/files/wmload.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=WmLoad
+Comment=Simple network monitor
+Comment[pl]=Prosty monitor sieci
+Exec=wmload
+Type=Application
+Terminal=false
+Categories=System;
diff --git a/x11-plugins/wmload/metadata.xml b/x11-plugins/wmload/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmload/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmload/wmload-0.9.7-r1.ebuild b/x11-plugins/wmload/wmload-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..3b438d697b05
--- /dev/null
+++ b/x11-plugins/wmload/wmload-0.9.7-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="yet another dock application showing a system load gauge"
+HOMEPAGE="https://www.dockapps.net/wmload"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.6-solaris.patch )
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+
+	dodoc README
+	domenu "${FILESDIR}"/${PN}.desktop
+}
diff --git a/x11-plugins/wmlongrun/Manifest b/x11-plugins/wmlongrun/Manifest
new file mode 100644
index 000000000000..89a5ad767bb1
--- /dev/null
+++ b/x11-plugins/wmlongrun/Manifest
@@ -0,0 +1 @@
+DIST wmlongrun-0.3.1.tar.gz 147511 BLAKE2B ec7c2852dc4272f21f633f9c168901d14ee372f706870a7b7c4a712aba87fc07210daf686367be35d0a156a23bd884f975a9f7301ea620a77adf909a445e8362 SHA512 8bbd6b50ef566f5a7e1cc5f3f183ba74c43fa39accdb5c740e5a6f00a62c1f1c2298053705a24f2f6c8adabd99465be85d927fb9dd45899a65a5efa936fc2f56
diff --git a/x11-plugins/wmlongrun/metadata.xml b/x11-plugins/wmlongrun/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmlongrun/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmlongrun/wmlongrun-0.3.1.ebuild b/x11-plugins/wmlongrun/wmlongrun-0.3.1.ebuild
new file mode 100644
index 000000000000..1609296d7367
--- /dev/null
+++ b/x11-plugins/wmlongrun/wmlongrun-0.3.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A dockapp to monitor LongRun on a Transmeta Crusoe processor"
+HOMEPAGE="https://www.dockapps.net/wmlongrun"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
diff --git a/x11-plugins/wmmaiload/Manifest b/x11-plugins/wmmaiload/Manifest
new file mode 100644
index 000000000000..36a127f866d1
--- /dev/null
+++ b/x11-plugins/wmmaiload/Manifest
@@ -0,0 +1,2 @@
+DIST wmmaiload-2.2.1.tar.gz 183538 BLAKE2B 5859051ca2040399d1cc3db863e89a1d779a22f9c47a171c11e5bfee6a835b03eaaaa7f47ef95ddc9cb29a24b914e84a4b448600a001959ab5471afa409ec646 SHA512 2f4cd4980feefb1022384880a57aea628d3e976dad7d1c838a23dbeb8bf86df6c061c14661bb562e36c51e2ca40d5f9ed3d465d9d26b9c7b9193fe448dbb9394
+DIST wmmaiload-2.3.0.tar.bz2 42852 BLAKE2B abee44716ff74e48a480881c3327bc4a4f02600044a587b3322429567a3454f01c733542fbaa42cb074a2da48ecd1c453d19ed42c30efc04e634c44330d729d3 SHA512 c4e63eb2868474e3b76f5f4f401bdd23172f23dfdb0e90712e3eca607494057e067805b83a53490d38b6f7b2c876e2ec8fdb1d95b871d3febeeda35369550de9
diff --git a/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-checkthread.patch b/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-checkthread.patch
new file mode 100644
index 000000000000..941cb03ae3bb
--- /dev/null
+++ b/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-checkthread.patch
@@ -0,0 +1,17 @@
+--- wmmaiload-2.2.1.orig/wmmaiload/checkthread.c	2010-08-31 15:43:37.000000000 +0200
++++ wmmaiload-2.2.1/wmmaiload/checkthread.c.new	2010-08-31 15:43:46.000000000 +0200
+@@ -101,14 +101,6 @@
+ #endif /* HAVE_MH */
+ 
+ 
+-#ifndef _GNU_SOURCE
+-int isblank(int c)
+-{
+-        return (c == ' ' || c == '\t');
+-}
+-#endif
+-
+-
+ #ifdef HAVE_MBOX
+ static Bool check_mbox(MailBox *box, time_t now)
+ {
diff --git a/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch b/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch
new file mode 100644
index 000000000000..38c8625e51ac
--- /dev/null
+++ b/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch
@@ -0,0 +1,157 @@
+diff -ur wmmaiload-2.2.1.orig/wmmaiload/dockapp.c wmmaiload-2.2.1/wmmaiload/dockapp.c
+--- wmmaiload-2.2.1.orig/wmmaiload/dockapp.c	2005-07-12 22:39:47.000000000 +0300
++++ wmmaiload-2.2.1/wmmaiload/dockapp.c	2008-01-12 11:53:00.000000000 +0200
+@@ -27,6 +27,7 @@
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ 
+ #define WINDOWED_SIZE_W 64
+ #define WINDOWED_SIZE_H 64
+diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/actions.c wmmaiload-2.2.1/wmmaiload-config/actions.c
+--- wmmaiload-2.2.1.orig/wmmaiload-config/actions.c	2005-07-13 22:54:46.000000000 +0300
++++ wmmaiload-2.2.1/wmmaiload-config/actions.c	2008-01-12 11:54:15.000000000 +0200
+@@ -3,6 +3,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <string.h>
+ #include "defines.h"
+ #include "variables.h"
+ #include "dialogs.h"
+diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/dialogs.c wmmaiload-2.2.1/wmmaiload-config/dialogs.c
+--- wmmaiload-2.2.1.orig/wmmaiload-config/dialogs.c	2005-07-07 21:54:17.000000000 +0300
++++ wmmaiload-2.2.1/wmmaiload-config/dialogs.c	2008-01-12 11:47:42.000000000 +0200
+@@ -38,7 +38,6 @@
+                            bouton, TRUE, TRUE, 0);
+         GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
+         gtk_widget_grab_default(GTK_WIDGET(bouton));
+-        gtk_widget_draw_default(GTK_WIDGET(bouton));
+         gtk_widget_show(bouton);
+ 
+         bouton = gtk_button_new_with_label("No");
+@@ -97,7 +96,6 @@
+                            bouton, TRUE, TRUE, 0);
+         GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
+         gtk_widget_grab_default(GTK_WIDGET(bouton));
+-        gtk_widget_draw_default(GTK_WIDGET(bouton));
+         gtk_widget_show(bouton);
+ 
+         gtk_container_set_border_width(GTK_CONTAINER
+diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/Init.make wmmaiload-2.2.1/wmmaiload-config/Init.make
+--- wmmaiload-2.2.1.orig/wmmaiload-config/Init.make	2005-08-26 21:37:33.000000000 +0300
++++ wmmaiload-2.2.1/wmmaiload-config/Init.make	2008-01-12 11:48:12.000000000 +0200
+@@ -35,9 +35,9 @@
+ #
+ 
+ CROSS_COMPILE =
+-USER_CPPFLAGS = `gtk-config --cflags`
++USER_CPPFLAGS = `pkg-config gtk+-2.0 --cflags`
+ USER_CFLAGS   =
+-USER_LDFLAGS  = `gtk-config --libs` -lX11
++USER_LDFLAGS  = `pkg-config gtk+-2.0 --libs` -lX11
+ 
+ 
+ #*****************************************************************
+Only in wmmaiload-2.2.1/wmmaiload-config: Init.make.orig
+diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/main.c wmmaiload-2.2.1/wmmaiload-config/main.c
+--- wmmaiload-2.2.1.orig/wmmaiload-config/main.c	2005-07-13 22:51:28.000000000 +0300
++++ wmmaiload-2.2.1/wmmaiload-config/main.c	2008-01-12 11:54:01.000000000 +0200
+@@ -3,6 +3,8 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <gtk/gtk.h>
+ #include "config.h"
+ #include "defines.h"
+diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/mainwindow.c wmmaiload-2.2.1/wmmaiload-config/mainwindow.c
+--- wmmaiload-2.2.1.orig/wmmaiload-config/mainwindow.c	2005-07-13 22:51:52.000000000 +0300
++++ wmmaiload-2.2.1/wmmaiload-config/mainwindow.c	2008-01-12 11:47:42.000000000 +0200
+@@ -10,9 +10,9 @@
+ #include "actions.h"
+ 
+ 
+-static GtkWidget *edit;
+-static GtkWidget *set;
+-static GtkWidget *remove;
++static GtkWidget *b_edit;
++static GtkWidget *b_set;
++static GtkWidget *b_remove;
+ 
+ static gint list_sel_cb (GtkCList *clist,
+                          gint row,
+@@ -21,9 +21,9 @@
+                          void *data)
+ {
+         selected_row = row;
+-        gtk_widget_set_sensitive(edit, TRUE);
+-        gtk_widget_set_sensitive(set, TRUE);
+-        gtk_widget_set_sensitive(remove, TRUE);
++        gtk_widget_set_sensitive(b_edit, TRUE);
++        gtk_widget_set_sensitive(b_set, TRUE);
++        gtk_widget_set_sensitive(b_remove, TRUE);
+         return TRUE;
+ }
+ 
+@@ -35,9 +35,9 @@
+                     void *data)
+ {
+         selected_row = -1;
+-        gtk_widget_set_sensitive(edit, FALSE);
+-        gtk_widget_set_sensitive(set, FALSE);
+-        gtk_widget_set_sensitive(remove, FALSE);
++        gtk_widget_set_sensitive(b_edit, FALSE);
++        gtk_widget_set_sensitive(b_set, FALSE);
++        gtk_widget_set_sensitive(b_remove, FALSE);
+         return TRUE;
+ }
+ 
+@@ -230,7 +230,7 @@
+         gtk_table_attach_defaults(GTK_TABLE(table), bouton, 0, 1, 0, 1);
+         gtk_widget_set_sensitive(bouton, FALSE);
+         gtk_widget_show(bouton);
+-        edit = bouton;
++        b_edit = bouton;
+ 
+         bouton = gtk_button_new_with_label(" Set default ");
+         gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
+@@ -238,7 +238,7 @@
+         gtk_table_attach_defaults(GTK_TABLE(table), bouton, 1, 2, 0, 1);
+         gtk_widget_set_sensitive(bouton, FALSE);
+         gtk_widget_show(bouton);
+-        set = bouton;
++        b_set = bouton;
+ 
+         bouton = gtk_button_new_with_label(" Remove box ");
+         gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
+@@ -246,7 +246,7 @@
+         gtk_table_attach_defaults(GTK_TABLE(table), bouton, 2, 3, 0, 1);
+         gtk_widget_set_sensitive(bouton, FALSE);
+         gtk_widget_show(bouton);
+-        remove = bouton;
++        b_remove = bouton;
+ 
+         /*--- Frame 5 ---*/
+         frame = gtk_frame_new(NULL);
+@@ -322,7 +322,6 @@
+         gtk_box_pack_start(GTK_BOX(buttons_hbox), bouton, TRUE, TRUE, 0);
+         GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
+         gtk_widget_grab_default(GTK_WIDGET(bouton));
+-        gtk_widget_draw_default(GTK_WIDGET(bouton));
+         gtk_widget_show(bouton);
+ 
+         bouton = gtk_button_new_with_label(" Cancel ");
+diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/popedit.c wmmaiload-2.2.1/wmmaiload-config/popedit.c
+--- wmmaiload-2.2.1.orig/wmmaiload-config/popedit.c	2005-07-07 21:54:17.000000000 +0300
++++ wmmaiload-2.2.1/wmmaiload-config/popedit.c	2008-01-12 11:47:42.000000000 +0200
+@@ -68,7 +68,6 @@
+                            bouton, TRUE, TRUE, 0);
+         GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
+         gtk_widget_grab_default(GTK_WIDGET(bouton));
+-        gtk_widget_draw_default(GTK_WIDGET(bouton));
+         gtk_widget_show(bouton);
+ 
+         bouton = gtk_button_new_with_label("Cancel");
diff --git a/x11-plugins/wmmaiload/metadata.xml b/x11-plugins/wmmaiload/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmmaiload/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmmaiload/wmmaiload-2.2.1-r1.ebuild b/x11-plugins/wmmaiload/wmmaiload-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..322a9b74c0be
--- /dev/null
+++ b/x11-plugins/wmmaiload/wmmaiload-2.2.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="dockapp that monitors one or more mailboxes"
+HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
+SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gtk.patch \
+		"${FILESDIR}"/${P}-checkthread.patch
+	sed -i -e "s/-lssl/\0 -lcrypto/" wmmaiload/Init.make || die "sed failed"
+}
+
+src_configure() {
+	# The ./configure script is not autoconf based, therefore don't use econf:
+	./configure -p /usr || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		DEBUG_LDFLAGS="" \
+		LDFLAGS="${LDFLAGS}" \
+		DEBUG_CFLAGS=""
+}
+
+src_install() {
+	dobin ${PN}/${PN} ${PN}-config/${PN}-config
+	doman doc/*.1
+	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO doc/sample.${PN}rc
+}
diff --git a/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..f41d82dac80a
--- /dev/null
+++ b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="dockapp that monitors one or more mailboxes"
+HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
+SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2.1-checkthread.patch )
+src_prepare() {
+	sed -i -e "s/-lssl/\0 -lcrypto/" wmmaiload/Init.make || die
+	sed -e "s/SSLv2_client_method/SSLv23_client_method/" \
+		-i wmmaiload/ssl.c || die
+
+	default
+}
+
+src_configure() {
+	# The ./configure script is not autoconf based, therefore don't use econf:
+	./configure -p /usr || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		DEBUG_LDFLAGS="" \
+		LDFLAGS="${LDFLAGS}" \
+		DEBUG_CFLAGS=""
+}
+
+src_install() {
+	dobin ${PN}/${PN} ${PN}-config/${PN}-config
+	doman doc/*.1
+	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO doc/sample.${PN}rc
+}
diff --git a/x11-plugins/wmmand/Manifest b/x11-plugins/wmmand/Manifest
new file mode 100644
index 000000000000..b0ef6f98ce6f
--- /dev/null
+++ b/x11-plugins/wmmand/Manifest
@@ -0,0 +1 @@
+DIST wmMand-1.3.2.tar.bz2 41268 BLAKE2B 75eb252c162d2403e15a7e4df9ed79e0af5d9835c5c6ffc0208ac20f856f148a513f48460aedee7d26053867f464dd1b1c13d3fabbb2151513eab6102dfaefe0 SHA512 03a06c114371bf98037ac8859010fcbd20ec675fdd563b655c1be58a384a48f59d36bcb795759e45dba798af765ae179df1bf591d2ee7fe245069af06c8b5587
diff --git a/x11-plugins/wmmand/files/wmmand-1.3.2-gcc-10.patch b/x11-plugins/wmmand/files/wmmand-1.3.2-gcc-10.patch
new file mode 100644
index 000000000000..3d47e700e681
--- /dev/null
+++ b/x11-plugins/wmmand/files/wmmand-1.3.2-gcc-10.patch
@@ -0,0 +1,39 @@
+diff -Naur wmMand-1.3.2.orig/wmgeneral/wmgeneral.c wmMand-1.3.2/wmgeneral/wmgeneral.c
+--- wmMand-1.3.2.orig/wmgeneral/wmgeneral.c	2006-10-16 20:56:44.000000000 +0200
++++ wmMand-1.3.2/wmgeneral/wmgeneral.c	2020-01-30 01:48:11.662044413 +0100
+@@ -45,6 +45,13 @@
+ Pixel		back_pix, fore_pix;
+ char		*Geometry = "";
+ Pixmap		pixmask;
++Display		*display;
++Window		*Root;
++int			d_depth;
++GC			NormalGC;
++XpmIcon		wmgen;
++Window		iconwin, win;
++
+ 
+   /*****************/
+  /* Mouse Regions */
+diff -Naur wmMand-1.3.2.orig/wmgeneral/wmgeneral.h wmMand-1.3.2/wmgeneral/wmgeneral.h
+--- wmMand-1.3.2.orig/wmgeneral/wmgeneral.h	2006-10-16 20:56:44.000000000 +0200
++++ wmMand-1.3.2/wmgeneral/wmgeneral.h	2020-01-30 01:47:43.262040337 +0100
+@@ -28,12 +28,12 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
+-Window          Root;
+-int		d_depth;
+-GC              NormalGC;
+-XpmIcon         wmgen;
+-Window		iconwin, win;
++extern Display	*display;
++extern Window	*Root;
++extern int		d_depth;
++extern GC		NormalGC;
++extern XpmIcon	wmgen;
++extern Window	iconwin, win;
+ 
+ 
+   /***********************/
diff --git a/x11-plugins/wmmand/metadata.xml b/x11-plugins/wmmand/metadata.xml
new file mode 100644
index 000000000000..7643a537fc2d
--- /dev/null
+++ b/x11-plugins/wmmand/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">wmmand</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild b/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..fb66e91df2b3
--- /dev/null
+++ b/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+MY_P=wmMand-${PV}
+
+DESCRIPTION="a dockable mandelbrot browser"
+HOMEPAGE="https://sourceforge.net/projects/wmmand/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S=${WORKDIR}/${MY_P}/wmMand
+
+DOCS=( ../{BUGS,changelog,TODO} )
+
+src_prepare() {
+	default
+	gunzip wmMand.6.gz || die
+
+	pushd "${WORKDIR}"/${MY_P} || die
+	eapply "${FILESDIR}"/${P}-gcc-10.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
+		SYSTEM="${LDFLAGS}" \
+		INCDIR="" LIBDIR=""
+}
+
+src_install() {
+	dobin wmMand
+	doman wmMand.6
+	doicon wmMand.png
+	einstalldocs
+}
diff --git a/x11-plugins/wmmemload/Manifest b/x11-plugins/wmmemload/Manifest
new file mode 100644
index 000000000000..757b305edad6
--- /dev/null
+++ b/x11-plugins/wmmemload/Manifest
@@ -0,0 +1 @@
+DIST wmmemload-0.1.8.tar.gz 23114 BLAKE2B 3d0a56a6908dc1e0617ea43aa73fc07a294575fce8e3f54b7769d8eda49b134cf292caf8d92930bf8a22e7a4f33080da531403bbea6443333859def6937cfbfe SHA512 7139e92e15371ff493784c0677d6697074d85c5f4457d0c5caa146bf1aef481a4afc31a4b70bf8ec0edcc90390c18e16daa8efff7d418f96c137c72f7c7819f9
diff --git a/x11-plugins/wmmemload/metadata.xml b/x11-plugins/wmmemload/metadata.xml
new file mode 100644
index 000000000000..319cd6684fd8
--- /dev/null
+++ b/x11-plugins/wmmemload/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+wmmemload is a simple dockapp for WindowMaker that displays memory and swap 
+space usage. It is very heavily based on WMMemMon and WMCPULoad.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmmemload/wmmemload-0.1.8-r1.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.8-r1.ebuild
new file mode 100644
index 000000000000..d54315e724c8
--- /dev/null
+++ b/x11-plugins/wmmemload/wmmemload-0.1.8-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="dockapp that displays memory and swap space usage"
+HOMEPAGE="https://www.dockapps.net/wmmemload"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc ppc64 ~sparc x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libICE
+	x11-libs/libXt"
+
+S="${WORKDIR}/dockapps"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/x11-plugins/wmmenu/Manifest b/x11-plugins/wmmenu/Manifest
new file mode 100644
index 000000000000..c6a5139a0376
--- /dev/null
+++ b/x11-plugins/wmmenu/Manifest
@@ -0,0 +1 @@
+DIST wmmenu-1.3.tar.gz 33766 BLAKE2B aaed2a54781a1daa475d0757a4dd97d50e3d200dc72bcc9a7d2c833c6207a73f8f632aa66dc6746f5992edc94cfcb24a722e4dcae06496b9a811577329aeeb98 SHA512 4c8738c9a81d56e084754f4db28da6d3171475b5967ceddaa5646b3d87679112e4f272e1bee2c2a81dd072cc948b3652d843a3ddff9bc31cfac4f787b337e767
diff --git a/x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch b/x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch
new file mode 100644
index 000000000000..bbf18433480c
--- /dev/null
+++ b/x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch
@@ -0,0 +1,19 @@
+--- a/Makefile	2015-04-17 13:43:08.122972280 +0200
++++ b/Makefile	2015-04-17 13:43:11.569975854 +0200
+@@ -14,12 +14,12 @@
+ PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0
+ endif
+ 
+-CC = gcc #-g
+-CFLAGS = -pipe -O2
+-CPPFLAGS = -MMD -ansi -pedantic -Wall
++CC ?= gcc #-g
++CFLAGS ?= -pipe -O2
++CPPFLAGS ?= -MMD -ansi -pedantic -Wall
+ INCDIRS = $(PIXBUF_INC)
+ DEFINES = -DETCDIR='"$(ETCDIR)"' $(PIXBUF_DEF)
+-LDFLAGS = -s
++LDFLAGS ?= -s
+ LIBDIRS = $(PIXBUF_LIB)
+ LDLIBS = -ldockapp -lXpm -lXext -lX11 -lm
+ 
diff --git a/x11-plugins/wmmenu/metadata.xml b/x11-plugins/wmmenu/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmmenu/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild b/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
new file mode 100644
index 000000000000..9022ddb6b31e
--- /dev/null
+++ b/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="a popup menu of icons like in AfterStep, as a dockapp"
+HOMEPAGE="https://www.dockapps.net/wmmenu"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="x11-libs/gdk-pixbuf[X]
+	>=x11-libs/libdockapp-0.7:="
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/dockapps"
+
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
+
+DOCS=( README TODO example/{apps,defaults,extract_icon_back} )
+
+src_prepare() {
+	default
+	sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
+}
+
+src_compile() {
+	emake  CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin wmmenu
+	doman wmmenu.1
+	einstalldocs
+}
diff --git a/x11-plugins/wmmisc/Manifest b/x11-plugins/wmmisc/Manifest
new file mode 100644
index 000000000000..84f02933417d
--- /dev/null
+++ b/x11-plugins/wmmisc/Manifest
@@ -0,0 +1 @@
+DIST wmmisc-1.2.tar.gz 96087 BLAKE2B f48c9dc9afee04de7d437143deb870083e90d01768510b68df2c0e213cfb7ab956696f88d0a76c23a1ff5e5dd5c1d8e5c4640b6766dd7a948d1ad292f2b144fc SHA512 d8ed7c06665c28fb98e2a555c8abfcb7da9e0ae517031d24dce171f8a93775565471176d9dc8905043ae408b23c2f101eaccc364ecd8fa4816d2b529f7922d68
diff --git a/x11-plugins/wmmisc/metadata.xml b/x11-plugins/wmmisc/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmmisc/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmmisc/wmmisc-1.2.ebuild b/x11-plugins/wmmisc/wmmisc-1.2.ebuild
new file mode 100644
index 000000000000..56b299d40804
--- /dev/null
+++ b/x11-plugins/wmmisc/wmmisc-1.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="a monitoring dockapp for system load, user amount, fork amount and processes"
+HOMEPAGE="https://www.dockapps.net/wmmisc"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+
+RDEPEND=">=x11-libs/libdockapp-0.7:="
+DEPEND="${RDEPEND}"
diff --git a/x11-plugins/wmmixer/Manifest b/x11-plugins/wmmixer/Manifest
new file mode 100644
index 000000000000..ac908ad2fc57
--- /dev/null
+++ b/x11-plugins/wmmixer/Manifest
@@ -0,0 +1 @@
+DIST wmmixer-1.8.tar.gz 102723 BLAKE2B 2e64b7c81e97d288e2c48cad01fdee5e4a85effc4e831ca4b0391e4df67faa11f5556c07129740b3d07607251ac8fbb98ffbcc573c888f367e288c338600de93 SHA512 3b5c7f27da6ed2cbf8d06c431584186799d17e72db663db6ffc488f777c31de0b13fcc3f665099925efab036a14e70da4bbbabaff6ffc12280698e91f555e276
diff --git a/x11-plugins/wmmixer/metadata.xml b/x11-plugins/wmmixer/metadata.xml
new file mode 100644
index 000000000000..b37eab6956dc
--- /dev/null
+++ b/x11-plugins/wmmixer/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmmixer/wmmixer-1.8.ebuild b/x11-plugins/wmmixer/wmmixer-1.8.ebuild
new file mode 100644
index 000000000000..e557c839133f
--- /dev/null
+++ b/x11-plugins/wmmixer/wmmixer-1.8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A mixer designed for WindowMaker"
+HOMEPAGE="https://www.dockapps.net/wmmon"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-plugins/wmmon+smp/Manifest b/x11-plugins/wmmon+smp/Manifest
new file mode 100644
index 000000000000..ef5b773998ed
--- /dev/null
+++ b/x11-plugins/wmmon+smp/Manifest
@@ -0,0 +1 @@
+DIST wmmon+smp-1.0.tar.gz 15807 BLAKE2B e58ad4a1a6f9deb33e031f20674cd6ad4d0a558e84906a470a2b2802df1736dfac4f6a9ae0bfc5f36192684f59374d5cd1d5186ef505f9b4da26082d31f9c728 SHA512 9565815c30642a3d12a23960bf6123eafa9379d24a69b2a75794757e89a3b056669fc47a898a5e756871a74502dcab8b76abe5508f2c5474a1fbfc8bdd4e6a94
diff --git a/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-fno-common.patch b/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-fno-common.patch
new file mode 100644
index 000000000000..6ec3ba03520d
--- /dev/null
+++ b/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-fno-common.patch
@@ -0,0 +1,24 @@
+diff -Naur wmmon.app.orig/wmgeneral/wmgeneral.h wmmon.app/wmgeneral/wmgeneral.h
+--- wmmon.app.orig/wmgeneral/wmgeneral.h	1999-06-07 03:09:36.000000000 +0200
++++ wmmon.app/wmgeneral/wmgeneral.h	2020-03-08 12:20:10.345121264 +0100
+@@ -36,7 +36,7 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
+diff -Naur wmmon.app.orig/wmmon/wmmon.c wmmon.app/wmmon/wmmon.c
+--- wmmon.app.orig/wmmon/wmmon.c	1999-06-07 05:49:45.000000000 +0200
++++ wmmon.app/wmmon/wmmon.c	2020-03-08 12:20:18.657124944 +0100
+@@ -19,6 +19,8 @@
+ int	wmmon_mask_width = 64;
+ int	wmmon_mask_height = 64;
+ 
++Display		*display;
++
+ void usage(void);
+ void drawstat(int *, int, int, int, int);
+ void wmmon_routine(int, char **);
diff --git a/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-list.patch b/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-list.patch
new file mode 100644
index 000000000000..19756d5edf21
--- /dev/null
+++ b/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-list.patch
@@ -0,0 +1,127 @@
+diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
+--- a/wmgeneral/list.c	2016-01-04 13:28:36.583339716 +0100
++++ b/wmgeneral/list.c	2016-01-04 13:28:48.694343645 +0100
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail)
+ 
+-INLINE LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned 
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -101,7 +101,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@
+     }
+ 
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -132,7 +132,7 @@
+ 
+ /* Return element that has ELEM as car
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@
+ 
+ /* Free list (backwards recursive)
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
+--- a/wmgeneral/list.h	2016-01-04 13:28:36.583339716 +0100
++++ b/wmgeneral/list.h	2016-01-04 13:28:39.471340654 +0100
+@@ -29,31 +29,25 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-plugins/wmmon+smp/metadata.xml b/x11-plugins/wmmon+smp/metadata.xml
new file mode 100644
index 000000000000..a440b57dd101
--- /dev/null
+++ b/x11-plugins/wmmon+smp/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+WMMon+SMP shows real-time CPU usage on SMP machines. Only Dual-processor 
+systems are supported. A load average graph a.k.a. wmloadavg/xload is also 
+provided. WMMon+SMP is based on WMMon 1.0b2 and does not display I/O or memory 
+statistics.
+	</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
new file mode 100644
index 000000000000..e16511eaf5bb
--- /dev/null
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Dockapp CPU monitor resembling Xosview, support for smp"
+HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/"
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S="${WORKDIR}/wmmon.app/wmmon"
+
+PATCHES=( "${FILESDIR}"/${P}-list.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	)
+
+src_prepare() {
+	tc-export CC
+	# Respect LDFLAGS, see bug #335047
+	sed \
+		-e 's/cc -o/${CC} ${LDFLAGS} -o/' \
+		-e 's/cc -c/${CC} ${CFLAGS} -c/' \
+		-i Makefile || die
+
+	cd "${WORKDIR}"/wmmon.app || die
+	default
+}
+
+src_install() {
+	newbin wmmon wmmon+smp
+	dodoc ../README
+}
diff --git a/x11-plugins/wmmon/Manifest b/x11-plugins/wmmon/Manifest
new file mode 100644
index 000000000000..b4be83dc420a
--- /dev/null
+++ b/x11-plugins/wmmon/Manifest
@@ -0,0 +1 @@
+DIST wmmon-1.4.tar.gz 107477 BLAKE2B 973dedb994c0e688dbdcefde12d186e1d3712164adeb454e97367c6592e223dd61f01ddc7c5258bc387619ed185f049439b8692a18a1bd28bccafda986359e36 SHA512 ca5a0d8278d6fda4ae1be2e76e17ad7e550e91398dba1c5aa09b501c4e17b8d4f597bcaa0c9ea844d3a307a5c60d6d28e44cbffd54fe44c92be0386450f25951
diff --git a/x11-plugins/wmmon/metadata.xml b/x11-plugins/wmmon/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmmon/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmmon/wmmon-1.4.ebuild b/x11-plugins/wmmon/wmmon-1.4.ebuild
new file mode 100644
index 000000000000..b52135abe045
--- /dev/null
+++ b/x11-plugins/wmmon/wmmon-1.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Dockable system resources monitor applet for WindowMaker"
+HOMEPAGE="https://www.dockapps.net/wmmon"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-plugins/wmmoonclock/Manifest b/x11-plugins/wmmoonclock/Manifest
new file mode 100644
index 000000000000..d5aa8989c554
--- /dev/null
+++ b/x11-plugins/wmmoonclock/Manifest
@@ -0,0 +1,2 @@
+DIST wmmoonclock-1.29.tar.gz 234991 BLAKE2B 7d38b4758d6bd4b78d069ae7d872c60f1a43a25fc424a51615ff0506d249bc0ee416cec9dc389ea27281f0b1eafa299bb126f0ea177334508ebb2b3542162162 SHA512 c36850034a0f3b7863ecfd03f73f91f9b935f645362cebeb33186873f700585d682dc5c35f3b5d67932afd3c5699fca56bf012e8f8a06615ff52c44a47ba552e
+DIST wmmoonclock-1.30.tar.gz 238171 BLAKE2B 05246845f95a24f4b0e1b2ce1fb790c170da2b2023337fca5517a27afccaa7a9e42efa497151059897fe87f25b2e32390f441a820afc3eaf353333faa1760d57 SHA512 2173586ef8dd53eae0a05368440dffe8438e57f8158df05fd0de2d4525a5726e48b62ef8e8a81403cb7707d836936957e2238f543946beb557623bd9fbd54175
diff --git a/x11-plugins/wmmoonclock/files/wmmoonclock-1.29-gcc-10.patch b/x11-plugins/wmmoonclock/files/wmmoonclock-1.29-gcc-10.patch
new file mode 100644
index 000000000000..9554254e6239
--- /dev/null
+++ b/x11-plugins/wmmoonclock/files/wmmoonclock-1.29-gcc-10.patch
@@ -0,0 +1,37 @@
+diff -Naur wmmoonclock-1.29.orig/src/xutils.c wmmoonclock-1.29/src/xutils.c
+--- wmmoonclock-1.29.orig/src/xutils.c	2017-08-15 00:32:44.000000000 +0200
++++ wmmoonclock-1.29/src/xutils.c	2020-02-27 11:42:33.266076617 +0100
+@@ -52,6 +52,13 @@
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
+ 
++Display		*display;
++Window          Root;
++Window          iconwin, win;
++int             screen;
++int             DisplayDepth;
++
++
+ 
+ 
+ 
+diff -Naur wmmoonclock-1.29.orig/src/xutils.h wmmoonclock-1.29/src/xutils.h
+--- wmmoonclock-1.29.orig/src/xutils.h	2017-08-15 00:31:51.000000000 +0200
++++ wmmoonclock-1.29/src/xutils.h	2020-02-27 11:41:58.180058348 +0100
+@@ -20,11 +20,11 @@
+ /*
+  *   Global variable
+  */
+-Display		*display;
+-Window          Root;
+-Window          iconwin, win;
+-int             screen;
+-int             DisplayDepth;
++extern Display		*display;
++extern Window          Root;
++extern Window          iconwin, win;
++extern int             screen;
++extern int             DisplayDepth;
+ 
+ 
+ 
diff --git a/x11-plugins/wmmoonclock/metadata.xml b/x11-plugins/wmmoonclock/metadata.xml
new file mode 100644
index 000000000000..409e92c54fb3
--- /dev/null
+++ b/x11-plugins/wmmoonclock/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+		wmmoonclock displays phases and ephemeris of the Moon. Clicking on the App
+		cycles the user through several `pages' of ephemeris information. Included are
+		age, fraction of current lunar cycle, the % illumination, whether its currently
+		visible or not, the rise/set times for yesterday, today and tomorrow, the
+		`horizon coordinates", and the "ecliptic coordinates". wmmoonlock supports
+		8-bit and high-color displays.
+	</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild b/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
new file mode 100644
index 000000000000..9530051db958
--- /dev/null
+++ b/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="dockapp that shows lunar ephemeris to a high accuracy"
+HOMEPAGE="https://www.dockapps.net/wmmoonclock"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
diff --git a/x11-plugins/wmmoonclock/wmmoonclock-1.30.ebuild b/x11-plugins/wmmoonclock/wmmoonclock-1.30.ebuild
new file mode 100644
index 000000000000..e40b73d04b9e
--- /dev/null
+++ b/x11-plugins/wmmoonclock/wmmoonclock-1.30.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="dockapp that shows lunar ephemeris to a high accuracy"
+HOMEPAGE="https://www.dockapps.net/wmmoonclock"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-plugins/wmmp/Manifest b/x11-plugins/wmmp/Manifest
new file mode 100644
index 000000000000..f891308fcffc
--- /dev/null
+++ b/x11-plugins/wmmp/Manifest
@@ -0,0 +1 @@
+DIST WMmp-0.10.0.tar.gz 228560 BLAKE2B ec405452112131cad8738b28d13bdbe7f6a60a3204374aa76632bb0cb16c3eea087e58f5294354bd4c201bd9b989d009d417c38fa09d334a4ab72c08e0c527c3 SHA512 5a2777afcb879dd42556f169d4e472660f3cb2bd2b3a1e3833328d3be793e859f7b36dce6e59ca39a4a074b89d305a7704d60382dfc6bed0578c046fe3a8598c
diff --git a/x11-plugins/wmmp/metadata.xml b/x11-plugins/wmmp/metadata.xml
new file mode 100644
index 000000000000..7c37e01331b6
--- /dev/null
+++ b/x11-plugins/wmmp/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">musicpd</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmmp/wmmp-0.10.0-r1.ebuild b/x11-plugins/wmmp/wmmp-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..937d9742621d
--- /dev/null
+++ b/x11-plugins/wmmp/wmmp-0.10.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${P/wm/WM}
+
+DESCRIPTION="A Window Maker dock app client for Music Player Daemon(media-sound/mpd)"
+HOMEPAGE="http://mpd.wikia.com/wiki/Client:WMmp"
+SRC_URI="mirror://sourceforge/musicpd/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	econf --with-default-port=6600
+}
diff --git a/x11-plugins/wmmp3/Manifest b/x11-plugins/wmmp3/Manifest
new file mode 100644
index 000000000000..534f34750df8
--- /dev/null
+++ b/x11-plugins/wmmp3/Manifest
@@ -0,0 +1 @@
+DIST wmmp3-0.12.tar.gz 43977 BLAKE2B bde74194020e65dfea27e94f5a4e937e0811da12c3af28b8d7902c3d08adc27499cd5414ee4826e6f5b25709bf784e6b27d1df07e8079953ec2a602b332b17bf SHA512 6cc06f109d6ab6c69ed3b8175010a2f38053138291f02e59780fc7394c35cc629ddd6b982bd5069e20a3cb81d81b3d08b9e10d1f7984f783f22c9b012c933740
diff --git a/x11-plugins/wmmp3/files/wmmp3-0.12-fno-common.patch b/x11-plugins/wmmp3/files/wmmp3-0.12-fno-common.patch
new file mode 100644
index 000000000000..2179b9e30dd2
--- /dev/null
+++ b/x11-plugins/wmmp3/files/wmmp3-0.12-fno-common.patch
@@ -0,0 +1,33 @@
+diff -Naur wmmp3-0.12.orig/wmgeneral.c wmmp3-0.12/wmgeneral.c
+--- wmmp3-0.12.orig/wmgeneral.c	1999-10-08 07:58:16.000000000 +0200
++++ wmmp3-0.12/wmgeneral.c	2020-05-08 19:16:45.911950119 +0200
+@@ -58,6 +58,11 @@
+  /* X11 Variables */
+ /*****************/
+ 
++Display *display;
++Window Root, iconwin, win;
++XpmIcon wmgen;
++XpmIcon wmfont;
++
+ int screen;
+ int x_fd;
+ int d_depth;
+diff -Naur wmmp3-0.12.orig/wmgeneral.h wmmp3-0.12/wmgeneral.h
+--- wmmp3-0.12.orig/wmgeneral.h	1999-10-08 07:58:18.000000000 +0200
++++ wmmp3-0.12/wmgeneral.h	2020-05-08 19:16:53.693959618 +0200
+@@ -41,10 +41,10 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display *display;
+-Window Root, iconwin, win;
+-XpmIcon wmgen;
+-XpmIcon wmfont;
++extern Display *display;
++extern Window Root, iconwin, win;
++extern XpmIcon wmgen;
++extern XpmIcon wmfont;
+ 
+ /***********************/
+  /* Function Prototypes */
diff --git a/x11-plugins/wmmp3/files/wmmp3-0.12-x_includes_n_libraries.patch b/x11-plugins/wmmp3/files/wmmp3-0.12-x_includes_n_libraries.patch
new file mode 100644
index 000000000000..c5253fd7278a
--- /dev/null
+++ b/x11-plugins/wmmp3/files/wmmp3-0.12-x_includes_n_libraries.patch
@@ -0,0 +1,20 @@
+--- a/configure	2005-08-24 09:45:23.000000000 +0200
++++ b/configure	2005-08-24 09:45:08.000000000 +0200
+@@ -1977,11 +1977,15 @@
+ 
+ 
+ if test "$x_includes" != "NONE"; then
+-        CFLAGS="$CFLAGS -I$x_includes"
++        if test "$x_includes" != ""; then
++                CFLAGS="$CFLAGS -I$x_includes"
++        fi
+ fi
+ 
+ if test "$x_libraries" != "NONE"; then
+-        LDFLAGS="$LDFLAGS -L$x_libraries"
++        if test "$x_libraries" != ""; then
++                LDFLAGS="$LDFLAGS -L$x_libraries"
++        fi
+ fi
+ 
+ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
diff --git a/x11-plugins/wmmp3/metadata.xml b/x11-plugins/wmmp3/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmmp3/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmmp3/wmmp3-0.12-r1.ebuild b/x11-plugins/wmmp3/wmmp3-0.12-r1.ebuild
new file mode 100644
index 000000000000..ce5131e34556
--- /dev/null
+++ b/x11-plugins/wmmp3/wmmp3-0.12-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Mp3 player dock app for WindowMaker; frontend to mpg123"
+HOMEPAGE="https://www.dockapps.net/wmmp3"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	media-sound/mpg123
+	x11-base/xorg-proto"
+
+PATCHES=( "${FILESDIR}"/${P}-x_includes_n_libraries.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	)
+
+DOCS=( AUTHORS ChangeLog sample.wmmp3 README TODO )
+
+src_compile() {
+	emake prefix="/usr/"
+}
+
+pkg_postinst() {
+	einfo "Please copy the sample.wmmp3 to your home directory and change it to fit your needs."
+}
diff --git a/x11-plugins/wmnd/Manifest b/x11-plugins/wmnd/Manifest
new file mode 100644
index 000000000000..9eb16279a3e8
--- /dev/null
+++ b/x11-plugins/wmnd/Manifest
@@ -0,0 +1,2 @@
+DIST wmnd-0.4.17.tar.gz 191089 BLAKE2B 4a4703896297b86297c369d9058113382c6de13416839bd0922c3772cb3422e164cead318874bd62c77e5c35054df97fb4509388057adfe3642f58aef1de166b SHA512 09ecb0d21df2ca996dbe18b8711abb327200fd6c098e57bda19b960854bc9fae5c5c4f5d5a8cb306c21393983f602f591af87a0afdf009380d9a6ae1a2e81eb2
+DIST wmnd-0.4.18.tar.gz 177523 BLAKE2B 578b80ab5019b0f6f1d37ed67425e07e9fb68f9f3b726cf7672a49fb37603e0c9d6830eacb1059aae4aa96aa1b54872ff0352352f93f7c04c61e9a6bf07ba19f SHA512 409c6b85bbcf4204f60288890471c2fc8860e797bde4c5d9b78d7e2e2353b4b851cf5d0670261c35ab941a5cf86e8067476d053d4e5223916cd8a0b84c7c15a4
diff --git a/x11-plugins/wmnd/metadata.xml b/x11-plugins/wmnd/metadata.xml
new file mode 100644
index 000000000000..f3c94dc69512
--- /dev/null
+++ b/x11-plugins/wmnd/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+WMND (Window Maker Network Devices) is a  dockapp
+for monitoring multiple network  interfaces
+simultaneously. Based on WMiFS  1.3b, WMND has
+been almost totally re-written  and is more
+optimized, flexible, and consumes  less CPU time
+than wmmon.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmnd/wmnd-0.4.17-r1.ebuild b/x11-plugins/wmnd/wmnd-0.4.17-r1.ebuild
new file mode 100644
index 000000000000..7080166ba275
--- /dev/null
+++ b/x11-plugins/wmnd/wmnd-0.4.17-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WindowMaker Network Devices (dockapp)"
+HOMEPAGE="https://www.thregr.org/~wavexx/software/wmnd/"
+SRC_URI="https://www.thregr.org/~wavexx/software/wmnd/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="snmp"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm
+	snmp? ( >=net-analyzer/net-snmp-5.2.1 )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-plugins/wmnd/wmnd-0.4.18.ebuild b/x11-plugins/wmnd/wmnd-0.4.18.ebuild
new file mode 100644
index 000000000000..c0f220c4aa52
--- /dev/null
+++ b/x11-plugins/wmnd/wmnd-0.4.18.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WindowMaker Network Devices (dockapp)"
+HOMEPAGE="https://www.thregr.org/~wavexx/software/wmnd/"
+SRC_URI="https://www.thregr.org/~wavexx/software/wmnd/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="snmp"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm
+	snmp? ( >=net-analyzer/net-snmp-5.2.1 )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-plugins/wmnet/Manifest b/x11-plugins/wmnet/Manifest
new file mode 100644
index 000000000000..45219471f65f
--- /dev/null
+++ b/x11-plugins/wmnet/Manifest
@@ -0,0 +1,2 @@
+DIST wmnet-1.06-misc.patch.bz2 11327 BLAKE2B c03f25270c37e9a54731547a51c00983df802b5f4278d02b7051571de45bd326bb5eda330bbba8e09be6bcb4b3afca111956d6506e73c13f955afd40b9c967ea SHA512 34d08676cfa9415c1cc182b148364143589b13c6b060c55b4047fa417146b1939b84fa5e32fc86da92cd92c10a5f5f0abb602c9ba943ed077bc6529c0dbf0ea3
+DIST wmnet-1.06.tar.gz 27506 BLAKE2B 9cd5cb626406238e5dc20ff58f26b13389c5b8bff9569e3cc8fc4f083422d213702fc387521bffc003339ef4e0c6223f5cfcec8617ba3e71b516786c6950cdf8 SHA512 1e62db5e7e3b843d47459fcfa9cc932ba3df8f8498d1b24dcb77602a334d528b90e9c93886b8b330ac7bd5baa4ad1cd3bc94e96c14a841fba8bb9172f624e10a
diff --git a/x11-plugins/wmnet/metadata.xml b/x11-plugins/wmnet/metadata.xml
new file mode 100644
index 000000000000..cd576ff543d9
--- /dev/null
+++ b/x11-plugins/wmnet/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+wmnet polls network statistics and does a few things with the data it gets. It 
+has small blinking lights for the rx and tx of ip packets, a digital 
+speedometer of your tcp/ip stack's current speed and neatest of all, a bar 
+graph like xload et. al which has a tx speed graph from bottom-up and rx speed 
+graph from the top-down. The speedometer keeps track of the current speed per 
+second and shows it in a color corresponding to which of rx or tx that has the 
+highest speed at the moment.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
new file mode 100644
index 000000000000..21b7b7b3f0d1
--- /dev/null
+++ b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WMnet is a dock.app network monitor"
+HOMEPAGE="https://www.dockapps.net/wmnet"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz
+	mirror://gentoo/${P}-misc.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-misc/imake
+	app-text/rman"
+
+PATCHES=( "${WORKDIR}"/${P}-misc.patch )
+
+src_compile() {
+	xmkmf || die "xmkmf failed."
+	emake CDEBUGFLAGS="${CFLAGS}" LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin wmnet
+	newman wmnet.man wmnet.1
+	dodoc README Changelog
+}
diff --git a/x11-plugins/wmnetload/Manifest b/x11-plugins/wmnetload/Manifest
new file mode 100644
index 000000000000..4a996ab437d5
--- /dev/null
+++ b/x11-plugins/wmnetload/Manifest
@@ -0,0 +1 @@
+DIST wmnetload-1.3.tar.gz 105588 BLAKE2B 21c56ef3d6b9e13f9e7d7a1eeb4ad79693134a74d7b864a45f76e174a8f8fef46efc0444bce9a5422d698b8b966768914fe6fb9fb4eda29c8e0dd6f6892daf40 SHA512 67f28100fefea54a21f82be3acde9a457779b2dd1eb1c2f0c074c0a956a8f7b43a6c7ed39b97f8bdd1f51adfc1c21d197c1a7dfd84d8aeb562e46d58fd06b3f7
diff --git a/x11-plugins/wmnetload/files/wmnetload-1.3-r4-configure.patch b/x11-plugins/wmnetload/files/wmnetload-1.3-r4-configure.patch
new file mode 100644
index 000000000000..1c8a5a732212
--- /dev/null
+++ b/x11-plugins/wmnetload/files/wmnetload-1.3-r4-configure.patch
@@ -0,0 +1,70 @@
+diff -Naur wmnetload-1.3.orig/configure.in wmnetload-1.3/configure.in
+--- a/configure.in	2003-02-23 10:07:39.000000000 +0100
++++ b/configure.in	2015-08-23 22:26:30.221448648 +0200
+@@ -102,7 +102,6 @@
+ 	[inc_search_path=" -I $withval $inc_search_path"])
+ 
+ LIBRARY_SEARCH_PATH="$lib_search_path -L/usr/local/lib"
+-LIBRARY_RPATH=`echo "$LIBRARY_SEARCH_PATH" | sed 's/[ *]-L[ *]/:/g'`
+ HEADER_SEARCH_PATH="$inc_search_path -I/usr/local/include"
+ 
+ AC_SUBST(LIBRARY_SEARCH_PATH)
+@@ -122,12 +121,10 @@
+ 	;;
+ *netbsd*)
+ 	OS=netbsd
+-	LIBRARY_RPATH="$LIBRARY_RPATH:/usr/X11R6/lib"
+ 	LIBS="$LIBS -lkvm"
+ 	;;
+ *freebsd*)
+ 	OS=freebsd
+-	LIBRARY_RPATH="$LIBRARY_RPATH:/usr/X11R6/lib"
+ 	;;
+ *)
+ 	echo ""
+@@ -143,22 +140,6 @@
+ 
+ AC_PATH_XTRA
+ 
+-dnl
+-dnl Hack in rpath -- yes, this sucks, and it even has a hidden dependency
+-dnl on the implementation of AC_PATH_XTRA.  F@&* you, portability.
+-dnl
+-if test "$GCC" = yes; then
+-	if test "ac_R_space" = no; then
+-		RPATH="-Wl,\"-R$LIBRARY_RPATH\""
+-	else
+-		RPATH="-Wl,\"-R $LIBRARY_RPATH\"" 
+-	fi
+-else
+-	RPATH=
+-	echo "WARNING: do not know how to set RPATH with this compiler"
+-fi
+-
+-AC_SUBST(RPATH)
+ 
+ 
+ X_LIBRARY_PATH=$x_libraries
+@@ -188,8 +169,8 @@
+ 
+ WN_CHECK_LIB(dockapp, DAInitialize, [$XLFLAGS $XLIBS -lXpm])
+ if test "x$ac_cv_lib_dockapp_DAInitialize" = xyes; then
+-        WN_CHECK_HEADER(dockapp.h, $XCFLAGS)
+-        if test "x$ac_cv_header_dockapp_h" != xyes; then
++        WN_CHECK_HEADER(libdockapp/dockapp.h, $XCFLAGS)
++        if test "x$ac_cv_header_libdockapp_dockapp_h" != xyes; then
+ 		echo "Cannot find required libdockapp headers."
+ 		exit 1
+         fi
+diff -Naur wmnetload-1.3.orig/src/Makefile.am wmnetload-1.3/src/Makefile.am
+--- a/src/Makefile.am	2003-02-18 07:30:48.000000000 +0100
++++ b/src/Makefile.am	2015-08-23 22:20:16.599704945 +0200
+@@ -25,8 +25,6 @@
+ EXTRA_wmnetload_SOURCES	= ifstat_linux.c ifstat_netbsd.c ifstat_solaris.c \
+ 			  ifstat_freebsd.c
+ 
+-LDFLAGS			= @RPATH@
+-
+ LDADD	 = @LIBRARY_SEARCH_PATH@ @XLFLAGS@ @XLIBS@ -ldockapp -lXpm -lm
+ CPPFLAGS = @CPPFLAGS@ @XCFLAGS@ -DVERSION=\"@VERSION@\" 
+ INCLUDES = @HEADER_SEARCH_PATH@ -I$(top_srcdir)/xpm/@WN_LOOK@
diff --git a/x11-plugins/wmnetload/metadata.xml b/x11-plugins/wmnetload/metadata.xml
new file mode 100644
index 000000000000..0a0ac9100a69
--- /dev/null
+++ b/x11-plugins/wmnetload/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+wmnetload is a network interface monitor dockapp  for Window Maker. It is 
+designed to fit well with  dockapps like wmcpuload and wmmemmon. It tracks 
+whether the interface is functioning and displays current network interface 
+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>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmnetload/wmnetload-1.3-r6.ebuild b/x11-plugins/wmnetload/wmnetload-1.3-r6.ebuild
new file mode 100644
index 000000000000..e7edca2fa228
--- /dev/null
+++ b/x11-plugins/wmnetload/wmnetload-1.3-r6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Network interface monitor dockapp"
+HOMEPAGE="https://github.com/bbidulock/wmnetload"
+SRC_URI="https://github.com/bbidulock/wmnetload/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND=">=x11-libs/libdockapp-0.7:="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-r4-configure.patch" )
+
+src_prepare() {
+	default
+	sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i src/*.c || die
+	eautoreconf
+}
diff --git a/x11-plugins/wmpager/Manifest b/x11-plugins/wmpager/Manifest
new file mode 100644
index 000000000000..5b6fe8f8ae70
--- /dev/null
+++ b/x11-plugins/wmpager/Manifest
@@ -0,0 +1 @@
+DIST wmpager-1.2.tar.gz 24255 BLAKE2B 7ca18094ad1cb51793249072e530366cd4b4c02d8d5a2a8f49bae4e4742fbfdb6dad9a20d79142cd6776a17dfa078c6e6a7dbf84e98611f6024166f1bdf0a977 SHA512 6abd4ea28bba9bb809a8e0ce96df2b4491f32eaa39a16fa57727581c63ad6f96515e761392564af1515b92a6c463f7efee5fd84b96ae730fa0ff19094f5fec3e
diff --git a/x11-plugins/wmpager/metadata.xml b/x11-plugins/wmpager/metadata.xml
new file mode 100644
index 000000000000..4c72cc5e2084
--- /dev/null
+++ b/x11-plugins/wmpager/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">wmpager</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmpager/wmpager-1.2-r2.ebuild b/x11-plugins/wmpager/wmpager-1.2-r2.ebuild
new file mode 100644
index 000000000000..920a6e876ac9
--- /dev/null
+++ b/x11-plugins/wmpager/wmpager-1.2-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A simple pager docklet for the WindowMaker window manager"
+HOMEPAGE="http://wmpager.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wmpager/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXext"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -i "s:\(WMPAGER_DEFAULT_INSTALL_DIR \).*:\1\"/usr/share/wmpager\":" \
+		src/wmpager.c || die
+
+	#Honour Gentoo CFLAGS and LDFLAGS, see bug #337604
+	sed -i -e "s/-g/${CFLAGS}/" \
+		-e "s/\${LIBS}/\${LIBS} \${LDFLAGS}/" \
+		src/Makefile || die
+}
+
+src_install() {
+	emake INSTALLDIR="${ED}/usr" install
+	rm -rf "${ED}"/usr/man || die
+	doman man/man1/*.1x
+	dodoc README
+}
diff --git a/x11-plugins/wmpasman/Manifest b/x11-plugins/wmpasman/Manifest
new file mode 100644
index 000000000000..fea3c6ef8bda
--- /dev/null
+++ b/x11-plugins/wmpasman/Manifest
@@ -0,0 +1,3 @@
+DIST wmpasman-0.8.5.3.tar.gz 198779 BLAKE2B f38c0fb17406f1e0ca0fd8e97eccb46f690a28c489307b453a6df4c5d3edfc3344381e7e646d107eda9820a75b624770cd56053ef45a1bbc1b79d65ef31e33b0 SHA512 d47bae993b1ea47ef2cf4cce0dc8d8f1e8e055650dbfc7854612176a0933a0a5079ad29bc85ba8e0370843e9be189d7e4d0b349590981d3eac4c3f01fe69ec87
+DIST wmpasman-2.0.tar.gz 154433 BLAKE2B c6bb3441a34252f450d1d81e83cb400dd242c0f250d2dbe8846b3e90055aeb1410543be6f43d0a5cb3a7fcaec86866eb8fa941fe6decd57cde5c56d1d0390936 SHA512 32ab415d7b87f5277c96f1253b25a9d5002d2bf188d8635d96c169ff51ab7949e0cd2c05df43136eed4e5d9c4f037affb30ee4a45977d0a6e74bc9e332b9e8be
+DIST wmpasman-2.2.tar.gz 155077 BLAKE2B d7d9bd1c3e34d4f03661babd42ed5abbf42637709fb2f31358b51fda13dcd682e083af683640a7ef75ae0087f2de179136635e9be3979f9a36a067b5b634fcd2 SHA512 2f24e2ef84d6e5cab1c3a51d032ecabbd21b22e81341ee48b1f86fc96f493d42cde42fd20cf5523f0f8462906cab4f22a2238b6c147b61b33e812f98f32c0157
diff --git a/x11-plugins/wmpasman/files/wmpasman-0.8.5.3-list.patch b/x11-plugins/wmpasman/files/wmpasman-0.8.5.3-list.patch
new file mode 100644
index 000000000000..3769d09d30ee
--- /dev/null
+++ b/x11-plugins/wmpasman/files/wmpasman-0.8.5.3-list.patch
@@ -0,0 +1,116 @@
+diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
+--- wmgeneral.orig/list.c	2016-01-04 13:18:09.361133006 +0100
++++ wmgeneral/list.c	2016-01-04 13:18:21.789137166 +0100
+@@ -40,7 +40,7 @@
+ 
+ /* Return a cons cell produced from (head . tail) */
+ 
+-inline LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -53,7 +53,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero */
+ 
+-inline int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -68,7 +68,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned  */
+ 
+-inline void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -83,7 +83,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor */
+ 
+-inline void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -103,7 +103,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT */
+ /*
+-inline void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -114,7 +114,7 @@
+     }
+ }*/
+ 
+-inline LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -134,7 +134,7 @@
+ 
+ /* Return element that has ELEM as car */
+ 
+-inline LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -148,7 +148,7 @@
+ 
+ /* Free list (backwards recursive) */
+ 
+-inline void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -160,7 +160,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST */
+ 
+-inline void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
+--- wmgeneral.orig/list.h	2016-01-04 13:18:09.361133006 +0100
++++ wmgeneral/list.h	2016-01-04 13:18:26.007138577 +0100
+@@ -36,20 +36,20 @@
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-inline LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-inline int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-inline void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-inline void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-inline LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-inline void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-inline LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-inline void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-plugins/wmpasman/metadata.xml b/x11-plugins/wmpasman/metadata.xml
new file mode 100644
index 000000000000..99ee8ae21f2e
--- /dev/null
+++ b/x11-plugins/wmpasman/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+wmpasman stores passwords and makes them available
+for pasting (both via the middle-click primary
+selection and the clipboard selection) at the
+click of a button. It also contains a digital
+clock. Access is controlled by a passphrase.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">wmpasman</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmpasman/wmpasman-0.8.5.3.ebuild b/x11-plugins/wmpasman/wmpasman-0.8.5.3.ebuild
new file mode 100644
index 000000000000..59c8cd68dd6f
--- /dev/null
+++ b/x11-plugins/wmpasman/wmpasman-0.8.5.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Password storage/retrieval in a dockapp"
+HOMEPAGE="https://sourceforge.net/projects/wmpasman/"
+SRC_URI="mirror://sourceforge/wmpasman/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.4.1:2
+	>=app-crypt/mhash-0.9.1
+	>=app-crypt/mcrypt-2.6.4"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	virtual/pkgconfig
+	>=x11-libs/libXpm-3.5.5"
+
+DOCS="BUGS ChangeLog README TODO WARNINGS"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-list.patch
+}
diff --git a/x11-plugins/wmpasman/wmpasman-2.0.ebuild b/x11-plugins/wmpasman/wmpasman-2.0.ebuild
new file mode 100644
index 000000000000..1d1725c81054
--- /dev/null
+++ b/x11-plugins/wmpasman/wmpasman-2.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Password storage/retrieval in a dockapp"
+HOMEPAGE="https://sourceforge.net/projects/wmpasman/"
+SRC_URI="mirror://sourceforge/wmpasman/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="app-crypt/libsecret
+	>=x11-libs/gtk+-3.8.0:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="ChangeLog WARNINGS"
diff --git a/x11-plugins/wmpasman/wmpasman-2.2.ebuild b/x11-plugins/wmpasman/wmpasman-2.2.ebuild
new file mode 100644
index 000000000000..5eb588f9aab4
--- /dev/null
+++ b/x11-plugins/wmpasman/wmpasman-2.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Password storage/retrieval in a dockapp"
+HOMEPAGE="https://sourceforge.net/projects/wmpasman/"
+SRC_URI="mirror://sourceforge/wmpasman/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="app-crypt/libsecret
+	>=x11-libs/gtk+-3.8.0:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="ChangeLog WARNINGS"
diff --git a/x11-plugins/wmpinboard/Manifest b/x11-plugins/wmpinboard/Manifest
new file mode 100644
index 000000000000..fa280e493b6d
--- /dev/null
+++ b/x11-plugins/wmpinboard/Manifest
@@ -0,0 +1 @@
+DIST wmpinboard-1.0.1.tar.gz 195782 BLAKE2B f88368b61645c91958d81161e9f5e8523d09b7ef825476afebb2b4318c8cf04f11319b3eaf9b152fe97a4dea2dac6147e9b70eb70cd9cddbc1f45960df6529e5 SHA512 5728aa8a040ba81a814a0851f5bed2d5fbf933b400bdafd2b92deef8eb35d62a050293bdb98d71c6a8db058223e5ae64de932dcf971fd244aea8f48f8832aa36
diff --git a/x11-plugins/wmpinboard/metadata.xml b/x11-plugins/wmpinboard/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmpinboard/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild b/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
new file mode 100644
index 000000000000..2c2bdf7149ce
--- /dev/null
+++ b/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Window Maker dock applet resembling a miniature pinboard"
+HOMEPAGE="https://github.com/bbidulock/wmpinboard"
+SRC_URI="https://github.com/bbidulock/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-plugins/wmping/Manifest b/x11-plugins/wmping/Manifest
new file mode 100644
index 000000000000..f1041db65269
--- /dev/null
+++ b/x11-plugins/wmping/Manifest
@@ -0,0 +1 @@
+DIST wmping-0.2.1.tar.gz 100059 BLAKE2B ce6ec83cb93b2c7ee7412eb7c30388fe0d5adc4bb4021e1632e889886034336209cc3ffc2dd36a02a7bc73326e097272675bb48b255be7373aab3c4dedb44c13 SHA512 c13a4906810d7513fe3e1e88a77846a5b0a299180f858f755a2fe602eaab802e77062d29e767e4d5c28e45bc6ce1431418cc71ee26c3c8fc5521280999bb9351
diff --git a/x11-plugins/wmping/files/wmping-0.2.1-format-security.patch b/x11-plugins/wmping/files/wmping-0.2.1-format-security.patch
new file mode 100644
index 000000000000..a0ad2b3fc290
--- /dev/null
+++ b/x11-plugins/wmping/files/wmping-0.2.1-format-security.patch
@@ -0,0 +1,38 @@
+--- a/wmping.c	2015-08-06 15:03:32.407526918 +0200
++++ b/wmping.c	2015-08-06 15:03:56.907978079 +0200
+@@ -237,7 +237,7 @@
+ 		    if(strcmp(tokens[1],"="))
+ 		    {
+ 			sprintf(str_err, "Not correct format of configuration file ( %s ): line %u", cfgfile, lineN);
+-			fprintf(stderr, str_err);
++			fprintf(stderr, "%s", str_err);
+                         exit(-1);
+ 		    }
+ 
+@@ -288,7 +288,7 @@
+ 		else
+ 		{
+ 		    sprintf(str_err, "Not correct format of configuration file ( %s ): line %u", cfgfile, lineN);
+-		    fprintf(stderr, str_err);
++		    fprintf(stderr, "%s", str_err);
+ 		    exit(-1);
+ 
+ 		}
+@@ -297,7 +297,7 @@
+         else
+ 	{
+ 	    sprintf(str_err, "Error open configuration file ( %s ): %s", cfgfile, strerror(errno));
+-	    fprintf(stderr, str_err);
++	    fprintf(stderr, "%s", str_err);
+ 	    fprintf(stderr, "\n Create default configuration file\n");
+ 	    createDefaultCfg(cfgfile);
+ 	}
+@@ -305,7 +305,7 @@
+     else
+     {
+ 	sprintf(str_err, "Error open configuration file ( %s ): %s", cfgfile, strerror(errno));
+-	fprintf(stderr, str_err);
++	fprintf(stderr, "%s", str_err);
+ 	fprintf(stderr, "\n Create default configuration file\n");
+ 	createDefaultCfg(cfgfile);
+     }
diff --git a/x11-plugins/wmping/files/wmping-0.2.1-gcc-10.patch b/x11-plugins/wmping/files/wmping-0.2.1-gcc-10.patch
new file mode 100644
index 000000000000..3ed8b82f29e8
--- /dev/null
+++ b/x11-plugins/wmping/files/wmping-0.2.1-gcc-10.patch
@@ -0,0 +1,21 @@
+--- a/wmgeneral.c
++++ b/wmgeneral.c
+@@ -45,6 +45,7 @@ Window		iconwin, win;
+ GC			NormalGC;
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
++Display		*display;
+ 
+   /*****************/
+  /* Mouse Regions */
+--- a/wmgeneral.h
++++ b/wmgeneral.h
+@@ -21,7 +21,7 @@ typedef struct {
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
diff --git a/x11-plugins/wmping/metadata.xml b/x11-plugins/wmping/metadata.xml
new file mode 100644
index 000000000000..3cfe4fdd659b
--- /dev/null
+++ b/x11-plugins/wmping/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">wmping</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmping/wmping-0.2.1-r1.ebuild b/x11-plugins/wmping/wmping-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..489881f2407c
--- /dev/null
+++ b/x11-plugins/wmping/wmping-0.2.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="a simple host status monitoring dockapp"
+HOMEPAGE="https://sourceforge.net/projects/wmping"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+suid"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libICE
+	x11-libs/libXt"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
+	)
+
+DOCS=( AUTHORS CHANGES README )
+
+src_install() {
+	if use suid; then
+		default
+	else
+		dosbin ${PN}
+		einstalldocs
+	fi
+	doman ${PN}.1
+}
+
+pkg_postinst() {
+	use suid || ewarn "warning, ${PN} needs to be executed as root."
+}
diff --git a/x11-plugins/wmpop3/Manifest b/x11-plugins/wmpop3/Manifest
new file mode 100644
index 000000000000..b3154b6138e3
--- /dev/null
+++ b/x11-plugins/wmpop3/Manifest
@@ -0,0 +1 @@
+DIST WMPop3-0.5.6a.tar.gz 23532 BLAKE2B faef591c9280cb7e37a5071cd2226b84bfb7a49d8b4639085d5b6a44bac8bb3763ca51bd1923d47b8d971010f9b8a7d5d48c6f9a6c76fd3db5cbc00333edc63d SHA512 127dfd3d4dec8a58c991a9bc0d2d1d1c0e9c0ef36af9b2894283bbda129db9b3464c43aa053152f9c0d25eee31b94ffec329784ffa256ce04cb233b809791c2f
diff --git a/x11-plugins/wmpop3/files/wmpop3-0.5.6a-fno-common.patch b/x11-plugins/wmpop3/files/wmpop3-0.5.6a-fno-common.patch
new file mode 100644
index 000000000000..6e6c3e604146
--- /dev/null
+++ b/x11-plugins/wmpop3/files/wmpop3-0.5.6a-fno-common.patch
@@ -0,0 +1,23 @@
+diff -Naur wmpop3-0.5.6a.orig/wmgeneral/wmgeneral.c wmpop3-0.5.6a/wmgeneral/wmgeneral.c
+--- wmpop3-0.5.6a.orig/wmgeneral/wmgeneral.c	1999-08-13 17:56:19.000000000 +0200
++++ wmpop3-0.5.6a/wmgeneral/wmgeneral.c	2020-06-13 11:00:02.036999257 +0200
+@@ -67,6 +67,7 @@
+ GC			NormalGC;
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
++Display		*display;
+ 
+   /*****************/
+  /* Mouse Regions */
+diff -Naur wmpop3-0.5.6a.orig/wmgeneral/wmgeneral.h wmpop3-0.5.6a/wmgeneral/wmgeneral.h
+--- wmpop3-0.5.6a.orig/wmgeneral/wmgeneral.h	1999-08-13 17:56:19.000000000 +0200
++++ wmpop3-0.5.6a/wmgeneral/wmgeneral.h	2020-06-13 10:59:57.263995472 +0200
+@@ -36,7 +36,7 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
diff --git a/x11-plugins/wmpop3/files/wmpop3-0.5.6a-list.patch b/x11-plugins/wmpop3/files/wmpop3-0.5.6a-list.patch
new file mode 100644
index 000000000000..9ef9a61f0de3
--- /dev/null
+++ b/x11-plugins/wmpop3/files/wmpop3-0.5.6a-list.patch
@@ -0,0 +1,127 @@
+diff -Naur wmpop3-0.5.6a.orig/wmgeneral/list.c wmpop3-0.5.6a/wmgeneral/list.c
+--- wmpop3-0.5.6a.orig/wmgeneral/list.c	1999-08-13 17:56:19.000000000 +0200
++++ wmpop3-0.5.6a/wmgeneral/list.c	2016-06-10 12:52:47.293968265 +0200
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail) */
+ 
+-INLINE LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero */
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned  */
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor */
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -101,7 +101,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT */
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@
+     }
+ }*/
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -132,7 +132,7 @@
+ 
+ /* Return element that has ELEM as car */
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@
+ 
+ /* Free list (backwards recursive) */
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST */
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur wmpop3-0.5.6a.orig/wmgeneral/list.h wmpop3-0.5.6a/wmgeneral/list.h
+--- wmpop3-0.5.6a.orig/wmgeneral/list.h	1999-08-13 17:56:19.000000000 +0200
++++ wmpop3-0.5.6a/wmgeneral/list.h	2016-06-10 12:52:56.598983075 +0200
+@@ -29,31 +29,25 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-plugins/wmpop3/metadata.xml b/x11-plugins/wmpop3/metadata.xml
new file mode 100644
index 000000000000..85fc165e8bfa
--- /dev/null
+++ b/x11-plugins/wmpop3/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+WMPop3 is a Window Maker dockable app which will check a pop3 mail server and 
+report how many messages are waiting( new and old ). Check it out!
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild b/x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild
new file mode 100644
index 000000000000..7a3f6094bc11
--- /dev/null
+++ b/x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="dockapp for checking pop3 accounts"
+HOMEPAGE="https://www.dockapps.net/wmpop3"
+SRC_URI="https://www.dockapps.net/download/${P/wmpop3/WMPop3}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
+IUSE=""
+
+DEPEND="x11-wm/windowmaker
+	x11-libs/libXpm"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-list.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	)
+
+src_prepare() {
+	sed -e "s|cc |$(tc-getCC) |" \
+		-e "s|-O2|${CFLAGS}|" \
+		-e "s|-o wmpop3|${LDFLAGS} -o wmpop3|" \
+		-i ${PN}/Makefile || die
+
+	default
+}
+
+src_compile() {
+	emake -C wmpop3
+}
+
+src_install() {
+	dobin wmpop3/wmpop3
+	dodoc CHANGE_LOG README
+}
diff --git a/x11-plugins/wmpop3lb/Manifest b/x11-plugins/wmpop3lb/Manifest
new file mode 100644
index 000000000000..c1a1c0881219
--- /dev/null
+++ b/x11-plugins/wmpop3lb/Manifest
@@ -0,0 +1 @@
+DIST wmpop3lb2.4.2.tar.gz 37391 BLAKE2B a9e1acaa35b965db90d5e272382629d02b127b19e9501a6e26094f204463a1f33023cdcf4b7910a045abd2e412c0a41cd3d67fb98378b164f2a3c3f0f457f8af SHA512 6d9d12261c457542ba45bbbb2f07ea9895a456d87c60187e2df0f0cc6e6da57fb498ea642346d113749b9529f1bebc623ec9dad48ee84e5016925b2440211e0f
diff --git a/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-fix-RECV-and-try-STAT-if-LAST-wont-work.patch b/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-fix-RECV-and-try-STAT-if-LAST-wont-work.patch
new file mode 100644
index 000000000000..93d2ab291741
--- /dev/null
+++ b/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-fix-RECV-and-try-STAT-if-LAST-wont-work.patch
@@ -0,0 +1,190 @@
+--- a/wmpop3/Pop3Client.c	2002-06-27 16:04:42.000000000 +0200
++++ b/wmpop3/Pop3Client.c	2007-01-11 14:39:12.000000000 +0200
+@@ -27,6 +27,49 @@
+ 
+ #include "Pop3Client.h"
+ 
++/* receive full responce */
++int do_recv(int s, void *ibuf, size_t len, int flags)
++{
++  size_t ret, total;
++  char *p, *buf = ibuf;
++
++  total = 0;
++  while (1)
++  {
++    /* left one byte for null termination */
++    ret = recv(s, buf + total, len - 1 - total, flags);
++    /* if we got error or close, then brea */
++    if (ret <= 0)
++    {
++      break;
++    }
++    /* increase size of received data */
++    total += ret;
++    /* null terminating received data */
++    buf[total] = 0;
++    /* left one byte for null termination
++     * if out of buffer, return */
++    if (len - total <= 1)
++    {
++      break;
++    }
++    /* if we found end of line signal, then stop */
++    p = strstr(buf, "\r\n");
++    printf("p == %p\n", p);
++    if (p != 0)
++    {
++      break;
++    }
++  }
++
++  /* if there wasn't any data, then return error code */
++  if (total == 0)
++  {
++    return ret;
++  }
++  return total;
++}
++
+ /* return size if all goes well, -1 if not expected answer */
+ int	send_command(char *exp_answer, char **retour, Pop3 pc) 
+ {
+@@ -61,18 +104,29 @@
+     return (pc);
+ }
+ int pop3MakeConnection(Pop3 pc, char *serverName, int port){
++    struct timeval t;
+ 
+     pc->s = socket(AF_INET, SOCK_STREAM, 0 );
+     memset( &(pc->server), 0 , sizeof(pc->server));
+     pc->server.sin_family = AF_INET;
+     pc->hp = gethostbyname(serverName);
+     if( pc->hp == 0)
++    {
++        close(pc->s);
+         return -1;
++    }
+     memcpy( &(pc->server.sin_addr), pc->hp->h_addr, pc->hp->h_length);
+     pc->server.sin_port = htons(port);
+     if ( connect(pc->s, (struct sockaddr *)&(pc->server)
+                                , sizeof(pc->server)) < 0 )
++    {
++        close(pc->s);
+         return -1;
++    }
++    t.tv_sec = 60;
++    t.tv_usec = 0;
++    setsockopt(pc->s, SOL_SOCKET, SO_RCVTIMEO, &t, sizeof(t));
++    setsockopt(pc->s, SOL_SOCKET, SO_SNDTIMEO, &t, sizeof(t));
+     pc->connected = CONNECTED;
+    return 0;
+ }
+@@ -94,7 +148,7 @@
+           return -1;
+       }
+ 
+-      size = recv(pc->s,&pc->inBuf,1024,0);
++      size = do_recv(pc->s,&pc->inBuf,1024,0);
+       memset(temp,0,1024);
+       memcpy(temp,pc->inBuf,size);
+       if( temp[0] != '+' ){
+@@ -104,10 +158,10 @@
+ 
+       sprintf(pc->outBuf,"USER %s\r\n",name);
+       send(pc->s, &pc->outBuf,strlen(pc->outBuf),0); 
+-      size =recv(pc->s,pc->inBuf,1024,0);
++      size = do_recv(pc->s,pc->inBuf,1024,0);
+       memset(temp,0,1024);
+       memcpy(temp,pc->inBuf,size);
+-      if( temp[0] != '+' ){
++      if( temp[0] != '+' && temp[0] != '\r' ){
+           fprintf(stderr,"Invalid User Name\n");
+           return -1;
+       }
+@@ -115,10 +169,10 @@
+       memset(pc->outBuf,0,1024);
+       sprintf(pc->outBuf,"PASS %s\r\n",pass);
+       send(pc->s, pc->outBuf, strlen(pc->outBuf),0 );
+-      size =recv(pc->s,&pc->inBuf,1024,0);
++      size = do_recv(pc->s,&pc->inBuf,1024,0);
+       memset(temp,0,1024);
+       memcpy(temp,pc->inBuf,size);
+-      if( temp[0] != '+' ){
++      if( temp[0] != '+' && temp[0] != '\r'){
+           fprintf(stderr,"Incorrect Password\n");
+           return -1;
+       }
+@@ -213,7 +267,7 @@
+   /* Find total number of messages in mail box */
+   sprintf(pc->outBuf,"STAT\r\n");
+   send(pc->s, pc->outBuf, strlen(pc->outBuf),0 );
+-  size = recv(pc->s,pc->inBuf,1024,0);
++  size = do_recv(pc->s,pc->inBuf,1024,0);
+   if( pc->inBuf[0] != '+' ){
+     perror("Error Receiving Stats");
+     return (-1);
+@@ -266,7 +320,7 @@
+   /* Find total number of messages in mail box */
+   sprintf(pc->outBuf,"STAT\r\n");
+   send(pc->s, pc->outBuf, strlen(pc->outBuf),0 );
+-  size = recv(pc->s,pc->inBuf,1024,0);
++  size = do_recv(pc->s,pc->inBuf,1024,0);
+   pc->inBuf[size] = '\0';
+ #ifdef _DEBUG
+   printf("  pop3CheckMail, stat received buf (size=%d): [%s]\n",
+@@ -313,7 +367,7 @@
+ 
+   sprintf(pc->outBuf,"LAST\r\n");
+   send(pc->s, pc->outBuf, strlen(pc->outBuf),0 );
+-  size = recv(pc->s,pc->inBuf,1024,0);
++  size = do_recv(pc->s,pc->inBuf,1024,0);
+   pc->inBuf[size] = '\0';
+ #ifdef _DEBUG
+   printf("  pop3CheckMail, last received buf (size=%d): [%s]\n",
+@@ -325,9 +379,25 @@
+ #ifdef _DEBUG
+     printf("  Error Receiving LAST: [%s]\n", temp);
+ #endif
+-    pc->numOfUnreadMessages = pc->numOfMessages;
++    /* TRY STAT instead LAST */
++    sprintf(pc->outBuf,"STAT\r\n");
++    send(pc->s, pc->outBuf, strlen(pc->outBuf),0 );
++    size = do_recv(pc->s,pc->inBuf,1024,0);
++    pc->inBuf[size] = '\0';
++#ifdef _DEBUG
++    printf("  pop3CheckMail, last received buf (size=%d): [%s]\n",
++		    size, pc->inBuf);
++#endif
++    memset(temp,0,1024);
++    memcpy(temp,pc->inBuf,size);
++    if( temp[0] != '+' ){
++#ifdef _DEBUG
++      printf("  Error Receiving STAT: [%s]\n", temp);
++#endif
++      pc->numOfUnreadMessages = pc->numOfMessages;
++    }
+   }
+-  else {
++  if( temp[0] != '+' ){
+     ptr = strtok(temp, " ");
+     ptr = strtok( 0," ");
+     pc->numOfUnreadMessages = pc->numOfMessages - atoi(ptr);
+@@ -545,7 +615,7 @@
+   printf("  %s\n", pc->outBuf);
+ #endif
+   send(pc->s, pc->outBuf, strlen(pc->outBuf), 0);
+-  size = recv(pc->s, pc->inBuf, 4096, 0);
++  size = do_recv(pc->s, pc->inBuf, 4096, 0);
+   if ('+' != pc->inBuf[0]) {
+     perror("error while deleting mail");
+     return (1);
+@@ -579,7 +649,7 @@
+     if( pc->connected == NOT_CONNECTED )
+         return -1;
+     send(pc->s, "quit\r\n", 6,0 );
+-    size =recv(pc->s,&pc->inBuf,1024,0);
++    size = do_recv(pc->s,&pc->inBuf,1024,0);
+     pc->connected = NOT_CONNECTED;
+     if(pc->s != 0)
+         close(pc->s);
diff --git a/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-gcc-10.patch b/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-gcc-10.patch
new file mode 100644
index 000000000000..5beb41552562
--- /dev/null
+++ b/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-gcc-10.patch
@@ -0,0 +1,21 @@
+--- a/wmgeneral/wmgeneral.c
++++ b/wmgeneral/wmgeneral.c
+@@ -45,6 +45,7 @@ Window		iconwin, win;
+ GC			NormalGC;
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
++Display		*display;
+ 
+   /*****************/
+  /* Mouse Regions */
+--- a/wmgeneral/wmgeneral.h
++++ b/wmgeneral/wmgeneral.h
+@@ -21,7 +21,7 @@ typedef struct {
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
diff --git a/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-list.patch b/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-list.patch
new file mode 100644
index 000000000000..684b5a171c9b
--- /dev/null
+++ b/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-list.patch
@@ -0,0 +1,127 @@
+diff -Naur a/wmgeneral/list.c b/wmgeneral/list.c
+--- a/wmgeneral/list.c	2016-01-04 13:22:26.492218531 +0100
++++ b/wmgeneral/list.c	2016-01-04 13:22:59.018229270 +0100
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail) */
+ 
+-INLINE LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero */
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned  */
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor */
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -101,7 +101,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT */
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@
+     }
+ }*/
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -132,7 +132,7 @@
+ 
+ /* Return element that has ELEM as car */
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@
+ 
+ /* Free list (backwards recursive) */
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST */
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur a/wmgeneral/list.h b/wmgeneral/list.h
+--- a/wmgeneral/list.h	2016-01-04 13:22:26.492218531 +0100
++++ b/wmgeneral/list.h	2016-01-04 13:22:30.028219699 +0100
+@@ -29,31 +29,25 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-plugins/wmpop3lb/metadata.xml b/x11-plugins/wmpop3lb/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmpop3lb/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild
new file mode 100644
index 000000000000..8b443af7ff28
--- /dev/null
+++ b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="dockapp for checking up to 7 pop3 accounts"
+HOMEPAGE="https://www.dockapps.net/wmpop3lb"
+SRC_URI="https://www.dockapps.net/download/${P/-}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P/-}
+
+PATCHES=( "${FILESDIR}"/${P}-fix-RECV-and-try-STAT-if-LAST-wont-work.patch
+	"${FILESDIR}"/${P}-list.patch
+	"${FILESDIR}"/${P}-gcc-10.patch )
+
+src_prepare() {
+	#Honour Gentoo CFLAGS
+	sed -i -e "s|-g2 -D_DEBUG|${CFLAGS}|" "wmpop3/Makefile" || die
+
+	#De-hardcode compiler
+	sed -i -e "s|cc|\$(CC)|g" "wmpop3/Makefile" || die
+
+	#Honour Gentoo LDFLAGS - bug #335986
+	sed -i -e "s|\$(FLAGS) -o wmpop3lb|\$(LDFLAGS) -o wmpop3lb|" "wmpop3/Makefile" || die
+	default
+}
+
+src_compile() {
+	emake -C wmpop3
+}
+
+src_install() {
+	dobin wmpop3/wmpop3lb
+	dodoc CHANGE_LOG README
+}
diff --git a/x11-plugins/wmpower/Manifest b/x11-plugins/wmpower/Manifest
new file mode 100644
index 000000000000..065f2bb5604a
--- /dev/null
+++ b/x11-plugins/wmpower/Manifest
@@ -0,0 +1 @@
+DIST wmpower-0.4.3.tar.bz2 99178 BLAKE2B 191c562d0b3a2d738d826030323b17db049868bef988ac49250af3e0c32b0c531bb1d819526de609fae3da8bd74b2bc78d724c58999f5fae5e6655e0c1aaa5a1 SHA512 90d96949472497e39760f76b33f4363751863d3f824b1cb22ab9ff333f496b1f329db5fda1a2353c871f87b9f9f09781c410b51907cf13c617cdd3af2c2c84e9
diff --git a/x11-plugins/wmpower/files/wmpower-0.4.3-gcc-10.patch b/x11-plugins/wmpower/files/wmpower-0.4.3-gcc-10.patch
new file mode 100644
index 000000000000..bdc28a16341e
--- /dev/null
+++ b/x11-plugins/wmpower/files/wmpower-0.4.3-gcc-10.patch
@@ -0,0 +1,148 @@
+diff -Naur wmpower-0.4.3.orig/src/dockapp/dockapp.c wmpower-0.4.3/src/dockapp/dockapp.c
+--- wmpower-0.4.3.orig/src/dockapp/dockapp.c	2003-09-18 18:53:27.000000000 +0200
++++ wmpower-0.4.3/src/dockapp/dockapp.c	2020-01-29 19:15:58.062434728 +0100
+@@ -50,6 +50,7 @@
+ GC         NormalGC;
+ XpmIcon    wmgen;
+ Pixmap     pixmask;
++Display    *display;
+ 
+   /*****************/
+  /* Mouse Regions */
+diff -Naur wmpower-0.4.3.orig/src/dockapp/dockapp.h wmpower-0.4.3/src/dockapp/dockapp.h
+--- wmpower-0.4.3.orig/src/dockapp/dockapp.h	2003-09-18 18:29:17.000000000 +0200
++++ wmpower-0.4.3/src/dockapp/dockapp.h	2020-01-29 19:15:58.062434728 +0100
+@@ -28,7 +28,7 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
+diff -Naur wmpower-0.4.3.orig/src/power_management/acpi/libacpi.c wmpower-0.4.3/src/power_management/acpi/libacpi.c
+--- wmpower-0.4.3.orig/src/power_management/acpi/libacpi.c	2005-09-06 12:09:10.000000000 +0200
++++ wmpower-0.4.3/src/power_management/acpi/libacpi.c	2020-01-29 19:20:44.031452047 +0100
+@@ -46,6 +46,8 @@
+ #include "power_management.h"
+ #include "lib_utils.h"
+ 
++char battery_type;
++int batt_count;
+ 
+ /* here we put temp stuff read from proc files */
+ char buf[512];
+diff -Naur wmpower-0.4.3.orig/src/power_management/acpi/libacpi.h wmpower-0.4.3/src/power_management/acpi/libacpi.h
+--- wmpower-0.4.3.orig/src/power_management/acpi/libacpi.h	2004-07-16 20:13:19.000000000 +0200
++++ wmpower-0.4.3/src/power_management/acpi/libacpi.h	2020-01-29 19:20:48.717452334 +0100
+@@ -67,7 +67,7 @@
+ }
+ ACPIinfo;
+ 
+-char battery_type;
++extern char battery_type;
+ 
+ typedef struct
+ {
+@@ -76,7 +76,7 @@
+ ACADstate;
+ 
+ /* number of batteries detected */
+-int batt_count;
++extern int batt_count;
+ 
+ int  check_acpi (void);
+ void read_acad_state (ACADstate *acadstate);
+diff -Naur wmpower-0.4.3.orig/src/power_management/compal/compal_lib.c wmpower-0.4.3/src/power_management/compal/compal_lib.c
+--- wmpower-0.4.3.orig/src/power_management/compal/compal_lib.c	2005-09-12 18:13:32.000000000 +0200
++++ wmpower-0.4.3/src/power_management/compal/compal_lib.c	2020-01-29 19:21:14.455453915 +0100
+@@ -40,6 +40,7 @@
+ #include "lib_utils.h"
+ #include "power_management.h"
+ 
++char  compal_model[COMPAL_MAX_MODEL_INFO];
+ 
+ 
+ /* gets a value from a strtok-ed buffer; for reading from /proc */
+diff -Naur wmpower-0.4.3.orig/src/power_management/compal/compal_lib.h wmpower-0.4.3/src/power_management/compal/compal_lib.h
+--- wmpower-0.4.3.orig/src/power_management/compal/compal_lib.h	2005-09-12 18:13:23.000000000 +0200
++++ wmpower-0.4.3/src/power_management/compal/compal_lib.h	2020-01-29 19:21:09.180453591 +0100
+@@ -44,7 +44,7 @@
+ #define COMPAL_PROC_FILE_BATT	"/proc/omnibook/battery"
+ 
+ 
+-char  compal_model[COMPAL_MAX_MODEL_INFO];
++extern char  compal_model[COMPAL_MAX_MODEL_INFO];
+ 
+ char *getvaluefromhash (char *key, char *hash);
+ 
+diff -Naur wmpower-0.4.3.orig/src/power_management/power_management.c wmpower-0.4.3/src/power_management/power_management.c
+--- wmpower-0.4.3.orig/src/power_management/power_management.c	2005-12-15 12:54:59.000000000 +0100
++++ wmpower-0.4.3/src/power_management/power_management.c	2020-01-29 19:18:36.031444239 +0100
+@@ -55,6 +55,13 @@
+ int use_noflushd=1;
+ int use_cpufreq=1;
+ 
++kernel_versions kernel_version;
++int minBrightness;
++int maxBrightness;
++int waittime; /* /proc polling time */
++char *cpufreq_online_governor;
++char *cpufreq_offline_governor;
++
+ /* Battery to monitor */
+ int Battery;
+ 
+diff -Naur wmpower-0.4.3.orig/src/power_management/power_management.h wmpower-0.4.3/src/power_management/power_management.h
+--- wmpower-0.4.3.orig/src/power_management/power_management.h	2005-12-15 12:54:12.000000000 +0100
++++ wmpower-0.4.3/src/power_management/power_management.h	2020-01-29 19:18:29.941443870 +0100
+@@ -34,7 +34,7 @@
+ 	IS_2_6 = 0,
+ 	IS_OTHER
+ } kernel_versions;
+-kernel_versions kernel_version;
++extern kernel_versions kernel_version;
+ 
+ typedef struct
+ {
+@@ -49,11 +49,11 @@
+ 
+ } pm_status;
+ 
+-int minBrightness;
+-int maxBrightness;
+-int waittime; /* /proc polling time */
+-char *cpufreq_online_governor;
+-char *cpufreq_offline_governor;
++extern int minBrightness;
++extern int maxBrightness;
++extern int waittime; /* /proc polling time */
++extern char *cpufreq_online_governor;
++extern char *cpufreq_offline_governor;
+ 
+ int pm_support(int which_battery);
+ void get_power_status(pm_status *power_status);
+diff -Naur wmpower-0.4.3.orig/src/power_management/toshiba/toshiba_lib.c wmpower-0.4.3/src/power_management/toshiba/toshiba_lib.c
+--- wmpower-0.4.3.orig/src/power_management/toshiba/toshiba_lib.c	2005-09-02 11:46:16.000000000 +0200
++++ wmpower-0.4.3/src/power_management/toshiba/toshiba_lib.c	2020-01-29 19:19:47.112448563 +0100
+@@ -57,6 +57,7 @@
+ #include "lib_utils.h"
+ #include "power_management.h"
+ 
++char toshiba_model[255];
+ 
+ void UglyHack(void);
+ int Get_Fan_Status(void);
+diff -Naur wmpower-0.4.3.orig/src/power_management/toshiba/toshiba_lib.h wmpower-0.4.3/src/power_management/toshiba/toshiba_lib.h
+--- wmpower-0.4.3.orig/src/power_management/toshiba/toshiba_lib.h	2005-09-02 11:34:04.000000000 +0200
++++ wmpower-0.4.3/src/power_management/toshiba/toshiba_lib.h	2020-01-29 19:19:38.749448053 +0100
+@@ -34,7 +34,7 @@
+ #define TOSHIBA_LCD_MED 1
+ #define TOSHIBA_LCD_MAX 2
+ 
+-char toshiba_model[255];
++extern char toshiba_model[255];
+ 
+ int machine_is_toshiba(int *use_toshiba_hardware);
+ int toshiba_get_fan_status(int use_toshiba_hardware);
diff --git a/x11-plugins/wmpower/metadata.xml b/x11-plugins/wmpower/metadata.xml
new file mode 100644
index 000000000000..f96e44a7073f
--- /dev/null
+++ b/x11-plugins/wmpower/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+wmpower is a Window Maker dock application
+allowing the user to graphically see (and set) the power management status of his laptop.
+It works with both APM and ACPI enabled kernels, has special support for Toshiba, Compal
+and Dell hardware, and allows you to dinamically set the frequency of your CPU(s) via CPUfreq.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">wmpower</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild b/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild
new file mode 100644
index 000000000000..0f828dab5809
--- /dev/null
+++ b/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="a dockapp to get/set power management status for laptops (APM, ACPI
+and CPUfreq)"
+HOMEPAGE="http://wmpower.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wmpower/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
+
+DOCS=( AUTHORS BUGS ChangeLog LEGGIMI NEWS README README.compal THANKS TODO )
+
+src_configure() {
+	# override wmpower self-calculated cflags
+	econf MY_CFLAGS="${CFLAGS}"
+}
+
+src_compile() {
+	emake prefix="/usr/"
+}
diff --git a/x11-plugins/wmppp/Manifest b/x11-plugins/wmppp/Manifest
new file mode 100644
index 000000000000..d7f213222fd1
--- /dev/null
+++ b/x11-plugins/wmppp/Manifest
@@ -0,0 +1 @@
+DIST wmppp.app-1.3.2.tar.gz 26883 BLAKE2B 443144a0eca5653f1ee71b3fccea2ea00e079f224638d815609e20fd245d1f0fefe99a416ceed7f22a7e84f6da32d9ff0ca0d6259d9c047b6791e8343c209903 SHA512 d6fdf5b3016ff05cb6d251b7b9985ca9f13ba791dbd40d2109aa18076dc034f143d994f30bb6070e6152e50c0d51774c32dbe8f23062b798bd5f2c820f8b65c1
diff --git a/x11-plugins/wmppp/metadata.xml b/x11-plugins/wmppp/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmppp/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmppp/wmppp-1.3.2-r1.ebuild b/x11-plugins/wmppp/wmppp-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..32005e4b5d81
--- /dev/null
+++ b/x11-plugins/wmppp/wmppp-1.3.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+MY_P=${PN}.app-${PV}
+DESCRIPTION="PPP dial control and network load monitor with NeXTStep look"
+HOMEPAGE="http://www.dockapps.net/wmppp.app"
+SRC_URI="http://www.dockapps.net/download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+# Specific to this tarball
+S=${WORKDIR}/dockapps-7ec9002
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc BUGS CHANGES HINTS README TODO
+}
diff --git a/x11-plugins/wmrack/Manifest b/x11-plugins/wmrack/Manifest
new file mode 100644
index 000000000000..e0f9255a091f
--- /dev/null
+++ b/x11-plugins/wmrack/Manifest
@@ -0,0 +1 @@
+DIST wmrack-1.4.tar.gz 124243 BLAKE2B a1d8581b9ebc252429abe4c04aebbe9774d8a84048511b6dc5af02b8495f9c6c50d23e3fa26dd68f31d2d155ddae28e19c37d81082ed4378d269d19fd6888ae6 SHA512 27ed399a56f7f37e494005f02e74a09ad22c448ac288a3d2123987488ce65460f4c80841e8ff0fe3ff20db156130bc9e4894b42280181a1af58e06c1f8320a1e
diff --git a/x11-plugins/wmrack/metadata.xml b/x11-plugins/wmrack/metadata.xml
new file mode 100644
index 000000000000..8dfbca974393
--- /dev/null
+++ b/x11-plugins/wmrack/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">wmrack</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmrack/wmrack-1.4-r1.ebuild b/x11-plugins/wmrack/wmrack-1.4-r1.ebuild
new file mode 100644
index 000000000000..f40d1f916205
--- /dev/null
+++ b/x11-plugins/wmrack/wmrack-1.4-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="a sound mixer and CD player dockapp"
+HOMEPAGE="http://wmrack.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+DOCS=( CHANGES README TODO )
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's:gcc:$(CC):' \
+		-e 's:$(OBJECTS) -o:$(OBJECTS) $(LDFLAGS) -o:' "${S}"/Makefile.in || die
+}
+
+src_install() {
+	emake LIBDIR="${D}/usr/$(get_libdir)/WMRack" \
+		MANDIR="${D}/usr/share/man" BINDIR="${D}/usr/bin" \
+		install
+	einstalldocs
+}
diff --git a/x11-plugins/wmrecord/Manifest b/x11-plugins/wmrecord/Manifest
new file mode 100644
index 000000000000..43a766aaa374
--- /dev/null
+++ b/x11-plugins/wmrecord/Manifest
@@ -0,0 +1 @@
+DIST wmrecord-1.0.5_20040218_0029.tgz 38594 BLAKE2B d1cc41a7de5c45a19ea364c9c007382c9220bdf0b4a6d69e09f2169cfc879e51d53afd33fd434f28ad6ea4e20b05760b06afbbf8a5560abc63b6edea9114bab7 SHA512 4a0c9f58d22a72a83f9e7922b5806528cc412576d55b9c24f45b7d93a5594f380f51581addbb41b65c18c9b5f0ac1cbc8e3881268a75386545f5024f55836154
diff --git a/x11-plugins/wmrecord/files/wmrecord-1.0.5.3-fno-common.patch b/x11-plugins/wmrecord/files/wmrecord-1.0.5.3-fno-common.patch
new file mode 100644
index 000000000000..a70b5f87b0ee
--- /dev/null
+++ b/x11-plugins/wmrecord/files/wmrecord-1.0.5.3-fno-common.patch
@@ -0,0 +1,29 @@
+diff -Naur wmrecord-1.0.5.orig/wmgeneral/wmgeneral.c wmrecord-1.0.5/wmgeneral/wmgeneral.c
+--- wmrecord-1.0.5.orig/wmgeneral/wmgeneral.c	1999-07-05 20:40:04.000000000 +0200
++++ wmrecord-1.0.5/wmgeneral/wmgeneral.c	2020-06-13 10:57:57.237900077 +0200
+@@ -66,6 +66,9 @@
+ char		*Geometry = "";
+ GC			NormalGC;
+ Pixmap		pixmask;
++Display		*display;
++Window          Root, iconwin, win;
++XpmIcon		wmgen;
+ 
+   /*****************/
+  /* Mouse Regions */
+diff -Naur wmrecord-1.0.5.orig/wmgeneral/wmgeneral.h wmrecord-1.0.5/wmgeneral/wmgeneral.h
+--- wmrecord-1.0.5.orig/wmgeneral/wmgeneral.h	1999-06-01 15:46:55.000000000 +0200
++++ wmrecord-1.0.5/wmgeneral/wmgeneral.h	2020-06-13 10:57:51.055895156 +0200
+@@ -36,9 +36,9 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
+-Window          Root, iconwin, win;
+-XpmIcon		wmgen;
++extern Display		*display;
++extern Window          Root, iconwin, win;
++extern XpmIcon		wmgen;
+ 
+   /***********************/
+  /* Function Prototypes */
diff --git a/x11-plugins/wmrecord/files/wmrecord.desktop b/x11-plugins/wmrecord/files/wmrecord.desktop
new file mode 100644
index 000000000000..c166dc454985
--- /dev/null
+++ b/x11-plugins/wmrecord/files/wmrecord.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=WmRecord
+Comment=Audio recorder for WindowMaker
+Comment[pl]=Rekorder dźwięku dla WindowMakera
+Exec=wmrecord
+Type=Application
+Terminal=false
+Categories=AudioVideo;Audio;Recorder;
diff --git a/x11-plugins/wmrecord/metadata.xml b/x11-plugins/wmrecord/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmrecord/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmrecord/wmrecord-1.0.5.3-r2.ebuild b/x11-plugins/wmrecord/wmrecord-1.0.5.3-r2.ebuild
new file mode 100644
index 000000000000..565cf6323752
--- /dev/null
+++ b/x11-plugins/wmrecord/wmrecord-1.0.5.3-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="A Dockable General Purpose Recording Utility"
+HOMEPAGE="http://ret009t0.eresmas.net/other_software/wmrecord/"
+SRC_URI="http://ret009t0.eresmas.net/other_software/wmrecord/${PN}-1.0.5_20040218_0029.tgz"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc x86"
+
+S="${WORKDIR}/${PN}-1.0.5"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+src_prepare() {
+	default
+	#prevent auto-stripping of binaries. Closes bug #252112
+	sed -i 's/install -s -o/install -o/' "${S}/Makefile" || die
+
+	#Honour Gentoo LDFLAGS. Closes bug #336753.
+	sed -i 's/-o $@ wmrecord.o/$(LDFLAGS) -o $@ wmrecord.o/' "${S}/Makefile" || die
+
+	#Fix buffer overflow. Closes bug #336754.
+	sed -i 's/sprintf(cse, "000");/snprintf(cse, "000", 3);/' "${S}/wmrecord.c" || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} -Wall"
+}
+
+src_install() {
+	dobin ${PN}
+	doman man/${PN}.1
+	domenu "${FILESDIR}"/${PN}.desktop
+	einstalldocs
+}
diff --git a/x11-plugins/wmsmixer/Manifest b/x11-plugins/wmsmixer/Manifest
new file mode 100644
index 000000000000..b4fa7c3b7ad8
--- /dev/null
+++ b/x11-plugins/wmsmixer/Manifest
@@ -0,0 +1 @@
+DIST wmsmixer-0.5.1.tar.gz 33350 BLAKE2B 9f80e0680834b0c8537baececa1a80708ef249db3b58cd77d8d5ab2d13a96959d55f016b38bc5975f8c3decf7569a3a356e5c09cb27c2b5a662dc2fe00766962 SHA512 2731645addb9888b30cbfcaa1f9609c036855d3ee864628535fc5a0dd4c005d01b111bac3dd7f9d11f4794f55f22be65564ccafe598f098b13abdfa9277da299
diff --git a/x11-plugins/wmsmixer/metadata.xml b/x11-plugins/wmsmixer/metadata.xml
new file mode 100644
index 000000000000..408b7e757242
--- /dev/null
+++ b/x11-plugins/wmsmixer/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+WMsmixer is a hack to wmmixer which makes some changes to the display
+and adds a few new features, most notably scrollwheel support. It also
+includes a numeric volume indicator.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmsmixer/wmsmixer-0.5.1-r1.ebuild b/x11-plugins/wmsmixer/wmsmixer-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..0b0c25be6b64
--- /dev/null
+++ b/x11-plugins/wmsmixer/wmsmixer-0.5.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="fork of wmmixer adding scrollwheel support and other features"
+HOMEPAGE="https://www.dockapps.net/wmsmixer"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXpm
+	x11-libs/libXext
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_compile() {
+	$(tc-getCXX) ${CFLAGS} -I/usr/X11R6/include -c -o wmsmixer.o wmsmixer.cc
+	rm -f wmsmixer || die
+	$(tc-getCXX) ${LDFLAGS} -o wmsmixer ${CFLAGS} -L/usr/X11R6/lib wmsmixer.o -lXpm -lXext -lX11
+}
+
+src_install() {
+	insinto /usr/bin
+	insopts -m0655
+	doins wmsmixer
+	dodoc README README.wmmixer
+}
diff --git a/x11-plugins/wmstickynotes/Manifest b/x11-plugins/wmstickynotes/Manifest
new file mode 100644
index 000000000000..d7b39951ac0b
--- /dev/null
+++ b/x11-plugins/wmstickynotes/Manifest
@@ -0,0 +1 @@
+DIST wmstickynotes-0.2.tar.gz 107432 BLAKE2B 2164c351adc723caa22689cbec277554b4adc1d73dce67b52f3ba30ce14a6cc70c39762ae6eb00f2d51b4c365738edfe5713580aa1c30d9256cf112efe579a4b SHA512 59e54e64157a04296f12c1c8c224c5c4b05685f2f0e05abe2a23a1c2137c0656c30e7befc4e5a39b4cb97f99e2ff68f53173cf6456b95f3fef80441661d19b63
diff --git a/x11-plugins/wmstickynotes/files/wmstickynotes-0.2-gold.patch b/x11-plugins/wmstickynotes/files/wmstickynotes-0.2-gold.patch
new file mode 100644
index 000000000000..360140a85ed6
--- /dev/null
+++ b/x11-plugins/wmstickynotes/files/wmstickynotes-0.2-gold.patch
@@ -0,0 +1,28 @@
+ Makefile.am |    2 +-
+ Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 7c69428..bccf1d4 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -10,5 +10,5 @@ AUTOMAKE_OPTIONS = gnu
+ bin_PROGRAMS = wmstickynotes
+ wmstickynotes_SOURCES = wmstickynotes.c wmstickynotes.h wmstickynotes.xpm delete_button.xpm resize_button.xpm
+ 
+-wmstickynotes_LDADD = @GTK_LIBS@
++wmstickynotes_LDADD = @GTK_LIBS@ -lX11
+ EXTRA_DIST = THANKS
+diff --git a/Makefile.in b/Makefile.in
+index 91b19bd..fd883f2 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -182,7 +182,7 @@ top_srcdir = @top_srcdir@
+ AM_CFLAGS = @GTK_CFLAGS@
+ AUTOMAKE_OPTIONS = gnu
+ wmstickynotes_SOURCES = wmstickynotes.c wmstickynotes.h wmstickynotes.xpm delete_button.xpm resize_button.xpm
+-wmstickynotes_LDADD = @GTK_LIBS@
++wmstickynotes_LDADD = @GTK_LIBS@ -lX11
+ EXTRA_DIST = THANKS
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/x11-plugins/wmstickynotes/metadata.xml b/x11-plugins/wmstickynotes/metadata.xml
new file mode 100644
index 000000000000..d1235a51ba52
--- /dev/null
+++ b/x11-plugins/wmstickynotes/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">wmstickynotes</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmstickynotes/wmstickynotes-0.2-r1.ebuild b/x11-plugins/wmstickynotes/wmstickynotes-0.2-r1.ebuild
new file mode 100644
index 000000000000..61bae078ca75
--- /dev/null
+++ b/x11-plugins/wmstickynotes/wmstickynotes-0.2-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A dockapp for keeping small notes around on the desktop"
+HOMEPAGE="https://sourceforge.net/projects/wmstickynotes/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="x11-libs/gtk+:2"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-gold.patch )
diff --git a/x11-plugins/wmswallow/Manifest b/x11-plugins/wmswallow/Manifest
new file mode 100644
index 000000000000..a43de4916d9f
--- /dev/null
+++ b/x11-plugins/wmswallow/Manifest
@@ -0,0 +1 @@
+DIST wmswallow-0.6.1.tar.Z 28567 BLAKE2B 3fb5c39fd07c4cce329f0b60abea72d0c42203bedd36f55994bc16f36412843aef81bc985a6acb9cea0b279f900f84ffc99bc088b5343e2997f6d3951bca4bba SHA512 24ef61a4084bda49afd6a7168600d99c60fe85daab6d16733fd208a905966433ca3d031a1d991676f3e73cb8a3a552c49fe69cfb4e1271e7c9a09d9247c21cdc
diff --git a/x11-plugins/wmswallow/files/wmswallow-0.6.1-format-security.patch b/x11-plugins/wmswallow/files/wmswallow-0.6.1-format-security.patch
new file mode 100644
index 000000000000..aad08dd18f17
--- /dev/null
+++ b/x11-plugins/wmswallow/files/wmswallow-0.6.1-format-security.patch
@@ -0,0 +1,16 @@
+--- a/wmswallow.c	2015-04-01 17:12:29.420177608 +0200
++++ b/wmswallow.c	2015-04-01 17:13:14.947182921 +0200
+@@ -445,11 +445,11 @@
+ int printlist(FILE * stream, char * string, char **stringlist) {
+   int i=0;
+ 
+-  fprintf(stream, string);
++  fprintf(stream, "%s", string);
+   if (stringlist!=NULL) {
+     while (stringlist[i]!=NULL) {
+       fprintf(stream, " �");
+-      fprintf(stream, stringlist[i]);
++      fprintf(stream, "%s", stringlist[i]);
+       fprintf(stream, "� ");
+       ++i;
+     }
diff --git a/x11-plugins/wmswallow/metadata.xml b/x11-plugins/wmswallow/metadata.xml
new file mode 100644
index 000000000000..b2dee7903672
--- /dev/null
+++ b/x11-plugins/wmswallow/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+wmswallow is a WindowMaker dock applet that makes any application dockable. You 
+can define an action to be taken on a mouseclick if the window does not receive 
+mouseclicks itself, and you can define the size and width of the swallowed 
+window on the commandline. Applications may be started on the commandline and 
+specified via name, class, or window-id.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..5821727229a1
--- /dev/null
+++ b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A dock applet to make any application dockable"
+HOMEPAGE="https://www.dockapps.net/wmswallow"
+SRC_URI="https://www.dockapps.net/download/${PN}.tar.Z -> ${P}.tar.Z"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}"/${P}-format-security.patch )
+
+src_prepare() {
+	default
+
+	# the Makefile is a mess, just
+	# rely on implicit rules instead
+	rm Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags x11 xext)
+	export LDLIBS="$($(tc-getPKG_CONFIG) --libs x11 xext)"
+}
+
+src_compile() {
+	emake wmswallow
+}
+
+src_install() {
+	dobin wmswallow
+	dodoc CHANGELOG README todo
+}
diff --git a/x11-plugins/wmsysmon/Manifest b/x11-plugins/wmsysmon/Manifest
new file mode 100644
index 000000000000..12e312cd5b7f
--- /dev/null
+++ b/x11-plugins/wmsysmon/Manifest
@@ -0,0 +1 @@
+DIST wmsysmon-0.7.8.tar.gz 23533 BLAKE2B 830edc78222e8997c6ee23bdd9fcb28729e9b80d92b07f70a53d841065b7377f5c450024c511b4faa92043bd45aa0cc92e89ff900d7d4a53d3c9f4b57b4e6e7e SHA512 b1afd176851e8f89896e39b55d24d6efeb97eb5fdbb9c181cb030320445f1d8b22d31073edc615e6b47b91fd133b381f00b612901c8b312e7da404a4746bb97c
diff --git a/x11-plugins/wmsysmon/files/wmsysmon-0.7.8-gcc-10.patch b/x11-plugins/wmsysmon/files/wmsysmon-0.7.8-gcc-10.patch
new file mode 100644
index 000000000000..e9477899b1b9
--- /dev/null
+++ b/x11-plugins/wmsysmon/files/wmsysmon-0.7.8-gcc-10.patch
@@ -0,0 +1,23 @@
+diff -Naur src.orig/wmgeneral.h src/wmgeneral.h
+--- src.orig/wmgeneral.h	2017-12-06 15:00:16.000000000 +0100
++++ src/wmgeneral.h	2020-03-01 16:03:18.293199660 +0100
+@@ -38,7 +38,7 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
+diff -Naur src.orig/wmsysmon.c src/wmsysmon.c
+--- src.orig/wmsysmon.c	2017-12-06 15:00:16.000000000 +0100
++++ src/wmsysmon.c	2020-03-01 16:03:32.992203044 +0100
+@@ -138,6 +138,7 @@
+ time_t	curtime;
+ time_t	prevtime;
+ 
++Display		*display;
+ 
+ kernel_versions Get_Kernel_version(void);
+ void usage(void);
diff --git a/x11-plugins/wmsysmon/metadata.xml b/x11-plugins/wmsysmon/metadata.xml
new file mode 100644
index 000000000000..9589b48c8f64
--- /dev/null
+++ b/x11-plugins/wmsysmon/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+<upstream>
+	<remote-id type="github">voyageur/wmsysmon</remote-id>
+</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild b/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild
new file mode 100644
index 000000000000..4a1faee41b23
--- /dev/null
+++ b/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="a dockapp to monitor: CPU, Memory, Uptime, IRQs, Paging and Swap activity"
+HOMEPAGE="https://github.com/voyageur/wmsysmon"
+SRC_URI="https://github.com/voyageur/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
+DOCS=( ../ChangeLog ../README )
+S=${WORKDIR}/${P}/src
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin wmsysmon
+	einstalldocs
+}
diff --git a/x11-plugins/wmsystemtray/Manifest b/x11-plugins/wmsystemtray/Manifest
new file mode 100644
index 000000000000..6e0224bd0a25
--- /dev/null
+++ b/x11-plugins/wmsystemtray/Manifest
@@ -0,0 +1 @@
+DIST wmsystemtray-1.4.tar.gz 131973 BLAKE2B c9927c39006b665163826ff3d937042df1a3d0ea4cf9045767ff511499151f6b525a9e9b37ca62955e61853f48e7b0148cbf8b5a9e4e130c81bc9af35df99150 SHA512 16620f222dc16d709e89d5011f699c9f96b6e4bf6014eec628574b84434b2e828ba12c92b5a598d1b9037dd16cbff2cc45f7ecb6533777c8a64bf435ea0c549c
diff --git a/x11-plugins/wmsystemtray/metadata.xml b/x11-plugins/wmsystemtray/metadata.xml
new file mode 100644
index 000000000000..83d3dd53c123
--- /dev/null
+++ b/x11-plugins/wmsystemtray/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>a system tray using the freedesktop.org system tray protocol designed as a Window Maker dock app. It has the ability to display more than one dock window to make room for more tray icons, and the ability to scroll through the icons if more are present than will fit.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">wmsystemtray</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmsystemtray/wmsystemtray-1.4-r2.ebuild b/x11-plugins/wmsystemtray/wmsystemtray-1.4-r2.ebuild
new file mode 100644
index 000000000000..62350a58135d
--- /dev/null
+++ b/x11-plugins/wmsystemtray/wmsystemtray-1.4-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="a system tray dockapp with the ability to display more than just four tray icons"
+HOMEPAGE="https://sourceforge.net/projects/wmsystemtray/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXmu
+	x11-libs/libXpm"
+RDEPEND="${DEPEND}"
diff --git a/x11-plugins/wmsystray/Manifest b/x11-plugins/wmsystray/Manifest
new file mode 100644
index 000000000000..1636d7454591
--- /dev/null
+++ b/x11-plugins/wmsystray/Manifest
@@ -0,0 +1 @@
+DIST wmsystray-0.1.1.tar.bz2 18261 BLAKE2B d232dcfd3077760d7990ec8e22249aafa9dacf415e71b6a662a1a32464e233cd5460f9b99d6e1c478ce69c6ad0e9973febfce2292992d5619792d4bf4dcc1d7c SHA512 a28d8cb6a3e74909a1467459f81a853dae2d74c28db166be15f398f00bc8066fbb1caa0e982fb3874279a7edd376ab892499e8981d2c2126eed591ef52f8d604
diff --git a/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch b/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch
new file mode 100644
index 000000000000..19afa355b229
--- /dev/null
+++ b/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch
@@ -0,0 +1,44 @@
+diff -ur wmsystray-0.1.1/Makefile wmsystray-0.1.1.new/Makefile
+--- wmsystray-0.1.1/Makefile	2004-03-01 05:35:47.000000000 +0100
++++ wmsystray-0.1.1.new/Makefile	2007-06-30 18:09:59.000000000 +0200
+@@ -1,13 +1,14 @@
+ prefix=/usr
+ bindir = ${prefix}/bin
+ mandir = ${prefix}/share/man
+-INSTALL = /bin/install
++INSTALL = install
+ INSTALLPROG = ${INSTALL} -m 0755
+ INSTALLMAN = ${INSTALL} -m 0644
++EXTRACFLAGS = 
+ 
+ all:
+-	make -C xembed xembed.o
+-	make -C wmsystray
++	make EXTRACFLAGS="${EXTRACFLAGS}" -C xembed xembed.o
++	make EXTRACFLAGS="${EXTRACFLAGS}" -C wmsystray
+ 
+ clean:
+ 	make -C xembed clean
+diff -ur wmsystray-0.1.1/wmsystray/Makefile wmsystray-0.1.1.new/wmsystray/Makefile
+--- wmsystray-0.1.1/wmsystray/Makefile	2004-03-01 04:54:44.000000000 +0100
++++ wmsystray-0.1.1.new/wmsystray/Makefile	2007-06-30 18:09:59.000000000 +0200
+@@ -1,7 +1,7 @@
+ include ../Rules.make
+ 
+ CC = gcc
+-CFLAGS = ${X11CFLAGS} -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -Wall -g
++CFLAGS = ${X11CFLAGS} -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -g ${EXTRACFLAGS}
+ LDFLAGS = ${X11LDFLAGS} -lXpm
+ 
+ OBJS = main.o ui.o systray.o xpms.o
+diff -ur wmsystray-0.1.1/xembed/Makefile wmsystray-0.1.1.new/xembed/Makefile
+--- wmsystray-0.1.1/xembed/Makefile	2004-03-01 04:54:44.000000000 +0100
++++ wmsystray-0.1.1.new/xembed/Makefile	2007-06-30 18:09:59.000000000 +0200
+@@ -1,6 +1,6 @@
+ include ../Rules.make
+ 
+-CFLAGS = -DTRACE_LEVEL=${TRACE_LEVEL} ${X11CFLAGS} -Wall -g
++CFLAGS = -DTRACE_LEVEL=${TRACE_LEVEL} ${X11CFLAGS} -g ${EXTRACFLAGS}
+ LDFLAGS = ${X11LDFLAGS}
+ 
+ all: xembed.o
diff --git a/x11-plugins/wmsystray/files/wmsystray-0.1.1-gcc-3.4.patch b/x11-plugins/wmsystray/files/wmsystray-0.1.1-gcc-3.4.patch
new file mode 100644
index 000000000000..74f11a5ce73c
--- /dev/null
+++ b/x11-plugins/wmsystray/files/wmsystray-0.1.1-gcc-3.4.patch
@@ -0,0 +1,10 @@
+--- a/wmsystray/ui.c	2004-08-25 11:14:51.265675224 +0000
++++ b/wmsystray/ui.c	2004-08-25 11:09:56.676459592 +0000
+@@ -28,6 +28,7 @@
+ int width, height, pos_x, pos_y;
+ Pixmap bg_pixmap;
+ char *bg_data;
++void draw_ui_elements();
+ 
+ int wmaker = 1;
+ int loop_program = 1;
diff --git a/x11-plugins/wmsystray/files/wmsystray.desktop b/x11-plugins/wmsystray/files/wmsystray.desktop
new file mode 100644
index 000000000000..e3701e0603e8
--- /dev/null
+++ b/x11-plugins/wmsystray/files/wmsystray.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=WmSysTray
+Comment=SysTray dockapp for WindowMaker
+Comment[pl]=Dokowalny SysTray dla WindowMakera
+Exec=wmsystray
+Type=Application
+Terminal=false
+Categories=Utility;
diff --git a/x11-plugins/wmsystray/metadata.xml b/x11-plugins/wmsystray/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmsystray/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..4756f31445fd
--- /dev/null
+++ b/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop
+
+DESCRIPTION="Window Maker dock app that provides a system tray for GNOME/KDE applications"
+HOMEPAGE="https://github.com/bbidulock/wmsystray"
+SRC_URI="https://github.com/bbidulock/wmsystray/releases/download/${PV}/${P}.tar.bz2"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc ~sparc x86"
+
+# Let's honour Gentoo CFLAGS and use correct install program
+# Fix for #61704, cannot compile with gcc 3.4.1:
+# it's a trivial change and does not affect other compilers...
+PATCHES=( "${FILESDIR}/${P}-Makefile.patch"
+	"${FILESDIR}/${P}-gcc-3.4.patch" )
+
+DOCS=( README HACKING AUTHORS )
+
+src_prepare() {
+	default
+	# Fix parallel compilation
+	sed -ie "s/make EXTRACFLAGS/make \${MAKEOPTS} EXTRACFLAGS/" Makefile || die
+
+	# Honour Gentoo LDFLAGS, see bug #336296
+	sed -ie "s/-o wmsystray/${LDFLAGS} -o wmsystray/" wmsystray/Makefile || die
+}
+
+src_compile() {
+	emake EXTRACFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}/${PN}
+	doman doc/${PN}.1
+	domenu "${FILESDIR}/${PN}.desktop"
+	einstalldocs
+}
diff --git a/x11-plugins/wmtime/Manifest b/x11-plugins/wmtime/Manifest
new file mode 100644
index 000000000000..8f18b5b9a64c
--- /dev/null
+++ b/x11-plugins/wmtime/Manifest
@@ -0,0 +1 @@
+DIST wmtime-1.4.tar.gz 19200 BLAKE2B 453668828ee512979e840b66473c7acc52558965ad00d9ab750aba93d22447dcab13c424c2d5ad07baf3ef7c8e2d6c785c1ad5ccbe44d42aed867bdb7a10e679 SHA512 46e35ffe41aaa55a651fa2a4002ab83fd45f901dc12ce1e0ed981666b9b620aa11666920f595fc3a782c54cc036491e0c676fb760a38cd6f6b24e264723b87fb
diff --git a/x11-plugins/wmtime/metadata.xml b/x11-plugins/wmtime/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmtime/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmtime/wmtime-1.4-r1.ebuild b/x11-plugins/wmtime/wmtime-1.4-r1.ebuild
new file mode 100644
index 000000000000..100762d07f4c
--- /dev/null
+++ b/x11-plugins/wmtime/wmtime-1.4-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="applet which displays the date and time in a dockable tile"
+HOMEPAGE="https://www.dockapps.net/wmtime"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+DOCS=( BUGS CHANGES HINTS README TODO )
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	einstalldocs
+}
diff --git a/x11-plugins/wmtimer/Manifest b/x11-plugins/wmtimer/Manifest
new file mode 100644
index 000000000000..2218df1c7ec6
--- /dev/null
+++ b/x11-plugins/wmtimer/Manifest
@@ -0,0 +1 @@
+DIST wmtimer-2.92.tar.gz 22091 BLAKE2B 7e8f598708a70168233aa4545fc9978fab9ea6891a02f618f1bdafa08bbc3ed077183c19f467c70637b07fa501f40bd2409bdb3e60034888296895b9ff3f35f1 SHA512 d00e2eff92c89b1a848d2319f62b2f060f4ced1299440aa20ca4288b5bdd16f7cff625907f6587514a1618fec74e5be34fb6c923cec51a663cd9efc86c6f0a07
diff --git a/x11-plugins/wmtimer/files/wmtimer-2.92-counter-fix.patch b/x11-plugins/wmtimer/files/wmtimer-2.92-counter-fix.patch
new file mode 100644
index 000000000000..b949e2885f78
--- /dev/null
+++ b/x11-plugins/wmtimer/files/wmtimer-2.92-counter-fix.patch
@@ -0,0 +1,23 @@
+diff -Naur wmtimer-2.92.orig/wmtimer/wmtimer.c wmtimer-2.92/wmtimer/wmtimer.c
+--- wmtimer-2.92.orig/wmtimer/wmtimer.c	2004-01-29 03:45:48.000000000 +0100
++++ wmtimer-2.92/wmtimer/wmtimer.c	2016-06-08 14:17:40.039581673 +0200
+@@ -128,7 +128,8 @@
+     switch (mode)
+     {
+       case TIMER:
+-	if (prevSec < thisTime->tm_sec) 
++	if (   (prevSec < thisTime->tm_sec) 
++        || ((prevSec == 59) && (thisTime->tm_sec == 0)))
+ 	{
+ 	  decrementTimer();
+ 	  updateACT();
+@@ -138,7 +139,8 @@
+ 	prevSec = thisTime->tm_sec;
+ 	break;
+       case CHRONO:
+-	if (prevSec < thisTime->tm_sec)
++	if (   (prevSec < thisTime->tm_sec)
++        || ((prevSec == 59) && (thisTime->tm_sec == 0)))
+ 	{
+ 	  incrementTimer();
+ 	  updateACT();
diff --git a/x11-plugins/wmtimer/files/wmtimer-2.92-gcc-10.patch b/x11-plugins/wmtimer/files/wmtimer-2.92-gcc-10.patch
new file mode 100644
index 000000000000..4332e8916640
--- /dev/null
+++ b/x11-plugins/wmtimer/files/wmtimer-2.92-gcc-10.patch
@@ -0,0 +1,23 @@
+diff -Naur wmtimer-2.92.orig/wmgeneral/wmgeneral.c wmtimer-2.92/wmgeneral/wmgeneral.c
+--- wmtimer-2.92.orig/wmgeneral/wmgeneral.c	2004-01-29 03:38:58.000000000 +0100
++++ wmtimer-2.92/wmgeneral/wmgeneral.c	2020-02-24 22:07:07.028810885 +0100
+@@ -67,6 +67,7 @@
+ GC NormalGC;
+ XpmIcon wmgen;
+ Pixmap pixmask;
++Display *display;
+ 
+ char *textColor = NULL;
+ XpmColorSymbol colorSymbols[3] = { {"Text", NULL, 0} };
+diff -Naur wmtimer-2.92.orig/wmgeneral/wmgeneral.h wmtimer-2.92/wmgeneral/wmgeneral.h
+--- wmtimer-2.92.orig/wmgeneral/wmgeneral.h	2001-10-11 07:38:39.000000000 +0200
++++ wmtimer-2.92/wmgeneral/wmgeneral.h	2020-02-24 22:06:49.756805063 +0100
+@@ -40,7 +40,7 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display *display;
++extern Display *display;
+ 
+ /***********************/
+  /* Function Prototypes */
diff --git a/x11-plugins/wmtimer/files/wmtimer-2.92-list.patch b/x11-plugins/wmtimer/files/wmtimer-2.92-list.patch
new file mode 100644
index 000000000000..57314929f8eb
--- /dev/null
+++ b/x11-plugins/wmtimer/files/wmtimer-2.92-list.patch
@@ -0,0 +1,120 @@
+diff -Naur wmtimer-2.92.orig/wmgeneral/list.c wmtimer-2.92/wmgeneral/list.c
+--- wmtimer-2.92.orig/wmgeneral/list.c	1999-12-23 16:01:39.000000000 +0100
++++ wmtimer-2.92/wmgeneral/list.c	2016-06-08 14:11:02.027179589 +0200
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail) */
+ 
+-INLINE LinkedList * list_cons (void *head, LinkedList * tail)
++LinkedList * list_cons (void *head, LinkedList * tail)
+ {
+   LinkedList *cell;
+ 
+@@ -50,7 +50,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero */
+ 
+-INLINE int list_length (LinkedList * list)
++int list_length (LinkedList * list)
+ {
+   int i = 0;
+   while (list)
+@@ -64,7 +64,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned  */
+ 
+-INLINE void * list_nth (int index, LinkedList * list)
++void * list_nth (int index, LinkedList * list)
+ {
+   while (index-- != 0)
+     {
+@@ -78,7 +78,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor */
+ 
+-INLINE void list_remove_head (LinkedList ** list)
++void list_remove_head (LinkedList ** list)
+ {
+   if (!*list)
+     return;
+@@ -110,7 +110,7 @@
+    }
+    } */
+ 
+-INLINE LinkedList * list_remove_elem (LinkedList * list, void *elem)
++LinkedList * list_remove_elem (LinkedList * list, void *elem)
+ {
+   LinkedList *tmp;
+ 
+@@ -131,7 +131,7 @@
+ 
+ /* Return element that has ELEM as car */
+ 
+-INLINE LinkedList * list_find (LinkedList * list, void *elem)
++LinkedList * list_find (LinkedList * list, void *elem)
+ {
+   while (list)
+     {
+@@ -144,7 +144,7 @@
+ 
+ /* Free list (backwards recursive) */
+ 
+-INLINE void list_free (LinkedList * list)
++void list_free (LinkedList * list)
+ {
+   if (list)
+     {
+@@ -155,7 +155,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST */
+ 
+-INLINE void list_mapcar (LinkedList * list, void (*function) (void *))
++void list_mapcar (LinkedList * list, void (*function) (void *))
+ {
+   while (list)
+     {
+diff -Naur wmtimer-2.92.orig/wmgeneral/list.h wmtimer-2.92/wmgeneral/list.h
+--- wmtimer-2.92.orig/wmgeneral/list.h	1999-12-23 16:01:39.000000000 +0100
++++ wmtimer-2.92/wmgeneral/list.h	2016-06-08 14:11:20.953198667 +0200
+@@ -29,12 +29,6 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-#define INLINE inline
+-#else
+-#define INLINE
+-#endif
+-
+ typedef struct LinkedList
+   {
+     void *head;
+@@ -42,20 +36,20 @@
+   }
+ LinkedList;
+ 
+-INLINE LinkedList *list_cons (void *head, LinkedList * tail);
++LinkedList *list_cons (void *head, LinkedList * tail);
+ 
+-INLINE int list_length (LinkedList * list);
++int list_length (LinkedList * list);
+ 
+-INLINE void *list_nth (int index, LinkedList * list);
++void *list_nth (int index, LinkedList * list);
+ 
+-INLINE void list_remove_head (LinkedList ** list);
++void list_remove_head (LinkedList ** list);
+ 
+-INLINE LinkedList *list_remove_elem (LinkedList * list, void *elem);
++LinkedList *list_remove_elem (LinkedList * list, void *elem);
+ 
+-INLINE void list_mapcar (LinkedList * list, void (*function) (void *));
++void list_mapcar (LinkedList * list, void (*function) (void *));
+ 
+-INLINE LinkedList *list_find (LinkedList * list, void *elem);
++LinkedList *list_find (LinkedList * list, void *elem);
+ 
+-INLINE void list_free (LinkedList * list);
++void list_free (LinkedList * list);
+ 
+ #endif
diff --git a/x11-plugins/wmtimer/metadata.xml b/x11-plugins/wmtimer/metadata.xml
new file mode 100644
index 000000000000..0d39856f8e4c
--- /dev/null
+++ b/x11-plugins/wmtimer/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+WMTimer is a dockable alarm clock for Windowmaker or Blackbox which can be run 
+in alarm, countdown timer, or chronograph mode. In alarm or timer mode, you can 
+either execute a command or sound the system bell when the time is reached. 
+WMTimer is configurable through the command line or the GTK GUI.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild b/x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild
new file mode 100644
index 000000000000..bcf6d63c094c
--- /dev/null
+++ b/x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Dockable clock which can run in alarm, countdown timer or chronograph mode"
+HOMEPAGE="https://github.com/bbidulock/wmtimer"
+SRC_URI="https://github.com/bbidulock/wmtimer/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2
+	x11-libs/gtk+:2
+	x11-libs/libXpm
+	x11-libs/libXext
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_prepare() {
+	sed -i -e "s|\$(CFLAGS)||" Makefile || die
+	sed -i -e "s|-g||g" Makefile || die
+	sed -i -e "s|-O2|\$(CFLAGS) ${CFLAGS}|"  Makefile || die
+	sed -i -e "s|-o wmtimer|\$(LDFLAGS) -o wmtimer|" Makefile || die
+
+	cd "${WORKDIR}"/${P} || die
+	eapply "${FILESDIR}"/${P}-counter-fix.patch
+	eapply "${FILESDIR}"/${P}-list.patch
+	eapply "${FILESDIR}"/${P}-gcc-10.patch
+	eapply_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LIBDIR="-L/usr/$(get_libdir)"
+}
+
+src_install() {
+	dobin wmtimer
+	dodoc ../{Changelog,CREDITS,README}
+}
diff --git a/x11-plugins/wmtop/Manifest b/x11-plugins/wmtop/Manifest
new file mode 100644
index 000000000000..5c5559253db5
--- /dev/null
+++ b/x11-plugins/wmtop/Manifest
@@ -0,0 +1 @@
+DIST wmtop-0.85.tar.gz 21165 BLAKE2B d114391a987395ae2defcfe03bc4dc022b8d9e4163b310cb4294e34097d8b950fff44c09035265ed152a1a86d2aadd67dcca7a50cd1230c0cf5c49d2b2cb49c1 SHA512 0a251b1ae32fe8c9a09ed1aeb19315d2eab42a7b2264d637de57f2ca946af69f68fec43d921a21ea0cb25b5fa6e24206bf1321ce59dd0ed6c187a5327c7ec70a
diff --git a/x11-plugins/wmtop/metadata.xml b/x11-plugins/wmtop/metadata.xml
new file mode 100644
index 000000000000..3cd9eca3d3c4
--- /dev/null
+++ b/x11-plugins/wmtop/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+wmtop is a WindowMaker dock app that displays the top 3 CPU-consuming processes 
+in graphical form - like 'top' but pretty and using less real estate on the 
+screen. It functions with just about any Linux distribution with a /proc 
+filesystem and FreeBSD. Under Linux, there is a switch to allow display of 
+physical memory usage rather than CPU usage.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmtop/wmtop-0.85.ebuild b/x11-plugins/wmtop/wmtop-0.85.ebuild
new file mode 100644
index 000000000000..63b85df2a302
--- /dev/null
+++ b/x11-plugins/wmtop/wmtop-0.85.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="dockapp for monitoring the top three processes using cpu or memory"
+HOMEPAGE="https://www.dockapps.net/wmtop"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+# Incorrect path in this tarball version
+S=${WORKDIR}/dockapps-be3f170
+
+src_prepare() {
+	eapply_user
+
+	eautoreconf
+}
diff --git a/x11-plugins/wmtz/Manifest b/x11-plugins/wmtz/Manifest
new file mode 100644
index 000000000000..8fcaf84082f3
--- /dev/null
+++ b/x11-plugins/wmtz/Manifest
@@ -0,0 +1 @@
+DIST wmtz-0.7_p20150816.tar.gz 19310 BLAKE2B 7f3bc0b077a9a667211cc588f1fb7c3d1d246256724a6cf5a17f028d2d334d02f898a798aca6fae11910868d312844bbe8ac5bfd190229f3ae829e97e50e2247 SHA512 60c9b66423332b155ce262d30026a5091c0379eb3257f547af1203d331968e9f334a533ed03832476512893d06cea857db9c044b30115978904510f9725e8455
diff --git a/x11-plugins/wmtz/metadata.xml b/x11-plugins/wmtz/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmtz/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmtz/wmtz-0.7_p20150816.ebuild b/x11-plugins/wmtz/wmtz-0.7_p20150816.ebuild
new file mode 100644
index 000000000000..1e47374c61b4
--- /dev/null
+++ b/x11-plugins/wmtz/wmtz-0.7_p20150816.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib toolchain-funcs
+
+DESCRIPTION="dockapp that shows the time in multiple timezones"
+HOMEPAGE="https://www.dockapps.net/wmtz"
+# https://www.dockapps.net/download/${P}.tar.gz
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_prepare() {
+	default
+	#Honour Gentoo LDFLAGS, see bug #337890.
+	sed -e "s/\$(FLAGS) -o wmtz/\$(LDFLAGS) -o wmtz/" -i Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" FLAGS="${CFLAGS}" \
+		LIBDIR="-L/usr/$(get_libdir)"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	insinto /etc
+	doins wmtzrc
+	dodoc ../{BUGS,CHANGES,README}
+}
diff --git a/x11-plugins/wmudmount/Manifest b/x11-plugins/wmudmount/Manifest
new file mode 100644
index 000000000000..1fe7c4741d3c
--- /dev/null
+++ b/x11-plugins/wmudmount/Manifest
@@ -0,0 +1 @@
+DIST wmudmount-3.0.tar.gz 189435 BLAKE2B e04c0bedfd4d0f4deed88f3acc87e4f2871890d6d12811404ec6c884107ae6bd9df17e724100068b08ff31ae557a02cd20bfc86222111939984fcc7916466c06 SHA512 dd12354d281ab04255e4ecf600d05c661168ed69b48439bba4ee6e61f2c93507e35e45c6f6671426c26df2fcf17ba5e851a6a3a3d757a5016a49bd8f76893eb9
diff --git a/x11-plugins/wmudmount/files/wmudmount-2.2-perl_brace_regex.patch b/x11-plugins/wmudmount/files/wmudmount-2.2-perl_brace_regex.patch
new file mode 100644
index 000000000000..4730b2d64b9d
--- /dev/null
+++ b/x11-plugins/wmudmount/files/wmudmount-2.2-perl_brace_regex.patch
@@ -0,0 +1,12 @@
+diff -Naur wmudmount-2.2.orig/make-chars.pl wmudmount-2.2/make-chars.pl
+--- wmudmount-2.2.orig/make-chars.pl	2014-02-03 06:41:59.000000000 +0100
++++ wmudmount-2.2/make-chars.pl	2017-10-22 21:13:22.555748713 +0200
+@@ -52,7 +52,7 @@
+ 
+ while(<IN>){
+     $head.=$_;
+-    if(/^static char \* ([a-zA-Z0-9_]+_xpm)\[\] = {/){
++    if(/^static char \* ([a-zA-Z0-9_]+_xpm)\[\] = \{/){
+         $name=$1;
+         last;
+     }
diff --git a/x11-plugins/wmudmount/metadata.xml b/x11-plugins/wmudmount/metadata.xml
new file mode 100644
index 000000000000..9db3fe533a70
--- /dev/null
+++ b/x11-plugins/wmudmount/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<use>
+		<flag name="gcr">Enable support for secure memory with <pkg>app-crypt/gcr</pkg></flag>
+		<flag name="secret">Enable support for secret service with <pkg>app-crypt/libsecret</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">wmudmount</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmudmount/wmudmount-3.0.ebuild b/x11-plugins/wmudmount/wmudmount-3.0.ebuild
new file mode 100644
index 000000000000..074d9c9f5458
--- /dev/null
+++ b/x11-plugins/wmudmount/wmudmount-3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils
+
+DESCRIPTION="A filesystem mounter that uses udisks to handle notification and mounting"
+HOMEPAGE="https://sourceforge.net/projects/wmudmount/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gcr libnotify secret"
+
+RDEPEND="sys-fs/udisks:2
+	>=x11-libs/gtk+-3.16.0:3
+	gcr? ( app-crypt/gcr )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	secret? ( app-crypt/libsecret )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	virtual/imagemagick-tools[png]"
+
+DOCS="ChangeLog"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2-perl_brace_regex.patch )
+
+src_configure() {
+	econf \
+		$(use_with gcr) \
+		$(use_with libnotify) \
+		$(use_with secret)
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-plugins/wmweather+/Manifest b/x11-plugins/wmweather+/Manifest
new file mode 100644
index 000000000000..11e7543e7bc7
--- /dev/null
+++ b/x11-plugins/wmweather+/Manifest
@@ -0,0 +1,2 @@
+DIST wmweather+-2.17.tar.gz 212763 BLAKE2B e810ecaf6858bba0cb3bdb32517f5c1cbaa552ed071b1ce6dfca33b41ad75c5272616c9be78930f47ee3980d2ab8c51a29caaec627c5e608e9c2790d940cfe65 SHA512 45622513792698f1adf4a686506913146e2a24c9ff39fda1129132aae864528184aa122b525e00b079f416fd131c1369ff95e430c4c63877bdc166c982f841eb
+DIST wmweather+-2.18.tar.gz 206062 BLAKE2B 14fe0b49b5541d5e093c958d1c12c4c28c3bae53f8539402a61800d1817bf22eae426d4733e08ae3f1e90057e7dd297a9412d62e5edd9fb973b0a9e799b3f792 SHA512 538325b1d2bd7dd3a89a006d88868e02a71318b6e49001033d0f543965fb21f91b265e116d3b929a096e99719c99241d520a7eb395ec55f721de0d01dcbedbc0
diff --git a/x11-plugins/wmweather+/files/wmweather+-2.17-gcc-10.patch b/x11-plugins/wmweather+/files/wmweather+-2.17-gcc-10.patch
new file mode 100644
index 000000000000..1b26aa3936e5
--- /dev/null
+++ b/x11-plugins/wmweather+/files/wmweather+-2.17-gcc-10.patch
@@ -0,0 +1,23 @@
+diff -Naur wmweather+-2.17.orig/wmgeneral/wmgeneral-x11.c wmweather+-2.17/wmgeneral/wmgeneral-x11.c
+--- wmweather+-2.17.orig/wmgeneral/wmgeneral-x11.c	2014-02-07 20:17:44.000000000 +0100
++++ wmweather+-2.17/wmgeneral/wmgeneral-x11.c	2020-02-24 22:11:47.226905019 +0100
+@@ -94,6 +94,7 @@
+ GC          NormalGC;
+ GC          RedrawGC;
+ XpmIcon     wmgen;
++Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
+diff -Naur wmweather+-2.17.orig/wmgeneral/wmgeneral-x11.h wmweather+-2.17/wmgeneral/wmgeneral-x11.h
+--- wmweather+-2.17.orig/wmgeneral/wmgeneral-x11.h	2014-02-07 20:17:44.000000000 +0100
++++ wmweather+-2.17/wmgeneral/wmgeneral-x11.h	2020-02-24 22:10:45.233884234 +0100
+@@ -17,7 +17,7 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
diff --git a/x11-plugins/wmweather+/metadata.xml b/x11-plugins/wmweather+/metadata.xml
new file mode 100644
index 000000000000..54c1c7d56357
--- /dev/null
+++ b/x11-plugins/wmweather+/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">wmweatherplus</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmweather+/wmweather+-2.17.ebuild b/x11-plugins/wmweather+/wmweather+-2.17.ebuild
new file mode 100644
index 000000000000..94bc2487217f
--- /dev/null
+++ b/x11-plugins/wmweather+/wmweather+-2.17.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A dockapp for displaying data collected from METAR, AVN, ETA, and MRF forecasts"
+HOMEPAGE="https://www.sourceforge.net/projects/wmweatherplus/"
+SRC_URI="mirror://sourceforge/wmweatherplus/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~mips ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+DEPEND="dev-libs/libpcre
+	>=net-misc/curl-7.17.1
+	x11-libs/libXpm
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-wm/windowmaker"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
diff --git a/x11-plugins/wmweather+/wmweather+-2.18.ebuild b/x11-plugins/wmweather+/wmweather+-2.18.ebuild
new file mode 100644
index 000000000000..01b450a84cce
--- /dev/null
+++ b/x11-plugins/wmweather+/wmweather+-2.18.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A dockapp for displaying data collected from METAR, AVN, ETA, and MRF forecasts"
+HOMEPAGE="https://www.sourceforge.net/projects/wmweatherplus/"
+SRC_URI="mirror://sourceforge/wmweatherplus/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libpcre
+	>=net-misc/curl-7.17.1
+	x11-libs/libXpm
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-wm/windowmaker"
+RDEPEND="${DEPEND}"
diff --git a/x11-plugins/wmweather/Manifest b/x11-plugins/wmweather/Manifest
new file mode 100644
index 000000000000..c6ec022bb541
--- /dev/null
+++ b/x11-plugins/wmweather/Manifest
@@ -0,0 +1 @@
+DIST wmweather_2.4.7.orig.tar.gz 86220 BLAKE2B 55eeab40bb4cdb30d8e82b801728e7d0b8a32f741769e098b6d61ba087af27ed8401391853f53e7f06e616d5a99e6f38714c438b9e66765c1159c07f6d324d12 SHA512 d9d0c46e85a24aaa278aa75e0fcd51fc417c3c094d9e69c5820a288955c3ebdde21a24b26964824d9275a41ec053e3d942b185b24088d806e033e311e6e09108
diff --git a/x11-plugins/wmweather/files/wmweather-2.4.7-fno-common.patch b/x11-plugins/wmweather/files/wmweather-2.4.7-fno-common.patch
new file mode 100644
index 000000000000..5db5fbcc2e34
--- /dev/null
+++ b/x11-plugins/wmweather/files/wmweather-2.4.7-fno-common.patch
@@ -0,0 +1,23 @@
+diff -Naur wmweather-2.4.7.orig/src/wmgeneral.h wmweather-2.4.7/src/wmgeneral.h
+--- wmweather-2.4.7.orig/src/wmgeneral.h	2019-02-13 20:54:48.000000000 +0100
++++ wmweather-2.4.7/src/wmgeneral.h	2020-03-29 13:14:19.373976239 +0200
+@@ -36,7 +36,7 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
+diff -Naur wmweather-2.4.7.orig/src/wmweather.c wmweather-2.4.7/src/wmweather.c
+--- wmweather-2.4.7.orig/src/wmweather.c	2019-02-13 20:54:49.000000000 +0100
++++ wmweather-2.4.7/src/wmweather.c	2020-03-29 13:14:57.254963956 +0200
+@@ -56,6 +56,7 @@
+ static void update(int);
+ static size_t curl_callback(void*, size_t, size_t, void*);
+ 
++Display *display;
+ CURL
+ 	*curl       = NULL;
+ static struct memory
diff --git a/x11-plugins/wmweather/metadata.xml b/x11-plugins/wmweather/metadata.xml
new file mode 100644
index 000000000000..0b9fd85fa286
--- /dev/null
+++ b/x11-plugins/wmweather/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+wmweather displays your current local weather conditions. After supplying a 
+4-character METAR station identifier code (most major airports have one), it 
+shows station ID, time of the last update, temperature, dew point, pressure, 
+humidity, and wind speed. The various entries can be forced to display in a 
+variety of different units.
+</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmweather/wmweather-2.4.7.ebuild b/x11-plugins/wmweather/wmweather-2.4.7.ebuild
new file mode 100644
index 000000000000..174e4977f14a
--- /dev/null
+++ b/x11-plugins/wmweather/wmweather-2.4.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="a dockable weather monitor for standard METAR stations using ICAO location"
+HOMEPAGE="https://people.debian.org/~godisch/wmweather/"
+SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libICE
+	x11-apps/xmessage
+	net-misc/curl"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S=${WORKDIR}/${P}/src
+
+DOCS=(
+	"${WORKDIR}"/${P}/CHANGES
+	"${WORKDIR}"/${P}/README
+	)
+
+src_prepare() {
+	default
+
+	pushd "${WORKDIR}"/${P} || die
+	eapply "${FILESDIR}"/${P}-fno-common.patch
+}
diff --git a/x11-plugins/wmwifi/Manifest b/x11-plugins/wmwifi/Manifest
new file mode 100644
index 000000000000..2323fb0b33f7
--- /dev/null
+++ b/x11-plugins/wmwifi/Manifest
@@ -0,0 +1 @@
+DIST wmwifi-0.6.tar.gz 150482 BLAKE2B 213f56897527b57ea2fd6123d9147c8d4547323104e940b632c2290fc6941478a9ee5d0aefbe5a06e2b20bd524b84eebd9d75bedc83054066975459b770fbc56 SHA512 ae0a66b68f991907b7e8434a872cc8b1fd9219d633260183a6917e1d34dd4ddc7be91dd71b6cb0ed20781ca4eaa6a0cfc2adcb7a838b734050264a5fae4cadd0
diff --git a/x11-plugins/wmwifi/metadata.xml b/x11-plugins/wmwifi/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmwifi/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmwifi/wmwifi-0.6-r1.ebuild b/x11-plugins/wmwifi/wmwifi-0.6-r1.ebuild
new file mode 100644
index 000000000000..a52c89a719bf
--- /dev/null
+++ b/x11-plugins/wmwifi/wmwifi-0.6-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="wireless network interface monitor dockapp"
+HOMEPAGE="https://www.dockapps.net/wmwifi"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_compile() {
+	# by default it does not honour our CFLAGS
+	emake CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin src/wmwifi
+	doman wmwifi.1
+	dodoc AUTHORS README
+}
diff --git a/x11-plugins/wmwork/Manifest b/x11-plugins/wmwork/Manifest
new file mode 100644
index 000000000000..fedced8a42c8
--- /dev/null
+++ b/x11-plugins/wmwork/Manifest
@@ -0,0 +1 @@
+DIST wmwork-0.2.5.tar.gz 62044 BLAKE2B e2990e84aa4be3c025f681e52948a9a729a6e06cb2032cd2502c7eb484c2a99aa0cfeede0bd727d22a70d9ca372cf0ee4afaabf2af8d0c659fb7c29977dcc08a SHA512 ffbc1b7e3a1bdd0e76c2c3b01088ee8cf1a9c615b4925ea8af514b6a4096f5192900a6c6633b2d60fd941d3515a6cb80396ca17d81104b7cdcacb5e46050e864
diff --git a/x11-plugins/wmwork/files/wmwork-0.2.5-gcc-10.patch b/x11-plugins/wmwork/files/wmwork-0.2.5-gcc-10.patch
new file mode 100644
index 000000000000..3ed8b82f29e8
--- /dev/null
+++ b/x11-plugins/wmwork/files/wmwork-0.2.5-gcc-10.patch
@@ -0,0 +1,21 @@
+--- a/wmgeneral.c
++++ b/wmgeneral.c
+@@ -45,6 +45,7 @@ Window		iconwin, win;
+ GC			NormalGC;
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
++Display		*display;
+ 
+   /*****************/
+  /* Mouse Regions */
+--- a/wmgeneral.h
++++ b/wmgeneral.h
+@@ -21,7 +21,7 @@ typedef struct {
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
diff --git a/x11-plugins/wmwork/metadata.xml b/x11-plugins/wmwork/metadata.xml
new file mode 100644
index 000000000000..a65e7749da2f
--- /dev/null
+++ b/x11-plugins/wmwork/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild b/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild
new file mode 100644
index 000000000000..e8fd4e681e82
--- /dev/null
+++ b/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="a dockapp that lets you easily track time spent on different projects"
+HOMEPAGE="https://www.dockapps.net/wmwork"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+
+RDEPEND=">=x11-libs/libXext-1.0.3
+	>=x11-libs/libX11-1.1.1-r1
+	>=x11-libs/libXpm-3.5.6"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S="${WORKDIR}/${P}/src"
+
+DOCS=( ../{CHANGES,README} )
+PATCHES=( ${FILESDIR}/${P}-gcc-10.patch )
diff --git a/x11-plugins/wmxkb/Manifest b/x11-plugins/wmxkb/Manifest
new file mode 100644
index 000000000000..0e8550b0aff0
--- /dev/null
+++ b/x11-plugins/wmxkb/Manifest
@@ -0,0 +1 @@
+DIST wmxkb-1.2.2.tar.gz 196726 BLAKE2B df0ae8275c82c4fb8965ef6761c82831edfccaf074fdc907ca4bf6b37fb853f6ccb31a05a76c0c392c8b9604a2f03af3bb1e7ed6918c2da09c2757ff93f8965d SHA512 4439c532cc2e0dbcbfd04664420fbdfdf65db47961d2b3374049bb78e20589478c2d3e07d01f1936ce7ace24f5da553546597fa7805c27bba45ac1dfc26d8f54
diff --git a/x11-plugins/wmxkb/metadata.xml b/x11-plugins/wmxkb/metadata.xml
new file mode 100644
index 000000000000..b37eab6956dc
--- /dev/null
+++ b/x11-plugins/wmxkb/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmxkb/wmxkb-1.2.2-r1.ebuild b/x11-plugins/wmxkb/wmxkb-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..c22114f48ac8
--- /dev/null
+++ b/x11-plugins/wmxkb/wmxkb-1.2.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Dockable keyboard layout switcher for Window Maker"
+HOMEPAGE="http://wmalms.tripod.com/#WMXKB"
+SRC_URI="http://wmalms.tripod.com/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+DOCS=( CHANGES README )
+HTML_DOCS=( doc/manual{,_body,_title}.html )
+
+src_prepare() {
+	default
+	sed -i -e 's:$(LD) -o:$(CC) $(LDFLAGS) -o:' Makefile.in || die #336528
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin wmxkb
+	insinto /usr/share/pixmaps/wmxkb
+	doins pixmaps/*.xpm
+	einstalldocs
+}
diff --git a/x11-plugins/wmxres/Manifest b/x11-plugins/wmxres/Manifest
new file mode 100644
index 000000000000..a15be3b2367d
--- /dev/null
+++ b/x11-plugins/wmxres/Manifest
@@ -0,0 +1 @@
+DIST wmxres-1.1-0.tar.gz 9948 BLAKE2B e9d0952a0cba30733f0b28ab0b1f37e7b0215ba71abda255646321ee673a09f8510384466919dd27679a6b91c68f7a31fe3ff646c7eb453193c9de29b46c5710 SHA512 e7b5bfb061822fb827da50b24287ab9c6b14d3ddf9a89ff6cd5e1bb61939905c901b4a0ff7a6492e0ccce3b39b8bb4d8ffb13cbf7978075a73a30080e25c18ad
diff --git a/x11-plugins/wmxres/files/wmxres-1.2-gcc-10.patch b/x11-plugins/wmxres/files/wmxres-1.2-gcc-10.patch
new file mode 100644
index 000000000000..5beb41552562
--- /dev/null
+++ b/x11-plugins/wmxres/files/wmxres-1.2-gcc-10.patch
@@ -0,0 +1,21 @@
+--- a/wmgeneral/wmgeneral.c
++++ b/wmgeneral/wmgeneral.c
+@@ -45,6 +45,7 @@ Window		iconwin, win;
+ GC			NormalGC;
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
++Display		*display;
+ 
+   /*****************/
+  /* Mouse Regions */
+--- a/wmgeneral/wmgeneral.h
++++ b/wmgeneral/wmgeneral.h
+@@ -21,7 +21,7 @@ typedef struct {
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
diff --git a/x11-plugins/wmxres/files/wmxres-1.2-r1-fix-build-system.patch b/x11-plugins/wmxres/files/wmxres-1.2-r1-fix-build-system.patch
new file mode 100644
index 000000000000..53c791dc5e05
--- /dev/null
+++ b/x11-plugins/wmxres/files/wmxres-1.2-r1-fix-build-system.patch
@@ -0,0 +1,23 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,16 +1,15 @@
+-INCDIR	=	-I/usr/X11R6/include
+-LIBDIR	=	-L/usr/X11R6/lib
+ LIBS	=	-lXpm -lXext -lX11 -lXxf86vm
+ OBJS	=	wmxres/wmxres.o \
+-		wmgeneral/wmgeneral.o \
++		wmgeneral/wmgeneral.o
++CFLAGS += -Wall
+ 
+ .c.o:
+-	cc -g -c -O2 -Wall -D$(shell echo `uname -s`) $< -o $*.o $(INCDIR)
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c -D$(shell echo `uname -s`) $< -o $@
+ 
+ all: wmxres
+ 
+ wmxres: $(OBJS)
+-	cc -o wmxres/wmxres $^ $(LIBDIR) $(LIBS)
++	$(CC) $(LDFLAGS) -o wmxres/wmxres $^ $(LIBS)
+ 
+ install:: all
+ 	install -s -m 4755 -o root wmxres/wmxres /usr/X11R6/bin
diff --git a/x11-plugins/wmxres/files/wmxres-debian-1.1-1.2.patch b/x11-plugins/wmxres/files/wmxres-debian-1.1-1.2.patch
new file mode 100644
index 000000000000..ef7438e5e973
--- /dev/null
+++ b/x11-plugins/wmxres/files/wmxres-debian-1.1-1.2.patch
@@ -0,0 +1,55 @@
+diff -Naur wmxres.app/wmxres/wmxres.c wmxres-1.2/wmxres/wmxres.c
+--- wmxres.app/wmxres/wmxres.c	1999-11-13 22:43:12.000000000 +0000
++++ wmxres-1.2/wmxres/wmxres.c	2004-04-19 01:27:19.000000000 +0000
+@@ -29,7 +29,7 @@
+ int	res_selected;
+ int	res_i_active=-1;
+ char	res_active[10];
+-char	res_list[10][20];
++char	res_list[100][20];
+ XF86VidModeModeInfo **res_modelines; 
+ XEvent  Event;
+ 
+@@ -139,7 +139,12 @@
+ 		}
+ 	}
+ 
+-	for(c=0; c < res_count; c++) {
++	/* fix bounds on res_count -- Todd Troxell <ttroxell@debian.org */	
++	if(res_count > 100) {
++		res_count =100;
++	}
++
++	for(c=0; c < res_count ; c++) {
+ 		sprintf(res_list[c], "%dx%d", res_modelines[c]->hdisplay, res_modelines[c]->vdisplay);
+ 	}
+ }
+diff -Naur wmxres.app/wmxres.1 wmxres-1.2/wmxres.1
+--- wmxres.app/wmxres.1	1970-01-01 00:00:00.000000000 +0000
++++ wmxres-1.2/wmxres.1	2004-04-19 01:02:46.000000000 +0000
+@@ -0,0 +1,25 @@
++.\"                                      Hey, EMACS: -*- nroff -*-
++.\" wmxres.1 is copyright 2001 by
++.\" Todd Troxell <ttroxell@debian.org>
++.\"
++.\" This is free documentation, see the latest version of the GNU
++.\" General Public License for copying conditions. There is NO warranty.
++.TH WMXRES 1 "May  5, 2001"
++
++.SH NAME
++wmxres \- dockable application to change X modes 
++
++.SH SYNOPSIS
++.B wmxres
++
++.SH DESCRIPTION
++dockable application to select your display mode from those available.  It is written in C.
++
++.SH INFO 
++This manual page was written for the Debian GNU/Linux distribution
++because the original program does not have a manual page.
++.PP
++
++.SH AUTHOR
++This manual page was written by Todd Troxell <ttroxell@debian.org>,
++for the Debian GNU/Linux system (but may be used by others).
diff --git a/x11-plugins/wmxres/metadata.xml b/x11-plugins/wmxres/metadata.xml
new file mode 100644
index 000000000000..b37eab6956dc
--- /dev/null
+++ b/x11-plugins/wmxres/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/x11-plugins/wmxres/wmxres-1.2-r1.ebuild b/x11-plugins/wmxres/wmxres-1.2-r1.ebuild
new file mode 100644
index 000000000000..763a7d022d4a
--- /dev/null
+++ b/x11-plugins/wmxres/wmxres-1.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Dock application to select your display mode among those possible"
+HOMEPAGE="http://yalla.free.fr/wn"
+SRC_URI="http://yalla.free.fr/wn/${PN}-1.1-0.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXxf86dga"
+
+S="${WORKDIR}/${PN}.app"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-debian-1.1-1.2.patch
+	"${FILESDIR}"/${PN}-1.2-r1-fix-build-system.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
+)
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}/${PN}
+	doman ${PN}.1
+}
author	Palica <palica+gitlab@liguros.net>	2020-06-23 22:35:08 +0200
committer	Palica <palica+gitlab@liguros.net>	2020-06-23 22:35:08 +0200
commit	ecdac123787b96ce6649f0f91da12ea6458cc2b1 (patch)
tree	b89c74d9e6fe6e8aebc4c77bcbeb4ab73214127d /x11-plugins
parent	1be72aa41cf41dedadeecf59dca9f01de6381f5e (diff)
download	baldeagleos-repo-ecdac123787b96ce6649f0f91da12ea6458cc2b1.tar.gz baldeagleos-repo-ecdac123787b96ce6649f0f91da12ea6458cc2b1.tar.xz baldeagleos-repo-ecdac123787b96ce6649f0f91da12ea6458cc2b1.zip