Finished the removal of patches from $FILESDIR. All the patches are downloaded separately now.

(Portage version: 2.0.52-r1)

43 files changed, 121 insertions, 1409 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index b2ac1004c7ac..ccb03aa1351f 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,32 @@
 # 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.239 2005/09/20 09:36:09 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.240 2005/09/20 15:29:32 vivo Exp $
+
+  20 Sep 2005; Francesco Riosa <vivo@gentoo.org>
+  -files/mysql-3.23.52-install-db-sh.diff,
+  -files/mysql-3.23-safe-mysqld-sh.diff,
+  -files/mysql-4.0.14-r1-tcpd-vars-fix.diff,
+  -files/mysql-4.0.18-gentoo-nptl.diff,
+  -files/mysql-4.0.18-mysqld-safe-sh.diff,
+  -files/mysql-4.0.21-install-db-sh.diff, -files/mysql-4.0.21-thrssl.patch,
+  -files/mysql-4.0.23-install-db-sh.diff,
+  -files/mysql-4.0.24-manual.texi.patch,
+  -files/mysql-4.0.25-r2-asm-pic-fixes.patch,
+  -files/mysql-4.0-my-print-defaults.diff,
+  -files/mysql-4.0-mysqlhotcopy-security.patch,
+  -files/mysql-4.0-nisam.h.diff, -files/mysql-4.1.9-thrssl.patch,
+  -files/010_all_my-print-defaults-r2.patch,
+  -files/035_x86_asm-pic-fixes-r1.patch,
+  -files/035_x86_asm-pic-fixes-r2.patch,
+  -files/701_all_test-myisam-geometry.patch,
+  -files/mysql-3.23-my-print-defaults.diff,
+  -files/703_all_test-rpl_rotate_logs.patch, -files/mysql-3.23-nisam.h.diff,
+  -files/mysql-accesstmp.patch, -files/mysql-test-myisam-geometry.patch,
+  mysql-3.23.58-r1.ebuild, mysql-4.0.22.ebuild, mysql-4.0.22-r2.ebuild,
+  mysql-4.0.24.ebuild, mysql-4.0.25-r2.ebuild, mysql-4.0.26.ebuild,
+  mysql-4.1.13-r1.ebuild, mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild:
+  Finished the removal of patches from $FILESDIR. All the patches are downloaded
+  separately now.
 
   20 Sep 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.26.ebuild,
   mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild:
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 56773ee89cd6..55df05c6323c 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,29 +1,29 @@
-MD5 764d5742304c74c3a41ca2751a33bfbb mysql-5.0.12_beta.ebuild 17973
-MD5 2dd5ddcd96ed408fcd1af172ff996f01 mysql-4.1.14.ebuild 17719
-MD5 ef94182bd884e7175eda8f59076ca3f6 mysql-4.0.26.ebuild 14869
-MD5 52296a66343439f293d84dd33ed3eef8 mysql-4.1.13-r1.ebuild 17218
-MD5 d168c71df57729ea0eeadab3c6a59f43 mysql-4.0.22.ebuild 8768
-MD5 92fc2eaf2ef09d494ee45b25e57c6087 mysql-4.0.22-r2.ebuild 9569
-MD5 0cfd7831f2d57b93e252c0f3d9c25276 mysql-3.23.58-r1.ebuild 7063
-MD5 de9bc44b9100cfff7b5ee2296d727910 mysql-4.0.24.ebuild 9840
+MD5 5bb79b3d0149b95e9d42a71db3360503 mysql-5.0.12_beta.ebuild 17973
+MD5 f954940ea77235db20f32f68faa1bf95 mysql-4.1.14.ebuild 17719
+MD5 8ae1f2ce78d16a46adec273f324cc5c0 mysql-4.0.26.ebuild 14869
+MD5 c37dbfa3f113b518d82894277315852c mysql-4.1.13-r1.ebuild 17350
+MD5 33af8468220fc2d57b7ed5591a1c5469 mysql-4.0.22.ebuild 8970
+MD5 07d04db1e3fa07cb3a2b3871f8a349d3 mysql-4.0.22-r2.ebuild 9843
+MD5 ebee15146545330483d344545b133d56 mysql-3.23.58-r1.ebuild 7248
+MD5 d398667334e1fedc166e5f33bed4e8f0 mysql-4.0.24.ebuild 9862
 MD5 97a485cb772abccc2443d5ef4e2ed3cc ChangeLog 41837
 MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
-MD5 06056877b1940a0df66415d32bbe782c mysql-4.0.25-r2.ebuild 13805
+MD5 59d451ef52357f6fb5b957f75ed3fc57 mysql-4.0.25-r2.ebuild 13812
 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 5990b9d1cb5ba35bb7c9d56a00d10f58 files/digest-mysql-4.1.13-r1 139
 MD5 237315cdafd5415390df78dec50669e9 files/035_x86_asm-pic-fixes-r2.patch 8201
 MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187
-MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58-r1 67
+MD5 c6fcd70c34bed04e59808ec71c5bedfb files/digest-mysql-3.23.58-r1 140
 MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
 MD5 58c4d09c5c2712254b1881a6fcc7abff files/mysql-4.0.18-gentoo-nptl.diff 587
-MD5 ae611d4c9c9ace8e80092ae9568ce22e files/digest-mysql-5.0.12_beta 144
+MD5 0c3c016fee3edff9a0585290e58f1c26 files/digest-mysql-5.0.12_beta 144
 MD5 087f3fbbe8e3385f5408d91cb661aace files/mysql-4.0-mysqlhotcopy-security.patch 1394
-MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22 66
-MD5 a752e07babd8812e2bd5629470fc9578 files/digest-mysql-4.0.24 139
-MD5 dd06ee73caa6600251957b2c3c0e14c7 files/digest-mysql-4.0.26 139
-MD5 9e4f32959c5991f8d89f1d5d7eff604b files/digest-mysql-4.1.14 139
+MD5 631ed23db7ff8777599dee1c45edae0f files/digest-mysql-4.0.22 139
+MD5 1a7299f19831c9bc9930bd76f381da80 files/digest-mysql-4.0.24 139
+MD5 201c8b31cd9eb58eec712e37d6f0c328 files/digest-mysql-4.0.26 139
+MD5 4e6e76e3945e29b6795ce6d1a66bc98f files/digest-mysql-4.1.14 139
 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
@@ -47,6 +47,6 @@ MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 46
 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 a0f56eeed1704232e3b56ecba599d38a files/digest-mysql-4.0.22-r2 139
-MD5 6799fc7139b1044f7c9f84f29ccc6015 files/digest-mysql-4.0.25-r2 139
+MD5 631ed23db7ff8777599dee1c45edae0f files/digest-mysql-4.0.22-r2 139
+MD5 0feb3b501c47708ea13707c8e4cdde9c files/digest-mysql-4.0.25-r2 139
 MD5 a868ff3e6a328acbed6842fdd17c8cdf files/035_x86_asm-pic-fixes-r1.patch 4102
diff --git a/dev-db/mysql/files/010_all_my-print-defaults-r2.patch b/dev-db/mysql/files/010_all_my-print-defaults-r2.patch
deleted file mode 100644
index 656930de04ec..000000000000
--- a/dev-db/mysql/files/010_all_my-print-defaults-r2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-###MY_VER_RANGE  [5.0.6_beta,)
---- mysql.old/mysys/default.c	2005-05-22 02:35:25.000000000 +0200
-+++ mysql/mysys/default.c	2005-05-22 02:36:17.000000000 +0200
-@@ -823,19 +823,19 @@
-     5. ""
- 
-   On Novell NetWare, this is:
--    1. sys:/etc/
-+    1. sys:/etc/mysql/
-     2. getenv(DEFAULT_HOME_ENV)
-     3. ""
- 
-   On OS/2, this is:
-     1. getenv(ETC)
--    2. /etc/
-+    2. /etc/mysql/
-     3. getenv(DEFAULT_HOME_ENV)
-     4. ""
-     5. "~/"
- 
-   Everywhere else, this is:
--    1. /etc/
-+    1. /etc/mysql/
-     2. getenv(DEFAULT_HOME_ENV)
-     3. ""
-     4. "~/"
-@@ -860,13 +860,13 @@
- #endif
- 
- #elif defined(__NETWARE__)
--  *ptr++= "sys:/etc/";
-+  *ptr++= "sys:/etc/mysql/";
- #else
- #if defined(__EMX__) || defined(OS2)
-   if ((env= getenv("ETC")))
-     *ptr++= env;
- #endif
--  *ptr++= "/etc/";
-+  *ptr++= "/etc/mysql/";
- #endif
-   if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
-     *ptr++= env;
diff --git a/dev-db/mysql/files/035_x86_asm-pic-fixes-r1.patch b/dev-db/mysql/files/035_x86_asm-pic-fixes-r1.patch
deleted file mode 100644
index 6d6293d7a1a5..000000000000
--- a/dev-db/mysql/files/035_x86_asm-pic-fixes-r1.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-###MY_VER_RANGE [4.1,4.1.13-r1)
-diff -Nurp mysql/strings/longlong2str-x86.s mysql-fixed/strings/longlong2str-x86.s
---- mysql/strings/longlong2str-x86.s	2005-05-13 12:32:11.000000000 +0100
-+++ mysql-fixed/strings/longlong2str-x86.s	2005-05-25 01:19:32.000000000 +0100
-@@ -19,6 +19,13 @@
- 	.file	"longlong2str.s"
- 	.version "1.01"
- 
-+	.section	.rodata
-+	.align 32
-+	.type	_dig_vec_upper, @object
-+	.size	_dig_vec_upper, 37
-+_dig_vec_upper:
-+	.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,13 +87,13 @@ 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)
- 	decl %ecx
- 	movl %eax,%esi		# quotent in ebp:esi 
--	movb _dig_vec_upper(%edx),%al   # al is faster than dl 
-+	movb _dig_vec_upper@GOTOFF(%ebx,%edx),%al   # al is faster than dl
- 	movb %al,(%ecx)		# store value in buff 
- 	.align 4
- .L155:
-@@ -93,14 +103,13 @@ longlong2str:
- 	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_upper@GOTOFF(%ebx,%edx),%dl
- 	testl %eax,%eax
- 	movb %dl,(%ecx)
- 	jne .L154
-@@ -137,9 +146,6 @@ longlong2str:
- #	
- 
- 	.align 4
--.Ltmp:
--        .long 0xcccccccd
--	.align 4
- 	
- .globl	longlong10_to_str
- 	.type	 longlong10_to_str,@function
-@@ -202,7 +208,7 @@ longlong10_to_str:
- 
- 	# The following code uses some tricks to change division by 10 to
- 	# multiplication and shifts
--	movl .Ltmp,%esi		# set %esi to 0xcccccccd
-+	movl $0xcccccccd,%esi	# set %esi to 0xcccccccd
- 	
- .L10_40:
-         movl %ebx,%eax
-@@ -221,3 +227,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/strings/my_strtoll10-x86.s mysql-fixed/strings/my_strtoll10-x86.s
---- mysql/strings/my_strtoll10-x86.s	2005-05-13 12:32:22.000000000 +0100
-+++ mysql-fixed/strings/my_strtoll10-x86.s	2005-05-25 01:13:23.000000000 +0100
-@@ -18,7 +18,7 @@
- 	
- 	.file	"my_strtoll10-x86.s"
- 	.version "01.01"
--.data
-+.section .rodata
- 	.align 32
- 	.type	 lfactor,@object
- 	.size	 lfactor,36
-@@ -315,7 +315,11 @@ my_strtoll10:
- .Lend_i_and_j:
- 	movl %esi,%ecx
- 	subl -12(%ebp),%ecx	# ecx= number of digits in second part
--	movl lfactor(,%ecx,4),%eax
-+
-+	call __i686.get_pc_thunk.bx
-+	addl $_GLOBAL_OFFSET_TABLE_,%ebx
-+
-+	movl lfactor@GOTOFF(%ebx,%ecx,4),%eax
- 	jmp .L523
- 
- 	# Return -8(%ebp) * $1000000000 + edi
-@@ -400,3 +404,13 @@ my_strtoll10:
-         .comm   end_ptr,120,32
-         .comm   error,120,32
- 	.ident	"Monty"
-+
-+	.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/strings/strings-x86.s mysql-fixed/strings/strings-x86.s
---- mysql/strings/strings-x86.s	2005-05-13 12:32:40.000000000 +0100
-+++ mysql-fixed/strings/strings-x86.s	2005-05-23 23:19:13.000000000 +0100
-@@ -415,3 +415,5 @@ next_str:
- 	ret
- .strxmov_end:
- 	.size	 strxmov,.strxmov_end-strxmov
-+
-+	.section	.note.GNU-stack,"",@progbits
diff --git a/dev-db/mysql/files/035_x86_asm-pic-fixes-r2.patch b/dev-db/mysql/files/035_x86_asm-pic-fixes-r2.patch
deleted file mode 100644
index 4a089a315f68..000000000000
--- a/dev-db/mysql/files/035_x86_asm-pic-fixes-r2.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-###MY_VER_RANGE [4.1.13-r1,4.1.13-r1] [5.0.9_beta-r2,5.0.9_beta-r2]
-diff -aur mysql.orig/strings/longlong2str-x86.s mysql.notextrel/strings/longlong2str-x86.s
---- mysql.orig/strings/longlong2str-x86.s	2005-07-26 17:52:18.000000000 +0200
-+++ mysql.notextrel/strings/longlong2str-x86.s	2005-07-26 19:29:23.000000000 +0200
-@@ -13,8 +13,9 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
--# Optimized longlong2str function for Intel 80x86  (gcc/gas syntax) 
--# Some set sequences are optimized for pentuimpro II 
-+# longlong2str function for Intel 80x86  (gcc/gas syntax) 
-+
-+# See longlong2str(dst,radix,val) description in longlong2str.c.
- 
- 	.file	"longlong2str.s"
- 	.version "1.01"
-@@ -24,99 +25,88 @@
- 
- .globl	longlong2str
- 	.type	 longlong2str,@function
--	
-+
- longlong2str:
--	subl $80,%esp
-+	subl  $80,%esp          # Temporary buffer for up to 64 radix-2 digits
- 	pushl %ebp
- 	pushl %esi
- 	pushl %edi
- 	pushl %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
--	testl %eax,%eax
--	jge .L144
--
--	addl $36,%eax
--	cmpl $34,%eax
--	ja .Lerror		# Wrong radix 
-+
-+	movl  100(%esp),%esi	# esi = Lower part of val 
-+	movl  112(%esp),%ebx	# ebx = Radix
-+	movl  104(%esp),%ebp	# ebp = Higher part of val 
-+	movl  108(%esp),%edi    # edi -> dst
-+		 
-+	testl %ebx,%ebx
-+	jge   .L144             # (Radix >= 0)
-+
- 	testl %ebp,%ebp
--	jge .L146
--	movb $45,(%edi)		# Add sign 
--	incl %edi		# Change sign of val 
--	negl %esi
--	adcl $0,%ebp
--	negl %ebp
-+	jge   .L146             # (Higher part of val >= 0)
-+	movb  $45,(%edi)	# Add '-' sign 
-+	incl  %edi
-+	negl  %esi              # Change val to positive
-+	adcl  $0,%ebp
-+	negl  %ebp
- .L146:
--	negl %ebx		# Change radix to positive 
--	jmp .L148
--	.align 4
-+	negl  %ebx		# Change radix to positive 
- .L144:
--	addl $-2,%eax
--	cmpl $34,%eax
--	ja .Lerror		# Radix in range 
-+	cmpl  $36,%ebx          # Radix must be between 2 and 36
-+	ja    .Lerror		# (Radix not in range)
-+	cmpl  $2,%ebx
-+	jb    .Lerror		# (Radix not in range)
-+
-+	movl  %esi,%eax         # eax = lower part of val ...
-+	orl   %ebp,%eax         # and it stays thus if ebp=0
-+	je    Lzero             # (Treat zero as special case)
- 
--.L148:
--	movl %esi,%eax		# Test if zero (for easy loop) 
--	orl %ebp,%eax
--	jne .L150
--	movb $48,(%edi)
--	incl %edi
--	jmp .L10_end
--	.align 4
--
--.L150:
--	leal 92(%esp),%ecx	# End of buffer 
--	jmp  .L155
--	.align 4
--
--.L153:
--	# val is stored in in ebp:esi 
--
--	movl %ebp,%eax		# High part of value 
--	xorl %edx,%edx
--	divl %ebx
--	movl %eax,%ebp
--	movl %esi,%eax
--	divl %ebx
--	decl %ecx
--	movl %eax,%esi		# quotent in ebp:esi 
--	movb _dig_vec_upper(%edx),%al   # al is faster than dl 
--	movb %al,(%ecx)		# store value in buff 
--	.align 4
--.L155:
-+	leal  92(%esp),%ecx     # ecx -> End of temporary buffer
-+	
- 	testl %ebp,%ebp
--	ja .L153
--	testl %esi,%esi		# rest value 
--	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
--	decl %ecx
--	movb (%edx,%ebp),%dl	# bh is always zero as ebx=radix < 36 
--	testl %eax,%eax
--	movb %dl,(%ecx)
--	jne .L154
--
--.L10_mov:
--	movl %ecx,%esi
--	leal 92(%esp),%ecx	# End of buffer 
--	subl %esi,%ecx
--	rep
--	movsb
--
--.L10_end:
--	movl %edi,%eax		# Pointer to end null 
--	movb $0,(%edi)		# Store the end null 
--
--.L165:
-+	je    Llow              # (Higher part of val = 0)
-+	
-+Lhigh:
-+	#val in ebp:esi. div the high part by the radix,
-+        #then div remainder + low part by the radix.
-+	movl  %ebp,%eax	  	# edx=0,eax=high(from ebp) 
-+	xorl  %edx,%edx
-+        decl  %ecx
-+        divl  %ebx         
-+	movl  %eax,%ebp         # edx=result of last, eax=low(from esi)
-+	movl  %esi,%eax    
-+	divl  %ebx
-+	movl  %eax,%esi	  	# ebp:esi = quotient 
-+	movb  %dl,(%ecx)        # store byte in temporary buffer
-+	testl %ebp,%ebp 
-+	jne   Lhigh             # (Higher part of val still > 0)
-+
-+Llow:
-+	#val in 0:eax. div 0 + low part by the radix.
-+	xorl  %edx,%edx
-+        decl  %ecx
-+	divl  %ebx
-+ 	movb  %dl,(%ecx)        # store byte in temporary buffer
-+        testl %eax,%eax
-+	jne   Llow              # (Lower part of val still <> 0)
-+
-+	leal  92(%esp),%esi     # esi -> End of temporary buffer
-+
-+Lmov:
-+	movb  (%ecx),%dl        # dl = byte from temporary buffer
-+	movb  $-1,%bl
-+	cmpb  $10,%dl           # add 7 if dl > '9'
-+	adcb  $0,%bl
-+	addb  $48,%dl           # add '0'  
-+	andb  $7,%bl
-+	addb  %bl,%dl
-+        incl  %ecx
-+	movb  %dl,(%edi)        # put dl in dst
-+	incl  %edi
-+	cmpl  %ecx,%esi
-+	ja    Lmov              # (more bytes exist in temporary buffer)
-+	movb  $0,(%edi)         # trailing '\0' in dst
-+	movl  %edi,%eax		# eax = return value = pointer to '\0'
-+.Lret:
- 	popl %ebx
- 	popl %edi
- 	popl %esi
-@@ -126,20 +116,28 @@
- 
- .Lerror:
- 	xorl %eax,%eax		# Wrong radix 
--	jmp .L165
-+	jmp .Lret
- 
--.Lfe3:
--	.size	 longlong2str,.Lfe3-longlong2str
-+Lzero:
-+        # Treat 0 as a special case. Unnecessary but we
-+	# expect 0 will be frequent.
-+	movl  108(%esp),%eax    # eax = dst
-+	popl  %ebx
-+        movb  $48,(%eax)        # '0'
-+	popl  %edi
-+        incl  %eax
-+	popl  %esi
-+	popl  %ebp
-+	addl  $80,%esp
-+        movb  $0,(%eax)         # '\0'
-+	ret
- 
- #
- # This is almost equal to the above, except that we can do the final
- # loop much more efficient	
--#	
-+#
- 
- 	.align 4
--.Ltmp:
--        .long 0xcccccccd
--	.align 4
- 	
- .globl	longlong10_to_str
- 	.type	 longlong10_to_str,@function
-@@ -202,7 +200,7 @@
- 
- 	# The following code uses some tricks to change division by 10 to
- 	# multiplication and shifts
--	movl .Ltmp,%esi		# set %esi to 0xcccccccd
-+	movl $0xcccccccd,%esi   # set %esi to 0xcccccccd
- 	
- .L10_40:
-         movl %ebx,%eax
-@@ -217,7 +215,30 @@
-         movl %edx,%ebx
-         testl %ebx,%ebx
- 	jne .L10_40
--	jmp .L10_mov		# Shared end with longlong10_to_str
-+#	jmp .L10_mov		# Shared end with longlong10_to_str
-+
- 
-+.L10_mov:
-+	movl %ecx,%esi
-+	leal 92(%esp),%ecx	# End of buffer 
-+	subl %esi,%ecx
-+	rep
-+	movsb
-+
-+.L10_end:
-+	movl %edi,%eax		# Pointer to end null 
-+	movb $0,(%edi)		# Store the end null 
-+
-+.L165:
-+	popl %ebx
-+	popl %edi
-+	popl %esi
-+	popl %ebp
-+	addl $80,%esp
-+	ret
-+	
- .L10end:
- 	.size	 longlong10_to_str,.L10end-longlong10_to_str
-+
-+	.section    .note.GNU-stack,"",@progbits
-+
-diff -aur mysql.orig/strings/my_strtoll10-x86.s mysql.notextrel/strings/my_strtoll10-x86.s
---- mysql.orig/strings/my_strtoll10-x86.s	2005-07-26 17:52:18.000000000 +0200
-+++ mysql.notextrel/strings/my_strtoll10-x86.s	2005-07-26 19:29:33.000000000 +0200
-@@ -18,20 +18,7 @@
- 	
- 	.file	"my_strtoll10-x86.s"
- 	.version "01.01"
--.data
--	.align 32
--	.type	 lfactor,@object
--	.size	 lfactor,36
--lfactor:
--	.long 1
--	.long 10
--	.long 100
--	.long 1000
--	.long 10000
--	.long 100000
--	.long 1000000
--	.long 10000000
--	.long 100000000
-+
- .text
- 	.align 4
- 	
-@@ -315,9 +302,32 @@
- .Lend_i_and_j:
- 	movl %esi,%ecx
- 	subl -12(%ebp),%ecx	# ecx= number of digits in second part
--	movl lfactor(,%ecx,4),%eax
--	jmp .L523
--
-+	movl $1,%eax
-+	cmpb $0,%cl
-+	je .L523		# 0 so 1
-+	movl $10,%eax
-+	cmpb $1,%cl
-+	je .L523		# 1 so 10
-+	movl $100,%eax
-+	cmpb $2,%cl
-+	je .L523		# 2 so 100
-+	movl $1000,%eax
-+	cmpb $3,%cl
-+	je .L523		# 3 so 1000
-+	movl $10000,%eax
-+	cmpb $4,%cl
-+	je .L523		# 4 so 10000
-+	movl $100000,%eax
-+	cmpb $5,%cl
-+	je .L523		# 5 so 100000
-+	movl $1000000,%eax
-+	cmpb $6,%cl
-+	je .L523		# 6 so 1000000
-+	movl $10000000,%eax
-+	cmpb $7,%cl
-+	je .L523		# 7 so 10000000
-+	movl $100000000,%eax
-+	jmp .L523		# 8 so 100000000
- 	# Return -8(%ebp) * $1000000000 + edi
- 	.p2align 4,,7
- .Lend3:
-@@ -400,3 +410,6 @@
-         .comm   end_ptr,120,32
-         .comm   error,120,32
- 	.ident	"Monty"
-+
-+	.section    .note.GNU-stack,"",@progbits
-+
-diff -aur mysql.orig/strings/strings-x86.s mysql.notextrel/strings/strings-x86.s
---- mysql.orig/strings/strings-x86.s	2005-07-26 17:52:18.000000000 +0200
-+++ mysql.notextrel/strings/strings-x86.s	2005-07-26 19:29:42.000000000 +0200
-@@ -415,3 +415,6 @@
- 	ret
- .strxmov_end:
- 	.size	 strxmov,.strxmov_end-strxmov
-+
-+	.section    .note.GNU-stack,"",@progbits
-+
diff --git a/dev-db/mysql/files/701_all_test-myisam-geometry.patch b/dev-db/mysql/files/701_all_test-myisam-geometry.patch
deleted file mode 100644
index 536c92a14b10..000000000000
--- a/dev-db/mysql/files/701_all_test-myisam-geometry.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-###MY_VER_RANGE [4.1.3_alpha,4.1.14_alpha20050808)
-
-# MySQL Bugs: #11083: myisam.test fail w/ --without-geometry
-
---- mysql.orig/mysql-test/t/myisam.test	2005-05-26 16:55:48.000000000 +0200
-+++ mysql.fix/mysql-test/t/myisam.test	2005-06-03 21:26:28.000000000 +0200
-@@ -479,7 +479,7 @@
- #
- # Test RTREE index
- #
----error 1235
-+--error 1235,1289
- CREATE TABLE t1 (`a` int(11) NOT NULL default '0', `b` int(11) NOT NULL default '0', UNIQUE KEY `a` USING RTREE (`a`,`b`)) ENGINE=MyISAM;
- # INSERT INTO t1 VALUES (1,1),(1,1);
- # DELETE FROM rt WHERE a<1;
---- mysql.orig/mysql-test/r/myisam.result	2005-05-26 16:55:48.000000000 +0200
-+++ mysql.fix/mysql-test/r/myisam.result	2005-06-03 21:27:20.000000000 +0200
-@@ -506,7 +506,7 @@
- 1	SIMPLE	t2	index	NULL	PRIMARY	4	NULL	2	Using index; Distinct
- drop table t1,t2;
- CREATE TABLE t1 (`a` int(11) NOT NULL default '0', `b` int(11) NOT NULL default '0', UNIQUE KEY `a` USING RTREE (`a`,`b`)) ENGINE=MyISAM;
--ERROR 42000: This version of MySQL doesn't yet support 'RTREE INDEX'
-+Got one of the listed errors
- create table t1 (a int, b varchar(200), c text not null) checksum=1;
- create table t2 (a int, b varchar(200), c text not null) checksum=0;
- insert t1 values (1, "aaa", "bbb"), (NULL, "", "ccccc"), (0, NULL, "");
diff --git a/dev-db/mysql/files/703_all_test-rpl_rotate_logs.patch b/dev-db/mysql/files/703_all_test-rpl_rotate_logs.patch
deleted file mode 100644
index 9fd3079408d1..000000000000
--- a/dev-db/mysql/files/703_all_test-rpl_rotate_logs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-###MY_VER_RANGE  [5.0.6_beta,5.1.0_alpha) [5.1.0_alpha,)
-
-# MySQL Bugs: #9763: Test rpl_rotate_logs fails in default mode and with --force
-# Error: 1201 SQLSTATE: HY000 (ER_MASTER_INFO)
-# Message: Could not initialize master info structure; more error messages can be found in the MySQL
-# error log
-
---- mysql.orig/mysql-test/t/rpl_rotate_logs.test	2005-05-26 16:55:48.000000000 +0200
-+++ mysql.fix/mysql-test/t/rpl_rotate_logs.test	2005-06-03 20:21:51.000000000 +0200
-@@ -24,7 +24,7 @@
- # START SLAVE will fail because it can't read the file (mode 000)
- # (system error 13)
- --replace_result $MYSQL_TEST_DIR TESTDIR
----error 1105,1105,29
-+--error 1201,1105,29
- start slave;
- system chmod 600 var/slave-data/master.info;
- # It will fail again because the file is empty so the slave cannot get valuable
diff --git a/dev-db/mysql/files/digest-mysql-3.23.58-r1 b/dev-db/mysql/files/digest-mysql-3.23.58-r1
index 36384becd475..3a6dd30d9c0f 100644
--- a/dev-db/mysql/files/digest-mysql-3.23.58-r1
+++ b/dev-db/mysql/files/digest-mysql-3.23.58-r1
@@ -1 +1,2 @@
 MD5 835a96c86132fbde0db36db60c5b34cd mysql-3.23.58.tar.gz 12039843
+MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/digest-mysql-4.0.22 b/dev-db/mysql/files/digest-mysql-4.0.22
index e3e0885efab8..035eb2307c3d 100644
--- a/dev-db/mysql/files/digest-mysql-4.0.22
+++ b/dev-db/mysql/files/digest-mysql-4.0.22
@@ -1 +1,2 @@
 MD5 fab53259c3ba9f729a319bf271fc8587 mysql-4.0.22.tar.gz 14395535
+MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/digest-mysql-4.0.22-r2 b/dev-db/mysql/files/digest-mysql-4.0.22-r2
index 830ee52391e5..035eb2307c3d 100644
--- a/dev-db/mysql/files/digest-mysql-4.0.22-r2
+++ b/dev-db/mysql/files/digest-mysql-4.0.22-r2
@@ -1,2 +1,2 @@
 MD5 fab53259c3ba9f729a319bf271fc8587 mysql-4.0.22.tar.gz 14395535
-MD5 adaf3f0e5174f968bef0f910aff65f7d mysql-extras-20050908.tar.bz2 46663
+MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/digest-mysql-4.0.24 b/dev-db/mysql/files/digest-mysql-4.0.24
index ee6e37a7e47f..1ccabb481e7e 100644
--- a/dev-db/mysql/files/digest-mysql-4.0.24
+++ b/dev-db/mysql/files/digest-mysql-4.0.24
@@ -1,2 +1,2 @@
 MD5 408d3001ed715ddc90009c247e548638 mysql-4.0.24.tar.gz 16885399
-MD5 adaf3f0e5174f968bef0f910aff65f7d mysql-extras-20050908.tar.bz2 46663
+MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/digest-mysql-4.0.25-r2 b/dev-db/mysql/files/digest-mysql-4.0.25-r2
index 7a2e394541fb..38f31096918f 100644
--- a/dev-db/mysql/files/digest-mysql-4.0.25-r2
+++ b/dev-db/mysql/files/digest-mysql-4.0.25-r2
@@ -1,2 +1,2 @@
 MD5 68a47ff8c1f0c24866a792f6b3bb59d6 mysql-4.0.25.tar.gz 11159288
-MD5 adaf3f0e5174f968bef0f910aff65f7d mysql-extras-20050908.tar.bz2 46663
+MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/digest-mysql-4.0.26 b/dev-db/mysql/files/digest-mysql-4.0.26
index 0b13a499cd73..0165f0321bce 100644
--- a/dev-db/mysql/files/digest-mysql-4.0.26
+++ b/dev-db/mysql/files/digest-mysql-4.0.26
@@ -1,2 +1,2 @@
 MD5 4e2060a3875470e0d853391e8647a019 mysql-4.0.26.tar.gz 11144366
-MD5 afb83d76259603f3a02837fad080fa7d mysql-extras-20050919.tar.bz2 49853
+MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/digest-mysql-4.1.13-r1 b/dev-db/mysql/files/digest-mysql-4.1.13-r1
index 91b7152d79f6..023cb20ea158 100644
--- a/dev-db/mysql/files/digest-mysql-4.1.13-r1
+++ b/dev-db/mysql/files/digest-mysql-4.1.13-r1
@@ -1 +1,2 @@
 MD5 49d7a7314a2c9cf49e34777e73e66562 mysql-4.1.13.tar.gz 17137413
+MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/digest-mysql-4.1.14 b/dev-db/mysql/files/digest-mysql-4.1.14
index 6cccb93672bb..530f960597fe 100644
--- a/dev-db/mysql/files/digest-mysql-4.1.14
+++ b/dev-db/mysql/files/digest-mysql-4.1.14
@@ -1,2 +1,2 @@
 MD5 98ba9caea24b0a48ee06bb242ff2e37f mysql-4.1.14.tar.gz 17074439
-MD5 afb83d76259603f3a02837fad080fa7d mysql-extras-20050919.tar.bz2 49853
+MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/digest-mysql-5.0.12_beta b/dev-db/mysql/files/digest-mysql-5.0.12_beta
index a19fb76f817b..e2a1b673c4e2 100644
--- a/dev-db/mysql/files/digest-mysql-5.0.12_beta
+++ b/dev-db/mysql/files/digest-mysql-5.0.12_beta
@@ -1,2 +1,2 @@
 MD5 52ce66773505a9128accc64b44d1ecf2 mysql-5.0.12-beta.tar.gz 18798040
-MD5 afb83d76259603f3a02837fad080fa7d mysql-extras-20050919.tar.bz2 49853
+MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/mysql-3.23-my-print-defaults.diff b/dev-db/mysql/files/mysql-3.23-my-print-defaults.diff
deleted file mode 100644
index dbdf14d8101d..000000000000
--- a/dev-db/mysql/files/mysql-3.23-my-print-defaults.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- orig/mysys/default.c	Sun May 13 16:40:06 2001
-+++ mysql-patched/mysys/default.c	Sun May 13 16:40:17 2001
-@@ -48,7 +48,7 @@
- #ifdef __WIN__
- "C:/",
- #else
--"/etc/",
-+"/etc/mysql/",
- #endif
- #ifdef DATADIR
- DATADIR,
diff --git a/dev-db/mysql/files/mysql-3.23-nisam.h.diff b/dev-db/mysql/files/mysql-3.23-nisam.h.diff
deleted file mode 100644
index 8b4450478808..000000000000
--- a/dev-db/mysql/files/mysql-3.23-nisam.h.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/nisam.h~	Tue Mar 27 10:11:02 2001
-+++ include/nisam.h	Fri Apr 13 16:26:02 2001
-@@ -31,7 +31,7 @@
- 
- #define N_MAXKEY	16		/* Max allowed keys */
- #define N_MAXKEY_SEG	16		/* Max segments for key */
--#define N_MAX_KEY_LENGTH 256		/* May be increased up to 500 */
-+#define N_MAX_KEY_LENGTH 500		/* May be increased up to 500 */
- #define N_MAX_KEY_BUFF	 (N_MAX_KEY_LENGTH+N_MAXKEY_SEG+sizeof(double)-1)
- #define N_MAX_POSSIBLE_KEY_BUFF 500+9
- 
diff --git a/dev-db/mysql/files/mysql-3.23-safe-mysqld-sh.diff b/dev-db/mysql/files/mysql-3.23-safe-mysqld-sh.diff
deleted file mode 100644
index d47ef58ef775..000000000000
--- a/dev-db/mysql/files/mysql-3.23-safe-mysqld-sh.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ur mysql-3.23.47.orig/scripts/safe_mysqld.sh mysql-3.23.47/scripts/safe_mysqld.sh
---- mysql-3.23.47.orig/scripts/safe_mysqld.sh	Thu Dec 27 07:23:28 2001
-+++ mysql-3.23.47/scripts/safe_mysqld.sh	Fri Jan  4 05:08:08 2002
-@@ -68,42 +68,14 @@
-   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-3.23.52-install-db-sh.diff b/dev-db/mysql/files/mysql-3.23.52-install-db-sh.diff
deleted file mode 100644
index 6cbbaf121d68..000000000000
--- a/dev-db/mysql/files/mysql-3.23.52-install-db-sh.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -uNr mysql-3.23.52.orig/scripts/mysql_install_db.sh mysql-3.23.52/scripts/mysql_install_db.sh
---- mysql-3.23.52.orig/scripts/mysql_install_db.sh	Tue Aug 13 22:08:16 2002
-+++ mysql-3.23.52/scripts/mysql_install_db.sh	Sun Aug 25 04:11:09 2002
-@@ -309,14 +309,10 @@
- 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."
-@@ -330,15 +326,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-4.0-my-print-defaults.diff b/dev-db/mysql/files/mysql-4.0-my-print-defaults.diff
deleted file mode 100644
index b0865638da57..000000000000
--- a/dev-db/mysql/files/mysql-4.0-my-print-defaults.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- mysql-4.0.1-alpha.orig/mysys/default.c	Sun Dec 23 01:22:08 2001
-+++ mysql-4.0.1-alpha/mysys/default.c	Sat Jun 22 18:56:03 2002
-@@ -47,7 +47,7 @@
- #ifdef __WIN__
- "C:/",
- #else
--"/etc/",
-+"/etc/mysql/",
- #endif
- #ifdef DATADIR
- DATADIR,
diff --git a/dev-db/mysql/files/mysql-4.0-mysqlhotcopy-security.patch b/dev-db/mysql/files/mysql-4.0-mysqlhotcopy-security.patch
deleted file mode 100644
index f2f2e74e52e6..000000000000
--- a/dev-db/mysql/files/mysql-4.0-mysqlhotcopy-security.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 1.42/scripts/mysqlhotcopy.sh	Tue May 25 21:00:12 2004
-+++ 1.43/scripts/mysqlhotcopy.sh	Fri Jul  9 14:30:48 2004
-@@ -8,5 +8,7 @@
- use DBI;
- use Sys::Hostname;
-+use File::Copy;
-+use File::Temp;
- 
- =head1 NAME
- 
-@@ -626,7 +628,6 @@
- sub copy_index
- {
-   my ($method, $files, $source, $target) = @_;
--  my $tmpfile="$opt_tmpdir/mysqlhotcopy$$";
-   
-   print "Copying indices for ".@$files." files...\n" unless $opt{quiet};  
-   foreach my $file (@$files)
-@@ -652,21 +653,21 @@
-       }
-       close OUTPUT	   || die "Error on close of $to: $!\n";
-     }
--    elsif ($opt{method} eq 'scp')
-+    elsif ($opt{method} =~ /^scp\b/)
-     {
--      my $tmp=$tmpfile;
--      open(OUTPUT,">$tmp") || die "Can\'t create file $tmp: $!\n";
--      if (syswrite(OUTPUT,$buff) != length($buff))
-+      my ($fh, $tmp)=tempfile('mysqlhotcopy-XXXXXX', DIR => $opt_tmpdir);
-+      die "Can\'t create/open file in $opt_tmpdir\n";
-+      if (syswrite($fh,$buff) != length($buff))
-       {
- 	die "Error when writing data to $tmp: $!\n";
-       }
--      close OUTPUT	     || die "Error on close of $tmp: $!\n";
--      safe_system("scp $tmp $to");
-+      close $fh || die "Error on close of $tmp: $!\n";
-+      safe_system("$opt{method} $tmp $to");
-+      unlink $tmp;
-     }
-     else
-     {
-       die "Can't use unsupported method '$opt{method}'\n";
-     }
-   }
--  unlink "$tmpfile" if  ($opt{method} eq 'scp');
- }
-
diff --git a/dev-db/mysql/files/mysql-4.0-nisam.h.diff b/dev-db/mysql/files/mysql-4.0-nisam.h.diff
deleted file mode 100644
index c8d9d676888e..000000000000
--- a/dev-db/mysql/files/mysql-4.0-nisam.h.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/nisam.h~	Sat Jun 22 18:03:36 2002
-+++ include/nisam.h	Sat Jun 22 18:03:53 2002
-@@ -30,7 +30,7 @@
- 
- #define N_MAXKEY	16		/* Max allowed keys */
- #define N_MAXKEY_SEG	16		/* Max segments for key */
--#define N_MAX_KEY_LENGTH 256		/* May be increased up to 500 */
-+#define N_MAX_KEY_LENGTH 500		/* May be increased up to 500 */
- #define N_MAX_KEY_BUFF	 (N_MAX_KEY_LENGTH+N_MAXKEY_SEG+sizeof(double)-1)
- #define N_MAX_POSSIBLE_KEY_BUFF 500+9
- 
diff --git a/dev-db/mysql/files/mysql-4.0.14-r1-tcpd-vars-fix.diff b/dev-db/mysql/files/mysql-4.0.14-r1-tcpd-vars-fix.diff
deleted file mode 100644
index 18fd9c87bb6d..000000000000
--- a/dev-db/mysql/files/mysql-4.0.14-r1-tcpd-vars-fix.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur orig/sql/mysqld.cc new/sql/mysqld.cc
---- orig/sql/mysqld.cc  2003-06-10 22:22:10.000000000 +0200
-+++ new/sql/mysqld.cc   2003-06-10 22:21:38.000000000 +0200
-@@ -101,8 +101,8 @@
- #ifdef NEED_SYS_SYSLOG_H
- #include <sys/syslog.h>
- #endif /* NEED_SYS_SYSLOG_H */
--int allow_severity = LOG_INFO;
--int deny_severity = LOG_WARNING;
-+//int allow_severity = LOG_INFO;
-+//int deny_severity = LOG_WARNING;
- 
- #ifdef __STDC__
- #define my_fromhost(A)    fromhost(A)
diff --git a/dev-db/mysql/files/mysql-4.0.18-gentoo-nptl.diff b/dev-db/mysql/files/mysql-4.0.18-gentoo-nptl.diff
deleted file mode 100644
index d5815b799a6f..000000000000
--- a/dev-db/mysql/files/mysql-4.0.18-gentoo-nptl.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- mysql-4.0.18/configure.in.orig	2004-03-04 13:53:36.000000000 -0800
-+++ mysql-4.0.18/configure.in	2004-03-04 13:53:37.000000000 -0800
-@@ -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/mysql-4.0.18-mysqld-safe-sh.diff b/dev-db/mysql/files/mysql-4.0.18-mysqld-safe-sh.diff
deleted file mode 100644
index 18d4f1c17c78..000000000000
--- a/dev-db/mysql/files/mysql-4.0.18-mysqld-safe-sh.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- mysql-4.0.18/scripts/mysqld_safe.sh.orig	2004-02-10 10:15:48.000000000 -0800
-+++ mysql-4.0.18/scripts/mysqld_safe.sh	2004-03-04 13:45:27.000000000 -0800
-@@ -89,42 +89,14 @@
-   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
- 
- 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
- 
- # 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.21-install-db-sh.diff b/dev-db/mysql/files/mysql-4.0.21-install-db-sh.diff
deleted file mode 100644
index 8940e99f5026..000000000000
--- a/dev-db/mysql/files/mysql-4.0.21-install-db-sh.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- mysql-4.0.21/scripts/mysql_install_db.sh.orig	
-+++ mysql-4.0.21/scripts/mysql_install_db.sh	
-@@ -371,6 +371,7 @@
-   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.
diff --git a/dev-db/mysql/files/mysql-4.0.21-thrssl.patch b/dev-db/mysql/files/mysql-4.0.21-thrssl.patch
deleted file mode 100644
index e180572a2ee1..000000000000
--- a/dev-db/mysql/files/mysql-4.0.21-thrssl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mysql-4.0.21/libmysql_r/Makefile.in.orig
-+++ mysql-4.0.21/libmysql_r/Makefile.in
-@@ -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@
diff --git a/dev-db/mysql/files/mysql-4.0.23-install-db-sh.diff b/dev-db/mysql/files/mysql-4.0.23-install-db-sh.diff
deleted file mode 100644
index fe3d8d303acc..000000000000
--- a/dev-db/mysql/files/mysql-4.0.23-install-db-sh.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- mysql-4.0.23/scripts/mysql_install_db.sh.orig	2004-12-23 02:28:09.755109232 -0800
-+++ mysql-4.0.23/scripts/mysql_install_db.sh	2004-12-23 02:31:32.204332272 -0800
-@@ -368,10 +368,13 @@
-     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 "$bindir/mysqladmin -u root -h $hostname password 'new-password'"
--  echo "See the manual for more instructions."
-+  echo "To do so, issue the following commands to start the server"
-+  echo "and change the applicable passwords:"
-+  echo "  /etc/init.d/mysql start"
-+  echo "  $bindir/mysqladmin -u root -h $hostname password 'new-password'"
-+  echo "  $bindir/mysqladmin -u root password 'new-password'"
-+  echo "Depending on your configuration, a -p option may be needed"
-+  echo "in the last command. See the manual for more details."
-   #
-   # Print message about upgrading unless we have created a new db table.
-   if test -z "$c_d"
diff --git a/dev-db/mysql/files/mysql-4.0.24-manual.texi.patch b/dev-db/mysql/files/mysql-4.0.24-manual.texi.patch
deleted file mode 100644
index 2789efba0336..000000000000
--- a/dev-db/mysql/files/mysql-4.0.24-manual.texi.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mysql-4.0.24.bbb/Docs/manual.texi	2005-03-11 22:49:27.000000000 +0100
-+++ mysql-4.0.24/Docs/manual.texi	2005-03-11 22:57:56.000000000 +0100
-@@ -91349,7 +91349,7 @@
- 
- @c NOTE: To regenerate this list, run the make-errmsg-table.pl script.
- 
--@include errmsg-table.texi
-+failed to include errmsg-table.texi
- 
- Client error information comes from the following files:
- 
-@@ -91370,7 +91370,7 @@
- 
- @c NOTE: To regenerate this list, run the make-cl-errmsg-table.pl script.
- 
--@include cl-errmsg-table.texi
-+failed to include cl-errmsg-table.texi
- 
- 
- @node Extending MySQL, Problems, Error-handling, Top
diff --git a/dev-db/mysql/files/mysql-4.0.25-r2-asm-pic-fixes.patch b/dev-db/mysql/files/mysql-4.0.25-r2-asm-pic-fixes.patch
deleted file mode 100644
index 48e551737490..000000000000
--- a/dev-db/mysql/files/mysql-4.0.25-r2-asm-pic-fixes.patch
+++ /dev/null
@@ -1,304 +0,0 @@
---- mysql-4.0.25/strings/strings-x86.s	2005-06-29 19:06:44.000000000 +0200
-+++ mysql/strings/strings-x86.s	2005-07-19 15:41:31.000000000 +0200
-@@ -403,3 +403,5 @@
- 	ret
- .strxmov_end:
- 	.size	 strxmov,.strxmov_end-strxmov
-+
-+	.section	.note.GNU-stack,"",@progbits
---- mysql-4.0.25/strings/longlong2str-x86.s	2005-06-29 19:06:43.000000000 +0200
-+++ mysql/strings/longlong2str-x86.s	2005-07-19 15:41:31.000000000 +0200
-@@ -13,8 +13,9 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
--# Optimized longlong2str function for Intel 80x86  (gcc/gas syntax) 
--# Some set sequences are optimized for pentuimpro II 
-+# longlong2str function for Intel 80x86  (gcc/gas syntax) 
-+
-+# See longlong2str(dst,radix,val) description in longlong2str.c.
- 
- 	.file	"longlong2str.s"
- 	.version "1.01"
-@@ -24,8 +25,123 @@
- 
- .globl	longlong2str
- 	.type	 longlong2str,@function
--	
-+
- longlong2str:
-+	subl  $80,%esp          # Temporary buffer for up to 64 radix-2 digits
-+	pushl %ebp
-+	pushl %esi
-+	pushl %edi
-+	pushl %ebx
-+
-+	movl  100(%esp),%esi	# esi = Lower part of val 
-+	movl  112(%esp),%ebx	# ebx = Radix
-+	movl  104(%esp),%ebp	# ebp = Higher part of val 
-+	movl  108(%esp),%edi    # edi -> dst
-+		 
-+	testl %ebx,%ebx
-+	jge   .L144             # (Radix >= 0)
-+
-+	testl %ebp,%ebp
-+	jge   .L146             # (Higher part of val >= 0)
-+	movb  $45,(%edi)	# Add '-' sign 
-+	incl  %edi
-+	negl  %esi              # Change val to positive
-+	adcl  $0,%ebp
-+	negl  %ebp
-+.L146:
-+	negl  %ebx		# Change radix to positive 
-+.L144:
-+	cmpl  $36,%ebx          # Radix must be between 2 and 36
-+	ja    .Lerror		# (Radix not in range)
-+	cmpl  $2,%ebx
-+	jb    .Lerror		# (Radix not in range)
-+
-+	movl  %esi,%eax         # eax = lower part of val ...
-+	orl   %ebp,%eax         # and it stays thus if ebp=0
-+	je    Lzero             # (Treat zero as special case)
-+
-+	leal  92(%esp),%ecx     # ecx -> End of temporary buffer
-+	
-+	testl %ebp,%ebp
-+	je    Llow              # (Higher part of val = 0)
-+	
-+Lhigh:
-+	#val in ebp:esi. div the high part by the radix,
-+        #then div remainder + low part by the radix.
-+	movl  %ebp,%eax	  	# edx=0,eax=high(from ebp) 
-+	xorl  %edx,%edx
-+        decl  %ecx
-+        divl  %ebx         
-+	movl  %eax,%ebp         # edx=result of last, eax=low(from esi)
-+	movl  %esi,%eax    
-+	divl  %ebx
-+	movl  %eax,%esi	  	# ebp:esi = quotient 
-+	movb  %dl,(%ecx)        # store byte in temporary buffer
-+	testl %ebp,%ebp 
-+	jne   Lhigh             # (Higher part of val still > 0)
-+
-+Llow:
-+	#val in 0:eax. div 0 + low part by the radix.
-+	xorl  %edx,%edx
-+        decl  %ecx
-+	divl  %ebx
-+ 	movb  %dl,(%ecx)        # store byte in temporary buffer
-+        testl %eax,%eax
-+	jne   Llow              # (Lower part of val still <> 0)
-+
-+	leal  92(%esp),%esi     # esi -> End of temporary buffer
-+
-+Lmov:
-+	movb  (%ecx),%dl        # dl = byte from temporary buffer
-+	movb  $-1,%bl
-+	cmpb  $10,%dl           # add 7 if dl > '9'
-+	adcb  $0,%bl
-+	addb  $48,%dl           # add '0'  
-+	andb  $7,%bl
-+	addb  %bl,%dl
-+        incl  %ecx
-+	movb  %dl,(%edi)        # put dl in dst
-+	incl  %edi
-+	cmpl  %ecx,%esi
-+	ja    Lmov              # (more bytes exist in temporary buffer)
-+	movb  $0,(%edi)         # trailing '\0' in dst
-+	movl  %edi,%eax		# eax = return value = pointer to '\0'
-+.Lret:
-+	popl %ebx
-+	popl %edi
-+	popl %esi
-+	popl %ebp
-+	addl $80,%esp
-+	ret
-+
-+.Lerror:
-+	xorl %eax,%eax		# Wrong radix 
-+	jmp .Lret
-+
-+Lzero:
-+        # Treat 0 as a special case. Unnecessary but we
-+	# expect 0 will be frequent.
-+	movl  108(%esp),%eax    # eax = dst
-+	popl  %ebx
-+        movb  $48,(%eax)        # '0'
-+	popl  %edi
-+        incl  %eax
-+	popl  %esi
-+	popl  %ebp
-+	addl  $80,%esp
-+        movb  $0,(%eax)         # '\0'
-+	ret
-+
-+#
-+# This is almost equal to the above, except that we can do the final
-+# loop much more efficient	
-+#
-+
-+	.align 4
-+	
-+.globl	longlong10_to_str
-+	.type	 longlong10_to_str,@function
-+longlong10_to_str:
- 	subl $80,%esp
- 	pushl %ebp
- 	pushl %esi
-@@ -34,85 +150,82 @@
- 	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
--	testl %eax,%eax
--	jge .L144
--
--	addl $36,%eax
--	cmpl $34,%eax
--	ja .Lerror		# Wrong radix 
--	testl %ebp,%ebp
--	jge .L146
-+	movl 112(%esp),%ebx	# Radix (10 or -10)
-+	testl %ebx,%ebx
-+	jge .L10_10		# Positive radix
-+
-+	negl %ebx		# Change radix to positive (= 10)
-+
-+	testl %ebp,%ebp		# Test if negative value
-+	jge .L10_10
- 	movb $45,(%edi)		# Add sign 
--	incl %edi		# Change sign of val 
--	negl %esi
-+	incl %edi
-+	negl %esi		# Change sign of val (ebp:esi)
- 	adcl $0,%ebp
- 	negl %ebp
--.L146:
--	negl %ebx		# Change radix to positive 
--	jmp .L148
- 	.align 4
--.L144:
--	addl $-2,%eax
--	cmpl $34,%eax
--	ja .Lerror		# Radix in range 
- 
--.L148:
-+.L10_10:
-+	leal 92(%esp),%ecx	# End of buffer 
- 	movl %esi,%eax		# Test if zero (for easy loop) 
- 	orl %ebp,%eax
--	jne .L150
-+	jne .L10_30		# Not zero
-+
-+	# Here when value is zero
- 	movb $48,(%edi)
- 	incl %edi
--	jmp .L164
--	.align 4
--
--.L150:
--	leal 92(%esp),%ecx	# End of buffer 
--	jmp  .L155
-+	jmp .L10_end
- 	.align 4
- 
--.L153:
-+.L10_20:
- 	# val is stored in in ebp:esi 
--
- 	movl %ebp,%eax		# High part of value 
- 	xorl %edx,%edx
--	divl %ebx
-+	divl %ebx		# Divide by 10
- 	movl %eax,%ebp
- 	movl %esi,%eax
--	divl %ebx
--	movl %eax,%esi		# quotent in ebp:esi 
--	movb _dig_vec(%edx),%al   # al is faster than dl 
-+	divl %ebx		# Divide by 10
- 	decl %ecx
--	movb %al,(%ecx)		# store value in buff 
--	.align 4
--.L155:
-+	movl %eax,%esi		# quotent in ebp:esi 
-+	addl $48,%edx		# Convert to ascii
-+	movb %dl,(%ecx)		# store value in buff 
-+
-+.L10_30:
- 	testl %ebp,%ebp
--	ja .L153
-+	ja .L10_20
- 	testl %esi,%esi		# rest value 
--	jl .L153
--	je .L160		# Ready 
--	movl %esi,%eax
--	movl $_dig_vec,%ebp
--	.align 4
-+	jl .L10_20		# Unsigned, do ulonglong div once more
-+	je .L10_mov		# Ready
-+	movl %esi,%ebx		# Move val to %ebx
-+
-+	# The following code uses some tricks to change division by 10 to
-+	# multiplication and shifts
-+	movl $0xcccccccd,%esi   # set %esi to 0xcccccccd
-+	
-+.L10_40:
-+        movl %ebx,%eax
-+        mull %esi
-+        decl %ecx
-+        shrl $3,%edx
-+        leal (%edx,%edx,4),%eax
-+        addl %eax,%eax
-+        subb %al,%bl		# %bl now contains val % 10
-+        addb $48,%bl
-+        movb %bl,(%ecx)
-+        movl %edx,%ebx
-+        testl %ebx,%ebx
-+	jne .L10_40
-+#	jmp .L10_mov		# Shared end with longlong10_to_str
- 
--.L154:				# Do rest with integer precision 
--	cltd
--	divl %ebx
--	decl %ecx
--	movb (%edx,%ebp),%dl	# bh is always zero as ebx=radix < 36 
--	testl %eax,%eax
--	movb %dl,(%ecx)
--	jne .L154
- 
--.L160:
-+.L10_mov:
- 	movl %ecx,%esi
- 	leal 92(%esp),%ecx	# End of buffer 
- 	subl %esi,%ecx
- 	rep
- 	movsb
- 
--.L164:
-+.L10_end:
- 	movl %edi,%eax		# Pointer to end null 
- 	movb $0,(%edi)		# Store the end null 
- 
-@@ -123,18 +236,8 @@
- 	popl %ebp
- 	addl $80,%esp
- 	ret
--
--.Lerror:
--	xorl %eax,%eax		# Wrong radix 
--	jmp .L165
--
--.Lfe3:
--	.size	 longlong2str,.Lfe3-longlong2str
--
--.globl	longlong10_to_str
--	.type	 longlong10_to_str,@function
--longlong10_to_str:
--	jmp longlong2str
--
-+	
- .L10end:
- 	.size	 longlong10_to_str,.L10end-longlong10_to_str
-+
-+	.section	.note.GNU-stack,"",@progbits
diff --git a/dev-db/mysql/files/mysql-4.1.9-thrssl.patch b/dev-db/mysql/files/mysql-4.1.9-thrssl.patch
deleted file mode 100644
index d50325e8085d..000000000000
--- a/dev-db/mysql/files/mysql-4.1.9-thrssl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mysql-4.1.10.orig/libmysql_r/Makefile.in	2005-02-12 21:38:04.000000000 +0100
-+++ mysql-4.1.10/libmysql_r/Makefile.in	2005-02-19 01:41:11.000000000 +0100
-@@ -242,7 +242,7 @@
- LIBDL = @LIBDL@
- LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
-+LIBS = @CLIENT_LIBS@ @ZLIB_LIBS@ @openssl_libs@ @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
- LM_CFLAGS = @LM_CFLAGS@
---- mysql-4.1.10.orig/libmysql_r/Makefile.am	2005-02-12 21:37:33.000000000 +0100
-+++ mysql-4.1.10/libmysql_r/Makefile.am	2005-02-19 01:43:49.000000000 +0100
-@@ -22,7 +22,7 @@
- 
- target = libmysqlclient_r.la
- target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
--LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
-+LIBS = @CLIENT_LIBS@ @ZLIB_LIBS@ @openssl_libs@ @LIBS@
- 
- INCLUDES = @MT_INCLUDES@ \
- 	   -I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@
diff --git a/dev-db/mysql/files/mysql-accesstmp.patch b/dev-db/mysql/files/mysql-accesstmp.patch
deleted file mode 100644
index 700084e2df8b..000000000000
--- a/dev-db/mysql/files/mysql-accesstmp.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- mysql-4.1.8/scripts/mysqlaccess.sh	2004-12-14 13:40:36.000000000 +0100
-+++ mysql-4.1.8.bug77805/scripts/mysqlaccess.sh	2005-01-18 00:48:07.692271624 +0100
-@@ -2,7 +2,7 @@
- # ****************************
- package MySQLaccess;
- #use strict;
--use POSIX qw(tmpnam);
-+use File::Temp qw(tempfile tmpnam);
- use Fcntl;
- 
- BEGIN {
-@@ -32,7 +32,6 @@
- 	$ACCESS_U_BCK = 'user_backup';   
- 	$ACCESS_D_BCK = 'db_backup';     
-         $DIFF      = '/usr/bin/diff'; 
--        $TMP_PATH  = '/tmp';             #path to writable tmp-directory
-         $MYSQLDUMP = '@bindir@/mysqldump';
-                                          #path to mysqldump executable
- 
-@@ -431,7 +430,7 @@
- # no caching on STDOUT
- 	$|=1;
- 
--	$MYSQL_CNF = POSIX::tmpnam();
-+ $MYSQL_CNF = tmpnam();
- 	%MYSQL_CNF = (client    => { },
-                       mysql     => { },
-                       mysqldump => { },
-@@ -576,8 +575,6 @@
- push(@MySQLaccess::Grant::Error,'not_found_mysql')     if !(-x $MYSQL);
- push(@MySQLaccess::Grant::Error,'not_found_diff')      if !(-x $DIFF);
- push(@MySQLaccess::Grant::Error,'not_found_mysqldump') if !(-x $MYSQLDUMP);
--push(@MySQLaccess::Grant::Error,'not_found_tmp')       if !(-d $TMP_PATH);
--push(@MySQLaccess::Grant::Error,'write_err_tmp')       if !(-w $TMP_PATH);
- if (@MySQLaccess::Grant::Error) {
-    MySQLaccess::Report::Print_Error_Messages() ;
-    exit 0;
-@@ -1776,17 +1773,15 @@
-    @before = sort(@before);
-    @after  = sort(@after);
- 
--   $before = "$MySQLaccess::TMP_PATH/$MySQLaccess::script.before.$$";
--   $after  = "$MySQLaccess::TMP_PATH/$MySQLaccess::script.after.$$";
--   #$after = "/tmp/t0";
--   open(BEFORE,"> $before") ||
--    push(@MySQLaccess::Report::Errors,"Can't open temporary file $before for writing");
--   open(AFTER,"> $after") ||
--    push(@MySQLaccess::Report::Errors,"Can't open temporary file $after for writing");
--   print BEFORE join("\n",@before);
--   print AFTER  join("\n",@after);
--   close(BEFORE);
--   close(AFTER);
-+   ($hb, $before) = tempfile("$MySQLaccess::script.XXXXXX") or
-+    push(@MySQLaccess::Report::Errors,"Can't create temporary file: $!");
-+   ($ha, $after)  = tempfile("$MySQLaccess::script.XXXXXX") or
-+    push(@MySQLaccess::Report::Errors,"Can't create temporary file: $!");
-+    
-+    print $hb join("\n",@before);
-+    print $ha join("\n",@after);
-+    close $hb;
-+    close $ha;
- 
-    # ----------------------------------
-    # compute difference
-@@ -1799,8 +1794,8 @@
- 
-    # ----------------------------------
-    # cleanup temp. files
--   unlink(BEFORE);
--   unlink(AFTER);
-+   unlink($before);
-+   unlink($after);
- 
-    return \@diffs;
- }
-@@ -2315,14 +2310,6 @@
-    => "The diff program <$MySQLaccess::DIFF> could not be found.\n"
-      ."+ Check your path, or\n"
-      ."+ edit the source of this script to point \$DIFF to the diff program.\n"
-- ,'not_found_tmp'
--   => "The temporary directory <$MySQLaccess::TMP_PATH> could not be found.\n"
--     ."+ create this directory (writeable!), or\n"
--     ."+ edit the source of this script to point \$TMP_PATH to the right directory.\n"
-- ,'write_err_tmp'
--   => "The temporary directory <$MySQLaccess::TMP_PATH> is not writable.\n"
--     ."+ make this directory writeable!, or\n"
--     ."+ edit the source of this script to point \$TMP_PATH to another directory.\n"
-  ,'Unrecognized_option'
-    => "Sorry,\n"
-      ."You are using an old version of the mysql-program,\n"
diff --git a/dev-db/mysql/files/mysql-test-myisam-geometry.patch b/dev-db/mysql/files/mysql-test-myisam-geometry.patch
deleted file mode 100644
index 54a4a939e7e4..000000000000
--- a/dev-db/mysql/files/mysql-test-myisam-geometry.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mysql.orig/mysql-test/t/myisam.test	2005-03-27 16:07:37.000000000 +0200
-+++ mysql/mysql-test/t/myisam.test	2005-03-27 16:17:33.000000000 +0200
-@@ -476,7 +476,7 @@
- #
- # Test RTREE index
- #
----error 1235
-+--error 1289
- CREATE TABLE t1 (`a` int(11) NOT NULL default '0', `b` int(11) NOT NULL default '0', UNIQUE KEY `a` USING RTREE (`a`,`b`)) ENGINE=MyISAM;
- # INSERT INTO t1 VALUES (1,1),(1,1);
- # DELETE FROM rt WHERE a<1;
---- mysql.orig/mysql-test/r/myisam.result	2005-03-27 16:08:20.000000000 +0200
-+++ mysql/mysql-test/r/myisam.result	2005-03-27 16:12:18.000000000 +0200
-@@ -499,7 +499,7 @@
- 1	SIMPLE	t2	index	NULL	PRIMARY	4	NULL	2	Using index; Distinct
- drop table t1,t2;
- CREATE TABLE t1 (`a` int(11) NOT NULL default '0', `b` int(11) NOT NULL default '0', UNIQUE KEY `a` USING RTREE (`a`,`b`)) ENGINE=MyISAM;
--ERROR 42000: This version of MySQL doesn't yet support 'RTREE INDEX'
-+ERROR HY000: The 'RTree keys' feature is disabled; you need MySQL built with 'HAVE_RTREE_KEYS' to have it working
- create table t1 (a int, b varchar(200), c text not null) checksum=1;
- create table t2 (a int, b varchar(200), c text not null) checksum=0;
- insert t1 values (1, "aaa", "bbb"), (NULL, "", "ccccc"), (0, NULL, "");
diff --git a/dev-db/mysql/mysql-3.23.58-r1.ebuild b/dev-db/mysql/mysql-3.23.58-r1.ebuild
index 46551975c338..d0344da88523 100644
--- a/dev-db/mysql/mysql-3.23.58-r1.ebuild
+++ b/dev-db/mysql/mysql-3.23.58-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.58-r1.ebuild,v 1.16 2005/09/09 11:42:28 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.58-r1.ebuild,v 1.17 2005/09/20 15:29:32 vivo Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,7 +13,8 @@ SDIR=MySQL-${SVER}
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
 HOMEPAGE="http://www.mysql.com/"
 SRC_URI="ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/${SDIR}/${P}.tar.gz
-	ftp://mysql.valueclick.com/pub/mysql/Downloads/${SDIR}/${P}.tar.gz"
+	ftp://mysql.valueclick.com/pub/mysql/Downloads/${SDIR}/${P}.tar.gz
+	mirror://gentoo/mysql-extras-20050920.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -33,20 +34,24 @@ src_unpack() {
 	use innodb || ewarn "InnoDB support is not selected to be compiled in."
 	unpack ${A} || die
 	cd ${S} || die
+
+	local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras"
+
 	# required for qmail-mysql
-	epatch ${FILESDIR}/mysql-3.23-nisam.h.diff
+	epatch ${MY_PATCH_SOURCE}/mysql-3.23-nisam.h.diff || die
 	# zap startup script messages
-	epatch ${FILESDIR}/mysql-3.23.52-install-db-sh.diff
+	epatch ${MY_PATCH_SOURCE}/mysql-3.23.52-install-db-sh.diff || die
 	# zap binary distribution stuff
-	epatch ${FILESDIR}/mysql-3.23-safe-mysqld-sh.diff
+	epatch ${MY_PATCH_SOURCE}/mysql-3.23-safe-mysqld-sh.diff || die
 	# for correct hardcoded sysconf directory
-	epatch ${FILESDIR}/mysql-3.23-my-print-defaults.diff
-	#patch -p1 < ${FILESDIR}/mysql-3.23.51-tcpd.patch || die
-	#epatch ${FILESDIR}/mysql-4.0.14-security-28394.patch
+	epatch ${MY_PATCH_SOURCE}/mysql-3.23-my-print-defaults.diff || die
+	#patch -p1 < ${MY_PATCH_SOURCE}/mysql-3.23.51-tcpd.patch || die
+	#epatch ${MY_PATCH_SOURCE}/mysql-4.0.14-security-28394.patch
 
 	# security fix from http://lists.mysql.com/internals/15185
 	# gentoo bug #60744
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-4.0-mysqlhotcopy-security.patch
+	EPATCH_OPTS="-p1 -d ${S}" \
+	epatch ${MY_PATCH_SOURCE}/${PN}-4.0-mysqlhotcopy-security.patch || die
 
 	# upstream bug http://bugs.mysql.com/bug.php?id=7971
 	# names conflict with stuff in 2.6.10 kernel headers
diff --git a/dev-db/mysql/mysql-4.0.22-r2.ebuild b/dev-db/mysql/mysql-4.0.22-r2.ebuild
index a59fc485b0c8..88ea23a02926 100644
--- a/dev-db/mysql/mysql-4.0.22-r2.ebuild
+++ b/dev-db/mysql/mysql-4.0.22-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22-r2.ebuild,v 1.24 2005/09/12 14:58:15 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22-r2.ebuild,v 1.25 2005/09/20 15:29:32 vivo Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -17,7 +17,7 @@ S=${WORKDIR}/${NEWP}
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 HOMEPAGE="http://www.mysql.com/"
 SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz
-	mirror://gentoo/mysql-extras-20050908.tar.bz2"
+	mirror://gentoo/mysql-extras-20050920.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -78,33 +78,42 @@ src_unpack() {
 	fi
 	unpack ${A} || die
 
-	#zap startup script messages
-	epatch "${MY_PATCH_SOURCE}/${PN}-4.0.23-install-db-sh.diff" || die
+	local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras"
+
+	#zap startup script messages	
+	EPATCH_OPTS="-p1 -d ${S}" \
+	epatch ${MY_PATCH_SOURCE}/${PN}-4.0.21-install-db-sh.diff || die
 	#zap binary distribution stuff
+	EPATCH_OPTS="-p1 -d ${S}" \
 	epatch "${MY_PATCH_SOURCE}/${PN}-4.0.18-mysqld-safe-sh.diff" || die
 	#required for qmail-mysql
+	EPATCH_OPTS="-p0 -d ${S}" \
 	epatch "${MY_PATCH_SOURCE}/${PN}-4.0-nisam.h.diff" || die
 	#for correct hardcoded sysconf directory
+	EPATCH_OPTS="-p1 -d ${S}" \
 	epatch "${MY_PATCH_SOURCE}/${PN}-4.0-my-print-defaults.diff" || die
 	# NPTL support
+	EPATCH_OPTS="-p1 -d ${S}" \
 	epatch "${MY_PATCH_SOURCE}/${PN}-4.0.18-gentoo-nptl.diff" || die
 	# bad tmpfiles in mysqlaccess, see bug 77805
 	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/mysql-accesstmp.patch
+	epatch ${MY_PATCH_SOURCE}/mysql-accesstmp.patch || die
 
 	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
 	# i would really prefer to fix this at the Makefile.am level, but can't
 	# get the software to autoreconf as distributed - too many missing files
+	EPATCH_OPTS="-p1 -d ${S}" \
 	epatch "${MY_PATCH_SOURCE}/${PN}-4.0.21-thrssl.patch" || die
 
 
 	if use tcpd; then
+		EPATCH_OPTS="-p1 -d ${S}" \
 		epatch "${MY_PATCH_SOURCE}/${PN}-4.0.14-r1-tcpd-vars-fix.diff" || die
 	fi
 
 	# security fix from http://lists.mysql.com/internals/15185
 	# gentoo bug #60744
-	#EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-4.0-mysqlhotcopy-security.patch
+	#EPATCH_OPTS="-p1 -d ${S}" epatch ${MY_PATCH_SOURCE}/${PN}-4.0-mysqlhotcopy-security.patch
 	# Already included upstream in 4.0.21
 
 	for d in ${S} ${S}/innobase; do
diff --git a/dev-db/mysql/mysql-4.0.22.ebuild b/dev-db/mysql/mysql-4.0.22.ebuild
index c971827dfeef..eb84d84817d6 100644
--- a/dev-db/mysql/mysql-4.0.22.ebuild
+++ b/dev-db/mysql/mysql-4.0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22.ebuild,v 1.22 2005/08/29 12:55:19 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22.ebuild,v 1.23 2005/09/20 15:29:32 vivo Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -16,7 +16,8 @@ S=${WORKDIR}/${NEWP}
 
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
+SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz
+	mirror://gentoo/mysql-extras-20050920.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -59,36 +60,38 @@ src_unpack() {
 	fi
 	unpack ${A} || die
 
+	local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras"
+
 	#zap startup script messages
 	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.21-install-db-sh.diff
+	epatch ${MY_PATCH_SOURCE}/${PN}-4.0.21-install-db-sh.diff || die
 	#zap binary distribution stuff
 	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-mysqld-safe-sh.diff
+	epatch ${MY_PATCH_SOURCE}/${PN}-4.0.18-mysqld-safe-sh.diff || die
 	#required for qmail-mysql
 	EPATCH_OPTS="-p0 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-nisam.h.diff
+	epatch ${MY_PATCH_SOURCE}/${PN}-4.0-nisam.h.diff || die
 	#for correct hardcoded sysconf directory
 	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff
+	epatch ${MY_PATCH_SOURCE}/${PN}-4.0-my-print-defaults.diff || die
 	# NPTL support
 	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-gentoo-nptl.diff
+	epatch ${MY_PATCH_SOURCE}/${PN}-4.0.18-gentoo-nptl.diff || die
 
 	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
 	# i would really prefer to fix this at the Makefile.am level, but can't
 	# get the software to autoreconf as distributed - too many missing files
 	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.21-thrssl.patch
+	epatch ${MY_PATCH_SOURCE}/${PN}-4.0.21-thrssl.patch || die
 
 	if use tcpd; then
 		EPATCH_OPTS="-p1 -d ${S}" \
-		epatch ${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff
+		epatch ${MY_PATCH_SOURCE}/${PN}-4.0.14-r1-tcpd-vars-fix.diff || die
 	fi
 
 	# security fix from http://lists.mysql.com/internals/15185
 	# gentoo bug #60744
-	#EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-4.0-mysqlhotcopy-security.patch
+	#EPATCH_OPTS="-p1 -d ${S}" epatch ${MY_PATCH_SOURCE}/${PN}-4.0-mysqlhotcopy-security.patch
 	# Already included upstream in 4.0.21
 
 	cd ${S}
diff --git a/dev-db/mysql/mysql-4.0.24.ebuild b/dev-db/mysql/mysql-4.0.24.ebuild
index 37226020dfa4..aed4206065f2 100644
--- a/dev-db/mysql/mysql-4.0.24.ebuild
+++ b/dev-db/mysql/mysql-4.0.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.24.ebuild,v 1.17 2005/09/12 14:58:15 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.24.ebuild,v 1.18 2005/09/20 15:29:32 vivo Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -17,7 +17,7 @@ S=${WORKDIR}/${NEWP}
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 HOMEPAGE="http://www.mysql.com/"
 SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz
-	mirror://gentoo/mysql-extras-20050908.tar.bz2"
+	mirror://gentoo/mysql-extras-20050920.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -79,6 +79,7 @@ src_unpack() {
 	unpack ${A} || die
 
 	local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras"
+
 	#zap startup script messages
 	epatch "${MY_PATCH_SOURCE}/${PN}-4.0.23-install-db-sh.diff" || die
 	#zap binary distribution stuff
@@ -89,14 +90,14 @@ src_unpack() {
 	epatch "${MY_PATCH_SOURCE}/${PN}-4.0-my-print-defaults.diff" || die
 	# NPTL support
 	epatch "${MY_PATCH_SOURCE}/${PN}-4.0.18-gentoo-nptl.diff" || die
-	epatch ${FILESDIR}/${PN}-4.0.18-gentoo-nptl.diff || die
+	epatch ${MY_PATCH_SOURCE}/${PN}-4.0.18-gentoo-nptl.diff || die
 	# Merged upstream as of 4.0.24
 	# bad tmpfiles in mysqlaccess, see bug 77805
 	#EPATCH_OPTS="-p1 -d ${S}" \
-	#epatch ${FILESDIR}/mysql-accesstmp.patch
+	#epatch ${MY_PATCH_SOURCE}/mysql-accesstmp.patch
 
 	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.24-manual.texi.patch || die
+	epatch ${MY_PATCH_SOURCE}/${PN}-4.0.24-manual.texi.patch || die
 
 	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
 	# i would really prefer to fix this at the Makefile.am level, but can't
diff --git a/dev-db/mysql/mysql-4.0.25-r2.ebuild b/dev-db/mysql/mysql-4.0.25-r2.ebuild
index b47b4b8551e6..f70829f594a9 100644
--- a/dev-db/mysql/mysql-4.0.25-r2.ebuild
+++ b/dev-db/mysql/mysql-4.0.25-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.25-r2.ebuild,v 1.16 2005/09/12 14:58:15 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.25-r2.ebuild,v 1.17 2005/09/20 15:29:32 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 HOMEPAGE="http://www.mysql.com/"
 SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
-	mirror://gentoo/mysql-extras-20050908.tar.bz2"
+	mirror://gentoo/mysql-extras-20050920.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -116,7 +116,7 @@ src_unpack() {
 
 	# fixed in 4.0.25
 	#EPATCH_OPTS="-p1 -d ${S}" \
-	#epatch ${FILESDIR}/${PN}-4.0.24-manual.texi.patch || die
+	#epatch ${MY_PATCH_SOURCE}/${PN}-4.0.24-manual.texi.patch || die
 
 	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
 	# i would really prefer to fix this at the Makefile.am level, but can't
diff --git a/dev-db/mysql/mysql-4.0.26.ebuild b/dev-db/mysql/mysql-4.0.26.ebuild
index efd0ad19b630..482ea5eee665 100644
--- a/dev-db/mysql/mysql-4.0.26.ebuild
+++ b/dev-db/mysql/mysql-4.0.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.26.ebuild,v 1.6 2005/09/20 09:36:10 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.26.ebuild,v 1.7 2005/09/20 15:29:32 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 HOMEPAGE="http://www.mysql.com/"
 SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
-	mirror://gentoo/mysql-extras-20050919.tar.bz2"
+	mirror://gentoo/mysql-extras-20050920.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-db/mysql/mysql-4.1.13-r1.ebuild b/dev-db/mysql/mysql-4.1.13-r1.ebuild
index 380e6135225f..4d902a914da0 100644
--- a/dev-db/mysql/mysql-4.1.13-r1.ebuild
+++ b/dev-db/mysql/mysql-4.1.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.13-r1.ebuild,v 1.9 2005/09/16 08:34:02 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.13-r1.ebuild,v 1.10 2005/09/20 15:29:32 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -14,7 +14,8 @@ S="${WORKDIR}/${PN}"
 
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz"
+SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
+	mirror://gentoo/mysql-extras-20050920.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -121,24 +122,26 @@ src_unpack() {
 	mv "${WORKDIR}/${NEWP}" "${S}"
 	cd "${S}"
 
+	local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras"
+
 	# for correct hardcoded sysconf directory
-	epatch "${FILESDIR}/${PN}-4.0-my-print-defaults.diff"
+	epatch "${MY_PATCH_SOURCE}/${PN}-4.0-my-print-defaults.diff"
 
 	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
 	# i would really prefer to fix this at the Makefile.am level, but can't
 	# get the software to autoreconf as distributed - too many missing files
-	epatch "${FILESDIR}/${PN}-4.1.9-thrssl.patch"
+	epatch "${MY_PATCH_SOURCE}/${PN}-4.1.9-thrssl.patch"
 
 	# PIC fixes
 	# bug #42968
-	epatch "${FILESDIR}/035_x86_asm-pic-fixes-r1.patch"
+	epatch "${MY_PATCH_SOURCE}/035_x86_asm-pic-fixes-r1.patch"
 
 	if use tcpd; then
-		epatch "${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff"
+		epatch "${MY_PATCH_SOURCE}/${PN}-4.0.14-r1-tcpd-vars-fix.diff"
 	fi
 
 	# avoid error running src_test and not enabling geometry USE flag
-	useq geometry || epatch "${FILESDIR}/${PN}-test-myisam-geometry.patch"
+	useq geometry || epatch "${MY_PATCH_SOURCE}/${PN}-test-myisam-geometry.patch"
 
 	for d in ${S} ${S}/innobase; do
 		cd ${d}
diff --git a/dev-db/mysql/mysql-4.1.14.ebuild b/dev-db/mysql/mysql-4.1.14.ebuild
index cc60973e38e1..a89969e72d66 100644
--- a/dev-db/mysql/mysql-4.1.14.ebuild
+++ b/dev-db/mysql/mysql-4.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.7 2005/09/20 09:36:10 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.8 2005/09/20 15:29:32 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 HOMEPAGE="http://www.mysql.com/"
 SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
-	mirror://gentoo/mysql-extras-20050919.tar.bz2"
+	mirror://gentoo/mysql-extras-20050920.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-db/mysql/mysql-5.0.12_beta.ebuild b/dev-db/mysql/mysql-5.0.12_beta.ebuild
index eb59048bde5f..5b23443a6c84 100644
--- a/dev-db/mysql/mysql-5.0.12_beta.ebuild
+++ b/dev-db/mysql/mysql-5.0.12_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.12_beta.ebuild,v 1.9 2005/09/20 09:36:10 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.12_beta.ebuild,v 1.10 2005/09/20 15:29:32 vivo Exp $
 
 inherit eutils flag-o-matic versionator
 
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 HOMEPAGE="http://www.mysql.com/"
 SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
-	mirror://gentoo/mysql-extras-20050919.tar.bz2"
+	mirror://gentoo/mysql-extras-20050920.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"