diff options
Diffstat (limited to 'sci-visualization')
| -rw-r--r-- | sci-visualization/gnuplot/ChangeLog | 4 | ||||
| -rw-r--r-- | sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild | 10 | ||||
| -rw-r--r-- | sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog index 9ff03dfa6..6203a3246 100644 --- a/sci-visualization/gnuplot/ChangeLog +++ b/sci-visualization/gnuplot/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 22 Apr 2013; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.6.9999.ebuild, + gnuplot-4.7.9999.ebuild: + sync with gx86 + 12 Mar 2013; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.6.9999.ebuild, gnuplot-4.7.9999.ebuild: fix build without emacs diff --git a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild index f6d334cf0..ee417926c 100644 --- a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild @@ -20,7 +20,8 @@ if [[ -z ${PV%%*9999} ]]; then SRC_URI="" else MY_P="${P/_/.}" - SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz" + SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz + mirror://gentoo/${PN}.info-4.6.2.tar.xz" fi LICENSE="gnuplot GPL-2 bitmap? ( free-noncomm )" @@ -36,7 +37,7 @@ RDEPEND=" !emacs? ( xemacs? ( app-editors/xemacs app-xemacs/xemacs-base ) ) - gd? ( media-libs/gd[png] ) + gd? ( >=media-libs/gd-2.0.35-r3[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base @@ -77,7 +78,10 @@ E_SITEFILE="lisp/50${PN}-gentoo.el" TEXMF="${EPREFIX}/usr/share/texmf-site" src_prepare() { - if [[ -z ${PV%%*9999} ]]; then + if [[ -n ${PV%%*9999} ]]; then + epatch "${FILESDIR}/${PN}-4.6.1-eldoc.patch" + epatch "${FILESDIR}/${PN}-4.6.2-gdversion.patch" #462996 + else local dir for dir in config demo m4 term tutorial; do emake -C "$dir" -f Makefile.am.in Makefile.am diff --git a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild index e26eeed7a..cffef192a 100644 --- a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild @@ -36,7 +36,7 @@ RDEPEND=" !emacs? ( xemacs? ( app-editors/xemacs app-xemacs/xemacs-base ) ) - gd? ( media-libs/gd[png] ) + gd? ( >=media-libs/gd-2.0.35-r3[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base |