diff options
| -rw-r--r-- | sci-chemistry/raster3d/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-chemistry/raster3d/Manifest | 15 | ||||
| -rw-r--r-- | sci-chemistry/raster3d/files/raster3d-gcc-4.1-gentoo.patch | 61 | ||||
| -rw-r--r-- | sci-chemistry/raster3d/raster3d-2.7c.ebuild | 8 |
4 files changed, 84 insertions, 8 deletions
diff --git a/sci-chemistry/raster3d/ChangeLog b/sci-chemistry/raster3d/ChangeLog index ddd2efb4df0f..9a01fa8ca0dc 100644 --- a/sci-chemistry/raster3d/ChangeLog +++ b/sci-chemistry/raster3d/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-chemistry/raster3d # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.5 2006/04/11 04:50:05 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.6 2006/04/12 14:02:22 markusle Exp $ + + 12 Apr 2006; Markus Dittrich <markusle@gentoo.org> + +files/raster3d-gcc-4.1-gentoo.patch, raster3d-2.7c.ebuild: + Applied patch to fix compile problems using gcc-4.1. Thanks to + Patrizio Bassi <hetfield666@gmail.com> for testing. This fixes + bug #125190. 11 Apr 2006; Markus Dittrich <markusle@gentoo.org> raster3d-2.6e.ebuild, raster3d-2.7c.ebuild: diff --git a/sci-chemistry/raster3d/Manifest b/sci-chemistry/raster3d/Manifest index a785c6bd6d56..7cc5d83da455 100644 --- a/sci-chemistry/raster3d/Manifest +++ b/sci-chemistry/raster3d/Manifest @@ -1,18 +1,21 @@ -MD5 5873b589385def5537147af7b12a1aeb ChangeLog 1292 -RMD160 a7f2973db0a8c65690a72426c5da4d1b9e05a62d ChangeLog 1292 -SHA256 8078da546c2dbb3815cbbcded05f2c901c45af75a0bb12d139016942ffc1aec6 ChangeLog 1292 +MD5 8f78a9c76125ed33a7aee5c5afc4c707 ChangeLog 1553 +RMD160 3637038732ec23989b3927e659fc1b6a19daedfa ChangeLog 1553 +SHA256 8f8855918068cce47043d0377949b174b14a80cf1e3772530ecd67487bb76dda ChangeLog 1553 MD5 723018f5f5337107a1540a5c233fcefb files/digest-raster3d-2.6e 66 RMD160 550ba0c0641fda13fe1fb1392f7a073940886919 files/digest-raster3d-2.6e 66 SHA256 94bcad1afbbfcb6acd010cb06fde32b4be4ef7560cc85acf50e5b535dba14351 files/digest-raster3d-2.6e 66 MD5 2282d222050f006a9665130cdc15e1be files/digest-raster3d-2.7c 244 RMD160 7139b19e868f8a746759bb109bfbd00129d250f1 files/digest-raster3d-2.7c 244 SHA256 08e0eaad3ab2a21897957788b38890843ef751389785b8cf724842402010d358 files/digest-raster3d-2.7c 244 +MD5 f359b8a66da6a239d4597dbfba835a5e files/raster3d-gcc-4.1-gentoo.patch 2423 +RMD160 4ebc09f61759a2ef79239141197ad2ee1890c23a files/raster3d-gcc-4.1-gentoo.patch 2423 +SHA256 c3a2e396b9a99956734c4c75ff024a7ecdf9386e82fc81909aaed107861b1e14 files/raster3d-gcc-4.1-gentoo.patch 2423 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156 MD5 e2fd65185f0124e78febbf57d89ee724 raster3d-2.6e.ebuild 1381 RMD160 5e436e37d6b084eb297b9556585150c75d57597c raster3d-2.6e.ebuild 1381 SHA256 41a9c020def2c9b94fbee0e7b0272991cef755a3e88d80678e64eaf339106a4b raster3d-2.6e.ebuild 1381 -MD5 ae9904febf9e7f7d06d23779b619d568 raster3d-2.7c.ebuild 1646 -RMD160 8397dedeacffd2b3d63838a9b8f1b92702f2b354 raster3d-2.7c.ebuild 1646 -SHA256 ad2045e2e408ac744313f16285a410067e7667df7898a0e7b673490a908a3d30 raster3d-2.7c.ebuild 1646 +MD5 9e79221e8489196747608caf3443fe97 raster3d-2.7c.ebuild 1730 +RMD160 7fb4125a26f2d52dde4af6942c70e315053c4fcf raster3d-2.7c.ebuild 1730 +SHA256 a37976e338ec46983324404674cead718e7b1aa82bcd1f81dacfec3e4d59da4c raster3d-2.7c.ebuild 1730 diff --git a/sci-chemistry/raster3d/files/raster3d-gcc-4.1-gentoo.patch b/sci-chemistry/raster3d/files/raster3d-gcc-4.1-gentoo.patch new file mode 100644 index 000000000000..fb9ad2150f9e --- /dev/null +++ b/sci-chemistry/raster3d/files/raster3d-gcc-4.1-gentoo.patch @@ -0,0 +1,61 @@ +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 +@@ -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.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 +@@ -133,7 +133,7 @@ + c + c Support for validation of similarity of bonded atoms + logical suvflag +- integer suvlun, suvbad ++ integer suvlun, suvbad, defcols + 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 +@@ -792,9 +792,9 @@ + * Get background colour + READ (INPUT,*,ERR=104) BKGND + if (XBG.NE.0) then +- BKGND(3) = FLOAT(iand(XBG,'00FF'X)) / 255. +- BKGND(2) = FLOAT(iand(XBG,'FF00'X)/256) / 255. +- BKGND(1) = FLOAT(iand(XBG,'FF0000'X)/65536) / 255. ++ BKGND(3) = REAL(iand(XBG,'00FF'X)) / 255. ++ BKGND(2) = REAL(iand(XBG,'FF00'X)/256) / 255. ++ BKGND(1) = REAL(iand(XBG,'FF0000'X)/65536) / 255. + BKGND(3) = BKGND(3)**2 + BKGND(2) = BKGND(2)**2 + BKGND(1) = BKGND(1)**2 +@@ -3679,7 +3679,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 -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 +@@ -16,7 +16,6 @@ + integer input, output, noise + parameter (input=5, output=6, noise=0) + integer iargc, narg +- external iargc + character*64 options + logical bflag, pflag, sflag + c diff --git a/sci-chemistry/raster3d/raster3d-2.7c.ebuild b/sci-chemistry/raster3d/raster3d-2.7c.ebuild index 2e045a78d83d..13af8b73896c 100644 --- a/sci-chemistry/raster3d/raster3d-2.7c.ebuild +++ b/sci-chemistry/raster3d/raster3d-2.7c.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.7c.ebuild,v 1.3 2006/04/11 04:50:06 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.7c.ebuild,v 1.4 2006/04/12 14:02:23 markusle Exp $ inherit toolchain-funcs fortran @@ -24,6 +24,12 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${NAME}_${PV}" +src_unpack() { + unpack ${A} + epatch "${FILESDIR}"/raster3d-gcc-4.1-gentoo.patch +} + + src_compile() { cd "${S}" |