gentoo christmass resync : 25.12.2020

22 files changed, 194 insertions, 513 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 3c1be92c5343..08d437dbb538 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-window_merge/Manifest b/x11-plugins/pidgin-window_merge/Manifest
index c495f628f218..cf8d8b765f03 100644
--- a/x11-plugins/pidgin-window_merge/Manifest
+++ b/x11-plugins/pidgin-window_merge/Manifest
@@ -1,3 +1,3 @@
 DIST window_merge-0.3.tar.gz 328953 BLAKE2B 2277f2c5cb83d98ed34b4e0961281b7c8ebf8209b31471447bf64e9405c9cd0c2e0edc0388f64904f377d77a9916c411cecbc9c6cf235f2127685cf553906c69 SHA512 6863c58b3054aac51ed109ca8fff5e02459220648e6afa700c7231e259e71893ec7ca237263c230632a512d470c6907d3e8cfc9516cb752c1e78bbfdb05a50d3
-EBUILD pidgin-window_merge-0.3.ebuild 706 BLAKE2B 8f644d0ace94ba1c28ea2da49f43239fd7eaccf439ab331133dc4d04b10295af88feb881afbe92782e41093df67f1699e186a521a95ce3290e6e92d59189a05f SHA512 ff9095aa9d3c66814da9774c6f3f5539bcfb9f781ad82983d6b034993ab42758ef0ef968f6250e2bfd1751878b8ef17378f723251753a2c240dab5ef10f4f713
+EBUILD pidgin-window_merge-0.3.ebuild 703 BLAKE2B 3a58c80676252168eaa458902ce2dcf2cb18d5e6052778994ecaa7c1cb2b088774d53216258f3f65658c92c6786a199f35391520b3970fc3b0834ad871deda36 SHA512 d21a89d2586ba066c074d34445d3d9b570b8b9c3c2529f1865c1576f286289f31ea6be1a669f84a8943faaf37ae8b85f9268fc2748ffeab18187202e6d60b4f0
 MISC metadata.xml 333 BLAKE2B b458848f22eab0215a7dd163c7e5a274032cf3b0444b8de14c6f331978c143249ba2a68038a47d82ba4a5d89742491a5949be5aee4f140e1dc4e3cc866bedea9 SHA512 38298a8d49cc03e1f0f390d3d52cd4e7a87cc88b8b74b8a53835000b57a8e658f778dd3b97afe3015bfc2893d24632452bfc0b17734d95122464f071be5e5e35
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
index 95abeb686964..9927a83926b6 100644
--- a/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild
+++ b/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index c4ba260005fc..5e7344117bd7 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -5,5 +5,5 @@ DIST wmbiff-0.4.35.tar.gz 265332 BLAKE2B 049f01dafaf71af614c47379fa1e59593e6d790
 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 749 BLAKE2B e6eec09bc83b0d23065c27efe48043d829017ffce44440094ed159ebb864b22e14e63433b7edbc7090b4559fa1d8f9d4aaaaa05125f77d9474e9264c684021bf SHA512 0eef526e14cc7e96a732eb02595790dcc703246d8551aa9049d85ae1b0d286d50a77097f2005b13cbf7ce22c1d03099a7411f9a12e15393eae29bf81a50f0b83
+EBUILD wmbiff-0.4.36.ebuild 748 BLAKE2B df8b921c25613260d469fa9410456e74a7f6fdd677bdd38c37a79074ebebc3b0e19a3b39305b0a39edcb2e9741b33d8ff46b9f703f65ccf3b2bb215c6419e821 SHA512 1893570240517a5f0e9af38ba3a5308fe95036387604323c4d0e3dcaf7edd6fdf5b29a164da7479461b1f8a5f860b71c535b2d8758f66e3c9d59fc47111c3f32
 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
index a7c57b290a75..9bc7ddb28d8b 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="crypt"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmbutton/Manifest b/x11-plugins/wmbutton/Manifest
index fe6e217bede2..12b46fcacb1f 100644
--- a/x11-plugins/wmbutton/Manifest
+++ b/x11-plugins/wmbutton/Manifest
@@ -1,5 +1,3 @@
-AUX sample.wmbutton 659 BLAKE2B 35aa7b2ed88b7a04d869ad1b6eb7ba807d25460aa7addb7e323567e09dca592878295488daee59cbf8d0e89c04ec3d440627ddf10774dbba51b3afcecc10219e SHA512 fc828740001b2280f49b916cd1fc803cb1d606d36a7fdeca0aafa9d892d377ed68eebb996efe7bb96eff6f5ea281e4431182e2831605f6167a39cb2be878063f
-AUX wmbutton-0.7.0-Makefile.patch 753 BLAKE2B 5dcf27655194b834f63f5c9dcc25ed3a3ccbe6d61b2f4db88444c168c54f206039b2c2065e45462d054fa376eaa062a6634f267b7629ea226b27681e80ac1b26 SHA512 f62306dfbba48a960a1e198f7c50a4e828405642d852dd543b4cf6ffd2e297266bac71c386d176a35c060dcc6f6c126a4af52a0f83772a4ebed1b55dbe880b8c
 DIST wmbutton-0.7.1.tar.gz 140293 BLAKE2B 55ab4926b833ae4e57e73cbd4e0fdb6177510099a140bd17d1378c31fe4f42a5fa35c1dbe58398412d465ceb99065a3c7a45a496dc3cb71d045edd879bd70f18 SHA512 61e846c2c7edf6375fdf7e86490ef80feab986b24ce83110283b7e336562a670142e326bfda24ddad832c563da0cb4bc2c3d7379e88e647954c6d93a4dcf6068
 EBUILD wmbutton-0.7.1.ebuild 467 BLAKE2B ad97f18003b167381cf3a356830a2eed663022915ef9f72a89e52d0b4f174ac99ded48f13f00d3f4827b0b7422d302494e15f70b26904b25ffb1ac164f31ae32 SHA512 8fb65e5cc1e3efb5b431fbc40f56a3210a15a415d5cd0fbaa5fded87f4f9201fbc27d09528f4c16cfb2e8528df8ad247bb5abade05fdd38e1a90271db9fb08f2
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmbutton/files/sample.wmbutton b/x11-plugins/wmbutton/files/sample.wmbutton
deleted file mode 100644
index a4177a24e081..000000000000
--- a/x11-plugins/wmbutton/files/sample.wmbutton
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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
deleted file mode 100644
index f9197842b44a..000000000000
--- a/x11-plugins/wmbutton/files/wmbutton-0.7.0-Makefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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/wmcoincoin/Manifest b/x11-plugins/wmcoincoin/Manifest
index cb074408478e..a755fb104661 100644
--- a/x11-plugins/wmcoincoin/Manifest
+++ b/x11-plugins/wmcoincoin/Manifest
@@ -1,5 +1,5 @@
 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
 EBUILD wmcoincoin-2.6.2_p20140602.ebuild 978 BLAKE2B 74c122836e1bfcd89fc77117349d48dd88566f143a37c25426c2322362a2d586d3513bcd5559e0a73f58761b1b274eb037b422c37d67a1164deb5b286fe135b9 SHA512 ad01f83b53cd4a2d5dd9da3f8daa8830eb4c2b227ebae3279302c5afcedd56183c07f6ca70ebb0b4938b8d4f90c264c161e5b655f5a237f2133befa3586eafaa
-EBUILD wmcoincoin-2.6.3.ebuild 742 BLAKE2B 2d420d4646b4c3e2e9f45cb57e2beefaa76ca1b743342425bc6b924fb3b2dfa29247b31a1198b33542025a72fd96465937ce784768d93a39b25bc6fad228f000 SHA512 5872e935c0db3a827b56ad2751cde3a3b532cb68359382be62f716f2376e4ef505b188f383b75eda3cdc76b7a1b688969e19218c82ec9fd99f1f949d4e7832e8
+EBUILD wmcoincoin-2.6.3.ebuild 741 BLAKE2B d246c8288b155ca4810bf7fee0359edc622a91b48ae7cbd0d0a8ec4e2a0b5d5616ddcc5fad9e8576552d2f46370c5d9980ba08d2faa4997ad56f0b4856694c15 SHA512 ad734d06e91dbe98eba7534874165c16864c86265986f2614dbc9744b5c4bfc6502572ec18965dd6694f602ebdf639c7bb8039e758151f304144b61bd498b68d
 MISC metadata.xml 641 BLAKE2B 8ceb569e438dfe8de74de91d31c6b858db7dc20508257fa371504352664cd409c0339e356401cf68f8a59a5cae8aee10dba93134ca353d6a63c47405bc07a229 SHA512 e2d77f95ba4774261ec4ec669d18bc5cdc11558e935bfb3d4e759e9755e15e7ef88b9207a7498c44bab9061f01483c36b2c9624648fc05df526dc91f5637bc64
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
index 7ceffa19d445..4d14c5ca8975 100644
--- a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
+++ b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://hules.free.fr/${PN}/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE="nls xinerama"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-plugins/wmgtemp/Manifest b/x11-plugins/wmgtemp/Manifest
index a4f337bbb91a..c3e8560315f5 100644
--- a/x11-plugins/wmgtemp/Manifest
+++ b/x11-plugins/wmgtemp/Manifest
@@ -1,3 +1,3 @@
 DIST wmgtemp-1.2.tar.gz 96949 BLAKE2B c578666451260e49ebfd0986b4961586f9425ef3e7426168a0dc14aa9b6ddf65097f69da6a3871711ab96f3d678285e538bff17780f57437aa5835aeb61e8d24 SHA512 ab76eabb5459b6a8dde28c23b8c8d39587e7874daaf368afcbe7aabe57ce499285d4151b53afa8295991742c481ca18617e71107ae264c05ab28b24b67c00b9b
-EBUILD wmgtemp-1.2.ebuild 420 BLAKE2B ec6478e06e336bb384495ba33dfe9fdd604fba32084983f81ef0af64affe16ccc1c6e5809ad40c43d39c12576d1552eaea63fac00f7f5bac2b07a120add984b2 SHA512 1fa32a77caae87ee1561511cf89d1bc9ea6a30fbe7f4972b6635d8c0b2baf841cc994217ec4d3a190667d4fcebba99ee8bceebd71ac9e5f2145aa5b65a68d7aa
+EBUILD wmgtemp-1.2.ebuild 417 BLAKE2B 34b554a89d1721dd24e10fd3f4718263815f4d5fd7ddaef5ca5f16ed3a05851b7eec40286e161df8ab1a6376b9f72fb83e1bdbbae3a317ea7607e7497ffb0228 SHA512 e55ae61f059a26917ca8516c794ff3447720dbe1a67889d1d6ec7631d6b611d27c7538c2ae5a19e1adeb28472fdc41a7ae07cb7dc2d9ecb5eb9457338c51ed47
 MISC metadata.xml 739 BLAKE2B 095601890d8962a8fdb9cc3b39b6edec90e09145388511c25edf6cd7adf8047d2ee6c6e9785b39b2f058e092f92a061b75aed34157343f943b5c576f2f8c9300 SHA512 873468c2e1aac9118c7d1749160df5e51797d52305dbf7a0f28f71931731c525bf4950051075aba278905d8e026b9786379b8681fa217d547ebff62139340749
diff --git a/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild b/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild
index 5040d25087d5..cfe8a2453c50 100644
--- a/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild
+++ b/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/x11-plugins/wmix/Manifest b/x11-plugins/wmix/Manifest
index 6123ce3075c3..37825b32072b 100644
--- a/x11-plugins/wmix/Manifest
+++ b/x11-plugins/wmix/Manifest
@@ -1,5 +1,3 @@
-AUX wmix-3.4-gcc-10.patch 3584 BLAKE2B 4026aa39e88ea33625e37995607845b710c5150b8a3afc5d6142bf127cd17216a9843a6e5ce1913e5698bd6488ce1d009abfee20e25a9818c770dacbd55031ce SHA512 b79b3bfc92682e49ad2d45d97c21bb1d97d40db42de242049a6567507b9766e37a7f5f438ebe16b09b29ddca18391dfee8bba67888b817f71e1b9ce1da57f2f6
-AUX wmix.1 1969 BLAKE2B 9599e110ef1efcfb1582749cc58355f5d055920f5d1d0834073bd161af65cea300c100a9cd64ef65906842858da0e4539527a0c448616228280f7b283bf2a29a SHA512 3937513506295543cef1a12a0a739f4923e2fe6500436433969351547493b712c891ac41ccf627a325eaf03c8552cbe6cac0cedc3ba3548a26c138f4eec084d6
 DIST wmix-3.5.tar.gz 118052 BLAKE2B 54461c59d46a2ccf7f81aaf422b9e9fadf260001621396543deb996cb346a1dea5d100b38517b79974acc4d429d6a2f4fcde10e88d114e9f6978d1c0bb599d2e SHA512 ca702368cd5db55958e5f25c9703bf6659987534795fe58fd1ade426220f468ae3979e98ed1a00ffa162b094e53e37974d626a6bc48e2f6099c8c6eaa1f3dfd6
 EBUILD wmix-3.5.ebuild 464 BLAKE2B 9b62dfdefe3e991b5f1a22a3a917efea9a4bbd62ce2b70b7f5f892ec3b71367f4ee0da61e78553746f12a861641a8175369b59aec668f23ec50a8227df1281d5 SHA512 b0db10b4390d024a7a4fb222bd0bd3e14c3b13281950b43230279a4e4b06e9d334a4cd95c58ee4ec72b7f9c67199cc00465b04109a089f9588e83cdbdd9f408b
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch b/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch
deleted file mode 100644
index 4e91a1a53d78..000000000000
--- a/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-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
deleted file mode 100644
index afd65224bbe5..000000000000
--- a/x11-plugins/wmix/files/wmix.1
+++ /dev/null
@@ -1,68 +0,0 @@
-.\"                                      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/wmmaiload/Manifest b/x11-plugins/wmmaiload/Manifest
index faa64dfedeef..d17a858c5149 100644
--- a/x11-plugins/wmmaiload/Manifest
+++ b/x11-plugins/wmmaiload/Manifest
@@ -1,5 +1,7 @@
 AUX wmmaiload-2.2.1-checkthread.patch 387 BLAKE2B 2c79203a230b8caa9cb3ff85443380843144318146c61750d4c7b7113df9ae51960541adc3d76cbfed412cf1dc7c91687a224f549cb898bcd0a7cb70926fc2cc SHA512 a2edea4c4c0beecd5fe764bf8a591a8367d76997bd747f0c2b11ed6f268f88d57aae0d0c0a085ab9b48c7eca42fe1d2fe3f5ea3246981d42868fedf2336da7d1
-AUX wmmaiload-2.2.1-gtk.patch 6148 BLAKE2B 082a2f93bde9fe08c227770789e1e1b54286f69506fb8208550c46f92a985f5a73854ffd96fb96d1026bf70a13180e0109fb5a4572e3d07fd8c9280412730efe SHA512 f0766111c10af4a3d658804f8fbf4a628df49947fad3f350e2399ae10ffeaf5083291759172155647e54b101dccc2dd66520483302d20f59557e57933564bcb6
+AUX wmmaiload-2.3.0-fno-common.patch 3189 BLAKE2B ce81f29d6b8fb3c95eaeb1859d86cd45a935e595785c26ee756cdebf8b9f7f340b966020796c6ee96d943b3aea7ff81df48d3c05af6119d31cf6c81d5748a2a9 SHA512 689c196834783f969c58d3a3244eb289c0d0a34b7a9c32f9b374f07325b3077f8e231afa1fe91832d0e99e4cc2a54c6a85cf9839bec65a588288e57df60804d3
+AUX wmmaiload-2.3.0-ssl.patch 1008 BLAKE2B 2d62d5549df7facd43df932365bccb11324c90ec79dc0aedc1fc42bde5474aa82c51ab42420bda06d6ae2282d26c8cc8aaf59597bbdee4fdebcec31b0ba509f3 SHA512 2976bba5207b77c80ceb0d1759a170f03915fe7746f051a07a1862e748e1d9f95b717670c5ef7692de8fa995b1a1bf018a15f1ec8a70165dcbe5dff691c12352
 DIST wmmaiload-2.3.0.tar.bz2 42852 BLAKE2B abee44716ff74e48a480881c3327bc4a4f02600044a587b3322429567a3454f01c733542fbaa42cb074a2da48ecd1c453d19ed42c30efc04e634c44330d729d3 SHA512 c4e63eb2868474e3b76f5f4f401bdd23172f23dfdb0e90712e3eca607494057e067805b83a53490d38b6f7b2c876e2ec8fdb1d95b871d3febeeda35369550de9
 EBUILD wmmaiload-2.3.0-r1.ebuild 1113 BLAKE2B a3cd913239de19f6a5ff5e14fb29eef7604b8b1905aa64032b8b327a73dad27a0c6d08eaac75c01cbd64f3b4f576d1e5694e5318bb9f825a182c1ee3e17ad9b9 SHA512 a72ed432d9bb9a1a74ef9d8871d41a6ce92a5afd44394a9b0c51f51b7ce0f85fcd450bac3858ef93c946b9852577d7dfc831eaf1e0b2e39b4f2305655995570d
+EBUILD wmmaiload-2.3.0-r2.ebuild 1035 BLAKE2B 7f64f7542d12e3238a540055e243ab59af69ac2cc39a7d7b6642a9859a18a5347dfcc86faf4c8dd5e6dcbf7d7d2dc6eacee4249b2e8a5855e990c3769a3db6a5 SHA512 9bcd425fe90dc0cc764427d123608c1055b5a2fb5040452598e0bd616151ef39a316e8e84e92adabf7c21dd3e17257b0c2b5812ea80be795e61fd4932b1c9470
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch b/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch
deleted file mode 100644
index 38c8625e51ac..000000000000
--- a/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-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/files/wmmaiload-2.3.0-fno-common.patch b/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-fno-common.patch
new file mode 100644
index 000000000000..f4c0eb9763b6
--- /dev/null
+++ b/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-fno-common.patch
@@ -0,0 +1,113 @@
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload-config/main.c wmmaiload-2.3.0/wmmaiload-config/main.c
+--- wmmaiload-2.3.0.orig/wmmaiload-config/main.c	2005-07-13 21:51:28.000000000 +0200
++++ wmmaiload-2.3.0/wmmaiload-config/main.c	2020-12-20 22:04:03.170530520 +0100
+@@ -11,6 +11,18 @@
+ #include "mainwindow.h"
+ #include "actions.h"
+ 
++int backlight;
++int update_interval;
++int boxnum;
++int check_delay;
++int switch_authorized;
++int run_once;
++int test_size;
++char *config_file;
++char *light_color;
++char *command;
++char *notif_cmd;
++MailBox *mboxes;
+ 
+ void Usage ()
+ {
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload-config/mainwindow.c wmmaiload-2.3.0/wmmaiload-config/mainwindow.c
+--- wmmaiload-2.3.0.orig/wmmaiload-config/mainwindow.c	2009-02-23 03:58:00.000000000 +0100
++++ wmmaiload-2.3.0/wmmaiload-config/mainwindow.c	2020-12-20 22:05:14.978622375 +0100
+@@ -9,6 +9,19 @@
+ #include "mainwindow.h"
+ #include "actions.h"
+ 
++GtkWidget *application;
++GtkWidget *filelist;
++GtkWidget *wid_backlight;
++GtkWidget *wid_blink;
++GtkWidget *wid_interval;
++GtkWidget *wid_checkdelay;
++GtkWidget *wid_color;
++GtkWidget *wid_command;
++GtkWidget *wid_notify;
++GtkWidget *wid_runonce;
++GtkWidget *wid_testsize;
++
++int selected_row;
+ 
+ static GtkWidget *b_edit;
+ static GtkWidget *b_set;
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload-config/mainwindow.h wmmaiload-2.3.0/wmmaiload-config/mainwindow.h
+--- wmmaiload-2.3.0.orig/wmmaiload-config/mainwindow.h	2005-07-07 20:54:17.000000000 +0200
++++ wmmaiload-2.3.0/wmmaiload-config/mainwindow.h	2020-12-20 22:05:14.978622375 +0100
+@@ -7,19 +7,19 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-GtkWidget *application;
+-GtkWidget *filelist;
+-GtkWidget *wid_backlight;
+-GtkWidget *wid_blink;
+-GtkWidget *wid_interval;
+-GtkWidget *wid_checkdelay;
+-GtkWidget *wid_color;
+-GtkWidget *wid_command;
+-GtkWidget *wid_notify;
+-GtkWidget *wid_runonce;
+-GtkWidget *wid_testsize;
++extern GtkWidget *application;
++extern GtkWidget *filelist;
++extern GtkWidget *wid_backlight;
++extern GtkWidget *wid_blink;
++extern GtkWidget *wid_interval;
++extern GtkWidget *wid_checkdelay;
++extern GtkWidget *wid_color;
++extern GtkWidget *wid_command;
++extern GtkWidget *wid_notify;
++extern GtkWidget *wid_runonce;
++extern GtkWidget *wid_testsize;
+ 
+-int selected_row;
++extern int selected_row;
+ 
+ gint list_unsel_cb (GtkCList *clist,
+                     gint row,
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload-config/variables.h wmmaiload-2.3.0/wmmaiload-config/variables.h
+--- wmmaiload-2.3.0.orig/wmmaiload-config/variables.h	2005-07-07 20:54:17.000000000 +0200
++++ wmmaiload-2.3.0/wmmaiload-config/variables.h	2020-12-20 22:04:03.170530520 +0100
+@@ -7,17 +7,17 @@
+ 
+ #include "defines.h"
+ 
+-int backlight;
+-int update_interval;
+-int boxnum;
+-int check_delay;
+-int switch_authorized;
+-int run_once;
+-int test_size;
+-char *config_file;
+-char *light_color;
+-char *command;
+-char *notif_cmd;
+-MailBox *mboxes;
++extern int backlight;
++extern int update_interval;
++extern int boxnum;
++extern int check_delay;
++extern int switch_authorized;
++extern int run_once;
++extern int test_size;
++extern char *config_file;
++extern char *light_color;
++extern char *command;
++extern char *notif_cmd;
++extern MailBox *mboxes;
+ 
+ #endif
diff --git a/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-ssl.patch b/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-ssl.patch
new file mode 100644
index 000000000000..812563486256
--- /dev/null
+++ b/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-ssl.patch
@@ -0,0 +1,24 @@
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload/Init.make wmmaiload-2.3.0/wmmaiload/Init.make
+--- wmmaiload-2.3.0.orig/wmmaiload/Init.make	2005-08-28 21:14:57.000000000 +0200
++++ wmmaiload-2.3.0/wmmaiload/Init.make	2020-12-20 22:10:24.487996211 +0100
+@@ -45,7 +45,7 @@
+ # SPECIFIC INFORMATIONS :
+ #
+ 
+-LIB_SSL = $(shell grep -q '^OPTIONS.*HAVE_SSL' ../Config.make && echo '-lssl')
++LIB_SSL = $(shell grep -q '^OPTIONS.*HAVE_SSL' ../Config.make && echo '-lssl -lcrypto')
+ LIB_THREADS = $(shell grep -q '^OPTIONS.*HAVE_THREADS' ../Config.make && echo '-lpthread')
+ 
+ CROSS_COMPILE =
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload/ssl.c wmmaiload-2.3.0/wmmaiload/ssl.c
+--- wmmaiload-2.3.0.orig/wmmaiload/ssl.c	2005-07-30 15:52:55.000000000 +0200
++++ wmmaiload-2.3.0/wmmaiload/ssl.c	2020-12-20 22:10:30.327001632 +0100
+@@ -39,7 +39,7 @@
+ 
+         OpenSSL_add_all_algorithms();
+ 
+-        method = SSLv2_client_method();
++        method = SSLv23_client_method();
+         ctx = SSL_CTX_new(method);
+         return ctx;
+ }
diff --git a/x11-plugins/wmmaiload/wmmaiload-2.3.0-r2.ebuild b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..79edd2c03eb7
--- /dev/null
+++ b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r2.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="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
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-ssl.patch
+)
+
+src_configure() {
+	# The ./configure script is not autoconf based, therefore don't use econf:
+	./configure -p /usr || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCPP)" \
+		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/wmpasman/Manifest b/x11-plugins/wmpasman/Manifest
index 7ba1ba401f5d..d864c99135ba 100644
--- a/x11-plugins/wmpasman/Manifest
+++ b/x11-plugins/wmpasman/Manifest
@@ -1,4 +1,3 @@
-AUX wmpasman-0.8.5.3-list.patch 2751 BLAKE2B de34e3491f74dd8fc3340c85a665e9dfc546bfd8d056ff56542e535bd98c969e01f37a30e2852bf33d2f95accfa39c7c26752ddfd9ab598b4326da9ec4ebf0c9 SHA512 f8b5f33f7b6da03e95f000a8a7b27c1346b10cb3953635974f804e64af9279ecc7fc99eadbc1a0d534f5f434672db18fa4d46fced0498829fe2202b46ab818a1
 DIST wmpasman-2.2.tar.gz 155077 BLAKE2B d7d9bd1c3e34d4f03661babd42ed5abbf42637709fb2f31358b51fda13dcd682e083af683640a7ef75ae0087f2de179136635e9be3979f9a36a067b5b634fcd2 SHA512 2f24e2ef84d6e5cab1c3a51d032ecabbd21b22e81341ee48b1f86fc96f493d42cde42fd20cf5523f0f8462906cab4f22a2238b6c147b61b33e812f98f32c0157
 EBUILD wmpasman-2.2.ebuild 461 BLAKE2B fd0003bc34d852ff261f13ad3eb1ea8f5948f99a3b853b079384536763d6308243d06c55133ab71949ad6addbc3a49e1b4c40ddcd89d95e5ba6a644d9d6324bf SHA512 b96df693cbc613d95bc942034f7b5f34804c9f93c2049f6011b19199e68c68e77d32fcb102c364be8f214ded8a6335db8f771bf466c8b78aff901d3e1756023d
 MISC metadata.xml 603 BLAKE2B 20e83900219fe3124a32af326c94834ffcaa2303a2fcb7d33d30d9943397c88a38b0ed09c6130307ad1a5be45ffbef36d37ccd6f9c28dce8db080f2acfa3ace9 SHA512 5cc8f2cc54d2298a15f330444e0d06f941c74efb88177e4ebb45d36688f22807c65cdf50c9b2f519a78c76336060ea6f815a67013e9df36ef2a2df1a1de0055a
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
deleted file mode 100644
index 3769d09d30ee..000000000000
--- a/x11-plugins/wmpasman/files/wmpasman-0.8.5.3-list.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-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