[gentoo-commits] proj/sci:master commit in: sci-chemistry/simpson/files/, sci-chemistry/simpson/

[Justin Lecher]

commit:     85c49f7d25ad36be2ee4ed276874aab260ba15da
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 14:27:41 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 14:27:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=85c49f7d

Version BUmp, added missing dep, found by louic and reported in irc

(Portage version: 2.2.0_alpha79/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-chemistry/simpson/ChangeLog                    |    6 ++++
 sci-chemistry/simpson/files/3.1.0-gentoo.patch     |   32 ++++++++++++++++++++
 sci-chemistry/simpson/simpson-3.0.1.ebuild         |    1 +
 .../{simpson-3.0.1.ebuild => simpson-3.1.0.ebuild} |    5 ++-
 4 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/simpson/ChangeLog b/sci-chemistry/simpson/ChangeLog
index cc55b16..33b30cf 100644
--- a/sci-chemistry/simpson/ChangeLog
+++ b/sci-chemistry/simpson/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*simpson-3.1.0 (29 Nov 2011)
+
+  29 Nov 2011; Justin Lecher <jlec@g.o> +files/3.1.0-gentoo.patch,
+  simpson-3.0.1.ebuild, +simpson-3.1.0.ebuild:
+  Version BUmp, added missing dep, found by louic and reported in irc
+
   25 Oct 2011; Justin Lecher <jlec@g.o> metadata.xml:
   Removed no-herd from herd tag in metadata.xml
 

diff --git a/sci-chemistry/simpson/files/3.1.0-gentoo.patch b/sci-chemistry/simpson/files/3.1.0-gentoo.patch
new file mode 100644
index 0000000..f8133cb
--- /dev/null
+++ b/sci-chemistry/simpson/files/3.1.0-gentoo.patch
@@ -0,0 +1,32 @@
+ Makefile |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7206ba5..832e76a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -11,9 +11,9 @@ BINDIR = /usr/bin
+ #LIBRARIES = -lm *.dll
+ 
+ # Linux
+-#INCLUDES = -I/usr/include/tcl8.4
+-#LIBRARIES = -lm -llapack -lblas -ltcl8.4
+-#BINDIR = /usr/local/bin
++INCLUDES = -I@GENTOO_PORTAGE_EPREFIX@/usr/include/
++BLASLIBS = `pkg-config --libs blas lapack`
++LIBRARIES = -lm ${BLASLIBS} -ltcl
+ 
+ # Linux MPI 
+ #INCLUDES = -I/usr/include/tcl8.4 -I/com/intel/mkl/10.1.1.019/include/ 
+@@ -38,9 +38,9 @@ TAR = tar
+ MKDIR = mkdir
+ 
+ simpson: $(OBJ)
+-	$(CC) $(LIBRARIES) $(OBJ) -o simpson
++	$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBRARIES)
+ .c.o:
+-	$(CC) $(FLAGS) $(EXTRA_FLAGS) $(INCLUDES) -DVERSION=\"$(VERSION)\" $<
++	$(CC) $(CFLAGS) $(EXTRA_FLAGS) $(INCLUDES) -DVERSION=\"$(VERSION)\" -c $<
+ clean:
+ 	$(RM) -f *.o simpson
+ dist:

diff --git a/sci-chemistry/simpson/simpson-3.0.1.ebuild b/sci-chemistry/simpson/simpson-3.0.1.ebuild
index 3a7f745..b2d5a0e 100644
--- a/sci-chemistry/simpson/simpson-3.0.1.ebuild
+++ b/sci-chemistry/simpson/simpson-3.0.1.ebuild
@@ -18,6 +18,7 @@ IUSE="gtk threads tk"
 RDEPEND="
 	dev-libs/libf2c
 	virtual/blas
+	virtual/cblas
 	virtual/lapack
 	gtk? ( x11-libs/gtk+:1 )
 	tk? ( dev-lang/tk )"

diff --git a/sci-chemistry/simpson/simpson-3.0.1.ebuild b/sci-chemistry/simpson/simpson-3.1.0.ebuild
similarity index 85%
copy from sci-chemistry/simpson/simpson-3.0.1.ebuild
copy to sci-chemistry/simpson/simpson-3.1.0.ebuild
index 3a7f745..b46c559 100644
--- a/sci-chemistry/simpson/simpson-3.0.1.ebuild
+++ b/sci-chemistry/simpson/simpson-3.1.0.ebuild
@@ -8,7 +8,7 @@ inherit eutils prefix
 
 DESCRIPTION="General-purpose software package for simulation virtually all kinds of solid-state NMR experiments"
 HOMEPAGE="http://bionmr.chem.au.dk/bionmr/software/index.php"
-SRC_URI="http://www.bionmr.chem.au.dk/download/${PN}/3.0/${PN}-source-${PV}.tgz"
+SRC_URI="http://www.bionmr.chem.au.dk/download/${PN}/3.1/${PN}-source-${PV}.tbz2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
@@ -18,6 +18,7 @@ IUSE="gtk threads tk"
 RDEPEND="
 	dev-libs/libf2c
 	virtual/blas
+	virtual/cblas
 	virtual/lapack
 	gtk? ( x11-libs/gtk+:1 )
 	tk? ( dev-lang/tk )"
@@ -28,7 +29,7 @@ S="${WORKDIR}"/${PN}-source-${PV}
 src_prepare() {
 	edos2unix Makefile
 	epatch "${FILESDIR}"/${PV}-gentoo.patch
-	epatch "${FILESDIR}"/${PV}-type.patch
+	epatch "${FILESDIR}"/3.0.1-type.patch
 	eprefixify Makefile
 }