Revision bump, with updated norpath patch to fix bug #226853.

Also, now libdockapp 0.5 support patch is obsolete and not applied any longer.
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.24-tuxonice-r9 i686

4 files changed, 105 insertions, 2 deletions

diff --git a/x11-plugins/wmnetload/ChangeLog b/x11-plugins/wmnetload/ChangeLog
index 3673c6db1e04..b3115c0b7ceb 100644
--- a/x11-plugins/wmnetload/ChangeLog
+++ b/x11-plugins/wmnetload/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmnetload
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/ChangeLog,v 1.28 2007/02/06 02:03:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/ChangeLog,v 1.29 2009/01/22 14:21:24 s4t4n Exp $
+
+*wmnetload-1.3-r3 (22 Jan 2009)
+
+  22 Jan 2009; Michele Noberasco <s4t4n@gentoo.org> wmnetload-1.3-r3.ebuild:
+  Revision bump, with updated norpath patch to fix bug #226853.
+  Also, now libdockapp 0.5 support patch is obsolete and not applied any longer.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmnetload/Manifest b/x11-plugins/wmnetload/Manifest
index 0f9fdbe81437..5452c300dcb0 100644
--- a/x11-plugins/wmnetload/Manifest
+++ b/x11-plugins/wmnetload/Manifest
@@ -1,6 +1,8 @@
 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 757 RMD160 50971261683dcee689c4f553b0af1101737d0699 SHA1 1159b290c1315fcf04eb75025976d4573e54cfe4 SHA256 dd103c00c9d18414cf0c4e1c462bfcec971e511b1d681f063ad8018c1e33c645
-MISC ChangeLog 3831 RMD160 129df3e58d668702eaf53bf5c353c9665fd4e835 SHA1 b258ddbff48bfd64e6968ca4f88fd640390df0fb SHA256 036a72ee34cb4026c77c8917c8dec1ab98ce1413940811af2071d96c5beb0370
+EBUILD wmnetload-1.3-r3.ebuild 794 RMD160 f98a183cc093ff302a3e5e3d8ce1cea592a68eb8 SHA1 c059878b5167a0ef147cbe7eeb25712729ab6b53 SHA256 a342fc7188065817101cae0e47d45d35fffa4ec0bbf3fb44fda194db6514e0c1
+MISC ChangeLog 4083 RMD160 b54f2d1d426f1c8d8859ca1cd10a233cc9bc7261 SHA1 f47365fdd9866e358d046337f7dc16eb2251f302 SHA256 2e66b5c034ace2f76df08001978b47ec1f39547171d042490bfe545587d236c5
 MISC metadata.xml 600 RMD160 f25b9c60547fc27c87bc124bddeebced91413d84 SHA1 8126f180b31441cf0791ca2f837d13ca64f1a13f SHA256 0e8ff6400d10dbb8557bdc75fd8a991af3da41234b7a81800b5c65761ad1b601
diff --git a/x11-plugins/wmnetload/files/wmnetload-1.3-r3-norpath.patch b/x11-plugins/wmnetload/files/wmnetload-1.3-r3-norpath.patch
new file mode 100644
index 000000000000..117015d242a5
--- /dev/null
+++ b/x11-plugins/wmnetload/files/wmnetload-1.3-r3-norpath.patch
@@ -0,0 +1,59 @@
+diff -Naur wmnetload-1.3/configure.in wmnetload-1.3-new/configure.in
+--- wmnetload-1.3/configure.in	2003-02-23 10:07:39.000000000 +0100
++++ wmnetload-1.3-new/configure.in	2009-01-20 09:24:20.000000000 +0100
+@@ -102,7 +102,6 @@
+ 	[inc_search_path=" -I $withval $inc_search_path"])
+ 
+ LIBRARY_SEARCH_PATH="$lib_search_path -L/usr/local/lib"
+-LIBRARY_RPATH=`echo "$LIBRARY_SEARCH_PATH" | sed 's/[ *]-L[ *]/:/g'`
+ HEADER_SEARCH_PATH="$inc_search_path -I/usr/local/include"
+ 
+ AC_SUBST(LIBRARY_SEARCH_PATH)
+@@ -122,12 +121,10 @@
+ 	;;
+ *netbsd*)
+ 	OS=netbsd
+-	LIBRARY_RPATH="$LIBRARY_RPATH:/usr/X11R6/lib"
+ 	LIBS="$LIBS -lkvm"
+ 	;;
+ *freebsd*)
+ 	OS=freebsd
+-	LIBRARY_RPATH="$LIBRARY_RPATH:/usr/X11R6/lib"
+ 	;;
+ *)
+ 	echo ""
+@@ -143,22 +140,6 @@
+ 
+ AC_PATH_XTRA
+ 
+-dnl
+-dnl Hack in rpath -- yes, this sucks, and it even has a hidden dependency
+-dnl on the implementation of AC_PATH_XTRA.  F@&* you, portability.
+-dnl
+-if test "$GCC" = yes; then
+-	if test "ac_R_space" = no; then
+-		RPATH="-Wl,\"-R$LIBRARY_RPATH\""
+-	else
+-		RPATH="-Wl,\"-R $LIBRARY_RPATH\"" 
+-	fi
+-else
+-	RPATH=
+-	echo "WARNING: do not know how to set RPATH with this compiler"
+-fi
+-
+-AC_SUBST(RPATH)
+ 
+ 
+ X_LIBRARY_PATH=$x_libraries
+diff -Naur wmnetload-1.3/src/Makefile.am wmnetload-1.3-new/src/Makefile.am
+--- wmnetload-1.3/src/Makefile.am	2003-02-18 07:30:48.000000000 +0100
++++ wmnetload-1.3-new/src/Makefile.am	2009-01-20 09:24:58.000000000 +0100
+@@ -25,8 +25,6 @@
+ 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@\" 
+ INCLUDES = @HEADER_SEARCH_PATH@ -I$(top_srcdir)/xpm/@WN_LOOK@
diff --git a/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild b/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild
new file mode 100644
index 000000000000..032ec5a41c69
--- /dev/null
+++ b/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2009 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.1 2009/01/22 14:21:24 s4t4n Exp $
+
+inherit autotools eutils
+
+WANT_AUTOMAKE="1.4"
+
+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="~x86 ~amd64 ~ppc ~ppc64 ~sparc"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdockapp-0.6.1"
+
+DEPEND="${RDEPEND}
+	=sys-devel/automake-1.4_p6"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-${PVR}-norpath.patch"
+
+	eautoconf || die
+	eautomake || die
+}
+
+src_install() {
+	einstall || die "einstall failed."
+	dodoc AUTHORS README NEWS
+}