Fix mysql as-needed wrt bug#423437.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 53 insertions, 15 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e263861bdb00..ed9d9a4d466b 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -8,6 +8,7 @@ AUX libreoffice-3.5-propagate-gb_FULLDEPS.patch 922 SHA256 73cbbec0744fc8cce99f5
 AUX libreoffice-3.5.4-libexttextcat.patch 910 SHA256 5e2acf868f511d8937d6551b6fe52e73e808082cc5bf327815a95c8fe4c9a6d2 SHA512 eb3ac4eff756812d3b2a149f30a98501abc625b2177bfed73bb35ab37bfbf09fd3c214aa58fa29b0a4bdc38788dfdb625aa48ba9dc5d05b971bfe4f06a1bc129 WHIRLPOOL 7f1a771765296cce6c38eaec6c2abf50913355cf1d2909fbd51636045c8ac38bdd05dd2cf54edfffeab5c904c2de1de5be57b1347961c55fee937c90afd0758f
 AUX libreoffice-3.6-system-pyuno.patch 1628 SHA256 25f319caed7205e06d4b9e17a45ab268a2ac67846c4e02442a15acc540266a5b SHA512 e7eb2c26932dd3fdff22c0c72a28542a42c26fc04a0fcc2a813e7b4d7fe642f211a395d41042cfc735670127a81104fcc2a4b845a59235a4d7924db2659916b0 WHIRLPOOL 09863ef7c67e8ed5d3edfd758fcdebd3ad785d3f82de47b9f1cc60d41cc18a56973515088abe9a4584311b551073b0db8bdd7e74fb72a81576a5a0d71c900998
 AUX libreoffice-3.6.0-kde-fpicker.patch 1586 SHA256 03d091f549e5a7d7ba72f523c7d0e8d3e753e3e1b02494ec4dd6b276cc2566c8 SHA512 8a319daf33cb3ffe76012891bade9038cea2acce49a8927a487d54178b5b52989046db52bf3da9341f73ce88dceb7e0d724c4e99b61a560a9cd110434e26ef02 WHIRLPOOL 3e4585b0a6c253c6e82a9a4a946ac205cb15354a9a2c1ef337b20c46ee090bbbd5ac1144e93e41d61fe03d0cc263e1da212f05afb41b0f0d7f940360088e1dbd
+AUX libreoffice-3.6.0-mysql-as-needed.patch 1395 SHA256 c5d26597d9de043f7b8b64abb5ea4a8c2c4dac4c3622f9387e3f43365ad90464 SHA512 09f5ee6e20adc3700ab9fc929b75e021d4394aa95302c6f3cfa8dbcd9946ad41f1e5668877628304a0f430dab8c7867347925d7373700827246fc24acc6119e9 WHIRLPOOL 0f7a6dbdec2b539bdfe940e45d0366190238bf2ff49ff2f335ae1a1c15692e3dcb536d411a7e4f5b0a5e2b608ad98746569971b97651349dd19ec9ca64ac189e
 AUX libreoffice-system-pyuno.patch 1634 SHA256 8a45fe2d6eb9b9a529c9f237b7219b221296d270caa7d42d4ea1a47c5e30841f SHA512 30d6ea3e648ce21e2e9cabf8b1ffc05e7a97ac691fadc56d02f9fa32df914628735fce2101abc1e30b5a31967f3ce124a85ecb481041b9f61713acd9d9489220 WHIRLPOOL c2f10535ed97b9eb5fa9f271ff4c9ad8b552595f58234899d2b5091daacc4444532bdee1d2ec2bd24f0ce601f0e5b5ce408fcbe169e21184f263c7bac86bfa69
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
@@ -27,7 +28,7 @@ DIST libreoffice-help-3.5.5.3.tar.xz 1856804 SHA256 62631206eb03de10d24295e21260
 DIST libreoffice-help-3.6.0.4.tar.xz 1863972 SHA256 30b79e3b4cb5b2167d1f3c17b8781e8940665f861197ee9021a6ac8c64d508f8 SHA512 f6fe9296c605999634b484de4a62e7665dae8353d8c5dc20595036b1cc87d51750f6b2eedcae70c4739993337a8ec22de6cf3046d0a15f8669464247e6da1745 WHIRLPOOL 8237777a6bcaf15d875f8cdc909f401906902a5670f2e2097376a90ceb74bd116d42a258faafba563317b7b1e9469b6fdaf1ffa71d95c9d3447d25cfdaf3f6b5
 EBUILD libreoffice-3.5.5.3.ebuild 15651 SHA256 2d917faf6e64025100fc3913d5709d995ecd608b65c977d029e789dfe0ac9d12 SHA512 c45a9848e807334c62b0e3ee537bbf96b4c5fae01756364c02e67b5c4cfc8ab53b5613408f7aa82e1e534ae54d56d375538210bd1cfea20e3375196f424f3364 WHIRLPOOL 63957862d965632f8f60a5fe2a4b1f5d86202f652e4bf5156f0ae62e333656c5c7f5b59dc74de1de4fbaa8805549afbf3e667f00e8c7fd31b3bd1db78472aaa7
 EBUILD libreoffice-3.5.9999.ebuild 15656 SHA256 e53d4935d180d5f3910904e1b90e091f392f268bae3a137fde30f0d1ec7ad996 SHA512 bb81fce7015a3bbb10684bde943bfa29b2f40dec6bffd91f844d770eafab0fba48015e29aaa29d55bcd74c4e67fa3d7c21c6628d8418d878197457894824b78d WHIRLPOOL a6813f67b4bd317f246dcec9347e0cc43d695751f0fd6c8055d0973469e0e31f50445fec4c77861dd4866b5cad0a85796c8120016700ef9780875d36254194ac
-EBUILD libreoffice-3.6.0.4.ebuild 17115 SHA256 8b40a5695e7474fc62da59d88900936d7a1e5b9a994da0fad88c65ef57ef354c SHA512 a1bc370c5489f4993350b1129a1f2b874881da04da2766a8e777f5250400f440a9d9605fffc3f138f372b0713637e174dfcc8d5b9adaf5fb805c78ae2cc79494 WHIRLPOOL 114890b8efb259bb8db1c908ed5ac3a52b5ea441e8c7ad7d39d2697e0ebff9df173a0f126e25048727a5f27130a8e5aeafa0ae2a9cde774235dd0798c882d103
+EBUILD libreoffice-3.6.0.4.ebuild 17170 SHA256 b95cb9ed051d10b05838f7f50a73c9769b52af5b3bf04e225e5eb6994af1d717 SHA512 40e872c0b7de3959181df36c39ce02acd89873418c5e1c6aa8bed5fc5586428fb11f61e5ee66ae2d2a6eeb24317eaf2070e9381119028746533dc29b7caf7b28 WHIRLPOOL a9418402a37f9f1dfc9899fb9b0f36fe5dc7b34b9960f0f134f5c4a5435aeba55fafae8a26365eae4680ae6d7b30c1a6e09fb7488725a6fbde2243e9335b715a
 EBUILD libreoffice-3.6.9999.ebuild 17076 SHA256 97f855a8df13dcb990326bf00a07bb9e34ce8f2fa57e921a76cd242a9b6ce89d SHA512 0a9834a6c7f2d51614091278f1770e8e7581083b615373bd02568c2b350db12e9c3f65670dba07e65bb1cbed822b646c1ca33fbab834edcad4309965b6be5053 WHIRLPOOL 3ce2a8c777091b6f70fb6ab2b87b04c898002631c5d19a011a19e4060f33b76380ed6034c112dc512f035dd87d4f743bfc1dd4fd165fd240e476f6ef5c9d2ab2
 EBUILD libreoffice-9999-r2.ebuild 17139 SHA256 336f8e45fef7c9a3a69ca0661501f74f3d9b7b2b5943edaa255fd2b014b58969 SHA512 e4d77ab7e98283c820d082c2ff24dec8748e8722ebc6f8ea96c6346b500be58eda280e8fcd0def189f0e382ce4551c0fffc1935a36b397e41f323fe6b2362d65 WHIRLPOOL ecd48e0322944653a99daa903934a89647d4c5565d49ee62d8e44c849ebac8cdccca68ef55822650d855e44efe1420a81b34ee58e9d8a59e2a668df6f165a072
 MISC ChangeLog 64571 SHA256 e37a5f216879c4fac5d7baa5d5e45efe51fbce9d128d16ce98cf01a9974f9b43 SHA512 99ff3359bdef5cf85f5f25266692f874c3380ccca0b1358c6a35b1a7ee8161459aee7c0159635d941aa01d97702dbf5d262b25ba9f86af981f8a09a042b06895 WHIRLPOOL fc37d9d6e0b6a7fe47df523ec905bd9bf9866ecdde19fa016a7bcb9ccb720a7de83b9ab5cca49f53f5031d98f90a174b09fbfbb7d0d68b15c6f48a6248b28cb9
@@ -35,17 +36,17 @@ MISC metadata.xml 1534 SHA256 2f095ea98ee3715366a47bfb72683434384d06526cb66a3db8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQIpZZAAoJENwGBM22xffe9U0P/2knCT+xwQRIADrfJ53UC0o9
-rOxSrcAYz3Hod35dywCQCU8JKAFKnfZ0YOMEkjlpD7tAJsyi4vJRxEMMWym3yT/H
-fAptur77zXLBO+eOZjQodwDT1k0PUooEGpi6PIgW8ePHTz1QKp1Txbi0jxTaK+Gt
-cGL8aWanmh3DmPHZpsCcfha4vveTrfJ2VH6V8RMHF+ygh/dEp+N9ARS7vTCiybAO
-KSwuqCMlJ2eklGJpznS0oNy6vTkMgbFpkUfB28hPlse1ZPuPn0dDRE2RoHTuxysd
-jrqTFjRaYScsaVt+zS/aTspaLQuXXMnzUI1XZcMsgEzyK0JFDvQ8u+1DBvID6O+7
-X+IyAeT4ScqpYzoWyTPEcVrUrVAmj/+nVVqfq44NhYhMlCicFtK2whiwG8+AgKF5
-sKnriRRUiyMVNuLhdBPFN+VX2n/PymzkH5FG6dGnmidfBfYhi+oJ8sSiD1g6nq6G
-HaAD4t0jhG/xKennO2FqK5nJbxa88xRcq0uiq36s3Ih+k68OkwoxJvljUj3cxPBn
-l25sQbC7AUj48nk+uFMIh518oGsaEE9exJRixgHXMhIbqY4/DO869mlYq2kfG1Tp
-pTLTZYcStLqlIEtRVIQqsAdf7EuJX71bhLnaJtzJ1sMLYn+iWhNKSAtRmef+4r/Y
-J8MvivSzyFBSbaTnFNWS
-=n85n
+iQIcBAEBCAAGBQJQI3OGAAoJEOSiRoyO7jvoXpwP/0yoexvotORhlNENk93tjuIK
+1CxDPlD+Qex5Tqyi8lGoZyiFJBhcyoG8C3ESBo11waaExcotSihtYlQBjiah7KcP
+RNQR91kIRxmeir+hmFOqXEjzkvrtA3CEvN2q4v5pKj/cDzCeboAL6rDw4dVa/e/Y
+kDtyyQLqAVWanCIZopJWaykVdKAqgi6MSfvI1rbld1HqJhvJH3e+bntRrkYtQiYc
+x8LmEsePF9fSfnC6TBZUDdapbZuVQLdNqgtpM/aaR0HrR1q8Wu+lRzMlTOzvJ/uS
+k7CDioZ5EMB+Fcmjvq1fmbBctF2SA6gxeSSoVDu68E8L7Q0BtRgbBHDyiJLb+z+S
+cQLz85QA4PZALUiKKThaZhnLUx95h4CYX6qFw5caX7sSsFwRD+Cmvlrg/rdpPe+K
+wCOZAAj0FB6JeDVa4EVTJaMQM7+3+6bX8fPnOF6DZdh5S3+ucbvkeqkJbEEUBdhn
+vfC2eraMMtjKVzEQe6kmUDKDVbU3DbSGM6fxwsMUq+wzW/F1ktoX3VWypymfLwnW
+9kedyt3DW9cUTofYYGuJ4yPy27JQiGHdNqFCvKZQT2HNEmjsl2zAuEaFhR1RcBuy
+YpNDHUUZUlOkN2mQmggttPj0U7UodkjeTs3TkuBhvAk/j9QQCQxRrsIvDcD9LDWG
+xq4bD+k0e1Inrhusrq0B
+=gjaX
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-3.6.0-mysql-as-needed.patch b/app-office/libreoffice/files/libreoffice-3.6.0-mysql-as-needed.patch
new file mode 100644
index 000000000000..f53ec26c45c0
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.6.0-mysql-as-needed.patch
@@ -0,0 +1,36 @@
+From 130a064c29f218699c0b64b50367b3ddd3a3d2db Mon Sep 17 00:00:00 2001
+From: Tomas Chvatal <tchvatal@suse.cz>
+Date: Wed, 08 Aug 2012 19:10:17 +0000
+Subject: Use LIBS not LDFLAGS to not fail with enforced as-needed.
+
+Change-Id: Ia27e97c12e9a8f36e106c9ae3c399cd776433387
+(cherry picked from commit 0c7617a388d8e2e3a0d6c451b6412a5d32dd3d6e)
+
+Signed-off-by: Michael Stahl <mstahl@redhat.com>
+---
+diff --git a/configure.in b/configure.in
+index 2dd9390..444cf82 100644
+--- a/configure.in
++++ b/configure.in
+@@ -6833,8 +6833,8 @@ if test "$ENABLE_MYSQLC" = "YES"; then
+                     [AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ Connectivity)], [])
+         AC_CHECK_LIB([mysqlcppconn], [main], [:],
+                     [AC_MSG_ERROR(MySQL C++ Connectivity lib not found or functional)], [])
+-        save_LDFLAGS=$LDFLAGS
+-        LDFLAGS="$LDFLAGS -lmysqlcppconn"
++        save_LIBS=$LIBS
++        LIBS="$LIBS -lmysqlcppconn"
+         AC_MSG_CHECKING([version])
+         AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <mysql_driver.h>
+@@ -6852,7 +6852,7 @@ int main(int argc, char **argv) {
+       ]])],[AC_MSG_RESULT(OK)],[AC_MSG_ERROR([not suitable, we need >= 1.0.6])],[])
+ 
+         AC_LANG_POP([C++])
+-        LDFLAGS=$save_LDFLAGS
++        LIBS=$save_LIBS
+     else
+         AC_MSG_RESULT([internal])
+         AC_MSG_CHECKING([for mysqlcppconn module])
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/app-office/libreoffice/libreoffice-3.6.0.4.ebuild b/app-office/libreoffice/libreoffice-3.6.0.4.ebuild
index 75b5d57675ec..3d58af030f3d 100644
--- a/app-office/libreoffice/libreoffice-3.6.0.4.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.0.4.ebuild,v 1.2 2012/08/08 16:37:34 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.0.4.ebuild,v 1.3 2012/08/09 08:22:14 scarabeus Exp $
 
 EAPI=4
 
@@ -212,6 +212,7 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/libreoffice-3.6.0-kde-fpicker.patch"
+	"${FILESDIR}/libreoffice-3.6.0-mysql-as-needed.patch"
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-3.6-system-pyuno.patch"
 )