Use Python 2 (bug #311683).

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

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 0bd05df9b1d24a640fb55adcd11bf138e61608d2..6ebf0af727c747883aefc7c34991a0717c136d69 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.533 2010/05/24 14:23:11 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.534 2010/05/25 16:42:48 arfrever Exp $
+
+  25 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  openoffice-3.2.0.ebuild, openoffice-3.2.1_rc1.ebuild:
+  Use Python 2 (bug #311683).
 
 *openoffice-3.2.1_rc1 (24 May 2010)
 

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 9ad13a4294b0c1ad5806d599aaf3e78358eb3e83..91dd6c18b9fd7da027370181984951b323722684 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -35,7 +35,7 @@ DIST ooo-build-3.2.1.1.tar.gz 14448636 RMD160 09e675981735e6f436d8517162e54706cb
 DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6ca6030301577477857 SHA1 c3dd261bfe366ac514a019b0fa829369b833c0c7 SHA256 3fcc0eb394ddfc43111ac27f35a7d966d4f775b0b46d6853c9b2b2612a940f4a
 DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD openoffice-3.2.0.ebuild 13472 RMD160 59dc5ae8a392d25f1876939a49faa8650efaddb9 SHA1 fb882cb7177e9b918ca32f2f13c99d179e981f5f SHA256 e40e8b790446a6bd604198202f92ecaeb4d86660b1acbeb6fb9a84d438d4c131
-EBUILD openoffice-3.2.1_rc1.ebuild 13232 RMD160 d5330eb179c66719a5c83f2e307fc9cc155a4f2d SHA1 5208e19af1675607fb362d2a5c9ee12ebe135400 SHA256 d5498f204c5868cf74edd5031cafff4931c645fd2bade27f14770e33a20a09a6
-MISC ChangeLog 109286 RMD160 0a22f3bcf7642f2036a745563a8ea5b7b144fb88 SHA1 51dc59021853ce9ece510fabcf8f339972b504f6 SHA256 f9c4e18a694ce5d38b31306bd1b2fad77cab8aaef10e3ac6de8b31a5d532a5e2
+EBUILD openoffice-3.2.0.ebuild 13541 RMD160 95447ab23c23e7643136e2e4a96e32133319a0e6 SHA1 5ecbc46ba5816acc74c5251913491ee654299ae7 SHA256 9207a2a1be79dd783763e2749775662733e2e35b5f001212d3ba0c77b0bcbd04
+EBUILD openoffice-3.2.1_rc1.ebuild 13301 RMD160 8c4368d5201883a77aef98f25074847d290ff213 SHA1 bb5341e5b322c3d6587b3073c3110e1fd99c42c4 SHA256 c3ffd7a706e46c8c786a304150c31bb6b2b5741a73c97f0b8a4140c96ba637c7
+MISC ChangeLog 109450 RMD160 e776ce4a90b360af49342bce18650aa287efe32d SHA1 b251b82439f5ff3eea8da2b3ea6a5c1ebe25b40a SHA256 92de320bfbc2e8f671f9cb6ede2d693ed35dc2a7128bd952cd7ed8992fb613bc
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78

diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild
index a8194c87eb89dfd84dc18cbb147fa53e1808a454..f2258605c1069abd4557a7b8d20098962e597eb5 100644 (file)
--- a/app-office/openoffice/openoffice-3.2.0.ebuild
+++ b/app-office/openoffice/openoffice-3.2.0.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.25 2010/05/15 07:13:22 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.26 2010/05/25 16:42:48 arfrever Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
 KDE_REQUIRED="optional"
 CMAKE_REQUIRED="never"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads"
 
-inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base mono multilib toolchain-funcs
+inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base mono multilib python toolchain-funcs
 
 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates"
 
@@ -134,7 +136,6 @@ DEPEND="${COMMON_DEPEND}
        sys-apps/coreutils
        pam? ( sys-libs/pam
                sys-apps/shadow[pam] )
-       >=dev-lang/python-2.3.4[threads]
        java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
                >=dev-java/ant-core-1.7 )
        ldap? ( net-nds/openldap )"
@@ -201,6 +202,9 @@ pkg_setup() {
 
        kde4-base_pkg_setup
 
+       python_set_active_version 2
+       python_pkg_setup
+
 }
 
 src_unpack() {

diff --git a/app-office/openoffice/openoffice-3.2.1_rc1.ebuild b/app-office/openoffice/openoffice-3.2.1_rc1.ebuild
index 1fdc803c5e119c2621b7c7c9b385d38d32bf6b60..5ece3fe26915df763ce50235aa6e2f7727c24c1d 100644 (file)
--- a/app-office/openoffice/openoffice-3.2.1_rc1.ebuild
+++ b/app-office/openoffice/openoffice-3.2.1_rc1.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.1_rc1.ebuild,v 1.1 2010/05/24 14:23:11 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.1_rc1.ebuild,v 1.2 2010/05/25 16:42:48 arfrever Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
 KDE_REQUIRED="optional"
 CMAKE_REQUIRED="never"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads"
 
-inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base multilib toolchain-funcs
+inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base multilib python toolchain-funcs
 
 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl pam templates"
 
@@ -134,7 +136,6 @@ DEPEND="${COMMON_DEPEND}
        sys-apps/coreutils
        pam? ( sys-libs/pam
                sys-apps/shadow[pam] )
-       >=dev-lang/python-2.3.4[threads]
        java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
                >=dev-java/ant-core-1.7 )
        ldap? ( net-nds/openldap )"
@@ -201,6 +202,9 @@ pkg_setup() {
 
        kde4-base_pkg_setup
 
+       python_set_active_version 2
+       python_pkg_setup
+
 }
 
 src_unpack() {