Add mysql 5.5.1-m2, we don't support the same version syntax, so mangle _alpha_pre -> -m, because _alpha on it's own means something else upstream. -m comes BEFORE _alpha.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 209 insertions, 2 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index dfe93bc75a20..fbbcf3c0cc33 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.505 2010/02/02 05:57:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.506 2010/02/02 22:04:02 robbat2 Exp $
+
+*mysql-5.5.1_alpha_pre2 (02 Feb 2010)
+
+  02 Feb 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +mysql-5.5.1_alpha_pre2.ebuild:
+  Add mysql 5.5.1-m2, we don't support the same version syntax, so mangle
+  _alpha_pre -> -m, because _alpha on it's own means something else
+  upstream. -m comes BEFORE _alpha.
 
   02 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
   Explicitly note what USE=extraengine turns on: Archive, CSV, Blackhole,
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 63115994e568..b139bbf48794 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -19,6 +19,7 @@ DIST mysql-5.1.41.tar.gz 23026814 RMD160 f99d17a2bb43fc45222c7015a3b65c6b4f68612
 DIST mysql-5.1.42.tar.gz 22267547 RMD160 03be40ad07238d0b13d82b3e763f5263962e3bef SHA1 b16a787b61dfc6f57ff6fb723223598c6f529db1 SHA256 9b4fcc5137b3f6ab7107f6f84248aa8c74702be55a73470091c24b451fe79abe
 DIST mysql-5.1.43.tar.gz 22319586 RMD160 51aa017edc165f13f2cb696ee210505b8f2a21ee SHA1 fff98e59f17487d646998662409bc894a422b7e9 SHA256 6e417c22c0ba91ba7fea15a6c7b63b581decd446b638ea5dac896cd5de90baf3
 DIST mysql-5.4.3-beta.tar.gz 21750728 RMD160 dc191579cc429441da7d20a1f50b25754fe37ad0 SHA1 daf96fb8adcdad23afed921727fe767ff0939711 SHA256 525e84f4c1fa135a492ead6945e03d91d5e72dc31397ca2d713b3124bbc3fcb5
+DIST mysql-5.5.1-m2.tar.gz 21459964 RMD160 aa36e78efe6fdbfc020cd1599fa63dd9aa60e91b SHA1 6eb787a884523ea30b4a8b900a928a0caa159e3a SHA256 26e8d98ae2341b8ee292bc173531560011e0150da63f2d873fad191d8dbce081
 DIST mysql-extras-20061210.tar.bz2 51115 RMD160 52355e608d5048c91b7960aa5be0c030ecb0e5d8 SHA1 c9d035ac73d29fe2d1274760ca70b8c6b882fec6 SHA256 46505a8b54ae7cafdc610465edfdfde1cd74f101071f71cf1f5c1c02e92790eb
 DIST mysql-extras-20070105.tar.bz2 50005 RMD160 abf1f8ebab8ecdfdb5ebe9ca55076f39ab492acb SHA1 7f4dbc3d6c20fe953bf6e936a58343a229398ca0 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172
 DIST mysql-extras-20080124.tar.bz2 106526 RMD160 8f9f556308c96c4cd5cffd0506c99ea59e7c25c2 SHA1 574f5dbf4a8bb53d352cb2fbe391ad5c484eb932 SHA256 c4b33dd391834252d20d4b083ac4bd6999253a8f20d894dd93b0795c6b318829
@@ -55,5 +56,6 @@ EBUILD mysql-5.1.41.ebuild 5529 RMD160 4228c029ac80940ef55e364f155c03848b9522d5
 EBUILD mysql-5.1.42.ebuild 6376 RMD160 dc58417ca85214a09ce1f9670558ecae7187ce91 SHA1 e14ee2baec4cf4d2ff0596ff470c0d27c37c347b SHA256 ee88e625c10245cbfa36d658e0e9001c0fe454f5dd438983b4fef49f512f2ef6
 EBUILD mysql-5.1.43.ebuild 6302 RMD160 e1f9522106d20c6c43ee2243e16c6f09001c6c4e SHA1 aa2e72b46257bc0d4a5adbb568c94ff762f1f6a4 SHA256 d325640a4260fc707e0606a1a7e83e3b159d02400126e5d8e98b2c00fdaec10f
 EBUILD mysql-5.4.3_beta.ebuild 6537 RMD160 f305bc58d21e2466e2a25bf0d44639736c595650 SHA1 f7727d92dd0be64f6fac125f504a9e1c555e2048 SHA256 98d7d53fd608c04e64bdcac4b84de15cc6fe37fdd30ead96e7d7caa5e91c6929
-MISC ChangeLog 97670 RMD160 a8dd4f986d16492603bd4f97b8cdd1e5d465f060 SHA1 2f50dcfac8f013243d78cef7e2773f96e2988454 SHA256 336b88a1cd6623ac4bc46a9c61023bfe94c2490ec92c52c0223cd9aef87f4f97
+EBUILD mysql-5.5.1_alpha_pre2.ebuild 6765 RMD160 90c5fc5a1ae0bbb0574386cab9aced2340bca03b SHA1 76b52701031a8c8a11da723a3f7e909c490d54f0 SHA256 1a5217e72b94def4f0c2f26fb5ad69f7b79aeb8a31b993c64c209e455fe9d2b9
+MISC ChangeLog 97975 RMD160 2ce3262912dcd6fe4e462bf6b8b96348a83a8ed2 SHA1 25b2e611c9a5165425196945efbfd29777bace26 SHA256 455cb488844849f14433a5bea5c6c94366bb631350717e35c359f1ab81ab0397
 MISC metadata.xml 1044 RMD160 eca52715bc85512f787d2434ea048c7b6ada592a SHA1 20c62ad5fa9b0dac0a8a4d5e05ada56878e4bbd8 SHA256 eb1d58952bb1865a0fe14d57e830854852bcdc5ca7fe76eb0f11a67b52311504
diff --git a/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild b/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild
new file mode 100644
index 000000000000..081363910da6
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.1 2010/02/02 22:04:02 robbat2 Exp $
+
+MY_EXTRAS_VER="20100201-0104Z"
+EAPI=2
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+inherit toolchain-funcs mysql
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-4 >=sys-devel/gcc-apple-4 )"
+RDEPEND="!media-sound/amarok"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='berkdb cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	emake check || die "make check failed"
+	if ! use "minimal" ; then
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		make -j1 test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		make -j1 test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		make -j1 test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}