From: Andreas Proschofsky Date: Fri, 21 Oct 2005 21:27:39 +0000 (+0000) Subject: remove python use-flag, makes no sense, also closes bug #109996 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7bcfc51f2671de707cb50a290023f8d68f3376fa;p=gentoo.git remove python use-flag, makes no sense, also closes bug #109996 Package-Manager: portage-2.0.53_rc6 --- 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 + 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 openoffice-2.0.0.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 0805d4093830..483f33281abb 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,4 +1,4 @@ -MD5 c6ebe850d3767418bb2f06118675500c ChangeLog 30217 +MD5 eb0d277e4164b68963b56ee3f8401246 ChangeLog 30542 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766 @@ -37,4 +37,4 @@ MD5 c45a70a1b4109bc275d7e55083b85d44 files/digest-openoffice-2.0.0 476 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566 -MD5 464fff747f1300df8ae63c7648a2db6d openoffice-2.0.0.ebuild 6817 +MD5 d7a9850b36561d3078c5dab7143db42c openoffice-2.0.0.ebuild 6743 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}