* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2011-02-22 21:27 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2011-02-22 21:27 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2011-02-23 19:44 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2011-02-23 19:44 UTC (permalink / raw
To: gentoo-commits
commit: d2f9454becdc462c5a7818f4ce50fedb6b1f9b3b
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 19:55:11 2011 +0000
Commit: Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Wed Feb 23 19:55:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d2f9454b
[sci-visualization/gnuplot] updated deps
(Portage version: 2.1.9.25/git/Linux i686, signed Manifest commit with key C2000586)
---
sci-visualization/gnuplot/ChangeLog | 3 +++
sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild | 3 ++-
sci-visualization/gnuplot/metadata.xml | 16 ++++++++++------
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 3b647c1..3f06e47 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 23 Feb 2011; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.5.9999.ebuild:
+ updated deps
+
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
diff --git a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
index 7d4a575..d414079 100644
--- a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
@@ -48,7 +48,8 @@ RDEPEND="!app-emacs/gnuplot-mode
DEPEND="${RDEPEND}
dev-util/pkgconfig
doc? ( virtual/latex-base
- app-text/ghostscript-gpl )"
+ app-text/ghostscript-gpl )
+ virtual/emacs"
S="${WORKDIR}/${PN}"
GP_VERSION="${PV%.*}"
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index fa883bc..28c5899 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -3,12 +3,16 @@
<pkgmetadata>
<herd>sci</herd>
<maintainer>
- <email>kleiner_otti@gmx.de</email>
+ <email>ottxor@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
-<use>
- <flag name='gd'>Add support for <pkg>media-libs/gd</pkg>.
- Needed for GIF, JPEG, and PNG image output.</flag>
- <flag name='thin-splines'>Enable thin plate splines</flag>
-</use>
+ <maintainer>
+ <email>ulm@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name='gd'>Add support for <pkg>media-libs/gd</pkg>.
+ Needed for GIF, JPEG, and PNG image output.</flag>
+ <flag name='thin-splines'>Enable thin plate splines</flag>
+ <flag name='qt4'>Build Qt4 terminal</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2011-05-08 14:47 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2011-05-08 14:47 UTC (permalink / raw
To: gentoo-commits
commit: 3fba7c869869ae1359b7b4950755e07010d5fc3a
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 14:47:49 2011 +0000
Commit: Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sun May 8 14:47:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3fba7c86
[sci-visualization/gnuplot] sync with tree and bug #366129#c11
(Portage version: 2.1.9.42/git/Linux i686, signed Manifest commit with key C2000586)
---
sci-visualization/gnuplot/ChangeLog | 6 ++
...lot-4.4.9999.ebuild => gnuplot-4.4.3-r1.ebuild} | 63 +++++++++++++------
sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild | 63 +++++++++++++------
3 files changed, 92 insertions(+), 40 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 3f06e47..d13a5c0 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*gnuplot-4.4.3-r1 (08 May 2011)
+
+ 08 May 2011; Christoph Junghans <ottxor@gentoo.org> +gnuplot-4.4.3-r1.ebuild,
+ gnuplot-4.4.9999.ebuild:
+ sync with tree and bug #366129#c11
+
23 Feb 2011; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.5.9999.ebuild:
updated deps
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild
similarity index 81%
copy from sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
copy to sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild
index 9c29c61..be4fc1c 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild
@@ -4,16 +4,24 @@
EAPI=3
-inherit autotools cvs elisp-common multilib wxwidgets
+inherit elisp-common multilib wxwidgets
DESCRIPTION="Command-line driven interactive plotting program"
HOMEPAGE="http://www.gnuplot.info/"
-ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
-ECVS_MODULE="gnuplot"
-ECVS_BRANCH="branch-4-4-stable"
-ECVS_USER="anonymous"
-ECVS_CVS_OPTIONS="-dP"
+if [[ -z ${PV%%*9999} ]]; then
+ inherit autotools cvs
+ ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
+ ECVS_MODULE="gnuplot"
+ ECVS_BRANCH="branch-4-4-stable"
+ ECVS_USER="anonymous"
+ ECVS_CVS_OPTIONS="-dP"
+ MY_P="${PN}"
+ SRC_URI=""
+else
+ MY_P="${P/_/-}"
+ SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+fi
LICENSE="gnuplot GPL-2"
SLOT="0"
@@ -38,33 +46,35 @@ RDEPEND="!app-emacs/gnuplot-mode
wxwidgets? ( x11-libs/wxGTK:2.8[X]
x11-libs/cairo
x11-libs/pango
- >=x11-libs/gtk+-2.8:2 )
+ x11-libs/gtk+:2 )
X? ( x11-libs/libXaw )
xemacs? ( app-editors/xemacs
- app-xemacs/xemacs-base
- app-xemacs/texinfo )"
+ app-xemacs/xemacs-base )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
doc? ( virtual/latex-base
- app-text/ghostscript-gpl )"
+ app-text/ghostscript-gpl )
+ !emacs? ( xemacs? ( app-xemacs/texinfo ) )
+ !emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${MY_P}"
GP_VERSION="${PV%.*}"
E_SITEFILE="50${PN}-gentoo.el"
TEXMF="${EPREFIX}/usr/share/texmf-site"
src_prepare() {
- 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"
- done
+ 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"
+ done
+ eautoreconf
+ fi
# Add special version identification as required by provision 2
# of the gnuplot license
sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-
- eautoreconf
}
src_configure() {
@@ -96,7 +106,15 @@ src_configure() {
&& myconf="${myconf} --with-readline=gnu" \
|| myconf="${myconf} --with-readline=builtin"
- econf ${myconf} DIST_CONTACT="http://bugs.gentoo.org/"
+ if has_version virtual/emacs; then
+ emacs="emacs"
+ elif has_version app-xemacs/texinfo; then
+ emacs="xemacs"
+ fi
+
+ econf ${myconf} \
+ DIST_CONTACT="http://bugs.gentoo.org/" \
+ EMACS="${emacs}"
if use xemacs; then
einfo "Configuring gnuplot-mode for XEmacs ..."
@@ -121,7 +139,7 @@ src_compile() {
# example plots.
addwrite /dev/svga:/dev/mouse:/dev/tts/0
- emake || die
+ emake all info || die
if use xemacs; then
cd "${S}/lisp-xemacs"
@@ -202,7 +220,12 @@ pkg_postinst() {
use emacs && elisp-site-regen
use latex && texmf-update
+ einfo "Gnuplot no longer links against pdflib, see the ChangeLog for"
+ einfo "details. You can use the \"pdfcairo\" terminal for PDF output."
+ use cairo || einfo "It is available with USE=\"cairo\"."
+
if use svga; then
+ echo
einfo "In order to enable ordinary users to use SVGA console graphics"
einfo "gnuplot needs to be set up as setuid root. Please note that"
einfo "this is usually considered to be a security hazard."
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
index 9c29c61..be4fc1c 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
@@ -4,16 +4,24 @@
EAPI=3
-inherit autotools cvs elisp-common multilib wxwidgets
+inherit elisp-common multilib wxwidgets
DESCRIPTION="Command-line driven interactive plotting program"
HOMEPAGE="http://www.gnuplot.info/"
-ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
-ECVS_MODULE="gnuplot"
-ECVS_BRANCH="branch-4-4-stable"
-ECVS_USER="anonymous"
-ECVS_CVS_OPTIONS="-dP"
+if [[ -z ${PV%%*9999} ]]; then
+ inherit autotools cvs
+ ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
+ ECVS_MODULE="gnuplot"
+ ECVS_BRANCH="branch-4-4-stable"
+ ECVS_USER="anonymous"
+ ECVS_CVS_OPTIONS="-dP"
+ MY_P="${PN}"
+ SRC_URI=""
+else
+ MY_P="${P/_/-}"
+ SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+fi
LICENSE="gnuplot GPL-2"
SLOT="0"
@@ -38,33 +46,35 @@ RDEPEND="!app-emacs/gnuplot-mode
wxwidgets? ( x11-libs/wxGTK:2.8[X]
x11-libs/cairo
x11-libs/pango
- >=x11-libs/gtk+-2.8:2 )
+ x11-libs/gtk+:2 )
X? ( x11-libs/libXaw )
xemacs? ( app-editors/xemacs
- app-xemacs/xemacs-base
- app-xemacs/texinfo )"
+ app-xemacs/xemacs-base )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
doc? ( virtual/latex-base
- app-text/ghostscript-gpl )"
+ app-text/ghostscript-gpl )
+ !emacs? ( xemacs? ( app-xemacs/texinfo ) )
+ !emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${MY_P}"
GP_VERSION="${PV%.*}"
E_SITEFILE="50${PN}-gentoo.el"
TEXMF="${EPREFIX}/usr/share/texmf-site"
src_prepare() {
- 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"
- done
+ 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"
+ done
+ eautoreconf
+ fi
# Add special version identification as required by provision 2
# of the gnuplot license
sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-
- eautoreconf
}
src_configure() {
@@ -96,7 +106,15 @@ src_configure() {
&& myconf="${myconf} --with-readline=gnu" \
|| myconf="${myconf} --with-readline=builtin"
- econf ${myconf} DIST_CONTACT="http://bugs.gentoo.org/"
+ if has_version virtual/emacs; then
+ emacs="emacs"
+ elif has_version app-xemacs/texinfo; then
+ emacs="xemacs"
+ fi
+
+ econf ${myconf} \
+ DIST_CONTACT="http://bugs.gentoo.org/" \
+ EMACS="${emacs}"
if use xemacs; then
einfo "Configuring gnuplot-mode for XEmacs ..."
@@ -121,7 +139,7 @@ src_compile() {
# example plots.
addwrite /dev/svga:/dev/mouse:/dev/tts/0
- emake || die
+ emake all info || die
if use xemacs; then
cd "${S}/lisp-xemacs"
@@ -202,7 +220,12 @@ pkg_postinst() {
use emacs && elisp-site-regen
use latex && texmf-update
+ einfo "Gnuplot no longer links against pdflib, see the ChangeLog for"
+ einfo "details. You can use the \"pdfcairo\" terminal for PDF output."
+ use cairo || einfo "It is available with USE=\"cairo\"."
+
if use svga; then
+ echo
einfo "In order to enable ordinary users to use SVGA console graphics"
einfo "gnuplot needs to be set up as setuid root. Please note that"
einfo "this is usually considered to be a security hazard."
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2011-05-28 13:09 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2011-05-28 13:09 UTC (permalink / raw
To: gentoo-commits
commit: 0cb993816aeb680ca03eae50d3a4cf154ad56de9
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 12:56:09 2011 +0000
Commit: Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat May 28 12:56:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0cb99381
[sci-visualization/gnuplot] 4.4.3-r1 InCVS
(Portage version: 2.1.9.42/git/Linux i686, signed Manifest commit with key C2000586)
---
sci-visualization/gnuplot/ChangeLog | 4 +
sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild | 246 ---------------------
2 files changed, 4 insertions(+), 246 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index d13a5c0..127125b 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 28 May 2011; Christoph Junghans <ottxor@gentoo.org> -gnuplot-4.4.3-r1.ebuild,
+ metadata.xml:
+ InCVS
+
*gnuplot-4.4.3-r1 (08 May 2011)
08 May 2011; Christoph Junghans <ottxor@gentoo.org> +gnuplot-4.4.3-r1.ebuild,
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild
deleted file mode 100644
index be4fc1c..0000000
--- a/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit elisp-common multilib wxwidgets
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-
-if [[ -z ${PV%%*9999} ]]; then
- inherit autotools cvs
- ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
- ECVS_MODULE="gnuplot"
- ECVS_BRANCH="branch-4-4-stable"
- ECVS_USER="anonymous"
- ECVS_CVS_OPTIONS="-dP"
- MY_P="${PN}"
- SRC_URI=""
-else
- MY_P="${P/_/-}"
- SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-fi
-
-LICENSE="gnuplot GPL-2"
-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="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 )
- emacs? ( virtual/emacs )
- gd? ( media-libs/gd[png] )
- ggi? ( media-libs/libggi )
- latex? ( virtual/latex-base
- lua? ( dev-tex/pgf
- >=dev-texlive/texlive-latexrecommended-2008-r2 ) )
- lua? ( dev-lang/lua )
- 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 )
- X? ( x11-libs/libXaw )
- xemacs? ( app-editors/xemacs
- app-xemacs/xemacs-base )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- doc? ( virtual/latex-base
- app-text/ghostscript-gpl )
- !emacs? ( xemacs? ( app-xemacs/texinfo ) )
- !emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
-
-S="${WORKDIR}/${MY_P}"
-GP_VERSION="${PV%.*}"
-E_SITEFILE="50${PN}-gentoo.el"
-TEXMF="${EPREFIX}/usr/share/texmf-site"
-
-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"
- done
- eautoreconf
- fi
-
- # Add special version identification as required by provision 2
- # of the gnuplot license
- sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-}
-
-src_configure() {
- if ! use latex; then
- sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
- fi
-
- if use wxwidgets; then
- WX_GTK_VER="2.8"
- need-wxwidgets unicode
- fi
-
- 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 ${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)"
- myconf="${myconf} $(use_with X x)"
- use readline \
- && myconf="${myconf} --with-readline=gnu" \
- || myconf="${myconf} --with-readline=builtin"
-
- if has_version virtual/emacs; then
- emacs="emacs"
- elif has_version app-xemacs/texinfo; then
- emacs="xemacs"
- fi
-
- 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() {
- # Prevent access violations, see bug 201871
- VARTEXFONTS="${T}/fonts"
-
- # This is a hack to avoid sandbox violations when using the Linux console.
- # Creating the DVI and PDF tutorials require /dev/svga to build the
- # example plots.
- addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
- emake all info || die
-
- if use xemacs; then
- cd "${S}/lisp-xemacs"
- emake || die
- fi
-
- if use emacs; then
- cd "${S}/lisp"
- emake || die
- fi
-
- if use doc; then
- # Avoid sandbox violation in epstopdf/ghostscript
- addpredict /var/cache/fontconfig
- cd "${S}/docs"
- emake pdf || die
- cd "${S}/tutorial"
- emake pdf || die
-
- if use emacs || use xemacs; then
- cd "${S}/lisp"
- emake pdf || die
- fi
- fi
-}
-
-src_install () {
- emake DESTDIR="${D}" install || die
-
- if use xemacs; then
- cd "${S}/lisp-xemacs"
- emake DESTDIR="${D}" install || die
- fi
-
- if use emacs; then
- cd "${S}/lisp"
- emake DESTDIR="${D}" install || die
- # 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
- elisp-site-file-install ${E_SITEFILE} || die
- fi
-
- cd "${S}"
- dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README* TODO
- newdoc term/PostScript/README README-ps
- newdoc term/js/README README-js
- use lua && newdoc term/lua/README README-lua
-
- if use doc; then
- # Demo files
- insinto /usr/share/${PN}/${GP_VERSION}
- doins -r demo || die
- 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
- dodoc tutorial/{tutorial.dvi,tutorial.pdf}
- # FAQ
- dodoc FAQ.pdf
- # Documentation for making PostScript files
- 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
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- use latex && texmf-update
-
- einfo "Gnuplot no longer links against pdflib, see the ChangeLog for"
- einfo "details. You can use the \"pdfcairo\" terminal for PDF output."
- use cairo || einfo "It is available with USE=\"cairo\"."
-
- if use svga; then
- echo
- einfo "In order to enable ordinary users to use SVGA console graphics"
- einfo "gnuplot needs to be set up as setuid root. Please note that"
- einfo "this is usually considered to be a security hazard."
- einfo "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
- fi
- if use gd; then
- echo
- einfo "For font support in png/jpeg/gif output, you may have to"
- einfo "set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT environment"
- einfo "variables. See the FAQ file in /usr/share/doc/${PF}/"
- einfo "for more information."
- fi
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- use latex && texmf-update
-}
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2011-05-28 13:09 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2011-05-28 13:09 UTC (permalink / raw
To: gentoo-commits
commit: f71bb2df52c781cb3eb58a955316dc8bb9fe43a9
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 13:09:13 2011 +0000
Commit: Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat May 28 13:09:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f71bb2df
[sci-visualization/gnuplot] sync with tree
(Portage version: 2.1.9.42/git/Linux i686, signed Manifest commit with key C2000586)
---
sci-visualization/gnuplot/ChangeLog | 3 +
sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild | 62 ++++++++++++++-------
2 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 127125b..2f2be4a 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 28 May 2011; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.5.9999.ebuild:
+ sync with tree
+
28 May 2011; Christoph Junghans <ottxor@gentoo.org> -gnuplot-4.4.3-r1.ebuild,
metadata.xml:
InCVS
diff --git a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
index d414079..3898887 100644
--- a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
@@ -4,16 +4,24 @@
EAPI=3
-inherit autotools cvs elisp-common multilib wxwidgets
+inherit elisp-common multilib wxwidgets
DESCRIPTION="Command-line driven interactive plotting program"
HOMEPAGE="http://www.gnuplot.info/"
-ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
-ECVS_MODULE="gnuplot"
-ECVS_BRANCH="HEAD"
-ECVS_USER="anonymous"
-ECVS_CVS_OPTIONS="-dP"
+if [[ -z ${PV%%*9999} ]]; then
+ inherit autotools cvs
+ ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
+ ECVS_MODULE="gnuplot"
+ ECVS_BRANCH="HEAD"
+ ECVS_USER="anonymous"
+ ECVS_CVS_OPTIONS="-dP"
+ MY_P="${PN}"
+ SRC_URI=""
+else
+ MY_P="${P/_/-}"
+ SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+fi
LICENSE="gnuplot GPL-2"
SLOT="0"
@@ -40,34 +48,35 @@ RDEPEND="!app-emacs/gnuplot-mode
wxwidgets? ( x11-libs/wxGTK:2.8[X]
x11-libs/cairo
x11-libs/pango
- >=x11-libs/gtk+-2.8:2 )
+ x11-libs/gtk+:2 )
X? ( x11-libs/libXaw )
xemacs? ( app-editors/xemacs
- app-xemacs/xemacs-base
- app-xemacs/texinfo )"
+ app-xemacs/xemacs-base )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
doc? ( virtual/latex-base
app-text/ghostscript-gpl )
- virtual/emacs"
+ !emacs? ( xemacs? ( app-xemacs/texinfo ) )
+ !emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${MY_P}"
GP_VERSION="${PV%.*}"
E_SITEFILE="50${PN}-gentoo.el"
TEXMF="${EPREFIX}/usr/share/texmf-site"
src_prepare() {
- 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"
- done
+ 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"
+ done
+ eautoreconf
+ fi
# Add special version identification as required by provision 2
# of the gnuplot license
sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-
- eautoreconf
}
src_configure() {
@@ -100,7 +109,15 @@ src_configure() {
&& myconf="${myconf} --with-readline=gnu" \
|| myconf="${myconf} --with-readline=builtin"
- econf ${myconf} DIST_CONTACT="http://bugs.gentoo.org/"
+ if has_version virtual/emacs; then
+ emacs="emacs"
+ elif has_version app-xemacs/texinfo; then
+ emacs="xemacs"
+ fi
+
+ econf ${myconf} \
+ DIST_CONTACT="http://bugs.gentoo.org/" \
+ EMACS="${emacs}"
if use xemacs; then
einfo "Configuring gnuplot-mode for XEmacs ..."
@@ -125,7 +142,7 @@ src_compile() {
# example plots.
addwrite /dev/svga:/dev/mouse:/dev/tts/0
- emake || die
+ emake all info || die
if use xemacs; then
cd "${S}/lisp-xemacs"
@@ -206,7 +223,12 @@ pkg_postinst() {
use emacs && elisp-site-regen
use latex && texmf-update
+ einfo "Gnuplot no longer links against pdflib, see the ChangeLog for"
+ einfo "details. You can use the \"pdfcairo\" terminal for PDF output."
+ use cairo || einfo "It is available with USE=\"cairo\"."
+
if use svga; then
+ echo
einfo "In order to enable ordinary users to use SVGA console graphics"
einfo "gnuplot needs to be set up as setuid root. Please note that"
einfo "this is usually considered to be a security hazard."
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2011-07-16 17:00 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2011-07-16 17:00 UTC (permalink / raw
To: gentoo-commits
commit: 0295cc2cae87bd65779222a6e2c954914d85a65c
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 16:59:40 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 16:59:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0295cc2c
Install demos through USE=examples, #374187
(Portage version: 2.2.0_alpha45/git/Linux x86_64, signed Manifest commit with key 70EB7916)
---
sci-visualization/gnuplot/ChangeLog | 4 ++
sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild | 32 +++++++++++++-------
sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild | 28 ++++++++++++------
sci-visualization/gnuplot/metadata.xml | 6 ++--
4 files changed, 47 insertions(+), 23 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 2f2be4a..d9daf85 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 16 Jul 2011; Justin Lecher <jlec@gentoo.org> gnuplot-4.4.9999.ebuild,
+ gnuplot-4.5.9999.ebuild, metadata.xml:
+ Install demos through USE=examples, #374187
+
28 May 2011; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.5.9999.ebuild:
sync with tree
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
index be4fc1c..3d9a9c1 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
@@ -26,38 +26,46 @@ fi
LICENSE="gnuplot GPL-2"
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="cairo doc emacs +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs"
+IUSE="cairo doc emacs examples +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs"
-RESTRICT="wxwidgets? ( test )"
-
-RDEPEND="!app-emacs/gnuplot-mode
- cairo? ( x11-libs/cairo
+RDEPEND="
+ !app-emacs/gnuplot-mode
+ cairo? (
+ x11-libs/cairo
x11-libs/pango )
emacs? ( virtual/emacs )
gd? ( media-libs/gd[png] )
ggi? ( media-libs/libggi )
- latex? ( virtual/latex-base
- lua? ( dev-tex/pgf
+ latex? (
+ virtual/latex-base
+ lua? (
+ dev-tex/pgf
>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
lua? ( dev-lang/lua )
plotutils? ( media-libs/plotutils )
readline? ( sys-libs/readline )
svga? ( media-libs/svgalib )
- wxwidgets? ( x11-libs/wxGTK:2.8[X]
+ wxwidgets? (
+ x11-libs/wxGTK:2.8[X]
x11-libs/cairo
x11-libs/pango
x11-libs/gtk+:2 )
X? ( x11-libs/libXaw )
- xemacs? ( app-editors/xemacs
+ xemacs? (
+ app-editors/xemacs
app-xemacs/xemacs-base )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
- doc? ( virtual/latex-base
+ doc? (
+ virtual/latex-base
app-text/ghostscript-gpl )
!emacs? ( xemacs? ( app-xemacs/texinfo ) )
!emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
+RESTRICT="wxwidgets? ( test )"
+
S="${WORKDIR}/${MY_P}"
+
GP_VERSION="${PV%.*}"
E_SITEFILE="50${PN}-gentoo.el"
TEXMF="${EPREFIX}/usr/share/texmf-site"
@@ -192,12 +200,14 @@ src_install () {
newdoc term/js/README README-js
use lua && newdoc term/lua/README README-lua
- if use doc; then
+ if use examples; then
# Demo files
insinto /usr/share/${PN}/${GP_VERSION}
doins -r demo || die
rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+ fi
+ if use doc; then
# 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 3898887..b1e1ea8 100644
--- a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
@@ -26,17 +26,21 @@ fi
LICENSE="gnuplot GPL-2"
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="cairo doc emacs +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
+IUSE="cairo doc emacs examples +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
+RDEPEND="
+ !app-emacs/gnuplot-mode
+ cairo? (
+ x11-libs/cairo
x11-libs/pango )
emacs? ( virtual/emacs )
gd? ( media-libs/gd[png] )
ggi? ( media-libs/libggi )
- latex? ( virtual/latex-base
- lua? ( dev-tex/pgf
+ latex? (
+ virtual/latex-base
+ lua? (
+ dev-tex/pgf
>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
lua? ( dev-lang/lua )
plotutils? ( media-libs/plotutils )
@@ -45,21 +49,25 @@ RDEPEND="!app-emacs/gnuplot-mode
>=x11-libs/qt-svg-4.5 )
readline? ( sys-libs/readline )
svga? ( media-libs/svgalib )
- wxwidgets? ( x11-libs/wxGTK:2.8[X]
+ wxwidgets? (
+ x11-libs/wxGTK:2.8[X]
x11-libs/cairo
x11-libs/pango
x11-libs/gtk+:2 )
X? ( x11-libs/libXaw )
- xemacs? ( app-editors/xemacs
+ xemacs? (
+ app-editors/xemacs
app-xemacs/xemacs-base )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
- doc? ( virtual/latex-base
+ doc? (
+ virtual/latex-base
app-text/ghostscript-gpl )
!emacs? ( xemacs? ( app-xemacs/texinfo ) )
!emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
S="${WORKDIR}/${MY_P}"
+
GP_VERSION="${PV%.*}"
E_SITEFILE="50${PN}-gentoo.el"
TEXMF="${EPREFIX}/usr/share/texmf-site"
@@ -195,12 +203,14 @@ src_install () {
newdoc term/js/README README-js
use lua && newdoc term/lua/README README-lua
- if use doc; then
+ if use examples; then
# Demo files
insinto /usr/share/${PN}/${GP_VERSION}
doins -r demo || die
rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+ fi
+ if use doc; then
# Manual
dodoc docs/gnuplot.pdf
# Tutorial
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index 28c5899..b66be8a 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -10,9 +10,9 @@
<email>ulm@gentoo.org</email>
</maintainer>
<use>
- <flag name='gd'>Add support for <pkg>media-libs/gd</pkg>.
+ <flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
Needed for GIF, JPEG, and PNG image output.</flag>
- <flag name='thin-splines'>Enable thin plate splines</flag>
- <flag name='qt4'>Build Qt4 terminal</flag>
+ <flag name="thin-splines">Enable thin plate splines</flag>
+ <flag name="qt4">Build Qt4 terminal</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2011-11-03 23:24 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2011-11-03 23:24 UTC (permalink / raw
To: gentoo-commits
commit: 3ecffc9ae3c6efc0623677dcf7416d566bf8b59c
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 3 23:16:30 2011 +0000
Commit: Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Thu Nov 3 23:16:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3ecffc9a
Live ebuild updates
(Portage version: 2.2.0_alpha72/git/Linux i686, signed Manifest commit with key C2000586)
---
sci-visualization/gnuplot/ChangeLog | 4 ++++
sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild | 1 -
sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index d9daf85..5ea94a5 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 03 Nov 2011; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.4.9999.ebuild,
+ gnuplot-4.5.9999.ebuild:
+ Live ebuild updates
+
16 Jul 2011; Justin Lecher <jlec@gentoo.org> gnuplot-4.4.9999.ebuild,
gnuplot-4.5.9999.ebuild, metadata.xml:
Install demos through USE=examples, #374187
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
index 3d9a9c1..0445bf3 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
@@ -29,7 +29,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd
IUSE="cairo doc emacs examples +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs"
RDEPEND="
- !app-emacs/gnuplot-mode
cairo? (
x11-libs/cairo
x11-libs/pango )
diff --git a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
index b1e1ea8..1c302db 100644
--- a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
@@ -30,7 +30,6 @@ IUSE="cairo doc emacs examples +gd ggi latex lua plotutils qt4 readline svga thi
RESTRICT="wxwidgets? ( test )"
RDEPEND="
- !app-emacs/gnuplot-mode
cairo? (
x11-libs/cairo
x11-libs/pango )
@@ -100,6 +99,7 @@ src_configure() {
local myconf
myconf="${myconf} --without-lisp-files"
myconf="${myconf} --without-pdf"
+ myconf="${myconf} --enable-stats" #extra command save to be enabled
myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}"
myconf="${myconf} $(use_with cairo)"
myconf="${myconf} $(use_with doc tutorial)"
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2012-01-27 3:22 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2012-01-27 3:22 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2012-01-28 3:28 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2012-01-28 3:28 UTC (permalink / raw
To: gentoo-commits
commit: 9cd99b68d1feffc7052442f06344ee188ea331ab
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 03:26:31 2012 +0000
Commit: Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Jan 28 03:26:31 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9cd99b68
sync with tree and bug #400999#c7
(Portage version: 2.2.0_alpha84/git/Linux i686, unsigned Manifest commit)
---
sci-visualization/gnuplot/ChangeLog | 4 ++
sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild | 42 ++++++++++++---------
sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild | 42 ++++++++++++---------
3 files changed, 52 insertions(+), 36 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 6d0b375..b149287 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 28 Jan 2012; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.6.9999.ebuild,
+ gnuplot-4.7.9999.ebuild:
+ sync with tree and bug #400999#c7
+
*gnuplot-4.7.9999 (27 Jan 2012)
*gnuplot-4.6.9999 (27 Jan 2012)
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
index 3153e2f..89556a7 100644
--- a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild,v 1.3 2012/01/27 16:05:06 ulm Exp $
EAPI=4
@@ -61,9 +61,15 @@ DEPEND="${RDEPEND}
dev-util/pkgconfig
doc? (
virtual/latex-base
+ dev-texlive/texlive-latexextra
app-text/ghostscript-gpl )
- !emacs? ( xemacs? ( app-xemacs/texinfo ) )
+ !emacs? ( xemacs? ( app-xemacs/texinfo ) )"
+
+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 ) ) )"
+fi
S="${WORKDIR}/${MY_P}"
@@ -116,15 +122,15 @@ src_configure() {
&& myconf="${myconf} --with-readline=gnu" \
|| myconf="${myconf} --with-readline=builtin"
- if has_version virtual/emacs; then
- emacs="emacs"
- elif has_version app-xemacs/texinfo; then
- emacs="xemacs"
+ local emacs=$(usev emacs || usev xemacs || echo no)
+ if [[ -z ${PV%%*9999} && ${emacs} = no ]]; then
+ #live ebuild needs an emacs to build texi
+ has_version virtual/emacs && emacs="emacs" || emacs="xemacs"
fi
econf ${myconf} \
DIST_CONTACT="http://bugs.gentoo.org/" \
- EMACS="${emacs}"
+ EMACS=${emacs}
if use xemacs; then
einfo "Configuring gnuplot-mode for XEmacs ..."
@@ -232,23 +238,23 @@ pkg_postinst() {
use emacs && elisp-site-regen
use latex && texmf-update
- einfo "Gnuplot no longer links against pdflib, see the ChangeLog for"
- einfo "details. You can use the \"pdfcairo\" terminal for PDF output."
- use cairo || einfo "It is available with USE=\"cairo\"."
+ elog "Gnuplot no longer links against pdflib, see the ChangeLog for"
+ elog "details. You can use the \"pdfcairo\" terminal for PDF output."
+ use cairo || elog "It is available with USE=\"cairo\"."
if use svga; then
echo
- einfo "In order to enable ordinary users to use SVGA console graphics"
- einfo "gnuplot needs to be set up as setuid root. Please note that"
- einfo "this is usually considered to be a security hazard."
- einfo "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
+ elog "In order to enable ordinary users to use SVGA console graphics"
+ elog "gnuplot needs to be set up as setuid root. Please note that"
+ elog "this is usually considered to be a security hazard."
+ elog "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
fi
if use gd; then
echo
- einfo "For font support in png/jpeg/gif output, you may have to"
- einfo "set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT environment"
- einfo "variables. See the FAQ file in /usr/share/doc/${PF}/"
- einfo "for more information."
+ elog "For font support in png/jpeg/gif output, you may have to"
+ elog "set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT environment"
+ elog "variables. See the FAQ file in /usr/share/doc/${PF}/"
+ elog "for more information."
fi
}
diff --git a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
index af41315..3cb5c17 100644
--- a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild,v 1.3 2012/01/27 16:05:06 ulm Exp $
EAPI=4
@@ -61,9 +61,15 @@ DEPEND="${RDEPEND}
dev-util/pkgconfig
doc? (
virtual/latex-base
+ dev-texlive/texlive-latexextra
app-text/ghostscript-gpl )
- !emacs? ( xemacs? ( app-xemacs/texinfo ) )
+ !emacs? ( xemacs? ( app-xemacs/texinfo ) )"
+
+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 ) ) )"
+fi
S="${WORKDIR}/${MY_P}"
@@ -116,15 +122,15 @@ src_configure() {
&& myconf="${myconf} --with-readline=gnu" \
|| myconf="${myconf} --with-readline=builtin"
- if has_version virtual/emacs; then
- emacs="emacs"
- elif has_version app-xemacs/texinfo; then
- emacs="xemacs"
+ local emacs=$(usev emacs || usev xemacs || echo no)
+ if [[ -z ${PV%%*9999} && ${emacs} = no ]]; then
+ #live ebuild needs an emacs to build texi
+ has_version virtual/emacs && emacs="emacs" || emacs="xemacs"
fi
econf ${myconf} \
DIST_CONTACT="http://bugs.gentoo.org/" \
- EMACS="${emacs}"
+ EMACS=${emacs}
if use xemacs; then
einfo "Configuring gnuplot-mode for XEmacs ..."
@@ -232,23 +238,23 @@ pkg_postinst() {
use emacs && elisp-site-regen
use latex && texmf-update
- einfo "Gnuplot no longer links against pdflib, see the ChangeLog for"
- einfo "details. You can use the \"pdfcairo\" terminal for PDF output."
- use cairo || einfo "It is available with USE=\"cairo\"."
+ elog "Gnuplot no longer links against pdflib, see the ChangeLog for"
+ elog "details. You can use the \"pdfcairo\" terminal for PDF output."
+ use cairo || elog "It is available with USE=\"cairo\"."
if use svga; then
echo
- einfo "In order to enable ordinary users to use SVGA console graphics"
- einfo "gnuplot needs to be set up as setuid root. Please note that"
- einfo "this is usually considered to be a security hazard."
- einfo "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
+ elog "In order to enable ordinary users to use SVGA console graphics"
+ elog "gnuplot needs to be set up as setuid root. Please note that"
+ elog "this is usually considered to be a security hazard."
+ elog "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
fi
if use gd; then
echo
- einfo "For font support in png/jpeg/gif output, you may have to"
- einfo "set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT environment"
- einfo "variables. See the FAQ file in /usr/share/doc/${PF}/"
- einfo "for more information."
+ elog "For font support in png/jpeg/gif output, you may have to"
+ elog "set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT environment"
+ elog "variables. See the FAQ file in /usr/share/doc/${PF}/"
+ elog "for more information."
fi
}
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2012-03-14 2:00 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2012-03-14 2:00 UTC (permalink / raw
To: gentoo-commits
commit: 287070533eedbc60be4ed24f0174c3fd1197b5eb
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 14 01:59:13 2012 +0000
Commit: Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Wed Mar 14 01:59:13 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=28707053
sci-visualization/gnuplot: clean up
(Portage version: 2.2.0_alpha90/git/Linux i686, unsigned Manifest commit)
---
sci-visualization/gnuplot/ChangeLog | 4 +
sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild | 255 ---------------------
sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild | 19 +-
sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild | 19 +-
sci-visualization/gnuplot/metadata.xml | 2 +-
5 files changed, 25 insertions(+), 274 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index b149287..fe614ea 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Mar 2012; Christoph Junghans <ottxor@gentoo.org> -gnuplot-4.4.9999.ebuild,
+ gnuplot-4.6.9999.ebuild, gnuplot-4.7.9999.ebuild, metadata.xml:
+ sci-visualization/gnuplot: clean up
+
28 Jan 2012; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.6.9999.ebuild,
gnuplot-4.7.9999.ebuild:
sync with tree and bug #400999#c7
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
deleted file mode 100644
index 0445bf3..0000000
--- a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit elisp-common multilib wxwidgets
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-
-if [[ -z ${PV%%*9999} ]]; then
- inherit autotools cvs
- ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
- ECVS_MODULE="gnuplot"
- ECVS_BRANCH="branch-4-4-stable"
- ECVS_USER="anonymous"
- ECVS_CVS_OPTIONS="-dP"
- MY_P="${PN}"
- SRC_URI=""
-else
- MY_P="${P/_/-}"
- SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-fi
-
-LICENSE="gnuplot GPL-2"
-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="cairo doc emacs examples +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs"
-
-RDEPEND="
- cairo? (
- x11-libs/cairo
- x11-libs/pango )
- emacs? ( virtual/emacs )
- gd? ( media-libs/gd[png] )
- ggi? ( media-libs/libggi )
- latex? (
- virtual/latex-base
- lua? (
- dev-tex/pgf
- >=dev-texlive/texlive-latexrecommended-2008-r2 ) )
- lua? ( dev-lang/lua )
- 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 )
- X? ( x11-libs/libXaw )
- xemacs? (
- app-editors/xemacs
- app-xemacs/xemacs-base )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- doc? (
- virtual/latex-base
- app-text/ghostscript-gpl )
- !emacs? ( xemacs? ( app-xemacs/texinfo ) )
- !emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
-
-RESTRICT="wxwidgets? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-GP_VERSION="${PV%.*}"
-E_SITEFILE="50${PN}-gentoo.el"
-TEXMF="${EPREFIX}/usr/share/texmf-site"
-
-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"
- done
- eautoreconf
- fi
-
- # Add special version identification as required by provision 2
- # of the gnuplot license
- sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-}
-
-src_configure() {
- if ! use latex; then
- sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
- fi
-
- if use wxwidgets; then
- WX_GTK_VER="2.8"
- need-wxwidgets unicode
- fi
-
- 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 ${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)"
- myconf="${myconf} $(use_with X x)"
- use readline \
- && myconf="${myconf} --with-readline=gnu" \
- || myconf="${myconf} --with-readline=builtin"
-
- if has_version virtual/emacs; then
- emacs="emacs"
- elif has_version app-xemacs/texinfo; then
- emacs="xemacs"
- fi
-
- 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() {
- # Prevent access violations, see bug 201871
- VARTEXFONTS="${T}/fonts"
-
- # This is a hack to avoid sandbox violations when using the Linux console.
- # Creating the DVI and PDF tutorials require /dev/svga to build the
- # example plots.
- addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
- emake all info || die
-
- if use xemacs; then
- cd "${S}/lisp-xemacs"
- emake || die
- fi
-
- if use emacs; then
- cd "${S}/lisp"
- emake || die
- fi
-
- if use doc; then
- # Avoid sandbox violation in epstopdf/ghostscript
- addpredict /var/cache/fontconfig
- cd "${S}/docs"
- emake pdf || die
- cd "${S}/tutorial"
- emake pdf || die
-
- if use emacs || use xemacs; then
- cd "${S}/lisp"
- emake pdf || die
- fi
- fi
-}
-
-src_install () {
- emake DESTDIR="${D}" install || die
-
- if use xemacs; then
- cd "${S}/lisp-xemacs"
- emake DESTDIR="${D}" install || die
- fi
-
- if use emacs; then
- cd "${S}/lisp"
- emake DESTDIR="${D}" install || die
- # 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
- elisp-site-file-install ${E_SITEFILE} || die
- fi
-
- cd "${S}"
- dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README* TODO
- newdoc term/PostScript/README README-ps
- newdoc term/js/README README-js
- use lua && newdoc term/lua/README README-lua
-
- if use examples; then
- # Demo files
- insinto /usr/share/${PN}/${GP_VERSION}
- doins -r demo || die
- rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
- rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
- fi
- if use doc; then
- # Manual
- dodoc docs/gnuplot.pdf
- # Tutorial
- dodoc tutorial/{tutorial.dvi,tutorial.pdf}
- # FAQ
- dodoc FAQ.pdf
- # Documentation for making PostScript files
- 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
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- use latex && texmf-update
-
- einfo "Gnuplot no longer links against pdflib, see the ChangeLog for"
- einfo "details. You can use the \"pdfcairo\" terminal for PDF output."
- use cairo || einfo "It is available with USE=\"cairo\"."
-
- if use svga; then
- echo
- einfo "In order to enable ordinary users to use SVGA console graphics"
- einfo "gnuplot needs to be set up as setuid root. Please note that"
- einfo "this is usually considered to be a security hazard."
- einfo "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
- fi
- if use gd; then
- echo
- einfo "For font support in png/jpeg/gif output, you may have to"
- einfo "set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT environment"
- einfo "variables. See the FAQ file in /usr/share/doc/${PF}/"
- einfo "for more information."
- fi
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- use latex && texmf-update
-}
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
index 89556a7..d0ec7f6 100644
--- a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild,v 1.3 2012/01/27 16:05:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild,v 1.7 2012/03/07 00:33:49 ulm Exp $
EAPI=4
@@ -23,10 +23,10 @@ else
SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
fi
-LICENSE="gnuplot GPL-2"
+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="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 plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
RESTRICT="wxwidgets? ( test )"
RDEPEND="
@@ -106,6 +106,7 @@ src_configure() {
myconf="${myconf} --without-pdf"
myconf="${myconf} --enable-stats" #extra command save to be enabled
myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}"
+ myconf="${myconf} $(use_with bitmap bitmap-terminals)"
myconf="${myconf} $(use_with cairo)"
myconf="${myconf} $(use_with doc tutorial)"
myconf="${myconf} $(use_with gd)"
@@ -124,8 +125,9 @@ src_configure() {
local emacs=$(usev emacs || usev xemacs || echo no)
if [[ -z ${PV%%*9999} && ${emacs} = no ]]; then
- #live ebuild needs an emacs to build texi
- has_version virtual/emacs && emacs="emacs" || emacs="xemacs"
+ # 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
econf ${myconf} \
@@ -150,10 +152,9 @@ src_compile() {
# Prevent access violations, see bug 201871
VARTEXFONTS="${T}/fonts"
- # This is a hack to avoid sandbox violations when using the Linux console.
- # Creating the DVI and PDF tutorials require /dev/svga to build the
- # example plots.
- addwrite /dev/svga:/dev/mouse:/dev/tts/0
+ # We believe that the following line is no longer needed.
+ # In case of problems file a bug report at bugs.gentoo.org.
+ #addwrite /dev/svga:/dev/mouse:/dev/tts/0
emake all info
diff --git a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
index 3cb5c17..5a5541e 100644
--- a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild,v 1.3 2012/01/27 16:05:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild,v 1.7 2012/03/07 00:33:49 ulm Exp $
EAPI=4
@@ -23,10 +23,10 @@ else
SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
fi
-LICENSE="gnuplot GPL-2"
+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="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 plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
RESTRICT="wxwidgets? ( test )"
RDEPEND="
@@ -106,6 +106,7 @@ src_configure() {
myconf="${myconf} --without-pdf"
myconf="${myconf} --enable-stats" #extra command save to be enabled
myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}"
+ myconf="${myconf} $(use_with bitmap bitmap-terminals)"
myconf="${myconf} $(use_with cairo)"
myconf="${myconf} $(use_with doc tutorial)"
myconf="${myconf} $(use_with gd)"
@@ -124,8 +125,9 @@ src_configure() {
local emacs=$(usev emacs || usev xemacs || echo no)
if [[ -z ${PV%%*9999} && ${emacs} = no ]]; then
- #live ebuild needs an emacs to build texi
- has_version virtual/emacs && emacs="emacs" || emacs="xemacs"
+ # 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
econf ${myconf} \
@@ -150,10 +152,9 @@ src_compile() {
# Prevent access violations, see bug 201871
VARTEXFONTS="${T}/fonts"
- # This is a hack to avoid sandbox violations when using the Linux console.
- # Creating the DVI and PDF tutorials require /dev/svga to build the
- # example plots.
- addwrite /dev/svga:/dev/mouse:/dev/tts/0
+ # We believe that the following line is no longer needed.
+ # In case of problems file a bug report at bugs.gentoo.org.
+ #addwrite /dev/svga:/dev/mouse:/dev/tts/0
emake all info
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index b66be8a..9f5fba3 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -13,6 +13,6 @@
<flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
Needed for GIF, JPEG, and PNG image output.</flag>
<flag name="thin-splines">Enable thin plate splines</flag>
- <flag name="qt4">Build Qt4 terminal</flag>
+ <flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2012-06-07 6:30 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2012-06-07 6:30 UTC (permalink / raw
To: gentoo-commits
commit: 5ee26a85022d9983c49a0d73d8fe27942167c5f0
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 7 06:30:23 2012 +0000
Commit: Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Thu Jun 7 06:30:23 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5ee26a85
fixed info install
(Portage version: 2.2.0_alpha110/git/Linux i686, unsigned Manifest commit)
---
sci-visualization/gnuplot/ChangeLog | 3 +++
sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index fe614ea..5a9c9e1 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 07 Jun 2012; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.7.9999.ebuild:
+ fixed info install
+
14 Mar 2012; Christoph Junghans <ottxor@gentoo.org> -gnuplot-4.4.9999.ebuild,
gnuplot-4.6.9999.ebuild, gnuplot-4.7.9999.ebuild, metadata.xml:
sci-visualization/gnuplot: clean up
diff --git a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
index 5a5541e..afaa424 100644
--- a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
@@ -102,7 +102,7 @@ src_configure() {
fi
local myconf
- myconf="${myconf} --without-lisp-files"
+ myconf="${myconf} --with-lisp-files" #need to build info file
myconf="${myconf} --without-pdf"
myconf="${myconf} --enable-stats" #extra command save to be enabled
myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}"
@@ -184,7 +184,8 @@ src_compile() {
}
src_install () {
- emake DESTDIR="${D}" 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"
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2012-12-10 3:30 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2012-12-10 3:30 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2012-12-23 0:28 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2012-12-23 0:28 UTC (permalink / raw
To: gentoo-commits
commit: f4a48336696431638c54170937de26288113e6d0
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 00:10:48 2012 +0000
Commit: Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sun Dec 23 00:10:48 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f4a48336
reworked emacs issue (bug #444526#c3) + move to git
Package-Manager: portage-2.2.0_alpha149
---
sci-visualization/gnuplot/ChangeLog | 4 +-
sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild | 45 +++++++++++++--------
2 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 5a9c9e1..f17d274 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 23 Dec 2012; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.7.9999.ebuild:
+ reworked emacs issue (bug #444526#c3) + move to git
+
07 Jun 2012; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.7.9999.ebuild:
fixed info install
@@ -135,4 +138,3 @@
21 May 2009; Christoph Junghans <kleiner_otti@gmx.de> ChangeLog:
Initial commit ,based upon bug #232363
-
diff --git a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
index bede5f3..4c86d15 100644
--- a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
@@ -2,22 +2,24 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild,v 1.7 2012/03/07 00:33:49 ulm Exp $
-EAPI=4
+EAPI=5
inherit elisp-common multilib wxwidgets
DESCRIPTION="Command-line driven interactive plotting program"
HOMEPAGE="http://www.gnuplot.info/"
-if [[ -z ${PV%%*9999} ]]; then
- inherit autotools cvs
- ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot/gnuplot"
- ECVS_MODULE="gnuplot"
- ECVS_BRANCH="HEAD"
- ECVS_USER="anonymous"
- ECVS_CVS_OPTIONS="-dP"
+if [[ ${PV} = *9999 ]]; then
+ inherit autotools
+ #inherit cvs
+ #ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot/gnuplot"
+ #ECVS_MODULE="gnuplot"
+ #ECVS_BRANCH="HEAD"
+ #ECVS_USER="anonymous"
+ #ECVS_CVS_OPTIONS="-dP"
+ inherit git-2
+ EGIT_REPO_URI="git://github.com/gnuplot/gnuplot.git"
MY_P="${PN}"
- SRC_URI=""
else
MY_P="${P/_/.}"
SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
@@ -26,7 +28,8 @@ 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 qt4 readline svga thin-splines wxwidgets X"
+IUSE="bitmap cairo doc emacs examples +gd ggi latex lua qt4 readline svga thin-splines wxwidgets X xemacs"
+REQUIRED_USE="?? ( emacs xemacs )"
RESTRICT="wxwidgets? ( test )"
RDEPEND="
@@ -52,17 +55,22 @@ RDEPEND="
x11-libs/cairo
x11-libs/pango
x11-libs/gtk+:2 )
- X? ( x11-libs/libXaw )"
+ X? ( x11-libs/libXaw )
+ xemacs? (
+ app-editors/xemacs
+ app-xemacs/xemacs-base )"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? (
virtual/latex-base
dev-texlive/texlive-latexextra
- app-text/ghostscript-gpl )"
+ app-text/ghostscript-gpl )
+ xemacs? ( app-xemacs/texinfo )"
-if [[ -z ${PV%%*9999} ]]; then
+if [[ ${PV} = *9999 ]]; then
# The live ebuild always needs an Emacs for building of gnuplot.texi
- DEPEND="${DEPEND} virtual/emacs"
+ DEPEND="${DEPEND}
+ !emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
fi
S="${WORKDIR}/${MY_P}"
@@ -72,7 +80,7 @@ E_SITEFILE="50${PN}-gentoo.el"
TEXMF="${EPREFIX}/usr/share/texmf-site"
src_prepare() {
- if [[ -z ${PV%%*9999} ]]; then
+ if [[ ${PV} = *9999 ]]; then
local dir
for dir in config demo m4 term tutorial; do
emake -C "$dir" -f Makefile.am.in Makefile.am
@@ -117,9 +125,12 @@ src_configure() {
&& myconf="${myconf} --with-readline=gnu" \
|| myconf="${myconf} --with-readline=builtin"
- local emacs=$(usev emacs || echo no)
+ local emacs=$(usev emacs || usev xemacs || echo no)
+ if [[ ${PV} = *9999 && ${emacs} = no ]]; then
# Live ebuild needs an Emacs to build gnuplot.texi
- [[ -z ${PV%%*9999} ]] && emacs=emacs
+ if has_version virtual/emacs; then emacs=emacs
+ elif has_version app-xemacs/texinfo; then emacs=xemacs; fi
+ fi
econf ${myconf} \
DIST_CONTACT="http://bugs.gentoo.org/" \
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2013-03-07 22:15 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2013-03-07 22:15 UTC (permalink / raw
To: gentoo-commits
commit: 3ec2e2ccc209f11690c71da9161b602f1916b8dd
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 22:13:02 2013 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 22:13:02 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3ec2e2cc
sync wit gx86
Package-Manager: portage-2.2.0_alpha166
---
sci-visualization/gnuplot/ChangeLog | 4 +
sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild | 198 +++++++++------------
sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild | 196 ++++++++++----------
3 files changed, 186 insertions(+), 212 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 9910d92..d5598be 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 07 Mar 2013; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.6.9999.ebuild,
+ gnuplot-4.7.9999.ebuild:
+ sync wit gx86
+
03 Mar 2013; Justin Lecher <jlec@gentoo.org> gnuplot-4.6.9999.ebuild,
gnuplot-4.7.9999.ebuild, metadata.xml:
Update to new qt deps names
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
index da20e42..698c277 100644
--- a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
@@ -1,17 +1,17 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild,v 1.7 2012/03/07 00:33:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.1-r1.ebuild,v 1.5 2013/03/07 20:35:32 ottxor Exp $
-EAPI=4
+EAPI=5
-inherit elisp-common multilib wxwidgets
+inherit elisp-common eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
DESCRIPTION="Command-line driven interactive plotting program"
HOMEPAGE="http://www.gnuplot.info/"
if [[ -z ${PV%%*9999} ]]; then
inherit autotools cvs
- ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot/gnuplot"
+ ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
ECVS_MODULE="gnuplot"
ECVS_BRANCH="branch-4-6-stable"
ECVS_USER="anonymous"
@@ -26,14 +26,16 @@ 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"
-RESTRICT="wxwidgets? ( test )"
+IUSE="aqua bitmap cairo doc emacs examples +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
RDEPEND="
cairo? (
x11-libs/cairo
x11-libs/pango )
emacs? ( virtual/emacs )
+ !emacs? ( xemacs? (
+ app-editors/xemacs
+ app-xemacs/xemacs-base ) )
gd? ( media-libs/gd[png] )
ggi? ( media-libs/libggi )
latex? (
@@ -43,9 +45,9 @@ RDEPEND="
>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
lua? ( dev-lang/lua )
plotutils? ( media-libs/plotutils )
- qt4? ( >=dev-qt/qtcore-4.5
- >=dev-qt/qtgui-4.5
- >=dev-qt/qtsvg-4.5 )
+ qt4? ( >=dev-qt/qtcore-4.5:4
+ >=dev-qt/qtgui-4.5:4
+ >=dev-qt/qtsvg-4.5:4 )
readline? ( sys-libs/readline )
svga? ( media-libs/svgalib )
wxwidgets? (
@@ -53,10 +55,7 @@ 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}
virtual/pkgconfig
doc? (
@@ -68,13 +67,13 @@ DEPEND="${RDEPEND}
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 ) ) )"
+ || ( virtual/emacs app-xemacs/texinfo )"
fi
S="${WORKDIR}/${MY_P}"
GP_VERSION="${PV%.*}"
-E_SITEFILE="50${PN}-gentoo.el"
+E_SITEFILE="lisp/50${PN}-gentoo.el"
TEXMF="${EPREFIX}/usr/share/texmf-site"
src_prepare() {
@@ -89,6 +88,24 @@ src_prepare() {
# Add special version identification as required by provision 2
# of the gnuplot license
sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+ # hacky workaround
+ # Please hack the buildsystem if you like
+ if use prefix && use qt4; then
+ append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+ fi
+
+ DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
+ for details. You can use the "pdfcairo" terminal for PDF output.'
+ use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+ use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
+ SVGA console graphics, gnuplot needs to be set up as setuid root.
+ Please note that this is usually considered to be a security hazard.
+ As root, manually "chmod u+s /usr/bin/gnuplot".'
+ use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
+ you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+ environment variables. See the FAQ file in /usr/share/doc/${PF}/
+ for more information.'
}
src_configure() {
@@ -101,51 +118,49 @@ src_configure() {
need-wxwidgets unicode
fi
- local myconf
- myconf="${myconf} --without-lisp-files"
- myconf="${myconf} --without-pdf"
- myconf="${myconf} --enable-stats" #extra command save to be enabled
- myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}"
- myconf="${myconf} $(use_with bitmap bitmap-terminals)"
- myconf="${myconf} $(use_with cairo)"
- myconf="${myconf} $(use_with doc tutorial)"
- myconf="${myconf} $(use_with gd)"
- 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)"
- myconf="${myconf} $(use_with X x)"
- myconf="${myconf} $(use_enable qt4 qt)"
- use readline \
- && myconf="${myconf} --with-readline=gnu" \
- || myconf="${myconf} --with-readline=builtin"
+ tc-export CC CXX #453174
- local emacs=$(usev emacs || usev xemacs || echo no)
- if [[ -z ${PV%%*9999} && ${emacs} = no ]]; 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
+ 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
+ fi
fi
- econf ${myconf} \
+ 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) \
+ $(use_with gd) \
+ "$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
+ "$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
+ $(use_with lua) \
+ "$(use_with plotutils plot "${EPREFIX}/usr/$(get_libdir)")" \
+ $(use_with svga linux-vga) \
+ $(use_with X x) \
+ --enable-stats \
+ $(use_enable qt4 qt) \
+ $(use_enable thin-splines) \
+ $(use_enable wxwidgets) \
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
+ EMACS="${emacs}"
}
src_compile() {
@@ -158,56 +173,30 @@ 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
- cd "${S}/docs"
- emake pdf
- cd "${S}/tutorial"
- emake pdf
-
- if use emacs || use xemacs; then
- cd "${S}/lisp"
- emake pdf
- fi
+ 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 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
+ # 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' lisp/dotemacs >> ${E_SITEFILE} || die
elisp-site-file-install ${E_SITEFILE} || die
fi
- cd "${S}"
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
+ readme.gentoo_create_doc
if use examples; then
# Demo files
@@ -216,13 +205,10 @@ src_install () {
rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
fi
+
if use doc; then
- # Manual
- dodoc docs/gnuplot.pdf
- # Tutorial
- dodoc tutorial/{tutorial.dvi,tutorial.pdf}
- # FAQ
- dodoc FAQ.pdf
+ # Manual, tutorial, FAQ
+ dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
# Documentation for making PostScript files
docinto psdoc
dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
@@ -235,28 +221,14 @@ src_install () {
fi
}
+src_test() {
+ GNUTERM="unknown" default_src_test
+}
+
pkg_postinst() {
use emacs && elisp-site-regen
use latex && texmf-update
-
- elog "Gnuplot no longer links against pdflib, see the ChangeLog for"
- elog "details. You can use the \"pdfcairo\" terminal for PDF output."
- use cairo || elog "It is available with USE=\"cairo\"."
-
- if use svga; then
- echo
- elog "In order to enable ordinary users to use SVGA console graphics"
- elog "gnuplot needs to be set up as setuid root. Please note that"
- elog "this is usually considered to be a security hazard."
- elog "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
- fi
- if use gd; then
- echo
- elog "For font support in png/jpeg/gif output, you may have to"
- elog "set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT environment"
- elog "variables. See the FAQ file in /usr/share/doc/${PF}/"
- elog "for more information."
- fi
+ readme.gentoo_print_elog
}
pkg_postrm() {
diff --git a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
index 2b14927..8bca269 100644
--- a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
@@ -1,25 +1,23 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild,v 1.7 2012/03/07 00:33:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.1-r1.ebuild,v 1.5 2013/03/07 20:35:32 ottxor Exp $
EAPI=5
-inherit elisp-common multilib wxwidgets
+inherit elisp-common eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
DESCRIPTION="Command-line driven interactive plotting program"
HOMEPAGE="http://www.gnuplot.info/"
-if [[ ${PV} = *9999 ]]; then
- inherit autotools
- #inherit cvs
- #ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot/gnuplot"
- #ECVS_MODULE="gnuplot"
- #ECVS_BRANCH="HEAD"
- #ECVS_USER="anonymous"
- #ECVS_CVS_OPTIONS="-dP"
- inherit git-2
- EGIT_REPO_URI="git://github.com/gnuplot/gnuplot.git"
+if [[ -z ${PV%%*9999} ]]; then
+ inherit autotools cvs
+ ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
+ ECVS_MODULE="gnuplot"
+ ECVS_BRANCH="HEAD"
+ ECVS_USER="anonymous"
+ ECVS_CVS_OPTIONS="-dP"
MY_P="${PN}"
+ SRC_URI=""
else
MY_P="${P/_/.}"
SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
@@ -28,15 +26,16 @@ 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 qt4 readline svga thin-splines wxwidgets X xemacs"
-REQUIRED_USE="?? ( emacs xemacs )"
-RESTRICT="wxwidgets? ( test )"
+IUSE="aqua bitmap cairo doc emacs examples +gd ggi latex lua qt4 readline svga thin-splines wxwidgets X xemacs"
RDEPEND="
cairo? (
x11-libs/cairo
x11-libs/pango )
emacs? ( virtual/emacs )
+ !emacs? ( xemacs? (
+ app-editors/xemacs
+ app-xemacs/xemacs-base ) )
gd? ( media-libs/gd[png] )
ggi? ( media-libs/libggi )
latex? (
@@ -45,9 +44,9 @@ RDEPEND="
dev-tex/pgf
>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
lua? ( dev-lang/lua )
- qt4? ( >=dev-qt/qtcore-4.5
- >=dev-qt/qtgui-4.5
- >=dev-qt/qtsvg-4.5 )
+ qt4? ( >=dev-qt/qtcore-4.5:4
+ >=dev-qt/qtgui-4.5:4
+ >=dev-qt/qtsvg-4.5:4 )
readline? ( sys-libs/readline )
svga? ( media-libs/svgalib )
wxwidgets? (
@@ -55,32 +54,29 @@ 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}
virtual/pkgconfig
doc? (
virtual/latex-base
dev-texlive/texlive-latexextra
app-text/ghostscript-gpl )
- xemacs? ( app-xemacs/texinfo )"
+ !emacs? ( xemacs? ( app-xemacs/texinfo ) )"
-if [[ ${PV} = *9999 ]]; then
+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 ) ) )"
+ || ( virtual/emacs app-xemacs/texinfo )"
fi
S="${WORKDIR}/${MY_P}"
GP_VERSION="${PV%.*}"
-E_SITEFILE="50${PN}-gentoo.el"
+E_SITEFILE="lisp/50${PN}-gentoo.el"
TEXMF="${EPREFIX}/usr/share/texmf-site"
src_prepare() {
- if [[ ${PV} = *9999 ]]; then
+ 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
@@ -91,6 +87,24 @@ src_prepare() {
# Add special version identification as required by provision 2
# of the gnuplot license
sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+ # hacky workaround
+ # Please hack the buildsystem if you like
+ if use prefix && use qt4; then
+ append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+ fi
+
+ DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
+ for details. You can use the "pdfcairo" terminal for PDF output.'
+ use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+ use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
+ SVGA console graphics, gnuplot needs to be set up as setuid root.
+ Please note that this is usually considered to be a security hazard.
+ As root, manually "chmod u+s /usr/bin/gnuplot".'
+ use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
+ you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+ environment variables. See the FAQ file in /usr/share/doc/${PF}/
+ for more information.'
}
src_configure() {
@@ -103,38 +117,48 @@ src_configure() {
need-wxwidgets unicode
fi
- 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}"
- myconf="${myconf} $(use_with bitmap bitmap-terminals)"
- myconf="${myconf} $(use_with cairo)"
- myconf="${myconf} $(use_with doc tutorial)"
- myconf="${myconf} $(use_with gd)"
- 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 svga linux-vga)"
- myconf="${myconf} $(use_enable thin-splines)"
- myconf="${myconf} $(use_enable wxwidgets)"
- myconf="${myconf} $(use_with X x)"
- myconf="${myconf} $(use_enable qt4 qt)"
- use readline \
- && myconf="${myconf} --with-readline=gnu" \
- || myconf="${myconf} --with-readline=builtin"
-
- local emacs=$(usev emacs || usev xemacs || echo no)
- if [[ ${PV} = *9999 && ${emacs} = no ]]; 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
+ 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
+ fi
fi
- econf ${myconf} \
+ 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) \
+ $(use_with gd) \
+ "$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
+ "$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
+ $(use_with lua) \
+ $(use_with svga linux-vga) \
+ $(use_with X x) \
+ --enable-stats \
+ $(use_enable qt4 qt) \
+ $(use_enable thin-splines) \
+ $(use_enable wxwidgets) \
DIST_CONTACT="http://bugs.gentoo.org/" \
- EMACS=${emacs}
+ EMACS="${emacs}"
}
src_compile() {
@@ -150,36 +174,27 @@ src_compile() {
if use doc; then
# Avoid sandbox violation in epstopdf/ghostscript
addpredict /var/cache/fontconfig
- cd "${S}/docs"
- emake pdf
- cd "${S}/tutorial"
- emake pdf
-
- if use emacs; then
- cd "${S}/lisp"
- emake pdf
- fi
+ emake -C docs pdf
+ emake -C tutorial pdf
+ use emacs || use xemacs && emake -C lisp pdf
fi
}
src_install () {
- emake DESTDIR="${D}" install install-info
+ emake DESTDIR="${D}" install
if use emacs; then
- # info-look* is included with >=emacs-21
- rm -f "${ED}${SITELISP}/${PN}"/info-look*
-
- # Gentoo emacs site-lisp configuration
+ # Gentoo Emacs site-lisp configuration
echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE}
- sed '/^;; move/,+3 d' "${S}"/lisp/dotemacs >> ${E_SITEFILE} || die
+ sed '/^;; move/,+3 d' lisp/dotemacs >> ${E_SITEFILE} || die
elisp-site-file-install ${E_SITEFILE} || die
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
+ readme.gentoo_create_doc
if use examples; then
# Demo files
@@ -188,47 +203,30 @@ src_install () {
rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
fi
+
if use doc; then
- # Manual
- dodoc docs/gnuplot.pdf
- # Tutorial
- dodoc tutorial/{tutorial.dvi,tutorial.pdf}
- # FAQ
- dodoc FAQ.pdf
+ # Manual, tutorial, FAQ
+ dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
# Documentation for making PostScript files
docinto psdoc
dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
fi
- if use emacs; then
+ if use emacs || use xemacs; then
docinto emacs
dodoc lisp/ChangeLog lisp/README
use doc && dodoc lisp/gpelcard.pdf
fi
}
+src_test() {
+ GNUTERM="unknown" default_src_test
+}
+
pkg_postinst() {
use emacs && elisp-site-regen
use latex && texmf-update
-
- elog "Gnuplot no longer links against pdflib, see the ChangeLog for"
- elog "details. You can use the \"pdfcairo\" terminal for PDF output."
- use cairo || elog "It is available with USE=\"cairo\"."
-
- if use svga; then
- echo
- elog "In order to enable ordinary users to use SVGA console graphics"
- elog "gnuplot needs to be set up as setuid root. Please note that"
- elog "this is usually considered to be a security hazard."
- elog "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
- fi
- if use gd; then
- echo
- elog "For font support in png/jpeg/gif output, you may have to"
- elog "set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT environment"
- elog "variables. See the FAQ file in /usr/share/doc/${PF}/"
- elog "for more information."
- fi
+ readme.gentoo_print_elog
}
pkg_postrm() {
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2013-03-12 20:30 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2013-03-12 20:30 UTC (permalink / raw
To: gentoo-commits
commit: 9e830d074d0cac4ee244e0f75a8e755e1210a111
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 20:30:40 2013 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 20:30:40 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9e830d07
fix build without emacs
Package-Manager: portage-2.2.0_alpha166
---
sci-visualization/gnuplot/ChangeLog | 4 ++++
sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild | 3 +++
sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild | 2 ++
3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index d5598be..9ff03df 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 12 Mar 2013; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.6.9999.ebuild,
+ gnuplot-4.7.9999.ebuild:
+ fix build without emacs
+
07 Mar 2013; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.6.9999.ebuild,
gnuplot-4.7.9999.ebuild:
sync wit gx86
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
index 698c277..f6d334c 100644
--- a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
@@ -136,6 +136,9 @@ src_configure() {
# 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
diff --git a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
index 8bca269..e26eeed 100644
--- a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
@@ -135,6 +135,8 @@ src_configure() {
# 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
+ # with emtpy lispdir info cannot be build
+ lispdir="${T}"
fi
fi
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2013-04-22 1:39 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2013-04-22 1:39 UTC (permalink / raw
To: gentoo-commits
commit: 348a913b00602a36cb1f1643fb12e68ecc7b1b33
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 22 01:39:39 2013 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 01:39:39 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=348a913b
sync with gx86
Package-Manager: portage-2.2.0_alpha173
---
sci-visualization/gnuplot/ChangeLog | 4 ++++
sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild | 10 +++++++---
sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 9ff03df..6203a32 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 Apr 2013; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.6.9999.ebuild,
+ gnuplot-4.7.9999.ebuild:
+ sync with gx86
+
12 Mar 2013; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.6.9999.ebuild,
gnuplot-4.7.9999.ebuild:
fix build without emacs
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
index f6d334c..ee41792 100644
--- a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
@@ -20,7 +20,8 @@ if [[ -z ${PV%%*9999} ]]; then
SRC_URI=""
else
MY_P="${P/_/.}"
- SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+ SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz
+ mirror://gentoo/${PN}.info-4.6.2.tar.xz"
fi
LICENSE="gnuplot GPL-2 bitmap? ( free-noncomm )"
@@ -36,7 +37,7 @@ RDEPEND="
!emacs? ( xemacs? (
app-editors/xemacs
app-xemacs/xemacs-base ) )
- gd? ( media-libs/gd[png] )
+ gd? ( >=media-libs/gd-2.0.35-r3[png] )
ggi? ( media-libs/libggi )
latex? (
virtual/latex-base
@@ -77,7 +78,10 @@ E_SITEFILE="lisp/50${PN}-gentoo.el"
TEXMF="${EPREFIX}/usr/share/texmf-site"
src_prepare() {
- if [[ -z ${PV%%*9999} ]]; then
+ if [[ -n ${PV%%*9999} ]]; then
+ epatch "${FILESDIR}/${PN}-4.6.1-eldoc.patch"
+ epatch "${FILESDIR}/${PN}-4.6.2-gdversion.patch" #462996
+ else
local dir
for dir in config demo m4 term tutorial; do
emake -C "$dir" -f Makefile.am.in Makefile.am
diff --git a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
index e26eeed..cffef19 100644
--- a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
!emacs? ( xemacs? (
app-editors/xemacs
app-xemacs/xemacs-base ) )
- gd? ( media-libs/gd[png] )
+ gd? ( >=media-libs/gd-2.0.35-r3[png] )
ggi? ( media-libs/libggi )
latex? (
virtual/latex-base
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2013-06-14 11:21 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2013-06-14 11:21 UTC (permalink / raw
To: gentoo-commits
commit: 8e489ce0a55fd84b06884efa842d4c14b9781a2f
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 11:16:03 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 11:16:03 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8e489ce0
sci-visualization/gnuplot: Drop KEYWORDS of live ebuilds
Package-Manager: portage-2.2.0_alpha179
---
sci-visualization/gnuplot/ChangeLog | 4 ++++
sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild | 2 +-
sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 6203a32..5e0fc2e 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Jun 2013; Justin Lecher <jlec@gentoo.org> gnuplot-4.6.9999.ebuild,
+ gnuplot-4.7.9999.ebuild:
+ Drop KEYWORDS of live ebuilds
+
22 Apr 2013; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.6.9999.ebuild,
gnuplot-4.7.9999.ebuild:
sync with gx86
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
index ee41792..2509873 100644
--- a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
@@ -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"
+KEYWORDS=""
IUSE="aqua bitmap cairo doc emacs examples +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
RDEPEND="
diff --git a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
index cffef19..b50f33f 100644
--- a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
@@ -25,7 +25,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"
+KEYWORDS=""
IUSE="aqua bitmap cairo doc emacs examples +gd ggi latex lua qt4 readline svga thin-splines wxwidgets X xemacs"
RDEPEND="
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2013-06-19 5:29 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2013-06-19 5:29 UTC (permalink / raw
To: gentoo-commits
commit: b7b9b0ab678a48e3b12abe3ee820230c24b2ca4a
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 19 05:28:54 2013 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jun 19 05:29:01 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b7b9b0ab
fixed qt4 build
Package-Manager: portage-2.2.0_alpha180
---
sci-visualization/gnuplot/ChangeLog | 3 +++
sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 5e0fc2e..bd56044 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 19 Jun 2013; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.7.9999.ebuild:
+ fixed qt4 build
+
14 Jun 2013; Justin Lecher <jlec@gentoo.org> gnuplot-4.6.9999.ebuild,
gnuplot-4.7.9999.ebuild:
Drop KEYWORDS of live ebuilds
diff --git a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
index b50f33f..c22c039 100644
--- a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
@@ -156,7 +156,7 @@ src_configure() {
$(use_with svga linux-vga) \
$(use_with X x) \
--enable-stats \
- $(use_enable qt4 qt) \
+ $(use_with qt4 qt qt4) \
$(use_enable thin-splines) \
$(use_enable wxwidgets) \
DIST_CONTACT="http://bugs.gentoo.org/" \
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2013-07-14 17:05 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2013-07-14 17:05 UTC (permalink / raw
To: gentoo-commits
commit: 16665bb7850b2bce8899f08ded9462f9c5dbef3f
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 17:04:53 2013 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 17:04:53 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=16665bb7
build of info file broke again, drop it, will be shipped in the release anyhow
Package-Manager: portage-2.2.0_alpha188
---
sci-visualization/gnuplot/ChangeLog | 3 +++
sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild | 15 +--------------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index bd56044..539d7ec 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Jul 2013; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.7.9999.ebuild:
+ build of info file broke again, drop it, will be shipped in the release anyhow
+
19 Jun 2013; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.7.9999.ebuild:
fixed qt4 build
diff --git a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
index c22c039..4446c06 100644
--- a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
@@ -63,12 +63,6 @@ DEPEND="${RDEPEND}
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
-
S="${WORKDIR}/${MY_P}"
GP_VERSION="${PV%.*}"
@@ -131,13 +125,6 @@ src_configure() {
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
- # with emtpy lispdir info cannot be build
- lispdir="${T}"
- fi
fi
econf \
@@ -171,7 +158,7 @@ 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
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2014-03-22 23:31 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2014-03-22 23:31 UTC (permalink / raw
To: gentoo-commits
commit: d4f2ef09b398b14c2cb583f6b8ec5c925bbcd8f3
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 22 09:58:44 2014 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sat Mar 22 22:02:08 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d4f2ef09
Add libcaca USE flag, thanks to James Cloos <cloos <AT> jhcloos.com>, bug 504354. Remove thin-splines USE flag and configure option.
Package-Manager: portage-2.2.8-r1
---
sci-visualization/gnuplot/ChangeLog | 4 ++++
sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 5d9f363..a083926 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 Mar 2014; Ulrich Müller <ulm@gentoo.org> gnuplot-4.7.9999.ebuild:
+ Add libcaca USE flag, thanks to James Cloos <cloos@jhcloos.com>, bug 504354.
+ Remove thin-splines USE flag and configure option.
+
22 Mar 2014; Ulrich Müller <ulm@gentoo.org> 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
diff --git a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
index f5ff014..fbbe710 100644
--- a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
@@ -26,7 +26,7 @@ fi
LICENSE="gnuplot bitmap? ( free-noncomm )"
SLOT="0"
KEYWORDS=""
-IUSE="aqua bitmap cairo doc examples +gd ggi latex lua qt4 readline svga thin-splines wxwidgets X"
+IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca lua qt4 readline svga wxwidgets X"
RDEPEND="
cairo? (
@@ -39,6 +39,7 @@ RDEPEND="
lua? (
dev-tex/pgf
>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
+ libcaca? ( media-libs/libcaca )
lua? ( dev-lang/lua )
qt4? ( >=dev-qt/qtcore-4.5:4
>=dev-qt/qtgui-4.5:4
@@ -118,12 +119,12 @@ src_configure() {
$(use_with gd) \
"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
+ "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
$(use_with lua) \
$(use_with svga linux-vga) \
$(use_with X x) \
--enable-stats \
$(use_with qt4 qt qt4) \
- $(use_enable thin-splines) \
$(use_enable wxwidgets) \
DIST_CONTACT="http://bugs.gentoo.org/" \
EMACS=no
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2014-03-22 23:31 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2014-03-22 23:31 UTC (permalink / raw
To: gentoo-commits
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@gentoo.org> 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@gentoo.org> 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
}
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2014-07-13 20:19 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2014-07-13 20:19 UTC (permalink / raw
To: gentoo-commits
commit: 3850d2b876de9d7a3f20f7317c502dbf4545b282
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 13 20:19:46 2014 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sun Jul 13 20:19:46 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3850d2b8
version bump
Package-Manager: portage-2.2.8-r1
---
sci-visualization/gnuplot/ChangeLog | 6 ++++++
.../gnuplot/{gnuplot-4.7.9999.ebuild => gnuplot-5.0.9999.ebuild} | 0
2 files changed, 6 insertions(+)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index a083926..937fbcf 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*gnuplot-5.0.9999 (13 Jul 2014)
+
+ 13 Jul 2014; Christoph Junghans <ottxor@gentoo.org> +gnuplot-5.0.9999.ebuild,
+ -gnuplot-4.7.9999.ebuild:
+ version bump
+
22 Mar 2014; Ulrich Müller <ulm@gentoo.org> gnuplot-4.7.9999.ebuild:
Add libcaca USE flag, thanks to James Cloos <cloos@jhcloos.com>, bug 504354.
Remove thin-splines USE flag and configure option.
diff --git a/sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
similarity index 100%
rename from sci-visualization/gnuplot/gnuplot-4.7.9999.ebuild
rename to sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2014-07-14 0:46 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2014-07-14 0:46 UTC (permalink / raw
To: gentoo-commits
commit: cb3f5ec3a3aba866caec3cb68788bcd0783751bd
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 14 00:46:16 2014 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Jul 14 00:46:16 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cb3f5ec3
added support for libcerf
Package-Manager: portage-2.2.8-r1
---
sci-visualization/gnuplot/ChangeLog | 3 +++
sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild | 1 +
2 files changed, 4 insertions(+)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 937fbcf..5954359 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Jul 2014; Christoph Junghans <ottxor@gentoo.org> gnuplot-5.0.9999.ebuild:
+ added support for libcerf
+
*gnuplot-5.0.9999 (13 Jul 2014)
13 Jul 2014; Christoph Junghans <ottxor@gentoo.org> +gnuplot-5.0.9999.ebuild,
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
index fbbe710..071e763 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
@@ -45,6 +45,7 @@ RDEPEND="
>=dev-qt/qtgui-4.5:4
>=dev-qt/qtsvg-4.5:4 )
readline? ( sys-libs/readline )
+ sci-libs/libcerf
svga? ( media-libs/svgalib )
wxwidgets? (
x11-libs/wxGTK:2.8[X]
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2014-09-08 20:31 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2014-09-08 20:31 UTC (permalink / raw
To: gentoo-commits
commit: aab1ae762e33c53c4e54b9e556234138d3a8a8af
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 8 20:30:49 2014 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Sep 8 20:31:01 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=aab1ae76
sync with gx86
Package-Manager: portage-2.2.8-r1
---
sci-visualization/gnuplot/ChangeLog | 4 ++++
sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild | 13 +++++++++----
sci-visualization/gnuplot/metadata.xml | 19 +++++++++++++++----
3 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 5954359..07c4b2b 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 08 Sep 2014; Christoph Junghans <ottxor@gentoo.org> gnuplot-5.0.9999.ebuild,
+ metadata.xml:
+ sync with gx86
+
14 Jul 2014; Christoph Junghans <ottxor@gentoo.org> gnuplot-5.0.9999.ebuild:
added support for libcerf
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
index 071e763..5c1624f 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
@@ -18,15 +18,17 @@ if [[ -z ${PV%%*9999} ]]; then
ECVS_CVS_OPTIONS="-dP"
MY_P="${PN}"
SRC_URI=""
+ KEYWORDS=""
else
MY_P="${P/_/.}"
SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+ 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"
+ inherit autotools
fi
LICENSE="gnuplot bitmap? ( free-noncomm )"
SLOT="0"
-KEYWORDS=""
-IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca lua qt4 readline svga wxwidgets X"
+IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
RDEPEND="
cairo? (
@@ -45,7 +47,7 @@ RDEPEND="
>=dev-qt/qtgui-4.5:4
>=dev-qt/qtsvg-4.5:4 )
readline? ( sys-libs/readline )
- sci-libs/libcerf
+ libcerf? ( sci-libs/libcerf )
svga? ( media-libs/svgalib )
wxwidgets? (
x11-libs/wxGTK:2.8[X]
@@ -73,6 +75,9 @@ src_prepare() {
emake -C "$dir" -f Makefile.am.in Makefile.am
done
eautoreconf
+ else
+ epatch "${FILESDIR}/${PN}-5.0_rc1-libcerf.patch"
+ eautoreconf
fi
# Add special version identification as required by provision 2
@@ -144,7 +149,7 @@ src_compile() {
if use doc; then
# Avoid sandbox violation in epstopdf/ghostscript
addpredict /var/cache/fontconfig
- emake -C docs pdf
+ emake -C docs gnuplot.pdf
emake -C tutorial pdf
fi
}
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index 6524891..1a66c94 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -3,16 +3,27 @@
<pkgmetadata>
<herd>sci</herd>
<maintainer>
- <email>ottxor@gentoo.org</email>
- <name>Christoph Junghans</name>
+ <email>ulm@gentoo.org</email>
+ <name>Ulrich Müller</name>
</maintainer>
<maintainer>
- <email>ulm@gentoo.org</email>
+ <email>ottxor@gentoo.org</email>
+ <name>Christoph Junghans</name>
</maintainer>
+ <longdescription>
+ Gnuplot is a command-driven interactive function plotting program.
+ It can be used to plot functions and data points in both two- and
+ three-dimensional plots in many different formats. It is designed
+ primarily for the visual display of scientific data.
+</longdescription>
<use>
<flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
- Needed for GIF, JPEG, and PNG image output.</flag>
+ Needed for GIF, JPEG, and PNG image output.</flag>
+<flag name="libcerf">Enable special functions from <pkg>sci-libs/libcerf</pkg></flag>
<flag name="thin-splines">Enable thin plate splines</flag>
<flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
</use>
+ <upstream>
+ <remote-id type="sourceforge">gnuplot</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2014-09-16 22:09 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2014-09-16 22:09 UTC (permalink / raw
To: gentoo-commits
commit: 3606ca5cdcb1613a0e4b073ede1c7f8fe0729092
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 16 21:33:42 2014 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Sep 16 21:33:42 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3606ca5c
libcerf patch got merged upstream
Package-Manager: portage-2.2.8-r1
---
sci-visualization/gnuplot/ChangeLog | 3 +++
sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild | 1 +
2 files changed, 4 insertions(+)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 07c4b2b..bac226c 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 16 Sep 2014; Christoph Junghans <ottxor@gentoo.org> gnuplot-5.0.9999.ebuild:
+ libcerf patch got merged upstream
+
08 Sep 2014; Christoph Junghans <ottxor@gentoo.org> gnuplot-5.0.9999.ebuild,
metadata.xml:
sync with gx86
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
index 5c1624f..05eabe3 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
@@ -126,6 +126,7 @@ src_configure() {
"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
+ $(use_with libcerf) \
$(use_with lua) \
$(use_with svga linux-vga) \
$(use_with X x) \
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2014-11-08 20:48 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2014-11-08 20:48 UTC (permalink / raw
To: gentoo-commits
commit: e850bd6a27d017ef66c1312de0b92b348aaee0ee
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 8 20:48:29 2014 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sat Nov 8 20:48:29 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e850bd6a
added latest dev version
Package-Manager: portage-2.2.8-r2
---
sci-visualization/gnuplot/ChangeLog | 6 ++++++
sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild | 2 +-
.../gnuplot/{gnuplot-5.0.9999.ebuild => gnuplot-5.1.9999.ebuild} | 0
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index bac226c..2244691 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*gnuplot-5.1.9999 (08 Nov 2014)
+
+ 08 Nov 2014; Christoph Junghans <ottxor@gentoo.org> +gnuplot-5.1.9999.ebuild,
+ gnuplot-5.0.9999.ebuild:
+ added latest dev version
+
16 Sep 2014; Christoph Junghans <ottxor@gentoo.org> gnuplot-5.0.9999.ebuild:
libcerf patch got merged upstream
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
index 05eabe3..ba3a990 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
@@ -13,7 +13,7 @@ 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-5-0-stable"
ECVS_USER="anonymous"
ECVS_CVS_OPTIONS="-dP"
MY_P="${PN}"
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
similarity index 100%
copy from sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
copy to sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2015-05-25 23:02 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2015-05-25 23:02 UTC (permalink / raw
To: gentoo-commits
commit: 003779af4c728f8788d6f5383fb42d1da22e40d8
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 22:49:03 2015 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon May 25 23:02:13 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=003779af
added compat use flag (bug #550370)
Package-Manager: portage-2.2.18
sci-visualization/gnuplot/ChangeLog | 6 +++++-
sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild | 14 ++++++--------
sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild | 9 +++++----
sci-visualization/gnuplot/metadata.xml | 3 ++-
4 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 2244691..389d2c0 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for sci-visualization/gnuplot
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 May 2015; Christoph Junghans <ottxor@gentoo.org> gnuplot-5.0.9999.ebuild,
+ gnuplot-5.1.9999.ebuild, metadata.xml:
+ added compat use flag (bug #550370)
+
*gnuplot-5.1.9999 (08 Nov 2014)
08 Nov 2014; Christoph Junghans <ottxor@gentoo.org> +gnuplot-5.1.9999.ebuild,
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
index ba3a990..fbc18cf 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -22,13 +22,13 @@ if [[ -z ${PV%%*9999} ]]; then
else
MY_P="${P/_/.}"
SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
- 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"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
inherit autotools
fi
LICENSE="gnuplot bitmap? ( free-noncomm )"
SLOT="0"
-IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
+IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
RDEPEND="
cairo? (
@@ -42,11 +42,11 @@ RDEPEND="
dev-tex/pgf
>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
libcaca? ( media-libs/libcaca )
- lua? ( dev-lang/lua )
+ lua? ( dev-lang/lua:0 )
qt4? ( >=dev-qt/qtcore-4.5:4
>=dev-qt/qtgui-4.5:4
>=dev-qt/qtsvg-4.5:4 )
- readline? ( sys-libs/readline )
+ readline? ( sys-libs/readline:0 )
libcerf? ( sci-libs/libcerf )
svga? ( media-libs/svgalib )
wxwidgets? (
@@ -75,9 +75,6 @@ src_prepare() {
emake -C "$dir" -f Makefile.am.in Makefile.am
done
eautoreconf
- else
- epatch "${FILESDIR}/${PN}-5.0_rc1-libcerf.patch"
- eautoreconf
fi
# Add special version identification as required by provision 2
@@ -121,6 +118,7 @@ src_configure() {
--with-readline=$(usex readline gnu builtin) \
$(use_with bitmap bitmap-terminals) \
$(use_with cairo) \
+ $(use_enable compat backwards-compatibility) \
$(use_with doc tutorial) \
$(use_with gd) \
"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
diff --git a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
index 05eabe3..f8f88c2 100644
--- a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -28,7 +28,7 @@ fi
LICENSE="gnuplot bitmap? ( free-noncomm )"
SLOT="0"
-IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
+IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
RDEPEND="
cairo? (
@@ -42,11 +42,11 @@ RDEPEND="
dev-tex/pgf
>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
libcaca? ( media-libs/libcaca )
- lua? ( dev-lang/lua )
+ lua? ( dev-lang/lua:0 )
qt4? ( >=dev-qt/qtcore-4.5:4
>=dev-qt/qtgui-4.5:4
>=dev-qt/qtsvg-4.5:4 )
- readline? ( sys-libs/readline )
+ readline? ( sys-libs/readline:0 )
libcerf? ( sci-libs/libcerf )
svga? ( media-libs/svgalib )
wxwidgets? (
@@ -121,6 +121,7 @@ src_configure() {
--with-readline=$(usex readline gnu builtin) \
$(use_with bitmap bitmap-terminals) \
$(use_with cairo) \
+ $(use_enable compat backwards-compatibility) \
$(use_with doc tutorial) \
$(use_with gd) \
"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index 1a66c94..f95b022 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -16,7 +16,8 @@
three-dimensional plots in many different formats. It is designed
primarily for the visual display of scientific data.
</longdescription>
- <use>
+<use>
+ <flag name="compat">Enable backwards compatibility with version 4 syntax</flag>
<flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
Needed for GIF, JPEG, and PNG image output.</flag>
<flag name="libcerf">Enable special functions from <pkg>sci-libs/libcerf</pkg></flag>
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2015-05-25 23:02 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2015-05-25 23:02 UTC (permalink / raw
To: gentoo-commits
commit: 6353be6aeaf4406aaac522d5c6d322e86fabc8f3
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 23:00:16 2015 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon May 25 23:02:13 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=6353be6a
remove old
Package-Manager: portage-2.2.18
sci-visualization/gnuplot/ChangeLog | 4 +
sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild | 194 ----------------------
sci-visualization/gnuplot/metadata.xml | 1 -
3 files changed, 4 insertions(+), 195 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 389d2c0..70dc9bc 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 May 2015; Christoph Junghans <ottxor@gentoo.org> -gnuplot-4.6.9999.ebuild,
+ metadata.xml:
+ remove old
+
25 May 2015; Christoph Junghans <ottxor@gentoo.org> gnuplot-5.0.9999.ebuild,
gnuplot-5.1.9999.ebuild, metadata.xml:
added compat use flag (bug #550370)
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
deleted file mode 100644
index 9330bba..0000000
--- a/sci-visualization/gnuplot/gnuplot-4.6.9999.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-
-if [[ -z ${PV%%*9999} ]]; then
- inherit autotools cvs
- ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
- ECVS_MODULE="gnuplot"
- ECVS_BRANCH="branch-4-6-stable"
- ECVS_USER="anonymous"
- ECVS_CVS_OPTIONS="-dP"
- MY_P="${PN}"
- SRC_URI=""
-else
- MY_P="${P/_/.}"
- SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz
- mirror://gentoo/${PN}.info-4.6.2.tar.xz"
-fi
-
-LICENSE="gnuplot bitmap? ( free-noncomm )"
-SLOT="0"
-KEYWORDS=""
-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 )
- gd? ( >=media-libs/gd-2.0.35-r3[png] )
- ggi? ( media-libs/libggi )
- latex? (
- virtual/latex-base
- lua? (
- dev-tex/pgf
- >=dev-texlive/texlive-latexrecommended-2008-r2 ) )
- lua? ( dev-lang/lua )
- plotutils? ( media-libs/plotutils )
- qt4? ( >=dev-qt/qtcore-4.5:4
- >=dev-qt/qtgui-4.5:4
- >=dev-qt/qtsvg-4.5:4 )
- 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 )
- X? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? (
- virtual/latex-base
- dev-texlive/texlive-latexextra
- app-text/ghostscript-gpl )"
-
-S="${WORKDIR}/${MY_P}"
-
-GP_VERSION="${PV%.*}"
-E_SITEFILE="lisp/50${PN}-gentoo.el"
-TEXMF="${EPREFIX}/usr/share/texmf-site"
-
-src_prepare() {
- if [[ -n ${PV%%*9999} ]]; then
- epatch "${FILESDIR}/${PN}-4.6.1-eldoc.patch"
- epatch "${FILESDIR}/${PN}-4.6.2-gdversion.patch" #462996
- else
- local dir
- for dir in config demo m4 term tutorial; do
- emake -C "$dir" -f Makefile.am.in Makefile.am
- done
- eautoreconf
- fi
-
- # Add special version identification as required by provision 2
- # of the gnuplot license
- sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-
- # hacky workaround
- # Please hack the buildsystem if you like
- if use prefix && use qt4; then
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
- fi
-
- DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
- for details. You can use the "pdfcairo" terminal for PDF output.'
- use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
- use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
- SVGA console graphics, gnuplot needs to be set up as setuid root.
- Please note that this is usually considered to be a security hazard.
- As root, manually "chmod u+s /usr/bin/gnuplot".'
- use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
- you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
- environment variables. See the FAQ file in /usr/share/doc/${PF}/
- for more information.'
-}
-
-src_configure() {
- if ! use latex; then
- sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
- fi
-
- if use wxwidgets; then
- WX_GTK_VER="2.8"
- need-wxwidgets unicode
- fi
-
- tc-export CC CXX #453174
-
- econf \
- --without-pdf \
- --with-texdir="${TEXMF}/tex/latex/${PN}" \
- --with-readline=$(usex readline gnu builtin) \
- --without-lisp-files \
- $(use_with bitmap bitmap-terminals) \
- $(use_with cairo) \
- $(use_with doc tutorial) \
- $(use_with gd) \
- "$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
- "$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
- $(use_with lua) \
- "$(use_with plotutils plot "${EPREFIX}/usr/$(get_libdir)")" \
- $(use_with svga linux-vga) \
- $(use_with X x) \
- --enable-stats \
- $(use_enable qt4 qt) \
- $(use_enable thin-splines) \
- $(use_enable wxwidgets) \
- DIST_CONTACT="http://bugs.gentoo.org/" \
- EMACS=no
-}
-
-src_compile() {
- # Prevent access violations, see bug 201871
- VARTEXFONTS="${T}/fonts"
-
- # We believe that the following line is no longer needed.
- # In case of problems file a bug report at bugs.gentoo.org.
- #addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
- emake all
-
- if use doc; then
- # Avoid sandbox violation in epstopdf/ghostscript
- addpredict /var/cache/fontconfig
- emake -C docs pdf
- emake -C tutorial pdf
- fi
-}
-
-src_install () {
- emake DESTDIR="${D}" install
-
- 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
- readme.gentoo_create_doc
-
- if use examples; then
- # Demo files
- insinto /usr/share/${PN}/${GP_VERSION}
- doins -r demo
- rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
- rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
- fi
-
- if use doc; then
- # Manual, tutorial, FAQ
- dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
- # Documentation for making PostScript files
- docinto psdoc
- dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
- fi
-}
-
-src_test() {
- GNUTERM="unknown" default_src_test
-}
-
-pkg_postinst() {
- use latex && texmf-update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- use latex && texmf-update
-}
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index f95b022..cccec8e 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -21,7 +21,6 @@
<flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
Needed for GIF, JPEG, and PNG image output.</flag>
<flag name="libcerf">Enable special functions from <pkg>sci-libs/libcerf</pkg></flag>
- <flag name="thin-splines">Enable thin plate splines</flag>
<flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2015-09-23 12:48 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2015-09-23 12:48 UTC (permalink / raw
To: gentoo-commits
commit: 158e1ac2f66a58267b358ad0bd6d3a5f93dd5f0c
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 12:06:53 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 12:06:53 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=158e1ac2
sci-visualization/gnuplot: Use default functions
Package-Manager: portage-2.2.21
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild | 2 +-
sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild | 2 +-
sci-visualization/gnuplot/metadata.xml | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
index ea423fb..9c63fe4 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
@@ -154,7 +154,7 @@ src_compile() {
}
src_install () {
- emake DESTDIR="${D}" install
+ default
dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
newdoc term/PostScript/README README-ps
diff --git a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
index 3d97427..d7c805a 100644
--- a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
@@ -157,7 +157,7 @@ src_compile() {
}
src_install () {
- emake DESTDIR="${D}" install
+ default
dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
newdoc term/PostScript/README README-ps
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index cccec8e..8178349 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -16,11 +16,11 @@
three-dimensional plots in many different formats. It is designed
primarily for the visual display of scientific data.
</longdescription>
-<use>
- <flag name="compat">Enable backwards compatibility with version 4 syntax</flag>
+ <use>
+ <flag name="compat">Enable backwards compatibility with version 4 syntax</flag>
<flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
Needed for GIF, JPEG, and PNG image output.</flag>
-<flag name="libcerf">Enable special functions from <pkg>sci-libs/libcerf</pkg></flag>
+ <flag name="libcerf">Enable special functions from <pkg>sci-libs/libcerf</pkg></flag>
<flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2015-12-18 21:09 Christoph Junghans
0 siblings, 0 replies; 32+ messages in thread
From: Christoph Junghans @ 2015-12-18 21:09 UTC (permalink / raw
To: gentoo-commits
commit: a3cf45618c6e9de77455e4749972be01e0734227
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 21:09:09 2015 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 21:09:50 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a3cf4561
sci-visualization/gnuplot: added missing subslot (bug #568628)
Package-Manager: portage-2.2.24
sci-visualization/gnuplot/ChangeLog | 4 ++++
sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild | 2 +-
sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 6dab9ab..8baffe8 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 18 Dec 2015; Christoph Junghans <ottxor@gentoo.org> gnuplot-5.0.9999.ebuild,
+ gnuplot-5.1.9999.ebuild:
+ sci-visualization/gnuplot: added missing subslot (bug #568628)
+
25 May 2015; Christoph Junghans <ottxor@gentoo.org> -gnuplot-4.6.9999.ebuild,
metadata.xml:
remove old
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
index 9c63fe4..683f71b 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
cairo? (
x11-libs/cairo
x11-libs/pango )
- gd? ( >=media-libs/gd-2.0.35-r3[png] )
+ gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
ggi? ( media-libs/libggi )
latex? (
virtual/latex-base
diff --git a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
index d7c805a..b5989e8 100644
--- a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
cairo? (
x11-libs/cairo
x11-libs/pango )
- gd? ( >=media-libs/gd-2.0.35-r3[png] )
+ gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
ggi? ( media-libs/libggi )
latex? (
virtual/latex-base
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2016-02-11 9:11 Justin Lecher
0 siblings, 0 replies; 32+ messages in thread
From: Justin Lecher @ 2016-02-11 9:11 UTC (permalink / raw
To: gentoo-commits
commit: 575dcdce2cb50884f74679f3dc164115bf9d5c90
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 11 09:11:10 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Feb 11 09:11:10 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=575dcdce
sci-visualization/gnuplot: Move to nextgen readme.gentoo eclass
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild | 4 ++--
sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
index 683f71b..ad098d2 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-inherit eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
+inherit eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs wxwidgets
DESCRIPTION="Command-line driven interactive plotting program"
HOMEPAGE="http://www.gnuplot.info/"
diff --git a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
index b5989e8..989bfc8 100644
--- a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-inherit eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
+inherit eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs wxwidgets
DESCRIPTION="Command-line driven interactive plotting program"
HOMEPAGE="http://www.gnuplot.info/"
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/
@ 2016-06-10 16:09 Andreas Hüttel
0 siblings, 0 replies; 32+ messages in thread
From: Andreas Hüttel @ 2016-06-10 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 384ac33797e99c384d06414cb3124cec30867638
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 16:05:51 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 16:05:51 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=384ac337
sci-visualization/gnuplot: Remove; moved to main tree
sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild | 193 ---------------------
sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild | 196 ----------------------
sci-visualization/gnuplot/metadata.xml | 32 ----
3 files changed, 421 deletions(-)
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
deleted file mode 100644
index ad098d2..0000000
--- a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs wxwidgets
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-
-if [[ -z ${PV%%*9999} ]]; then
- inherit autotools cvs
- ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
- ECVS_MODULE="gnuplot"
- ECVS_BRANCH="branch-5-0-stable"
- ECVS_USER="anonymous"
- ECVS_CVS_OPTIONS="-dP"
- MY_P="${PN}"
- SRC_URI=""
- KEYWORDS=""
-else
- MY_P="${P/_/.}"
- SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
- inherit autotools
-fi
-
-LICENSE="gnuplot bitmap? ( free-noncomm )"
-SLOT="0"
-IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
-
-RDEPEND="
- cairo? (
- x11-libs/cairo
- x11-libs/pango )
- gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
- ggi? ( media-libs/libggi )
- latex? (
- virtual/latex-base
- lua? (
- dev-tex/pgf
- >=dev-texlive/texlive-latexrecommended-2008-r2 ) )
- libcaca? ( media-libs/libcaca )
- lua? ( dev-lang/lua:0 )
- qt4? ( >=dev-qt/qtcore-4.5:4
- >=dev-qt/qtgui-4.5:4
- >=dev-qt/qtsvg-4.5:4 )
- readline? ( sys-libs/readline:0 )
- libcerf? ( sci-libs/libcerf )
- svga? ( media-libs/svgalib )
- wxwidgets? (
- x11-libs/wxGTK:2.8[X]
- x11-libs/cairo
- x11-libs/pango
- x11-libs/gtk+:2 )
- X? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? (
- virtual/latex-base
- dev-texlive/texlive-latexextra
- app-text/ghostscript-gpl )"
-
-S="${WORKDIR}/${MY_P}"
-
-GP_VERSION="${PV%.*}"
-E_SITEFILE="lisp/50${PN}-gentoo.el"
-TEXMF="${EPREFIX}/usr/share/texmf-site"
-
-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
- done
- eautoreconf
- fi
-
- # Add special version identification as required by provision 2
- # of the gnuplot license
- sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-
- # hacky workaround
- # Please hack the buildsystem if you like
- if use prefix && use qt4; then
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
- fi
-
- DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
- for details. You can use the "pdfcairo" terminal for PDF output.'
- use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
- use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
- SVGA console graphics, gnuplot needs to be set up as setuid root.
- Please note that this is usually considered to be a security hazard.
- As root, manually "chmod u+s /usr/bin/gnuplot".'
- use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
- you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
- environment variables. See the FAQ file in /usr/share/doc/${PF}/
- for more information.'
-}
-
-src_configure() {
- if ! use latex; then
- sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
- fi
-
- if use wxwidgets; then
- WX_GTK_VER="2.8"
- need-wxwidgets unicode
- fi
-
- tc-export CC CXX #453174
-
- econf \
- --without-pdf \
- --with-texdir="${TEXMF}/tex/latex/${PN}" \
- --with-readline=$(usex readline gnu builtin) \
- $(use_with bitmap bitmap-terminals) \
- $(use_with cairo) \
- $(use_enable compat backwards-compatibility) \
- $(use_with doc tutorial) \
- $(use_with gd) \
- "$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
- "$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
- "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
- $(use_with libcerf) \
- $(use_with lua) \
- $(use_with svga linux-vga) \
- $(use_with X x) \
- --enable-stats \
- $(use_with qt4 qt qt4) \
- $(use_enable wxwidgets) \
- DIST_CONTACT="http://bugs.gentoo.org/" \
- EMACS=no
-}
-
-src_compile() {
- # Prevent access violations, see bug 201871
- VARTEXFONTS="${T}/fonts"
-
- # We believe that the following line is no longer needed.
- # In case of problems file a bug report at bugs.gentoo.org.
- #addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
- emake all
-
- if use doc; then
- # Avoid sandbox violation in epstopdf/ghostscript
- addpredict /var/cache/fontconfig
- emake -C docs gnuplot.pdf
- emake -C tutorial pdf
- fi
-}
-
-src_install () {
- default
-
- 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
- readme.gentoo_create_doc
-
- if use examples; then
- # Demo files
- insinto /usr/share/${PN}/${GP_VERSION}
- doins -r demo
- rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
- rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
- fi
-
- if use doc; then
- # Manual, tutorial, FAQ
- dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
- # Documentation for making PostScript files
- docinto psdoc
- dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
- fi
-}
-
-src_test() {
- GNUTERM="unknown" default_src_test
-}
-
-pkg_postinst() {
- use latex && texmf-update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- use latex && texmf-update
-}
diff --git a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
deleted file mode 100644
index 989bfc8..0000000
--- a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs wxwidgets
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-
-if [[ -z ${PV%%*9999} ]]; then
- inherit autotools cvs
- ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
- ECVS_MODULE="gnuplot"
- ECVS_BRANCH="HEAD"
- ECVS_USER="anonymous"
- ECVS_CVS_OPTIONS="-dP"
- MY_P="${PN}"
- SRC_URI=""
- KEYWORDS=""
-else
- MY_P="${P/_/.}"
- SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
- 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"
- inherit autotools
-fi
-
-LICENSE="gnuplot bitmap? ( free-noncomm )"
-SLOT="0"
-IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
-
-RDEPEND="
- cairo? (
- x11-libs/cairo
- x11-libs/pango )
- gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
- ggi? ( media-libs/libggi )
- latex? (
- virtual/latex-base
- lua? (
- dev-tex/pgf
- >=dev-texlive/texlive-latexrecommended-2008-r2 ) )
- libcaca? ( media-libs/libcaca )
- lua? ( dev-lang/lua:0 )
- qt4? ( >=dev-qt/qtcore-4.5:4
- >=dev-qt/qtgui-4.5:4
- >=dev-qt/qtsvg-4.5:4 )
- readline? ( sys-libs/readline:0 )
- libcerf? ( sci-libs/libcerf )
- svga? ( media-libs/svgalib )
- wxwidgets? (
- x11-libs/wxGTK:2.8[X]
- x11-libs/cairo
- x11-libs/pango
- x11-libs/gtk+:2 )
- X? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? (
- virtual/latex-base
- dev-texlive/texlive-latexextra
- app-text/ghostscript-gpl )"
-
-S="${WORKDIR}/${MY_P}"
-
-GP_VERSION="${PV%.*}"
-E_SITEFILE="lisp/50${PN}-gentoo.el"
-TEXMF="${EPREFIX}/usr/share/texmf-site"
-
-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
- done
- eautoreconf
- else
- epatch "${FILESDIR}/${PN}-5.0_rc1-libcerf.patch"
- eautoreconf
- fi
-
- # Add special version identification as required by provision 2
- # of the gnuplot license
- sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-
- # hacky workaround
- # Please hack the buildsystem if you like
- if use prefix && use qt4; then
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
- fi
-
- DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
- for details. You can use the "pdfcairo" terminal for PDF output.'
- use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
- use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
- SVGA console graphics, gnuplot needs to be set up as setuid root.
- Please note that this is usually considered to be a security hazard.
- As root, manually "chmod u+s /usr/bin/gnuplot".'
- use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
- you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
- environment variables. See the FAQ file in /usr/share/doc/${PF}/
- for more information.'
-}
-
-src_configure() {
- if ! use latex; then
- sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
- fi
-
- if use wxwidgets; then
- WX_GTK_VER="2.8"
- need-wxwidgets unicode
- fi
-
- tc-export CC CXX #453174
-
- econf \
- --without-pdf \
- --with-texdir="${TEXMF}/tex/latex/${PN}" \
- --with-readline=$(usex readline gnu builtin) \
- $(use_with bitmap bitmap-terminals) \
- $(use_with cairo) \
- $(use_enable compat backwards-compatibility) \
- $(use_with doc tutorial) \
- $(use_with gd) \
- "$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
- "$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
- "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
- $(use_with libcerf) \
- $(use_with lua) \
- $(use_with svga linux-vga) \
- $(use_with X x) \
- --enable-stats \
- $(use_with qt4 qt qt4) \
- $(use_enable wxwidgets) \
- DIST_CONTACT="http://bugs.gentoo.org/" \
- EMACS=no
-}
-
-src_compile() {
- # Prevent access violations, see bug 201871
- VARTEXFONTS="${T}/fonts"
-
- # We believe that the following line is no longer needed.
- # In case of problems file a bug report at bugs.gentoo.org.
- #addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
- emake all
-
- if use doc; then
- # Avoid sandbox violation in epstopdf/ghostscript
- addpredict /var/cache/fontconfig
- emake -C docs gnuplot.pdf
- emake -C tutorial pdf
- fi
-}
-
-src_install () {
- default
-
- 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
- readme.gentoo_create_doc
-
- if use examples; then
- # Demo files
- insinto /usr/share/${PN}/${GP_VERSION}
- doins -r demo
- rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
- rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
- fi
-
- if use doc; then
- # Manual, tutorial, FAQ
- dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
- # Documentation for making PostScript files
- docinto psdoc
- dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
- fi
-}
-
-src_test() {
- GNUTERM="unknown" default_src_test
-}
-
-pkg_postinst() {
- use latex && texmf-update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- use latex && texmf-update
-}
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
deleted file mode 100644
index b6f49a5..0000000
--- a/sci-visualization/gnuplot/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>ulm@gentoo.org</email>
- <name>Ulrich Müller</name>
- </maintainer>
- <maintainer type="person">
- <email>ottxor@gentoo.org</email>
- <name>Christoph Junghans</name>
- </maintainer>
- <maintainer type="project">
- <email>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <longdescription>
- Gnuplot is a command-driven interactive function plotting program.
- It can be used to plot functions and data points in both two- and
- three-dimensional plots in many different formats. It is designed
- primarily for the visual display of scientific data.
-</longdescription>
- <use>
- <flag name="compat">Enable backwards compatibility with version 4 syntax</flag>
- <flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
- Needed for GIF, JPEG, and PNG image output.</flag>
- <flag name="libcerf">Enable special functions from <pkg>sci-libs/libcerf</pkg></flag>
- <flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">gnuplot</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 32+ messages in thread
end of thread, other threads:[~2016-06-10 16:09 UTC | newest]
Thread overview: 32+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-28 13:09 [gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/ Christoph Junghans
-- strict thread matches above, loose matches on Subject: below --
2016-06-10 16:09 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
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-08 14:47 Christoph Junghans
2011-02-23 19:44 Christoph Junghans
2011-02-22 21:27 Christoph Junghans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox