Ubundle amd, colamd and zlib, removed old

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

6 files changed, 139 insertions, 61 deletions

diff --git a/sci-mathematics/glpk/ChangeLog b/sci-mathematics/glpk/ChangeLog
index 93f32eb89843..136840695547 100644
--- a/sci-mathematics/glpk/ChangeLog
+++ b/sci-mathematics/glpk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/glpk
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.65 2013/12/03 20:11:10 bicatali Exp $
+# 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 $
+
+*glpk-4.52.1-r1 (16 Jan 2014)
+
+  16 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/glpk-4.52.1-debundle-amd.patch, +files/glpk-4.52.1-debundle-zlib.patch,
+  +glpk-4.52.1-r1.ebuild, -glpk-4.47.ebuild, -glpk-4.52.1.ebuild, metadata.xml:
+  Ubundle amd, colamd and zlib, removed old
 
 *glpk-4.52.1 (03 Dec 2013)
 
diff --git a/sci-mathematics/glpk/files/glpk-4.52.1-debundle-amd.patch b/sci-mathematics/glpk/files/glpk-4.52.1-debundle-amd.patch
new file mode 100644
index 000000000000..e8a24e914e69
--- /dev/null
+++ b/sci-mathematics/glpk/files/glpk-4.52.1-debundle-amd.patch
@@ -0,0 +1,60 @@
+Description: Do not use embedded copy of AMD and COLAMD libraries from suitesparse
+Author: Sébastien Villemot <sebastien@debian.org>
+Forwarded: not-needed
+Last-Update: 2013-06-25
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/configure.ac
++++ b/configure.ac
+@@ -142,6 +142,11 @@
+ 
+ AC_CHECK_LIB([z], [gzopen])
+ 
++AC_CHECK_LIB([amd], [amd_1])
++AC_CHECK_LIB([colamd], [colamd])
++
++AC_CHECK_HEADER([amd.h])
++
+ AC_CONFIG_FILES(
+    [src/Makefile examples/Makefile Makefile])
+ AC_OUTPUT
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,10 +6,8 @@
+ 
+ libglpk_la_CPPFLAGS = \
+ -I$(srcdir) \
+--I$(srcdir)/amd \
+ -I$(srcdir)/bflib \
+ -I$(srcdir)/cglib \
+--I$(srcdir)/colamd \
+ -I$(srcdir)/env \
+ -I$(srcdir)/minisat \
+ -I$(srcdir)/misc \
+@@ -99,18 +97,6 @@
+ glpssx01.c \
+ glpssx02.c \
+ glptsp.c \
+-amd/amd_1.c \
+-amd/amd_2.c \
+-amd/amd_aat.c \
+-amd/amd_control.c \
+-amd/amd_defaults.c \
+-amd/amd_dump.c \
+-amd/amd_info.c \
+-amd/amd_order.c \
+-amd/amd_post_tree.c \
+-amd/amd_postorder.c \
+-amd/amd_preprocess.c \
+-amd/amd_valid.c \
+ bflib/fhv.c \
+ bflib/fhvint.c \
+ bflib/luf.c \
+@@ -119,7 +105,6 @@
+ bflib/sva.c \
+ cglib/cfg.c \
+ cglib/cfg1.c \
+-colamd/colamd.c \
+ env/alloc.c \
+ env/env.c \
+ env/error.c \
diff --git a/sci-mathematics/glpk/files/glpk-4.52.1-debundle-zlib.patch b/sci-mathematics/glpk/files/glpk-4.52.1-debundle-zlib.patch
new file mode 100644
index 000000000000..6eb2130eda8e
--- /dev/null
+++ b/sci-mathematics/glpk/files/glpk-4.52.1-debundle-zlib.patch
@@ -0,0 +1,52 @@
+Description: Do not use embedded copy of zlib
+Author: Sébastien Villemot <sebastien@debian.org>
+Forwarded: not-needed
+Last-Update: 2013-06-25
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -13,8 +13,7 @@
+ -I$(srcdir)/env \
+ -I$(srcdir)/minisat \
+ -I$(srcdir)/misc \
+--I$(srcdir)/proxy \
+--I$(srcdir)/zlib
++-I$(srcdir)/proxy
+ 
+ libglpk_la_LDFLAGS = \
+ -version-info 36:1:0 \
+@@ -144,21 +143,6 @@
+ misc/wclique.c \
+ misc/wclique1.c \
+ proxy/proxy.c \
+-proxy/proxy1.c \
+-zlib/adler32.c \
+-zlib/compress.c \
+-zlib/crc32.c \
+-zlib/deflate.c \
+-zlib/gzclose.c \
+-zlib/gzlib.c \
+-zlib/gzread.c \
+-zlib/gzwrite.c \
+-zlib/inffast.c \
+-zlib/inflate.c \
+-zlib/inftrees.c \
+-zlib/trees.c \
+-zlib/uncompr.c \
+-zlib/zio.c \
+-zlib/zutil.c
++proxy/proxy1.c
+ 
+ ## eof ##
+--- a/configure.ac
++++ b/configure.ac
+@@ -140,6 +140,8 @@
+    AC_MSG_RESULT([no])
+ fi
+ 
++AC_CHECK_LIB([z], [gzopen])
++
+ AC_CONFIG_FILES(
+    [src/Makefile examples/Makefile Makefile])
+ AC_OUTPUT
diff --git a/sci-mathematics/glpk/glpk-4.47.ebuild b/sci-mathematics/glpk/glpk-4.47.ebuild
deleted file mode 100644
index ac49a5f4404a..000000000000
--- a/sci-mathematics/glpk/glpk-4.47.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.47.ebuild,v 1.6 2013/02/21 16:53:29 jlec Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic toolchain-funcs
-
-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 ~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"
-
-src_configure() {
-	local myconf="--disable-dl"
-	if use mysql || use odbc; then
-		myconf="--enable-dl"
-	fi
-
-	[[ -z $(type -P odbc-config) ]] && \
-		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
-
-	econf \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable static-libs static) \
-		$(use_with gmp) \
-		${myconf}
-}
-
-src_install() {
-	default
-	if use examples; then
-		emake distclean
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
-	prune_libtool_files
-}
diff --git a/sci-mathematics/glpk/glpk-4.52.1.ebuild b/sci-mathematics/glpk/glpk-4.52.1-r1.ebuild
index f356f1501e52..8a8720bf81d9 100644
--- a/sci-mathematics/glpk/glpk-4.52.1.ebuild
+++ b/sci-mathematics/glpk/glpk-4.52.1-r1.ebuild
@@ -1,9 +1,11 @@
-# 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.52.1.ebuild,v 1.1 2013/12/03 20:11:10 bicatali Exp $
+# $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 $
 
 EAPI=5
 
+AUTOTOOLS_AUTORECONF=1
+
 inherit eutils flag-o-matic toolchain-funcs autotools-utils
 
 DESCRIPTION="GNU Linear Programming Kit"
@@ -16,12 +18,20 @@ 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 )
+	sci-libs/amd
+	sci-libs/colamd
+	sys-libs/zlib:=
+	gmp? ( dev-libs/gmp:= )
 	mysql? ( virtual/mysql )
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.52.1-debundle-amd.patch
+	"${FILESDIR}"/${PN}-4.52.1-debundle-zlib.patch
+)
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable mysql)
diff --git a/sci-mathematics/glpk/metadata.xml b/sci-mathematics/glpk/metadata.xml
index f58fdc6b640e..00e9a6f8b81b 100644
--- a/sci-mathematics/glpk/metadata.xml
+++ b/sci-mathematics/glpk/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
-  <maintainer>
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-  <longdescription lang="en">
+<herd>sci-mathematics</herd>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+<longdescription lang="en">
   The GNU Linear Programming Kit package is intended for solving
   large-scale linear programming (LP), mixed integer programming
   (MIP), and other related problems. It is a set of routines written