Remove mozilla use-flag for bug #137665

Package-Manager: portage-2.1.1_pre1-r1

5 files changed, 34 insertions, 33 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/Manifest b/app-office/openoffice/Manifest
index b3e33e96ecd2..fef7c1fc34a3 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -28,22 +28,22 @@ DIST ooo-build-2.0.2.11.tar.gz 5287864 RMD160 678e32a584ca43b85b2be12773ae57c542
 DIST ooo-build-2.0.2.9.tar.gz 5264791 RMD160 85bbcaf8202be2976a309758a9fffd992a60328c SHA1 5e2d76192f3e551863066f50ca0f99288680cb90 SHA256 b2554e8ae2593079caa193e022e774fe34cee2be7630b0321b35348a65f16649
 DIST ooo_crystal_images-6.tar.bz2 1308872 RMD160 4daa3f2139d479cdeb89f829c6d7089fadb59506 SHA1 99ee34dcba96e27296daf159ab2f48c6c2f0364a SHA256 3752d54470ace722b11ef6613694f15603295b9b9945d6033dd8eaf3bab921b7
 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e
-EBUILD openoffice-2.0.1-r1.ebuild 7334 RMD160 5965630887a411c39608b82352c69b4ab9277194 SHA1 5a0ed92b9bbfb6fbda74ba4024424c1c7b504cd6 SHA256 7c132d2d10f51786bbd5342aa7bf9777975f6ff378528b7254f04e894cdc37dc
-MD5 4036291770fc77e15ca28b0136d44805 openoffice-2.0.1-r1.ebuild 7334
-RMD160 5965630887a411c39608b82352c69b4ab9277194 openoffice-2.0.1-r1.ebuild 7334
-SHA256 7c132d2d10f51786bbd5342aa7bf9777975f6ff378528b7254f04e894cdc37dc openoffice-2.0.1-r1.ebuild 7334
-EBUILD openoffice-2.0.2-r1.ebuild 7872 RMD160 f16e24df7e17e3b2701adee8184336aaf7b82317 SHA1 98f94998372f3e134aa2c1bc0c7c398985d683b2 SHA256 c21d5046a139631e07aa6c7c2bcd83b33df81cf7f09908600a0fd2f8046441ef
-MD5 e9ac565200979c941227fc2af541fba5 openoffice-2.0.2-r1.ebuild 7872
-RMD160 f16e24df7e17e3b2701adee8184336aaf7b82317 openoffice-2.0.2-r1.ebuild 7872
-SHA256 c21d5046a139631e07aa6c7c2bcd83b33df81cf7f09908600a0fd2f8046441ef openoffice-2.0.2-r1.ebuild 7872
-EBUILD openoffice-2.0.2-r2.ebuild 8134 RMD160 6f80a0f8dd97387d6e7c2ab125e4a42cec079094 SHA1 11542e1d25f1ad214e5e36097ad3b12482add8fe SHA256 b2e00aa78e68534025f90c492f5349aa04d13c46e289a76e55e8af0f090ea3df
-MD5 c72c20db4c6d6c33f38e2cdad5d25fbc openoffice-2.0.2-r2.ebuild 8134
-RMD160 6f80a0f8dd97387d6e7c2ab125e4a42cec079094 openoffice-2.0.2-r2.ebuild 8134
-SHA256 b2e00aa78e68534025f90c492f5349aa04d13c46e289a76e55e8af0f090ea3df openoffice-2.0.2-r2.ebuild 8134
-MISC ChangeLog 47760 RMD160 f06f19c9fd59c4ca17584f390a2b5cc7d8e8b522 SHA1 70cd5697a65e928a75ec72a84f40c0ba17d7025a SHA256 506da43ded770230823720eaab1f42e6231dc8cf89875f11b69c11c0d39eb55a
-MD5 9d734c1ec13ed3b949c64a704bee8902 ChangeLog 47760
-RMD160 f06f19c9fd59c4ca17584f390a2b5cc7d8e8b522 ChangeLog 47760
-SHA256 506da43ded770230823720eaab1f42e6231dc8cf89875f11b69c11c0d39eb55a ChangeLog 47760
+EBUILD openoffice-2.0.1-r1.ebuild 7249 RMD160 488d97e84787a6ed830e5b5c64952e60b93311f8 SHA1 095c64a8c5488f7f01d6edc330e4fd851edf5a54 SHA256 fbc05bf606cd16ab1bd3aa4653cdd168969801a6d59a52498b1f9999433a8965
+MD5 53ff464256d938ecb7d25f8618a42d22 openoffice-2.0.1-r1.ebuild 7249
+RMD160 488d97e84787a6ed830e5b5c64952e60b93311f8 openoffice-2.0.1-r1.ebuild 7249
+SHA256 fbc05bf606cd16ab1bd3aa4653cdd168969801a6d59a52498b1f9999433a8965 openoffice-2.0.1-r1.ebuild 7249
+EBUILD openoffice-2.0.2-r1.ebuild 7787 RMD160 cf4b5b8cfb9c338f2ec082aaa4ea9bf488ec83f9 SHA1 ed6ebc6f5739068e14e5d16979fec975219ae1d4 SHA256 ab87c17cac39cd9d6526ed134547b4845a8e0c8358c92966e8bd9750693d593d
+MD5 4fa7481e390f4561bb436bb0b8dcd951 openoffice-2.0.2-r1.ebuild 7787
+RMD160 cf4b5b8cfb9c338f2ec082aaa4ea9bf488ec83f9 openoffice-2.0.2-r1.ebuild 7787
+SHA256 ab87c17cac39cd9d6526ed134547b4845a8e0c8358c92966e8bd9750693d593d openoffice-2.0.2-r1.ebuild 7787
+EBUILD openoffice-2.0.2-r2.ebuild 8077 RMD160 8f7e70da2934147d5adfcb2ff37bc0e49d58fff5 SHA1 f8e4ca513494aa020ebc8972424a1eda69e6470e SHA256 23ce684f0fb9193f05e8089f48c30149e05a7f4f590016f6c86e3e80fb76d49c
+MD5 a781d043ead9a5764574d944fc3c3e7f openoffice-2.0.2-r2.ebuild 8077
+RMD160 8f7e70da2934147d5adfcb2ff37bc0e49d58fff5 openoffice-2.0.2-r2.ebuild 8077
+SHA256 23ce684f0fb9193f05e8089f48c30149e05a7f4f590016f6c86e3e80fb76d49c openoffice-2.0.2-r2.ebuild 8077
+MISC ChangeLog 48005 RMD160 f1f865ff25e7da18196f4c3e1c12ce7b50eb9598 SHA1 65d1b7cfc817d22a6353ffe8bb9a7bc7be49e43f SHA256 1db615a08f7e74391f9596b36f30c690fa38dfbbf8e5c4ce9716c355ff9256c8
+MD5 0d58b754ce877e701957f5b5b7b4c405 ChangeLog 48005
+RMD160 f1f865ff25e7da18196f4c3e1c12ce7b50eb9598 ChangeLog 48005
+SHA256 1db615a08f7e74391f9596b36f30c690fa38dfbbf8e5c4ce9716c355ff9256c8 ChangeLog 48005
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
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}