--- perl-5.8.7/lib/ExtUtils/MM_Unix.pm	2005-09-10 14:06:59.000000000 +0200
+++ perl-5.8.7/lib/ExtUtils/MM_Unix.pm	2005-09-10 15:25:52.000000000 +0200
@@ -1915,6 +1915,17 @@ 
 	    # LD_RUN_PATH now computed by ExtUtils::Liblist
 	    ($self->{EXTRALIBS},  $self->{BSLOADLIBS}, 
              $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;
+	    # We do not want the build root in RPATH
+	    if (exists $ENV{PORTAGE_TMPDIR}) {
+	      # If we have PORTAGE_TMPDIR set, strip that, as just testing for
+	      # /usr and /opt might not be sufficient
+	      $self->{LD_RUN_PATH} = join ':', grep !/^\Q$ENV{PORTAGE_TMPDIR}/,
+	                             split /:/, $self->{LD_RUN_PATH};
+	    } else {
+	      # Else just use /usr and /opt paths, and hope for the best
+	      $self->{LD_RUN_PATH} = join ':', grep m!^/(?:usr|opt)!, split /:/,
+	                             $self->{LD_RUN_PATH};
+	    }
 	    last;
 	}
     }