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 1Rqyxo-00059S-8C for garchives@archives.gentoo.org; Sat, 28 Jan 2012 03:28:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BC63E0A98; Sat, 28 Jan 2012 03:28:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1DDDFE0A98 for ; Sat, 28 Jan 2012 03:28:16 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 854DD1B400B for ; Sat, 28 Jan 2012 03:28:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E700780044 for ; Sat, 28 Jan 2012 03:28:14 +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: <9cd99b68d1feffc7052442f06344ee188ea331ab.kleiner_otti@gentoo> 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.6.9999.ebuild sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild X-VCS-Directories: sci-visualization/gnuplot/ X-VCS-Committer: kleiner_otti X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 9cd99b68d1feffc7052442f06344ee188ea331ab Date: Sat, 28 Jan 2012 03:28:14 +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: c6bea319-f758-4ad0-83ce-5167d066d66e X-Archives-Hash: 22a81181884a094fe5170db6fef6f834 commit: 9cd99b68d1feffc7052442f06344ee188ea331ab Author: Christoph Junghans gentoo org> AuthorDate: Sat Jan 28 03:26:31 2012 +0000 Commit: Christoph Junghans gmx de> CommitDate: Sat Jan 28 03:26:31 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D9cd99b68 sync with tree and bug #400999#c7 (Portage version: 2.2.0_alpha84/git/Linux i686, unsigned Manifest commit) --- sci-visualization/gnuplot/ChangeLog | 4 ++ sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild | 42 ++++++++++++---= ------ sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild | 42 ++++++++++++---= ------ 3 files changed, 52 insertions(+), 36 deletions(-) diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnup= lot/ChangeLog index 6d0b375..b149287 100644 --- a/sci-visualization/gnuplot/ChangeLog +++ b/sci-visualization/gnuplot/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 28 Jan 2012; Christoph Junghans gnuplot-4.6.9999.e= build, + gnuplot-4.7.9999.ebuild: + sync with tree and bug #400999#c7 + *gnuplot-4.7.9999 (27 Jan 2012) *gnuplot-4.6.9999 (27 Jan 2012) =20 diff --git a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild b/sci-visu= alization/gnuplot/gnuplot-4.6.9999.ebuild index 3153e2f..89556a7 100644 --- a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6= _rc1.ebuild,v 1.3 2012/01/27 16:05:06 ulm Exp $ =20 EAPI=3D4 =20 @@ -61,9 +61,15 @@ DEPEND=3D"${RDEPEND} dev-util/pkgconfig doc? ( virtual/latex-base + dev-texlive/texlive-latexextra app-text/ghostscript-gpl ) - !emacs? ( xemacs? ( app-xemacs/texinfo ) ) + !emacs? ( xemacs? ( app-xemacs/texinfo ) )" + +if [[ -z ${PV%%*9999} ]]; then + # The live ebuild always needs an Emacs for building of gnuplot.texi + DEPEND=3D"${DEPEND} !emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )" +fi =20 S=3D"${WORKDIR}/${MY_P}" =20 @@ -116,15 +122,15 @@ src_configure() { && myconf=3D"${myconf} --with-readline=3Dgnu" \ || myconf=3D"${myconf} --with-readline=3Dbuiltin" =20 - if has_version virtual/emacs; then - emacs=3D"emacs" - elif has_version app-xemacs/texinfo; then - emacs=3D"xemacs" + local emacs=3D$(usev emacs || usev xemacs || echo no) + if [[ -z ${PV%%*9999} && ${emacs} =3D no ]]; then + #live ebuild needs an emacs to build texi + has_version virtual/emacs && emacs=3D"emacs" || emacs=3D"xemacs" fi =20 econf ${myconf} \ DIST_CONTACT=3D"http://bugs.gentoo.org/" \ - EMACS=3D"${emacs}" + EMACS=3D${emacs} =20 if use xemacs; then einfo "Configuring gnuplot-mode for XEmacs ..." @@ -232,23 +238,23 @@ 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\"." + 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=3D\"cairo\"." =20 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 } =20 diff --git a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild b/sci-visu= alization/gnuplot/gnuplot-4.7.9999.ebuild index af41315..3cb5c17 100644 --- a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6= _rc1.ebuild,v 1.3 2012/01/27 16:05:06 ulm Exp $ =20 EAPI=3D4 =20 @@ -61,9 +61,15 @@ DEPEND=3D"${RDEPEND} dev-util/pkgconfig doc? ( virtual/latex-base + dev-texlive/texlive-latexextra app-text/ghostscript-gpl ) - !emacs? ( xemacs? ( app-xemacs/texinfo ) ) + !emacs? ( xemacs? ( app-xemacs/texinfo ) )" + +if [[ -z ${PV%%*9999} ]]; then + # The live ebuild always needs an Emacs for building of gnuplot.texi + DEPEND=3D"${DEPEND} !emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )" +fi =20 S=3D"${WORKDIR}/${MY_P}" =20 @@ -116,15 +122,15 @@ src_configure() { && myconf=3D"${myconf} --with-readline=3Dgnu" \ || myconf=3D"${myconf} --with-readline=3Dbuiltin" =20 - if has_version virtual/emacs; then - emacs=3D"emacs" - elif has_version app-xemacs/texinfo; then - emacs=3D"xemacs" + local emacs=3D$(usev emacs || usev xemacs || echo no) + if [[ -z ${PV%%*9999} && ${emacs} =3D no ]]; then + #live ebuild needs an emacs to build texi + has_version virtual/emacs && emacs=3D"emacs" || emacs=3D"xemacs" fi =20 econf ${myconf} \ DIST_CONTACT=3D"http://bugs.gentoo.org/" \ - EMACS=3D"${emacs}" + EMACS=3D${emacs} =20 if use xemacs; then einfo "Configuring gnuplot-mode for XEmacs ..." @@ -232,23 +238,23 @@ 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\"." + 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=3D\"cairo\"." =20 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 } =20