version bump

Package-Manager: portage-2.2.0_alpha84/cvs/Linux i686

3 files changed, 275 insertions, 16 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index d6a82fb96bbb..c3d492dc1883 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.172 2012/01/17 07:11:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.173 2012/01/27 03:06:09 ottxor Exp $
+
+*gnuplot-4.6_rc1 (27 Jan 2012)
+
+  27 Jan 2012; Christoph Junghans <ottxor@gentoo.org> +gnuplot-4.6_rc1.ebuild:
+  version bump
 
   17 Jan 2012; Ulrich Müller <ulm@gentoo.org> -gnuplot-4.4.4.ebuild:
   Remove intermediate version.
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 6120625fa0d5..f0059ebd198e 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -5,24 +5,20 @@ AUX gnuplot-4.4.4-tikz.patch 578 RMD160 563699f2e7df71b28a6d5bfab9ad37e46d5c48fb
 DIST gnuplot-4.4.3-texinfo-update.patch.gz 7519 RMD160 73188caf8edbc84d11b43ea16a93fb5c9bece959 SHA1 dbd8d69214ae99411a2ffcc63f309cd342622865 SHA256 6153e081a0165682b052188a0166408e353a03be5fa1465d889c75f56d32700a
 DIST gnuplot-4.4.3.tar.gz 3305912 RMD160 90290eb2b6b9404dc520080439bdee9056e61fc4 SHA1 a4d315b9288739e3cbaa04d8ddda7861b4009bd4 SHA256 6faa236ed5c744f34a9ac58ef89dab6177a15c5835dc3644a0a12779439426e6
 DIST gnuplot-4.4.4.tar.gz 3328278 RMD160 7e1d039c05c46fa38b53a3c4afbd328509da901d SHA1 d4f143eade1f8d8b27be44cbda431d37a71c6a31 SHA256 d228599d08d5f87bcb79af8af8bb432c77d942802b1643f920c7baaeaf1ddbfd
+DIST gnuplot-4.6.rc1.tar.gz 5018714 RMD160 96d44d5e0f7c8ac5b317b0b1851a2d0a0df4bd07 SHA1 41a4a4b83c7005d9d2b997e534d858a111791fc1 SHA256 e906f7276e76f6c8f119c7c731000ff6694a2dbf11571d531a1f2706f0ffdbd2
 EBUILD gnuplot-4.4.3-r1.ebuild 6822 RMD160 16cf62476b3ee217ddcda45c82e26977ad87c119 SHA1 405efe0aa3edf3e210324fcf36f7a67ac0389490 SHA256 46f55e88250d46f1f309a583ac982a4ee00e5128401e894a527c2b4355260f58
 EBUILD gnuplot-4.4.4-r1.ebuild 6626 RMD160 de93410aaec6229a14d12ddfad9ef2f4217cb9af SHA1 edea04b773835c5f62f7dc80a19552f9a4cd4f64 SHA256 a10056ac1a0f794efcd19777e29e09a5e258b8ef6f9cb36bdb4ca2ffeb39efdb
-MISC ChangeLog 31691 RMD160 fade9d36d2700d69a6cfd13b42393ff5fa23eace SHA1 c34016eee539d192546909cf673f2892d4fa1fcd SHA256 836af5a1989145b8c9d7a981ed0460d5a33ccf8d38bbf7765bda1f77ae6a2c3e
+EBUILD gnuplot-4.6_rc1.ebuild 6903 RMD160 414407d5bda11c6b2732e87198bb8c1449f7d8bd SHA1 d54b9325cba3f8aae02b5fd139953f50743ef431 SHA256 a2f8229eb10f05403070eb625d4baa6b8c99c4b37340a08e6a866c9fb1011a7a
+MISC ChangeLog 31821 RMD160 504c2a76834e0a18c267aa20659cb762d29637bd SHA1 f5e015c8d7125cac64989ad80f0bfb69aeae7fad SHA256 2084d0dfdd52a8ea1d0a4f2396f423c28506dbbc2d3cd5d769bae443e68a1e16
 MISC metadata.xml 827 RMD160 e6b9c60a2d8ad33c3ed2c649ead9e836b1a54fdb SHA1 23524656ce50cf1b1b44fda522c79c6ce78afa1b SHA256 d98221cb62667b8e7eaafa41b3a89be5bf2b9fbfc958b3adde99150839403ea5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPFR96AAoJEDxpGckxwJCB1GcQAK3hGqSTBKcJJB7Q+pfqhDcz
-MQFTflnu7DyfbAF7WaPT4FIJ5BLklvadNmTZ0QuH1YC5Q8DmtGtIm7QPYru7IWqe
-bFjICH52FNIHfcfNgLHDMUesPIQ5SwOFKgRovYeQadrO/FPYihNR7Adja5sXmOxA
-MkZXhj4Zi2SLW3p/dWxaOGPVaUODIpDbtR7DBnxD9yH+Gr59jbew91L2OOJGkpNg
-dJEbuA+5WpZ0XEc95U2wBFPwVtSY8PJy8DJr5EVejDQyTDgkgHF/D1LsYyaQ5gtw
-auxw3x/MA/K5llQnERVFHqobglXzqsvYmmwH+m3umym6mfsOPm8aWbFCS7OMGoRL
-n2CtzzEbSNyXhN/7AnRs/kpt+C37gdhiUBeUnkpUHITK1ozGwNpkJZZQ2E7yL22K
-FOIrI9gsbfsaghUpk4jMgOjTDkExFi0GENt1JRewX2IAK5tPVhfb1K78BmL8lAvQ
-iQOZ8xFNUJc8kNPM1QHlN5SsPdRoUjM4Uws18veGXr2Q+tnC3fMgM4ALOgE3bSrG
-jM3XY2t4gQBKuJqw29s8ZeBZa/E/i36pYDjVJXfupOZF9EIk/eGtgjqcnO6y8O5k
-NdWutXRdlKvg6RA0WU5MEdmjS4W7st1/BDdeOTXYHK2eyb86QvfTRv8pQhQZk1pB
-Rmoekgk6mI9HU1sgxuK3
-=1EVG
+iQEcBAEBAgAGBQJPIhSoAAoJEOeBhlrCAAWGwHoH/jd3PG+PV8FgjUAgl8FVlisG
+8SNyxpwxtAMJjns7YdqF6le9QQVBl8DzUyZjGTvkYy85611v6H6ex40ya3dIorD4
+V0/t/sQgdg0UjJbK7b6iTBxcFKq55pUNKIPXVX+kKnXh/CwDo4zplrsVmoPv2ehu
+yUWq/5xkxCTzp2IJiofbmZBsClzp47AzseEKyUyGnJKUD7yitWAlkglHKfn+ITdg
++bfu2k4gtaLzJ1eX1dU5Aged/H5gaMCFRLN4n0xIFQAidC1jboLyF6cAjkkOoW6I
+lDWA4+lfdHD6+ACnYZ0d8OSib9OPg3l1qfEA6OCitGWVwvsxtkYar5I0t4dfSQ4=
+=SPLf
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild b/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild
new file mode 100644
index 000000000000..85e5c1650d37
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild,v 1.1 2012/01/27 03:06:09 ottxor Exp $
+
+EAPI=4
+
+inherit elisp-common multilib 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="HEAD"
+	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"
+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="cairo doc emacs examples +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
+RESTRICT="wxwidgets? ( test )"
+
+RDEPEND="
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango )
+	emacs? ( virtual/emacs )
+	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
+		>=x11-libs/qt-gui-4.5
+		>=x11-libs/qt-svg-4.5 )
+	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 )
+	xemacs? (
+		app-editors/xemacs
+		app-xemacs/xemacs-base )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? (
+		virtual/latex-base
+		app-text/ghostscript-gpl )
+	!emacs? ( xemacs? ( app-xemacs/texinfo ) )
+	!emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+GP_VERSION="${PV%.*}"
+E_SITEFILE="50${PN}-gentoo.el"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+src_prepare() {
+	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
+}
+
+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
+
+	local myconf
+	myconf="${myconf} --without-lisp-files"
+	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 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"
+
+	if has_version virtual/emacs; then
+		emacs="emacs"
+	elif has_version app-xemacs/texinfo; then
+		emacs="xemacs"
+	fi
+
+	econf ${myconf} \
+		DIST_CONTACT="http://bugs.gentoo.org/" \
+		EMACS="${emacs}"
+
+	if use xemacs; then
+		einfo "Configuring gnuplot-mode for XEmacs ..."
+		use emacs && cp -Rp lisp lisp-xemacs || ln -s lisp lisp-xemacs
+		cd "${S}/lisp-xemacs"
+		econf --with-lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/${PN}" EMACS=xemacs
+	fi
+
+	if use emacs; then
+		einfo "Configuring gnuplot-mode for GNU Emacs ..."
+		cd "${S}/lisp"
+		econf --with-lispdir="${EPREFIX}${SITELISP}/${PN}" EMACS=emacs
+	fi
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	VARTEXFONTS="${T}/fonts"
+
+	# 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
+
+	emake all info
+
+	if use xemacs; then
+		cd "${S}/lisp-xemacs"
+		emake
+	fi
+
+	if use emacs; then
+		cd "${S}/lisp"
+		emake
+	fi
+
+	if use doc; then
+		# Avoid sandbox violation in epstopdf/ghostscript
+		addpredict /var/cache/fontconfig
+		cd "${S}/docs"
+		emake pdf
+		cd "${S}/tutorial"
+		emake pdf
+
+		if use emacs || use xemacs; then
+			cd "${S}/lisp"
+			emake pdf
+		fi
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	if use xemacs; then
+		cd "${S}/lisp-xemacs"
+		emake DESTDIR="${D}" install
+	fi
+
+	if use emacs; then
+		cd "${S}/lisp"
+		emake DESTDIR="${D}" install
+		# info-look* is included with >=emacs-21
+		rm -f "${ED}${SITELISP}/${PN}"/info-look*
+
+		# Gentoo emacs site-lisp configuration
+		echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE}
+		sed '/^;; move/,+3 d' dotemacs >> ${E_SITEFILE} || die
+		elisp-site-file-install ${E_SITEFILE} || die
+	fi
+
+	cd "${S}"
+	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README* TODO
+	newdoc term/PostScript/README README-ps
+	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
+
+	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
+		dodoc docs/gnuplot.pdf
+		# Tutorial
+		dodoc tutorial/{tutorial.dvi,tutorial.pdf}
+		# FAQ
+		dodoc 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
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use latex && texmf-update
+
+	einfo "Gnuplot no longer links against pdflib, see the ChangeLog for"
+	einfo "details. You can use the \"pdfcairo\" terminal for PDF output."
+	use cairo || einfo "It is available with USE=\"cairo\"."
+
+	if use svga; then
+		echo
+		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
+	if use gd; then
+		echo
+		einfo "For font support in png/jpeg/gif output, you may have to"
+		einfo "set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT environment"
+		einfo "variables. See the FAQ file in /usr/share/doc/${PF}/"
+		einfo "for more information."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use latex && texmf-update
+}