New ebuilds with big-tables support

Package-Manager: portage-2.0.51.22-r1

10 files changed, 2050 insertions, 2 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 158665bbb28b..b8f4d07e043d 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.203 2005/07/15 13:07:03 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.204 2005/07/15 19:09:50 vivo Exp $
+
+*mysql-5.0.9_beta (15 Jul 2005)
+*mysql-4.1.12-r1 (15 Jul 2005)
+
+  15 Jul 2005; portage <vivo@gentoo.org>
+  +files/mysql-4.0.25-asm-pic-fixes.patch, +mysql-4.0.25.ebuild,
+  +mysql-4.1.12-r1.ebuild, +mysql-5.0.9_beta.ebuild,
+  +files/035_x86_asm-pic-fixes-r2.patch:
+  Added big-tables USE flag, the previous mysql-4.1.12 version had it
+  enabled by default.
+  Patches for hardened installations.
+  A brand new MySQL-5.0 ebuild to start play with it.
+
+*mysql-4.0.25 (15 Jul 2005)
+
+  15 Jul 2005; portage <vivo@gentoo.org>
+  +files/mysql-4.0.25-asm-pic-fixes.patch, +mysql-4.0.25.ebuild:
+  MySQL-4.0.25, based off MySQL-4.0.24-r2. Added big-tables USE flag.
+  Added patches for hardened installations.
 
   13 Jul 2005; portage <vivo@gentoo.org> mysql-4.1.12.ebuild:
   Fix permissions, see bug #95320
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5aa6c88c371d..b4f2a2cde033 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -3,21 +3,26 @@ MD5 1975292a4eeae0ebd6c3e077d42f22c1 mysql-4.0.24-r2.ebuild 13727
 MD5 ca4242e577d3b1b6f69cfa80142c320f mysql-3.23.58.ebuild 6640
 MD5 a4e6b738e389c33c3c9e19b8fb5b8fa3 mysql-4.0.23.ebuild 9040
 MD5 80c210f51c3c19afc810c5fb9fc67c7b mysql-4.0.23-r2.ebuild 9407
+MD5 3c2490d316dd09cc6644f6789cacb219 mysql-4.0.25.ebuild 13780
 MD5 6185a1b16dbe0b6fe32d725e8bee26b6 mysql-4.1.8-r1.ebuild 9225
 MD5 1173ba95403d2a99a6d38d6ae5bde41a mysql-4.0.24-r1.ebuild 11899
 MD5 75aca22d48ce2becdbebffb7afcad049 mysql-4.0.22.ebuild 8757
 MD5 9bb11a2e8c8e579009cb712fd7a8bf66 mysql-4.0.22-r2.ebuild 9602
+MD5 e7108cd960e91be85b73a25a7a976f18 mysql-5.0.9_beta.ebuild 16093
+MD5 795da984a91cb40679805c8f0187bb80 mysql-4.1.12-r1.ebuild 15714
 MD5 d436e793baae2f71669b96381ce2959b mysql-3.23.58-r1.ebuild 6759
 MD5 135c8d82ff80aa2d7d3b1df75719dd00 mysql-4.1.8.ebuild 9087
 MD5 be85068e1f8dd9340882814ae10e1763 mysql-4.0.23-r1.ebuild 9160
 MD5 950a2a955947846b03dbb285f5a53daf mysql-4.1.12.ebuild 15584
 MD5 f26f6906248f45f5f0d23248a39c03a4 mysql-4.0.24.ebuild 9816
-MD5 e25e2046625d403a336730af4601ff97 ChangeLog 31925
+MD5 d01ca0828e449cf67fb8822f93e3cf28 ChangeLog 32621
 MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
 MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
 MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
 MD5 a755fb5a3ed724046a4f83fafd819c77 files/mysql-test-myisam-geometry.patch 1217
 MD5 e37e03b4ce894ff87fda12ce6f7b31a6 files/mysql-4.0.21-install-db-sh.diff 585
+MD5 ee67067f786849424c4591e278819bbc files/digest-mysql-4.1.12-r1 66
+MD5 91994238ae91abea0bf8f6db4a5cecdb files/035_x86_asm-pic-fixes-r2.patch 6205
 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
@@ -30,6 +35,7 @@ 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 06a7c1ead0dfe570f7c67d525c45f7c3 files/digest-mysql-4.0.25 66
 MD5 ee67067f786849424c4591e278819bbc files/digest-mysql-4.1.12 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
@@ -56,6 +62,7 @@ MD5 f599e8b3eb4636bb61721525dc15f5f5 files/mysql-4.0.18-thrssl.patch 723
 MD5 c4785801e45235c28d7a4139bfbd73af files/my.cnf-4.1 3667
 MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
 MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
+MD5 ac14a8689f181adcd3118f21742bdd36 files/mysql-4.0.25-asm-pic-fixes.patch 6988
 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
@@ -64,6 +71,7 @@ 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 93827506c0de13cf7b5023847a4afd95 files/digest-mysql-5.0.9_beta 70
 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
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
new file mode 100644
index 000000000000..a70eb32e6f08
--- /dev/null
+++ b/dev-db/mysql/files/035_x86_asm-pic-fixes-r2.patch
@@ -0,0 +1,260 @@
+--- mysql/strings/longlong2str-x86.s	2005-07-15 14:06:49.000000000 +0200
++++ mysql-fixed/strings/longlong2str-x86.s	2005-07-15 14:07:42.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 
+-
+-.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
++	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)
+ 
+-.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
++	addl  $80,%esp
++        movb  $0,(%eax)         # '\0'
++	popl  %ebp
++	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,27 @@
+         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
diff --git a/dev-db/mysql/files/digest-mysql-4.0.25 b/dev-db/mysql/files/digest-mysql-4.0.25
new file mode 100644
index 000000000000..f75729166e27
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.0.25
@@ -0,0 +1 @@
+MD5 68a47ff8c1f0c24866a792f6b3bb59d6 mysql-4.0.25.tar.gz 11159288
diff --git a/dev-db/mysql/files/digest-mysql-4.1.12-r1 b/dev-db/mysql/files/digest-mysql-4.1.12-r1
new file mode 100644
index 000000000000..d9e377ccf07b
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.1.12-r1
@@ -0,0 +1 @@
+MD5 56a6f5cacd97ae290e07bbe19f279af1 mysql-4.1.12.tar.gz 17069350
diff --git a/dev-db/mysql/files/digest-mysql-5.0.9_beta b/dev-db/mysql/files/digest-mysql-5.0.9_beta
new file mode 100644
index 000000000000..f39b28da0a77
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-5.0.9_beta
@@ -0,0 +1 @@
+MD5 8899d591d549d1d8ca61f5741bff490c mysql-5.0.9-beta.tar.gz 18615183
diff --git a/dev-db/mysql/files/mysql-4.0.25-asm-pic-fixes.patch b/dev-db/mysql/files/mysql-4.0.25-asm-pic-fixes.patch
new file mode 100644
index 000000000000..e20663f96418
--- /dev/null
+++ b/dev-db/mysql/files/mysql-4.0.25-asm-pic-fixes.patch
@@ -0,0 +1,294 @@
+--- mysql/strings/longlong2str-x86.s	2005-07-15 15:47:28.000000000 +0200
++++ mysql-fixed/strings/longlong2str-x86.s	2005-07-15 14:07:42.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
++	addl  $80,%esp
++        movb  $0,(%eax)         # '\0'
++	popl  %ebp
++	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,6 @@
+ 	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
diff --git a/dev-db/mysql/mysql-4.0.25.ebuild b/dev-db/mysql/mysql-4.0.25.ebuild
new file mode 100644
index 000000000000..1ce8513a1e04
--- /dev/null
+++ b/dev-db/mysql/mysql-4.0.25.ebuild
@@ -0,0 +1,449 @@
+# 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.ebuild,v 1.1 2005/07/15 19:09:50 vivo Exp $
+
+inherit eutils gnuconfig flag-o-matic versionator
+
+SVER=${PV%.*}
+PLV=""
+NEWP="${PN}-${SVER}.$( get_version_component_range 3-3 )${PLV}"
+
+# shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="berkdb debug doc minimal perl readline selinux ssl static tcpd big-tables"
+RESTRICT="primaryuri"
+
+DEPEND="readline? ( >=sys-libs/readline-4.1 )
+		tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
+		ssl? ( >=dev-libs/openssl-0.9.6d )
+		perl? ( dev-lang/perl )
+		>=sys-libs/zlib-1.1.3
+		>=sys-apps/texinfo-4.7-r1
+		sys-process/procps
+		>=sys-apps/sed-4"
+RDEPEND="${DEPEND}
+		selinux? ( sec-policy/selinux-mysql )"
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( dev-perl/DBD-mysql )"
+
+mysql_get_datadir() {
+	DATADIR=""
+	if [ -f '/etc/mysql/my.cnf' ] ; then
+		#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
+		#DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
+		#DATADIR=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'`
+		DATADIR=`my_print_defaults mysqld 2>/dev/null | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
+	fi
+	if [ -z "${DATADIR}" ]; then
+		DATADIR="/var/lib/mysql/"
+		einfo "Using default DATADIR"
+	fi
+	einfo "MySQL DATADIR is ${DATADIR}"
+	export DATADIR
+}
+
+mysql_upgrade_warning() {
+	ewarn
+	ewarn "If you're upgrading from MySQL-3.x to 4.0, or 4.0.x to 4.1.x, you"
+	ewarn "must recompile the other packages on your system that link with"
+	ewarn "libmysqlclient after the upgrade completes.  To obtain such a list"
+	ewarn "of packages for your system, you may use 'revdep-rebuild' from"
+	ewarn "app-portage/gentoolkit."
+	ewarn
+	epause 5
+}
+
+pkg_setup() {
+	mysql_upgrade_warning
+	mysql_get_datadir
+}
+
+src_unpack() {
+	if use static && use ssl; then
+		local msg="MySQL does not support building statically with SSL support"
+		eerror "${msg}"
+		die "${msg}"
+	fi
+
+	unpack ${A} || die
+
+	mv "${WORKDIR}/${NEWP}" "${S}"
+	cd "${S}"
+
+	#zap startup script messages
+	EPATCH_OPTS="-p1 -d ${S}" \
+	epatch ${FILESDIR}/${PN}-4.0.23-install-db-sh.diff || die
+	#zap binary distribution stuff
+	EPATCH_OPTS="-p1 -d ${S}" \
+	epatch ${FILESDIR}/${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 || die
+	#for correct hardcoded sysconf directory
+	EPATCH_OPTS="-p1 -d ${S}" \
+	epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff || die
+	# NPTL support
+	EPATCH_OPTS="-p1 -d ${S}" \
+	epatch ${FILESDIR}/${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
+
+	# fixed in 4.0.25
+	#EPATCH_OPTS="-p1 -d ${S}" \
+	#epatch ${FILESDIR}/${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
+	# get the software to autoreconf as distributed - too many missing files
+	EPATCH_OPTS="-p1 -d ${S}" \
+	epatch ${FILESDIR}/${PN}-4.0.21-thrssl.patch || die
+
+	# PIC fixes
+	# bug #42968
+	EPATCH_OPTS="-p1 -d ${S}" \
+	epatch ${FILESDIR}/${PN}-4.0.25-asm-pic-fixes.patch || die
+
+	if use tcpd; then
+		EPATCH_OPTS="-p1 -d ${S}" \
+		epatch ${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff || die
+	fi
+
+	for d in ${S} ${S}/innobase; do
+		cd ${d}
+		# WARNING, plain autoconf breaks it!
+		#autoconf
+		# must use this instead
+		WANT_AUTOCONF=2.59 autoreconf --force
+		# Fix the evil "libtool.m4 and ltmain.sh have a version mismatch!"
+		libtoolize --copy --force
+		# Saving this for a rainy day, in case we need it again
+		#WANT_AUTOMAKE=1.7 automake
+		gnuconfig_update
+	done
+
+	# upstream bug http://bugs.mysql.com/bug.php?id=7971
+	# names conflict with stuff in 2.6.10 kernel headers
+	echo ${S}/client/mysqltest.c ${S}/extra/replace.c | xargs -n1 \
+	sed -i \
+		-e "s/\<set_bit\>/my__set_bit/g" \
+		-e "s/\<clear_bit\>/my__clear_bit/g" \
+	    || die "Failed to fix bitops"
+}
+
+src_compile() {
+	local myconf
+
+	# readline pair reads backwards on purpose, DONT change it around, Ok?
+	# this is because it refers to the building of a bundled readline
+	# versus the system copy
+	use readline && myconf="${myconf} --without-readline"
+	use readline || myconf="${myconf} --with-readline"
+
+	use static \
+		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
+		|| myconf="${myconf} --enable-shared --enable-static"
+
+	myconf="${myconf} `use_with tcpd libwrap`"
+
+	use ssl \
+		&& myconf="${myconf} --with-vio --with-openssl" \
+		|| myconf="${myconf} --without-openssl"
+
+	myconf="${myconf} `use_with debug` `use_with big-tables`"
+
+	# benchmarking stuff needs perl
+	# and shouldn't be bothered with on minimal builds
+	if useq perl && ! useq minimal; then
+		myconf="${myconf} --with-bench"
+	else
+		myconf="${myconf} --without-bench"
+	fi
+
+	# these are things we exclude from a minimal build
+	# note that the server actually does get built and installed
+	# but we then delete it before packaging.
+	local minimal_exclude_list="server embedded-server extra-tools innodb raid"
+	if ! useq minimal; then
+		for i in ${minimal_exclude_list}; do
+			myconf="${myconf} --with-${i}"
+		done
+
+		# lots of chars
+		myconf="${myconf} --with-extra-charsets=all"
+
+		#The following fix is due to a bug with bdb on sparc's. See:
+		#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
+		# it boils down to non-64 bit safety.
+		if useq sparc || useq alpha || useq hppa || useq mips || useq amd64
+		then
+			myconf="${myconf} --without-berkeley-db"
+		else
+			use berkdb \
+				&& myconf="${myconf} --with-berkeley-db=./bdb" \
+				|| myconf="${myconf} --without-berkeley-db"
+		fi
+
+	else
+		for i in ${minimal_exclude_list}; do
+			myconf="${myconf} --without-${i}"
+		done
+		myconf="${myconf} --without-berkeley-db"
+		myconf="${myconf} --with-extra-charsets=none"
+	fi
+
+	# documentation
+	myconf="${myconf} `use_with doc docs`"
+
+	# glibc-2.3.2_pre fix; bug #16496
+	append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
+
+	#bug fix for #15099, should make this api backward compatible
+	append-flags "-DUSE_OLD_FUNCTIONS"
+
+	#the compiler flags are as per their "official" spec ;)
+	#CFLAGS="${CFLAGS/-O?/} -O3" \
+	export CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti"
+
+	econf \
+		-C \
+		--libexecdir=/usr/sbin \
+		--sysconfdir=/etc/mysql \
+		--localstatedir=/var/lib/mysql \
+		--with-low-memory \
+		--enable-assembler \
+		--with-charset=latin1 \
+		--enable-local-infile \
+		--with-mysqld-user=mysql \
+		--with-client-ldflags=-lstdc++ \
+		--enable-thread-safe-client \
+		--with-comment="Gentoo Linux ${PF}" \
+		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
+		${myconf} || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die
+
+	diropts "-m0750"
+	dodir "${DATADIR}" /var/log/mysql
+
+	diropts "-m0755"
+	dodir /var/run/mysqld
+
+	keepdir "${DATADIR}" /var/run/mysqld /var/log/mysql
+	chown -R mysql:mysql ${D}/var/lib/mysql \
+		${D}/var/run/mysqld \
+		${D}/var/log/mysql
+
+	# move client libs, install a couple of missing headers
+	local lib=$(get_libdir)
+	mv ${D}/usr/${lib}/mysql/libmysqlclient*.so* ${D}/usr/${lib}
+	dosym ../libmysqlclient.so /usr/${lib}/mysql/libmysqlclient.so
+	dosym ../libmysqlclient_r.so /usr/${lib}/mysql/libmysqlclient_r.so
+	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
+
+	# convenience links
+	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
+	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
+	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
+
+	# various junk
+	rm -f ${D}/usr/bin/make*distribution
+	rm -f ${D}/usr/share/mysql/make_*_distribution
+	rm -f ${D}/usr/share/mysql/mysql.server
+	rm -f ${D}/usr/share/mysql/binary-configure
+	rm -f ${D}/usr/share/mysql/mysql-log-rotate
+	rm -f ${D}/usr/share/mysql/{post,pre}install
+	rm -f ${D}/usr/share/mysql/mi_test*
+	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
+	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
+	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
+
+	# All of these (ab)use Perl.
+	if ! use perl; then
+		rm -f ${D}/usr/bin/{mysqlhotcopy,mysql_find_rows,mysql_convert_table_format,mysqld_multi,mysqlaccess,mysql_fix_extensions,mysqldumpslow,mysql_zap,mysql_explain_log,mysql_tableinfo,mysql_setpermission}
+		rm -f ${D}/usr/bin/mysqlhotcopy
+		rm -rf ${D}/usr/share/mysql/sql-bench
+	fi
+
+	# clean up stuff for a minimal build
+	# this is anything server-specific
+	if useq minimal; then
+		rm -rf ${D}/usr/share/mysql/{mysql-test,sql-bench}
+		rm -f ${D}/usr/bin/{mysql_install_db,mysqlmanager*,mysql_secure_installation,mysql_fix_privilege_tables,mysqlhotcopy,mysql_convert_table_format,mysqld_multi,mysql_fix_extensions,mysql_zap,mysql_explain_log,mysql_tableinfo,mysqld_safe,myisam*,isam*,mysql_install,mysql_waitpid,mysqlbinlog,mysqltest,pack_isam}
+		rm -f ${D}/usr/sbin/mysqld
+		rm -f ${D}/usr/lib/mysql/lib{heap,merge,nisam,mysys,mystrings,mysqld,myisammrg,vio,dbug,myisam}.a
+	fi
+
+	# config stuff
+	insinto /etc/mysql
+	doins scripts/mysqlaccess.conf
+	newins ${FILESDIR}/my.cnf-4.0.24-r1 my.cnf
+
+	# minimal builds don't have the server
+	if ! useq minimal; then
+		exeinto /etc/init.d
+		newexe "${FILESDIR}/mysql-4.0.24-r2.rc6" mysql
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/logrotate.mysql" mysql
+	fi
+
+	# docs
+	dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
+	# minimal builds don't have the server
+	if useq doc && ! useq minimal; then
+		dohtml Docs/*.html
+		dodoc Docs/manual.{txt,ps}
+		docinto conf-samples
+		dodoc support-files/my-*.cnf
+	fi
+
+}
+
+src_test() {
+	cd ${S}
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	make check || die "make check failed"
+	if ! useq minimal; then
+		local retstatus
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+		make test
+		retstatus=$?
+
+		# to be sure ;)
+		pkill -9 -f ${S}/ndb/src/kernel/ndbd 2>/dev/null
+		pkill -9 -f ${S}/ndb/src/mgmsrv/ndb_mgmd 2>/dev/null
+		pkill -9 -f ${S}/ndb/src/mgmclient/ndb_mgm 2>/dev/null
+		pkill -9 -f ${S}/sql/mysqld 2>/dev/null
+		[[ $retstatus == 0 ]] || die "make test failed"
+
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
+
+pkg_config() {
+	mysql_get_datadir
+
+	if built_with_use dev-db/mysql minimal; then
+		die "Minimal builds do NOT include the MySQL server"
+	fi
+
+	if [[ "$(pgrep mysqld)" != "" ]] ; then
+		die "Oops you already have a mysql daemon running!"
+	fi
+
+	local pwd1="a"
+	local pwd2="b"
+	local maxtry=5
+
+	if [[ -d "${DATADIR}/mysql" ]] ; then
+		ewarn "You have already a MySQL database in place."
+		ewarn "Please rename it or delete it if you wish to replace it."
+		die "MySQL database already exists!"
+	fi
+
+	einfo "Creating the mysql database and setting proper"
+	einfo "permissions on it..."
+
+	einfo "Insert a password for the mysql 'root' user"
+	ewarn "the password will be visible on the screen"
+
+	echo -n "    >" && read -r pwd1
+	einfo "Repeat the password"
+	echo -n "    >" && read -r pwd2
+
+	if ((  "x$pwd1" != "x$pwd2" )) ; then
+		die "Passwords are not the same"
+	fi
+
+	${ROOT}/usr/bin/mysql_install_db || die "MySQL databases not installed"
+
+	# MySQL 5.0 don't ned this
+	chown -R mysql:mysql ${DATADIR}
+	chmod 0750 ${ROOT}/${DATADIR}
+
+	# now we can set the password
+	local socket=${ROOT}/var/run/mysqld/mysqld.sock
+	local mysqld="${ROOT}/usr/sbin/mysqld \
+		--skip-grant-tables \
+		--basedir=${ROOT}/usr \
+		--datadir=${ROOT}/var/lib/mysql \
+		--skip-innodb \
+		--skip-bdb \
+		--max_allowed_packet=8M \
+		--net_buffer_length=16K \
+		--socket=${socket} \
+		--pid-file=${ROOT}/var/run/mysqld/mysqld.pid"
+
+	$mysqld &
+
+	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]]
+	do
+		maxtry=$(($maxtry-1))
+		echo -n "."
+		sleep 1
+	done
+
+	# do this from memory we don't want clear text password in temp files
+	local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'"
+	${ROOT}/usr/bin/mysql \
+		--socket=${socket} \
+		-hlocalhost \
+		-e "${sql}"
+	local retstatus=$?
+
+	kill $( cat ${ROOT}/var/run/mysqld/mysqld.pid )
+
+	[[ $retstatus == 0 ]] || die "Failed to communicate with MySQL server"
+
+	einfo "done"
+}
+
+pkg_preinst() {
+	enewgroup mysql 60 || die "problem adding group mysql"
+	enewuser mysql 60 /bin/false /var/lib/mysql mysql \
+	|| die "problem adding user mysql"
+}
+
+pkg_postinst() {
+	mysql_get_datadir
+
+	if ! useq minimal; then
+		#empty dirs...
+		[ -d "${ROOT}/${DATADIR}" ] || install -d -m0750 -o mysql -g mysql ${ROOT}/var/lib/mysql
+		[ -d "${ROOT}/var/run/mysqld" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
+		[ -d "${ROOT}/var/log/mysql" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
+
+		# secure the logfiles... does this bother anybody?
+		touch ${ROOT}/var/log/mysql/mysql.{log,err}
+		chown mysql:mysql ${ROOT}/var/log/mysql/mysql*
+		chmod 0660 ${ROOT}/var/log/mysql/mysql*
+		# secure some directories
+		chmod 0750 ${ROOT}/var/log/mysql ${ROOT}/${DATADIR}
+
+		# your friendly public service announcement...
+		einfo
+		einfo "You might want to run:"
+		einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
+		einfo "if this is a new install."
+		einfo
+	fi
+
+	mysql_upgrade_warning
+	einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
+}
diff --git a/dev-db/mysql/mysql-4.1.12-r1.ebuild b/dev-db/mysql/mysql-4.1.12-r1.ebuild
new file mode 100644
index 000000000000..744b14ba813b
--- /dev/null
+++ b/dev-db/mysql/mysql-4.1.12-r1.ebuild
@@ -0,0 +1,496 @@
+# 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.12-r1.ebuild,v 1.1 2005/07/15 19:09:50 vivo Exp $
+
+inherit eutils gnuconfig flag-o-matic versionator
+
+SVER=${PV%.*}
+PLV=""
+NEWP="${PN}-${SVER}.$( get_version_component_range 3-3 )${PLV}"
+
+# shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~sparc ~ia64 ~ppc ~ppc64"
+IUSE="berkdb debug doc minimal perl readline selinux ssl static tcpd cluster utf8 geometry extraengine big-tables"
+RESTRICT="primaryuri"
+
+DEPEND="readline? ( >=sys-libs/readline-4.1 )
+		tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
+		ssl? ( >=dev-libs/openssl-0.9.6d )
+		perl? ( dev-lang/perl )
+		>=sys-libs/zlib-1.1.3
+		>=sys-apps/texinfo-4.7-r1
+		sys-process/procps
+		>=sys-apps/sed-4"
+RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )"
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+mysql_upgrade_error() {
+	mysql_get_datadir
+	ewarn "Sorry plain upgrade from version of MySQL before 4.1.4 is NOT supported."
+	ewarn "Be sure to read \"Upgrading from version 4.0 to 4.1\" section"
+	ewarn "http://dev.mysql.com/doc/mysql/en/upgrading-from-4-0.html"
+	ewarn "then unmerge previous version of MySQL with"
+	ewarn "#emerge -C dev-db/mysql"
+	ewarn "move your data out of \"${DATADIR}\""
+	ewarn "#emerge =dev-db/${P}"
+	ewarn "reload data you dumped with \"mysqldump\" Because you have read "
+	ewarn "the documentation on how to upgrade"
+	ewarn ""
+	ewarn "You can also choose to preview some new MySQL 4.1 behaviour"
+	ewarn "adding a section \"[mysqld-4.0]\" followed by the word \"new\""
+	ewarn "into /etc/mysql/my.cnf (you need a recent MySQL version)"
+}
+
+mysql_upgrade_warning() {
+	ewarn "If you're upgrading from MySQL-3.x to 4.0, or 4.0.x to 4.1.x, you"
+	ewarn "must recompile the other packages on your system that link with"
+	ewarn "libmysqlclient after the upgrade completes.  To obtain such a list"
+	ewarn "of packages for your system, you may use 'revdep-rebuild' from"
+	ewarn "app-portage/gentoolkit."
+}
+
+mysql_get_datadir() {
+	DATADIR=""
+	if [ -f '/etc/mysql/my.cnf' ] ; then
+		#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
+		#DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
+		#DATADIR=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'`
+		DATADIR=`my_print_defaults mysqld 2>/dev/null | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
+	fi
+	if [ -z "${DATADIR}" ]; then
+		DATADIR="/var/lib/mysql/"
+		einfo "Using default DATADIR"
+	fi
+	einfo "MySQL DATADIR is ${DATADIR}"
+	export DATADIR
+}
+
+pkg_setup() {
+	mysql_get_datadir
+	if ! useq minimal ; then
+		if has_version "<=dev-db/mysql-4.1.4" \
+		&& ! built_with_use dev-db/mysql minimal \
+		&& [ -d "${DATADIR}/mysql" ]; then
+			mysql_upgrade_error
+			die
+		fi
+	fi
+	mysql_upgrade_warning
+}
+
+src_unpack() {
+	if use static && use ssl; then
+		local msg="MySQL does not support building statically with SSL support"
+		eerror "${msg}"
+		die "${msg}"
+	fi
+
+	if useq cluster || useq geometry || useq extraengine && useq minimal; then
+		die "USEs cluster, geometry, extraengine conflicts with \"minimal\""
+	fi
+
+	unpack ${A} || die
+
+	mv "${WORKDIR}/${NEWP}" "${S}"
+	cd "${S}"
+
+	# for correct hardcoded sysconf directory
+	epatch "${FILESDIR}/${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"
+
+	# PIC fixes
+	# bug #42968
+	epatch "${FILESDIR}/035_x86_asm-pic-fixes-r2.patch"
+
+	if use tcpd; then
+		epatch "${FILESDIR}/${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"
+
+	for d in ${S} ${S}/innobase; do
+		cd ${d}
+		# WARNING, plain autoconf breaks it!
+		#autoconf
+		# must use this instead
+		WANT_AUTOCONF="2.59" autoreconf --force
+		# Fix the evil "libtool.m4 and ltmain.sh have a version mismatch!"
+		libtoolize --copy --force
+		# Saving this for a rainy day, in case we need it again
+		#WANT_AUTOMAKE=1.7 automake
+		gnuconfig_update
+	done
+
+	## Should be fixed in 4.1.12
+	# upstream bug http://bugs.mysql.com/bug.php?id=7971
+	# names conflict with stuff in 2.6.10 kernel headers
+	#sed -i.orig \
+	#	-e "s/\<set_bit\>/my__set_bit/g" \
+	#	-e "s/\<clear_bit\>/my__clear_bit/g" \
+	#	${S}/client/mysqltest.c || die "Failed to fix bitops"
+
+}
+
+src_compile() {
+	local myconf
+
+	# readline pair reads backwards on purpose, DONT change it around, Ok?
+	# this is because it refers to the building of a bundled readline
+	# versus the system copy
+	use readline && myconf="${myconf} --without-readline"
+	use readline || myconf="${myconf} --with-readline"
+
+	use static \
+		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
+		|| myconf="${myconf} --enable-shared --enable-static"
+
+	myconf="${myconf} `use_with tcpd libwrap`"
+
+	use ssl \
+		&& myconf="${myconf} --with-vio --with-openssl" \
+		|| myconf="${myconf} --without-openssl"
+
+	if use debug; then
+		myconf="${myconf} --with-debug=full"
+	else
+		myconf="${myconf} --without-debug"
+		use cluster && myconf="${myconf} --without-ndb-debug"
+	fi
+
+	# benchmarking stuff needs perl
+	# and shouldn't be bothered with on minimal builds
+	if useq perl && ! useq minimal; then
+		myconf="${myconf} --with-bench"
+	else
+		myconf="${myconf} --without-bench"
+	fi
+
+	# these are things we exclude from a minimal build
+	# note that the server actually does get built and installed
+	# but we then delete it before packaging.
+	local minimal_exclude_list="server embedded-server extra-tools innodb raid"
+	if ! useq minimal; then
+		for i in ${minimal_exclude_list}; do
+			myconf="${myconf} --with-${i}"
+		done
+
+		if useq utf8; then
+			myconf="${myconf} --with-charset=utf8 --with-collation=utf8_general_ci"
+		else
+			myconf="${myconf} --with-charset=latin1 --with-collation=latin1_swedish_ci"
+		fi
+
+		# lots of chars
+		myconf="${myconf} --with-extra-charsets=all"
+
+		#The following fix is due to a bug with bdb on sparc's. See:
+		#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
+		# it comes down to non-64-bit safety problems
+		if useq sparc || useq alpha || useq hppa || useq mips || useq amd64
+		then
+			myconf="${myconf} --without-berkeley-db"
+		else
+			use berkdb \
+				&& myconf="${myconf} --with-berkeley-db=./bdb" \
+				|| myconf="${myconf} --without-berkeley-db"
+		fi
+		myconf="${myconf} $(use_with geometry) $(use_with cluster ndbcluster)"
+		myconf="${myconf} $(use_with big-tables)"
+	else
+		for i in ${minimal_exclude_list}; do
+			myconf="${myconf} --without-${i}"
+		done
+		myconf="${myconf} --without-berkeley-db"
+		myconf="${myconf} --with-extra-charsets=none"
+	fi
+
+	# documentation
+	myconf="${myconf} `use_with doc docs`"
+
+	if useq extraengine; then
+		# http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
+		myconf="${myconf} --with-archive-storage-engine"
+		# http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
+		myconf="${myconf} --with-csv-storage-engine"
+		# http://dev.mysql.com/doc/mysql/en/federated-description.html
+		# http://dev.mysql.com/doc/mysql/en/federated-limitations.html
+		#if  version_is_at_least "5.1.3" ; then
+		#	einfo "before to use federated engine be sure to read"
+		#	einfo "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
+		#	myconf="${myconf} --with-federated-storage-engine"
+		#fi
+		myconf="${myconf} --with-blackhole-storage-engine"
+	fi
+
+	#glibc-2.3.2_pre fix; bug #16496
+	append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
+
+	#the compiler flags are as per their "official" spec ;)
+	#CFLAGS="${CFLAGS/-O?/} -O3" \
+	export CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti"
+
+	econf \
+		--libexecdir=/usr/sbin \
+		--sysconfdir=/etc/mysql \
+		--localstatedir=/var/lib/mysql \
+		--with-low-memory \
+		--enable-assembler \
+		--enable-local-infile \
+		--with-mysqld-user=mysql \
+		--with-client-ldflags=-lstdc++ \
+		--enable-thread-safe-client \
+		--with-comment="Gentoo Linux ${PF}" \
+		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
+		--with-zlib-dir=/usr \
+		--with-lib-ccflags="-fPIC" \
+		${myconf} || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die
+
+	diropts "-m0750"
+	dodir "${DATADIR}" /var/run/mysqld /var/log/mysql
+
+	diropts "-m0755"
+	dodir /var/run/mysqld
+
+	keepdir "${DATADIR}" /var/run/mysqld /var/log/mysql
+	chown -R mysql:mysql ${D}/var/lib/mysql \
+		${D}/var/run/mysqld \
+		${D}/var/log/mysql
+
+	# move client libs, install a couple of missing headers
+	local lib=$(get_libdir)
+	mv ${D}/usr/${lib}/mysql/libmysqlclient*.so* ${D}/usr/${lib}
+	dosym ../libmysqlclient.so /usr/${lib}/mysql/libmysqlclient.so
+	dosym ../libmysqlclient_r.so /usr/${lib}/mysql/libmysqlclient_r.so
+	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
+
+	# convenience links
+	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
+	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
+	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
+
+	# various junk
+	rm -f ${D}/usr/bin/make*distribution
+	rm -f ${D}/usr/share/mysql/make_*_distribution
+	rm -f ${D}/usr/share/mysql/mysql.server
+	rm -f ${D}/usr/share/mysql/binary-configure
+	rm -f ${D}/usr/share/mysql/mysql-log-rotate
+	rm -f ${D}/usr/share/mysql/{post,pre}install
+	rm -f ${D}/usr/share/mysql/mi_test*
+	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
+	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
+	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
+
+	# All of these (ab)use Perl.
+	if ! use perl; then
+		rm -f ${D}/usr/bin/{mysqlhotcopy,mysql_find_rows,mysql_convert_table_format,mysqld_multi,mysqlaccess,mysql_fix_extensions,mysqldumpslow,mysql_zap,mysql_explain_log,mysql_tableinfo,mysql_setpermission}
+		rm -f ${D}/usr/bin/mysqlhotcopy
+		rm -rf ${D}/usr/share/mysql/sql-bench
+	fi
+
+	# clean up stuff for a minimal build
+	# this is anything server-specific
+	if useq minimal; then
+		rm -rf ${D}/usr/share/mysql/{mysql-test,sql-bench}
+		rm -f ${D}/usr/bin/{mysql_install_db,mysqlmanager*,mysql_secure_installation,mysql_fix_privilege_tables,mysqlhotcopy,mysql_convert_table_format,mysqld_multi,mysql_fix_extensions,mysql_zap,mysql_explain_log,mysql_tableinfo,mysqld_safe,myisam*,isam*,mysql_install,mysql_waitpid,mysqlbinlog,mysqltest,pack_isam}
+		rm -f ${D}/usr/sbin/mysqld
+		rm -f ${D}/usr/lib/mysql/lib{heap,merge,nisam,mysys,mystrings,mysqld,myisammrg,vio,dbug,myisam}.a
+	fi
+
+	# config stuff
+	insinto /etc/mysql
+	doins scripts/mysqlaccess.conf
+
+	newins "${FILESDIR}/my.cnf-4.1" my.cnf
+
+	if ! use utf8; then
+		sed -i -e "s/utf8/latin1/" ${D}/etc/mysql/my.cnf
+	fi
+
+	# minimal builds don't have the server
+	if ! useq minimal; then
+		exeinto /etc/init.d
+		newexe "${FILESDIR}/mysql-4.0.24-r2.rc6" mysql
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/logrotate.mysql" mysql
+	fi
+
+	# docs
+	dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
+	# minimal builds don't have the server
+	if useq doc && ! useq minimal; then
+		dohtml Docs/*.html
+		dodoc Docs/manual.{txt,ps}
+		docinto conf-samples
+		dodoc support-files/my-*.cnf
+	fi
+}
+
+src_test() {
+	cd ${S}
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	make check || die "make check failed"
+	if ! useq minimal; then
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus
+		addpredict /this-dir-does-not-exist/t9.MYI
+		make test
+		retstatus=$?
+
+		# to be sure ;)
+		pkill -9 -f ${S}/ndb/src/kernel/ndbd 2>/dev/null
+		pkill -9 -f ${S}/ndb/src/mgmsrv/ndb_mgmd 2>/dev/null
+		pkill -9 -f ${S}/ndb/src/mgmclient/ndb_mgm 2>/dev/null
+		pkill -9 -f ${S}/sql/mysqld 2>/dev/null
+		[[ $retstatus == 0 ]] || die "make test failed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
+
+pkg_config() {
+	mysql_get_datadir
+
+	if built_with_use dev-db/mysql minimal; then
+		die "Minimal builds do NOT include the MySQL server"
+	fi
+
+	if [[ "$(pgrep mysqld)" != "" ]] ; then
+		die "Oops you already have a mysql daemon running!"
+	fi
+
+	local pwd1="a"
+	local pwd2="b"
+	local maxtry=5
+
+	if [[ -d "${DATADIR}/mysql" ]] ; then
+		ewarn "You have already a MySQL database in place."
+		ewarn "Please rename it or delete it if you wish to replace it."
+		die "MySQL database already exists!"
+	fi
+
+	einfo "Creating the mysql database and setting proper"
+	einfo "permissions on it..."
+
+	einfo "Insert a password for the mysql 'root' user"
+	ewarn "the password will be visible on the screen"
+
+	echo -n "    >" && read -r pwd1
+	einfo "Check the password"
+	echo -n "    >" && read -r pwd2
+
+	if ((  pwd1 != pwd2 )) ; then
+		die "Passwords are not the same"
+	fi
+
+	${ROOT}/usr/bin/mysql_install_db || die "MySQL databases not installed"
+
+	# MySQL 5.0 don't ned this
+	chown -R mysql:mysql ${DATADIR}
+	chmod 0750 ${ROOT}/${DATADIR}
+
+	local sqltmp="$(emktemp)"
+	local help_tables="${ROOT}/usr/share/mysql/fill_help_tables.sql"
+	# Filling timezones, see
+	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	${ROOT}/usr/bin/mysql_tzinfo_to_sql ${ROOT}/usr/share/zoneinfo > "${sqltmp}"
+
+	if [[ -r "${help_tables}" ]] ; then
+		cat "${help_tables}" >> "${sqltmp}"
+	fi
+
+	local socket=${ROOT}/var/run/mysqld/mysqld.sock
+	local mysqld="${ROOT}/usr/sbin/mysqld \
+		--skip-grant-tables \
+		--basedir=${ROOT}/usr \
+		--datadir=${ROOT}/var/lib/mysql \
+		--skip-innodb \
+		--skip-bdb \
+		--skip-ndbcluster \
+		--max_allowed_packet=8M \
+		--net_buffer_length=16K \
+		--socket=${socket} \
+		--pid-file=${ROOT}/var/run/mysqld/mysqld.pid"
+
+	$mysqld &
+	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]]
+	do
+		maxtry=$(($maxtry-1))
+		echo -n "."
+		sleep 1
+	done
+
+	# do this from memory we don't want clear text password in temp files
+	local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'"
+	${ROOT}/usr/bin/mysql \
+		--socket=${ROOT}/var/run/mysqld/mysqld.sock \
+		-hlocalhost \
+		-e "${sql}"
+
+	einfo "Loading \"zoneinfo\" this step may require few seconds"
+
+	${ROOT}/usr/bin/mysql \
+		--socket=${socket} \
+		-hlocalhost \
+		-uroot \
+		-p"${pwd1}" \
+		mysql < "${sqltmp}"
+
+	kill $( cat ${ROOT}/var/run/mysqld/mysqld.pid )
+	rm  "${sqltmp}"
+	einfo "done"
+}
+
+pkg_preinst() {
+	enewgroup mysql 60 || die "problem adding group mysql"
+	enewuser mysql 60 /bin/false /var/lib/mysql mysql \
+	|| die "problem adding user mysql"
+}
+
+pkg_postinst() {
+	mysql_get_datadir
+
+	if ! useq minimal; then
+		#empty dirs...
+		[ -d "${ROOT}/${DATADIR}" ] || install -d -m0750 -o mysql -g mysql ${ROOT}/var/lib/mysql
+		[ -d "${ROOT}/var/run/mysqld" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
+		[ -d "${ROOT}/var/log/mysql" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
+
+		# secure the logfiles... does this bother anybody?
+		touch ${ROOT}/var/log/mysql/mysql.{log,err}
+		chown mysql:mysql ${ROOT}/var/log/mysql/mysql*
+		chmod 0660 ${ROOT}/var/log/mysql/mysql*
+		# secure some directories
+		chmod 0750 ${ROOT}/var/log/mysql ${ROOT}/${DATADIR}
+
+		# your friendly public service announcement...
+		einfo
+		einfo "You might want to run:"
+		einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
+		einfo "if this is a new install."
+		einfo
+	fi
+
+	mysql_upgrade_warning
+	einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
+}
diff --git a/dev-db/mysql/mysql-5.0.9_beta.ebuild b/dev-db/mysql/mysql-5.0.9_beta.ebuild
new file mode 100644
index 000000000000..45676a747212
--- /dev/null
+++ b/dev-db/mysql/mysql-5.0.9_beta.ebuild
@@ -0,0 +1,519 @@
+# 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.9_beta.ebuild,v 1.1 2005/07/15 19:09:50 vivo Exp $
+
+inherit flag-o-matic versionator
+
+SVER=${PV%.*}
+NEWP="${PN}-${PV}"
+NEWP="${NEWP/_beta/-beta}"
+
+
+# shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~sparc ~ia64 ~ppc ~ppc64"
+
+IUSE="debug doc minimal perl readline selinux ssl static tcpd big-tables"
+RESTRICT="primaryuri"
+
+DEPEND="readline? ( >=sys-libs/readline-4.1 )
+	bdb? ( sys-apps/ed )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	perl? ( dev-lang/perl )
+	>=sys-libs/zlib-1.1.3
+	>=sys-apps/texinfo-4.7-r1
+	sys-process/procps
+	>=sys-apps/sed-4"
+RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )"
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+if version_is_at_least "4.1.3" ; then
+	IUSE="${IUSE} cluster utf8 geometry extraengine"
+fi
+
+mysql_upgrade_error() {
+	mysql_get_datadir
+	ewarn "Sorry plain upgrade from version of MySQL before 4.1.4 is NOT supported."
+	ewarn "Be sure to read \"Upgrading from version 4.0 to 4.1\" section"
+	ewarn "http://dev.mysql.com/doc/mysql/en/upgrading-from-4-0.html"
+	ewarn "then unmerge previous version of MySQL with"
+	ewarn "#emerge -C dev-db/mysql"
+	ewarn "move your data out of \"${DATADIR}\""
+	ewarn "#emerge =dev-db/${P}"
+	ewarn "reload data you dumped with \"mysqldump\" Because you have read "
+	ewarn "the documentation on how to upgrade"
+	ewarn ""
+	ewarn "You can also choose to preview some new MySQL 4.1 behaviour"
+	ewarn "adding a section \"[mysqld-4.0]\" followed by the word \"new\""
+	ewarn "into /etc/mysql/my.cnf (you need a recent MySQL version)"
+}
+
+mysql_upgrade_warning() {
+	ewarn "If you're upgrading from MySQL-3.x to 4.0, or 4.0.x to 4.1.x, you"
+	ewarn "must recompile the other packages on your system that link with"
+	ewarn "libmysqlclient after the upgrade completes.  To obtain such a list"
+	ewarn "of packages for your system, you may use 'revdep-rebuild' from"
+	ewarn "app-portage/gentoolkit."
+}
+
+mysql_get_datadir() {
+	DATADIR=""
+	if [ -f '/etc/mysql/my.cnf' ] ; then
+		#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
+		#DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
+		#DATADIR=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'`
+		DATADIR=`my_print_defaults mysqld 2>/dev/null | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
+	fi
+	if [ -z "${DATADIR}" ]; then
+		DATADIR="/var/lib/mysql/"
+		einfo "Using default DATADIR"
+	fi
+	einfo "MySQL DATADIR is ${DATADIR}"
+	export DATADIR
+}
+
+pkg_setup() {
+	mysql_get_datadir
+	if ! useq minimal && version_is_at_least "4.1.4"; then
+		if has_version "<=dev-db/mysql-4.1.4" \
+		&& ! built_with_use dev-db/mysql minimal \
+		&& [ -d "${DATADIR}/mysql" ]; then
+			mysql_upgrade_error
+			die
+		fi
+	fi
+	mysql_upgrade_warning
+}
+
+src_unpack() {
+	if use static && use ssl; then
+		local msg="MySQL does not support building statically with SSL support"
+		eerror "${msg}"
+		die "${msg}"
+	fi
+
+	if version_is_at_least "4.1.3" \
+	&& useq cluster \
+	|| useq geometry \
+	|| useq extraengine \
+	&& useq minimal ; then
+		die "USEs cluster, geometry, extraengine conflicts with \"minimal\""
+	fi
+
+	unpack ${A} || die
+
+	mv "${WORKDIR}/${NEWP}" "${S}"
+	cd "${S}"
+
+	epatch "${FILESDIR}/010_all_my-print-defaults-r2.patch"
+	epatch "${FILESDIR}/035_x86_asm-pic-fixes-r2.patch"
+	epatch "${FILESDIR}/701_all_test-myisam-geometry.patch"
+	epatch "${FILESDIR}/703_all_test-rpl_rotate_logs.patch"
+
+	find . -name Makefile -o -name Makefile.in -o -name configure -exec rm {} \;
+	aclocal && autoheader \
+		|| die "failed reconfigure step 01"
+	libtoolize --automake --force \
+		|| die "failed reconfigure step 02"
+	automake --force --add-missing && autoconf \
+		|| die "failed reconfigure step 03"
+	pushd innobase && aclocal && autoheader && autoconf && automake \
+		|| die "failed innobase reconfigure"
+	popd
+	pushd bdb/dist && sh s_all \
+		|| die "failed bdb reconfigure"
+	popd
+}
+
+src_compile() {
+	local myconf
+
+	# readline pair reads backwards on purpose, DONT change it around, Ok?
+	# this is because it refers to the building of a bundled readline
+	# versus the system copy
+	useq readline && myconf="${myconf} --without-readline"
+	useq readline || myconf="${myconf} --with-readline"
+
+	if useq static ; then
+		myconf="${myconf} --with-mysqld-ldflags=-all-static"
+		myconf="${myconf} --with-client-ldflags=-all-static"
+		myconf="${myconf} --disable-shared"
+	else
+		myconf="${myconf} --enable-shared --enable-static"
+	fi
+
+	myconf="${myconf} `use_with tcpd libwrap`"
+
+	if useq ssl ; then
+		# --with-vio is not needed anymore, it's on by default and
+		# has been removed from configure
+		version_is_at_least "5.0.4_beta" || myconf="${myconf} --with-vio"
+		if version_is_at_least "5.0.6_beta" ; then
+			# yassl-0.96 is young break with gcc-4.0 || amd64
+			#myconf="${myconf} --with-yassl"
+			myconf="${myconf} --with-openssl"
+		else
+			myconf="${myconf} --with-openssl"
+		fi
+	else
+		myconf="${myconf} --without-openssl"
+	fi
+
+	if useq debug; then
+		myconf="${myconf} --with-debug=full"
+	else
+		myconf="${myconf} --without-debug"
+		version_is_at_least "4.1.3" && useq cluster && myconf="${myconf} --without-ndb-debug"
+	fi
+
+	# benchmarking stuff needs perl
+	# and shouldn't be bothered with on minimal builds
+	if useq perl && ! useq minimal; then
+		myconf="${myconf} --with-bench"
+	else
+		myconf="${myconf} --without-bench"
+	fi
+
+	# these are things we exclude from a minimal build
+	# note that the server actually does get built and installed
+	# but we then delete it before packaging.
+	local minimal_exclude_list="server embedded-server extra-tools innodb raid"
+	if ! useq minimal; then
+		for i in ${minimal_exclude_list}; do
+			myconf="${myconf} --with-${i}"
+		done
+
+		# this one break things at least in mysql [5.0,5.0.6_beta]
+		#if version_is_at_least "4.1.3" && use utf8; then
+		#	myconf="${myconf} --with-charset=utf8 --with-collation=utf8_general_ci"
+		#else
+		#	myconf="${myconf} --with-charset=latin1 --with-collation=latin1_swedish_ci"
+		#fi
+
+		# lots of chars
+		myconf="${myconf} --with-extra-charsets=all"
+
+		#The following fix is due to a bug with bdb on sparc's. See:
+		#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
+		# it comes down to non-64-bit safety problems
+		if useq sparc || useq alpha || useq hppa || useq mips || useq amd64
+		then
+			myconf="${myconf} --without-berkeley-db"
+		else
+			use berkdb \
+				&& myconf="${myconf} --with-berkeley-db=./bdb" \
+				|| myconf="${myconf} --without-berkeley-db"
+		fi
+
+		if version_is_at_least "4.1.3" ; then
+			myconf="${myconf} $(use_with geometry)"
+			myconf="${myconf} $(use_with cluster ndbcluster)"
+		fi
+
+		version_is_at_least "4.1.11_alpha20050403" &&  myconf="${myconf} --with-big-tables"
+	else
+		for i in ${minimal_exclude_list}; do
+			myconf="${myconf} --without-${i}"
+		done
+		myconf="${myconf} --without-berkeley-db"
+		myconf="${myconf} --with-extra-charsets=none"
+	fi
+
+	# documentation
+	myconf="${myconf} `use_with doc docs`"
+
+	if version_is_at_least "4.1.3" && use extraengine; then
+		# http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
+		myconf="${myconf} --with-archive-storage-engine"
+		# http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
+		version_is_at_least "4.1.4" \
+		&& myconf="${myconf} --with-csv-storage-engine"
+		# http://dev.mysql.com/doc/mysql/en/federated-description.html
+		# http://dev.mysql.com/doc/mysql/en/federated-limitations.html
+		if version_is_at_least "5.0.3" ; then
+			einfo "before to use federated engine be sure to read"
+			einfo "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
+			myconf="${myconf} --with-federated-storage-engine"
+		fi
+		version_is_at_least "4.1.11_alpha20050403" \
+		&&  myconf="${myconf} --with-blackhole-storage-engine"
+	fi
+
+	myconf="${myconf} `use_with big-tables`"
+
+	#glibc-2.3.2_pre fix; bug #16496
+	append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
+
+	#the compiler flags are as per their "official" spec ;)
+	#CFLAGS="${CFLAGS/-O?/} -O3" \
+	export CXXFLAGS="${CXXFLAGS} -fno-implicit-templates -felide-constructors -fno-exceptions -fno-rtti"
+
+	econf \
+		--libexecdir=/usr/sbin \
+		--sysconfdir=/etc/mysql \
+		--localstatedir=/var/lib/mysql \
+		--with-low-memory \
+		--enable-assembler \
+		--enable-local-infile \
+		--with-mysqld-user=mysql \
+		--with-client-ldflags=-lstdc++ \
+		--enable-thread-safe-client \
+		--with-comment="Gentoo Linux ${PF}" \
+		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
+		--with-zlib-dir=/usr \
+		--with-lib-ccflags="-fPIC" \
+		${myconf} || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die
+
+	diropts "-m0750"
+	dodir "${DATADIR}" /var/log/mysql
+
+	diropts "-m0755"
+	dodir /var/run/mysqld
+
+	keepdir "${DATADIR}" /var/run/mysqld /var/log/mysql
+	chown -R mysql:mysql ${D}/var/lib/mysql \
+		${D}/var/run/mysqld \
+		${D}/var/log/mysql
+
+	# move client libs, install a couple of missing headers
+	local lib=$(get_libdir)
+	mv ${D}/usr/${lib}/mysql/libmysqlclient*.so* ${D}/usr/${lib}
+	dosym ../libmysqlclient.so /usr/${lib}/mysql/libmysqlclient.so
+	dosym ../libmysqlclient_r.so /usr/${lib}/mysql/libmysqlclient_r.so
+	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
+
+	# convenience links
+	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
+	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
+	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
+
+	# various junk
+	rm -f ${D}/usr/bin/make*distribution
+	rm -f ${D}/usr/share/mysql/make_*_distribution
+	rm -f ${D}/usr/share/mysql/mysql.server
+	rm -f ${D}/usr/share/mysql/binary-configure
+	rm -f ${D}/usr/share/mysql/mysql-log-rotate
+	rm -f ${D}/usr/share/mysql/{post,pre}install
+	rm -f ${D}/usr/share/mysql/mi_test*
+	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
+	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
+	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
+
+	# All of these (ab)use Perl.
+	if ! use perl; then
+		rm -f ${D}/usr/bin/{mysqlhotcopy,mysql_find_rows,mysql_convert_table_format,mysqld_multi,mysqlaccess,mysql_fix_extensions,mysqldumpslow,mysql_zap,mysql_explain_log,mysql_tableinfo,mysql_setpermission}
+		rm -f ${D}/usr/bin/mysqlhotcopy
+		rm -rf ${D}/usr/share/mysql/sql-bench
+	fi
+
+	# clean up stuff for a minimal build
+	# this is anything server-specific
+	if useq minimal; then
+		rm -rf ${D}/usr/share/mysql/{mysql-test,sql-bench}
+		rm -f ${D}/usr/bin/{mysql_install_db,mysqlmanager*,mysql_secure_installation,mysql_fix_privilege_tables,mysqlhotcopy,mysql_convert_table_format,mysqld_multi,mysql_fix_extensions,mysql_zap,mysql_explain_log,mysql_tableinfo,mysqld_safe,myisam*,isam*,mysql_install,mysql_waitpid,mysqlbinlog,mysqltest,pack_isam}
+		rm -f ${D}/usr/sbin/mysqld
+		rm -f ${D}/usr/lib/mysql/lib{heap,merge,nisam,mysys,mystrings,mysqld,myisammrg,vio,dbug,myisam}.a
+	fi
+
+	# config stuff
+	insinto /etc/mysql
+	doins scripts/mysqlaccess.conf
+
+	newins "${FILESDIR}/my.cnf-4.1" my.cnf
+
+	if version_is_at_least "4.1.3" && ! use utf8; then
+		sed --in-place "s/utf8/latin1/" \
+			${D}/etc/mysql/my.cnf
+	fi
+
+	# minimal builds don't have the server
+	if ! useq minimal; then
+		exeinto /etc/init.d
+		newexe "${FILESDIR}/mysql-4.0.24-r2.rc6" mysql
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/logrotate.mysql" mysql
+	fi
+
+	# docs
+	dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
+	# minimal builds don't have the server
+	if useq doc && ! useq minimal; then
+		dohtml Docs/*.html
+		dodoc Docs/manual.{txt,ps}
+		docinto conf-samples
+		dodoc support-files/my-*.cnf
+	fi
+}
+
+src_test() {
+	cd ${S}
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	make check || die "make check failed"
+	if ! useq minimal; then
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		version_is_at_least "5.0.6_beta" \
+		&& make test-force \
+		|| make test
+		retstatus=$?
+
+		# to be sure ;)
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		[[ $retstatus -eq 0 ]] || die "make test failed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
+
+pkg_config() {
+	mysql_get_datadir
+
+	if built_with_use dev-db/mysql minimal; then
+		die "Minimal builds do NOT include the MySQL server"
+	fi
+
+	if [[ "$(pgrep mysqld)" != "" ]] ; then
+		die "Oops you already have a mysql daemon running!"
+	fi
+
+	local pwd1="a"
+	local pwd2="b"
+	local maxtry=5
+
+	if [[ -d "${DATADIR}/mysql" ]] ; then
+		ewarn "You have already a MySQL database in place."
+		ewarn "Please rename it or delete it if you wish to replace it."
+		die "MySQL database already exists!"
+	fi
+
+	einfo "Creating the mysql database and setting proper"
+	einfo "permissions on it..."
+
+	einfo "Insert a password for the mysql 'root' user"
+	ewarn "the password will be visible on the screen"
+
+	echo -n "    >" && read -r pwd1
+	einfo "Check the password"
+	echo -n "    >" && read -r pwd2
+
+	if ((  pwd1 != pwd2 )) ; then
+		die "Passwords are not the same"
+	fi
+
+	${ROOT}/usr/bin/mysql_install_db || die "MySQL databases not installed"
+
+	# MySQL 5.0 don't need this
+	chown -R mysql:mysql ${DATADIR}
+	chmod 0750 ${ROOT}/${DATADIR}
+
+	local options=""
+	local sqltmp="$(emktemp)"
+	local help_tables="${ROOT}/usr/share/mysql/fill_help_tables.sql"
+
+	if version_is_at_least "4.1.3" ; then
+		options="--skip-ndbcluster"
+
+		# Filling timezones, see
+		# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+		${ROOT}/usr/bin/mysql_tzinfo_to_sql ${ROOT}/usr/share/zoneinfo \
+		> "${sqltmp}"
+
+		if [[ -r "${help_tables}" ]] ; then
+			cat "${help_tables}" >> "${sqltmp}"
+		fi
+	fi
+
+	local socket=${ROOT}/var/run/mysqld/mysqld.sock
+	local mysqld="${ROOT}/usr/sbin/mysqld \
+		${options} \
+		--skip-grant-tables \
+		--basedir=${ROOT}/usr \
+		--datadir=${ROOT}/var/lib/mysql \
+		--skip-innodb \
+		--skip-bdb \
+		--max_allowed_packet=8M \
+		--net_buffer_length=16K \
+		--socket=${socket} \
+		--pid-file=${ROOT}/var/run/mysqld/mysqld.pid"
+
+	$mysqld &
+	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]]
+	do
+		maxtry=$(($maxtry-1))
+		echo -n "."
+		sleep 1
+	done
+
+	# do this from memory we don't want clear text password in temp files
+	local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'"
+	${ROOT}/usr/bin/mysql \
+		--socket=${ROOT}/var/run/mysqld/mysqld.sock \
+		-hlocalhost \
+		-e "${sql}"
+
+	einfo "Loading \"zoneinfo\" this step may require few seconds"
+
+	${ROOT}/usr/bin/mysql \
+		--socket=${socket} \
+		-hlocalhost \
+		-uroot \
+		-p"${pwd1}" \
+		mysql < "${sqltmp}"
+
+	kill $( cat ${ROOT}/var/run/mysqld/mysqld.pid )
+	rm  "${sqltmp}"
+	einfo "done"
+}
+
+pkg_preinst() {
+	enewgroup mysql 60 || die "problem adding group mysql"
+	enewuser mysql 60 /bin/false /var/lib/mysql mysql \
+	|| die "problem adding user mysql"
+}
+
+pkg_postinst() {
+	mysql_get_datadir
+
+	if ! useq minimal; then
+		#empty dirs...
+		[ -d "${ROOT}/${DATADIR}" ] || install -d -m0750 -o mysql -g mysql ${ROOT}/var/lib/mysql
+		[ -d "${ROOT}/var/run/mysqld" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
+		[ -d "${ROOT}/var/log/mysql" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
+
+		# secure the logfiles... does this bother anybody?
+		touch ${ROOT}/var/log/mysql/mysql.{log,err}
+		chown mysql:mysql ${ROOT}/var/log/mysql/mysql*
+		chmod 0660 ${ROOT}/var/log/mysql/mysql*
+		# secure some directories
+		chmod 0750 ${ROOT}/var/log/mysql ${ROOT}/${DATADIR}
+
+		# your friendly public service announcement...
+		einfo
+		einfo "You might want to run:"
+		einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
+		einfo "if this is a new install."
+		einfo
+	fi
+
+	mysql_upgrade_warning
+	einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
+}