major improvement of files/rebuilder.sh

4 files changed, 25 insertions, 19 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 61a027db9c9b..1f78dfbaf8fc 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,14 +1,21 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.47 2003/05/05 14:47:01 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.48 2003/05/10 01:16:27 robbat2 Exp $
 
+*mysql-4.0.12 (22 Mar 2003)
+
+  09 May 2003; Robin Johnson <robbat2@gentoo.org> mysql-4.0.12.ebuild,
+  file/rebuilder.sh:
+  Some users still complaining about rebuilder.sh not working. Adding
+  gentoolkit to DEPEND now.
+  rebuilder.sh has been modified to be significently faster and more accurate
+  now.
+  
   05 May 2003; Caleb Tennis <caleb@gentoo.org> files/rebuilder.sh:
   Fix bug #17723 by posting a note to the user that they need to have
   gentoolkit emerged before running this script.  Also fix bug #18605 by
   having the script scan the qt directory too.
 
-*mysql-4.0.12 (22 Mar 2003)
-
   22 Apr 2003; Robin Johnson <robbat2@gentoo.org> files/mysql-4.0.rc6,
   files/mysql.init:
   Change dir=`awk...` line to use sed instead in a more reliable manner
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 7c32069e9f7a..1b81d2099374 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,5 +1,5 @@
 MD5 873cd30ebb693aa7732628e8d0e83789 mysql-3.23.56.ebuild 6624
-MD5 f70f1b50a6921cbddba0c7afa2e9ba4a mysql-4.0.12.ebuild 6840
+MD5 d95bde38182c7cf31940632ea48d3536 mysql-4.0.12.ebuild 6863
 MD5 de1d42fa3fa2e13885845a690fc6d34d mysql-3.23.54a-r1.ebuild 7082
 MD5 24660eb38dccd2e55edc3cdc1e8968fb mysql-3.23.53.ebuild 6081
 MD5 bf749016181bc4529387ca0ce467d908 mysql-4.0.11a-r1.ebuild 6520
@@ -8,7 +8,7 @@ MD5 1a867a1d48e2747dcc951bfe02f2691f mysql-3.23.55.ebuild 6631
 MD5 a8d09cf83655804c6e211814bd124bf4 mysql-4.0.5_beta.ebuild 6259
 MD5 85e5fc82532d42c912b7dd4cbd86a865 mysql-4.0.11a.ebuild 6377
 MD5 fd1035a55f2c4687c7949860e2658930 mysql-3.23.54a.ebuild 6452
-MD5 d0c3af49ea36f169de824e0fac5437a1 ChangeLog 7805
+MD5 2dc34643e54b8f4420853dbc29cc17a9 ChangeLog 8085
 MD5 912d5aff6850b334c88b18c0e37f2ef3 mysql-4.0.7.ebuild 6132
 MD5 b356cd7d6b5330724f0daa4c2a740f17 mysql-4.0.10.ebuild 6126
 MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
@@ -18,7 +18,7 @@ MD5 707d18c98dd9d86533b53330a2daadd2 files/mysql-4.0.rc6 951
 MD5 015a823e06d7181373b0601e4a17c284 files/digest-mysql-3.23.52-r1 67
 MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
 MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368
-MD5 58d02e723027d50612e41caad02adef7 files/rebuilder.sh 1105
+MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557
 MD5 d3bc9aa573525019c4e9d9316f56556a files/digest-mysql-4.0.10 72
 MD5 a77a12a8e251ca0d82d3027b7b50c762 files/digest-mysql-4.0.12 1371
 MD5 ee578e3021841ef9dba4175403564136 files/mysql-4.0-db-3.2.1.diff 1047
diff --git a/dev-db/mysql/files/rebuilder.sh b/dev-db/mysql/files/rebuilder.sh
index 9afadcd4a0ca..d0b7c1e8ac05 100644
--- a/dev-db/mysql/files/rebuilder.sh
+++ b/dev-db/mysql/files/rebuilder.sh
@@ -11,16 +11,15 @@ rm -f /tmp/${LINKED_WITH}.*
 echo "This might take a while ..."
 (
 	cd /
-	for i in `find . -regex './bin.*' \
-		-or -regex './lib.*' \
-		-or -regex './sbin.*' \
-		-or -regex './usr/bin.*' \
-		-or -regex './usr/sbin.*' \
-		-or -regex './usr/lib.*' \
-		-or -regex './usr/kde.*' \
-		-or -regex './usr/qt.*'`
+    # this is the list of locations to search
+    LIST="/bin /sbin /lib /var/qmail /var/vpopmail /usr/X11R6/bin /usr/X11R6/lib /usr/bin /usr/sbin /usr/lib /usr/local/bin /usr/local/sbin /usr/local/lib /usr/qt /usr/libexec /usr/e17 /usr/kde /usr/qt /usr/libexec"
+    # this is the list of limitations to apply to trim the input
+    LIMITS="-type f ! -fstype proc ! -fstype tmpfs ! -fstype devfs ! -fstype usbdevfs ! -fstype ramfs ! -fstype smbfs ! -fstype devpts ! -path tmp "
+    # this if any of these are true, then we want this file
+    WANTED="-perm +111 -or -name '*.so' -or -name '*.so.*' -or -name '*.a' -or -name '*.a.*'"
+   
+	for i in ` find $LIST \(  $WANTED \) $LIMITS 2>/dev/null | sort | uniq `
 	do
-	[ -x $i -a -f $i ] && {
 		ldd $i 2>/dev/null | grep ${LINKED_WITH} >/dev/null 2>&1
 		[ $? -eq 0 ] && {
 			qpkg -nc -f `echo $i | sed -e 's|^\.||'` >>/tmp/${LINKED_WITH}.pkgs
@@ -29,10 +28,9 @@ echo "This might take a while ..."
 			echo "---"
 			echo ""
 		}
-	}
 	done
 ) | sed -e "s|\(.*\)\(${LINKED_WITH}\)\(.*\)\(=>\)|-->\1\2\3\4|" >>/tmp/${LINKED_WITH}.hits
-
+    
 cat /tmp/${LINKED_WITH}.pkgs | sort | uniq | sed 's:\(.*/.*\)-[0-9]\+.*:\1:g' \
 	>>/tmp/${LINKED_WITH}.rebuildme
 
diff --git a/dev-db/mysql/mysql-4.0.12.ebuild b/dev-db/mysql/mysql-4.0.12.ebuild
index fe7f46d0daf6..8c6672dbb056 100644
--- a/dev-db/mysql/mysql-4.0.12.ebuild
+++ b/dev-db/mysql/mysql-4.0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.12.ebuild,v 1.2 2003/04/06 16:26:54 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.12.ebuild,v 1.3 2003/05/10 01:16:27 robbat2 Exp $
 
 #to accomodate -laadeedah releases
 NEWP=${P}
@@ -29,7 +29,8 @@ DEPEND="readline? ( >=sys-libs/readline-4.1 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	>=sys-libs/zlib-1.1.3
 	dev-lang/perl
-	sys-apps/procps"
+	sys-apps/procps
+	app-admin/gentoolkit"
 PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
 
 warning() {