remove -Werror flag wrt #494332

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 49 insertions, 22 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 237a9d53d6f7..b90c42686163 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.664 2013/08/29 14:40:17 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.665 2014/03/19 00:52:45 hasufell Exp $
+
+  19 Mar 2014; Julian Ospald <hasufell@gentoo.org> mysql-5.5.32.ebuild,
+  +files/mysql-5.5.32-Werror.patch:
+  remove -Werror flag wrt #494332
 
   29 Aug 2013; Agostino Sarubbo <ago@gentoo.org> -mysql-5.1.66-r1.ebuild,
   -mysql-5.1.66.ebuild, -mysql-5.1.67-r1.ebuild, -mysql-5.1.67.ebuild,
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 23cdb8727c57..a1989ec50ffc 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX my.cnf 1249 SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec SHA512 f3864d5ff209dce0a0ab0ae5d0c20d4564ff491d21681c052a7a9d75f986b22d9c637f7d606ab1d7f923539a9137abaf547ceab4c2334140b76f952ef45d26dc WHIRLPOOL ec41a690119cff9b0f2b6adab148dee82a77e9a56fbabe7619d3aa1a9996261c9ad8a4c33d40294a12d701ef7db9fe40e81ad167566070a61d759ac134f087f7
 AUX my.cnf-4.0 4324 SHA256 2c9715f29b423207a92e6bc81f1179b152c2d8ff72f69e4af3cda37c114452df SHA512 51c3956b44e54dfc3aa2f1ac0d8aac3fefca1f2a8caa9298c218eff4fd64e33f4a49ea313aafc22d13582af7420edbc35034cec1ee2340f7689cfe49b180a3d5 WHIRLPOOL 839926eb7816ef93ee1bc480b0a2fc354f91db8d3053a8679bc5663fce785a0efa974cb1421c8b6c122d5d5f86f95305eafdeadc80e2c101cced6a6017f08ec7
 AUX my.cnf-4.1 4235 SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7 SHA512 8bb6a8cc05b9aea433f0a0f1184a03b5b99b6a4dd5e162abd173810db8a530de33db80a7ae0018e29879253c752a4b3a4522335a170cb2339a1ead76fd15318b WHIRLPOOL fa5e0f91100e8dd6ed42e095079635dd95ed171d96275340145136c86157805fd1d101b74b49873b6cc05f182ca209d6e981e0d16d4871adf5d24a279469b59b
 AUX my.cnf-5.1 4827 SHA256 8b11f33d086566d0ca21d46bb21b1020be6e24511038f3f12e146089a1d406c7 SHA512 5facc6fe5b6a4bf9e4ac9430d1c2a8195e7a859fb66d84cf4adebf2a9f4e3f422c5fc143beb5d8f327d9191200e654b636a564b6e082cc9cbac39cfb6516a086 WHIRLPOOL 185cb121d3ca0c5c249cfa58377e029a7dd4934de2bd240943cddb9d3c10116a3c3d90959bf8872d5f69627f8b2adf7fd001aa40947713a42bd13df7f733f068
 AUX my.cnf-5.5 5000 SHA256 ea119fee667ed963ad20b807a5102ad776035df4009f3bfc819b26a47bb0a3db SHA512 1265cf6d1fd3dfa9d0607eef0065409e4d6a8187e8e6882a45e69da7fc0a337a336c1fd3ef3bd66a8707f82818def70d30e66f487b57cd75f094acc4f467ef94 WHIRLPOOL 52abef494668f35d29241d5cb89b5f197671d1224465c25b05f59a265dc940b9a4797f13fa499279a649a84f1a7090db180ae7bec889d49914981773aa6f6198
+AUX mysql-5.5.32-Werror.patch 620 SHA256 bb2cf6f5b1546a310a64d94e80e0583354c7223fd223169280f00268dde1410b SHA512 a1fdc9619e6d6d6cb708946ef7951854f6d8e481d4eb9d47495c1a9114cd835bc34f50815fcf93ede8c055b2cd5c28454c610f94263c8745f9e26f69de85c925 WHIRLPOOL aa27642e499d4dcc611c5b9caf591c3fa5b3b9e0558660b4a3adea7e18e0fb6c7bfab8684be18bd17d42b4ec01a1aa747a61f26730370c813f500d870c8d3640
 AUX mysql.init 886 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12 SHA512 4400e6e993fc9bb69efdb06e8dd2eaacd16a361d290031c38347a3dc1f912867bc3f0f62fe2d61e09671801a2355bf896bf22360e209e8044877ca976f4e0611 WHIRLPOOL 43a656123c687571158edc94363e9dfd742e4ef29f92551e7bba56ff9782795b75ae62fab1f659fc3d21bc6debab689c39269c0a5bfd28b6652162d38ae9dd5a
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
@@ -23,24 +24,26 @@ EBUILD mysql-4.0.27-r1.ebuild 1105 SHA256 eed1ba3bb284d74483c521b410cb2f165db846
 EBUILD mysql-4.1.22-r1.ebuild 1343 SHA256 237e821bc7b47d259635f42255e80bc1e6f411341ada6b9014b6443d8ef52f08 SHA512 f66d21e221e9dcc2f7558f360b6d44bbe72c547dec3c1b164e7313e779268c5f11eb51807d6707298dc2547df4dc455174ceb21fe4f6bf6e6f02b377c62940cb WHIRLPOOL 6fdaa7a771dbcf52b2e39470c580f6c887e30a9df01e4f550cdd665b1762095dd37d52ece783c6b25511a57cdb555926399a25cc333a0a53e5ad1f0b162d4afb
 EBUILD mysql-5.0.96.ebuild 7175 SHA256 307fd3e2426b42d05b6793c9f0b90be12387fd5434abcc9b8caca84adcf275a0 SHA512 e7d71bb91dd953ec013d5b10379f97fe649c0a4c678ddead7120660349b8dfb8b7f2ebedb45ca17ec6b522ca5c8ece34cd8e0ec6a66fdb8faf076e5074e1e3cd WHIRLPOOL c9a06e4d0d52af5cbdc2cc56e1003564de4281ada0b951f7c9d2f93b64cecba1a6c48405308ef4b0a646099f0bc3ad3e10ba86a38e7d84519ef223a8927352c1
 EBUILD mysql-5.1.70.ebuild 8874 SHA256 abd74f2cf58e5c8d4544c2dee89c8b30174b038aba91f3b45138cc299d8013b7 SHA512 303ee2ff791852dcab8d72a73e06b7f5e1fe0bd48b6e71730013c601eba412cebacb09cc76d06075f4e63b0eae80947a2bf9eb42da24d412b5c66d69d9aeb4c4 WHIRLPOOL 20d542a938589b3fefc738e64f5d9f9596faa1f1dad0175b144adc096d7354390eb6c4aed873dec9687e08483cba47fac56c786829c2ffbbb22e04ecea2b867a
-EBUILD mysql-5.5.32.ebuild 4239 SHA256 e0826b93e2be1a374f15cac4b1c5737cd24907668002d0ca5f360de7fc4e3886 SHA512 979138f5c22c2f5461eff1bf3ea0f3e2064a64b5dbd1f00f30a3c0f59d4a5e1e9bd891cf61a34755eba0583a67d4d58e21c32f987ba7079deb349738d303acd8 WHIRLPOOL cc6fac50d195ac5f95e2b899a6f1c83ad08ee95357d5fba6b21099a0db1bf37fc1d8f57032705df770f8e1c78c1e9cbd6d9c70b8b352e61707484e2e2451a677
-MISC ChangeLog 16146 SHA256 8a1cc75f3594b147207eaa1dbe821bbe2283f6e2e8f9632be320d6e9abec4bac SHA512 e35e1103023532a68edd3b5b96f54b5b59c4f7a1b0220de78d53a8722698226fc63b2d9885b12e15cdee35355cacb908f1b047026e2de6224a96b254896d46c8 WHIRLPOOL 00e88735b5dab23907632bf38437e4d88f64969e1b3f15c1569f355b124d368832a77e71dfd2c5b90bea9a906ef81acb4a04b02b5c68d16873ec15e6c9949a1c
+EBUILD mysql-5.5.32.ebuild 4336 SHA256 e0b85387c000151ce4e450c36f70b4e813b607c21d7e3226c038963e0d84a12e SHA512 cbe0a2165054f47c0179cdde1cec176be75d4dc13edce00ec9f8eddbb5ae4dfd8bc55a572cb083cf5c52d9bac4b732c6a0c4a635176d63022f68118acfe7980c WHIRLPOOL 351e194f73bd597d5055735ee9d119343503a42281bec830cc492ae919b101f1cd13db6d7eb061d58ef9a78a7290372fdbc51832c058454c4a8d1eb81248562f
+MISC ChangeLog 16294 SHA256 2eadfed069947e9403c2ccbbb704d212331c789ebad35e9b0e5445eb46cd6fb4 SHA512 b2983b090bf35662313a83238c216dbbd322b0ca7dea174a355f1e3763a552396e9fa868659db7d79b6aa8b998d23d5499e17a931c755f63e7c63b8c00bf45d2 WHIRLPOOL 222f1af66c5520b9d8ecf95446c9dd50caecba6ff47271ff1bb67459635c8ad633df1402bc8883161c1ed6a5c86044e1eab2b026d689a984d51df980c6b61857
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC metadata.xml 1512 SHA256 2aa7aa3c625242463dcc8fbd52f0c33558507f375dd64c80412372e5d8456b70 SHA512 b9a09711b821ce7a962dcb23a4e249bfa83fd5605a45bc9416e4721a643e8fc740df4e22a7aba8d7245612361f6f3d779647f32c9469662fc2a2598030a2499e WHIRLPOOL 9d553da0a5501afbb99566ba46664f50e871e90a6ae839626f2aea9b7f28e9eadd1b8360483bed9a397082f59518009d1f70fef128399370c4bb1d6e85c2b5dd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSH11UAAoJELp701BxlEWfFwYP/AvBUUzxkTlp7hP/X/w04cm3
-dUt9T7G23fcaYlAzn7fGoGh1ulFtQ1jyz7BZx+1GMi7R6YrzZzic9BnsEED+u7xO
-YO/0OZDNf9GuyPl8rEpnRrlldVODz3hKSMC6OYj9ORPN8fL44GRpTOLAS3g/gjud
-TGWUDVHwHyqS/gk6O3k/f8D0zzt0r64+Ow9TGRoIKf96bMCKE2d8mYjBX2PZRF8q
-SAxahL0ULM3Y+s3+7M0gOyyth9qECi6y/mZqEfO3hcN2YqBaTJUunulpCwY6E4iP
-isKxKIY50iyzEokrOu0cOtJ5+dTQHUx8YQFZkVK6W6TaA/vkK+rz46UoPDsty6oY
-CzJ7WDx2g6LEB0iUyyqyyqgXtFfu43pA6mBNy+wOJn5XmoEETMINxNFy7+behLMp
-cFyBZEqc0pE3Gwtkb0Mn6D+GZAMQ65axG6mWBR1nNIu3UQowP/ZTW5v6B6xgTDTp
-BvPuNag/NJYUv/yshdOg1QN+TbZ/jFWo2aVJSntWLO0IQg5cfIn3JQa506KmK7Ui
-JShKlgMqm9SDBhhpQMeezAhBR/ZH2AEuGZ/X6kF8ehcJju8WoTQJ5j70h/hRmiz5
-7MyKO/blddRg7mEeHY5oCJCyBCZtGSaq4cFY75q5EShLBK8OukYEa5YM8+NYFhwN
-kxzTEuwbr50YalrUEFFe
-=58GX
+iQJ8BAEBCABmBQJTKOpgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg0I4P/1WYDO4toc8Oko2Ms12OR5qW
+AhnwDoIKUifh+DFrfHWAoabG8q5K03vWiBso0EohLZ9kzG3bZifqLK6mYtWforPG
+ftUS6YDxzuh1aVQTC5/+rVmcZd3Ac6LUud2Vt0UuH1KeauC3UE+DIyFTcIi12AW/
+NjbQOA9gcp7UxX8QbmydEGNIxB6231zpWDP2G+GvN3AvBN2LpROEtIu1u5RIJgyu
+Wz3P+grK0x48YmrP/ri65KTPUiqqv4KmghQCEYcKoTPYH8A+plpTGv2LuiKi/awF
+J7izdqA9aBcPpDiego6zZGYcbCzkDYb8qbFd7VXaco0vJRHQJ78vidua/z34fP6g
+cdUM+bYQjMwSs2Z+PsXAf73/dB5T/hY63BWPgWosVcrHi3M2XP/N98SEH8PAkpzf
+NcDQS55m8lVM7WJCp/6A0nRIpcCbnRQcVXqi5J2lxwz4LnMeeoerhpnHUHzbUSkh
+xQrblpRi+xWqMttQPLH+p2/MrExoWT+iqm8GRsCXVjXjRlGwRt6MtKk9/F8kXGpQ
+RNF+qm7WrPoGEorH66BWrOArNdkIKlqJJjZDGGghGjL+0p/zdTsBURWQO+k3mrbD
+Q7Z83T59ExzA2rpwo4U0OnHoHP9dF2JHEkouYycaBdR2ih6EE7tgqouVlg6wKeLX
+cjmS1nz5dwkZhEOWW4XE
+=M05N
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/files/mysql-5.5.32-Werror.patch b/dev-db/mysql/files/mysql-5.5.32-Werror.patch
new file mode 100644
index 000000000000..157eabf8793e
--- /dev/null
+++ b/dev-db/mysql/files/mysql-5.5.32-Werror.patch
@@ -0,0 +1,15 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed Jan  8 16:07:03 UTC 2014
+Subject: rm -Werror
+
+--- mysql-5.5.32/cmake/maintainer.cmake
++++ mysql-5.5.32/cmake/maintainer.cmake
+@@ -18,7 +18,7 @@
+ # Setup GCC (GNU C compiler) warning options.
+ MACRO(SET_MYSQL_MAINTAINER_GNU_C_OPTIONS)
+   SET(MY_MAINTAINER_WARNINGS
+-      "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror")
++      "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing")
+   CHECK_C_COMPILER_FLAG("-Wdeclaration-after-statement"
+                         HAVE_DECLARATION_AFTER_STATEMENT)
+   IF(HAVE_DECLARATION_AFTER_STATEMENT)
diff --git a/dev-db/mysql/mysql-5.5.32.ebuild b/dev-db/mysql/mysql-5.5.32.ebuild
index c8ba059ef83c..5ee92428681d 100644
--- a/dev-db/mysql/mysql-5.5.32.ebuild
+++ b/dev-db/mysql/mysql-5.5.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.32.ebuild,v 1.1 2013/06/06 17:06:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.32.ebuild,v 1.2 2014/03/19 00:52:45 hasufell Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ MY_PV="${MY_PV//_/-}"
 # Build type
 BUILD="cmake"
 
-inherit toolchain-funcs mysql-v2
+inherit eutils toolchain-funcs mysql-v2
 # only to make repoman happy. it is really set in the eclass
 IUSE="$IUSE"
 
@@ -31,6 +31,11 @@ RDEPEND="${RDEPEND}"
 # 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() {
+	epatch "${FILESDIR}"/${PN}-5.5.32-Werror.patch
+	mysql-v2_src_prepare
+}
+
 # Official test instructions:
 # USE='berkdb -cluster embedded extraengine perl ssl community' \
 # FEATURES='test userpriv -usersandbox' \