| 1 |
commit: d61fbda324953e661a27e2d4a72a1e71dbf5714d |
| 2 |
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 22 21:37:41 2011 +0000 |
| 4 |
Commit: Christoph Junghans <kleiner_otti <AT> gmx <DOT> de> |
| 5 |
CommitDate: Tue Feb 22 21:37:41 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d61fbda3 |
| 7 |
|
| 8 |
[sci-visualization/gnuplot] removed pdf use flag + bump to EAPI=3 |
| 9 |
|
| 10 |
(Portage version: 2.1.9.25/git/Linux i686, signed Manifest commit with key C2000586) |
| 11 |
|
| 12 |
--- |
| 13 |
sci-visualization/gnuplot/ChangeLog | 6 +++- |
| 14 |
sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild | 37 ++++++++++----------- |
| 15 |
sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild | 36 +++++++++----------- |
| 16 |
3 files changed, 40 insertions(+), 39 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog |
| 19 |
index 4d124d3..3b647c1 100644 |
| 20 |
--- a/sci-visualization/gnuplot/ChangeLog |
| 21 |
+++ b/sci-visualization/gnuplot/ChangeLog |
| 22 |
@@ -1,7 +1,11 @@ |
| 23 |
# ChangeLog for sci-visualization/gnuplot |
| 24 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
# $Header: $ |
| 27 |
|
| 28 |
+ 22 Feb 2011; Christoph Junghans <ottxor@g.o> gnuplot-4.4.9999.ebuild, |
| 29 |
+ gnuplot-4.5.9999.ebuild: |
| 30 |
+ removed pdf use flag + bump to EAPI=3 |
| 31 |
+ |
| 32 |
20 Mar 2010; Christoph Junghans <kleiner_otti@×××.de> |
| 33 |
-files/gnuplot-4.2.2-disable_texi_generation.patch, |
| 34 |
-gnuplot-4.4.0_rc1.ebuild, -files/gnuplot-4.4.0_rc1-app-defaults.patch, |
| 35 |
|
| 36 |
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild |
| 37 |
index 770a887..9c29c61 100644 |
| 38 |
--- a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild |
| 39 |
+++ b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild |
| 40 |
@@ -1,8 +1,8 @@ |
| 41 |
-# Copyright 1999-2010 Gentoo Foundation |
| 42 |
+# Copyright 1999-2011 Gentoo Foundation |
| 43 |
# Distributed under the terms of the GNU General Public License v2 |
| 44 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild,v 1.1 2010/03/14 14:37:17 ulm Exp $ |
| 45 |
+# $Header: $ |
| 46 |
|
| 47 |
-EAPI=2 |
| 48 |
+EAPI=3 |
| 49 |
|
| 50 |
inherit autotools cvs elisp-common multilib wxwidgets |
| 51 |
|
| 52 |
@@ -17,14 +17,14 @@ ECVS_CVS_OPTIONS="-dP" |
| 53 |
|
| 54 |
LICENSE="gnuplot GPL-2" |
| 55 |
SLOT="0" |
| 56 |
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd" |
| 57 |
-IUSE="cairo doc emacs +gd ggi latex lua pdf plotutils readline svga thin-splines wxwidgets X xemacs" |
| 58 |
+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" |
| 59 |
+IUSE="cairo doc emacs +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs" |
| 60 |
+ |
| 61 |
RESTRICT="wxwidgets? ( test )" |
| 62 |
|
| 63 |
RDEPEND="!app-emacs/gnuplot-mode |
| 64 |
cairo? ( x11-libs/cairo |
| 65 |
- x11-libs/pango |
| 66 |
- >=x11-libs/gtk+-2.8 ) |
| 67 |
+ x11-libs/pango ) |
| 68 |
emacs? ( virtual/emacs ) |
| 69 |
gd? ( media-libs/gd[png] ) |
| 70 |
ggi? ( media-libs/libggi ) |
| 71 |
@@ -32,14 +32,13 @@ RDEPEND="!app-emacs/gnuplot-mode |
| 72 |
lua? ( dev-tex/pgf |
| 73 |
>=dev-texlive/texlive-latexrecommended-2008-r2 ) ) |
| 74 |
lua? ( dev-lang/lua ) |
| 75 |
- pdf? ( media-libs/pdflib ) |
| 76 |
plotutils? ( media-libs/plotutils ) |
| 77 |
readline? ( sys-libs/readline ) |
| 78 |
svga? ( media-libs/svgalib ) |
| 79 |
wxwidgets? ( x11-libs/wxGTK:2.8[X] |
| 80 |
x11-libs/cairo |
| 81 |
x11-libs/pango |
| 82 |
- >=x11-libs/gtk+-2.8 ) |
| 83 |
+ >=x11-libs/gtk+-2.8:2 ) |
| 84 |
X? ( x11-libs/libXaw ) |
| 85 |
xemacs? ( app-editors/xemacs |
| 86 |
app-xemacs/xemacs-base |
| 87 |
@@ -52,7 +51,7 @@ DEPEND="${RDEPEND} |
| 88 |
S="${WORKDIR}/${PN}" |
| 89 |
GP_VERSION="${PV%.*}" |
| 90 |
E_SITEFILE="50${PN}-gentoo.el" |
| 91 |
-TEXMF="/usr/share/texmf-site" |
| 92 |
+TEXMF="${EPREFIX}/usr/share/texmf-site" |
| 93 |
|
| 94 |
src_prepare() { |
| 95 |
local dir |
| 96 |
@@ -80,15 +79,15 @@ src_configure() { |
| 97 |
|
| 98 |
local myconf |
| 99 |
myconf="${myconf} --without-lisp-files" |
| 100 |
+ myconf="${myconf} --without-pdf" |
| 101 |
myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}" |
| 102 |
myconf="${myconf} $(use_with cairo)" |
| 103 |
myconf="${myconf} $(use_with doc tutorial)" |
| 104 |
myconf="${myconf} $(use_with gd)" |
| 105 |
- myconf="${myconf} $(use_with ggi ggi /usr/$(get_libdir))" |
| 106 |
- myconf="${myconf} $(use_with ggi xmi /usr/$(get_libdir))" |
| 107 |
+ myconf="${myconf} $(use_with ggi ggi ${EPREFIX}/usr/$(get_libdir))" |
| 108 |
+ myconf="${myconf} $(use_with ggi xmi ${EPREFIX}/usr/$(get_libdir))" |
| 109 |
myconf="${myconf} $(use_with lua)" |
| 110 |
- myconf="${myconf} $(use_with pdf pdf /usr/$(get_libdir))" |
| 111 |
- myconf="${myconf} $(use_with plotutils plot /usr/$(get_libdir))" |
| 112 |
+ myconf="${myconf} $(use_with plotutils plot "${EPREFIX}"/usr/$(get_libdir))" |
| 113 |
myconf="${myconf} $(use_with svga linux-vga)" |
| 114 |
myconf="${myconf} $(use_enable thin-splines)" |
| 115 |
myconf="${myconf} $(use_enable wxwidgets)" |
| 116 |
@@ -103,13 +102,13 @@ src_configure() { |
| 117 |
einfo "Configuring gnuplot-mode for XEmacs ..." |
| 118 |
use emacs && cp -Rp lisp lisp-xemacs || ln -s lisp lisp-xemacs |
| 119 |
cd "${S}/lisp-xemacs" |
| 120 |
- econf --with-lispdir="/usr/lib/xemacs/site-packages/${PN}" EMACS=xemacs |
| 121 |
+ econf --with-lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/${PN}" EMACS=xemacs |
| 122 |
fi |
| 123 |
|
| 124 |
if use emacs; then |
| 125 |
einfo "Configuring gnuplot-mode for GNU Emacs ..." |
| 126 |
cd "${S}/lisp" |
| 127 |
- econf --with-lispdir="${SITELISP}/${PN}" EMACS=emacs |
| 128 |
+ econf --with-lispdir="${EPREFIX}${SITELISP}/${PN}" EMACS=emacs |
| 129 |
fi |
| 130 |
} |
| 131 |
|
| 132 |
@@ -161,7 +160,7 @@ src_install () { |
| 133 |
cd "${S}/lisp" |
| 134 |
emake DESTDIR="${D}" install || die |
| 135 |
# info-look* is included with >=emacs-21 |
| 136 |
- rm -f "${D}${SITELISP}/${PN}"/info-look* |
| 137 |
+ rm -f "${ED}${SITELISP}/${PN}"/info-look* |
| 138 |
|
| 139 |
# Gentoo emacs site-lisp configuration |
| 140 |
echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE} |
| 141 |
@@ -179,8 +178,8 @@ src_install () { |
| 142 |
# Demo files |
| 143 |
insinto /usr/share/${PN}/${GP_VERSION} |
| 144 |
doins -r demo || die |
| 145 |
- rm -f "${D}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile* |
| 146 |
- rm -f "${D}"/usr/share/${PN}/${GP_VERSION}/demo/binary* |
| 147 |
+ rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile* |
| 148 |
+ rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary* |
| 149 |
# Manual |
| 150 |
dodoc docs/gnuplot.pdf |
| 151 |
# Tutorial |
| 152 |
|
| 153 |
diff --git a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild |
| 154 |
index 879865b..7d4a575 100644 |
| 155 |
--- a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild |
| 156 |
+++ b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild |
| 157 |
@@ -1,8 +1,8 @@ |
| 158 |
-# Copyright 1999-2010 Gentoo Foundation |
| 159 |
+# Copyright 1999-2011 Gentoo Foundation |
| 160 |
# Distributed under the terms of the GNU General Public License v2 |
| 161 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild,v 1.1 2010/03/14 14:37:17 ulm Exp $ |
| 162 |
+# $Header: $ |
| 163 |
|
| 164 |
-EAPI=2 |
| 165 |
+EAPI=3 |
| 166 |
|
| 167 |
inherit autotools cvs elisp-common multilib wxwidgets |
| 168 |
|
| 169 |
@@ -17,14 +17,13 @@ ECVS_CVS_OPTIONS="-dP" |
| 170 |
|
| 171 |
LICENSE="gnuplot GPL-2" |
| 172 |
SLOT="0" |
| 173 |
-KEYWORDS="~amd64 ~x86" |
| 174 |
-IUSE="cairo doc emacs +gd ggi latex lua pdf plotutils qt4 readline svga thin-splines wxwidgets X xemacs" |
| 175 |
+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" |
| 176 |
+IUSE="cairo doc emacs +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X xemacs" |
| 177 |
RESTRICT="wxwidgets? ( test )" |
| 178 |
|
| 179 |
RDEPEND="!app-emacs/gnuplot-mode |
| 180 |
cairo? ( x11-libs/cairo |
| 181 |
- x11-libs/pango |
| 182 |
- >=x11-libs/gtk+-2.8 ) |
| 183 |
+ x11-libs/pango ) |
| 184 |
emacs? ( virtual/emacs ) |
| 185 |
gd? ( media-libs/gd[png] ) |
| 186 |
ggi? ( media-libs/libggi ) |
| 187 |
@@ -32,7 +31,6 @@ RDEPEND="!app-emacs/gnuplot-mode |
| 188 |
lua? ( dev-tex/pgf |
| 189 |
>=dev-texlive/texlive-latexrecommended-2008-r2 ) ) |
| 190 |
lua? ( dev-lang/lua ) |
| 191 |
- pdf? ( media-libs/pdflib ) |
| 192 |
plotutils? ( media-libs/plotutils ) |
| 193 |
qt4? ( >=x11-libs/qt-core-4.5 |
| 194 |
>=x11-libs/qt-gui-4.5 |
| 195 |
@@ -42,7 +40,7 @@ RDEPEND="!app-emacs/gnuplot-mode |
| 196 |
wxwidgets? ( x11-libs/wxGTK:2.8[X] |
| 197 |
x11-libs/cairo |
| 198 |
x11-libs/pango |
| 199 |
- >=x11-libs/gtk+-2.8 ) |
| 200 |
+ >=x11-libs/gtk+-2.8:2 ) |
| 201 |
X? ( x11-libs/libXaw ) |
| 202 |
xemacs? ( app-editors/xemacs |
| 203 |
app-xemacs/xemacs-base |
| 204 |
@@ -55,7 +53,7 @@ DEPEND="${RDEPEND} |
| 205 |
S="${WORKDIR}/${PN}" |
| 206 |
GP_VERSION="${PV%.*}" |
| 207 |
E_SITEFILE="50${PN}-gentoo.el" |
| 208 |
-TEXMF="/usr/share/texmf-site" |
| 209 |
+TEXMF="${EPREFIX}/usr/share/texmf-site" |
| 210 |
|
| 211 |
src_prepare() { |
| 212 |
local dir |
| 213 |
@@ -83,15 +81,15 @@ src_configure() { |
| 214 |
|
| 215 |
local myconf |
| 216 |
myconf="${myconf} --without-lisp-files" |
| 217 |
+ myconf="${myconf} --without-pdf" |
| 218 |
myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}" |
| 219 |
myconf="${myconf} $(use_with cairo)" |
| 220 |
myconf="${myconf} $(use_with doc tutorial)" |
| 221 |
myconf="${myconf} $(use_with gd)" |
| 222 |
- myconf="${myconf} $(use_with ggi ggi /usr/$(get_libdir))" |
| 223 |
- myconf="${myconf} $(use_with ggi xmi /usr/$(get_libdir))" |
| 224 |
+ myconf="${myconf} $(use_with ggi ggi ${EPREFIX}/usr/$(get_libdir))" |
| 225 |
+ myconf="${myconf} $(use_with ggi xmi ${EPREFIX}/usr/$(get_libdir))" |
| 226 |
myconf="${myconf} $(use_with lua)" |
| 227 |
- myconf="${myconf} $(use_with pdf pdf /usr/$(get_libdir))" |
| 228 |
- myconf="${myconf} $(use_with plotutils plot /usr/$(get_libdir))" |
| 229 |
+ myconf="${myconf} $(use_with plotutils plot "${EPREFIX}"/usr/$(get_libdir))" |
| 230 |
myconf="${myconf} $(use_with svga linux-vga)" |
| 231 |
myconf="${myconf} $(use_enable thin-splines)" |
| 232 |
myconf="${myconf} $(use_enable wxwidgets)" |
| 233 |
@@ -107,13 +105,13 @@ src_configure() { |
| 234 |
einfo "Configuring gnuplot-mode for XEmacs ..." |
| 235 |
use emacs && cp -Rp lisp lisp-xemacs || ln -s lisp lisp-xemacs |
| 236 |
cd "${S}/lisp-xemacs" |
| 237 |
- econf --with-lispdir="/usr/lib/xemacs/site-packages/${PN}" EMACS=xemacs |
| 238 |
+ econf --with-lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/${PN}" EMACS=xemacs |
| 239 |
fi |
| 240 |
|
| 241 |
if use emacs; then |
| 242 |
einfo "Configuring gnuplot-mode for GNU Emacs ..." |
| 243 |
cd "${S}/lisp" |
| 244 |
- econf --with-lispdir="${SITELISP}/${PN}" EMACS=emacs |
| 245 |
+ econf --with-lispdir="${EPREFIX}${SITELISP}/${PN}" EMACS=emacs |
| 246 |
fi |
| 247 |
} |
| 248 |
|
| 249 |
@@ -165,7 +163,7 @@ src_install () { |
| 250 |
cd "${S}/lisp" |
| 251 |
emake DESTDIR="${D}" install || die |
| 252 |
# info-look* is included with >=emacs-21 |
| 253 |
- rm -f "${D}${SITELISP}/${PN}"/info-look* |
| 254 |
+ rm -f "${ED}${SITELISP}/${PN}"/info-look* |
| 255 |
|
| 256 |
# Gentoo emacs site-lisp configuration |
| 257 |
echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE} |
| 258 |
@@ -183,8 +181,8 @@ src_install () { |
| 259 |
# Demo files |
| 260 |
insinto /usr/share/${PN}/${GP_VERSION} |
| 261 |
doins -r demo || die |
| 262 |
- rm -f "${D}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile* |
| 263 |
- rm -f "${D}"/usr/share/${PN}/${GP_VERSION}/demo/binary* |
| 264 |
+ rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile* |
| 265 |
+ rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary* |
| 266 |
# Manual |
| 267 |
dodoc docs/gnuplot.pdf |
| 268 |
# Tutorial |
Archives