From 58dc4deb4011f1f9cc1858e68f2d57cffa1d167a Mon Sep 17 00:00:00 2001
From: fuzzyray <fuzzyray@gentoo.org>
Date: Wed, 5 Jul 2006 19:19:43 +0000
Subject: [PATCH] Add --no-path option to revdep-rebuild

svn path=/; revision=302
---
 trunk/ChangeLog                           |  4 ++++
 trunk/src/revdep-rebuild/revdep-rebuild   | 10 +++++++++-
 trunk/src/revdep-rebuild/revdep-rebuild.1 |  3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index c40ca66..73d96ed 100644
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-05 Paul Varner <fuzzyray@gentoo.org>
+	* revdep-rebuild: Add --no-path option to revdep-rebuild for bug
+	#137313
+
 2006-06-25 Marius Mauch <genone@gentoo.org>
 	* glsa-check: update cve code for bug 128115
 
diff --git a/trunk/src/revdep-rebuild/revdep-rebuild b/trunk/src/revdep-rebuild/revdep-rebuild
index 569e183..d42bd92 100755
--- a/trunk/src/revdep-rebuild/revdep-rebuild
+++ b/trunk/src/revdep-rebuild/revdep-rebuild
@@ -40,6 +40,7 @@ then
 	echo "      --library NAME   Emerge existing packages that use the library with NAME"
 	echo "      --library=NAME   NAME can be a full path to the library or a basic"
 	echo "                       regular expression (man grep)"
+	echo " -np, --no-path        Do not include searched directories in LD_LIBRARY_PATH"
 	echo " -nc, --no-color       Turn off colored output"
 	echo "  -i, --ignore         Ignore temporary files from previous runs"
 	echo "  -q, --quiet          Be less verbose (also passed to emerge command)"
@@ -166,6 +167,7 @@ SONAME_GREP=grep
 SEARCH_BROKEN=true
 EXTRA_VERBOSE=false
 KEEP_TEMP=false
+FULL_PATH=true
 
 EMERGE_OPTIONS=""
 PRELIMINARY_CALLED_OPTIONS=""
@@ -197,6 +199,10 @@ while [ ! -z "$1" ] ; do
 		NOCOLOR=true
 		shift
 		;;
+	-np | --no-path )
+		FULL_PATH=false
+		shift
+		;;
 	-i | --ignore )
 		rm -f ${LIST}*
 		shift
@@ -385,7 +391,9 @@ if $SEARCH_BROKEN ; then
 		(
 			echo /lib* /usr/lib* | sed 's/ /:/g'
 			sed '/^#/d;s/#.*$//' </etc/ld.so.conf
-			sed 's:/[^/]*$::' <$LIST.1_files | sort -ru
+			if $FULL_PATH ; then
+				sed 's:/[^/]*$::' <$LIST.1_files | sort -ru
+			fi
 		) | tr '\n' : | tr -d '\r' | sed 's/:$//' >$LIST.2_ldpath
 		echo -e " done.\n  ($LIST.2_ldpath)"
 	fi
diff --git a/trunk/src/revdep-rebuild/revdep-rebuild.1 b/trunk/src/revdep-rebuild/revdep-rebuild.1
index e9d59a5..1be9c6c 100644
--- a/trunk/src/revdep-rebuild/revdep-rebuild.1
+++ b/trunk/src/revdep-rebuild/revdep-rebuild.1
@@ -14,6 +14,9 @@ emerge the best packages available, not neccessarily the exact version of the in
 .B \-\-library=NAME
 emerge packages that use the named library. Name can be a full path to a library or basic regular expression. (See man grep for the definition of basic regular expressions)
 .TP 
+.B \-np | \-\-no\-path
+Do not include searched directories in LD_LIBRARY_PATH. \fBNote:\fR Using this option will cause revdep-rebuild to report some false positives.
+.TP 
 .B \-nc | \-\-no\-color
 turn off colored output (This option is also passed to the emerge command)
 .TP 
-- 
2.26.2