[patch] oo.patch

oo.patch (text/plain), 2.36 KB, created by Chris Gianelloni (RETIRED) on 2008-02-15 20:34:06 UTC

? oo.patch
Index: openoffice-2.3.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.1-r1.ebuild,v
retrieving revision 1.5
diff -u -b -B -r1.5 openoffice-2.3.1-r1.ebuild
--- openoffice-2.3.1-r1.ebuild	4 Feb 2008 15:24:40 -0000	1.5
+++ openoffice-2.3.1-r1.ebuild	15 Feb 2008 20:26:44 -0000
@@ -67,8 +67,7 @@
 		>=dev-java/xerces-2.7
 		=dev-java/xml-commons-external-1.3* )
 	mono? ( >=dev-lang/mono-1.2.3.1 )
-	firefox? ( >=www-client/mozilla-firefox-1.5-r9
-		>=dev-libs/nspr-4.6.6
+	firefox? ( >=dev-libs/nspr-4.6.6
 		>=dev-libs/nss-3.11-r1 )
 	!firefox? ( seamonkey? ( www-client/seamonkey
 		>=dev-libs/nspr-4.6.6
@@ -101,6 +100,8 @@
 	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
 
 RDEPEND="java? ( >=virtual/jre-1.4 )
+	firefox? (  >=www-client/mozilla-firefox-1.5-r9
+		 >=www-client/mozilla-firefox-bin-1.5-r9 ) )
 	${COMMON_DEPEND}"
 
 DEPEND="${COMMON_DEPEND}
@@ -128,6 +129,7 @@
 	>=dev-lang/python-2.3.4
 	java? ( || ( !amd64? ( =virtual/jdk-1.5* ) =virtual/jdk-1.4* )
 		dev-java/ant-core )
+	firefox? ( >=www-client/mozilla-firefox-1.5-r9 )
 	ldap? ( net-nds/openldap )"
 
 PROVIDE="virtual/ooo"
Index: openoffice-2.3.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.1.ebuild,v
retrieving revision 1.9
diff -u -b -B -r1.9 openoffice-2.3.1.ebuild
--- openoffice-2.3.1.ebuild	14 Feb 2008 21:22:49 -0000	1.9
+++ openoffice-2.3.1.ebuild	15 Feb 2008 20:26:44 -0000
@@ -67,8 +67,7 @@
 		>=dev-java/xerces-2.7
 		=dev-java/xml-commons-external-1.3* )
 	mono? ( >=dev-lang/mono-1.2.3.1 )
-	firefox? ( >=www-client/mozilla-firefox-1.5-r9
-		>=dev-libs/nspr-4.6.6
+	firefox? ( >=dev-libs/nspr-4.6.6
 		>=dev-libs/nss-3.11-r1 )
 	!firefox? ( seamonkey? ( www-client/seamonkey
 		>=dev-libs/nspr-4.6.6
@@ -100,6 +99,8 @@
 	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
 
 RDEPEND="java? ( >=virtual/jre-1.4 )
+	firefox? (  >=www-client/mozilla-firefox-1.5-r9
+		 >=www-client/mozilla-firefox-bin-1.5-r9 ) )
 	${COMMON_DEPEND}"
 
 DEPEND="${COMMON_DEPEND}
@@ -127,6 +128,7 @@
 	>=dev-lang/python-2.3.4
 	java? ( || ( !amd64? ( =virtual/jdk-1.5* ) =virtual/jdk-1.4* )
 		dev-java/ant-core )
+	firefox? ( >=www-client/mozilla-firefox-1.5-r9 )
 	ldap? ( net-nds/openldap )"
 
 PROVIDE="virtual/ooo"