Fixed parallel building, no more forced stripping, added a missing header for QA, removed fortran eclass, switched to EAPI=2

Package-Manager: portage-2.2_rc54/cvs/Linux x86_64

6 files changed, 104 insertions, 29 deletions

diff --git a/sci-visualization/xd3d/ChangeLog b/sci-visualization/xd3d/ChangeLog
index ac0bb789fdcf..fd7195554dca 100644
--- a/sci-visualization/xd3d/ChangeLog
+++ b/sci-visualization/xd3d/ChangeLog
@@ -1,6 +1,12 @@
 # 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.8 2008/04/04 10:10:12 bicatali Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/ChangeLog,v 1.9 2009/12/04 19:05:23 bicatali Exp $
+
+  04 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org> xd3d-8.3.1.ebuild,
+  files/xd3d-8.3.1-gentoo.diff, +files/xd3d-8.3.1-parallel.patch,
+  +files/xd3d-8.3.1-rotated.patch:
+  Fixed parallel building, no more forced stripping, added a missing header
+  for QA, removed fortran eclass, switched to EAPI=2
 
   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:
diff --git a/sci-visualization/xd3d/Manifest b/sci-visualization/xd3d/Manifest
index d752c5f57f97..74b4c60fe86d 100644
--- a/sci-visualization/xd3d/Manifest
+++ b/sci-visualization/xd3d/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX xd3d-8.3.1-gentoo.diff 1770 RMD160 0d4511c533ee18a4c6975a4f2ed24b72c59c5661 SHA1 b3b097443ec89d3e42a049b79bb5dadb54e666d7 SHA256 9de8ef3df8d30ed0533c62049335a092967c2fb664b264d644017d583f3317ce
+AUX xd3d-8.3.1-gentoo.diff 1768 RMD160 b889b98a0899a0739e1321d5b26d5b187acf0ab0 SHA1 6acebc8eedcda12de44f1539121a4a83c49eaa67 SHA256 cd2833152b1be3f40ec69b72a20ab655fc068be35f6c71ac4f4a74a3bed4b04d
+AUX xd3d-8.3.1-parallel.patch 2209 RMD160 cd4efded9c245614c8b8c5aad08f5217931dc0b6 SHA1 684bd4adca83c8e2fa301c38e2ccf7a94f3f757e SHA256 e338c1e5966fca00b6308cbd20926c4a3f5840082803bbc6ecbc1853c98ad0dd
+AUX xd3d-8.3.1-rotated.patch 242 RMD160 78849d46a6e6442689f84c00cf4fdc24674d871c SHA1 398ff4e6e1f78dd67e164b3c2373cccf8d0b0105 SHA256 14fca665afe5a226223e9efac7e8f707e67b759105feeec954f9ad7108946234
 DIST xd3d-8.3.1.tar.gz 2188216 RMD160 78b3d6b457bce69e3525a1c654d7241df2f8d5c8 SHA1 9ab3c1c14e63434714e7e8022b6c1ab2366ede3d SHA256 f363cabec88fb5055fe86fb9973d7122e93dfd4a803517b9f90be18131ef8816
-EBUILD xd3d-8.3.1.ebuild 1230 RMD160 bbddc971c121e78cf7d7fcdd3e698f7c59531f9d SHA1 9341d6a1af782eff2b15cd1163441633672714fd SHA256 9a9a600730a8695e565362ecd4eec71cabcd8922cbe65270fb088947ff197dd2
-MISC ChangeLog 1990 RMD160 cb49b79dd4f9f0ee6ab15dd3f45fd6fbf5228636 SHA1 d4dc34706a495a8f302eacc2458a39fc64809eec SHA256 8468d27d564699c4df9881f7c5a8e0703f13f39a90f26a04c480aca337341de9
+EBUILD xd3d-8.3.1.ebuild 1138 RMD160 0aa5d7a2d3999af39a2248ce93289f4996a5df50 SHA1 ac971089628df282d8f07d2c75c91594d92afcd3 SHA256 a78aa741f280a8bea6adde79643908231762ff09c8250a821acd026d56d67836
+MISC ChangeLog 2295 RMD160 6e23f54ccab33b8fe4bde8fbe052b0469e1ac03b SHA1 57bda7cde942b985ccba39831433fe0975d1b1eb SHA256 de09deeb10560f3014221f5fc678ad8619f98970401ebb8fcc7d6b27b9998bd3
 MISC metadata.xml 614 RMD160 153dd760d702ef7f14cb2f2e73f0dcbd22c88646 SHA1 41535ad4d73196125d16049bc6a1c3ade1ea496c SHA256 18dec81f48b4dcf4a397189171483fabf4a1fabf0ad8d1dca013e20b138bd06c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iD8DBQFH9f6O1ycZbhPLE2ARAjC7AJ4vYkNyNiJzebDsqLGWu21AbEyr7gCeLtQh
-owp5aHx8ITMYb2UbeVe58kk=
-=jYXX
+iEYEARECAAYFAksZZtoACgkQ1ycZbhPLE2CL4gCfTnV0Dmye5uip3CI3W7Xi5KbS
+VrsAnioSdrkJHJYVS18u9YVW2BvzMiiI
+=5cmx
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/xd3d/files/xd3d-8.3.1-gentoo.diff b/sci-visualization/xd3d/files/xd3d-8.3.1-gentoo.diff
index 4baf7b3f795b..4e7c52b7724a 100644
--- a/sci-visualization/xd3d/files/xd3d-8.3.1-gentoo.diff
+++ b/sci-visualization/xd3d/files/xd3d-8.3.1-gentoo.diff
@@ -45,24 +45,24 @@ diff -Naur RULES.gentoo RULES.gentoo
 +#
 +# Fortran compiler
 +#
-+COMPILF = ##FC##
++COMPILF = $(FC)
 +
 +#
 +# C compiler
 +#
-+COMPILC = ##CC##
++COMPILC = $(CC)
 +RANLIB  = ranlib
 +AR      = ar r
-+STRIP   = strip $@
++STRIP   = echo $@
 +
 +#
 +# Options for the Fortran compiler
 +#
-+OPTF = ##FFLAGS##
++OPTF = $(FFLAGS)
 +#
 +# Options for the C compiler
 +#
-+OPTC = ##CFLAGS##
++OPTC = $(CFLAGS)
 +
 +#-----------------------------------------------
 +# You should not need to change anything below !
@@ -75,7 +75,7 @@ diff -Naur RULES.gentoo RULES.gentoo
 +INCF   = -I$(XD3D_DIR)/src/include
 +INCC   = -I$(LIBX11)/../include
 +
-+LINK      = $(COMPILF) $(OPTF) -o
++LINK      = $(COMPILF) $(LDFLAGS) -o
 +LINKOPT   = -lc -lm
 +LINKOPTX  = -L$(LIBX11) -lX11 -lXpm -lc -lm
 +LIBRAIRIE = $(LIBDIR)/question_lib.a
diff --git a/sci-visualization/xd3d/files/xd3d-8.3.1-parallel.patch b/sci-visualization/xd3d/files/xd3d-8.3.1-parallel.patch
new file mode 100644
index 000000000000..8161fda3d9a7
--- /dev/null
+++ b/sci-visualization/xd3d/files/xd3d-8.3.1-parallel.patch
@@ -0,0 +1,61 @@
+--- ./src/various/Makefile.orig	2009-12-04 18:16:57.000000000 +0000
++++ ./src/various/Makefile	2009-12-04 18:17:13.000000000 +0000
+@@ -1,6 +1,6 @@
+ include ../../RULES
+ 
+-all :; make clair clairc3d create_c3d obscur obscurc3d tradavoir translation txt2avoir
++all : clair clairc3d create_c3d obscur obscurc3d tradavoir translation txt2avoir
+ 
+ clair : clair.f $(LIBRAIRIE) ;\
+ $(LINK) $(BINDIR)/clair $(INCF) clair.f $(LIBRAIRIE) $(LINKOPTX)
+--- ./src/X/Makefile.orig	2009-12-04 18:16:06.000000000 +0000
++++ ./src/X/Makefile	2009-12-04 18:16:36.000000000 +0000
+@@ -118,7 +118,7 @@
+ lib : $(LIBMARC)
+ $(LIBMARC) : $(OBJETS) $(OBJETSMARC) ; $(AR) $@ $(OBJETS) $(OBJETSMARC) ; $(RANLIB) $@
+ 
+-all :; make ; make lib
++all : lib
+ 
+ clean : ; /bin/rm -f $(OBJETS) $(LIB) $(LIBMARC)
+ 
+--- ./Makefile.orig	2009-12-04 18:12:08.000000000 +0000
++++ ./Makefile	2009-12-04 19:06:37.000000000 +0000
+@@ -13,22 +13,24 @@
+ $(BINDIR)/xd3d$(SUFF) \
+ $(BINDIR)/xgraphic$(SUFF)
+ 
+-all :; make libs ; make utils ; make xgraphic ; make xd3d
++all : libs utils xgraphic xd3d
+ 
+ install :; /bin/cp -pidvu $(EXE) ./infps $(INSTALL_DIR)
+ 
+ libs :; \
+-cd $(SRCDIR)/qlib   ; echo "---- Building utility lib ----" ; make ;\
+-cd $(SRCDIR)/interp ; echo "---- Building parsing lib ----" ; make ;\
+-cd $(SRCDIR)/X      ; echo "---- Building X interface lib ----" ; make
+-
+-xd3d :; cd $(SRCDIR)/d3d ; echo "---- Building xd3d ----" ; make
+-
+-xgraphic :; cd $(SRCDIR)/graphic ; echo "---- Building xgraphic ----" ; make
+-
+-utils :; \
+-echo " ---- Building various utils ----" ;\
+-cd $(SRCDIR)/trad_nopo ; make ;\
+-cd $(SRCDIR)/various  ; make
++cd $(SRCDIR)/qlib   ; echo "---- Building utility lib ----" ; $(MAKE) ;\
++cd $(SRCDIR)/interp ; echo "---- Building parsing lib ----" ;$(MAKE) ;\
++cd $(SRCDIR)/X      ; echo "---- Building X interface lib ----" ; $(MAKE)
++
++xd3d : libs
++	cd $(SRCDIR)/d3d ; echo "---- Building xd3d ----" ; $(MAKE)
++
++xgraphic : libs 
++	cd $(SRCDIR)/graphic ; echo "---- Building xgraphic ----" ; $(MAKE)
++
++utils : libs 
++	echo " ---- Building various utils ----" ;\
++	cd $(SRCDIR)/trad_nopo ; $(MAKE) ;\
++	cd $(SRCDIR)/various  ; $(MAKE)
+ 
+ clean :; /bin/rm -f $(SRCDIR)/*/*.o $(LIBRAIRIE) $(MYXLIB) $(INTERP) $(EXE)
diff --git a/sci-visualization/xd3d/files/xd3d-8.3.1-rotated.patch b/sci-visualization/xd3d/files/xd3d-8.3.1-rotated.patch
new file mode 100644
index 000000000000..9e66dcab586c
--- /dev/null
+++ b/sci-visualization/xd3d/files/xd3d-8.3.1-rotated.patch
@@ -0,0 +1,10 @@
+--- src/X/rotated.c.orig	2009-12-04 18:09:55.000000000 +0000
++++ src/X/rotated.c	2009-12-04 18:10:37.000000000 +0000
+@@ -29,6 +29,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <string.h>
++#include <stdlib.h>
+ #include "rotated.h"
+ 
+ 
diff --git a/sci-visualization/xd3d/xd3d-8.3.1.ebuild b/sci-visualization/xd3d/xd3d-8.3.1.ebuild
index ae832b91862b..3974d26a083f 100644
--- a/sci-visualization/xd3d/xd3d-8.3.1.ebuild
+++ b/sci-visualization/xd3d/xd3d-8.3.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.2 2008/04/04 10:10:12 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/xd3d-8.3.1.ebuild,v 1.3 2009/12/04 19:05:23 bicatali Exp $
 
-inherit fortran toolchain-funcs multilib
+EAPI=2
+inherit eutils toolchain-funcs
 
 DESCRIPTION="scientific visualization tool"
 HOMEPAGE="http://www.cmap.polytechnique.fr/~jouve/xd3d/"
@@ -13,34 +14,29 @@ KEYWORDS="~ppc ~ppc64 ~x86 ~amd64"
 IUSE=""
 
 RDEPEND="x11-libs/libXpm"
-
 DEPEND="${RDEPEND}
 	app-shells/tcsh"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.diff
+	epatch "${FILESDIR}"/${P}-parallel.patch
+	epatch "${FILESDIR}"/${P}-rotated.patch
 }
 
-src_compile() {
+src_configure() {
+	export FC=$(tc-getFC)
 	sed -e "s:##D##:${D}:" \
 		-e "s:##lib##:$(get_libdir):" \
-		-e "s:##FC##:${FORTRANC}:" \
-		-e "s:##CC##:$(tc-getCC):" \
-		-e "s:##FFLAGS##:${FFLAGS}:" \
-		-e "s:##CFLAGS##:${CFLAGS}:" \
 		-i RULES.gentoo \
 		|| die "failed to set up RULES.gentoo"
 	./configure -arch=gentoo || die "configure failed."
-	emake || die "emake failed."
 }
 
 src_install() {
 	dodir /usr/bin
 	emake install || die "emake install failed"
 
-	dodoc BUGS CHANGELOG FAQ FORMATS INSTALL README || die
+	dodoc BUGS CHANGELOG FAQ FORMATS README
 	insinto /usr/share/doc/${PF}
 	doins Manuals/* || die