From dc0fd8ee3a1bd2a0bf57875fff66e929f7a11f45 Mon Sep 17 00:00:00 2001
From: fuzzyray <fuzzyray@gentoo.org>
Date: Fri, 7 Jul 2006 21:19:24 +0000
Subject: [PATCH] Added patch from truedfx to fix bug #38751

svn path=/; revision=304
---
 trunk/ChangeLog                         |  6 ++++++
 trunk/src/revdep-rebuild/revdep-rebuild | 17 +++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 73d96ed..336b660 100644
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-07 Paul Varner <fuzzyray@gentoo.org>
+	* revdep-rebuild: Rename --no-path to --no-ld-path and change
+	functionality to not set LD_LIBRARY_PATH.  This fixes bug #96946 as
+	well as bug #137313
+	* revdep-rebuild: Apply patch from truedfx to fix bug #38751
+
 2006-07-05 Paul Varner <fuzzyray@gentoo.org>
 	* revdep-rebuild: Add --no-path option to revdep-rebuild for bug
 	#137313
diff --git a/trunk/src/revdep-rebuild/revdep-rebuild b/trunk/src/revdep-rebuild/revdep-rebuild
index df2ed35..ed1e11b 100755
--- a/trunk/src/revdep-rebuild/revdep-rebuild
+++ b/trunk/src/revdep-rebuild/revdep-rebuild
@@ -428,7 +428,7 @@ else
 				done
 				if [ "$MISSING_LIBS" != "" ]
 				then
-					echo "$FILE" >>$LLIST.3_rebuild
+					echo "obj $FILE" >>$LLIST.3_rebuild
 					echo_v "  broken $FILE (requires ${MISSING_LIBS})"
 				fi
 			fi
@@ -447,7 +447,7 @@ else
 			done
 			if [ "$MISSING_LIBS" != "" ]
 			then
-				echo "$FILE" >>$LLIST.3_rebuild
+				echo "obj $FILE" >>$LLIST.3_rebuild
 				if $SEARCH_BROKEN ; then
 					echo_v "  broken $FILE (requires ${MISSING_LIBS})"
 				else
@@ -462,7 +462,7 @@ else
 			for depend in $(grep '^dependency_libs' $FILE | awk -F'=' '{print $2}' | sed "s/'//g") ; do
 				[ ${depend:0:1} != '/' ] && continue
 				if [ ! -e $depend ] ; then
-					echo "$FILE" >>$LLIST.3_rebuild
+					echo "obj $FILE" >>$LLIST.3_rebuild
 					echo_v "  broken $FILE (requires ${depend})"
 				fi
 			done
@@ -482,11 +482,11 @@ if $PACKAGE_NAMES ; then
 		set_trap "$LLIST.4_packages*"
 		echo -n >$LLIST.4_packages_raw
 		echo -n >$LLIST.4_package_owners
-		cat $LLIST.3_rebuild | while read FILE ; do
+		cat $LLIST.3_rebuild | while read obj FILE ; do
 			if $PORTAGE_UTILS ; then
 				EXACT_PKG="$(qfile -qvC ${FILE} )"
 			else
-				EXACT_PKG="$(echo "$FILE " | sed 's/^/obj /' | (cd /var/db/pkg; grep -l -f - */*/CONTENTS) | sed s:/CONTENTS:: )"
+				EXACT_PKG=$(find /var/db/pkg -name CONTENTS | xargs fgrep -l "obj $FILE " | sed -e 's:/var/db/pkg/\(.*\)/CONTENTS:\1:g')
 			fi
 			# Ugly sed hack to strip version information
 			PKG="$(echo $EXACT_PKG | sed 's/-r[0-9].*$//;s/\(^.*\/*\)-.*$/\1/')"
@@ -572,11 +572,8 @@ else
 	else
 		if [ -s "$LLIST.3_rebuild" ] ; then
 			set_trap "$LLIST.4_ebuilds"
-			cat $LLIST.3_rebuild | sed 's/^/obj /;s/$/ /' |
-			(
-				cd /var/db/pkg
-				fgrep -l -f - */*/CONTENTS
-			) | sed s:/CONTENTS:: > $LLIST.4_ebuilds
+			find /var/db/pkg -name CONTENTS | xargs fgrep -l -f $LLIST.3_rebuild |
+			sed 's:/var/db/pkg/\(.*\)/CONTENTS:\1:' > $LLIST.4_ebuilds
 			echo -e " done.\n  ($LLIST.4_ebuilds)"
 		else
 			echo " Nothing to rebuild"
-- 
2.26.2