rpath fix as per bug #107703. Thanks Weeve

Package-Manager: portage-2.1_pre3-r1

4 files changed, 82 insertions, 8 deletions

diff --git a/x11-plugins/wmnetload/ChangeLog b/x11-plugins/wmnetload/ChangeLog
index bcca5f65ea60..21988bc2527a 100644
--- a/x11-plugins/wmnetload/ChangeLog
+++ b/x11-plugins/wmnetload/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmnetload
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/ChangeLog,v 1.25 2005/11/11 10:12:18 s4t4n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/ChangeLog,v 1.26 2006/01/09 21:07:24 dragonheart Exp $
+
+  09 Jan 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/wmnetload-1.3-norpath.patch, wmnetload-1.3-r2.ebuild:
+  rpath fix as per bug #107703. Thanks Weeve
 
   11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmnetload-1.3-r2.ebuild:
   Removed COPYING and INSTALL from dodoc.
diff --git a/x11-plugins/wmnetload/Manifest b/x11-plugins/wmnetload/Manifest
index 34e5f6a7276a..c27ef7126392 100644
--- a/x11-plugins/wmnetload/Manifest
+++ b/x11-plugins/wmnetload/Manifest
@@ -1,5 +1,16 @@
-MD5 e8127a0192058be2c63de0b191b997d9 ChangeLog 3447
-MD5 a4e6b8fede98f4471909cda8b29bc02d metadata.xml 600
-MD5 ed9c497b6c27dcddfd86db5d6601f807 wmnetload-1.3-r2.ebuild 819
-MD5 8287f37c009e97ceef426da1acdc9965 files/digest-wmnetload-1.3-r2 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 259a75293e41042388b24cb2edd2f966 ChangeLog 3615
 MD5 91c8ced226a5e46438cc17ca8e0eaa19 files/add_support_for_libdockapp_0.5.patch 2028
+MD5 8287f37c009e97ceef426da1acdc9965 files/digest-wmnetload-1.3-r2 65
+MD5 7692affc1abe16d7addf9effd39ffc04 files/wmnetload-1.3-norpath.patch 1927
+MD5 a4e6b8fede98f4471909cda8b29bc02d metadata.xml 600
+MD5 7eb4c52d6e28f0e3aab54cb0e8fd2de9 wmnetload-1.3-r2.ebuild 874
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDwtqumdTrptrqvGERAt0dAKCXOW0NeezEXR00qUDFXXbdrNkZyACeMNlY
+u/TBl14QpxTXH323TbHEYT8=
+=7DRg
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmnetload/files/wmnetload-1.3-norpath.patch b/x11-plugins/wmnetload/files/wmnetload-1.3-norpath.patch
new file mode 100644
index 000000000000..a75b5b2bd9da
--- /dev/null
+++ b/x11-plugins/wmnetload/files/wmnetload-1.3-norpath.patch
@@ -0,0 +1,57 @@
+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
index 87934afcafc1..e04757f70af6 100644
--- a/x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild
+++ b/x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.2 2005/11/11 10:12:18 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/wmnetload-1.3-r2.ebuild,v 1.3 2006/01/09 21:07:24 dragonheart Exp $
 
 inherit eutils
 
@@ -24,6 +24,8 @@ src_unpack()
 
 	# Add support for libdockapp 0.5
 	epatch ${FILESDIR}/add_support_for_libdockapp_0.5.patch
+
+	epatch ${FILESDIR}/wmnetload-1.3-norpath.patch
 }
 
 src_compile()