Version bump. Should also fix bug 412157.

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

3 files changed, 101 insertions, 5 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index 64d9ad1d9d74..e89cc3fe5b85 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.55 2012/03/10 13:29:51 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.56 2012/04/16 18:50:31 graaff Exp $
+
+*mysql-workbench-5.2.39 (16 Apr 2012)
+
+  16 Apr 2012; Hans de Graaff <graaff@gentoo.org>
+  +mysql-workbench-5.2.39.ebuild:
+  Version bump. Should also fix bug 412157.
 
 *mysql-workbench-5.2.38 (10 Mar 2012)
 
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index a20c341a98c3..3f9ca545b690 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -6,15 +6,17 @@ AUX mysql-workbench-5.2.34-gcc46.patch 617 RMD160 8c71980999b7f5caa98c200411bfef
 DIST mysql-workbench-gpl-5.2.35-src.tar.gz 17874329 RMD160 6207d7350cf1ea7a426ece90dabb4b7caab072a2 SHA1 74c2dddba06e4b233f3b28acf8be45f0394310f2 SHA256 3681351af061637ce54dcc1b490325e9a4a0b42127e642e60220845fcfc2cbaa
 DIST mysql-workbench-gpl-5.2.37-src.tar.gz 18554877 RMD160 f08369149b5ba3c6890bfbbb29e9087b57ee709a SHA1 5031f0436b01b756bc272d154eb0f6c67b222098 SHA256 44a110ced2877ded14d57d6b217cf03a9a7e83f9f5376ead1872fd01c2685744
 DIST mysql-workbench-gpl-5.2.38-src.tar.gz 18640435 RMD160 ff1ef75099f1d0b2669ab9ff77121f652513e265 SHA1 6b92140e041642761f4ebee1c8a928ab34f6889a SHA256 223fb450110bcb720c6393a1b7ab0769425f02612f3e0613163970705043e448
+DIST mysql-workbench-gpl-5.2.39-src.tar.gz 18904504 RMD160 af9782af37150fca0353821e02bbe2d8dcfc5a50 SHA1 a01ff48a17b55cd0affb3cea5d0b631037286b7b SHA256 0e4e14f1b39dca2b65f924381d82b406dc25a530fbd25631b4cd05bddc4ab5bd
 EBUILD mysql-workbench-5.2.35.ebuild 2129 RMD160 bb2a1433233b69b64f38cbce35394f597a0d031e SHA1 7c0236c910ebac5d8f3c5ffbc81e3c289e3db8fb SHA256 0d70a99330fac65bd682e0d90f3ea5ae98cd0be00777034800178decd32d0086
 EBUILD mysql-workbench-5.2.37.ebuild 2346 RMD160 6288bb37e01d2a80fec3e29f0c688ee02bc2d750 SHA1 9890e801dd7a397ef93b0c74a2f0ce65c46d61c0 SHA256 ff20405973453ba6624a2ab0134e583c1feeeccb8a2c2f2e6b53eee1842da9c5
 EBUILD mysql-workbench-5.2.38.ebuild 2346 RMD160 2ba3f0b8319085fd9a54d45d2af1e6ff8968159c SHA1 9821b5a1c78d9c48885f75fc880a99e36c760d03 SHA256 3fee06c98ca7b2878a56ea3ebf2afb738461abfcdbcf44e3e138f3e54d841504
-MISC ChangeLog 10085 RMD160 0002167a3949bfa012a411e637365fe21e77e89a SHA1 dcedd4ae63514d6ff51ced0bf0e5b9d1d32e709c SHA256 3b9f7d1a9b0322a56d777ab676b8bd9bdb7733d9efd5427bd258d2f7d3312040
+EBUILD mysql-workbench-5.2.39.ebuild 2346 RMD160 de3d75e12e6ff1804f577a18ebe97ae92d001403 SHA1 1e365af4e05f70b32dfc46563b70123e515c35bd SHA256 9c7138560e2e7e7d863358f4c905843de6653798ff649fb295a4a67a445e13c4
+MISC ChangeLog 10253 RMD160 0818432fd147cbfe3577631b5bdcb8b66e68e300 SHA1 cb2f6305382f29f9cf88bfd2ecda18183e46b71c SHA256 21a77e033f54496a421a7e4d088302163b1fba1bdd8e37e3a4ed2acd044d8de8
 MISC metadata.xml 201 RMD160 bbf7920d9809941fb024d20016dbe2fb9f15ff97 SHA1 e629d21795e99a77bd0a6aded1a153fd12d5b2c5 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9bV1gACgkQiIP6VqMIqNcQtAEAi5xF+F34/uVSt9BH0K/SAkOh
-g76IyzD6NLKi7Wu06gkA/1H+XpIp5JO1xS/yeuZjZVdrQPaeBHs7Qf76JHe79vx4
-=umdc
+iF4EAREIAAYFAk+Maf4ACgkQiIP6VqMIqNfHcQD+JKd2NnwTfpkYgsfNpJhI7Ch8
+qPqbAykJJgG2A2QcoGIA/iYtLsrCE/wftK0tkRRgc9M+LPAPoNUCawG1tPiCDYo5
+=gA0w
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.39.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.39.ebuild
new file mode 100644
index 000000000000..43abdfb12c79
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-5.2.39.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2012 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.39.ebuild,v 1.1 2012/04/16 18:50:31 graaff Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+PYTHON_DEPEND=2
+
+inherit gnome2 eutils flag-o-matic python
+
+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 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc nls 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]
+	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 )"
+RDEPEND="${CDEPEND}
+	app-admin/sudo
+	sys-apps/net-tools"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+pkg_setup() {
+	# Make sure we use Python 2 since the code is not compatible with 3.
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+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
+
+	# paramiko 1.7.7.1 is newer, update version range check:
+	# http://bugs.mysql.com/bug.php?id=63750
+	sed -i -e 's/4,5,6/4,5,6,7/' plugins/wb.admin/backend/wb_admin_ssh.py || die
+
+	# Remove hardcoded CXXFLAGS
+	sed -i -e 's/debug_flags="-ggdb3 /debug_flags="/' configure || die
+	sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/Makefile.in ext/scintilla/gtk/Makefile.am || die
+
+	# 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 debug) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	find "${ED}" -name '*.la' -delete || die
+}