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

Package-Manager: portage-2.1_rc1-r3

5 files changed, 70 insertions, 16 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/Manifest b/net-fs/netatalk/Manifest
index 052fdf3301be..1102ea4e1404 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -1,15 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6a291e141c5d19ba797d82805100fa71 ChangeLog 6771
-MD5 9ee0857567bda5d9ffabf5d04095e90b files/digest-netatalk-2.0.3-r2 68
+AUX netatalk-2.0.3-db43.patch 1224 RMD160 ee8d1e0f3a5abc07f28d26d266fdb55f791bee91 SHA1 0c7278172da52c48a4f85d4ef8307b50c194f99f SHA256 1b731d6b89beb704a4787a9ec4f6c32e1bec7e39904f3c6edb6100d62659c879 size 1224
+MD5 f447a57b9a8aa72a9ae71f1c151b7485 files/netatalk-2.0.3-db43.patch 1224
+RMD160 ee8d1e0f3a5abc07f28d26d266fdb55f791bee91 files/netatalk-2.0.3-db43.patch 1224
+SHA256 1b731d6b89beb704a4787a9ec4f6c32e1bec7e39904f3c6edb6100d62659c879 files/netatalk-2.0.3-db43.patch 1224
+AUX netatalk-2.0.3-setXid.patch 545 RMD160 2494b98895e2ea7a685959efce1f45534ee096e1 SHA1 6e86c7d4e80eefecbab548dadcc60b8775ee1960 SHA256 9a148e2e1d8fcb86e3a01ac2172e3e369c6b5081bd6f551296820f463d946e7c size 545
 MD5 bb9fcf495bb4dfd88b684b4c0f934beb files/netatalk-2.0.3-setXid.patch 545
+RMD160 2494b98895e2ea7a685959efce1f45534ee096e1 files/netatalk-2.0.3-setXid.patch 545
+SHA256 9a148e2e1d8fcb86e3a01ac2172e3e369c6b5081bd6f551296820f463d946e7c files/netatalk-2.0.3-setXid.patch 545
+DIST netatalk-2.0.3.tar.bz2 1471804 RMD160 29b763400a45797ac4a8e499d5328aa91a091c91 SHA256 25e004732f471de0dd9a21ab129ee799da018fce3b313d4ab5e6f52e6e9e3998 size 1471804
+EBUILD netatalk-2.0.3-r2.ebuild 2858 RMD160 313c23d36eb650a78a352e06e1e454d254904645 SHA1 2260769e8a0beb58bc1f8fafd34097a0a268cbf8 SHA256 7c2b16051b3a4f9e6addbc670f620c69d45810cbb8ea64318ab7714fc421f39a size 2858
+MD5 7dd5d170b0ef48db28a73884be8c9126 netatalk-2.0.3-r2.ebuild 2858
+RMD160 313c23d36eb650a78a352e06e1e454d254904645 netatalk-2.0.3-r2.ebuild 2858
+SHA256 7c2b16051b3a4f9e6addbc670f620c69d45810cbb8ea64318ab7714fc421f39a netatalk-2.0.3-r2.ebuild 2858
+MISC ChangeLog 6930 RMD160 a22fcfdd7bfae141bd122bf2a2edc376247e6abb SHA1 6f9fa5401fa4f2094608a5a5577c64ff59d16fd6 SHA256 1f76e0ab342710760f2daa30e7004e0697648214d6c4f734227bf13a5c54c9a0 size 6930
+MD5 6e06af5e5bc8fb3a4d75c96e2f998e5f ChangeLog 6930
+RMD160 a22fcfdd7bfae141bd122bf2a2edc376247e6abb ChangeLog 6930
+SHA256 1f76e0ab342710760f2daa30e7004e0697648214d6c4f734227bf13a5c54c9a0 ChangeLog 6930
+MISC metadata.xml 347 RMD160 787dde5bce12950e30dc339837ca65a3aee6f6c4 SHA1 157629b91710c5e815f4e066bfa51ce70132abe7 SHA256 e08c60c6b753f50a9db504de70dfb207959293c1710153d1cd7ebabe8c553680 size 347
 MD5 43c6b606d88eab1f3467634846a77491 metadata.xml 347
-MD5 0855cf34869e3ed2fc864574d91910d1 netatalk-2.0.3-r2.ebuild 2879
+RMD160 787dde5bce12950e30dc339837ca65a3aee6f6c4 metadata.xml 347
+SHA256 e08c60c6b753f50a9db504de70dfb207959293c1710153d1cd7ebabe8c553680 metadata.xml 347
+MD5 dbb3ade254598c2e3f75db3f1ea35485 files/digest-netatalk-2.0.3-r2 250
+RMD160 20723dddfd5c100fb5ae0be0c589bd1846b58f26 files/digest-netatalk-2.0.3-r2 250
+SHA256 8a3c31ecccd09a19efd41877feebae8df7f0eaf1ba945c3dd14a0b110ca6e03d files/digest-netatalk-2.0.3-r2 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFDtv02AiZjviIA2XgRApuHAKCfGVK8gS2rAyVVd7K0F95Ba6iXuACfU3az
-V/YbdGROjiKWSGf9/tkD+04=
-=jqo2
+iD8DBQFEbk2NAiZjviIA2XgRAmuVAJ9sclJRKdMUVInJf9Dy/TUIbAjppQCgtux4
+QXo+d6toRs5mHTL3dG5hEZk=
+=i73Y
 -----END PGP SIGNATURE-----
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
 }