Depend on wxGTK 2.8.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686

3 files changed, 203 insertions, 5 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 4d160bbb5239..e03bfd5e8e6f 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.81 2008/10/08 12:55:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.82 2008/10/09 15:11:32 ulm Exp $
+
+*gnuplot-4.2.4-r1 (09 Oct 2008)
+
+  09 Oct 2008; Ulrich Mueller <ulm@gentoo.org> +gnuplot-4.2.4-r1.ebuild:
+  Depend on wxGTK 2.8, thanks bicatali and leio.
 
 *gnuplot-4.2.4 (08 Oct 2008)
 
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 9c8c4012c8a1..0269080494d6 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -10,13 +10,14 @@ DIST gnuplot-4.2.3.tar.gz 2840611 RMD160 b4692db884c9da2f0d160f33f53c3d2aba65f36
 DIST gnuplot-4.2.4.tar.gz 2904358 RMD160 88acf7561a74116aece627f9b5e41e0726daee75 SHA1 4226b959493a37bc5a1f40a3b165ffd9e1b9d202 SHA256 2a20701410a21307c404a9d10ad9fdf699bb92fa0a919797213208d80b080913
 EBUILD gnuplot-4.2.2-r1.ebuild 5158 RMD160 442c819f61991a8a8cbdd75580f0e5f104a3eca5 SHA1 2bd01833889569b706829e8135f351753d42765f SHA256 fbde8c23eef98d14346526b9275da2f0c530d4866676a234c29f384d6435c37a
 EBUILD gnuplot-4.2.3-r2.ebuild 5553 RMD160 d3d3c138f5b9b4c3d953775b0c19428e68719b9f SHA1 b013c52c80e88395b798083e8a3003ab2d86fe92 SHA256 8586e7402fbc8720ce69c9f9d7a15cdef7b2364897e6af7f844c5c22d9466d45
+EBUILD gnuplot-4.2.4-r1.ebuild 5408 RMD160 62439b40352c1661017637c9f6770ef3faee0c72 SHA1 58ebbcef4f2434829f3dec2d8e07e04aaf2a78b0 SHA256 7ef7ed981d50f02f75a8fe99251fc1decca87d03800fb3656175f05f5328f77e
 EBUILD gnuplot-4.2.4.ebuild 5471 RMD160 7e5c18ee3f3a341a8db14f635e0a28f311bf4b75 SHA1 f0ac3e18968e34307bd75a7111315cdd57bef752 SHA256 027a89c3d5daea35cb641a7eb21364895a3eb531d22944e829b04c88ebf681b6
-MISC ChangeLog 18846 RMD160 2f0b341532b8d890521485875e866e5f750ffd7e SHA1 c03a7a134b5f411e6d9f870bc64aa135e1a00463 SHA256 cacf882402d15cacdbfb8ee5206c6b34a32687572c3160567369d0dfe43117cc
+MISC ChangeLog 19002 RMD160 95fca4a063760ae4da4262d36f41991f4171cbb5 SHA1 755abdf0943295abfdbb3b747d4201b17ffe317d SHA256 4cd7419606de4d6ef26757cd11f97039faa293d884b086ab0b0ed0733b285c70
 MISC metadata.xml 276 RMD160 101ad3143b6457f9d2668d192b7aac223f3591dd SHA1 ea4db22a1bcd96727956a9903662e7be5af26923 SHA256 6659aef747a907b0953dd240d628c62ed93baafe308c685670584f3e5b16a8ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkjsrdsACgkQOeoy/oIi7uz1TwCfTBEGcjcVA3u4fOZ9nmUPyCjX
-QHEAn3fvA01duYk7axDJAYQoz7Y7l8wA
-=dAlc
+iEYEARECAAYFAkjuHzYACgkQOeoy/oIi7uwTnwCfcy7Xm6N/uCR6uEoZ0QA+jPiF
+g6cAoI7iEOSlRsxwX4KgvN7SU9mZLk3b
+=MRRv
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.4-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.4-r1.ebuild
new file mode 100644
index 000000000000..995a62ad1e02
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-4.2.4-r1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.4-r1.ebuild,v 1.1 2008/10/09 15:11:32 ulm Exp $
+
+WX_GTK_VER="2.8"
+
+inherit autotools elisp-common eutils multilib 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 ~x86-fbsd"
+IUSE="doc emacs gd ggi latex pdf plotutils readline svga wxwindows X xemacs"
+RESTRICT="wxwindows? ( test )"
+
+RDEPEND="
+	xemacs? ( virtual/xemacs app-xemacs/texinfo app-xemacs/xemacs-base )
+	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
+	pdf? ( media-libs/pdflib )
+	ggi? ( media-libs/libggi )
+	gd? ( >=media-libs/gd-2 )
+	doc? ( virtual/latex-base
+		virtual/ghostscript )
+	latex? ( virtual/latex-base )
+	X? ( x11-libs/libXaw )
+	svga? ( media-libs/svgalib )
+	readline? ( >=sys-libs/readline-4.2 )
+	plotutils? ( media-libs/plotutils )
+	wxwindows? ( =x11-libs/wxGTK-2.8*
+		>=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=50${PN}-gentoo.el
+TEXMF=/usr/share/texmf-site
+
+latex_rehash() {
+	if has_version '>=app-text/tetex-3' || has_version '>=app-text/ptex-3.1.8' || has_version 'app-text/texlive'; then
+		texmf-update
+	else
+		texconfig rehash
+	fi
+}
+
+pkg_setup() {
+	if use gd && ! built_with_use media-libs/gd png; then
+		eerror "media-libs/gd needs to be built with PNG support"
+		die "please rebuilt media-libs/gd with USE=png"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Texinfo source is already shipped, so separate preparation not needed
+	# and error-prone, see bug 194216
+	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch
+	# Don't store resource files in deprecated location, reported upstream:
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=1953742&group_id=2055&atid=102055
+	epatch "${FILESDIR}"/${PN}-4.2.3-app-defaults.patch
+	# Disable texhash to prevent sandbox violation, bug 201871
+	epatch "${FILESDIR}"/${PN}-4.2.3-disable-texhash.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	VARTEXFONTS="${T}/fonts"
+
+	# See bug #156427.
+	if use latex ; then
+		sed -i -e "s:\`kpsexpand.*\`:${TEXMF}/tex/latex/${PN}:" \
+			share/LaTeX/Makefile.in || die
+	else
+		sed -i \
+			-e '/^SUBDIRS/ s/LaTeX//' share/LaTeX/Makefile.in || die
+	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_enable wxwindows wxwidgets)"
+	myconf="${myconf} $(use_with plotutils plot /usr/$(get_libdir))"
+	myconf="${myconf} $(use_with pdf pdf /usr/$(get_libdir))"
+
+	use ggi \
+		&& myconf="${myconf} --with-ggi=/usr/$(get_libdir)
+		--with-xmi=/usr/$(get_libdir)" \
+		|| 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
+
+	TEMACS=no
+	use xemacs && TEMACS=xemacs
+	use emacs && TEMACS=emacs
+	EMACS=${TEMACS} econf ${myconf} || die
+	emake || die
+
+	if use doc ; then
+		cd docs
+		emake pdf || die
+		cd ../tutorial
+		emake pdf || die
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+
+	if use emacs; then
+		cd lisp
+		einfo "Configuring gnuplot-mode for GNU Emacs..."
+		EMACS="emacs" econf --with-lispdir="${SITELISP}/${PN}" || die
+		emake DESTDIR="${D}" install || die
+		emake clean
+		cd ..
+
+		# Gentoo emacs site-lisp configuration
+		echo -e "\n;;; ${PN} site-lisp configuration\n" > ${E_SITEFILE}
+		echo -e "(add-to-list 'load-path \"@SITELISP@\")\n" >> ${E_SITEFILE}
+		sed '/^;; move/,+3 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" \
+			econf --with-lispdir="/usr/lib/xemacs/site-packages/${PN}" || die
+		emake DESTDIR="${D}" install || 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
+
+	if ! use X; then
+		# see bug 194527
+		rm -rf "${D}/usr/$(get_libdir)/X11"
+	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
+	use latex && latex_rehash
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use latex && latex_rehash
+}