Fix samba blocker, bug 377809 comment 2

Package-Manager: portage-2.1.10.12/cvs/Linux x86_64

diff --git a/sys-libs/ldb/ChangeLog b/sys-libs/ldb/ChangeLog
index 26a8640180cc230374231ba37b2b48c010873b49..3902d4e2ee693b745df1a39e879190a699c13c62 100644 (file)
--- a/sys-libs/ldb/ChangeLog
+++ b/sys-libs/ldb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/ldb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ChangeLog,v 1.10 2011/08/14 11:00:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ChangeLog,v 1.11 2011/09/04 18:40:17 maksbotan Exp $
+
+  04 Sep 2011; Maxim Koltsov <maksbotan@gentoo.org> ldb-1.1.0.ebuild:
+  Fix samba blocker, bug 377809 comment 2
 
   14 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> ldb-1.1.0.ebuild:
   Fix typo, fix LD_PATH for test wrt #379139, marked ~ppc/~ppc64 wrt #377809

diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 7b8dc683d298d4e8df867d1744a82b6b3f0cb6a1..926fbaa5c283a4d41b19e2a7926cbcba0657031e 100644 (file)
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST ldb-1.1.0.tar.gz 839912 RMD160 b02ebad67755ff49964ec7895628eb1c375f72c7 SHA1 5f7e11733e2c39b59c3f1c718b859d00798342d6 SHA256 84f3841a69f8b3bba30b70f6d548b145a0b87cfef13c21f8c776f4aec490347e
-EBUILD ldb-1.1.0.ebuild 1519 RMD160 ba6ae9c1388b0b3defea38ff749bda4da6276bc5 SHA1 cf4a1d9b2f1bf030d2190a00fb06d862f367fdb3 SHA256 5c3d448371e127c0a6946d388da1b8063b32d242cf1b5088d06558f8723a6bef
-MISC ChangeLog 1167 RMD160 ab4175a1d800b19b9561c5b007478f7a75a6fc9f SHA1 e3d5dfa7304b1b9af079728b632fd656274eb2a2 SHA256 e9d2890009a6bbf18d316114a93e0d9e5a3845afe88ffe7597d76f524f96bc0a
+EBUILD ldb-1.1.0.ebuild 1557 RMD160 55bab60b0be084acbf6940034396049fd8f4456b SHA1 ab3bcfec3ce79d7484877937cba820406d014d67 SHA256 2cd45a2ac3907322362ca19ac4e936c8dc72addf79e601388c684ac476597347
+MISC ChangeLog 1279 RMD160 346fbce8e46be80ac73c46d684f3c605876f9ede SHA1 e6cd08ac3dd48d6dca489ee3529d65cb9aefbc50 SHA256 609fedf840537f137f5403cdffbc9ea5217b92a60866f5d55b1e0c916fba0b83
 MISC metadata.xml 394 RMD160 3e29a648ac544e1cabb1dab00c7df6703a112759 SHA1 5fabc86b263d39ab56aaab5cc67ce080e6a3495c SHA256 bf4846b7d49d8eb197c1a51281d2a39e7bc013b006f6ca797a09561403a606e1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk5Hqr0ACgkQIiMqcbOVdxR1XQQAgBmMpCQlwrQEVrKYiw9BTZGO
-vwT7jITwB/k1p9KuYpF0tkRglQpXruJaTBQ0jQ1Zj/jKsiY3EwKLzffWt61u1O69
-sHd8Cg90MOBSY80hlCn6qJ3PjECkYxuxC4reUKMgy6PW1RjKK1eldvNzsw+/0xma
-f2MJuvvpEgSFaptypKE=
-=yQ4P
------END PGP SIGNATURE-----

diff --git a/sys-libs/ldb/ldb-1.1.0.ebuild b/sys-libs/ldb/ldb-1.1.0.ebuild
index d67e83a878f006c9ddeb8413fb1ba60e9278f30a..6e327c4ad533a2fd743df52934934c5bbc4125d0 100644 (file)
--- a/sys-libs/ldb/ldb-1.1.0.ebuild
+++ b/sys-libs/ldb/ldb-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.0.ebuild,v 1.9 2011/08/14 11:00:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.0.ebuild,v 1.10 2011/09/04 18:40:17 maksbotan Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -21,7 +21,9 @@ RDEPEND="dev-libs/popt
        >=sys-libs/tevent-0.9.11
        >=sys-libs/tdb-1.2.9[python]
        net-nds/openldap
-       !!net-fs/samba[ldb]"
+       !!<net-fs/samba-3.6.0[ldb]
+       !!>=net-fs/samba-4.0.0[ldb]
+       "
 
 DEPEND="dev-libs/libxslt
        doc? ( app-doc/doxygen )