[dev-db/mariadb-5.5] Drop src_prepare - fixes bug 462078.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xBB0E6E98

6 files changed, 35 insertions, 28 deletions

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 876463572781..d3e178c6ef27 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mariadb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.29 2013/06/02 19:48:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.30 2013/06/26 19:42:59 jmbsvicetto Exp $
+
+  26 Jun 2013; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mariadb-5.5.28a.ebuild, mariadb-5.5.29.ebuild, mariadb-5.5.30.ebuild,
+  mariadb-5.5.31.ebuild:
+  [dev-db/mariadb-5.5] Drop src_prepare - fixes bug 462078.
 
 *mariadb-5.5.31 (02 Jun 2013)
 
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 009ec9ada9c3..b06e0cb871c3 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX my.cnf-4.1 4237 SHA256 08524ededab93a9f1678c2febf0b837bf0b46cbaf0e649a04f90746ff23e47fe SHA512 3edc4fd8214f880c4e0de51b22a28c4f984910f84abe67624282e83db11bd21469f8d3dbc022bab8daed23e09c4f4a48b26aa5b3b993edb2d699c2bcf1f5603a WHIRLPOOL a8ed9409496d96e160fb249afa56dd1ab068ee749c8621ddb056b1ac58f442192725faafbe08dae37739bfb504dcba2b1f8b8433eab665121689389c21fdb5af
 AUX my.cnf-5.1 4829 SHA256 109d4db271860f646df0a1317a2812ffe4b51785aca423bf539e93de2640b65f SHA512 7b0838ac416dffc184a92720991ec78daf2bdb1056cf9b24d918002458ae8693a8b9d91280bb754ce9fb12b0f861f111a134909a545260304401161a53827747 WHIRLPOOL b628a658ad842353b63975081548761a0f41c357e5f1089147286edee57ea6e274b25af5a3aa339b058aaf6da5d306153e465ca42b9e14d2a2399f4cd2280750
 AUX my.cnf-5.5 5002 SHA256 191a6a92923d338e71d6b0dd9bb5f915cbee75693db582e45268ae67826c15b1 SHA512 a665cd1894a081cc53522664300628e575e763962b7471a9a61bd539da3de0d85f4dc21d892946249293bea4f9ecf9968ee220533986cf3b82a9e775215894e0 WHIRLPOOL 9cd2062a9c8e5c01e8667095d6ffbfd9a8a8fce7df7427553574df453c2c4be2b407a2fa34409c1b16a49d1f591234c6648d26c132fb4d9cb4440db75529397d
@@ -20,9 +23,26 @@ EBUILD mariadb-5.2.13.ebuild 6139 SHA256 3fa332de67622c7476d709efbd2067621a323b3
 EBUILD mariadb-5.2.14.ebuild 6139 SHA256 cda45549305440ebad53070326cc97145670e529e0a2442bf32313b3ae7bb87c SHA512 35461342dae9fc536c9fab694145e91e596b63e63a2530fb5e8565a81c996794ce777e21c6140d5c08e64ca1aedf4ced6b5a8be6a5d35ad94c36d307f812f799 WHIRLPOOL 813df13a7503aca2421e35152801d028c02ac541958046edfb9bec275d722e9125cd26195f6cb5de104edcd75015fce40a36a835f3d0dc84d27a294adba6f96f
 EBUILD mariadb-5.3.11.ebuild 6139 SHA256 6f8461f218a54d89b0d72c7fe177f6848d24dcc5edf73a293cf26bdd213d0b9f SHA512 aa504722f1d11bd33633d49da462ff2a80f51161307727e71b3d47cee95317f4fe29f6cea0ae00acc1d3e027018c6713ce3b7319b877fc2268d37dbecaf3974c WHIRLPOOL cd9c9909783d874d80cf6c93acfe75cb4875c01f6dcbdb1030701e6a4c12aae5249b95976e782e55bf61d168dc74994b5eb00bfcbffb0cac4248033752ecf480
 EBUILD mariadb-5.3.12.ebuild 6139 SHA256 3a100af180cf6996925b097486c68258befde65867b148701909263aabfd583b SHA512 004b15eeb91a184c75d3d48b179c5918ac56285e42364a831f265383be6be452c63830af9ceecc80c33f17c256338e4a9d16d3f272c3ff583e048390e21a7bc4 WHIRLPOOL 5fc916908aee833fc6bae68a1ca41c01d9ccec1a1401eef63cbbbca4afc334c8023c85fb7840d83ae5143084dd2fde444f4ea632314c794210d1992aa46f963e
-EBUILD mariadb-5.5.28a.ebuild 4670 SHA256 d041e449777e1025fb41142045d86f1197e5a6477a5752080b13311b95f1236b SHA512 978b3f8c4dc16fd0aababae50648d819651b91dc1402e1eb8bcd222d7f2e8ac20b3a7ede5bde2b67527002895dd8a4aeb7bd17dec1a7e898612891df2222f9d1 WHIRLPOOL 86be5690efc09d9ff6a3c39b9d0c4b2aa8a6ffbfe7b66773963ca079a9ec855193ce158d2c18c1e47eedcf83ca0c30161ba6e93fe666f0c6e63467e127c20a1d
-EBUILD mariadb-5.5.29.ebuild 4622 SHA256 91f9bcb2d6d47814ebbfe2af50d3a456f30bd2517f034e68ee39dcb30fa6c80e SHA512 1002f55d85f3788f646e75312ea3ea425d5f68fbbea6593e20c2fafd4850c96f66e6f7eddac1cf9902ed88fd5d84e34032e084320cf479b97c1d7cad37de3285 WHIRLPOOL 893039c29ed29c470efbdec77da2e8cf3ad27433381668b6cf61b3d35ea69b105a20ae161215ce382b01028c8057759fe817cc53f72e3bc29872aea0e1d93b77
-EBUILD mariadb-5.5.30.ebuild 4622 SHA256 6b9647afa5c2b8e516693de3ae15d3a1fa2a9789594d5e9dafd10f309a2a640f SHA512 9b7c9590cfb6d5ccdfe6a5d5cdeaebce83ab233d596f708e556b155b950a6382d29fc8e6e37bc59ab37b963a10424a9cf8e90e2d26f7b9bf4bfdfb3b0eec7315 WHIRLPOOL ecf081695471188520660d9e5a2cdb2b5045e65d3757a11536bfb57e764283a058d1c0c2bd5a39e8924d5e67bc19d747b4962dd3615b63a0c767964aafd0b25d
-EBUILD mariadb-5.5.31.ebuild 4494 SHA256 56102dba6c7bc87f9d42f6b6789dfa51b134d3be99fade1d853a5167de1b7964 SHA512 1b0b05293cef4bf7ab6fe068310b6cd7f7d1ac5f2a3aff227f62225e2eb27ed6ff343be1bd2285a6c37be9dc907579507e74c6736d2d906e2a43f362fc5bce86 WHIRLPOOL ab9c604f506ce6317cf7ffa5121649aace5dd7b6700e8e0eefb2b3608b0b79b6752531b24584feff3a120b84077a6fa68b2b9cd27b4822af3ad39e2603439f76
-MISC ChangeLog 6264 SHA256 75bc7bec25b9556d1fdac7b52e85d9df66e0af76838544d0e300ed960430fb76 SHA512 625e2f0b9d1648be8ad6167fe7a1dd0670ed2ce76a231448efc243ed4f1b6f85db784419373355bf940d9d0ea9d7289d900593e82ec393b3dfdf3d01a21cdafd WHIRLPOOL ab3692769deea50ee8e825c7e322df1327b831a014789719e697bd79d170da42f262982fadca2816488df8a4639a0ef2fcc1579887f763a98dcd3b55f49f34ae
+EBUILD mariadb-5.5.28a.ebuild 4546 SHA256 4401d5ef9860ef9e813c364e9e4df4c9e435a36dbb796e2116e55e7f16c6c86e SHA512 50e4fdba68ab3cf2ae204c05918e444266a80063d80640824fba498669191aa6f108877b68e5965135e718fa3a57952e683293f3122007c06e27bed81bafd189 WHIRLPOOL eaa41a0c5cd577002621a850a60972d396c27007ec3a403b6452a241449699174acfebbb0ed8f2b04b981dfd4cb6a75b27a5f409be1040acf585a5b8d066c738
+EBUILD mariadb-5.5.29.ebuild 4498 SHA256 eab597e8729b3454db05da1d6a226ebdbc56fa36f4e7679565156baa425f6995 SHA512 22e776e3ebc7133e68159faac69d7da1b3f40274b30bbd7e2499df93f7e3a3b4aa95c6d59f046711e8d718b4362cc401b3c0f76079b9cbaaa9424e231621da45 WHIRLPOOL f2449473b6163657a0bd3d396caf25060e605a6d62380550a6837fe733d3b9711c19bb2ed7638214e9468cb8a871161663c8fc755fd4a7ceb4d4909d2972f5a4
+EBUILD mariadb-5.5.30.ebuild 4498 SHA256 f8e7edff534e6727619216de7def6686470f868dc0ee6cd42de6c0964bb36b1a SHA512 ea68bd2f6775ebb39a35cba8b792d1052211e871a560eb28a57243b5ae97a25f5062acf7070d997296619b543794f7b5b42a5a1b040a22d900538f41e44bd9c2 WHIRLPOOL 8204ed1e47f2fbda608f4790bec4d310351eebfb88812e4f5b7962ee6bf6e3389c58fd47a822cb54b3abb82115d669be457d1c6953b858803ef57dd0dace1a49
+EBUILD mariadb-5.5.31.ebuild 4498 SHA256 f1ae0d5655da218b2287dba16ea8f29cc55aa9f147876bdf81b44bfe95fb81de SHA512 a9bc66721f5c12721df2a2a89cd510f245d789aa82acb43d2b42ab233f653b8009cdafa32ec6fa008c8c8ca2d506f54ca4095303f201d3ab3c013efbb031b3d3 WHIRLPOOL 36ace749293c4e8458313c87c26fe2731e73add73044f5fc4d05626141e32fa305d385b64b3b96d439af4a135fcd37f8fff28f2927cc71556c0d60b7fc4f84f5
+MISC ChangeLog 6493 SHA256 e26c74f69acd0fda0119ff880798590f082f1145940ab05f3ac48489521e1933 SHA512 e71fd25f08224a29b3ea63a3ec5d19d7a171b174d5e7b9cffd291e967ab188519acd2db557baa177e161f9cb3e6cf0c8f22744692bb6fc56427abf4ae0b0a248 WHIRLPOOL e6792651f0113e139d7399220e131749b14cdb1ddd6befe005039feebf9a63ea2bbc64f4cce18d900c1ac16f3d1a507b20479f396a2f22f076bbaf7e3002276d
 MISC metadata.xml 1566 SHA256 5c11cee8a35a2b7a2751a69e79fd3a5e3e17b7860c6f5051114dec0e270ad4d4 SHA512 526061b67c4f9fa4133ad0841f1eafe11734edc42b2f18cc526af2d8432496cfb496202cbb1003bb3610c5fbae179a081c2bd617febd9c9d3e0ca8f4afd18173 WHIRLPOOL c910bf7b3050945b2ba353d0eeda384afd07a5478225a3b39dae2803ad3192ce28584c4a5b8cacfd2af07950fc5dfdc9d81ad69a10dd0595c2165ded064439fd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRy0PDAAoJEC8ZTXQF1qEP3NYP/1L8T5jivoGHd/OroZJQVRTC
+9gvfXkkTAGRJ144P00Z8bhUQ33jid8t6I8Uppbk/fbe69N+ICxElBy9umEk1iHoD
+ZfiqvEzh5gPR50Mn6UofklIk3eyHDHFx16Blp/zpYo1W4aJGc5JEQzOFVlyhCdFo
+RR7LO1E6wn8GEo4qqccgXt966iEYB9kxLMdg8ErqeVLtxwxJD5rbNFI+K4BWaTN5
+Tex0VDuxrjG3cUghfgJN+SsopkLbbo35l4n1vXn8a9SUZIRuN1YB7TcmzKrjfmkq
+i98/aJoRPjgcpNTyLcT5nOox3AQKAEgMpEXACzWYfST0ZwlAEHU9K6g2qBXqreN2
+HoYY3HBBcwiNdS98MwRm18zBE8O8HnEdFDnTgGKPKLsK7ZUXvg3UYN9Bk9zXjGTI
+/fzC6y5EDYFMw4Ie9ELf0T2ESMX7eDevyoCYqXcKvH55CdSSFk/peFQECoA4ZjS3
+xt6fmKfaOTwx6s/+zYLU6GV9/KyLN5rEleLmt5JxG083FRSteLcFQbM7Ga0hj7Ye
+oI4N9/XaZhttbk3ekY6wzZd593zs+xJEQANTeZPZt2EQfQLvm1JtLWDOgrHIF3bI
+TDCvNnwkZgyMVfamcf3Ah67GdNzotn52I0kbetbwkNBhRHYgsayeDBHEY7J4x6ki
+eh7pWDhvq6IBEM1LOUVX
+=xSrj
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-5.5.28a.ebuild b/dev-db/mariadb/mariadb-5.5.28a.ebuild
index bd208ea29bd2..8d315f57ffd9 100644
--- a/dev-db/mariadb/mariadb-5.5.28a.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.28a.ebuild
@@ -1,6 +1,6 @@
 # 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.5.28a.ebuild,v 1.1 2013/01/20 02:19:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.28a.ebuild,v 1.2 2013/06/26 19:42:59 jmbsvicetto Exp $
 
 EAPI="4"
 MY_EXTRAS_VER="20130120-0100Z"
@@ -24,12 +24,6 @@ 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' \
diff --git a/dev-db/mariadb/mariadb-5.5.29.ebuild b/dev-db/mariadb/mariadb-5.5.29.ebuild
index 56e401235110..918ffec23298 100644
--- a/dev-db/mariadb/mariadb-5.5.29.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.29.ebuild
@@ -1,6 +1,6 @@
 # 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.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.2 2013/06/26 19:42:59 jmbsvicetto Exp $
 
 EAPI="4"
 MY_EXTRAS_VER="20130120-0100Z"
@@ -24,12 +24,6 @@ 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' \
diff --git a/dev-db/mariadb/mariadb-5.5.30.ebuild b/dev-db/mariadb/mariadb-5.5.30.ebuild
index 50b02812a189..1f0ddded8188 100644
--- a/dev-db/mariadb/mariadb-5.5.30.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.30.ebuild
@@ -1,6 +1,6 @@
 # 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.5.30.ebuild,v 1.1 2013/03/14 01:02:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.30.ebuild,v 1.2 2013/06/26 19:42:59 jmbsvicetto Exp $
 
 EAPI="4"
 MY_EXTRAS_VER="20130120-0100Z"
@@ -24,12 +24,6 @@ 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' \
diff --git a/dev-db/mariadb/mariadb-5.5.31.ebuild b/dev-db/mariadb/mariadb-5.5.31.ebuild
index febec71cacd9..45e5b8edbb51 100644
--- a/dev-db/mariadb/mariadb-5.5.31.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.31.ebuild
@@ -1,6 +1,6 @@
 # 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.5.31.ebuild,v 1.1 2013/06/02 19:48:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.31.ebuild,v 1.2 2013/06/26 19:42:59 jmbsvicetto Exp $
 
 EAPI="4"
 MY_EXTRAS_VER="20130602-1946Z"