Add patch to build with sys-libs/db-4.3.

(Portage version: 2.1_rc1-r3)

4 files changed, 44 insertions, 9 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index 40b5465c3938..954300983eca 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/netatalk
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.42 2005/12/31 21:49:19 flameeyes Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.43 2006/05/19 22:58:12 flameeyes Exp $
+
+  19 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/netatalk-2.0.3-db43.patch, netatalk-2.0.3-r2.ebuild:
+  Add patch to build with sys-libs/db-4.3.
 
   31 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
   -files/netatalk-1.6.4-tempfile.patch, -netatalk-1.6.4-r1.ebuild,
diff --git a/net-fs/netatalk/files/digest-netatalk-2.0.3-r2 b/net-fs/netatalk/files/digest-netatalk-2.0.3-r2
index 1f207b35e1d9..63044205ed9e 100644
--- a/net-fs/netatalk/files/digest-netatalk-2.0.3-r2
+++ b/net-fs/netatalk/files/digest-netatalk-2.0.3-r2
@@ -1 +1,3 @@
 MD5 28092763085783805dc2f00aa2127a3e netatalk-2.0.3.tar.bz2 1471804
+RMD160 29b763400a45797ac4a8e499d5328aa91a091c91 netatalk-2.0.3.tar.bz2 1471804
+SHA256 25e004732f471de0dd9a21ab129ee799da018fce3b313d4ab5e6f52e6e9e3998 netatalk-2.0.3.tar.bz2 1471804
diff --git a/net-fs/netatalk/files/netatalk-2.0.3-db43.patch b/net-fs/netatalk/files/netatalk-2.0.3-db43.patch
new file mode 100644
index 000000000000..93d3e4b9ea3b
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-2.0.3-db43.patch
@@ -0,0 +1,32 @@
+Index: netatalk-2.0.3/bin/cnid/cnid_index.c
+===================================================================
+--- netatalk-2.0.3.orig/bin/cnid/cnid_index.c
++++ netatalk-2.0.3/bin/cnid/cnid_index.c
+@@ -274,7 +274,11 @@ static int dbif_count(const int dbi, u_i
+     DB_BTREE_STAT *sp;
+     DB *db = db_table[dbi].db;
+ 
++#if DB_VERSION_MAJOR > 4 || ( DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3 )
++    ret = db->stat(db, db_txn, &sp, 0);
++#else
+     ret = db->stat(db, &sp, 0);
++#endif
+ 
+     if (ret) {
+         LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
+Index: netatalk-2.0.3/etc/cnid_dbd/dbif.c
+===================================================================
+--- netatalk-2.0.3.orig/etc/cnid_dbd/dbif.c
++++ netatalk-2.0.3/etc/cnid_dbd/dbif.c
+@@ -514,7 +514,11 @@ int dbif_count(const int dbi, u_int32_t 
+     DB_BTREE_STAT *sp;
+     DB *db = db_table[dbi].db;
+ 
++#if DB_VERSION_MAJOR > 4 || ( DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3 )
++    ret = db->stat(db, db_txn, &sp, 0);
++#else
+     ret = db->stat(db, &sp, 0);
++#endif
+ 
+     if (ret) {
+         LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
diff --git a/net-fs/netatalk/netatalk-2.0.3-r2.ebuild b/net-fs/netatalk/netatalk-2.0.3-r2.ebuild
index 1dc63a1f3849..d5bf152fb466 100644
--- a/net-fs/netatalk/netatalk-2.0.3-r2.ebuild
+++ b/net-fs/netatalk/netatalk-2.0.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.3-r2.ebuild,v 1.8 2005/12/31 21:49:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.3-r2.ebuild,v 1.9 2006/05/19 22:58:12 flameeyes Exp $
 
 inherit eutils pam flag-o-matic autotools
 IUSE="ssl pam tcpd slp cups kerberos krb4 debug cracklib"
@@ -23,10 +23,6 @@ RDEPEND=">=sys-libs/db-4.2.52
 	kerberos? ( virtual/krb5 )
 	krb4? ( virtual/krb5 )"
 
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -41,7 +37,8 @@ src_unpack() {
 			${S}/distrib/initscripts/rc.atalk.gentoo.tmpl
 	fi
 
-	epatch ${FILESDIR}/${P}-setXid.patch
+	epatch "${FILESDIR}/${P}-setXid.patch"
+	epatch "${FILESDIR}/${P}-db43.patch"
 	AT_M4DIR="macros" eautoreconf
 }