4 files changed, 30 insertions, 139 deletions
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index ce51eead9a0d..d2816b3d5a02 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mariadb
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.117 2015/08/08 03:41:14 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.118 2015/08/08 04:35:53 grknight Exp $
+
+*mariadb-5.5.45 (08 Aug 2015)
+
+  08 Aug 2015; Brian Evans <grknight@gentoo.org> +mariadb-5.5.45.ebuild,
+  -mariadb-5.5.43-r1.ebuild, -mariadb-5.5.44.ebuild:
+  Version bump for 5.5 series; Drop old 5.5s
 
 *mariadb-10.0.21-r1 (08 Aug 2015)
 *mariadb-10.0.21 (08 Aug 2015)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 5b56c25d3d74..3c9d371874d8 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -7,8 +7,7 @@ AUX my.cnf-5.6 4687 SHA256 dc94a99e91d082b47c0ceb10badbf12a44c5ab7f60710bcc2e5f1
 DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
 DIST mariadb-10.0.20.tar.gz 56241178 SHA256 3a4f6963c794977af5d5fd9ec06a337a2ad556b3a287196fddbd2243c1388b7b SHA512 40214e29ec3fd6402b6e075644ab3fc3acd080e9e0d6e77db83c14d928f69a9af366c5df715d3d52692b90259c6b6d28160376a4d6e05811ed9973741a3ba445 WHIRLPOOL 5a5dfa7a53254a22fc4540aa78a6ac3704e17e90b22d1bae32f40bddd906e6e9409161c973e9229d48af27419df410c7214859bd979137221ba394d37cf1bbbb
 DIST mariadb-10.0.21.tar.gz 56216903 SHA256 4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545 SHA512 75aa4b019f3432a61483bb325a0f088ea92d6fede44d7a300c15659411c8927fa2a0586182226315b6d6796641ca1d8746f7fd49e21fe21505adec1fc38ae32f WHIRLPOOL b086fb34363b2426f5e91c14916b747787feadf37c609f4aea1f08bd235e9e97df17f5bfa0eb9e65e93fbed3df5eb6c021287c4eb987a3362ea87cf96eaf268e
-DIST mariadb-5.5.43.tar.gz 45651398 SHA256 a0709997140549154edb87c9dfab564cd4755b238251acbf42369118f9bb4d01 SHA512 fa9b463843ebf70e3a462ee5fdfa34aedd35194f3593f7ec1fc5f17663e798610ade46925b31f9f96e06503508ae840bfed54ae7b6661affa4d5b630d475f1db WHIRLPOOL 4d9b219263e75dd6530a24fe2d34df370cde0cfc7b13b5a820567d84cc4da22864e1fbb0d3413a23f2b9ce12c7fccd32c09aad391e690b510b2c7a788f7fa88e
-DIST mariadb-5.5.44.tar.gz 45672065 SHA256 7d425caf5f1e45de9e5eb72daa98ceb542e7b134a89bd01540b60fe9c5965e8f SHA512 34cde1a49055e4389b9b17a7d5ee8465a6213bf2b0e6a9c9ed327c1bcbe3abfa0023ee55755ac40940887315b7f7204960aed1328a767bd6b3129dee2b7a32d9 WHIRLPOOL bbdfa58077b232e900140b9ffe26661f2d2865eecfdae0ad26ab70b0589ad8759b344c4f77e510ff25d3d6db11527c7e69ed8473a550207db02f335bc2b0d060
+DIST mariadb-5.5.45.tar.gz 45686618 SHA256 4dc3aff6941ef1068412002915d795bcf67db0eaa38a5c6f3af57474c4226fb0 SHA512 57501670605cfcdd231ef57d2db7ac9bf460856e63c0660d050ad11aa0392d3d6ce6730ae119dca5d00847c9170990f375c8499593bf0d02c1995395191236ba WHIRLPOOL e5ef471c097c2b8921596b88f26df6914e031daafdcd878d79a16c20be6ba8c97fb79069e48d7d1b9aa405ced063f66feac1c52503907e06ee4b577def2c57fa
 DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
 DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
 DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
@@ -17,26 +16,25 @@ EBUILD mariadb-10.0.20-r1.ebuild 4342 SHA256 f47ef1d7bfe8fe505bfc26679d05eeafd9f
 EBUILD mariadb-10.0.20.ebuild 3989 SHA256 add94f125cf35e5b725140c14a1c3c3e98dac4c7c8ee966f21f1aba226d625ca SHA512 5dd35988222ef73bcb9086a8a84a4681d3a21e4ab9a80e9881315d7a71989d4bd1d7d4884486551335e5409e0cfb6856a051c8d5fcfc598d916f7513f4d96ebd WHIRLPOOL 4d8fc61d8f9ad161cd6128fb90447a31b1ee158f22abb9f5da4935a2454e9408f0206fc2ad2c93d2a58f2fb55a2d8be0100f439187bf6759d3f9c51228384607
 EBUILD mariadb-10.0.21-r1.ebuild 4576 SHA256 2ccaad4fc714034b7fd9cd21cba635036f4584c5ad3f4e129cb101c3af86414f SHA512 7b20ef122e97f7cd75b245cfae3e68362082d9910dc7fa98bc009ddf3c270f00c994d61dfd85e30e54146542ef75a574a643899b606a297037a7dbb1b598b07c WHIRLPOOL 7064bb8960b6edc90735a2fa3bbefd9b72a976425b905d6aefd34e283b19a58c3c4d2af1eda4cf6246fff66047c9b53cafcd17ccf7e36af8f26b55e8b6469e8a
 EBUILD mariadb-10.0.21.ebuild 4298 SHA256 58135b072eb3c089e114c574d5814d36ccc6c96d41b852a1a2acff8a951cda6d SHA512 1f88c036fe212fc08e121be37e73cd30c26c033c41a3b4a291594a82ea0d63b6f4c43625fd3428f31c4b2c2f79953bf48c64c02b8485701fcafb74b2ab3a4e48 WHIRLPOOL f6ebe115a0f8e618ac0190466f842287c1a8f55b8a0bdbd10eccec98c54c50b20dd6fca037376160af8fb1f9fd8929caaced2b3eee4cb6d838ad6ee7a75be779
-EBUILD mariadb-5.5.43-r1.ebuild 4124 SHA256 24cfbd4e0fd532c44f3c62a51fe8f829dc37e77b8a3390fa1159a1bc4d969341 SHA512 60b58452feaedf650f763651ff994ddfcb7c46302f6fdb8607c2b68bb579a83394a2bada83d9b03e5a58c1f40f32f8c19184c4752c20c81137f497dbfbb65e01 WHIRLPOOL f87b2b849cefaf0617fb78e331bb7ed3c5b784c61e71e760d8debf3fecb46b52e6d328af93303fabb2068757b3d3458201f8399f9a1cc40cdddb5df5f07f2dd5
-EBUILD mariadb-5.5.44.ebuild 4121 SHA256 26db98fc9f8118e88060d7994a74f38bf2cc6d9dc04ec2d7745a9f079dab602d SHA512 42b6545e2b7c9ad34a30239b28ecc9c73ed4c7137479d0e1acc033ee2ac4d430ac3f2513d4d042d0915ad9003edd83ca9496301bc85d523225677a0191105501 WHIRLPOOL 05eaf80a6cbd03f314a11e301d84beca99ef3618f52e50c5a80f47f186bc8c226c8c491abac0316cd06f963382a8ba2a20fda881c583cfdaae6e5cf1d3154692
-MISC ChangeLog 18458 SHA256 a6e594cf92fa55171668496b9c8e32f017b387b97caf8e4405f65b93457283a5 SHA512 49c9bdc9606c47dab45b0aa663b533afd9e8339856712bad7b1fa699bcad19e25b4bb5c57ed31f4031071be79851a0ed08a17813e07e931bac60d1282f7c4092 WHIRLPOOL 713ac867dad0c12c4fad63e87165b702fd3df7775e7333a3041c2ad88ea4ee123715e3d1eb952eebe6381eec66f62614db573a44625e713583d42b7711a2b6ee
+EBUILD mariadb-5.5.45.ebuild 4355 SHA256 7daed9ce7d4d7276d1ec7dbd88d2cdec687ff137eb467a06753de6fe6e0ddaa2 SHA512 aaf3e35b21ae772f9e45ac1f0e31348313d6b7dbeb97a10ec9d00012d36bdabc4f643539d691302e39d8ae8010e1892f39ec751b664e6c0613e35a37d603c1e1 WHIRLPOOL 2ea9b0fd4845491e5db5433368df22dd64fa670a8421011504ee1f1bc38928660d62d3552a76ed3566bdb9c5cc8c8a2ae8e6766ddcea9a095ad9d95a94d18c1d
+MISC ChangeLog 18661 SHA256 49a3541aba6998e4e877f4a11c5f3b9e3c6019c87d2f7ad8b8e55a25eab88eda SHA512 24861a1e538520bb16a70d09a34633dd51b15a4c2fee86928be65ec589ef54014aea54072124b245a4572b69208483c30cd2e26260fa09e30433e3ab617d25fc WHIRLPOOL 6b99d1767c2bf508d584fc9ab323e722079280aaad98ef7d56414f6b183a87b54b1907cc6f2bb2487d87e9cb672f9879cf65a49bf872f59fb09d794bb83253a7
 MISC metadata.xml 1611 SHA256 54b3e0c4009f1f551cc4106406ee66424541cb40aa211bfe45e5655b92e12d97 SHA512 de4a3b4bb2b23eeb3a2ceeed00a3bb75c9564de378cfe703e6be7408e470fa21cb0d4c893336b68ab984227894dc6a4a0690839bace5f174a59d4076b4e4518d WHIRLPOOL bf4c098b4e2c396ddec57e8734fd2a909b941dc142b6a427c01e2f8ec30e55e96e1bfc622ac4e6710cefcb30eb5020b4f44756a8d90ce8451bfd979244ecf3b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVxXpgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVxYcvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2L24QALoDOINAccgfQ6vbuPa3jzZ4
-9R/kDiVmhWkByRjEZ4qYHtwNcvG+dwxogtsndWyORe7tqjpuSmiHGriTcjkcaWBX
-rPjeJ+YdR8mVgYuwj4UumvuqIZTSh4k3QrppQaJSyUBzb6P23mZsSPDFQODvm5YS
-6hzzTjcGT3rlRKA4cctkNN2C0SWeIyAB6nIViv7/gTMr725PFNOQABbQLHJ2X1eT
-+UOqTYTwDklvNgjtNzXoZZSbyNW3diOPYqUwlW+pKBAGIGIsOfeAVgKopLLjHJq7
-J3uW9R1ly0o9tjM3h9SNltJCQCMt1nrr8iKIYGVqafFkkJFlX2I9rOUeimf78QCY
-AC8F5bxwHlHEvx9zOw4F/OOfpoo54R/Y9VFoBecglJ07/gPnFm/3d9BNZKXYkEy5
-7jHUXCVz+2P2WvqcjzLB1KrYtlEAsDw1NMVq+uKXMSYGSkBHMBUt/28/WxqG5Pxq
-LQKZ4QgrE2GqvFwLjU6EZEit3e0gDZ58baYnXGrG2DLczGfAVMp/4TGkcphovswE
-R9J+OD7X+epURo3WuEBZ+LSSWCy/DhIdXOZOwe5WY6dtighagH3mWhoh9RTPz+HZ
-4gISEX4GNJ12maK+1wE4L5zxwmHYB77lvG/AqxYWRvtHYVErSQij4G0Oo5IoFAFy
-RQAznGXbhXhG/Sqg17bj
-=tTnh
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2P7EP/3a9Ytum75gui6wnOOd5gd7B
++inIZF1M338N0UqtSx5tATtVZKZb01j2H8zAuC0aWqdtSJv3gYtn9MKFtVvHjcNu
+FJW3P9qlWiSp2AM0R57paheNRoGAM/d6wd5whgjW0uxhpzgCjY9h1LNLfY7njntO
+O2gtlWjmFloaQ3bhHrnrpaVgX+wHVhzp58B+lNdyPGMineX9VM2cyt7lqj8pxozl
+YnSU9SJiQwa6jvfAC956WYiKy/8DjB/Ab02WnOXapox2idm3ryMLKc7pz9BCGmiV
+6Qzst72gtrT0Ag+ztVd1kEQTraxkXhCeq6f6byqny6mFEup7P1GX4xV9paQoCuLy
+hxVdYN8aQVY4EB6pfhybOEWaXCN5kx8Hv2n89ABuAB7zy68lb0kvU2aGCGIkb/Rk
+vxnUqRaYMym6XrehgJzOSWqUC8Ttux11ZIKK9Nws7QvlbIhk1jvAXmm9SFv9oPwI
+3ZNAUXudKOPRxFB3z0WqNcV+/340KNbUMNV41AqnIfXq4x3l2rF1T5QWc+0BJJLp
+nUKKBF/dmQ/CApBLpZ42QnjQqLBu090R5tDv0oWYSKAtEaa0BpcRWf4vir5tcjev
+sEESlAxcqDysjgeMtJxwP/fl2j3t2SVKl4vlrJflZNWcX8UYDEJ+Y1+LutxeLTrr
+pxQidbB4mxACp4x5Fw8E
+=9Dox
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.5.44.ebuild b/dev-db/mariadb/mariadb-5.5.44.ebuild
deleted file mode 100644
index 5cf1ddf50a6d..000000000000
--- a/dev-db/mariadb/mariadb-5.5.44.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.44.ebuild,v 1.1 2015/06/20 01:46:49 grknight Exp $
-
-EAPI="5"
-MY_EXTRAS_VER="20150509-1847Z"
-
-# 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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
-
-# Official test instructions:
-# USE='embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${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))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# create symlink for the tests to find the replace util
-		ln -s "${BUILD_DIR}/extra/replace" "${BUILD_DIR}/client/"
-
-		# These are failing in MariaDB 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; 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="${T}/var-tests" \
-			--testcase-timeout=30
-		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
-}
diff --git a/dev-db/mariadb/mariadb-5.5.43-r1.ebuild b/dev-db/mariadb/mariadb-5.5.45.ebuild
index 2b77a6361084..120d64353914 100644
--- a/dev-db/mariadb/mariadb-5.5.43-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.43-r1.ebuild,v 1.1 2015/05/09 18:53:27 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.45.ebuild,v 1.1 2015/08/08 04:35:53 grknight Exp $
 
 EAPI="5"
 MY_EXTRAS_VER="20150509-1847Z"
@@ -79,10 +79,15 @@ src_test() {
 		# main.mysql_client_test, main.mysql_client_test_nonblock:
 		# segfaults at random under Portage only, suspect resource limits.
 		#
+		# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
 
 		for t in main.mysql_client_test main.mysql_client_test_nonblock \
 			binlog.binlog_statement_insert_delayed main.information_schema \
 			main.mysqld--help \
+			archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
 			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
 				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done