QA cleaning. Removed old version (buggy and using icc use flag)

(Portage version: 2.1.4.4)

4 files changed, 13 insertions, 246 deletions

diff --git a/sci-visualization/xd3d/ChangeLog b/sci-visualization/xd3d/ChangeLog
index 95350e7b05c5..ac0bb789fdcf 100644
--- a/sci-visualization/xd3d/ChangeLog
+++ b/sci-visualization/xd3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/xd3d
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/ChangeLog,v 1.7 2008/01/21 14:24:20 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/ChangeLog,v 1.8 2008/04/04 10:10:12 bicatali Exp $
+
+  04 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/gentoo-xd3d-8.2.1.diff, -xd3d-8.2.1.ebuild, xd3d-8.3.1.ebuild:
+  QA cleaning. Removed old version (buggy and using icc use flag)
 
 *xd3d-8.3.1 (21 Jan 2008)
 
diff --git a/sci-visualization/xd3d/files/gentoo-xd3d-8.2.1.diff b/sci-visualization/xd3d/files/gentoo-xd3d-8.2.1.diff
deleted file mode 100644
index ed8356b75c36..000000000000
--- a/sci-visualization/xd3d/files/gentoo-xd3d-8.2.1.diff
+++ /dev/null
@@ -1,184 +0,0 @@
-diff -U 3 -dHrN -- xd3d-8.2.0-orig/Makefile xd3d-8.2.0/Makefile
---- xd3d-8.2.0-orig/Makefile	2003-11-25 13:47:13.000000000 +0100
-+++ xd3d-8.2.0/Makefile	2004-05-09 02:41:11.192321664 +0200
-@@ -15,7 +15,9 @@
- 
- all :; make libs ; make utils ; make xgraphic ; make xd3d
- 
--install :; /bin/cp $(EXE) ./infps $(INSTALL_DIR)
-+install :; \
-+install -d $(INSTALL_DIR) ;\
-+install $(EXE) ./infps $(INSTALL_DIR)
- 
- libs :; \
- cd $(SRCDIR)/qlib   ; echo "---- Building utility lib ----" ; make ;\
-diff -U 3 -dHrN -- xd3d-8.2.0-orig/RULES.gentoo xd3d-8.2.0/RULES.gentoo
---- xd3d-8.2.0-orig/RULES.gentoo	1970-01-01 01:00:00.000000000 +0100
-+++ xd3d-8.2.0/RULES.gentoo	2004-05-09 02:28:27.156472768 +0200
-@@ -0,0 +1,81 @@
-+#--------------------------------------------------------
-+# Configuration file for the Makefiles of xd3d          |
-+# François Jouve 2003 (Francois.Jouve@Polytechnique.fr) |
-+#--------------------------------------------------------
-+
-+#
-+# Modifiable parameters
-+#
-+
-+#
-+# Root directory of the distribution
-+#
-+#XD3D_DIR = $(HOME)/xd3d-8.1.0
-+XD3D_DIR = Please_Configure
-+
-+#
-+# Install directory
-+#
-+#INSTALL_DIR = /usr/local/bin
-+INSTALL_DIR = ##D##/usr/bin
-+
-+#
-+# Location of the X11 lib (libX11.a)
-+#
-+#LIBX11 = /usr/X11R6/lib
-+LIBX11 = /usr/X11R6/lib
-+
-+#
-+# Language parameter
-+#
-+#LANGUAGE = FRANCAIS
-+#LANGUAGE = ENGLISH
-+LANGUAGE = ENGLISH
-+
-+#
-+# Max memory for xd3d (MBytes)
-+#
-+#MEMORY_XD3D = 64
-+MEMORY_XD3D = 64
-+
-+#
-+# Fortran compiler
-+#
-+COMPILF = g77
-+
-+#
-+# C compiler
-+#
-+COMPILC = gcc
-+RANLIB  = ranlib
-+AR      = ar r
-+STRIP   = strip $@
-+
-+#
-+# Options for the Fortran compiler
-+#
-+OPTF = ##CFLAGS##
-+#
-+# Options for the C compiler
-+#
-+OPTC = ##CFLAGS##
-+
-+#-----------------------------------------------
-+# You should not need to change anything below !
-+#-----------------------------------------------
-+
-+SRCDIR = $(XD3D_DIR)/src
-+BINDIR = $(XD3D_DIR)/bin
-+LIBDIR = $(XD3D_DIR)/lib
-+INCF   = -I$(XD3D_DIR)/src/include
-+INCC   = -I$(LIBX11)/../include
-+
-+LINK      = $(COMPILF) $(OPTF) -o
-+LINKOPT   = -lc -lm
-+LINKOPTX  = -L$(LIBX11) -lX11 -lXpm -lc -lm
-+LIBRAIRIE = $(LIBDIR)/question_lib.a
-+MYXLIB    = $(LIBDIR)/my_Xlib.a
-+INTERP    = $(LIBDIR)/interp.a
-+
-+.f.o: ; $(COMPILF) $(INCF) $(OPTF) -c $*.f
-+.c.o: ; $(COMPILC) $(INCC) $(OPTC) -D$(LANGUAGE) -c $*.c
-diff -U 3 -dHrN -- xd3d-8.2.0-orig/RULES.icc xd3d-8.2.0/RULES.icc
---- xd3d-8.2.0-orig/RULES.icc	1970-01-01 01:00:00.000000000 +0100
-+++ xd3d-8.2.0/RULES.icc	2004-05-09 02:28:40.138499200 +0200
-@@ -0,0 +1,81 @@
-+#--------------------------------------------------------
-+# Configuration file for the Makefiles of xd3d          |
-+# François Jouve 2003 (Francois.Jouve@Polytechnique.fr) |
-+#--------------------------------------------------------
-+
-+#
-+# Modifiable parameters
-+#
-+
-+#
-+# Root directory of the distribution
-+#
-+#XD3D_DIR = $(HOME)/xd3d-8.1.0
-+XD3D_DIR = Please_Configure
-+
-+#
-+# Install directory
-+#
-+#INSTALL_DIR = /usr/local/bin
-+INSTALL_DIR = ##D##/usr/bin
-+
-+#
-+# Location of the X11 lib (libX11.a)
-+#
-+#LIBX11 = /usr/X11R6/lib
-+LIBX11 = /usr/X11R6/lib
-+
-+#
-+# Language parameter
-+#
-+#LANGUAGE = FRANCAIS
-+#LANGUAGE = ENGLISH
-+LANGUAGE = ENGLISH
-+
-+#
-+# Max memory for xd3d (MBytes)
-+#
-+#MEMORY_XD3D = 64
-+MEMORY_XD3D = 64
-+
-+#
-+# Fortran compiler
-+#
-+COMPILF = ifort
-+
-+#
-+# C compiler
-+#
-+COMPILC = icc
-+RANLIB  = ranlib
-+AR      = xiar r
-+STRIP   = strip $@
-+
-+#
-+# Options for the Fortran compiler
-+#
-+OPTF = -O3 -axWNBKP -ipo
-+#
-+# Options for the C compiler
-+#
-+OPTC = -O3 -axWNBKP -ipo
-+
-+#-----------------------------------------------
-+# You should not need to change anything below !
-+#-----------------------------------------------
-+
-+SRCDIR = $(XD3D_DIR)/src
-+BINDIR = $(XD3D_DIR)/bin
-+LIBDIR = $(XD3D_DIR)/lib
-+INCF   = -I$(XD3D_DIR)/src/include
-+INCC   = -I$(LIBX11)/../include
-+
-+LINK      = $(COMPILF) $(OPTF) -o
-+LINKOPT   = -lc -lm
-+LINKOPTX  = -L$(LIBX11) -lX11 -lXpm -lc -lm
-+LIBRAIRIE = $(LIBDIR)/question_lib.a
-+MYXLIB    = $(LIBDIR)/my_Xlib.a
-+INTERP    = $(LIBDIR)/interp.a
-+
-+.f.o: ; $(COMPILF) $(INCF) $(OPTF) -c $*.f
-+.c.o: ; $(COMPILC) $(INCC) $(OPTC) -D$(LANGUAGE) -c $*.c
diff --git a/sci-visualization/xd3d/xd3d-8.2.1.ebuild b/sci-visualization/xd3d/xd3d-8.2.1.ebuild
deleted file mode 100644
index 29e125e8cf83..000000000000
--- a/sci-visualization/xd3d/xd3d-8.2.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/xd3d-8.2.1.ebuild,v 1.5 2008/01/21 14:24:20 markusle Exp $
-
-DESCRIPTION="scientific visualization tool"
-
-HOMEPAGE="http://www.cmap.polytechnique.fr/~jouve/xd3d/"
-SRC_URI="http://www.cmap.polytechnique.fr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-
-KEYWORDS="~ppc ~ppc64 ~x86"
-
-IUSE="icc"
-
-RDEPEND="x11-libs/libXpm
-	icc? ( dev-lang/icc dev-lang/ifc )"
-
-DEPEND="${RDEPEND}
-	app-shells/tcsh"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	patch -p1 < "${FILESDIR}"/gentoo-${P}.diff
-}
-
-src_compile() {
-	if use icc; then
-		sed "s:##D##:${D}:g" < RULES.icc > RULES.gentoo
-	else
-		type -P g77 2> /dev/null || die "No GNU Fortran compiler found!"
-		sed "s:##CFLAGS##:${CFLAGS}:g" < RULES.gentoo > RULES.linux
-		sed "s:##D##:${D}:g" < RULES.linux > RULES.gentoo
-	fi
-	./configure -arch=gentoo || die
-
-	make || die
-}
-
-src_install() {
-	make install || die
-
-	dodoc BUGS CHANGELOG FAQ FORMATS INSTALL README
-	insinto /usr/share/doc/${PF}
-	doins Manuals/*
-
-	dodir /usr/share/doc/${PF}/examples
-	insinto /usr/share/doc/${PF}/examples
-	doins Examples/*
-}
diff --git a/sci-visualization/xd3d/xd3d-8.3.1.ebuild b/sci-visualization/xd3d/xd3d-8.3.1.ebuild
index 9575397ee92f..ae832b91862b 100644
--- a/sci-visualization/xd3d/xd3d-8.3.1.ebuild
+++ b/sci-visualization/xd3d/xd3d-8.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/xd3d-8.3.1.ebuild,v 1.1 2008/01/21 14:24:20 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/xd3d-8.3.1.ebuild,v 1.2 2008/04/04 10:10:12 bicatali Exp $
 
 inherit fortran toolchain-funcs multilib
 
@@ -18,7 +18,7 @@ DEPEND="${RDEPEND}
 	app-shells/tcsh"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-gentoo.diff
 }
@@ -33,17 +33,17 @@ src_compile() {
 		-i RULES.gentoo \
 		|| die "failed to set up RULES.gentoo"
 	./configure -arch=gentoo || die "configure failed."
-	emake || die "make failed."
+	emake || die "emake failed."
 }
 
 src_install() {
-	mkdir -p "${D}"/usr/bin && make install \
-		|| die "make install failed"
+	dodir /usr/bin
+	emake install || die "emake install failed"
 
-	dodoc BUGS CHANGELOG FAQ FORMATS INSTALL README
+	dodoc BUGS CHANGELOG FAQ FORMATS INSTALL README || die
 	insinto /usr/share/doc/${PF}
-	doins Manuals/*
+	doins Manuals/* || die
 
 	insinto /usr/share/doc/${PF}/examples
-	doins -r Examples/*
+	doins -r Examples/* || die
 }