diff options
author | Andreas Proschofsky <suka@gentoo.org> | 2005-10-21 21:27:39 +0000 |
---|---|---|
committer | Andreas Proschofsky <suka@gentoo.org> | 2005-10-21 21:27:39 +0000 |
commit | a590e060f3404871c2a611b90cebbf4d48e4f018 (patch) | |
tree | fc08487e53264e719e1bcbd95588bda6010b5b52 /app-office | |
parent | Stable on mips (-r3), removed old version. (diff) | |
download | gentoo-2-a590e060f3404871c2a611b90cebbf4d48e4f018.tar.gz gentoo-2-a590e060f3404871c2a611b90cebbf4d48e4f018.tar.bz2 gentoo-2-a590e060f3404871c2a611b90cebbf4d48e4f018.zip |
remove python use-flag, makes no sense, also closes bug #109996
(Portage version: 2.0.53_rc6)
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/openoffice/ChangeLog | 9 | ||||
-rw-r--r-- | app-office/openoffice/openoffice-2.0.0.ebuild | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 3833df68aa0d..c27184c44510 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.138 2005/10/21 15:49:37 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.139 2005/10/21 21:27:39 suka Exp $ + + 21 Oct 2005; Andreas Proschofsky <suka@gentoo.org> + openoffice-2.0.0.ebuild: + Remove the python use-flag, we are now using system-python by default. Makes + no sense to have it anyway, as portage needs python, and + --without-system-python just grows the build and currently results in build + breakage, see bug #109996 21 Oct 2005; Andreas Proschofsky <suka@gentoo.org> openoffice-2.0.0.ebuild: diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild index 25ca5fe7be53..4a68e5dc1abe 100644 --- a/app-office/openoffice/openoffice-2.0.0.ebuild +++ b/app-office/openoffice/openoffice-2.0.0.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.2 2005/10/21 15:49:37 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.3 2005/10/21 21:27:39 suka Exp $ inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs -IUSE="curl eds gnome java kde ldap mozilla nas python zlib xml2" +IUSE="curl eds gnome java kde ldap mozilla nas zlib xml2" PATCHLEVEL="OOO680" PATCHDIR="${WORKDIR}/ooo-build-${PV}" @@ -66,13 +66,13 @@ DEPEND="${RDEPEND} zlib? ( sys-libs/zlib ) sys-libs/pam !dev-util/dmake + >=dev-lang/python-2.3.4 java? ( =virtual/jdk-1.4* dev-java/ant-core >=dev-java/java-config-1.2.11-r1 ) !java? ( dev-libs/libxslt >=dev-libs/libxml2-2.0 ) ldap? ( net-nds/openldap ) - python? ( >=dev-lang/python-2.3.4 ) xml2? ( >=dev-libs/libxml2-2.0 )" PROVIDE="virtual/ooo" @@ -125,7 +125,6 @@ src_unpack() { echo "`use_with curl system-curl`" >> ${CONFFILE} echo "`use_with nas system-nas`" >> ${CONFFILE} - echo "`use_with python system-python`" >> ${CONFFILE} echo "`use_with xml2 system-libxml`" >> ${CONFFILE} echo "`use_with zlib system-zlib`" >> ${CONFFILE} |