diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-05-25 16:42:48 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-05-25 16:42:48 +0000 |
| commit | 93e2790a577b569bf0e56b9f2b02543e6c3c4800 (patch) | |
| tree | 677dec01630191cf085de339b2c136bbb4fb0f8b /app-office | |
| parent | Use 'python_pkg_setup' instead of 'python_execute_function -f -q'. (diff) | |
| download | gentoo-2-93e2790a577b569bf0e56b9f2b02543e6c3c4800.tar.gz gentoo-2-93e2790a577b569bf0e56b9f2b02543e6c3c4800.tar.bz2 gentoo-2-93e2790a577b569bf0e56b9f2b02543e6c3c4800.zip | |
Use Python 2 (bug #311683).
(Portage version: HEAD/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.2.0.ebuild | 10 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.2.1_rc1.ebuild | 10 |
3 files changed, 19 insertions, 7 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 0bd05df9b1d2..6ebf0af727c7 100644 --- 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/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild index a8194c87eb89..f2258605c106 100644 --- 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 1fdc803c5e11..5ece3fe26915 100644 --- 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() { |