Version bump for 5.5 series

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

3 files changed, 32 insertions, 21 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 785d161e92a1..db318d302d60 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.720 2015/02/04 18:30:31 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.721 2015/02/05 16:03:20 grknight Exp $
+
+*mysql-5.5.42 (05 Feb 2015)
+
+  05 Feb 2015; Brian Evans <grknight@gentoo.org> +mysql-5.5.42.ebuild,
+  -mysql-5.5.41.ebuild:
+  Version bump for 5.5 series
 
 *mysql-5.6.23 (04 Feb 2015)
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 22ab5a6bc61d..9c214ce8a373 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -5,33 +5,33 @@ AUX my.cnf-5.1 4827 SHA256 8b11f33d086566d0ca21d46bb21b1020be6e24511038f3f12e146
 AUX my.cnf-5.5 4903 SHA256 5dea40a071aa24d34485788fcf5a852885f362f69dfa1e479d813386c1c08d8b SHA512 caa701bfb912d32d0e0d61e28c59b9e106c0ca2c6717d79365bca8f67fda69c705a36fe56cb00e3e76bfbb8eb099e0a74f900dc3546f88004247706a3ac3b01f WHIRLPOOL ea276746aa54cf9659a0c81d2c978d0ac880bb0d0b86ffaf9c4a8a5f0d250d1c1736669fc1ec250b0f702f3b3095256d0310e146ad67ecdbf4ebf61eba282add
 AUX my.cnf-5.6 4674 SHA256 c7eb9b67e6dc0006dc10bc3b0a4ade611fc1d05e50c7469d5e1d177f3fcdb9ee SHA512 d5638364a54940b32088c1b2382b85c1e6126c8f7e1b0c41a20f8d3a59efe760bc30defd75c6089d2918ce7c9e5ad973da45ebbd7aec7d87450fa15043355f38 WHIRLPOOL 059e3844e12f23cabfd62a35dd6fa94ce279de374521b0eca89225204981f66bc597a5b035365460a740755327b25a66a96dbd95ad32bab2a341a2a756e8ba31
 DIST mysql-5.5.40.tar.gz 21727672 SHA256 4d3721761a31c28866e8ee0fde47558a3e9047aaef3b89135ae8d45eebb74960 SHA512 9adc3c0ace48a84ee87fb7e1f36b2f3d3e5cd95d50ca3012828c7fb33b723cfbfdf85760a30ea38c719a90cc449613747e974768b7f0b070dc346e05a5c418b3 WHIRLPOOL e8a5e8c6e4b816d935fd5368a9f38eaea23b1269c39e6ceed54c13bfaa85586ea81d1c4386f4f3d520cdb3d16b023afa3dab763629e388bc0759389e0eddec43
-DIST mysql-5.5.41.tar.gz 21768300 SHA256 ec642fc5be5ea03b24a0c5189204675fb3794dee772314ace650623c1c994844 SHA512 4c4e9658175e1f5de218527045d7d43f880a16c0069725e6c9f9873538b5ede39e4024fc9983e42c04d59a7bece7a3505d154eabbaa230c0dd456c46ff4982b8 WHIRLPOOL 37ef2709b489db62beb745d3b39bf6e6ebe97e98ea6f5630fa4a74cf865d048a222b19995eff71c6146b15cb28f4dd7edf1567ddf6dbef606f964149dad37ccc
+DIST mysql-5.5.42.tar.gz 21795431 SHA256 887b12676be4893fa833e4a585c6c8b0c0f18dee30ba7d22cfe860cd85bfc74a SHA512 d02ea8d5a3f0309c2bd17241c9feca81ef35acc2595bfcb134fe436cd6a3d9ddbac5daa71ac75d953518ec2dc5791f953663648f52727bb37cb378d6663f2e0a WHIRLPOOL 43accca23246c353d0ce4e8d0807c4f4f80ba00e2a1d08a97fec5e59abed1278c34c2cda010894af9f98e866aee2a33614c8bf4fe4b840d45ff1d88993a1ff9e
 DIST mysql-5.6.22.tar.gz 33115516 SHA256 c4d2dfabb20a8e26e8437dff41f366520001eb031ffd77fbfcde70d0073fc9f6 SHA512 11b4a1b34ff4bb63d7cdbc1134947772b2c30715b1e3d3fba2ed9c5102f0bde14a708561b2d463014eca64f5fb415a54a0e1656d48f118b403e66d83b98f5b82 WHIRLPOOL a85db903ce1bc542ac87d832d2d0d84cd4c8a75f5feae435d0a9c5ce26f792b7d30c0113764315e8df0e74a899ee2c02233e3b193b42a98daf46ed52b5ccc9cd
 DIST mysql-5.6.23.tar.gz 33115859 SHA256 3bd21af06a9304e372daba41fa5612bb54ac1bc05a4349b3160d0cda972ac098 SHA512 ac648550934ac6ddcb0cbc93731c2d913288dff53ada665f161d14c46e16f2a8ad8d09106a2718e8412f859ea9cf038d04e4c6f5fbea6e4424f9373ddccf4da3 WHIRLPOOL ae315cc7a60408cc050a7941b3c16cf169554b5a67fe4ce23a9b183cb551168f2ec3817e28cf0aa24b619ddc1b638bd926cfcf9c2e0755b2acbf1b82548b2581
 DIST mysql-extras-20140801-1950Z.tar.bz2 1494288 SHA256 a656486a7383d656ed33e279f41bb4384feba082cad3af48376ce9e1f395fe0b SHA512 b2c29c3d7c1ddacfa170125c9df0aaf65eac9f6112244b1deea97a46a3a2f2bd3eb069808e7b2ee3261d609b32046363830ba4ebcc7e74f449189a91145a6f9c WHIRLPOOL 41befc03a7382516849ecaecc1d02be7d00c47be489b97ce68c320c3aa8979c8f941525efe230d97ad2d1a85936a1e4d6c93d96a3f45930991a938e5f0fdab87
 DIST mysql-extras-20141203-2105Z.tar.bz2 1494317 SHA256 cec9fe6873563840e9520ec9f02d06e1262748847be45a9aeaaa841f7ed4b4dc SHA512 958b410d7905d7911a69288ba9a9ebb1d80ff38281506e18400652b15895eb3926d9679fd245a54f4f7cdb688ed9940f21b1b4634239dbc1a1db19ac3918921a WHIRLPOOL baf70684826f393723bd3877813d9415c15b847ffd71757535a12106bff4fcf343cca37e166d45be06eca0425d249dc600bc752ab5e27e02ead3897952ceb169
 DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
 EBUILD mysql-5.5.40.ebuild 4073 SHA256 b995be1a0cf508a87e12225ae6168f91a0f4098ce24aa4d61e00f4ae1d735519 SHA512 4c6eb3f253a0769421d1c0f4c88081251c7f0159f7d58a60ce9a7f4132405ab897f8dfbdb19ae4584c87df955d109abc17f884cc97a674dcb835f01b181f9841 WHIRLPOOL 8420b841f89f25eac7cf4300de2918e1372ca76f40e55acbee3a55f0a1bc367cd1b946767033ddd97803ff33ddf6db4055b85d1e347b9dcccda070bfd6f95193
-EBUILD mysql-5.5.41.ebuild 4071 SHA256 ae8165b249af56c676522c5fecdb259108e08fde3bee78da082d3d965c66429a SHA512 e2603665081ce6afc48aa192a50f0c318069ab8f90ab0e90b807e7ae29c1fcfb0d852a01bc4da2f77c01308fb18bdb632bbfcf950962749c36a021be2c862b6c WHIRLPOOL cee7a7f8ced60c89c68b91a2c7b1700d22f8fbb3ee7f7f737bde34f9758c56e0cc4ad1f28db6985381a2468df96f229b2d228aeadadfa9ef8bb09546034ea6d8
+EBUILD mysql-5.5.42.ebuild 4298 SHA256 b2e1919f6e90822285f1f903c43b75479a48d71de51e3f3fa175d18c221b08d8 SHA512 81a23d9f128ddde75fcfa6495fabc428a82e7fe8c279581ad75f037426f089867d045c758287db5a40b9b9df7165ab368da387f92e8908584f036b528805525c WHIRLPOOL a95ca23a1329bd23a1d432cfd84b63fa248a2732c7ce43f645c6567dc7d3255f6664916f63b44d7e07965b5f5694d84c3adc0ccdba3f7e7d93cc690749608657
 EBUILD mysql-5.6.22.ebuild 5242 SHA256 b1af0b4d976b26825401db48c1b4528b857d9b525771632a80cd375d5bd99a16 SHA512 cc3da39252fed23d1e3157e72da3e4c4796e9891e4e8940e9ef1ea0036e3b792b98a669a92ccfa9e315790606d0f6c557103302425ba8185d7a8001584651681 WHIRLPOOL 5539ebb6512a84e360e175f52eb3f47d75a81f6d28d47194825d0aa634ab06ac9aff3de75596e72fff4819e15f5d84ebab005072b3e43a0b0103cb1814d39e16
 EBUILD mysql-5.6.23.ebuild 5254 SHA256 b9356860456f09d8b1a6a1a11ad426cad2858e40656efb28c3e820e3546e80fb SHA512 c42face5dd2d23bc2f3c4c4caebe0b7b52666f4c3fe48406f57dff50a0f63ba2e86cc8b4eea2448bd59c4827b51a0d59be3d7f937b739da65d7121e606a7907b WHIRLPOOL bc60e6803967a33210b3b81b2af34cabbfdb82eaf22ab2c4d94e74c0001ef0467a1a5dde2ae1069a421607348aca7f28e8595a5448760d01d605044ba77e6577
-MISC ChangeLog 23584 SHA256 c271a796c06b77879c20f6f60bd7075f5b715c0b76d07ccc12c6331a9909fd09 SHA512 860d2612d377b099f26a0eb9409cd49c5730e83c30aae4bfde082cb02a2a58dc3d0434d909fcceb8685ad8b6438b906eb0a91306f34eddd523839ad46df327ef WHIRLPOOL 82af8bce1df7b77b0c4c4112a9a1e195f45421b67371d80d05815f4a39eedca3a90d91787b89f8ec7f656431053463dc01a31b6e357474f38b8301ff00047f89
+MISC ChangeLog 23739 SHA256 607839d2ad374c8cd4b52a149aa09fc607df0687c8df04446717eec1c2b92895 SHA512 d3ccc19f41d532bf354af9b2d3c09f37236eb0e1c4d6b102ac9c682f188b7042a533909a70ed7e64a42b624a3241dd82f957cf47e41a867af2d2a151bad2828a WHIRLPOOL 47ee15e9676ebca3b78a4a9551b74ca06f4d162629105148643fb9920230aec4e6c1eb09cfd10886e9af628ffe1431a074f40747c36f069d0093171cbf6631fa
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC metadata.xml 1195 SHA256 de7dc626aa238322a90b982b1e2055d9f6b0b0fb4c72366a6ea79145626154c4 SHA512 236b205d90988ff622eccffec1d0811b1600115089b45dc1da457e707a3318330d2ce94d22fc92f0ce5555a806c82e95289ffe96fd440698fdf90936240373cf WHIRLPOOL f41e2b682bedbfec1d8389d60b352931339811d16012096f3856e76725a54488a36da6e8dcf108db9704a90fd9bb2b78c74d99c890c4619decf51063c7bf1fbf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU0mVMAAoJENH3ge/59KO2E5kQALCBsIsiplgtWjmZGbkinY0Z
-F85mEHJuJmctIcNDZ4GhAzM0W3vAXiORJSTuFQCsd0eKXZGMptNMN/e0OQZfjoGP
-SDSKTXvkifap+22zVulSSGj22kvL2Kf6sOm9ACm6E0xYYTu3vltGKRnlapUqXbd3
-U4Gw6UkCopItxSMF3YXqdwtcuNLsTBEchxKAS31EYPihxRBeNGhaUsOKpanD7mce
-Ej6NJFW7oiKUmw8Se4P9ybYVK+iLvFKW92LyNDMZfpue7IRgMbky/besr5SFN7lY
-utw+JAG+13DY5tPAKBIN9Uto2qXUbYkVXQsWaxxLye9CzY9b5mM8MVwaTORq1R6O
-CYSHTnW//kCw3q57M5ZXKSvl0B43j2tk/DNCRKuVH3ROLgvMFYhRBk0yeYYe8mMA
-fTq3AGJmnVlk7p1Z2sUtSDf7lHUU3sr26uLWJPZVImd88GXmxN5YO5AlD/o+pIox
-/WNGZlyBJshjYs0ZWeRwf76qqHkZ0c5O1KPid6B1HWcPVAJfokhQGu7/u0xOcCjR
-NrnCrSzaId4uArb2xi6btH6AHDtb7CoZRXhi7M1OrCclbQ87eslG3tvWlvUcMWCC
-4+27YXrsVhlcDy8PtTuoUWlGhhSWE5R92H8oQyc++sWPW56NETf34NWtgUimHxb4
-LgdCBaE8XV3/8vnYZg/l
-=zDL7
+iQIcBAEBCAAGBQJU05RYAAoJENH3ge/59KO2Z90P/AzDHuBxLqN1xJFu/HWYIwDW
+g+PRHF0IPFRE58Yt+MD4ezlgVlvpt3Wdc2xfWmClhRtXdgBLPT7HQcL4hn67HnhL
+gjvNgmqpwtfvZud43k4xevSBuw4gsESAr2M5+fPnHyhnoMWXWH5wdBAtKu1lML0R
+X8VMKAE7Tln/ThILI30zO+4ZmN9qISOHIF08QbSwOcHtoak7ADf5xqlGd/ZCMAg0
+OJaJd7p6tiaLYOwJMKNBRtng6dyAMmqGAGt5EHTH69d5fS2mE47J+Cb26faRXZQ8
+PwOOE2wyqelAfCxgka6eKYdY8U0ic+rwiFamq4PoV19Mwl9epYrQKjHSTvkdIsuB
+gBlgWGTz6USbCaBZnUvZvxiljETTS4W5kNeC+fFoXpdtHzEEh+WbMfvKI84AHfdk
+4QKqC/9U/w15e9RHVmxrCxME7w3ukuc3g9wFAK4xmGj+Im24Hf7OhrDkT8YIn87T
+9dR0JQgqqWnJ3Vjjp1VVIaydYg+bw9RdqBw+nWp0myvRfFkm60zGEnLYeygRKT9i
+gNz+6fVC1wzq3l/6HJADweJNGAv5S3/RPK8g5oJmUYy5lWiFG0JVUF9baNbaVAGa
+5/EcZZmqcwtyCPQxEcs3jq8J4DebtRvK598Icea4mAcyjJ4tukv+3RjFfjNFCkru
+RKSuusOwn8u85iVqDkQI
+=A+Bd
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/mysql-5.5.41.ebuild b/dev-db/mysql/mysql-5.5.42.ebuild
index 8cd099618c47..9240420a57e6 100644
--- a/dev-db/mysql/mysql-5.5.41.ebuild
+++ b/dev-db/mysql/mysql-5.5.42.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.41.ebuild,v 1.1 2014/12/04 01:27:44 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.42.ebuild,v 1.1 2015/02/05 16:03:20 grknight Exp $
 
 EAPI="5"
 
-MY_EXTRAS_VER="20141203-2105Z"
+MY_EXTRAS_VER="20150127-1351Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 
@@ -83,10 +83,15 @@ src_test() {
 		#
 		# main.mysql_client_test:
 		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.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 \
 			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin ; do
+			main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
 				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done