gentoo resync : 25.11.2020

4 files changed, 39 insertions, 16 deletions

diff --git a/x11-plugins/asmon/Manifest b/x11-plugins/asmon/Manifest
index 7926600dcf1f..c95785eab983 100644
--- a/x11-plugins/asmon/Manifest
+++ b/x11-plugins/asmon/Manifest
@@ -1,4 +1,5 @@
-AUX asmon-0.71-list.patch 2918 BLAKE2B 393e76edcefa54d814229cc2d8d21556d7437580c1a226d454470175de6ad1e9a688555aabdc60aaa328d578b4d04b300e64ae431efe9d7680400118d52116d5 SHA512 2a6da4a9b676ea51bbcc400b3255f3c10240db13fd6da46921f6c91d5529ecf50120e195b815e58a1b0a8bad81a944e8da3cba261a69579f36165f35ad23f144
+AUX asmon-0.71-fno-common.patch 451 BLAKE2B 81b60caf28ded54bb0311f3ca83e9f01acc3122c65338d7d8d4364413dc9be5bef0226037f8f0b74856a004552ddf70f74bd01dd34926d35cff481db27e54e09 SHA512 7f1851289a3400b147bcef27732091a0b1a365596bd524f9e8f229f447895a1d73ab51f6eaac9550a2cd49229edfce4152370ac668f4c1629f597282083afac9
+AUX asmon-0.71-list.patch 2632 BLAKE2B b7221d48285441cbab3fb13f4b406deb02dfadc3d3dd8dabdfab886cf26d89b397133fc7ff9b0c7baaa9fe4ede8deb3cb2752ba79f7de0d4bb23dcfd76b02010 SHA512 7ceabc659ff3059dc782f72039a25a78e988a5c9b31b67662f2da92084d46411d08507fecfcbca806e9eb96680b7c0654b9c41fca4f3236d8db4d367917da297
 DIST asmon-0.71.tar.bz2 42235 BLAKE2B 5e82638ae115ea088e4936615e8a67074cb8a1bde42607f37837edb1d774f24bb71d3db1d69780e4810eafcdaef681306fc07ce50e8eed1a96edf610cc081cbc SHA512 20d321b228e0157e9e2611eeac017fdf6a9e9eb8ba6e02c7c30adadb411529da408b7a543e18b30de0659ccf4f86bfde21bef392e2a4756803c58a9f28c31c45
-EBUILD asmon-0.71-r1.ebuild 744 BLAKE2B 739091e78a857114e4f5ce97b2c3bcf37828cb8ba6d7ff82b9aad951f50522250378f191cb891838c2fe0ff59bb31f1a7cc413b1581dd82ee172e22d3ce1ff49 SHA512 71d918d326d5da7d7eac357fe71c1ef15d6a97753006ab33094d3d3b99d995298d801e77d16cc437ede79dbef43d697536f0b7679a5e36db1e4026a60be7742e
+EBUILD asmon-0.71-r1.ebuild 782 BLAKE2B a9975298aabc0d07df1d89465795837e530eea8aa3ba4b8c1fdd6bed8e1ae3e98f64b07ce996f6e44c2f4343ba3011ec45668db82a19922bcef38ca4b3977bc6 SHA512 0640ce1569ffeb8b39059bd4d063265373176b6da2f5460e02a0100e37c2677ceb84e40d25f6ffb96fb76d6de61d5e1a216491a1c40f2a535e023190aaab9782
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/asmon/asmon-0.71-r1.ebuild b/x11-plugins/asmon/asmon-0.71-r1.ebuild
index 2c91504fc699..2d2ce19ee4ef 100644
--- a/x11-plugins/asmon/asmon-0.71-r1.ebuild
+++ b/x11-plugins/asmon/asmon-0.71-r1.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="WindowMaker/AfterStep system monitor dockapp"
 HOMEPAGE="http://rio.vg/asmon"
 SRC_URI="http://rio.vg/${PN}/${P}.tar.bz2"
+S="${WORKDIR}/${P}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc sparc x86"
-IUSE=""
 
 RDEPEND="x11-libs/libXext
 	x11-libs/libXpm
@@ -19,13 +20,14 @@ RDEPEND="x11-libs/libXext
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-S=${WORKDIR}/${P}/${PN}
-
 src_prepare() {
+	default
+
 	sed -i -e "s:gcc:$(tc-getCC):g" Makefile || die
 
-	cd "${WORKDIR}"/${P} || die
-	epatch "${FILESDIR}"/${P}-list.patch
+	cd "../wmgeneral" || die
+	eapply "${FILESDIR}/${P}-list.patch"
+	eapply "${FILESDIR}/${P}-fno-common.patch"
 }
 
 src_compile() {
diff --git a/x11-plugins/asmon/files/asmon-0.71-fno-common.patch b/x11-plugins/asmon/files/asmon-0.71-fno-common.patch
new file mode 100644
index 000000000000..831d6b258163
--- /dev/null
+++ b/x11-plugins/asmon/files/asmon-0.71-fno-common.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/708118
+--- a/wmgeneral.c
++++ b/wmgeneral.c
+@@ -50,6 +50,7 @@ Window		iconwin, win;
+ GC			NormalGC;
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
++Display		*display;
+ 
+   /*****************/
+  /* Mouse Regions */
+--- a/wmgeneral.h
++++ b/wmgeneral.h
+@@ -28,7 +28,7 @@ typedef struct {
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
diff --git a/x11-plugins/asmon/files/asmon-0.71-list.patch b/x11-plugins/asmon/files/asmon-0.71-list.patch
index 1b1ac317669e..89e9ef321673 100644
--- a/x11-plugins/asmon/files/asmon-0.71-list.patch
+++ b/x11-plugins/asmon/files/asmon-0.71-list.patch
@@ -1,6 +1,5 @@
-diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
---- wmgeneral.orig/list.c	2016-01-04 13:28:36.583339716 +0100
-+++ wmgeneral/list.c	2016-01-04 13:28:48.694343645 +0100
+--- a/list.c
++++ b/list.c
 @@ -38,7 +38,7 @@
  
  /* Return a cons cell produced from (head . tail)
@@ -82,9 +81,8 @@ diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
  list_mapcar(LinkedList* list, void(*function)(void*))
  {
    while(list)
-diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
---- wmgeneral.orig/list.h	2016-01-04 13:28:36.583339716 +0100
-+++ wmgeneral/list.h	2016-01-04 13:28:39.471340654 +0100
+--- a/list.h
++++ b/list.h
 @@ -29,31 +29,25 @@
  #ifndef __LIST_H_
  #define __LIST_H_