Version bump.

(Portage version: 2.1.9.42/cvs/Linux x86_64)

3 files changed, 108 insertions, 1 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index bec0c3f6dbde..e6b25860e477 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.33 2011/03/01 18:37:42 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.34 2011/03/14 18:22:12 graaff Exp $
+
+*mysql-workbench-5.2.33 (14 Mar 2011)
+
+  14 Mar 2011; Hans de Graaff <graaff@gentoo.org>
+  +mysql-workbench-5.2.33.ebuild, +files/mysql-workbench-5.2.33-cpp.patch:
+  Version bump.
 
   01 Mar 2011; Hans de Graaff <graaff@gentoo.org>
   mysql-workbench-5.2.31.ebuild:
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-cpp.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-cpp.patch
new file mode 100644
index 000000000000..879db83ed32d
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-cpp.patch
@@ -0,0 +1,24 @@
+--- library/base/base/xml_util_functions.h.~1~	2011-03-11 00:03:28.000000000 +0100
++++ library/base/base/xml_util_functions.h	2011-03-14 18:57:34.571514279 +0100
+@@ -20,10 +20,6 @@
+ #ifndef _XML_UTIL_FUNCTIONS_H_
+ #define _XML_UTIL_FUNCTIONS_H_
+ 
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+ #include "base/common.h"
+ //#include "util.h"
+ 
+@@ -31,6 +27,10 @@
+ #include <libxml/tree.h>
+ //#endif
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ typedef char base_bool;
+ 
+ BASELIBRARY_PUBLIC_FUNC xmlDocPtr base_xmlParseFile(const char *filename);
diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.33.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.33.ebuild
new file mode 100644
index 000000000000..95b56972a452
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-5.2.33.ebuild
@@ -0,0 +1,77 @@
+# 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.33.ebuild,v 1.1 2011/03/14 18:22:12 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
+	>=dev-cpp/glibmm-2.14
+	>=dev-cpp/gtkmm-2.14
+	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}-cpp.patch"
+	eautoreconf
+
+	# Remove bundled ctemplate version to make sure we use the system version.
+	rm -rf ext/ctemplate || 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
+}