lot of trivial stuff

(Portage version: 2.1.2_rc4-r1)

9 files changed, 230 insertions, 28 deletions

diff --git a/dev-db/mysql-community/ChangeLog b/dev-db/mysql-community/ChangeLog
index cc34e34b8a2d..e96e41a45ad2 100644
--- a/dev-db/mysql-community/ChangeLog
+++ b/dev-db/mysql-community/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-db/mysql-community
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/ChangeLog,v 1.7 2006/12/10 03:28:59 vivo Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/ChangeLog,v 1.8 2007/01/03 15:23:32 vivo Exp $
+
+*mysql-community-5.1.15_alpha20061231-r60 (03 Jan 2007)
+*mysql-community-5.1.15_alpha-r90 (03 Jan 2007)
+
+  03 Jan 2007; Francesco Riosa <vivo@gentoo.org>
+  -mysql-community-4.1.22.ebuild, mysql-community-5.0.27.ebuild,
+  -mysql-community-5.1.13_alpha20061018.ebuild,
+  mysql-community-5.1.14_beta.ebuild,
+  +mysql-community-5.1.15_alpha-r90.ebuild,
+  +mysql-community-5.1.15_alpha20061231-r60.ebuild:
+  Added "pbxt" USE flag, better using testsuite
 
 *mysql-community-4.1.22 (10 Dec 2006)
 
diff --git a/dev-db/mysql-community/files/digest-mysql-community-5.0.27 b/dev-db/mysql-community/files/digest-mysql-community-5.0.27
index 93f2852555f2..ae197314c5c8 100644
--- a/dev-db/mysql-community/files/digest-mysql-community-5.0.27
+++ b/dev-db/mysql-community/files/digest-mysql-community-5.0.27
@@ -1,6 +1,6 @@
 MD5 584d423440a9d9c859678e3d4f2690b3 mysql-5.0.27.tar.gz 25867740
 RMD160 3de75b959d04e002b2e4cfe322abdb48bf2f80fd mysql-5.0.27.tar.gz 25867740
 SHA256 08dc9a7b4adb766b2fb8390804147822f1772aa4bd2e06ca7764bc85010c73a7 mysql-5.0.27.tar.gz 25867740
-MD5 6bbe6a711efc1455c0d210a477d2af0e mysql-community-patchset-5.0.27-r1.tar.bz2 1748
-RMD160 74198d990e7a627841aac6ef7ff866704d82e601 mysql-community-patchset-5.0.27-r1.tar.bz2 1748
-SHA256 1279a343a15a0b601cdc4b0c34502ff924528a12f7c4ff83a506b5050e19ce1c mysql-community-patchset-5.0.27-r1.tar.bz2 1748
+MD5 889650b97f04964a837c9d6f1b0b21d9 mysql-extras-20070103.tar.bz2 49578
+RMD160 4bce7fdaa3c2d425f52f8f05905cf56b5f9ea333 mysql-extras-20070103.tar.bz2 49578
+SHA256 fded30189183e3e3dadd40719264e9f0a125a797e18a5529dcfbc58c3bf8f66b mysql-extras-20070103.tar.bz2 49578
diff --git a/dev-db/mysql-community/files/digest-mysql-community-5.1.14_beta b/dev-db/mysql-community/files/digest-mysql-community-5.1.14_beta
index c6ef2da2aa85..6a8cf386f954 100644
--- a/dev-db/mysql-community/files/digest-mysql-community-5.1.14_beta
+++ b/dev-db/mysql-community/files/digest-mysql-community-5.1.14_beta
@@ -1,3 +1,9 @@
 MD5 f02115e98c99558e062adcf2dc305283 mysql-5.1.14-beta.tar.gz 23640648
 RMD160 2acaa1393967a6fd57f9c37f3eef8dac62eb7138 mysql-5.1.14-beta.tar.gz 23640648
 SHA256 6b4990a784169560fd487d24c69efba1f73662500d0d3132375d8b5cd026bb67 mysql-5.1.14-beta.tar.gz 23640648
+MD5 889650b97f04964a837c9d6f1b0b21d9 mysql-extras-20070103.tar.bz2 49578
+RMD160 4bce7fdaa3c2d425f52f8f05905cf56b5f9ea333 mysql-extras-20070103.tar.bz2 49578
+SHA256 fded30189183e3e3dadd40719264e9f0a125a797e18a5529dcfbc58c3bf8f66b mysql-extras-20070103.tar.bz2 49578
+MD5 1dde707c3f86ecbb4567b8d5de603dc3 pbxt-0.9.73-beta.tar.gz 2706652
+RMD160 a4d974a8519b62868e948966910a84dbded05abe pbxt-0.9.73-beta.tar.gz 2706652
+SHA256 a2176d137138d33028c57499b74a79c5f12dcd958c3e7f1aad67bb4b7b24674d pbxt-0.9.73-beta.tar.gz 2706652
diff --git a/dev-db/mysql-community/files/digest-mysql-community-5.1.15_alpha-r90 b/dev-db/mysql-community/files/digest-mysql-community-5.1.15_alpha-r90
new file mode 100644
index 000000000000..ed004d821f4b
--- /dev/null
+++ b/dev-db/mysql-community/files/digest-mysql-community-5.1.15_alpha-r90
@@ -0,0 +1,6 @@
+MD5 889650b97f04964a837c9d6f1b0b21d9 mysql-extras-20070103.tar.bz2 49578
+RMD160 4bce7fdaa3c2d425f52f8f05905cf56b5f9ea333 mysql-extras-20070103.tar.bz2 49578
+SHA256 fded30189183e3e3dadd40719264e9f0a125a797e18a5529dcfbc58c3bf8f66b mysql-extras-20070103.tar.bz2 49578
+MD5 1dde707c3f86ecbb4567b8d5de603dc3 pbxt-0.9.73-beta.tar.gz 2706652
+RMD160 a4d974a8519b62868e948966910a84dbded05abe pbxt-0.9.73-beta.tar.gz 2706652
+SHA256 a2176d137138d33028c57499b74a79c5f12dcd958c3e7f1aad67bb4b7b24674d pbxt-0.9.73-beta.tar.gz 2706652
diff --git a/dev-db/mysql-community/files/digest-mysql-community-5.1.15_alpha20061231-r60 b/dev-db/mysql-community/files/digest-mysql-community-5.1.15_alpha20061231-r60
new file mode 100644
index 000000000000..c2bb1435985d
--- /dev/null
+++ b/dev-db/mysql-community/files/digest-mysql-community-5.1.15_alpha20061231-r60
@@ -0,0 +1,9 @@
+MD5 b231ba7f535806f1cb8d792e4091f1b9 mysql-5.1.15-bk-20061231.tar.bz2 11999404
+RMD160 9a9929d6c2df4e128b3b5259b21fec5e04fe3181 mysql-5.1.15-bk-20061231.tar.bz2 11999404
+SHA256 1e4acc53175af275b48dbab33320d4841c9502c74f283e4f62215f5c2e602f15 mysql-5.1.15-bk-20061231.tar.bz2 11999404
+MD5 889650b97f04964a837c9d6f1b0b21d9 mysql-extras-20070103.tar.bz2 49578
+RMD160 4bce7fdaa3c2d425f52f8f05905cf56b5f9ea333 mysql-extras-20070103.tar.bz2 49578
+SHA256 fded30189183e3e3dadd40719264e9f0a125a797e18a5529dcfbc58c3bf8f66b mysql-extras-20070103.tar.bz2 49578
+MD5 1dde707c3f86ecbb4567b8d5de603dc3 pbxt-0.9.73-beta.tar.gz 2706652
+RMD160 a4d974a8519b62868e948966910a84dbded05abe pbxt-0.9.73-beta.tar.gz 2706652
+SHA256 a2176d137138d33028c57499b74a79c5f12dcd958c3e7f1aad67bb4b7b24674d pbxt-0.9.73-beta.tar.gz 2706652
diff --git a/dev-db/mysql-community/mysql-community-5.0.27.ebuild b/dev-db/mysql-community/mysql-community-5.0.27.ebuild
index b50350b7c21e..cfb3749796d4 100644
--- a/dev-db/mysql-community/mysql-community-5.0.27.ebuild
+++ b/dev-db/mysql-community/mysql-community-5.0.27.ebuild
@@ -1,13 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/mysql-community-5.0.27.ebuild,v 1.2 2006/12/09 22:38:54 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/mysql-community-5.0.27.ebuild,v 1.3 2007/01/03 15:23:32 vivo Exp $
 
 # Leave this empty
 MYSQL_VERSION_ID=""
-MYSQL_RERELEASE=""
-# Set the patchset revision to use, must be either empty or a decimal number
-MYSQL_PATCHSET_REV="1"
-BASE_URI="mirror://mysql/Downloads/MySQL-${PV%.*}"
+SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
 
 inherit mysql
 
@@ -15,17 +12,41 @@ inherit mysql
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 
 src_test() {
-	cd "${S}"
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
 	make check || die "make check failed"
 	if ! useq "minimal" ; then
+		cd "${S}"
 		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
 		local retstatus
+		local t
 		addpredict /this-dir-does-not-exist/t9.MYI
 
-		cd mysql-test
-		sed -i -e "s|PORT=3306|PORT=3307|g" mysql-test-run
-		./mysql-test-run
+		# mysqladmin start before dir creation
+		mkdir mysql-test/var{,/log}
+
+		if [[ ${UID} -eq 0 ]] ; then
+			mysql_disable_test  "im_daemon_life_cycle" "fail as root"
+			mysql_disable_test  "im_life_cycle"        "fail as root"
+			mysql_disable_test  "im_options_set"       "fail as root"
+			mysql_disable_test  "im_options_unset"     "fail as root"
+			mysql_disable_test  "im_utils"             "fail as root"
+		fi
+
+		for t in \
+		loaddata_autocom_ndb \
+		ndb_{alter_table{,2},autodiscover{,2,3},basic,bitfield,blob} \
+		ndb_{cache{,2},cache_multi{,2},charset,condition_pushdown,config} \
+		ndb_{database,gis,index,index_ordered,index_unique,insert,limit} \
+		ndb_{loaddatalocal,lock,minmax,multi,read_multi_range,rename,replace} \
+		ndb_{restore,subquery,transaction,trigger,truncate,types,update} \
+		ps_7ndb rpl_ndb_innodb_trans strict_autoinc_5ndb
+		do
+			mysql_disable_test "${t}" "fail in sandbox"
+		done
+
+		useq "extraengine" && mysql_disable_test "federated" "fail with extraengine"
+
+		make test-force-pl
 		retstatus=$?
 
 		# Just to be sure ;)
diff --git a/dev-db/mysql-community/mysql-community-5.1.14_beta.ebuild b/dev-db/mysql-community/mysql-community-5.1.14_beta.ebuild
index f0e435aa6331..3fbc8609c94e 100644
--- a/dev-db/mysql-community/mysql-community-5.1.14_beta.ebuild
+++ b/dev-db/mysql-community/mysql-community-5.1.14_beta.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/mysql-community-5.1.14_beta.ebuild,v 1.1 2006/12/10 00:34:04 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/mysql-community-5.1.14_beta.ebuild,v 1.2 2007/01/03 15:23:32 vivo Exp $
 
 # Leave this empty
 MYSQL_VERSION_ID=""
-MYSQL_RERELEASE=""
-# Set the patchset revision to use, must be either empty or a decimal number
-MYSQL_PATCHSET_REV=""
-BASE_URI="mirror://mysql/Downloads/MySQL-${PV%.*}"
+SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
+PBXT_VERSION="0.9.73-beta"
 
 inherit mysql
 
@@ -15,18 +13,44 @@ inherit mysql
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 
 src_test() {
-	cd "${S}"
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
 	make check || die "make check failed"
 	if ! useq "minimal" ; then
+		cd "${S}/mysql-test"
 		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
 		local retstatus
+		local t
+		local testopts="--force"
+
+		# sandbox make ndbd zombie
+		hasq "sandbox" ${FEATURES} && testopts="${testopts} --skip-ndb"
+
 		addpredict /this-dir-does-not-exist/t9.MYI
 
-		cd mysql-test
-		sed -i -e "s|PORT=3306|PORT=3307|g" mysql-test-run
-		./mysql-test-run
-		retstatus=$?
+		# mysqladmin start before dir creation
+		mkdir ${S}/mysql-test/var{,/log}
+
+		if [[ ${UID} -eq 0 ]] ; then
+			mysql_disable_test  "im_cmd_line"          "fail as root"
+			mysql_disable_test  "im_daemon_life_cycle" "fail as root"
+			mysql_disable_test  "im_instance_conf"     "fail as root"
+			mysql_disable_test  "im_life_cycle"        "fail as root"
+			mysql_disable_test  "im_options"           "fail as root"
+			mysql_disable_test  "im_utils"             "fail as root"
+			mysql_disable_test  "trigger"              "fail as root"
+		fi
+
+		useq "extraengine" && mysql_disable_test "federated" "fail with extraengine"
+
+		mysql_disable_test "view" "FIXME: fail because now we are in year 2007"
+
+		# from Makefile.am:
+		retstatus=1
+		./mysql-test-run.pl ${testopts} --mysqld=--binlog-format=mixed \
+		&& ./mysql-test-run.pl ${testopts} --ps-protocol --mysqld=--binlog-format=row \
+		&& ./mysql-test-run.pl ${testopts} --ps-protocol --mysqld=--binlog-format=mixed \
+		&& ./mysql-test-run.pl ${testopts} --mysqld=--binlog-format=row \
+		&& retstatus=0
 
 		# Just to be sure ;)
 		pkill -9 -f "${S}/ndb" 2>/dev/null
diff --git a/dev-db/mysql-community/mysql-community-5.1.15_alpha-r90.ebuild b/dev-db/mysql-community/mysql-community-5.1.15_alpha-r90.ebuild
new file mode 100644
index 000000000000..5f2e143260a9
--- /dev/null
+++ b/dev-db/mysql-community/mysql-community-5.1.15_alpha-r90.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/mysql-community-5.1.15_alpha-r90.ebuild,v 1.1 2007/01/03 15:23:32 vivo Exp $
+
+# Leave this empty
+MYSQL_VERSION_ID=""
+MYSQL_RERELEASE=""
+SERVER_URI=""
+PBXT_VERSION="0.9.73-beta"
+
+inherit mysql
+
+#REMEMBER!!!: update also eclass/mysql*.eclass prior to commit
+KEYWORDS="testing"
+
+src_test() {
+
+	make check || die "make check failed"
+	if ! useq "minimal" ; then
+		cd "${S}/mysql-test"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus
+		local t
+		local testopts="--force"
+
+		# sandbox make ndbd zombie
+		hasq "sandbox" ${FEATURES} && testopts="${testopts} --skip-ndb"
+
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# mysqladmin start before dir creation
+		mkdir ${S}/mysql-test/var{,/log}
+
+		if [[ ${UID} -eq 0 ]] ; then
+			mysql_disable_test  "im_cmd_line"          "fail as root"
+			mysql_disable_test  "im_daemon_life_cycle" "fail as root"
+			mysql_disable_test  "im_instance_conf"     "fail as root"
+			mysql_disable_test  "im_life_cycle"        "fail as root"
+			mysql_disable_test  "im_options"           "fail as root"
+			mysql_disable_test  "im_utils"             "fail as root"
+			mysql_disable_test  "trigger"              "fail as root"
+		fi
+
+		useq "extraengine" && mysql_disable_test "federated" "fail with extraengine"
+
+		mysql_disable_test "view" "FIXME: fail because now we are in year 2007"
+
+		# from Makefile.am:
+		retstatus=1
+		./mysql-test-run.pl ${testopts} --mysqld=--binlog-format=mixed \
+		&& ./mysql-test-run.pl ${testopts} --ps-protocol --mysqld=--binlog-format=row \
+		&& ./mysql-test-run.pl ${testopts} --ps-protocol --mysqld=--binlog-format=mixed \
+		&& ./mysql-test-run.pl ${testopts} --mysqld=--binlog-format=row \
+		&& retstatus=0
+
+		# Just 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-community/mysql-community-5.1.15_alpha20061231-r60.ebuild b/dev-db/mysql-community/mysql-community-5.1.15_alpha20061231-r60.ebuild
new file mode 100644
index 000000000000..f0d76c946c05
--- /dev/null
+++ b/dev-db/mysql-community/mysql-community-5.1.15_alpha20061231-r60.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/mysql-community-5.1.15_alpha20061231-r60.ebuild,v 1.1 2007/01/03 15:23:32 vivo Exp $
+
+# Leave this empty
+MYSQL_VERSION_ID=""
+SERVER_URI="mirror://gentoo/MySQL-${PV%.*}/mysql-${PV//_alpha/-bk-}.tar.bz2"
+PBXT_VERSION="0.9.73-beta"
+
+inherit mysql
+
+#REMEMBER!!!: update also eclass/mysql*.eclass prior to commit
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+
+src_test() {
+
+	make check || die "make check failed"
+	if ! useq "minimal" ; then
+		cd "${S}/mysql-test"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus
+		local t
+		local testopts="--force"
+
+		# sandbox make ndbd zombie
+		hasq "sandbox" ${FEATURES} && testopts="${testopts} --skip-ndb"
+
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# mysqladmin start before dir creation
+		mkdir ${S}/mysql-test/var{,/log}
+
+		if [[ ${UID} -eq 0 ]] ; then
+			mysql_disable_test  "im_cmd_line"          "fail as root"
+			mysql_disable_test  "im_daemon_life_cycle" "fail as root"
+			mysql_disable_test  "im_instance_conf"     "fail as root"
+			mysql_disable_test  "im_life_cycle"        "fail as root"
+			mysql_disable_test  "im_options"           "fail as root"
+			mysql_disable_test  "im_utils"             "fail as root"
+			mysql_disable_test  "trigger"              "fail as root"
+		fi
+
+		useq "extraengine" && mysql_disable_test "federated" "fail with extraengine"
+
+		mysql_disable_test "view" "Already fixed: fail because now we are in year 2007"
+
+		# from Makefile.am:
+		retstatus=1
+		./mysql-test-run.pl ${testopts} --mysqld=--binlog-format=mixed \
+		&& ./mysql-test-run.pl ${testopts} --ps-protocol --mysqld=--binlog-format=row \
+		&& ./mysql-test-run.pl ${testopts} --ps-protocol --mysqld=--binlog-format=mixed \
+		&& ./mysql-test-run.pl ${testopts} --mysqld=--binlog-format=row \
+		&& retstatus=0
+
+		# Just 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
+}