gentoo resync : 13.06.2020

23 files changed, 130 insertions, 242 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index ed74fe3332c6..3d9ebda84aa7 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/fsviewer/Manifest b/x11-plugins/fsviewer/Manifest
deleted file mode 100644
index 640f1b050199..000000000000
--- a/x11-plugins/fsviewer/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX fsviewer-0.2.6-configure.patch 696 BLAKE2B 9e4266e78f161f1a416becac9023ff5a7bde384865b1f31d8c77937cb641ae3370567f4ab654f6fababf0797a29ea708e0b777b348340e26b266ebe0314a607e SHA512 0e3965b438c15342847dff6caff21c00b3e360cc449333465115cb33a59a9f7e97e00cd4f9dd03f473f906aeba118cd168ec6c941b17e94668c782283fd4609e
-AUX fsviewer-0.2.6-fix_title_bar.patch 2963 BLAKE2B b776fd1e04ae203186a428169d0d8cac9be621d3089983bc3598862386680b6e614d851eb8dffd7db8380251af5c8722a2417ee880dd5bf1201922d5a3bf009c SHA512 cddf339433cb1e3f0db282234a2c115b9de23cb1ca4500745dcb624186b8c918bad3ac415f2132be05cfef9d1fd879471e1aa5b904b83b3caae7b548935c7f97
-AUX fsviewer-0.2.6-gcc-10.patch 912 BLAKE2B 6e061c901e4059b43db4fed604016b221e8866f4e77fb12b80e20eeb130ce8e424d30dd9bc12221a1223f97cdc9b64eccee7b9dc2c06ea5af5852dfdf598f06b SHA512 c8f482c3bc24ca8c4684a01e0bd0b4eaedcc5d2b2c25c0e1c67d1a9c7901946aec5268ee5e4080e95b1a66156d1ea6e1877de4030e2d2e170948568b2d30666d
-AUX fsviewer-0.2.6-gcc5.patch 301 BLAKE2B b3c427a897b554548e62fbedc9fca134440d727aec146e161e84b498538b9c122b04b448fe079761cb6d4764d9253826612ac337c900b8d778cabdcaed145d37 SHA512 ccb76e22192e174700f06e45e73a2e357e865049c7fc9b6f23bff90e424d78cc13a16dfc220b0d5d4a602055e81c9577e76fb080a2ec0743b45ea93afb689407
-AUX fsviewer-0.2.6-wmaker-0.95_support.patch 1624 BLAKE2B 4351d0d079aa8e153f84cede3ea4b9f495f567bdc747db26eb0d8c2992b96677d49f4f176665307a8c7a89e7f3586e062064c3c9d5bd1408d8f5e33262bb9914 SHA512 d9cde107c34f13e4041d8c20d98e2051acf7c518f60454b891b4fe3a83995eb65e4db51f1699911f480fe09ea1d938750f620a85a9b71bc6f5f48affbe3c4dd9
-DIST fsviewer-app-0.2.6.tar.bz2 785422 BLAKE2B cd9650fec13cbe6082c7b6cf30db75d179a870673908a02ee5fcf5439bbbb5e86815b634dd536552197c6dc20d3866f3168a49978a0c9c5ec5b3c49543a19a0c SHA512 47c10a049120db8e5b095fdcc82033b66a4413f8f7e88959f0190b568324e85c8362486e0419b9c098e62e19e38dd8f2f56c6f0d1e7829afafd21a4837b4859b
-EBUILD fsviewer-0.2.6-r2.ebuild 1052 BLAKE2B 40b985b31ef9dbdd2abb9b0156564c262334e0213f6bddba3a35c1244e8f6ffb6510a1ba835e7ee6c4484f8c5122ad27b811c154d6a0519b87df81724aca27fc SHA512 e72796fd500fc7a52648ef24dc2d372c05250fd6f1374dd93d8c8f8325c66ef72a7583d039f44a29ad12aa0d5071a65dcbcf9b12bd5a46cc88bcf1c268c8c268
-MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/fsviewer/files/fsviewer-0.2.6-configure.patch b/x11-plugins/fsviewer/files/fsviewer-0.2.6-configure.patch
deleted file mode 100644
index 2d1759fefce5..000000000000
--- a/x11-plugins/fsviewer/files/fsviewer-0.2.6-configure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- fsviewer-app-0.2.6.orig/configure.ac	2007-10-13 23:54:47.000000000 +0200
-+++ fsviewer-app-0.2.6/configure.ac	2015-09-02 21:10:40.829519545 +0200
-@@ -26,15 +26,15 @@
- dnl look for X windows first so further libs check
- AC_PATH_X 
- 
--if test "$x_includes" != "NONE"; then
-+if test "$x_includes" != "NONE" && test -n "$x_includes"; then
-         CFLAGS="$CFLAGS -I$x_includes"
- fi
--if test "$x_libraries" != "NONE"; then
-+if test "$x_libraries" != "NONE" && test -n "$x_libraries"; then
-         LDFLAGS="$LDFLAGS -L$x_libraries"
- fi
- 
- dnl Additional "default" items
--#LIBS="$LIBS -lX11"
-+LIBS="$LIBS -lm -lX11 -lXpm"
- #CFLAGS="$CFLAGS -I/usr/X11/include"
- #LDFLAGS="$LDFLAGS -L/usr/X11/lib"
- 
diff --git a/x11-plugins/fsviewer/files/fsviewer-0.2.6-fix_title_bar.patch b/x11-plugins/fsviewer/files/fsviewer-0.2.6-fix_title_bar.patch
deleted file mode 100644
index 36f595609375..000000000000
--- a/x11-plugins/fsviewer/files/fsviewer-0.2.6-fix_title_bar.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Naur fsviewer-app-0.2.6.orig/src/FSFileView.c fsviewer-app-0.2.6/src/FSFileView.c
---- fsviewer-app-0.2.6.orig/src/FSFileView.c	2007-10-14 21:06:02.000000000 +0200
-+++ fsviewer-app-0.2.6/src/FSFileView.c	2015-09-02 21:18:39.574691303 +0200
-@@ -430,7 +430,7 @@
- 				   WMResizableWindowMask);
- 	attributes.window_level = WMNormalWindowLevel;
- 	attributes.extra_flags = GSFullKeyboardEventsFlag;
--	attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr |
-+	attributes.flags = (/*GSWindowStyleAttr |*/ GSWindowLevelAttr |
- 			    GSExtraFlagsAttr);
- 	WMSetWindowAttributes(fView->dpy, WMWidgetXID(fView->fileView),
- 			      &attributes);
-diff -Naur fsviewer-app-0.2.6.orig/src/FSFinder.c fsviewer-app-0.2.6/src/FSFinder.c
---- fsviewer-app-0.2.6.orig/src/FSFinder.c	2006-07-23 09:24:16.000000000 +0200
-+++ fsviewer-app-0.2.6/src/FSFinder.c	2015-09-02 21:18:39.574691303 +0200
-@@ -144,7 +144,7 @@
- 			       WMResizableWindowMask);
-     attributes.window_level = WMNormalWindowLevel;
-     attributes.extra_flags = GSFullKeyboardEventsFlag;
--    attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr |
-+    attributes.flags = (/*GSWindowStyleAttr |*/ GSWindowLevelAttr |
- 			GSExtraFlagsAttr);
-     WMSetWindowAttributes(finder->dpy, WMWidgetXID(finder->win),
- 			  &attributes);
-diff -Naur fsviewer-app-0.2.6.orig/src/FSViewer.c fsviewer-app-0.2.6/src/FSViewer.c
---- fsviewer-app-0.2.6.orig/src/FSViewer.c	2007-10-14 17:29:04.000000000 +0200
-+++ fsviewer-app-0.2.6/src/FSViewer.c	2015-09-02 21:18:39.574691303 +0200
-@@ -161,7 +161,7 @@
-     attributes.window_level = WMFloatingWindowLevel;
-     attributes.extra_flags = GSFullKeyboardEventsFlag;
-     attributes.flags =
--	(GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
-+	(/*GSWindowStyleAttr |*/ GSWindowLevelAttr | GSExtraFlagsAttr);
-     WMSetWindowAttributes(fsViewer->dpy, window, &attributes);
-     WMAppAddWindow(fsViewer->wmContext, window);
- 
-@@ -189,7 +189,7 @@
-     attributes.window_level = WMNormalWindowLevel;
-     attributes.extra_flags = GSFullKeyboardEventsFlag;
-     attributes.flags =
--	(GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
-+	(/*GSWindowStyleAttr |*/ GSWindowLevelAttr | GSExtraFlagsAttr);
-     WMSetWindowAttributes(fsViewer->dpy, window, &attributes);
-     WMAppAddWindow(fsViewer->wmContext, window);
- }
-@@ -216,7 +216,7 @@
-     attributes.window_level = WMFloatingWindowLevel;
-     attributes.extra_flags = GSFullKeyboardEventsFlag;
-     attributes.flags =
--	(GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
-+	(/*GSWindowStyleAttr |*/ GSWindowLevelAttr | GSExtraFlagsAttr);
-     WMSetWindowAttributes(fsViewer->dpy, window, &attributes);
-     WMAppAddWindow(fsViewer->wmContext, window);
- }
-@@ -476,6 +476,7 @@
-       bindtextdomain("FSViewer", getenv("NLSPATH"));
-     else
-       bindtextdomain("FSViewer", LOCALEDIR);
-+      bind_textdomain_codeset("FSViewer", "UTF-8");
-     textdomain("FSViewer");
- 
-     if (!XSupportsLocale()) {
diff --git a/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc-10.patch b/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc-10.patch
deleted file mode 100644
index 00c5e651e69c..000000000000
--- a/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc-10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur fsviewer-app-0.2.6.orig/src/FSViewer.c fsviewer-app-0.2.6/src/FSViewer.c
---- fsviewer-app-0.2.6.orig/src/FSViewer.c	2007-10-14 17:29:04.000000000 +0200
-+++ fsviewer-app-0.2.6/src/FSViewer.c	2020-02-03 00:20:37.979716353 +0100
-@@ -25,6 +25,8 @@
- static Bool      focusIn;
- int ModifierFromKey(Display *dpy, char *key);
- 
-+WMUserDefaults *defaultsDB;
-+WMPropList *filesDB;
- void
- wAbort(Bool foo)
- {
-diff -Naur fsviewer-app-0.2.6.orig/src/FSViewer.h fsviewer-app-0.2.6/src/FSViewer.h
---- fsviewer-app-0.2.6.orig/src/FSViewer.h	2006-07-23 09:24:15.000000000 +0200
-+++ fsviewer-app-0.2.6/src/FSViewer.h	2020-02-03 00:20:39.299718025 +0100
-@@ -123,8 +123,8 @@
- } CallbackRec;
- 
- /* Application defaults */
--WMUserDefaults *defaultsDB;
--WMPropList *filesDB;
-+extern WMUserDefaults *defaultsDB;
-+extern WMPropList *filesDB;
- 
- /* all Panels must start with the following layout */
- typedef struct PanelRec {
diff --git a/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc5.patch b/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc5.patch
deleted file mode 100644
index 2a532625ff8c..000000000000
--- a/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fsviewer-app-0.2.6.orig/src/list.h
-+++ fsviewer-app-0.2.6/src/list.h
-@@ -29,7 +29,7 @@
- #ifndef __LIST_H_
- #define __LIST_H_
- 
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-+#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && (__GNUC__ < 5)
- # define INLINE inline
- #else
- # define INLINE
diff --git a/x11-plugins/fsviewer/files/fsviewer-0.2.6-wmaker-0.95_support.patch b/x11-plugins/fsviewer/files/fsviewer-0.2.6-wmaker-0.95_support.patch
deleted file mode 100644
index da64f3a0389e..000000000000
--- a/x11-plugins/fsviewer/files/fsviewer-0.2.6-wmaker-0.95_support.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur fsviewer-app-0.2.6.orig/configure.ac fsviewer-app-0.2.6/configure.ac
---- fsviewer-app-0.2.6.orig/configure.ac	2012-07-11 17:55:06.448981246 +0200
-+++ fsviewer-app-0.2.6/configure.ac	2012-07-11 18:04:15.528940159 +0200
-@@ -81,6 +81,8 @@
-              AC_MSG_ERROR([WMaker library not found]))
- AC_CHECK_LIB(WINGs, WMAppSetMainMenu,,
-              AC_MSG_ERROR([WINGs library not found]))
-+AC_CHECK_LIB(WUtil, WMCreatePLString,,
-+             AC_MSG_ERROR([WUtil library not found]))
- 
- dnl Checks for PropList (not necessary since version 0.2.3b)
- dnl AC_CHECK_HEADERS(proplist.h,, AC_MSG_WARN(Can't find PropList include-file: Please install libPropList (included in WindowMaker)))
-diff -Naur fsviewer-app-0.2.6.orig/defs/chdef.c fsviewer-app-0.2.6/defs/chdef.c
---- fsviewer-app-0.2.6.orig/defs/chdef.c	2012-07-11 17:55:06.444981361 +0200
-+++ fsviewer-app-0.2.6/defs/chdef.c	2012-07-11 17:55:50.387699640 +0200
-@@ -374,7 +374,7 @@
- 	SetIntegerForKey(0, "DisplayMCListPixmap");
- 	
- 	WMWritePropListToFile(filesDB,
--                wdefaultspathfordomain("FSViewer"), True);
-+                wdefaultspathfordomain("FSViewer"));
- 	result = 0;
-     }	    
-     else
-diff -Naur fsviewer-app-0.2.6.orig/src/extnInspector.c fsviewer-app-0.2.6/src/extnInspector.c
---- fsviewer-app-0.2.6.orig/src/extnInspector.c	2012-07-11 17:55:06.452981130 +0200
-+++ fsviewer-app-0.2.6/src/extnInspector.c	2012-07-11 17:56:02.315351669 +0200
-@@ -229,7 +229,7 @@
- 
-     if(numRows > 0)
- 	WMWritePropListToFile(filesDB,
--	  wdefaultspathfordomain("FSViewer"), True);
-+	  wdefaultspathfordomain("FSViewer"));
- 
-    if(extn)
- 	free(extn);
diff --git a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
deleted file mode 100644
index 9e5972eaf1e1..000000000000
--- a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib
-
-MY_P=${PN}-app-${PV}
-
-DESCRIPTION="A file system viewer for Window Maker"
-HOMEPAGE="http://wie-im-flug.net/linux/fsviewer/index.html"
-SRC_URI="http://wie-im-flug.net/linux/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-RDEPEND=">=x11-wm/windowmaker-0.95.2
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-configure.patch
-	"${FILESDIR}"/${P}-gcc5.patch
-	"${FILESDIR}"/${P}-wmaker-0.95_support.patch
-	"${FILESDIR}"/${P}-fix_title_bar.patch
-	"${FILESDIR}"/${P}-gcc-10.patch
-)
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-appspath=/usr/$(get_libdir)/GNUstep
-}
-
-src_install() {
-	default
-	dosym ../$(get_libdir)/GNUstep/FSViewer.app/FSViewer /usr/bin/FSViewer
-}
diff --git a/x11-plugins/fsviewer/metadata.xml b/x11-plugins/fsviewer/metadata.xml
deleted file mode 100644
index 7d273a80ff68..000000000000
--- a/x11-plugins/fsviewer/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-</pkgmetadata>
diff --git a/x11-plugins/wmXName/Manifest b/x11-plugins/wmXName/Manifest
index 750867a410c1..6cd51f6761ba 100644
--- a/x11-plugins/wmXName/Manifest
+++ b/x11-plugins/wmXName/Manifest
@@ -1,3 +1,4 @@
+AUX wmXName-0.1-fno-common.patch 938 BLAKE2B c484b4c3487dbbcdba30306a0dfcfc077b792824446f1de6f52a9e128c4b2a73994b2837956d20d65685135dfbc3232c074702239470cf6e421952d520327a51 SHA512 243376bbe626ac04996c027d00f942db3a687121927b4a6880d9f81407ab028ee53bcacf43f0b0540e53ad381016ff58c3324fabfc8eccde42d61c5070f8f4e1
 DIST wmXName-0.01.tgz 10757 BLAKE2B cebe95354227f7a47fca90dd96225f4972edbcecbaf207d4275993cf1d5acff2fa85fb9ef4322130b98d62d2688317d94a6f513d9106d7fe7f1aa92f5e294055 SHA512 1b94e70fd1cb89b0fa47d488d85d981316efc636d4ef743e9445add38b48d33b1baa1ce38192e6d3b476c0f65aa312394b7dd9edc3f43ccef4f7bae807828b0b
-EBUILD wmXName-0.1-r1.ebuild 911 BLAKE2B 3f106f91f5420b81dd836563543b731f9d32d9915b1260a1b514924c5e89281e5c438e843fbc11f6f7a4b28a72ccfea73cb84a6a9bdb6db12d8ebf2aacc371e3 SHA512 7c0ff23eb9a3e7c23aa1300cf024eb5ef959357d9a24a0de2f1c53358e4e32a02b7664c0d52765a1c2926f7ae53f8f621752ac5e4b7a050e67ad6dd70f526c2c
+EBUILD wmXName-0.1-r1.ebuild 960 BLAKE2B d731043b542d21ea0ee674b4342d16cc72612486442bc1e43ab2f7062fd6d8639cefa5eb41aeca7db166aaf9dff32b014a8f32b6824fffb73b1e45486f1beb93 SHA512 6b6523c079aac10beaeaff66a9c7936fe840bd46bddd8b0d1f6d44ed462be1048cf8ac5717501e44e50c5a42908739158595e8a6017de10e37e35b1269344b0e
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
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/wmXName-0.1-r1.ebuild b/x11-plugins/wmXName/wmXName-0.1-r1.ebuild
index c812f1f76b89..793841b97984 100644
--- a/x11-plugins/wmXName/wmXName-0.1-r1.ebuild
+++ b/x11-plugins/wmXName/wmXName-0.1-r1.ebuild
@@ -25,6 +25,8 @@ 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() {
diff --git a/x11-plugins/wmapm/Manifest b/x11-plugins/wmapm/Manifest
index e954acde65e0..59e66744a854 100644
--- a/x11-plugins/wmapm/Manifest
+++ b/x11-plugins/wmapm/Manifest
@@ -1,3 +1,4 @@
+AUX wmapm-3.1-fno-common.patch 767 BLAKE2B 66d644c6aab907608304476704d19ae5b3d725eb45f15dba91313719ef16354428aec93bc67ecbd78a0bd92b077f0f2cf758cf5f4a62478746074af85adca6cd SHA512 32a232d099f91fe58a0f8b2a0e23c80a4a78a504ff0935469edca81923dfa3ca8fe74248c730c4347fc6772e215246a361a121010aed42449bfd66e6b45eb828
 DIST wmapm-3.1.tar.gz 28321 BLAKE2B 13373f675bb2561c6034268d4afab12bfb6b5ef99da7fd975842392519a8f87726455e807baecc29f15403a0c711228be8513125def3b32b36683dd386b91f54 SHA512 478edf6b48d4c44017f5f2d50efc7e757b33b14d283dfa062dcf2084c9bffe1e7624651dfd22236a98ca9aa49306849cabd1a1fd09d1d3f709e715cf0fa2f84e
-EBUILD wmapm-3.1-r2.ebuild 777 BLAKE2B 70630c9faafd4a563ea5801ce88c152d1bed01c55d62485dde2088785dfef00946f576cc469d5d23dbfd8b5e5d940a4b3cdd7a7aa571aab3966bf0beb89cdc05 SHA512 2e9372b490b87e8ed9351e294bdbe9c2c9177a8008e74485eb79cfc116b88effe45a2e83ecb0d93407a18da4542b1a27b1035b6abf963569677b3a43e1f352d9
+EBUILD wmapm-3.1-r2.ebuild 854 BLAKE2B e7ec72849bc1387dc37e33b3576d3a0bb333700eb5e6107070501a866e360cf2113cde2ea8b32864443b1667eeed5a54fe8cde32bb3e81b7a2a48eb7cf60104f SHA512 779facbbca66ce574784f3f5ddc78bace9fdf6ec9b7f300a7075612118a3d75cc83b7758590145363f2ba8015101b3864546fdcf786b0b2b4bca7ac787d7cf3e
 MISC metadata.xml 586 BLAKE2B 1cab619da94bf64d9919cad5164f23e03fbb7b1a503e6012a7c99701291dbc9e842df5f28327cb67135bd86f3ea4c6c4f622610eb45dd3cb004b2610baead1f1 SHA512 e0ccbf5129fce75fcfb4ead8ab9d90403a12647541517f1ca62e75f029d63e0e50c805714189d411eaf146d559c011ce194c6f3e79904e14222496e9d3d4b0ad
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/wmapm-3.1-r2.ebuild b/x11-plugins/wmapm/wmapm-3.1-r2.ebuild
index 870dfd26f77c..90652b1aee08 100644
--- a/x11-plugins/wmapm/wmapm-3.1-r2.ebuild
+++ b/x11-plugins/wmapm/wmapm-3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,9 @@ 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() {
diff --git a/x11-plugins/wmcms/Manifest b/x11-plugins/wmcms/Manifest
index d1efb6af309f..b849927afe75 100644
--- a/x11-plugins/wmcms/Manifest
+++ b/x11-plugins/wmcms/Manifest
@@ -1,4 +1,3 @@
-AUX wmcms-0.3.5-fno-common.patch 286 BLAKE2B a54b0379ad65661d373cf4011dbf0dcaf5841b3b1256b1139c479460cd9efb815d0787e96a7a88885f9e5f619f9d8d43a724147e1e731a12b7cae2cfb738632a SHA512 38dfd1b553897c95814737e0bcea1028e291cc08bd78ce332dace914862685d54b4726c337617c3ce4ab527eff77fd008cfa8b0a38d1420a8c8150fb00c816e8
 AUX wmcms-0.3.5-s4t4n.patch 8562 BLAKE2B d1b99dc03a8dd0fd2f1e5d387ee8b763a0b1633199c20ab231fa8496a253f9124ad7508bd66cf742660b7aa9ddca16b5eaa887f08ddb4e8de0dd10b7cf490370 SHA512 ad25dead5271907845ae96efec52844de1005f31ddbf4d2e43996633ef8c54c89f9137421b019079462227a16052df950c7f589d112815c8b02b435f863e8b09
 DIST wmcms-0.3.5.tar.gz 19855 BLAKE2B ac97dc403e6adeebc85b386ae7c78a8537c33858950f41059aadb750909b22fabef5bed3114e9552b381d3fb9d603e90236c88a614ee168a46214f64b9ca50f5 SHA512 ef57e6b278c14163de0792e6af8be40ef721020594fb2871aad34543471869ecf468210c173861a93b4f22e1dfca8f1e4254aec6508adfdf143f3a0f1a49f549
 EBUILD wmcms-0.3.5-r4.ebuild 710 BLAKE2B dc90bba96a414e8d91bd704f86b847b782fde93b8385e4b9557f730f365691f98c4921bf1cc54e102143a656ffd283524c3dc20f1b815b56dc5e2e2214b5ac34 SHA512 ea7f7584dbf73efd20cde1315124f0a328f3f83d2918403a203552e4bdf32114b7e64340d7a2f28d2a5f5b8189adafdbe74648af595529208fbc31079025a9b0
diff --git a/x11-plugins/wmcms/files/wmcms-0.3.5-fno-common.patch b/x11-plugins/wmcms/files/wmcms-0.3.5-fno-common.patch
deleted file mode 100644
index 3b060769667c..000000000000
--- a/x11-plugins/wmcms/files/wmcms-0.3.5-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur wmcms-0.3.5.orig/wmcms.c wmcms-0.3.5/wmcms.c
---- wmcms-0.3.5.orig/wmcms.c	2001-09-24 00:57:06.000000000 +0200
-+++ wmcms-0.3.5/wmcms.c	2020-03-29 13:04:56.465162877 +0200
-@@ -28,6 +28,7 @@
- GC gc;
- Pixmap pixmap;
- Pixmap backdrop;
-+Display *display;
- 
- int advanced;
- int up;
diff --git a/x11-plugins/wmpop3/Manifest b/x11-plugins/wmpop3/Manifest
index be73f1b6709e..f5df01066f5e 100644
--- a/x11-plugins/wmpop3/Manifest
+++ b/x11-plugins/wmpop3/Manifest
@@ -1,4 +1,5 @@
+AUX wmpop3-0.5.6a-fno-common.patch 799 BLAKE2B 25c90a1dc1e1ebc21c439172ffcc67f985c521e130e83e9a623dd476d1b7f12969a4991958838a311244da293ccbc0000adf2fd4d6e9c4a2f28ab323f57ca4ab SHA512 3b896460877356b087344d86626ac088141e84fb2999240d76008e64389bc270ad2bea51f254e88158df5263814e3b3478a1dfa598c780c3a24c3b1f9270ce56
 AUX wmpop3-0.5.6a-list.patch 3057 BLAKE2B b9cd76c4e3b6f3643f2aacdb14e49a3d5ba8fdf51f94abeb7473e12923e72be32663870ac8b31475d95bf0dcd06ce8fb1cd007dc1d4fd3300fdf626a90d0eadf SHA512 f0d9a4efeb924dd7a0cae1169404c81529f1e7262684872845db9e3b5b415fe2b48061d778d9829526a1ee8ce66aba48018d9d8ab329f11652d692c322786c3c
 DIST WMPop3-0.5.6a.tar.gz 23532 BLAKE2B faef591c9280cb7e37a5071cd2226b84bfb7a49d8b4639085d5b6a44bac8bb3763ca51bd1923d47b8d971010f9b8a7d5d48c6f9a6c76fd3db5cbc00333edc63d SHA512 127dfd3d4dec8a58c991a9bc0d2d1d1c0e9c0ef36af9b2894283bbda129db9b3464c43aa053152f9c0d25eee31b94ffec329784ffa256ce04cb233b809791c2f
-EBUILD wmpop3-0.5.6a-r1.ebuild 733 BLAKE2B 765c170c60065d36b06174b59de7456c649deecf54941e899a6046773dd3a80a742cbadc82b4f1fe89184b73b0cc727bb57090368b874a8d854e1f02ef667035 SHA512 5f1a25c914eb7ba97ea6543d8bc85247dbd61d9f02f41a468e1a4281b453a956f2107fbe7590d0f8096671e69f11bb92df0da008f154fae9e25ee46a09a274dc
+EBUILD wmpop3-0.5.6a-r1.ebuild 773 BLAKE2B d9c0fecd5737600a78617cf5f3f908303c94d0305e11bceacba6d9025ea428987363d43ccf83541cc7795d410d2375e81cfec4f5148cf3258e992387b88a3da0 SHA512 e9cf18da0383d8fa2760fca82a640814339e368531f30b07d1eafc9ed572351cc1c2b179b11eda2ab114d58bafb26011fca7c4eb82d492b3f1a83e6bb86f59dd
 MISC metadata.xml 432 BLAKE2B d5bc39fc935e5a260493e984847f81c7e446be86759cd64475717b989414254e9b5852a409b68c18de0dd7f6636e118a213a475fa1a5d7d4e91d8dca38e3e1ea SHA512 b2c9e06a435ec6744f3a98e4b78b3a4e3184ea65fa68e25befac9ed4d8ffa806e2c9b2b8565f49035959a1513ce9053a5902ba3cf11aa251d966d399f8fb9e18
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/wmpop3-0.5.6a-r1.ebuild b/x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild
index 88f9dc571200..7a3f6094bc11 100644
--- a/x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild
+++ b/x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild
@@ -17,7 +17,9 @@ DEPEND="x11-wm/windowmaker
 	x11-libs/libXpm"
 RDEPEND="${DEPEND}"
 
-PATCHES=( ${FILESDIR}/${P}-list.patch )
+PATCHES=( "${FILESDIR}"/${P}-list.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	)
 
 src_prepare() {
 	sed -e "s|cc |$(tc-getCC) |" \
diff --git a/x11-plugins/wmrecord/Manifest b/x11-plugins/wmrecord/Manifest
index af15a5963295..7f447eaf05b4 100644
--- a/x11-plugins/wmrecord/Manifest
+++ b/x11-plugins/wmrecord/Manifest
@@ -1,4 +1,5 @@
+AUX wmrecord-1.0.5.3-fno-common.patch 989 BLAKE2B 754983b8593ee6f3b54054eead71cbabc479c64bee26493c0d5c0baef409c5c1c23d077fa593a85142243575469448e226b6a9717d0584ce83e49cc19c224928 SHA512 984ae9a7e9467f8625f5e79f1206d9066b251817b4be7b30279b7f2eed0fec32c1f048c6e62ce65eb752d0ceb56641b33c248abe5772869c88f75259d28ad7c2
 AUX wmrecord.desktop 201 BLAKE2B ac13a893dc87c2fe0c26f8ffb3b9f1a19cf1d80a1a0894d6a69f63aa703e80ae31346fe2e9e3e147675546b7656d5a797250b55eb02305e17f024e47e0b009c3 SHA512 47b075d64bdf027bef79e4737845aca32677676f5dcf81826064c16a2516bd6089c839fc3292a34b5005eac2bb5ed7ce66916c6646474819a384e36604df7c7b
 DIST wmrecord-1.0.5_20040218_0029.tgz 38594 BLAKE2B d1cc41a7de5c45a19ea364c9c007382c9220bdf0b4a6d69e09f2169cfc879e51d53afd33fd434f28ad6ea4e20b05760b06afbbf8a5560abc63b6edea9114bab7 SHA512 4a0c9f58d22a72a83f9e7922b5806528cc412576d55b9c24f45b7d93a5594f380f51581addbb41b65c18c9b5f0ac1cbc8e3881268a75386545f5024f55836154
-EBUILD wmrecord-1.0.5.3-r2.ebuild 1111 BLAKE2B d7e2bc8b5b992677a234dcf24daa270d308145d7d8fc671ec53d86fe155a33e5de07464ae72ba086d68489acd44436a0cc418da0242ae860578e7c7a98d2698a SHA512 6066a2d8bac7b577bd3dfdb62b29d54aa124d055c71abe9a648d7f70b76c50f3ad118f103e101a015856c6ea5c393efb805b7ea4087a0778a257330e47c0c9a2
+EBUILD wmrecord-1.0.5.3-r2.ebuild 1157 BLAKE2B fbeac2488844c7b57fdbf59e4721d6b1caae4642281aa5791a766fa5ab146198337a77fc19470587076c7ca0046bc81af7e51da744ffc30e7fa114a353e07135 SHA512 6d886822df5e71669d9c5285afda586c547d52cde759c87a122fabc501ab9977225a8d9a4026216b48251c2e5b10b37a4f7dc7d56daa5f689e34fd3f17e8ed4c
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
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/wmrecord-1.0.5.3-r2.ebuild b/x11-plugins/wmrecord/wmrecord-1.0.5.3-r2.ebuild
index 4be4f50aa084..565cf6323752 100644
--- a/x11-plugins/wmrecord/wmrecord-1.0.5.3-r2.ebuild
+++ b/x11-plugins/wmrecord/wmrecord-1.0.5.3-r2.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,6 +22,8 @@ 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