Added missing x11-misc/imake to DEPEND. This fixes bug #128747. Also moved raster3d-2.6e to modular X.

(Portage version: 2.1_pre7-r5)

5 files changed, 53 insertions, 20 deletions

diff --git a/sci-chemistry/raster3d/ChangeLog b/sci-chemistry/raster3d/ChangeLog
index 1ceab9015268..ddd2efb4df0f 100644
--- a/sci-chemistry/raster3d/ChangeLog
+++ b/sci-chemistry/raster3d/ChangeLog
@@ -1,6 +1,11 @@
 # 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.4 2006/01/18 06:55:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.5 2006/04/11 04:50:05 markusle Exp $
+
+  11 Apr 2006; Markus Dittrich <markusle@gentoo.org> raster3d-2.6e.ebuild,
+  raster3d-2.7c.ebuild:
+  Added missing x11-misc/imake to DEPEND. This fixes bug #128747.
+  Also moved raster3d-2.6e to modular X.
 
   18 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>; raster3d-2.7c.ebuild:
   Fix dependencies for modular X.
diff --git a/sci-chemistry/raster3d/Manifest b/sci-chemistry/raster3d/Manifest
index ca60abc4ecc5..80ba5206eb9a 100644
--- a/sci-chemistry/raster3d/Manifest
+++ b/sci-chemistry/raster3d/Manifest
@@ -1,6 +1,18 @@
-MD5 dd9d6bad4187a4dbd8b663f01986b20b ChangeLog 1086
+MD5 8f25f0136f02225dabbf3ed5d092572d ChangeLog 1293
+RMD160 4d6f92f38a75a97ad71e196630149c8b9b03daef ChangeLog 1293
+SHA256 4e1e4b4564690a3542e3f7f665de06b390530a7b62cd164c56ed53881b6a7b91 ChangeLog 1293
 MD5 723018f5f5337107a1540a5c233fcefb files/digest-raster3d-2.6e 66
-MD5 f5bad7190e4ff31e28ea02e7327eeb9f files/digest-raster3d-2.7c 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 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 ccae91a86f4e295c88f3538fa525de3f raster3d-2.6e.ebuild 1284
-MD5 86743f1a0e7dd0d1723e50fa26d05ef6 raster3d-2.7c.ebuild 1454
+RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
+SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
+MD5 5bdf6a005582ca5124670002a80aba36 raster3d-2.6e.ebuild 1381
+RMD160 6d7aa55170d9879f6e3bbd96e378b9f632d0a7e7 raster3d-2.6e.ebuild 1381
+SHA256 d8f09c89ade562dd24b869ed94eb9430b9da992aea21684d7f6551ecb2135e15 raster3d-2.6e.ebuild 1381
+MD5 e79075bb458076b325fbdf1424173bd9 raster3d-2.7c.ebuild 1647
+RMD160 81e42ceac43969aee63f4f7e2d1638efd07ac1de raster3d-2.7c.ebuild 1647
+SHA256 d3e677193b14b667371eb86a9b76b0cd24e37450d6c99332f98e77b62a89643d raster3d-2.7c.ebuild 1647
diff --git a/sci-chemistry/raster3d/files/digest-raster3d-2.7c b/sci-chemistry/raster3d/files/digest-raster3d-2.7c
index 7314eb52681f..6c3d13ab9429 100644
--- a/sci-chemistry/raster3d/files/digest-raster3d-2.7c
+++ b/sci-chemistry/raster3d/files/digest-raster3d-2.7c
@@ -1 +1,3 @@
 MD5 2f9976c9de5d48a574583c72f1f842aa Raster3D_2.7c.tar.gz 1727387
+RMD160 ebb41c0504646b8d965dbccad0f3cee1bfad0244 Raster3D_2.7c.tar.gz 1727387
+SHA256 7d5c450e83865fbafecbab3caabf38a8560b6c41982948a3b0e34d79c2c3381a Raster3D_2.7c.tar.gz 1727387
diff --git a/sci-chemistry/raster3d/raster3d-2.6e.ebuild b/sci-chemistry/raster3d/raster3d-2.6e.ebuild
index 9c01b9ba0ac3..9f7490033513 100644
--- a/sci-chemistry/raster3d/raster3d-2.6e.ebuild
+++ b/sci-chemistry/raster3d/raster3d-2.6e.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.6e.ebuild,v 1.1 2004/12/24 17:04:44 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.6e.ebuild,v 1.2 2006/04/11 04:50:05 markusle Exp $
 
 Name="Raster3D"
 S="${WORKDIR}/${Name}_${PV}"
@@ -13,7 +13,12 @@ SLOT="0"
 IUSE=""
 KEYWORDS="x86"
 
-DEPEND="virtual/x11"
+RDEPEND="media-libs/jpeg
+	media-libs/libpng
+	media-libs/tiff"
+
+DEPEND="${RDEPEND}
+	|| ( x11-misc/imake virtual/x11 )"
 
 src_compile() {
 	sed "/prefix/s/\/usr\/local/\/usr/" ${S}/Makefile.template > ${S}/Makefile.template.new
diff --git a/sci-chemistry/raster3d/raster3d-2.7c.ebuild b/sci-chemistry/raster3d/raster3d-2.7c.ebuild
index cfaae66df2ba..2e045a78d83d 100644
--- a/sci-chemistry/raster3d/raster3d-2.7c.ebuild
+++ b/sci-chemistry/raster3d/raster3d-2.7c.ebuild
@@ -1,6 +1,8 @@
 # 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.2 2006/01/18 06:55:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.7c.ebuild,v 1.3 2006/04/11 04:50:06 markusle Exp $
+
+inherit toolchain-funcs fortran
 
 NAME="Raster3D"
 
@@ -16,25 +18,31 @@ KEYWORDS="~x86"
 RDEPEND="media-libs/jpeg
 	media-libs/libpng
 	media-libs/tiff"
-DEPEND="${RDEPEND}"
+
+DEPEND="${RDEPEND}
+	   || ( x11-misc/imake virtual/x11 )"
 
 S="${WORKDIR}/${NAME}_${PV}"
 
 src_compile() {
-	sed -e "/prefix/s/\/usr\/local/\/usr/" -i ${S}/Makefile.template || die \
-		"Failed to patch makefile."
+	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() {
-	#dodir /usr/bin
-	#dodir /usr/share/Raster3D/materials
-	#dodir /usr/share/Raster3D/html
-	#dodir /usr/share/Raster3D/examples
-	#dodir /usr/share/man/man1
-
 	emake prefix="${D}"/usr \
 			bindir="${D}"/usr/bin \
 			datadir="${D}"/usr/share/Raster3D/materials \
@@ -43,7 +51,8 @@ src_install() {
 			examdir="${D}"/usr/share/Raster3D/examples \
 			install || die "Failed to install application."
 
-	#dodir /etc/env.d
+	dodir /etc/env.d
 	echo -e "R3D_LIB=/usr/share/${NAME}/materials" > \
-		"${D}"/etc/env.d/10raster3d "Failed to install env file."
+		"${D}"/etc/env.d/10raster3d || \
+		die "Failed to install env file."
 }