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

[Bernard Cafarelli]

commit:     08732702b792b2a51a0ccab1a2fed6d3ffe8c83d
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jun 23 18:10:04 2018 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 21:53:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08732702

x11-plugins/docker: EAPI7, improve ebuild

 x11-plugins/docker/docker-1.5-r2.ebuild            | 29 ++++++++++++++++++++++
 .../docker/files/docker-1.5-makefile_rename.patch  |  4 +--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/docker/docker-1.5-r2.ebuild b/x11-plugins/docker/docker-1.5-r2.ebuild
new file mode 100644
index 00000000000..8999156d944
--- /dev/null
+++ b/x11-plugins/docker/docker-1.5-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Openbox app which acts as a system tray for KDE and GNOME2"
+HOMEPAGE="https://icculus.org/openbox/2/docker/"
+SRC_URI="https://icculus.org/openbox/2/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.0.4
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-makefile_rename.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+pkg_postinst() {
+	einfo "To avoid collision with app-emulation/docker, binary was renamed to wmdocker"
+}

diff --git a/x11-plugins/docker/files/docker-1.5-makefile_rename.patch b/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
index 2e742661b11..cf20a9135aa 100644
--- a/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
+++ b/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2015-01-19 20:10:47.762522964 +0100
-+++ Makefile	2015-01-19 20:11:11.463545692 +0100
+--- a/Makefile	2015-01-19 20:10:47.762522964 +0100
++++ b/Makefile	2015-01-19 20:11:11.463545692 +0100
 @@ -5,12 +5,10 @@
  #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#