gentoo resync : 14.05.2020

18 files changed, 304 insertions, 6 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 4bed22932589..a17da4bcb0b6 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/cputnik/Manifest b/x11-plugins/cputnik/Manifest
index d4c5ef23fb98..4aaf6cca004e 100644
--- a/x11-plugins/cputnik/Manifest
+++ b/x11-plugins/cputnik/Manifest
@@ -1,4 +1,5 @@
+AUX cputnik-0.2.0-fno-common.patch 1429 BLAKE2B 564cd629a6782aa9747be1460185cd612758b701db6700f21800ce9c9425e9e1cac883f7beb540ce525e9b601f451457c6dab6188a2bf9cee4002c59e3d98202 SHA512 bfc90e8e43b4be13d36e546b4d03bb1a1456c03d9602d7802dbfc6a3f0fa0b68b8deb82f9f5e7f0d7d8224667c2caf9f70c82cae29a662ee748fc6678ca62976
 AUX cputnik-0.2.0-makefile.patch 709 BLAKE2B d40b5743f8bedf589d18e020374a38daf10563542c5e9f93514013880dceb16629c7ee83737ecdb6ff7dbde189697bebe6679b931e4cf5996245f2049a811f31 SHA512 4aff01e83540a7c08e777be8726b07fdb9d34798da957c85b9c27c87760854db335ed9f45b1dd250f63ae16c1e96c59615db79ca818f7233822103695458744d
 DIST cputnik-0.2.0.tar.gz 17850 BLAKE2B 90824218a349d9b6cdf592cafe8dd29674f975a190a19a3dd6b941383d47f4fc492af339cbbb88240499363a1048b2564855d5a17caeaf53437fe34bf0d55ee1 SHA512 829d9d63f82a2d41c0160be575b3fb7840a5c295c6dd16702240a6aa104e557bff83936c46243e850edf918b41ddc22fd123dab7f5ffd6492302d60c374df55f
-EBUILD cputnik-0.2.0-r1.ebuild 638 BLAKE2B f4c865c26818780722b8a828f8c70f5285e956f047c91ee4898a491fd7d4cc495f422fd1c788d081d1b3f756ddf3c745f462473293b16038eec8b72bf58b91ac SHA512 d82d8f76e99611c82b3a0c48b459c4f768ff51276f117a21ecb155b6752e83386d2c2907bed2ddad089261558269f5e0025f83e476826fc90597e06c4813d00e
+EBUILD cputnik-0.2.0-r1.ebuild 673 BLAKE2B 8a4cd4828e036461ee72518e8a712cd2e22a5bc362958cbd1f9267708b7ff11c4759536d78611f935d75e15b774721757f432a8744c58113487f9ec016d43097 SHA512 ac27e947b81f04db7d2d32101aa8a79ec2f03dd060bb15ad5f372bc74006ac1e7b3771c39aaf2405505926297f70c60f981a411221de789827693a0d35b880d4
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
index ec561276c8a1..eb195d5a676b 100644
--- a/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
+++ b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,9 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P}/src
 
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	)
 
 src_compile() {
 	emake CC="$(tc-getCC)"
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/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
index 8fe61eff55ce..56d7d48b6462 100644
--- a/x11-plugins/pidgin-telegram/Manifest
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -1,3 +1,6 @@
+AUX pidgin-telegram-1.4.3-change-metadata-location.patch 1749 BLAKE2B ad5dd197f162223d31d802259c183e4285921ee3270010bc2d6070048d625a4ca5e0c0457c26a65396aba1fb9dbbea5bf87ef21513782a06ad3d69dd4018b47e SHA512 fc42f57d033a5f5192a104fb1c364b44a54a54059613989c147fdb741ebcb3eb1b4870a5325260e8b6f4b328ad0d74f1e236c5540f5ff837054ff99c6c9f4b14
 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
 EBUILD pidgin-telegram-1.4.2.ebuild 1125 BLAKE2B c3fdb7773f5f30992bbd0bb929158d837a0052d30d692cea7959b5bbdc5c3178517e29b0c99d46980435926c69307d7ff914ce20381ee64712ff07669354f205 SHA512 8826e13b35c34c2bccf52d0b7dcc756e44b2864f3fe3f8e64eee902f169f8f562cd8d033eb747463685c914a47329b48c1a969c972ac998455116b48f5701257
+EBUILD pidgin-telegram-1.4.3.ebuild 1189 BLAKE2B 04cac880ccb16b759f372b3838d5318d173aba1b350903519c83a127398b11f9ee89b4be3b54b1c4a16f7b3328c3d1602a85aac7c3d4b611665a92643e4f848c SHA512 d9382aa3c221e06b6322ca5839c772af0dcd4364454aeb525b067bacef6ad546efffa2e42e714df39990a77d00e04e5dcbbdae28ecb842ea30aa102376121ef6
 MISC metadata.xml 722 BLAKE2B fb8498a592b6da08fda5cb1961fd84ea2a4e839233719330625166f487f2d01e8000860d2383488ea1c377105f8d74aae928871f349ed08efda1dd7c0420db10 SHA512 6b7e5121c5662de9943b7b7d30e6acf6c2df04b5c9d19b3ce942b6e403e62023f1a07076c4023d899ccb97f7fd2a29b331f9bf76391cb5db1c477d5bfce088c8
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/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/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index d1b93bfdff0b..a6586d538608 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -2,6 +2,8 @@ AUX wmbiff-0.4.27-invalid-strncpy.patch 816 BLAKE2B 8c9dec1bb64014c4d99dcfe0214f
 AUX wmbiff-0.4.35-fno-common.patch 781 BLAKE2B fbde39e1df40b9f51128aceeb5adc90c8ef5852584d92fc1d31404306691e7639943363c5460f6abfcfe8aebfc647ad675c531805ba81369c63463502dc50260 SHA512 105abbe67deab8c2ac2f562c94d37418da69ee38cffbc5d91ca4e1cc976069dc2d92241c5de86c16a6276b01f8ed215cb6d84c43a613bf5b28e28bd6e08baff5
 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
 EBUILD wmbiff-0.4.28.ebuild 825 BLAKE2B 3e27116ec3256f882303581d48c4911aee3f360e581bb58c5da55244e94edc89a978333cd2654b2d49d2e8e141df6b05a236456c5768bb5fd5f7f0c8156518d6 SHA512 cf73dca2d7798577fed2e223f25e66261915220d198edc90884181c7d71c9b6b909e29aee41a7a9a5e284221048b4dc29b97388bba9e3a117cdad73adf2cf283
 EBUILD wmbiff-0.4.35.ebuild 854 BLAKE2B fb2e3f070a2e668f729e5748330d98876ea7108bf8c20dc91d20b49eaf52e562897879249226bd67b717ed2a659009a896c8e955615255c7d447cb18eeee75c0 SHA512 1d69747b719985f878268f8111edfde765613dd31aa135d2eb8d4569b2237b63a384514183f90c118fe47e23a73319f4fda6bf783145438d9ec1bfcae283af88
+EBUILD wmbiff-0.4.36.ebuild 751 BLAKE2B 6f58848e63988590983794fb22c373e4e665ee3091ad887ac755cca80058a4c053bd119a4f1c1ed261802d2671e0b490ef4d8e306d4fc50757cb08b7d7a633cc SHA512 180540a646beb188badb2fbef4e69c6800cf9f483775ec0d3f2ac2a648ab782b9883bb066e98937fa88ada0c99cc2f133aab1764e0a17af5faebfe89f1c3b91d
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
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/wmix/Manifest b/x11-plugins/wmix/Manifest
index 8a66609f56ee..2a339c331878 100644
--- a/x11-plugins/wmix/Manifest
+++ b/x11-plugins/wmix/Manifest
@@ -2,6 +2,8 @@ AUX wmix-3.4-gcc-10.patch 3584 BLAKE2B 4026aa39e88ea33625e37995607845b710c5150b8
 AUX wmix.1 1969 BLAKE2B 9599e110ef1efcfb1582749cc58355f5d055920f5d1d0834073bd161af65cea300c100a9cd64ef65906842858da0e4539527a0c448616228280f7b283bf2a29a SHA512 3937513506295543cef1a12a0a739f4923e2fe6500436433969351547493b712c891ac41ccf627a325eaf03c8552cbe6cac0cedc3ba3548a26c138f4eec084d6
 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
 EBUILD wmix-3.2.ebuild 674 BLAKE2B d7c082f0d5e54415ea880d0ddc08695fdecc7bb4db3916dad02069579cd7aa1101c5f2b2764e3f5a498a9e99e45d4d13758f43e3ed9e1a26bf2b72ca92616b57 SHA512 74e06a9c9b2007284e8688192c60880557208aeab1c23bd0f45ea1470b6f24a0588166ecd24ed1d3660679dca0a2ae808cf7e35ef2b37049d2ae804e1e1cf444
 EBUILD wmix-3.4.ebuild 536 BLAKE2B 940782ea3a564f33dc211a4e880a74801081d1304372c713712ab7a6e609746a382f901aff04d71994e85ab867d0f40d3a8370a76dc45365f6f535c4272fd540 SHA512 b6c13bae7f0b28fe25f37a1fbe162387fe6883e38f9c74f65ef0dbbe6ecb6e1f9045ca8d73110ad8ee33f16779f513078e3fee572fdbf66da5f4a1913b5c6db9
+EBUILD wmix-3.5.ebuild 467 BLAKE2B d20508efc34568e08b0d8fac23f0a7408c253611b1c09b32a0e9dc021d1c44111566db89ff7a940df91b8dcd5e3e501e478d9af130daad1fa9004f8783bd53dd SHA512 46eb30113c5ea43f3a8200fbbe4b32be6b2e4fcab70e885ac45211b0e3a481e15a0c2f00ef07527df5dd88a3991bbb827dfda63f1babb6fc24d8c0e611095b9d
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
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/wmmoonclock/Manifest b/x11-plugins/wmmoonclock/Manifest
index 7983bfee23e4..d34ea1e4e513 100644
--- a/x11-plugins/wmmoonclock/Manifest
+++ b/x11-plugins/wmmoonclock/Manifest
@@ -1,4 +1,6 @@
 AUX wmmoonclock-1.29-gcc-10.patch 990 BLAKE2B 4a2eaf6adacf7d63ca50b5096117acdbdc83be22b1563f81865495b105e1781e981bf6b5fdb0a0ed97c27d50d059a2d958252a21244a22a475abfd3e9b476cf5 SHA512 5de4007d9660a44c722e660a20833f3ebc34e855ecc3728323516982d1536c360072a7ab1fd5b07ad608460e7190ac320deb75ebf31ae811b69255f542d8459a
 DIST wmmoonclock-1.29.tar.gz 234991 BLAKE2B 7d38b4758d6bd4b78d069ae7d872c60f1a43a25fc424a51615ff0506d249bc0ee416cec9dc389ea27281f0b1eafa299bb126f0ea177334508ebb2b3542162162 SHA512 c36850034a0f3b7863ecfd03f73f91f9b935f645362cebeb33186873f700585d682dc5c35f3b5d67932afd3c5699fca56bf012e8f8a06615ff52c44a47ba552e
+DIST wmmoonclock-1.30.tar.gz 238171 BLAKE2B 05246845f95a24f4b0e1b2ce1fb790c170da2b2023337fca5517a27afccaa7a9e42efa497151059897fe87f25b2e32390f441a820afc3eaf353333faa1760d57 SHA512 2173586ef8dd53eae0a05368440dffe8438e57f8158df05fd0de2d4525a5726e48b62ef8e8a81403cb7707d836936957e2238f543946beb557623bd9fbd54175
 EBUILD wmmoonclock-1.29.ebuild 505 BLAKE2B 6176851b991d94be6c07f068905a2ffdae0e07eea8045e702bdc48b9b9a2c05576754c3cb3783d4481df7e9212ed701bd37ec64425189c9fef5df18d5e3269c0 SHA512 25e781aa2b007a44e447de9eef7c4a431c23ded06c6528de36eb18ff496664ba4a87a17de0d3b55c0ea28ebc3e3839d0826bb6632cf6de81591ed928799cbbb6
+EBUILD wmmoonclock-1.30.ebuild 463 BLAKE2B 1b7b6ae7dfebd4600ddcac4321610788fea5d2c8732299db378176d89cec88e954119873b337d475c43d508d8f0c0223e5b00dd3324126147a91dc805990fd24 SHA512 13cee21d2aaa662f196382fe6c8877ba042a0f0e3bd3f857e29f8e5c6e690114e1407ea444d5bcdf29b6191e5c38fac2bd4b8a81ed77aa3f13420b9023388ebd
 MISC metadata.xml 717 BLAKE2B e5c17235e51c6f1491c4b9005324c9f8d8a718bd4ded9dd8e7b314109c69c88cb7583a57d7023ccf7dd06a86da4d5980152b4fdde077d43f8bf633027b0ba4eb SHA512 8b4e39220460db02c6adc76d282fa041650b96af82c46f7f308e8afa098d3f016a5646079f48e37b3814d6e168f0468f4ce921225e28bb3fe2b0ab5832a76a1f
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/wmmp3/Manifest b/x11-plugins/wmmp3/Manifest
index b6b7975922c7..51e0bbe5b1a8 100644
--- a/x11-plugins/wmmp3/Manifest
+++ b/x11-plugins/wmmp3/Manifest
@@ -1,4 +1,5 @@
+AUX wmmp3-0.12-fno-common.patch 884 BLAKE2B 421642a5979b66bbbc133960955b3d9c44cece6a3355bef9a63438179820fe616b9332c0aa42dbfb3083aaa38a8eecbf262950c517969d6b22281ffbd46b9055 SHA512 efd0b0870d6cebbde47b28d9e6ec026eed8d8fc969f40a37450c92da29156dccdb9b49f90a3809f4e2c9a9f4d7d9ae6bf3a6f8899a622c6a058302fdea790200
 AUX wmmp3-0.12-x_includes_n_libraries.patch 581 BLAKE2B 63f7bd5c835a9c63de4c8bd5edbbcf5ee76cb1a7e4e60fa48ee5b0cd86cb966e051966db40022e5656f7a7cea6bf9f2dd972cbdb53d1db0fa2cda587c0ff4b17 SHA512 f3f49b0c2469283401b26c1b5a5436f442d48e9aebf918a5357aaa979378d54d10f634167b6340769a700973a6bda01de1439c55290b33120fd43cb9728b6e5f
 DIST wmmp3-0.12.tar.gz 43977 BLAKE2B bde74194020e65dfea27e94f5a4e937e0811da12c3af28b8d7902c3d08adc27499cd5414ee4826e6f5b25709bf784e6b27d1df07e8079953ec2a602b332b17bf SHA512 6cc06f109d6ab6c69ed3b8175010a2f38053138291f02e59780fc7394c35cc629ddd6b982bd5069e20a3cb81d81b3d08b9e10d1f7984f783f22c9b012c933740
-EBUILD wmmp3-0.12-r1.ebuild 743 BLAKE2B ba5481e3c6159b678f91f751777b237a3594b318051fcce193649c6a34f7325b855961e019d2eda62f6f4eda3af9b9209d7a2988b64ee08887b3c75525269bed SHA512 3380ee2237df5e1cf3a4b08fdc6818e43e04193d20d5120a066f34bcddccd4904c4554fc8c7410557ed72388e4175a0c8643f4dce7b9042a4e6bf16c3dd68315
+EBUILD wmmp3-0.12-r1.ebuild 778 BLAKE2B e64e2ff57e413cfafd25365fe63755ba1a6b944ed809d655f9e8a174ad338693445aece93159255db1ac5ebd5edf94bea9794372aeb9ba74c1da6c8d23db4a2a SHA512 a982464a450d75caba651700234f6e811b819cba884bc8af85a162e71a271aa68a79dba7cc7a0d0d0ffef5c294d606ad3d744b7080a034ca73c22c106e014c03
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
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/wmmp3-0.12-r1.ebuild b/x11-plugins/wmmp3/wmmp3-0.12-r1.ebuild
index 23fc74a48c46..ce5131e34556 100644
--- a/x11-plugins/wmmp3/wmmp3-0.12-r1.ebuild
+++ b/x11-plugins/wmmp3/wmmp3-0.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,9 @@ DEPEND="${RDEPEND}
 	media-sound/mpg123
 	x11-base/xorg-proto"
 
-PATCHES=( "${FILESDIR}"/${P}-x_includes_n_libraries.patch )
+PATCHES=( "${FILESDIR}"/${P}-x_includes_n_libraries.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	)
 
 DOCS=( AUTHORS ChangeLog sample.wmmp3 README TODO )
 
diff --git a/x11-plugins/wmweather+/Manifest b/x11-plugins/wmweather+/Manifest
index 51763025c8d7..bb16f8845500 100644
--- a/x11-plugins/wmweather+/Manifest
+++ b/x11-plugins/wmweather+/Manifest
@@ -1,4 +1,6 @@
 AUX wmweather+-2.17-gcc-10.patch 874 BLAKE2B 070270a2e87ca42b217f031bb77aa471299bd3471299b2552e3c5c6356b0ae44781e1a0a9c4369d59f17868c8b57c048a246ffbbf65d0d355fe8ef127e4218cc SHA512 710a5aeb79e76ea2fc332cdde31f7d30902d5e0fe396bc09e75543c9e02f058a8e5a4dbb37418b2c72e5a5408512fb7215d2e2d005443b8841b37f3ab5e5efac
 DIST wmweather+-2.17.tar.gz 212763 BLAKE2B e810ecaf6858bba0cb3bdb32517f5c1cbaa552ed071b1ce6dfca33b41ad75c5272616c9be78930f47ee3980d2ab8c51a29caaec627c5e608e9c2790d940cfe65 SHA512 45622513792698f1adf4a686506913146e2a24c9ff39fda1129132aae864528184aa122b525e00b079f416fd131c1369ff95e430c4c63877bdc166c982f841eb
+DIST wmweather+-2.18.tar.gz 206062 BLAKE2B 14fe0b49b5541d5e093c958d1c12c4c28c3bae53f8539402a61800d1817bf22eae426d4733e08ae3f1e90057e7dd297a9412d62e5edd9fb973b0a9e799b3f792 SHA512 538325b1d2bd7dd3a89a006d88868e02a71318b6e49001033d0f543965fb21f91b265e116d3b929a096e99719c99241d520a7eb395ec55f721de0d01dcbedbc0
 EBUILD wmweather+-2.17.ebuild 594 BLAKE2B adc6678320670251f26b21eaf41d839c17269b9ddfa9b35880271050e7bd189dbe6c83ff2331f157b299a30fdee3a29c29ef1e8fa49c0ac591a94998e40b5f65 SHA512 7df87bd3899d7c56be8aa22817f373ba75a26d5971a4ae8e1d30e8cc435a24f1bc775ebb59190ced380154b17936b0503d834fb2231322767077f6faff27c63a
+EBUILD wmweather+-2.18.ebuild 552 BLAKE2B c70d2c88d4b506cab24e316cabbc33160902b1c8584dc3452de5809484afec1c485acfbe2821df58130246edbf6962e24efb0201ff0dbccbf4f795ad169aec8b SHA512 5570cb6a97188c9318afa2d82e4f02308671d2e515ed1ad3507dbd703a4d76e7537898169bf68bef4476bb0180be070a374267fed7907dd9d893b80b62ccc389
 MISC metadata.xml 335 BLAKE2B 76f6e54fde3b2c75610062a4ed18b7953a1a8c0ddeac50e9f58a3276927e929087cf2559ad4ed55814831d9014502bcee83a5bacc781d2e0fbdf5a98dffbd8d9 SHA512 8cddf721129500148c51b172e42ee2f56a7ae234a15c7567bd37f738ca776110b88c690ae802e3192a4451be48c9ced9af73a111eec20f788f62ee4464505209
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}"