fix Emacs support

Package-Manager: portage-2.1.2.9

4 files changed, 201 insertions, 5 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 61a345add469..d188b018b059 100644
--- 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.26 2007/06/28 08:03:17 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.27 2007/07/02 08:50:31 opfer Exp $
+
+*gnuplot-4.2.0-r1 (02 Jul 2007)
+
+  02 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
+  +gnuplot-4.2.0-r1.ebuild:
+  fix Emacs support
 
   28 Jun 2007; Markus Rothe <corsair@gentoo.org> gnuplot-4.0-r2.ebuild:
   Stable on ppc64; bug #179533
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 836d97b6780c..fad07509073f 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnuplot-4.0-filled-arrow.patch 1349 RMD160 99c620fda889773a4814726e339e51095924a38b SHA1 8a32dfc108e1a82fd013899a194f9a31e1e0ac0a SHA256 aa3adb859e5ed943d948e8817e24b9f3e391411684ca4bdea5485374d976e652
 MD5 7af7e5f057531526e6c3447bf18c2ed8 files/gnuplot-4.0-filled-arrow.patch 1349
 RMD160 99c620fda889773a4814726e339e51095924a38b files/gnuplot-4.0-filled-arrow.patch 1349
@@ -28,14 +31,18 @@ EBUILD gnuplot-4.0-r2.ebuild 4117 RMD160 22c69c0dfae1a4175c83f6f1b68021628dd1b58
 MD5 b5af976945dd28037c7a010143ee62a8 gnuplot-4.0-r2.ebuild 4117
 RMD160 22c69c0dfae1a4175c83f6f1b68021628dd1b58d gnuplot-4.0-r2.ebuild 4117
 SHA256 43372773b160265a38fb4d27b4a7b270998a880520025951a4a200ae73320b78 gnuplot-4.0-r2.ebuild 4117
+EBUILD gnuplot-4.2.0-r1.ebuild 4888 RMD160 2fc13489286f61ea88b343e40546f7d55c10b7d2 SHA1 8982e691848286f4e907bb5231deed71c0a1eba2 SHA256 6766b57997e346e02f966a24194f92a42a69b0539353a3884f1f30e5ea62d5d3
+MD5 3bd5672eb913b8145abbc44c33eb51e1 gnuplot-4.2.0-r1.ebuild 4888
+RMD160 2fc13489286f61ea88b343e40546f7d55c10b7d2 gnuplot-4.2.0-r1.ebuild 4888
+SHA256 6766b57997e346e02f966a24194f92a42a69b0539353a3884f1f30e5ea62d5d3 gnuplot-4.2.0-r1.ebuild 4888
 EBUILD gnuplot-4.2.0.ebuild 4869 RMD160 a0f35e5d7e219c062802b3e055d4f51d00fdf959 SHA1 61f4dea1587b3f69eb29a8815bacbac310f394ad SHA256 13a6e49fc1cb395ee95fbe031d58eb8ee1a1a3a02ead9993cb0e2eae0f9775e1
 MD5 e5af72cc34ce6f1bfc57cc75d0d10363 gnuplot-4.2.0.ebuild 4869
 RMD160 a0f35e5d7e219c062802b3e055d4f51d00fdf959 gnuplot-4.2.0.ebuild 4869
 SHA256 13a6e49fc1cb395ee95fbe031d58eb8ee1a1a3a02ead9993cb0e2eae0f9775e1 gnuplot-4.2.0.ebuild 4869
-MISC ChangeLog 10488 RMD160 e2635429e2f1118d20f15a0b7350e4c0689d0a52 SHA1 0cd216071a9ecde2b3cdbb9e141580a8d6c950d4 SHA256 86ea099fa3c373b5994d104a288b3dda3126474dbb602014f7c3b3c09f83efee
-MD5 3fa3d829bad9a2799b1be3c09396c481 ChangeLog 10488
-RMD160 e2635429e2f1118d20f15a0b7350e4c0689d0a52 ChangeLog 10488
-SHA256 86ea099fa3c373b5994d104a288b3dda3126474dbb602014f7c3b3c09f83efee ChangeLog 10488
+MISC ChangeLog 10623 RMD160 162724dd71db55c6bb4592b6ef6012d9273989cf SHA1 e8c609586bde7db65c1607dc7eb4119faf09c4f7 SHA256 d5451cebe4cce9bb471acbed6dd1acb938698e385e30ffe2fb1b21824e03d3f7
+MD5 7d2de6f7cb74f6bf03721a67039e6ccb ChangeLog 10623
+RMD160 162724dd71db55c6bb4592b6ef6012d9273989cf ChangeLog 10623
+SHA256 d5451cebe4cce9bb471acbed6dd1acb938698e385e30ffe2fb1b21824e03d3f7 ChangeLog 10623
 MISC metadata.xml 281 RMD160 9578b17bd8b0f05da3044064822e531912d1817c SHA1 709ef0382fe7ec2d3746554f452ebd91bc0014f0 SHA256 702dd681c8877369b1ee1553a05fccbbb8633cb96c893f28a4dbcb5492d74511
 MD5 bd00d3bd41c122c9fc97c6aaaa7e468a metadata.xml 281
 RMD160 9578b17bd8b0f05da3044064822e531912d1817c metadata.xml 281
@@ -49,3 +56,13 @@ SHA256 911f90b2bf05ec39c8895c5391d384465266d4a5357e1b95259ef2ab05656610 files/di
 MD5 46bf95697418c0c80329a089d6e9738d files/digest-gnuplot-4.2.0 244
 RMD160 1dce5fef245bd7df3e9ee4e50fc2cda367c211ee files/digest-gnuplot-4.2.0 244
 SHA256 67b29005a738bc6ea31297b4881661ef3534c7e58e8a7b926fb925877d64497c files/digest-gnuplot-4.2.0 244
+MD5 46bf95697418c0c80329a089d6e9738d files/digest-gnuplot-4.2.0-r1 244
+RMD160 1dce5fef245bd7df3e9ee4e50fc2cda367c211ee files/digest-gnuplot-4.2.0-r1 244
+SHA256 67b29005a738bc6ea31297b4881661ef3534c7e58e8a7b926fb925877d64497c files/digest-gnuplot-4.2.0-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGiLxgNQqtfCuFneMRAseRAJ4sP422XcHtffMz7tuHWgssB2il/wCfbcJ4
+WbKaNW+bznb+3Pchrsm70OQ=
+=LVGd
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/files/digest-gnuplot-4.2.0-r1 b/sci-visualization/gnuplot/files/digest-gnuplot-4.2.0-r1
new file mode 100644
index 000000000000..b03e262c595c
--- /dev/null
+++ b/sci-visualization/gnuplot/files/digest-gnuplot-4.2.0-r1
@@ -0,0 +1,3 @@
+MD5 f688a578ddb4c376fd7d91ce444a0745 gnuplot-4.2.0.tar.gz 2836649
+RMD160 1d31a40796f5c2474473afbe5c6d667d7d97c91c gnuplot-4.2.0.tar.gz 2836649
+SHA256 ede70fb18f05935f0186ae7514e5f77e09d7eab94a4f9cff82ddb48dbcbe20e9 gnuplot-4.2.0.tar.gz 2836649
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.0-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.0-r1.ebuild
new file mode 100644
index 000000000000..90a909f91b2f
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-4.2.0-r1.ebuild
@@ -0,0 +1,170 @@
+# 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.0-r1.ebuild,v 1.1 2007/07/02 08:50:31 opfer 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 tetex 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 )
+	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}"/${P}-libggi.patch
+}
+
+src_compile() {
+	# See bug #156427.
+	if use tetex ; 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_enable 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 "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/lib/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
+}