Replace einstall with emake install, bug #521688. Remove old version

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

6 files changed, 21 insertions, 169 deletions

diff --git a/x11-plugins/wmnetload/ChangeLog b/x11-plugins/wmnetload/ChangeLog
index 727d7e5a6328..3732a60c1b1e 100644
--- a/x11-plugins/wmnetload/ChangeLog
+++ b/x11-plugins/wmnetload/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmnetload
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/ChangeLog,v 1.36 2012/03/18 19:56:30 armin76 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/ChangeLog,v 1.37 2014/09/01 15:21:48 voyageur Exp $
+
+  01 Sep 2014; Bernard Cafarelli <voyageur@gentoo.org>
+  -wmnetload-1.3-r2.ebuild, wmnetload-1.3-r3.ebuild,
+  -files/add_support_for_libdockapp_0.5.patch,
+  -files/wmnetload-1.3-norpath.patch:
+  Replace einstall with emake install, bug #521688. Remove old version
 
   18 Mar 2012; Raúl Porcel <armin76@gentoo.org> wmnetload-1.3-r2.ebuild,
   wmnetload-1.3-r3.ebuild:
diff --git a/x11-plugins/wmnetload/Manifest b/x11-plugins/wmnetload/Manifest
index de431f796798..183c61e142a6 100644
--- a/x11-plugins/wmnetload/Manifest
+++ b/x11-plugins/wmnetload/Manifest
@@ -1,18 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX add_support_for_libdockapp_0.5.patch 2028 RMD160 d9c0cf90b129b26c69abdc855434ea11d22288d2 SHA1 448d5c08a6ad73727777f65a2808397beb1bb1b0 SHA256 070348b7191365efb9a9a101b234e4f33335e3d37a7046df3ef672440113b0ea
-AUX wmnetload-1.3-norpath.patch 1927 RMD160 fead8f8c6eb020464206390515313c8de5cdb818 SHA1 4179c83aaee691c4871553d56c1751373ab5dbfe SHA256 f303fe45566d65834f8ed3c2c71d5742a541a9f75bf31937bbf42e6e13a2a41c
-AUX wmnetload-1.3-r3-norpath.patch 1748 RMD160 116261efeef7fb1a3a757db639d5712e9e1abfcd SHA1 fa92be18cfc15e13ca4f2958f78402f35730417c SHA256 0783bd7b3801e94f4dc943d15d8dbae553d9362ea32ac28a6eec5c7b099c899f
-DIST wmnetload-1.3.tar.gz 105588 RMD160 5e18ded5284c5f4f85b567cc13cd56095f0533f2 SHA1 295687eb8e3e05c0797301e53e582313ee48a8e9 SHA256 c2dcfb5075dd56fbdba9e92abc7854bd01c2652fc914490f9f7df07625275e64
-EBUILD wmnetload-1.3-r2.ebuild 754 RMD160 b41fa2dd44d148b91611a4e464b7637071679211 SHA1 36d11eab4120bbddee5de4e4807e10fb75b7d96d SHA256 6aabc8bc3fce48cfeef687b3682ab0cf9cb47159a1acf4508420ee823ac2774f
-EBUILD wmnetload-1.3-r3.ebuild 692 RMD160 9103bdf08f71a4791c2768c18c5174b91180f13f SHA1 f984ef7474f3c4c62ea68c965d08d37addf1e5b4 SHA256 67caf7825d2a2ac879641ec0177b1ff92b55a83d15306cec8e56a6cd853bbdcb
-MISC ChangeLog 5005 RMD160 9a9c89d0b8c913b2017dd90f533e44f330338766 SHA1 6a357732ec7f2ccdc5a8f23b4c1b381357c81d37 SHA256 ef3155a72cb30f2ba593f44894ec9cddf5ee5db4fa0aff91d9a11f0209d40ef1
-MISC metadata.xml 600 RMD160 f25b9c60547fc27c87bc124bddeebced91413d84 SHA1 8126f180b31441cf0791ca2f837d13ca64f1a13f SHA256 0e8ff6400d10dbb8557bdc75fd8a991af3da41234b7a81800b5c65761ad1b601
+AUX wmnetload-1.3-r3-norpath.patch 1748 SHA256 0783bd7b3801e94f4dc943d15d8dbae553d9362ea32ac28a6eec5c7b099c899f SHA512 721e37cd4aa0035b1cb063948736bc32f0cbd889f02c8c65a23ed014462b6e974de2fcae213cbe51b75dad270fa34dca9a909d50291476e7e9abe4cf93c02e34 WHIRLPOOL a87e852d9c76160d2406b36ed788b2a8eb4e2bd428112f84d467448c390d206da2032f41da060486ed58980b43259ca4d8007957e831edeec6d13a11b9f4b851
+DIST wmnetload-1.3.tar.gz 105588 SHA256 c2dcfb5075dd56fbdba9e92abc7854bd01c2652fc914490f9f7df07625275e64 SHA512 67f28100fefea54a21f82be3acde9a457779b2dd1eb1c2f0c074c0a956a8f7b43a6c7ed39b97f8bdd1f51adfc1c21d197c1a7dfd84d8aeb562e46d58fd06b3f7 WHIRLPOOL 185a55e2fae71791a22da969ec25baebde7e4981d05ab2091e168e4977980c4ee98a8161da3035b5c66c09d1aad057e89e4a37269fe5f601d8cad675f7dbf309
+EBUILD wmnetload-1.3-r3.ebuild 713 SHA256 496ceffda9f0592340a670d8f07c24c7c8c3769e6f9a58a7404e2892c4bdf407 SHA512 5975260285c4298092ae1ccf97f1622280defb59e911b316f1c6affca78a778c105828e05006cc178949219d73c047532d906d109c398b7e809d49b253bbb4ca WHIRLPOOL adb35f2cd8d9cb38af93b724f02a6d27eea0ea924103a9fcea3fb862b222b33e5347f5f51a565b2edf8551800b57eb52c4a34c9170cb6a72ff87e6ef1901a51d
+MISC ChangeLog 5271 SHA256 6bd8d4ada8d5e02bbb6ec552623f4e16c625d063f164c498ed85964062f17516 SHA512 247415a6140a1c80eb095d0ffa706388dd2d74455cc90bde7c5fd99262cb7ee817a110a4270e2621003d5d1ac5d759a637935a65aa6fff5029c19b99268b4c74 WHIRLPOOL 95b4324f8c3993d6b2a3dce0760030f9f3bbc812e797bede1ae365ac89ae7ed6c8c1a2c892c8a211a03e20f3c4192fea30dc3a6dff7fd7f256502017b3b937d5
+MISC metadata.xml 600 SHA256 0e8ff6400d10dbb8557bdc75fd8a991af3da41234b7a81800b5c65761ad1b601 SHA512 7befa3dda8613068f98580ecc8d0d91d06b90ecfa985644149cba3de3a7224cb9217824b764faaea7207a2e62015c6dcc4c0316a4e558628a333f84dded437d2 WHIRLPOOL c36bebcef5ff26b7e926f0c5afbc0644ac6293e47412fe9c9a20aaa097893acd8ce0bcea2c88210a9cb238db864a3685995b725ec9aa82439967b8f2ecb707de
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEARECAAYFAk9mPfQACgkQuQc30/atMkC02gCgkpzGp8Al7GCshafl0bMHP7ib
-hcsAmgKQ/T16J3T1meceorEpG77DdP3f
-=zks6
+iF4EAREIAAYFAlQEjyQACgkQFYEBGcdFJfLP2wEAkV68lmuNGWTpl0kHQYWAFXho
+aC7atmrSkEfIK7ysuBcA/jZIBbsP783spML/e7sTibi9nfvTXgviO3W0mYH3uIKM
+=Z8//
 -----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmnetload/files/add_support_for_libdockapp_0.5.patch b/x11-plugins/wmnetload/files/add_support_for_libdockapp_0.5.patch
deleted file mode 100644
index ba43f5f811ba..000000000000
--- a/x11-plugins/wmnetload/files/add_support_for_libdockapp_0.5.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- configure	2004-06-10 20:59:32.970436153 -0500
-+++ configure	2004-06-10 20:38:51.655962203 -0500
-@@ -4627,9 +4627,9 @@
- 
- LDFLAGS_old="$LDFLAGS"
- LDFLAGS="$LDFLAGS $LIBRARY_SEARCH_PATH"
--echo "$as_me:$LINENO: checking for DAInitialize in -ldockapp" >&5
--echo $ECHO_N "checking for DAInitialize in -ldockapp... $ECHO_C" >&6
--if test "${ac_cv_lib_dockapp_DAInitialize+set}" = set; then
-+echo "$as_me:$LINENO: checking for DAOpenDisplay in -ldockapp" >&5
-+echo $ECHO_N "checking for DAOpenDisplay in -ldockapp... $ECHO_C" >&6
-+if test "${ac_cv_lib_dockapp_DAOpenDisplay+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -4648,11 +4648,11 @@
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char DAInitialize ();
-+char DAOpenDisplay ();
- int
- main ()
- {
--DAInitialize ();
-+DAOpenDisplay ();
-   ;
-   return 0;
- }
-@@ -4669,19 +4669,19 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_dockapp_DAInitialize=yes
-+  ac_cv_lib_dockapp_DAOpenDisplay=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_dockapp_DAInitialize=no
-+ac_cv_lib_dockapp_DAOpenDisplay=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dockapp_DAInitialize" >&5
--echo "${ECHO_T}$ac_cv_lib_dockapp_DAInitialize" >&6
--if test $ac_cv_lib_dockapp_DAInitialize = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dockapp_DAOpenDisplay" >&5
-+echo "${ECHO_T}$ac_cv_lib_dockapp_DAOpenDisplay" >&6
-+if test $ac_cv_lib_dockapp_DAOpenDisplay = yes; then
-   yes=yes
- else
-   no=no
-@@ -4689,7 +4689,7 @@
- 
- LDFLAGS="$LDFLAGS_old"
- 
--if test "x$ac_cv_lib_dockapp_DAInitialize" = xyes; then
-+if test "x$ac_cv_lib_dockapp_DAOpenDisplay" = xyes; then
- 
- CPPFLAGS_old="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $HEADER_SEARCH_PATH $XCFLAGS"
diff --git a/x11-plugins/wmnetload/files/wmnetload-1.3-norpath.patch b/x11-plugins/wmnetload/files/wmnetload-1.3-norpath.patch
deleted file mode 100644
index a75b5b2bd9da..000000000000
--- a/x11-plugins/wmnetload/files/wmnetload-1.3-norpath.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ru wmnetload-1.3.orig/Makefile.in wmnetload-1.3/Makefile.in
---- wmnetload-1.3.orig/Makefile.in	2003-02-23 20:08:31.000000000 +1100
-+++ wmnetload-1.3/Makefile.in	2005-10-02 22:12:01.000000000 +1000
-@@ -89,7 +89,7 @@
- MAKEINFO = @MAKEINFO@
- OS = @OS@
- PACKAGE = @PACKAGE@
--RPATH = @RPATH@
-+
- VERSION = @VERSION@
- WN_LOOK = @WN_LOOK@
- XCFLAGS = @XCFLAGS@
-diff -ru wmnetload-1.3.orig/configure wmnetload-1.3/configure
---- wmnetload-1.3.orig/configure	2003-02-23 20:08:00.000000000 +1100
-+++ wmnetload-1.3/configure	2005-10-02 22:12:01.000000000 +1000
-@@ -6017,7 +6017,7 @@
- s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
- s,@X_LIBS@,$X_LIBS,;t t
- s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
--s,@RPATH@,$RPATH,;t t
-+
- s,@X_LIBRARY_PATH@,$X_LIBRARY_PATH,;t t
- s,@XCFLAGS@,$XCFLAGS,;t t
- s,@XLFLAGS@,$XLFLAGS,;t t
-diff -ru wmnetload-1.3.orig/src/Makefile.am wmnetload-1.3/src/Makefile.am
---- wmnetload-1.3.orig/src/Makefile.am	2003-02-18 17:30:48.000000000 +1100
-+++ wmnetload-1.3/src/Makefile.am	2005-10-02 22:12:01.000000000 +1000
-@@ -25,7 +25,7 @@
- EXTRA_wmnetload_SOURCES	= ifstat_linux.c ifstat_netbsd.c ifstat_solaris.c \
- 			  ifstat_freebsd.c
- 
--LDFLAGS			= @RPATH@
-+
- 
- LDADD	 = @LIBRARY_SEARCH_PATH@ @XLFLAGS@ @XLIBS@ -ldockapp -lXpm -lm
- CPPFLAGS = @CPPFLAGS@ @XCFLAGS@ -DVERSION=\"@VERSION@\" 
-diff -ru wmnetload-1.3.orig/src/Makefile.in wmnetload-1.3/src/Makefile.in
---- wmnetload-1.3.orig/src/Makefile.in	2003-02-23 20:08:35.000000000 +1100
-+++ wmnetload-1.3/src/Makefile.in	2005-10-02 22:12:01.000000000 +1000
-@@ -89,7 +89,7 @@
- MAKEINFO = @MAKEINFO@
- OS = @OS@
- PACKAGE = @PACKAGE@
--RPATH = @RPATH@
-+
- VERSION = @VERSION@
- WN_LOOK = @WN_LOOK@
- XCFLAGS = @XCFLAGS@
-@@ -102,7 +102,7 @@
- EXTRA_wmnetload_SOURCES = ifstat_linux.c ifstat_netbsd.c ifstat_solaris.c 			  ifstat_freebsd.c
- 
- 
--LDFLAGS = @RPATH@
-+
- 
- LDADD = @LIBRARY_SEARCH_PATH@ @XLFLAGS@ @XLIBS@ -ldockapp -lXpm -lm
- CPPFLAGS = @CPPFLAGS@ @XCFLAGS@ -DVERSION=\"@VERSION@\" 
diff --git a/x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild b/x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild
deleted file mode 100644
index aa146521aeda..000000000000
--- a/x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild,v 1.6 2012/03/18 19:56:30 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="Network interface monitor dockapp"
-HOMEPAGE="http://freshmeat.net/projects/wmnetload/"
-SRC_URI="ftp://truffula.com/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="x11-libs/libdockapp"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Add support for libdockapp 0.5
-	epatch "${FILESDIR}"/add_support_for_libdockapp_0.5.patch
-
-	epatch "${FILESDIR}"/wmnetload-1.3-norpath.patch
-}
-
-src_install() {
-	einstall || die "einstall failed."
-	dodoc AUTHORS README NEWS
-}
diff --git a/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild b/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild
index fd12bc004f12..f130c6afd1d3 100644
--- a/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild
+++ b/x11-plugins/wmnetload/wmnetload-1.3-r3.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/wmnetload/wmnetload-1.3-r3.ebuild,v 1.8 2012/03/18 19:56:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild,v 1.9 2014/09/01 15:21:48 voyageur Exp $
 
 inherit autotools eutils
 
@@ -25,6 +25,6 @@ src_unpack() {
 }
 
 src_install() {
-	einstall || die "einstall failed."
+	emake DESTDIR="${D}" install || die "einstall failed."
 	dodoc AUTHORS README NEWS
 }