public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/simpson/files/, sci-chemistry/simpson/
@ 2011-11-29 14:41 Justin Lecher
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2011-11-29 14:41 UTC (permalink / raw
  To: gentoo-commits

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

Another Version bump

(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.2-gentoo.patch |  114 ++++++++++++++++++++++++
 sci-chemistry/simpson/simpson-3.1.2.ebuild     |   44 +++++++++
 3 files changed, 164 insertions(+), 0 deletions(-)

diff --git a/sci-chemistry/simpson/ChangeLog b/sci-chemistry/simpson/ChangeLog
index 33b30cf..16c557e 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.2 (29 Nov 2011)
+
+  29 Nov 2011; Justin Lecher <jlec@gentoo.org> +files/3.1.2-gentoo.patch,
+  +simpson-3.1.2.ebuild:
+  Another Version bump
+
 *simpson-3.1.0 (29 Nov 2011)
 
   29 Nov 2011; Justin Lecher <jlec@gentoo.org> +files/3.1.0-gentoo.patch,

diff --git a/sci-chemistry/simpson/files/3.1.2-gentoo.patch b/sci-chemistry/simpson/files/3.1.2-gentoo.patch
new file mode 100644
index 0000000..34cd2b1
--- /dev/null
+++ b/sci-chemistry/simpson/files/3.1.2-gentoo.patch
@@ -0,0 +1,114 @@
+ Makefile |  106 +++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 53 insertions(+), 53 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 216955d..ba54573 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,53 +1,53 @@
+-VERSION = 3.1.2
+-
+-# Mac OS X
+-INCLUDES = -I/usr/include/tcl8.5
+-LIBRARIES = -lm -framework Accelerate -framework Tcl
+-EXTRA_FLAGS = -DNO_CONST
+-BINDIR = /usr/bin
+-
+-# Windows
+-#INCLUDES = -IC:/Tcl/include -I../CBLAS/src
+-#LIBRARIES = -lm *.dll
+-
+-# Linux (Ubuntu 10.?)
+-#INCLUDES = -I/usr/include/tcl8.4
+-#LIBRARIES = -lm -llapack -lblas -ltcl8.4
+-#BINDIR = /usr/local/bin
+-
+-# Linux MPI 
+-#INCLUDES = -I/usr/include/tcl8.4 -I/com/intel/mkl/10.1.1.019/include/ 
+-#LIBRARIES = -L/com/intel/mkl/10.1.1.019/lib/em64t -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -lmkl_lapack -liomp5 -ltcl8.4 -lm
+-#CC = mpicc
+-#EXTRA_FLAGS = -DMKL_INTEL -DMPI
+-
+-SRC = B0inhom.c crystdat.c gd.c iodata.c relax.c spinsys.c \
+-OCroutines.c csa.c  gdfontg.c isotopes.c restrict.c tclcode.c \
+-cm_new.c csastat.c gdfontl.c main.c rfprof.c tclutil.c \
+-cmblock.c fft.c  gdfontmb.c matrix_new.c rfshapes.c wigner.c \
+-complx.c fidcalc.c gdfonts.c new_direct.c sim.c  zte.c \
+-contour.c fit.c  gdfontt.c pulse.c simplex.c \
+-cryst.c ftools.c ham.c  readsys.c simpson.c
+-OBJ = $(SRC:.c=.o)
+-CC = gcc
+-STRIP = strip
+-CP = cp
+-FLAGS = -c -O3
+-RM = rm
+-TAR = tar
+-MKDIR = mkdir
+-
+-simpson: $(OBJ)
+-	$(CC) $(LIBRARIES) $(OBJ) -o simpson
+-.c.o:
+-	$(CC) $(FLAGS) $(EXTRA_FLAGS) $(INCLUDES) -DVERSION=\"$(VERSION)\" $<
+-clean:
+-	$(RM) -f *.o simpson
+-dist:
+-	$(MKDIR) simpson-source-$(VERSION)
+-	$(CP) -r *.c *.h simpson.xcodeproj Makefile simpson-source-$(VERSION)
+-	$(TAR) cvjf simpson-source-$(VERSION).tbz2 simpson-source-$(VERSION)
+-	$(RM) -fr simpson-source-$(VERSION)
+-install:
+-	$(STRIP) simpson
+-	$(CP) simpson $(BINDIR)
++VERSION = 3.1.2
++
++# Mac OS X
++INCLUDES = -I/usr/include/tcl8.5
++LIBRARIES = -lm -framework Accelerate -framework Tcl
++EXTRA_FLAGS = -DNO_CONST
++BINDIR = /usr/bin
++
++# Windows
++#INCLUDES = -IC:/Tcl/include -I../CBLAS/src
++#LIBRARIES = -lm *.dll
++
++# Linux
++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/ 
++#LIBRARIES = -L/com/intel/mkl/10.1.1.019/lib/em64t -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -lmkl_lapack -liomp5 -ltcl8.4 -lm
++#CC = mpicc
++#EXTRA_FLAGS = -DMKL_INTEL -DMPI
++
++SRC = B0inhom.c crystdat.c gd.c iodata.c relax.c spinsys.c \
++OCroutines.c csa.c  gdfontg.c isotopes.c restrict.c tclcode.c \
++cm_new.c csastat.c gdfontl.c main.c rfprof.c tclutil.c \
++cmblock.c fft.c  gdfontmb.c matrix_new.c rfshapes.c wigner.c \
++complx.c fidcalc.c gdfonts.c new_direct.c sim.c  zte.c \
++contour.c fit.c  gdfontt.c pulse.c simplex.c \
++cryst.c ftools.c ham.c  readsys.c simpson.c
++OBJ = $(SRC:.c=.o)
++CC = gcc
++STRIP = strip
++CP = cp
++FLAGS = -c -O3
++RM = rm
++TAR = tar
++MKDIR = mkdir
++
++simpson: $(OBJ)
++	$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBRARIES)
++.c.o:
++	$(CC) $(CFLAGS) $(EXTRA_FLAGS) $(INCLUDES) -DVERSION=\"$(VERSION)\" -c $<
++clean:
++	$(RM) -f *.o simpson
++dist:
++	$(MKDIR) simpson-source-$(VERSION)
++	$(CP) -r *.c *.h simpson.xcodeproj Makefile simpson-source-$(VERSION)
++	$(TAR) cvjf simpson-source-$(VERSION).tbz2 simpson-source-$(VERSION)
++	$(RM) -fr simpson-source-$(VERSION)
++install:
++	$(STRIP) simpson
++	$(CP) simpson $(BINDIR)

diff --git a/sci-chemistry/simpson/simpson-3.1.2.ebuild b/sci-chemistry/simpson/simpson-3.1.2.ebuild
new file mode 100644
index 0000000..b46c559
--- /dev/null
+++ b/sci-chemistry/simpson/simpson-3.1.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+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.1/${PN}-source-${PV}.tbz2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+LICENSE="GPL-2"
+IUSE="gtk threads tk"
+
+RDEPEND="
+	dev-libs/libf2c
+	virtual/blas
+	virtual/cblas
+	virtual/lapack
+	gtk? ( x11-libs/gtk+:1 )
+	tk? ( dev-lang/tk )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${PN}-source-${PV}
+
+src_prepare() {
+	edos2unix Makefile
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
+	epatch "${FILESDIR}"/3.0.1-type.patch
+	eprefixify Makefile
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+}



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/simpson/files/, sci-chemistry/simpson/
@ 2017-01-12 19:27 Justin Lecher
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2017-01-12 19:27 UTC (permalink / raw
  To: gentoo-commits

commit:     0a1f117b51e7e096dcbf6972a0bc4c549f453dde
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 19:27:12 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 19:27:12 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=0a1f117b

Drop old package

Requires gtk:1

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-chemistry/simpson/files/3.0.1-gentoo.patch |  28 ------
 sci-chemistry/simpson/files/3.0.1-type.patch   | 110 ------------------------
 sci-chemistry/simpson/files/3.1.0-gentoo.patch |  32 -------
 sci-chemistry/simpson/files/3.1.2-gentoo.patch | 114 -------------------------
 sci-chemistry/simpson/metadata.xml             |   8 --
 sci-chemistry/simpson/simpson-3.0.1.ebuild     |  47 ----------
 sci-chemistry/simpson/simpson-3.1.0.ebuild     |  47 ----------
 sci-chemistry/simpson/simpson-3.1.2.ebuild     |  47 ----------
 8 files changed, 433 deletions(-)

diff --git a/sci-chemistry/simpson/files/3.0.1-gentoo.patch b/sci-chemistry/simpson/files/3.0.1-gentoo.patch
deleted file mode 100644
index 77c886d..0000000
--- a/sci-chemistry/simpson/files/3.0.1-gentoo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Makefile b/Makefile
-index c5f6fcf..25e328f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -7,8 +7,9 @@ C_OBJS = *.o
- #INCLUDES = -IC:/Tcl/include -I../CBLAS/src
- #LIBRARIES = -lm *.dll
- # LINUX:
--INCLUDES = -I/usr/include/tcl8.5
--LIBRARIES = -lm -lgslcblas -llapack -ltcl8.5
-+INCLUDES = -I@GENTOO_PORTAGE_EPREFIX@/usr/include/
-+BLASLIBS = `$(PKG_CONFIG) --libs cblas lapack`
-+LIBRARIES = -lm ${BLASLIBS} -ltcl
- 
- FLAGS = -c -O3
- CC = gcc
-@@ -16,9 +17,9 @@ RM = rm
- TAR = tar
- 
- simpson: $(C_OBJS)
--	$(CC) $(LIBRARIES) $(C_OBJS) -o simpson 
-+	$(CC) $(LDFLAGS) -o simpson $(C_OBJS) $(LIBRARIES)
- $(C_OBJS):
--	$(CC) $(FLAGS) $(INCLUDES) *.c
-+	$(CC) $(CFLAGS) $(INCLUDES) -c *.c
- clean:
- 	$(RM) -f *.o simpson
- dist:

diff --git a/sci-chemistry/simpson/files/3.0.1-type.patch b/sci-chemistry/simpson/files/3.0.1-type.patch
deleted file mode 100644
index 3f6cc70..0000000
--- a/sci-chemistry/simpson/files/3.0.1-type.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff --git a/OCroutines.c b/OCroutines.c
-index eef6849..60ef56c 100644
---- a/OCroutines.c
-+++ b/OCroutines.c
-@@ -11,6 +11,7 @@
- #include "iodata.h"
- #include "tclutil.h"
- #include "B0inhom.h"
-+#include "defs_blas_lapack.h"
- 
- /* global variable holding all OC parameters */
- OCoptPars OCpar;
-diff --git a/contour.c b/contour.c
-index ec5a223..87ae8ee 100644
---- a/contour.c
-+++ b/contour.c
-@@ -242,7 +242,8 @@ DEFINE_CMD(FContour)
-   double lowcolor[3], highcolor[3], xmin, xmax, ymin, ymax;
-   double *levels, x1, y1, x2, y2, cl, r1, r2, fmax;
-   double *xpos, *ypos, **z, iratio, jratio, nlowcolor[3], nhighcolor[3];
--  char outputfile[256], **av;
-+  char outputfile[256];
-+  const char **av;
-   FILE *file;
-   FD *fdp;
-   Point *p, **pp;
-diff --git a/ftools.c b/ftools.c
-index 682e475..3c150d6 100644
---- a/ftools.c
-+++ b/ftools.c
-@@ -1434,7 +1434,8 @@ int tclFRms(ClientData data,Tcl_Interp* interp,int argc, char *argv[])
-   double2 *vec,*vec2;
-   double v1,v2;
-   int part;
--  char **par,**par2,*range;
-+  char *range;
-+  const char **par,**par2;
-   int i,i1,i2,npar,npar2;
-   double sumrms,sumint;
- 
-diff --git a/ham.c b/ham.c
-index 5be9dd1..5d36bdc 100644
---- a/ham.c
-+++ b/ham.c
-@@ -34,6 +34,7 @@
- #include "cm_new.h"
- #include "ham.h"
- #include "defs.h"
-+#include "defs_blas_lapack.h"
- 
- /*
-   Allocation strategy:
-diff --git a/matrix_new.c b/matrix_new.c
-index c0aaad2..2f3f370 100644
---- a/matrix_new.c
-+++ b/matrix_new.c
-@@ -24,6 +24,7 @@
- 
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #include "complx.h"
- #include "matrix_new.h"
- 
-diff --git a/new_direct.c b/new_direct.c
-index 24502f2..cc5fd68 100644
---- a/new_direct.c
-+++ b/new_direct.c
-@@ -1,4 +1,5 @@
- #include "new_direct.h"
-+#include "defs_blas_lapack.h"
- 
- /* make visible global variable pulse */
- extern Pulse* puls;
-diff --git a/pulse.c b/pulse.c
-index f40787c..335d225 100644
---- a/pulse.c
-+++ b/pulse.c
-@@ -43,6 +43,7 @@
- #include "OCroutines.h"
- #include "B0inhom.h"
- #include "relax.h"
-+#include "defs_blas_lapack.h"
- 
- /*
-   tpropstart_usec : the time when the propagator was reset last time
-diff --git a/wigner.c b/wigner.c
-index bacf4b8..1644aaf 100644
---- a/wigner.c
-+++ b/wigner.c
-@@ -27,6 +27,7 @@
- #include <math.h>
- #include "complx.h"
- #include <stdio.h>
-+#include <stdlib.h>
- #include "defs.h"
- #include "matrix_new.h"
- //#include "defs_blas_lapack.h"
-diff --git a/zte.c b/zte.c
-index 77dcb87..6025fa4 100644
---- a/zte.c
-+++ b/zte.c
-@@ -2,6 +2,7 @@
- #include <stdlib.h>
- #include "cm_new.h"
- #include "pulse.h"
-+#include "tclutil.h"
- 
- typedef struct _ZTEstruct {
-    mv_complx *rho0, *sigma;

diff --git a/sci-chemistry/simpson/files/3.1.0-gentoo.patch b/sci-chemistry/simpson/files/3.1.0-gentoo.patch
deleted file mode 100644
index 7675d79..0000000
--- a/sci-chemistry/simpson/files/3.1.0-gentoo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
- 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 cblas 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/files/3.1.2-gentoo.patch b/sci-chemistry/simpson/files/3.1.2-gentoo.patch
deleted file mode 100644
index d81daea..0000000
--- a/sci-chemistry/simpson/files/3.1.2-gentoo.patch
+++ /dev/null
@@ -1,114 +0,0 @@
- Makefile |  106 +++++++++++++++++++++++++++++++-------------------------------
- 1 files changed, 53 insertions(+), 53 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 216955d..ba54573 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,53 +1,53 @@
--VERSION = 3.1.2
--
--# Mac OS X
--INCLUDES = -I/usr/include/tcl8.5
--LIBRARIES = -lm -framework Accelerate -framework Tcl
--EXTRA_FLAGS = -DNO_CONST
--BINDIR = /usr/bin
--
--# Windows
--#INCLUDES = -IC:/Tcl/include -I../CBLAS/src
--#LIBRARIES = -lm *.dll
--
--# Linux (Ubuntu 10.?)
--#INCLUDES = -I/usr/include/tcl8.4
--#LIBRARIES = -lm -llapack -lblas -ltcl8.4
--#BINDIR = /usr/local/bin
--
--# Linux MPI 
--#INCLUDES = -I/usr/include/tcl8.4 -I/com/intel/mkl/10.1.1.019/include/ 
--#LIBRARIES = -L/com/intel/mkl/10.1.1.019/lib/em64t -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -lmkl_lapack -liomp5 -ltcl8.4 -lm
--#CC = mpicc
--#EXTRA_FLAGS = -DMKL_INTEL -DMPI
--
--SRC = B0inhom.c crystdat.c gd.c iodata.c relax.c spinsys.c \
--OCroutines.c csa.c  gdfontg.c isotopes.c restrict.c tclcode.c \
--cm_new.c csastat.c gdfontl.c main.c rfprof.c tclutil.c \
--cmblock.c fft.c  gdfontmb.c matrix_new.c rfshapes.c wigner.c \
--complx.c fidcalc.c gdfonts.c new_direct.c sim.c  zte.c \
--contour.c fit.c  gdfontt.c pulse.c simplex.c \
--cryst.c ftools.c ham.c  readsys.c simpson.c
--OBJ = $(SRC:.c=.o)
--CC = gcc
--STRIP = strip
--CP = cp
--FLAGS = -c -O3
--RM = rm
--TAR = tar
--MKDIR = mkdir
--
--simpson: $(OBJ)
--	$(CC) $(LIBRARIES) $(OBJ) -o simpson
--.c.o:
--	$(CC) $(FLAGS) $(EXTRA_FLAGS) $(INCLUDES) -DVERSION=\"$(VERSION)\" $<
--clean:
--	$(RM) -f *.o simpson
--dist:
--	$(MKDIR) simpson-source-$(VERSION)
--	$(CP) -r *.c *.h simpson.xcodeproj Makefile simpson-source-$(VERSION)
--	$(TAR) cvjf simpson-source-$(VERSION).tbz2 simpson-source-$(VERSION)
--	$(RM) -fr simpson-source-$(VERSION)
--install:
--	$(STRIP) simpson
--	$(CP) simpson $(BINDIR)
-+VERSION = 3.1.2
-+
-+# Mac OS X
-+INCLUDES = -I/usr/include/tcl8.5
-+LIBRARIES = -lm -framework Accelerate -framework Tcl
-+EXTRA_FLAGS = -DNO_CONST
-+BINDIR = /usr/bin
-+
-+# Windows
-+#INCLUDES = -IC:/Tcl/include -I../CBLAS/src
-+#LIBRARIES = -lm *.dll
-+
-+# Linux
-+INCLUDES = -I@GENTOO_PORTAGE_EPREFIX@/usr/include/
-+BLASLIBS = `$(PKG_CONFIG) --libs cblas lapack`
-+LIBRARIES = -lm ${BLASLIBS} -ltcl
-+
-+# Linux MPI 
-+#INCLUDES = -I/usr/include/tcl8.4 -I/com/intel/mkl/10.1.1.019/include/ 
-+#LIBRARIES = -L/com/intel/mkl/10.1.1.019/lib/em64t -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -lmkl_lapack -liomp5 -ltcl8.4 -lm
-+#CC = mpicc
-+#EXTRA_FLAGS = -DMKL_INTEL -DMPI
-+
-+SRC = B0inhom.c crystdat.c gd.c iodata.c relax.c spinsys.c \
-+OCroutines.c csa.c  gdfontg.c isotopes.c restrict.c tclcode.c \
-+cm_new.c csastat.c gdfontl.c main.c rfprof.c tclutil.c \
-+cmblock.c fft.c  gdfontmb.c matrix_new.c rfshapes.c wigner.c \
-+complx.c fidcalc.c gdfonts.c new_direct.c sim.c  zte.c \
-+contour.c fit.c  gdfontt.c pulse.c simplex.c \
-+cryst.c ftools.c ham.c  readsys.c simpson.c
-+OBJ = $(SRC:.c=.o)
-+CC = gcc
-+STRIP = strip
-+CP = cp
-+FLAGS = -c -O3
-+RM = rm
-+TAR = tar
-+MKDIR = mkdir
-+
-+simpson: $(OBJ)
-+	$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBRARIES)
-+.c.o:
-+	$(CC) $(CFLAGS) $(EXTRA_FLAGS) $(INCLUDES) -DVERSION=\"$(VERSION)\" -c $<
-+clean:
-+	$(RM) -f *.o simpson
-+dist:
-+	$(MKDIR) simpson-source-$(VERSION)
-+	$(CP) -r *.c *.h simpson.xcodeproj Makefile simpson-source-$(VERSION)
-+	$(TAR) cvjf simpson-source-$(VERSION).tbz2 simpson-source-$(VERSION)
-+	$(RM) -fr simpson-source-$(VERSION)
-+install:
-+	$(STRIP) simpson
-+	$(CP) simpson $(BINDIR)

diff --git a/sci-chemistry/simpson/metadata.xml b/sci-chemistry/simpson/metadata.xml
deleted file mode 100644
index 8937bad..0000000
--- a/sci-chemistry/simpson/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>
-  <maintainer type="project">
-    <email>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-</pkgmetadata>

diff --git a/sci-chemistry/simpson/simpson-3.0.1.ebuild b/sci-chemistry/simpson/simpson-3.0.1.ebuild
deleted file mode 100644
index 9fa6926..0000000
--- a/sci-chemistry/simpson/simpson-3.0.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils prefix toolchain-funcs
-
-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"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-LICENSE="GPL-2"
-IUSE="gtk threads tk"
-
-RDEPEND="
-	dev-libs/libf2c
-	virtual/blas
-	virtual/cblas
-	virtual/lapack
-	gtk? ( x11-libs/gtk+:1 )
-	tk? ( dev-lang/tk:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${PN}-source-${PV}
-
-src_prepare() {
-	tc-export PKG_CONFIG
-	edos2unix Makefile
-	epatch \
-		"${FILESDIR}"/${PV}-gentoo.patch \
-		"${FILESDIR}"/${PV}-type.patch
-	eprefixify Makefile
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-}

diff --git a/sci-chemistry/simpson/simpson-3.1.0.ebuild b/sci-chemistry/simpson/simpson-3.1.0.ebuild
deleted file mode 100644
index 520ce7d..0000000
--- a/sci-chemistry/simpson/simpson-3.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils prefix toolchain-funcs
-
-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.1/${PN}-source-${PV}.tbz2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-LICENSE="GPL-2"
-IUSE="gtk threads tk"
-
-RDEPEND="
-	dev-libs/libf2c
-	virtual/blas
-	virtual/cblas
-	virtual/lapack
-	gtk? ( x11-libs/gtk+:1 )
-	tk? ( dev-lang/tk:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${PN}-source-${PV}
-
-src_prepare() {
-	tc-export PKG_CONFIG
-	edos2unix Makefile
-	epatch \
-		"${FILESDIR}"/${PV}-gentoo.patch \
-		"${FILESDIR}"/3.0.1-type.patch
-	eprefixify Makefile
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-}

diff --git a/sci-chemistry/simpson/simpson-3.1.2.ebuild b/sci-chemistry/simpson/simpson-3.1.2.ebuild
deleted file mode 100644
index 520ce7d..0000000
--- a/sci-chemistry/simpson/simpson-3.1.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils prefix toolchain-funcs
-
-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.1/${PN}-source-${PV}.tbz2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-LICENSE="GPL-2"
-IUSE="gtk threads tk"
-
-RDEPEND="
-	dev-libs/libf2c
-	virtual/blas
-	virtual/cblas
-	virtual/lapack
-	gtk? ( x11-libs/gtk+:1 )
-	tk? ( dev-lang/tk:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${PN}-source-${PV}
-
-src_prepare() {
-	tc-export PKG_CONFIG
-	edos2unix Makefile
-	epatch \
-		"${FILESDIR}"/${PV}-gentoo.patch \
-		"${FILESDIR}"/3.0.1-type.patch
-	eprefixify Makefile
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/simpson/files/, sci-chemistry/simpson/
@ 2013-02-27 17:23 Justin Lecher
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2013-02-27 17:23 UTC (permalink / raw
  To: gentoo-commits

commit:     5aa4f6f7a3eb16cc92ef192bbde227e8326b7c82
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 27 17:03:50 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 17:03:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5aa4f6f7

sci-chemistry/simpson: Use PKG_CONFIG instead of generic pkg-config

Package-Manager: portage-2.2.0_alpha163

---
 sci-chemistry/simpson/ChangeLog                |    5 +++++
 sci-chemistry/simpson/files/3.0.1-gentoo.patch |    2 +-
 sci-chemistry/simpson/files/3.1.0-gentoo.patch |    2 +-
 sci-chemistry/simpson/files/3.1.2-gentoo.patch |    2 +-
 sci-chemistry/simpson/simpson-3.0.1.ebuild     |    3 ++-
 sci-chemistry/simpson/simpson-3.1.0.ebuild     |    3 ++-
 sci-chemistry/simpson/simpson-3.1.2.ebuild     |    3 ++-
 7 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/sci-chemistry/simpson/ChangeLog b/sci-chemistry/simpson/ChangeLog
index cbbfccd..386dae8 100644
--- a/sci-chemistry/simpson/ChangeLog
+++ b/sci-chemistry/simpson/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Feb 2013; Justin Lecher <jlec@gentoo.org> files/3.0.1-gentoo.patch,
+  files/3.1.0-gentoo.patch, files/3.1.2-gentoo.patch, simpson-3.0.1.ebuild,
+  simpson-3.1.0.ebuild, simpson-3.1.2.ebuild:
+  Use PKG_CONFIG instead of generic pkg-config
+
   22 Feb 2013; Justin Lecher <jlec@gentoo.org> simpson-3.0.1.ebuild,
   simpson-3.1.0.ebuild, simpson-3.1.2.ebuild, metadata.xml:
   Add missing dep on virtual/pkgconfig

diff --git a/sci-chemistry/simpson/files/3.0.1-gentoo.patch b/sci-chemistry/simpson/files/3.0.1-gentoo.patch
index 61d170f..77c886d 100644
--- a/sci-chemistry/simpson/files/3.0.1-gentoo.patch
+++ b/sci-chemistry/simpson/files/3.0.1-gentoo.patch
@@ -9,7 +9,7 @@ index c5f6fcf..25e328f 100644
 -INCLUDES = -I/usr/include/tcl8.5
 -LIBRARIES = -lm -lgslcblas -llapack -ltcl8.5
 +INCLUDES = -I@GENTOO_PORTAGE_EPREFIX@/usr/include/
-+BLASLIBS = `pkg-config --libs cblas lapack`
++BLASLIBS = `$(PKG_CONFIG) --libs cblas lapack`
 +LIBRARIES = -lm ${BLASLIBS} -ltcl
  
  FLAGS = -c -O3

diff --git a/sci-chemistry/simpson/files/3.1.0-gentoo.patch b/sci-chemistry/simpson/files/3.1.0-gentoo.patch
index 3424cb9..7675d79 100644
--- a/sci-chemistry/simpson/files/3.1.0-gentoo.patch
+++ b/sci-chemistry/simpson/files/3.1.0-gentoo.patch
@@ -13,7 +13,7 @@ index 7206ba5..832e76a 100644
 -#LIBRARIES = -lm -llapack -lblas -ltcl8.4
 -#BINDIR = /usr/local/bin
 +INCLUDES = -I@GENTOO_PORTAGE_EPREFIX@/usr/include/
-+BLASLIBS = `pkg-config --libs cblas lapack`
++BLASLIBS = `$(PKG_CONFIG) --libs cblas lapack`
 +LIBRARIES = -lm ${BLASLIBS} -ltcl
  
  # Linux MPI 

diff --git a/sci-chemistry/simpson/files/3.1.2-gentoo.patch b/sci-chemistry/simpson/files/3.1.2-gentoo.patch
index a820012..d81daea 100644
--- a/sci-chemistry/simpson/files/3.1.2-gentoo.patch
+++ b/sci-chemistry/simpson/files/3.1.2-gentoo.patch
@@ -73,7 +73,7 @@ index 216955d..ba54573 100644
 +
 +# Linux
 +INCLUDES = -I@GENTOO_PORTAGE_EPREFIX@/usr/include/
-+BLASLIBS = `pkg-config --libs cblas lapack`
++BLASLIBS = `$(PKG_CONFIG) --libs cblas lapack`
 +LIBRARIES = -lm ${BLASLIBS} -ltcl
 +
 +# Linux MPI 

diff --git a/sci-chemistry/simpson/simpson-3.0.1.ebuild b/sci-chemistry/simpson/simpson-3.0.1.ebuild
index 6b0911a..6777509 100644
--- a/sci-chemistry/simpson/simpson-3.0.1.ebuild
+++ b/sci-chemistry/simpson/simpson-3.0.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit eutils prefix
+inherit eutils prefix toolchain-funcs
 
 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"
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"/${PN}-source-${PV}
 
 src_prepare() {
+	tc-export PKG_CONFIG
 	edos2unix Makefile
 	epatch "${FILESDIR}"/${PV}-gentoo.patch
 	epatch "${FILESDIR}"/${PV}-type.patch

diff --git a/sci-chemistry/simpson/simpson-3.1.0.ebuild b/sci-chemistry/simpson/simpson-3.1.0.ebuild
index 5f73f9e..75e9f8e 100644
--- a/sci-chemistry/simpson/simpson-3.1.0.ebuild
+++ b/sci-chemistry/simpson/simpson-3.1.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit eutils prefix
+inherit eutils prefix toolchain-funcs
 
 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"
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"/${PN}-source-${PV}
 
 src_prepare() {
+	tc-export PKG_CONFIG
 	edos2unix Makefile
 	epatch "${FILESDIR}"/${PV}-gentoo.patch
 	epatch "${FILESDIR}"/3.0.1-type.patch

diff --git a/sci-chemistry/simpson/simpson-3.1.2.ebuild b/sci-chemistry/simpson/simpson-3.1.2.ebuild
index 5f73f9e..75e9f8e 100644
--- a/sci-chemistry/simpson/simpson-3.1.2.ebuild
+++ b/sci-chemistry/simpson/simpson-3.1.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit eutils prefix
+inherit eutils prefix toolchain-funcs
 
 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"
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"/${PN}-source-${PV}
 
 src_prepare() {
+	tc-export PKG_CONFIG
 	edos2unix Makefile
 	epatch "${FILESDIR}"/${PV}-gentoo.patch
 	epatch "${FILESDIR}"/3.0.1-type.patch


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/simpson/files/, sci-chemistry/simpson/
@ 2012-11-15 22:57 Justin Lecher
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2012-11-15 22:57 UTC (permalink / raw
  To: gentoo-commits

commit:     4aa30b80e37568a5c4dd376ca537769e18996e98
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 15 18:37:49 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Nov 15 18:37:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4aa30b80

sci-chemistry/simpson: Fix underlinking

Package-Manager: portage-2.2.0_alpha142

---
 sci-chemistry/simpson/ChangeLog                |    3 +++
 sci-chemistry/simpson/files/3.1.0-gentoo.patch |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/sci-chemistry/simpson/ChangeLog b/sci-chemistry/simpson/ChangeLog
index 9f1dcc5..2032a1f 100644
--- a/sci-chemistry/simpson/ChangeLog
+++ b/sci-chemistry/simpson/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Nov 2012; Justin Lecher <jlec@gentoo.org> files/3.1.0-gentoo.patch:
+  Fix underlinking
+
   30 May 2012; Justin Lecher <jlec@gentoo.org> files/3.1.2-gentoo.patch:
   Correct blas to cblas for linking
 

diff --git a/sci-chemistry/simpson/files/3.1.0-gentoo.patch b/sci-chemistry/simpson/files/3.1.0-gentoo.patch
index f8133cb..3424cb9 100644
--- a/sci-chemistry/simpson/files/3.1.0-gentoo.patch
+++ b/sci-chemistry/simpson/files/3.1.0-gentoo.patch
@@ -13,7 +13,7 @@ index 7206ba5..832e76a 100644
 -#LIBRARIES = -lm -llapack -lblas -ltcl8.4
 -#BINDIR = /usr/local/bin
 +INCLUDES = -I@GENTOO_PORTAGE_EPREFIX@/usr/include/
-+BLASLIBS = `pkg-config --libs blas lapack`
++BLASLIBS = `pkg-config --libs cblas lapack`
 +LIBRARIES = -lm ${BLASLIBS} -ltcl
  
  # Linux MPI 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/simpson/files/, sci-chemistry/simpson/
@ 2012-06-01 10:42 Justin Lecher
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2012-06-01 10:42 UTC (permalink / raw
  To: gentoo-commits

commit:     8d628d3363d9515958425df2f67bdbdf05012d87
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed May 30 06:27:01 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed May 30 06:27:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8d628d33

sci-chemistry/simpson: Correct blas to cblas for linking

(Portage version: 2.2.0_alpha108/git/Linux x86_64, unsigned Manifest commit)

---
 sci-chemistry/simpson/ChangeLog                |    5 +-
 sci-chemistry/simpson/files/3.1.2-gentoo.patch |   96 ++++++++++++------------
 2 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/sci-chemistry/simpson/ChangeLog b/sci-chemistry/simpson/ChangeLog
index 16c557e..9f1dcc5 100644
--- a/sci-chemistry/simpson/ChangeLog
+++ b/sci-chemistry/simpson/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-chemistry/simpson
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 May 2012; Justin Lecher <jlec@gentoo.org> files/3.1.2-gentoo.patch:
+  Correct blas to cblas for linking
+
 *simpson-3.1.2 (29 Nov 2011)
 
   29 Nov 2011; Justin Lecher <jlec@gentoo.org> +files/3.1.2-gentoo.patch,

diff --git a/sci-chemistry/simpson/files/3.1.2-gentoo.patch b/sci-chemistry/simpson/files/3.1.2-gentoo.patch
index 34cd2b1..a820012 100644
--- a/sci-chemistry/simpson/files/3.1.2-gentoo.patch
+++ b/sci-chemistry/simpson/files/3.1.2-gentoo.patch
@@ -59,56 +59,56 @@ index 216955d..ba54573 100644
 -install:
 -	$(STRIP) simpson
 -	$(CP) simpson $(BINDIR)
-+VERSION = 3.1.2
-+
-+# Mac OS X
-+INCLUDES = -I/usr/include/tcl8.5
-+LIBRARIES = -lm -framework Accelerate -framework Tcl
-+EXTRA_FLAGS = -DNO_CONST
-+BINDIR = /usr/bin
-+
-+# Windows
-+#INCLUDES = -IC:/Tcl/include -I../CBLAS/src
-+#LIBRARIES = -lm *.dll
-+
++VERSION = 3.1.2
++
++# Mac OS X
++INCLUDES = -I/usr/include/tcl8.5
++LIBRARIES = -lm -framework Accelerate -framework Tcl
++EXTRA_FLAGS = -DNO_CONST
++BINDIR = /usr/bin
++
++# Windows
++#INCLUDES = -IC:/Tcl/include -I../CBLAS/src
++#LIBRARIES = -lm *.dll
++
 +# Linux
 +INCLUDES = -I@GENTOO_PORTAGE_EPREFIX@/usr/include/
-+BLASLIBS = `pkg-config --libs blas lapack`
++BLASLIBS = `pkg-config --libs cblas lapack`
 +LIBRARIES = -lm ${BLASLIBS} -ltcl
-+
-+# Linux MPI 
-+#INCLUDES = -I/usr/include/tcl8.4 -I/com/intel/mkl/10.1.1.019/include/ 
-+#LIBRARIES = -L/com/intel/mkl/10.1.1.019/lib/em64t -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -lmkl_lapack -liomp5 -ltcl8.4 -lm
-+#CC = mpicc
-+#EXTRA_FLAGS = -DMKL_INTEL -DMPI
-+
-+SRC = B0inhom.c crystdat.c gd.c iodata.c relax.c spinsys.c \
-+OCroutines.c csa.c  gdfontg.c isotopes.c restrict.c tclcode.c \
-+cm_new.c csastat.c gdfontl.c main.c rfprof.c tclutil.c \
-+cmblock.c fft.c  gdfontmb.c matrix_new.c rfshapes.c wigner.c \
-+complx.c fidcalc.c gdfonts.c new_direct.c sim.c  zte.c \
-+contour.c fit.c  gdfontt.c pulse.c simplex.c \
-+cryst.c ftools.c ham.c  readsys.c simpson.c
-+OBJ = $(SRC:.c=.o)
-+CC = gcc
-+STRIP = strip
-+CP = cp
-+FLAGS = -c -O3
-+RM = rm
-+TAR = tar
-+MKDIR = mkdir
-+
-+simpson: $(OBJ)
++
++# Linux MPI 
++#INCLUDES = -I/usr/include/tcl8.4 -I/com/intel/mkl/10.1.1.019/include/ 
++#LIBRARIES = -L/com/intel/mkl/10.1.1.019/lib/em64t -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -lmkl_lapack -liomp5 -ltcl8.4 -lm
++#CC = mpicc
++#EXTRA_FLAGS = -DMKL_INTEL -DMPI
++
++SRC = B0inhom.c crystdat.c gd.c iodata.c relax.c spinsys.c \
++OCroutines.c csa.c  gdfontg.c isotopes.c restrict.c tclcode.c \
++cm_new.c csastat.c gdfontl.c main.c rfprof.c tclutil.c \
++cmblock.c fft.c  gdfontmb.c matrix_new.c rfshapes.c wigner.c \
++complx.c fidcalc.c gdfonts.c new_direct.c sim.c  zte.c \
++contour.c fit.c  gdfontt.c pulse.c simplex.c \
++cryst.c ftools.c ham.c  readsys.c simpson.c
++OBJ = $(SRC:.c=.o)
++CC = gcc
++STRIP = strip
++CP = cp
++FLAGS = -c -O3
++RM = rm
++TAR = tar
++MKDIR = mkdir
++
++simpson: $(OBJ)
 +	$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBRARIES)
-+.c.o:
++.c.o:
 +	$(CC) $(CFLAGS) $(EXTRA_FLAGS) $(INCLUDES) -DVERSION=\"$(VERSION)\" -c $<
-+clean:
-+	$(RM) -f *.o simpson
-+dist:
-+	$(MKDIR) simpson-source-$(VERSION)
-+	$(CP) -r *.c *.h simpson.xcodeproj Makefile simpson-source-$(VERSION)
-+	$(TAR) cvjf simpson-source-$(VERSION).tbz2 simpson-source-$(VERSION)
-+	$(RM) -fr simpson-source-$(VERSION)
-+install:
-+	$(STRIP) simpson
-+	$(CP) simpson $(BINDIR)
++clean:
++	$(RM) -f *.o simpson
++dist:
++	$(MKDIR) simpson-source-$(VERSION)
++	$(CP) -r *.c *.h simpson.xcodeproj Makefile simpson-source-$(VERSION)
++	$(TAR) cvjf simpson-source-$(VERSION).tbz2 simpson-source-$(VERSION)
++	$(RM) -fr simpson-source-$(VERSION)
++install:
++	$(STRIP) simpson
++	$(CP) simpson $(BINDIR)



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/simpson/files/, sci-chemistry/simpson/
@ 2011-11-29 14:27 Justin Lecher
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2011-11-29 14:27 UTC (permalink / raw
  To: gentoo-commits

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@gentoo.org> +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@gentoo.org> 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
 }
 



^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-01-12 19:27 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-29 14:41 [gentoo-commits] proj/sci:master commit in: sci-chemistry/simpson/files/, sci-chemistry/simpson/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2017-01-12 19:27 Justin Lecher
2013-02-27 17:23 Justin Lecher
2012-11-15 22:57 Justin Lecher
2012-06-01 10:42 Justin Lecher
2011-11-29 14:27 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox