Raising dependency for nspr, see bug #177731, also support db-4.6, bug #191672

Package-Manager: portage-2.1.3.9

3 files changed, 18 insertions, 23 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 6f87c0eab790..c9eddedb61ce 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.341 2007/09/20 07:03:41 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.342 2007/09/20 08:17:05 suka Exp $
+
+  20 Sep 2007; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.3.0.ebuild:
+  Raising dependency for nspr, see bug #177731, also support db-4.6, bug #191672
 
   20 Sep 2007; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.3.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 6fd972f4024b..f9779e79a395 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.2.1/disable-regcomp-java.diff 965 RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e SHA1 d5768499c6bf9290dd0dab867918596369dbbfab SHA256 0a3656e0a34c0069f0096251eb245efc7ebd1b3ec2870592065695a556b17b19
 MD5 c4d90c5fb8d48a5feb3ec4cd6d6e3f38 files/2.2.1/disable-regcomp-java.diff 965
 RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e files/2.2.1/disable-regcomp-java.diff 965
@@ -79,14 +76,14 @@ EBUILD openoffice-2.2.1.ebuild 11889 RMD160 d8f060050e051a083d51b6afc2738903cfe0
 MD5 dac1ed6e687aa78d5b87cce285332fb7 openoffice-2.2.1.ebuild 11889
 RMD160 d8f060050e051a083d51b6afc2738903cfe09a18 openoffice-2.2.1.ebuild 11889
 SHA256 98f7525fe494ff952810acc6ae454c6fba6041462737335790e6ed39b36a625d openoffice-2.2.1.ebuild 11889
-EBUILD openoffice-2.3.0.ebuild 12223 RMD160 460ebdc96ce8dd4245eed3e011163a7601d13365 SHA1 ab6c98860ab66dff0cc87ecff3b2e65b0e8051f9 SHA256 7e3de105af3832d864e55a8f4dd8a78ef214370e084ce830100cd28b0ff07f2b
-MD5 59cfd95ba9662ed0c3bae38903140816 openoffice-2.3.0.ebuild 12223
-RMD160 460ebdc96ce8dd4245eed3e011163a7601d13365 openoffice-2.3.0.ebuild 12223
-SHA256 7e3de105af3832d864e55a8f4dd8a78ef214370e084ce830100cd28b0ff07f2b openoffice-2.3.0.ebuild 12223
-MISC ChangeLog 71045 RMD160 3f9ec0e2fce8002e714c779497de614e593f2b51 SHA1 9941995e2b1b04730e2458302d52926427ba7424 SHA256 cff3dab0a3333e6069b508ef6e27d428c9f82463dbd929b3ab18a60ec24fbeb0
-MD5 346503fd1521118c1f74d1f821356f0a ChangeLog 71045
-RMD160 3f9ec0e2fce8002e714c779497de614e593f2b51 ChangeLog 71045
-SHA256 cff3dab0a3333e6069b508ef6e27d428c9f82463dbd929b3ab18a60ec24fbeb0 ChangeLog 71045
+EBUILD openoffice-2.3.0.ebuild 12274 RMD160 75a83e2b4dcf1df0cb292cd6a6caad6ef92d5f95 SHA1 3d578a7aea39a8e092f9a3579a184d93f1dc3e8e SHA256 df5e8f4ecd84c8fe2c8ecf280ffe8b380fdbf0683d9384e3fd9ea81a0211976a
+MD5 239fc352a95d8015f2554c6bc0be741a openoffice-2.3.0.ebuild 12274
+RMD160 75a83e2b4dcf1df0cb292cd6a6caad6ef92d5f95 openoffice-2.3.0.ebuild 12274
+SHA256 df5e8f4ecd84c8fe2c8ecf280ffe8b380fdbf0683d9384e3fd9ea81a0211976a openoffice-2.3.0.ebuild 12274
+MISC ChangeLog 71207 RMD160 9492765c151f93260f71c23fcb9ca8d3c8b6f631 SHA1 3725fb31dc4de88286f5b8f860e32b3eea48156d SHA256 f58d40d03f39bee948b580853440a0a6a9b0fb4ceb255ceeb253cb50589efc88
+MD5 fbe689be4790b68f30574d7506ceb782 ChangeLog 71207
+RMD160 9492765c151f93260f71c23fcb9ca8d3c8b6f631 ChangeLog 71207
+SHA256 f58d40d03f39bee948b580853440a0a6a9b0fb4ceb255ceeb253cb50589efc88 ChangeLog 71207
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
@@ -97,10 +94,3 @@ SHA256 6ad627f46984c26bf39734c60fc5227e5b1bd1398fab95f261b2e18b016e87de files/di
 MD5 8d862dac5829329b7e4cbefda8354cb8 files/digest-openoffice-2.3.0 3244
 RMD160 763427c8042ae07f62a585b302adf79f149a3c9c files/digest-openoffice-2.3.0 3244
 SHA256 1c9e6129a9530072074945083a9035713eff1253aeb386c3c754ad66758d8c87 files/digest-openoffice-2.3.0 3244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFG8iIZNQqtfCuFneMRAgNUAJ9vx8JBM5cnEuCD92uNc3w/RilkWwCbBkQS
-nPHJOe537THvyEJLjb9B75E=
-=qbrW
------END PGP SIGNATURE-----
diff --git a/app-office/openoffice/openoffice-2.3.0.ebuild b/app-office/openoffice/openoffice-2.3.0.ebuild
index 74f3d7e4dada..29681031504d 100644
--- a/app-office/openoffice/openoffice-2.3.0.ebuild
+++ b/app-office/openoffice/openoffice-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild,v 1.6 2007/09/20 07:29:57 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild,v 1.7 2007/09/20 08:17:05 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -68,13 +68,13 @@ COMMON_DEPEND="!app-office/openoffice-bin
 		=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.2
+		>=dev-libs/nspr-4.6.6
 		>=dev-libs/nss-3.11-r1 )
 	!firefox? ( seamonkey? ( www-client/seamonkey
-		>=dev-libs/nspr-4.6.2
+		>=dev-libs/nspr-4.6.6
 		>=dev-libs/nss-3.11-r1 ) )
 	!firefox? ( !seamonkey? ( xulrunner? ( net-libs/xulrunner
-		>=dev-libs/nspr-4.6.2
+		>=dev-libs/nspr-4.6.6
 		>=dev-libs/nss-3.11-r1 ) ) )
 	sound? ( >=media-libs/portaudio-18.1-r5
 			>=media-libs/libsndfile-1.0.9 )
@@ -203,6 +203,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
 	epatch ${FILESDIR}/${PV}/ooo-env_log.diff
+	epatch ${FILESDIR}/${PV}/system-check-db-4.6.patch
 
 	if use ppc ; then
 		cp -f ${FILESDIR}/${PV}/disable-regcomp-java.diff ${S}/patches/src680 || die