diff options
| -rw-r--r-- | sci-chemistry/raster3d/ChangeLog | 10 | ||||
| -rw-r--r-- | sci-chemistry/raster3d/files/digest-raster3d-2.7d | 3 | ||||
| -rw-r--r-- | sci-chemistry/raster3d/files/raster3d-2.7d-gcc4-gentoo.patch | 38 | ||||
| -rw-r--r-- | sci-chemistry/raster3d/files/raster3d-gcc-4.1-gentoo.patch | 37 | ||||
| -rw-r--r-- | sci-chemistry/raster3d/raster3d-2.7d.ebuild | 63 |
5 files changed, 138 insertions, 13 deletions
diff --git a/sci-chemistry/raster3d/ChangeLog b/sci-chemistry/raster3d/ChangeLog index 41d3132b4a36..29228fa38b07 100644 --- a/sci-chemistry/raster3d/ChangeLog +++ b/sci-chemistry/raster3d/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-chemistry/raster3d # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.12 2007/07/22 07:25:12 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.13 2007/09/10 12:55:59 markusle Exp $ + +*raster3d-2.7d (08 Sep 2007) + + 08 Sep 2007; Markus Dittrich <markusle@gentoo.org> + +files/raster3d-2.7d-gcc4-gentoo.patch, + files/raster3d-gcc-4.1-gentoo.patch, +raster3d-2.7d.ebuild: + Fixed gcc patch to work with gcc-4.2 and bumped raster3d to new + version (see bug #190511). 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; raster3d-2.7c.ebuild: Drop virtual/x11 references. diff --git a/sci-chemistry/raster3d/files/digest-raster3d-2.7d b/sci-chemistry/raster3d/files/digest-raster3d-2.7d new file mode 100644 index 000000000000..6e5e02305b96 --- /dev/null +++ b/sci-chemistry/raster3d/files/digest-raster3d-2.7d @@ -0,0 +1,3 @@ +MD5 30b284037b0138d328ab1b43328549e6 Raster3D_2.7d.tar.gz 1724473 +RMD160 646db1421f3222d75ba4f1a0c2339d603629877e Raster3D_2.7d.tar.gz 1724473 +SHA256 b784e0a96679791adc7db2b1767a1011ef742380ee4fc783ecae9971a251eca1 Raster3D_2.7d.tar.gz 1724473 diff --git a/sci-chemistry/raster3d/files/raster3d-2.7d-gcc4-gentoo.patch b/sci-chemistry/raster3d/files/raster3d-2.7d-gcc4-gentoo.patch new file mode 100644 index 000000000000..eb2ab51a7c87 --- /dev/null +++ b/sci-chemistry/raster3d/files/raster3d-2.7d-gcc4-gentoo.patch @@ -0,0 +1,38 @@ +diff -Naur Raster3D_2.7d/normal3d.f Raster3D_2.7d.new/normal3d.f +--- Raster3D_2.7d/normal3d.f 2003-10-20 18:50:11.000000000 -0400 ++++ Raster3D_2.7d.new/normal3d.f 2007-09-08 10:12:49.000000000 -0400 +@@ -443,7 +443,8 @@ + READ (INPUT,'(A)',ERR=101) TITLE + IF (TITLE(1:1).EQ.'#') GOTO 100 + GOTO 102 +- 101 WRITE (NOISE,'(A,A)') ' >> Cannot open or read file ',TITLE(2:132) ++ 101 WRITE (NOISE,'(A,A)') ' >> Cannot open or read file ', ++ *TITLE(2:132) + CALL EXIT(-1) + 102 CONTINUE + ENDIF +diff -Naur Raster3D_2.7d/parse.f Raster3D_2.7d.new/parse.f +--- Raster3D_2.7d/parse.f 2006-04-11 14:33:48.000000000 -0400 ++++ Raster3D_2.7d.new/parse.f 2007-09-08 10:25:24.000000000 -0400 +@@ -4,7 +4,8 @@ + COMMON /OPTIONS/ FONTSCALE, GAMMA, ZOOM, NSCHEME, SHADOWFLAG, XBG, + & NAX, NAY, OTMODE, QUALITY, INVERT, LFLAG + REAL FONTSCALE, GAMMA, ZOOM +- INTEGER NSCHEME, SHADOWFLAG, XBG ++ INTEGER NSCHEME, SHADOWFLAG ++ INTEGER*8 XBG + INTEGER*2 NAX, NAY, OTMODE, QUALITY + LOGICAL*2 INVERT, LFLAG + c +diff -Naur Raster3D_2.7d/render.f Raster3D_2.7d.new/render.f +--- Raster3D_2.7d/render.f 2006-04-11 17:13:04.000000000 -0400 ++++ Raster3D_2.7d.new/render.f 2007-09-08 10:15:17.000000000 -0400 +@@ -3685,7 +3685,7 @@ + FRAC = DETAIL(K+8) + INEXT = INDTOP + 1 + IF (TYPE(INEXT).EQ.VERTEXRGB) INEXT = INEXT + 1 +- CALL ASSERT(TYPE(INEXT).EQ.VERTRANSP,'lost vertex transp') ++ CALL ASSERT(TYPE(INEXT).EQ.VERTRANSP,'lost vertex transp') + K = LIST(INEXT) + CLRITY = FRAC*DETAIL(K+1) + (1.-FRAC)*DETAIL(K+2) + ELSE IF (TYPE(INDTOP).EQ.TRIANG) THEN diff --git a/sci-chemistry/raster3d/files/raster3d-gcc-4.1-gentoo.patch b/sci-chemistry/raster3d/files/raster3d-gcc-4.1-gentoo.patch index fb9ad2150f9e..4525f5fdc8ba 100644 --- a/sci-chemistry/raster3d/files/raster3d-gcc-4.1-gentoo.patch +++ b/sci-chemistry/raster3d/files/raster3d-gcc-4.1-gentoo.patch @@ -1,6 +1,6 @@ -diff -Naur Raster3D_2.7c/normal3d.f Raster3D_2.7c-patched/normal3d.f ---- Raster3D_2.7c/normal3d.f 2003-10-20 17:50:11.000000000 -0500 -+++ Raster3D_2.7c-patched/normal3d.f 2006-04-11 01:04:15.000000000 -0500 +diff -Naur Raster3D_2.7c/normal3d.f Raster3D_2.7c.new/normal3d.f +--- Raster3D_2.7c/normal3d.f 2003-10-20 18:50:11.000000000 -0400 ++++ Raster3D_2.7c.new/normal3d.f 2007-09-08 10:23:08.000000000 -0400 @@ -443,7 +443,8 @@ READ (INPUT,'(A)',ERR=101) TITLE IF (TITLE(1:1).EQ.'#') GOTO 100 @@ -11,9 +11,22 @@ diff -Naur Raster3D_2.7c/normal3d.f Raster3D_2.7c-patched/normal3d.f CALL EXIT(-1) 102 CONTINUE ENDIF -diff -Naur Raster3D_2.7c/rastep.f Raster3D_2.7c-patched/rastep.f ---- Raster3D_2.7c/rastep.f 2004-02-12 11:01:31.000000000 -0600 -+++ Raster3D_2.7c-patched/rastep.f 2006-04-11 00:55:05.000000000 -0500 +diff -Naur Raster3D_2.7c/parse.f Raster3D_2.7c.new/parse.f +--- Raster3D_2.7c/parse.f 2003-10-20 18:50:11.000000000 -0400 ++++ Raster3D_2.7c.new/parse.f 2007-09-08 10:23:48.000000000 -0400 +@@ -4,7 +4,8 @@ + COMMON /OPTIONS/ FONTSCALE, GAMMA, ZOOM, NSCHEME, SHADOWFLAG, XBG, + & NAX, NAY, OTMODE, QUALITY, INVERT, LFLAG + REAL FONTSCALE, GAMMA, ZOOM +- INTEGER NSCHEME, SHADOWFLAG, XBG ++ INTEGER NSCHEME, SHADOWFLAG ++ INTEGER*8 XBG + INTEGER*2 NAX, NAY, OTMODE, QUALITY + LOGICAL*2 INVERT, LFLAG + c +diff -Naur Raster3D_2.7c/rastep.f Raster3D_2.7c.new/rastep.f +--- Raster3D_2.7c/rastep.f 2004-02-12 12:01:31.000000000 -0500 ++++ Raster3D_2.7c.new/rastep.f 2007-09-08 10:23:08.000000000 -0400 @@ -133,7 +133,7 @@ c c Support for validation of similarity of bonded atoms @@ -23,9 +36,9 @@ diff -Naur Raster3D_2.7c/rastep.f Raster3D_2.7c-patched/rastep.f real anisov(6) c c Default to CPK colors and VDW radii -diff -Naur Raster3D_2.7c/render.f Raster3D_2.7c-patched/render.f ---- Raster3D_2.7c/render.f 2003-10-20 17:50:11.000000000 -0500 -+++ Raster3D_2.7c-patched/render.f 2006-04-11 00:56:26.000000000 -0500 +diff -Naur Raster3D_2.7c/render.f Raster3D_2.7c.new/render.f +--- Raster3D_2.7c/render.f 2003-10-20 18:50:11.000000000 -0400 ++++ Raster3D_2.7c.new/render.f 2007-09-08 10:23:08.000000000 -0400 @@ -792,9 +792,9 @@ * Get background colour READ (INPUT,*,ERR=104) BKGND @@ -48,9 +61,9 @@ diff -Naur Raster3D_2.7c/render.f Raster3D_2.7c-patched/render.f K = LIST(INEXT) CLRITY = FRAC*DETAIL(K+1) + (1.-FRAC)*DETAIL(K+2) ELSE IF (TYPE(INDTOP).EQ.TRIANG) THEN -diff -Naur Raster3D_2.7c/rings3d.f Raster3D_2.7c-patched/rings3d.f ---- Raster3D_2.7c/rings3d.f 2003-10-20 17:50:11.000000000 -0500 -+++ Raster3D_2.7c-patched/rings3d.f 2006-04-11 01:03:13.000000000 -0500 +diff -Naur Raster3D_2.7c/rings3d.f Raster3D_2.7c.new/rings3d.f +--- Raster3D_2.7c/rings3d.f 2003-10-20 18:50:11.000000000 -0400 ++++ Raster3D_2.7c.new/rings3d.f 2007-09-08 10:23:08.000000000 -0400 @@ -16,7 +16,6 @@ integer input, output, noise parameter (input=5, output=6, noise=0) diff --git a/sci-chemistry/raster3d/raster3d-2.7d.ebuild b/sci-chemistry/raster3d/raster3d-2.7d.ebuild new file mode 100644 index 000000000000..13646e66c32d --- /dev/null +++ b/sci-chemistry/raster3d/raster3d-2.7d.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.7d.ebuild,v 1.1 2007/09/10 12:55:59 markusle Exp $ + +inherit toolchain-funcs fortran + +NAME="Raster3D" + +DESCRIPTION="a set of tools for generating high quality raster images of proteins or other molecules" +LICENSE="as-is" +HOMEPAGE="http://www.bmsc.washington.edu/raster3d/raster3d.html" +SRC_URI="http://www.bmsc.washington.edu/${PN}/${NAME}_${PV}.tar.gz" + +SLOT="0" +IUSE="" +KEYWORDS="~ppc ~x86" + +RDEPEND="media-libs/jpeg + media-libs/libpng + media-libs/tiff" + +DEPEND="${RDEPEND} + x11-misc/imake" + +S="${WORKDIR}/${NAME}_${PV}" + +src_unpack() { + unpack ${A} + epatch "${FILESDIR}"/${P}-gcc4-gentoo.patch +} + +src_compile() { + cd "${S}" + + # fix Makefile to honor user's CFLAGS/FFLAGS + sed -e "s:gcc:$(tc-getCC):" \ + -e "s:g77:${FORTRANC}:" \ + -e "s:-g -m486 -w:${CFLAGS}:" \ + -e "s:-g -O -w -malign-double:${FFLAGS} -w:" \ + -i Makefile || die "Failed to patch makefile" + + sed -e "s:prefix = /usr/local:prefix = /usr:" \ + -i Makefile.template || \ + die "Failed to patch makefile.template" + + make linux || die "Failed to make linux target." + make all || die "Failed to make all target." +} + +src_install() { + emake prefix="${D}"/usr \ + bindir="${D}"/usr/bin \ + datadir="${D}"/usr/share/Raster3D/materials \ + mandir="${D}"/usr/share/man/man1 \ + htmldir="${D}"/usr/share/Raster3D/html \ + examdir="${D}"/usr/share/Raster3D/examples \ + install || die "Failed to install application." + + dodir /etc/env.d + echo -e "R3D_LIB=/usr/share/${NAME}/materials" > \ + "${D}"/etc/env.d/10raster3d || \ + die "Failed to install env file." +} |