diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2011-08-20 18:51:32 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2011-08-20 18:51:32 +0000 |
| commit | 299af9940d0662433363531de193ca99ab239e4c (patch) | |
| tree | e5de582c67cc8177b5cc577b29a621ffef65c299 /dev-db | |
| parent | New snapshot. (diff) | |
| download | gentoo-2-299af9940d0662433363531de193ca99ab239e4c.tar.gz gentoo-2-299af9940d0662433363531de193ca99ab239e4c.tar.bz2 gentoo-2-299af9940d0662433363531de193ca99ab239e4c.zip | |
Depend on the right python version and make sure it is used. Should fix bug 378717. Thanks to Arfrever for the suggestions.
(Portage version: 2.1.10.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/mysql-workbench/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-db/mysql-workbench/mysql-workbench-5.2.34.ebuild | 12 |
2 files changed, 16 insertions, 3 deletions
diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog index b18136b1be38..ad5f3559bf3f 100644 --- a/dev-db/mysql-workbench/ChangeLog +++ b/dev-db/mysql-workbench/ChangeLog @@ -1,6 +1,11 @@ # 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.39 2011/08/20 17:48:47 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.40 2011/08/20 18:51:32 graaff Exp $ + + 20 Aug 2011; Hans de Graaff <graaff@gentoo.org> + mysql-workbench-5.2.34.ebuild: + Depend on the right python version and make sure it is used. Should fix bug + 378717. Thanks to Arfrever for the suggestions. 20 Aug 2011; Hans de Graaff <graaff@gentoo.org> -mysql-workbench-5.2.31.ebuild, -mysql-workbench-5.2.33.ebuild: diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.34.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.34.ebuild index da9ae5f38094..14cab722570a 100644 --- a/dev-db/mysql-workbench/mysql-workbench-5.2.34.ebuild +++ b/dev-db/mysql-workbench/mysql-workbench-5.2.34.ebuild @@ -1,11 +1,11 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.34.ebuild,v 1.2 2011/08/20 18:51:32 graaff Exp $ EAPI="3" GCONF_DEBUG="no" -inherit gnome2 eutils flag-o-matic autotools +inherit gnome2 eutils flag-o-matic python autotools MY_P="${PN}-gpl-${PV}-src" @@ -18,6 +18,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="debug doc nls readline static-libs" +PYTHON_DEPEND=2 + CDEPEND="dev-db/sqlite:3 >=x11-libs/gtk+-2.6:2 dev-libs/glib:2 @@ -51,6 +53,12 @@ DEPEND="${CDEPEND} 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 |