bad db dpendancy include path fix. Bug #73955 and bug #94566

Package-Manager: portage-2.0.51.22-r2

4 files changed, 27 insertions, 10 deletions

diff --git a/app-crypt/xca/ChangeLog b/app-crypt/xca/ChangeLog
index cc8064b5525a..ab73edd1076b 100644
--- a/app-crypt/xca/ChangeLog
+++ b/app-crypt/xca/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/xca
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/ChangeLog,v 1.4 2005/07/21 15:30:36 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/ChangeLog,v 1.5 2005/08/14 13:09:46 dragonheart Exp $
+
+  14 Aug 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/configure-db-4.1.patch, +files/configure-db.patch,
+  xca-0.5.1.ebuild:
+  better (though not perfect) dependancy fix for db-4.* includes
+  Bug #73955 and bug #94566. Thanks to Michael Krelin, Mike Nerone
+  and Thomas Meira Andrade.
 
   21 Jul 2005; Caleb Tennis <caleb@gentoo.org> xca-0.5.1.ebuild:
   Fix Qt dep per 98180
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 015a593843fc..9836315b7b55 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,7 +1,17 @@
-MD5 afced6fef75a9c41dcba48120f3892a2 xca-0.5.1.ebuild 1101
-MD5 316c30996fb556ecd1f6486c48f67b4f ChangeLog 807
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6fd77a9b999ec8be46051c045036b5e2 ChangeLog 1107
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
-MD5 8bdc8f5dfc26313d6d167f947ce7bd8c files/xca-0.5.1-qt.diff 466
-MD5 824dd090495b970cdbbe37ae02a2aade files/digest-xca-0.5.1 61
-MD5 878557cfb66b6c55e140b22b59a945fe files/configure-db-4.1.patch 485
+MD5 70933334043cd24a67a81e73ba34a48d xca-0.5.1.ebuild 1103
 MD5 a863ab8517d47d6115278df5657a8e6e files/Rules.mak-prefix.patch 317
+MD5 824dd090495b970cdbbe37ae02a2aade files/digest-xca-0.5.1 61
+MD5 8bdc8f5dfc26313d6d167f947ce7bd8c files/xca-0.5.1-qt.diff 466
+MD5 ab7ebbe2a038dc3100f6f4af0923946c files/configure-db.patch 471
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFC/0KymdTrptrqvGERAlX5AJ4nRHusaYP9hPcQgDqok0rDbe5cyQCeOeSa
+c9/Iwh9NOlv1AmKld+pt1DM=
+=8U2M
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/xca/files/configure-db-4.1.patch b/app-crypt/xca/files/configure-db.patch
index 25a49773e7ef..05f10dde7466 100644
--- a/app-crypt/xca/files/configure-db-4.1.patch
+++ b/app-crypt/xca/files/configure-db.patch
@@ -5,7 +5,7 @@
  
  ######################## DB
 -subdirs="/db /db4 /db3"
-+subdirs="/db4.1 /db /db4 /db3"
++subdirs="/db4.?"
  search_includes db_cxx.h || err "The Berkeley DB header files were not found"
  search_lib db_cxx db4_cxx db_cxx-4 db3_cxx db_cxx-3 || err "The Berkeley DB library was not found. Try installing db-dev" 
  ## The fun of NPTL... (Thx Enrico Scholz)
diff --git a/app-crypt/xca/xca-0.5.1.ebuild b/app-crypt/xca/xca-0.5.1.ebuild
index 8ebd15b96bb3..3facc38672df 100644
--- a/app-crypt/xca/xca-0.5.1.ebuild
+++ b/app-crypt/xca/xca-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/xca-0.5.1.ebuild,v 1.4 2005/07/21 15:30:36 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/xca-0.5.1.ebuild,v 1.5 2005/08/14 13:09:46 dragonheart Exp $
 
 inherit eutils kde toolchain-funcs
 
@@ -15,13 +15,13 @@ IUSE=""
 
 DEPEND=">=dev-libs/openssl-0.9.6
 	|| ( =x11-libs/qt-3* =x11-libs/qt-2* )
-	>=sys-libs/db-3.2"
+	>=sys-libs/db-4.1"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-qt.diff
-	epatch ${FILESDIR}/configure-db-4.1.patch
+	epatch ${FILESDIR}/configure-db.patch
 	echo "inst_prefix=/usr" >> Local.mak
 	epatch ${FILESDIR}/Rules.mak-prefix.patch
 }