Fix db detection with 4.3 and 4.4 versions.

Package-Manager: portage-2.1_rc1-r3

4 files changed, 50 insertions, 13 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index 954300983eca..98143bf7a1d4 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/netatalk
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.44 2006/05/20 14:45:31 flameeyes Exp $
+
+  20 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/netatalk-2.0.3-newerdb.patch, netatalk-2.0.3-r2.ebuild:
+  Fix db detection with 4.3 and 4.4 versions.
 
   19 May 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/netatalk-2.0.3-db43.patch, netatalk-2.0.3-r2.ebuild:
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index 1102ea4e1404..cba867d877bf 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -5,19 +5,23 @@ AUX netatalk-2.0.3-db43.patch 1224 RMD160 ee8d1e0f3a5abc07f28d26d266fdb55f791bee
 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-newerdb.patch 1183 RMD160 2ae908649d8fa44c436ab8725b57b7d481baf6f1 SHA1 e7e94bf36285c1839bb2e4bc6c2fca527ab8843d SHA256 ca4b6de8f536ac715e4afd15e06dc57155e443a3033383d61762545b93d4a83c size 1183
+MD5 639bb4691ca75d255c6f34b82e23b06a files/netatalk-2.0.3-newerdb.patch 1183
+RMD160 2ae908649d8fa44c436ab8725b57b7d481baf6f1 files/netatalk-2.0.3-newerdb.patch 1183
+SHA256 ca4b6de8f536ac715e4afd15e06dc57155e443a3033383d61762545b93d4a83c files/netatalk-2.0.3-newerdb.patch 1183
 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
+EBUILD netatalk-2.0.3-r2.ebuild 2900 RMD160 5d6c39909f80cccf1488e4415217724f2e2135d7 SHA1 d74871425e15ad9b85793ac171593e712efdd1d1 SHA256 37fc8fe204597f7bcd3ae8ff25d97b69db93b7009ece0f882852cf4d47c458de size 2900
+MD5 97aabf77f910a66dce3638639795ab8e netatalk-2.0.3-r2.ebuild 2900
+RMD160 5d6c39909f80cccf1488e4415217724f2e2135d7 netatalk-2.0.3-r2.ebuild 2900
+SHA256 37fc8fe204597f7bcd3ae8ff25d97b69db93b7009ece0f882852cf4d47c458de netatalk-2.0.3-r2.ebuild 2900
+MISC ChangeLog 7095 RMD160 f8b23ffd3eb1b21952af683a1c4ec3469e7c7136 SHA1 8996ca20388ab16fab6be11be4ce0f61477b87b8 SHA256 5877088568c27b698d3ca9434aee5019d9ccd78fbf2310f62d5ce54ba943fdbd size 7095
+MD5 ce6da524030ae7a417814afbde725b30 ChangeLog 7095
+RMD160 f8b23ffd3eb1b21952af683a1c4ec3469e7c7136 ChangeLog 7095
+SHA256 5877088568c27b698d3ca9434aee5019d9ccd78fbf2310f62d5ce54ba943fdbd ChangeLog 7095
 MISC metadata.xml 347 RMD160 787dde5bce12950e30dc339837ca65a3aee6f6c4 SHA1 157629b91710c5e815f4e066bfa51ce70132abe7 SHA256 e08c60c6b753f50a9db504de70dfb207959293c1710153d1cd7ebabe8c553680 size 347
 MD5 43c6b606d88eab1f3467634846a77491 metadata.xml 347
 RMD160 787dde5bce12950e30dc339837ca65a3aee6f6c4 metadata.xml 347
@@ -28,7 +32,7 @@ SHA256 8a3c31ecccd09a19efd41877feebae8df7f0eaf1ba945c3dd14a0b110ca6e03d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEbk2NAiZjviIA2XgRAmuVAJ9sclJRKdMUVInJf9Dy/TUIbAjppQCgtux4
-QXo+d6toRs5mHTL3dG5hEZk=
-=i73Y
+iD8DBQFEbyuTAiZjviIA2XgRAs00AKC/wbDOTFXe0kgCnmkjpsEzJunVrgCggsOM
+E6X88bbNqWfWrQURItWAu2U=
+=bMDi
 -----END PGP SIGNATURE-----
diff --git a/net-fs/netatalk/files/netatalk-2.0.3-newerdb.patch b/net-fs/netatalk/files/netatalk-2.0.3-newerdb.patch
new file mode 100644
index 000000000000..f64c8cf5eb45
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-2.0.3-newerdb.patch
@@ -0,0 +1,28 @@
+Index: netatalk-2.0.3/macros/db3-check.m4
+===================================================================
+--- netatalk-2.0.3.orig/macros/db3-check.m4
++++ netatalk-2.0.3/macros/db3-check.m4
+@@ -115,6 +115,14 @@ int main(void) {
+ AC_DEFUN([NETATALK_BERKELEY_LINK],
+ [
+ atalk_cv_lib_db=no
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_4,[-ldb-4.4])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db44,[-ldb44])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_44,[-ldb-44])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_4,[-ldb-4-4])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.3])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db43,[-ldb43])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_43,[-ldb-43])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_3,[-ldb-4-3])
+ NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2])
+ NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42])
+ NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-42])
+@@ -134,7 +142,7 @@ AC_DEFUN([AC_PATH_BDB], 
+ 	trybdbdir=""
+ 	dobdbsearch=yes
+ 	bdb_search_dirs="/usr/local/include /usr/include"
+-	search_subdirs="/db4.2 /db42 /db4.1 /db41 /db4 /"
++	search_subdirs="/db4.4 /db44 /db4.3 /db43 /db4.2 /db42 /db4.1 /db41 /db4 /"
+ 
+ dnl required BDB version
+ 	DB_MAJOR_REQ=4
diff --git a/net-fs/netatalk/netatalk-2.0.3-r2.ebuild b/net-fs/netatalk/netatalk-2.0.3-r2.ebuild
index d5bf152fb466..7fb9f1e2731f 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-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.9 2006/05/19 22:58:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.3-r2.ebuild,v 1.10 2006/05/20 14:45:31 flameeyes Exp $
 
 inherit eutils pam flag-o-matic autotools
 IUSE="ssl pam tcpd slp cups kerberos krb4 debug cracklib"
@@ -39,6 +39,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-setXid.patch"
 	epatch "${FILESDIR}/${P}-db43.patch"
+	epatch "${FILESDIR}/${P}-newerdb.patch"
 	AT_M4DIR="macros" eautoreconf
 }