Revision bump to fix bug #190355.

(Portage version: 2.1.3.16)

4 files changed, 49 insertions, 4 deletions

diff --git a/dev-db/mysql-gui-tools/ChangeLog b/dev-db/mysql-gui-tools/ChangeLog
index 07a2f1a31fc1..cfdbf6b90f3a 100644
--- a/dev-db/mysql-gui-tools/ChangeLog
+++ b/dev-db/mysql-gui-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mysql-gui-tools
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.19 2007/10/21 10:51:30 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.20 2007/10/24 18:48:43 swegener Exp $
+
+*mysql-gui-tools-5.0_p12-r1 (24 Oct 2007)
+
+  24 Oct 2007; Sven Wegener <swegener@gentoo.org>
+  +files/mysql-gui-tools-5.0_p12-workbench-lua.patch,
+  -mysql-gui-tools-5.0_p12.ebuild, +mysql-gui-tools-5.0_p12-r1.ebuild:
+  Revision bump to fix bug #190355.
 
   21 Oct 2007; Sven Wegener <swegener@gentoo.org>
   mysql-gui-tools-5.0_p12.ebuild:
diff --git a/dev-db/mysql-gui-tools/files/digest-mysql-gui-tools-5.0_p12 b/dev-db/mysql-gui-tools/files/digest-mysql-gui-tools-5.0_p12-r1
index 36209eaa1205..36209eaa1205 100644
--- a/dev-db/mysql-gui-tools/files/digest-mysql-gui-tools-5.0_p12
+++ b/dev-db/mysql-gui-tools/files/digest-mysql-gui-tools-5.0_p12-r1
diff --git a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-workbench-lua.patch b/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-workbench-lua.patch
new file mode 100644
index 000000000000..eb3f0b7815f5
--- /dev/null
+++ b/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-workbench-lua.patch
@@ -0,0 +1,37 @@
+The lua parser has problems with . as a decimal point when the locale uses , as
+the decimal point.
+
+http://bugs.mysql.com/bug.php?id=19380
+
+Index: mysql-workbench/source/lua/Workbench.lua
+===================================================================
+--- mysql-workbench/source/lua/Workbench.lua	(revision 459)
++++ mysql-workbench/source/lua/Workbench.lua	(working copy)
+@@ -1683,10 +1683,10 @@
+   local x= grtV.toLua(args[1])

+   local y= grtV.toLua(args[2])

+   local curView= grtV.getGlobal("/workbench/model/currentView")

+-  local lowestX= 9999999999.0

+-  local lowestY= 9999999999.0

+-  local highestX= 0.0

+-  local highestY= 0.0

++  local lowestX= 9999999999

++  local lowestY= 9999999999

++  local highestX= 0

++  local highestY= 0

+ 

+   local i, c

+ 

+Index: mysql-workbench/source/lua/WorkbenchImport.lua
+===================================================================
+--- mysql-workbench/source/lua/WorkbenchImport.lua	(revision 459)
++++ mysql-workbench/source/lua/WorkbenchImport.lua	(working copy)
+@@ -55,7 +55,7 @@
+ function importDbd4(args)

+   local filename= grtV.toLua(args[1])

+   local p

+-  local xF= 1.5

++  local xF= 1 + 1 / 2

+   local yF= 2

+   

+   local callbacks= {

diff --git a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r1.ebuild
index ab79c8681258..d7d33e319a33 100644
--- a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild
+++ b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild,v 1.5 2007/10/21 10:51:30 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r1.ebuild,v 1.1 2007/10/24 18:48:43 swegener Exp $
 
 GCONF_DEBUG="no"
 
@@ -66,8 +66,9 @@ src_unpack() {
 	gnome2_src_unpack
 	cd "${S}"
 
-	epatch "${FILESDIR}"/mysql-gui-tools-5.0_p8-i18n-fix.patch
-	epatch "${FILESDIR}"/mysql-gui-tools-5.0_p8-lua-modules.patch
+	epatch "${FILESDIR}"/${PN}-5.0_p8-i18n-fix.patch
+	epatch "${FILESDIR}"/${PN}-5.0_p8-lua-modules.patch
+	epatch "${FILESDIR}"/${P}-workbench-lua.patch
 
 	sed -i \
 		-e "s/\\(^\\|[[:space:]]\\)-ltermcap\\($\\|[[:space:]]\\)/ /g" \