fix Bug #128713 dev-db/mysql: Query Logging Bypass Vulnerability (CVE-2006-0903) ; Raphael Marichez has ported the upstream patch to 4.1.14, thanks!

Package-Manager: portage-2.1_pre7-r4

14 files changed, 64 insertions, 675 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 87d7b408c04b..e93346020e3c 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.312 2006/03/24 16:03:07 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.313 2006/04/10 21:34:03 vivo Exp $
+
+*mysql-5.0.19-r1 (10 Apr 2006)
+*mysql-4.1.18-r61 (10 Apr 2006)
+*mysql-4.1.14-r1 (10 Apr 2006)
+
+  10 Apr 2006; Francesco Riosa <vivo@gentoo.org> -mysql-4.1.14.ebuild,
+  +mysql-4.1.14-r1.ebuild, -mysql-4.1.18-r60.ebuild,
+  +mysql-4.1.18-r61.ebuild, -mysql-5.0.18-r60.ebuild, -mysql-5.0.19.ebuild,
+  +mysql-5.0.19-r1.ebuild, mysql-5.1.7_beta.ebuild:
+  fix Bug #128713 dev-db/mysql: Query Logging Bypass Vulnerability
+  (CVE-2006-0903)
+  Raphael Marichez has ported the upstream patch to 4.1.14, thanks!
 
   24 Mar 2006; Francesco Riosa <vivo@gentoo.org> mysql-4.1.14.ebuild:
   Fix Bug 111073 also for stable ebuilds
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 34a0e0c559e7..824d9b1d1bf1 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ab8c8895ee0950617dd2527b35f14090 ChangeLog 64439
-RMD160 dde3bcd5195f32d89873eed6462dcd11816361af ChangeLog 64439
-SHA256 dcc0258aa18d402571833b41df4eac52de7512795fbea442473df049a99f56c4 ChangeLog 64439
+MD5 ce8ccee6ffede6c347d1efe49d9cedf7 ChangeLog 64940
+RMD160 0bf5ec628f5df3e9cc0b51ddacd010b0768a786a ChangeLog 64940
+SHA256 9a3ecf930ed5754d5da80cd682b55d18f3a885bfd8a1e55729da4edbdaa3b21e ChangeLog 64940
 MD5 7a9b202499409304a68680f9d749ec8d files/digest-mysql-3.23.58-r1 512
 RMD160 5d30edca2748f16b2092021823c1377da2007194 files/digest-mysql-3.23.58-r1 512
 SHA256 348bceaedc24580dd89d90afb52164a26487574c59e855e2483468d5f1584eec files/digest-mysql-3.23.58-r1 512
@@ -13,18 +13,15 @@ SHA256 fbade4c995f82cd8b0c952b9c8d61ea19d4d380b800658352d3ab5fb8318cfcb files/di
 MD5 7e23e7da8ca77866dfb81a8bb7577556 files/digest-mysql-4.0.26 509
 RMD160 d8ca28fa575d3c713561ea21a906136979322a71 files/digest-mysql-4.0.26 509
 SHA256 e4e4320bbb1b04818e364c0ad68e3df6fa8149e57d0ed3359bd3cd1dcedad96a files/digest-mysql-4.0.26 509
-MD5 76b0ff7ee0c64222a2cc9f09f0306a93 files/digest-mysql-4.1.14 509
-RMD160 7413311cadac22b111cc049e49b0a86f734537d7 files/digest-mysql-4.1.14 509
-SHA256 580756dca82c751758e5ecd856b3c8883876a94306304f52eef62a24fd3c45ab files/digest-mysql-4.1.14 509
-MD5 8bc5dfb3309efc25fe2f13d1311120e4 files/digest-mysql-4.1.18-r60 506
-RMD160 2c4ee85734bd3aaebed23015c96259611ab10d6f files/digest-mysql-4.1.18-r60 506
-SHA256 82f834ad174ae5f145850aa2b3e29a3fbb2bb0fbdf286b1a823ab9ae8385b705 files/digest-mysql-4.1.18-r60 506
-MD5 2f994c051ed73d3057f6bb7d27fd5eb0 files/digest-mysql-5.0.18-r60 506
-RMD160 85a656fc5db6a9b430deab67bf87f72937084477 files/digest-mysql-5.0.18-r60 506
-SHA256 d407c34eeee235ac8fc541f8b5a8a9686d86337bc34edc5d7c6c0a6e1b83cca4 files/digest-mysql-5.0.18-r60 506
-MD5 32bc3210c24c601b06c897fbbd204d6a files/digest-mysql-5.0.19 506
-RMD160 72e4dc7a0be4bc3e48c2705498ea11e2e2e491e7 files/digest-mysql-5.0.19 506
-SHA256 c5082ff62026d5da2cc68da6bb575d1335cda5fe5003092ba3e4a7f50f48e4c8 files/digest-mysql-5.0.19 506
+MD5 6ad8b233ddc290a680d6e27c886e4651 files/digest-mysql-4.1.14-r1 509
+RMD160 4a6882b802a4502f480fe0906ac4f69d9c86f3d5 files/digest-mysql-4.1.14-r1 509
+SHA256 46a392f2add899962dc10d7b38070c503b76ea519901607fbfed3cde5dbecf03 files/digest-mysql-4.1.14-r1 509
+MD5 89a85e63bbfdd7fe4c67afd1f51c8501 files/digest-mysql-4.1.18-r61 509
+RMD160 0acbe8a2289cbd8baf998bb2622fc459d3913732 files/digest-mysql-4.1.18-r61 509
+SHA256 1cf041f2583c2e0cbeea0fb000eec6a1022245cde9206b15e2ebe725c2a8f42d files/digest-mysql-4.1.18-r61 509
+MD5 ae87623c7c32ce7afc3b1df9488f55cf files/digest-mysql-5.0.19-r1 509
+RMD160 85b594ed9e064d01c9c5c59af461b2d96b9853d9 files/digest-mysql-5.0.19-r1 509
+SHA256 f1f06c37ad7dec1e000cb05a449f7d8f49f468615ea6af98c471c31d3605ad6c files/digest-mysql-5.0.19-r1 509
 MD5 7d57efe901ac369be51d2b49c1082970 files/digest-mysql-5.1.7_beta 518
 RMD160 ded433dfee471f54e087c3cda2b336fe546e18bd files/digest-mysql-5.1.7_beta 518
 SHA256 8d351a2ab082329fbb778120d9ebae13d64eab0fa84d373d083d108783326477 files/digest-mysql-5.1.7_beta 518
@@ -85,25 +82,22 @@ SHA256 74dd3416ea6c24d38edae84f5fb679803b89792e7dd3c91377a8980b04a91a6d mysql-4.
 MD5 94e66d421dd7650e25b31d3f3e1d51be mysql-4.0.26.ebuild 14866
 RMD160 21e6da3902723aa73d3671d73221d7eb1a6e1445 mysql-4.0.26.ebuild 14866
 SHA256 a8f336963e9034dc8bb622d1b1acebdb44b474bfb232e015c96965ba9e49bf8a mysql-4.0.26.ebuild 14866
-MD5 182ddf09ba22c5dc27a673d285bf36c0 mysql-4.1.14.ebuild 18807
-RMD160 0a874868c407fef3f785dfc36494974dbbe39597 mysql-4.1.14.ebuild 18807
-SHA256 2b85fc7a87bc866e53265c7eb8c45fd7cd0a7b2dad7cee62293ea925729d9388 mysql-4.1.14.ebuild 18807
-MD5 6ac703a86faeb15584decd25538222f8 mysql-4.1.18-r60.ebuild 892
-RMD160 9282cee2f6e99746577f7d98132bc340a87cacd7 mysql-4.1.18-r60.ebuild 892
-SHA256 195d4e43b85329b7d3b0fbafdbe437777987b0ac260fa3ac510afdd2bc582804 mysql-4.1.18-r60.ebuild 892
-MD5 2f15ee6f6361d6ace432d1acfe5b3149 mysql-5.0.18-r60.ebuild 892
-RMD160 0d8385d056cda49d985255161be0ca2e152ec227 mysql-5.0.18-r60.ebuild 892
-SHA256 a840eecc499b4021105e115ed13388eb16ea60f33a7676b291a0eae598cd5c48 mysql-5.0.18-r60.ebuild 892
-MD5 8239e1cb0ec39c78d55084ad28246b68 mysql-5.0.19.ebuild 888
-RMD160 b894fc0ba1f35c488ce90d5317a1452eb22bffd5 mysql-5.0.19.ebuild 888
-SHA256 e4188005b00c8a7678fa48833f6729be1c87009dcdedb8fdfdb4630b62f932f0 mysql-5.0.19.ebuild 888
-MD5 87b9427d9c167a63030973e78ff9976b mysql-5.1.7_beta.ebuild 892
-RMD160 da03dacffef83eedcf5dbcf6902b1c2aa83f10d1 mysql-5.1.7_beta.ebuild 892
-SHA256 e6d9df9b00790ccfc4fb96f2fdac67682d5b8931e6ba9921f8b8010ca62cd6a7 mysql-5.1.7_beta.ebuild 892
+MD5 d4214c9d211599398cfeeb77321687aa mysql-4.1.14-r1.ebuild 880
+RMD160 ee8a4f2ebd6f9212c95519ecf3c64b925a654d0b mysql-4.1.14-r1.ebuild 880
+SHA256 7cabb8dfc91c3739d133cdd6e77e8e99d31e43291d91428fa9d541688ee6ab49 mysql-4.1.14-r1.ebuild 880
+MD5 567c4c26f11a2bdd8d44b0754e92b720 mysql-4.1.18-r61.ebuild 892
+RMD160 13f4ce65599d821c6696ebfee360953d58db99d2 mysql-4.1.18-r61.ebuild 892
+SHA256 ce96306db83ce9a17858ee4fb95c2cacb87d74f7611b3e5046b621594c0c602d mysql-4.1.18-r61.ebuild 892
+MD5 edbb9026adc9ccb08764a30145966b22 mysql-5.0.19-r1.ebuild 891
+RMD160 210178e38276fe161f3393a18a786d1a1cc96f86 mysql-5.0.19-r1.ebuild 891
+SHA256 addd492e50534613561cd107ed40e4422689e27d0328dadb7872fa4430b97fc4 mysql-5.0.19-r1.ebuild 891
+MD5 113f1450ff243f4282edddeb015277d4 mysql-5.1.7_beta.ebuild 917
+RMD160 2b38d6ee428b0c2a428f345a94db0693f7dddae4 mysql-5.1.7_beta.ebuild 917
+SHA256 8fb3da37434d709774be90a4961936bda220eb731ee16614955b3f80cf591f84 mysql-5.1.7_beta.ebuild 917
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEOQmiKolR564NvWYRAtiOAKCDnfOd/gXL8f1BUMRFpbhgORlxWACdEs8W
-Vmzc4xmNb9Z85L+8lj0LNgo=
-=QLf3
+iD8DBQFEOs9eKolR564NvWYRAuhpAJwPdaDIx8J02sQbfSnFVeWCDKAHgACfe2fc
+YvCMbHpmLym4qK1HX+0QEOQ=
+=BIVP
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/files/digest-mysql-4.1.14 b/dev-db/mysql/files/digest-mysql-4.1.14
deleted file mode 100644
index 71d862e0498f..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.1.14
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 98ba9caea24b0a48ee06bb242ff2e37f mysql-4.1.14.tar.gz 17074439
-RMD160 43a637109ac54f30ddd2c437f81f50776a5d0b2c mysql-4.1.14.tar.gz 17074439
-SHA256 00ca84538dc5e792abbc708e0452e649ea6b13edb262ae309e4282c5ca6fc58c mysql-4.1.14.tar.gz 17074439
-MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
-RMD160 27e8eaaf09bf8a6cc1fbec2678d756bad102c1ea mysql-extras-20050920.tar.bz2 51007
-SHA256 f75922eac6229593508c4adace441b53d7bc68e82282fc80f1174612418bb8fc mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/digest-mysql-4.1.14-r1 b/dev-db/mysql/files/digest-mysql-4.1.14-r1
new file mode 100644
index 000000000000..8c13a231c209
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.1.14-r1
@@ -0,0 +1,6 @@
+MD5 98ba9caea24b0a48ee06bb242ff2e37f mysql-4.1.14.tar.gz 17074439
+RMD160 43a637109ac54f30ddd2c437f81f50776a5d0b2c mysql-4.1.14.tar.gz 17074439
+SHA256 00ca84538dc5e792abbc708e0452e649ea6b13edb262ae309e4282c5ca6fc58c mysql-4.1.14.tar.gz 17074439
+MD5 24db50ca2855cf294e5c1a081bed0c03 mysql-extras-20060410.tar.bz2 10678
+RMD160 58326d909c7d45536c6eabb64fdc493dd3c539b8 mysql-extras-20060410.tar.bz2 10678
+SHA256 5afc1f8aedd733b018f0155927d0ba977c0d94d09b6a6d6e4af74beeb18485c4 mysql-extras-20060410.tar.bz2 10678
diff --git a/dev-db/mysql/files/digest-mysql-4.1.18-r60 b/dev-db/mysql/files/digest-mysql-4.1.18-r60
deleted file mode 100644
index 61be5ff5244a..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.1.18-r60
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 a2db4edb3e1e3b8e0f8c2242225ea513 mysql-4.1.18.tar.gz 17172994
-RMD160 6a761803092d9e34c15a18bad7e2c1c46f2e2429 mysql-4.1.18.tar.gz 17172994
-SHA256 7744d78131619b73a82adb6f73d6cfc6bad11a6ad2806c0f5130f88fe88ac9dd mysql-4.1.18.tar.gz 17172994
-MD5 a986948fcbb3dd9cd5dd8a79289f90ac mysql-extras-20060316.tar.bz2 4719
-RMD160 e4434ee53990bf9622e4a8bdedba63ecad35524e mysql-extras-20060316.tar.bz2 4719
-SHA256 9c5552d40f6ca77ad47f74dd55306ab4d318f24b3f69f2910595b5d480d661d3 mysql-extras-20060316.tar.bz2 4719
diff --git a/dev-db/mysql/files/digest-mysql-4.1.18-r61 b/dev-db/mysql/files/digest-mysql-4.1.18-r61
new file mode 100644
index 000000000000..95b16bf7c7b2
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.1.18-r61
@@ -0,0 +1,6 @@
+MD5 a2db4edb3e1e3b8e0f8c2242225ea513 mysql-4.1.18.tar.gz 17172994
+RMD160 6a761803092d9e34c15a18bad7e2c1c46f2e2429 mysql-4.1.18.tar.gz 17172994
+SHA256 7744d78131619b73a82adb6f73d6cfc6bad11a6ad2806c0f5130f88fe88ac9dd mysql-4.1.18.tar.gz 17172994
+MD5 24db50ca2855cf294e5c1a081bed0c03 mysql-extras-20060410.tar.bz2 10678
+RMD160 58326d909c7d45536c6eabb64fdc493dd3c539b8 mysql-extras-20060410.tar.bz2 10678
+SHA256 5afc1f8aedd733b018f0155927d0ba977c0d94d09b6a6d6e4af74beeb18485c4 mysql-extras-20060410.tar.bz2 10678
diff --git a/dev-db/mysql/files/digest-mysql-5.0.18-r60 b/dev-db/mysql/files/digest-mysql-5.0.18-r60
deleted file mode 100644
index fc29d583ebd8..000000000000
--- a/dev-db/mysql/files/digest-mysql-5.0.18-r60
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 f18153b0239aaa03fc5a751f2d82cb71 mysql-5.0.18.tar.gz 19169082
-RMD160 1987df6d9446637c8e353f61e269e9a57d995803 mysql-5.0.18.tar.gz 19169082
-SHA256 bd3d4b56de636eb14330be20e58f6fc58b015ff9d43926661e2e688ca7b6188a mysql-5.0.18.tar.gz 19169082
-MD5 a986948fcbb3dd9cd5dd8a79289f90ac mysql-extras-20060316.tar.bz2 4719
-RMD160 e4434ee53990bf9622e4a8bdedba63ecad35524e mysql-extras-20060316.tar.bz2 4719
-SHA256 9c5552d40f6ca77ad47f74dd55306ab4d318f24b3f69f2910595b5d480d661d3 mysql-extras-20060316.tar.bz2 4719
diff --git a/dev-db/mysql/files/digest-mysql-5.0.19 b/dev-db/mysql/files/digest-mysql-5.0.19
deleted file mode 100644
index 59e7d7b0af5d..000000000000
--- a/dev-db/mysql/files/digest-mysql-5.0.19
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 d8a922fe657cca3b03d390e5f13d60a8 mysql-5.0.19.tar.gz 19454023
-RMD160 6d3fe75b11fd553652563f637476da8d2502c315 mysql-5.0.19.tar.gz 19454023
-SHA256 4e8faa4268b48c77a94792a637e785e87840513a316fe1b7eb8d0a5be77469a2 mysql-5.0.19.tar.gz 19454023
-MD5 a986948fcbb3dd9cd5dd8a79289f90ac mysql-extras-20060316.tar.bz2 4719
-RMD160 e4434ee53990bf9622e4a8bdedba63ecad35524e mysql-extras-20060316.tar.bz2 4719
-SHA256 9c5552d40f6ca77ad47f74dd55306ab4d318f24b3f69f2910595b5d480d661d3 mysql-extras-20060316.tar.bz2 4719
diff --git a/dev-db/mysql/files/digest-mysql-5.0.19-r1 b/dev-db/mysql/files/digest-mysql-5.0.19-r1
new file mode 100644
index 000000000000..df50eb89ed42
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-5.0.19-r1
@@ -0,0 +1,6 @@
+MD5 d8a922fe657cca3b03d390e5f13d60a8 mysql-5.0.19.tar.gz 19454023
+RMD160 6d3fe75b11fd553652563f637476da8d2502c315 mysql-5.0.19.tar.gz 19454023
+SHA256 4e8faa4268b48c77a94792a637e785e87840513a316fe1b7eb8d0a5be77469a2 mysql-5.0.19.tar.gz 19454023
+MD5 24db50ca2855cf294e5c1a081bed0c03 mysql-extras-20060410.tar.bz2 10678
+RMD160 58326d909c7d45536c6eabb64fdc493dd3c539b8 mysql-extras-20060410.tar.bz2 10678
+SHA256 5afc1f8aedd733b018f0155927d0ba977c0d94d09b6a6d6e4af74beeb18485c4 mysql-extras-20060410.tar.bz2 10678
diff --git a/dev-db/mysql/mysql-5.0.18-r60.ebuild b/dev-db/mysql/mysql-4.1.14-r1.ebuild
index 4d2d37327209..180c3ff8249a 100644
--- a/dev-db/mysql/mysql-5.0.18-r60.ebuild
+++ b/dev-db/mysql/mysql-4.1.14-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.18-r60.ebuild,v 1.2 2006/03/18 11:53:53 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14-r1.ebuild,v 1.1 2006/04/10 21:34:03 vivo Exp $
 
 inherit mysql
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 
 src_test() {
 	cd ${S}
diff --git a/dev-db/mysql/mysql-4.1.14.ebuild b/dev-db/mysql/mysql-4.1.14.ebuild
deleted file mode 100644
index 617277ef6765..000000000000
--- a/dev-db/mysql/mysql-4.1.14.ebuild
+++ /dev/null
@@ -1,612 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.34 2006/03/24 16:03:07 vivo Exp $
-
-inherit eutils gnuconfig 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
-	mirror://gentoo/mysql-extras-20050920.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="big-tables berkdb debug doc minimal perl readline selinux ssl static tcpd"
-RESTRICT="primaryuri"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	berkdb? ( sys-apps/ed )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( dev-lang/perl )
-	userland_GNU? ( sys-process/procps )
-	>=sys-libs/zlib-1.2.3
-	>=sys-apps/texinfo-4.7-r1
-	>=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() {
-	ewarn "Sorry, plain up/downgrade between different version of MySQL is (still)"
-	ewarn "un-supported."
-	ewarn "Some gentoo documentation on how to do it:"
-	ewarn "http://www.gentoo.org/doc/en/mysql-upgrading.xml"
-	ewarn "Also on the MySQL website:"
-	ewarn "http://dev.mysql.com/doc/refman/4.1/en/upgrading-from-4-0.html"
-	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)"
-	ewarn ""
-
-}
-
-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:"
-	ewarn "revdep-rebuild --library=libmysqlclient.so.12"
-	ewarn "from app-portage/gentoolkit."
-	ewarn ""
-	ewarn "the value of \"innodb_log_file_size\" into /etc/mysql/my.cnf file "
-	ewarn "has changed size from \"8M\" to \"5M\"."
-	ewarn "To start mysql either revert the value back to \"8M\" or backup and"
-	ewarn "remove the old ib_logfile* from the datadir"
-}
-
-mysql_get_datadir() {
-	DATADIR=""
-	if [ -f '/etc/mysql/my.cnf' ] ; then
-		#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`
-		if [ -z "${DATADIR}" ]; then
-			DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
-			einfo "Using default DATADIR"
-		fi
-	fi
-	if [ -z "${DATADIR}" ]; then
-		DATADIR="/var/lib/mysql/"
-		einfo "Using default DATADIR"
-	fi
-	einfo "MySQL DATADIR is ${DATADIR}"
-
-	if [ -z "${PREVIOUS_DATADIR}" ] ; then
-		if [ -a "${DATADIR}" ] ; then
-			ewarn "Previous datadir found, it's YOUR job to change"
-			ewarn "ownership and have care of it"
-			PREVIOUS_DATADIR="yes"
-			export PREVIOUS_DATADIR
-		else
-			PREVIOUS_DATADIR="no"
-			export PREVIOUS_DATADIR
-		fi
-	fi
-
-	export DATADIR
-}
-
-pkg_setup() {
-
-	if [[ -z $MYSQL_STRAIGHT_UPGRADE ]] ; then
-		mysql_get_datadir
-		local curversion="dev-db/${PN}-${PV%.*}"
-		local oldversion="$(best_version dev-db/mysql)"
-		oldversion=${oldversion%.*}
-
-		# permit upgrade from old version if it's safe
-		useq minimal && oldversion=""
-		built_with_use dev-db/mysql minimal && oldversion=""
-		[[ -d "${DATADIR}/mysql" ]] || oldversion=""
-
-		if [[ -n "${oldversion}" ]] && [[ "${oldversion}" != "${curversion}" ]]
-		then
-			mysql_upgrade_error
-			eerror "MySQL-${oldversion} found, up/downgrade to \"${curversion}\" is unsupported"
-			eerror "export MYSQL_STRAIGHT_UPGRADE=1 to force"
-			die
-		fi
-	fi
-
-	mysql_upgrade_warning
-
-	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 -1 /dev/null mysql \
-	|| die "problem adding user mysql"
-
-}
-
-src_unpack() {
-	if useq static && useq 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}"
-	rm -rf "${S}/zlib/"*.[ch]
-	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
-
-	local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras"
-
-	epatch ${MY_PATCH_SOURCE}/010_all_my-print-defaults-r0.patch || die
-	epatch ${MY_PATCH_SOURCE}/030_all_thrssl-r1.patch || die
-	epatch ${MY_PATCH_SOURCE}/035_x86_asm-pic-fixes-r7.patch || die
-	epatch ${MY_PATCH_SOURCE}/040_all_tcpd-vars-fix.patch || die
-
-	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
-
-	# Temporary workaround for bug in test suite, a correct solution
-	# should work inside the include files to enable/disable the tests
-	# for the current configuration
-
-	if ! useq extraengine ; then
-		einfo "disabling unneded extraengine tests"
-		local disable_test="archive bdb blackhole federated view csv"
-		for i in $disable_test ; do
-			mv "${S}/mysql-test/t/${i}.test" "${S}/mysql-test/t/${i}.disabled" \
-			&> /dev/null
-		done
-	fi
-
-
-	if ! useq berkdb ; then
-		einfo "disabling unneded berkdb tests"
-		local disable_test="auto_increment bdb-alter-table-1 bdb-alter-table-2 bdb-crash bdb-deadlock bdb bdb_cache binlog ctype_sjis ctype_utf8 heap_auto_increment index_merge_bdb multi_update mysqldump ps_1general ps_6bdb rowid_order_bdb"
-		for i in $disable_test ; do
-			mv "${S}/mysql-test/t/${i}.test" "${S}/mysql-test/t/${i}.disabled" \
-			&> /dev/null
-		done
-	fi
-}
-
-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"
-	if ! useq minimal; then
-		for i in ${minimal_exclude_list}; do
-			myconf="${myconf} --with-${i}"
-		done
-
-		if useq static ; then
-			myconf="${myconf} --without-raid"
-			ewarn "disabling raid support, has problem with static"
-		else
-			myconf="${myconf} --with-raid"
-		fi
-
-		if ! version_is_at_least "5.0_alpha" ; then
-			if version_is_at_least "4.1_alpha" && useq utf8; then
-				myconf="${myconf} --with-charset=utf8"
-				myconf="${myconf} --with-collation=utf8_general_ci"
-			else
-				myconf="${myconf} --with-charset=latin1"
-				myconf="${myconf} --with-collation=latin1_swedish_ci"
-			fi
-		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
-			useq 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" && 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
-		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} -felide-constructors -fno-exceptions -fno-rtti"
-	version_is_at_least "5.0_alpha" \
-	&& export CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
-
-	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-lib-ccflags="-fPIC" \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-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
-
-		# Temporary removed, 4.1.14 use mysql-test-run.pl instead
-		# of mysql-test-run, thus failing on test that should be
-		# skipped.
-		#version_is_at_least "5.0.6_beta" \
-		#&& make test-force \
-		#|| make test
-
-		# <replace me whenever possible>
-		cd mysql-test; ./mysql-test-run && ./mysql-test-run --ps-protocol
-		retstatus=$?
-		cd ..
-		# </replace me whenever possible>
-
-		# 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
-}
-
-src_install() {
-	mysql_get_datadir
-	make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die
-
-	# 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 ! useq 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" && ! useq utf8; then
-		sed --in-place -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
-
-		#empty dirs...
-		diropts "-m0750"
-		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
-			dodir "${DATADIR}"
-			keepdir "${DATADIR}"
-			chown -R mysql:mysql "${D}/${DATADIR}"
-		fi
-
-		diropts "-m0755"
-		dodir "/var/log/mysql"
-		#touch ${D}/var/log/mysql/mysql.{log,err}
-		#chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
-		keepdir "/var/log/mysql"
-		chown -R mysql:mysql "${D}/var/log/mysql"
-
-		diropts "-m0755"
-		dodir "/var/run/mysqld"
-
-		keepdir "/var/run/mysqld"
-		chown -R mysql:mysql "${D}/var/run/mysqld"
-	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
-}
-
-pkg_preinst() {
-	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 -1 /dev/null mysql \
-	|| die "problem adding user mysql"
-}
-
-pkg_postinst() {
-	mysql_get_datadir
-
-	# mind at FEATURES=collision-protect before to remove this
-	#empty dirs...
-	[ -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
-
-	if ! useq minimal; then
-		# your friendly public service announcement...
-		einfo
-		einfo "You might want to run:"
-		einfo "\"emerge --config =${PF}\""
-		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."
-}
-
-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 "${ROOT}/${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 "Avoid [\"'\\_%] characters in the password"
-
-	read -rsp "    >" pwd1 ; echo
-	einfo "Check the password"
-	read -rsp "    >" pwd2 ; echo
-
-	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 need this
-	chown -R mysql:mysql ${ROOT}/${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}/${DATADIR} \
-		--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"
-}
diff --git a/dev-db/mysql/mysql-4.1.18-r60.ebuild b/dev-db/mysql/mysql-4.1.18-r61.ebuild
index 7c3bdee79c21..4529ad64a7be 100644
--- a/dev-db/mysql/mysql-4.1.18-r60.ebuild
+++ b/dev-db/mysql/mysql-4.1.18-r61.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.18-r60.ebuild,v 1.2 2006/03/17 20:18:06 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.18-r61.ebuild,v 1.1 2006/04/10 21:34:03 vivo Exp $
 
 inherit mysql
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/dev-db/mysql/mysql-5.0.19.ebuild b/dev-db/mysql/mysql-5.0.19-r1.ebuild
index 2ce202a1f915..f8516ed40b7b 100644
--- a/dev-db/mysql/mysql-5.0.19.ebuild
+++ b/dev-db/mysql/mysql-5.0.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.19.ebuild,v 1.2 2006/03/17 20:18:06 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.19-r1.ebuild,v 1.1 2006/04/10 21:34:03 vivo Exp $
 
 inherit mysql
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/dev-db/mysql/mysql-5.1.7_beta.ebuild b/dev-db/mysql/mysql-5.1.7_beta.ebuild
index 493152e75ad5..da1faf0c1039 100644
--- a/dev-db/mysql/mysql-5.1.7_beta.ebuild
+++ b/dev-db/mysql/mysql-5.1.7_beta.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.7_beta.ebuild,v 1.2 2006/03/17 20:18:06 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.7_beta.ebuild,v 1.3 2006/04/10 21:34:03 vivo Exp $
 
+MY_EXTRAS_VER="20060316"
 inherit mysql
 KEYWORDS="-alpha -amd64 -arm -hppa -ia64 -ppc -ppc64 -s390 -sh -sparc -x86"