Now install pgdisp, more drivers, and more doc. Add a motif and tk flag

(Portage version: 2.1.2-r9)

6 files changed, 278 insertions, 58 deletions

diff --git a/sci-libs/pgplot/ChangeLog b/sci-libs/pgplot/ChangeLog
index 2a8e6b0abc43..6db94ac7d783 100644
--- a/sci-libs/pgplot/ChangeLog
+++ b/sci-libs/pgplot/ChangeLog
@@ -1,6 +1,16 @@
 # 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.6 2007/03/05 18:58:23 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.7 2007/03/09 02:54:50 bicatali Exp $
+
+*pgplot-5.2.2-r2 (09 Mar 2007)
+
+  09 Mar 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  files/pgplot-drivers.patch, -files/pgplot-path.patch,
+  +files/pgplot-pgdisp.patch, +pgplot-5.2.2-r2.ebuild:
+  Now install pgdisp, more drivers, and more doc. Add a motif and tk flag 
+  to allow these two drivers to be built. Remove drivers using the non 
+  standard fortran %val for gfortran to compile (if g77 selected, drivers
+  won't be removed). Did some cleaning as well.
 
 *pgplot-5.2.2-r1 (05 Mar 2007)
 
diff --git a/sci-libs/pgplot/files/digest-pgplot-5.2.2-r2 b/sci-libs/pgplot/files/digest-pgplot-5.2.2-r2
new file mode 100644
index 000000000000..a08d5a4ce344
--- /dev/null
+++ b/sci-libs/pgplot/files/digest-pgplot-5.2.2-r2
@@ -0,0 +1,3 @@
+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/pgplot-drivers.patch b/sci-libs/pgplot/files/pgplot-drivers.patch
index 18eeebb28f79..8201bdfaeb70 100644
--- a/sci-libs/pgplot/files/pgplot-drivers.patch
+++ b/sci-libs/pgplot/files/pgplot-drivers.patch
@@ -1,67 +1,117 @@
-diff -ur pgplot.orig/drivers.list pgplot/drivers.list
---- pgplot.orig/drivers.list	1999-05-03 22:02:15.000000000 -0700
-+++ pgplot/drivers.list	2005-12-15 20:17:23.000000000 -0800
-@@ -16,8 +16,8 @@
+--- drivers.list.orig	2007-03-08 15:56:20.000000000 +0000
++++ drivers.list	2007-03-08 15:59:21.000000000 +0000
+@@ -6,71 +6,71 @@
+ !------------------------------------------------------------------------------
+ ! File       Code       Description                                Restrictions
+ ! BCDRIV 0 /BCANON    Canon Laser printer (bitmap version), landscape
+-! CADRIV 0 /CANON     Canon Laser printer, LBP-8/A2, landscape
++ CADRIV 0 /CANON     Canon Laser printer, LBP-8/A2, landscape
+ ! CCDRIV 0 /CCP       DEC LJ250 Color Companion printer
+-! CGDRIV 1 /CGM       CGM metafile, indexed colour selection            C
+-! CGDRIV 2 /CGMD      CGM metafile, direct colour selection             C
+-! CWDRIV 0 /CW6320    Gould/Bryans Colourwriter 6320 pen plotter	Std F77
++ CGDRIV 1 /CGM       CGM metafile, indexed colour selection            C
++ CGDRIV 2 /CGMD      CGM metafile, direct colour selection             C
++ CWDRIV 0 /CW6320    Gould/Bryans Colourwriter 6320 pen plotter	Std F77
+ ! EPDRIV 0 /EPSON     Epson FX100 dot matrix printer
+ ! EXDRIV 1 /EXCL      Talaris/EXCL printers, landscape
  ! EXDRIV 2 /EXCL      Talaris/EXCL printers, portrait
  ! GCDRIV 0 /GENICOM   Genicom 4410 dot-matrix printer, landscape
  !             Caution: use of GIDRIV may require a license from Unisys:
 -! GIDRIV 1 /GIF       GIF-format file, landscape
 -! GIDRIV 2 /VGIF      GIF-format file, portrait
-+  GIDRIV 1 /GIF       GIF-format file, landscape
-+  GIDRIV 2 /VGIF      GIF-format file, portrait
- ! GLDRIV 1 /HPGL      Hewlett-Packard HP-GL plotters, landscape		Std F77
- ! GLDRIV 2 /VHPGL     Hewlett-Packard HP-GL plotters, portrait		Std F77
+-! GLDRIV 1 /HPGL      Hewlett-Packard HP-GL plotters, landscape		Std F77
+-! GLDRIV 2 /VHPGL     Hewlett-Packard HP-GL plotters, portrait		Std F77
++ GIDRIV 1 /GIF       GIF-format file, landscape
++ GIDRIV 2 /VGIF      GIF-format file, portrait
++ GLDRIV 1 /HPGL      Hewlett-Packard HP-GL plotters, landscape		Std F77
++ GLDRIV 2 /VHPGL     Hewlett-Packard HP-GL plotters, portrait		Std F77
  ! GODRIV 0 /GOC       GOC Sigma T5670 terminal				VMS 
-@@ -32,19 +32,19 @@
- ! LSDRIV 2 /VLIPS2    Canon LaserShot printer (portrait)
+ ! GVDRIV 0 /GVENICOM  Genicom 4410 dot-matrix printer, portrait
+-! HGDRIV 0 /HPGL2     Hewlett-Packard graphics language
+-! HIDRIV 0 /HIDMP     Houston Instruments HIDMP pen plotter
++ HGDRIV 0 /HPGL2     Hewlett-Packard graphics language
++ HIDRIV 0 /HIDMP     Houston Instruments HIDMP pen plotter
+ ! HJDRIV 0 /HJ        Hewlett-Packard Desk/Laserjet printer
+-! HPDRIV 0 /HP7221    Hewlett-Packard HP7221 pen plotter		Std F77
++ HPDRIV 0 /HP7221    Hewlett-Packard HP7221 pen plotter		Std F77
+ ! LADRIV 0 /LA50      Dec LA50 and other sixel printers
+ ! LJDRIV 0 /LJ        Hewlett-Packard LaserJet printers                 VMS
+-! LSDRIV 1 /LIPS2     Canon LaserShot printer (landscape)
+-! LSDRIV 2 /VLIPS2    Canon LaserShot printer (portrait)
++ LSDRIV 1 /LIPS2     Canon LaserShot printer (landscape)
++ LSDRIV 2 /VLIPS2    Canon LaserShot printer (portrait)
  ! LNDRIV 0 /LN03      Dec LN03-PLUS Laser printer (landscape)           VMS
  ! LVDRIV 0 /LVN03     Dec LN03-PLUS Laser printer (portrait)            VMS
 -! LXDRIV 0 /LATEX     LaTeX picture environment
-+  LXDRIV 0 /LATEX     LaTeX picture environment
++ LXDRIV 0 /LATEX     LaTeX picture environment
  ! MFDRIV 0 /FILE      PGPLOT graphics metafile
  ! NEDRIV 0 /NEXT      Computers running NeXTstep operating system
    NUDRIV 0 /NULL      Null device (no output)				Std F77
- ! PGDRIV 0 /PGMF      PGPLOT metafile (new format, experimental)        Std F77
+-! PGDRIV 0 /PGMF      PGPLOT metafile (new format, experimental)        Std F77
 -! PNDRIV 1 /PNG       Portable Network Graphics file                    C
 -! PNDRIV 2 /TPNG      Portable Network Graphics file - transparent background C
-+  PNDRIV 1 /PNG       Portable Network Graphics file                    C
-+  PNDRIV 2 /TPNG      Portable Network Graphics file - transparent background C
- ! PPDRIV 1 /PPM       Portable Pixel Map file, landscape
- ! PPDRIV 2 /VPPM      Portable PIxel Map file, portrait
+-! PPDRIV 1 /PPM       Portable Pixel Map file, landscape
+-! PPDRIV 2 /VPPM      Portable PIxel Map file, portrait
 -! PSDRIV 1 /PS        PostScript printers, monochrome, landscape	Std F77
 -! PSDRIV 2 /VPS       Postscript printers, monochrome, portrait		Std F77
 -! PSDRIV 3 /CPS       PostScript printers, color, landscape		Std F77
 -! PSDRIV 4 /VCPS      PostScript printers, color, portrait		Std F77
-+  PSDRIV 1 /PS        PostScript printers, monochrome, landscape	Std F77
-+  PSDRIV 2 /VPS       Postscript printers, monochrome, portrait		Std F77
-+  PSDRIV 3 /CPS       PostScript printers, color, landscape		Std F77
-+  PSDRIV 4 /VCPS      PostScript printers, color, portrait		Std F77
++ PGDRIV 0 /PGMF      PGPLOT metafile (new format, experimental)        Std F77
++ PNDRIV 1 /PNG       Portable Network Graphics file                    C
++ PNDRIV 2 /TPNG      Portable Network Graphics file - transparent background C
++ PPDRIV 1 /PPM       Portable Pixel Map file, landscape
++ PPDRIV 2 /VPPM      Portable PIxel Map file, portrait
++ PSDRIV 1 /PS        PostScript printers, monochrome, landscape	Std F77
++ PSDRIV 2 /VPS       Postscript printers, monochrome, portrait		Std F77
++ PSDRIV 3 /CPS       PostScript printers, color, landscape		Std F77
++ PSDRIV 4 /VCPS      PostScript printers, color, portrait		Std F77
  ! PXDRIV 0 /PRINTRONI Printronix P300 or P600 dot-matrix printer
- ! QMDRIV 1 /QMS       QUIC devices (QMS and Talaris), landscape		Std F77
- ! QMDRIV 2 /VQMS      QUIC devices (QMS and Talaris), portrait		Std F77
-@@ -54,7 +54,7 @@
- ! TTDRIV 2 /GF        GraphOn terminal					Std F77
- ! TTDRIV 3 /RETRO     RetroGraphics terminal				Std F77
- ! TTDRIV 4 /GTERM     GTERM Tektronix terminal emulator			Std F77
+-! QMDRIV 1 /QMS       QUIC devices (QMS and Talaris), landscape		Std F77
+-! QMDRIV 2 /VQMS      QUIC devices (QMS and Talaris), portrait		Std F77
++ QMDRIV 1 /QMS       QUIC devices (QMS and Talaris), landscape		Std F77
++ QMDRIV 2 /VQMS      QUIC devices (QMS and Talaris), portrait		Std F77
+ ! TFDRIV 0 /TFILE     Tektronix-format disk file                        VMS
+ ! TODRIV 0 /TOSHIBA   Toshiba "3-in-one" printer, model P351
+-! TTDRIV 1 /TEK4010   Tektronix 4006/4010 storage-tube terminal		Std F77
+-! TTDRIV 2 /GF        GraphOn terminal					Std F77
+-! TTDRIV 3 /RETRO     RetroGraphics terminal				Std F77
+-! TTDRIV 4 /GTERM     GTERM Tektronix terminal emulator			Std F77
 -! TTDRIV 5 /XTERM     XTERM Tektronix terminal emulator			Std F77
-+  TTDRIV 5 /XTERM     XTERM Tektronix terminal emulator			Std F77
- ! TTDRIV 6 /ZSTEM     ZSTEM terminal emulator				Std F77
- ! TTDRIV 7 /V603      Visual 603 terminal				Std F77
+-! TTDRIV 6 /ZSTEM     ZSTEM terminal emulator				Std F77
+-! TTDRIV 7 /V603      Visual 603 terminal				Std F77
++ TTDRIV 1 /TEK4010   Tektronix 4006/4010 storage-tube terminal		Std F77
++ TTDRIV 2 /GF        GraphOn terminal					Std F77
++ TTDRIV 3 /RETRO     RetroGraphics terminal				Std F77
++ TTDRIV 4 /GTERM     GTERM Tektronix terminal emulator			Std F77
++ TTDRIV 5 /XTERM     XTERM Tektronix terminal emulator			Std F77
++ TTDRIV 6 /ZSTEM     ZSTEM terminal emulator				Std F77
++ TTDRIV 7 /V603      Visual 603 terminal				Std F77
  ! TTDRIV 8 /KRM3      Kermit 3 on IBM-PC				Std F77
-@@ -64,12 +64,12 @@
- ! VADRIV 0 /VCANON    Canon Laser printer, LBP-8/A2, portrait
- ! VBDRIV 0 /VBCANON   Canon Laser printer (bitmap version), portrait
- ! VTDRIV 0 /VT125     Dec Regis terminals (VT125 etc.)			Std F77
+-! TTDRIV 9 /TK4100    Tektronix 4100-series terminals			Std F77
+-! TTDRIV 10 /VMAC     Macintosh VersaTerm-PRO Tektronix-4105 emulator	Std F77
++ TTDRIV 9 /TK4100    Tektronix 4100-series terminals			Std F77
++ TTDRIV 10 /VMAC     Macintosh VersaTerm-PRO Tektronix-4105 emulator	Std F77
+ ! TXDRIV 0 /TX        TeX PK Font Output files
+-! VADRIV 0 /VCANON    Canon Laser printer, LBP-8/A2, portrait
+-! VBDRIV 0 /VBCANON   Canon Laser printer (bitmap version), portrait
+-! VTDRIV 0 /VT125     Dec Regis terminals (VT125 etc.)			Std F77
 -! WDDRIV 1 /WD        X Window dump file, landscape
 -! WDDRIV 2 /VWD       X Window dump file, portrait
-+  WDDRIV 1 /WD        X Window dump file, landscape
-+  WDDRIV 2 /VWD       X Window dump file, portrait
++ VADRIV 0 /VCANON    Canon Laser printer, LBP-8/A2, portrait
++! VBDRIV 0 /VBCANON   Canon Laser printer (bitmap version), portrait	
++ VTDRIV 0 /VT125     Dec Regis terminals (VT125 etc.)			Std F77
++ WDDRIV 1 /WD        X Window dump file, landscape
++ WDDRIV 2 /VWD       X Window dump file, portrait
  ! WSDRIV 0 /WS        VAX workstations running VWS software		VMS
- ! X2DRIV 0 /XDISP     PGDISP or FIGDISP server for X workstations	C
+-! X2DRIV 0 /XDISP     PGDISP or FIGDISP server for X workstations	C
 -! XWDRIV 1 /XWINDOW   Workstations running X Window System		C
 -! XWDRIV 2 /XSERVE    Persistent window on X Window System		C
-+  XWDRIV 1 /XWINDOW   Workstations running X Window System		C
-+  XWDRIV 2 /XSERVE    Persistent window on X Window System		C
- ! ZEDRIV 0 /ZETA      Zeta 8 Digital Plotter
+-! ZEDRIV 0 /ZETA      Zeta 8 Digital Plotter
++ X2DRIV 0 /XDISP     PGDISP or FIGDISP server for X workstations	C
++ XWDRIV 1 /XWINDOW   Workstations running X Window System		C
++ XWDRIV 2 /XSERVE    Persistent window on X Window System		C
++! ZEDRIV 0 /ZETA      Zeta 8 Digital Plotter				
  !
  ! The following drivers can only be used in PGPLOT installations on MS-DOS
+ ! systems with appropriate hardware and software. Do not select these 
diff --git a/sci-libs/pgplot/files/pgplot-path.patch b/sci-libs/pgplot/files/pgplot-path.patch
deleted file mode 100644
index 990d9104c181..000000000000
--- a/sci-libs/pgplot/files/pgplot-path.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur pgplot/makehtml pgplot.new/makehtml
---- pgplot/makehtml	1997-02-26 21:54:09.000000000 +0000
-+++ pgplot.new/makehtml	2006-06-04 16:21:34.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $, = ' ';		# set output field separator
- $\ = "\n";		# set output record separator
-diff -Nur pgplot/maketex pgplot.new/maketex
---- pgplot/maketex	1996-04-16 22:51:24.000000000 +0100
-+++ pgplot.new/maketex	2006-06-04 16:21:47.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $, = ' ';		# set output field separator
- $\ = "\n";		# set output record separator
diff --git a/sci-libs/pgplot/files/pgplot-pgdisp.patch b/sci-libs/pgplot/files/pgplot-pgdisp.patch
new file mode 100644
index 000000000000..9828a3bdbcbd
--- /dev/null
+++ b/sci-libs/pgplot/files/pgplot-pgdisp.patch
@@ -0,0 +1,11 @@
+--- pgdispd/proccom.c	2007-03-08 14:47:15.000000000 +0000
++++ pgdispd/proccom.c.new	2007-03-08 15:34:36.000000000 +0000
+@@ -163,8 +163,6 @@
+ 	void drawline();	/* draw a line in the bitmap window */
+ 	Pixmap XCreatePixmap();
+ 
+-	char *malloc();
+-
+ 	if (!len & savedshorts)
+ 	{ /* an incomplete command was sent! */
+ 		savedshorts=0;
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild
new file mode 100644
index 000000000000..17f53d30ac93
--- /dev/null
+++ b/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild
@@ -0,0 +1,164 @@
+# 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.1 2007/03/09 02:54:50 bicatali Exp $
+
+inherit eutils toolchain-funcs fortran
+
+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 motif tk"
+RDEPEND="x11-libs/libX11
+	media-libs/libpng
+	motif? ( virtual/motif )
+	tk? ( dev-lang/tk )"
+DEPEND="${RDEPEND}
+	doc? ( virtual/tetex )"
+
+S="${WORKDIR}/${PN}"
+
+FORTRAN="g77 gfortran"
+
+src_unpack() {
+	fortran_src_unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-drivers.patch
+	epatch "${FILESDIR}"/${PN}-makemake.patch
+	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
+		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
+		sed -i \
+			-e 's/GIDRIV/! GIDRIV/g' \
+			-e 's/PPDRIV/! GIDRIV/g' \
+			-e 's/WDDRIV/! GIDRIV/g' \
+			drivers.list || die "sed drivers failed"
+	fi
+
+	# fix pointers for 64 bits
+	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:g" \
+		-e "s:/usr/local/bin:/usr/bin:g" \
+		src/grgfil.f makehtml maketex || die "sed path failed"
+
+	use motif && \
+		sed -i -e '/XMDRIV/s/!//' drivers.list
+
+	use tk && \
+		sed -i -e '/TKDRIV/s/!//' drivers.list
+}
+
+src_compile() {
+	./makemake "${S}" linux
+
+	emake -j1 || die "emake failed"
+
+	# Build C portion
+	make 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"
+		pdflatex pgplot-routines.tex
+		pdflatex pgplot-routines.tex
+	fi
+
+	# 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 NULL PNG PS CPS LATEX; 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 *.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 pgdisp
+
+	# 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
+
+	if use motif; then
+		doins XmPgplot.h
+		dolib.a libXmPgplot.a
+	fi
+
+	if use tk; then
+		doins tkpgplot.h
+		dolib.a libtkpgplot.a
+	fi
+
+	# minimal doc
+	dodoc aaaread.me pgplot.doc
+	newdoc pgdispd/aaaread.me pgdisp.txt
+
+	if use doc; then
+		dodoc cpg/cpgplot.doc applications/curvefit/curvefit.doc
+		dohtml pgplot.html
+		insinto /usr/share/doc/${PF}
+		doins pgplot-routines.pdf pgplot-routines.tex
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/* cpg/cpgdemo.c
+		insinto /usr/share/doc/${PF}/applications
+		doins -r applications/*
+		if use motif; then
+			insinto /usr/share/doc/${PF}/pgm
+			doins pgmf/* drivers/xmotif/pgmdemo.c
+		fi
+		if use tk; then
+			insinto /usr/share/doc/${PF}/pgtk
+			doins drivers/xtk/pgtkdemo.*
+		fi
+	fi
+}