From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QQJGp-0002vL-0e for garchives@archives.gentoo.org; Sat, 28 May 2011 13:09:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D8E01C12E; Sat, 28 May 2011 13:09:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 506CD1C12A for ; Sat, 28 May 2011 13:09:26 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F3A41B401D for ; Sat, 28 May 2011 13:09:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 00D158050A for ; Sat, 28 May 2011 13:09:25 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: Subject: [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/ X-VCS-Repository: proj/sci X-VCS-Files: sci-visualization/gnuplot/ChangeLog sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild X-VCS-Directories: sci-visualization/gnuplot/ X-VCS-Committer: kleiner_otti X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: f71bb2df52c781cb3eb58a955316dc8bb9fe43a9 Date: Sat, 28 May 2011 13:09:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: bc006834b614d7531c1752df7e2072b8 commit: f71bb2df52c781cb3eb58a955316dc8bb9fe43a9 Author: Christoph Junghans gentoo org> AuthorDate: Sat May 28 13:09:13 2011 +0000 Commit: Christoph Junghans gmx de> CommitDate: Sat May 28 13:09:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Df71bb2df [sci-visualization/gnuplot] sync with tree (Portage version: 2.1.9.42/git/Linux i686, signed Manifest commit with ke= y C2000586) --- sci-visualization/gnuplot/ChangeLog | 3 + sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild | 62 ++++++++++++++-= ------ 2 files changed, 45 insertions(+), 20 deletions(-) diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnup= lot/ChangeLog index 127125b..2f2be4a 100644 --- a/sci-visualization/gnuplot/ChangeLog +++ b/sci-visualization/gnuplot/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 28 May 2011; Christoph Junghans gnuplot-4.5.9999.e= build: + sync with tree + 28 May 2011; Christoph Junghans -gnuplot-4.4.3-r1.= ebuild, metadata.xml: InCVS diff --git a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild b/sci-visu= alization/gnuplot/gnuplot-4.5.9999.ebuild index d414079..3898887 100644 --- a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild @@ -4,16 +4,24 @@ =20 EAPI=3D3 =20 -inherit autotools cvs elisp-common multilib wxwidgets +inherit elisp-common multilib wxwidgets =20 DESCRIPTION=3D"Command-line driven interactive plotting program" HOMEPAGE=3D"http://www.gnuplot.info/" =20 -ECVS_SERVER=3D"gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot" -ECVS_MODULE=3D"gnuplot" -ECVS_BRANCH=3D"HEAD" -ECVS_USER=3D"anonymous" -ECVS_CVS_OPTIONS=3D"-dP" +if [[ -z ${PV%%*9999} ]]; then + inherit autotools cvs + ECVS_SERVER=3D"gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot" + ECVS_MODULE=3D"gnuplot" + ECVS_BRANCH=3D"HEAD" + ECVS_USER=3D"anonymous" + ECVS_CVS_OPTIONS=3D"-dP" + MY_P=3D"${PN}" + SRC_URI=3D"" +else + MY_P=3D"${P/_/-}" + SRC_URI=3D"mirror://sourceforge/gnuplot/${MY_P}.tar.gz" +fi =20 LICENSE=3D"gnuplot GPL-2" SLOT=3D"0" @@ -40,34 +48,35 @@ RDEPEND=3D"!app-emacs/gnuplot-mode wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/cairo x11-libs/pango - >=3Dx11-libs/gtk+-2.8:2 ) + x11-libs/gtk+:2 ) X? ( x11-libs/libXaw ) xemacs? ( app-editors/xemacs - app-xemacs/xemacs-base - app-xemacs/texinfo )" + app-xemacs/xemacs-base )" DEPEND=3D"${RDEPEND} dev-util/pkgconfig doc? ( virtual/latex-base app-text/ghostscript-gpl ) - virtual/emacs" + !emacs? ( xemacs? ( app-xemacs/texinfo ) ) + !emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )" =20 -S=3D"${WORKDIR}/${PN}" +S=3D"${WORKDIR}/${MY_P}" GP_VERSION=3D"${PV%.*}" E_SITEFILE=3D"50${PN}-gentoo.el" TEXMF=3D"${EPREFIX}/usr/share/texmf-site" =20 src_prepare() { - local dir - for dir in config demo m4 term tutorial; do - emake -C "$dir" -f Makefile.am.in Makefile.am || \ - die "make -f Makefile.am.in Makefile.am in $dir failed" - done + 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 || \ + die "make -f Makefile.am.in Makefile.am in $dir failed" + done + eautoreconf + fi =20 # Add special version identification as required by provision 2 # of the gnuplot license sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die - - eautoreconf } =20 src_configure() { @@ -100,7 +109,15 @@ src_configure() { && myconf=3D"${myconf} --with-readline=3Dgnu" \ || myconf=3D"${myconf} --with-readline=3Dbuiltin" =20 - econf ${myconf} DIST_CONTACT=3D"http://bugs.gentoo.org/" + if has_version virtual/emacs; then + emacs=3D"emacs" + elif has_version app-xemacs/texinfo; then + emacs=3D"xemacs" + fi + + econf ${myconf} \ + DIST_CONTACT=3D"http://bugs.gentoo.org/" \ + EMACS=3D"${emacs}" =20 if use xemacs; then einfo "Configuring gnuplot-mode for XEmacs ..." @@ -125,7 +142,7 @@ src_compile() { # example plots. addwrite /dev/svga:/dev/mouse:/dev/tts/0 =20 - emake || die + emake all info || die =20 if use xemacs; then cd "${S}/lisp-xemacs" @@ -206,7 +223,12 @@ pkg_postinst() { use emacs && elisp-site-regen use latex && texmf-update =20 + 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=3D\"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."