Fix tikz support, bug 396251, patch from upstream bug tracker.

Update ebuild to EAPI 4. Remove old.

Package-Manager: portage-2.1.10.43/cvs/Linux x86_64

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 25ebc703b37d29b921b97fc4716e4cddb7fec228..1913b272d21901cfc47f1e71425428906a8fc287 100644 (file)
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.170 2011/11/28 08:41:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.171 2011/12/28 10:34:38 ulm Exp $
+
+*gnuplot-4.4.4-r1 (28 Dec 2011)
+
+  28 Dec 2011; Ulrich Mueller <ulm@gentoo.org> -gnuplot-4.4.2-r1.ebuild,
+  +gnuplot-4.4.4-r1.ebuild, +files/gnuplot-4.4.4-tikz.patch:
+  Fix tikz support, bug 396251, patch from upstream bug tracker. Update ebuild
+  to EAPI 4. Remove old.
 
   28 Nov 2011; Ulrich Mueller <ulm@gentoo.org>
   -files/gnuplot-4.2.2-disable_texi_generation.patch,

diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index b3fea4d35aee00c37869f19a68dd023a1c01fed8..9da3745675728f8958ec9dc437ef55ce95369f8c 100644 (file)
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST gnuplot-4.4.2.tar.gz 3299690 RMD160 077d6d353e0370d1f8463693380030722f5789af SHA1 35666be22e877ade5e272199d3d81555c141cef5 SHA256 37e8c8d4838fb84a3ad97a6c4823f086b929cb18d6613a2d0e8227ce0d4de9e4
+AUX gnuplot-4.4.4-tikz.patch 578 RMD160 563699f2e7df71b28a6d5bfab9ad37e46d5c48fb SHA1 4297d02936427b5efe78767fe00df789e6895f83 SHA256 aaf803a66e57c7e069dc5aba8ec91dc3038c224c10d8624368c1b505ef34e4f6
 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
-EBUILD gnuplot-4.4.2-r1.ebuild 6158 RMD160 4b31a2b6240fc957304a5db5c3fb3cd37dd12b32 SHA1 5e1eb21a80d67472ecde1648d0ad456431167a2a SHA256 5fef0cb9cd88d3446c98539220fa807b89ae0db5977329ab578a34d01c7bd6eb
 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
 EBUILD gnuplot-4.4.4.ebuild 6722 RMD160 2c63f1f97a845ae641c947bcd61bfb90cb9c9fae SHA1 1415611fd244b95e154800d0e8024de3f0b27f24 SHA256 24eb1b38df2c0c6ff483700e247ffeab1b10c2a95f60da2acdb7e4d78a48f12d
-MISC ChangeLog 31317 RMD160 18be2181fddb532c519f1b897a6b2a02e9133a5a SHA1 eb81c3787937041251f99ac27d668be667aab228 SHA256 024d8c927feec0a5f8bf90b3988422f2c3f7b3d19f9e4f076a1e836655d22c75
+MISC ChangeLog 31589 RMD160 5b7d4e5faf650cfff2ebb78a1c45ca0ad66b24b0 SHA1 06f5231f49b6a6b91a32e0b337f9425476091644 SHA256 a2febe789c114f289b3839878900d20646f789b9f943d3e506ae0dafa9e67dc6
 MISC metadata.xml 827 RMD160 e6b9c60a2d8ad33c3ed2c649ead9e836b1a54fdb SHA1 23524656ce50cf1b1b44fda522c79c6ce78afa1b SHA256 d98221cb62667b8e7eaafa41b3a89be5bf2b9fbfc958b3adde99150839403ea5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7TS4EACgkQOeoy/oIi7uxwTQCeL4jiarJRXnVC0lLybVs8YxxM
-ryYAoN5xdKo37Xaj67Loc8jPT/EBIvAZ
-=+DOw
+iEYEARECAAYFAk768zcACgkQOeoy/oIi7uxRkwCeJwwZTBGLxRvFaddhmZAzzo+b
+sMwAnjR4vRHvjq+nff0aHZZMsy5eS3bP
+=dP0j
 -----END PGP SIGNATURE-----

diff --git a/sci-visualization/gnuplot/files/gnuplot-4.4.4-tikz.patch b/sci-visualization/gnuplot/files/gnuplot-4.4.4-tikz.patch
new file mode 100644 (file)
index 0000000..174fdd1
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-4.4.4-tikz.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/396251
+http://sourceforge.net/tracker/?func=detail&aid=3441899&group_id=2055&atid=102055
+
+--- gnuplot-4.4.4-orig/term/lua/gnuplot-tikz.lua
++++ gnuplot-4.4.4/term/lua/gnuplot-tikz.lua
+@@ -251,6 +251,7 @@
+   gp.write(string.format("\\begin{tikzpicture}[gnuplot%s]\n",global_opt))
+   gp.write(string.format("%%%% generated with GNUPLOT %sp%s (%s; terminal rev. %s, script rev. %s)\n%%%% %s\n",
+       term.gp_version, term.gp_patchlevel,
++      _VERSION,
+       string.sub(term.lua_term_revision,7,-3),
+       pgf.REVISION,os.date()))
+   if font ~= "" then

diff --git a/sci-visualization/gnuplot/gnuplot-4.4.2-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.4-r1.ebuild
similarity index 73%
rename from sci-visualization/gnuplot/gnuplot-4.4.2-r1.ebuild
rename to sci-visualization/gnuplot/gnuplot-4.4.4-r1.ebuild
index 4712ea887a3495e3844c66519594e37bf1f5c241..8590f6904dcf7cc5850dfeb718042047676e0585 100644 (file)
--- a/sci-visualization/gnuplot/gnuplot-4.4.2-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.4-r1.ebuild
@@ -1,20 +1,31 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.2-r1.ebuild,v 1.6 2011/11/28 05:30:57 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.4-r1.ebuild,v 1.1 2011/12/28 10:34:38 ulm Exp $
 
-EAPI=3
+EAPI=4
 
 inherit 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"
+
+if [[ -z ${PV%%*9999} ]]; then
+       inherit autotools cvs
+       ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
+       ECVS_MODULE="gnuplot"
+       ECVS_BRANCH="branch-4-4-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"
 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"
+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 readline svga thin-splines wxwidgets X xemacs"
 
 RDEPEND="
@@ -46,6 +57,7 @@ DEPEND="${RDEPEND}
        dev-util/pkgconfig
        doc? (
                virtual/latex-base
+               dev-texlive/texlive-latexextra
                app-text/ghostscript-gpl )
        !emacs? ( xemacs? ( app-xemacs/texinfo ) )"
 
@@ -58,6 +70,16 @@ E_SITEFILE="50${PN}-gentoo.el"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
 
 src_prepare() {
+       epatch "${FILESDIR}/${P}-tikz.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
@@ -92,7 +114,9 @@ src_configure() {
                && myconf="${myconf} --with-readline=gnu" \
                || myconf="${myconf} --with-readline=builtin"
 
-       econf ${myconf} DIST_CONTACT="http://bugs.gentoo.org/"
+       econf ${myconf} \
+               DIST_CONTACT="http://bugs.gentoo.org/" \
+               EMACS=$(usev emacs || usev xemacs || echo no)
 
        if use xemacs; then
                einfo "Configuring gnuplot-mode for XEmacs ..."
@@ -117,44 +141,44 @@ src_compile() {
        # example plots.
        addwrite /dev/svga:/dev/mouse:/dev/tts/0
 
-       emake all info || die
+       emake all info
 
        if use xemacs; then
                cd "${S}/lisp-xemacs"
-               emake || die
+               emake
        fi
 
        if use emacs; then
                cd "${S}/lisp"
-               emake || die
+               emake
        fi
 
        if use doc; then
                # Avoid sandbox violation in epstopdf/ghostscript
                addpredict /var/cache/fontconfig
                cd "${S}/docs"
-               emake pdf || die
+               emake pdf
                cd "${S}/tutorial"
-               emake pdf || die
+               emake pdf
 
                if use emacs || use xemacs; then
                        cd "${S}/lisp"
-                       emake pdf || die
+                       emake pdf
                fi
        fi
 }
 
 src_install () {
-       emake DESTDIR="${D}" install || die
+       emake DESTDIR="${D}" install
 
        if use xemacs; then
                cd "${S}/lisp-xemacs"
-               emake DESTDIR="${D}" install || die
+               emake DESTDIR="${D}" install
        fi
 
        if use emacs; then
                cd "${S}/lisp"
-               emake DESTDIR="${D}" install || die
+               emake DESTDIR="${D}" install
                # info-look* is included with >=emacs-21
                rm -f "${ED}${SITELISP}/${PN}"/info-look*
 
@@ -173,7 +197,7 @@ src_install () {
        if use examples; then
                # Demo files
                insinto /usr/share/${PN}/${GP_VERSION}
-               doins -r demo || die
+               doins -r demo
                rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
                rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
        fi
@@ -200,23 +224,23 @@ 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\"."
+       elog "Gnuplot no longer links against pdflib, see the ChangeLog for"
+       elog "details. You can use the \"pdfcairo\" terminal for PDF output."
+       use cairo || elog "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\"."
+               elog "In order to enable ordinary users to use SVGA console graphics"
+               elog "gnuplot needs to be set up as setuid root. Please note that"
+               elog "this is usually considered to be a security hazard."
+               elog "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."
+               elog "For font support in png/jpeg/gif output, you may have to"
+               elog "set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT environment"
+               elog "variables. See the FAQ file in /usr/share/doc/${PF}/"
+               elog "for more information."
        fi
 }