| 1 |
ulm 13/03/04 11:37:51 |
| 2 |
|
| 3 |
Modified: ChangeLog gnuplot-4.6.1-r1.ebuild |
| 4 |
Log: |
| 5 |
Simplify logic in src_configure. |
| 6 |
|
| 7 |
(Portage version: 2.1.11.53/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.209 sci-visualization/gnuplot/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/ChangeLog?rev=1.209&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/ChangeLog?rev=1.209&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/ChangeLog?r1=1.208&r2=1.209 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v |
| 19 |
retrieving revision 1.208 |
| 20 |
retrieving revision 1.209 |
| 21 |
diff -u -r1.208 -r1.209 |
| 22 |
--- ChangeLog 2 Mar 2013 23:27:51 -0000 1.208 |
| 23 |
+++ ChangeLog 4 Mar 2013 11:37:51 -0000 1.209 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for sci-visualization/gnuplot |
| 26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.208 2013/03/02 23:27:51 hwoarang Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.209 2013/03/04 11:37:51 ulm Exp $ |
| 29 |
+ |
| 30 |
+ 04 Mar 2013; Ulrich Müller <ulm@g.o> gnuplot-4.6.1-r1.ebuild: |
| 31 |
+ Simplify logic in src_configure. |
| 32 |
|
| 33 |
02 Mar 2013; Markos Chandras <hwoarang@g.o> gnuplot-4.6.0.ebuild, |
| 34 |
gnuplot-4.6.1-r1.ebuild, gnuplot-4.6.1.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.4 sci-visualization/gnuplot/gnuplot-4.6.1-r1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.1-r1.ebuild?rev=1.4&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.1-r1.ebuild?rev=1.4&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.1-r1.ebuild?r1=1.3&r2=1.4 |
| 43 |
|
| 44 |
Index: gnuplot-4.6.1-r1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.1-r1.ebuild,v |
| 47 |
retrieving revision 1.3 |
| 48 |
retrieving revision 1.4 |
| 49 |
diff -u -r1.3 -r1.4 |
| 50 |
--- gnuplot-4.6.1-r1.ebuild 2 Mar 2013 23:27:51 -0000 1.3 |
| 51 |
+++ gnuplot-4.6.1-r1.ebuild 4 Mar 2013 11:37:51 -0000 1.4 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2013 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.1-r1.ebuild,v 1.3 2013/03/02 23:27:51 hwoarang Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.1-r1.ebuild,v 1.4 2013/03/04 11:37:51 ulm Exp $ |
| 57 |
|
| 58 |
EAPI=5 |
| 59 |
|
| 60 |
@@ -67,7 +67,7 @@ |
| 61 |
if [[ -z ${PV%%*9999} ]]; then |
| 62 |
# The live ebuild always needs an Emacs for building of gnuplot.texi |
| 63 |
DEPEND="${DEPEND} |
| 64 |
- !emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )" |
| 65 |
+ || ( virtual/emacs app-xemacs/texinfo )" |
| 66 |
fi |
| 67 |
|
| 68 |
S="${WORKDIR}/${MY_P}" |
| 69 |
@@ -98,15 +98,15 @@ |
| 70 |
fi |
| 71 |
|
| 72 |
DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog |
| 73 |
- for details. You can use the "pdfcairo" terminal for PDF output.' |
| 74 |
- use cairo || DOC_CONTENTS+=' It is available with USE="cairo".' |
| 75 |
+ for details. You can use the "pdfcairo" terminal for PDF output.' |
| 76 |
+ use cairo || DOC_CONTENTS+=' It is available with USE="cairo".' |
| 77 |
use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use |
| 78 |
SVGA console graphics, gnuplot needs to be set up as setuid root. |
| 79 |
Please note that this is usually considered to be a security hazard. |
| 80 |
As root, manually "chmod u+s /usr/bin/gnuplot".' |
| 81 |
use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output, |
| 82 |
you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT |
| 83 |
- environment variables. See the FAQ file in /usr/share/doc/${PF}/ |
| 84 |
+ environment variables. See the FAQ file in /usr/share/doc/${PF}/ |
| 85 |
for more information.' |
| 86 |
} |
| 87 |
|
| 88 |
@@ -122,27 +122,6 @@ |
| 89 |
|
| 90 |
tc-export CC CXX #453174 |
| 91 |
|
| 92 |
- local myconf |
| 93 |
- myconf="${myconf} --without-pdf" |
| 94 |
- myconf="${myconf} --enable-stats" #extra command save to be enabled |
| 95 |
- myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}" |
| 96 |
- myconf="${myconf} $(use_with bitmap bitmap-terminals)" |
| 97 |
- myconf="${myconf} $(use_with cairo)" |
| 98 |
- myconf="${myconf} $(use_with doc tutorial)" |
| 99 |
- myconf="${myconf} $(use_with gd)" |
| 100 |
- myconf="${myconf} $(use_with ggi ggi ${EPREFIX}/usr/$(get_libdir))" |
| 101 |
- myconf="${myconf} $(use_with ggi xmi ${EPREFIX}/usr/$(get_libdir))" |
| 102 |
- myconf="${myconf} $(use_with lua)" |
| 103 |
- myconf="${myconf} $(use_with plotutils plot "${EPREFIX}"/usr/$(get_libdir))" |
| 104 |
- myconf="${myconf} $(use_with svga linux-vga)" |
| 105 |
- myconf="${myconf} $(use_enable thin-splines)" |
| 106 |
- myconf="${myconf} $(use_enable wxwidgets)" |
| 107 |
- myconf="${myconf} $(use_with X x)" |
| 108 |
- myconf="${myconf} $(use_enable qt4 qt)" |
| 109 |
- use readline \ |
| 110 |
- && myconf="${myconf} --with-readline=gnu" \ |
| 111 |
- || myconf="${myconf} --with-readline=builtin" |
| 112 |
- |
| 113 |
local emacs lispdir |
| 114 |
if use emacs; then |
| 115 |
emacs=emacs |
| 116 |
@@ -154,7 +133,7 @@ |
| 117 |
lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/${PN}" |
| 118 |
else |
| 119 |
emacs=no |
| 120 |
- myconf="${myconf} --without-lisp-files" |
| 121 |
+ lispdir="" |
| 122 |
if [[ -z ${PV%%*9999} ]]; then |
| 123 |
# Live ebuild needs an Emacs to build gnuplot.texi |
| 124 |
if has_version virtual/emacs; then emacs=emacs |
| 125 |
@@ -162,9 +141,28 @@ |
| 126 |
fi |
| 127 |
fi |
| 128 |
|
| 129 |
- econf ${myconf} \ |
| 130 |
+ econf \ |
| 131 |
+ --without-pdf \ |
| 132 |
+ --with-texdir="${TEXMF}/tex/latex/${PN}" \ |
| 133 |
+ --with-readline=$(usex readline gnu builtin) \ |
| 134 |
+ --with-lispdir="${lispdir}" \ |
| 135 |
+ --with$([[ -z ${lispdir} ]] && echo out)-lisp-files \ |
| 136 |
+ $(use_with bitmap bitmap-terminals) \ |
| 137 |
+ $(use_with cairo) \ |
| 138 |
+ $(use_with doc tutorial) \ |
| 139 |
+ $(use_with gd) \ |
| 140 |
+ "$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \ |
| 141 |
+ "$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \ |
| 142 |
+ $(use_with lua) \ |
| 143 |
+ "$(use_with plotutils plot "${EPREFIX}/usr/$(get_libdir)")" \ |
| 144 |
+ $(use_with svga linux-vga) \ |
| 145 |
+ $(use_with X x) \ |
| 146 |
+ --enable-stats \ |
| 147 |
+ $(use_enable qt4 qt) \ |
| 148 |
+ $(use_enable thin-splines) \ |
| 149 |
+ $(use_enable wxwidgets) \ |
| 150 |
DIST_CONTACT="http://bugs.gentoo.org/" \ |
| 151 |
- EMACS="${emacs}" --with-lispdir="${lispdir}" |
| 152 |
+ EMACS="${emacs}" |
| 153 |
} |
| 154 |
|
| 155 |
src_compile() { |
Archives