Fix build and install problems with XEmacs, bug 459172. The ebuild now supports either GNU Emacs or XEmacs, but not both.

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 282 insertions, 5 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 51f3c3abcc8d..7bce77ef1c3a 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.206 2013/02/28 14:39:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.207 2013/03/02 17:25:24 ulm Exp $
+
+*gnuplot-4.6.1-r1 (02 Mar 2013)
+
+  02 Mar 2013; Ulrich Müller <ulm@gentoo.org> +gnuplot-4.6.1-r1.ebuild,
+  +files/gnuplot-4.6.1-eldoc.patch:
+  Fix build and install problems with XEmacs, bug 459172. The ebuild now
+  supports either GNU Emacs or XEmacs, but not both.
 
   28 Feb 2013; Jeroen Roovers <jer@gentoo.org> gnuplot-4.6.1.ebuild:
   Stable for HPPA (bug #446243).
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 6e81828066f5..20b2bc0c2ec2 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -2,18 +2,27 @@
 Hash: SHA256
 
 AUX gnuplot-4.4.4-tikz.patch 578 SHA256 aaf803a66e57c7e069dc5aba8ec91dc3038c224c10d8624368c1b505ef34e4f6 SHA512 7362e5b0a064ba9eefc46f2ef9861652bcf34f6fcb0cbd452130cb11a3fbbc65a0ada232042d85f2769fb522224b9e2f5d41624e92503f22463c67215c5dd3c6 WHIRLPOOL 00dd326c9b1cb47886505bcf1831300c3e70bce40702e9910af7c38242d9ff4efc2697e46a141bc5e7157eaa8b6586bce52ef525bcf85b28e1e90e8b12d4fe95
+AUX gnuplot-4.6.1-eldoc.patch 1077 SHA256 0b8ce02df0ba67de1002e6d6ea753c1f4b5c1d2783091cfd26daf61317eec975 SHA512 97347e6223a3f13ed6857896b60dedff03eb632a87a9728c41b41833eef528655459cb2b5469fe9c521795d406ad69ab3eb1d6a2dd921579d15cc8d649b552af WHIRLPOOL 3a1826e1a848fa84bf1d60abecf4371d4f101c83cfd418184284166b8d51ae884ce4e64632bfdd7e079eeb4e7ad79c408c76f9b0f9cde915582158bb24390749
 DIST gnuplot-4.4.4.tar.gz 3328278 SHA256 d228599d08d5f87bcb79af8af8bb432c77d942802b1643f920c7baaeaf1ddbfd SHA512 5781a1cb569bb4e4471be87f563c761a28a8a927c32c58e65e296152869951d2f5f16a437af3988ba83212ea2aaf641176c9863d6f5f3e629d86a927c41e75ba WHIRLPOOL c5e04c1a9ae7aa6c3f91e535d004cd75ae2ffa2bda5a6f284fa475286e34606c6e7970d83f80fd00e359da4b81f34526b2f02c2a305d7d982840b30a1e8cecd5
 DIST gnuplot-4.6.0.tar.gz 5017694 SHA256 6e60adb5039a3541f407c2ade670004178b376754c424c13f0be24c7960c17be SHA512 a4358c20577f978215a22db041f4d369ab69a88624b2fe831d2a1124fffb84d4dafa7f0f5a8bfdb388c663073570adb084949195c6eebd0f11f9b0ac4485debc WHIRLPOOL a892cf9061b1ca1e47f51294bbc08494f8725a9b1cb4f413d68d99a158f11fcf718aec3bc8a21c132f596f4ab39a9b4e541f3cca1933de9670912cdd32364ef4
 DIST gnuplot-4.6.1.tar.gz 4959670 SHA256 f4bf99907d0fea7db90b6e50147f1730b5bde2fbb93d9e58478b6b94409eebc6 SHA512 a6a05da6708a7f5629d8356901e93ab622d4a3a6325e050fc1f8dce652e6061164783a98ff5cbc2dede65f6f0cb5be6a1ab2fcaeb778f6879215bae7056bd3ed WHIRLPOOL fa72b52a181ee9f7599c3646c4303ebcc21c0ecae51f7e9024356108f6f6539cfbc91e52e787fbf6d782aff8e1e94d9fec02f05c6bf754c6368eaca947e6bb6c
 EBUILD gnuplot-4.4.4-r1.ebuild 6635 SHA256 919cc230c0f26a0e12442d0185cbcf794cd0699307153f84d8f89186129b0217 SHA512 6dad45b149a3fd5ec095bd7abbe9bc2c273eaf1abc5977d9a92a22b3a57d19dd87e3e401f971013a34706f697ce9041bae410b35d3a09e646fc24ea0509ac775 WHIRLPOOL c8f4fc801a4af68307a0df0e066718b16647ff7faae39545603eb88eeeac65545e1ae668c88049d8e4308169b788f40c5e832de2684802a96ab92111a1e641dc
 EBUILD gnuplot-4.6.0.ebuild 7463 SHA256 34ca65cb1d55d7861ec92ddcce1a8b6cb565e3dcf5e84c80b43391466f49e2d8 SHA512 1bf8cad162f42ecc6ad890897a59105c1ab0d4355707b18e21a7384675ba3dc025e8bcd3760e24aaf2d4e554159f1fedd8ff77a56c022a1c4ae0c4a4e5085bdc WHIRLPOOL e5033b165fcb39aafc3d8c1d82a256a3710b18c6832c998171491bf973654833d40227fd71bdd29cf542097513e4d8e812af5cc5ade8843f69babf9cbc8e79b9
+EBUILD gnuplot-4.6.1-r1.ebuild 7042 SHA256 16c2552552b64c8f2fbf4980ddd25f4b276cbb9031ff9005d7fcd00bb80e89fc SHA512 3f2bd156193e08f28cac9be34dd061028a4b239b8698548ea40f268cd2fd759609ef6b033fba82477acdd4ede0b8e048bf3981c951681b9b5a99276434ef487f WHIRLPOOL 7965978782fa4261b22e259119ca3df52ffc9a35b25b24ca16de6f0352171a0a0cfcbfd91711e6eb37b24c9919252ceecb41bc216c40e3c57ad07d05b07e78a3
 EBUILD gnuplot-4.6.1.ebuild 7516 SHA256 295cca8c1aa43369302b80fa2bced6bbb1fb82007914a0208bd7aa8b6a24d479 SHA512 a8fca01f4d5b1aba54dd1395b03af2275226fe7658f341705e5a6ce440e0823c43cae396ff5143a23fd5ad1252c0c82489917f7f0ca8489be0828ed04a84d8b4 WHIRLPOOL 83e36bfde569ff53bf027eaa2a9decf80c2232eb092668d10e20ad99979bf75ec7a9bb77c8b9b785eebd9df6787580547edf94853e15344278727814d3c5a3e5
-MISC ChangeLog 35830 SHA256 7e0ff8261f157fc7da138a3d8768db08b10b994b1192e2afda85973cbcb64fd5 SHA512 8c6fb2fbd6bd1973e1ad94ceba8dd0866406a3cebbd0471472bb1ade02645c49fb04688238063965f97cbf438936d9b1137e2e18699410470914df3ea0c7ab36 WHIRLPOOL a7a581253c54db91a51d95a83d5070cabafb16e2f00e94dd9fb892dd1e29d214126a56551f361af3f433ee06bd1dba1148cc69bfc1ad0d1d332e39323a1207d8
+MISC ChangeLog 36099 SHA256 55446728729b16b36561f3f6771dfbe0ef539efb4987fade99855e7be8ced831 SHA512 533147096127cc1781a6632e2ebbf69e985f3a5905f8db0ca75d06e51016bb2545f54952a15ac8a66281004bd5c16a04c94bd226b3f0bb7dd1a79f31f5a10d54 WHIRLPOOL 6d98e13c1fe2403a98f2645ebbe0176b31a6106a8bbf23d875bb90de2081fbda2969631e1167c1f62a5fcabd65d90068c9e8434f0a29e29d3aace19afa553196
 MISC metadata.xml 974 SHA256 0fdd09afff7d6bc87078d6c09ededb60856891f130a733a0294c72e773a35f25 SHA512 feddb2b2bcf1e41c961a30c25edba081076c8703d3186f79728a7c0d496f400b3f5c1d876307325d41a4a59d19a4b27580293d57d8d5717ee23fed30a4e131d7 WHIRLPOOL 17525529c6fd42a91373324d0c5b1bfbe8528d04bd2c3b6d50b311b60c2db2d21bc3871f7ea520e119c911863a0cfa80375de5702965035cfaf0073d03610143
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEvbAUACgkQVWmRsqeSphML5gCfcj+6BP9RTm0Cp/2+SBLATIUM
-D2IAnjt2BIUNOcun5em5y3WaMQ0HpqqY
-=N0BY
+iQGcBAEBCAAGBQJRMjc0AAoJEJQzkH1pP7W4vPEMAKxOHejou6SC++TasH/dQKbp
+UAsnb6OSA0rxA74BBVDwiGnQzlUrHo80ZFdbgVVq0+SJlL0bZacivQEDStpkt06v
+1bQNXd3rVwrWpM4OsumpapJcqyKD1IbVAztYy4vB5jU8zYrLw1mnLH4oQKMzyO6W
+ec6d7cRcr8bHK1Dq+UizPQMiymIYZPur+/XP+51wT7s9EPuJGMvJ5oh5iTxOVnIW
+Nx340HEwOAYRUO1eZD56wvFMDdivqE4J9MvNII3/bX09rImQMTAdX7K9E1Fgx9+E
+qPdiTKGQGSO3WcVQPkPQ7G27krRiv1+Z1r+v0rTjYgPrAT3uNfPaDtZ1zSvwXD2y
+X5N9ftcapX7EZUyBXZmt6qYi4Q+C//ricL3vQ15unY7BmKNUsrN/9v5lXTZpp7Jp
+H5yoVfLOpYGXtGOXB9Xv5nQlnc14D8yK61XyidW+Q6Uhd4k3A5DSo0El03IZbKE8
+cE7AOyynrRvQohKCtLZbCMCG4D/LQeDvYYo3asSv3w==
+=cjnq
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.6.1-eldoc.patch b/sci-visualization/gnuplot/files/gnuplot-4.6.1-eldoc.patch
new file mode 100644
index 000000000000..5306c057bcca
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-4.6.1-eldoc.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/459172
+
+--- gnuplot-4.6.1-orig/docs/Makefile.in
++++ gnuplot-4.6.1/docs/Makefile.in
+@@ -396,11 +396,11 @@
+ gnuplot.texi $(srcdir)/gnuplot-eldoc.el $(srcdir)/gnuplot-eldoc.elc: $(srcdir)/doc2texi.el $(srcdir)/gnuplot.doc
+ 	@echo "Creating texinfo and eldoc strings file"
+ 	@if test "$(EMACS)" != no; then \
+-	   @test "$(top_srcdir)" = "$(top_builddir)" || echo "COPYING GNUPLOT.DOC" ; \
+-	   @test "$(top_srcdir)" = "$(top_builddir)" || cp $(srcdir)/gnuplot.doc . ; \
+-	   $(EMACS) -batch -l $(srcdir)/doc2texi.el -f d2t-doc-to-texi ; \
++	   test "$(top_srcdir)" = "$(top_builddir)" || echo "COPYING GNUPLOT.DOC" ; \
++	   test "$(top_srcdir)" = "$(top_builddir)" || cp $(srcdir)/gnuplot.doc . ; \
++	   $(EMACS) -batch -q -no-site-file -l $(srcdir)/doc2texi.el -f d2t-doc-to-texi ; \
+ 	   echo "Compiling gnuplot-eldoc.el" ; \
+-	   $(EMACS) -batch --eval='(byte-compile-file "gnuplot-eldoc.el")' ; \
++	   $(EMACS) -batch -q -no-site-file -f batch-byte-compile gnuplot-eldoc.el ; \
+ 	else \
+ 	   echo "No emacs found - cannot create texinfo file" ; \
+ 	fi
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.1-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.1-r1.ebuild
new file mode 100644
index 000000000000..0ce3d7d58ed8
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-4.6.1-r1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.1-r1.ebuild,v 1.1 2013/03/02 17:25:24 ulm Exp $
+
+EAPI=5
+
+inherit elisp-common eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+
+if [[ -z ${PV%%*9999} ]]; then
+	inherit autotools cvs
+	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
+	ECVS_MODULE="gnuplot"
+	ECVS_BRANCH="branch-4-6-stable"
+	ECVS_USER="anonymous"
+	ECVS_CVS_OPTIONS="-dP"
+	MY_P="${PN}"
+	SRC_URI=""
+else
+	MY_P="${P/_/.}"
+	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+fi
+
+LICENSE="gnuplot GPL-2 bitmap? ( free-noncomm )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bitmap cairo doc emacs examples +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
+
+RDEPEND="
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango )
+	emacs? ( virtual/emacs )
+	!emacs? ( xemacs? (
+		app-editors/xemacs
+		app-xemacs/xemacs-base ) )
+	gd? ( media-libs/gd[png] )
+	ggi? ( media-libs/libggi )
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
+			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
+	lua? ( dev-lang/lua )
+	plotutils? ( media-libs/plotutils )
+	qt4? ( >=x11-libs/qt-core-4.5:4
+		>=x11-libs/qt-gui-4.5:4
+		>=x11-libs/qt-svg-4.5:4 )
+	readline? ( sys-libs/readline )
+	svga? ( media-libs/svgalib )
+	wxwidgets? (
+		x11-libs/wxGTK:2.8[X]
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gtk+:2 )
+	X? ( x11-libs/libXaw )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		app-text/ghostscript-gpl )
+	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
+
+if [[ -z ${PV%%*9999} ]]; then
+	# The live ebuild always needs an Emacs for building of gnuplot.texi
+	DEPEND="${DEPEND}
+	!emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+GP_VERSION="${PV%.*}"
+E_SITEFILE="lisp/50${PN}-gentoo.el"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-eldoc.patch"
+
+	if [[ -z ${PV%%*9999} ]]; then
+		local dir
+		for dir in config demo m4 term tutorial; do
+			emake -C "$dir" -f Makefile.am.in Makefile.am
+		done
+		eautoreconf
+	fi
+
+	# Add special version identification as required by provision 2
+	# of the gnuplot license
+	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+	# hacky workaround
+	# Please hack the buildsystem if you like
+	if use prefix && use qt4; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+	fi
+
+	DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
+		for details. You can use the "pdfcairo" terminal for PDF output.'
+	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+	use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
+		SVGA console graphics, gnuplot needs to be set up as setuid root.
+		Please note that this is usually considered to be a security hazard.
+		As root, manually "chmod u+s /usr/bin/gnuplot".'
+	use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
+		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+		environment variables. See the FAQ file in /usr/share/doc/${PF}/
+		for more information.'
+}
+
+src_configure() {
+	if ! use latex; then
+		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
+	fi
+
+	if use wxwidgets; then
+		WX_GTK_VER="2.8"
+		need-wxwidgets unicode
+	fi
+
+	tc-export CC CXX			#453174
+
+	local myconf
+	myconf="${myconf} --without-pdf"
+	myconf="${myconf} --enable-stats" #extra command save to be enabled
+	myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}"
+	myconf="${myconf} $(use_with bitmap bitmap-terminals)"
+	myconf="${myconf} $(use_with cairo)"
+	myconf="${myconf} $(use_with doc tutorial)"
+	myconf="${myconf} $(use_with gd)"
+	myconf="${myconf} $(use_with ggi ggi ${EPREFIX}/usr/$(get_libdir))"
+	myconf="${myconf} $(use_with ggi xmi ${EPREFIX}/usr/$(get_libdir))"
+	myconf="${myconf} $(use_with lua)"
+	myconf="${myconf} $(use_with plotutils plot "${EPREFIX}"/usr/$(get_libdir))"
+	myconf="${myconf} $(use_with svga linux-vga)"
+	myconf="${myconf} $(use_enable thin-splines)"
+	myconf="${myconf} $(use_enable wxwidgets)"
+	myconf="${myconf} $(use_with X x)"
+	myconf="${myconf} $(use_enable qt4 qt)"
+	use readline \
+		&& myconf="${myconf} --with-readline=gnu" \
+		|| myconf="${myconf} --with-readline=builtin"
+
+	local emacs lispdir
+	if use emacs; then
+		emacs=emacs
+		lispdir="${EPREFIX}${SITELISP}/${PN}"
+		use xemacs \
+			&& ewarn "USE flag \"xemacs\" ignored (superseded by \"emacs\")"
+	elif use xemacs; then
+		emacs=xemacs
+		lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/${PN}"
+	else
+		emacs=no
+		myconf="${myconf} --without-lisp-files"
+		if [[ -z ${PV%%*9999} ]]; then
+			# Live ebuild needs an Emacs to build gnuplot.texi
+			if has_version virtual/emacs; then emacs=emacs
+			elif has_version app-xemacs/texinfo; then emacs=xemacs; fi
+		fi
+	fi
+
+	econf ${myconf} \
+		DIST_CONTACT="http://bugs.gentoo.org/" \
+		EMACS="${emacs}" --with-lispdir="${lispdir}"
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	VARTEXFONTS="${T}/fonts"
+
+	# We believe that the following line is no longer needed.
+	# In case of problems file a bug report at bugs.gentoo.org.
+	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
+
+	emake all info
+
+	if use doc; then
+		# Avoid sandbox violation in epstopdf/ghostscript
+		addpredict /var/cache/fontconfig
+		emake -C docs pdf
+		emake -C tutorial pdf
+		use emacs || use xemacs && emake -C lisp pdf
+	fi
+}
+
+src_install () {
+	emake -j1 DESTDIR="${D}" install
+
+	if use emacs; then
+		# Gentoo Emacs site-lisp configuration
+		echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE}
+		sed '/^;; move/,+3 d' lisp/dotemacs >> ${E_SITEFILE} || die
+		elisp-site-file-install ${E_SITEFILE} || die
+	fi
+
+	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
+	newdoc term/PostScript/README README-ps
+	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
+	readme.gentoo_create_doc
+
+	if use examples; then
+		# Demo files
+		insinto /usr/share/${PN}/${GP_VERSION}
+		doins -r demo
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+	fi
+
+	if use doc; then
+		# Manual, tutorial, FAQ
+		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
+		# Documentation for making PostScript files
+		docinto psdoc
+		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+	fi
+
+	if use emacs || use xemacs; then
+		docinto emacs
+		dodoc lisp/ChangeLog lisp/README
+		use doc && dodoc lisp/gpelcard.pdf
+	fi
+}
+
+src_test() {
+	GNUTERM="unknown" default_src_test
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use latex && texmf-update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use latex && texmf-update
+}