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: Tue, 22 Feb 2011 21:27:30 +0000 (UTC) [thread overview]
Message-ID: <d61fbda324953e661a27e2d4a72a1e71dbf5714d.kleiner_otti@gentoo> (raw)
commit: d61fbda324953e661a27e2d4a72a1e71dbf5714d
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 21:37:41 2011 +0000
Commit: Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Tue Feb 22 21:37:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d61fbda3
[sci-visualization/gnuplot] removed pdf use flag + bump to EAPI=3
(Portage version: 2.1.9.25/git/Linux i686, signed Manifest commit with key C2000586)
---
sci-visualization/gnuplot/ChangeLog | 6 +++-
sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild | 37 ++++++++++-----------
sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild | 36 +++++++++-----------
3 files changed, 40 insertions(+), 39 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 4d124d3..3b647c1 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for sci-visualization/gnuplot
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 Feb 2011; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.4.9999.ebuild,
+ gnuplot-4.5.9999.ebuild:
+ removed pdf use flag + bump to EAPI=3
+
20 Mar 2010; Christoph Junghans <kleiner_otti@gmx.de>
-files/gnuplot-4.2.2-disable_texi_generation.patch,
-gnuplot-4.4.0_rc1.ebuild, -files/gnuplot-4.4.0_rc1-app-defaults.patch,
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
index 770a887..9c29c61 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild,v 1.1 2010/03/14 14:37:17 ulm Exp $
+# $Header: $
-EAPI=2
+EAPI=3
inherit autotools cvs elisp-common multilib wxwidgets
@@ -17,14 +17,14 @@ ECVS_CVS_OPTIONS="-dP"
LICENSE="gnuplot GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
-IUSE="cairo doc emacs +gd ggi latex lua pdf plotutils readline svga thin-splines wxwidgets X xemacs"
+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="cairo doc emacs +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs"
+
RESTRICT="wxwidgets? ( test )"
RDEPEND="!app-emacs/gnuplot-mode
cairo? ( x11-libs/cairo
- x11-libs/pango
- >=x11-libs/gtk+-2.8 )
+ x11-libs/pango )
emacs? ( virtual/emacs )
gd? ( media-libs/gd[png] )
ggi? ( media-libs/libggi )
@@ -32,14 +32,13 @@ RDEPEND="!app-emacs/gnuplot-mode
lua? ( dev-tex/pgf
>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
lua? ( dev-lang/lua )
- pdf? ( media-libs/pdflib )
plotutils? ( media-libs/plotutils )
readline? ( sys-libs/readline )
svga? ( media-libs/svgalib )
wxwidgets? ( x11-libs/wxGTK:2.8[X]
x11-libs/cairo
x11-libs/pango
- >=x11-libs/gtk+-2.8 )
+ >=x11-libs/gtk+-2.8:2 )
X? ( x11-libs/libXaw )
xemacs? ( app-editors/xemacs
app-xemacs/xemacs-base
@@ -52,7 +51,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${PN}"
GP_VERSION="${PV%.*}"
E_SITEFILE="50${PN}-gentoo.el"
-TEXMF="/usr/share/texmf-site"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
src_prepare() {
local dir
@@ -80,15 +79,15 @@ src_configure() {
local myconf
myconf="${myconf} --without-lisp-files"
+ myconf="${myconf} --without-pdf"
myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}"
myconf="${myconf} $(use_with cairo)"
myconf="${myconf} $(use_with doc tutorial)"
myconf="${myconf} $(use_with gd)"
- myconf="${myconf} $(use_with ggi ggi /usr/$(get_libdir))"
- myconf="${myconf} $(use_with ggi xmi /usr/$(get_libdir))"
+ 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 pdf pdf /usr/$(get_libdir))"
- myconf="${myconf} $(use_with plotutils plot /usr/$(get_libdir))"
+ 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)"
@@ -103,13 +102,13 @@ src_configure() {
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="/usr/lib/xemacs/site-packages/${PN}" EMACS=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="${SITELISP}/${PN}" EMACS=emacs
+ econf --with-lispdir="${EPREFIX}${SITELISP}/${PN}" EMACS=emacs
fi
}
@@ -161,7 +160,7 @@ src_install () {
cd "${S}/lisp"
emake DESTDIR="${D}" install || die
# info-look* is included with >=emacs-21
- rm -f "${D}${SITELISP}/${PN}"/info-look*
+ rm -f "${ED}${SITELISP}/${PN}"/info-look*
# Gentoo emacs site-lisp configuration
echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE}
@@ -179,8 +178,8 @@ src_install () {
# Demo files
insinto /usr/share/${PN}/${GP_VERSION}
doins -r demo || die
- rm -f "${D}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
- rm -f "${D}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+ rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+ rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
# Manual
dodoc docs/gnuplot.pdf
# Tutorial
diff --git a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
index 879865b..7d4a575 100644
--- a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild,v 1.1 2010/03/14 14:37:17 ulm Exp $
+# $Header: $
-EAPI=2
+EAPI=3
inherit autotools cvs elisp-common multilib wxwidgets
@@ -17,14 +17,13 @@ ECVS_CVS_OPTIONS="-dP"
LICENSE="gnuplot GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo doc emacs +gd ggi latex lua pdf plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
+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="cairo doc emacs +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
RESTRICT="wxwidgets? ( test )"
RDEPEND="!app-emacs/gnuplot-mode
cairo? ( x11-libs/cairo
- x11-libs/pango
- >=x11-libs/gtk+-2.8 )
+ x11-libs/pango )
emacs? ( virtual/emacs )
gd? ( media-libs/gd[png] )
ggi? ( media-libs/libggi )
@@ -32,7 +31,6 @@ RDEPEND="!app-emacs/gnuplot-mode
lua? ( dev-tex/pgf
>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
lua? ( dev-lang/lua )
- pdf? ( media-libs/pdflib )
plotutils? ( media-libs/plotutils )
qt4? ( >=x11-libs/qt-core-4.5
>=x11-libs/qt-gui-4.5
@@ -42,7 +40,7 @@ RDEPEND="!app-emacs/gnuplot-mode
wxwidgets? ( x11-libs/wxGTK:2.8[X]
x11-libs/cairo
x11-libs/pango
- >=x11-libs/gtk+-2.8 )
+ >=x11-libs/gtk+-2.8:2 )
X? ( x11-libs/libXaw )
xemacs? ( app-editors/xemacs
app-xemacs/xemacs-base
@@ -55,7 +53,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${PN}"
GP_VERSION="${PV%.*}"
E_SITEFILE="50${PN}-gentoo.el"
-TEXMF="/usr/share/texmf-site"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
src_prepare() {
local dir
@@ -83,15 +81,15 @@ src_configure() {
local myconf
myconf="${myconf} --without-lisp-files"
+ myconf="${myconf} --without-pdf"
myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}"
myconf="${myconf} $(use_with cairo)"
myconf="${myconf} $(use_with doc tutorial)"
myconf="${myconf} $(use_with gd)"
- myconf="${myconf} $(use_with ggi ggi /usr/$(get_libdir))"
- myconf="${myconf} $(use_with ggi xmi /usr/$(get_libdir))"
+ 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 pdf pdf /usr/$(get_libdir))"
- myconf="${myconf} $(use_with plotutils plot /usr/$(get_libdir))"
+ 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)"
@@ -107,13 +105,13 @@ src_configure() {
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="/usr/lib/xemacs/site-packages/${PN}" EMACS=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="${SITELISP}/${PN}" EMACS=emacs
+ econf --with-lispdir="${EPREFIX}${SITELISP}/${PN}" EMACS=emacs
fi
}
@@ -165,7 +163,7 @@ src_install () {
cd "${S}/lisp"
emake DESTDIR="${D}" install || die
# info-look* is included with >=emacs-21
- rm -f "${D}${SITELISP}/${PN}"/info-look*
+ rm -f "${ED}${SITELISP}/${PN}"/info-look*
# Gentoo emacs site-lisp configuration
echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE}
@@ -183,8 +181,8 @@ src_install () {
# Demo files
insinto /usr/share/${PN}/${GP_VERSION}
doins -r demo || die
- rm -f "${D}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
- rm -f "${D}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+ rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+ rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
# Manual
dodoc docs/gnuplot.pdf
# Tutorial
next reply other threads:[~2011-02-22 21:27 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-22 21:27 Christoph Junghans [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-02-23 19:44 [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/ Christoph Junghans
2011-05-08 14:47 Christoph Junghans
2011-05-28 13:09 Christoph Junghans
2011-05-28 13:09 Christoph Junghans
2011-07-16 17:00 Justin Lecher
2011-11-03 23:24 Christoph Junghans
2012-01-27 3:22 Christoph Junghans
2012-01-28 3:28 Christoph Junghans
2012-03-14 2:00 Christoph Junghans
2012-06-07 6:30 Christoph Junghans
2012-12-10 3:30 Christoph Junghans
2012-12-23 0:28 Christoph Junghans
2013-03-07 22:15 Christoph Junghans
2013-03-12 20:30 Christoph Junghans
2013-04-22 1:39 Christoph Junghans
2013-06-14 11:21 Justin Lecher
2013-06-19 5:29 Christoph Junghans
2013-07-14 17:05 Christoph Junghans
2014-03-22 23:31 Christoph Junghans
2014-03-22 23:31 Christoph Junghans
2014-07-13 20:19 Christoph Junghans
2014-07-14 0:46 Christoph Junghans
2014-09-08 20:31 Christoph Junghans
2014-09-16 22:09 Christoph Junghans
2014-11-08 20:48 Christoph Junghans
2015-05-25 23:02 Christoph Junghans
2015-05-25 23:02 Christoph Junghans
2015-09-23 12:48 Justin Lecher
2015-12-18 21:09 Christoph Junghans
2016-02-11 9:11 Justin Lecher
2016-06-10 16:09 Andreas Hüttel
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=d61fbda324953e661a27e2d4a72a1e71dbf5714d.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