re-add missing patch

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

4 files changed, 16 insertions, 112 deletions

diff --git a/sci-mathematics/glpk/ChangeLog b/sci-mathematics/glpk/ChangeLog
index 0ba46434fa96..81f657a50c91 100644
--- a/sci-mathematics/glpk/ChangeLog
+++ b/sci-mathematics/glpk/ChangeLog
@@ -1,6 +1,10 @@
 # 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.69 2014/04/05 21:32:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.70 2014/04/09 15:54:19 bicatali Exp $
+
+  09 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/glpk-4.52.1-mariadb-5.5.patch, -glpk-4.48.ebuild, -glpk-4.53.ebuild:
+  re-add missing patch
 
 *glpk-4.54 (05 Apr 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.48.ebuild b/sci-mathematics/glpk/glpk-4.48.ebuild
deleted file mode 100644
index 9c54f2f101a4..000000000000
--- a/sci-mathematics/glpk/glpk-4.48.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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.3 2014/02/05 21:54:33 bicatali Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs autotools-utils
-
-DESCRIPTION="GNU Linear Programming Kit"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.gnu.org/software/glpk/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0"
-IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-RDEPEND="
-	gmp? ( dev-libs/gmp )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.52.1-mariadb-5.5.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable mysql)
-		$(use_enable odbc)
-		$(use_with gmp)
-	)
-	if use mysql || use odbc; then
-		myeconfargs+=( --enable-dl )
-	else
-		myeconfargs+=( --disable-dl )
-	fi
-	[[ -z $(type -P odbc-config) ]] && \
-		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
-}
diff --git a/sci-mathematics/glpk/glpk-4.53.ebuild b/sci-mathematics/glpk/glpk-4.53.ebuild
deleted file mode 100644
index 8f690901a64a..000000000000
--- a/sci-mathematics/glpk/glpk-4.53.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.53.ebuild,v 1.1 2014/03/24 17:46:25 bicatali Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit eutils flag-o-matic toolchain-funcs autotools-utils
-
-DESCRIPTION="GNU Linear Programming Kit"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.gnu.org/software/glpk/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0/36"
-IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-RDEPEND="
-	sci-libs/amd:0=
-	sci-libs/colamd:=
-	sys-libs/zlib:0=
-	gmp? ( dev-libs/gmp:0= )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.53-debundle-system-libs.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable mysql)
-		$(use_enable odbc)
-		$(use_with gmp)
-	)
-	if use mysql || use odbc; then
-		myeconfargs+=( --enable-dl )
-	else
-		myeconfargs+=( --disable-dl )
-	fi
-	[[ -z $(type -P odbc-config) ]] && \
-		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
-}