Add block on net-fs/samba to sys-libs/ldb

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

diff --git a/sys-libs/ldb/ChangeLog b/sys-libs/ldb/ChangeLog
index 76aee21626982cf49547a067265be4bab9ea9454..ccb23620511b77e433193b03f547f11a822aa6b7 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.2 2011/08/07 21:10:07 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ChangeLog,v 1.3 2011/08/09 18:23:20 maksbotan Exp $
+
+  09 Aug 2011; <maks@gentoo.org> ldb-1.1.0.ebuild:
+  Add blocker for samba[ldb] until bug 377809 is done.
 
   07 Aug 2011; <maks@gentoo.org> ldb-1.1.0.ebuild:
   Fix missing dependency and test problems, thanks slepnoga. Bug 377881

diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index eb9d98d38258a2c1443a28b5cbd1c2d9b0d569f5..968d434f35213a8612362aefebff4de4507f25e7 100644 (file)
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -1,4 +1,4 @@
 DIST ldb-1.1.0.tar.gz 839912 RMD160 b02ebad67755ff49964ec7895628eb1c375f72c7 SHA1 5f7e11733e2c39b59c3f1c718b859d00798342d6 SHA256 84f3841a69f8b3bba30b70f6d548b145a0b87cfef13c21f8c776f4aec490347e
-EBUILD ldb-1.1.0.ebuild 1508 RMD160 37a7b295658b699645bed5db5e6ebbb7d511f355 SHA1 0c4daf24bc3b48d4ec2ecb79c0f55ed5ebedb4b0 SHA256 9fb08bb6b223e433dc7a009468b8f3ac503425d5b53e658473119ca259b64463
-MISC ChangeLog 527 RMD160 29910983d0f25c0875736880d12b3bfd6f7cd8e2 SHA1 5952e04ac888d7e7e1d70a60aa07245d8776e754 SHA256 737d056d927b8c1938074868ad8aa7f2f0cfb76c9dd24b867ee999ed8c8bddc3
+EBUILD ldb-1.1.0.ebuild 1529 RMD160 722e97df81c9d01e97ebfc1683e8a4e6447769a2 SHA1 f95d72ccf3a3cae0c8258e274046dba9d7cb1c2a SHA256 2727b1b1e61bfe428ced71dca6fbb96423dbed849301538bb2ff369af0b2207d
+MISC ChangeLog 634 RMD160 f370fb5aae0120a9913e54203b0f81b8cfbc3f5c SHA1 7026312701a2f967a91d8f09371c2395dc2cf6a9 SHA256 555a9a3447f3f6c141cbea5675d3adf93669ef0fd3cc92a9bff121dbfdb15593
 MISC metadata.xml 394 RMD160 3e29a648ac544e1cabb1dab00c7df6703a112759 SHA1 5fabc86b263d39ab56aaab5cc67ce080e6a3495c SHA256 bf4846b7d49d8eb197c1a51281d2a39e7bc013b006f6ca797a09561403a606e1

diff --git a/sys-libs/ldb/ldb-1.1.0.ebuild b/sys-libs/ldb/ldb-1.1.0.ebuild
index 919cb973902db9f87b650b1f220c1280436f2b4e..651666bd901f5ae223deda2e8f1943ba63b997f2 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.2 2011/08/07 21:10:07 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.0.ebuild,v 1.3 2011/08/09 18:23:20 maksbotan Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -20,7 +20,8 @@ RDEPEND="dev-libs/popt
        >=sys-libs/talloc-2.0.0[python]
        sys-libs/tdb[python]
        sys-libs/tevent
-       net-nds/openldap"
+       net-nds/openldap
+       !!net-fs/samba[ldb]"
 
 DEPEND="dev-libs/libxslt
        doc? ( app-doc/doxygen )