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

(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

5 files changed, 32 insertions, 6 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/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() {