add new correct dependency for USE=xemacs; straighten XEmacs support (not multilib); patch to disable regeneration of Texinfo files, just useless and error-prone (various bugs)

Package-Manager: portage-2.1.3.16

5 files changed, 234 insertions, 9 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 63c0af3964f6..b65e1a03cdb2 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,15 @@
 # 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.50 2007/10/24 19:11:41 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.51 2007/10/30 21:15:09 opfer Exp $
+
+*gnuplot-4.2.2-r1 (30 Oct 2007)
+
+  30 Oct 2007; Christian Faulhammer <opfer@gentoo.org>
+  +files/gnuplot-4.2.2-disable_texi_generation.patch,
+  +gnuplot-4.2.2-r1.ebuild:
+  add new correct dependency for USE=xemacs; straighten XEmacs support (not
+  multilib); patch to disable regeneration of Texinfo files, just useless and
+  error-prone (various bugs)
 
   24 Oct 2007; Daniel Gryniewicz <dang@gentoo.org> gnuplot-4.2.2.ebuild:
   Marked stable on amd64 for bug #189672
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 498ec6de619d..b4071d9a3271 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -13,6 +13,10 @@ AUX gnuplot-4.2.0-libggi.patch 2437 RMD160 ef60c994bf2b34ca42a7e487a1fec89c01eb1
 MD5 ab8fc7f4c7f2f539a28dbc0bc5294851 files/gnuplot-4.2.0-libggi.patch 2437
 RMD160 ef60c994bf2b34ca42a7e487a1fec89c01eb1530 files/gnuplot-4.2.0-libggi.patch 2437
 SHA256 7263c8b22a2c7691e4cae85be6ea284846e4c5d328c894d174221cb2ffd3b3d3 files/gnuplot-4.2.0-libggi.patch 2437
+AUX gnuplot-4.2.2-disable_texi_generation.patch 646 RMD160 777fcdf8524145bfb61586b6df24704a35d4ece5 SHA1 6a78e653bb60efdd2410ee6db813f1e2b750d999 SHA256 86292fe807d86b8b133b17bed76d2f19688220dec91ce57ef54f83428d4b7f97
+MD5 ba3f219fed57e75c1ea333c7dbfa489a files/gnuplot-4.2.2-disable_texi_generation.patch 646
+RMD160 777fcdf8524145bfb61586b6df24704a35d4ece5 files/gnuplot-4.2.2-disable_texi_generation.patch 646
+SHA256 86292fe807d86b8b133b17bed76d2f19688220dec91ce57ef54f83428d4b7f97 files/gnuplot-4.2.2-disable_texi_generation.patch 646
 AUX header-order.patch 1692 RMD160 d9b45d996958e41b7b4bbc9d33cdb1018f718dc4 SHA1 2e59302f469c31ee14bbe6b2f1658e571342e7e9 SHA256 d0feb2cd13afae70d558fd3c4d1284383e7ccb4d1d14527d9564ffe0e9b0d7c1
 MD5 6bd90ea3b0173af9fe24085ca37fbfa3 files/header-order.patch 1692
 RMD160 d9b45d996958e41b7b4bbc9d33cdb1018f718dc4 files/header-order.patch 1692
@@ -44,14 +48,18 @@ 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
+EBUILD gnuplot-4.2.2-r1.ebuild 5184 RMD160 6275e93e26968a775e83e2f86da7dcf382c778ee SHA1 4164618cc3c43a97b973cfea0ebf6c07c42e9ce0 SHA256 2f5ac501464bf52d79b222e020e0b1367c0dc428fb73d6213cb4091cc48da988
+MD5 37205868333e19049bf77c06cef8ca48 gnuplot-4.2.2-r1.ebuild 5184
+RMD160 6275e93e26968a775e83e2f86da7dcf382c778ee gnuplot-4.2.2-r1.ebuild 5184
+SHA256 2f5ac501464bf52d79b222e020e0b1367c0dc428fb73d6213cb4091cc48da988 gnuplot-4.2.2-r1.ebuild 5184
 EBUILD gnuplot-4.2.2.ebuild 5258 RMD160 3c232dca60fa5de13f7af8bb0cef7862e3c8e9ea SHA1 730d56a94913709790d30fbda125ec70f0f484d2 SHA256 896c71b483f3aca5752e9e9d24ed10e0f9bee98d392376f1b14fbc05da6a24dd
 MD5 5b57267407ab2ad70759f445d1c5d8fc gnuplot-4.2.2.ebuild 5258
 RMD160 3c232dca60fa5de13f7af8bb0cef7862e3c8e9ea gnuplot-4.2.2.ebuild 5258
 SHA256 896c71b483f3aca5752e9e9d24ed10e0f9bee98d392376f1b14fbc05da6a24dd gnuplot-4.2.2.ebuild 5258
-MISC ChangeLog 13988 RMD160 3246d0d762ba1def0f81ad6a5a10ef278996e444 SHA1 2b16d732103c61ea94e4bb2362d01d41f228a9a0 SHA256 15337016f1d4bed877069c03797b83e5e125836a6968b51a665f891e0d785775
-MD5 e6edf9a0425899c389319b3202428cc5 ChangeLog 13988
-RMD160 3246d0d762ba1def0f81ad6a5a10ef278996e444 ChangeLog 13988
-SHA256 15337016f1d4bed877069c03797b83e5e125836a6968b51a665f891e0d785775 ChangeLog 13988
+MISC ChangeLog 14343 RMD160 223ea3c44f9ace75590d2990b8553411dceb09bb SHA1 e929399291384d175b9bd7238d6b9ea351210dfc SHA256 8181d05c496ad783f65193022d43eb75750cb5a4aea89f7c7b082fe06f4bc787
+MD5 4832f60d67564e829f6868ea763b7b74 ChangeLog 14343
+RMD160 223ea3c44f9ace75590d2990b8553411dceb09bb ChangeLog 14343
+SHA256 8181d05c496ad783f65193022d43eb75750cb5a4aea89f7c7b082fe06f4bc787 ChangeLog 14343
 MISC metadata.xml 281 RMD160 9578b17bd8b0f05da3044064822e531912d1817c SHA1 709ef0382fe7ec2d3746554f452ebd91bc0014f0 SHA256 702dd681c8877369b1ee1553a05fccbbb8633cb96c893f28a4dbcb5492d74511
 MD5 bd00d3bd41c122c9fc97c6aaaa7e468a metadata.xml 281
 RMD160 9578b17bd8b0f05da3044064822e531912d1817c metadata.xml 281
@@ -74,10 +82,13 @@ SHA256 67b29005a738bc6ea31297b4881661ef3534c7e58e8a7b926fb925877d64497c files/di
 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
+MD5 e5c3d8415e0636858d249fde0731f3f0 files/digest-gnuplot-4.2.2-r1 244
+RMD160 3f2e986756041f0a37c0864b14d0cc41388135c5 files/digest-gnuplot-4.2.2-r1 244
+SHA256 ab25cb4ca0103199010d2d93c5b0744047b8e1616674b0c2087246949b59ad2c files/digest-gnuplot-4.2.2-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHH5j2omPajV0RnrERAubHAJ0fR12wG/tuQcrILXpMBFsovNKWlACfRA3R
-uwH0eX5qdaOfdwq6uCawBIM=
-=mqDT
+iD8DBQFHJ57kNQqtfCuFneMRArYHAJsGjlsNmy4yTaYDiWWOtQ2LDxiSYwCeOXuG
+i6M1TjxmZWqBNBaBf7cp09I=
+=7n7w
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/files/digest-gnuplot-4.2.2-r1 b/sci-visualization/gnuplot/files/digest-gnuplot-4.2.2-r1
new file mode 100644
index 000000000000..d690e826678a
--- /dev/null
+++ b/sci-visualization/gnuplot/files/digest-gnuplot-4.2.2-r1
@@ -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/files/gnuplot-4.2.2-disable_texi_generation.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.2-disable_texi_generation.patch
new file mode 100644
index 000000000000..2a360484376d
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-4.2.2-disable_texi_generation.patch
@@ -0,0 +1,19 @@
+--- /tmp/Makefile.in	2007-10-30 20:35:47.000000000 +0100
++++ docs/Makefile.in	2007-10-30 21:57:52.000000000 +0100
+@@ -348,16 +348,6 @@
+ gnuplot.info: $(srcdir)/gnuplot.texi
+ 	$(MAKEINFO) -I$(srcdir) $(srcdir)/gnuplot.texi --no-split --output=$@
+ 
+-# Thanks to Bruce Ravel for doc2texi.el!
+-$(srcdir)/gnuplot.texi: $(srcdir)/doc2texi.el $(srcdir)/gnuplot.doc
+-	@echo "Creating texinfo"
+-	@if test "$(EMACS)" != no; then \
+-	   cd $(srcdir) ;  \
+-	   $(EMACS) -batch -l doc2texi.el -f d2t-doc-to-texi ; \
+-	else \
+-	   echo "No emacs found - cannot create texinfo file" ; \
+-	fi
+-
+ # this is how to make OS/2 ipfc documentation
+ ipf: gnuplot.ipf
+ 
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.2-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..12edd3e4d4b4
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-4.2.2-r1.ebuild
@@ -0,0 +1,183 @@
+# 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-r1.ebuild,v 1.1 2007/10/30 21:15:09 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 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/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"
+
+latex_rehash() {
+	if has_version '>=app-text/tetex-3' || has_version '>=app-text/ptex-3.1.8' ; 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}"
+	# not sane enough for upstream, but we will keep it
+	epatch "${FILESDIR}"/${PN}-4.2.0-libggi.patch
+	# Texinfo source is already shipped, so separate preparation not needed
+	# and error-prone, see bug 194216
+	epatch "${FILESDIR}"/${P}-disable_texi_generation.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
+
+	TEMACS=no
+	use xemacs && TEMACS=xemacs
+	use emacs && TEMACS=emacs
+	EMACS=${TEMACS} econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+
+	if use doc ; then
+		cd docs
+		emake pdf || die "pdf doc creation failed"
+		cd ../tutorial
+		emake pdf || die "pdf tutorial failed"
+	fi
+}
+
+src_install () {
+	emake 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="${SITELISP}/${PN}" || die "econf Emacs files faild"
+		emake DESTDIR="${D}" install || die "make install Emacs files failed"
+		emake 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
+		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 tetex && latex_rehash
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use tetex && latex_rehash
+}