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

[Christoph Junghans]

commit:     174d53ce1e50d6d95f66ba9625d46361735fd550
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 22 09:55:42 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sat Mar 22 22:02:03 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=174d53ce

Don't install Emacs support files as the they have been removed from the CVS trunk, and the ones included with 4.6 are outdated, bug 504354.

Package-Manager: portage-2.2.8-r1

---
 sci-visualization/gnuplot/ChangeLog               |  7 ++-
 sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild | 64 +++--------------------
 sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild | 47 ++---------------
 3 files changed, 18 insertions(+), 100 deletions(-)

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 539d7ec..5d9f363 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-visualization/gnuplot
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Mar 2014; Ulrich Müller <ulm@g.o> gnuplot-4.6.9999.ebuild,
+  gnuplot-4.7.9999.ebuild:
+  Don't install Emacs support files as the they have been removed from the CVS
+  trunk, and the ones included with 4.6 are outdated, bug 504354.
+
   14 Jul 2013; Christoph Junghans <ottxor@g.o> gnuplot-4.7.9999.ebuild:
   build of info file broke again, drop it, will be shipped in the release anyhow
 

diff --git a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
index b0a6152..9330bba 100644
--- a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit elisp-common eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
+inherit eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
 
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
@@ -24,19 +24,15 @@ else
 		mirror://gentoo/${PN}.info-4.6.2.tar.xz"
 fi
 
-LICENSE="gnuplot GPL-2 bitmap? ( free-noncomm )"
+LICENSE="gnuplot bitmap? ( free-noncomm )"
 SLOT="0"
 KEYWORDS=""
-IUSE="aqua bitmap cairo doc emacs examples +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
+IUSE="aqua bitmap cairo doc examples +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X"
 
 RDEPEND="
 	cairo? (
 		x11-libs/cairo
 		x11-libs/pango )
-	emacs? ( virtual/emacs )
-	!emacs? ( xemacs? (
-		app-editors/xemacs
-		app-xemacs/xemacs-base ) )
 	gd? ( >=media-libs/gd-2.0.35-r3[png] )
 	ggi? ( media-libs/libggi )
 	latex? (
@@ -62,14 +58,7 @@ DEPEND="${RDEPEND}
 	doc? (
 		virtual/latex-base
 		dev-texlive/texlive-latexextra
-		app-text/ghostscript-gpl )
-	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
-
-if [[ -z ${PV%%*9999} ]]; then
-	# The live ebuild always needs an Emacs for building of gnuplot.texi
-	DEPEND="${DEPEND}
-	|| ( virtual/emacs app-xemacs/texinfo )"
-fi
+		app-text/ghostscript-gpl )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -124,34 +113,11 @@ src_configure() {
 
 	tc-export CC CXX			#453174
 
-	local emacs lispdir
-	if use emacs; then
-		emacs=emacs
-		lispdir="${EPREFIX}${SITELISP}/${PN}"
-		use xemacs \
-			&& ewarn "USE flag \"xemacs\" ignored (superseded by \"emacs\")"
-	elif use xemacs; then
-		emacs=xemacs
-		lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/${PN}"
-	else
-		emacs=no
-		lispdir=""
-		if [[ -z ${PV%%*9999} ]]; then
-			# 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
-			# for emacs != no gnuplot will install lisp files in 
-			# ${lispdir}/ which will / for emtpy lispdir
-			lispdir="${T}"
-		fi
-	fi
-
 	econf \
 		--without-pdf \
 		--with-texdir="${TEXMF}/tex/latex/${PN}" \
 		--with-readline=$(usex readline gnu builtin) \
-		--with-lispdir="${lispdir}" \
-		--with$([[ -z ${lispdir} ]] && echo out)-lisp-files \
+		--without-lisp-files \
 		$(use_with bitmap bitmap-terminals) \
 		$(use_with cairo) \
 		$(use_with doc tutorial) \
@@ -167,7 +133,7 @@ src_configure() {
 		$(use_enable thin-splines) \
 		$(use_enable wxwidgets) \
 		DIST_CONTACT="http://bugs.gentoo.org/" \
-		EMACS="${emacs}"
+		EMACS=no
 }
 
 src_compile() {
@@ -178,27 +144,19 @@ src_compile() {
 	# In case of problems file a bug report at bugs.gentoo.org.
 	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
 
-	emake all info
+	emake all
 
 	if use doc; then
 		# Avoid sandbox violation in epstopdf/ghostscript
 		addpredict /var/cache/fontconfig
 		emake -C docs pdf
 		emake -C tutorial pdf
-		use emacs || use xemacs && emake -C lisp pdf
 	fi
 }
 
 src_install () {
 	emake DESTDIR="${D}" install
 
-	if use emacs; then
-		# Gentoo Emacs site-lisp configuration
-		echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE}
-		sed '/^;; move/,+3 d' lisp/dotemacs >> ${E_SITEFILE} || die
-		elisp-site-file-install ${E_SITEFILE} || die
-	fi
-
 	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
 	newdoc term/PostScript/README README-ps
 	newdoc term/js/README README-js
@@ -220,12 +178,6 @@ src_install () {
 		docinto psdoc
 		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
 	fi
-
-	if use emacs || use xemacs; then
-		docinto emacs
-		dodoc lisp/ChangeLog lisp/README
-		use doc && dodoc lisp/gpelcard.pdf
-	fi
 }
 
 src_test() {
@@ -233,12 +185,10 @@ src_test() {
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	use latex && texmf-update
 	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
-	use emacs && elisp-site-regen
 	use latex && texmf-update
 }

diff --git a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
index 8eccbc4..f5ff014 100644
--- a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit elisp-common eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
+inherit eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
 
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
@@ -23,19 +23,15 @@ else
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
 fi
 
-LICENSE="gnuplot GPL-2 bitmap? ( free-noncomm )"
+LICENSE="gnuplot bitmap? ( free-noncomm )"
 SLOT="0"
 KEYWORDS=""
-IUSE="aqua bitmap cairo doc emacs examples +gd ggi latex lua qt4 readline svga thin-splines wxwidgets X xemacs"
+IUSE="aqua bitmap cairo doc examples +gd ggi latex lua qt4 readline svga thin-splines wxwidgets X"
 
 RDEPEND="
 	cairo? (
 		x11-libs/cairo
 		x11-libs/pango )
-	emacs? ( virtual/emacs )
-	!emacs? ( xemacs? (
-		app-editors/xemacs
-		app-xemacs/xemacs-base ) )
 	gd? ( >=media-libs/gd-2.0.35-r3[png] )
 	ggi? ( media-libs/libggi )
 	latex? (
@@ -60,8 +56,7 @@ DEPEND="${RDEPEND}
 	doc? (
 		virtual/latex-base
 		dev-texlive/texlive-latexextra
-		app-text/ghostscript-gpl )
-	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
+		app-text/ghostscript-gpl )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -113,26 +108,10 @@ src_configure() {
 
 	tc-export CC CXX			#453174
 
-	local emacs lispdir
-	if use emacs; then
-		emacs=emacs
-		lispdir="${EPREFIX}${SITELISP}/${PN}"
-		use xemacs \
-			&& ewarn "USE flag \"xemacs\" ignored (superseded by \"emacs\")"
-	elif use xemacs; then
-		emacs=xemacs
-		lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/${PN}"
-	else
-		emacs=no
-		lispdir=""
-	fi
-
 	econf \
 		--without-pdf \
 		--with-texdir="${TEXMF}/tex/latex/${PN}" \
 		--with-readline=$(usex readline gnu builtin) \
-		--with-lispdir="${lispdir}" \
-		--with$([[ -z ${lispdir} ]] && echo out)-lisp-files \
 		$(use_with bitmap bitmap-terminals) \
 		$(use_with cairo) \
 		$(use_with doc tutorial) \
@@ -147,7 +126,7 @@ src_configure() {
 		$(use_enable thin-splines) \
 		$(use_enable wxwidgets) \
 		DIST_CONTACT="http://bugs.gentoo.org/" \
-		EMACS="${emacs}"
+		EMACS=no
 }
 
 src_compile() {
@@ -165,20 +144,12 @@ src_compile() {
 		addpredict /var/cache/fontconfig
 		emake -C docs pdf
 		emake -C tutorial pdf
-		use emacs || use xemacs && emake -C lisp pdf
 	fi
 }
 
 src_install () {
 	emake DESTDIR="${D}" install
 
-	if use emacs; then
-		# Gentoo Emacs site-lisp configuration
-		echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE}
-		sed '/^;; move/,+3 d' lisp/dotemacs >> ${E_SITEFILE} || die
-		elisp-site-file-install ${E_SITEFILE} || die
-	fi
-
 	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
 	newdoc term/PostScript/README README-ps
 	newdoc term/js/README README-js
@@ -200,12 +171,6 @@ src_install () {
 		docinto psdoc
 		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
 	fi
-
-	if use emacs || use xemacs; then
-		docinto emacs
-		dodoc lisp/ChangeLog lisp/README
-		use doc && dodoc lisp/gpelcard.pdf
-	fi
 }
 
 src_test() {
@@ -213,12 +178,10 @@ src_test() {
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	use latex && texmf-update
 	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
-	use emacs && elisp-site-regen
 	use latex && texmf-update
 }