[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: Mon, 10 Dec 2012 03:30:14 +0000 (UTC)	[thread overview]
Message-ID: <1355110247.81d6373d635372bdce820b3bfbca99dbcb4916ad.kleiner_otti@gentoo> (raw)

commit:     81d6373d635372bdce820b3bfbca99dbcb4916ad
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 10 03:30:47 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Mon Dec 10 03:30:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=81d6373d

updated + fix for bug #444526

Package-Manager: portage-2.2.0_alpha145

---
 sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild |    6 +-
 sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild |   64 ++++-----------------
 2 files changed, 15 insertions(+), 55 deletions(-)

diff --git a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
index d0ec7f6..7539b03 100644
--- a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnuplot.info/"
 
 if [[ -z ${PV%%*9999} ]]; then
 	inherit autotools cvs
-	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
+	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot/gnuplot"
 	ECVS_MODULE="gnuplot"
 	ECVS_BRANCH="branch-4-6-stable"
 	ECVS_USER="anonymous"
@@ -58,7 +58,7 @@ RDEPEND="
 		app-editors/xemacs
 		app-xemacs/xemacs-base )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	virtual/pkgconfig
 	doc? (
 		virtual/latex-base
 		dev-texlive/texlive-latexextra
@@ -204,7 +204,7 @@ src_install () {
 	fi
 
 	cd "${S}"
-	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README* TODO
+	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
 	newdoc term/PostScript/README README-ps
 	newdoc term/js/README README-js
 	use lua && newdoc term/lua/README README-lua

diff --git a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
index afaa424..bede5f3 100644
--- a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnuplot.info/"
 
 if [[ -z ${PV%%*9999} ]]; then
 	inherit autotools cvs
-	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
+	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot/gnuplot"
 	ECVS_MODULE="gnuplot"
 	ECVS_BRANCH="HEAD"
 	ECVS_USER="anonymous"
@@ -26,7 +26,7 @@ fi
 LICENSE="gnuplot GPL-2 bitmap? ( free-noncomm )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bitmap cairo doc emacs examples +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
+IUSE="bitmap cairo doc emacs examples +gd ggi latex lua qt4 readline svga thin-splines wxwidgets X"
 RESTRICT="wxwidgets? ( test )"
 
 RDEPEND="
@@ -42,7 +42,6 @@ RDEPEND="
 			dev-tex/pgf
 			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
 	lua? ( dev-lang/lua )
-	plotutils? ( media-libs/plotutils )
 	qt4? ( >=x11-libs/qt-core-4.5
 		>=x11-libs/qt-gui-4.5
 		>=x11-libs/qt-svg-4.5 )
@@ -53,22 +52,17 @@ RDEPEND="
 		x11-libs/cairo
 		x11-libs/pango
 		x11-libs/gtk+:2 )
-	X? ( x11-libs/libXaw )
-	xemacs? (
-		app-editors/xemacs
-		app-xemacs/xemacs-base )"
+	X? ( x11-libs/libXaw )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	virtual/pkgconfig
 	doc? (
 		virtual/latex-base
 		dev-texlive/texlive-latexextra
-		app-text/ghostscript-gpl )
-	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
+		app-text/ghostscript-gpl )"
 
 if [[ -z ${PV%%*9999} ]]; then
 	# The live ebuild always needs an Emacs for building of gnuplot.texi
-	DEPEND="${DEPEND}
-	!emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
+	DEPEND="${DEPEND} virtual/emacs"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -103,6 +97,7 @@ src_configure() {
 
 	local myconf
 	myconf="${myconf} --with-lisp-files" #need to build info file
+	myconf="${myconf} --with-lispdir=${EPREFIX}${SITELISP}/${PN}"
 	myconf="${myconf} --without-pdf"
 	myconf="${myconf} --enable-stats" #extra command save to be enabled
 	myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}"
@@ -113,7 +108,6 @@ src_configure() {
 	myconf="${myconf} $(use_with ggi ggi ${EPREFIX}/usr/$(get_libdir))"
 	myconf="${myconf} $(use_with ggi xmi ${EPREFIX}/usr/$(get_libdir))"
 	myconf="${myconf} $(use_with lua)"
-	myconf="${myconf} $(use_with plotutils plot "${EPREFIX}"/usr/$(get_libdir))"
 	myconf="${myconf} $(use_with svga linux-vga)"
 	myconf="${myconf} $(use_enable thin-splines)"
 	myconf="${myconf} $(use_enable wxwidgets)"
@@ -123,29 +117,13 @@ src_configure() {
 		&& myconf="${myconf} --with-readline=gnu" \
 		|| myconf="${myconf} --with-readline=builtin"
 
-	local emacs=$(usev emacs || usev xemacs || echo no)
-	if [[ -z ${PV%%*9999} && ${emacs} = no ]]; then
+	local emacs=$(usev emacs || echo no)
 		# Live ebuild needs an Emacs to build gnuplot.texi
-		if has_version virtual/emacs; then emacs=emacs
-		elif has_version app-xemacs/texinfo; then emacs=xemacs; fi
-	fi
+	[[ -z ${PV%%*9999} ]] && emacs=emacs
 
 	econf ${myconf} \
 		DIST_CONTACT="http://bugs.gentoo.org/" \
 		EMACS=${emacs}
-
-	if use xemacs; then
-		einfo "Configuring gnuplot-mode for XEmacs ..."
-		use emacs && cp -Rp lisp lisp-xemacs || ln -s lisp lisp-xemacs
-		cd "${S}/lisp-xemacs"
-		econf --with-lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/${PN}" EMACS=xemacs
-	fi
-
-	if use emacs; then
-		einfo "Configuring gnuplot-mode for GNU Emacs ..."
-		cd "${S}/lisp"
-		econf --with-lispdir="${EPREFIX}${SITELISP}/${PN}" EMACS=emacs
-	fi
 }
 
 src_compile() {
@@ -158,16 +136,6 @@ src_compile() {
 
 	emake all info
 
-	if use xemacs; then
-		cd "${S}/lisp-xemacs"
-		emake
-	fi
-
-	if use emacs; then
-		cd "${S}/lisp"
-		emake
-	fi
-
 	if use doc; then
 		# Avoid sandbox violation in epstopdf/ghostscript
 		addpredict /var/cache/fontconfig
@@ -176,7 +144,7 @@ src_compile() {
 		cd "${S}/tutorial"
 		emake pdf
 
-		if use emacs || use xemacs; then
+		if use emacs; then
 			cd "${S}/lisp"
 			emake pdf
 		fi
@@ -185,22 +153,14 @@ src_compile() {
 
 src_install () {
 	emake DESTDIR="${D}" install install-info
-	rm -rf "${D}"/usr/share/emacs #handled by use {,x}emacs below
-
-	if use xemacs; then
-		cd "${S}/lisp-xemacs"
-		emake DESTDIR="${D}" install
-	fi
 
 	if use emacs; then
-		cd "${S}/lisp"
-		emake DESTDIR="${D}" install
 		# info-look* is included with >=emacs-21
 		rm -f "${ED}${SITELISP}/${PN}"/info-look*
 
 		# Gentoo emacs site-lisp configuration
 		echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE}
-		sed '/^;; move/,+3 d' dotemacs >> ${E_SITEFILE} || die
+		sed '/^;; move/,+3 d' "${S}"/lisp/dotemacs >> ${E_SITEFILE} || die
 		elisp-site-file-install ${E_SITEFILE} || die
 	fi
 
@@ -229,7 +189,7 @@ src_install () {
 		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
 	fi
 
-	if use emacs || use xemacs; then
+	if use emacs; then
 		docinto emacs
 		dodoc lisp/ChangeLog lisp/README
 		use doc && dodoc lisp/gpelcard.pdf

next             reply	other threads:[~2012-12-10  3:30 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-10  3:30 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-06-07  6:30 Christoph Junghans
2012-03-14  2:00 Christoph Junghans
2012-01-28  3:28 Christoph Junghans
2012-01-27  3:22 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:d0ec7f6 dfblob:7539b03 dfblob:afaa424 dfblob:bede5f3 )
 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=1355110247.81d6373d635372bdce820b3bfbca99dbcb4916ad.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