Add missing patch, oops.

Package-Manager: portage-2.1.2.1

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 14f79d709cde45d67b8ee6452e60ba506baea18d..4814ec04a86c95598a74860a9f319ab145f4af02 100644 (file)
--- 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.304 2007/03/06 19:04:22 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.305 2007/03/07 06:14:33 suka Exp $
+
+  07 Mar 2007; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.1.0/detect-db4.5.diff:
+  Add missing patch, oops.
 
   06 Mar 2007; Andreas Proschofsky <suka@gentoo.org>
   files/2.1.0/wrapper-readd.diff, files/2.1.0/gentoo-2.1.0.diff,

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 2e1d257855fff100c0425a0edd763af7a614396c..90fe74b5ccd4439b8ee4aa3c921a6fe08d51b4d5 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -14,6 +14,10 @@ AUX 2.0.4/regcompapply.diff 319 RMD160 c46130cf0c466dc7c4b82f7235b0009b39476752
 MD5 cb8c7bad3c931b6b7990cffd484a4cae files/2.0.4/regcompapply.diff 319
 RMD160 c46130cf0c466dc7c4b82f7235b0009b39476752 files/2.0.4/regcompapply.diff 319
 SHA256 6886083c9de0493f0b3a68b8d1f329ed3927360d989ff1d15916f12c7842cadd files/2.0.4/regcompapply.diff 319
+AUX 2.1.0/detect-db4.5.diff 1062 RMD160 d69a5db4fb199230c7bc6e6adb772be62ce5649e SHA1 f122c4dbf6e0575a525a3412f5e86aa1dd1e53aa SHA256 f747db0c73b4e139553e307530d2e15e4d6327ca6f75e0f2275c4934d66be392
+MD5 36e46678f498f80cfc3865b69e7487cc files/2.1.0/detect-db4.5.diff 1062
+RMD160 d69a5db4fb199230c7bc6e6adb772be62ce5649e files/2.1.0/detect-db4.5.diff 1062
+SHA256 f747db0c73b4e139553e307530d2e15e4d6327ca6f75e0f2275c4934d66be392 files/2.1.0/detect-db4.5.diff 1062
 AUX 2.1.0/disable-regcomp-java.diff 965 RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e SHA1 d5768499c6bf9290dd0dab867918596369dbbfab SHA256 0a3656e0a34c0069f0096251eb245efc7ebd1b3ec2870592065695a556b17b19
 MD5 c4d90c5fb8d48a5feb3ec4cd6d6e3f38 files/2.1.0/disable-regcomp-java.diff 965
 RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e files/2.1.0/disable-regcomp-java.diff 965
@@ -64,10 +68,10 @@ EBUILD openoffice-2.1.0.ebuild 11700 RMD160 9c463d17db4e47890d575e48174eb04697c3
 MD5 40497d586ce540d59c0d826ed76eaaf8 openoffice-2.1.0.ebuild 11700
 RMD160 9c463d17db4e47890d575e48174eb04697c3ab2c openoffice-2.1.0.ebuild 11700
 SHA256 0c53d55eb802f697d8c1ea309ba8c8193a59ac4dd4bff4b21b15e6a6f603375d openoffice-2.1.0.ebuild 11700
-MISC ChangeLog 63457 RMD160 ee07a3c227d3eb8336329f4b489ea4c58c3f02be SHA1 3c9f2e49a2691f9f966a295a41fefe2d43d48db3 SHA256 11cae0815c78b7af790132adffa427171bb971d25df4d85d32f57e77c7717c13
-MD5 c478aeb4ae5aa2ec55ffafd40535fb58 ChangeLog 63457
-RMD160 ee07a3c227d3eb8336329f4b489ea4c58c3f02be ChangeLog 63457
-SHA256 11cae0815c78b7af790132adffa427171bb971d25df4d85d32f57e77c7717c13 ChangeLog 63457
+MISC ChangeLog 63572 RMD160 2f2895864e0b18b36159a20232fb3ff0d1383af8 SHA1 2d4e8e45c6652c35ee67e89924f9c9a94ec8b3b6 SHA256 f4cd5ac44782131d7c9174c68099b7317f343ab103fe01b023e0e4e77ebc4260
+MD5 35499a00495559a5aa5cc0e63e72356a ChangeLog 63572
+RMD160 2f2895864e0b18b36159a20232fb3ff0d1383af8 ChangeLog 63572
+SHA256 f4cd5ac44782131d7c9174c68099b7317f343ab103fe01b023e0e4e77ebc4260 ChangeLog 63572
 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/files/2.1.0/detect-db4.5.diff b/app-office/openoffice/files/2.1.0/detect-db4.5.diff
new file mode 100644 (file)
index 0000000..0a708e9
--- /dev/null
+++ b/app-office/openoffice/files/2.1.0/detect-db4.5.diff
@@ -0,0 +1,20 @@
+--- patches/src680.orig/system-db-check.diff   2007-02-08 14:18:23.000000000 +0100
++++ patches/src680/system-db-check.diff        2007-03-06 10:56:17.754647295 +0100
+@@ -12,7 +12,7 @@
+ -             [ AC_MSG_ERROR(no. install the db4 libraries) ], []+             )
+ -        ], []
+ -    )
+-+    for dbver in -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
+++    for dbver in -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
+ +       AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ])
+ +    done
+ +    if test "$DB_INCLUDES" = ""; then
+@@ -31,7 +31,7 @@
+ -    AC_HAVE_LIBRARY(db, [],
+ -      [AC_MSG_ERROR([db not installed or functional])], [])
+ +    save_LIBS="$LIBS"
+-+    for dbver in -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
+++    for dbver in -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
+ +       AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ])
+ +    done
+ +    AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ])