* [gentoo-commits] proj/sci:master commit in: sci-libs/libcmatrix/files/, sci-libs/libcmatrix/
@ 2011-08-31 14:03 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2011-08-31 14:03 UTC (permalink / raw
To: gentoo-commits
commit: 5bee4ea3e8e65f21671cb9477b5915a58cd5cbc6
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 14:03:23 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 14:03:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5bee4ea3
In the tree
---
sci-libs/libcmatrix/ChangeLog | 23 -----------
sci-libs/libcmatrix/files/3.2.1-gcc4.4.patch | 12 ------
sci-libs/libcmatrix/files/3.2.1-minuit2.patch | 14 -------
sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild | 50 -------------------------
sci-libs/libcmatrix/metadata.xml | 11 -----
5 files changed, 0 insertions(+), 110 deletions(-)
diff --git a/sci-libs/libcmatrix/ChangeLog b/sci-libs/libcmatrix/ChangeLog
deleted file mode 100644
index 16c20d2..0000000
--- a/sci-libs/libcmatrix/ChangeLog
+++ /dev/null
@@ -1,23 +0,0 @@
-# ChangeLog for sci-libs/libcmatrix
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*libcmatrix-3.2.1 (02 Nov 2009)
-
- 02 Nov 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
- -files/080301-minuit2.patch, +libcmatrix-3.2.1.ebuild,
- +files/3.2.1-gcc4.4.patch, +files/3.2.1-minuit2.patch,
- -libcmatrix-080301.ebuild:
- version bump
- PV is ABI which comes from CHANGES
-
- 26 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
- libcmatrix-080301.ebuild:
- QA
-
-*libcmatrix-080301 (19 Mar 2009)
-
- 19 Mar 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> +metadata.xml,
- +libcmatrix-080301.ebuild:
- Initial checkin
-
diff --git a/sci-libs/libcmatrix/files/3.2.1-gcc4.4.patch b/sci-libs/libcmatrix/files/3.2.1-gcc4.4.patch
deleted file mode 100644
index 24c1a89..0000000
--- a/sci-libs/libcmatrix/files/3.2.1-gcc4.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/include/DynamicList.h b/include/DynamicList.h
-index f8c1346..05a7b10 100755
---- a/include/DynamicList.h
-+++ b/include/DynamicList.h
-@@ -4,6 +4,7 @@
- #include "BaseList.h"
- #include "lcm_basethreads.h"
- #include "Warnings.h"
-+#include <cstdio>
-
- namespace libcmatrix {
-
diff --git a/sci-libs/libcmatrix/files/3.2.1-minuit2.patch b/sci-libs/libcmatrix/files/3.2.1-minuit2.patch
deleted file mode 100644
index 24dc562..0000000
--- a/sci-libs/libcmatrix/files/3.2.1-minuit2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure-libraries.ac 2008-03-04 00:48:46.000000000 +0100
-+++ configure-libraries.ac.new 2009-03-19 18:22:21.000000000 +0100
-@@ -14,8 +14,8 @@
- fi
- if test x$FOUNDMINUIT = xyes; then
- AC_CHECK_LIB(lcg_Minuit,main,,
-- AC_CHECK_LIB(Minuit,main,,FOUNDMINUIT=no
-- AC_MSG_WARN([Minuit library (liblcg_Minuit or libMinuit) not found
-+ AC_CHECK_LIB(Minuit2,main,,FOUNDMINUIT=no
-+ AC_MSG_WARN([Minuit library (liblcg_Minuit or libMinuit2) not found
- Is LDFLAGS is defined to include relevant directory?])))
- if test x$FOUNDMINUIT = xyes; then
- AC_DEFINE(HAVE_LIBMINUIT)
-
diff --git a/sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild b/sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild
deleted file mode 100644
index 684fa17..0000000
--- a/sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit autotools eutils
-
-MY_P="${PN}${PV}_lite"
-
-DESCRIPTION="lite version of pNMRsim"
-HOMEPAGE="http://www.dur.ac.uk/paul.hodgkinson/pNMRsim/"
-#SRC_URI="${HOMEPAGE}/${MY_P}.tar.gz"
-SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="atlas threads"
-
-RDEPEND="
- sci-libs/minuit
- atlas? ( sci-libs/blas-atlas )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${PN}R3
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PV}-minuit2.patch \
- "${FILESDIR}"/${PV}-gcc4.4.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-minuit \
- $(use_with atlas) \
- $(use_with threads)
-}
-
-src_install() {
- dolib.a lib/"${PN}".a || die "install failed"
-
- insinto /usr/include/${PN}R3
- doins include/* || die "no includes"
-
- dodoc CHANGES docs/* || die "no docs"
-}
diff --git a/sci-libs/libcmatrix/metadata.xml b/sci-libs/libcmatrix/metadata.xml
deleted file mode 100644
index 0a72d26..0000000
--- a/sci-libs/libcmatrix/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-<maintainer>
- <email>sci@gentoo.org</email>
-</maintainer>
-<use>
- <flag name='atlas'>Use of atlas blas implementation</flag>
-</use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/libcmatrix/files/, sci-libs/libcmatrix/
@ 2013-03-08 10:01 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2013-03-08 10:01 UTC (permalink / raw
To: gentoo-commits
commit: 17ec5d63e9c59e0271dff3456da1fc324184583c
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 8 10:00:51 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Mar 8 10:00:51 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=17ec5d63
Newer version in CVS
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
---
sci-libs/libcmatrix/ChangeLog | 69 --------
sci-libs/libcmatrix/files/3.11.0-shared.patch | 80 ---------
sci-libs/libcmatrix/files/3.2.1-atlas.patch | 33 ----
sci-libs/libcmatrix/files/3.2.1-gcc4.4.patch | 12 --
sci-libs/libcmatrix/files/3.2.1-gcc4.6.patch | 16 --
sci-libs/libcmatrix/files/3.2.1-gcc4.7.patch | 227 -------------------------
sci-libs/libcmatrix/files/3.2.1-minuit2.patch | 14 --
sci-libs/libcmatrix/files/3.2.1-shared.patch | 80 ---------
sci-libs/libcmatrix/files/3.9.0-atlas.patch | 24 ---
sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild | 55 ------
sci-libs/libcmatrix/metadata.xml | 8 -
11 files changed, 0 insertions(+), 618 deletions(-)
diff --git a/sci-libs/libcmatrix/ChangeLog b/sci-libs/libcmatrix/ChangeLog
deleted file mode 100644
index b62318c..0000000
--- a/sci-libs/libcmatrix/ChangeLog
+++ /dev/null
@@ -1,69 +0,0 @@
-# ChangeLog for sci-libs/libcmatrix
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcmatrix/ChangeLog,v 1.13 2012/12/27 18:31:20 jlec Exp $
-
- 24 Jan 2013; Justin Lecher <jlec@gentoo.org> +files/3.2.1-atlas.patch,
- +files/3.2.1-gcc4.4.patch, +files/3.2.1-gcc4.6.patch,
- +files/3.2.1-gcc4.7.patch, +files/3.2.1-minuit2.patch,
- +files/3.2.1-shared.patch, +files/3.9.0-atlas.patch,
- +files/3.11.0-shared.patch, +libcmatrix-3.11.0.ebuild, +metadata.xml:
- fixed
-
- 27 Dec 2012; Justin Lecher <jlec@gentoo.org> metadata.xml:
- Drop local USE
-
- 27 Dec 2012; Justin Lecher <jlec@gentoo.org> libcmatrix-3.11.0.ebuild:
- Force usage of atlas
-
- 27 Dec 2012; Justin Lecher <jlec@gentoo.org> libcmatrix-3.11.0.ebuild:
- Force ignoring atlas at all, #448832
-
- 20 Dec 2012; Justin Lecher <jlec@gentoo.org> -libcmatrix-3.2.1.ebuild,
- -libcmatrix-3.9.0.ebuild, libcmatrix-3.11.0.ebuild, metadata.xml:
- Drop old and drop atlas support
-
- 23 Jul 2012; Justin Lecher <jlec@gentoo.org> libcmatrix-3.2.1.ebuild,
- libcmatrix-3.11.0.ebuild:
- Patch all versions for gcc-4.7, #427494
-
- 24 Jun 2012; Justin Lecher <jlec@gentoo.org> +files/3.2.1-gcc4.7.patch,
- libcmatrix-3.9.0.ebuild:
- Fix compilation with gcc-4.7, #423181
-
-*libcmatrix-3.11.0 (21 May 2012)
-
- 21 May 2012; Justin Lecher <jlec@gentoo.org> +files/3.11.0-shared.patch,
- +libcmatrix-3.11.0.ebuild:
- Version Bump
-
- 04 May 2012; Justin Lecher <jlec@gentoo.org> libcmatrix-3.9.0.ebuild:
- Prefer atlas over blas-atlas
-
- 31 Aug 2011; Justin Lecher <jlec@gentoo.org> +files/3.9.0-atlas.patch,
- +libcmatrix-3.9.0.ebuild, metadata.xml:
- Version bump
-
-*libcmatrix-3.9.0 (31 Aug 2011)
-
- 31 Aug 2011; Justin Lecher <jlec@gentoo.org> +files/3.9.0-atlas.patch,
- +libcmatrix-3.9.0.ebuild, metadata.xml:
- Version bump
-
- 21 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/3.2.1-atlas.patch,
- files/3.2.1-shared.patch, libcmatrix-3.2.1.ebuild:
- Correct linking against bicatalis new atlas version
-
- 12 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/3.2.1-gcc4.6.patch,
- libcmatrix-3.2.1.ebuild:
- Fix for compilation with gcc-4.6 (-fpermissive), #363161
-
- 03 Nov 2010; Justin Lecher <jlec@gentoo.org> libcmatrix-3.2.1.ebuild:
- Keyworded for ~-linux prefix
-
-*libcmatrix-3.2.1 (03 Nov 2010)
-
- 03 Nov 2010; Justin Lecher <jlec@gentoo.org> +files/3.2.1-gcc4.4.patch,
- +libcmatrix-3.2.1.ebuild, +files/3.2.1-minuit2.patch,
- +files/3.2.1-shared.patch, +metadata.xml:
- New Addition, imported from sci overlay
-
diff --git a/sci-libs/libcmatrix/files/3.11.0-shared.patch b/sci-libs/libcmatrix/files/3.11.0-shared.patch
deleted file mode 100644
index 6c5c316..0000000
--- a/sci-libs/libcmatrix/files/3.11.0-shared.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 1361371..1448e76 100755
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -13,8 +13,8 @@ AR=@AR@
-
- # You shouldn't need to alter anything below here
-
--COMPILE=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c
--ALLOPTFLAGS=$(OPTFLAGS) -DNDEBUG
-+COMPILE=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -c
-+#ALLOPTFLAGS=$(OPTFLAGS) -DNDEBUG
-
- LOCALOBJS= local/CrystalSystem.o local/CrystalGeneric.o local/MoleculeStructure.o
- COREOBJS= coredefs/complex.o coredefs/common.o coredefs/diagonal.o coredefs/diagonalise.o coredefs/power.o coredefs/invert.o coredefs/transforms.o coredefs/blocking.o coredefs/mixed.o coredefs/realtransforms.o coredefs/Chebyshev.o
-@@ -36,7 +36,7 @@ ALLTHROBJS=$(UNSAFEOBJS:.o=_r.o) $(ALLSAFEOBJS)
-
- ROOT=..
-
--first: lib/libcmatrix.a
-+first: lib/libcmatrix.so.3.11.0
-
- #%.o: %.f
- # @F77@ @FFLAGS@ -c -o $@ $<
-@@ -68,25 +68,25 @@ tempclean:
- # -cd optim; @CLEAN@
- # -cd local; @CLEAN@
-
--lib/libcmatrix.a: $(ALLNORMOBJS)
-- $(AR) $@ $(ALLNORMOBJS)
-- chmod a+rx $@
-- $(RANLIB) $@
--
--lib/libcmatrix_p.a: $(ALLPROFOBJS)
-- $(AR) $@ $(ALLPROFOBJS)
-- chmod a+rx $@
-- $(RANLIB) $@
--
--lib/libcmatrix-g.a: $(ALLGOBJS)
-- $(AR) $@ $(ALLGOBJS)
-- chmod a+rx $@
-- $(RANLIB) $@
--
--lib/libcmatrix_r.a: $(ALLTHROBJS)
-- $(AR) @MTFLAGS@ $@ $(ALLTHROBJS)
-- chmod a+rx $@
-- $(RANLIB) $@
-+lib/libcmatrix.so.3.11.0: $(ALLNORMOBJS)
-+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLNORMOBJS) -lrt @ATLAS_LIBS@
-+ ln -sf libcmatrix.so.3.11.0 lib/libcmatrix.so.3
-+ ln -sf libcmatrix.so.3.11.0 lib/libcmatrix.so
-+
-+lib/libcmatrix_p.so.3.11.0: $(ALLPROFOBJS)
-+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLPROFOBJS) -lrt @ATLAS_LIBS@
-+ ln -sf libcmatrix_p.so.3.11.0 lib/libcmatrix_p.so.3
-+ ln -sf libcmatrix_p.so.3.11.0 lib/libcmatrix_p.so
-+
-+lib/libcmatrix-g.so.3.11.0: $(ALLGOBJS)
-+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLGOBJS) -lrt @ATLAS_LIBS@
-+ ln -sf libcmatrix-g.so.3.11.0 lib/libcmatrix-g.so.3
-+ ln -sf libcmatrix-g.so.3.11.0 lib/libcmatrix-g.so
-+
-+lib/libcmatrix.so_r.3.11.0: $(ALLTHROBJS)
-+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLTHROBJS) -lrt @ATLAS_LIBS@
-+ ln -sf libcmatrix_r.so.3.11.0 lib/libcmatrix_r.so.3
-+ ln -sf libcmatrix_r.so.3.11.0 lib/libcmatrix_r.so
-
- @CONFIGLEAF@.tar.gz:
- cd $(ROOT) ; tar --exclude lib/* --exclude *.o --exclude=*~ --exclude=Makefile --exclude=include/config.h --exclude=config.status -cvf @CONFIGLEAF@.tar @CONFIGLEAF@
-diff --git a/configure.ac b/configure.ac
-index c0ae0e1..50dcd5a 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,5 +1,6 @@
- AC_INIT(configure.ac)
- AC_CONFIG_HEADER(include/config.h)
-+LT_INIT
-
- DEFAR="ar ru"
- MAKEEXTRA=
diff --git a/sci-libs/libcmatrix/files/3.2.1-atlas.patch b/sci-libs/libcmatrix/files/3.2.1-atlas.patch
deleted file mode 100644
index b10b41d..0000000
--- a/sci-libs/libcmatrix/files/3.2.1-atlas.patch
+++ /dev/null
@@ -1,33 +0,0 @@
- configure-libraries.ac | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/configure-libraries.ac b/configure-libraries.ac
-index a64e79c..afc75b8 100755
---- a/configure-libraries.ac
-+++ b/configure-libraries.ac
-@@ -33,6 +33,7 @@ AC_ARG_WITH(atlas,
- AS_HELP_STRING([--with-atlas],[use the ATLAS BLAS library (default-use if found)]),,with_atlas=check)
- if test x$with_atlas != xno; then
- FOUNDATLAS=yes
-+ PKG_CHECK_MODULES([ATLAS], [cblas])
- AC_CHECK_HEADERS(cblas.h,,FOUNDATLAS=no
- AC_MSG_WARN([ATLAS header files (cblas.h) not found
- Is CPPFLAGS is defined to include relevant directory?]))
-@@ -40,7 +41,7 @@ Is CPPFLAGS is defined to include relevant directory?]))
- AC_MSG_WARN([ATLAS library (libatlas.a) not found
- Is LDFLAGS is defined to include relevant directory?]))
- if test x$FOUNDATLAS = xyes; then
-- LIBS="-lcblas $LIBS"
-+ LIBS="$ATLAS_LIBS $LIBS"
- CXXFLAGS="$CXXFLAGS -DLCM_USE_EXTERNAL"
- else
- if test x$with_atlas = xyes; then
-@@ -49,6 +50,8 @@ Is LDFLAGS is defined to include relevant directory?]))
- fi
- fi
-
-+AC_SUBST(ATLAS_LIBS)
-+
- AC_ARG_WITH(acml,
- AS_HELP_STRING([--with-acml],[use the ACML BLAS library (default=no)]),,with_acml=no)
- if test x$with_acml = xyes; then
diff --git a/sci-libs/libcmatrix/files/3.2.1-gcc4.4.patch b/sci-libs/libcmatrix/files/3.2.1-gcc4.4.patch
deleted file mode 100644
index 24c1a89..0000000
--- a/sci-libs/libcmatrix/files/3.2.1-gcc4.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/include/DynamicList.h b/include/DynamicList.h
-index f8c1346..05a7b10 100755
---- a/include/DynamicList.h
-+++ b/include/DynamicList.h
-@@ -4,6 +4,7 @@
- #include "BaseList.h"
- #include "lcm_basethreads.h"
- #include "Warnings.h"
-+#include <cstdio>
-
- namespace libcmatrix {
-
diff --git a/sci-libs/libcmatrix/files/3.2.1-gcc4.6.patch b/sci-libs/libcmatrix/files/3.2.1-gcc4.6.patch
deleted file mode 100644
index b3d8c8d..0000000
--- a/sci-libs/libcmatrix/files/3.2.1-gcc4.6.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- NMR/MetaPropagation.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/NMR/MetaPropagation.cc b/NMR/MetaPropagation.cc
-index b7ed98b..ce8c16f 100755
---- a/NMR/MetaPropagation.cc
-+++ b/NMR/MetaPropagation.cc
-@@ -2136,7 +2136,7 @@ SpinOpGenerator::add_A0(T& dest,F func, double coup, size_t j, size_t sk, Type2T
- { ref_.clear(0); }
- const space_T& operator()() const { return ref_; }
- ~fudge_isotropic_() { ref_.ensure_rank(0); }
-- mutable space_T& ref_;
-+ space_T& ref_;
- };
- template<> struct fudge_isotropic_<double> {
- fudge_isotropic_(double v) : v_(v) {};
diff --git a/sci-libs/libcmatrix/files/3.2.1-gcc4.7.patch b/sci-libs/libcmatrix/files/3.2.1-gcc4.7.patch
deleted file mode 100644
index 633c9d5..0000000
--- a/sci-libs/libcmatrix/files/3.2.1-gcc4.7.patch
+++ /dev/null
@@ -1,227 +0,0 @@
- include/MultiMatrix.h | 14 +++++++-------
- include/UnionHolder.h | 40 ++++++++++++++++++++--------------------
- include/basedefs.h | 22 ++++++++++++----------
- utils/Fork_controller.cc | 3 +++
- utils/ttyio.cc | 2 ++
- 5 files changed, 44 insertions(+), 37 deletions(-)
-
-diff --git a/include/MultiMatrix.h b/include/MultiMatrix.h
-index b6fec33..2d54db5 100755
---- a/include/MultiMatrix.h
-+++ b/include/MultiMatrix.h
-@@ -254,19 +254,19 @@ namespace libcmatrix {
- }
-
- size_t operator()(size_t r) const
-- { check_bounds_open(dim,r);
-+ { this->check_bounds_open(dim,r);
- return r*mults[0]; }
-
- size_t operator()(size_t r,size_t s) const
-- { check_bounds_open(dim,r,s);
-+ { this->check_bounds_open(dim,r,s);
- return r*mults[0]+s*mults[1]; }
-
- size_t operator()(size_t r,size_t s,size_t t) const
-- { check_bounds_open(dim,r,s,t);
-+ { this->check_bounds_open(dim,r,s,t);
- return r*mults[0]+s*mults[1]+t*mults[2]; }
-
- size_t operator()(size_t r,size_t s,size_t t,size_t u) const
-- { check_bounds_open(dim,r,s,t,u);
-+ { this->check_bounds_open(dim,r,s,t,u);
- return r*mults[0]+s*mults[1]+t*mults[2]+u*mults[3]; }
-
- size_t index(size_t r) const
-@@ -293,14 +293,14 @@ namespace libcmatrix {
-
- void reverse(size_t& r, size_t& s, size_t ind) const {
- LCM_STATIC_CHECK(N==2, Indexer_non2D_object);
-- check(ind<size(),"Indexer::reverse");
-+ this->check(ind<size(),"Indexer::reverse");
- r=ind / mults[0];
- s=ind-r*mults[0];
- }
-
- void reverse(size_t& r, size_t& s, size_t& t, size_t ind) const {
- LCM_STATIC_CHECK(N==3, Indexer_non3D_object);
-- check(ind<size(),"Indexer::reverse");
-+ this->check(ind<size(),"Indexer::reverse");
- r=ind / mults[0];
- ind-=r*mults[0];
- s=ind / mults[1];
-@@ -309,7 +309,7 @@ namespace libcmatrix {
-
- void reverse(size_t& r, size_t& s, size_t& t, size_t& u, size_t ind) const {
- LCM_STATIC_CHECK(N==4, Indexer_non4D_object);
-- check(ind<size(),"Indexer::reverse");
-+ this->check(ind<size(),"Indexer::reverse");
- r=ind / mults[0];
- ind-=r*mults[0];
- s=ind / mults[1];
-diff --git a/include/UnionHolder.h b/include/UnionHolder.h
-index f447501..3157330 100755
---- a/include/UnionHolder.h
-+++ b/include/UnionHolder.h
-@@ -359,21 +359,21 @@ namespace libcmatrix {
- //! overrides ::clear method from ::CommonHolder
- void clear() {
- switch (type_) {
-- case 1: clear_(first_); break;
-- case 2: clear_(second_); break;
-- case 3: clear_(third_); break;
-- case 4: clear_(fourth_); break;
-- case 5: clear_(fifth_); break;
-- case 6: clear_(sixth_); break;
-- case 7: clear_(seventh_); break;
-- case 8: clear_(eighth_); break;
-- case 9: clear_(nineth_); break;
-+ case 1: this->clear_(first_); break;
-+ case 2: this->clear_(second_); break;
-+ case 3: this->clear_(third_); break;
-+ case 4: this->clear_(fourth_); break;
-+ case 5: this->clear_(fifth_); break;
-+ case 6: this->clear_(sixth_); break;
-+ case 7: this->clear_(seventh_); break;
-+ case 8: this->clear_(eighth_); break;
-+ case 9: this->clear_(nineth_); break;
- }
- type_=0;
- }
-
- template<class T> UnionHolder& operator= (const T& v) {
-- get(Type2Type<T>())=v;
-+ this->get(Type2Type<T>())=v;
- type(Type2Type<T>()); //only change type if assignment was successful
- return *this;
- }
-@@ -399,12 +399,12 @@ namespace libcmatrix {
-
- template<class T> T& set(Type2Type<T> in) {
- type(in);
-- return get(in);
-+ return this->get(in);
- }
-
- template<int M> typename reverse<M>::type& set(Int2Type<M> in) {
- type(in);
-- return get(Type2Type<typename reverse<M>::type>());
-+ return this->get(Type2Type<typename reverse<M>::type>());
- }
-
- template<class T> T& operator()(Type2Type<T> in) {
-@@ -429,12 +429,12 @@ namespace libcmatrix {
-
- template<int M> typename reverse<M>::type& operator()(Int2Type<M> in) {
- verify(in);
-- return get(Type2Type<typename reverse<M>::type>());
-+ return this->get(Type2Type<typename reverse<M>::type>());
- }
-
- template<int M> const typename reverse<M>::type& operator()(Int2Type<M> in) const {
- verify(in);
-- return get(Type2Type<typename reverse<M>::type>());
-+ return this->get(Type2Type<typename reverse<M>::type>());
- }
- };
-
-@@ -482,12 +482,12 @@ namespace libcmatrix {
- bool iscomplex() const { return (this->type()==COMPLEX); }
- bool isreal() const { return (this->type()==REAL); }
-
-- C& set_complex() { return set(Int2Type<COMPLEX>()); }
-- R& set_real() { return set(Int2Type<REAL>()); }
-- const C& get_complex() const { return get(Type2Type<C>()); }
-- const R& get_real() const { return get(Type2Type<R>()); }
-- C& get_complex() { return get(Type2Type<C>()); }
-- R& get_real() { return get(Type2Type<R>()); }
-+ C& set_complex() { return this->set(Int2Type<COMPLEX>()); }
-+ R& set_real() { return this->set(Int2Type<REAL>()); }
-+ const C& get_complex() const { return this->get(Type2Type<C>()); }
-+ const R& get_real() const { return this->get(Type2Type<R>()); }
-+ C& get_complex() { return this->get(Type2Type<C>()); }
-+ R& get_real() { return this->get(Type2Type<R>()); }
- };
-
- } //namespace libcmatrix
-diff --git a/include/basedefs.h b/include/basedefs.h
-index 420b341..80d47e3 100755
---- a/include/basedefs.h
-+++ b/include/basedefs.h
-@@ -13,6 +13,8 @@
- #include <functional>
- #include <iterator>
- #include <algorithm>
-+#include <math.h>
-+//#include "BlockedMatrix.h"
- //#include <complex>
-
- // #ifdef LCM_DEBUG_ALLOCATOR
-@@ -1703,6 +1705,16 @@ template<size_t N> struct Multiply_<N,N,0> {
- }
- };
-
-+template<size_t,size_t,size_t> struct Mla_ {
-+ template<class T1,class T2,class T3> static void func(T1&, const T2&, const T3&) {
-+ LCM_STATIC_ERROR( mla_incompatible_dimensionalities );
-+ }
-+};
-+
-+template<class T1,class T2,class T3> inline void mla(T1& d,const T2& a,const T3& b) {
-+ Mla_<LCM_DIM(T1),LCM_DIM(T2),LCM_DIM(T3)>::func(d,a,b);
-+}
-+
- template<> struct Multiply_<2,2,2> {
- template<class T1,class T2,class T3> static void func(T1& dest,const T2& a,const T3& b)
- {
-@@ -1875,12 +1887,6 @@ template<> struct Multiply_<0,0,0> {
- Multiply_<LCM_DIM(T1),LCM_DIM(T2),LCM_DIM(T3)>::func(d,a,b);
- }
-
--template<size_t,size_t,size_t> struct Mla_ {
-- template<class T1,class T2,class T3> static void func(T1&, const T2&, const T3&) {
-- LCM_STATIC_ERROR( mla_incompatible_dimensionalities );
-- }
--};
--
- template<size_t N> struct Mla_<N,0,N> {
- template<class T1,class T2,class T3> LCM_INLINE static void func(T1& d, const T2& a, const T3& b) {
- if (d.empty())
-@@ -1940,10 +1946,6 @@ template<> struct Mla_<0,0,0> {
- }
- };
-
--template<class T1,class T2,class T3> inline void mla(T1& d,const T2& a,const T3& b) {
-- Mla_<LCM_DIM(T1),LCM_DIM(T2),LCM_DIM(T3)>::func(d,a,b);
--}
--
- template<class T,size_t N> struct Print_ {
- static void print(const T& a,std::ostream& ostr) {
- ostr << '[';
-diff --git a/utils/Fork_controller.cc b/utils/Fork_controller.cc
-index 5f6b913..08ec942 100755
---- a/utils/Fork_controller.cc
-+++ b/utils/Fork_controller.cc
-@@ -3,6 +3,9 @@
- #include <sys/wait.h>
- #include <time.h>
- #include <cstdio>
-+#include <sys/types.h>
-+#include <unistd.h>
-+
-
- namespace libcmatrix {
-
-diff --git a/utils/ttyio.cc b/utils/ttyio.cc
-index 17e4eb3..bbeac81 100755
---- a/utils/ttyio.cc
-+++ b/utils/ttyio.cc
-@@ -17,6 +17,8 @@
- #include "args_iter.h"
- #endif
-
-+#include <unistd.h>
-+
- namespace libcmatrix {
-
- namespace {
diff --git a/sci-libs/libcmatrix/files/3.2.1-minuit2.patch b/sci-libs/libcmatrix/files/3.2.1-minuit2.patch
deleted file mode 100644
index 24dc562..0000000
--- a/sci-libs/libcmatrix/files/3.2.1-minuit2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure-libraries.ac 2008-03-04 00:48:46.000000000 +0100
-+++ configure-libraries.ac.new 2009-03-19 18:22:21.000000000 +0100
-@@ -14,8 +14,8 @@
- fi
- if test x$FOUNDMINUIT = xyes; then
- AC_CHECK_LIB(lcg_Minuit,main,,
-- AC_CHECK_LIB(Minuit,main,,FOUNDMINUIT=no
-- AC_MSG_WARN([Minuit library (liblcg_Minuit or libMinuit) not found
-+ AC_CHECK_LIB(Minuit2,main,,FOUNDMINUIT=no
-+ AC_MSG_WARN([Minuit library (liblcg_Minuit or libMinuit2) not found
- Is LDFLAGS is defined to include relevant directory?])))
- if test x$FOUNDMINUIT = xyes; then
- AC_DEFINE(HAVE_LIBMINUIT)
-
diff --git a/sci-libs/libcmatrix/files/3.2.1-shared.patch b/sci-libs/libcmatrix/files/3.2.1-shared.patch
deleted file mode 100644
index 4e84302..0000000
--- a/sci-libs/libcmatrix/files/3.2.1-shared.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 1361371..1448e76 100755
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -13,8 +13,8 @@ AR=@AR@
-
- # You shouldn't need to alter anything below here
-
--COMPILE=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c
--ALLOPTFLAGS=$(OPTFLAGS) -DNDEBUG
-+COMPILE=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -c
-+#ALLOPTFLAGS=$(OPTFLAGS) -DNDEBUG
-
- LOCALOBJS= local/CrystalSystem.o local/CrystalGeneric.o local/MoleculeStructure.o
- COREOBJS= coredefs/complex.o coredefs/common.o coredefs/diagonal.o coredefs/diagonalise.o coredefs/power.o coredefs/invert.o coredefs/transforms.o coredefs/blocking.o coredefs/mixed.o coredefs/realtransforms.o coredefs/Chebyshev.o
-@@ -36,7 +36,7 @@ ALLTHROBJS=$(UNSAFEOBJS:.o=_r.o) $(ALLSAFEOBJS)
-
- ROOT=..
-
--first: lib/libcmatrix.a
-+first: lib/libcmatrix.so.3.2.1
-
- #%.o: %.f
- # @F77@ @FFLAGS@ -c -o $@ $<
-@@ -68,25 +68,25 @@ tempclean:
- # -cd optim; @CLEAN@
- # -cd local; @CLEAN@
-
--lib/libcmatrix.a: $(ALLNORMOBJS)
-- $(AR) $@ $(ALLNORMOBJS)
-- chmod a+rx $@
-- $(RANLIB) $@
--
--lib/libcmatrix_p.a: $(ALLPROFOBJS)
-- $(AR) $@ $(ALLPROFOBJS)
-- chmod a+rx $@
-- $(RANLIB) $@
--
--lib/libcmatrix-g.a: $(ALLGOBJS)
-- $(AR) $@ $(ALLGOBJS)
-- chmod a+rx $@
-- $(RANLIB) $@
--
--lib/libcmatrix_r.a: $(ALLTHROBJS)
-- $(AR) @MTFLAGS@ $@ $(ALLTHROBJS)
-- chmod a+rx $@
-- $(RANLIB) $@
-+lib/libcmatrix.so.3.2.1: $(ALLNORMOBJS)
-+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLNORMOBJS) @ATLAS_LIBS@
-+ ln -sf libcmatrix.so.3.2.1 lib/libcmatrix.so.3
-+ ln -sf libcmatrix.so.3.2.1 lib/libcmatrix.so
-+
-+lib/libcmatrix_p.so.3.2.1: $(ALLPROFOBJS)
-+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLPROFOBJS) @ATLAS_LIBS@
-+ ln -sf libcmatrix_p.so.3.2.1 lib/libcmatrix_p.so.3
-+ ln -sf libcmatrix_p.so.3.2.1 lib/libcmatrix_p.so
-+
-+lib/libcmatrix-g.so.3.2.1: $(ALLGOBJS)
-+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLGOBJS) @ATLAS_LIBS@
-+ ln -sf libcmatrix-g.so.3.2.1 lib/libcmatrix-g.so.3
-+ ln -sf libcmatrix-g.so.3.2.1 lib/libcmatrix-g.so
-+
-+lib/libcmatrix.so_r.3.2.1: $(ALLTHROBJS)
-+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLTHROBJS) @ATLAS_LIBS@
-+ ln -sf libcmatrix_r.so.3.2.1 lib/libcmatrix_r.so.3
-+ ln -sf libcmatrix_r.so.3.2.1 lib/libcmatrix_r.so
-
- @CONFIGLEAF@.tar.gz:
- cd $(ROOT) ; tar --exclude lib/* --exclude *.o --exclude=*~ --exclude=Makefile --exclude=include/config.h --exclude=config.status -cvf @CONFIGLEAF@.tar @CONFIGLEAF@
-diff --git a/configure.ac b/configure.ac
-index c0ae0e1..50dcd5a 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,5 +1,6 @@
- AC_INIT(configure.ac)
- AC_CONFIG_HEADER(include/config.h)
-+LT_INIT
-
- DEFAR="ar ru"
- MAKEEXTRA=
diff --git a/sci-libs/libcmatrix/files/3.9.0-atlas.patch b/sci-libs/libcmatrix/files/3.9.0-atlas.patch
deleted file mode 100644
index 329e794..0000000
--- a/sci-libs/libcmatrix/files/3.9.0-atlas.patch
+++ /dev/null
@@ -1,24 +0,0 @@
- configure-libraries.ac | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/configure-libraries.ac b/configure-libraries.ac
-index 6e9579d..a919398 100755
---- a/configure-libraries.ac
-+++ b/configure-libraries.ac
-@@ -33,6 +33,7 @@ AC_ARG_WITH(atlas,
- AS_HELP_STRING([--with-atlas],[use the ATLAS BLAS library (default-use if found)]),,with_atlas=check)
- if test x$with_atlas != xno; then
- FOUNDATLAS=yes
-+ PKG_CHECK_MODULES([ATLAS], [cblas])
- AC_CHECK_HEADERS(cblas.h,,FOUNDATLAS=no
- AC_MSG_WARN([ATLAS header files (cblas.h) not found
- Is CPPFLAGS is defined to include relevant directory?]))
-@@ -40,7 +41,7 @@ Is CPPFLAGS is defined to include relevant directory?]))
- AC_MSG_WARN([ATLAS library (libatlas.a) not found
- Is LDFLAGS is defined to include relevant directory?]))
- if test x$FOUNDATLAS = xyes; then
-- LIBS="-lcblas $LIBS"
-+ LIBS="$ATLAS_LIBS $LIBS"
- CXXFLAGS="$CXXFLAGS -DLCM_USE_EXTERNAL"
- else
- if test x$with_atlas = xyes; then
diff --git a/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild b/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild
deleted file mode 100644
index 885e822..0000000
--- a/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcmatrix/libcmatrix-3.11.0.ebuild,v 1.5 2012/12/27 18:30:44 jlec Exp $
-
-EAPI="3"
-
-inherit autotools eutils
-
-MY_P="${PN}${PV}_lite"
-
-DESCRIPTION="lite version of pNMRsim"
-HOMEPAGE="http://www.dur.ac.uk/paul.hodgkinson/pNMRsim/"
-#SRC_URI="${HOMEPAGE}/${MY_P}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="sse threads"
-
-RDEPEND="
- sci-libs/atlas[lapack]
- sci-libs/minuit"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${PN}R3
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PV}-shared.patch \
- "${FILESDIR}"/3.2.1-minuit2.patch \
- "${FILESDIR}"/3.2.1-gcc4.4.patch \
- "${FILESDIR}"/3.2.1-gcc4.6.patch \
- "${FILESDIR}"/3.2.1-gcc4.7.patch \
- "${FILESDIR}"/3.9.0-atlas.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-minuit \
- --with-atlas \
- --with-sysroot="${EROOT}" \
- $(use_with sse) \
- $(use_with threads)
-}
-
-src_install() {
- dolib.so lib/*.so* || die "install failed"
-
- insinto /usr/include/${PN}R3
- doins include/* || die "no includes"
-
- dodoc CHANGES docs/* || die "no docs"
-}
diff --git a/sci-libs/libcmatrix/metadata.xml b/sci-libs/libcmatrix/metadata.xml
deleted file mode 100644
index 5ef07a3..0000000
--- a/sci-libs/libcmatrix/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>sci</herd>
- <maintainer>
- <email>jlec@gentoo.org</email>
- </maintainer>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-03-08 10:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-08 10:01 [gentoo-commits] proj/sci:master commit in: sci-libs/libcmatrix/files/, sci-libs/libcmatrix/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2011-08-31 14:03 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox