gentoo resync : 04.08.2018

3 files changed, 50 insertions, 3 deletions

diff --git a/x11-plugins/wmsystray/Manifest b/x11-plugins/wmsystray/Manifest
index 4089a1754c9b..223444bbc816 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-gcc-3.4.patch 270 BLAKE2B 080549d7d8293c80b82b14be801f05d98e22de00fa3535e8768527c18607010918d6cbfa885e07c035601a6f8d3dafc65574b94e845a5b3dc8d1d63a5e75a761 SHA512 018db13c7eddd35080ddddc8ae146a5a129785561dc5a75ed4eac9bd7376b77a8a9c413a2e5cf4fb6d26ce454ed52b9afd206e812c3cf01dc46d88678bd60c92
+AUX wmsystray-0.1.1-gcc-3.4.patch 269 BLAKE2B c3b126db45c7d2dcf38dfce5db9965f9f5c7bf9636a5f9f194d4f0209a737cf11d115ac42430b5ae6f00ad9770256a95e8f03cf47f23127251927172f2e8783a SHA512 ee03a2986af6e1f3de6751a2d90738ffeec2fff0c1f7f0ddc686cc4baeeb010bf2fca764b886e9ee1af82ac2926d4571519ae2371c172053834f3d6bac7e2570
 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 1182 BLAKE2B f6f0e49caccf7e1d618299e86351b853560550ad909d81d5db60acdbb7d68885ecc8b74ec2bf32637236fb99535e3aaf131b1c2c9d2b0ae0582a65cec715a73a SHA512 cac40c5fb9240fc3a70a41285c37b812b13ef331c628a3930b87251485b16a6f524d48c542920c833bfb4fe5972f45835d4e5e5b81fea8150409f6c47b4e660b
 EBUILD wmsystray-0.1.1.ebuild 1204 BLAKE2B 8e9235f29442507f9f54ed5ec6e7680b9153d1a5a0a5d8d0dcbe0475faa62e831d8b2333d2e5141696bd17bfd1351210acaee59e6935f049c1a4ca44cf8788ce SHA512 dc8ba563e2c1da0e05f79541d701d89d3ad11d335eda486f00bd557aa141c27711ba92e7ee1cf5328733d6e7907e18bfb2fb42f959bfe1d9710825d9036ec522
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmsystray/files/wmsystray-0.1.1-gcc-3.4.patch b/x11-plugins/wmsystray/files/wmsystray-0.1.1-gcc-3.4.patch
index 538a7ce0aa6a..74f11a5ce73c 100644
--- a/x11-plugins/wmsystray/files/wmsystray-0.1.1-gcc-3.4.patch
+++ b/x11-plugins/wmsystray/files/wmsystray-0.1.1-gcc-3.4.patch
@@ -1,5 +1,5 @@
---- wmsystray/ui.c.orig	2004-08-25 11:14:51.265675224 +0000
-+++ wmsystray/ui.c	2004-08-25 11:09:56.676459592 +0000
+--- a/wmsystray/ui.c	2004-08-25 11:14:51.265675224 +0000
++++ b/wmsystray/ui.c	2004-08-25 11:09:56.676459592 +0000
 @@ -28,6 +28,7 @@
  int width, height, pos_x, pos_y;
  Pixmap bg_pixmap;
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..d48af6dcae9a
--- /dev/null
+++ b/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop
+
+DESCRIPTION="Window Maker dock app that provides a system tray for GNOME/KDE applications"
+HOMEPAGE="https://github.com/bbidulock/wmsystray"
+SRC_URI="https://github.com/bbidulock/wmsystray/releases/download/${PV}/${P}.tar.bz2"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+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" )
+
+DOCS=( README HACKING AUTHORS )
+
+src_prepare() {
+	default
+	# Fix parallel compilation
+	sed -ie "s/make EXTRACFLAGS/make \${MAKEOPTS} EXTRACFLAGS/" Makefile || die
+
+	# Honour Gentoo LDFLAGS, see bug #336296
+	sed -ie "s/-o wmsystray/${LDFLAGS} -o wmsystray/" wmsystray/Makefile || die
+}
+
+src_compile() {
+	emake EXTRACFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}/${PN}
+	doman doc/${PN}.1
+	domenu "${FILESDIR}/${PN}.desktop"
+	einstalldocs
+}