Bug #311681.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/app-office/openerp-client/ChangeLog b/app-office/openerp-client/ChangeLog
index ff8fc186f5dfc9ab76188cff9f2681c921b52d00..71dfa40ee287cc501b3776b29284dfc7a6e02617 100644 (file)
--- a/app-office/openerp-client/ChangeLog
+++ b/app-office/openerp-client/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openerp-client
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openerp-client/ChangeLog,v 1.1 2010/01/29 19:48:20 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp-client/ChangeLog,v 1.2 2010/05/24 02:19:05 elvanor Exp $
+
+  23 May 2010; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  openerp-client-5.0.6.ebuild, files/openerp-client:
+  Bug #311681 (Python 3 related stuff).
 
 *openerp-client-5.0.6 (29 Jan 2010)
 

diff --git a/app-office/openerp-client/Manifest b/app-office/openerp-client/Manifest
index 14af69991969bd3078c2d706a588be0f24240df0..af1810996a02c2c6e077fa2946694d43b177e7e0 100644 (file)
--- a/app-office/openerp-client/Manifest
+++ b/app-office/openerp-client/Manifest
@@ -1,5 +1,5 @@
-AUX openerp-client 203 RMD160 b8051385509ecc893610b4e2bb114a9416263de8 SHA1 c87eab489ce751d4b6946eb7eea25238519da77f SHA256 3f37ed5c32d8fffc8dbf6d5ef8f0217bd8ad574f552deef1114136d74ca0f1c8
+AUX openerp-client 228 RMD160 927fb9286eb2729f5c58051aed320d9df66beeba SHA1 2ef333872a0e7f2b64ba681009d33f29d3e0263d SHA256 40e4afc3d9d4647c8d8836c43f2a5316bd84ba6d3fd4880ee4a605f34d6824df
 DIST openerp-client-5.0.6.tar.gz 1231541 RMD160 5a3502fa37bfcd9253df4a7f938f5625b8b0be32 SHA1 230f3eed8c2971517ac91784f8c911e23ac6d750 SHA256 7a588b765814839751941ecdfb907e8189a42251ede27b2cfefcd2a5b20eb275
-EBUILD openerp-client-5.0.6.ebuild 716 RMD160 f109ffadc8809938ff4507bb4236ae9d2dfcf01b SHA1 05b6817791e5e959625872092f5231fbe5d29b5a SHA256 4f696252f8eeaaaf2481d546f67b92ac20732af4e3fb169075cf5daba46972cd
-MISC ChangeLog 407 RMD160 6989f1d2ad9bb9d7f56a591eb5c1bc293fd58e8f SHA1 592fbd515f52be4df3d5d2c9ea92c8c35123bef5 SHA256 b40f43e75de7aa914af78b906d8d8bb136551989613f47a3b8953481ee96054d
+EBUILD openerp-client-5.0.6.ebuild 786 RMD160 9ad746e7c629740aaefd2f7c419a31c70438b17c SHA1 ee2bc2c16abf35b6c2f99848c55a68536a3ab17b SHA256 8986018303ab935e0c43e700f187c4d5e93c5daf568fad13fef46c0b895f385e
+MISC ChangeLog 558 RMD160 de620991ee6c1f3c78c1e382ba9eda759b32d4ba SHA1 c8defb5610e4ad838a98ed3de61dde189722dd7a SHA256 0f6c1c60e56bce8cc047883a3ee6d760c1e5bdff9a2e43e6da27c44dd39734da
 MISC metadata.xml 322 RMD160 3f1a6c9f39b62a24de61ea742c6e9e553d445c33 SHA1 b9d7d427d11e24803c94683c154037eaf7ca536d SHA256 8c1e11113a1da40073ac6d1763bc378e05073e7ba7f942c146fd1e69b2aea409

diff --git a/app-office/openerp-client/files/openerp-client b/app-office/openerp-client/files/openerp-client
index 679bfaab6a1b51cf70475fb6fff86708b286f177..69a2cc7b1f5495d1e61c1eebf7bae5c2bd823341 100755 (executable)
--- a/app-office/openerp-client/files/openerp-client
+++ b/app-office/openerp-client/files/openerp-client
@@ -1,4 +1,4 @@
 #!/bin/sh
-PYTHONDIR=$(python -c 'from distutils.sysconfig import get_config_var; print(get_config_var("LIBP"))')
-cd "${PYTHONDIR}/site-packages/openerp-client"
-exec /usr/bin/python ./openerp-client.py $@
\ No newline at end of file
+PYTHON_DIRECTORY=$(/usr/bin/python2 -c 'from distutils.sysconfig import get_config_var; print(get_config_var("LIBP"))')
+cd "${PYTHON_DIRECTORY}/site-packages/openerp-client"
+exec /usr/bin/python2 ./openerp-client.py $@
\ No newline at end of file

diff --git a/app-office/openerp-client/openerp-client-5.0.6.ebuild b/app-office/openerp-client/openerp-client-5.0.6.ebuild
index bf80754f63d9dde87bf355af4209a514de670943..ef472c0b9b59a2416d5a289b6096a7acc13386d8 100644 (file)
--- a/app-office/openerp-client/openerp-client-5.0.6.ebuild
+++ b/app-office/openerp-client/openerp-client-5.0.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openerp-client/openerp-client-5.0.6.ebuild,v 1.1 2010/01/29 19:48:20 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp-client/openerp-client-5.0.6.ebuild,v 1.2 2010/05/24 02:19:05 elvanor Exp $
 
 EAPI="2"
-
-inherit eutils distutils
+PYTHON_DEPEND="2"
+inherit eutils distutils python
 
 DESCRIPTION="Open Source ERP & CRM"
 HOMEPAGE="http://www.openerp.com/"
@@ -22,6 +22,10 @@ CDEPEND="dev-python/matplotlib
 RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}"
 
+pkg_setup() {
+       python_set_active_version 2
+}
+
 src_install() {
        distutils_src_install
        rm "${D}/usr/bin/openerp-client"