adding unslotted MySQL, masked for the moment

8 files changed, 232 insertions, 11 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 0a5c81e8d700..497fbc59df17 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,15 @@
 # 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.305 2006/03/03 01:31:54 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.306 2006/03/09 14:00:20 vivo Exp $
+
+*mysql-5.0.19 (09 Mar 2006)
+*mysql-5.0.18-r60 (09 Mar 2006)
+*mysql-4.1.18-r60 (09 Mar 2006)
+
+  09 Mar 2006; Francesco Riosa <vivo@gentoo.org> +mysql-4.1.18-r60.ebuild,
+  +mysql-5.0.18-r60.ebuild, +mysql-5.0.19.ebuild:
+  Added unslotted MySQL for version 4.0.18, 5.0.18 and 5.0.19, all are masked
+  waiting for the revert to be announced and documented.
 
 *mysql-5.1.7_beta (03 Mar 2006)
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index b1109373e85d..9f8f291e721f 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a261dbb899e81279321826b22e8fd340 ChangeLog 62765
 RMD160 48ea13ea8dbcce48f23a2c92fc07987cc4b37372 ChangeLog 62765
 SHA256 94965090fce9a127b63856e299b53573c3330ff8776dc0e587c945c4140fc561 ChangeLog 62765
@@ -25,12 +22,21 @@ SHA256 0802f09103dc675570e9133773d845780b5b8f7b441366a9bc4dcc48d8fb435e files/di
 MD5 9cc8cf047c6784b87d9ffc2f9bdbeec3 files/digest-mysql-4.1.18-r30 509
 RMD160 f19f66a83eb82c60a5384d58ff0d0da932ad11f5 files/digest-mysql-4.1.18-r30 509
 SHA256 ee801d4d2f1f3d2f86ae1cf267ed32a662bc80488da29c5348e28f1cd4b5abd3 files/digest-mysql-4.1.18-r30 509
+MD5 3ca576554af70984f5bbbbdbf1de91e9 files/digest-mysql-4.1.18-r60 509
+RMD160 4bd2d873ef19fb3a50729285c16c47252ae7f5f5 files/digest-mysql-4.1.18-r60 509
+SHA256 15eb9398057e36a260ed9f8a20b52131879844f3589bf2bddfe043b154714d19 files/digest-mysql-4.1.18-r60 509
 MD5 61fb608f7d62d7c79a6e214ff6080464 files/digest-mysql-5.0.18 509
 RMD160 9c7c0e613946b7d4b994dd754937eaf2ac0eca6c files/digest-mysql-5.0.18 509
 SHA256 5a6cf4a50060b5e13c7bcfe4e9bb7e1596d03eaaf6871c1c33e82bddfbc17ea8 files/digest-mysql-5.0.18 509
 MD5 9ea44731bd30b0dd36a7572c044696e9 files/digest-mysql-5.0.18-r30 509
 RMD160 4589dd0c639033b3de7055f6fce456381d670209 files/digest-mysql-5.0.18-r30 509
 SHA256 de83a353e7d4d66bfd5186afe2f8b461ed00d6ad7a3a47bcd8f55172cb949c5d files/digest-mysql-5.0.18-r30 509
+MD5 7a544a6b81a17eb80fa76295f359eb8d files/digest-mysql-5.0.18-r60 509
+RMD160 a831fb74493358ceb6c31c38b2255f147e2814ed files/digest-mysql-5.0.18-r60 509
+SHA256 8452746c8a037308db01b41828d700bdfe04a82e4fc4c25b5576b9eddac3a419 files/digest-mysql-5.0.18-r60 509
+MD5 e4aa51e405f90c2d979e7314ba910a5e files/digest-mysql-5.0.19 509
+RMD160 f18a80267aa2887ba7f2e1c492106c454ccb94c4 files/digest-mysql-5.0.19 509
+SHA256 63251f66978a9cb3b2f5b01e629ec12c6d8274a7c95cb7aa8677045e4534e377 files/digest-mysql-5.0.19 509
 MD5 5aa028806767e63171b5d4520015571f files/digest-mysql-5.1.7_beta 521
 RMD160 ddc150c4236d6701433ff50849b13da45ae4b23c files/digest-mysql-5.1.7_beta 521
 SHA256 6eb6bcce4bf607148a63b84928ee5a1e887fafd127898f14ca54443680cabce8 files/digest-mysql-5.1.7_beta 521
@@ -112,19 +118,21 @@ SHA256 64b26729cac70aa9e5e9e63252c9051da9e4b7ac07b248f082d891608d7c263b mysql-4.
 MD5 9df67f755fb4daf4f7da5dc96a59531c mysql-4.1.18-r30.ebuild 2062
 RMD160 0594e52b0889f3dc26d695ea68c51817d76cba35 mysql-4.1.18-r30.ebuild 2062
 SHA256 74413770684726b78c82f27a1fe5e812f49727f27658294e870c7e7d6c3cbb02 mysql-4.1.18-r30.ebuild 2062
+MD5 191abb8d4babd95f436132e1b0641e14 mysql-4.1.18-r60.ebuild 2069
+RMD160 ddee63548a6356aad8786a30527a3dee3b2155b8 mysql-4.1.18-r60.ebuild 2069
+SHA256 1c5f00a9a61966ed72ef6c3c243b9d5c90e62efafd36b89b1a366bdf357948bd mysql-4.1.18-r60.ebuild 2069
 MD5 09f6c62cd80d2dc46d0b0dc7c57873b3 mysql-5.0.18-r30.ebuild 2065
 RMD160 39942cdaa6e3ce821b782bd08d00018821a2041a mysql-5.0.18-r30.ebuild 2065
 SHA256 4ecddc90a006eac39436aa345fbcb608706af27517d6db67019234f2a8b63ddb mysql-5.0.18-r30.ebuild 2065
+MD5 da71f69f4d988e38fe124418330448ac mysql-5.0.18-r60.ebuild 2072
+RMD160 8658747c6e681fbdea4a2810faf4ead01afbe315 mysql-5.0.18-r60.ebuild 2072
+SHA256 5f49f4402673bdfb790776c5ee5ef9cfbcf8b7fad20e1a23b82e408e58911a67 mysql-5.0.18-r60.ebuild 2072
 MD5 c4ded86a0fdb58b34c5232ac37a3b42e mysql-5.0.18.ebuild 24842
 RMD160 53921af172a5c95a80b93be02644dc2d013aa365 mysql-5.0.18.ebuild 24842
 SHA256 b606ae70c57b16fa41b0cbd46f5375244dbb735c9d85554e99833180ca9bb656 mysql-5.0.18.ebuild 24842
+MD5 da71f69f4d988e38fe124418330448ac mysql-5.0.19.ebuild 2072
+RMD160 8658747c6e681fbdea4a2810faf4ead01afbe315 mysql-5.0.19.ebuild 2072
+SHA256 5f49f4402673bdfb790776c5ee5ef9cfbcf8b7fad20e1a23b82e408e58911a67 mysql-5.0.19.ebuild 2072
 MD5 3afe047568e65a91f01ec766e588cad5 mysql-5.1.7_beta.ebuild 2072
 RMD160 1ac81a589e8d75e9b3c354a0ce09de4204e6740b mysql-5.1.7_beta.ebuild 2072
 SHA256 40629470b8b992952b536fdfa7f5a20c560a943b7999dbce849967a8b8175174 mysql-5.1.7_beta.ebuild 2072
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEB50TKolR564NvWYRAnlZAKCaHskQwZsCYqLJNYIS34MpfNylowCgsvZp
-AU9Zu/XG2/0J0WX8p6sSC48=
-=sTk9
------END PGP SIGNATURE-----
diff --git a/dev-db/mysql/files/digest-mysql-4.1.18-r60 b/dev-db/mysql/files/digest-mysql-4.1.18-r60
new file mode 100644
index 000000000000..d6cb50b58e4e
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.1.18-r60
@@ -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 e47aad78a132dcde074b763c19cb2ac8 mysql-extras-20060304.tar.bz2 78284
+RMD160 1c709ec33758587fb9c6a261dde1d58e1ef5ebc0 mysql-extras-20060304.tar.bz2 78284
+SHA256 92f47ed28745b129b122836546ebda65ae87abcf5b1ca7628f44bcca1ed6af74 mysql-extras-20060304.tar.bz2 78284
diff --git a/dev-db/mysql/files/digest-mysql-5.0.18-r60 b/dev-db/mysql/files/digest-mysql-5.0.18-r60
new file mode 100644
index 000000000000..1cdfff79d680
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-5.0.18-r60
@@ -0,0 +1,6 @@
+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 e47aad78a132dcde074b763c19cb2ac8 mysql-extras-20060304.tar.bz2 78284
+RMD160 1c709ec33758587fb9c6a261dde1d58e1ef5ebc0 mysql-extras-20060304.tar.bz2 78284
+SHA256 92f47ed28745b129b122836546ebda65ae87abcf5b1ca7628f44bcca1ed6af74 mysql-extras-20060304.tar.bz2 78284
diff --git a/dev-db/mysql/files/digest-mysql-5.0.19 b/dev-db/mysql/files/digest-mysql-5.0.19
new file mode 100644
index 000000000000..973f09ae7e44
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-5.0.19
@@ -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 e47aad78a132dcde074b763c19cb2ac8 mysql-extras-20060304.tar.bz2 78284
+RMD160 1c709ec33758587fb9c6a261dde1d58e1ef5ebc0 mysql-extras-20060304.tar.bz2 78284
+SHA256 92f47ed28745b129b122836546ebda65ae87abcf5b1ca7628f44bcca1ed6af74 mysql-extras-20060304.tar.bz2 78284
diff --git a/dev-db/mysql/mysql-4.1.18-r60.ebuild b/dev-db/mysql/mysql-4.1.18-r60.ebuild
new file mode 100644
index 000000000000..446d28ff0e40
--- /dev/null
+++ b/dev-db/mysql/mysql-4.1.18-r60.ebuild
@@ -0,0 +1,62 @@
+# 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.1 2006/03/09 14:00:20 vivo Exp $
+
+# MYSQL_VERSION_ID will be
+# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
+# this is an important piece, becouse from this variable depends many of the
+# choices the ebuild will do.
+# in particular the code below work only with PVR like "5.0.18-r3"
+# the result with the previous PVR is "5001803"
+MYSQL_VERSION_ID=""
+tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
+for vatom in 0 1 2 3; do
+	# pad to lenght 2
+	tpv[${vatom}]="00${tpv[${vatom}]}"
+	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
+done
+# strip leading "0" (otherwise it's considered an octal number from bash)
+MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
+
+# for future use ...
+NDB_VERSION_ID=$(( ${MYSQL_VERSION_ID} / 100 ))
+MY_EXTRAS_VER="20060304"
+
+inherit mysql
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+SLOT=0
+
+DEPEND="${DEPEND}
+	>=sys-libs/readline-4.1
+	berkdb? ( sys-apps/ed )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	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 )"
+
+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
+
+		cd mysql-test
+		sed -i -e "s|MYSQL_TCP_PORT=3306|MYSQL_TCP_PORT=3307|" mysql-test-run
+		./mysql-test-run
+		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
+}
diff --git a/dev-db/mysql/mysql-5.0.18-r60.ebuild b/dev-db/mysql/mysql-5.0.18-r60.ebuild
new file mode 100644
index 000000000000..49dcded76fcc
--- /dev/null
+++ b/dev-db/mysql/mysql-5.0.18-r60.ebuild
@@ -0,0 +1,62 @@
+# 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.1 2006/03/09 14:00:20 vivo Exp $
+
+# MYSQL_VERSION_ID will be
+# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
+# this is an important piece, becouse from this variable depends many of the
+# choices the ebuild will do.
+# in particular the code below work only with PVR like "5.0.18-r3"
+# the result with the previous PVR is "5001803"
+MYSQL_VERSION_ID=""
+tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
+for vatom in 0 1 2 3; do
+	# pad to lenght 2
+	tpv[${vatom}]="00${tpv[${vatom}]}"
+	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
+done
+# strip leading "0" (otherwise it's considered an octal number from bash)
+MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
+
+# for future use ...
+NDB_VERSION_ID=$(( ${MYSQL_VERSION_ID} / 100 ))
+MY_EXTRAS_VER="20060304"
+
+inherit mysql_fx mysql
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+SLOT=0
+
+DEPEND="${DEPEND}
+	>=sys-libs/readline-4.1
+	berkdb? ( sys-apps/ed )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	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 )"
+
+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
+
+		cd mysql-test
+		sed -i -e "s|MYSQL_TCP_PORT=3306|MYSQL_TCP_PORT=3307|" mysql-test-run
+		./mysql-test-run
+		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
+}
diff --git a/dev-db/mysql/mysql-5.0.19.ebuild b/dev-db/mysql/mysql-5.0.19.ebuild
new file mode 100644
index 000000000000..c5fd3ea3fd59
--- /dev/null
+++ b/dev-db/mysql/mysql-5.0.19.ebuild
@@ -0,0 +1,62 @@
+# 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.1 2006/03/09 14:00:20 vivo Exp $
+
+# MYSQL_VERSION_ID will be
+# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
+# this is an important piece, becouse from this variable depends many of the
+# choices the ebuild will do.
+# in particular the code below work only with PVR like "5.0.18-r3"
+# the result with the previous PVR is "5001803"
+MYSQL_VERSION_ID=""
+tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
+for vatom in 0 1 2 3; do
+	# pad to lenght 2
+	tpv[${vatom}]="00${tpv[${vatom}]}"
+	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
+done
+# strip leading "0" (otherwise it's considered an octal number from bash)
+MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
+
+# for future use ...
+NDB_VERSION_ID=$(( ${MYSQL_VERSION_ID} / 100 ))
+MY_EXTRAS_VER="20060304"
+
+inherit mysql_fx mysql
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+SLOT=0
+
+DEPEND="${DEPEND}
+	>=sys-libs/readline-4.1
+	berkdb? ( sys-apps/ed )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	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 )"
+
+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
+
+		cd mysql-test
+		sed -i -e "s|MYSQL_TCP_PORT=3306|MYSQL_TCP_PORT=3307|" mysql-test-run
+		./mysql-test-run
+		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
+}