Depend on the right python version and make sure it is used. Should fix bug 378717...

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

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index b18136b1be387b54b4c7e132ec6ae9dc65057304..ad5f3559bf3fe4cde46c244c5ee619a7910e0558 100644 (file)
--- 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/Manifest b/dev-db/mysql-workbench/Manifest
index 80ef9b53201ef23b86613702ff9a9efaf4661da0..e2fc10a279ccbfda60bf68012778e8749af1aa31 100644 (file)
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -8,13 +8,13 @@ AUX mysql-workbench-5.2.33-cpp.patch 544 RMD160 f8c824dae64e1dd205e4c34b7ece25f9
 AUX mysql-workbench-5.2.33-gtkmm.patch 863 RMD160 d0acabbde930656f03576027153bcda7cc84ba60 SHA1 69c1bc26b5887cea4714a462c9f5c270ac9b5712 SHA256 00102fbd57977f7d064c336ee43314aa102c2586d650c3d14f709067a2594c1c
 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
-EBUILD mysql-workbench-5.2.34.ebuild 2030 RMD160 2fa545c21c8ea937cf063438187440fddf8e7bed SHA1 3d9786b7f104b2db16a12ae19b5fb9a5ffb52fa5 SHA256 272148c34be126d278e274322208441531eb962dd07338f0178d24e6be6a81fc
-MISC ChangeLog 7553 RMD160 853a131a67c0082426cd38f515a1983c59435ffb SHA1 cbb20088daf6d6bc0ee5c0e62c0c1e4e036f5df5 SHA256 4c7c3ea243e138b2f2375490a2c89bffdbd61cf7a0a3c0d6dba9e44ba0e64af9
+EBUILD mysql-workbench-5.2.34.ebuild 2188 RMD160 13a835d9b9117da60cac62dcc4496e24790c12e4 SHA1 6ddb083b6d8928a3c6ffcd22a4da0afa02bfc350 SHA256 8fc8d01281880a1967fd57c10dc55d7b52a71ab534036c9a6af9e253a296daf5
+MISC ChangeLog 7765 RMD160 bf14abcc8632a969fe4951902891cedc988437f0 SHA1 6ae37e22acfc6f0a2d6b91f86193e449f92e39dc SHA256 f3effdf94d75687a078a1568417b4fb99c3856a02f18afa7340dad8318ea91fc
 MISC metadata.xml 222 RMD160 c395116c51764efaa671a0f89a7d8992ecbe7304 SHA1 2095e0ced2657346964271e45cc69027b0ccd49d SHA256 0adb6b2a2a8cc78f3d28b8b629db9d9e5731f21da86168ae88eeadc8b82d3225
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5P84QACgkQiIP6VqMIqNcz7gD8Dhmw0fph6S2GF43f6T8FVRgN
-spfuwRtQAz09as50AOMA/jP0dfNDKxQJb/+UoE7+fVAw7hYbBIL05n8rbNv9r5JK
-=6USq
+iF4EAREIAAYFAk5QAkUACgkQiIP6VqMIqNefmwD+Ibf1XRfvcGkrz2dVfkUlnhhB
+GpqOuTcWR1lQkHCXtdYBAIfdQprca88jl6Fng95fcji2XLOg5FmQ9afgC7JZ0DEk
+=cUCX
 -----END PGP SIGNATURE-----

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 da9ae5f38094a06ee26876b77cabab18e9c72d5c..14cab722570ae969c96ff9ae1408332ad659fe60 100644 (file)
--- 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