Fix for bug #125387 , error after choosing a game

Package-Manager: portage-2.1_pre6-r4

4 files changed, 95 insertions, 9 deletions

diff --git a/games-strategy/xconq/ChangeLog b/games-strategy/xconq/ChangeLog
index 5d4e920ecca3..0607cfe3b58d 100644
--- a/games-strategy/xconq/ChangeLog
+++ b/games-strategy/xconq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/xconq
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/ChangeLog,v 1.6 2006/02/23 22:38:52 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/ChangeLog,v 1.7 2006/03/22 23:12:54 tupone Exp $
+
+  22 Mar 2006; <Tupone@gentoo.org> +files/xconq-tkconq.patch,
+  xconq-7.4.1.ebuild:
+  Fixed tkconq.tcl error messages. Bug #125387 by Paulo da Silva.
 
   23 Feb 2006; <Tupone@gentoo.org> xconq-7.4.1.ebuild:
   Modular X dependency fix
diff --git a/games-strategy/xconq/Manifest b/games-strategy/xconq/Manifest
index 2d1830828db7..f354c1d7ae32 100644
--- a/games-strategy/xconq/Manifest
+++ b/games-strategy/xconq/Manifest
@@ -1,15 +1,28 @@
-MD5 7ff2ef5fc4be5e1905c577f3356dd9e3 ChangeLog 769
-RMD160 f7fbda44ac1609b881b2d375a5c2b9a64ae22afc ChangeLog 769
-SHA256 4d849a59dc418aece9d99c6b298bd210165abfb7a9a7e5d460c8d1f71779af79 ChangeLog 769
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 99a031925a3961f2b2f2eb99cec716ac ChangeLog 920
+RMD160 584fc47b7ea5d64c659a39aa77f32cccab5a6231 ChangeLog 920
+SHA256 d002cb89ed3bd801487ebad8fee26246d0c745e681100bcb26a25a74a56a9d4f ChangeLog 920
 MD5 028c52409e7a9e083023f419f65a76f6 files/digest-xconq-7.4.1 238
 RMD160 21997ae1f3f6e282e82ee04912546332a40f0a6e files/digest-xconq-7.4.1 238
 SHA256 1b7c045dc114e710dd70938c1d4a4b85a169538297cd267878b98f2a4da96916 files/digest-xconq-7.4.1 238
 MD5 678926da0bc080c8b9c755516e553ddb files/xconq-gcc-3.4.patch 223
 RMD160 286b8a0f3604eff1030234d35ca4c14a835e96fc files/xconq-gcc-3.4.patch 223
 SHA256 59e72407bef819ccabd9b1b0c175b8105a40521c3a8e33f370a63002074e695b files/xconq-gcc-3.4.patch 223
+MD5 547f68c11af8a17bed0e26e6c08e385b files/xconq-tkconq.patch 3725
+RMD160 713a18e99c886f100a39cad1b9cb499e1a264ee4 files/xconq-tkconq.patch 3725
+SHA256 134dc49f74db073a5c0529450cd8094ccf890c6b9e096fa9d5d34d3dfda10397 files/xconq-tkconq.patch 3725
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 d2464775f64b4fd1fc38b0bf8da3bdeb xconq-7.4.1.ebuild 1053
-RMD160 992546b69cad81cea5bb4d830674f5f037c7b0a8 xconq-7.4.1.ebuild 1053
-SHA256 c32b1524c5f434c908f98d1e945308b1359fc99f703eafff8e5cf61863918d4b xconq-7.4.1.ebuild 1053
+MD5 96000cedc1bab2f309c8ee24e53eab4c xconq-7.4.1.ebuild 1088
+RMD160 8b69ab25c8afb7cecc7fc22a203e62908678db92 xconq-7.4.1.ebuild 1088
+SHA256 149cd2904fb5b6183ed5257872bc9367978d335089e693b0ee27c619c3cf3e90 xconq-7.4.1.ebuild 1088
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFEIdoI2CTtIKiFlQIRAtIFAKCD4UK6aQ+we7LWHCDXvKkjHQ1Q7wCgktyR
+Db4meFC2myRc/vo35UdyAsM=
+=dG69
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/xconq/files/xconq-tkconq.patch b/games-strategy/xconq/files/xconq-tkconq.patch
new file mode 100644
index 000000000000..82af334cca48
--- /dev/null
+++ b/games-strategy/xconq/files/xconq-tkconq.patch
@@ -0,0 +1,68 @@
+--- tcltk/tkconq.tcl	2000-12-11 19:09:15.000000000 +0100
++++ /usr/share/games/xconq/tkconq.tcl	2006-03-22 23:49:20.000000000 +0100
+@@ -472,7 +472,7 @@
+ 		    -state $variantstate($col2) -variable variantvalue($col2) \
+ 		    -command [ list set_variant_value_cmd $col2 ]
+ 	    grid .newgame.top.checks.v$col1 .newgame.top.checks.v$col2 \
+-		    -sticky w -pad 5
++		    -sticky w -padx 5 -pady 5
+ 	}
+ 	for { set v 0 } { $v < 16 } { incr v } {
+ 	    if { "$variantstate($v)" == "active" } {
+@@ -785,37 +785,37 @@
+ 	    -command { adjust_advantage_cmd 1 }
+     button .newgame.top.plbuttons.aminus -text "A-" -state disabled \
+ 	    -command { adjust_advantage_cmd -1 }
+-    grid .newgame.top.plbuttons.aplus .newgame.top.plbuttons.aminus -sticky ew -pad 2
++    grid .newgame.top.plbuttons.aplus .newgame.top.plbuttons.aminus -sticky ew -padx 2 -pady 2
+     button .newgame.top.plbuttons.add -text "Add" \
+ 	    -command { add_player_cmd } -width 8
+-    grid .newgame.top.plbuttons.add -columnspan 2 -sticky ew -pad 2
++    grid .newgame.top.plbuttons.add -columnspan 2 -sticky ew -padx 2 -pady 2
+     button .newgame.top.plbuttons.remove -text "Remove" -width 8
+-    grid .newgame.top.plbuttons.remove -columnspan 2 -sticky ew -pad 2
++    grid .newgame.top.plbuttons.remove -columnspan 2 -sticky ew -padx 2 -pady 2
+ 
+     menubutton .newgame.top.plbuttons.sidelib -text "Side Name" \
+ 	    -menu .newgame.top.plbuttons.sidelib.menu \
+ 	    -borderwidth 2 -relief raised -width 8
+     menu .newgame.top.plbuttons.sidelib.menu -tearoff 0
+-    grid .newgame.top.plbuttons.sidelib -columnspan 2 -sticky ew -pad 2
++    grid .newgame.top.plbuttons.sidelib -columnspan 2 -sticky ew -padx 2 -pady 2
+ 
+     button .newgame.top.plbuttons.rename -text "Random" \
+ 	    -command { rename_side_for_player_cmd -1 } -width 8
+-    grid .newgame.top.plbuttons.rename -columnspan 2 -sticky ew -pad 2
++    grid .newgame.top.plbuttons.rename -columnspan 2 -sticky ew -padx 2 -pady 2
+     button .newgame.top.plbuttons.computer -text "Computer" \
+ 	    -command { cycle_ai_cmd } -width 8
+-    grid .newgame.top.plbuttons.computer -columnspan 2 -sticky ew -pad 2
++    grid .newgame.top.plbuttons.computer -columnspan 2 -sticky ew -padx 2 -pady 2
+     button .newgame.top.plbuttons.exchange -text "Exchange" \
+ 	    -command { exchange_players_cmd } -width 8
+-    grid .newgame.top.plbuttons.exchange -columnspan 2 -sticky ew -pad 2
++    grid .newgame.top.plbuttons.exchange -columnspan 2 -sticky ew -padx 2 -pady 2
+ 
+     label .newgame.top.plbuttons.indeplabel -text "Indep Units"
+-    grid .newgame.top.plbuttons.indeplabel -columnspan 2 -sticky ew -pad 2
++    grid .newgame.top.plbuttons.indeplabel -columnspan 2 -sticky ew -padx 2 -pady 2
+     button .newgame.top.plbuttons.indepside -text "Add AI" \
+ 	    -command { set_indepside toggle } -width 6
+-    grid .newgame.top.plbuttons.indepside -columnspan 2 -pad 2
++    grid .newgame.top.plbuttons.indepside -columnspan 2 -padx 2 -pady 2
+     button .newgame.top.plbuttons.indepconfig -text "Config" \
+ 	    -command { popup_indepside_config } -width 6
+-    grid .newgame.top.plbuttons.indepconfig -columnspan 2 -pad 2
++    grid .newgame.top.plbuttons.indepconfig -columnspan 2 -padx 2 -pady 2
+ 
+     # Add names to the side library menu, disabling already-used names.
+     set numsidelib [ side_lib_size ]
+@@ -2985,7 +2985,7 @@
+ 	pack .bool.msg .bool.buttons -side top -fill x -padx 10 -pady 10
+ 	button .bool.buttons.yes -text Yes -command [ list bool_yes $mapn ]
+ 	button .bool.buttons.no -text No -command [ list bool_no $mapn ]
+-	grid .bool.buttons.yes .bool.buttons.no -pad 5
++	grid .bool.buttons.yes .bool.buttons.no -padx 5 -pady 5
+ 	# (should use dflt arg here)
+ 	update idletasks
+     }
diff --git a/games-strategy/xconq/xconq-7.4.1.ebuild b/games-strategy/xconq/xconq-7.4.1.ebuild
index e940f4d4d6f9..ddd3b57ee1fe 100644
--- a/games-strategy/xconq/xconq-7.4.1.ebuild
+++ b/games-strategy/xconq/xconq-7.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/xconq-7.4.1.ebuild,v 1.8 2006/02/23 22:38:52 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/xconq-7.4.1.ebuild,v 1.9 2006/03/22 23:12:54 tupone Exp $
 
 inherit eutils games
 
@@ -22,7 +22,8 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-gcc-3.4.patch
+	epatch ${FILESDIR}/${PN}-gcc-3.4.patch \
+		${FILESDIR}/${PN}-tkconq.patch
 }
 
 src_compile() {