version bump; upstream bug fixes; and a typo in the ebuild, thanks to Sebastian Schubert <sebastian-schubert@gmx.de> in bug 192471

Package-Manager: portage-2.1.2.12

4 files changed, 195 insertions, 9 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 024ce0f46abe..db81b55425b7 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,13 @@
 # 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.32 2007/08/21 11:55:20 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.33 2007/09/14 06:43:07 opfer Exp $
+
+*gnuplot-4.2.2 (14 Sep 2007)
+
+  14 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
+  +gnuplot-4.2.2.ebuild:
+  version bump; upstream bug fixes; and a typo in the ebuild, thanks to
+  Sebastian Schubert <sebastian-schubert@gmx.de> in bug 192471
 
   21 Aug 2007; Ferris McCormick <fmccor@gentoo.org> gnuplot-4.2.0-r2.ebuild:
   Sparc stable --- Bug #189672 --- runs all tests and demos.
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index f87d16c05c73..ac1301b79228 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -23,6 +23,7 @@ RMD160 cb89ecb654a425925b34398a36cb83332fd438e2 files/pdflib-6-compat.patch 560
 SHA256 b1745ad75b58f081b7c9d5dc204f58f519b283aa116e2791c93128026b45700f files/pdflib-6-compat.patch 560
 DIST gnuplot-4.0.0.tar.gz 2160918 RMD160 7b1fc84c161c132c776269b6e9a49abd29251a18 SHA1 a862bc311724c263aa1ef1c646291d73dc37c978 SHA256 a77ad7cb08b2551dacbaa0bb02e561fddb6b9f4a0f3d45eb1c38be219955ea48
 DIST gnuplot-4.2.0.tar.gz 2836649 RMD160 1d31a40796f5c2474473afbe5c6d667d7d97c91c SHA1 867e010ba23346d472e0afdf997edeb6e5ddd585 SHA256 ede70fb18f05935f0186ae7514e5f77e09d7eab94a4f9cff82ddb48dbcbe20e9
+DIST gnuplot-4.2.2.tar.gz 2832174 RMD160 7364d283718d89c05652d7c25a841154caa2efd8 SHA1 991db8024f04e8cad300804bc2661e358fdcf348 SHA256 756f8a058f2743d0ca739a14bd43cda40d6fd9cc14bb50f4d30d92d538478a91
 EBUILD gnuplot-4.0-r1.ebuild 4005 RMD160 7fa9f67c2e9d392878aad4c02368e359b5bb8187 SHA1 764a4f99e643fc1e11a153a8062100d4928d464c SHA256 066fa1339d27e992038f978ecf957e1aa1bb8fae7ea1a75f81c2d65a14582583
 MD5 2385397c236d990cddaad8827753c3e9 gnuplot-4.0-r1.ebuild 4005
 RMD160 7fa9f67c2e9d392878aad4c02368e359b5bb8187 gnuplot-4.0-r1.ebuild 4005
@@ -43,10 +44,14 @@ EBUILD gnuplot-4.2.0.ebuild 4872 RMD160 6ef6ddd89fc6859a9dada1e7bc35497ad032b027
 MD5 835e17f9207a07b51deab21e7bbc756d gnuplot-4.2.0.ebuild 4872
 RMD160 6ef6ddd89fc6859a9dada1e7bc35497ad032b027 gnuplot-4.2.0.ebuild 4872
 SHA256 4144265d3b9f1cb4feb71bb3a0a5ecd040644ef2bcedec97677f539053191e9f gnuplot-4.2.0.ebuild 4872
-MISC ChangeLog 11304 RMD160 d9f0d1c3a832f213ac4372110d893ddac9e294a3 SHA1 feadf0044cad9c7afc792d21c7b1a641ca56d903 SHA256 c7f93004c0a8a8dba5ca56d5d3ec77ab889691b99d9a697f8cc124956bc5e499
-MD5 10a0108e1c241ee09efe06dba3f8b678 ChangeLog 11304
-RMD160 d9f0d1c3a832f213ac4372110d893ddac9e294a3 ChangeLog 11304
-SHA256 c7f93004c0a8a8dba5ca56d5d3ec77ab889691b99d9a697f8cc124956bc5e499 ChangeLog 11304
+EBUILD gnuplot-4.2.2.ebuild 4891 RMD160 de719097f89bc95cf873bddedefe6ac363978195 SHA1 4975e5b403e2d906c086a00b7c688818c0e3aeda SHA256 1d249e70dd2f081b3fc8c21b2f07cb809cace0158efeab69483e03643018ebe8
+MD5 3b78c90484c259755da204e861ea09c9 gnuplot-4.2.2.ebuild 4891
+RMD160 de719097f89bc95cf873bddedefe6ac363978195 gnuplot-4.2.2.ebuild 4891
+SHA256 1d249e70dd2f081b3fc8c21b2f07cb809cace0158efeab69483e03643018ebe8 gnuplot-4.2.2.ebuild 4891
+MISC ChangeLog 11549 RMD160 5e57bfb30b0aea400956c60b7c75b2343a57853f SHA1 6b9f00280293646513ec2eb42818f310e21aefa8 SHA256 69dafe6f548be742fa18f85c043a871d63e3512c2f787d221c43a6e2ced0849d
+MD5 ae8323b671fd40957b6ddb9138f278d4 ChangeLog 11549
+RMD160 5e57bfb30b0aea400956c60b7c75b2343a57853f ChangeLog 11549
+SHA256 69dafe6f548be742fa18f85c043a871d63e3512c2f787d221c43a6e2ced0849d ChangeLog 11549
 MISC metadata.xml 281 RMD160 9578b17bd8b0f05da3044064822e531912d1817c SHA1 709ef0382fe7ec2d3746554f452ebd91bc0014f0 SHA256 702dd681c8877369b1ee1553a05fccbbb8633cb96c893f28a4dbcb5492d74511
 MD5 bd00d3bd41c122c9fc97c6aaaa7e468a metadata.xml 281
 RMD160 9578b17bd8b0f05da3044064822e531912d1817c metadata.xml 281
@@ -66,10 +71,13 @@ SHA256 67b29005a738bc6ea31297b4881661ef3534c7e58e8a7b926fb925877d64497c files/di
 MD5 46bf95697418c0c80329a089d6e9738d files/digest-gnuplot-4.2.0-r2 244
 RMD160 1dce5fef245bd7df3e9ee4e50fc2cda367c211ee files/digest-gnuplot-4.2.0-r2 244
 SHA256 67b29005a738bc6ea31297b4881661ef3534c7e58e8a7b926fb925877d64497c files/digest-gnuplot-4.2.0-r2 244
+MD5 e5c3d8415e0636858d249fde0731f3f0 files/digest-gnuplot-4.2.2 244
+RMD160 3f2e986756041f0a37c0864b14d0cc41388135c5 files/digest-gnuplot-4.2.2 244
+SHA256 ab25cb4ca0103199010d2d93c5b0744047b8e1616674b0c2087246949b59ad2c files/digest-gnuplot-4.2.2 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG0Dzpp/wUKkr7RBoRAqmsAJ4ke+PS6u/hbpld1jP9Nsa8D9aS+QCeKbvX
-QfktFzcwKG+arg9a3Ase3ho=
-=0Eqy
+iD8DBQFG6i2DNQqtfCuFneMRAkRCAJ9HIqAwVRjLONgnOvh5oWozHs0cuQCfQjWA
+lbRx71gC3q8a4l2/N8noceI=
+=hG+l
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/files/digest-gnuplot-4.2.2 b/sci-visualization/gnuplot/files/digest-gnuplot-4.2.2
new file mode 100644
index 000000000000..d690e826678a
--- /dev/null
+++ b/sci-visualization/gnuplot/files/digest-gnuplot-4.2.2
@@ -0,0 +1,3 @@
+MD5 b9dd34e8210a65336b19ee408766a66f gnuplot-4.2.2.tar.gz 2832174
+RMD160 7364d283718d89c05652d7c25a841154caa2efd8 gnuplot-4.2.2.tar.gz 2832174
+SHA256 756f8a058f2743d0ca739a14bd43cda40d6fd9cc14bb50f4d30d92d538478a91 gnuplot-4.2.2.tar.gz 2832174
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.2.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.2.ebuild
new file mode 100644
index 000000000000..e5b639187be7
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-4.2.2.ebuild
@@ -0,0 +1,168 @@
+# 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.2.ebuild,v 1.1 2007/09/14 06:43:07 opfer Exp $
+
+inherit eutils elisp-common 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 tetex pdf plotutils readline svga wxwindows X xemacs"
+
+RDEPEND="
+	xemacs? ( virtual/xemacs )
+	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
+	pdf? ( media-libs/pdflib )
+	ggi? ( media-libs/libggi )
+	gd? ( >=media-libs/gd-2 )
+	doc? ( virtual/tetex )
+	tetex? ( virtual/tetex )
+	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"
+
+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}"
+	epatch "${FILESDIR}"/${PN}-4.2.0-libggi.patch
+}
+
+src_compile() {
+	# See bug #156427.
+	if use tetex ; then
+		sed -i \
+			-e 's/TEXMFLOCAL/TEXMFSITE/g' share/LaTeX/Makefile.in || die "sed failed"
+	else
+		sed -i \
+			-e '/^SUBDIRS/ s/LaTeX//' share/LaTeX/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_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
+
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+
+	if use doc ; then
+		cd docs
+		make pdf || die "pdf doc creation failed"
+		cd ../tutorial
+		make pdf || die "pdf tutorial failed"
+	fi
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	if use emacs; then
+		cd lisp
+		einfo "Configuring gnuplot-mode for GNU Emacs..."
+		EMACS="emacs" econf --with-lispdir="/usr/share/emacs/site-lisp/${PN}" || die "econf Emacs files faild"
+		make DESTDIR="${D}" install || die "make install Emacs files failed"
+		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" econf --with-lispdir="/usr/$(get_libdir)/xemacs/site-packages/${PN}" || 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
+}