Use Python 2 (bug #361497).

Package-Manager: portage-2.2.0_alpha29_p10/cvs/Linux x86_64

4 files changed, 45 insertions, 9 deletions

diff --git a/app-office/openerp-server/ChangeLog b/app-office/openerp-server/ChangeLog
index 36e3f93e56aa..9a740f3152d7 100644
--- a/app-office/openerp-server/ChangeLog
+++ b/app-office/openerp-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openerp-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openerp-server/ChangeLog,v 1.2 2011/01/14 10:32:36 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp-server/ChangeLog,v 1.3 2011/04/06 16:59:15 arfrever Exp $
+
+  06 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  openerp-server-5.0.6.ebuild, openerp-server-5.0.15.ebuild:
+  Use Python 2 (bug #361497).
 
 *openerp-server-5.0.15 (14 Jan 2011)
 
diff --git a/app-office/openerp-server/Manifest b/app-office/openerp-server/Manifest
index 61887f323b1f..ac803a5a70a8 100644
--- a/app-office/openerp-server/Manifest
+++ b/app-office/openerp-server/Manifest
@@ -1,10 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openerp-server 682 RMD160 0c9fd79469433ae675bf61eb16cffe68f74849ab SHA1 fa05c51decaa8fdd48731bb18ed6425a205dddc3 SHA256 7b92073d29dc00ce81c1586e78285cd995cbca0c1ea0f9330373a6c00c542cc0
 AUX openerp-server-confd 105 RMD160 a43bebb092ae8b5ba7f24abe735cbb7b0879ab30 SHA1 6a3a0c2c7f7e0e6215a379a523387188237bb2bd SHA256 d2a001ed22e104eaf68c64f0fecb18d50a6aa6439050fe7da2ba6def584135bf
 AUX openerp-server.cfg 1026 RMD160 930ff0e4434b5a0aa36269aa066486572cea400c SHA1 3bac0e9714f1f984fba37c5e1977eaab2e7e66af SHA256 1a5e9cf33372cd66823fc2681f46000d2381e0b9e52301e85037f1b38e7fa665
 AUX openerp-server.logrotate 341 RMD160 e3f08d24390d29982ea727cf43006651a959f213 SHA1 57d1d6cb9ffac4f0f06ba62a3095fa4cb8e132ed SHA256 7b6f0e33b6aa897d5c07a2e5f7e2edfec5e7238c4724483f12a341e56ae3fc4d
 DIST openerp-server-5.0.15.tar.gz 10529558 RMD160 11679778890aefb05182a41981750ea5d011d83b SHA1 45ecc01e826f8c10b7de97d155492a4dcff8026a SHA256 021dd27f352e1c92c0912d8b50f05cfcee39052551a2c6d90ee1677f4e361504
 DIST openerp-server-5.0.6.tar.gz 8733610 RMD160 1feffe5db442d503744fcf2e8c7eacf8b9fe670e SHA1 8f9a180d560c3d0f612663f09348923a22644c0d SHA256 5812b3199e2ecc473a265af0fc33626079351f3d119281e84df4edba5b5a0df4
-EBUILD openerp-server-5.0.15.ebuild 2025 RMD160 8ee4f1b79e9a4296123820b2b4214ab9c0c5e50f SHA1 c80b530363b7cd7ec2594f89a81c7a6fc4022e88 SHA256 1b7c2386e92d8b1d8eee9e59c01ef61431d20a9388b4ee07d3b39205827eebd9
-EBUILD openerp-server-5.0.6.ebuild 1776 RMD160 b7c2e5fbf11402b8b84322ba197a793b68d53cde SHA1 2db127f8d6c3ab1334b1406bb2c22c1f23100047 SHA256 ef70d73d80525b94b8cc5ba3128b3d63361479393855510aa121191462438e3e
-MISC ChangeLog 684 RMD160 2d6626004450690e39d0cfd154226d6ac72606c9 SHA1 335a295597d08d78ef4edeb17eef89358c3fb8c3 SHA256 cc36f298e3ee7868e254c190d8ccbdf47629884433ef24ddd828a55afaa61728
+EBUILD openerp-server-5.0.15.ebuild 2108 RMD160 3afafe823536e7220f2eb1824048c9644bc08adb SHA1 1f79e54188854f720cf883d256ff87ad62bce870 SHA256 3ba82b2a2fbbb364d804aecb2e09f9088c85e61a362629bba1de7bfce71b84cd
+EBUILD openerp-server-5.0.6.ebuild 1859 RMD160 fdf30b7431ba383485070bb8cb9b7243379fe3a2 SHA1 d95c3568f5707eecd478ebd666e7c5a6bcfe925c SHA256 09e1544ffe5237720debf2ca591aa987b0fbee3aae0a1c7e970825b3ee47c9f9
+MISC ChangeLog 850 RMD160 b120df7c36842d9e432a3df3262f3fbd03a31d1f SHA1 9de4ff606cf583e3877cd9b8aa0d068ad8c327d6 SHA256 d2f073fb335effc95216e687cc3781c43885b305683d26f419e10448216f4455
 MISC metadata.xml 323 RMD160 e814c8bef9e7078c47c44aa8492bcd984cae8f79 SHA1 fa18189f20b8118eab7498fa5ab94b5a5984bb76 SHA256 439632562128324755ba89695bf93de377c64c3e7a81c6819c7694d5b3d78c39
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNnJv0AAoJENgZr6v6gHY0sr0QALzfAuQ5X7QQUvTwWFk9Nzw2
+LhUjbD/NssFMY3XQEv81lbWJxWFMZJSXetrA2pKgKYTiW0vwl5DQUSX6fLOjCTO/
+kQZOTTx5mlmYTGAhErYcopcM0XApOqf5nF4sMXvKUwJKqq+U5PM9NToO85/gzXEJ
+y3EI4N/alIsBk1YCvS29CezWytsF+Ft04Z0MrvE5ojZs7dSzEPN/gabdGz1aZcDk
+6q5ahcOe0+sbuWHQX2eVkRhzcCCv/a/PpPBpO5ZTbPRF6Js/ZRqkh5MrFbQsEKYm
+k6Jf0WSdwAIWhAA8sDltR/5MaEIt4fmAMMQIqzGlEV2qCN2tCh+WrGbxHhSij7cn
+Cv1MW/Ycze0i+rK3Pz/e6pvQ17JOCrdNFVHRxW010SKnL8DzszrSrK2NuDDqSbrC
+RTg3LK/oeCb4zv8orjmshmYZVqaIZ7Qt6BauUpxN2TWNjr6TiIIMD7V5dTHeMsgg
+9UQCg2Xm30nDxGKXD0zMg+5VTLQdm4cba1IL6z2C12YjjKhgtjiFoTkTHZ7ufnWT
+pwjT3lj9lPcfknUd5Sg76Ephvu1rPFtuc1Yc//cEnirEvvBtyYscWMXOl/EdTRJ3
+2Rb8Z2KLmeHLcDp0kyPA+tSL9q+YpZkMYT/MaF373zYharzgSZr3er1zCjeolGUT
+a8+UzMTZ2KGxgLtMUBaG
+=4xot
+-----END PGP SIGNATURE-----
diff --git a/app-office/openerp-server/openerp-server-5.0.15.ebuild b/app-office/openerp-server/openerp-server-5.0.15.ebuild
index 8705521241ac..67cada6eb2d0 100644
--- a/app-office/openerp-server/openerp-server-5.0.15.ebuild
+++ b/app-office/openerp-server/openerp-server-5.0.15.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openerp-server/openerp-server-5.0.15.ebuild,v 1.1 2011/01/14 10:32:36 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp-server/openerp-server-5.0.15.ebuild,v 1.2 2011/04/06 16:59:15 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
 
 inherit eutils distutils
 
@@ -33,6 +34,11 @@ DEPEND="${CDEPEND}"
 OPENERP_USER="openerp"
 OPENERP_GROUP="openerp"
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_install() {
 	distutils_src_install
 
diff --git a/app-office/openerp-server/openerp-server-5.0.6.ebuild b/app-office/openerp-server/openerp-server-5.0.6.ebuild
index 71d034f9f1a5..4d86268d85f1 100644
--- a/app-office/openerp-server/openerp-server-5.0.6.ebuild
+++ b/app-office/openerp-server/openerp-server-5.0.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openerp-server/openerp-server-5.0.6.ebuild,v 1.1 2010/12/13 11:02:20 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp-server/openerp-server-5.0.6.ebuild,v 1.2 2011/04/06 16:59:15 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
 
 inherit eutils distutils
 
@@ -31,6 +32,11 @@ DEPEND="${CDEPEND}"
 OPENERP_USER="openerp"
 OPENERP_GROUP="openerp"
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_install() {
 	distutils_src_install