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

(Portage version: 2.1.3.12)

6 files changed, 35 insertions, 199 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/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
-}