Add missing patch, oops, closes bug #193162

Package-Manager: portage-2.1.3.9

3 files changed, 33 insertions, 5 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index c9eddedb61ce..cf174c8a1492 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.342 2007/09/20 08:17:05 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.343 2007/09/20 11:44:25 suka Exp $
+
+  20 Sep 2007; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.3.0/system-check-db-4.6.patch:
+  Add missing patch, oops, closes bug #193162
 
   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 f9779e79a395..6b295da9df4b 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -50,6 +50,10 @@ AUX 2.3.0/stlport-ppc-buildfix.diff 2192 RMD160 9f1b5be42101f0abbc0be98570643cb4
 MD5 e51522db455a6ea1ec886048093551eb files/2.3.0/stlport-ppc-buildfix.diff 2192
 RMD160 9f1b5be42101f0abbc0be98570643cb42fe74246 files/2.3.0/stlport-ppc-buildfix.diff 2192
 SHA256 979ef2431fd40e3142b4213370bd16c7f6b99ff49d43d572164c1b43adba1b1f files/2.3.0/stlport-ppc-buildfix.diff 2192
+AUX 2.3.0/system-check-db-4.6.patch 1098 RMD160 475ef9a9347c7293d4080a8bc7c58255ce299094 SHA1 623ca84de04fbe158476ec4ddd172fd6862eb9ce SHA256 39017466222a7ff075ea4079fd8830839b180f1068c677c2ac0058ca6facc859
+MD5 4aca6886a5814f2f93d23d7bb1790a34 files/2.3.0/system-check-db-4.6.patch 1098
+RMD160 475ef9a9347c7293d4080a8bc7c58255ce299094 files/2.3.0/system-check-db-4.6.patch 1098
+SHA256 39017466222a7ff075ea4079fd8830839b180f1068c677c2ac0058ca6facc859 files/2.3.0/system-check-db-4.6.patch 1098
 DIST OOo_2.2.1_src_binfilter.tar.bz2 7756778 RMD160 a6194849bb8e2130709a7ff769a8e751a43f86c6 SHA1 aa2c316e0fab13a25c07c2cfd0eafb7a50c96678 SHA256 13f2f6dad82a085a60724fa6dbc58c564a8c496cc27189af3cd7286a6e6adeb8
 DIST OOo_2.2.1_src_core.tar.bz2 123479583 RMD160 fa6775f397bf093ad5be19c28c18d179bb1057b8 SHA1 dad86ea3e8ed2805986c82333cf7a12040696269 SHA256 adc54c88892f5ced9887945709856efeb628fe5f7b5b2f2aa7797c5391b9c7d6
 DIST OOo_2.2.1_src_l10n.tar.bz2 76560727 RMD160 58f56faab079f179348f4c64cdbe176e296345f7 SHA1 f7c1592210c60313464b7f2cec88cb850578aec1 SHA256 d23cc1d5dc97533b03b04336e2a136ee4a359b2bd8239a008bd3e4508eae2b25
@@ -80,10 +84,10 @@ EBUILD openoffice-2.3.0.ebuild 12274 RMD160 75a83e2b4dcf1df0cb292cd6a6caad6ef92d
 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 ChangeLog 71349 RMD160 6946e2c859cc1d3521909b4a1b981165338a4643 SHA1 9853732e7568345df765aa2f630d9d86973e9506 SHA256 dc7c5b002cf2a0815880ac6090a30ba7fe84e67f23f15b004d480d4b1db859d8
+MD5 4bdf4517e9534840e39e479aef49043f ChangeLog 71349
+RMD160 6946e2c859cc1d3521909b4a1b981165338a4643 ChangeLog 71349
+SHA256 dc7c5b002cf2a0815880ac6090a30ba7fe84e67f23f15b004d480d4b1db859d8 ChangeLog 71349
 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.3.0/system-check-db-4.6.patch b/app-office/openoffice/files/2.3.0/system-check-db-4.6.patch
new file mode 100644
index 000000000000..4fac5e6c6b1b
--- /dev/null
+++ b/app-office/openoffice/files/2.3.0/system-check-db-4.6.patch
@@ -0,0 +1,20 @@
+--- patches/src680/system-db-check.diff.orig	2007-09-08 16:25:25.000000000 +0200
++++ patches/src680/system-db-check.diff	2007-09-08 16:26:25.000000000 +0200
+@@ -12,7 +12,7 @@
+ -             [ AC_MSG_ERROR(no. install the db4 libraries) ], []+             )
+ -        ], []
+ -    )
+-+    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
+++    for dbver in -4.6 4.6 -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.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
+++    for dbver in -4.6 4.6 -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]) ])