EAPI bump, ebuild cleanup, fix compilation. Replace einstall with emake install, bug #521680

(Portage version: 2.2.12-r1/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

4 files changed, 50 insertions, 7 deletions

diff --git a/x11-plugins/wmfsm/ChangeLog b/x11-plugins/wmfsm/ChangeLog
index 7590ac072dac..f91d1a9c8ee3 100644
--- a/x11-plugins/wmfsm/ChangeLog
+++ b/x11-plugins/wmfsm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/wmfsm
-# Copyright 2002-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/ChangeLog,v 1.14 2012/02/15 09:48:17 voyageur Exp $
+# Copyright 2002-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/ChangeLog,v 1.15 2014/09/01 21:18:24 voyageur Exp $
+
+*wmfsm-0.34-r2 (01 Sep 2014)
+
+  01 Sep 2014; Bernard Cafarelli <voyageur@gentoo.org> wmfsm-0.34-r1.ebuild,
+  +wmfsm-0.34-r2.ebuild, files/wmfsm-0.34.linux-fs.patch:
+  EAPI bump, ebuild cleanup, fix compilation. Replace einstall with emake
+  install, bug #521680
 
   15 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org> wmfsm-0.34-r1.ebuild:
   Update HOMEPAGE and SRC_URI, thanks Lorenz in bug #394607
diff --git a/x11-plugins/wmfsm/files/wmfsm-0.34.linux-fs.patch b/x11-plugins/wmfsm/files/wmfsm-0.34.linux-fs.patch
index 293090acd39e..51ea67314775 100644
--- a/x11-plugins/wmfsm/files/wmfsm-0.34.linux-fs.patch
+++ b/x11-plugins/wmfsm/files/wmfsm-0.34.linux-fs.patch
@@ -1,5 +1,5 @@
---- wmfsm.c	2002-07-13 06:06:35.000000000 +0200
-+++ wmfsm.c	2004-07-17 12:31:19.686338920 +0200
+--- wmfsm/wmfsm.c	2002-07-13 06:06:35.000000000 +0200
++++ wmfsm/wmfsm.c	2004-07-17 12:31:19.686338920 +0200
 @@ -509,7 +509,7 @@
  #if defined IRIX64 || defined(SunOS)
  			   strcmp(fstype, "hwgfs") && strcmp(fstype, "autofs") && strcmp(fstype, "proc") && strcmp(fstype, "fd") && !strstr(options, "ignore")
diff --git a/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild b/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild
index 57b94e06498a..036bc664f78b 100644
--- a/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild
+++ b/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild,v 1.10 2012/02/15 09:48:17 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild,v 1.11 2014/09/01 21:18:24 voyageur Exp $
 
 inherit eutils
 
@@ -28,6 +28,6 @@ src_unpack() {
 }
 
 src_install() {
-	einstall || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog
 }
diff --git a/x11-plugins/wmfsm/wmfsm-0.34-r2.ebuild b/x11-plugins/wmfsm/wmfsm-0.34-r2.ebuild
new file mode 100644
index 000000000000..d734b9aaa6ea
--- /dev/null
+++ b/x11-plugins/wmfsm/wmfsm-0.34-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/wmfsm-0.34-r2.ebuild,v 1.1 2014/09/01 21:18:24 voyageur Exp $
+
+EAPI=5
+
+inherit autotools eutils
+
+IUSE=""
+DESCRIPTION="dockapp for monitoring filesystem usage"
+HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/100"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}.linux-fs.patch
+	sed -e "/^X11LIBS/s/-I$x_includes //" -i configure.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog
+}