remove workbench references since lua-5.0 is gone.

Package-Manager: portage-2.1.4.4

4 files changed, 19 insertions, 81 deletions

diff --git a/dev-db/mysql-gui-tools/ChangeLog b/dev-db/mysql-gui-tools/ChangeLog
index 9dad670adeed..28828d3cb298 100644
--- a/dev-db/mysql-gui-tools/ChangeLog
+++ b/dev-db/mysql-gui-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mysql-gui-tools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.26 2008/08/05 16:35:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.27 2008/08/17 04:13:08 mr_bones_ Exp $
+
+  17 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/mysql-gui-tools-5.0_p12-workbench-lua.patch,
+  mysql-gui-tools-5.0_p12-r2.ebuild:
+  remove workbench references since lua-5.0 is gone.
 
   05 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/dev-db/mysql-gui-tools/Manifest b/dev-db/mysql-gui-tools/Manifest
index 157c59fd9ca8..b0dba633cecf 100644
--- a/dev-db/mysql-gui-tools/Manifest
+++ b/dev-db/mysql-gui-tools/Manifest
@@ -1,20 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mysql-gui-tools-5.0_p12-gcc-4.3.patch 1189 RMD160 939152bbcbd99372351023fdf61441326235a763 SHA1 21b827334555ffd30f5d1991d9be381fa800b4d8 SHA256 507d029d23c7d180418831e6f61a9ec53b8461891a0493689909c61fc60e6939
 AUX mysql-gui-tools-5.0_p12-libsigc++-2.2.patch 8320 RMD160 b6f1a5f946fa371f9ce484af6ca839dedd46bec7 SHA1 7b2146726ec939ccda449a3ddbc127eab823b5ec SHA256 9844dcb8b7b9c1ea2d092c6afa4cb2a46b994b6ae8c3654932b4e24cf8d24048
 AUX mysql-gui-tools-5.0_p12-query-browser-sps.patch 313 RMD160 c2b2727f8cab0946659b1cc39ae1d2983a50e4f0 SHA1 ce78c02e84e029199b7d8ea73a8b53f67d32b38b SHA256 a68fce4a3d4f51f9ad9d3c743fa9bb7be59356eaf2f21a7cc6f1735fd5528c8b
-AUX mysql-gui-tools-5.0_p12-workbench-lua.patch 1207 RMD160 188d2f4963f1578b32e0a7182ba3ea0eca90112c SHA1 ba97c5ee51d1425abda04fed5db3e50a5b6d7ec8 SHA256 23c81f83f22f23841412a0d4abf0d90ded4a26a12cff366d3bb95bb7bda27738
 AUX mysql-gui-tools-5.0_p8-i18n-fix.patch 354 RMD160 660c2f3715e655c5473738c8c69be69c5e3d2a81 SHA1 eb700f0d691fa7d6a69db3f51059844b9855215f SHA256 9abc2cb8370b4f550718c6500be717951c527e6dca9f9530be534a5f8db09447
 AUX mysql-gui-tools-5.0_p8-lua-modules.patch 672 RMD160 6a5aed0f34bb2d4bada62851dfb18ba329693e47 SHA1 d6b13610e25bbe3e22af040fc3c46d25564f0693 SHA256 2e3e271de504562db3f3d3ef33297ce454a6e1a223f98e4c4480cb2361dcbf28
 DIST mysql-gui-tools-5.0r12.tar.gz 25357550 RMD160 ea94545c0e351e86112b13a43479aba361bc2cef SHA1 3fdd3a80c634f0aa9fa8f3bc505add18f360dc6c SHA256 4ede2e8073ab3ffa9371c3ad258eec433e8bdea876aa3db6b85e26072eb2cf7e
-EBUILD mysql-gui-tools-5.0_p12-r2.ebuild 3185 RMD160 e5c6f69b18b7c941843db47d61ff2abc3108f9a6 SHA1 b3417d1827f8c77b93bb953407b76f54aa1b307e SHA256 beccbeef89b65549a6583cce4d16c588e070ea689232673c1b5480824f575c17
-MISC ChangeLog 4916 RMD160 3ef9a93dd0b028e3f3ffcfe0e9a9183a01ac8496 SHA1 d91862f26ca15a3e84753a7cd99d52ba11a8f783 SHA256 d5f466268804e968b54f7dffc31aaa88ba87f68a77c8719a9a6d0184219bfc9b
+EBUILD mysql-gui-tools-5.0_p12-r2.ebuild 2725 RMD160 9aed2af081b8b844e3d1bfb757af23ec7dc9980d SHA1 d4143553d4f2145b7966bc0346841c1f3a3cb12a SHA256 75e7a79d4cf58b01d624e12b9211eed8c782f57a645ed0f29ab7dbcd8635db62
+MISC ChangeLog 5122 RMD160 90b309c96c5ee9b0227b63b6478bdc03471cc00d SHA1 1044c6e8bf9b8cdc504036b65c3c798965b5a4b7 SHA256 8976a72a57baaac0e374baf8050e5b63750eb55f47df78837057908505e2fed4
 MISC metadata.xml 499 RMD160 31ff281d392380aba3c70b9da374f4325c311af0 SHA1 0824b3c4149b51f5d6b6fcf95dd0ecd84beffcdd SHA256 77d120f1120fbfd6cac1f389a44b18d97b2181fc6abd459514f54902e9db1e08
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkiYgX8ACgkQOeoy/oIi7uxWngCgrxVPYjBi1wKpDXN2XIDxWCrn
-WmYAoLVSz/FBuE0qU060c7/wNAxoFSDJ
-=hXNP
------END PGP SIGNATURE-----
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
deleted file mode 100644
index eb3f0b7815f5..000000000000
--- a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-workbench-lua.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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-r2.ebuild b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild
index dcdc98188219..fb76667ea729 100644
--- a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild
+++ b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r2.ebuild,v 1.4 2008/06/09 21:07:49 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild,v 1.5 2008/08/17 04:13:08 mr_bones_ Exp $
 
 GCONF_DEBUG="no"
 
@@ -16,7 +16,7 @@ EAPI="1"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls +administrator +query-browser workbench"
+IUSE="nls +administrator +query-browser"
 
 RDEPEND=">=x11-libs/gtk+-2.6
 	>=dev-libs/glib-2.6
@@ -27,10 +27,6 @@ RDEPEND=">=x11-libs/gtk+-2.6
 	>=dev-cpp/glibmm-2.14
 	dev-cpp/gtkmm:2.4
 	>=virtual/mysql-5.0
-	workbench? (
-		=dev-lang/lua-5.0*
-		virtual/opengl
-	)
 	query-browser? (
 		gnome-extra/gtkhtml:3.14
 		gnome-base/libgnomeprint:2.2
@@ -45,13 +41,12 @@ RDEPEND="${RDEPEND}
 S="${WORKDIR}"/${MY_P}
 
 pkg_setup() {
-	if ! use administrator && ! use query-browser && ! use workbench
+	if ! use administrator && ! use query-browser
 	then
 		elog "Please activate at least one of the following USE flags:"
 		elog "- administrator for MySQL Administrator"
 		elog "- query-browser for MySQL Query Browser"
-		elog "- workbench for MySQL Workbench"
-		die "Please activate at least one of the following USE flags: administrator, query-browser, workbench"
+		die "Please activate at least one of the following USE flags: administrator, query-browser"
 	fi
 
 	# Needed for gcc-4.3
@@ -62,12 +57,12 @@ src_unpack() {
 	gnome2_src_unpack
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${PN}-5.0_p8-i18n-fix.patch
-	epatch "${FILESDIR}"/${PN}-5.0_p8-lua-modules.patch
-	epatch "${FILESDIR}"/${P}-workbench-lua.patch
-	epatch "${FILESDIR}"/${P}-query-browser-sps.patch
-	epatch "${FILESDIR}"/${P}-libsigc++-2.2.patch
-	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
+	epatch \
+		"${FILESDIR}"/${PN}-5.0_p8-i18n-fix.patch \
+		"${FILESDIR}"/${PN}-5.0_p8-lua-modules.patch \
+		"${FILESDIR}"/${P}-query-browser-sps.patch \
+		"${FILESDIR}"/${P}-libsigc++-2.2.patch \
+		"${FILESDIR}"/${P}-gcc-4.3.patch
 
 	sed -i \
 		-e "s/\\(^\\|[[:space:]]\\)-ltermcap\\($\\|[[:space:]]\\)/ /g" \
@@ -82,8 +77,7 @@ src_compile() {
 	use nls || sed -i -e "/^SUBDIRS = / s/\\bpo\\b//" Makefile.{am,in}
 	gnome2_src_compile \
 		--disable-java-modules \
-		$(use_enable workbench grt) \
-		$(use_enable workbench canvas) \
+		--disable-workbench \
 		$(use_enable nls i18n)
 
 	if use administrator
@@ -99,13 +93,6 @@ src_compile() {
 		use nls || sed -i -e "/^SUBDIRS=/ s/\\bpo\\b//" Makefile.{am,in}
 		gnome2_src_compile --with-gtkhtml=libgtkhtml-3.14
 	fi
-
-	if use workbench
-	then
-		cd "${S}"/mysql-workbench
-		use nls || sed -i -e "/^SUBDIRS=/ s/\\bpo\\b//" Makefile.{am,in}
-		gnome2_src_compile
-	fi
 }
 
 src_install() {
@@ -123,10 +110,4 @@ src_install() {
 		cd "${S}"/mysql-query-browser
 		gnome2_src_install
 	fi
-
-	if use workbench
-	then
-		cd "${S}"/mysql-workbench
-		gnome2_src_install
-	fi
 }