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 1RqcOm-0006WJ-Dy for garchives@archives.gentoo.org; Fri, 27 Jan 2012 03:22:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 169E1E0AA8; Fri, 27 Jan 2012 03:22:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4E412E0AA5 for ; Fri, 27 Jan 2012 03:22:39 +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 8CED71B4030 for ; Fri, 27 Jan 2012 03:22:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D887580044 for ; Fri, 27 Jan 2012 03:22:37 +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: <3ebd33d9734fa79fb002860828493c7754a98166.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.5.9999.ebuild 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: 3ebd33d9734fa79fb002860828493c7754a98166 Date: Fri, 27 Jan 2012 03:22:37 +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: dffd0bb8-112d-4000-bc07-45edbe1b89bf X-Archives-Hash: 9fafee08d4200f3d5abc317e02ef4c06 commit: 3ebd33d9734fa79fb002860828493c7754a98166 Author: Christoph Junghans gentoo org> AuthorDate: Fri Jan 27 03:22:05 2012 +0000 Commit: Christoph Junghans gmx de> CommitDate: Fri Jan 27 03:22:05 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D3ebd33d9 version bump (Portage version: 2.2.0_alpha84/git/Linux i686, unsigned Manifest commit) --- sci-visualization/gnuplot/ChangeLog | 9 +++++- ...lot-4.5.9999.ebuild =3D> gnuplot-4.6.9999.ebuild} | 31 +++++++++---= ------- ...lot-4.5.9999.ebuild =3D> gnuplot-4.7.9999.ebuild} | 29 +++++++++---= ------ 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnup= lot/ChangeLog index 5ea94a5..6d0b375 100644 --- a/sci-visualization/gnuplot/ChangeLog +++ b/sci-visualization/gnuplot/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for sci-visualization/gnuplot -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 +*gnuplot-4.7.9999 (27 Jan 2012) +*gnuplot-4.6.9999 (27 Jan 2012) + + 27 Jan 2012; Christoph Junghans -gnuplot-4.5.9999.= ebuild, + +gnuplot-4.6.9999.ebuild, +gnuplot-4.7.9999.ebuild: + version bump + 03 Nov 2011; Christoph Junghans gnuplot-4.4.9999.e= build, gnuplot-4.5.9999.ebuild: Live ebuild updates diff --git a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild b/sci-visu= alization/gnuplot/gnuplot-4.6.9999.ebuild similarity index 93% copy from sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild copy to sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild index 1c302db..3153e2f 100644 --- a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 -EAPI=3D3 +EAPI=3D4 =20 inherit elisp-common multilib wxwidgets =20 @@ -13,13 +13,13 @@ 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_BRANCH=3D"branch-4-6-stable" ECVS_USER=3D"anonymous" ECVS_CVS_OPTIONS=3D"-dP" MY_P=3D"${PN}" SRC_URI=3D"" else - MY_P=3D"${P/_/-}" + MY_P=3D"${P/_/.}" SRC_URI=3D"mirror://sourceforge/gnuplot/${MY_P}.tar.gz" fi =20 @@ -75,8 +75,7 @@ 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 || \ - die "make -f Makefile.am.in Makefile.am in $dir failed" + emake -C "$dir" -f Makefile.am.in Makefile.am done eautoreconf fi @@ -150,44 +149,44 @@ src_compile() { # example plots. addwrite /dev/svga:/dev/mouse:/dev/tts/0 =20 - emake all info || die + emake all info =20 if use xemacs; then cd "${S}/lisp-xemacs" - emake || die + emake fi =20 if use emacs; then cd "${S}/lisp" - emake || die + emake fi =20 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 =20 if use emacs || use xemacs; then cd "${S}/lisp" - emake pdf || die + emake pdf fi fi } =20 src_install () { - emake DESTDIR=3D"${D}" install || die + emake DESTDIR=3D"${D}" install =20 if use xemacs; then cd "${S}/lisp-xemacs" - emake DESTDIR=3D"${D}" install || die + emake DESTDIR=3D"${D}" install fi =20 if use emacs; then cd "${S}/lisp" - emake DESTDIR=3D"${D}" install || die + emake DESTDIR=3D"${D}" install # info-look* is included with >=3Demacs-21 rm -f "${ED}${SITELISP}/${PN}"/info-look* =20 @@ -206,7 +205,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 diff --git a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild b/sci-visu= alization/gnuplot/gnuplot-4.7.9999.ebuild similarity index 93% rename from sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild rename to sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild index 1c302db..af41315 100644 --- a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 -EAPI=3D3 +EAPI=3D4 =20 inherit elisp-common multilib wxwidgets =20 @@ -19,7 +19,7 @@ if [[ -z ${PV%%*9999} ]]; then MY_P=3D"${PN}" SRC_URI=3D"" else - MY_P=3D"${P/_/-}" + MY_P=3D"${P/_/.}" SRC_URI=3D"mirror://sourceforge/gnuplot/${MY_P}.tar.gz" fi =20 @@ -75,8 +75,7 @@ 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 || \ - die "make -f Makefile.am.in Makefile.am in $dir failed" + emake -C "$dir" -f Makefile.am.in Makefile.am done eautoreconf fi @@ -150,44 +149,44 @@ src_compile() { # example plots. addwrite /dev/svga:/dev/mouse:/dev/tts/0 =20 - emake all info || die + emake all info =20 if use xemacs; then cd "${S}/lisp-xemacs" - emake || die + emake fi =20 if use emacs; then cd "${S}/lisp" - emake || die + emake fi =20 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 =20 if use emacs || use xemacs; then cd "${S}/lisp" - emake pdf || die + emake pdf fi fi } =20 src_install () { - emake DESTDIR=3D"${D}" install || die + emake DESTDIR=3D"${D}" install =20 if use xemacs; then cd "${S}/lisp-xemacs" - emake DESTDIR=3D"${D}" install || die + emake DESTDIR=3D"${D}" install fi =20 if use emacs; then cd "${S}/lisp" - emake DESTDIR=3D"${D}" install || die + emake DESTDIR=3D"${D}" install # info-look* is included with >=3Demacs-21 rm -f "${ED}${SITELISP}/${PN}"/info-look* =20 @@ -206,7 +205,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