depend from sys-apps/ed if bdb, new 4.1.13

(Portage version: 2.0.51.22-r2)

22 files changed, 65 insertions, 531 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 733e4e12d931..d80ba1f3b881 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,19 @@
 # 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.209 2005/07/20 12:06:52 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.210 2005/07/22 11:11:07 vivo Exp $
+
+*mysql-4.1.13 (22 Jul 2005)
+
+  22 Jul 2005; Francesco Riosa <vivo@gentoo.org> mysql-3.23.58.ebuild,
+  mysql-3.23.58-r1.ebuild, mysql-4.0.22.ebuild, mysql-4.0.22-r1.ebuild,
+  mysql-4.0.22-r2.ebuild, mysql-4.0.23.ebuild, mysql-4.0.23-r1.ebuild,
+  mysql-4.0.23-r2.ebuild, mysql-4.0.24.ebuild, mysql-4.0.24-r1.ebuild,
+  mysql-4.0.24-r2.ebuild, mysql-4.0.25-r1.ebuild, mysql-4.0.25-r2.ebuild,
+  mysql-4.1.8.ebuild, mysql-4.1.8-r1.ebuild, -mysql-4.1.12.ebuild,
+  -mysql-4.1.12-r2.ebuild, +mysql-4.1.13.ebuild:
+  Added sys-apps/ed to dependancies, it's used in configure phase of bdb storage
+  engine.
+  New version of 4.1 series
 
 *mysql-4.0.25-r2 (20 Jul 2005)
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 24143c1ccd06..1433420d4cb8 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,30 +1,28 @@
-MD5 a088b749386760cae4d09caf14f39c84 mysql-4.0.22-r1.ebuild 9269
-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 fa4a8f8a77181a0aacce711ab47c41aa mysql-4.0.25-r1.ebuild 13786
-MD5 8f5c52cc31c5dfdc8c6ac7a62dd175a7 mysql-4.1.12-r2.ebuild 15714
-MD5 80c210f51c3c19afc810c5fb9fc67c7b mysql-4.0.23-r2.ebuild 9407
-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 d436e793baae2f71669b96381ce2959b mysql-3.23.58-r1.ebuild 6759
-MD5 135c8d82ff80aa2d7d3b1df75719dd00 mysql-4.1.8.ebuild 9087
+MD5 a6fd08f3c054ece596c34e1818471be6 mysql-4.0.22-r1.ebuild 9291
+MD5 a951d352a9d229955e9508566953ca13 mysql-4.0.24-r2.ebuild 13750
+MD5 e065c35afd2c9f303f884fc2c15a6949 mysql-3.23.58.ebuild 6662
+MD5 4fbf564cd1412fe9d998b84ee5e0ce92 mysql-4.0.23.ebuild 9062
+MD5 675ec1fd1d70d792f69e92dc7bae2708 mysql-4.0.25-r1.ebuild 13809
+MD5 d85c5c95ae2080195311210a3915bd81 mysql-4.0.23-r2.ebuild 9429
+MD5 84e542781c0ac222e1a2222a4f923f09 mysql-4.1.13.ebuild 15737
+MD5 5d3993bd8ddfecad380e97aba0086972 mysql-4.1.8-r1.ebuild 9247
+MD5 fbb8eebe6a6269ffebbc282d72256cc0 mysql-4.0.24-r1.ebuild 11921
+MD5 79ee412b4bfeaff4ad462644f8f0f3f0 mysql-4.0.22.ebuild 8779
+MD5 68825e18a099d67dbf65890e1367e0dd mysql-4.0.22-r2.ebuild 9624
+MD5 46f2c14505e8fab67afd0be4a8cbca8a mysql-3.23.58-r1.ebuild 6781
+MD5 c3d91b431d62273b5050e390497c7417 mysql-4.1.8.ebuild 9109
 MD5 6b4e7861f8acedbd5f7675160efb9dfb mysql-5.0.9_beta-r1.ebuild 16096
-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 6470d8fcfdf40ff6df5168ed647a8f1d ChangeLog 33700
+MD5 9855253354280d5cbc635a3b92615f28 mysql-4.0.23-r1.ebuild 9182
+MD5 e1f4a23242efa981012002d72a76bd85 mysql-4.0.24.ebuild 9838
+MD5 e23e687d7f2000e6f1a65fd6dc331ce6 ChangeLog 34324
 MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
-MD5 f4a2004c75583965cc4f86d71ff96352 mysql-4.0.25-r2.ebuild 13786
+MD5 38ae3091b799b2ce55127318ed79c806 mysql-4.0.25-r2.ebuild 13809
 MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
 MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
 MD5 93827506c0de13cf7b5023847a4afd95 files/digest-mysql-5.0.9_beta-r1 70
 MD5 a755fb5a3ed724046a4f83fafd819c77 files/mysql-test-myisam-geometry.patch 1217
 MD5 76446c512e91b2f8e9e69a0379178e5c files/mysql-4.0.25-r2-asm-pic-fixes.patch 7295
 MD5 e37e03b4ce894ff87fda12ce6f7b31a6 files/mysql-4.0.21-install-db-sh.diff 585
-MD5 ee67067f786849424c4591e278819bbc files/digest-mysql-4.1.12-r2 66
 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
@@ -37,7 +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 ee67067f786849424c4591e278819bbc files/digest-mysql-4.1.12 66
+MD5 ad883e978e48b2040477a12951c01806 files/digest-mysql-4.1.13 66
 MD5 ee578e3021841ef9dba4175403564136 files/mysql-4.0-db-3.2.1.diff 1047
 MD5 f2905bbcc3f148a2ad689792917bd78d files/mysql-4.0.16-install-db-sh.diff 1429
 MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
diff --git a/dev-db/mysql/files/digest-mysql-4.1.12 b/dev-db/mysql/files/digest-mysql-4.1.12
deleted file mode 100644
index d9e377ccf07b..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.1.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 56a6f5cacd97ae290e07bbe19f279af1 mysql-4.1.12.tar.gz 17069350
diff --git a/dev-db/mysql/files/digest-mysql-4.1.12-r2 b/dev-db/mysql/files/digest-mysql-4.1.12-r2
deleted file mode 100644
index d9e377ccf07b..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.1.12-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 56a6f5cacd97ae290e07bbe19f279af1 mysql-4.1.12.tar.gz 17069350
diff --git a/dev-db/mysql/files/digest-mysql-4.1.13 b/dev-db/mysql/files/digest-mysql-4.1.13
new file mode 100644
index 000000000000..91b7152d79f6
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.1.13
@@ -0,0 +1 @@
+MD5 49d7a7314a2c9cf49e34777e73e66562 mysql-4.1.13.tar.gz 17137413
diff --git a/dev-db/mysql/mysql-3.23.58-r1.ebuild b/dev-db/mysql/mysql-3.23.58-r1.ebuild
index 9df9fc427d92..6093bc699620 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.11 2005/03/03 17:08:35 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.58-r1.ebuild,v 1.12 2005/07/22 11:11:07 vivo Exp $
 
 inherit flag-o-matic eutils
 
@@ -21,6 +21,7 @@ KEYWORDS="x86 ppc sparc alpha hppa"
 IUSE="berkdb debug innodb perl readline ssl static tcpd"
 
 DEPEND="readline? ( >=sys-libs/readline-4.1 )
+	bdb? ( sys-apps/ed )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	>=sys-libs/zlib-1.1.3
diff --git a/dev-db/mysql/mysql-3.23.58.ebuild b/dev-db/mysql/mysql-3.23.58.ebuild
index 965e1373d53b..28a5519fe074 100644
--- a/dev-db/mysql/mysql-3.23.58.ebuild
+++ b/dev-db/mysql/mysql-3.23.58.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.ebuild,v 1.7 2005/03/03 17:08:35 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.58.ebuild,v 1.8 2005/07/22 11:11:07 vivo Exp $
 
 inherit flag-o-matic eutils
 
@@ -21,6 +21,7 @@ KEYWORDS="~x86 ~sparc ~alpha ~hppa ppc"
 IUSE="berkdb debug innodb perl readline ssl static tcpd"
 
 DEPEND="readline? ( >=sys-libs/readline-4.1 )
+	bdb? ( sys-apps/ed )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	>=sys-libs/zlib-1.1.3
diff --git a/dev-db/mysql/mysql-4.0.22-r1.ebuild b/dev-db/mysql/mysql-4.0.22-r1.ebuild
index fb27a32706f6..bcc9e1e8c09d 100644
--- a/dev-db/mysql/mysql-4.0.22-r1.ebuild
+++ b/dev-db/mysql/mysql-4.0.22-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.0.22-r1.ebuild,v 1.10 2005/04/21 16:35:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22-r1.ebuild,v 1.11 2005/07/22 11:11:07 vivo Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -24,6 +24,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static readline innodb berkdb tcpd ssl perl debug selinux"
 
 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 )
diff --git a/dev-db/mysql/mysql-4.0.22-r2.ebuild b/dev-db/mysql/mysql-4.0.22-r2.ebuild
index 3e2677e160da..9734d204987b 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.19 2005/04/21 16:35:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22-r2.ebuild,v 1.20 2005/07/22 11:11:07 vivo Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -24,6 +24,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="static readline innodb berkdb tcpd ssl perl debug selinux"
 
 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 )
diff --git a/dev-db/mysql/mysql-4.0.22.ebuild b/dev-db/mysql/mysql-4.0.22.ebuild
index 0a6ea500b711..dc77bb6651d8 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.18 2005/04/21 16:35:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22.ebuild,v 1.19 2005/07/22 11:11:07 vivo Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -24,6 +24,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="static readline innodb berkdb tcpd ssl perl debug selinux"
 
 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 )
diff --git a/dev-db/mysql/mysql-4.0.23-r1.ebuild b/dev-db/mysql/mysql-4.0.23-r1.ebuild
index 5c45b1bef010..b2497ceb3b20 100644
--- a/dev-db/mysql/mysql-4.0.23-r1.ebuild
+++ b/dev-db/mysql/mysql-4.0.23-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.0.23-r1.ebuild,v 1.12 2005/04/21 16:35:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.23-r1.ebuild,v 1.13 2005/07/22 11:11:07 vivo Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -24,6 +24,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static readline innodb berkdb tcpd ssl perl debug selinux"
 
 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 )
diff --git a/dev-db/mysql/mysql-4.0.23-r2.ebuild b/dev-db/mysql/mysql-4.0.23-r2.ebuild
index 23a43faf217f..5109817ece8c 100644
--- a/dev-db/mysql/mysql-4.0.23-r2.ebuild
+++ b/dev-db/mysql/mysql-4.0.23-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.23-r2.ebuild,v 1.9 2005/04/21 16:35:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.23-r2.ebuild,v 1.10 2005/07/22 11:11:07 vivo Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -24,6 +24,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static readline innodb berkdb tcpd ssl perl debug selinux"
 
 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 )
diff --git a/dev-db/mysql/mysql-4.0.23.ebuild b/dev-db/mysql/mysql-4.0.23.ebuild
index 508f1d63649a..dfa781d5ab64 100644
--- a/dev-db/mysql/mysql-4.0.23.ebuild
+++ b/dev-db/mysql/mysql-4.0.23.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.23.ebuild,v 1.10 2005/04/21 16:35:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.23.ebuild,v 1.11 2005/07/22 11:11:07 vivo Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -24,6 +24,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static readline innodb berkdb tcpd ssl perl debug selinux"
 
 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 )
diff --git a/dev-db/mysql/mysql-4.0.24-r1.ebuild b/dev-db/mysql/mysql-4.0.24-r1.ebuild
index 7a0bf4a9644c..f7041151e86d 100644
--- a/dev-db/mysql/mysql-4.0.24-r1.ebuild
+++ b/dev-db/mysql/mysql-4.0.24-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.0.24-r1.ebuild,v 1.3 2005/04/21 16:35:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.24-r1.ebuild,v 1.4 2005/07/22 11:11:07 vivo Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -24,6 +24,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="berkdb debug doc minimal perl readline selinux ssl static tcpd"
 
 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 )
diff --git a/dev-db/mysql/mysql-4.0.24-r2.ebuild b/dev-db/mysql/mysql-4.0.24-r2.ebuild
index ecbb94cf8ddb..94f1eca614ac 100644
--- a/dev-db/mysql/mysql-4.0.24-r2.ebuild
+++ b/dev-db/mysql/mysql-4.0.24-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.24-r2.ebuild,v 1.2 2005/05/17 17:16:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.24-r2.ebuild,v 1.3 2005/07/22 11:11:07 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -23,6 +23,7 @@ IUSE="berkdb debug doc minimal perl readline selinux ssl static tcpd"
 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 )
diff --git a/dev-db/mysql/mysql-4.0.24.ebuild b/dev-db/mysql/mysql-4.0.24.ebuild
index 7d77b21af4b1..60cf4c1a2d3e 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.12 2005/04/21 16:35:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.24.ebuild,v 1.13 2005/07/22 11:11:07 vivo Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -24,6 +24,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="static readline innodb berkdb tcpd ssl perl debug selinux"
 
 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 )
diff --git a/dev-db/mysql/mysql-4.0.25-r1.ebuild b/dev-db/mysql/mysql-4.0.25-r1.ebuild
index f547447ed542..c4565e336443 100644
--- a/dev-db/mysql/mysql-4.0.25-r1.ebuild
+++ b/dev-db/mysql/mysql-4.0.25-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.0.25-r1.ebuild,v 1.1 2005/07/16 02:41:28 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.25-r1.ebuild,v 1.2 2005/07/22 11:11:07 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -23,6 +23,7 @@ IUSE="berkdb 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 )
diff --git a/dev-db/mysql/mysql-4.0.25-r2.ebuild b/dev-db/mysql/mysql-4.0.25-r2.ebuild
index 1e95a2077302..d649ef9d3886 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.1 2005/07/20 09:12:11 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.25-r2.ebuild,v 1.2 2005/07/22 11:11:07 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -23,6 +23,7 @@ IUSE="berkdb 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 )
diff --git a/dev-db/mysql/mysql-4.1.12.ebuild b/dev-db/mysql/mysql-4.1.12.ebuild
deleted file mode 100644
index 5d3ef89d21c6..000000000000
--- a/dev-db/mysql/mysql-4.1.12.ebuild
+++ /dev/null
@@ -1,492 +0,0 @@
-# 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.ebuild,v 1.6 2005/07/13 07:59:47 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"
-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_OPTS="-p1 -d ${S}" \
-	#epatch ${FILESDIR}/${PN}-4.1.12-asm-pic-fixes.patch || die
-
-	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} --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/log/mysql
-	keepdir "${DATADIR}" /var/run/mysqld /var/log/mysql
-	chown -R mysql:mysql ${D}/var/lib/mysql \
-		${D}/var/run/mysqld \
-		${D}/var/log/mysql
-
-	diropts "-m0755"
-	dodir "${DATADIR}" /var/run/mysqld
-
-	# 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)"
-	# 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}"
-
-	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-4.1.12-r2.ebuild b/dev-db/mysql/mysql-4.1.13.ebuild
index b175b58e96e5..22e6ecd52f92 100644
--- a/dev-db/mysql/mysql-4.1.12-r2.ebuild
+++ b/dev-db/mysql/mysql-4.1.13.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.12-r2.ebuild,v 1.1 2005/07/16 02:41:28 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.13.ebuild,v 1.1 2005/07/22 11:11:07 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -23,6 +23,7 @@ IUSE="berkdb debug doc minimal perl readline selinux ssl static tcpd cluster utf
 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 )
diff --git a/dev-db/mysql/mysql-4.1.8-r1.ebuild b/dev-db/mysql/mysql-4.1.8-r1.ebuild
index c337e2ff1c2d..71f31029e9ba 100644
--- a/dev-db/mysql/mysql-4.1.8-r1.ebuild
+++ b/dev-db/mysql/mysql-4.1.8-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.8-r1.ebuild,v 1.12 2005/05/06 09:48:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.8-r1.ebuild,v 1.13 2005/07/22 11:11:07 vivo Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -25,6 +25,7 @@ IUSE="static readline innodb berkdb tcpd ssl perl ruby selinux debug cluster"
 
 DEPEND="
 	!<dev-db/mysql-4.1
+	bdb? ( sys-apps/ed )
 	readline? ( >=sys-libs/readline-4.1 )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
diff --git a/dev-db/mysql/mysql-4.1.8.ebuild b/dev-db/mysql/mysql-4.1.8.ebuild
index bd4d7f9ae7a4..8423ffb0900c 100644
--- a/dev-db/mysql/mysql-4.1.8.ebuild
+++ b/dev-db/mysql/mysql-4.1.8.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.8.ebuild,v 1.11 2005/05/06 09:48:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.8.ebuild,v 1.12 2005/07/22 11:11:07 vivo Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -25,6 +25,7 @@ IUSE="static readline innodb berkdb tcpd ssl perl ruby selinux debug cluster"
 
 DEPEND="
 	!<dev-db/mysql-4.1
+	bdb? ( sys-apps/ed )
 	readline? ( >=sys-libs/readline-4.1 )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )