sci-chemistry/usf-tools: Bump to latest release

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

8 files changed, 101 insertions, 99 deletions

diff --git a/sci-chemistry/usf-tools/ChangeLog b/sci-chemistry/usf-tools/ChangeLog
index 640b34751..072e08cb5 100644
--- a/sci-chemistry/usf-tools/ChangeLog
+++ b/sci-chemistry/usf-tools/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for sci-chemistry/usf-tools
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*usf-tools-9999 (13 Aug 2012)
+
+  13 Aug 2012; Justin Lecher <jlec@gentoo.org> -files/usf-tools-1-build.patch,
+  -usf-tools-2.ebuild, +usf-tools-9999.ebuild,
+  +files/usf-tools-9999-longline.patch, -files/Makefile, -files/Makefile_gklib:
+  Bump to latest release
+
 *usf-tools-2 (11 Sep 2011)
 
   11 Sep 2011; Justin Lecher <jlec@gentoo.org> -usf-tools-1.ebuild,
diff --git a/sci-chemistry/usf-tools/Manifest b/sci-chemistry/usf-tools/Manifest
index d7202c8f5..1bf4094ed 100644
--- a/sci-chemistry/usf-tools/Manifest
+++ b/sci-chemistry/usf-tools/Manifest
@@ -1 +1,2 @@
-DIST usf-tools-2.tar.xz 23529396 RMD160 5af4dd1156aafe5d40dd7a4bf0d2e085eb602cc4 SHA1 977c5e7a2ac89e5de4c522a40d3d5b0c313fb767 SHA256 e001bf5bdbb37d4355386804837d9548250d27c6aacb8318537fd8cefb82e9d5
+DIST usf-tools-9999.tar.gz 108530172 SHA256 dd59640fb154d4157b814554dff68d6515cb1a417ed16794dc4f310dc92e95d4 SHA512 2ec2d13080aa5f893cc6f980b3f014c107f6f8f822b36cdd57f6e6f046994d36c8d1eea629f6846d8ea608603d003fd74e543fc41410e50baf1433c56b179464 WHIRLPOOL adff6df1fdd056e801cc7687397fc90442abde892edee7378c8c25bcce7c32f41d09160a83a12e2bb8bb6afd9f23c8dbc54435f1a917f40e364e177fc77c6a5c
+DIST usf-tools-autotools-001.tar.xz 4916 SHA256 9f255c54bf82afc065364e2e243c96d5bdc783f2614521390cca1e89c61c887a SHA512 04599fd4011e8b612d7f96e23917f363689f7e8619649ad9669a8f62ef25056b2c1c26bc8728b6acf97c9165f2106c35d4be7495342c27fc2accdd5626c24048 WHIRLPOOL bae078a672e023eb17f75973bfb5675a4fbe13dd1fc6e5fda2ebd4075209da80b54fd1832edbe659bc00cd8463084c40062e3e279adf5de950da982e8d3b5e45
diff --git a/sci-chemistry/usf-tools/files/Makefile b/sci-chemistry/usf-tools/files/Makefile
deleted file mode 100644
index 655056000..000000000
--- a/sci-chemistry/usf-tools/files/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-SUBDIRS = aconio ave cello coma comap comdem crave dataman essens \
-findncs flood imp lsqman mama mapfix mapman mappage mave moleman \
-moleman2 ncs6d o2d odbman oops oops2 prof seaman site2rt sod solex \
-spancsi ssencs voidoo xpand xplo2d
-
-SUBDIRS_MAKERULE = \
-        @+for d in $(SUBDIRS) ""; do \
-                if test -d "$$d" -a ! -z "$$d"; then \
-                        echo === $$d ===; \
-                        $(MAKE) -C $$d || exit $$?; \
-                fi; \
-        done
-
-all: gklib/libkley.so  $(SUBDIRS)
-	$(SUBDIRS_MAKERULE)
-
-gklib/libkley.so:
-	$(MAKE) -C gklib
diff --git a/sci-chemistry/usf-tools/files/Makefile_gklib b/sci-chemistry/usf-tools/files/Makefile_gklib
deleted file mode 100644
index 4e9e9aa59..000000000
--- a/sci-chemistry/usf-tools/files/Makefile_gklib
+++ /dev/null
@@ -1,24 +0,0 @@
-EXTRA_FFLAGS = -DLINUX -u -std=legacy -ffixed-line-length-132
-LIBS = -lccp4f -lccp4c
-
-all: libkley.so.0.0.1
-
-OBJ = $(patsubst %.f,%.o,$(wildcard *.f))
-
-echo :
-	echo $(OBJ)
-
-%.o: %.f
-	$(FC) $(FFLAGS) $(EXTRA_FFLAGS) -fPIC -c $<
-
-fmalloc:
-	$(CC) $(CFLAGS) -DLINUX -fPIC -c $@.c
-
-libkley.a: OBJ fmalloc
-	ar rsv $@ *.o
-	ranlib $@
-
-libkley.so.0.0.1: $(OBJ) fmalloc
-	$(FC) $(LDFLAGS) -shared -Wl,-soname,libkley.so.0 -o $@ *.o $(LIBS)
-	ln -sf $@ libkley.so.0
-	ln -sf $@ libkley.so
diff --git a/sci-chemistry/usf-tools/files/usf-tools-1-build.patch b/sci-chemistry/usf-tools/files/usf-tools-1-build.patch
deleted file mode 100644
index 554a1e9ee..000000000
--- a/sci-chemistry/usf-tools/files/usf-tools-1-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
- Makefile_linux_template |    8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile_linux_template b/Makefile_linux_template
-index 3535cab..5ed4719 100755
---- a/Makefile_linux_template
-+++ b/Makefile_linux_template
-@@ -1,7 +1,8 @@
- #
--OBJ=	PROGRAMNAME.o ../gklib/linux_kleylib  ../ccp4libs_latest_m32_linux/libccp4f.a  ../ccp4libs_latest_m32_linux/libccp4c.a
-+OBJ=	PROGRAMNAME.o
-+LIBS= -L../gklib -lkley -lccp4f -lccp4c
- EXEC =	PROGRAMNAME
--INCL=	Makefile_linux
-+INCL=	Makefile
- SUBS = 
- STATIC = 
- ##SUBS## SUBS = PROGRAMNAME_subs.o
-@@ -14,7 +15,8 @@ opt= -O -u -ffixed-line-length-132 -I..
- link= -O
- 
- $(EXEC):	$(OBJ) $(SUBS)
--	$(fc) $(link) -o $(EXEC) $(SUBS) $(OBJ) $(STATIC) ; strip $(EXEC)
-+	$(fc) $(link) -o $(EXEC) $(SUBS) $(OBJ) $(STATIC) $(LIBS)
-+	cp -fv $(EXEC) ../bin/
- 
- PROGRAMNAME.o:	PROGRAMNAME.fpp $(INCL)
- 	$(fc) $(opt) -c PROGRAMNAME.fpp
diff --git a/sci-chemistry/usf-tools/files/usf-tools-9999-longline.patch b/sci-chemistry/usf-tools/files/usf-tools-9999-longline.patch
new file mode 100644
index 000000000..028c0f45b
--- /dev/null
+++ b/sci-chemistry/usf-tools/files/usf-tools-9999-longline.patch
@@ -0,0 +1,57 @@
+ gklib/pckrho.f |   24 ++++++++++++++++++------
+ 1 files changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/gklib/pckrho.f b/gklib/pckrho.f
+index 31eefad..2dd5104 100644
+--- a/gklib/pckrho.f
++++ b/gklib/pckrho.f
+@@ -21,23 +21,33 @@ c        print *,'IX,IY,IZ    - ',ix, iy, iz
+ c        print *,'JX,JY,LEVEL - ',jx,jy,level
+ c        print *,'UVW         - ',uvw
+ c
+-	if (uvw(1) .eq. 1 .and. uvw(2) .eq. 2 .and. uvw(3) .eq. 3) then
++        if (  uvw(1) .eq. 1
++     :  .and. uvw(2) .eq. 2
++     :  .and. uvw(3) .eq. 3) then
+ 	  do 100 i=1,iy
+ 	  do 100 j=1,ix
+ 100	    sav(j,i,level) = rho(j,i)
+-	else if (uvw(1) .eq. 1 .and. uvw(2) .eq. 3 .and. uvw(3) .eq. 2) then
++        else if (uvw(1) .eq. 1
++     :  .and.    uvw(2) .eq. 3
++     :  .and.    uvw(3) .eq. 2) then
+ 	  do 110 i=1,iz
+ 	  do 110 j=1,ix
+ 110	    sav(j,level,i) = rho(j,i)
+-	else if (uvw(1) .eq. 2 .and. uvw(2) .eq. 1 .and. uvw(3) .eq. 3) then
++        else if (uvw(1) .eq. 2
++     :  .and.    uvw(2) .eq. 1
++     :  .and.    uvw(3) .eq. 3) then
+ 	  do 120 j=1,iy
+ 	  do 120 i=1,ix
+ 120	    sav(i,j,level) = rho(j,i)
+-	else if (uvw(1) .eq. 2 .and. uvw(2) .eq. 3 .and. uvw(3) .eq. 1) then
++        else if (uvw(1) .eq. 2
++     :  .and.    uvw(2) .eq. 3
++     :  .and.    uvw(3) .eq. 1) then
+ 	  do 130 i=1,iz
+ 	  do 130 j=1,iy
+ 130	    sav(level,j,i) = rho(j,i)
+-	else if (uvw(1) .eq. 3 .and. uvw(2) .eq. 1 .and. uvw(3) .eq. 2) then
++        else if (uvw(1) .eq. 3
++     :  .and.    uvw(2) .eq. 1
++     :  .and.    uvw(3) .eq. 2) then
+ 	  do 140 i=1,ix
+ cxyz
+ c          call ivalut (' I(x) now :',1,i)
+@@ -47,7 +57,9 @@ c            call ivalut (' J(z) now :',1,j)
+ c            call rvalut (' RHO(j,i) :',1,rho(j,i))
+ c            call rvalut (' SAV(I,LEVEL,J) :',1,sav(i,level,j))
+ 140	    sav(i,level,j) = rho(j,i)
+-	else if (uvw(1) .eq. 3 .and. uvw(2) .eq. 2 .and. uvw(3) .eq. 1) then
++        else if (uvw(1) .eq. 3
++     :  .and.    uvw(2) .eq. 2
++     :  .and.    uvw(3) .eq. 1) then
+ 	  do 150 i=1,iy
+ 	  do 150 j=1,iz
+ 150	    sav(level,i,j) = rho(j,i)
diff --git a/sci-chemistry/usf-tools/usf-tools-2.ebuild b/sci-chemistry/usf-tools/usf-tools-2.ebuild
deleted file mode 100644
index 8389e7daf..000000000
--- a/sci-chemistry/usf-tools/usf-tools-2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit autotools fortran-2
-
-DESCRIPTION="The USF program suite"
-HOMEPAGE="http://xray.bmc.uu.se/markh/usf"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="as-is"
-IUSE=""
-
-RDEPEND="
-	sci-libs/ccp4-libs
-	sci-libs/mmdb"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/
-
-src_prepare() {
-	eautoreconf
-}
diff --git a/sci-chemistry/usf-tools/usf-tools-9999.ebuild b/sci-chemistry/usf-tools/usf-tools-9999.ebuild
new file mode 100644
index 000000000..ac1e3f4cf
--- /dev/null
+++ b/sci-chemistry/usf-tools/usf-tools-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=y
+
+inherit autotools-utils flag-o-matic  fortran-2
+
+_AP=001
+
+DESCRIPTION="The USF program suite"
+HOMEPAGE="http://xray.bmc.uu.se/usf/"
+SRC_URI="
+	http://xray.bmc.uu.se/markh/usf/usf_distribution_kit.tar.gz -> ${P}.tar.gz
+	http://dev.gentoo.org/~jlec/distfiles/${PN}-autotools-${_AP}.tar.xz"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="
+	sci-libs/ccp4-libs
+	sci-libs/mmdb"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/usf_export
+
+src_prepare() {
+	append-fflags -ffixed-line-length-132 -DLINUX -cpp
+	autotools-utils_src_prepare
+}