Depend on xulrunner-1.9.0* for older releases

Package-Manager: portage-2.1.6.13/cvs/Linux i686

5 files changed, 15 insertions, 21 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 5cae2b7a0195..1db142bb1974 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.469 2009/07/19 17:29:08 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.470 2009/07/22 20:30:14 suka Exp $
+
+  22 Jul 2009; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-3.0.0.ebuild, openoffice-3.0.1.ebuild, openoffice-3.1.0.ebuild:
+  Depend on xulrunner-1.9.0* for older releases
 
   19 Jul 2009; Torsten Veller <tove@gentoo.org> openoffice-3.0.0.ebuild,
   openoffice-3.0.1.ebuild, openoffice-3.1.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 67d3beac0c9f..780c35d758a9 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9406ba568ef2dfe7d8a8bfd43ed153d44d SHA256 fd298c97fd28e765138a18d570a99613df3fa25076fa5d6243e86f9cbb750a03
 AUX buildfix-gcc44.diff 611 RMD160 31e7c33977941458b1472d92c645ed2b2ef64a82 SHA1 ed17195077f5212bfc6f546004f5e6f429b03c14 SHA256 dd66bbe257c9a88c757037d65f48ea4976d7cee8a38e96b6282611c1b70cecff
 AUX buildfix-mono-2-2.diff 523 RMD160 993dee1c2ab796980e7f04f8b9c0aeefc19743c7 SHA1 b2aee23fa2a7d6fb0b1a1d1ca97609bfaaa7f696 SHA256 5f807dd7b892dfa30c177ed20e69c19f50541bfec2f94a2ff1caaa5aa656a324
@@ -82,15 +79,8 @@ DIST ooo310-m11-ure.tar.bz2 5160732 RMD160 fd419b3a6a77dac2d95bc55afba5591bed093
 DIST ooo310-m11-writer.tar.bz2 8955758 RMD160 876e1ecbd0bf8e6dbf9eaa95155868e44c33823f SHA1 fc37627f0a8aab578a64818f713ac87a838c4709 SHA256 093f42b6f102f3f9c7f934bdc071680fa50487628b8107aa335f623f8a770694
 DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD openoffice-3.0.0.ebuild 12677 RMD160 7c042b815b207726078cce318b125e7c707d142b SHA1 52f523a4442377597e769be44b21716b8deef557 SHA256 3eca73a70d64aa72ee8668cec902d0f6931b0eaa37d28a7e511c5c250517df34
-EBUILD openoffice-3.0.1.ebuild 12207 RMD160 1392ad771f82c490ec79e32008a80de76758e67e SHA1 4a60380f8f414b54ea777db37e86ce329f5eeb9d SHA256 e8b75b0b8ff1d1e0f413750d7e506c278bdcedd6d36d6f8f6417ace6e9801436
-EBUILD openoffice-3.1.0.ebuild 12892 RMD160 ac7a9ec1485e96d73a36a19dc17bddb1d786b0a9 SHA1 b3e7a3116eae2159a457ee442d625acb78c59ec2 SHA256 71531cdb25d03220023d7f3d99c7234acb2f074f92a1bb62040a74d5b18f0035
-MISC ChangeLog 97886 RMD160 3b6e4aa6bc49a4cc236f7dd9cf3a3577e2506130 SHA1 be551094804d118269466648ffb1d3addd051ee2 SHA256 5fcb24ac3f0d8c70efd96d54fb32e0d4e0d2e85b22ac99c86e955b7430fe6672
+EBUILD openoffice-3.0.0.ebuild 12681 RMD160 20d2e4f6ea1e979f33f033d284d97d6a8e9bd4b8 SHA1 7a79d589ade481854fa81ab0309b972883ea6390 SHA256 4d096777f0cb9a99b1dfbfc363efc641a78650032c9544b95f997383e3b6a1f3
+EBUILD openoffice-3.0.1.ebuild 12211 RMD160 8efb197c3cdb0065167e3add43c7c0b43fb7e695 SHA1 dcdcfde6b51a10ebf1fd7a5c629c8b9051388571 SHA256 1900201d86955e47a25f64e2d86bb52cc8a8a7890bde33b93aad357b8056033c
+EBUILD openoffice-3.1.0.ebuild 12896 RMD160 c2e9d1643980683e074b9860ae832c80eb6475d8 SHA1 266028dd7704e24a40043b1770e4a59bf740f1e9 SHA256 567d246ddd19ff2f9b63bbc595b0e8653671b6d5c619887f33d9f5a52855231a
+MISC ChangeLog 98065 RMD160 dd06d310e62fc4aff296feb40e3680abb1de97c4 SHA1 eb9ac0f3d09e07efd5028881f594a8af76c412bb SHA256 419e7ce449aac0906118458521d333f11be03e39baa528b49b2dd316fa7be5e8
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpjWDIACgkQV3J2n04EauxhggCfSy2TjVrRpygOoClaHqxxI/JI
-N0MAnR38vKwBVq5WZuHOsy62fmFP6zmO
-=Mnhb
------END PGP SIGNATURE-----
diff --git a/app-office/openoffice/openoffice-3.0.0.ebuild b/app-office/openoffice/openoffice-3.0.0.ebuild
index f2bef79e7045..b0f1a0150316 100644
--- a/app-office/openoffice/openoffice-3.0.0.ebuild
+++ b/app-office/openoffice/openoffice-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.27 2009/07/19 17:29:08 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.28 2009/07/22 20:30:15 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -84,7 +84,7 @@ COMMON_DEPEND="!app-office/openoffice-bin
 	java? ( >=dev-java/bsh-2.0_beta4
 		>=dev-db/hsqldb-1.8.0.9 )
 	mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
-	nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* )
+	nsplugin? ( || ( =net-libs/xulrunner-1.9.0* net-libs/xulrunner:1.8 =www-client/seamonkey-1* )
 		>=dev-libs/nspr-4.6.6
 		>=dev-libs/nss-3.11-r1 )
 	opengl? ( virtual/opengl
diff --git a/app-office/openoffice/openoffice-3.0.1.ebuild b/app-office/openoffice/openoffice-3.0.1.ebuild
index f90a82bd495a..3c93a7d8772c 100644
--- a/app-office/openoffice/openoffice-3.0.1.ebuild
+++ b/app-office/openoffice/openoffice-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.1.ebuild,v 1.13 2009/07/19 17:29:08 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.1.ebuild,v 1.14 2009/07/22 20:30:15 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -83,7 +83,7 @@ COMMON_DEPEND="!app-office/openoffice-bin
 	java? ( >=dev-java/bsh-2.0_beta4
 		>=dev-db/hsqldb-1.8.0.9 )
 	mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
-	nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* )
+	nsplugin? ( || ( =net-libs/xulrunner-1.9.0* net-libs/xulrunner:1.8 =www-client/seamonkey-1* )
 		>=dev-libs/nspr-4.6.6
 		>=dev-libs/nss-3.11-r1 )
 	opengl? ( virtual/opengl
diff --git a/app-office/openoffice/openoffice-3.1.0.ebuild b/app-office/openoffice/openoffice-3.1.0.ebuild
index 0093e8cec751..6520d434db85 100644
--- a/app-office/openoffice/openoffice-3.1.0.ebuild
+++ b/app-office/openoffice/openoffice-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0.ebuild,v 1.8 2009/07/19 17:29:08 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0.ebuild,v 1.9 2009/07/22 20:30:14 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -85,7 +85,7 @@ COMMON_DEPEND="!app-office/openoffice-bin
 	java? ( >=dev-java/bsh-2.0_beta4
 		>=dev-db/hsqldb-1.8.0.9 )
 	mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
-	nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* )
+	nsplugin? ( || ( =net-libs/xulrunner-1.9.0* net-libs/xulrunner:1.8 =www-client/seamonkey-1* )
 		>=dev-libs/nspr-4.6.6
 		>=dev-libs/nss-3.11-r1 )
 	opengl? ( virtual/opengl