Gentoo Archives: gentoo-commits

From: "Andreas K. Huettel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/dilfridge:master commit in: sci-electronics/tnt/, sci-electronics/tnt/files/
Date: Fri, 25 Feb 2011 07:29:53
Message-Id: fab19b1e9728b5d62c6418b7d0beb574452ee783.dilfridge@gentoo
1 commit: fab19b1e9728b5d62c6418b7d0beb574452ee783
2 Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
3 AuthorDate: Thu Feb 24 23:30:04 2011 +0000
4 Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 24 23:30:04 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=fab19b1e
7
8 [sci-electronics/tnt] General cleanup
9
10 (Portage version: 2.1.9.41/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
11
12 ---
13 sci-electronics/tnt/ChangeLog | 7 ++
14 sci-electronics/tnt/Manifest | 37 +++++------
15 .../tnt/files/tnt-1.2.2-Makefile-am.patch | 27 --------
16 .../tnt/files/tnt-1.2.2-doc-Makefile-am.patch | 37 -----------
17 sci-electronics/tnt/files/tnt-1.2.2-docs.patch | 66 ++++++++++++++++++++
18 sci-electronics/tnt/files/tnt-1.2.2-f77.patch | 14 ++++
19 .../tnt/files/tnt-1.2.2-gui-splash.patch | 11 ---
20 sci-electronics/tnt/files/tnt-1.2.2-gui.patch | 24 +++++++
21 sci-electronics/tnt/files/tnt-1.2.2-gui_help.patch | 11 ---
22 sci-electronics/tnt/tnt-1.2.2.ebuild | 46 +++++---------
23 10 files changed, 144 insertions(+), 136 deletions(-)
24
25 diff --git a/sci-electronics/tnt/ChangeLog b/sci-electronics/tnt/ChangeLog
26 index c92dc3e..96ae9fb 100644
27 --- a/sci-electronics/tnt/ChangeLog
28 +++ b/sci-electronics/tnt/ChangeLog
29 @@ -3,6 +3,13 @@
30 # $Header: $
31
32 24 Feb 2011; Andreas K. Huettel <dilfridge@g.o> tnt-1.2.2.ebuild,
33 + -files/tnt-1.2.2-Makefile-am.patch,
34 + -files/tnt-1.2.2-doc-Makefile-am.patch, +files/tnt-1.2.2-docs.patch,
35 + +files/tnt-1.2.2-f77.patch, +files/tnt-1.2.2-gui.patch,
36 + -files/tnt-1.2.2-gui-splash.patch, -files/tnt-1.2.2-gui_help.patch:
37 + General cleanup and simplification
38 +
39 + 24 Feb 2011; Andreas K. Huettel <dilfridge@g.o> tnt-1.2.2.ebuild,
40 +files/tnt-1.2.2-calc.patch, -files/tnt-1.2.2-calc-cap-calcCAP.patch,
41 -files/tnt-1.2.2-calc-cap-cmplxmat.patch,
42 -files/tnt-1.2.2-calc-cap-cmplxvec.patch,
43
44 diff --git a/sci-electronics/tnt/Manifest b/sci-electronics/tnt/Manifest
45 index e242eb8..05147b6 100644
46 --- a/sci-electronics/tnt/Manifest
47 +++ b/sci-electronics/tnt/Manifest
48 @@ -1,32 +1,31 @@
49 -----BEGIN PGP SIGNED MESSAGE-----
50 Hash: SHA1
51
52 -AUX tnt-1.2.2-Makefile-am.patch 758 RMD160 2524d177a9ea2f28889775ee8dad0663f55a586c SHA1 5dc022c9009ad5f425fed591c880e73047d2eeb1 SHA256 aea0daec458376e63315736a45bc307a4768443c2a3be85aeb29f6fd1caf1f34
53 AUX tnt-1.2.2-bem-nmmtl.patch 456 RMD160 8463540d64226a8bf769a66d7fdd9fd5daf61cb6 SHA1 8b08be79fee98f1e06c5ded2e4fa24aacd8c6007 SHA256 f6f0bde8df73c524545e2290958a9612692f2a76114ed1ba7a6b984b81cb1dd1
54 AUX tnt-1.2.2-calc.patch 14487 RMD160 9234f56886cb95db4c1d1501250dc2f4954214d3 SHA1 e9b3b58a9409986b767a6b9678f2d37d8201fcb3 SHA256 daee74c5c2fb46a9a3742be5d9d8441260119dddcb52e9a06ddfe54147f5b735
55 -AUX tnt-1.2.2-doc-Makefile-am.patch 1032 RMD160 f8175289f67577cadb61649c00f4a233ff2b16b6 SHA1 24c83817bd7afdcd59260f1f52d2757e98bdf947 SHA256 38862d969bcee3e35623317572d3b22122f16678b88a95e79f4727c7d6f9ffa0
56 -AUX tnt-1.2.2-gui-splash.patch 401 RMD160 7870cc511eea6d591ee8be96504c5d5a63e40375 SHA1 e5fe12e4e1af6bb0627440f3722894a5d9aaaa8f SHA256 aede7920d86ec402463a4ce3ea43f839b509dda6859a12ae01796eadf77bd2ef
57 -AUX tnt-1.2.2-gui_help.patch 315 RMD160 050721d4c09efe2a9706ab8fe21a1ae072fae50b SHA1 9722eeb18a7daa1026f5b1a730801da675c727d1 SHA256 bf0c7b39a2c4a8eb8e5195868ee1b9751ebc53ab531435cc7e970ad7a8199d7f
58 +AUX tnt-1.2.2-docs.patch 1970 RMD160 ecfa0e2c973fcdcda155de3bf49eab1ef29b40a6 SHA1 28c2b8aa2ec2ad94e4e38ae57f514fc3ad03a4ce SHA256 35741bb44d5c97f718830fbfa63ed23f00c84cf4e5c1007bfa997f0e3f842520
59 +AUX tnt-1.2.2-f77.patch 482 RMD160 8f45a248f511bdd5aae54d0511a6f23abfbfdbc2 SHA1 f6d9f5b22d85fc7ac8d84845558497514009aab2 SHA256 b80cd8fdf9000ba115511b4b440d929dcdb55d8778bf01c52a1082607fd82362
60 +AUX tnt-1.2.2-gui.patch 900 RMD160 acfa4c03aa92c97b257f3d7d5a08e01d94834e77 SHA1 8486e487c10d29b6d3c09bb219b030d32039d6cf SHA256 d1c3cc7cf0f6d084d583502aa67a10687e1fbcd5a5833aca986b3c2d3fd37a20
61 AUX tnt-1.2.2-namespaces.patch 6862 RMD160 2a32bb175e4769f35bd9d91521da7c9ac13c11d9 SHA1 7a181abc878951f631d576188144e44422743eea SHA256 d777646d0e7a43aee5c68e5061a85cd99be45cd539b683afff7752d7581d16c1
62 AUX tnt-1.2.2-tkcon.patch 447 RMD160 d3b708d681a5a468c9f17b27dba6c273e3b472ad SHA1 55e8f6bb54d4e59ce73620d2909d6d8b23197770 SHA256 1302823cd11ad31dcca115abb93a6f1c07299872bf5d48d51815b5436bbee846
63 DIST tnt-1.2.2.tar.gz 2020099 RMD160 1a2ba68a93ee21590bb25a3eacf85d3773c3e77d SHA1 bd089863ca2cd939009253e83f4ab75317191047 SHA256 cbb418d0de4f244d8174e8826e4d8272bce753f50431c9d87af08928f5817445
64 -EBUILD tnt-1.2.2.ebuild 2213 RMD160 05f65a9e5ab0dc5a6b6e899741e98685cc01d9ec SHA1 2fc154af1a1ead865577d75dae0dc5e6430d8cfb SHA256 ae7aebfad09e94606d3d84910af4a88c7b0b123d64b2b963f96881360f656a23
65 -MISC ChangeLog 1013 RMD160 2dfa7a993395195056cf06e365cd08fecb6af6db SHA1 b0969f00bee62dfe2d6962bb33c73d46b8f7a76f SHA256 459c200d376175e95ef4395d7d20433b8371560a454e8e23b9e7de468160a6f3
66 +EBUILD tnt-1.2.2.ebuild 1560 RMD160 cf0dc81a332f776ea0d74861a840b0f65c5c5055 SHA1 d64b470d0edf236e2447e646c4cc31c81d3a6579 SHA256 db439bd394e69329ace1f76cba887df819c1f67a9a4e9f01cc04eca743efe15c
67 +MISC ChangeLog 1363 RMD160 4ca3eafee7154329f2c59ee6fc41623197ff7c73 SHA1 a6406509983d84621dddd59c816f8be1e8a6ae83 SHA256 62962a9ddbe3996c739b676a9cc8fd04ce270988f6d09bc466c7e5d13f7e484f
68 MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
69 -----BEGIN PGP SIGNATURE-----
70 Version: GnuPG v2.0.17 (GNU/Linux)
71
72 -iQIcBAEBAgAGBQJNZqaqAAoJENwGBM22xffe2XAQAJwvYBGGt7oeNAi14C0s+oJ6
73 -5sVOBY90n9zzH0RZxdwO4saKWhEoHhcuSW8Dek9g4GlwM7pxDlCY4SrYc6sK5v4t
74 -Q+NxTKSMxeVFkvHFD2x8xbLaNW9D+wG7NCgmQtRkcKy5QS5BNntXMRoe+xFGNvk7
75 -bihmLN2tJuanOhw6wLKdDK9SSLrvkqOrP8na1YUTiIOO5Ma2W2E5SK2KPO1N7q5x
76 -xbiSX0rgEN+FhZAte3hr3OVndnGv6YvrHZYu6592N7wcZarwitg1S4qWeBpCyOfp
77 -/R/Cy9BvqLxav+FxI0O4v/MUkQT25+oDw+dDiwu+WhsGrU+rHlvkKRdobqi1TcjP
78 -1ypdOddHFsC/R4mzUOH6w7/ew10/OJE/KabYlaptFchq+AeBpp0rWKWJtROc+YuR
79 -oNkgt854XswaubF2t9QFn2vPGpYefNPtnXh3hAVv94Dmh7KUdhzKXuhllX68BlWr
80 -FqwTMhdo1gGeh9XPmE5XF1qa/zHDlcNg8CBh00w3sE9E68aKQ2zWc2R2WNY+jyWn
81 -LfIZ6Kpr7cF8FbE6XNOW7yl/afaRAzbWYueu6OT4cYHCOoO3c1RAc5wInT4pAK1g
82 -gv4hUipgXlIQqiodZ8n9N9UmJOLZc7UjexkPk6jbOX8uZ3Zt144SJQ1jSP+7U2Nd
83 -Neie6vdDFakNDl13zpq2
84 -=uLQ+
85 +iQIcBAEBAgAGBQJNZun8AAoJENwGBM22xffev5wQAKJXT2pZ1zIjiUJI+Nx5pOtH
86 +MYpNmrLRedxCD/awO/WU60PfAdCxXIpxZ3lQlheAy55sKV2U2P0Zspw128ZCxcav
87 +IQU5XWI2uiF4RDF/m28mRVYz15BsLx9uRNogkWko4ewLNgr8Z6ulP4Vhpli+wbdl
88 +ZTpvNmfvhqEG1DWLwycy/pk3IGn+zdlbyPOAfI9RKjjEnVIQVfgxMiW6B2+4eAc/
89 +1Fze8g6hc7TkqLZjB8dxyddu6tZhzAkG3HNDYkJSLKxkECcusznoMvjqEt1h6X35
90 +hp+PdcZXPO6OyiP8wIrInDT50VQ/uAhG6H1LKKalvD5u2Q0rWQzteIKeOWoYbWpi
91 +KmBU33urUvJq61H2J5Aqb4eAZ06IPVRUWe7keDbomuK40DoR8BhwiTSBJlVOfS/X
92 +odjXKK1GvEIHNZ2JugycAO4/D/FwTJNnqS64+DCdz4i1uPmplVlXMpxY71fYTAki
93 +jXN6rR6R3QCPRzbW8jZgS1XdhQhnv15ZsfKLxraek93sB373Ap3Kuu08HamJ9oHK
94 +t8i54gGucknDvWwoMwXWIK47SE+5+R6YC2thIu9xFmx6bCtti+0f5MuTOCp/C2X7
95 +x6ruqnphajtyeoX5Sup1NxznPKixebhyRl3iGgvzXFw9ZAUpOyfOPy8J1DyC6wz7
96 +rrxbsEsGvSVAtqfdsLjf
97 +=L4xp
98 -----END PGP SIGNATURE-----
99
100 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-Makefile-am.patch b/sci-electronics/tnt/files/tnt-1.2.2-Makefile-am.patch
101 deleted file mode 100644
102 index aea1e2e..0000000
103 --- a/sci-electronics/tnt/files/tnt-1.2.2-Makefile-am.patch
104 +++ /dev/null
105 @@ -1,27 +0,0 @@
106 ---- Makefile.am.org 2011-02-19 00:22:25.000000000 -0800
107 -+++ Makefile.am 2011-02-19 00:23:29.000000000 -0800
108 -@@ -51,14 +51,16 @@
109 - # a prefix. If not, then I suppose README will go into
110 - # /usr.
111 - #---------------------------------------------------------------
112 --appdocsdir = $(prefix)
113 --appdocs_DATA = \
114 -- AUTHORS$(TXTEXT) \
115 -- COPYING$(TXTEXT) \
116 -- ChangeLog$(TXTEXT) \
117 -- NEWS$(TXTEXT) \
118 -- README$(TXTEXT) \
119 -- THANKS$(TXTEXT)
120 -+#
121 -+# Portage takes care for this
122 -+#appdocsdir = $(prefix)
123 -+#appdocs_DATA = \
124 -+# AUTHORS$(TXTEXT) \
125 -+# COPYING$(TXTEXT) \
126 -+# ChangeLog$(TXTEXT) \
127 -+# NEWS$(TXTEXT) \
128 -+# README$(TXTEXT) \
129 -+# THANKS$(TXTEXT)
130 -
131 - #---------------------------------------------------------------
132 - # Convert application documents to text files on Windows.
133
134 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-doc-Makefile-am.patch b/sci-electronics/tnt/files/tnt-1.2.2-doc-Makefile-am.patch
135 deleted file mode 100644
136 index 092158b..0000000
137 --- a/sci-electronics/tnt/files/tnt-1.2.2-doc-Makefile-am.patch
138 +++ /dev/null
139 @@ -1,37 +0,0 @@
140 ---- doc/Makefile.am.org 2011-02-19 00:25:11.000000000 -0800
141 -+++ doc/Makefile.am 2011-02-19 00:28:31.000000000 -0800
142 -@@ -43,7 +43,7 @@
143 - #
144 - #---------------------------------------------------------------
145 -
146 --docdir = $(prefix)/doc
147 -+#docdir = $(prefix)/doc
148 - doc_DATA = \
149 - user-guide.pdf
150 -
151 -@@ -73,15 +73,17 @@
152 - pdflatex $*
153 - latex2html -split 4 -show_section_numbers -local_icons $<
154 -
155 -+# Removed, because portage takes care of it.
156 -+#
157 - # Custom installation rule
158 --install-data-local:
159 -- for f in $(doc_DATA); do \
160 -- $(mkinstalldirs) $(docdir); \
161 -- $(INSTALL_DATA) $$f $(docdir)/$$f; \
162 -- d=`basename $$f .pdf`; \
163 -- $(mkinstalldirs) $(docdir)/$$d; \
164 -- $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
165 -- done
166 -+#install-data-local:
167 -+# for f in $(doc_DATA); do \
168 -+# $(mkinstalldirs) $(docdir); \
169 -+# $(INSTALL_DATA) $$f $(docdir)/$$f; \
170 -+# d=`basename $$f .pdf`; \
171 -+# $(mkinstalldirs) $(docdir)/$$d; \
172 -+# $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
173 -+# done
174 -
175 - #---------------------------------------------------------------
176 - # clean
177
178 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-docs.patch b/sci-electronics/tnt/files/tnt-1.2.2-docs.patch
179 new file mode 100644
180 index 0000000..77fe504
181 --- /dev/null
182 +++ b/sci-electronics/tnt/files/tnt-1.2.2-docs.patch
183 @@ -0,0 +1,66 @@
184 +diff -ruN tnt-1.2.2-5-tkcon/Makefile.am tnt-1.2.2/Makefile.am
185 +--- tnt-1.2.2-5-tkcon/Makefile.am 2004-07-22 16:23:32.000000000 +0200
186 ++++ tnt-1.2.2/Makefile.am 2011-02-24 23:43:41.000000000 +0100
187 +@@ -51,14 +51,16 @@
188 + # a prefix. If not, then I suppose README will go into
189 + # /usr.
190 + #---------------------------------------------------------------
191 +-appdocsdir = $(prefix)
192 +-appdocs_DATA = \
193 +- AUTHORS$(TXTEXT) \
194 +- COPYING$(TXTEXT) \
195 +- ChangeLog$(TXTEXT) \
196 +- NEWS$(TXTEXT) \
197 +- README$(TXTEXT) \
198 +- THANKS$(TXTEXT)
199 ++#
200 ++# Portage takes care for this
201 ++#appdocsdir = $(prefix)
202 ++#appdocs_DATA = \
203 ++# AUTHORS$(TXTEXT) \
204 ++# COPYING$(TXTEXT) \
205 ++# ChangeLog$(TXTEXT) \
206 ++# NEWS$(TXTEXT) \
207 ++# README$(TXTEXT) \
208 ++# THANKS$(TXTEXT)
209 +
210 + #---------------------------------------------------------------
211 + # Convert application documents to text files on Windows.
212 +diff -ruN tnt-1.2.2-5-tkcon/doc/Makefile.am tnt-1.2.2/doc/Makefile.am
213 +--- tnt-1.2.2-5-tkcon/doc/Makefile.am 2004-07-21 17:45:26.000000000 +0200
214 ++++ tnt-1.2.2/doc/Makefile.am 2011-02-24 23:43:45.000000000 +0100
215 +@@ -43,7 +43,7 @@
216 + #
217 + #---------------------------------------------------------------
218 +
219 +-docdir = $(prefix)/doc
220 ++#docdir = $(prefix)/doc
221 + doc_DATA = \
222 + user-guide.pdf
223 +
224 +@@ -73,15 +73,17 @@
225 + pdflatex $*
226 + latex2html -split 4 -show_section_numbers -local_icons $<
227 +
228 ++# Removed, because portage takes care of it.
229 ++#
230 + # Custom installation rule
231 +-install-data-local:
232 +- for f in $(doc_DATA); do \
233 +- $(mkinstalldirs) $(docdir); \
234 +- $(INSTALL_DATA) $$f $(docdir)/$$f; \
235 +- d=`basename $$f .pdf`; \
236 +- $(mkinstalldirs) $(docdir)/$$d; \
237 +- $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
238 +- done
239 ++#install-data-local:
240 ++# for f in $(doc_DATA); do \
241 ++# $(mkinstalldirs) $(docdir); \
242 ++# $(INSTALL_DATA) $$f $(docdir)/$$f; \
243 ++# d=`basename $$f .pdf`; \
244 ++# $(mkinstalldirs) $(docdir)/$$d; \
245 ++# $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
246 ++# done
247 +
248 + #---------------------------------------------------------------
249 + # clean
250
251 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-f77.patch b/sci-electronics/tnt/files/tnt-1.2.2-f77.patch
252 new file mode 100644
253 index 0000000..b1f3fa1
254 --- /dev/null
255 +++ b/sci-electronics/tnt/files/tnt-1.2.2-f77.patch
256 @@ -0,0 +1,14 @@
257 +diff -ruN tnt-1.2.2-3-namespace/bem/configure.ac tnt-1.2.2-4-g77/bem/configure.ac
258 +--- tnt-1.2.2-3-namespace/bem/configure.ac 2004-04-22 22:07:12.000000000 +0200
259 ++++ tnt-1.2.2-4-g77/bem/configure.ac 2011-02-24 23:55:35.000000000 +0100
260 +@@ -74,9 +74,7 @@
261 + ;;
262 + *linux*)
263 + # For Linux, all flavors...
264 +- # Use the GNU compilers for C++ and FORTRAN.
265 +- CXX="g++"
266 +- F77="g77"
267 ++ # Use the GNU compilers for C++ and FORTRAN and rely on portage
268 + AM_CXXFLAGS="-DFORTRAN_UNDERBARS"
269 + ;;
270 + esac
271
272 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-gui-splash.patch b/sci-electronics/tnt/files/tnt-1.2.2-gui-splash.patch
273 deleted file mode 100644
274 index e0c381a..0000000
275 --- a/sci-electronics/tnt/files/tnt-1.2.2-gui-splash.patch
276 +++ /dev/null
277 @@ -1,11 +0,0 @@
278 ---- gui/splash.tcl.org 2011-02-19 18:30:20.000000000 -0800
279 -+++ gui/splash.tcl 2011-02-19 18:40:53.000000000 -0800
280 -@@ -81,7 +81,7 @@
281 - } else {
282 - set filename COPYING
283 - }
284 -- set licenseFile [file join $::scriptDir .. $filename]
285 -+ set licenseFile [file join /usr share doc package_name html $filename]
286 - if { [file exists $licenseFile] } {
287 - ::gui::guiPopupFile $licenseFile
288 - } else {
289
290 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-gui.patch b/sci-electronics/tnt/files/tnt-1.2.2-gui.patch
291 new file mode 100644
292 index 0000000..e2a9b4c
293 --- /dev/null
294 +++ b/sci-electronics/tnt/files/tnt-1.2.2-gui.patch
295 @@ -0,0 +1,24 @@
296 +diff -ruN tnt-1.2.2-6-docs/gui/gui_help.tcl tnt-1.2.2/gui/gui_help.tcl
297 +--- tnt-1.2.2-6-docs/gui/gui_help.tcl 2004-07-26 15:37:52.000000000 +0200
298 ++++ tnt-1.2.2/gui/gui_help.tcl 2011-02-24 23:45:27.000000000 +0100
299 +@@ -26,7 +26,7 @@
300 + switch -exact $helpTopic {
301 +
302 + userguide {
303 +- display_online_help user-guide/index.html
304 ++ display_online_help /usr/share/doc/package_name/html/index.html
305 + }
306 +
307 + }
308 +diff -ruN tnt-1.2.2-6-docs/gui/splash.tcl tnt-1.2.2/gui/splash.tcl
309 +--- tnt-1.2.2-6-docs/gui/splash.tcl 2004-07-22 15:16:21.000000000 +0200
310 ++++ tnt-1.2.2/gui/splash.tcl 2011-02-24 23:45:23.000000000 +0100
311 +@@ -81,7 +81,7 @@
312 + } else {
313 + set filename COPYING
314 + }
315 +- set licenseFile [file join $::scriptDir .. $filename]
316 ++ set licenseFile [file join /usr share doc package_name html $filename]
317 + if { [file exists $licenseFile] } {
318 + ::gui::guiPopupFile $licenseFile
319 + } else {
320
321 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-gui_help.patch b/sci-electronics/tnt/files/tnt-1.2.2-gui_help.patch
322 deleted file mode 100644
323 index ba5da09..0000000
324 --- a/sci-electronics/tnt/files/tnt-1.2.2-gui_help.patch
325 +++ /dev/null
326 @@ -1,11 +0,0 @@
327 ---- gui/gui_help.tcl.org 2011-02-19 18:52:20.000000000 -0800
328 -+++ gui/gui_help.tcl 2011-02-19 18:59:17.000000000 -0800
329 -@@ -26,7 +26,7 @@
330 - switch -exact $helpTopic {
331 -
332 - userguide {
333 -- display_online_help user-guide/index.html
334 -+ display_online_help /usr/share/doc/package_name/html/index.html
335 - }
336 -
337 - }
338
339 diff --git a/sci-electronics/tnt/tnt-1.2.2.ebuild b/sci-electronics/tnt/tnt-1.2.2.ebuild
340 index 6fb8b5f..8ce4ae0 100644
341 --- a/sci-electronics/tnt/tnt-1.2.2.ebuild
342 +++ b/sci-electronics/tnt/tnt-1.2.2.ebuild
343 @@ -27,56 +27,40 @@ DEPEND="${RDEPEND}
344 media-gfx/imagemagick
345 "
346
347 -PATCHES=( "${FILESDIR}/${P}"-{calc,bem-nmmtl,namespaces}.patch )
348 +PATCHES=( "${FILESDIR}/${P}"-{calc,bem-nmmtl,namespaces,f77,tkcon,docs,gui}.patch )
349
350 src_prepare() {
351 base_src_prepare
352
353 - # Update fortran compiler
354 - sed -i 's/\"g77\"/\"$(tc-getF77)\"/' bem/configure.ac
355 - sed -i 's/\"g77\"/\"$(tc-getF77)\"/' calcCAP/configure.ac
356 - sed -i 's/\"g77\"/\"$(tc-getF77)\"/' calcRL/configure.ac
357 - #block document installation
358 - epatch "${FILESDIR}/${P}"-Makefile-am.patch
359 - epatch "${FILESDIR}/${P}"-doc-Makefile-am.patch
360 - epatch "${FILESDIR}/${P}"-tkcon.patch
361 #adjust new document location in gui
362 - epatch "${FILESDIR}/${P}"-gui-splash.patch
363 sed -i "s/package_name/${PF}/" gui/splash.tcl
364 - epatch "${FILESDIR}/${P}"-gui_help.patch
365 sed -i "s/package_name/${PF}/" gui/gui_help.tcl
366 - # regenerate the configure and make files
367 - rm aclocal.m4
368 - eautoreconf --force
369 -}
370 -
371 -src_configure() {
372 - econf || die "econf failed"
373 -}
374
375 -src_compile() {
376 - emake || die "emake failed"
377 + eautoreconf
378 }
379
380 src_install () {
381 emake DESTDIR="${D}" install || die "make install failed"
382 - dodoc AUTHORS ChangeLog NEWS README THANKS || die "failed to install docs"
383 - dohtml COPYING #tcl cannot handle the archives created by dodoc
384 +
385 + dodoc AUTHORS ChangeLog NEWS README THANKS || die
386 +
387 + # tcl cannot handle the archives created by dodoc
388 + dohtml COPYING || die
389 if use doc; then
390 - dodoc doc/*.pdf doc/*.png
391 - dohtml doc/user-guide/*
392 + dodoc doc/*.pdf doc/*.png || die
393 + dohtml doc/user-guide/* || die
394 fi
395 - #Install icon
396 +
397 + # Install icon
398 convert gui/logo.gif gui/tnt.png
399 docinto "examples"
400 dodoc examples/* || die "failed to install exampels"
401 newicon gui/tnt.png tnt.png
402 - make_desktop_entry ${PN} "Mttl" ${PN}
403 + make_desktop_entry ${PN} "tnt" ${PN}
404 }
405
406 pkg_postinst() {
407 - einfo "Warning: the sources are not under development anymore."
408 - einfo "We made it compile, but users should check if the results make sense."
409 - einfo "The GUI was written in an old version of TCL/TK."
410 - einfo "Examples are in the /usr/share/doc/tnt-1.2.2 folder."
411 + elog "Warning: the sources are not under development anymore."
412 + elog "We made it compile, but users should check if the results make sense."
413 + elog "Examples are in the /usr/share/doc/tnt-1.2.2 folder."
414 }