Fixed bug #420095 when mariadb is selected, thanks Dennis Schridde for his patch

Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

6 files changed, 41 insertions, 14 deletions

diff --git a/sci-mathematics/glpk/ChangeLog b/sci-mathematics/glpk/ChangeLog
index 136840695547..a0324cdc35ee 100644
--- a/sci-mathematics/glpk/ChangeLog
+++ b/sci-mathematics/glpk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/glpk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.66 2014/01/16 17:31:01 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.67 2014/02/05 21:54:33 bicatali Exp $
+
+  05 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/glpk-4.52.1-mariadb-5.5.patch, glpk-4.45.ebuild, glpk-4.48.ebuild,
+  glpk-4.52.1-r1.ebuild:
+  Fixed bug #420095 when mariadb is selected, thanks Dennis Schridde for his
+  patch
 
 *glpk-4.52.1-r1 (16 Jan 2014)
 
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 5f2f89062c6c..0168bd83359d 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -3,18 +3,19 @@ Hash: SHA256
 
 AUX glpk-4.52.1-debundle-amd.patch 1229 SHA256 c959878140d824f243ea51aded32a9c1359533e30f73f31249d4e9d5f7ef7787 SHA512 9f67326d7f7efbb02dbf3e99df1d385c793da04659257f4d609e3a67e0954183cf5fcc12d8917ec7f02118e8e488c59502106cd59e0f08eccb1c779d3c489dac WHIRLPOOL 1055b4b66923a3852e903c6a4abfc360d1064d97c2ea57ee79e2e01998c806dae486cc87c77ad73cc7f896272532ddddf8d196fa02c1615123a737d09136fdf7
 AUX glpk-4.52.1-debundle-zlib.patch 1019 SHA256 bf945bc89282480c562eb4e90f235d9c91a152513382e305eb21347b35da78e7 SHA512 06a4e8416549c5786b48b85fc6d23c3cc24cb60cdac3d0ec037476a922f182cb658471b0d8f3f5c0e4a39b763efff1c06d6fa7b3549cfcde9bc35a06e646e9e3 WHIRLPOOL 86e6b5bb24dd93c4d7e7e7dc455c70da334a579d94a516bfb461aac962c086ffa2b6a8b2ca264545feca6962131f758cb3c4a606c178c46743a243bc09dd8d55
-DIST glpk-4.45.tar.gz 3132439 SHA256 9207cb613d4436d9a66bc1b1f2018176d106cef0e92a3a85500feeec373be98c
+AUX glpk-4.52.1-mariadb-5.5.patch 275 SHA256 9125267c1434e881a48f159db52009663b72155c648e77a5c153d3bdc1b06576 SHA512 32669b38d5ec7b1ae4d97e07cb9fa054952321e516a8a4cd9d64bc1237081bf14be031513cc2db96c142cdb01b2fe602f843eb51864ce71e106a4cff662903d0 WHIRLPOOL f77f9e0a18f1be010bab620ebbd4d7fc9ca6fd2312e03a993435dce829bd4297cc69fc1b03d9afae4a7ec6b3cc108dd4cb584fa8fea21dcacdc9a9552e7cfe4b
+DIST glpk-4.45.tar.gz 3132439 SHA256 9207cb613d4436d9a66bc1b1f2018176d106cef0e92a3a85500feeec373be98c SHA512 27089b760d89ee16c5a3332d319007af4b05e8d27df0b990311508f856a01461d8b7b40b111bbf1f3dd4d754af84000112f95349d5286e6d3e42e56226f98649 WHIRLPOOL 7c050210e29f4c13b39e85dc10c9aeed846d7ee912c7dac5a83d13b87648a4e4bf4dce365d2575b6ad7994c56570d74ec87c219f101aaccbec39fd0e14353182
 DIST glpk-4.48.tar.gz 3488482 SHA256 abc2c8f895b20a91cdfcfc04367a0bc8677daf8b4ec3f3e86c5b71c79ac6adb1 SHA512 16795e6cf4db302f25e06e5c9a660e5ed8c7b24ffc5126cde0f864e83fa77d4d61838eab4f716291d568963dddf7442a36a39425a62bd58bd00ca73dac4ffa70 WHIRLPOOL c3e826d08cc6033e8553d7d1fb2a556d42622f38a184e8bbc18bf29d872103245218482b749bfb214cf707cc60eaaf54d7e6840537b483cf8e63c2d33b2c313d
 DIST glpk-4.52.1.tar.gz 2812957 SHA256 3231685b9ff92d30ccbb5c21ba7815b25ba59c7d1e5194e57a880dd1ebb3e95b SHA512 5b79ef7d2d4c50a634aec212270a08cbcbded72cb5a36e645d172e51a3549ac361159f93c2abc4db948241ad1f9205480c09c45718ff7bf0fc54471f77c08dff WHIRLPOOL dce4ceae01b0864fb853a12694ddb9e51a20f9a6a619cdf64b631879125f5aa02b67a1284ff1ecd644df326f6039e54f473dc3dc90bb2a9265d73d62b85349d8
-EBUILD glpk-4.45.ebuild 1487 SHA256 4c8f5455f13797561b6be684cb90de7b95d1cff135cbc76688de42f0dfdd85fc SHA512 cce3a837f65c111649d221d0f8ea4f4f7f182ffdc85492ea5e42c9a5c88cd841755532d7a8ddb6ddac85a0e78e5b425435a1bdd6f1dc467be03aeaffe4a8a89f WHIRLPOOL 34471268a022e19784f216718cf47e68dd2fc8d9980a740ab7da0fc5304f91d38e4c798075557667646236359a2b779c617c35c46c350799f36967624b6d0f79
-EBUILD glpk-4.48.ebuild 1298 SHA256 d5ce436ff6f66a88eee751a59885f2a5e5c94365b2ce6babe91c82d750a1b503 SHA512 25f29c9ae79e1cfb9238921eb4cd11bf1d69300d8878435fd2c80197aeeef378212bb5897d1147cb345f5dbd1aedcf119ecc3e9b90e896df9160e23a0e14eb42 WHIRLPOOL fc31e6169bd1a9b8f4c29cca8cb7294df8991a1e14a4b34c23e5907fc2e70e5cebcf659c7d723287dbc3f912d4d5d88454c9c2f1d8427968cfaeec03c2d18ce5
-EBUILD glpk-4.52.1-r1.ebuild 1488 SHA256 da90c065b1255a5a81131082c018f10de21495cb7dce82a6c5449b81f4893de3 SHA512 0b14859864e64935c0c5b1dbe80d267c1398fe80bfc395f90bc7bf0fbfcf3b2496e4314e7e4c4ab0f565358a5b4352e0e8b0da42532dacb86e888b8da03206d8 WHIRLPOOL a9891b7d2a0f040c6597d7d457d3e9e435d6c44cfd31925d8ec5ee81a5af4718363ec1c4d79e3a5d817cc453f240277f90b2d1afa0d56daba6b808c3894b6326
-MISC ChangeLog 9404 SHA256 a9d07eba7c7346ea3dc799f2a35dbd162488d69f9a9c54cd45fe50d2f911ad22 SHA512 7cd40c454285762542de88d480e13a023f447ed9ac18c4a95d36b38d12aa57341a952809fb571eadb41b94a2ac10216fefaaeb9da3210ed7b1414ee54b0ff517 WHIRLPOOL 41bbd0ffe90fb2bd089cf697d6cd0e1802ee41c3765aee1daa569efbd7690e8a7a3d1b8b52e6736f027c1b3567e9f64d75b007d2274492743911a7d63cabccc9
+EBUILD glpk-4.45.ebuild 1562 SHA256 f5fc8e5aadca838bba0456123d322c3d98a38bfd822edb7a3b26994cedd8c13f SHA512 a1c9c8a388eac767748878f74cec7d82e7d18c0d6a78905b6101afad68f229792606b3ec99893f9f503cad0e34afec2715bcc290214df2d1cfa9b2ee833080d6 WHIRLPOOL b3cd55afcd07ebb4e839a72c7512b27687ba744ff8af1e49dc220e728a8234eeef6fbb894a4612497a288c33356a7ad40d1551a27cbce452ab09787076737d8a
+EBUILD glpk-4.48.ebuild 1357 SHA256 b9b9cdb82831c47e4a3cba28bde55361debfe519358fbe59798d97892fc6f1c7 SHA512 8d46c78cc56a213bd6089a697fb3ccd0bc48477ecaf4923462d2b6cc11a1ce1b3ecd03b0c880c488f88362d200af814557d77adde9108fa6f8d6f77f07304147 WHIRLPOOL b74f385e7c27b3e0c56022c1d1e517755a0baa9c811ab447c1d421e9ba61b477c6fadffab8aa202580e6641a9938cac6069040c5052daabacf0493d7fe0238fa
+EBUILD glpk-4.52.1-r1.ebuild 1534 SHA256 233d98b1f230b449768d47f01feb0ec54b2413d7ad696b1c4c95ac7f2e773b97 SHA512 7e45803a001f721f031e7b7c760bcd4b35ca32a6a911baa4a3e1f661bd73c1bd17f8bdd3814832cfaf988650676787b19c794a0b9c36cdda023c8f88b69d00c2 WHIRLPOOL e292c8da36889bb677e13dd8a497e5f124df80a544f8de9152543dc6ecfe5c99dbf6cf299c9887768aac71a81eaf80be7365d738d9745dd4caf92a2a1ad148f8
+MISC ChangeLog 9646 SHA256 019288c6f2a01ec7511c3b681fabc22f2fc78d89d8769c1e441772ba3500053c SHA512 9e8ef9276370a994a050f8a634c767512489b5f94b53de98921906b05c95aa4929697aaeeaa18f8f45ae7f82172a807d4e0071ebbdf68668dd8bf4064f32d080 WHIRLPOOL a44e1f51eddfa94c752db3d981b6eb3ae9750f54375cb37d1d2790683bd74add136a712e48706bc6524e075bbf238908a7bbf6a44a1ff3eee96d903e2ae518c4
 MISC metadata.xml 539 SHA256 9852c32e609e676d105ea516f5295fda6be6a8f19fcb7e10e3dac775432a14dd SHA512 c9774b7447177264f04b2f16b68fad7b26c0e23d9d88a7b4f7eae646de1666c5ebc47ab98911c7e6e2fd6997e9ae46ee6fd2aee4d081200f5c6c643b85febb46 WHIRLPOOL 15b10e19d077f9eeaf7e5c65bbaa15d6f8852b27b4bb00c3e9d8969ae8e8e7409b99179ced297614dc305e2558c59a000ae007c28b9b3b02dc20c74bd4868753
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLYF1kACgkQ1ycZbhPLE2Bo2wCeIJcH+CkvJepT1MpwrSMctyRa
-HD0AnRD4NZB0+ipQme1IsKdKfbNrSbRt
-=ZM4Q
+iEYEAREIAAYFAlLysx4ACgkQ1ycZbhPLE2D1IQCbBAmP4RzHjLEuSSe85fUI3kgc
+dRQAnRSYlNmw9Vzo4yMm60sy9DiUBAkb
+=O7WJ
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/glpk/files/glpk-4.52.1-mariadb-5.5.patch b/sci-mathematics/glpk/files/glpk-4.52.1-mariadb-5.5.patch
new file mode 100644
index 000000000000..06aa8e5de95c
--- /dev/null
+++ b/sci-mathematics/glpk/files/glpk-4.52.1-mariadb-5.5.patch
@@ -0,0 +1,11 @@
+--- glpk-4.52.1/src/glpsql.c.orig	2014-02-05 22:14:21.487843989 +0100
++++ glpk-4.52.1/src/glpsql.c	2014-02-05 22:14:32.764510562 +0100
+@@ -1106,8 +1106,6 @@
+ #define byte_defined 1
+ #endif
+ 
+-#include <my_global.h>
+-#include <my_sys.h>
+ #include <mysql.h>
+ 
+ struct db_mysql
diff --git a/sci-mathematics/glpk/glpk-4.45.ebuild b/sci-mathematics/glpk/glpk-4.45.ebuild
index 85aa625a09e3..f6fc50a12975 100644
--- a/sci-mathematics/glpk/glpk-4.45.ebuild
+++ b/sci-mathematics/glpk/glpk-4.45.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.45.ebuild,v 1.10 2012/05/04 07:46:50 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.45.ebuild,v 1.11 2014/02/05 21:54:33 bicatali Exp $
 
 EAPI=2
 inherit flag-o-matic
@@ -22,6 +22,10 @@ RDEPEND="sys-libs/zlib
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+src_prepare() {
+	epatch 	"${FILESDIR}"/${PN}-4.52.1-mariadb-5.5.patch
+}
+
 src_configure() {
 	local myconf="--disable-dl"
 	if use mysql || use odbc; then
diff --git a/sci-mathematics/glpk/glpk-4.48.ebuild b/sci-mathematics/glpk/glpk-4.48.ebuild
index 170251f0313e..9c54f2f101a4 100644
--- a/sci-mathematics/glpk/glpk-4.48.ebuild
+++ b/sci-mathematics/glpk/glpk-4.48.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/sci-mathematics/glpk/glpk-4.48.ebuild,v 1.2 2013/07/18 12:34:51 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.48.ebuild,v 1.3 2014/02/05 21:54:33 bicatali Exp $
 
 EAPI=5
 
@@ -22,6 +22,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.52.1-mariadb-5.5.patch
+)
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable mysql)
diff --git a/sci-mathematics/glpk/glpk-4.52.1-r1.ebuild b/sci-mathematics/glpk/glpk-4.52.1-r1.ebuild
index 8a8720bf81d9..cfd9490b97b0 100644
--- a/sci-mathematics/glpk/glpk-4.52.1-r1.ebuild
+++ b/sci-mathematics/glpk/glpk-4.52.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.52.1-r1.ebuild,v 1.1 2014/01/16 17:31:01 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.52.1-r1.ebuild,v 1.2 2014/02/05 21:54:33 bicatali Exp $
 
 EAPI=5
 
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.52.1-debundle-amd.patch
 	"${FILESDIR}"/${PN}-4.52.1-debundle-zlib.patch
+	"${FILESDIR}"/${PN}-4.52.1-mariadb-5.5.patch
 )
 
 src_configure() {