version bump

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

3 files changed, 255 insertions, 9 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 8e9554e896f0..efd0405bb16f 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,11 @@
 # 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.209 2013/03/04 11:37:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.210 2013/03/17 23:01:03 ottxor Exp $
+
+*gnuplot-4.6.2 (17 Mar 2013)
+
+  17 Mar 2013; Christoph Junghans <ottxor@gentoo.org> +gnuplot-4.6.2.ebuild:
+  version bump
 
   04 Mar 2013; Ulrich Müller <ulm@gentoo.org> gnuplot-4.6.1-r1.ebuild:
   Simplify logic in src_configure.
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index aeb7d49fb384..9e490b1942e6 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -6,20 +6,22 @@ AUX gnuplot-4.6.1-eldoc.patch 1077 SHA256 0b8ce02df0ba67de1002e6d6ea753c1f4b5c1d
 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
+DIST gnuplot-4.6.2.tar.gz 4969701 SHA256 978b01bbd288c4c5f6d6572cae3aa8bc73b429629ef4400f71856bb5d2251818 SHA512 d7b8f8dcc95aa15ddb7506fcf6f2e8147df81a9b50777250c86cba62823c57dd8ccce67b467ffc044349283936e69fd67742586ef4ea4d0ce8afebd87fae8af5 WHIRLPOOL 63b4da71042d42e7b79075270b4fb5f7258588958a718f3516bd660cbe64addbfe9b532f71364c6c00ecd7760c79f3e023ad199433f53fc668ef2988846ff48c
 EBUILD gnuplot-4.4.4-r1.ebuild 6635 SHA256 919cc230c0f26a0e12442d0185cbcf794cd0699307153f84d8f89186129b0217 SHA512 6dad45b149a3fd5ec095bd7abbe9bc2c273eaf1abc5977d9a92a22b3a57d19dd87e3e401f971013a34706f697ce9041bae410b35d3a09e646fc24ea0509ac775 WHIRLPOOL c8f4fc801a4af68307a0df0e066718b16647ff7faae39545603eb88eeeac65545e1ae668c88049d8e4308169b788f40c5e832de2684802a96ab92111a1e641dc
 EBUILD gnuplot-4.6.0.ebuild 7452 SHA256 50fbf6ac2239ea825b1574dba40bfb06f94d02bee7e8115729f5dd67e014eb9d SHA512 342f8076c99c764963300b1a91751bb9c8e686cc5dace795b7bff18206b9fe8e7486259a2154b3868aa956437a4d655b5a72360a0f86a5b3aad57e77e2b1a810 WHIRLPOOL e3b6020034718535e3eda34d09858ae66ccee0aa593d720f472d485b5de1e6171c9a3d4dba0f026059e7a080f3610050da0f06a276780e7f2e352dfea3531de1
 EBUILD gnuplot-4.6.1-r1.ebuild 6683 SHA256 cc31bc3e4ad01e388b0c1e5dd6b6942cc5f8550d85673705d382744fb6ca058d SHA512 5e4ce9250250f22a6df24a9fd39cf972c065fb21d5b88516e5351e03d1831504acb7ed0e3f0b637ba5ec57633286454a8a6ea0cd825273c6fc461ea25482cb03 WHIRLPOOL 159cc2d08073964787a4305776f8dd93845822fcdaee5cdca3a230ae5e27c490ed599217a862118fd3a4b3e2d46723752f01a4e1aa0213a7bf9893bd3a80d1db
 EBUILD gnuplot-4.6.1.ebuild 7512 SHA256 776c7af4f1d94d7c02bcfdc1f64381655286fd98888f50f490d0bc4f11bfba85 SHA512 e1e79282a9ab17de9f77ce7550950f20424bc79a6c5cce044064e998112626d33d1ddbab60a093feab86bd35e3b1b52bd0f1c2566e2d4a5471c4281a25768ad1 WHIRLPOOL b9b0362579b27153205b73551517e3616f17b1c45aecb06e13d3f10e6c7668d18996d52faa0b3f1606e70c0863ba700ad019430fa7427fa1aebc764f777d024f
-MISC ChangeLog 36375 SHA256 ff8bd9117f6657041c75058a8d325a32ee928c3f5c157e1d59cf7d4e2013f947 SHA512 7c796fcf86d33e1c8fab8563c15816d199e3f2f35269becec05bcbf49ca7715557e8da5866e5b85ef4afe3e1fd820afb5ca1129eb76b1d941145870621615948 WHIRLPOOL a5002def46fe2ecce13c5c152b696befc98e22b06c1211ccc78c118b440082f15696080999c43a5c2c351b75c81cfb829dd4af6aec290f997b3b3dfd71afef79
+EBUILD gnuplot-4.6.2.ebuild 6687 SHA256 94ab11bf2a29cccb78e9cfe7fe261f84e282a0a1cffbace9f7fd42d1ec864b86 SHA512 693cf8ff67e42a3c58ba0c66c36a2147fe85f2d5dd7a084b9ca22f13a0af63b10fa69a19ac37e83fecd53c599a42e0cd15e6826d2d2b9b1e1ecb6a9a9610c34e WHIRLPOOL 9860b68d0308b26eb40807c0e9f1821cda4b7e71f6caa421313753490d41f468381f7d8790c593c97a774cfd296a67a886bef1a66231d0d3a56d789be70ff952
+MISC ChangeLog 36501 SHA256 c340b65bdd56dafeb0dd1a64b2685043a886d698a661f48d1b7f7e00dc1d8edc SHA512 3569f70bef7726038d89cf1dc089ca6869bf54120d50d3973a09dfb9afd4ad94f2700a40429de9ac8e97ad64ca3670320cf244a6e4d47e26acc1c35b01ae8d8e WHIRLPOOL d2c1379764df6d90e554b86ed41ddef61146864e93358b2c94f954cab579dc39fac210399dac999f9146e8d2712ea465f8c35e715383140658e0cadb95aaf6d7
 MISC metadata.xml 974 SHA256 0fdd09afff7d6bc87078d6c09ededb60856891f130a733a0294c72e773a35f25 SHA512 feddb2b2bcf1e41c961a30c25edba081076c8703d3186f79728a7c0d496f400b3f5c1d876307325d41a4a59d19a4b27580293d57d8d5717ee23fed30a4e131d7 WHIRLPOOL 17525529c6fd42a91373324d0c5b1bfbe8528d04bd2c3b6d50b311b60c2db2d21bc3871f7ea520e119c911863a0cfa80375de5702965035cfaf0073d03610143
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJROPoWAAoJEOeBhlrCAAWG/tsIAKl26AaGJ3aJeShJhqklUs8n
-PXwb0sE4AEqfNQeVNFMcOKOPouEHZd8xT52mzS3t4fDGUWuU7/Flt2cRUaAkPtnd
-1im9AL3BCXMXY6A1agpxblDoa7MlRaJVTZpt/Hc2eUPq7si3QP1AoENsKIVQIrtm
-tC18qXfoLfpcn/3TVp1XkOeEs8JnDuK85VXJglMirHtfaFtl+eUm5WW7vl0pUE3X
-fRH5sr56KX+M9Gk52H3Lmk1ydX83gmy1+PFpSnsd+14fP5MRZ6dCfGqW7CXlvUjy
-SnoZd+zOdYkhBB+SZRyRNWLyGfg9caBM6/4fimgD40nLd2qAUdVofsBz7vGo0QE=
-=A679
+iQEcBAEBCAAGBQJRRks5AAoJEOeBhlrCAAWGPdcH/1UwlW2nIrdBokcgODW/9jVs
+VKmgfYCO5bfVT72J4aS/XUc0PUDXe2jfS4dr7Cd0Cq1NsOmH30l/oYx1WkTkjV/S
+tnXUrq+Up8Yjiv4Xono8AZcYgHyxphZN5wQOrMIJ4HLe1cZZC6PD8QYS8O1XhR/7
+ajie69L7twrfKvcPXHmmcsH+s/Z4VlYQV4FKMaAlnx/26Kiwioo9aPSkkxsYpDmK
+ygsGl/UrDs9D3VLJNEhSU+cwLtj2IwcyiPMRQGohzbfREZHMQZXG0GdSnHETbl/T
+sNJJfRst67VA3JjunVVqWP9j70qevIbm5e3UFcPhX5kuZrTG6KF5ZurQPxgATgI=
+=F1LA
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.2.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.2.ebuild
new file mode 100644
index 000000000000..cde054bff63a
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-4.6.2.ebuild
@@ -0,0 +1,239 @@
+# 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.2.ebuild,v 1.1 2013/03/17 23:01:03 ottxor 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="aqua 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? ( >=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 )
+	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
+
+if [[ -z ${PV%%*9999} ]]; then
+	# The live ebuild always needs an Emacs for building of gnuplot.texi
+	DEPEND="${DEPEND}
+	|| ( 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}/${PN}-4.6.1-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 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
+		lispdir=""
+		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 \
+		--without-pdf \
+		--with-texdir="${TEXMF}/tex/latex/${PN}" \
+		--with-readline=$(usex readline gnu builtin) \
+		--with-lispdir="${lispdir}" \
+		--with$([[ -z ${lispdir} ]] && echo out)-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="${emacs}"
+}
+
+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
+}