[gentoo-commits] proj/sci:master commit in: sci-libs/iml/files/, sci-libs/iml/

[Justin Lecher]

commit:     82ab93d397b18e284a7c52ae4457dc22d137ec3e
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 10:38:05 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 10:38:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=82ab93d3

sci-libs/iml: Version Bump, drop old

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../iml/files/iml-1.0.3-fix-undefined-symbol.patch | 11 ---------
 sci-libs/iml/files/iml-1.0.3-repl_removal.patch    | 27 ----------------------
 .../iml-1.0.3-use-any-cblas-implementation.patch   | 14 -----------
 .../iml/{iml-1.0.3-r2.ebuild => iml-1.0.5.ebuild}  | 10 ++++----
 4 files changed, 5 insertions(+), 57 deletions(-)

diff --git a/sci-libs/iml/files/iml-1.0.3-fix-undefined-symbol.patch b/sci-libs/iml/files/iml-1.0.3-fix-undefined-symbol.patch
deleted file mode 100644
index 53b1425..0000000
--- a/sci-libs/iml/files/iml-1.0.3-fix-undefined-symbol.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/nullspace.c.orig	2009-11-23 15:01:49.200283384 +0000
-+++ src/nullspace.c	2009-11-23 15:03:00.862295995 +0000
-@@ -253,7 +253,7 @@
- 	    for (i = 0; i < m; i++) {
- 		for (j = 0; j < m; j++)
- 		    mpz_init_set_ui(mp_N[i * m + j], 0);
--		mpz_init_ui(mp_N[i * m + i], 1);
-+		mpz_set_ui(mp_N[i * m + i], 1);
- 	    }
- 	    *mp_N_pass = mp_N;
- 	} else {		/* r>0 and s>0 */

diff --git a/sci-libs/iml/files/iml-1.0.3-repl_removal.patch b/sci-libs/iml/files/iml-1.0.3-repl_removal.patch
deleted file mode 100644
index 0be719b..0000000
--- a/sci-libs/iml/files/iml-1.0.3-repl_removal.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.ac.orig	2011-01-13 22:39:44.640530988 +1300
-+++ configure.ac	2011-01-13 22:40:15.462530988 +1300
-@@ -63,7 +63,6 @@
- AC_OUTPUT([
- 	Makefile
- 	config/Makefile
--	repl/Makefile
- 	src/Makefile
- 	doc/Makefile
- 	examples/Makefile
---- Makefile.am.orig	2011-01-13 22:40:32.171530988 +1300
-+++ Makefile.am	2011-01-13 22:41:39.874530988 +1300
-@@ -1,3 +1,3 @@
- EXTRA_DIST = bootstrap
- 
--SUBDIRS = repl config src doc tests examples
-+SUBDIRS = config src doc tests examples
---- src/Makefile.am.orig	2011-01-13 22:41:53.012530988 +1300
-+++ src/Makefile.am	2011-01-13 22:42:12.585530988 +1300
-@@ -30,6 +30,5 @@
- 	            nullspace.c
- 
- libiml_la_CFLAGS = $(AM_CFLAGS)
--libiml_la_LIBADD = $(EXTERNLIB) \
--	 	   $(top_builddir)/repl/librepl.la
-+libiml_la_LIBADD = $(EXTERNLIB)
- libiml_la_LDFLAGS = -version-info 1:0:1

diff --git a/sci-libs/iml/files/iml-1.0.3-use-any-cblas-implementation.patch b/sci-libs/iml/files/iml-1.0.3-use-any-cblas-implementation.patch
deleted file mode 100644
index c1dd09c..0000000
--- a/sci-libs/iml/files/iml-1.0.3-use-any-cblas-implementation.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.ac.orig	2008-06-15 23:51:30.000000000 +0000
-+++ configure.ac	2010-08-07 08:38:44.689081000 +0000
-@@ -55,10 +55,7 @@
- respectively when running configure.
- )])
- 
--IML_CHECK_ATLAS(,,[AC_MSG_ERROR(
--ATLAS not found! 
--ATLAS version 3.0 or greater is required for this library to compile. Please make sure ATLAS is installed and specify the header and libraries location with the options --with-atlas-include=<path> and --with-atlas-lib=<path> respectively when running configure.
--)])
-+PKG_CHECK_MODULES([ATLAS], [cblas])
- 
- AC_SUBST(LDFLAGS)
- AC_SUBST(ac_aux_dir)

diff --git a/sci-libs/iml/iml-1.0.3-r2.ebuild b/sci-libs/iml/iml-1.0.5.ebuild
similarity index 74%
rename from sci-libs/iml/iml-1.0.3-r2.ebuild
rename to sci-libs/iml/iml-1.0.5.ebuild
index abdcaf1..d4bf626 100644
--- a/sci-libs/iml/iml-1.0.3-r2.ebuild
+++ b/sci-libs/iml/iml-1.0.5.ebuild
@@ -4,11 +4,13 @@
 
 EAPI=5
 
+AUTOTOOLS_AUTORECONF=yes
+
 inherit autotools-utils
 
 DESCRIPTION="Integer Matrix Library"
 HOMEPAGE="http://www.cs.uwaterloo.ca/~astorjoh/iml.html"
-SRC_URI="http://www.cs.uwaterloo.ca/~astorjoh/${P}.tar.gz"
+SRC_URI="http://www.cs.uwaterloo.ca/~astorjoh/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,13 +22,11 @@ RESTRICT="mirror"
 DEPEND="virtual/cblas"
 RDEPEND="${DEPEND}"
 
-AUTOTOOLS_AUTORECONF=yes
 AT_M4DIR="config"
 DOCS=( AUTHORS ChangeLog README )
+
 PATCHES=(
-	"${FILESDIR}"/${P}-use-any-cblas-implementation.patch
-	"${FILESDIR}"/${P}-fix-undefined-symbol.patch
-	"${FILESDIR}"/${P}-repl_removal.patch
+	"${FILESDIR}"/${PN}-1.0.4-use-any-cblas-implementation.patch
 )
 
 src_configure() {