Version bump.

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

3 files changed, 104 insertions, 2 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index 22cbe04068b3..c6f2d451ee58 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.58 2012/05/03 02:33:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.59 2012/05/17 11:21:38 graaff Exp $
+
+*mysql-workbench-5.2.40 (17 May 2012)
+
+  17 May 2012; Hans de Graaff <graaff@gentoo.org>
+  +mysql-workbench-5.2.40.ebuild:
+  Version bump.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> mysql-workbench-5.2.35.ebuild,
   mysql-workbench-5.2.37.ebuild, mysql-workbench-5.2.38.ebuild,
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index ba8e7f6e0eaa..79f806eaf1b7 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mysql-workbench-5.2.31-python-libs.patch 873 RMD160 f1af6477590b37ec78894dca991f8ede3fcf0bac SHA1 2bf2317c32fb365fc82e3346d3b4773426e0275d SHA256 7ddeb3cfd33c0a1460b3271f2fb3eb7b8cfa40496994b9288009bedb2cc3740a
 AUX mysql-workbench-5.2.34-gcc46.patch 617 RMD160 8c71980999b7f5caa98c200411bfefc220fec245 SHA1 18948ed74b1e60614ed7aaa00850515919ec6637 SHA256 6d0d9302e0f3682a6b9cb91c42955eacf60389881f3b531f65526b2b099baebd
 AUX mysql-workbench-5.2.39-glib-2.32.patch 2882 RMD160 f8323e42a70f04f6960b2a298d1eb6503ce8d5f1 SHA1 5378679dfe40bf6aa3d610e8c069ae143d57043b SHA256 28d2d13813a1ac3c071ba58eec7658fca04cf2886091e2cec06ae70946d35c65
@@ -5,9 +8,18 @@ DIST mysql-workbench-gpl-5.2.35-src.tar.gz 17874329 RMD160 6207d7350cf1ea7a426ec
 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
+DIST mysql-workbench-gpl-5.2.40-src.tar.gz 18902330 RMD160 02a7207b1df6f67c989c41b54d6b74d0c99318cb SHA1 d8ab6eadc2fdde5ee0028703ea5d67273c8b3384 SHA256 782be704afd7f2348bab98479c1ace807f83811f24aa268d5853486909c356ed
 EBUILD mysql-workbench-5.2.35.ebuild 2128 RMD160 9ecc9853cd5b8c3db540cf5f1a94e05b4cadc12f SHA1 2f2018078e30ae5b5575ede77e4fe44a7b83cf69 SHA256 3bff17dadee3c35ee5181313105ca778442447e183bcd3f417f76f4a24ffebfb
 EBUILD mysql-workbench-5.2.37.ebuild 2345 RMD160 26ed97be4c99ffb0f281b0a33567143af793de70 SHA1 a769fefa7365fad73c70eb5540ad49460e88b03f SHA256 9c5ef5f82f794f5866afce9066dc036660b76b76b62c86fe63a4888555dfc6f2
 EBUILD mysql-workbench-5.2.38.ebuild 2345 RMD160 e4709ba51159c8170350b066eebb32a75da6390e SHA1 dbebb283e381886397256e9263b2603e22bb042e SHA256 3e3995a0a2fb6bdb8bfe11babb65780354f8a7de2c36d72d97b1169b792afe30
 EBUILD mysql-workbench-5.2.39.ebuild 2389 RMD160 23816c645977f822629aced344565f859a3725a9 SHA1 69dffc7906aa59d21b1aee86c57305b616c7f1b7 SHA256 16a42793e82a10aff26b7691d33719743fd9d6e31c3eba6b37dc52279d5e6bef
-MISC ChangeLog 10708 RMD160 8a89573eef61abda93ab09dd084c82b535a6ad8d SHA1 d94976c26324a0305a70175f978373d943805066 SHA256 be8dc7753652100c1568ba70bf26b1d5a19761fcbb84e704058aa47332864b57
+EBUILD mysql-workbench-5.2.40.ebuild 2172 RMD160 0f12d97fed73c3ca24ac8fffba392f05a5345304 SHA1 b65a56335dcdb9bf113849c05020b4abb65386bc SHA256 a30fa3419ab2a8974253f4ed857c28408054827518576db7830c131522dce7f4
+MISC ChangeLog 10848 RMD160 36f1c7be59326a0b56d2b029226e95d7f6b3ee1a SHA1 a45c689e30c5ed49abd7c612cc85346565e0f574 SHA256 103cc1391ccc55c3a370c5b9ff50173f57da4ffaeeaa28b267a41c8e5a74adff
 MISC metadata.xml 201 RMD160 bbf7920d9809941fb024d20016dbe2fb9f15ff97 SHA1 e629d21795e99a77bd0a6aded1a153fd12d5b2c5 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk+0300ACgkQiIP6VqMIqNeF9gD+JgI9/4iqcW4ASMI9CqIgrIkl
+pt2yHqWtJqU1h6ZL9XsA+wU0ZNNNIOuTyT5yX3hd2rTDcCGtnj6oPanVa402NRRT
+=8Zsp
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.40.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.40.ebuild
new file mode 100644
index 000000000000..6535b6e4a9ae
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-5.2.40.ebuild
@@ -0,0 +1,84 @@
+# 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.40.ebuild,v 1.1 2012/05/17 11:21:38 graaff Exp $
+
+EAPI=4
+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-1.7.4
+	doc? ( dev-python/pysqlite:2 )
+	nls? ( sys-devel/gettext )"
+RDEPEND="${CDEPEND}
+	app-admin/sudo
+	sys-apps/net-tools"
+DEPEND="${CDEPEND}
+	virtual/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
+
+	# 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
+}