From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1E8E1138010 for ; Thu, 13 Sep 2012 02:24:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 452A221C011; Thu, 13 Sep 2012 02:24:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D283921C011 for ; Thu, 13 Sep 2012 02:24:29 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D2D5D33CAFB for ; Thu, 13 Sep 2012 02:24:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BC5B3E543F for ; Thu, 13 Sep 2012 02:24:26 +0000 (UTC) From: "Francois Bissey" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Francois Bissey" Message-ID: <1347502975.69a043dd2d73299369c1b3f1f88422c1da307bc5.fbissey@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/iml/files/, sci-libs/iml/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/iml/ChangeLog sci-libs/iml/files/fix-undefined-symbol.patch sci-libs/iml/files/iml-1.0.3-cblas.patch sci-libs/iml/files/iml-1.0.3-fix-undefined-symbol.patch sci-libs/iml/files/iml-1.0.3-repl_removal.patch sci-libs/iml/files/iml-1.0.3-use-any-cblas-implementation.patch sci-libs/iml/iml-1.0.3-r2.ebuild sci-libs/iml/iml-1.0.3.ebuild X-VCS-Directories: sci-libs/iml/files/ sci-libs/iml/ X-VCS-Committer: fbissey X-VCS-Committer-Name: Francois Bissey X-VCS-Revision: 69a043dd2d73299369c1b3f1f88422c1da307bc5 X-VCS-Branch: master Date: Thu, 13 Sep 2012 02:24:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f7999fc2-1d76-4f32-997c-85702002d08c X-Archives-Hash: 188857796fc8c85029bd3e62b2921f17 commit: 69a043dd2d73299369c1b3f1f88422c1da307bc5 Author: François Bissey canterbury ac nz> AuthorDate: Thu Sep 13 02:22:55 2012 +0000 Commit: Francois Bissey massey ac nz> CommitDate: Thu Sep 13 02:22:55 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=69a043dd Bump iml to the same level as s-o-g overlay, make it work on prefix including OS X. --- sci-libs/iml/ChangeLog | 12 +++++- sci-libs/iml/files/iml-1.0.3-cblas.patch | 41 ------------------- ....patch => iml-1.0.3-fix-undefined-symbol.patch} | 6 +- sci-libs/iml/files/iml-1.0.3-repl_removal.patch | 27 ++++++++++++ .../iml-1.0.3-use-any-cblas-implementation.patch | 14 ++++++ sci-libs/iml/iml-1.0.3-r2.ebuild | 37 +++++++++++++++++ sci-libs/iml/iml-1.0.3.ebuild | 43 -------------------- 7 files changed, 92 insertions(+), 88 deletions(-) diff --git a/sci-libs/iml/ChangeLog b/sci-libs/iml/ChangeLog index 7310d1e..8bee998 100644 --- a/sci-libs/iml/ChangeLog +++ b/sci-libs/iml/ChangeLog @@ -1,7 +1,17 @@ # ChangeLog for sci-libs/iml -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*iml-1.0.3-r2 (13 Sep 2012) + + 13 Sep 2012; François Bissey + -iml-1.0.3.ebuild, +iml-1.0.3-r2.ebuild, -files/iml-1.0.3-cblas.patch, + +files/iml-1.0.3-fix-undefined-symbol.patch, + +files/iml-1.0.3-repl_removal.patch, + +files/iml-1.0.3-use-any-cblas-implementation.patch, + -files/fix-undefined-symbol.patch: + bring to s-o-g level + *iml-1.0.3 (23 Nov 2009) 23 Nov 2009; François Bissey +iml-1.0.3.ebuild, diff --git a/sci-libs/iml/files/iml-1.0.3-cblas.patch b/sci-libs/iml/files/iml-1.0.3-cblas.patch deleted file mode 100644 index c9a6a1f..0000000 --- a/sci-libs/iml/files/iml-1.0.3-cblas.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- configure.ac.orig 2009-11-23 09:30:12.000000000 +1300 -+++ configure.ac 2009-11-23 11:35:59.000000000 +1300 -@@ -3,6 +3,7 @@ - AC_PREREQ(2.59) - AC_INIT(IML, 1.0.3) - AC_CONFIG_AUX_DIR(config) -+AC_CONFIG_MACRO_DIR(config) - AM_CONFIG_HEADER(config.h:config-h.in) - AC_CONFIG_SRCDIR([src/RNSop.c]) - AM_INIT_AUTOMAKE -@@ -55,11 +56,18 @@ - 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= and --with-atlas-lib= respectively when running configure. --)]) -+AC_CHECK_HEADERS([cblas.h], -+ [cblas_headers_found=yes; break;]) -+ -+AS_IF([test "x$cblas_headers_found" != "xyes"], -+ [AC_MSG_ERROR([Unable to find the cblas headers check your installation])]) -+ -+AC_ARG_WITH(cblas-lib, -+ AC_HELP_STRING([--with-cblas-lib=],[Specify the flags for cblas.]), -+ with_cblas_lib=$withval) -+ATLAS_LIBS="$with_cblas_lib" - -+AC_SUBST(ATLAS_LIBS) - AC_SUBST(LDFLAGS) - AC_SUBST(ac_aux_dir) - ---- Makefile.am~ 2009-11-23 11:38:44.000000000 +1300 -+++ Makefile.am 2009-11-23 11:38:44.000000000 +1300 -@@ -1,3 +1,5 @@ -+ACLOCAL_AMFLAGS = -I config -+ - EXTRA_DIST = bootstrap - - SUBDIRS = repl config src doc tests examples diff --git a/sci-libs/iml/files/fix-undefined-symbol.patch b/sci-libs/iml/files/iml-1.0.3-fix-undefined-symbol.patch similarity index 59% rename from sci-libs/iml/files/fix-undefined-symbol.patch rename to sci-libs/iml/files/iml-1.0.3-fix-undefined-symbol.patch index 1521d15..53b1425 100644 --- a/sci-libs/iml/files/fix-undefined-symbol.patch +++ b/sci-libs/iml/files/iml-1.0.3-fix-undefined-symbol.patch @@ -1,11 +1,11 @@ ---- nullspace.c.orig 2008-08-12 15:17:18.000000000 +0200 -+++ nullspace.c 2008-08-12 15:12:15.000000000 +0200 +--- 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_init_set_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 new file mode 100644 index 0000000..0be719b --- /dev/null +++ b/sci-libs/iml/files/iml-1.0.3-repl_removal.patch @@ -0,0 +1,27 @@ +--- 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 new file mode 100644 index 0000000..c1dd09c --- /dev/null +++ b/sci-libs/iml/files/iml-1.0.3-use-any-cblas-implementation.patch @@ -0,0 +1,14 @@ +--- 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= and --with-atlas-lib= 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.3-r2.ebuild new file mode 100644 index 0000000..df8342c --- /dev/null +++ b/sci-libs/iml/iml-1.0.3-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" + +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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="static-libs" + +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 +) + +src_configure() { + myeconfargs=( + --with-default="${EPREFIX}"/usr + ) + autotools-utils_src_configure +} diff --git a/sci-libs/iml/iml-1.0.3.ebuild b/sci-libs/iml/iml-1.0.3.ebuild deleted file mode 100644 index 92eab34..0000000 --- a/sci-libs/iml/iml-1.0.3.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -inherit autotools eutils - -DESCRIPTION="Integer Matrix Library" -HOMEPAGE="http://www.cs.uwaterloo.ca/~astorjoh/iml.html" -SRC_URI="http://www.cs.uwaterloo.ca/~astorjoh/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -RESTRICT="mirror" -IUSE="" - -DEPEND="dev-util/pkgconfig - dev-libs/gmp - virtual/cblas" -RDEPEND="dev-libs/gmp - virtual/cblas" - -src_prepare() { - # do not need atlas specifically any cblas will do... - epatch "${FILESDIR}/${P}-cblas.patch" - # apply patch supplied by debian bugreport #494819 - epatch "${FILESDIR}/fix-undefined-symbol.patch" - eautoreconf -} - -src_configure() { - econf \ - --enable-shared \ - --with-cblas-lib="$(pkg-config cblas --libs)" \ - || die "econf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc ChangeLog README -}