Fix bug #18605 and #18937 by making minor modifications to rebuilder.sh

3 files changed, 55 insertions, 2 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 1182176b80d4..61a027db9c9b 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # 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.46 2003/04/22 10:00:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.47 2003/05/05 14:47:01 caleb Exp $
+
+  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)
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
new file mode 100644
index 000000000000..7c32069e9f7a
--- /dev/null
+++ b/dev-db/mysql/Manifest
@@ -0,0 +1,42 @@
+MD5 873cd30ebb693aa7732628e8d0e83789 mysql-3.23.56.ebuild 6624
+MD5 f70f1b50a6921cbddba0c7afa2e9ba4a mysql-4.0.12.ebuild 6840
+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
+MD5 8bd70e5ba5708e31ffc18c0d3fcce1fa mysql-3.23.52-r1.ebuild 5952
+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 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
+MD5 123826c210fa0cbdf24c3e6903212dbe files/digest-mysql-3.23.54a 68
+MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
+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 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
+MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
+MD5 5bfc671c63667e6f4c8d48f9edc6076e files/mysql.init 904
+MD5 123826c210fa0cbdf24c3e6903212dbe files/digest-mysql-3.23.54a-r1 68
+MD5 997090f9cbe3e18afeb84508171cedef files/digest-mysql-4.0.7 71
+MD5 04fcbc3263b6da10d038907979ee7f96 files/digest-mysql-4.0.11a-r1 73
+MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271
+MD5 47c66444b6a1e2243eadf931d52d34b2 files/my.cnf 1229
+MD5 c960c30b32f42b00c92e32a07fa923a4 files/digest-mysql-4.0.5_beta 71
+MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366
+MD5 d1e79f7a155e45c69558f083fcb1139d files/mysql-4.0-my-print-defaults.diff 240
+MD5 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601
+MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
+MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
+MD5 917c1886c6f90d93178fdb3123d52458 files/digest-mysql-3.23.53 67
+MD5 a11b661dbb561774ad19036ecb2d1923 files/digest-mysql-3.23.55 67
+MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
+MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
+MD5 04fcbc3263b6da10d038907979ee7f96 files/digest-mysql-4.0.11a 73
diff --git a/dev-db/mysql/files/rebuilder.sh b/dev-db/mysql/files/rebuilder.sh
index 8d85f602a8dc..9afadcd4a0ca 100644
--- a/dev-db/mysql/files/rebuilder.sh
+++ b/dev-db/mysql/files/rebuilder.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+if [ ! -e /usr/bin/qpkg ]; then
+	echo "Please emerge gentoolkit before using this script."
+	exit 1
+fi
+
 LINKED_WITH=libmysqlclient
 rm -f /tmp/${LINKED_WITH}.*
 
@@ -12,7 +17,8 @@ echo "This might take a while ..."
 		-or -regex './usr/bin.*' \
 		-or -regex './usr/sbin.*' \
 		-or -regex './usr/lib.*' \
-		-or -regex './usr/kde.*'`
+		-or -regex './usr/kde.*' \
+		-or -regex './usr/qt.*'`
 	do
 	[ -x $i -a -f $i ] && {
 		ldd $i 2>/dev/null | grep ${LINKED_WITH} >/dev/null 2>&1