Cleanup, backup of removed files exist at http://dev.gentoo.org/~vivo/misc/OBSOLETED_dev-db_mysql_20050804.tar.gz

(Portage version: 2.0.51.22-r2)

24 files changed, 20 insertions, 947 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index ffe2b475608a..51937a9d1b1b 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.215 2005/07/29 11:39:14 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.216 2005/08/12 08:32:46 vivo Exp $
+
+  12 Aug 2005; Francesco Riosa <vivo@gentoo.org>
+  -files/mysql-3.23-db-3.2.3.diff, -files/mysql-3.23.51-tcpd.patch,
+  -files/mysql-3.23-install-db-sh.diff,
+  -files/mysql-4.0.4-install-db-sh.diff, -files/mysql-4.0.13-thrssl.patch,
+  -files/mysql-4.0-db-3.2.1.diff, -files/mysql-4.0.rc6,
+  -files/mysql-4.0.14-mysqld-safe-sh.diff,
+  -files/mysql-4.0.14-security-28394.patch,
+  -files/mysql-4.0.16-install-db-sh.diff,
+  -files/mysql-4.0.16-mysqld-safe-sh.diff, -files/mysql-4.0.17-thrssl.patch,
+  -files/mysql-4.0.18-install-db-sh.diff,
+  -files/mysql-4.0.18-mysqlbugsecurity.diff,
+  -files/mysql-4.0.18-mysqldmultisecurity.diff,
+  -files/mysql-4.0.18-thrssl.patch, -files/mysql-4.0.24-asm-pic-fixes.patch,
+  -files/mysql-4.0-install-db-sh.diff, -files/mysql-4.0-mysqld-safe-sh.diff,
+  -files/mysql-4.1.12-asm-pic-fixes.patch, -files/mysql-gentoo-nptl.diff,
+  -files/rebuilder.sh:
+  Cleanup, backup of removed files exist at
+  http://dev.gentoo.org/~vivo/misc/OBSOLETED_dev-db_mysql_20050804.tar.gz
 
   29 Jul 2005; Francesco Riosa <vivo@gentoo.org>
   mysql-4.0.25-r2.ebuild:
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index ca95927da5c4..26b5b9b33207 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -18,68 +18,48 @@ MD5 7a2300e4b7c4f1c68d680ea6fa75aab1 mysql-4.0.24.ebuild 9835
 MD5 433359a98b13ddcf52a911a0befc261e ChangeLog 36397
 MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
 MD5 40616a826638aeea1f00ecf5e2a6d190 mysql-4.0.25-r2.ebuild 13806
-MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
-MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
 MD5 93827506c0de13cf7b5023847a4afd95 files/digest-mysql-5.0.9_beta-r2 70
 MD5 a755fb5a3ed724046a4f83fafd819c77 files/mysql-test-myisam-geometry.patch 1217
 MD5 76446c512e91b2f8e9e69a0379178e5c files/mysql-4.0.25-r2-asm-pic-fixes.patch 7295
 MD5 e37e03b4ce894ff87fda12ce6f7b31a6 files/mysql-4.0.21-install-db-sh.diff 585
 MD5 ad883e978e48b2040477a12951c01806 files/digest-mysql-4.1.13-r1 66
 MD5 2a38459933c8b182b2b7ee08ac4e4509 files/035_x86_asm-pic-fixes-r2.patch 8162
-MD5 3e399acddc48f209b53e260eec64938c files/mysql-4.0.rc6 933
 MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187
 MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58-r1 67
 MD5 49aaf02181386f4a7d8c97c7e21f7d66 files/digest-mysql-5.0.10_beta 71
 MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
-MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368
 MD5 58c4d09c5c2712254b1881a6fcc7abff files/mysql-4.0.18-gentoo-nptl.diff 587
-MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557
 MD5 087f3fbbe8e3385f5408d91cb661aace files/mysql-4.0-mysqlhotcopy-security.patch 1394
-MD5 28b79a92729c506943a4f9c6d9abf1fb files/mysql-4.0.24-asm-pic-fixes.patch 2634
 MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22 66
 MD5 5c65bc30646d669193798324a56b002a files/digest-mysql-4.0.23 66
 MD5 547fab43da8e59a03a5f3e4a500cca45 files/digest-mysql-4.0.24 66
-MD5 ee578e3021841ef9dba4175403564136 files/mysql-4.0-db-3.2.1.diff 1047
-MD5 f2905bbcc3f148a2ad689792917bd78d files/mysql-4.0.16-install-db-sh.diff 1429
 MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
 MD5 9209843349ac5e9560f9ad7450c49769 files/703_all_test-rpl_rotate_logs.patch 802
 MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
 MD5 6d4fc135a2143e95681416795d1948d9 files/mysql-4.0.23-install-db-sh.diff 1055
 MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307
-MD5 fc80f877fa97f0f3a52ee684ce7f54b2 files/mysql-4.0.16-mysqld-safe-sh.diff 1562
 MD5 5701dee85af16e5d7aa821853ec8cda5 files/digest-mysql-4.1.8 65
-MD5 f635289f8422fdf26ba3c3dbdf99c4e2 files/mysql-4.0.14-mysqld-safe-sh.diff 1503
 MD5 46b0857fe11abf1015f0db6da26614ff files/010_all_my-print-defaults-r2.patch 907
-MD5 6f8de46485ea7dcf886e1747fb117427 files/mysql-gentoo-nptl.diff 654
-MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271
-MD5 e501d0f33d9d0be73b37c310099011d2 files/mysql-4.0.14-security-28394.patch 654
 MD5 d200345efa421d012cf858134d2c8884 files/logrotate.mysql 440
-MD5 68cbaa353f522c0a404a4d07693f917d files/mysql-4.0.18-install-db-sh.diff 1473
 MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231
 MD5 26a871e24e291f135d9189b6037fe48e files/mysql-4.0.25-r1-asm-pic-fixes.patch 2494
 MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366
 MD5 d1e79f7a155e45c69558f083fcb1139d files/mysql-4.0-my-print-defaults.diff 240
 MD5 3d755bbd0b109ec0397b0ce50b4a554d files/mysql-accesstmp.patch 3393
-MD5 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601
 MD5 5701dee85af16e5d7aa821853ec8cda5 files/digest-mysql-4.1.8-r1 65
 MD5 8af497943e1a29aa0a0c6b17af54b116 files/mysql-4.0.21-thrssl.patch 318
-MD5 f599e8b3eb4636bb61721525dc15f5f5 files/mysql-4.0.18-thrssl.patch 723
 MD5 277705080f05b5b98b815487e080e562 files/my.cnf-4.1 4068
 MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
 MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
 MD5 a9f61fe89f1a43f6c5a8de100176d2dc files/701_all_test-myisam-geometry.patch 1239
-MD5 a76ec36b83c2f0dbfba65c993f75d135 files/mysql-4.0.18-mysqlbugsecurity.diff 672
 MD5 66b1e90f93ae0adc106e7b62a2c4043b files/mysql-4.1.9-thrssl.patch 905
 MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58 67
 MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662
 MD5 08f1246e8107e4140378d429ff9773af files/mysql-4.0.24-r2.rc6 2123
-MD5 598859c685b18094178639620cb4ba89 files/mysql-4.1.12-asm-pic-fixes.patch 2655
 MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465
-MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
 MD5 c6ff193b0612040bab879d2085b6edea files/mysql-4.0.24-manual.texi.patch 603
 MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816
 MD5 9946a8f7163970ec4f6a713c97eadbe0 files/my.cnf-4.0.24-r1 4271
-MD5 9b5ad94f6e99e65bc3373c9dd15dff08 files/mysql-4.0.17-thrssl.patch 637
 MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r1 66
 MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r2 66
 MD5 5c65bc30646d669193798324a56b002a files/digest-mysql-4.0.23-r1 66
@@ -89,5 +69,3 @@ MD5 547fab43da8e59a03a5f3e4a500cca45 files/digest-mysql-4.0.24-r2 66
 MD5 06a7c1ead0dfe570f7c67d525c45f7c3 files/digest-mysql-4.0.25-r1 66
 MD5 06a7c1ead0dfe570f7c67d525c45f7c3 files/digest-mysql-4.0.25-r2 66
 MD5 c5fcb05dcc3f2d093efd55bd96af2423 files/035_x86_asm-pic-fixes-r1.patch 4093
-MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813
-MD5 ad5636b398982a23f6fc58f18a2114fc files/mysql-4.0.18-mysqldmultisecurity.diff 3863
diff --git a/dev-db/mysql/files/mysql-3.23-db-3.2.3.diff b/dev-db/mysql/files/mysql-3.23-db-3.2.3.diff
deleted file mode 100644
index 41125ff3409c..000000000000
--- a/dev-db/mysql/files/mysql-3.23-db-3.2.3.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur mysql-3.23.49.orig/acinclude.m4 mysql-3.23.49/acinclude.m4
---- mysql-3.23.49.orig/acinclude.m4	Thu Feb 14 12:30:13 2002
-+++ mysql-3.23.49/acinclude.m4	Mon Feb 18 21:09:10 2002
-@@ -774,13 +774,13 @@
-     if test X"$bdb_version_ok" = Xyes; then
-       save_LDFLAGS="$LDFLAGS"
-       LDFLAGS="-L$lib $LDFLAGS"
--      AC_CHECK_LIB(db,db_env_create, [
-+      AC_CHECK_LIB(db-3.2,db_env_create, [
-         bdb_dir_ok=installed
-         MYSQL_TOP_BUILDDIR([inc])
-         MYSQL_TOP_BUILDDIR([lib])
-         bdb_includes="-I$inc"
--        bdb_libs="-L$lib -ldb"
--        bdb_libs_with_path="$lib/libdb.a"
-+        bdb_libs="-L$lib -ldb-3.2"
-+        bdb_libs_with_path="$lib/libdb-3.2.a"
-       ])
-       LDFLAGS="$save_LDFLAGS"
-     else
-@@ -808,8 +808,8 @@
-         bdb="$dir"
-         MYSQL_TOP_BUILDDIR([dir])
-         bdb_includes="-I$dir/build_unix"
--        bdb_libs="-L$dir/build_unix -ldb"
--	bdb_libs_with_path="$dir/build_unix/libdb.a"
-+        bdb_libs="-L$dir/build_unix -ldb-3.2"
-+	bdb_libs_with_path="$dir/build_unix/libdb-3.2.a"
-       else
-         bdb_dir_ok="$bdb_version_ok"
-       fi
diff --git a/dev-db/mysql/files/mysql-3.23-install-db-sh.diff b/dev-db/mysql/files/mysql-3.23-install-db-sh.diff
deleted file mode 100644
index a893ca1f5cbc..000000000000
--- a/dev-db/mysql/files/mysql-3.23-install-db-sh.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur mysql-3.23.47.orig/scripts/mysql_install_db.sh mysql-3.23.47/scripts/mysql_install_db.sh
---- mysql-3.23.47.orig/scripts/mysql_install_db.sh	Thu Dec 27 07:23:38 2001
-+++ mysql-3.23.47/scripts/mysql_install_db.sh	Fri Jan  4 04:55:18 2002
-@@ -309,14 +309,9 @@
- END_OF_DATA
- then
-   echo ""
--  if test "$IN_RPM" -eq 0
--  then
--    echo "To start mysqld at boot time you have to copy support-files/mysql.server"
--    echo "to the right place for your system"
--    echo
--  fi
-   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-   echo "This is done with:"
-+  echo "/etc/init.d/mysql start  (you have to start the server first!)"
-   echo "$bindir/mysqladmin -u root -p password 'new-password'"
-   echo "$bindir/mysqladmin -u root -h $hostname -p password 'new-password'"
-   echo "See the manual for more instructions."
-@@ -330,15 +325,6 @@
-     echo "able to use the new GRANT command!"
-   fi
-   echo
--  if test "$IN_RPM" -eq 0
--  then
--    echo "You can start the MySQL daemon with:"
--    echo "cd @prefix@ ; $bindir/safe_mysqld &"
--    echo
--    echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:"
--    echo "cd sql-bench ; run-all-tests"
--    echo
--  fi
-   echo "Please report any problems with the @scriptdir@/mysqlbug script!"
-   echo
-   echo "The latest information about MySQL is available on the web at"
diff --git a/dev-db/mysql/files/mysql-3.23.51-tcpd.patch b/dev-db/mysql/files/mysql-3.23.51-tcpd.patch
deleted file mode 100644
index 6897ed0c17f1..000000000000
--- a/dev-db/mysql/files/mysql-3.23.51-tcpd.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -uNr mysql-3.23.51.orig/sql/mysqld.cc mysql-3.23.51/sql/mysqld.cc
---- mysql-3.23.51.orig/sql/mysqld.cc	Mon Jun  3 06:39:02 2002
-+++ mysql-3.23.51/sql/mysqld.cc	Thu Jun 20 16:11:47 2002
-@@ -91,9 +91,9 @@
- int deny_severity = LOG_WARNING;
- 
- #ifdef __linux__
--#define my_fromhost(A)	   fromhost()
--#define my_hosts_access(A) hosts_access()
--#define my_eval_client(A)  eval_client()
-+#define my_fromhost(A)	   fromhost(A)
-+#define my_hosts_access(A) hosts_access(A)
-+#define my_eval_client(A)  eval_client(A)
- #else
- #define my_fromhost(A)	   fromhost(A)
- #define my_hosts_access(A) hosts_access(A)
diff --git a/dev-db/mysql/files/mysql-4.0-db-3.2.1.diff b/dev-db/mysql/files/mysql-4.0-db-3.2.1.diff
deleted file mode 100644
index 5028a5cf5625..000000000000
--- a/dev-db/mysql/files/mysql-4.0-db-3.2.1.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- mysql-4.0.1-alpha.orig/acinclude.m4	Sun Dec 23 01:22:06 2001
-+++ mysql-4.0.1-alpha/acinclude.m4	Sat Jun 22 17:59:04 2002
-@@ -972,13 +972,13 @@
-     if test X"$bdb_version_ok" = Xyes; then
-       save_LDFLAGS="$LDFLAGS"
-       LDFLAGS="-L$lib $LDFLAGS"
--      AC_CHECK_LIB(db,db_env_create, [
-+      AC_CHECK_LIB(db-3.2,db_env_create, [
-         bdb_dir_ok=installed
-         MYSQL_TOP_BUILDDIR([inc])
-         MYSQL_TOP_BUILDDIR([lib])
-         bdb_includes="-I$inc"
--        bdb_libs="-L$lib -ldb"
--        bdb_libs_with_path="$lib/libdb.a"
-+        bdb_libs="-L$lib -ldb-3.2"
-+        bdb_libs_with_path="$lib/libdb-3.2.a"
-       ])
-       LDFLAGS="$save_LDFLAGS"
-     else
-@@ -1006,8 +1006,8 @@
-         bdb="$dir"
-         MYSQL_TOP_BUILDDIR([dir])
-         bdb_includes="-I$dir/build_unix"
--        bdb_libs="-L$dir/build_unix -ldb"
--	bdb_libs_with_path="$dir/build_unix/libdb.a"
-+        bdb_libs="-L$dir/build_unix -ldb-3.2"
-+	bdb_libs_with_path="$dir/build_unix/libdb-3.2.a"
-       else
-         bdb_dir_ok="$bdb_version_ok"
-       fi
diff --git a/dev-db/mysql/files/mysql-4.0-install-db-sh.diff b/dev-db/mysql/files/mysql-4.0-install-db-sh.diff
deleted file mode 100644
index 909de2b7dd6a..000000000000
--- a/dev-db/mysql/files/mysql-4.0-install-db-sh.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- mysql-4.0.1-alpha.orig/scripts/mysql_install_db.sh	Sun Dec 23 01:22:14 2001
-+++ mysql-4.0.1-alpha/scripts/mysql_install_db.sh	Sat Jun 22 18:07:37 2002
-@@ -313,14 +313,9 @@
- END_OF_DATA
- then
-   echo ""
--  if test "$IN_RPM" -eq 0
--  then
--    echo "To start mysqld at boot time you have to copy support-files/mysql.server"
--    echo "to the right place for your system"
--    echo
--  fi
-   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-   echo "This is done with:"
-+  echo "/etc/init.d/mysql start (you have to start the server first!)"
-   echo "$bindir/mysqladmin -u root password 'new-password'"
-   echo "$bindir/mysqladmin -u root -h $hostname password 'new-password'"
-   echo "See the manual for more instructions."
-@@ -334,15 +329,6 @@
-     echo "able to use the new GRANT command!"
-   fi
-   echo
--  if test "$IN_RPM" -eq 0
--  then
--    echo "You can start the MySQL daemon with:"
--    echo "cd @prefix@ ; $bindir/mysqld_safe &"
--    echo
--    echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:"
--    echo "cd sql-bench ; run-all-tests"
--    echo
--  fi
-   echo "Please report any problems with the @scriptdir@/mysqlbug script!"
-   echo
-   echo "The latest information about MySQL is available on the web at"
diff --git a/dev-db/mysql/files/mysql-4.0-mysqld-safe-sh.diff b/dev-db/mysql/files/mysql-4.0-mysqld-safe-sh.diff
deleted file mode 100644
index b6d93012f2a6..000000000000
--- a/dev-db/mysql/files/mysql-4.0-mysqld-safe-sh.diff
+++ /dev/null
@@ -1,49 +0,0 @@
---- mysql-4.0.1-alpha.orig/scripts/mysqld_safe.sh	Sun Dec 23 01:22:08 2001
-+++ mysql-4.0.1-alpha/scripts/mysqld_safe.sh	Sat Jun 22 18:11:21 2002
-@@ -73,42 +73,15 @@
-   done
- }
- 
--MY_PWD=`pwd`
--# Check if we are starting this relative (for the binary release)
--if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
-- -x ./bin/mysqld
--then
--  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
--  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
--  DATADIR=$MY_BASEDIR_VERSION/data
--  if test -z "$defaults"
--  then
--    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
--  fi
--# Check if this is a 'moved install directory'
--elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
-- -x ./libexec/mysqld
--then
--  MY_BASEDIR_VERSION=$MY_PWD		# Where libexec, share and var are
--  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
--  DATADIR=$MY_BASEDIR_VERSION/var
--else
--  MY_BASEDIR_VERSION=@prefix@
--  DATADIR=@localstatedir@
--  ledir=@libexecdir@
--fi
-+MY_BASEDIR_VERSION=@prefix@
-+DATADIR=@localstatedir@
-+ledir=@libexecdir@
- 
- MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
- MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
- user=@MYSQLD_USER@
- 
--# Use the mysqld-max binary by default if the user doesn't specify a binary
--if test -x $ledir/mysqld-max
--then
--  MYSQLD=mysqld-max
--else
--  MYSQLD=mysqld
--fi
-+MYSQLD=mysqld
- 
- # these rely on $DATADIR by default, so we'll set them later on
- pid_file=
diff --git a/dev-db/mysql/files/mysql-4.0.13-thrssl.patch b/dev-db/mysql/files/mysql-4.0.13-thrssl.patch
deleted file mode 100644
index bc998e2b0761..000000000000
--- a/dev-db/mysql/files/mysql-4.0.13-thrssl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libmysql_r/Makefile.in.orig 2003-06-12 14:01:40.000000000 -0700
-+++ libmysql_r/Makefile.in      2003-06-12 14:02:18.000000000 -0700
-@@ -209,7 +209,7 @@
- CHARSET_OBJS = @CHARSET_OBJS@
- 
- target = libmysqlclient_r.la
--target_defs = -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
-+target_defs = -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@ -DMYSQL_CLIENT
- 
- INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include \
-                -I$(srcdir)/.. -I$(top_srcdir) -I.. $(openssl_includes)
-@@ -320,7 +320,7 @@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @CLIENT_LIBS@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/conf_to_src.Po $(DEPDIR)/errmsg.Plo \
- @AMDEP_TRUE@   $(DEPDIR)/get_password.Plo $(DEPDIR)/libmysql.Plo \
diff --git a/dev-db/mysql/files/mysql-4.0.14-mysqld-safe-sh.diff b/dev-db/mysql/files/mysql-4.0.14-mysqld-safe-sh.diff
deleted file mode 100644
index ed744134b51e..000000000000
--- a/dev-db/mysql/files/mysql-4.0.14-mysqld-safe-sh.diff
+++ /dev/null
@@ -1,51 +0,0 @@
---- mysql-4.0.14/scripts/mysqld_safe.sh.orig	2003-07-18 07:57:41.000000000 -0700
-+++ mysql-4.0.14/scripts/mysqld_safe.sh	2003-07-28 15:01:24.000000000 -0700
-@@ -88,44 +88,16 @@
-   done
- }
- 
--
--MY_PWD=`pwd`
--# Check if we are starting this relative (for the binary release)
--if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
-- -x ./bin/mysqld
--then
--  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
--  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
--  DATADIR=$MY_BASEDIR_VERSION/data
--  if test -z "$defaults"
--  then
--    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
--  fi
--# Check if this is a 'moved install directory'
--elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
-- -x ./libexec/mysqld
--then
--  MY_BASEDIR_VERSION=$MY_PWD		# Where libexec, share and var are
--  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
--  DATADIR=$MY_BASEDIR_VERSION/var
--else
--  MY_BASEDIR_VERSION=@prefix@
--  DATADIR=@localstatedir@
--  ledir=@libexecdir@
--fi
-+MY_BASEDIR_VERSION=@prefix@
-+DATADIR=@localstatedir@
-+ledir=@libexecdir@
- 
- MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
- MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
- user=@MYSQLD_USER@
- niceness=0
- 
--# Use the mysqld-max binary by default if the user doesn't specify a binary
--if test -x $ledir/mysqld-max
--then
--  MYSQLD=mysqld-max
--else
--  MYSQLD=mysqld
--fi
-+MYSQLD=mysqld
- 
- # these rely on $DATADIR by default, so we'll set them later on
- pid_file=
diff --git a/dev-db/mysql/files/mysql-4.0.14-security-28394.patch b/dev-db/mysql/files/mysql-4.0.14-security-28394.patch
deleted file mode 100644
index 9092743dda76..000000000000
--- a/dev-db/mysql/files/mysql-4.0.14-security-28394.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru mysql-4.0.14.orig/sql/sql_acl.cc mysql-4.0.14/sql/sql_acl.cc
---- mysql-4.0.14.orig/sql/sql_acl.cc	2003-09-10 20:53:06.000000000 -0400
-+++ mysql-4.0.14/sql/sql_acl.cc	2003-09-10 20:54:41.000000000 -0400
-@@ -233,7 +233,7 @@
- 		      "Found old style password for user '%s'. Ignoring user. (You may want to restart mysqld using --old-protocol)",
- 		      user.user ? user.user : ""); /* purecov: tested */
-     }
--    else if (length % 8)		// This holds true for passwords
-+    else if (length % 8 || length > 16)		// This holds true for passwords
-     {
-       sql_print_error(
- 		      "Found invalid password for user: '%s@%s'; Ignoring user",
diff --git a/dev-db/mysql/files/mysql-4.0.16-install-db-sh.diff b/dev-db/mysql/files/mysql-4.0.16-install-db-sh.diff
deleted file mode 100644
index eef47d1412a5..000000000000
--- a/dev-db/mysql/files/mysql-4.0.16-install-db-sh.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- mysql-4.0.16/scripts/mysql_install_db.sh.orig	2003-10-16 22:29:20.000000000 -0700
-+++ mysql-4.0.16/scripts/mysql_install_db.sh	2003-10-26 15:14:46.000000000 -0800
-@@ -333,16 +333,11 @@
- END_OF_DATA
- then
-   echo ""
--  if test "$IN_RPM" = "0"
--  then
--    echo "To start mysqld at boot time you have to copy support-files/mysql.server"
--    echo "to the right place for your system"
--    echo
--  fi
-   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-   echo "This is done with:"
--  echo "$bindir/mysqladmin -u root password 'new-password'"
-+  echo "/etc/init.d/mysql start (you have to start the server first!)"
-   echo "$bindir/mysqladmin -u root -h $hostname password 'new-password'"
-+  echo "$bindir/mysqladmin -u root password 'new-password'"
-   echo "See the manual for more instructions."
-   #
-   # Print message about upgrading unless we have created a new db table.
-@@ -354,15 +349,6 @@
-     echo "able to use the new GRANT command!"
-   fi
-   echo
--  if test "$IN_RPM" = "0"
--  then
--    echo "You can start the MySQL daemon with:"
--    echo "cd @prefix@ ; $bindir/mysqld_safe &"
--    echo
--    echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:"
--    echo "cd sql-bench ; perl run-all-tests"
--    echo
--  fi
-   echo "Please report any problems with the @scriptdir@/mysqlbug script!"
-   echo
-   echo "The latest information about MySQL is available on the web at"
diff --git a/dev-db/mysql/files/mysql-4.0.16-mysqld-safe-sh.diff b/dev-db/mysql/files/mysql-4.0.16-mysqld-safe-sh.diff
deleted file mode 100644
index 6bc40f559f1a..000000000000
--- a/dev-db/mysql/files/mysql-4.0.16-mysqld-safe-sh.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ur mysql-4.0.16.orig/scripts/mysqld_safe.sh mysql-4.0.16/scripts/mysqld_safe.sh
---- mysql-4.0.16.orig/scripts/mysqld_safe.sh	2003-10-16 22:29:17.000000000 -0700
-+++ mysql-4.0.16/scripts/mysqld_safe.sh	2003-10-26 15:22:17.000000000 -0800
-@@ -88,43 +88,15 @@
-   done
- }
- 
--
--MY_PWD=`pwd`
--# Check if we are starting this relative (for the binary release)
--if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
-- -x ./bin/mysqld
--then
--  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
--  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
--  DATADIR=$MY_BASEDIR_VERSION/data
--  if test -z "$defaults"
--  then
--    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
--  fi
--# Check if this is a 'moved install directory'
--elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
-- -x ./libexec/mysqld
--then
--  MY_BASEDIR_VERSION=$MY_PWD		# Where libexec, share and var are
--  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
--  DATADIR=$MY_BASEDIR_VERSION/var
--else
--  MY_BASEDIR_VERSION=@prefix@
--  DATADIR=@localstatedir@
--  ledir=@libexecdir@
--fi
-+MY_BASEDIR_VERSION=@prefix@
-+DATADIR=@localstatedir@
-+ledir=@libexecdir@
- 
- safe_mysql_unix_port=${mysql_unix_port:-${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}}
- user=@MYSQLD_USER@
- niceness=0
- 
--# Use the mysqld-max binary by default if the user doesn't specify a binary
--if test -x $ledir/mysqld-max
--then
--  MYSQLD=mysqld-max
--else
--  MYSQLD=mysqld
--fi
-+MYSQLD=mysqld
- 
- # these rely on $DATADIR by default, so we'll set them later on
- pid_file=
diff --git a/dev-db/mysql/files/mysql-4.0.17-thrssl.patch b/dev-db/mysql/files/mysql-4.0.17-thrssl.patch
deleted file mode 100644
index a599bc6a4065..000000000000
--- a/dev-db/mysql/files/mysql-4.0.17-thrssl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -u -r mysql-4.0.17.orig/libmysql_r/Makefile.in mysql-4.0.17/libmysql_r/Makefile.in
---- mysql-4.0.17.orig/libmysql_r/Makefile.in	2003-12-14 13:24:02.000000000 -0800
-+++ mysql-4.0.17/libmysql_r/Makefile.in	2003-12-25 13:39:53.000000000 -0800
-@@ -209,8 +209,8 @@
- CHARSET_OBJS = @CHARSET_OBJS@
- 
- target = libmysqlclient_r.la
--target_defs = -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
--LIBS = @LIBS@ @openssl_libs@
-+target_defs = -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@ -DMYSQL_CLIENT
-+LIBS = @CLIENT_LIBS@ @openssl_libs@
- 
- INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include \
- 		-I$(srcdir)/.. -I$(top_srcdir) -I.. $(openssl_includes)
diff --git a/dev-db/mysql/files/mysql-4.0.18-install-db-sh.diff b/dev-db/mysql/files/mysql-4.0.18-install-db-sh.diff
deleted file mode 100644
index 74093716de05..000000000000
--- a/dev-db/mysql/files/mysql-4.0.18-install-db-sh.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- mysql-4.0.18/scripts/mysql_install_db.sh.orig	2004-02-10 10:15:55.000000000 -0800
-+++ mysql-4.0.18/scripts/mysql_install_db.sh	2004-03-04 13:40:26.000000000 -0800
-@@ -333,16 +333,11 @@
- END_OF_DATA
- then
-   echo ""
--  if test "$IN_RPM" = "0"
--  then
--    echo "To start mysqld at boot time you have to copy support-files/mysql.server"
--    echo "to the right place for your system"
--    echo
--  fi
-   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-   echo "To do so, start the server, then issue the following commands:"
--  echo "$bindir/mysqladmin -u root password 'new-password'"
-+  echo "/etc/init.d/mysql start (you have to start the server first!)"
-   echo "$bindir/mysqladmin -u root -h $hostname password 'new-password'"
-+  echo "$bindir/mysqladmin -u root password 'new-password'"
-   echo "See the manual for more instructions."
-   #
-   # Print message about upgrading unless we have created a new db table.
-@@ -354,15 +349,6 @@
-     echo "able to use the new GRANT command!"
-   fi
-   echo
--  if test "$IN_RPM" = "0"
--  then
--    echo "You can start the MySQL daemon with:"
--    echo "cd @prefix@ ; $bindir/mysqld_safe &"
--    echo
--    echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:"
--    echo "cd sql-bench ; perl run-all-tests"
--    echo
--  fi
-   echo "Please report any problems with the @scriptdir@/mysqlbug script!"
-   echo
-   echo "The latest information about MySQL is available on the web at"
diff --git a/dev-db/mysql/files/mysql-4.0.18-mysqlbugsecurity.diff b/dev-db/mysql/files/mysql-4.0.18-mysqlbugsecurity.diff
deleted file mode 100644
index 1b0bf5905608..000000000000
--- a/dev-db/mysql/files/mysql-4.0.18-mysqlbugsecurity.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur mysql-4.0.18.orig/scripts/mysqlbug.sh mysql-4.0.18/scripts/mysqlbug.sh
---- mysql-4.0.18.orig/scripts/mysqlbug.sh	2004-02-10 10:15:54.000000000 -0800
-+++ mysql-4.0.18/scripts/mysqlbug.sh	2004-04-13 09:00:53.000000000 -0700
-@@ -254,9 +254,9 @@
- if cmp -s $TEMP $TEMP.x
- then
-   echo "File not changed, no bug report submitted."
--  cp $TEMP /tmp/failed-mysql-bugreport
-+  mv -f $TEMP /tmp/failed-mysql-bugreport
-   echo "The raw bug report exists in /tmp/failed-mysql-bugreport"
--  echo "If you use this remember that the first lines of the report now is a lie.."
-+  echo "If you use this remember that the first lines of the report are now a lie.."
-   exit 1
- fi
- 
diff --git a/dev-db/mysql/files/mysql-4.0.18-mysqldmultisecurity.diff b/dev-db/mysql/files/mysql-4.0.18-mysqldmultisecurity.diff
deleted file mode 100644
index b35dabfc3792..000000000000
--- a/dev-db/mysql/files/mysql-4.0.18-mysqldmultisecurity.diff
+++ /dev/null
@@ -1,135 +0,0 @@
---- mysql-4.0.18/scripts/mysqld_multi.sh	2004-02-10 10:16:06.000000000 -0800
-+++ mysql-4.0.19/scripts/mysqld_multi.sh	2004-05-03 14:10:44.000000000 -0700
-@@ -4,12 +4,12 @@
- use POSIX qw(strftime);
- 
- $|=1;
--$VER="2.5";
-+$VER="2.7";
- 
- $opt_config_file   = undef();
- $opt_example       = 0;
- $opt_help          = 0;
--$opt_log           = "/tmp/mysqld_multi.log";
-+$opt_log           = undef();
- $opt_mysqladmin    = "@bindir@/mysqladmin";
- $opt_mysqld        = "@libexecdir@/mysqld";
- $opt_no_log        = 0;
-@@ -18,6 +18,9 @@
- $opt_user          = "root";
- $opt_version       = 0;
- 
-+my $my_print_defaults_exists= 1;
-+my $logdir= undef();
-+
- my ($mysqld, $mysqladmin, $groupids, $homedir, $my_progname);
- 
- $homedir = $ENV{HOME};
-@@ -42,16 +45,41 @@
-     print "Please make sure you have this command available and\n";
-     print "in your path. The command is available from the latest\n";
-     print "MySQL distribution.\n";
-+    $my_print_defaults_exists= 0;
-+  }
-+  if ($my_print_defaults_exists)
-+  {
-+    foreach my $arg (@ARGV)
-+    {
-+      if ($arg =~ m/^--config-file=(.*)/)
-+      {
-+	if (!length($1))
-+	{
-+	  die "Option config-file requires an argument\n";
-+	}
-+	elsif (!( -e $1 && -r $1))
-+	{
-+	  die "Option file '$1' doesn't exists, or is not readable\n";
-+	}
-+	else
-+	{
-+	  $opt_config_file= $1;
-+	}
-+      }
-+    }
-+    my $com= "my_print_defaults ";
-+    $com.= "--config-file=$opt_config_file " if (defined($opt_config_file));
-+    $com.= "mysqld_multi";
-+    my @defops = `$com`;
-+    chop @defops;
-+    splice @ARGV, 0, 0, @defops;
-   }
--  my @defops = `my_print_defaults mysqld_multi`;
--  chop @defops;
--  splice @ARGV, 0, 0, @defops;
-   GetOptions("help","example","version","mysqld=s","mysqladmin=s",
--	     "config-file=s","user=s","password=s","log=s","no-log","tcp-ip")
-+             "config-file=s","user=s","password=s","log=s","no-log","tcp-ip")
-   || die "Wrong option! See $my_progname --help for detailed information!\n";
- 
-+  init_log();
-   $groupids = $ARGV[1];
--
-   if ($opt_version)
-   {
-     print "$my_progname version $VER by Jani Tolonen\n";
-@@ -113,6 +141,45 @@
- }
- 
- ####
-+#### Init log file. Check for appropriate place for log file, in the following
-+#### order my_print_defaults mysqld datadir, @datadir@, /var/log, /tmp
-+####
-+
-+sub init_log
-+{
-+  if ($my_print_defaults_exists)
-+  {
-+    @mysqld_opts= `my_print_defaults mysqld`;
-+    chomp @mysqld_opts;
-+    foreach my $opt (@mysqld_opts)
-+    {
-+      if ($opt =~ m/^\-\-datadir[=](.*)/)
-+      {
-+        if (-d "$1" && -w "$1")
-+        {
-+	  $logdir= $1;
-+        }
-+      }
-+    }
-+  }
-+  if (!defined($logdir))
-+  {
-+    $logdir= "@datadir@" if (-d "@datadir@" && -w "@datadir@");
-+  }
-+  if (!defined($logdir))
-+  {
-+    # Log file was not specified and we could not log to a standard place,
-+    # so log file be disabled for now.
-+    print "WARNING: Log file disabled. Maybe directory/file isn't writable?\n";
-+    $opt_no_log= 1;
-+  }
-+  else
-+  {
-+    $opt_log= "$logdir/mysqld_multi.log";
-+  }
-+}
-+
-+####
- #### Report living and not running MySQL servers
- ####
- 
-@@ -589,12 +656,9 @@
- list. Anything after a white space are ignored.
- 
- Options:
----config-file=...  Alternative config file. NOTE: This will not affect
--                   this program's own options (group [mysqld_multi]),
--                   but only groups [mysqld#]. Without this option everything
--                   will be searched from the ordinary my.cnf file.
-+--config-file=...  Alternative config file.
-                    Using: $opt_config_file
----example          Give an example of a config file. (PLEASE DO CHECK THIS!)
-+--example          Give an example of a config file.
- --help             Print this help and exit.
- --log=...          Log file. Full path to and the name for the log file. NOTE:
-                    If the file exists, everything will be appended.
diff --git a/dev-db/mysql/files/mysql-4.0.18-thrssl.patch b/dev-db/mysql/files/mysql-4.0.18-thrssl.patch
deleted file mode 100644
index 815f23315960..000000000000
--- a/dev-db/mysql/files/mysql-4.0.18-thrssl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mysql-4.0.18/libmysql_r/Makefile.in.orig	2004-03-04 13:47:15.000000000 -0800
-+++ mysql-4.0.18/libmysql_r/Makefile.in	2004-03-04 13:48:48.000000000 -0800
-@@ -135,7 +135,7 @@
- LDFLAGS = @LDFLAGS@
- LIBDL = @LIBDL@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@ @openssl_libs@
-+LIBS = @CLIENT_LIBS@ @openssl_libs@
- LIBTOOL = @LIBTOOL@
- LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
- LM_CFLAGS = @LM_CFLAGS@
-@@ -277,7 +277,7 @@
- uname_prog = @uname_prog@
- vio_dir = @vio_dir@
- vio_libs = @vio_libs@
--target_defs = -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
-+target_defs = -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@ -DMYSQL_CLIENT
- 
- INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include \
- 		-I$(srcdir)/.. -I$(top_srcdir) -I.. $(openssl_includes)
diff --git a/dev-db/mysql/files/mysql-4.0.24-asm-pic-fixes.patch b/dev-db/mysql/files/mysql-4.0.24-asm-pic-fixes.patch
deleted file mode 100644
index ff6e128fe246..000000000000
--- a/dev-db/mysql/files/mysql-4.0.24-asm-pic-fixes.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-PIC fixes for MySQL. Makes the ASM PIC-compatible, so that it works with PaX.
-See http://bugs.gentoo.org/show_bug.cgi?id=42968 This patch authored by
-pageexec AT freemail.hu.
-
---- mysql-4.0.24/strings/longlong2str-x86.s	2005-03-05 00:38:14.000000000 +0000
-+++ mysql-4.0.24-fixed/strings/longlong2str-x86.s	2005-05-17 01:37:52.000000000 +0100
-@@ -19,6 +19,13 @@
- 	.file	"longlong2str.s"
- 	.version "1.01"
- 
-+	.section	rodata
-+	.align 32
-+	.type	_dig_vec, @object
-+	.size	_dig_vec, 37
-+_dig_vec:
-+	.string "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-+
- .text
- 	.align 4
- 
-@@ -31,11 +38,14 @@ longlong2str:
- 	pushl %esi
- 	pushl %edi
- 	pushl %ebx
-+
-+	call __i686.get_pc_thunk.bx
-+	addl $_GLOBAL_OFFSET_TABLE_,%ebx
-+
- 	movl 100(%esp),%esi	# Lower part of val 
- 	movl 104(%esp),%ebp	# Higher part of val 
- 	movl 108(%esp),%edi	# get dst 
--	movl 112(%esp),%ebx	# Radix 
--	movl %ebx,%eax
-+	movl 112(%esp),%eax	# Radix 
- 	testl %eax,%eax
- 	jge .L144
- 
-@@ -50,7 +60,7 @@ longlong2str:
- 	adcl $0,%ebp
- 	negl %ebp
- .L146:
--	negl %ebx		# Change radix to positive 
-+	negl 112(%esp)		# Change radix to positive 
- 	jmp .L148
- 	.align 4
- .L144:
-@@ -77,12 +87,12 @@ longlong2str:
- 
- 	movl %ebp,%eax		# High part of value 
- 	xorl %edx,%edx
--	divl %ebx
-+	divl 112(%esp)
- 	movl %eax,%ebp
- 	movl %esi,%eax
--	divl %ebx
-+	divl 112(%esp)
- 	movl %eax,%esi		# quotent in ebp:esi 
--	movb _dig_vec(%edx),%al   # al is faster than dl 
-+	movb _dig_vec@GOTOFF(%ebx,%edx),%al   # al is faster than dl 
- 	decl %ecx
- 	movb %al,(%ecx)		# store value in buff 
- 	.align 4
-@@ -93,14 +103,13 @@ longlong2str:
- 	jl .L153
- 	je .L160		# Ready 
- 	movl %esi,%eax
--	movl $_dig_vec,%ebp
- 	.align 4
- 
- .L154:				# Do rest with integer precision 
- 	cltd
--	divl %ebx
-+	divl 112(%esp)
- 	decl %ecx
--	movb (%edx,%ebp),%dl	# bh is always zero as ebx=radix < 36 
-+	movb _dig_vec@GOTOFF(%ebx,%edx),%dl
- 	testl %eax,%eax
- 	movb %dl,(%ecx)
- 	jne .L154
-@@ -138,3 +147,13 @@ longlong10_to_str:
- 
- .L10end:
- 	.size	 longlong10_to_str,.L10end-longlong10_to_str
-+
-+	.section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
-+.globl __i686.get_pc_thunk.bx
-+	.hidden	__i686.get_pc_thunk.bx
-+	.type	__i686.get_pc_thunk.bx, @function
-+__i686.get_pc_thunk.bx:
-+	movl	(%esp), %ebx
-+	ret
-+
-+	.section	.note.GNU-stack,"",@progbits
-diff -Nurp mysql-4.0.24/strings/strings-x86.s mysql-4.0.24-fixed/strings/strings-x86.s
---- mysql-4.0.24/strings/strings-x86.s	2005-03-05 00:38:15.000000000 +0000
-+++ mysql-4.0.24-fixed/strings/strings-x86.s	2005-05-17 01:37:47.000000000 +0100
-@@ -403,3 +403,5 @@ next_str:
- 	ret
- .strxmov_end:
- 	.size	 strxmov,.strxmov_end-strxmov
-+
-+	.section	.note.GNU-stack,"",@progbits
diff --git a/dev-db/mysql/files/mysql-4.0.4-install-db-sh.diff b/dev-db/mysql/files/mysql-4.0.4-install-db-sh.diff
deleted file mode 100644
index a5c23fd7607c..000000000000
--- a/dev-db/mysql/files/mysql-4.0.4-install-db-sh.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- mysql-4.0.4_beta/scripts/mysql_install_db.sh.orig	2002-11-20 12:59:08.000000000 -0500
-+++ mysql-4.0.4_beta/scripts/mysql_install_db.sh	2002-11-20 13:00:11.000000000 -0500
-@@ -327,16 +327,11 @@
- END_OF_DATA
- then
-   echo ""
--  if test "$IN_RPM" -eq 0
--  then
--    echo "To start mysqld at boot time you have to copy support-files/mysql.server"
--    echo "to the right place for your system"
--    echo
--  fi
-   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-   echo "This is done with:"
--  echo "$bindir/mysqladmin -u root password 'new-password'"
-+  echo "/etc/init.d/mysql start (you have to start the server first!)"
-   echo "$bindir/mysqladmin -u root -h $hostname password 'new-password'"
-+  echo "$bindir/mysqladmin -u root password 'new-password'"
-   echo "See the manual for more instructions."
-   #
-   # Print message about upgrading unless we have created a new db table.
-@@ -348,15 +343,6 @@
-     echo "able to use the new GRANT command!"
-   fi
-   echo
--  if test "$IN_RPM" -eq 0
--  then
--    echo "You can start the MySQL daemon with:"
--    echo "cd @prefix@ ; $bindir/mysqld_safe &"
--    echo
--    echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:"
--    echo "cd sql-bench ; perl run-all-tests"
--    echo
--  fi
-   echo "Please report any problems with the @scriptdir@/mysqlbug script!"
-   echo
-   echo "The latest information about MySQL is available on the web at"
-
-
diff --git a/dev-db/mysql/files/mysql-4.0.rc6 b/dev-db/mysql/files/mysql-4.0.rc6
deleted file mode 100644
index 1fc5add5bf83..000000000000
--- a/dev-db/mysql/files/mysql-4.0.rc6
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-4.0.rc6,v 1.8 2004/07/14 21:41:15 agriffis Exp $
-
-depend() {
-	need net
-	use dns
-}
-
-checkconfig() {
-	if [ ! -f /etc/mysql/my.cnf ] ; then
-		eerror "No /etc/mysql/my.cnf file exists!"
-	fi
-
-    dir=`my_print_defaults mysqld | grep -- --datadir | sed -e "s|^.*=\(.*\)|\1|"`
-
-	if [ ! -d $dir/mysql ] ; then
-		eerror "You dont appear to have the mysql database installed yet."
-		eerror "Please run /usr/bin/mysql_install_db to have this done..."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting mysqld"
-	start-stop-daemon --start --quiet --exec /usr/bin/mysqld_safe \
-		--background -- >/dev/null 2>&1
-	eend $?
-}
-
-stop () {
-	ebegin "Stopping mysqld"
-	start-stop-daemon --stop --quiet --pidfile=/var/run/mysqld/mysqld.pid
-	eend $?
-}
diff --git a/dev-db/mysql/files/mysql-4.1.12-asm-pic-fixes.patch b/dev-db/mysql/files/mysql-4.1.12-asm-pic-fixes.patch
deleted file mode 100644
index fb1ba1f851d6..000000000000
--- a/dev-db/mysql/files/mysql-4.1.12-asm-pic-fixes.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-PIC fixes for MySQL. Makes the ASM PIC-compatible, so that it works with PaX.
-See http://bugs.gentoo.org/show_bug.cgi?id=42968 This patch authored by
-pageexec AT freemail.hu. Ported to 4.1.12 by robbat2@gentoo.org.
-
-diff -NuarwbB mysql.orig/strings/longlong2str-x86.s mysql/strings/longlong2str-x86.s
---- mysql.orig/strings/longlong2str-x86.s	2005-05-13 04:32:11.000000000 -0700
-+++ mysql/strings/longlong2str-x86.s	2005-05-17 00:13:25.000000000 -0700
-@@ -19,6 +19,13 @@
- 	.file	"longlong2str.s"
- 	.version "1.01"
- 
-+	.section	rodata
-+	.align 32
-+	.type	_dig_vec, @object
-+	.size	_dig_vec, 37
-+_dig_vec:
-+	.string "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-+
- .text
- 	.align 4
- 
-@@ -31,11 +38,14 @@
- 	pushl %esi
- 	pushl %edi
- 	pushl %ebx
-+
-+	call __i686.get_pc_thunk.bx
-+	addl $_GLOBAL_OFFSET_TABLE_,%ebx
-+
- 	movl 100(%esp),%esi	# Lower part of val 
- 	movl 104(%esp),%ebp	# Higher part of val 
- 	movl 108(%esp),%edi	# get dst 
--	movl 112(%esp),%ebx	# Radix 
--	movl %ebx,%eax
-+	movl 112(%esp),%eax	# Radix 
- 	testl %eax,%eax
- 	jge .L144
- 
-@@ -50,7 +60,7 @@
- 	adcl $0,%ebp
- 	negl %ebp
- .L146:
--	negl %ebx		# Change radix to positive 
-+	negl 112(%esp)		# Change radix to positive 
- 	jmp .L148
- 	.align 4
- .L144:
-@@ -77,13 +87,13 @@
- 
- 	movl %ebp,%eax		# High part of value 
- 	xorl %edx,%edx
--	divl %ebx
-+	divl 112(%esp)
- 	movl %eax,%ebp
- 	movl %esi,%eax
--	divl %ebx
-+	divl 112(%esp)
- 	decl %ecx
- 	movl %eax,%esi		# quotent in ebp:esi 
--	movb _dig_vec_upper(%edx),%al   # al is faster than dl 
-+	movb _dig_vec@GOTOFF(%ebx,%edx),%al   # al is faster than dl 
- 	movb %al,(%ecx)		# store value in buff 
- 	.align 4
- .L155:
-@@ -93,14 +103,13 @@
- 	jl .L153
- 	je .L10_mov		# Ready 
- 	movl %esi,%eax
--	movl $_dig_vec_upper,%ebp
- 	.align 4
- 
- .L154:				# Do rest with integer precision 
- 	cltd
--	divl %ebx
-+	divl 112(%esp)
- 	decl %ecx
--	movb (%edx,%ebp),%dl	# bh is always zero as ebx=radix < 36 
-+	movb _dig_vec@GOTOFF(%ebx,%edx),%dl
- 	testl %eax,%eax
- 	movb %dl,(%ecx)
- 	jne .L154
-@@ -221,3 +230,13 @@
- 
- .L10end:
- 	.size	 longlong10_to_str,.L10end-longlong10_to_str
-+
-+	.section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
-+.globl __i686.get_pc_thunk.bx
-+	.hidden	__i686.get_pc_thunk.bx
-+	.type	__i686.get_pc_thunk.bx, @function
-+__i686.get_pc_thunk.bx:
-+	movl	(%esp), %ebx
-+	ret
-+
-+	.section	.note.GNU-stack,"",@progbits
-diff -NuarwbB mysql.orig/strings/strings-x86.s mysql/strings/strings-x86.s
---- mysql.orig/strings/strings-x86.s	2005-05-13 04:32:40.000000000 -0700
-+++ mysql/strings/strings-x86.s	2005-05-17 00:11:56.000000000 -0700
-@@ -415,3 +415,5 @@
- 	ret
- .strxmov_end:
- 	.size	 strxmov,.strxmov_end-strxmov
-+
-+	.section	.note.GNU-stack,"",@progbits
diff --git a/dev-db/mysql/files/mysql-gentoo-nptl.diff b/dev-db/mysql/files/mysql-gentoo-nptl.diff
deleted file mode 100644
index fabeb6cf423d..000000000000
--- a/dev-db/mysql/files/mysql-gentoo-nptl.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ruN mysql-4.0.17/configure.in mysql-4.0.17-nptl/configure.in
---- mysql-4.0.17/configure.in	2003-12-14 16:23:49.000000000 -0500
-+++ mysql-4.0.17-nptl/configure.in	2004-02-07 12:00:00.715528784 -0500
-@@ -1191,7 +1191,10 @@
- then
-   # Look for LinuxThreads.
-   AC_MSG_CHECKING("LinuxThreads")
--    res=`grep Linuxthreads /usr/include/pthread.h 2>/dev/null | wc -l`
-+   # res=`grep Linuxthreads /usr/include/pthread.h 2>/dev/null | wc -l`
-+   # All gentoo systems support this stuff, and this is an improper detection
-+   # for LinuxThreads anyhow, always set the result to 1
-+   res=1
-     if test "$res" -gt 0
-     then
-       AC_MSG_RESULT("Found")
diff --git a/dev-db/mysql/files/rebuilder.sh b/dev-db/mysql/files/rebuilder.sh
deleted file mode 100644
index d0b7c1e8ac05..000000000000
--- a/dev-db/mysql/files/rebuilder.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/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}.*
-
-echo "This might take a while ..."
-(
-	cd /
-    # 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
-		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
-			echo "`echo $i | sed -e 's|^\.||'` is linked to ${LINKED_WITH} ..."
-			ldd $i
-			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
-
-echo "You will need to rebuild the following packages:"
-echo "------------"
-cat /tmp/${LINKED_WITH}.rebuildme | grep -v "dev-db/mysql"
-echo "------------"