Remove curl use flag

Package-Manager: portage-2.1_pre6-r3

4 files changed, 24 insertions, 18 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/Manifest b/app-office/openoffice/Manifest
index 663d6ffad1c8..7722672daf96 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,6 +1,6 @@
-MD5 5718145305f5dfc12c14c42ce18efee8 ChangeLog 42467
-RMD160 bab6e13386f99b7fca6f8c96d4594d1c0536b500 ChangeLog 42467
-SHA256 e266d1187f206fba0318a51734f034d75ee8513c7ba13499f023ff6113658a47 ChangeLog 42467
+MD5 d27099ddb08ac665519e699e9e486cb2 ChangeLog 42644
+RMD160 d43b72b57fcbb4bca3a41c03354bd40678c80a44 ChangeLog 42644
+SHA256 6fc64a581270a0525fea4e3784bd2965b2a5aad69e964329b116913091335545 ChangeLog 42644
 MD5 500f7e71be57d40b0a8042cab1484df9 files/2.0.1/alwayscrystal.diff 3222
 RMD160 6f563dccad523db881def1fdb711df3949c2a687 files/2.0.1/alwayscrystal.diff 3222
 SHA256 22af14b2c3bd7d796eeda2f4a423f4290e71d2f2790a82038b837c6219133ef1 files/2.0.1/alwayscrystal.diff 3222
@@ -19,9 +19,9 @@ SHA256 89a598733c3c4bb4cac78ef0ce28549043db2df6298b90b84359d236ae44d8b6 files/di
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata.xml 461
-MD5 e00605b0acc60de47e6eee98a5f32894 openoffice-2.0.1.ebuild 7274
-RMD160 ed88f0dc45b87c259271f83fa9d4fd8bb55fab93 openoffice-2.0.1.ebuild 7274
-SHA256 56a67a1cd040cd120cb5227ed0fa926fbf378c5ba46e267bc43a9b0218f87fa7 openoffice-2.0.1.ebuild 7274
-MD5 5a93169b7214295b72fc34757d07766f openoffice-2.0.2.ebuild 7646
-RMD160 a5fab67ca2100f7f3acbf4355812d09291f146e8 openoffice-2.0.2.ebuild 7646
-SHA256 8e3331c4a9ec2ff710e97b65a1f6fe8ef6488ee0e2da159f2764552e25653bd2 openoffice-2.0.2.ebuild 7646
+MD5 7cc2820c5adc1d257bff44f894cf2767 openoffice-2.0.1.ebuild 7252
+RMD160 5b5adfc222b78c5ecd065c0674b8ea50e839bc84 openoffice-2.0.1.ebuild 7252
+SHA256 20105cce8cc455b7674d0e86b7bcdf1097ee94f3d6a9b1fb521517d7ff81138e openoffice-2.0.1.ebuild 7252
+MD5 52728353d8f0dc145ef536e733ad94f4 openoffice-2.0.2.ebuild 7624
+RMD160 3bf132fb290c2be3799cf1d9e579f6f8dc03c0cd openoffice-2.0.2.ebuild 7624
+SHA256 51be1d7fe3e1d56c9df1f93dff512dd6e9112c6e5486c123bea5a451904a6d5b openoffice-2.0.2.ebuild 7624
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() {