gentoo resync : 14.12.2020

4 files changed, 42 insertions, 21 deletions

diff --git a/x11-plugins/wmsystray/Manifest b/x11-plugins/wmsystray/Manifest
index e06c33649c8d..579b04f1de51 100644
--- a/x11-plugins/wmsystray/Manifest
+++ b/x11-plugins/wmsystray/Manifest
@@ -1,6 +1,7 @@
-AUX wmsystray-0.1.1-Makefile.patch 1551 BLAKE2B b58ebdc03508d47d1eb6c58913493bbf86912bfff9f32268abc41f7e7dbe9c86c85299da9e0a2c9fd2932b8155718ca6df52981d7035ea23a3bb8b5938ba3111 SHA512 0ebe1530db6770556def85a99075e9bea40fc9cffa1d0a43838651d0158c50960222ee830f8c8089f271537fec5869c6975fe17283443c9f9edbdf9da1a1c1b1
+AUX wmsystray-0.1.1-Makefile.patch 1780 BLAKE2B aba3c3844f906d3f4afcc41c6fad4c424b11325bbf02e1a0b81886f63946caa0c607cd1d4b8158b5544e782d4a35cfb5d80d78e8a0c0fa466d1bc56ebfa7c11d SHA512 9cc1201dda867b7a45512b83231d63f90c4632bcb762895dd87f1febb1f7fbb85755c7053050dc959ed32b5352025aa9bd75d905d139ae947a43cedccb10740b
 AUX wmsystray-0.1.1-gcc-3.4.patch 269 BLAKE2B c3b126db45c7d2dcf38dfce5db9965f9f5c7bf9636a5f9f194d4f0209a737cf11d115ac42430b5ae6f00ad9770256a95e8f03cf47f23127251927172f2e8783a SHA512 ee03a2986af6e1f3de6751a2d90738ffeec2fff0c1f7f0ddc686cc4baeeb010bf2fca764b886e9ee1af82ac2926d4571519ae2371c172053834f3d6bac7e2570
+AUX wmsystray-0.1.1-return-type.patch 476 BLAKE2B 6bee7cbfd4f78db1034fad7e7d635b3e9b7ece29909454ff6dfc82dc40da0636a2154586a52ed0e53965895d9e5019301fb0fb9247f8f0df31f1879ed71b66fc SHA512 93a19b7e462989e7333ab6e27f600c608d784a16eab8e1ea57155b0bcae95938534c0bc8df9026e3f38ba4cd362ea7509f49c396aecfb70d0de0f0d9dc87cdd7
 AUX wmsystray.desktop 185 BLAKE2B 5d4f524ddcc939ef335a043fad6c136e03f2a2cc7fdcc9a4703e210ad301d5e101f8c03caa6c5a069ca805ca44abdf6e56a18fcb8e98596f80f469482b8927e5 SHA512 f7a2c0391257d76c9024f2804de067b07f3669fbba6fd0af6471297f4c0fb876ecfdd7cd6b931187d657d6558ff27d01766c299048f7c16c4d4eed5c4586213b
 DIST wmsystray-0.1.1.tar.bz2 18261 BLAKE2B d232dcfd3077760d7990ec8e22249aafa9dacf415e71b6a662a1a32464e233cd5460f9b99d6e1c478ce69c6ad0e9973febfce2292992d5619792d4bf4dcc1d7c SHA512 a28d8cb6a3e74909a1467459f81a853dae2d74c28db166be15f398f00bc8066fbb1caa0e982fb3874279a7edd376ab892499e8981d2c2126eed591ef52f8d604
-EBUILD wmsystray-0.1.1-r1.ebuild 1176 BLAKE2B ef119e6cff86bc2a4a07d86ac099ec6452ea8b1fb8e5d52f67e35090d604a05a02b3239182ad96d27e8d186c2232a9ca0e25ff2e4b3654c3814c242e161fc39d SHA512 85cf15c7ce31786d0d8551ecbb408d0d380d6e339a9d2600b84def259945ad218e12579b5f4b2054073c9db8853dda7141e433787667c9f7a7f4158c69195d81
+EBUILD wmsystray-0.1.1-r1.ebuild 1075 BLAKE2B 2ca01fe2ac8b9f934545fa359710f93e0156d7b76d7647c42d48e78c86fd0694bd82117a5e744ea9622fc6a444806f6f40890eb31990c0329e43f3df7e34dc9e SHA512 97e96278b6939fa590d2b71ee67e5a21a9e5c0f0decf137b1ed83c0d620bcaa7c8ba7687a3a8afa337766b3e1420b3c8cf3bbe4bdf36525cf2752b39d9e7a7d2
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch b/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch
index 19afa355b229..ab754703962b 100644
--- a/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch
+++ b/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch
@@ -1,6 +1,6 @@
-diff -ur wmsystray-0.1.1/Makefile wmsystray-0.1.1.new/Makefile
---- wmsystray-0.1.1/Makefile	2004-03-01 05:35:47.000000000 +0100
-+++ wmsystray-0.1.1.new/Makefile	2007-06-30 18:09:59.000000000 +0200
+diff -Naur wmsystray-0.1.1.orig/Makefile wmsystray-0.1.1/Makefile
+--- wmsystray-0.1.1.orig/Makefile	2004-03-01 05:35:47.000000000 +0100
++++ wmsystray-0.1.1/Makefile	2020-12-03 11:22:13.786357942 +0100
 @@ -1,13 +1,14 @@
  prefix=/usr
  bindir = ${prefix}/bin
@@ -19,21 +19,29 @@ diff -ur wmsystray-0.1.1/Makefile wmsystray-0.1.1.new/Makefile
  
  clean:
  	make -C xembed clean
-diff -ur wmsystray-0.1.1/wmsystray/Makefile wmsystray-0.1.1.new/wmsystray/Makefile
---- wmsystray-0.1.1/wmsystray/Makefile	2004-03-01 04:54:44.000000000 +0100
-+++ wmsystray-0.1.1.new/wmsystray/Makefile	2007-06-30 18:09:59.000000000 +0200
-@@ -1,7 +1,7 @@
+diff -Naur wmsystray-0.1.1.orig/wmsystray/Makefile wmsystray-0.1.1/wmsystray/Makefile
+--- wmsystray-0.1.1.orig/wmsystray/Makefile	2004-03-01 04:54:44.000000000 +0100
++++ wmsystray-0.1.1/wmsystray/Makefile	2020-12-03 11:26:57.544595661 +0100
+@@ -1,14 +1,13 @@
  include ../Rules.make
  
- CC = gcc
+-CC = gcc
 -CFLAGS = ${X11CFLAGS} -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -Wall -g
 +CFLAGS = ${X11CFLAGS} -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -g ${EXTRACFLAGS}
  LDFLAGS = ${X11LDFLAGS} -lXpm
  
  OBJS = main.o ui.o systray.o xpms.o
-diff -ur wmsystray-0.1.1/xembed/Makefile wmsystray-0.1.1.new/xembed/Makefile
---- wmsystray-0.1.1/xembed/Makefile	2004-03-01 04:54:44.000000000 +0100
-+++ wmsystray-0.1.1.new/xembed/Makefile	2007-06-30 18:09:59.000000000 +0200
+ XEMBED_OBJS = ../xembed/xembed.o
+ 
+ wmsystray: ${OBJS} ${XEMBED_OBJS}
+-	gcc ${OBJS} ${XEMBED_OBJS} -o wmsystray ${LDFLAGS}
++	${CC} ${OBJS} ${XEMBED_OBJS} -o wmsystray ${LDFLAGS}
+ 
+ clean:
+ 	rm -f wmsystray ${OBJS}
+diff -Naur wmsystray-0.1.1.orig/xembed/Makefile wmsystray-0.1.1/xembed/Makefile
+--- wmsystray-0.1.1.orig/xembed/Makefile	2004-03-01 04:54:44.000000000 +0100
++++ wmsystray-0.1.1/xembed/Makefile	2020-12-03 11:22:13.786357942 +0100
 @@ -1,6 +1,6 @@
  include ../Rules.make
  
diff --git a/x11-plugins/wmsystray/files/wmsystray-0.1.1-return-type.patch b/x11-plugins/wmsystray/files/wmsystray-0.1.1-return-type.patch
new file mode 100644
index 000000000000..aa2c6539b81b
--- /dev/null
+++ b/x11-plugins/wmsystray/files/wmsystray-0.1.1-return-type.patch
@@ -0,0 +1,12 @@
+diff -Naur wmsystray-0.1.1.orig/wmsystray/systray.c wmsystray-0.1.1/wmsystray/systray.c
+--- wmsystray-0.1.1.orig/wmsystray/systray.c	2004-03-01 04:54:50.000000000 +0100
++++ wmsystray-0.1.1/wmsystray/systray.c	2020-12-03 11:30:36.661776579 +0100
+@@ -338,7 +338,7 @@
+ 		XReparentWindow (main_disp, embed_wind,
+ 				DefaultRootWindow(main_disp), 0, 0);
+ 		TRACE((stderr, "REJECTED!\n"));
+-		return;
++		return 1;
+ 	}
+ 
+ 	XSelectInput (main_disp, embed_wind, StructureNotifyMask |
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
index 4756f31445fd..926644e2d5b7 100644
--- a/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
+++ b/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Window Maker dock app that provides a system tray for GNOME/KDE applications"
 HOMEPAGE="https://github.com/bbidulock/wmsystray"
@@ -17,11 +17,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ~sparc x86"
 
-# Let's honour Gentoo CFLAGS and use correct install program
-# Fix for #61704, cannot compile with gcc 3.4.1:
-# it's a trivial change and does not affect other compilers...
-PATCHES=( "${FILESDIR}/${P}-Makefile.patch"
-	"${FILESDIR}/${P}-gcc-3.4.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-Makefile.patch"
+	"${FILESDIR}/${P}-gcc-3.4.patch"
+	"${FILESDIR}/${P}-return-type.patch"
+)
 
 DOCS=( README HACKING AUTHORS )
 
@@ -35,7 +35,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake EXTRACFLAGS="${CFLAGS}"
+	emake CC="$(tc-getCC)" EXTRACFLAGS="${CFLAGS}"
 }
 
 src_install() {