| 1 |
commit: 17a263f9615a3d09a8ebfd6a844723fde4aef893 |
| 2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 10 18:10:57 2017 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 10 18:44:19 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17a263f9 |
| 7 |
|
| 8 |
sci-astronomy/skycat: version bump |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 11 |
|
| 12 |
sci-astronomy/skycat/Manifest | 1 + |
| 13 |
.../files/skycat-3.1.3-remove-tclx-dep.patch | 315 +++++++++++++++++++++ |
| 14 |
.../skycat/files/skycat-3.1.3-string-issues.patch | 57 ++++ |
| 15 |
sci-astronomy/skycat/skycat-3.1.3.ebuild | 68 +++++ |
| 16 |
4 files changed, 441 insertions(+) |
| 17 |
|
| 18 |
diff --git a/sci-astronomy/skycat/Manifest b/sci-astronomy/skycat/Manifest |
| 19 |
index cad6d957909..306d57103d7 100644 |
| 20 |
--- a/sci-astronomy/skycat/Manifest |
| 21 |
+++ b/sci-astronomy/skycat/Manifest |
| 22 |
@@ -1 +1,2 @@ |
| 23 |
DIST skycat-3.1.2.tar.gz 3091874 SHA256 559ae26f044601517f8787eadcb93ebda85ebea971f8f961cedefbafb3b9d0ac SHA512 70f7f366c13f0d9914db5be0ed75952a5e97ca2aef18ce5a4aa3e330aeceaaa1ab06c5ada69056659d038b2e558648e1f4033668d4935c6a6c50bce8b766f100 WHIRLPOOL 29408a52256be3cffe06c86d8bc5f1551585f58c27c1c9e77b3f7f0393fd797295028e52410ea4bee4afbd37d2f5a277f3ae56c1c9354ae390a48de508eacded |
| 24 |
+DIST skycat-3.1.3.tar.gz 3057187 SHA256 833655c5ed5591e2f12db681e3aed36af0af906a4ffca1c524a3681f9fee097c SHA512 55ec0c2b367e028c23e5e8f8d74106aa51aec5173c2ab1772f5fa8a5a5b65f3d85e7b991597a89f11f6ca14d57aaa6b774f474b41e78747ee486df66ab22e9ff WHIRLPOOL 6ac13f5b447a255dc63673aa7b8422e52e1c0174993d2ba7569a4690730243ae0dff3fcee483b2451599cedd9e83de47222384580004e82cefbddeeb17b7b887 |
| 25 |
|
| 26 |
diff --git a/sci-astronomy/skycat/files/skycat-3.1.3-remove-tclx-dep.patch b/sci-astronomy/skycat/files/skycat-3.1.3-remove-tclx-dep.patch |
| 27 |
new file mode 100644 |
| 28 |
index 00000000000..73061798d37 |
| 29 |
--- /dev/null |
| 30 |
+++ b/sci-astronomy/skycat/files/skycat-3.1.3-remove-tclx-dep.patch |
| 31 |
@@ -0,0 +1,315 @@ |
| 32 |
+diff -Nur skycat-3.1.3.orig/astrotcl/library/AstrotclInit.tcl skycat-3.1.3/astrotcl/library/AstrotclInit.tcl |
| 33 |
+--- skycat-3.1.3.orig/astrotcl/library/AstrotclInit.tcl 2017-08-10 16:18:22.100000000 +0000 |
| 34 |
++++ skycat-3.1.3/astrotcl/library/AstrotclInit.tcl 2017-08-10 17:38:25.850000000 +0000 |
| 35 |
+@@ -11,7 +11,7 @@ |
| 36 |
+ # pbiereic 24/08/99 created |
| 37 |
+ # abrighto 21/12/05 updated for new version |
| 38 |
+ |
| 39 |
+-if {![lcontain $auto_path $astrotcl_library]} { |
| 40 |
++if { $auto_path ni $astrotcl_library } { |
| 41 |
+ lappend auto_path $astrotcl_library |
| 42 |
+ } |
| 43 |
+ |
| 44 |
+diff -Nur skycat-3.1.3.orig/cat/library/AstroCat.tcl skycat-3.1.3/cat/library/AstroCat.tcl |
| 45 |
+--- skycat-3.1.3.orig/cat/library/AstroCat.tcl 2017-08-10 16:18:22.110000000 +0000 |
| 46 |
++++ skycat-3.1.3/cat/library/AstroCat.tcl 2017-08-10 17:38:25.850000000 +0000 |
| 47 |
+@@ -145,7 +145,7 @@ |
| 48 |
+ return |
| 49 |
+ } |
| 50 |
+ if {"$onoff" == "on"} { |
| 51 |
+- lassign [pipe] rfd_ wfd_ |
| 52 |
++ lassign [chan pipe] rfd_ wfd_ |
| 53 |
+ fileevent $rfd_ readable [code $this feedback] |
| 54 |
+ $w_.cat feedback $wfd_ |
| 55 |
+ } elseif {[info exists rfd_]} { |
| 56 |
+diff -Nur skycat-3.1.3.orig/cat/library/AstroImage.tcl skycat-3.1.3/cat/library/AstroImage.tcl |
| 57 |
+--- skycat-3.1.3.orig/cat/library/AstroImage.tcl 2017-08-10 16:18:22.110000000 +0000 |
| 58 |
++++ skycat-3.1.3/cat/library/AstroImage.tcl 2017-08-10 17:38:25.850000000 +0000 |
| 59 |
+@@ -401,7 +401,7 @@ |
| 60 |
+ return |
| 61 |
+ } |
| 62 |
+ if {"$onoff" == "on"} { |
| 63 |
+- lassign [pipe] rfd_ wfd_ |
| 64 |
++ lassign [chan pipe] rfd_ wfd_ |
| 65 |
+ fileevent $rfd_ readable [code $this feedback] |
| 66 |
+ $w_.im feedback $wfd_ |
| 67 |
+ } elseif {[info exists rfd_]} { |
| 68 |
+diff -Nur skycat-3.1.3.orig/cat/library/CatInit.tcl skycat-3.1.3/cat/library/CatInit.tcl |
| 69 |
+--- skycat-3.1.3.orig/cat/library/CatInit.tcl 2017-08-10 16:18:22.110000000 +0000 |
| 70 |
++++ skycat-3.1.3/cat/library/CatInit.tcl 2017-08-10 17:38:25.850000000 +0000 |
| 71 |
+@@ -12,7 +12,7 @@ |
| 72 |
+ |
| 73 |
+ package require img::xpm |
| 74 |
+ |
| 75 |
+-if {![lcontain $auto_path $cat_library]} { |
| 76 |
++if { $auto_path ni $cat_library } { |
| 77 |
+ lappend auto_path $cat_library |
| 78 |
+ } |
| 79 |
+ |
| 80 |
+diff -Nur skycat-3.1.3.orig/rtd/library/RtdImageBias.tcl skycat-3.1.3/rtd/library/RtdImageBias.tcl |
| 81 |
+--- skycat-3.1.3.orig/rtd/library/RtdImageBias.tcl 2017-08-10 16:18:22.120000000 +0000 |
| 82 |
++++ skycat-3.1.3/rtd/library/RtdImageBias.tcl 2017-08-10 17:38:25.850000000 +0000 |
| 83 |
+@@ -10,6 +10,12 @@ |
| 84 |
+ |
| 85 |
+ itk::usual RtdImageBias {} |
| 86 |
+ |
| 87 |
++# see http://wiki.tcl.tk/2028 |
| 88 |
++proc lvarpush {var val {ndx end}} { |
| 89 |
++ upvar $var args |
| 90 |
++ set args [linsert $args $ndx $val] |
| 91 |
++} |
| 92 |
++ |
| 93 |
+ # RtdImageBias is a class for controlling the subtraction of |
| 94 |
+ # a bias frame. |
| 95 |
+ |
| 96 |
+diff -Nur skycat-3.1.3.orig/rtd/library/RtdImageFitsHeader.tcl skycat-3.1.3/rtd/library/RtdImageFitsHeader.tcl |
| 97 |
+--- skycat-3.1.3.orig/rtd/library/RtdImageFitsHeader.tcl 2017-08-10 16:18:22.120000000 +0000 |
| 98 |
++++ skycat-3.1.3/rtd/library/RtdImageFitsHeader.tcl 2017-08-10 17:41:35.500000000 +0000 |
| 99 |
+@@ -11,6 +11,8 @@ |
| 100 |
+ # pbiereic 17/02/03 fixed problems with tabnotebook, packing order |
| 101 |
+ # and labels of tabsets |
| 102 |
+ |
| 103 |
++package require Tclutil |
| 104 |
++ |
| 105 |
+ itk::usual RtdImageFitsHeader {} |
| 106 |
+ |
| 107 |
+ # RtdImageFitsHeader is an itcl widget for displaying the FITS header of all |
| 108 |
+@@ -156,7 +158,7 @@ |
| 109 |
+ set tconfig_(sort_cols) $sort_cols |
| 110 |
+ set tconfig_(sort_order) $sort_order |
| 111 |
+ |
| 112 |
+- loop i 0 $num_hdus_ { |
| 113 |
++ for {set i 0} {$i < $num_hdus_} {incr i} { |
| 114 |
+ $tabnotebook_(table$i) config -sort_cols $sort_cols \ |
| 115 |
+ -sort_order $sort_order |
| 116 |
+ $tabnotebook_(table$i) new_info |
| 117 |
+@@ -169,7 +171,7 @@ |
| 118 |
+ global $var |
| 119 |
+ set val [set $var] |
| 120 |
+ set tconfig_($label) $val |
| 121 |
+- loop i 0 $num_hdus_ { |
| 122 |
++ for {set i 0} {$i < $num_hdus_} {incr i} { |
| 123 |
+ $tabnotebook_(table$i) set_option $label Show $val |
| 124 |
+ $tabnotebook_(table$i) new_info |
| 125 |
+ } |
| 126 |
+@@ -216,7 +218,7 @@ |
| 127 |
+ |
| 128 |
+ set length [string length [$listbox get 0]] |
| 129 |
+ |
| 130 |
+- loop n $start_idx $end_idx { |
| 131 |
++ for {set n $start_idx} {$n < $end_idx} {incr n} { |
| 132 |
+ set row [string tolower [$listbox get $n]] |
| 133 |
+ if {[catch {regexp -indices $string $row indices} idx] } { continue } |
| 134 |
+ if { $idx > 0 } { |
| 135 |
+@@ -274,7 +276,7 @@ |
| 136 |
+ set hlist [$image_ hdu list] |
| 137 |
+ |
| 138 |
+ set ExtName "HDU 1" |
| 139 |
+- loop i 0 $hdu_count { |
| 140 |
++ for {set i 0} {$i < $hdu_count} {incr i} { |
| 141 |
+ set hdu [expr {$i + 1}] |
| 142 |
+ set list [lindex $hlist $i] |
| 143 |
+ |
| 144 |
+diff -Nur skycat-3.1.3.orig/rtd/library/RtdImageHduChooser.tcl skycat-3.1.3/rtd/library/RtdImageHduChooser.tcl |
| 145 |
+--- skycat-3.1.3.orig/rtd/library/RtdImageHduChooser.tcl 2017-08-10 16:18:22.120000000 +0000 |
| 146 |
++++ skycat-3.1.3/rtd/library/RtdImageHduChooser.tcl 2017-08-10 17:38:25.850000000 +0000 |
| 147 |
+@@ -16,6 +16,7 @@ |
| 148 |
+ # pbiereic 11/10/08 Break image display loop after failure. |
| 149 |
+ # pbiereic 26/11/08 Using 'view update' for HDU images display. |
| 150 |
+ # Using a toplevel window for the HDU images display. |
| 151 |
++package require Tclutil |
| 152 |
+ |
| 153 |
+ itk::usual RtdImageHduChooser {} |
| 154 |
+ |
| 155 |
+@@ -426,7 +427,7 @@ |
| 156 |
+ |
| 157 |
+ private method svinfo {} { |
| 158 |
+ set list [array get ext_ *NAXIS*] |
| 159 |
+- loop i 0 [llength $list] 2 { |
| 160 |
++ for {set i 0} {$i < [llength $list]} {incr i 2} { |
| 161 |
+ lappend newlist "[lindex $list $i] [lindex $list [expr {$i+1}]]" |
| 162 |
+ } |
| 163 |
+ set newlist [lsort -increasing -index 0 $newlist] |
| 164 |
+diff -Nur skycat-3.1.3.orig/rtd/library/RtdImagePerf.tcl skycat-3.1.3/rtd/library/RtdImagePerf.tcl |
| 165 |
+--- skycat-3.1.3.orig/rtd/library/RtdImagePerf.tcl 2017-08-10 16:18:22.120000000 +0000 |
| 166 |
++++ skycat-3.1.3/rtd/library/RtdImagePerf.tcl 2017-08-10 17:38:25.850000000 +0000 |
| 167 |
+@@ -9,6 +9,7 @@ |
| 168 |
+ # D. Hopkinson 31 Jan 97 Created |
| 169 |
+ # P.Biereichel 21/07/97 % display is the default + some bug fixes |
| 170 |
+ # P.Biereichel 01/03/01 Only % display suported + code revised |
| 171 |
++package require Tclutil |
| 172 |
+ |
| 173 |
+ itk::usual RtdImagePerf {} |
| 174 |
+ |
| 175 |
+diff -Nur skycat-3.1.3.orig/rtd/library/RtdImagePick2.tcl skycat-3.1.3/rtd/library/RtdImagePick2.tcl |
| 176 |
+--- skycat-3.1.3.orig/rtd/library/RtdImagePick2.tcl 2017-08-10 16:18:22.120000000 +0000 |
| 177 |
++++ skycat-3.1.3/rtd/library/RtdImagePick2.tcl 2017-08-10 17:38:25.850000000 +0000 |
| 178 |
+@@ -62,6 +62,7 @@ |
| 179 |
+ # NOTES |
| 180 |
+ # - In contrast to RtdImagePick, RtdImagePick2 does not use tkwait which may |
| 181 |
+ # cause problem for an inheriting class due to nested calls to tkwait. |
| 182 |
++package require Tclutil |
| 183 |
+ |
| 184 |
+ itk::usual RtdImagePick2 { } |
| 185 |
+ |
| 186 |
+@@ -127,7 +128,7 @@ |
| 187 |
+ {Set the magnification factor of the zoom} \ |
| 188 |
+ -menu [menu $magMenu_] |
| 189 |
+ |
| 190 |
+- loop i 2 31 { |
| 191 |
++ for {set i 2} {$i < 31} {incr i} { |
| 192 |
+ $m.mag add radiobutton -label " ${i}x" \ |
| 193 |
+ -command [code $this scaleZoom $i] \ |
| 194 |
+ -variable $magMenu_ |
| 195 |
+diff -Nur skycat-3.1.3.orig/rtd/library/RtdInit.tcl skycat-3.1.3/rtd/library/RtdInit.tcl |
| 196 |
+--- skycat-3.1.3.orig/rtd/library/RtdInit.tcl 2017-08-10 16:18:22.120000000 +0000 |
| 197 |
++++ skycat-3.1.3/rtd/library/RtdInit.tcl 2017-08-10 17:38:25.850000000 +0000 |
| 198 |
+@@ -10,7 +10,7 @@ |
| 199 |
+ # -------- --------- ---------------------------------------------- |
| 200 |
+ # pbiereic 24/08/99 created |
| 201 |
+ |
| 202 |
+-if {![lcontain $auto_path $rtd_library]} { |
| 203 |
++if { $auto_path ni $rtd_library} { |
| 204 |
+ lappend auto_path $rtd_library |
| 205 |
+ } |
| 206 |
+ |
| 207 |
+diff -Nur skycat-3.1.3.orig/rtd/library/Rtd.tcl skycat-3.1.3/rtd/library/Rtd.tcl |
| 208 |
+--- skycat-3.1.3.orig/rtd/library/Rtd.tcl 2017-08-10 16:18:22.120000000 +0000 |
| 209 |
++++ skycat-3.1.3/rtd/library/Rtd.tcl 2017-08-10 17:38:25.850000000 +0000 |
| 210 |
+@@ -650,7 +650,7 @@ |
| 211 |
+ set t6 "Tcl version:\t[info patchlevel]" |
| 212 |
+ set t7 "Tcl package path:\t$tcl_pkgPath" |
| 213 |
+ set t8 "Package versions:\t" |
| 214 |
+- foreach el "Tclx Itcl Itk Tkx BLT" { |
| 215 |
++ foreach el "Itcl Itk BLT" { |
| 216 |
+ set t8 "$t8$el[package versions $el] " |
| 217 |
+ } |
| 218 |
+ DialogWidget $w_.rtd_about \ |
| 219 |
+diff -Nur skycat-3.1.3.orig/rtd/library/tRtd.tcl skycat-3.1.3/rtd/library/tRtd.tcl |
| 220 |
+--- skycat-3.1.3.orig/rtd/library/tRtd.tcl 2017-08-10 16:18:22.120000000 +0000 |
| 221 |
++++ skycat-3.1.3/rtd/library/tRtd.tcl 2017-08-10 17:38:25.850000000 +0000 |
| 222 |
+@@ -10,6 +10,7 @@ |
| 223 |
+ # who when what |
| 224 |
+ # -------------- --------- ---------------------------------------- |
| 225 |
+ # pbiereic 01/03/01 Created |
| 226 |
++package require Tclutil |
| 227 |
+ |
| 228 |
+ itk::usual tRtd {} |
| 229 |
+ |
| 230 |
+diff -Nur skycat-3.1.3.orig/rtd/util/rmipc.tcl skycat-3.1.3/rtd/util/rmipc.tcl |
| 231 |
+--- skycat-3.1.3.orig/rtd/util/rmipc.tcl 2017-08-10 16:18:22.130000000 +0000 |
| 232 |
++++ skycat-3.1.3/rtd/util/rmipc.tcl 2017-08-10 17:38:25.850000000 +0000 |
| 233 |
+@@ -20,7 +20,7 @@ |
| 234 |
+ } |
| 235 |
+ set f [open "|ipcs $opt"] |
| 236 |
+ while {[gets $f line] != -1} { |
| 237 |
+- if { ![lcontain $line $env(USER)]} { continue } |
| 238 |
++ if { $line ni $env(USER) } { continue } |
| 239 |
+ set num [lindex $line 1] |
| 240 |
+ if {![catch {expr $num}]} { |
| 241 |
+ if {[catch {exec ipcrm $opt $num} msg]} { |
| 242 |
+diff -Nur skycat-3.1.3.orig/skycat/library/SkycatInit.tcl skycat-3.1.3/skycat/library/SkycatInit.tcl |
| 243 |
+--- skycat-3.1.3.orig/skycat/library/SkycatInit.tcl 2017-08-10 16:18:22.130000000 +0000 |
| 244 |
++++ skycat-3.1.3/skycat/library/SkycatInit.tcl 2017-08-10 17:38:25.850000000 +0000 |
| 245 |
+@@ -12,9 +12,11 @@ |
| 246 |
+ |
| 247 |
+ package require img::xpm |
| 248 |
+ |
| 249 |
+-if {![lcontain $auto_path $skycat_library]} { |
| 250 |
++if { $auto_path ni $skycat_library } { |
| 251 |
+ lappend auto_path $skycat_library |
| 252 |
+ } |
| 253 |
+ |
| 254 |
+ namespace eval skycat {namespace export *} |
| 255 |
+ namespace import -force skycat::* |
| 256 |
++namespace import ::tcl::mathfunc::max |
| 257 |
++namespace import ::tcl::mathfunc::min |
| 258 |
+diff -Nur skycat-3.1.3.orig/tclutil/library/Batch.tcl skycat-3.1.3/tclutil/library/Batch.tcl |
| 259 |
+--- skycat-3.1.3.orig/tclutil/library/Batch.tcl 2017-08-10 16:18:22.130000000 +0000 |
| 260 |
++++ skycat-3.1.3/tclutil/library/Batch.tcl 2017-08-10 17:40:54.160000000 +0000 |
| 261 |
+@@ -15,6 +15,8 @@ |
| 262 |
+ # -------- --------- ---------------------------------------------- |
| 263 |
+ # A.Brighton 20 Dec 95 created |
| 264 |
+ |
| 265 |
++package require Expect |
| 266 |
++ |
| 267 |
+ itk::usual Batch {} |
| 268 |
+ |
| 269 |
+ # This class is used to evaluate a set of Tcl commands in a separate |
| 270 |
+@@ -55,7 +57,7 @@ |
| 271 |
+ } |
| 272 |
+ flush stdout |
| 273 |
+ flush stderr |
| 274 |
+- pipe rfd wfd |
| 275 |
++ lassign [chan pipe] rfd wfd |
| 276 |
+ set pid [fork] |
| 277 |
+ if {$pid == 0} { |
| 278 |
+ # child |
| 279 |
+@@ -65,7 +67,7 @@ |
| 280 |
+ close $fd |
| 281 |
+ puts $wfd $status |
| 282 |
+ close $wfd |
| 283 |
+- kill [pid] |
| 284 |
++ kill [pid] 9 |
| 285 |
+ } else { |
| 286 |
+ set bg_pid_ $pid |
| 287 |
+ fileevent $rfd readable [code $this read_pipe $rfd $wfd] |
| 288 |
+diff -Nur skycat-3.1.3.orig/tclutil/library/canvastext.tcl skycat-3.1.3/tclutil/library/canvastext.tcl |
| 289 |
+--- skycat-3.1.3.orig/tclutil/library/canvastext.tcl 2017-08-10 16:18:22.130000000 +0000 |
| 290 |
++++ skycat-3.1.3/tclutil/library/canvastext.tcl 2017-08-10 17:38:25.850000000 +0000 |
| 291 |
+@@ -21,7 +21,7 @@ |
| 292 |
+ proc ct_search_forward_char {canvas item char} { |
| 293 |
+ if {![lempty $item]} { |
| 294 |
+ set text [lindex [$canvas itemconfigure $item -text] 4] |
| 295 |
+- loop i [$canvas index $item insert] [$canvas index $item end] { |
| 296 |
++ for {set i [$canvas index $item insert]} {$i < [$canvas index $item end]} {incr i} { |
| 297 |
+ if {$char == [string index $text $i]} { |
| 298 |
+ return $i |
| 299 |
+ } |
| 300 |
+@@ -37,7 +37,7 @@ |
| 301 |
+ proc ct_search_backward_char {canvas item char} { |
| 302 |
+ if {![lempty $item]} { |
| 303 |
+ set text [lindex [$canvas itemconfigure $item -text] 4] |
| 304 |
+- loop i [expr {[$canvas index $item insert] - 1}] 0 -1 { |
| 305 |
++ for {set i [expr {[$canvas index $item insert] - 1}]} {$i > 0} {decr i} { |
| 306 |
+ if {$char == [string index $text $i]} { |
| 307 |
+ return $i |
| 308 |
+ } |
| 309 |
+diff -Nur skycat-3.1.3.orig/tclutil/library/itcldoc.tcl skycat-3.1.3/tclutil/library/itcldoc.tcl |
| 310 |
+--- skycat-3.1.3.orig/tclutil/library/itcldoc.tcl 2017-08-10 16:18:22.130000000 +0000 |
| 311 |
++++ skycat-3.1.3/tclutil/library/itcldoc.tcl 2017-08-10 17:38:25.850000000 +0000 |
| 312 |
+@@ -36,7 +36,6 @@ |
| 313 |
+ # A.Brighton 07 Jan 98 created |
| 314 |
+ |
| 315 |
+ package require Itcl |
| 316 |
+-package require Tclx |
| 317 |
+ |
| 318 |
+ itcl::class ItclDoc { |
| 319 |
+ |
| 320 |
+diff -Nur skycat-3.1.3.orig/tclutil/library/list.tcl skycat-3.1.3/tclutil/library/list.tcl |
| 321 |
+--- skycat-3.1.3.orig/tclutil/library/list.tcl 2017-08-10 16:18:22.130000000 +0000 |
| 322 |
++++ skycat-3.1.3/tclutil/library/list.tcl 2017-08-10 17:38:25.850000000 +0000 |
| 323 |
+@@ -50,3 +50,9 @@ |
| 324 |
+ } |
| 325 |
+ return $l |
| 326 |
+ } |
| 327 |
++ |
| 328 |
++proc lempty {list} { |
| 329 |
++ if {[catch {llength $list} len]} { return 0 } |
| 330 |
++ return [expr {$len == 0}] |
| 331 |
++} |
| 332 |
++ |
| 333 |
+diff -Nur skycat-3.1.3.orig/tclutil/library/TclutilInit.tcl skycat-3.1.3/tclutil/library/TclutilInit.tcl |
| 334 |
+--- skycat-3.1.3.orig/tclutil/library/TclutilInit.tcl 2017-08-10 16:18:22.130000000 +0000 |
| 335 |
++++ skycat-3.1.3/tclutil/library/TclutilInit.tcl 2017-08-10 17:38:25.850000000 +0000 |
| 336 |
+@@ -16,9 +16,8 @@ |
| 337 |
+ |
| 338 |
+ package require Itcl |
| 339 |
+ package require Itk |
| 340 |
+-package require Tclx |
| 341 |
+ |
| 342 |
+-if {![lcontain $auto_path $tclutil_library]} { |
| 343 |
++if {$auto_path ni $tclutil_library} { |
| 344 |
+ lappend auto_path $tclutil_library |
| 345 |
+ } |
| 346 |
+ |
| 347 |
|
| 348 |
diff --git a/sci-astronomy/skycat/files/skycat-3.1.3-string-issues.patch b/sci-astronomy/skycat/files/skycat-3.1.3-string-issues.patch |
| 349 |
new file mode 100644 |
| 350 |
index 00000000000..f3e62572a13 |
| 351 |
--- /dev/null |
| 352 |
+++ b/sci-astronomy/skycat/files/skycat-3.1.3-string-issues.patch |
| 353 |
@@ -0,0 +1,57 @@ |
| 354 |
+diff -Nur skycat-3.1.3.orig/cat/generic/TclAstroCat.C skycat-3.1.3/cat/generic/TclAstroCat.C |
| 355 |
+--- skycat-3.1.3.orig/cat/generic/TclAstroCat.C 2017-08-10 16:18:22.110000000 +0000 |
| 356 |
++++ skycat-3.1.3/cat/generic/TclAstroCat.C 2017-08-10 18:06:22.660000000 +0000 |
| 357 |
+@@ -75,7 +75,7 @@ |
| 358 |
+ */ |
| 359 |
+ static class TclAstroCatSubCmds { |
| 360 |
+ public: |
| 361 |
+- char* name; // method name |
| 362 |
++ const char* name; // method name |
| 363 |
+ int (TclAstroCat::*fptr)(int argc, char* argv[]); |
| 364 |
+ int min_args; // minimum number of args |
| 365 |
+ int max_args; // maximum number of args |
| 366 |
+diff -Nur skycat-3.1.3.orig/rtd/generic/BiasData.C skycat-3.1.3/rtd/generic/BiasData.C |
| 367 |
+--- skycat-3.1.3.orig/rtd/generic/BiasData.C 2017-08-10 16:18:22.120000000 +0000 |
| 368 |
++++ skycat-3.1.3/rtd/generic/BiasData.C 2017-08-10 18:05:35.520000000 +0000 |
| 369 |
+@@ -76,7 +76,7 @@ |
| 370 |
+ char* BiasData::file(int nr) |
| 371 |
+ { |
| 372 |
+ if (nr < 0 || nr >=MAXBIAS) |
| 373 |
+- return '\0'; |
| 374 |
++ return ""; |
| 375 |
+ return &files_[nr][0]; |
| 376 |
+ } |
| 377 |
+ |
| 378 |
+diff -Nur skycat-3.1.3.orig/rtd/generic/RtdPerf.C skycat-3.1.3/rtd/generic/RtdPerf.C |
| 379 |
+--- skycat-3.1.3.orig/rtd/generic/RtdPerf.C 2017-08-10 16:18:22.120000000 +0000 |
| 380 |
++++ skycat-3.1.3/rtd/generic/RtdPerf.C 2017-08-10 18:05:35.520000000 +0000 |
| 381 |
+@@ -226,18 +226,18 @@ |
| 382 |
+ accGENtime_ = accTCLtime_ = accXtime_ = accFREQtime_ = 0.0; |
| 383 |
+ |
| 384 |
+ // Clear the Tcl variables. |
| 385 |
+- Tcl_SetVar2(interp_, var, "PERF_COUNT", '\0', TCL_GLOBAL_ONLY); |
| 386 |
++ Tcl_SetVar2(interp_, var, "PERF_COUNT", "", TCL_GLOBAL_ONLY); |
| 387 |
+ |
| 388 |
+- Tcl_SetVar2(interp_, var, "PERF_FREQ", '\0', TCL_GLOBAL_ONLY); |
| 389 |
+- Tcl_SetVar2(interp_, var, "PERF_GEN", '\0', TCL_GLOBAL_ONLY); |
| 390 |
+- Tcl_SetVar2(interp_, var, "PERF_XFUNC", '\0', TCL_GLOBAL_ONLY); |
| 391 |
+- Tcl_SetVar2(interp_, var, "PERF_TCL", '\0', TCL_GLOBAL_ONLY); |
| 392 |
+- Tcl_SetVar2(interp_, var, "PERF_TOTAL", '\0', TCL_GLOBAL_ONLY); |
| 393 |
++ Tcl_SetVar2(interp_, var, "PERF_FREQ", "", TCL_GLOBAL_ONLY); |
| 394 |
++ Tcl_SetVar2(interp_, var, "PERF_GEN", "", TCL_GLOBAL_ONLY); |
| 395 |
++ Tcl_SetVar2(interp_, var, "PERF_XFUNC", "", TCL_GLOBAL_ONLY); |
| 396 |
++ Tcl_SetVar2(interp_, var, "PERF_TCL", "", TCL_GLOBAL_ONLY); |
| 397 |
++ Tcl_SetVar2(interp_, var, "PERF_TOTAL", "", TCL_GLOBAL_ONLY); |
| 398 |
+ |
| 399 |
+- Tcl_SetVar2(interp_, var, "PERF_FREQ_AVE", '\0', TCL_GLOBAL_ONLY); |
| 400 |
+- Tcl_SetVar2(interp_, var, "PERF_GEN_AVE", '\0', TCL_GLOBAL_ONLY); |
| 401 |
+- Tcl_SetVar2(interp_, var, "PERF_XFUNC_AVE", '\0', TCL_GLOBAL_ONLY); |
| 402 |
+- Tcl_SetVar2(interp_, var, "PERF_TCL_AVE", '\0', TCL_GLOBAL_ONLY); |
| 403 |
+- Tcl_SetVar2(interp_, var, "PERF_TOTAL_AVE", '\0', TCL_GLOBAL_ONLY); |
| 404 |
++ Tcl_SetVar2(interp_, var, "PERF_FREQ_AVE", "", TCL_GLOBAL_ONLY); |
| 405 |
++ Tcl_SetVar2(interp_, var, "PERF_GEN_AVE", "", TCL_GLOBAL_ONLY); |
| 406 |
++ Tcl_SetVar2(interp_, var, "PERF_XFUNC_AVE", "", TCL_GLOBAL_ONLY); |
| 407 |
++ Tcl_SetVar2(interp_, var, "PERF_TCL_AVE", "", TCL_GLOBAL_ONLY); |
| 408 |
++ Tcl_SetVar2(interp_, var, "PERF_TOTAL_AVE", "", TCL_GLOBAL_ONLY); |
| 409 |
+ } |
| 410 |
+ |
| 411 |
|
| 412 |
diff --git a/sci-astronomy/skycat/skycat-3.1.3.ebuild b/sci-astronomy/skycat/skycat-3.1.3.ebuild |
| 413 |
new file mode 100644 |
| 414 |
index 00000000000..4ade8b0c438 |
| 415 |
--- /dev/null |
| 416 |
+++ b/sci-astronomy/skycat/skycat-3.1.3.ebuild |
| 417 |
@@ -0,0 +1,68 @@ |
| 418 |
+# Copyright 1999-2017 Gentoo Foundation |
| 419 |
+# Distributed under the terms of the GNU General Public License v2 |
| 420 |
+ |
| 421 |
+EAPI=6 |
| 422 |
+ |
| 423 |
+inherit autotools flag-o-matic |
| 424 |
+ |
| 425 |
+DESCRIPTION="ESO astronomical image visualizer with catalog access" |
| 426 |
+HOMEPAGE="http://archive.eso.org/skycat" |
| 427 |
+SRC_URI="http://archive.eso.org/cms/tools-documentation/skycat-download/${P}.tar.gz" |
| 428 |
+ |
| 429 |
+LICENSE="GPL-2" |
| 430 |
+SLOT="0" |
| 431 |
+ |
| 432 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 433 |
+IUSE="threads" |
| 434 |
+ |
| 435 |
+DEPEND=" |
| 436 |
+ dev-tcltk/blt:= |
| 437 |
+ dev-tcltk/expect:= |
| 438 |
+ dev-tcltk/itcl:= |
| 439 |
+ dev-tcltk/iwidgets:= |
| 440 |
+ dev-tcltk/tkimg:= |
| 441 |
+ sci-astronomy/wcstools:= |
| 442 |
+ sci-libs/cfitsio:= |
| 443 |
+ x11-libs/libXext:= |
| 444 |
+" |
| 445 |
+RDEPEND="${DEPEND}" |
| 446 |
+ |
| 447 |
+PATCHES=( |
| 448 |
+ "${FILESDIR}"/${PN}-3.1.3-string-issues.patch |
| 449 |
+ "${FILESDIR}"/${PN}-3.1.3-remove-tclx-dep.patch |
| 450 |
+ "${FILESDIR}"/${PN}-3.1.2-m4.patch |
| 451 |
+ "${FILESDIR}"/${PN}-3.1.2-makefile-qa.patch |
| 452 |
+ "${FILESDIR}"/${PN}-3.0.2-systemlibs.patch |
| 453 |
+ "${FILESDIR}"/${PN}-3.0.2-tk8.5.patch |
| 454 |
+) |
| 455 |
+ |
| 456 |
+src_prepare() { |
| 457 |
+ default |
| 458 |
+ rm -r astrotcl/{cfitsio,libwcs} || die |
| 459 |
+ # prefix it |
| 460 |
+ sed -e "s:/usr:${EPREFIX}/usr:g" \ |
| 461 |
+ -i */configure.in */aclocal.m4 || die |
| 462 |
+ local f |
| 463 |
+ for f in configure.in */configure.in ; do |
| 464 |
+ mv "$f" "${f/.in/.ac}" || die |
| 465 |
+ done |
| 466 |
+ # bug #626162 . lazy sed to avoid a big patch |
| 467 |
+ sed -i -e 's/static char/static unsigned char/g' $(find . -name \*.xbm) || die |
| 468 |
+ eautoreconf |
| 469 |
+} |
| 470 |
+ |
| 471 |
+src_configure() { |
| 472 |
+ # bug #514604 |
| 473 |
+ append-cppflags -DUSE_INTERP_RESULT |
| 474 |
+ econf $(use_enable threads) --enable-merge |
| 475 |
+} |
| 476 |
+ |
| 477 |
+src_install() { |
| 478 |
+ default |
| 479 |
+ local d f |
| 480 |
+ for d in tclutil astrotcl rtd cat skycat; do |
| 481 |
+ for f in README CHANGES VERSION; do |
| 482 |
+ newdoc ${f} ${f}.${d} |
| 483 |
+ done |
| 484 |
+ done |
| 485 |
+} |
Archives