Fix build with sys-libs/db-5.0, bug #349778 by me.

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

4 files changed, 26 insertions, 7 deletions

diff --git a/net-proxy/c-icap/ChangeLog b/net-proxy/c-icap/ChangeLog
index 869f9b0df8b9..90669b5e90e6 100644
--- a/net-proxy/c-icap/ChangeLog
+++ b/net-proxy/c-icap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/c-icap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/ChangeLog,v 1.2 2010/12/12 15:40:23 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/ChangeLog,v 1.3 2010/12/26 16:35:39 flameeyes Exp $
+
+  26 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org> c-icap-0.1.3.ebuild,
+  +files/c-icap-0.1.3+db-5.0.patch:
+  Fix build with sys-libs/db-5.0, bug #349778 by me.
 
   12 Dec 2010; Christian Faulhammer <fauli@gentoo.org> c-icap-0.1.3.ebuild:
   keyworded ~arch for x86, bug 346439
diff --git a/net-proxy/c-icap/Manifest b/net-proxy/c-icap/Manifest
index 18a94d438e3c..628f4ce1801c 100644
--- a/net-proxy/c-icap/Manifest
+++ b/net-proxy/c-icap/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX c-icap-0.1.3+db-5.0.patch 495 RMD160 482a3a15e718d21bd1d00a866f0c6c62cf7d1809 SHA1 d5e3ddb39ba692c9f67f97572c274f0756badc44 SHA256 5cc9ea93da6e14f546a4fbe34cdfbc796b8e871e6a618de400e709a61556fb01
 AUX c-icap-0.1.3-asneeded.patch 953 RMD160 bd4c51d283f3e0e74fa2c3d26a65a6c01e2ccfb6 SHA1 266d6ecc6883577645cac3954d7f3b377715c958 SHA256 353861571ab1116f59115ae4403ae4cdcc3bd799a0f3d1477f3e00fcb23783ee
 AUX c-icap-0.1.3-implicit.patch 489 RMD160 b3ef8769bbe897a3d160406e086f34766c656aa5 SHA1 a812bfafb718d05eec0ee2b6b406b1d1802ee330 SHA256 8268e23ea1810f737a7c376f43a7c8e5a349b6dfa909e25f7018c3432add8dca
 AUX c-icap.init 1048 RMD160 b47f5163b4cc04c83fec24a3f444436e0c24f101 SHA1 e38a0e39bc977a74e8bfa33de061a25369192baa SHA256 a2f5f719e36266ed1e41f12d3e12dd275d066e55ad09105dc5577947105fa2b1
 DIST c_icap-0.1.3.tar.gz 526931 RMD160 b81a2b1cca9d8044e4d8c4013a1593e32e24e8a9 SHA1 c4ea6795387a8abd18faed189d60d9e8c1f92092 SHA256 8942bae3a3e016664cf56c89ffb34a4337d1c984dc80e61d1c39e437ffab7baf
-EBUILD c-icap-0.1.3.ebuild 2636 RMD160 9e2ca40a17bb7e385a9b0891c370a5a14adc5bdd SHA1 125ee9bacce2faf464eaee4a66a7f87da21db040 SHA256 68d193ad94080807fed93295c7fbf8e74a78cbdd4a973fb933c5ce7a69569923
-MISC ChangeLog 617 RMD160 8225f7331d92cba5f5ce13fd66539ed40f94745d SHA1 2fca5ed6f245f5d4ae9363afdb7451938cbf8cf2 SHA256 7dfe0dce8be918fb257184e87e7e0fab60c85d1cd94f6ce4e30762641253586e
+EBUILD c-icap-0.1.3.ebuild 2680 RMD160 c8570478729ff14af6d7c16c2965c9f9c329c904 SHA1 0ad3e4f1923717189a5f9f76148c9f7c3c4f0d1b SHA256 d99d73f0796e417113a4b4baf5674869765021794d1258d0d90630a4bdd2758f
+MISC ChangeLog 788 RMD160 ba813bea0e1ec48f32d3edc0a96bd911a6cbcc73 SHA1 52b4c1fb12ee9dd10d78ade5b40136beb7d39c78 SHA256 4242d4eb5e333f36c237a53df4b53c08733225d2bf6f00b5b95ab21da0810c31
 MISC metadata.xml 314 RMD160 361f20765aacd066a4cd246dc6e1279b5867e1db SHA1 f94c897e86448ba1ecfd55a90f1391c5d050dcd5 SHA256 62f7e0195ddb28bcab113616feba8f590429a33552ec9bf96f5e3ad5c5f4e542
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0E7XIACgkQNQqtfCuFneOWsQCgi4afXsRK3GbIE16AliDawsGx
-BWgAoI1b6pWgOIeI/jotynnHk20o6MiJ
-=d6m1
+iEYEARECAAYFAk0XbrsACgkQAiZjviIA2Xh5ewCglE5EPb2uk4gJ7OBJXehn7Fu+
+3FwAoLaGRIxi6xZfHWw0ro3B/bGPy9Cp
+=drSU
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/c-icap/c-icap-0.1.3.ebuild b/net-proxy/c-icap/c-icap-0.1.3.ebuild
index 6a21257148f7..34593741a996 100644
--- a/net-proxy/c-icap/c-icap-0.1.3.ebuild
+++ b/net-proxy/c-icap/c-icap-0.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/c-icap-0.1.3.ebuild,v 1.2 2010/12/12 15:40:23 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/c-icap-0.1.3.ebuild,v 1.3 2010/12/26 16:35:39 flameeyes Exp $
 
 EAPI=2
 
@@ -28,6 +28,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	epatch "${FILESDIR}/${P}-asneeded.patch"
 	epatch "${FILESDIR}/${P}-implicit.patch"
+	epatch "${FILESDIR}/${P}+db-5.0.patch"
 	eautoreconf
 }
 
diff --git a/net-proxy/c-icap/files/c-icap-0.1.3+db-5.0.patch b/net-proxy/c-icap/files/c-icap-0.1.3+db-5.0.patch
new file mode 100644
index 000000000000..6be5fafb2311
--- /dev/null
+++ b/net-proxy/c-icap/files/c-icap-0.1.3+db-5.0.patch
@@ -0,0 +1,13 @@
+Index: c_icap-0.1.3/modules/bdb_tables.c
+===================================================================
+--- c_icap-0.1.3.orig/modules/bdb_tables.c
++++ c_icap-0.1.3/modules/bdb_tables.c
+@@ -108,7 +108,7 @@ int bdb_table_do_real_open(struct ci_loo
+     }
+ 
+ 
+-#if(DB_VERSION_MINOR>=1)
++#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+     if ((ret = dbdata->db->open( dbdata->db, NULL, table->path, NULL,
+ 				 DB_BTREE, DB_RDONLY|DB_THREAD, 0)) != 0) {
+ #else