From: Maxim Koltsov Date: Sun, 7 Aug 2011 21:10:07 +0000 (+0000) Subject: Fix misc errors in sys-libs/ldb, bug #377881 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5d9fe7f53a56cbb8c93d20bfdd6ab3a309cc8510;p=gentoo.git Fix misc errors in sys-libs/ldb, bug #377881 Package-Manager: portage-2.1.10.10/cvs/Linux x86_64 --- diff --git a/sys-libs/ldb/ChangeLog b/sys-libs/ldb/ChangeLog index 5e75467c1324..76aee2162698 100644 --- 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.1 2011/08/04 18:33:24 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ChangeLog,v 1.2 2011/08/07 21:10:07 maksbotan Exp $ + + 07 Aug 2011; ldb-1.1.0.ebuild: + Fix missing dependency and test problems, thanks slepnoga. Bug 377881 *ldb-1.1.0 (04 Aug 2011) diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest index 22130c93f7db..eb9d98d38258 100644 --- 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 1242 RMD160 41d8d1cac584bf4e3673ee84f5b661b7840a8cef SHA1 c906b28393742a1fa6f0f56064e42fe0f919915b SHA256 6bd2d8c812be55bd9502587c5def8dc1ef1ad3a3e7e66e99be2f636b37beaee5 -MISC ChangeLog 403 RMD160 04bca4dcf039935b80819d0f3bedad75c40bb4c5 SHA1 ec06e69efd1bca1e3b20cb99e5eea42e8c27a465 SHA256 ba2dbb028495203b980eccda81313bec135241313505e01238efe01685710a16 +EBUILD ldb-1.1.0.ebuild 1508 RMD160 37a7b295658b699645bed5db5e6ebbb7d511f355 SHA1 0c4daf24bc3b48d4ec2ecb79c0f55ed5ebedb4b0 SHA256 9fb08bb6b223e433dc7a009468b8f3ac503425d5b53e658473119ca259b64463 +MISC ChangeLog 527 RMD160 29910983d0f25c0875736880d12b3bfd6f7cd8e2 SHA1 5952e04ac888d7e7e1d70a60aa07245d8776e754 SHA256 737d056d927b8c1938074868ad8aa7f2f0cfb76c9dd24b867ee999ed8c8bddc3 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 fcf13cc3ed1d..919cb973902d 100644 --- 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.1 2011/08/04 18:33:24 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.0.ebuild,v 1.2 2011/08/07 21:10:07 maksbotan Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -17,8 +17,8 @@ KEYWORDS="~amd64 ~x86" IUSE="doc" RDEPEND="dev-libs/popt - >=sys-libs/talloc-2.0.0 - sys-libs/tdb + >=sys-libs/talloc-2.0.0[python] + sys-libs/tdb[python] sys-libs/tevent net-nds/openldap" @@ -31,6 +31,7 @@ WAF_BINARY="${S}/buildtools/bin/waf-svn" pkg_setup() { python_set_active_version 2 python_pkg_setup + python_need_rebuild } src_configure() { @@ -48,6 +49,12 @@ src_compile(){ use doc && doxygen Doxyfile } +src_test() { + WAF_MAKE=1 \ + PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${S}"/bin/shared/private/ \ + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/"${S}"/bin/shared/private/ waf test || die +} + src_install() { waf-utils_src_install rm "${D}/$(python_get_sitedir)/"_tevent.so @@ -57,3 +64,7 @@ src_install() { doman apidocs/man/man3/*.3 fi } + +pkg_postinst() { + python_need_rebuild +}