[gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Christoph Junghans" <kleiner_otti@gmx.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
Date: Fri, 27 Jan 2012 03:22:37 +0000 (UTC)	[thread overview]
Message-ID: <3ebd33d9734fa79fb002860828493c7754a98166.kleiner_otti@gentoo> (raw)

commit:     3ebd33d9734fa79fb002860828493c7754a98166
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 03:22:05 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Fri Jan 27 03:22:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3ebd33d9

version bump

(Portage version: 2.2.0_alpha84/git/Linux i686, unsigned Manifest commit)

---
 sci-visualization/gnuplot/ChangeLog                |    9 +++++-
 ...lot-4.5.9999.ebuild => gnuplot-4.6.9999.ebuild} |   31 +++++++++----------
 ...lot-4.5.9999.ebuild => gnuplot-4.7.9999.ebuild} |   29 +++++++++---------
 3 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/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: $
 
+*gnuplot-4.7.9999 (27 Jan 2012)
+*gnuplot-4.6.9999 (27 Jan 2012)
+
+  27 Jan 2012; Christoph Junghans <ottxor@gentoo.org> -gnuplot-4.5.9999.ebuild,
+  +gnuplot-4.6.9999.ebuild, +gnuplot-4.7.9999.ebuild:
+  version bump
+
   03 Nov 2011; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.4.9999.ebuild,
   gnuplot-4.5.9999.ebuild:
   Live ebuild updates

diff --git a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild b/sci-visualization/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: $
 
-EAPI=3
+EAPI=4
 
 inherit elisp-common multilib wxwidgets
 
@@ -13,13 +13,13 @@ if [[ -z ${PV%%*9999} ]]; then
 	inherit autotools cvs
 	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
 	ECVS_MODULE="gnuplot"
-	ECVS_BRANCH="HEAD"
+	ECVS_BRANCH="branch-4-6-stable"
 	ECVS_USER="anonymous"
 	ECVS_CVS_OPTIONS="-dP"
 	MY_P="${PN}"
 	SRC_URI=""
 else
-	MY_P="${P/_/-}"
+	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
 fi
 
@@ -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
 
-	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*
 
@@ -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-visualization/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: $
 
-EAPI=3
+EAPI=4
 
 inherit elisp-common multilib wxwidgets
 
@@ -19,7 +19,7 @@ if [[ -z ${PV%%*9999} ]]; then
 	MY_P="${PN}"
 	SRC_URI=""
 else
-	MY_P="${P/_/-}"
+	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
 fi
 
@@ -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
 
-	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*
 
@@ -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

next             reply	other threads:[~2012-01-27  3:22 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-27  3:22 Christoph Junghans [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-06-10 16:09 [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/ Andreas Hüttel
2016-02-11  9:11 Justin Lecher
2015-12-18 21:09 Christoph Junghans
2015-09-23 12:48 Justin Lecher
2015-05-25 23:02 Christoph Junghans
2015-05-25 23:02 Christoph Junghans
2014-11-08 20:48 Christoph Junghans
2014-09-16 22:09 Christoph Junghans
2014-09-08 20:31 Christoph Junghans
2014-07-14  0:46 Christoph Junghans
2014-07-13 20:19 Christoph Junghans
2014-03-22 23:31 Christoph Junghans
2014-03-22 23:31 Christoph Junghans
2013-07-14 17:05 Christoph Junghans
2013-06-19  5:29 Christoph Junghans
2013-06-14 11:21 Justin Lecher
2013-04-22  1:39 Christoph Junghans
2013-03-12 20:30 Christoph Junghans
2013-03-07 22:15 Christoph Junghans
2012-12-23  0:28 Christoph Junghans
2012-12-10  3:30 Christoph Junghans
2012-06-07  6:30 Christoph Junghans
2012-03-14  2:00 Christoph Junghans
2012-01-28  3:28 Christoph Junghans
2011-11-03 23:24 Christoph Junghans
2011-07-16 17:00 Justin Lecher
2011-05-28 13:09 Christoph Junghans
2011-05-28 13:09 Christoph Junghans
2011-05-08 14:47 Christoph Junghans
2011-02-23 19:44 Christoph Junghans
2011-02-22 21:27 Christoph Junghans

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:5ea94a5 dfblob:6d0b375 dfblob:1c302db dfblob:3153e2f
dfblob:1c302db dfblob:af41315 )
 OR (
bs:"[gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3ebd33d9734fa79fb002860828493c7754a98166.kleiner_otti@gentoo \
    --to=kleiner_otti@gmx.de \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox