Fix compability with TCL 8.5 and 8.6 for real.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 475 insertions, 12 deletions

diff --git a/app-office/ical/ChangeLog b/app-office/ical/ChangeLog
index 46e34dd28804..49cad1012cee 100644
--- a/app-office/ical/ChangeLog
+++ b/app-office/ical/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/ical
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.27 2010/02/26 12:04:43 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.28 2010/03/24 14:00:52 ssuominen Exp $
+
+*ical-3.0-r1 (24 Mar 2010)
+
+  24 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> +ical-3.0-r1.ebuild,
+  +files/ical-3.0-newtcl.patch:
+  Fix compability with TCL 8.5 and 8.6 for real.
 
   26 Feb 2010; Christian Faulhammer <fauli@gentoo.org> ical-3.0.ebuild:
   stable x86, bug 305295
diff --git a/app-office/ical/Manifest b/app-office/ical/Manifest
index 84add5b4bdf0..6d5bf7670b63 100644
--- a/app-office/ical/Manifest
+++ b/app-office/ical/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ical-2.3.3-glibc210.patch 592 RMD160 f464ed35aceeb4510e9e0b9e03f54b9b116be8e2 SHA1 4b78caf2aedfe765c177d1dd569122ec6ff70874 SHA256 96c4ddaba71e4c9be979eaacfbb33584c45925aa35b6ecc59698041e8af4993d
 AUX ical-2.3.3-tcl8.5.patch 552 RMD160 e735b32b5d620deaf617865e33ee8e096e2b9ade SHA1 e0c0290b7a34dde81443327b5560f187e191f6ad SHA256 768516416c77651b84ab1b277ed91d4b593bc9395394a80d843650329716608a
 AUX ical-3.0-gcc44.patch 329 RMD160 d04d78e4673f9d3d00694784d42e97234324f36f SHA1 6e6a29edead16866a041aaf0f08eb1cbef2c8708 SHA256 6450b45e18a63a34aaf32c28b55b8f49abed585d8ba8276f5992719b38769821
+AUX ical-3.0-newtcl.patch 12767 RMD160 bd5f7eb7b368a9b983b4e4eff05f8d90e42c267c SHA1 e7f700cdbac1ae026a6bfb56f02c154f178c9517 SHA256 75ff4f6683dc0d913f1bbe694958f1f1d108445e2a25da52eed922380dda9a28
 DIST ical-2.3.3.tar.gz 293932 RMD160 9141bec1497b49c1952d4814ad4b7cc0bda5d794 SHA1 4559ac395218642f0a479bd1bf1429c04d64cd25 SHA256 fa8659c3d5937629169ed34aeffa14df9ba12b825a8155cfb602bf63be0d84f2
 DIST ical-3.0.tar.gz 373891 RMD160 ff0724c1cda6de8cbde0762fb84931455abef73b SHA1 a2d2efe5bd93ea63045f3dd4a7d2e0922849c727 SHA256 d290fa484a8fe5e8f70a397e9c12b61bb82c6ca517464390171fe3b06d203bbb
 EBUILD ical-2.3.3.ebuild 1098 RMD160 186b663be3990629ea11604411b0c62893ae450e SHA1 75c97737bfb7d8332192db8e00022e7221ff53bc SHA256 247c32e4ce9bfdbc77ad687acf3247bd2c7c99ab9b5578de0da613d8ede2ceac
+EBUILD ical-3.0-r1.ebuild 1177 RMD160 3485d0796e6c274e74d5dde69ef642d3ac2666e8 SHA1 9ded81d10a543425dd14a6ac7754b8d1c208278b SHA256 342decbc1bc12525811de960306d4a0b7261afcac3c82c3f695415e24be5d843
 EBUILD ical-3.0.ebuild 1133 RMD160 4159c804eb6989b778a4e8de45c7d993daa1786c SHA1 754e5dae0de3b9a077694ab43a0a55789a1ef48e SHA256 90e5670aeef74eeee71f9d2784ad72f11e837d21171c60a8c1abca2285049ffa
-MISC ChangeLog 3376 RMD160 15f5bb30ad9db77dcec64856b3b170edb9edc8a9 SHA1 64a5c2833d8b261d95a6c68f29e0af6236b4fc4d SHA256 e1bea3484858f35233da7d37b5ca772e5d8c527d77a9b8a74e38d5e6871a39d7
+MISC ChangeLog 3565 RMD160 1395cccb268d1bfe819421f28ad4235dfd5bb814 SHA1 a53ab9b498299c53893789712cdc7737c9b867d8 SHA256 88a6983d79f9326b998827ad0b29a14e60bba9a5d3b470f3894e351e5eb3ea71
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuHuOYACgkQNQqtfCuFneM3awCfUppcbEVcnxtbnLEP77rpTOwr
-nY8An2VhDb49m5v6czKLtAEaG77A49WA
-=6IKW
------END PGP SIGNATURE-----
diff --git a/app-office/ical/files/ical-3.0-newtcl.patch b/app-office/ical/files/ical-3.0-newtcl.patch
new file mode 100644
index 000000000000..73fc26272e4c
--- /dev/null
+++ b/app-office/ical/files/ical-3.0-newtcl.patch
@@ -0,0 +1,412 @@
+diff -ur ical-3.0.orig/dg_item.tcl ical-3.0/dg_item.tcl
+--- ical-3.0.orig/dg_item.tcl	2008-11-13 01:27:08.000000000 +0200
++++ ical-3.0/dg_item.tcl	2010-03-24 15:46:06.000000000 +0200
+@@ -3,15 +3,15 @@
+ 
+ proc item_edit {leader item} {
+     global iedit
+-    set iedit(done) -1
++    set iedit_done -1
+ 
+     iedit_make
+     iedit_fill $item
+     update
+     wm minsize .iedit [winfo reqwidth .iedit] [winfo reqheight .iedit]
+ 
+-    dialog_run $leader .iedit iedit(done)
+-    if !$iedit(done) {return}
++    dialog_run $leader .iedit iedit_done
++    if !$iedit_done {return}
+ 
+     # Check that item has not been deleted concurrently
+     catch {
+@@ -28,7 +28,7 @@
+     toplevel $f -class Bigdialog
+     wm title $f {Item Properties}
+     wm iconname $f Item
+-    wm protocol $f WM_DELETE_WINDOW {set iedit(done) 0}
++    wm protocol $f WM_DELETE_WINDOW {set iedit_done 0}
+ 
+     # Make the various container frames
+     frame $f.f1
+@@ -37,8 +37,8 @@
+ 
+     # Make the buttons
+     make_buttons $f.bot 1 {
+-        {Cancel         {set iedit(done) 0}}
+-        {Okay           {set iedit(done) 1}}
++        {Cancel         {set iedit_done 0}}
++        {Okay           {set iedit_done 1}}
+     }
+ 
+     # Top-level layout
+@@ -139,8 +139,8 @@
+         -variable iedit(todo) -onvalue 1 -offvalue 0
+     pack $f.todo -in $f.f2.c1 -side top -fill both
+ 
+-    bind $f <Control-c> {set iedit(done) 0}
+-    bind $f <Return>    {set iedit(done) 1}
++    bind $f <Control-c> {set iedit_done 0}
++    bind $f <Return>    {set iedit_done 1}
+ 
+     wm withdraw $f
+ }
+diff -ur ical-3.0.orig/dg_key.tcl ical-3.0/dg_key.tcl
+--- ical-3.0.orig/dg_key.tcl	2008-11-10 12:06:11.000000000 +0200
++++ ical-3.0/dg_key.tcl	2010-03-24 15:47:41.000000000 +0200
+@@ -11,7 +11,7 @@
+ #       The result is a list with two elements.  The first element
+ #       is a key sequence, and the second is a command name.
+ 
+-set defkey(done) -1
++set defkey_done -1
+ set defkey(help) 0
+ set defkey(cmd)  {}
+ 
+@@ -36,7 +36,7 @@
+ 
+     toplevel $f -class Dialog
+     wm title $f "Define Key"
+-    wm protocol $f WM_DELETE_WINDOW {set defkey(done) 0}
++    wm protocol $f WM_DELETE_WINDOW {set defkey_done 0}
+ 
+     frame $f.top -class Pane
+     frame $f.mid -class Pane
+@@ -44,8 +44,8 @@
+     make_buttons $f.bot 3 {
+         {Clear                  {defkey_clear_key}}
+         {Help                   {defkey_help_toggle}}
+-        {Cancel                 {set defkey(done) 0}}
+-        {Okay                   {set defkey(done) 1}}
++        {Cancel                 {set defkey_done 0}}
++        {Okay                   {set defkey_done 1}}
+     }
+ 
+     message $f.text -aspect 400 -text [join {
+@@ -117,10 +117,10 @@
+     if $defkey(help) {defkey_help_toggle}
+ 
+     # Run dialog
+-    set defkey(done) -1
+-    dialog_run $leader $f defkey(done)
++    set defkey_done -1
++    dialog_run $leader $f defkey_done
+ 
+-    return $defkey(done)
++    return $defkey_done
+ }
+ 
+ proc defkey_select_command {} {
+diff -ur ical-3.0.orig/dg_monthr.tcl ical-3.0/dg_monthr.tcl
+--- ical-3.0.orig/dg_monthr.tcl	2008-11-10 12:06:10.000000000 +0200
++++ ical-3.0/dg_monthr.tcl	2010-03-24 15:48:57.000000000 +0200
+@@ -11,13 +11,13 @@
+ 
+ # Hidden global variables
+ #
+-#       mr_state(done)          Interaction has finished
++#       mr_state_done           Interaction has finished
+ #       mr_state(item)          The item being modified
+ #       mr_state(int)           Repetition interval in months
+ #       mr_state(occ)           Type of monthly occurrence
+ #       mr_state(count:...)     Count for a particular type of occurrence
+ 
+-set mr_state(done)      0
++set mr_state_done       0
+ set mr_state(item)      {}
+ set mr_state(occ)       {}
+ set mr_state(int)       {}
+@@ -51,7 +51,7 @@
+     toplevel $f -class Dialog
+     wm title $f "Monthly Repetition"
+     wm iconname $f "Repeat"
+-    wm protocol $f WM_DELETE_WINDOW {set mr_state(done) 0}
++    wm protocol $f WM_DELETE_WINDOW {set mr_state_done 0}
+ 
+     frame $f.top   -class Pane
+     frame $f.left  -class Pane
+@@ -61,8 +61,8 @@
+     pack $f.text -in $f.top -side top -expand 1 -fill both -padx 5m -pady 5m
+ 
+     make_buttons $f.bot 1 {
+-        {Cancel         {set mr_state(done) 0}}
+-        {Okay           {set mr_state(done) 1}}
++        {Cancel         {set mr_state_done 0}}
++        {Okay           {set mr_state_done 1}}
+     }
+ 
+     # Create interval buttons
+@@ -104,8 +104,8 @@
+     pack $f.left  -side left -expand 1 -fill both
+     pack $f.right -side left -expand 1 -fill both
+ 
+-    bind $f <Control-c> {set mr_state(done) 0}
+-    bind $f <Return>    {set mr_state(done) 1}
++    bind $f <Control-c> {set mr_state_done 0}
++    bind $f <Return>    {set mr_state_done 1}
+ 
+     wm withdraw $f
+     update
+@@ -114,7 +114,7 @@
+ proc monthrepeat_interact {leader item anchor} {
+     global mr_state
+     set f .mr_dialog
+-    set mr_state(done) -1
++    set mr_state_done -1
+     set mr_state(int)  1
+     set mr_state(occ)  month_day
+ 
+@@ -186,6 +186,6 @@
+         $f.month_last_week_day configure -text "[num2text $c]-last $wday_name"
+     }
+ 
+-    dialog_run $leader $f mr_state(done)
+-    return $mr_state(done)
++    dialog_run $leader $f mr_state_done
++    return $mr_state_done
+ }
+diff -ur ical-3.0.orig/dg_range.tcl ical-3.0/dg_range.tcl
+--- ical-3.0.orig/dg_range.tcl	2008-11-10 12:06:09.000000000 +0200
++++ ical-3.0/dg_range.tcl	2010-03-24 15:49:57.000000000 +0200
+@@ -14,11 +14,11 @@
+ 
+ # Hidden global variables
+ #
+-#       dr_state(done)          Interaction has finished
++#       dr_state_done           Interaction has finished
+ #       dr_state(start)         Starting date
+ #       dr_state(finish)        Finishing date
+ 
+-set dr_state(done)              0
++set dr_state_done               0
+ set dr_state(start)             {}
+ set dr_state(finish)            {}
+ 
+@@ -47,7 +47,7 @@
+     toplevel $f -class Dialog
+     wm title $f "Select Range"
+     wm iconname $f "Range"
+-    wm protocol $f WM_DELETE_WINDOW {set dr_state(done) 0}
++    wm protocol $f WM_DELETE_WINDOW {set dr_state_done 0}
+ 
+     frame $f.top -class Pane
+     message $f.text -aspect 800 -text {Restrict item repetition range...}
+@@ -62,16 +62,16 @@
+     pack $f.finish  -in $f.mid -side top -expand 1 -fill both -padx 5m -pady 5m
+ 
+     make_buttons $f.bot 1 {
+-        {Cancel         {set dr_state(done) 0}}
+-        {Okay           {set dr_state(done) 1}}
++        {Cancel         {set dr_state_done 0}}
++        {Okay           {set dr_state_done 1}}
+     }
+ 
+     pack $f.top -side top -fill both -expand 1
+     pack $f.mid -side top -fill both -expand 1
+     pack $f.bot -side bottom -fill x
+ 
+-    bind $f <Control-c> {set dr_state(done) 0}
+-    bind $f <Return>    {set dr_state(done) 1}
++    bind $f <Control-c> {set dr_state_done 0}
++    bind $f <Return>    {set dr_state_done 1}
+ 
+     wm withdraw $f
+     update
+@@ -86,9 +86,9 @@
+     global dr_state
+     set f .dr_dialog
+ 
+-    set dr_state(done) -1
+-    dialog_run $leader $f dr_state(done)
+-    return $dr_state(done)
++    set dr_state_done -1
++    dialog_run $leader $f dr_state_done
++    return $dr_state_done
+ }
+ 
+ proc dr_validate {args} {
+diff -ur ical-3.0.orig/dg_wdays.tcl ical-3.0/dg_wdays.tcl
+--- ical-3.0.orig/dg_wdays.tcl	2008-11-10 12:06:08.000000000 +0200
++++ ical-3.0/dg_wdays.tcl	2010-03-24 15:54:11.000000000 +0200
+@@ -11,11 +11,11 @@
+ 
+ # Hidden global variables
+ #
+-#       ws_state(done)          Is ws interaction finished
++#       ws_state_done           Is ws interaction finished
+ #       ws_state(1..7)          Set iff specified weekday was selected
+ #       ws_state(int)           Week interval
+ 
+-set ws_state(done) 0
++set ws_state_done 0
+ foreach i {1 2 3 4 5 6 7} {
+     set ws_state($i) 0
+ }
+@@ -54,7 +54,7 @@
+     toplevel $f -class Dialog
+     wm title $f {Weekly Repetition}
+     wm iconname $f Repeat
+-    wm protocol $f WM_DELETE_WINDOW {set ws_state(done) 0}
++    wm protocol $f WM_DELETE_WINDOW {set ws_state_done 0}
+ 
+     frame $f.top   -class Pane
+     frame $f.left  -class Pane
+@@ -64,8 +64,8 @@
+     pack $f.text -in $f.top -side top -expand 1 -fill both -padx 5m -pady 5m
+ 
+     make_buttons $f.bot 1 {
+-        {Cancel         {set ws_state(done) 0}}
+-        {Okay           {set ws_state(done) 1}}
++        {Cancel         {set ws_state_done 0}}
++        {Okay           {set ws_state_done 1}}
+     }
+ 
+     # Make set of weekdays
+@@ -107,8 +107,8 @@
+     pack $f.right -side left -expand 1 -fill both
+     pack $f.left -side left -expand 1 -fill both
+ 
+-    bind $f <Control-c> {set ws_state(done) 0}
+-    bind $f <Return>    {set ws_state(done) 1}
++    bind $f <Control-c> {set ws_state_done 0}
++    bind $f <Return>    {set ws_state_done 1}
+ 
+     wm withdraw $f
+     update
+@@ -135,9 +135,9 @@
+     ws_reconfig
+ 
+     # Run dialog
+-    set ws_state(done) -1
+-    dialog_run $leader $f ws_state(done)
++    set ws_state_done -1
++    dialog_run $leader $f ws_state_done
+ 
+     # Construct return value
+-    return $ws_state(done)
++    return $ws_state_done
+ }
+diff -ur ical-3.0.orig/help.tcl ical-3.0/help.tcl
+--- ical-3.0.orig/help.tcl	2008-11-10 12:06:04.000000000 +0200
++++ ical-3.0/help.tcl	2010-03-24 15:55:03.000000000 +0200
+@@ -132,7 +132,7 @@
+     return 0
+ }
+ 
+-set about(done) 0
++set about_done 0
+ proc show_about {leader} {
+     global ical about
+ 
+@@ -155,22 +155,22 @@
+         pack $t.top.author  -side top -expand 1 -fill x -padx 5m -pady 5m
+ 
+         make_buttons $t.bot 0 {
+-            {{Okay}             {set about(done) 1}}
++            {{Okay}             {set about_done 1}}
+         }
+ 
+         pack $t.top -side top -expand 1 -fill x
+         pack $t.bot -side bottom -expand 1 -fill x
+ 
+         wm title $t {About Ical}
+-        wm protocol $t WM_DELETE_WINDOW {set about(done) 1}
+-        bind $t <Control-c> {set about(done) 1}
+-        bind $t <Return>    {set about(done) 1}
++        wm protocol $t WM_DELETE_WINDOW {set about_done 1}
++        bind $t <Control-c> {set about_done 1}
++        bind $t <Return>    {set about_done 1}
+ 
+         wm withdraw $t
+         update idletasks
+     }
+ 
+-    set about(done) 0
+-    dialog_run $leader $t about(done)
++    set about_done 0
++    dialog_run $leader $t about_done
+     return
+ }
+diff -ur ical-3.0.orig/ical.C ical-3.0/ical.C
+--- ical-3.0.orig/ical.C	2008-11-10 12:06:04.000000000 +0200
++++ ical-3.0/ical.C	2010-03-24 15:58:38.000000000 +0200
+@@ -140,7 +140,7 @@
+     buffer.append('\0');
+ 
+     if (Tcl_Eval(tcl, buffer.as_pointer()) == TCL_ERROR)
+-        fprintf(stderr, "ical: trigger error: %s\n", tcl->result);
++	fprintf(stderr, "ical: trigger error: %s\n", Tcl_GetStringResult(tcl));
+ 
+     buffer.clear();
+ }
+diff -ur ical-3.0.orig/tcllib/dg_bug.tcl ical-3.0/tcllib/dg_bug.tcl
+--- ical-3.0.orig/tcllib/dg_bug.tcl	2008-11-10 12:03:23.000000000 +0200
++++ ical-3.0/tcllib/dg_bug.tcl	2010-03-24 15:57:22.000000000 +0200
+@@ -11,7 +11,7 @@
+ #
+ #       bug_done                Is bug interaction finished
+ 
+-set bug(done) no
++set bug_done no
+ 
+ proc bug_notify {mailer email message} {
+     bug_make
+@@ -26,15 +26,15 @@
+ 
+     toplevel $f -class Dialog
+     wm title $f {Internal Error}
+-    wm protocol $f WM_DELETE_WINDOW {set bug(done) cancel}
++    wm protocol $f WM_DELETE_WINDOW {set bug_done cancel}
+ 
+     frame $f.top -class Pane
+     frame $f.mid -class Pane
+ 
+     make_buttons $f.bot 2 {
+-        {{Dismiss}              {set bug(done) cancel}}
+-        {{Save}                 {set bug(done) save}}
+-        {{Mail Report}          {set bug(done) send}}
++        {{Dismiss}              {set bug_done cancel}}
++        {{Save}                 {set bug_done save}}
++        {{Mail Report}          {set bug_done send}}
+     }
+ 
+     label $f.icon -bitmap error
+@@ -57,7 +57,7 @@
+     pack $f.bot -side top -fill both
+ 
+     # XXX What bindings should we add here?
+-    # bind $f <Control-c><Control-c> {set bug(done) cancel}
++    # bind $f <Control-c><Control-c> {set bug_done cancel}
+ 
+     wm withdraw $f
+     update
+@@ -97,13 +97,13 @@
+     set etext $bug(edit).text
+     $etext delete 1.0 end
+ 
+-    set bug(done) no
+-    dialog_run {} $f bug(done) $etext
++    set bug_done no
++    dialog_run {} $f bug_done $etext
+ 
+-    if ![string compare $bug(done) {cancel}] return
++    if ![string compare $bug_done {cancel}] return
+ 
+     set text [bug_extract]
+-    switch -exact -- $bug(done) {
++    switch -exact -- $bug_done {
+         save {
+             bug_save $email $text
+         }
+diff -ur ical-3.0.orig/tests/dialog.tcl ical-3.0/tests/dialog.tcl
+--- ical-3.0.orig/tests/dialog.tcl	2008-11-10 12:03:37.000000000 +0200
++++ ical-3.0/tests/dialog.tcl	2010-03-24 15:57:47.000000000 +0200
+@@ -35,7 +35,7 @@
+ }
+ 
+ proc dg_bug {} {
+-    after 500 {set bug(done) cancel}
++    after 500 {set bug_done cancel}
+     expect {bug_notify cat foo "Test message"} {}
+ }
+ 
diff --git a/app-office/ical/ical-3.0-r1.ebuild b/app-office/ical/ical-3.0-r1.ebuild
new file mode 100644
index 000000000000..77c2e08cfd0f
--- /dev/null
+++ b/app-office/ical/ical-3.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ical-3.0-r1.ebuild,v 1.1 2010/03/24 14:00:52 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils multilib virtualx
+
+DESCRIPTION="Tk-based Calendar program"
+HOMEPAGE="http://launchpad.net/ical-tcl"
+SRC_URI="http://launchpad.net/ical-tcl/3.x/${PV}/+download/${P}.tar.gz"
+
+LICENSE="as-is GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/tcl
+	dev-lang/tk"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-newtcl.patch
+
+	sed -i \
+		-e 's:8.4 8.3:8.6 8.5 8.4 8.3:g' \
+		-e 's:sys/utsname.h limits.h::' \
+		configure.in || die
+
+	sed -i \
+		-e 's:mkdir:mkdir -p:' \
+		-e "/LIBDIR =/s:lib:$(get_libdir):" \
+		-e '/MANDIR =/s:man:share/man:' \
+		Makefile.in || die
+
+	eautoconf
+}
+
+src_compile() {
+	emake OPTF="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die
+}
+
+src_test() {
+	Xmake check || die
+}
+
+src_install() {
+	emake prefix="${D}/usr" install || die
+
+	dodoc ANNOUNCE *README RWMJ-release-notes.txt TODO
+	dohtml {.,doc}/*.html
+
+	rm -f "${D}"/usr/$(get_libdir)/ical/v3.0/contrib/README
+}