Add MariaDB 5.3.5 GA and 5.5.21 BETA

3 files changed, 135 insertions, 2 deletions

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 8ea1c94..2e25f3f 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -8,7 +8,8 @@ DIST mariadb-5.2.9.tar.gz 25107185 RMD160 23f89e13ec9b9f731f42ba65f40ea07ad21a44
 DIST mariadb-5.3.0-beta.tar.gz 26244818 RMD160 dab35f3f2e9668235f016e564559ebf62a11755f SHA1 2442be2c9d13c1c9f9bcb7d3edfbda09373f6297 SHA256 d4488147c6722cc869b017e8f9f1af72bbb1f385e63bf8adc3f141b783437b6a
 DIST mariadb-5.3.1-beta.tar.gz 26294191 RMD160 8c7841d03867170c05fa53931e5578c5dc5907c9 SHA1 6c75f95afe57d2e67925277f5bedb50bd97d81e1 SHA256 bf95a1f901feea88a2cb8aea08ce880c15f5ae6f1b1466e490ee83c37bfbf6ad
 DIST mariadb-5.3.3-rc.tar.gz 26578753 RMD160 0a4636259fe86dd6367e35bfd15895eab2b617ba SHA1 2a42cab846bd141847ef7262187921949c9d02e0 SHA256 7f697f38178b768fccb6a7b30ffd30a9c961baf9ed443254e924e7774fd36cf2
-DIST mariadb-5.3.5.tar.gz 26610363 RMD160 cd8ae9513d420c9855d2b77bc8826867f353b72c SHA1 a5487491ddc1477a48227f511ffd74f7cd719b3e SHA256 8b90d52d48de27f43b3f5480fdda80868b9122a11ffa69b5df485a0c857378f3
+DIST mariadb-5.3.5-ga.tar.gz 26610363 RMD160 cd8ae9513d420c9855d2b77bc8826867f353b72c SHA1 a5487491ddc1477a48227f511ffd74f7cd719b3e SHA256 8b90d52d48de27f43b3f5480fdda80868b9122a11ffa69b5df485a0c857378f3
+DIST mariadb-5.5.21.tar.gz 27342088 RMD160 fc9648e55e4751c031aaba03226696e64cbe01f0 SHA1 cc79633bd9955cf45f86ce28e86f45ad5b866dba SHA256 e29fb262c0f347962f6c8a3900e322de91bb4381eaea0686f63aecc0c7f39cf1
 DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
 DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
 EBUILD mariadb-5.1.55.ebuild 6034 RMD160 1e23e5a75da6368b71db55588b7191e44cfeb7bd SHA1 4dd5d1bd12915d3ba2d0f0294edf21c94e8b58a4 SHA256 cee0c000aa4da141ba1da2605864d8a2ba73003e218d9adebb4e9b70be6f2386
@@ -19,6 +20,7 @@ EBUILD mariadb-5.2.9.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0
 EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
 EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
 EBUILD mariadb-5.3.3_rc.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
-EBUILD mariadb-5.3.5.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
+EBUILD mariadb-5.3.5.ebuild 6000 RMD160 9ccc8ee1c003cb7d0584998629c251829358331e SHA1 3ea15f7e46d73d45be2e4d748bbc9fae3318a22a SHA256 e1e69758371cd33822d5fdcf98b004a729f92a605acd95d1fae657178179a132
+EBUILD mariadb-5.5.21.ebuild 5044 RMD160 5f5dd2d417bad1ea94d330c3ff953473594069b9 SHA1 6f193cbab1a8b4a5480aa1a7ee9344968762cd3a SHA256 31b8cffd70966c87cad70ce0a94af85260a03b734ea659e237ba36703a13a179
 MISC ChangeLog 4748 RMD160 fd1104bc4093238a078829d99f699f7cb7bf5592 SHA1 e1522463c7b327d50bf231bd78951669d89534f3 SHA256 af66e5983ec5f17648e82ebb8b50685a2b8ec7f1fa45d3db92ad29bad7dc5592
 MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca SHA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a
diff --git a/dev-db/mariadb/mariadb-5.3.5.ebuild b/dev-db/mariadb/mariadb-5.3.5.ebuild
index 75579d1..302d5df 100644
--- a/dev-db/mariadb/mariadb-5.3.5.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.5.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+SERVER_URI="http://ftp.osuosl.org/pub/mariadb/mariadb-5.3.5-ga/kvm-tarbake-jaunty-x86/mariadb-5.3.5-ga.tar.gz"
 MY_EXTRAS_VER="20110819-0415Z"
 EAPI="4"
 
diff --git a/dev-db/mariadb/mariadb-5.5.21.ebuild b/dev-db/mariadb/mariadb-5.5.21.ebuild
new file mode 100644
index 0000000..87d5eb2
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.21.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_EXTRAS_VER="20110819-0415Z"
+EAPI="4"
+
+# Build system
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# 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
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+        local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+        local retstatus_unit
+        local retstatus_tests
+
+        # 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"
+
+        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"
+
+                einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+                addpredict /this-dir-does-not-exist/t9.MYI
+
+                # Run CTest (test-units)
+                cmake-utils_src_test
+                retstatus_unit=$?
+                [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+                # Ensure that parallel runs don't die
+                export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+                # create directories because mysqladmin might right out of order
+                mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+                # These are failing in MySQL 5.5 for now and are believed to be
+                # false positives:
+                #
+                # main.information_schema, binlog.binlog_statement_insert_delayed,
+                # main.mysqld--help-notwin
+                # fails due to USE=-latin1 / utf8 default
+                #
+                # main.mysql_client_test:
+                # segfaults at random under Portage only, suspect resource limits.
+                #
+                # sys_vars.plugin_dir_basic
+                # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+                # instead of MYSQL_LIBDIR/plugin
+                #
+                # main.flush_read_lock_kill
+                # fails because of unknown system variable 'DEBUG_SYNC'
+                #
+                # main.openssl_1
+                # error message changing
+                # -mysqltest: Could not open connection 'default': 2026 SSL connection
+                #  error: ASN: bad other signature confirmation
+                # +mysqltest: Could not open connection 'default': 2026 SSL connection
+                #  error: error:00000001:lib(0):func(0):reason(1)
+                #
+
+                for t in main.mysql_client_test \
+                        binlog.binlog_statement_insert_delayed main.information_schema \
+                        main.mysqld--help-notwin main.flush_read_lock_kill \
+                        sys_vars.plugin_dir_basic main.openssl_1 ; do
+                                mysql-v2_disable_test  "$t" "False positives in Gentoo"
+                done
+
+                # Run mysql tests
+                pushd "${TESTDIR}"
+
+                # run mysql-test tests
+                perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+                retstatus_tests=$?
+                [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+                has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+                popd
+
+                # 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_tests -eq 0 ]] || failures="${failures} tests"
+                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
+}
+