Included rpath to cleanup for prelink

(Portage version: 2.1_pre7-r2)

5 files changed, 32 insertions, 8 deletions

diff --git a/app-editors/nvu/ChangeLog b/app-editors/nvu/ChangeLog
index d4127edc3fa3..7ae1907c2fd6 100644
--- a/app-editors/nvu/ChangeLog
+++ b/app-editors/nvu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/nvu
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/ChangeLog,v 1.16 2006/03/20 17:18:10 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/ChangeLog,v 1.17 2006/03/30 01:49:05 anarchy Exp $
+
+*nvu-1.0-r4 (30 Mar 2006)
+
+  30 Mar 2006; Jory A. Pratt <anarchy@gentoo.org>
+  +files/1.0/mozilla-rpath-3.patch, -nvu-1.0-r3.ebuild, +nvu-1.0-r4.ebuild:
+  Included rpath to cleanup for prelink
 
 *nvu-1.0-r3 (20 Mar 2006)
 
diff --git a/app-editors/nvu/Manifest b/app-editors/nvu/Manifest
index f26aef6d90b3..04ec0fd7b007 100644
--- a/app-editors/nvu/Manifest
+++ b/app-editors/nvu/Manifest
@@ -7,6 +7,9 @@ SHA256 5a64ffadb56c3c2316202e57ce82b6439c3037c6f4a5a1d4783d03173741e5cd files/01
 MD5 565f1133c57a789f0cf51c02510a6f9c files/1.0/mozconfig-1.0 1367
 RMD160 cf760e7b9ba734b989f6e5d204b0fb6c9142e76b files/1.0/mozconfig-1.0 1367
 SHA256 9ffca88736697d620cfef8ce907e2e7e973eac51a71825831ec0ce96839df8cf files/1.0/mozconfig-1.0 1367
+MD5 6aae9187e900549f9043b34d918263cd files/1.0/mozilla-rpath-3.patch 410
+RMD160 6c75912ccc4f9e5a34c523f14b318609c88cc7f5 files/1.0/mozilla-rpath-3.patch 410
+SHA256 71d88f260190d67cb03f94ab8a6ea1fc6623e6d86e83058d42a710781c5afce4 files/1.0/mozilla-rpath-3.patch 410
 MD5 841f7a0a89c5d8be3841444ce2dd0b85 files/1.0/nvu-0.50-dir.patch 713
 RMD160 7a30d72bf54fff4be8d04798d1b9ca26a367c3b8 files/1.0/nvu-0.50-dir.patch 713
 SHA256 ab6628e84162eeb42aaf5619bc56e5f046f2ad5c46757e42bf676cad00a19f37 files/1.0/nvu-0.50-dir.patch 713
@@ -31,9 +34,9 @@ SHA256 bb0c7035c68b1221342a837e127d2ec2efc034897d9d9afa39358c6750206c45 files/di
 MD5 a05fdf2c14ab81e5c9e6827958cc4a2c files/digest-nvu-1.0-r2 70
 RMD160 09c3dc34fc351be63a5b32dcac1fd447a3da9bdd files/digest-nvu-1.0-r2 70
 SHA256 bb77602d3db0ce3121f0539ead6ca0be366b0ab13f62c093e941744545693172 files/digest-nvu-1.0-r2 70
-MD5 331e2f632c2e315378193c928afe3514 files/digest-nvu-1.0-r3 256
-RMD160 e76ac0081af973af9392199e9ceaebb77304609f files/digest-nvu-1.0-r3 256
-SHA256 74325cc9527e15c1c2a9b3daee112e92ed7f417d91f382f6e2b4c2c5c644f116 files/digest-nvu-1.0-r3 256
+MD5 331e2f632c2e315378193c928afe3514 files/digest-nvu-1.0-r4 256
+RMD160 e76ac0081af973af9392199e9ceaebb77304609f files/digest-nvu-1.0-r4 256
+SHA256 74325cc9527e15c1c2a9b3daee112e92ed7f417d91f382f6e2b4c2c5c644f116 files/digest-nvu-1.0-r4 256
 MD5 91bb5e61f505e2e53aa42345431c8fa7 files/mozconfig2 2160
 RMD160 b3b57ca4815386f85f91b666ce41d4d9b45b9f64 files/mozconfig2 2160
 SHA256 9067662d295e1bf58da656d4693589977b8345d0ead9065b5515979d64a26ad5 files/mozconfig2 2160
@@ -46,6 +49,6 @@ SHA256 7b0a45946c0399084e4ed0d0b50bbd861fb9e665596e24d444c88f0b6e8ac5ab nvu-0.90
 MD5 f71aac9cd14f142bff51d1f51c8ac89c nvu-1.0-r2.ebuild 3124
 RMD160 f3d34ea7bca91756fd6a79d0617015a3850fdf9d nvu-1.0-r2.ebuild 3124
 SHA256 f4a15f05c095dae5df62570581af25d3c597cdf3c1f4752a6753ff86fb3b31c6 nvu-1.0-r2.ebuild 3124
-MD5 25049a9f1921c808777d550123e62c64 nvu-1.0-r3.ebuild 3207
-RMD160 81d09943e7d6db38491690bd535f680bf5bcb331 nvu-1.0-r3.ebuild 3207
-SHA256 cfa725fd813c4f767d8070a359f4eb72f5b649d77ca20169e5cbdc113fc2e211 nvu-1.0-r3.ebuild 3207
+MD5 097b47acb067f3f9f8a0faab18b80fe3 nvu-1.0-r4.ebuild 3290
+RMD160 9b9a85c8fd6937dacb1f2bf5d2b19438d77c7605 nvu-1.0-r4.ebuild 3290
+SHA256 f3810ce6883af1f40181a78607be561cd4015cdca66c1a7b65332a1c10f00952 nvu-1.0-r4.ebuild 3290
diff --git a/app-editors/nvu/files/1.0/mozilla-rpath-3.patch b/app-editors/nvu/files/1.0/mozilla-rpath-3.patch
new file mode 100644
index 000000000000..b45f0997b7d9
--- /dev/null
+++ b/app-editors/nvu/files/1.0/mozilla-rpath-3.patch
@@ -0,0 +1,14 @@
+--- config/rules.mk.orig	2005-07-28 01:45:18.000000000 +0000
++++ config/rules.mk	2005-07-28 01:45:21.000000000 +0000
+@@ -507,5 +507,10 @@
+ # 
+ ifeq ($(OS_ARCH),Linux)
+ ifdef IS_COMPONENT
++DSO_LDOPTS += -Wl,-rpath,'$$ORIGIN:$$ORIGIN/..'
++OS_LDFLAGS += -Wl,-rpath,'$$ORIGIN:$$ORIGIN/..'
+ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
++else
++DSO_LDOPTS += -Wl,-rpath,'$$ORIGIN'
++OS_LDFLAGS += -Wl,-rpath,'$$ORIGIN'
+ endif
+ 
diff --git a/app-editors/nvu/files/digest-nvu-1.0-r3 b/app-editors/nvu/files/digest-nvu-1.0-r4
index 9e9bf40be61d..9e9bf40be61d 100644
--- a/app-editors/nvu/files/digest-nvu-1.0-r3
+++ b/app-editors/nvu/files/digest-nvu-1.0-r4
diff --git a/app-editors/nvu/nvu-1.0-r3.ebuild b/app-editors/nvu/nvu-1.0-r4.ebuild
index 5e0461f025b6..7231c33dcbe4 100644
--- a/app-editors/nvu/nvu-1.0-r3.ebuild
+++ b/app-editors/nvu/nvu-1.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/nvu-1.0-r3.ebuild,v 1.1 2006/03/20 17:18:10 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/nvu-1.0-r4.ebuild,v 1.1 2006/03/30 01:49:05 anarchy Exp $
 
 inherit eutils mozconfig flag-o-matic multilib
 
@@ -26,6 +26,7 @@ src_unpack() {
 	# That can extend to future versions with much more ease. - Chris
 	epatch ${FILESDIR}/1.0/nvu-0.50-dir.patch || die "failed to apply dir. patch"
 	epatch ${FILESDIR}/1.0/nvu-0.50-freetype-compile.patch || die "failed to patch for freetype"
+	epatch ${FILESDIR}/1.0/mozilla-rpath-3.patch || die "failed to apply rpath patch"
 	epatch ${FILESDIR}/1.0/${P}-gcc4-1.patch || die "failed to apply gcc-4 patch"
 	epatch "${FILESDIR}/010_glibc-2.4.patch" || die "failed to apply glibc-2.4 patch"