Added ifc as a possible fortran compiler, x11-libs/libXt as a dep, more cleaning.

Package-Manager: portage-2.1.3.12

7 files changed, 53 insertions, 221 deletions

diff --git a/sci-libs/pgplot/ChangeLog b/sci-libs/pgplot/ChangeLog
index 3ccccb840428..39edd5f6a6e4 100644
--- a/sci-libs/pgplot/ChangeLog
+++ b/sci-libs/pgplot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/pgplot
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.9 2007/07/22 07:02:25 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.10 2007/10/11 17:50:41 bicatali Exp $
+
+  11 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> -pgplot-5.2.2.ebuild,
+  -pgplot-5.2.2-r1.ebuild, pgplot-5.2.2-r2.ebuild:
+  Added ifc as a possible fortran compiler, x11-libs/libXt as a dep, more
+  cleaning.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; pgplot-5.2.2.ebuild:
   Drop virtual/x11 references.
diff --git a/sci-libs/pgplot/Manifest b/sci-libs/pgplot/Manifest
index 55f32918fa1b..d554f7d96154 100644
--- a/sci-libs/pgplot/Manifest
+++ b/sci-libs/pgplot/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pgplot-compile-setup.patch 1600 RMD160 73f4786d421b6d353d0e195cc772e13fea1504ca SHA1 719252ffa8674239c8fab19d65f1e3c471b82e53 SHA256 972cbe86b72e79c15deec3c3ecf44b80b23ad56a4e9da4bfdbeb4e872af65e1b
 MD5 4f8ac4db89ea14bd777557e225b200e4 files/pgplot-compile-setup.patch 1600
 RMD160 73f4786d421b6d353d0e195cc772e13fea1504ca files/pgplot-compile-setup.patch 1600
@@ -15,32 +18,25 @@ MD5 2464539695079e49d14eb3e242b26ee8 files/pgplot-pgdisp.patch 332
 RMD160 1bd3c2ed7770bb60be19c50c4610c35d67bf92e9 files/pgplot-pgdisp.patch 332
 SHA256 3aac6127d35f4039023a13182553b24e1902d6e1b46530fbd68e034357d0b078 files/pgplot-pgdisp.patch 332
 DIST pgplot522.tar.gz 1197397 RMD160 4c21cad6613772f4104c65ac3d8d9a42e3c4afe1 SHA1 1f1c9aa17eeec9a2fb23fd15a0e4a91dcc49ddc1 SHA256 a5799ff719a510d84d26df4ae7409ae61fe66477e3f1e8820422a9a4727a5be4
-EBUILD pgplot-5.2.2-r1.ebuild 2675 RMD160 46872e1529f960a15da3cd5af22cd756c8bb814f SHA1 e39121bbb662822fc8854abb8351a951d1bb1b56 SHA256 adb40f700186435029be74a0b4674421fd3239617bbc479515141daba02cffe5
-MD5 d4f417f61f31ae7a963291b2d55fdc2b pgplot-5.2.2-r1.ebuild 2675
-RMD160 46872e1529f960a15da3cd5af22cd756c8bb814f pgplot-5.2.2-r1.ebuild 2675
-SHA256 adb40f700186435029be74a0b4674421fd3239617bbc479515141daba02cffe5 pgplot-5.2.2-r1.ebuild 2675
-EBUILD pgplot-5.2.2-r2.ebuild 4424 RMD160 ed2f3d91fa6e407ff20f81145b38a311f3f03dbd SHA1 2cc96c307f2d246887a9d4ba8da73617809cd412 SHA256 dbfd510604330a1d9e9869005640e43c747ae83cc72dc4ff84d01ebd39211d20
-MD5 be611af1946096991867e2ce46083aa1 pgplot-5.2.2-r2.ebuild 4424
-RMD160 ed2f3d91fa6e407ff20f81145b38a311f3f03dbd pgplot-5.2.2-r2.ebuild 4424
-SHA256 dbfd510604330a1d9e9869005640e43c747ae83cc72dc4ff84d01ebd39211d20 pgplot-5.2.2-r2.ebuild 4424
-EBUILD pgplot-5.2.2.ebuild 1477 RMD160 54c0848650748154e7ffb305ab4e2b18799e5775 SHA1 d4b2accd35f16dad47283e04eb66fa504f241be0 SHA256 68ea45612c8c86554d0f2b59fb33c31f4fe4e27df6f42a0d511743c2f0bc7943
-MD5 f75cf8448ac845f40d715b3e4df65b22 pgplot-5.2.2.ebuild 1477
-RMD160 54c0848650748154e7ffb305ab4e2b18799e5775 pgplot-5.2.2.ebuild 1477
-SHA256 68ea45612c8c86554d0f2b59fb33c31f4fe4e27df6f42a0d511743c2f0bc7943 pgplot-5.2.2.ebuild 1477
-MISC ChangeLog 1976 RMD160 ef98dc3958d1a770ec2a3fb9ded10fd9288961ad SHA1 f21e102ba1b4334bea7f984f3b80f183de321a17 SHA256 b832b8e63d9a5d738e7e9054f4e32a7f11a74bf6aac1811800e511999c56bf33
-MD5 9f2f835cc0e6e4a6cc0ad109b75d9e0e ChangeLog 1976
-RMD160 ef98dc3958d1a770ec2a3fb9ded10fd9288961ad ChangeLog 1976
-SHA256 b832b8e63d9a5d738e7e9054f4e32a7f11a74bf6aac1811800e511999c56bf33 ChangeLog 1976
+EBUILD pgplot-5.2.2-r2.ebuild 4779 RMD160 fad5c7a0ac4c56b87dc4b2fda543cc6e41ae9ec7 SHA1 e6ab539fb33b520ab97da99a972c2fee75abb95a SHA256 c75273a4a3357c309d577d8ecbf727ba0447d5bbfe3fb16e10de5d027be1099e
+MD5 60f3b80927f0ad37954bfcc1d2fd8d90 pgplot-5.2.2-r2.ebuild 4779
+RMD160 fad5c7a0ac4c56b87dc4b2fda543cc6e41ae9ec7 pgplot-5.2.2-r2.ebuild 4779
+SHA256 c75273a4a3357c309d577d8ecbf727ba0447d5bbfe3fb16e10de5d027be1099e pgplot-5.2.2-r2.ebuild 4779
+MISC ChangeLog 2191 RMD160 d91dad2719083f6ea5d5262e6949aa06c86b37db SHA1 92d685ea4045f7609d08ef7983ba5a370338ee52 SHA256 16ee304b730251e7f1740fbec5f6a0efffed21786a0199236378000a291dccae
+MD5 c2b2b7defff61c1a13c3d97a6fb2d595 ChangeLog 2191
+RMD160 d91dad2719083f6ea5d5262e6949aa06c86b37db ChangeLog 2191
+SHA256 16ee304b730251e7f1740fbec5f6a0efffed21786a0199236378000a291dccae ChangeLog 2191
 MISC metadata.xml 507 RMD160 8f89aef225b3c7fa4b817bd88ebfa5e73c9f1f4f SHA1 93061e1e4b6fa0967fec2829db49dbcaa74b6410 SHA256 44c0abf74199b2c4780cd7bf4bbc9b7c235ccc5e74e262985517ec8ade97189c
 MD5 0b77527426ef4e61d561d28de9662c34 metadata.xml 507
 RMD160 8f89aef225b3c7fa4b817bd88ebfa5e73c9f1f4f metadata.xml 507
 SHA256 44c0abf74199b2c4780cd7bf4bbc9b7c235ccc5e74e262985517ec8ade97189c metadata.xml 507
-MD5 381ff8dd7151ce6c864ea589a0e500f7 files/digest-pgplot-5.2.2 232
-RMD160 837a8454b49f25495e1776c9fb3ad4022b611b5a files/digest-pgplot-5.2.2 232
-SHA256 ee8e209202357347a9e6685f0f2930998edef0897d7496557c32fa767210e182 files/digest-pgplot-5.2.2 232
-MD5 381ff8dd7151ce6c864ea589a0e500f7 files/digest-pgplot-5.2.2-r1 232
-RMD160 837a8454b49f25495e1776c9fb3ad4022b611b5a files/digest-pgplot-5.2.2-r1 232
-SHA256 ee8e209202357347a9e6685f0f2930998edef0897d7496557c32fa767210e182 files/digest-pgplot-5.2.2-r1 232
 MD5 381ff8dd7151ce6c864ea589a0e500f7 files/digest-pgplot-5.2.2-r2 232
 RMD160 837a8454b49f25495e1776c9fb3ad4022b611b5a files/digest-pgplot-5.2.2-r2 232
 SHA256 ee8e209202357347a9e6685f0f2930998edef0897d7496557c32fa767210e182 files/digest-pgplot-5.2.2-r2 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHDmJ31ycZbhPLE2ARAjzYAKCtuW6MuGg66GqII6kjq0rWGuR0SwCeKBE3
+3C67ruyKv4vNutnIEXYX8o0=
+=1tPs
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/pgplot/files/digest-pgplot-5.2.2 b/sci-libs/pgplot/files/digest-pgplot-5.2.2
deleted file mode 100644
index a08d5a4ce344..000000000000
--- a/sci-libs/pgplot/files/digest-pgplot-5.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e8a6e8d0d5ef9d1709dfb567724525ae pgplot522.tar.gz 1197397
-RMD160 4c21cad6613772f4104c65ac3d8d9a42e3c4afe1 pgplot522.tar.gz 1197397
-SHA256 a5799ff719a510d84d26df4ae7409ae61fe66477e3f1e8820422a9a4727a5be4 pgplot522.tar.gz 1197397
diff --git a/sci-libs/pgplot/files/digest-pgplot-5.2.2-r1 b/sci-libs/pgplot/files/digest-pgplot-5.2.2-r1
deleted file mode 100644
index a08d5a4ce344..000000000000
--- a/sci-libs/pgplot/files/digest-pgplot-5.2.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e8a6e8d0d5ef9d1709dfb567724525ae pgplot522.tar.gz 1197397
-RMD160 4c21cad6613772f4104c65ac3d8d9a42e3c4afe1 pgplot522.tar.gz 1197397
-SHA256 a5799ff719a510d84d26df4ae7409ae61fe66477e3f1e8820422a9a4727a5be4 pgplot522.tar.gz 1197397
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r1.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r1.ebuild
deleted file mode 100644
index d66412a0ed9b..000000000000
--- a/sci-libs/pgplot/pgplot-5.2.2-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r1.ebuild,v 1.1 2007/03/05 18:58:23 bicatali Exp $
-
-inherit eutils toolchain-funcs fortran
-
-FORTRAN="g77"
-MY_P="${PN}${PV//.}"
-DESCRIPTION="A C/FORTRAN device-independent graphics library for making simple scientific graphs"
-HOMEPAGE="http://www.astro.caltech.edu/~tjp/pgplot/"
-SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz"
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE="doc"
-RDEPEND="x11-libs/libX11
-	media-libs/libpng"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	fortran_src_unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-drivers.patch
-	epatch "${FILESDIR}"/${PN}-makemake.patch
-	epatch "${FILESDIR}"/${PN}-compile-setup.patch
-
-	if use amd64 -o use ia64; then
-		sed -i \
-			-e 's/INTEGER PIXMAP/INTEGER*8 PIXMAP/g' \
-			drivers/{gi,pp,wd}driv.f || die "sed 64bits failed"
-	fi
-
-	cp sys_linux/g77_gcc.conf local.conf
-
-	sed -i \
-		-e "s:FCOMPL=.*:FCOMPL=\"${FORTRANC}\":g" \
-		-e "s:FFLAGOPT=.*:FFLAGOPT=\"${FFLAGS:- -O2}\":g" \
-		-e "s:CCOMPL=.*:CCOMPL=\"$(tc-getCC)\":g" \
-		-e "s:CFLAGOPT=.*:CFLAGOPT=\"${CFLAGS}\":g" \
-		local.conf || die "sed flags failed"
-
-	sed -i \
-		-e "s:/usr/local/pgplot:/usr/$(get_libdir)/pgplot:" \
-		src/grgfil.f || die "sed path failed"
-}
-
-src_compile() {
-	./makemake "${S}" linux
-
-	emake -j1 || die "emake failed"
-
-	# Build C portion
-	make cpg || die "make cpg failed"
-
-	# this just cleans out unneeded files
-	make clean
-}
-
-src_test() {
-	einfo "Testing various demo programs"
-	# i can go to 16
-	for i in 1 2 3; do
-		make pgdemo${i}
-		# j can also be LATEX CPS...
-		for j in GIF PNG PS; do
-			local testexe=./test_${j}_${i}
-			echo "./pgdemo${i} <<EOF" > ${testexe}
-			echo "/${j}" >> ${testexe}
-			echo "EOF" >> ${testexe}
-			sh ${testexe} || die "test ${i} failed"
-		done
-	done
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/pgplot
-	doins grfont.dat grexec.f grpckg1.inc rgb.txt
-
-	# FORTRAN libs
-	dolib.a libpgplot.a
-	dolib.so libpgplot.so
-	dosym libpgplot.so.5 /usr/$(get_libdir)/libpgplot.so
-	dobin pgxwin_server
-
-	# C binding
-	insinto /usr/include
-	doins cpgplot.h
-	dolib.a libcpgplot.a
-	# shared lib: todo eventually in a patch
-	# dolib.so libcpgplot.so
-	# dosym libcpgplot.so.5 /usr/$(get_libdir)/libcpgplot.so
-
-	# minimal doc
-	dodoc aaaread.me pgplot.doc
-
-	if use doc; then
-		dodoc cpg/cpgplot.doc applications/curvefit/curvefit.doc
-		dohtml pgplot.html
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/* cpg/cpgdemo.c
-		insinto /usr/share/doc/${PF}/pgm
-		doins pgmf/* drivers/xmotif/pgmdemo.c
-	fi
-}
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild
index 8fad60820fd4..16f140206284 100644
--- a/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild,v 1.2 2007/04/23 16:04:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild,v 1.3 2007/10/11 17:50:41 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -13,6 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~x86"
 IUSE="doc motif tk"
 RDEPEND="x11-libs/libX11
+	x11-libs/libXt
 	media-libs/libpng
 	motif? ( virtual/motif )
 	tk? ( dev-lang/tk )"
@@ -21,10 +22,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}"
 
-FORTRAN="g77 gfortran"
+FORTRAN="g77 gfortran ifc"
 
 src_unpack() {
-	fortran_src_unpack ${A}
+	unpack ${A}
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-drivers.patch
@@ -32,14 +33,13 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-compile-setup.patch
 	epatch "${FILESDIR}"/${PN}-pgdisp.patch
 
-	# gfortran does not compile gif, pp and wd drivers
-	# (might change with gfortran 4.2 or 4.3)
-	if [[ "${FORTRANC}" == "gfortran" ]]; then
+	# gfortran does not compile gif, pp and wd drivers (last check: gfortran-4.2)
+	if [[ "${FORTRANC}" == gfortran ]]; then
 		ewarn
 		ewarn "Warning!"
-		elog "gfortran selected: does not yet compile all drivers"
-		elog "disabling gif, wd, and ppd drivers"
-		elog "if you want more drivers, use g77"
+		ewarn "gfortran selected: does not yet compile all drivers"
+		ewarn "disabling gif, wd, and ppd drivers"
+		ewarn "if you want more drivers, use g77 or ifort"
 		ewarn
 		sed -i \
 			-e 's/GIDRIV/! GIDRIV/g' \
@@ -49,7 +49,7 @@ src_unpack() {
 	fi
 
 	# fix pointers for 64 bits
-	if use amd64 -o use ia64; then
+	if use amd64 || use ia64; then
 		sed -i \
 			-e 's/INTEGER PIXMAP/INTEGER*8 PIXMAP/g' \
 			drivers/{gi,pp,wd}driv.f || die "sed 64bits failed"
@@ -66,6 +66,13 @@ src_unpack() {
 		-e "s:SHARED_LD=.*:SHARED_LD=\"$(tc-getCC) -Wl,-soname,libpgplot.so.5 -shared -o \$SHARED_LIB\":g" \
 		local.conf || die "sed flags failed"
 
+	if [[ "${FORTRANC}" = if* ]]; then
+		sed -i \
+			-e 's/-Wall//g' \
+			-e 's/TK_LIBS="/TK_LIBS="-nofor-main /' \
+			local.conf || die "sed drivers failed"
+	fi
+
 	sed -i \
 		-e "s:/usr/local/pgplot:/usr/$(get_libdir)/pgplot:g" \
 		-e "s:/usr/local/bin:/usr/bin:g" \
@@ -84,24 +91,24 @@ src_compile() {
 	emake -j1 || die "emake failed"
 
 	# Build C portion
-	make cpg || die "make cpg failed"
+	emake -j1 cpg || die "make cpg failed"
 
 	if use doc; then
-		make pgplot.html || die "make pgplot.html failed"
-		make pgplot-routines.tex  || die "make pgplot-routines failed"
+		emake pgplot.html || die "make pgplot.html failed"
+		emake pgplot-routines.tex  || die "make pgplot-routines failed"
 		pdflatex pgplot-routines.tex
 		pdflatex pgplot-routines.tex
 	fi
 
 	# this just cleans out unneeded files
-	make clean
+	emake clean
 }
 
 src_test() {
 	einfo "Testing various demo programs"
 	# i can go to 16
 	for i in 1 2 3; do
-		make pgdemo${i}
+		emake pgdemo${i}
 		# j can also be LATEX CPS...
 		for j in NULL PNG PS CPS LATEX; do
 			local testexe=./test_${j}_${i}
@@ -125,25 +132,25 @@ src_install() {
 
 	# C binding
 	insinto /usr/include
-	doins cpgplot.h || die "doins failed"
+	doins cpgplot.h || die "doins C binding failed"
 	dolib.a libcpgplot.a || die "dolib.a failed"
 	# shared lib: todo eventually in a patch
 	# dolib.so libcpgplot.so
 	# dosym libcpgplot.so.5 /usr/$(get_libdir)/libcpgplot.so
 
 	if use motif; then
-		doins XmPgplot.h
-		dolib.a libXmPgplot.a
+		doins XmPgplot.h || die "doins motif failed"
+		dolib.a libXmPgplot.a "dolib.a motif failed"
 	fi
 
 	if use tk; then
-		doins tkpgplot.h
-		dolib.a libtkpgplot.a
+		doins tkpgplot.h || die "doins tk failed"
+		dolib.a libtkpgplot.a || die "dolib.a tk failed"
 	fi
 
 	# minimal doc
-	dodoc aaaread.me pgplot.doc
-	newdoc pgdispd/aaaread.me pgdisp.txt
+	dodoc aaaread.me pgplot.doc || die "dodoc minimal doc failed"
+	newdoc pgdispd/aaaread.me pgdispd.txt || die "install pgdispd doc failed"
 
 	if use doc; then
 		dodoc cpg/cpgplot.doc applications/curvefit/curvefit.doc
diff --git a/sci-libs/pgplot/pgplot-5.2.2.ebuild b/sci-libs/pgplot/pgplot-5.2.2.ebuild
deleted file mode 100644
index b52111a0a379..000000000000
--- a/sci-libs/pgplot/pgplot-5.2.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2.ebuild,v 1.3 2007/07/22 07:02:25 dberkholz Exp $
-
-inherit eutils toolchain-funcs fortran
-
-FORTRAN="g77"
-MY_P="${PN}${PV//.}"
-DESCRIPTION="A Fortran- or C-callable, device-independent graphics package for making simple scientific graphs"
-HOMEPAGE="http://www.astro.caltech.edu/~tjp/pgplot/"
-SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz"
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="~ia64 ~x86"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	media-libs/libpng"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${PN}-drivers.patch
-	epatch ${FILESDIR}/${PN}-makemake.patch
-	epatch ${FILESDIR}/${PN}-compile-setup.patch
-
-	cp sys_linux/g77_gcc.conf local.conf
-
-	sed -i \
-		-e "s:FCOMPL=.*:FCOMPL=\"${FORTRANC}\":g" \
-		-e "s:FFLAGOPT=.*:FFLAGOPT=\"${FFLAGS:- -O2}\":g" \
-		-e "s:CCOMPL=.*:CCOMPL=\"$(tc-getCC)\":g" \
-		-e "s:CFLAGOPT=.*:CFLAGOPT=\"${CFLAGS}\":g" \
-		local.conf
-}
-
-src_compile() {
-	./makemake ${S} linux
-
-	emake -j1 || die "emake failed"
-
-	# Build C portion
-	make cpg
-
-	# this just cleans out unneeded files
-	make clean
-}
-
-src_install() {
-	insinto /usr/lib/pgplot
-	doins grfont.dat
-
-	dolib.a libpgplot.a
-	dolib.so libpgplot.so
-	dodoc pgplot.doc
-	dobin pgxwin_server
-
-	# C binding
-	insinto /usr/include
-	doins cpgplot.h
-	dolib.a libcpgplot.a
-}