Remove old 5.1 that has been masked for a long time

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

3 files changed, 12 insertions, 178 deletions

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 4babf38fb252..d6eee6e5b695 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/mariadb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.50 2014/08/17 23:38:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.51 2014/08/21 12:52:54 grknight Exp $
+
+  21 Aug 2014;  <grknight@gentoo.org> -mariadb-5.1.67.ebuild:
+  Remove old 5.1 that has been masked for a long time
 
   17 Aug 2014; Jeroen Roovers <jer@gentoo.org> mariadb-5.5.39.ebuild,
   mariadb-10.0.13.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 1aaa7523dded..84e4be719bab 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -5,7 +5,6 @@ AUX my.cnf-5.1 4829 SHA256 109d4db271860f646df0a1317a2812ffe4b51785aca423bf539e9
 AUX my.cnf-5.5 4916 SHA256 b579073c015719b9623e2e00a985587947bb3562958f6e6f555306021b56d1e6 SHA512 93a79e4807d7fc6cb196445fa885c334ca86981513a0b716bf39f3bca76a7cdfeb62044bae7c44943c683e698a5fc4afe9a8d92fd1d03fce57531abd1947fb68 WHIRLPOOL 05dbc74ade9943d3752e2123449802ec8f5f743aaf0280325c8512f85aca0c3e70acae2eef0f4d1edfb5fde2891a58cf58e6deb3d1f9b0adc1e0c7597ee98607
 DIST mariadb-10.0.12.tar.gz 51100726 SHA256 612bc7360997173d536b79d744e8418d3910924775cbb0614d0843d609be162d SHA512 09d14df652d7ddbfc42b7faa6743e85b013db258e9b3d29b27ca6f01f6b017a03425a900b29b4907e348195da01b59686dce8346371bab4bcd5dcf6778f7ee50 WHIRLPOOL 37808855569961d108f133d40bd7774cfed386289e5923f7c28369056fb1eb6a6d40d02248a214982c7c7d3d0740e2403b1ce3fb41b1b7b628a0ee081999ebd1
 DIST mariadb-10.0.13.tar.gz 51333762 SHA256 1a56a0ad1178e26723dfd7e77a2266a7da89552f12ea6bd5116a00bd13fa3c0d SHA512 4bee28c1a1f51dde607f59587f7d0281e9677d6af65501238d6ddf9c4fee9b3ab7bc7da8fc7f321fb7d859fbbfec96354bea3c7852ad36c9cae883fbdba22ac1 WHIRLPOOL 524bdf2131d4e090c2cb9a1f5ee7eb64599b0180db9c7f8b4483223d7b28e986f91d81589ded6f3c2df65e5ae0c6b1d218d1c860db8aa8d1c0e45b035cb975a7
-DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
 DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
 DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
 DIST mariadb-5.5.39.tar.gz 45084762 SHA256 cb850865ab55ce5f01c99a612cc75b76ead5d75adfa75a606f453d32f9089d14 SHA512 a16685dce416449da5e004eaacc2e33d45ba437d91a117ef6c44c09f19186cafe626a87d25ebc67cbf08c0d57d61a3622dd9df9004c541a7bc46be82642b5a67 WHIRLPOOL d1c3efdb2ff4de1830e8d5f03709b7c7a1e037a07902fce3253473a241b62f15b3ccb54896e4ca048ecd952acc84577cfc0788632a2c4aa77694f86fe48f1089
@@ -15,16 +14,19 @@ DIST mysql-extras-20140817-2320Z.tar.bz2 1495153 SHA256 9a32dcc646c86cb8f9a941f4
 DIST mysql-extras-20140817-2331Z.tar.bz2 1494554 SHA256 c2e338b4e6933d87696cf8c15b5c17e41c0227c05cb123ef2c84e78f26b04b0a SHA512 40a181eabbc112d0408883cf280cc14fc694d971601c35c34b8d6bde6f931aab3f909952676a23457773a5d015f17d57d7b409818ff8569a4b8977638ed80456 WHIRLPOOL 24d74c5be9514b59b18673777aa24f358c7ce4f2daddf23598eb910ca05baa22631849c406c581a864ebd0836b56a7f5ff69bf7377c2dae9d21e96c670ed0e3e
 EBUILD mariadb-10.0.12.ebuild 3841 SHA256 b07c0d7323086f97b52518f9d93bb32f13e1d720ec0b9211b0eb232e828471db SHA512 ed5929e6efb8a8a73bd623e8b2ac4bed0a3f940ecca7fd461351d19c110ee5b7518ac4adf133610eff77f09c055e717aafcc9f0897d0899041d9f24e776478f6 WHIRLPOOL b6ff4763a597b004a1c9721e7dca865324307ab2c23543a7eaf5481b04f25a1f2dc11214508fc6b77a69b5c70c47fc31c931f2854ad3a9bfc4a875d13a30f313
 EBUILD mariadb-10.0.13.ebuild 4075 SHA256 01245644004d791c06ee9f64469ab3e9241045addbc957434026a8ac828466fc SHA512 eae31f65286aecaa915379e92403d2c030ab3ebe2b417fc0c6494611e2003ab40f1162213ca7ab5fb1994c2d7fac81b4d99db417f479ae3bf621e749e02ac2dd WHIRLPOOL 8c070db45d09a55345cdbeefc265084f7ff9cde52b6cfcb69c46d1ba1e06ef7a1f5e263540bfb643339d87cdcc5d828d0e132fd1fd2a12392ca437f5c9d355e6
-EBUILD mariadb-5.1.67.ebuild 6139 SHA256 b078c8b775af3de788b876f1d0d2034bc869cbb50abd2e66f32fa97827cfc0dd SHA512 004acbbab9e6521e5636a664c690078ef439728caafb565628fbb51830fc346961b2a6a9859eefd9d413d31b843e86666277dc124e6ae56c12ecf91c8f193630 WHIRLPOOL 4e0b95f855efa3e848d950062cb6bb408a1349406961dd400a232ac70d5fe7dac7a2b60dd27366abc6d01ddc03ce8ba1dfc0c7a08b4cd7ef14233dd70a43a4c8
 EBUILD mariadb-5.2.14.ebuild 6139 SHA256 cda45549305440ebad53070326cc97145670e529e0a2442bf32313b3ae7bb87c SHA512 35461342dae9fc536c9fab694145e91e596b63e63a2530fb5e8565a81c996794ce777e21c6140d5c08e64ca1aedf4ced6b5a8be6a5d35ad94c36d307f812f799 WHIRLPOOL 813df13a7503aca2421e35152801d028c02ac541958046edfb9bec275d722e9125cd26195f6cb5de104edcd75015fce40a36a835f3d0dc84d27a294adba6f96f
 EBUILD mariadb-5.3.12.ebuild 6139 SHA256 3a100af180cf6996925b097486c68258befde65867b148701909263aabfd583b SHA512 004b15eeb91a184c75d3d48b179c5918ac56285e42364a831f265383be6be452c63830af9ceecc80c33f17c256338e4a9d16d3f272c3ff583e048390e21a7bc4 WHIRLPOOL 5fc916908aee833fc6bae68a1ca41c01d9ccec1a1401eef63cbbbca4afc334c8023c85fb7840d83ae5143084dd2fde444f4ea632314c794210d1992aa46f963e
 EBUILD mariadb-5.5.39.ebuild 3946 SHA256 a7e061279baa5396e319fa1e9154b78a2ab412aa042ea57dede0846b803c5fe5 SHA512 669ca319ff47d65fa9282bc7c834d861f902554552ab49de60c47e975952819785bc220179e338874a2a18cfb8069927a2a2a9225b005408b1ed483b7f4c2466 WHIRLPOOL db9a00122fa935a02d5fae14d45028458a4763b27c30802d01fc3c32caca3cb1a9cd451b0463d6be0539f052427dc6168487c44b8c1a6f8afc4a84e1a666d6ac
-MISC ChangeLog 9884 SHA256 805e6e75a57896a861e379c7aad4774b539147ec7bcfe258d70308dd2bf7c75d SHA512 a5b4dbc20c9a96b7559dc9573f84e6bbf1439c60a322edb9f889dba00b12819b8ab1c3dcda55df49e552b2ba426b21b4f128a62b9833163f6e2f232a62cd58ff WHIRLPOOL 92b5892b42fa4ea6ebb1092f90ffab750cfd89317a4925a43ce6684fba6a3b1f45dcc4f193725dec6051570d50b1e90f791370c36e1dc05732bf7736360a4991
+MISC ChangeLog 10006 SHA256 7dfd64b98fd5a2ded99742e0cf739cc2638b71716fe4db46cc8ac13b2096f7ed SHA512 7b6a3d16ca12d9e0cf5a5a1cc74ebd111e55d72eb0ccde49c11bfc4ec900977a783532c47b8c51dfc85568e9eb0bee07d9b90fd64e2c3dc36e82658fcea0cb09 WHIRLPOOL 19bc45161679d6a17b2cb6559d1d886cc25a8b269b98a5b9d9cc6b79599b74429dc230331c4bfa5d78b7abc07561fd3ac73ee1a7c1b9d28e734ebb1bc5aad5ee
 MISC metadata.xml 1633 SHA256 f33ed7090c3e8917886b3efefbb24e03541e968a5833725dc066825bd0d7b6fa SHA512 c2fbbe518ac7a1f679b16cf5cb4add19369dedba343405079c044885132eae2a6e74126c4adb1d3befcef1050b8159f00f7576d259daac0c4bf81072f5647662 WHIRLPOOL 8673a8d013f14f8f965ddd50fdbfa0e89ea254b4afbd742d11fabcc500384369848801b55eba80d69e179661f41cf9b86e44eabc1e0923c5105257f0f2aee815
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPxPPkACgkQVWmRsqeSphMiTQCfWlsrbVTrVrO6QQBqc6jVu+ww
-NBMAnA+duLWg+63oxxNmqYrDAQ6LQdea
-=QmEG
+iQEcBAEBCAAGBQJT9eutAAoJEE4V4vFnx44d3r4H+wQMmEB3qhe9wOoM0B1nibk5
+SjMuHd5k59SYosw0TP1gNWTLgFguWqtUNegLbnwFfeHJsXFCgunjDFoqTIe/PRvT
+yvg4eRPJx5TAKoAYOY2ZfLm5aCpwrSfsKMiM6FFe04ji9oO2XAxurr/KfALTVt4h
+9Ad9Hfdl27uS+xy9YeqZvAQ4dQb+WPpSyzmzd5+a2JKXvXh70Ul2lecw/nHsfurJ
+gMfRy9RdzORR3o4hfO4Aj3/kxBfIpe6jhLNT5ZncC+W0TbSOsvJgjT0oNc8nYFbu
+6LNAcDRMc+LK0oE1NRmAXDZR3yW1QVJsH5wo0Fc7z67NcWA1KG9daolFikNX/qI=
+=nF5U
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.1.67.ebuild b/dev-db/mariadb/mariadb-5.1.67.ebuild
deleted file mode 100644
index 24ac7f4462cb..000000000000
--- a/dev-db/mariadb/mariadb-5.1.67.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.67.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20121101-2319Z"
-
-# Build system
-BUILD="autotools"
-
-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 ~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
-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() {
-	# 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))"
-
-		# 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.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-v2_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.2.*|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-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake 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"
-
-		emake 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
-}