Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Hans de Graaff (graaff)" <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/texmacs/files: TeXmacs.desktop texmacs-1.0.6.14.patch
Date: Sat, 22 Mar 2008 13:55:46
Message-Id: E1Jd4CF-0005aV-W9@stork.gentoo.org
1 graaff 08/03/22 13:55:43
2
3 Modified: TeXmacs.desktop
4 Added: texmacs-1.0.6.14.patch
5 Log:
6 Version bump and removal of old versions
7 (Portage version: 2.1.4.4)
8
9 Revision Changes Path
10 1.3 app-office/texmacs/files/TeXmacs.desktop
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/texmacs/files/TeXmacs.desktop?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/texmacs/files/TeXmacs.desktop?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/texmacs/files/TeXmacs.desktop?r1=1.2&r2=1.3
15
16 Index: TeXmacs.desktop
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-office/texmacs/files/TeXmacs.desktop,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- TeXmacs.desktop 29 Jan 2006 11:47:43 -0000 1.2
23 +++ TeXmacs.desktop 22 Mar 2008 13:55:43 -0000 1.3
24 @@ -7,4 +7,4 @@
25 Name=TeXmacs
26 GenericName=Scientific Word Processor
27 Comment=A scientific word processing application.
28 -Categories=Application;Office;WordProcessor
29 +Categories=Application;Office;WordProcessor;
30
31
32
33 1.1 app-office/texmacs/files/texmacs-1.0.6.14.patch
34
35 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/texmacs/files/texmacs-1.0.6.14.patch?rev=1.1&view=markup
36 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/texmacs/files/texmacs-1.0.6.14.patch?rev=1.1&content-type=text/plain
37
38 Index: texmacs-1.0.6.14.patch
39 ===================================================================
40 diff --recursive -U2 TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/maxima_detect TeXmacs-1.0.6.14-src/plugins/maxima/bin/maxima_detect
41 --- TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/maxima_detect 2008-03-19 23:16:36.000000000 +0600
42 +++ TeXmacs-1.0.6.14-src/plugins/maxima/bin/maxima_detect 2008-03-22 10:12:13.000000000 +0600
43 @@ -37,4 +37,30 @@
44 }
45
46 +# maximum version
47 +V1=0; V2=0; V3=0
48 +
49 +max_ver() {
50 + if [ -z "$1" ]; then
51 + return
52 + fi
53 +
54 + if [ $1 -gt $V1 ]
55 + then V1=$1; V2=$2; V3=$3
56 + elif [ $1 -eq $V1 ]
57 + then
58 + if [ $2 -gt $V2 ]
59 + then V2=$2; V3=$3
60 + elif [ $2 -eq $V2 ]
61 + then
62 + if [ $3 -gt $V3 ]
63 + then V3=$3
64 + fi
65 + fi
66 + fi
67 +
68 + shift; shift; shift
69 + max_ver $@
70 +}
71 +
72 if [ $OSTYPE = "cygwin" ] ; then EXT='.bat'; else EXT=''; fi
73 MAXIMA=`which maxima$EXT 2>/dev/null`
74 @@ -57,16 +83,28 @@
75 if [ "$1" ]
76 then
77 - if $MAXIMA --list-avail | grep -F "version 5.9.1
78 -version 5.9.2
79 -version 5.9.3
80 -version 5.10
81 -version 5.11
82 -version 5.12
83 -version 5.13
84 -version 5.14" >/dev/null
85 + max_ver `maxima --list-avail | \
86 + grep '^version [a-z0-9\.]\+, lisp [a-z]\+$' |\
87 + sed -e 's/^version \([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\).*$/\1 \2 \3/'`
88 +
89 + GOOD=no
90 + if [ $V1 -gt 5 ]
91 + then GOOD=yes
92 + elif [ $V1 -eq 5 ]
93 + then
94 + if [ $V2 -gt 9 ]
95 + then GOOD=yes
96 + elif [ $V2 -eq 9 ]
97 + then
98 + if [ $V3 -gt 0 ]
99 + then GOOD=yes
100 + fi
101 + fi
102 + fi
103 +
104 + if [ $GOOD = yes ]
105 then
106 - # 5.9.1 or 5.9.2 or 5.9.3 or 5.10 or 5.11 or 5.12 or 5.13 or 5.14
107 + # 5.9.1 or later
108 maxima -d | grep -F 'maxima-htmldir=' | sed -e \
109 - 's/maxima-htmldir=/"/' -e 's|$|/maxima_toc.html"|'
110 + 's/maxima-htmldir=/"/' -e 's|$|/maxima_toc.html"|'
111 else
112 # 5.9.0
113 @@ -74,6 +112,9 @@
114 fi
115 else
116 - maxima --list-avail | sed -e '1d' -e 's/version /"/' \
117 - -e 's/, lisp / /' -e 's/$/"/' -e '2s/^/(/' -e '$s/$/)/'
118 + echo '('
119 + maxima --list-avail |\
120 + grep '^version [a-z0-9\.]\+, lisp [a-z]\+$' |\
121 + sed -e 's/^version \([a-z0-9\.]\+\), lisp \([a-z]\+\)$/"\1 \2"/'
122 + echo ')'
123 fi
124 else
125 diff --recursive -U2 TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/tm_maxima TeXmacs-1.0.6.14-src/plugins/maxima/bin/tm_maxima
126 --- TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/tm_maxima 2008-03-19 23:16:36.000000000 +0600
127 +++ TeXmacs-1.0.6.14-src/plugins/maxima/bin/tm_maxima 2008-03-22 10:12:13.000000000 +0600
128 @@ -5,4 +5,5 @@
129
130 case $1 in
131 + cygwin) exec maxima.bat -p "`echo $TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp|cygpath --windows -f -`";;
132 5.6)
133 case $2 in
134 @@ -11,14 +12,9 @@
135 clisp) exec maxima -i "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.6.lisp" \
136 | maxima_filter;;
137 - *) echo -e "\2latex:\\red Unsupported lisp for old maxima: $2\5"
138 esac;;
139 - 5.9.0) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.0.lisp" \
140 - | maxima_filter;;
141 - 5.9.1) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.1.lisp";;
142 - 5.9.1.1* | 5.9.2* | 5.9.3*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.2.lisp";;
143 + 5.9.0) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.0.lisp" | maxima_filter;;
144 + 5.9.1*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.1.lisp";;
145 + 5.9.2* | 5.9.3*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.2.lisp";;
146 5.10.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.10.0.lisp";;
147 - 5.11.* | 5.12.* | 5.13.* | 5.14.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp";;
148 - cygwin)
149 - exec maxima.bat -p "`echo $TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp|cygpath --windows -f -`";;
150 - *) echo -e "\2latex:\\red Unsupported version of maxima: $1\5"
151 + *) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp";;
152 esac
153
154
155
156 --
157 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups