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

Package-Manager: portage-2.2.12-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

5 files changed, 60 insertions, 16 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/Manifest b/x11-plugins/wmfsm/Manifest
index 73fe5d424c4c..ac1ef8907a72 100644
--- a/x11-plugins/wmfsm/Manifest
+++ b/x11-plugins/wmfsm/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX wmfsm-0.34.linux-fs.patch 586 RMD160 f600888a23fc0411a2778c277e8424884c148940 SHA1 43229f0eb454b4ab1fe093cfecaafbc13ad3b7c3 SHA256 4558a54c7afeabb26c0238e37636189dd5a336fcaded360794803e871b7c52af
-DIST wmfsm-0.34.tar.gz 105220 RMD160 f615da10aebcca3f71572fd459bc61e0d4f0a86c SHA1 65a2b21819940512fc8fb7763610a593221d30c9 SHA256 8f2ac20fceb96cd2508aff2996e5c9896946345ec77b676190f46386b1ee571b
-EBUILD wmfsm-0.34-r1.ebuild 766 RMD160 8ad00d76a96c8ba2ca875123f41bf183c13835bf SHA1 77c4c9f156a22ca507d59995ac3dd736f2c448f1 SHA256 af57ae974655ddfe792c93eef5bb45e80613a7085128f96aeabe97b75173114d
-MISC ChangeLog 1780 RMD160 e0db7c4a470e3670290ed8d002fe2c0719e24b8b SHA1 4da06c34c3dab96b9255eb57b19355676096540c SHA256 f0a8d78dda52b87099b255658c4ccbfb427a286bc390d8900b17619e7c729fe0
-MISC metadata.xml 339 RMD160 4ec1139bd1517750df1525552e3efc37ca6b8af1 SHA1 9385b5158791987da7c764b87a00f966d956e76e SHA256 ace89d5a9a07149a721389c99a317c8e24017a3d99fc3af382c4fbe28e0cca40
+AUX wmfsm-0.34.linux-fs.patch 598 SHA256 e0df01b734ab70c376ee39787fe7332bb039d81c6bc604e796779a214c3f9f3c SHA512 4240970988a458e777e8d82d8843dea44ee04b026969f67159c6db572da098ead2e97de58c2c667669badc7ecf90a76b8a75cc88ddf0a24f0a6bf7a3d4553244 WHIRLPOOL aa08ae1d16b1d8f6d75930677099d26fd3f19ed00af3e3ccec7328b14ca733d0908a707daf18a2e66d2175f4dcb8d266970e9abd824d2dcff1590fc997a30922
+DIST wmfsm-0.34.tar.gz 105220 SHA256 8f2ac20fceb96cd2508aff2996e5c9896946345ec77b676190f46386b1ee571b SHA512 bf215d199e616c3f3d35d2556f208d76c9d5587e267d0dea3cdc48bc6b73c9216a35f5c683aa9cbfb425c01ff23e85c2a2f435fd87c82c8b26baa63dd7b03f08 WHIRLPOOL 5729efa3ed6896b40121f4f0911799861413f3e4483eec7c550609d9114b2aa3d2f9292d0a40d0cf35ce64034baf327573784854994fbdda3463c83f1624d696
+EBUILD wmfsm-0.34-r1.ebuild 786 SHA256 066486d3a2905fb3d72a68ae1f58c1a9eac763d41378ad65ed7decd5bd118d44 SHA512 09f7334bb3559c7337df4b677b57ae1c848034040a90852a6e5d4e2fc26feca39d8c7de5417094e13659faf3112626d2648440124f6bb567aa0150784018a9c0 WHIRLPOOL 6a02b2c040ec7169db3eb0c5cd6e3a4882007813e33acb25aaf6f7514fc63d468e4f7c91a5708f5b509eef54e0d10b7a44a592662a3b9f7a262ac75150cdf7fc
+EBUILD wmfsm-0.34-r2.ebuild 838 SHA256 c9fbf1a5a835a919cd6336d7b4913b084abc54819aeb53772bbd786af5d06646 SHA512 894348adfb4cdf45d26d8f60cfe813d4f419fdf12a7e234df7c096156644e7dc7effe4fc3187b62a9c2e376dd075142eb21a237ee2d8209023ce3b45a4400b52 WHIRLPOOL 009fa4893121ecb7a76034ca0f9d22c59d8161f966548771e84e8b8af76a3fab9b2cd5549a4deb8052faaa7403de358cea4a9ea78727adda1256b2f83eddce50
+MISC ChangeLog 2043 SHA256 1795a89208ec0efd965d942f876ded369a26d618cad65c2ce555fbe372cec195 SHA512 60b25a23ac06d8ba64f01d098d53c8ba745280a392aad7baba9b1ba20572b27591308bfadef0cfd5ff99970d174da7288073d48bc8d9c68bd5e569c646de5c57 WHIRLPOOL 042d57e94a7d0d4e31c03d31437b04e860ea3ece02625fae3b7e869ba75332d46eb1a63a2be2c52a376b4e80e5ae386670f90629f9a712b77933bdb2edd2ff5f
+MISC metadata.xml 339 SHA256 ace89d5a9a07149a721389c99a317c8e24017a3d99fc3af382c4fbe28e0cca40 SHA512 51ad4618f7e2ffeb3acfdf4fd8d64c19b4990205520ec796487b35f39f4f016a1d2b61b432b7099b7d3f38fcfc6a51c0e001cfe7cadf71cf920db1e590f508df WHIRLPOOL e722a5a9a1bf4fe3ef5a7e040e3c2d9580a0cc644dfff679b8fdc6c50beaf1a84315267495e3ea42690d7b4a1de04bb15c865cac6d7a8b6f82f2ff347b5c29ef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAk87f24ACgkQFYEBGcdFJfJKGwD/Yh2N5tHJukaQY5NYKGwJazBS
-66HPYcmonTu/QaSeTMgBAJn4H4Egn1zb66wy8U5RgwKU1fSyiGO/u9Ch2zokcYQt
-=TzzT
+iF4EAREIAAYFAlQE4q4ACgkQFYEBGcdFJfKObwD+KFRsiWuCjBBk52hkOdXp4jUn
+3c07Ah3AUTStCpawJJMA/RDtd3P7pfqM7K806K8wdgr2a3h+2eOfXBiOiCaQXG44
+=JpuV
 -----END PGP SIGNATURE-----
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
+}