diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2006-03-16 21:29:08 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2006-03-16 21:29:08 +0000 |
| commit | 64253226ba7e5630caac350a8f1d7a3c5198c461 (patch) | |
| tree | 6ef705808406de23128ba98eabf0365b1dc309ae /app-office | |
| parent | Adding dependancy for the bc package to ibm-powerpc-utils (diff) | |
| download | gentoo-2-64253226ba7e5630caac350a8f1d7a3c5198c461.tar.gz gentoo-2-64253226ba7e5630caac350a8f1d7a3c5198c461.tar.bz2 gentoo-2-64253226ba7e5630caac350a8f1d7a3c5198c461.zip | |
Remove curl use flag
(Portage version: 2.1_pre6-r3)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.0.1.ebuild | 9 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.0.2.ebuild | 9 |
3 files changed, 15 insertions, 9 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 825c5ec34bee..3e4692c8ca7e 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.197 2006/03/15 09:30:07 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.198 2006/03/16 21:29:08 suka Exp $ + + 16 Mar 2006; Andreas Proschofsky <suka@gentoo.org> + openoffice-2.0.1.ebuild, openoffice-2.0.2.ebuild: + Remove curl use flag, we really always want to use the external curl 15 Mar 2006; Andreas Proschofsky <suka@gentoo.org> +files/2.0.2/use-system-xt.diff, openoffice-2.0.2.ebuild: diff --git a/app-office/openoffice/openoffice-2.0.1.ebuild b/app-office/openoffice/openoffice-2.0.1.ebuild index 8fd79c952d69..8d8ffae4eeb5 100644 --- a/app-office/openoffice/openoffice-2.0.1.ebuild +++ b/app-office/openoffice/openoffice-2.0.1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.24 2006/02/15 12:12:05 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.25 2006/03/16 21:29:08 suka Exp $ inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs -IUSE="binfilter curl eds gnome gtk java kde ldap mozilla xml2" +IUSE="binfilter eds gnome gtk java kde ldap mozilla xml2" MY_PV="${PV}.3" PATCHLEVEL="OOA680" @@ -73,7 +73,7 @@ DEPEND="${RDEPEND} dev-perl/Archive-Zip dev-util/pkgconfig dev-util/intltool - curl? ( >=net-misc/curl-7.9.8 ) + >=net-misc/curl-7.9.8 sys-libs/zlib sys-libs/pam !dev-util/dmake @@ -145,7 +145,6 @@ src_unpack() { use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE} echo "`use_enable binfilter`" >> ${CONFFILE} - echo "`use_with curl system-curl`" >> ${CONFFILE} echo "`use_with xml2 system-libxml`" >> ${CONFFILE} echo "`use_with mozilla system-mozilla`" >> ${CONFFILE} @@ -156,6 +155,8 @@ src_unpack() { echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE} echo "`use_enable gnome lockdown`" >> ${CONFFILE} + echo "--with-system-curl" >> ${CONFFILE} + } src_compile() { diff --git a/app-office/openoffice/openoffice-2.0.2.ebuild b/app-office/openoffice/openoffice-2.0.2.ebuild index 6919555f74b0..a81a6a702e74 100644 --- a/app-office/openoffice/openoffice-2.0.2.ebuild +++ b/app-office/openoffice/openoffice-2.0.2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2.ebuild,v 1.3 2006/03/15 09:30:07 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2.ebuild,v 1.4 2006/03/16 21:29:08 suka Exp $ inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs -IUSE="binfilter cairo curl eds firefox gnome gtk java kde ldap mozilla xml2" +IUSE="binfilter cairo eds firefox gnome gtk java kde ldap mozilla xml2" PATCHLEVEL="OOB680" SRC="OOO_2_0_2" @@ -77,7 +77,7 @@ DEPEND="${RDEPEND} dev-perl/Archive-Zip dev-util/pkgconfig dev-util/intltool - curl? ( >=net-misc/curl-7.9.8 ) + >=net-misc/curl-7.9.8 sys-libs/zlib sys-libs/pam !dev-util/dmake @@ -148,7 +148,6 @@ src_unpack() { use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE} echo "`use_enable binfilter`" >> ${CONFFILE} - echo "`use_with curl system-curl`" >> ${CONFFILE} echo "`use_with xml2 system-libxml`" >> ${CONFFILE} echo "`use_with mozilla system-mozilla`" >> ${CONFFILE} @@ -161,6 +160,8 @@ src_unpack() { echo "`use_enable gnome lockdown`" >> ${CONFFILE} echo "`use_enable gnome atkbridge`" >> ${CONFFILE} + echo "--with-system-curl" >> ${CONFFILE} + } src_compile() { |