| 1 |
ulm 11/05/29 09:17:18 |
| 2 |
|
| 3 |
Modified: ChangeLog gnuplot-4.4.3-r1.ebuild |
| 4 |
Log: |
| 5 |
Don't depend on Emacs with USE="-emacs -xemacs". Update outdated texinfo file, bug 366129. |
| 6 |
|
| 7 |
(Portage version: 2.1.9.49/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.156 sci-visualization/gnuplot/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/ChangeLog?rev=1.156&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/ChangeLog?rev=1.156&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/ChangeLog?r1=1.155&r2=1.156 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v |
| 19 |
retrieving revision 1.155 |
| 20 |
retrieving revision 1.156 |
| 21 |
diff -u -r1.155 -r1.156 |
| 22 |
--- ChangeLog 28 May 2011 12:54:20 -0000 1.155 |
| 23 |
+++ ChangeLog 29 May 2011 09:17:18 -0000 1.156 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for sci-visualization/gnuplot |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.155 2011/05/28 12:54:20 ottxor Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.156 2011/05/29 09:17:18 ulm Exp $ |
| 29 |
+ |
| 30 |
+ 29 May 2011; Ulrich Mueller <ulm@g.o> gnuplot-4.4.3-r1.ebuild: |
| 31 |
+ Don't depend on Emacs with USE="-emacs -xemacs". Update outdated texinfo |
| 32 |
+ file, bug 366129. |
| 33 |
|
| 34 |
*gnuplot-4.4.3-r1 (28 May 2011) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.2 sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild?rev=1.2&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild?rev=1.2&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild?r1=1.1&r2=1.2 |
| 44 |
|
| 45 |
Index: gnuplot-4.4.3-r1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild,v |
| 48 |
retrieving revision 1.1 |
| 49 |
retrieving revision 1.2 |
| 50 |
diff -u -r1.1 -r1.2 |
| 51 |
--- gnuplot-4.4.3-r1.ebuild 28 May 2011 12:54:20 -0000 1.1 |
| 52 |
+++ gnuplot-4.4.3-r1.ebuild 29 May 2011 09:17:18 -0000 1.2 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2011 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild,v 1.1 2011/05/28 12:54:20 ottxor Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild,v 1.2 2011/05/29 09:17:18 ulm Exp $ |
| 58 |
|
| 59 |
EAPI=3 |
| 60 |
|
| 61 |
@@ -20,7 +20,8 @@ |
| 62 |
SRC_URI="" |
| 63 |
else |
| 64 |
MY_P="${P/_/-}" |
| 65 |
- SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz" |
| 66 |
+ SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz |
| 67 |
+ mirror://gentoo/${P}-texinfo-update.patch.gz" |
| 68 |
fi |
| 69 |
|
| 70 |
LICENSE="gnuplot GPL-2" |
| 71 |
@@ -54,8 +55,7 @@ |
| 72 |
dev-util/pkgconfig |
| 73 |
doc? ( virtual/latex-base |
| 74 |
app-text/ghostscript-gpl ) |
| 75 |
- !emacs? ( xemacs? ( app-xemacs/texinfo ) ) |
| 76 |
- !emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )" |
| 77 |
+ !emacs? ( xemacs? ( app-xemacs/texinfo ) )" |
| 78 |
|
| 79 |
S="${WORKDIR}/${MY_P}" |
| 80 |
GP_VERSION="${PV%.*}" |
| 81 |
@@ -70,6 +70,8 @@ |
| 82 |
die "make -f Makefile.am.in Makefile.am in $dir failed" |
| 83 |
done |
| 84 |
eautoreconf |
| 85 |
+ else |
| 86 |
+ epatch "${WORKDIR}"/${P}-texinfo-update.patch |
| 87 |
fi |
| 88 |
|
| 89 |
# Add special version identification as required by provision 2 |
| 90 |
@@ -106,15 +108,9 @@ |
| 91 |
&& myconf="${myconf} --with-readline=gnu" \ |
| 92 |
|| myconf="${myconf} --with-readline=builtin" |
| 93 |
|
| 94 |
- if has_version virtual/emacs; then |
| 95 |
- emacs="emacs" |
| 96 |
- elif has_version app-xemacs/texinfo; then |
| 97 |
- emacs="xemacs" |
| 98 |
- fi |
| 99 |
- |
| 100 |
econf ${myconf} \ |
| 101 |
DIST_CONTACT="http://bugs.gentoo.org/" \ |
| 102 |
- EMACS="${emacs}" |
| 103 |
+ EMACS=$(usev emacs || usev xemacs) |
| 104 |
|
| 105 |
if use xemacs; then |
| 106 |
einfo "Configuring gnuplot-mode for XEmacs ..." |
Archives