Remove mozilla use-flag for bug #137665

(Portage version: 2.1.1_pre1-r1)

4 files changed, 18 insertions, 17 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index c276aaf440ed..adb07e54668f 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # 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.226 2006/06/20 17:23:17 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.227 2006/06/23 07:40:33 suka Exp $
+
+  23 Jun 2006; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.1-r1.ebuild, openoffice-2.0.2-r1.ebuild,
+  openoffice-2.0.2-r2.ebuild:
+  Remove mozilla use-flag for bug #137665, please use the firefox use-flag
+  (where available) instead
 
   20 Jun 2006; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.2-r1.ebuild, openoffice-2.0.2-r2.ebuild:
diff --git a/app-office/openoffice/openoffice-2.0.1-r1.ebuild b/app-office/openoffice/openoffice-2.0.1-r1.ebuild
index 393bd2f69db3..dee484b5dcd1 100644
--- a/app-office/openoffice/openoffice-2.0.1-r1.ebuild
+++ b/app-office/openoffice/openoffice-2.0.1-r1.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-r1.ebuild,v 1.4 2006/04/04 19:45:33 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1-r1.ebuild,v 1.5 2006/06/23 07:40:34 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
-IUSE="binfilter eds gnome gtk java kde ldap mozilla xml"
+IUSE="binfilter eds gnome gtk java kde ldap xml"
 
 MY_PV="${PV}.3"
 PATCHLEVEL="OOA680"
@@ -42,7 +42,6 @@ RDEPEND="!app-office/openoffice-bin
 	gtk? ( >=x11-libs/gtk+-2.4 )
 	eds? ( >=gnome-extra/evolution-data-server-1.2 )
 	kde? ( kde-base/kdelibs )
-	mozilla? ( >=www-client/mozilla-1.7.10 )
 	>=x11-libs/startup-notification-0.5
 	>=media-libs/freetype-2.1.4
 	>=media-libs/fontconfig-2.2.0
@@ -147,8 +146,7 @@ src_unpack() {
 	echo "`use_enable binfilter`" >> ${CONFFILE}
 	echo "`use_with xml system-libxml`" >> ${CONFFILE}
 
-	echo "`use_with mozilla system-mozilla`" >> ${CONFFILE}
-	echo "`use_enable mozilla`" >> ${CONFFILE}
+	echo "--without-system-mozilla --disable-mozilla" >> ${CONFFILE}
 
 	echo "`use_enable ldap openldap`" >> ${CONFFILE}
 	echo "`use_enable eds evolution2`" >> ${CONFFILE}
diff --git a/app-office/openoffice/openoffice-2.0.2-r1.ebuild b/app-office/openoffice/openoffice-2.0.2-r1.ebuild
index e0c250e15fbf..7817fe4792ea 100644
--- a/app-office/openoffice/openoffice-2.0.2-r1.ebuild
+++ b/app-office/openoffice/openoffice-2.0.2-r1.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-r1.ebuild,v 1.10 2006/06/20 17:23:17 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2-r1.ebuild,v 1.11 2006/06/23 07:40:34 suka Exp $
 
 inherit check-reqs eutils fdo-mime flag-o-matic kde-functions mono toolchain-funcs
 
-IUSE="binfilter cairo eds gnome gtk java kde ldap mono mozilla xml"
+IUSE="binfilter cairo eds gnome gtk java kde ldap mono xml"
 
 MY_PV="${PV}.9"
 PATCHLEVEL="OOB680"
@@ -47,7 +47,6 @@ RDEPEND="!app-office/openoffice-bin
 		>=x11-libs/gtk+-2.8 )
 	eds? ( >=gnome-extra/evolution-data-server-1.2 )
 	kde? ( >=kde-base/kdelibs-3.2 )
-	mozilla? ( >=www-client/mozilla-1.7.10 )
 	>=x11-libs/startup-notification-0.5
 	>=media-libs/freetype-2.1.4
 	>=media-libs/fontconfig-2.2.0
@@ -160,8 +159,7 @@ src_unpack() {
 	echo "`use_enable binfilter`" >> ${CONFFILE}
 	echo "`use_with xml system-libxml`" >> ${CONFFILE}
 
-	echo "`use_with mozilla system-mozilla`" >> ${CONFFILE}
-	echo "`use_enable mozilla`" >> ${CONFFILE}
+	echo "--without-system-mozilla --disable-mozilla" >> ${CONFFILE}
 
 	echo "`use_enable ldap openldap`" >> ${CONFFILE}
 	echo "`use_enable eds evolution2`" >> ${CONFFILE}
diff --git a/app-office/openoffice/openoffice-2.0.2-r2.ebuild b/app-office/openoffice/openoffice-2.0.2-r2.ebuild
index e077bb2faef3..bfb6ca96b3f6 100644
--- a/app-office/openoffice/openoffice-2.0.2-r2.ebuild
+++ b/app-office/openoffice/openoffice-2.0.2-r2.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-r2.ebuild,v 1.14 2006/06/20 17:23:17 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2-r2.ebuild,v 1.15 2006/06/23 07:40:33 suka Exp $
 
 inherit check-reqs eutils fdo-mime flag-o-matic java-pkg kde-functions mono toolchain-funcs
 
-IUSE="binfilter cairo eds firefox gnome gtk java kde ldap mono mozilla xml"
+IUSE="binfilter cairo eds firefox gnome gtk java kde ldap mono xml"
 
 MY_PV="${PV}.11"
 PATCHLEVEL="OOB680"
@@ -47,8 +47,7 @@ RDEPEND="!app-office/openoffice-bin
 		>=x11-libs/gtk+-2.8 )
 	eds? ( >=gnome-extra/evolution-data-server-1.2 )
 	kde? ( >=kde-base/kdelibs-3.2 )
-	mozilla? ( !firefox? ( >=www-client/mozilla-1.7.12 )
-		firefox? ( >=www-client/mozilla-firefox-1.5-r9 ) )
+	firefox? ( >=www-client/mozilla-firefox-1.5-r9 )
 	>=x11-libs/startup-notification-0.5
 	>=media-libs/freetype-2.1.10
 	>=media-libs/fontconfig-2.2.0
@@ -164,8 +163,8 @@ src_unpack() {
 	echo "`use_enable binfilter`" >> ${CONFFILE}
 	echo "`use_with xml system-libxml`" >> ${CONFFILE}
 
-	echo "`use_with mozilla system-mozilla`" >> ${CONFFILE}
-	echo "`use_enable mozilla`" >> ${CONFFILE}
+	echo "`use_enable firefox mozilla`" >> ${CONFFILE}
+	echo "`use_with firefox system-mozilla`" >> ${CONFFILE}
 	echo "`use_with firefox`" >> ${CONFFILE}
 
 	echo "`use_enable ldap openldap`" >> ${CONFFILE}