Version bump. Drop python patch since the new code works for us as well. Fix compatibility with newer paramiko versions.

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

3 files changed, 101 insertions, 6 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index 3ed3469441e7..7f409fddd733 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,13 @@
 # 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.44 2011/10/04 01:35:29 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.45 2011/12/14 19:30:38 graaff Exp $
+
+*mysql-workbench-5.2.36 (14 Dec 2011)
+
+  14 Dec 2011; Hans de Graaff <graaff@gentoo.org>
+  +mysql-workbench-5.2.36.ebuild:
+  Version bump. Drop python patch since the new code works for us as well. Fix
+  compatibility with newer paramiko versions.
 
   04 Oct 2011; Joseph Jezak <josejx@gentoo.org> mysql-workbench-5.2.34.ebuild,
   mysql-workbench-5.2.35.ebuild:
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 498b03bdcdab..b580daedec53 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX mysql-workbench-5.2.17-as-needed-modules.patch 817 RMD160 07a91a62a364ead59597317738df334a8773338a SHA1 60c17b4337adef0257e3c9dc9facefcc5b6364fe SHA256 2b2503059228381ff16135bb6bf9987807661215b8b45f91acb7c6c156c5d7da
 AUX mysql-workbench-5.2.17-python-libs.patch 853 RMD160 b2ca54f9342c082395c5b5cac92e6247362531b9 SHA1 405a46f1d15f8d428dc3e6f0eada4d36cc00bb93 SHA256 8625ec48e17d3871d37dce559118868edc840a235a0010b47ea4f1afb277872b
@@ -9,14 +9,16 @@ AUX mysql-workbench-5.2.33-gtkmm.patch 863 RMD160 d0acabbde930656f03576027153bcd
 AUX mysql-workbench-5.2.34-gcc46.patch 617 RMD160 8c71980999b7f5caa98c200411bfefc220fec245 SHA1 18948ed74b1e60614ed7aaa00850515919ec6637 SHA256 6d0d9302e0f3682a6b9cb91c42955eacf60389881f3b531f65526b2b099baebd
 DIST mysql-workbench-gpl-5.2.34-src.tar.gz 18160097 RMD160 9607f1c7082700d1df5b7b1aa42e3c903c68d049 SHA1 e4f9a9ee43783361c05a98196eaf196c42d03a03 SHA256 868dd4d92f601f3789eaa50af9920b9907c5c38711357a898b670acf9892b1ac
 DIST mysql-workbench-gpl-5.2.35-src.tar.gz 17874329 RMD160 6207d7350cf1ea7a426ece90dabb4b7caab072a2 SHA1 74c2dddba06e4b233f3b28acf8be45f0394310f2 SHA256 3681351af061637ce54dcc1b490325e9a4a0b42127e642e60220845fcfc2cbaa
+DIST mysql-workbench-gpl-5.2.36-src.tar.gz 18571353 RMD160 2afa2de53cff8fa7e23be449691421db59ca5830 SHA1 039a797970bf237f17eb58c9c6758b52e1b60ea2 SHA256 eedcde69505a0f374613485cf0f1b4e61fc6a32db38a54bbe06b32eebdc175f7
 EBUILD mysql-workbench-5.2.34.ebuild 2171 RMD160 d16791cacb8fb4d75441d7c0334b82e077bf6c40 SHA1 dadf3caae51f149c3fce3bfac69ac2261d3e9512 SHA256 8c9ee7ddaa655c52c289839a02f682648c220a37009cdfc6f6d42389d687a33f
 EBUILD mysql-workbench-5.2.35.ebuild 2132 RMD160 d5f010e34e41060fb6ee41934b05d701e424c2fe SHA1 58bc5dbfef7d02f6c60e0464477422299473845b SHA256 a0c8afbe2f4e67d11929042ddafb15195ab076f707201fbd069775ee0edccb69
-MISC ChangeLog 8360 RMD160 55f3d853b1e79c14e22b74ebf4da736433aeb0f9 SHA1 a7152a5462e0c9ea4cb0c0fd76d5b36b5e922604 SHA256 3e5cd27a41d12b459fbd7c4146c19c4d3a1a24c63b2475bb6d2bee79231debfc
+EBUILD mysql-workbench-5.2.36.ebuild 2244 RMD160 a11fc13de26483e851fbb0aab57aced29104231d SHA1 27571287d24b1eac2f40a1a43ea29bba622531c9 SHA256 7bf8d109df15c861d6582cbcb3b7461bd69e38b04302147127c3b36ed3c35c52
+MISC ChangeLog 8609 RMD160 bc91d5671ab691f47706fab3f7752d340058d702 SHA1 99cfd95e9764295d86fd1ec164032e1018da5313 SHA256 9be712c1e0abc17dac248145c6407ac3f02ea903a1636a5d52b52327d925d1ca
 MISC metadata.xml 201 RMD160 bbf7920d9809941fb024d20016dbe2fb9f15ff97 SHA1 e629d21795e99a77bd0a6aded1a153fd12d5b2c5 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6KYucACgkQcsIHjyDViGSiAgCfUnmIfGWna4G7QTf+oA0g/UP2
-N0AAn2JBUSF9xton6jvZm+24KSNEy+tJ
-=1+eI
+iF4EAREIAAYFAk7o+WYACgkQiIP6VqMIqNe5/gD8CuBQK0wVk3ImLC6q6TtAtmke
+XvD8gXyJy2ROu4ojTGsA/RBJTn+BOq3cIOW5xypGd1ryDYXWMidgcjz2OqBinwEO
+=bMVG
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.36.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.36.ebuild
new file mode 100644
index 000000000000..61f6e0cf4cb3
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-5.2.36.ebuild
@@ -0,0 +1,86 @@
+# 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.36.ebuild,v 1.1 2011/12/14 19:30:38 graaff Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+PYTHON_DEPEND=2
+
+inherit gnome2 eutils flag-o-matic python 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 ~ppc ~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]
+	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}"
+
+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 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
+}