Setting VARTEXFONTS (see bug #223077). Removed obsolete revision.

(Portage version: 2.1.6.4/cvs/Linux 2.6.26-gentoo-r4 i686)

3 files changed, 10 insertions, 179 deletions

diff --git a/sci-libs/pgplot/ChangeLog b/sci-libs/pgplot/ChangeLog
index b4672be95a3c..ac7335dc815b 100644
--- a/sci-libs/pgplot/ChangeLog
+++ b/sci-libs/pgplot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/pgplot
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.15 2008/11/07 12:56:54 bicatali Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.16 2009/02/13 11:24:29 phosphan Exp $
+
+  13 Feb 2009; Patrick Kursawe <phosphan@gentoo.org>
+  -pgplot-5.2.2-r2.ebuild, pgplot-5.2.2-r3.ebuild:
+  Setting VARTEXFONTS (see bug #223077).
+  Removed obsolete revision.
 
   07 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org>
   files/pgplot-makemake.patch, pgplot-5.2.2-r3.ebuild:
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild
deleted file mode 100644
index b7b81a0ace0e..000000000000
--- a/sci-libs/pgplot/pgplot-5.2.2-r2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2008 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.6 2008/06/29 08:07:10 tove 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
-	x11-libs/libXt
-	media-libs/libpng
-	motif? ( x11-libs/openmotif )
-	tk? ( dev-lang/tk )"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${PN}"
-
-FORTRAN="g77 gfortran ifc"
-
-src_unpack() {
-	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 < 4.3 does not compile gif, pp and wd drivers
-	if [[ "${FORTRANC}" == gfortran ]] &&
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]] ; then
-		ewarn
-		ewarn "Warning!"
-		ewarn "gfortran < 4.3 selected: does not compile all drivers"
-		ewarn "disabling gif, wd, and ppd drivers"
-		ewarn "if you want more drivers, use gfortran >= 4.3, g77 or ifort"
-		ewarn
-		epause 4
-		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 || 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" \
-		-e 's:SHARED_LIB=.*:SHARED_LIB="libpgplot.so.5":g' \
-		-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" \
-		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
-	emake -j1 cpg || die "make cpg failed"
-
-	if use doc; then
-		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
-	emake clean
-}
-
-src_test() {
-	einfo "Testing various demo programs"
-	# i can go to 16
-	for i in 1 2 3; do
-		emake 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 || die "dolib.a failed"
-	dolib.so libpgplot.so.5 || die "dolib.so failed"
-	dosym libpgplot.so.5 /usr/$(get_libdir)/libpgplot.so || die "dosym failed"
-	dobin pgxwin_server pgdisp || die "dobin failed"
-
-	# C binding
-	insinto /usr/include
-	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 || die "doins motif failed"
-		dolib.a libXmPgplot.a || die "dolib.a motif failed"
-	fi
-
-	if use tk; then
-		doins tkpgplot.h || die "doins tk failed"
-		dolib.a libtkpgplot.a || die "dolib.a tk failed"
-	fi
-
-	# minimal doc
-	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
-		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
-}
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild
index d2d62720f09b..568afc09e1f3 100644
--- a/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild
@@ -1,6 +1,6 @@
-# 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-libs/pgplot/pgplot-5.2.2-r3.ebuild,v 1.2 2008/11/07 12:56:54 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild,v 1.3 2009/02/13 11:24:29 phosphan Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -93,6 +93,7 @@ src_compile() {
 		|| die "emake shared failed"
 
 	if use doc; then
+		export VARTEXFONTS="${T}/fonts"
 		emake pgplot.html || die "make pgplot.html failed"
 		emake pgplot-routines.tex  || die "make pgplot-routines failed"
 		pdflatex pgplot-routines.tex