Bumped to 4.2rc4. Tests still fail when there is no X available. Fixed bug #156427.

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 48979df8f1da122fcd20987259967cc86ac1a6bd..30074626c4afde90fdab212d02273f1ba6df2b77 100644 (file)
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.11 2007/03/31 17:50:14 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.12 2007/04/25 21:32:09 kugelfang Exp $
+
+*gnuplot-4.2_rc4 (25 Apr 2007)
+
+  25 Apr 2007; Danny van Dyk <kugelfang@gentoo.org> +gnuplot-4.2_rc4.ebuild:
+  Bumped to 4.2rc4. Tests still fail when there is no X available. Fixed bug
+  #156427.
 
   31 Mar 2007; Samuli Suominen <drac@gentoo.org>
   +files/gnuplot-4.0-libggi.patch, gnuplot-4.0-r2.ebuild:

diff --git a/sci-visualization/gnuplot/gnuplot-4.2_rc4.ebuild b/sci-visualization/gnuplot/gnuplot-4.2_rc4.ebuild
new file mode 100644 (file)
index 0000000..693aa99
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-4.2_rc4.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-visualization/gnuplot/gnuplot-4.2_rc4.ebuild,v 1.1 2007/04/25 21:32:09 kugelfang Exp $
+
+inherit eutils elisp-common wxwidgets
+
+MY_P="${P/_/.}"
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+
+LICENSE="gnuplot"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 s390 sparc x86"
+IUSE="doc emacs gd ggi latex pdf plotutils png readline svga wxwindows X xemacs"
+
+RDEPEND="
+       xemacs? ( virtual/xemacs )
+       emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
+       pdf? ( media-libs/pdflib )
+       ggi? ( media-libs/libggi )
+       png? ( media-libs/libpng )
+       gd? ( >=media-libs/gd-2 )
+       doc? ( virtual/tetex )
+       latex? ( || ( virtual/tetex app-text/cstetex ) )
+       X? ( x11-libs/libXaw )
+       svga? ( media-libs/svgalib )
+       readline? ( >=sys-libs/readline-4.2 )
+       plotutils? ( media-libs/plotutils )
+       wxwindows? ( =x11-libs/wxGTK-2.6*
+               >=x11-libs/cairo-0.9
+               >=x11-libs/pango-1.10.3
+               >=x11-libs/gtk+-2.8 )"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+E_SITEFILE="50gnuplot-gentoo.el"
+
+#src_unpack() {
+#      unpack ${A}
+#      cd ${S}
+#      epatch ${FILESDIR}/header-order.patch
+#      epatch ${FILESDIR}/pdflib-6-compat.patch
+#}
+
+src_compile() {
+       # See bug #156427.
+       if use latex ; then
+               sed -i \
+                       -e 's/TEXMFLOCAL/TEXTMFSITE/g' share/Makefile.in || die "sed failed"
+       else
+               sed -i \
+                       -e '/^SUBDIRS/ s/LaTeX//' share/Makefile.in || die "sed failed"
+       fi
+
+       if use wxwindows ; then
+               WX_GTK_VER="2.6"
+               need-wxwidgets unicode
+       fi
+
+       local myconf="--with-gihdir=/usr/share/${PN}/gih"
+
+       myconf="${myconf} $(use_with X x)"
+       myconf="${myconf} $(use_with svga linux-vga)"
+       myconf="${myconf} $(use_with gd)"
+       myconf="${myconf} $(use_with wxwindows wxwidgets)"
+       myconf="${myconf} $(use_with plotutils plot /usr/lib)"
+       myconf="${myconf} $(use_with png png /usr/lib)"
+       myconf="${myconf} $(use_with pdf pdf /usr/lib)"
+
+       use ggi \
+               && myconf="${myconf} --with-ggi=/usr/lib --with-xmi=/usr/lib" \
+               || myconf="${myconf} --without-ggi"
+
+       use readline \
+               && myconf="${myconf} --with-readline=gnu --enable-history-file" \
+               || myconf="${myconf} --with-readline"
+
+       myconf="${myconf} --without-lisp-files"
+
+       # This is a hack to avoid sandbox violations when using the Linux console.
+       # Creating the DVI and PDF tutorials require /dev/svga to build the
+       # example plots.
+       addwrite /dev/svga:/dev/mouse:/dev/tts/0
+
+       econf ${myconf} || die
+       emake || die
+
+       if use doc ; then
+               cd docs
+               make pdf || die
+               cd ../tutorial
+               make pdf || die
+       fi
+}
+
+src_install () {
+       make DESTDIR=${D} install || die
+
+       if use emacs; then
+               cd lisp
+               einfo "Configuring gnuplot-mode for emacs..."
+               EMACS="emacs" lispdir="/usr/share/emacs/site-lisp/${PN}" econf || die
+               make DESTDIR=${D} install || die
+               make clean
+               cd ..
+
+               # Gentoo emacs site-lisp configuration
+               string="(add-to-list 'load-path \"/usr/share/emacs/site-lisp/${PN}\")"
+               echo -e ";;; Gnuplot site-lisp configuration\n\n${string}\n" > ${E_SITEFILE}
+               sed '/^;; move/,+4 d' lisp/dotemacs >> ${E_SITEFILE}
+               elisp-site-file-install ${E_SITEFILE}
+       fi
+
+       if use xemacs; then
+               cd lisp
+               einfo "Configuring gnuplot-mode for xemacs..."
+               EMACS="xemacs" lispdir="/usr/lib/xemacs/site-packages/${PN}" econf || die
+               make DESTDIR=${D} install || {
+                       ewarn "Compiling/installing gnuplot-mode for xemacs has failed."
+                       ewarn "I need xemacs-base to be installed before I can compile"
+                       ewarn "the gnuplot-mode lisp files for xemacs successfully."
+                       ewarn "Please try re-emerging me after app-xemacs/xemacs-base"
+                       ewarn "has been successfuly emerged."
+                       die
+                       }
+               cd ..
+       fi
+
+
+       dodoc BUGS ChangeLog FAQ NEWS PATCHLEVEL PGPKEYS PORTING README* TODO VERSION
+
+       if use doc; then
+               # Demo files
+               insinto /usr/share/${PN}/demo
+               doins demo/*
+               # Manual
+               insinto /usr/share/doc/${PF}/manual
+               doins docs/gnuplot.pdf
+               # Tutorial
+               insinto /usr/share/doc/${PF}/tutorial
+               doins tutorial/{tutorial.dvi,tutorial.pdf}
+               # Documentation for making PostScript files
+               insinto /usr/share/doc/${PF}/psdoc
+               doins docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+       fi
+}
+
+pkg_postinst() {
+       use emacs && elisp-site-regen
+       if use svga ; then
+               einfo "In order to enable ordinary users to use SVGA console graphics"
+               einfo "gnuplot needs to be set up as setuid root.  Please note that"
+               einfo "this is usually considered to be a security hazard."
+               einfo "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
+       fi
+}
+
+pkg_postrm() {
+       use emacs && elisp-site-regen
+}