[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmsystray/, x11-plugins/wmsystray/files/

[Bernard Cafarelli]

commit:     ceb61b5e41f5917e79d8cfc940e619e107afdfd7
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jul 24 18:06:07 2018 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Thu Aug  2 20:21:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceb61b5e

x11-plugins/wmsystray: EAPI7, improve ebuild

 .../wmsystray/files/wmsystray-0.1.1-gcc-3.4.patch  |  4 +-
 x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild    | 46 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)

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 538a7ce0aa6..74f11a5ce73 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 00000000000..d48af6dcae9
--- /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
+}