Version bump. Fix compilation with gcc 4.6, closing 365855.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 107 insertions, 5 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index 891a14907477..7a5c706c34b9 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mysql-workbench
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.37 2011/04/10 18:14:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.38 2011/05/30 19:15:29 graaff Exp $
+
+*mysql-workbench-5.2.34 (30 May 2011)
+
+  30 May 2011; Hans de Graaff <graaff@gentoo.org>
+  +mysql-workbench-5.2.34.ebuild, +files/mysql-workbench-5.2.34-gcc46.patch:
+  Version bump. Fix compilation with gcc 4.6, closing 365855.
 
   10 Apr 2011; Hans de Graaff <graaff@gentoo.org>
   mysql-workbench-5.2.33.ebuild, +files/mysql-workbench-5.2.33-gtkmm.patch:
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index bf8438aba209..d15e24798fbd 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -6,16 +6,19 @@ AUX mysql-workbench-5.2.17-python-libs.patch 853 RMD160 b2ca54f9342c082395c5b5ca
 AUX mysql-workbench-5.2.31-python-libs.patch 873 RMD160 f1af6477590b37ec78894dca991f8ede3fcf0bac SHA1 2bf2317c32fb365fc82e3346d3b4773426e0275d SHA256 7ddeb3cfd33c0a1460b3271f2fb3eb7b8cfa40496994b9288009bedb2cc3740a
 AUX mysql-workbench-5.2.33-cpp.patch 544 RMD160 f8c824dae64e1dd205e4c34b7ece25f9132ff7e0 SHA1 3d1f47e2a11407ebc9e8d1a95418f78bc794417a SHA256 ee2a9106b7b18d64478f9bfa1143705d5d8f1b839ce88f71a3c570d54aeec853
 AUX mysql-workbench-5.2.33-gtkmm.patch 863 RMD160 d0acabbde930656f03576027153bcda7cc84ba60 SHA1 69c1bc26b5887cea4714a462c9f5c270ac9b5712 SHA256 00102fbd57977f7d064c336ee43314aa102c2586d650c3d14f709067a2594c1c
+AUX mysql-workbench-5.2.34-gcc46.patch 617 RMD160 8c71980999b7f5caa98c200411bfefc220fec245 SHA1 18948ed74b1e60614ed7aaa00850515919ec6637 SHA256 6d0d9302e0f3682a6b9cb91c42955eacf60389881f3b531f65526b2b099baebd
 DIST mysql-workbench-gpl-5.2.31-src.tar.gz 17971254 RMD160 14d9377eb34a26b2f0331be810ff9cb90d43e6cb SHA1 34682612b6f67391774e9ba20b09f3af899a002b SHA256 520cc9301dda288a574284d25c2bda007aff91d86a0f5c828bab179bc488ad85
 DIST mysql-workbench-gpl-5.2.33-src.tar.gz 17875492 RMD160 37d00323e72c1bd552470a03d39689daeb2b1746 SHA1 5448be93a39a062777385ecd09c8ce3f2f000214 SHA256 acd1b79e6fc90642c7d58a2d80f525c311b470749d45f7d5f6a33a0efe8c71a4
+DIST mysql-workbench-gpl-5.2.34-src.tar.gz 18160097 RMD160 9607f1c7082700d1df5b7b1aa42e3c903c68d049 SHA1 e4f9a9ee43783361c05a98196eaf196c42d03a03 SHA256 868dd4d92f601f3789eaa50af9920b9907c5c38711357a898b670acf9892b1ac
 EBUILD mysql-workbench-5.2.31.ebuild 1878 RMD160 b46ce253a28761fefd3efdb76e39904b05291107 SHA1 ccbdd7585d0177ad3a4c5c41237f103d9f97716c SHA256 eda49be69a45393e8511fd6da08436cee194164b474812592741952d98ff076b
 EBUILD mysql-workbench-5.2.33.ebuild 2067 RMD160 f7ec85413bd86c160e62f4076bf64388ff174500 SHA1 d5d2b6dea430defc58d2357982c9bef7d6dadc1e SHA256 640628e4b04ec2fb9268690600067cccabaa36d85c9a37c95c304e0a494590e9
-MISC ChangeLog 7184 RMD160 5654545974295bab32f2da794c6ce4851cebb600 SHA1 70692cb6d780dabc7066904db425c20ad54c62e9 SHA256 0037414db5a0bd25c8850163d76e810da20436061ecb7d359610ee126d7bcd51
+EBUILD mysql-workbench-5.2.34.ebuild 2030 RMD160 2fa545c21c8ea937cf063438187440fddf8e7bed SHA1 3d9786b7f104b2db16a12ae19b5fb9a5ffb52fa5 SHA256 272148c34be126d278e274322208441531eb962dd07338f0178d24e6be6a81fc
+MISC ChangeLog 7413 RMD160 3b7f458f2c287ad889b65849ee979c2a740f3c72 SHA1 01f92608c377332924b733e76c8be08d2215f44c SHA256 f8418acb967c99d5783029f0902a42ce07cfe014feb4f5dc8defbb8651e69547
 MISC metadata.xml 222 RMD160 c395116c51764efaa671a0f89a7d8992ecbe7304 SHA1 2095e0ced2657346964271e45cc69027b0ccd49d SHA256 0adb6b2a2a8cc78f3d28b8b629db9d9e5731f21da86168ae88eeadc8b82d3225
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2h84cACgkQrnu0mw69JkrJHQD+JMy9HUszjUfCg+QfzBbJ0DK7
-6u9tPz9tuIjfG3YqgRwA/1xInjWcMm6oityPlQPHrw20Y0PMRrDbfC0TZdU/fyK3
-=nLgq
+iF4EAREIAAYFAk3j7NcACgkQrnu0mw69Jkp8lQD+PgbHoewMpCAbcnqpL9/ye6fl
+phthLGyhS9mK/ZKtNj0BAIrMeZdqDahPxQltegGKH+QLAHzOdpOVNwpO3AYmlemX
+=NG8S
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.34-gcc46.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.34-gcc46.patch
new file mode 100644
index 000000000000..00c262a1c236
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-5.2.34-gcc46.patch
@@ -0,0 +1,13 @@
+Patch by Remi Collet for Fedora in http://bugs.mysql.com/bug.php?id=60603
+
+diff -up mysql-workbench-gpl-5.2.34-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46 mysql-workbench-gpl-5.2.34-src/modules/db.mysql/src/db_mysql_catalog_report.h
+--- mysql-workbench-gpl-5.2.34-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46	2011-05-28 08:12:31.887897052 +0200
++++ mysql-workbench-gpl-5.2.34-src/modules/db.mysql/src/db_mysql_catalog_report.h	2011-05-28 08:13:10.397054637 +0200
+@@ -10,6 +10,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <cstddef>
+ #include "ctemplate/template.h"
+ 
+ #include "grt/common.h"
diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.34.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.34.ebuild
new file mode 100644
index 000000000000..da9ae5f38094
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-5.2.34.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.34.ebuild,v 1.1 2011/05/30 19:15:29 graaff Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils flag-o-matic autotools
+
+MY_P="${PN}-gpl-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="http://dev.mysql.com/workbench/"
+SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc nls readline static-libs"
+
+CDEPEND="dev-db/sqlite:3
+	>=x11-libs/gtk+-2.6:2
+	dev-libs/glib:2
+	gnome-base/libglade:2.0
+	dev-libs/libsigc++:2
+	dev-libs/boost
+	>=dev-cpp/ctemplate-0.95
+	>=dev-libs/libxml2-2.6.2:2
+	>=dev-cpp/glibmm-2.14:2
+	>=dev-cpp/gtkmm-2.14:2.4
+	dev-libs/libzip
+	>=virtual/mysql-5.1
+	dev-libs/libpcre
+	virtual/opengl
+	>=dev-lang/lua-5.1[deprecated]
+	gnome-base/libgnome
+	x11-libs/pango
+	|| ( sys-libs/e2fsprogs-libs
+		dev-libs/ossp-uuid )
+	>=x11-libs/cairo-1.5.12[svg]
+	dev-python/pexpect
+	dev-python/paramiko
+	doc? ( dev-python/pysqlite:2 )
+	nls? ( sys-devel/gettext )
+	readline? ( sys-libs/readline )"
+RDEPEND="${CDEPEND}
+	app-admin/sudo
+	sys-apps/net-tools"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+src_prepare() {
+	# ifconfig isn't in the normal path
+	sed -i -e 's:ifconfig:/sbin/ifconfig:' plugins/wb.admin/backend/wb_server_control.py || die
+
+	epatch "${FILESDIR}/${PN}-5.2.31-python-libs.patch"
+	epatch "${FILESDIR}/${P}-gcc46.patch"
+	eautoreconf
+
+	# Remove bundled ctemplate version to make sure we use the system
+	# version, but leave a directory to avoid confusing configure, bug
+	# 357539.
+	rm -rf ext/ctemplate || die
+	mkdir -p ext/ctemplate/ctemplate-src || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls i18n) \
+		$(use_enable readline readline) \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	find "${ED}" -name '*.la' -delete || die
+}