Fixed gcc patch to work with gcc-4.2 and bumped raster3d to new version (see bug #190511).

Package-Manager: portage-2.1.3.7

6 files changed, 158 insertions, 21 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/Manifest b/sci-chemistry/raster3d/Manifest
index cad32d0238d9..f768003c8806 100644
--- a/sci-chemistry/raster3d/Manifest
+++ b/sci-chemistry/raster3d/Manifest
@@ -1,16 +1,25 @@
-AUX raster3d-gcc-4.1-gentoo.patch 2423 RMD160 4ebc09f61759a2ef79239141197ad2ee1890c23a SHA1 a9cf625be7ba6e88499f2b753c693f86509d6ae1 SHA256 5b95136918411d0f33f31289d791c78046c5728950dafcf90dcbb52f100b18bc
-MD5 f359b8a66da6a239d4597dbfba835a5e files/raster3d-gcc-4.1-gentoo.patch 2423
-RMD160 4ebc09f61759a2ef79239141197ad2ee1890c23a files/raster3d-gcc-4.1-gentoo.patch 2423
-SHA256 5b95136918411d0f33f31289d791c78046c5728950dafcf90dcbb52f100b18bc files/raster3d-gcc-4.1-gentoo.patch 2423
+AUX raster3d-2.7d-gcc4-gentoo.patch 1697 RMD160 a41c6744ef56bb548b4eab58f86b47a26cdab7e6 SHA1 6267baec8e33dc36281b79abe278a22d3db09e66 SHA256 c50c90e474451e6080c8d66ce82cdd0801f2c20942e8b9c4cdba4f3928203171
+MD5 d6a89f77b029824f7fe6ec752e26c7cc files/raster3d-2.7d-gcc4-gentoo.patch 1697
+RMD160 a41c6744ef56bb548b4eab58f86b47a26cdab7e6 files/raster3d-2.7d-gcc4-gentoo.patch 1697
+SHA256 c50c90e474451e6080c8d66ce82cdd0801f2c20942e8b9c4cdba4f3928203171 files/raster3d-2.7d-gcc4-gentoo.patch 1697
+AUX raster3d-gcc-4.1-gentoo.patch 2994 RMD160 3341eb4071b46b9fbec7fef51c0a76c257041ba3 SHA1 0d23cdcd54a31fb2f77f7ea8bb8768d3f12b0775 SHA256 b1a9ea24005c0ddb9fcd54e71196417186bea0a92b1bcf47ecea978d1faf2cc3
+MD5 047001e30c2ce2988fd298d63fb5208a files/raster3d-gcc-4.1-gentoo.patch 2994
+RMD160 3341eb4071b46b9fbec7fef51c0a76c257041ba3 files/raster3d-gcc-4.1-gentoo.patch 2994
+SHA256 b1a9ea24005c0ddb9fcd54e71196417186bea0a92b1bcf47ecea978d1faf2cc3 files/raster3d-gcc-4.1-gentoo.patch 2994
 DIST Raster3D_2.7c.tar.gz 1727387 RMD160 ebb41c0504646b8d965dbccad0f3cee1bfad0244 SHA1 b13e046d05b0f435dba6c09ebb0183454063b76d SHA256 7d5c450e83865fbafecbab3caabf38a8560b6c41982948a3b0e34d79c2c3381a
+DIST Raster3D_2.7d.tar.gz 1724473 RMD160 646db1421f3222d75ba4f1a0c2339d603629877e SHA1 eb939d6fa0e27d4f50fbb56e84985b1db96bcb0a SHA256 b784e0a96679791adc7db2b1767a1011ef742380ee4fc783ecae9971a251eca1
 EBUILD raster3d-2.7c.ebuild 1711 RMD160 119f9f3edf7e1541cf0656c327e369b83d6706ec SHA1 eeaa160f4e08fa388f121b38435c5c3788f7f736 SHA256 b58ed73f95668610cbf4b7536c1b05f5e7306f6d2c08c9501c6a7e1a50e7b15c
 MD5 c9c46821c7945b09d7f21b5f778dec31 raster3d-2.7c.ebuild 1711
 RMD160 119f9f3edf7e1541cf0656c327e369b83d6706ec raster3d-2.7c.ebuild 1711
 SHA256 b58ed73f95668610cbf4b7536c1b05f5e7306f6d2c08c9501c6a7e1a50e7b15c raster3d-2.7c.ebuild 1711
-MISC ChangeLog 2218 RMD160 683a5a76d4e8767e8e6bdc14527e0fc1c2502927 SHA1 7c30b3fa7f0dd2a38f002690cc6eac4f6adff7ed SHA256 04ffd68ab90d1c605b40a141b7b1887768e69cac38eb188f12b5c40f61de5fe4
-MD5 2327eeefc95ba8259e4da0f91c4f217f ChangeLog 2218
-RMD160 683a5a76d4e8767e8e6bdc14527e0fc1c2502927 ChangeLog 2218
-SHA256 04ffd68ab90d1c605b40a141b7b1887768e69cac38eb188f12b5c40f61de5fe4 ChangeLog 2218
+EBUILD raster3d-2.7d.ebuild 1705 RMD160 c6c32903a69ac3675822422669a0c441fecd49ff SHA1 c294231f5c20e9623aa5707d3e91c312aa0fbe3c SHA256 10cf3b9d0522eca9c80a62914fb290ca8ebd1f1a272f028c861d57792fedc173
+MD5 968c1d50989300845955274d30f29e37 raster3d-2.7d.ebuild 1705
+RMD160 c6c32903a69ac3675822422669a0c441fecd49ff raster3d-2.7d.ebuild 1705
+SHA256 10cf3b9d0522eca9c80a62914fb290ca8ebd1f1a272f028c861d57792fedc173 raster3d-2.7d.ebuild 1705
+MISC ChangeLog 2500 RMD160 f914df33e91a35f8600e236e7eddd641ac32a074 SHA1 e08f2ca8a0db14019b4642caa5f80c06d01cbb94 SHA256 7f8d188309f17355b2220e54d96851b83fcfe28933001921908db8282fa6057e
+MD5 ceeb101fd1deb93f90a112febb7b08e4 ChangeLog 2500
+RMD160 f914df33e91a35f8600e236e7eddd641ac32a074 ChangeLog 2500
+SHA256 7f8d188309f17355b2220e54d96851b83fcfe28933001921908db8282fa6057e ChangeLog 2500
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 MD5 43628e9f5743b5c3b018a82669a76bc7 metadata.xml 166
 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 metadata.xml 166
@@ -18,3 +27,6 @@ SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 metadata
 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 5c653b8fabeee599c2687308e259b690 files/digest-raster3d-2.7d 244
+RMD160 1508e62767e887e5ce75b3b9f351057f1eccf1e9 files/digest-raster3d-2.7d 244
+SHA256 ee7478823440160bf4d8703fdeaa75286aad0ebd27f889ccad9f6b18589a85ec files/digest-raster3d-2.7d 244
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."
+}