summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Noël Rivasseau <elvanor@gentoo.org>2010-05-24 02:19:05 +0000
committerJean-Noël Rivasseau <elvanor@gentoo.org>2010-05-24 02:19:05 +0000
commitf9d243ba28e2258d3bdda2a7841fc7f72390a6a9 (patch)
treeaeb1cb5f7d1507b144901284f418ed79d9e3bae0 /app-office
parentsign manifest (diff)
downloadgentoo-2-f9d243ba28e2258d3bdda2a7841fc7f72390a6a9.tar.gz
gentoo-2-f9d243ba28e2258d3bdda2a7841fc7f72390a6a9.tar.bz2
gentoo-2-f9d243ba28e2258d3bdda2a7841fc7f72390a6a9.zip
Bug #311681.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openerp-client/ChangeLog6
-rwxr-xr-xapp-office/openerp-client/files/openerp-client6
-rw-r--r--app-office/openerp-client/openerp-client-5.0.6.ebuild10
3 files changed, 15 insertions, 7 deletions
diff --git a/app-office/openerp-client/ChangeLog b/app-office/openerp-client/ChangeLog
index ff8fc186f5df..71dfa40ee287 100644
--- 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/files/openerp-client b/app-office/openerp-client/files/openerp-client
index 679bfaab6a1b..69a2cc7b1f54 100755
--- 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 bf80754f63d9..ef472c0b9b59 100644
--- 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"