Drop emacs and xemacs USE flags because gnuplot-mode for Emacs is now maintained and distributed separately, bug 504354. For Emacs support, app-emacs/gnuplot-mode should be installed. KEYWORDS dropped to those of gnuserv-mode; they will be readded later.

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

3 files changed, 221 insertions, 12 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 8bba0d21c4d7..89f16aacea55 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.232 2014/03/22 19:25:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.233 2014/03/23 13:55:21 ulm Exp $
+
+*gnuplot-4.6.4-r2 (23 Mar 2014)
+
+  23 Mar 2014; Ulrich Müller <ulm@gentoo.org> +gnuplot-4.6.4-r2.ebuild:
+  Drop emacs and xemacs USE flags because gnuplot-mode for Emacs is now
+  maintained and distributed separately, bug 504354. For Emacs support,
+  app-emacs/gnuplot-mode should be installed. KEYWORDS dropped to those
+  of gnuserv-mode; they will be readded later.
 
   22 Mar 2014; Ulrich Müller <ulm@gentoo.org> gnuplot-4.6.4-r1.ebuild:
   Install the GNU Info file with doinfo, as the install-info make target does
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 877f9036e04a..be0c6e27dcd5 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -8,19 +8,20 @@ DIST gnuplot-4.6.4.tar.gz 4974176 SHA256 843a2019bcc89f76520ac2c88ada900917f28b9
 DIST gnuplot.info-4.6.2.tar.xz 182168 SHA256 73307153e8f525cce04d8c2c09ef28e422f21cd216d019f7aef8dbe71b6cc1bd SHA512 805e11933addefde41a15287e96bff9f4e307bbffbabe4bf1a9c49663a688702d9e738750d4ca6db475c9c09c0b6a14589b7e18392161610709e8864c626d4ff WHIRLPOOL bc16e1b6a798e214516aba413b3843045b0489038943dec6511722fed1eba772ba1067a8cdcada216afa903de5744c0722fa9f856a74d8f8e68fa27016704e53
 EBUILD gnuplot-4.6.3.ebuild 7039 SHA256 9a86dd58c0c9060b2441d349999def1f0a39a35d7f06b36509948228f917f893 SHA512 796751f75187a55d29b379b7c316ea525c4d62203a78cf2996d861d394f9bcd5cc220756966a3e41e975e5683a89cfa9483c6e3fd9ac46d54be0093b1146d786 WHIRLPOOL ce362c2e283f8fc6e334de97ae45a9932c8a1909cb14eb4ad615eefaeb9bda3431aeeb6ce974187fcbbef214df22cf341fbad37c18649e6ac7ecd27eb82216b3
 EBUILD gnuplot-4.6.4-r1.ebuild 7027 SHA256 d8fa826c64961de6a87abccb4e492cb93b597e29af4fa1f8cd83d9c5d2f3db98 SHA512 8ce98eb4101e54ff02691a6c7e5353e7e86bde282fa28b83f8dc91f48eacdf69592d944e308a1b20973e2a5b6d308809e73be85afd86210e3704b9cff3b0a8f9 WHIRLPOOL 722c61b1f0cbb59839d80bda65575f3825046808f70c6806148b08ad2e07607aa662a5ee622bed329fb17f50823dcb22781034bd279c99248036300c288af06d
-MISC ChangeLog 39418 SHA256 1b3ee96b946d65ab84c598946aeddd8cfac2580931bf64bdf0d20b6bde116479 SHA512 7a965ebc2ca3c9247a68cb30093e7ba105e6db81262a27f6c97c63c50a00b52888958060c96dfc02e7e944985c3dcd9d1b301f38956b00e79afd539e408c42a4 WHIRLPOOL e57cce8afdfd7064f38fa035aaa51f2fb76973f7d7c358dfeed1963b196662eae6699d2da9c6dabb547d9e9a419dcaa1816aa090cd6672ffc3d7d279392b9816
+EBUILD gnuplot-4.6.4-r2.ebuild 5603 SHA256 387b3a20cd8592ab1c5c8e9fde24a923529de12207d8ba19e5008dd8af5fe4b1 SHA512 a04c255d5b06b3169bcafafb3a88951b918a0ce2a198e08b6c23035af1ba43d00b17cb8a1f114a9b6251851c84a28eec2a10ee9a1dedbab2b17967a78591bafc WHIRLPOOL e7deb7f43a6a30ed9d6af02f31c2a8a722724d218e239c0a2ff6dfcd7ba75126b1c78e823254bfb7a0820dc417b944b6a8e0044a369fd708c57adf1ca1e3b084
+MISC ChangeLog 39788 SHA256 cab886efbb852ae223c3ff58b6a34b14989e4c26c4b96894093782d67e3a1521 SHA512 bd4caafe293b9084f2ab121ae32033f8bbb898fba6a50746911717470abffca2a8067b7f5046fe028518ab6aa14e609e2b2c19bbf7f8b77bfb1cddc14af30d39 WHIRLPOOL f3058bcfe37279ec435f6a3a63f41e6efe7c6224ad34872c16d41a22e6e3e587f2cd885cb974a9b9757f53c483d24417f2d99471150e0ed8b25bd4daa40eb5db
 MISC metadata.xml 1011 SHA256 e70915c9ca263af29a8a4ed487f4e8693518dc9dc060ee3907b85869e84af3a4 SHA512 181a761a17a116db150c9cf9345ac311b823c34e340e367f338b697c661aa6fd14303fd47aafec629fb9cccd1af17cc61099f55bb032aa79b21c110ffa9ac5da WHIRLPOOL 25fe2556cb5e13fe35b6612d1306751f2c6c982bea8c76b32ee7255cad3c90b51348248bdfe3378330e7de083a8fb1cd842db3e9cbad731cf0cbd34bea9e5c2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJTLeVQAAoJEJQzkH1pP7W4y3kL/RNwt60wbp0OA92GCeE4XoOp
-cyuZY7ub8nEDjwzCEI+Tg4onIW8EHUOyUdvj20gkqT4TXyfqcUVeml7/UzeuWcWy
-ZMQlMOJPW+vruItNvUo8zKXaQstXaCkzHIe1bpfV2ccv1SR8F2kXmQbAmQ9hTGMj
-mnX+Fsc1qYxYZTmcTqt7TDAhDIqwpKsPewziAUsvFkZXQ5LrZqBaqw0ABDTzrP4T
-PIyTxnjuj5cCTFe8OQo/V8ipNpFtdyZBlrciKLWZqb4STeGs+Ae2qRa/TpT/gsqo
-QHZc68A1seFy8ZlL1m0gOa/8Cz2L7LhRGQtQJFVhhbmT0mzYQU81l9tguZqG66+d
-I7mGZwewa0gLiwyPt/5jlGD54oSG+ZlEUgEImlf1UNYY8E9euUxx/sveil02yRkV
-jBAjRValGwesfdLhiCFlV+3zcEoZAOlzSKiJ1pB08Y+gxRa/rNka0Naq+1xSrfAH
-7EanHkvY1ypBLjHJ14TSrbVA2DVppJ5zGQvIuIXskA==
-=RWXa
+iQGcBAEBCAAGBQJTLuleAAoJEJQzkH1pP7W4aMAL/1gKx9Z8kOg2fWJDxMb9YdsD
+MuQhSYqNeXEIXojRI+AHnQ4ghcDGHGnwr6Wd5Vt+PgvKrTKLRcHDF/EWyO18SsLk
+NLPWNQ+prS8+g7eDMhgCiE5Mvpqv9ZQwxqAUHlt/Dm3Qgch1O2PAugYYV3rAcSEW
+UHpsDqdHyZicw4FJcxC5kEkec3b1Qs7RZj15yuOdOK45mIhH+9czhJNQylTuZj8p
+ArBe6J+/sQgWx1PTMa77VksStmcUTYAbw2+MRMplABc2TaY829wr/AfT+5dHZtCG
+32bzCP6tvLAue9aU47OV4k3r9IWwrFjy44OFlhswnipT7a1aMZjbJZpuePYW1q+B
+VPlxmxwRDjBnZSAb5Y2EygpXzTLQ9dm6X2HgGC2Zf1HUUznJwhS/3hDzedx37apJ
+XRy+oCLHht7q1Hzb9tXtalbUb8D3d89wAt20C91ilUlyAScjHDge2NX9T7EgIRqh
+6zeI0zWbLFo5zR0AWK+3iwpcZAzJwNJCaRyDK3wMKw==
+=iEyg
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.4-r2.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.4-r2.ebuild
new file mode 100644
index 000000000000..c977738a10bf
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-4.6.4-r2.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.4-r2.ebuild,v 1.1 2014/03/23 13:55:21 ulm Exp $
+
+EAPI=5
+
+inherit 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
+		mirror://gentoo/${PN}.info-4.6.2.tar.xz"
+fi
+
+LICENSE="gnuplot bitmap? ( free-noncomm )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="aqua bitmap cairo doc examples +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X"
+
+RDEPEND="
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango )
+	gd? ( >=media-libs/gd-2.0.35-r3[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? ( >=dev-qt/qtcore-4.5:4
+		>=dev-qt/qtgui-4.5:4
+		>=dev-qt/qtsvg-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 )"
+
+S="${WORKDIR}/${MY_P}"
+
+GP_VERSION="${PV%.*}"
+E_SITEFILE="lisp/50${PN}-gentoo.el"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+src_prepare() {
+	if [[ -n ${PV%%*9999} ]]; then
+		epatch "${FILESDIR}/${PN}-4.6.2-gdversion.patch" #462996
+		mv "${WORKDIR}"/gnuplot-4.6.2/docs/gnuplot.info docs || die
+		touch docs/gnuplot.info || die #464092#c12 and #466758
+	else
+		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.'
+	DOC_CONTENTS+='\n\ngnuplot-mode for Emacs is now maintained and
+		distributed separately; the gnuplot ebuild no longer installs it.
+		Emerge app-emacs/gnuplot-mode for Emacs support.'
+	has_version "${CATEGORY}/${PN}[emacs(-)]" && FORCE_PRINT_ELOG=1
+}
+
+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
+
+	econf \
+		--without-pdf \
+		--with-texdir="${TEXMF}/tex/latex/${PN}" \
+		--with-readline=$(usex readline gnu builtin) \
+		--without-lisp-files \
+		$(use_with bitmap bitmap-terminals) \
+		$(use_with cairo) \
+		$(use_with doc tutorial) \
+		$(use_with gd) \
+		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
+		$(use_with lua) \
+		"$(use_with plotutils plot "${EPREFIX}/usr/$(get_libdir)")" \
+		$(use_with svga linux-vga) \
+		$(use_with X x) \
+		--enable-stats \
+		$(use_enable qt4 qt) \
+		$(use_enable thin-splines) \
+		$(use_enable wxwidgets) \
+		DIST_CONTACT="http://bugs.gentoo.org/" \
+		EMACS=no
+}
+
+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
+	fi
+}
+
+src_install () {
+	emake -j1 DESTDIR="${D}" install
+
+	doinfo docs/gnuplot.info
+	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
+}
+
+src_test() {
+	GNUTERM="unknown" default_src_test
+}
+
+pkg_postinst() {
+	use latex && texmf-update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use latex && texmf-update
+}