From: Victor Ostorga Date: Wed, 10 Aug 2011 18:16:56 +0000 (+0000) Subject: Using waf-utils_src_configure, fixing DEPEND on >=sys-libs/tdb-1.2.9 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c12dec16476f64660857569577eaaa28cf66dfe5;p=gentoo.git Using waf-utils_src_configure, fixing DEPEND on >=sys-libs/tdb-1.2.9 Package-Manager: portage-2.1.10.3/cvs/Linux i686 --- diff --git a/sys-libs/ldb/ChangeLog b/sys-libs/ldb/ChangeLog index 6f8ec7a75261..da24161d88cd 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.5 2011/08/10 17:54:09 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ChangeLog,v 1.6 2011/08/10 18:16:56 vostorga Exp $ + + 10 Aug 2011; Víctor Ostorga ldb-1.1.0.ebuild: + Using waf-utils_src_configure, fixing DEPEND on >=sys-libs/tdb-1.2.9 10 Aug 2011; Jeroen Roovers ldb-1.1.0.ebuild: Revert. It does not work as intended. diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest index 1d0da43de015..d4e98c1e2d79 100644 --- a/sys-libs/ldb/Manifest +++ b/sys-libs/ldb/Manifest @@ -2,13 +2,13 @@ Hash: SHA1 DIST ldb-1.1.0.tar.gz 839912 RMD160 b02ebad67755ff49964ec7895628eb1c375f72c7 SHA1 5f7e11733e2c39b59c3f1c718b859d00798342d6 SHA256 84f3841a69f8b3bba30b70f6d548b145a0b87cfef13c21f8c776f4aec490347e -EBUILD ldb-1.1.0.ebuild 1523 RMD160 ca20adc06f9d0fecbe2317517edbce65f06c552c SHA1 d0d23de69114f202db5e5d3cb339378ab32f4087 SHA256 65cb5786287d609ff52d00577f4b1143bce8b5ef220a831b44f2df744e453152 -MISC ChangeLog 840 RMD160 54e36d2fbebfc177909efcb87fad53731d4139ee SHA1 f3f3962f00e0fe87d739e02c2c940c9be87c4c79 SHA256 6ddea11ddcaa73fde41753e40c1a7f14e43bcbd1d2c6620cc9190772e67b53c8 +EBUILD ldb-1.1.0.ebuild 1492 RMD160 46ed8df94e988543852b07a8c51adccfb9efbd2f SHA1 3828c344c046c676575f647f654bc8f25e7221d1 SHA256 b95f48730f23f1a73437e2d113c273136e663c14b87af8b250420145287d56b0 +MISC ChangeLog 988 RMD160 e60b8d1affc2e3f011936a9e1ce12ab106db8050 SHA1 dee5715d924c4fb48c15960c257cd6ebd3b56cd5 SHA256 6172ee33282c99aa4ec71bd44b25e40cb4cc91f24da8fd4d9cbd0912356fd920 MISC metadata.xml 394 RMD160 3e29a648ac544e1cabb1dab00c7df6703a112759 SHA1 5fabc86b263d39ab56aaab5cc67ce080e6a3495c SHA256 bf4846b7d49d8eb197c1a51281d2a39e7bc013b006f6ca797a09561403a606e1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk5CxccACgkQVWmRsqeSphO8NwCeKjlqwo5Uystka+kQSElHh0RN -JpAAnjuaKI8ARBY2+hGHHTB1Lt4agIBl -=nSdA +iEYEARECAAYFAk5Cyx4ACgkQKQaZ7OJe4zYuGwCfeuDi7aseLgN6T1CFZ4JXoeQ2 +6FYAn1F5Rx7lXPDW4Q/dolrNSMyQZ81p +=Y6HT -----END PGP SIGNATURE----- diff --git a/sys-libs/ldb/ldb-1.1.0.ebuild b/sys-libs/ldb/ldb-1.1.0.ebuild index 7b8d001b4ee2..637a8a04af4c 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.5 2011/08/10 17:54:09 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.0.ebuild,v 1.6 2011/08/10 18:16:56 vostorga Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -20,6 +20,7 @@ RDEPEND="dev-libs/popt >=sys-libs/talloc-2.0.0[python] sys-libs/tdb[python] sys-libs/tevent + >=sys-libs/tdb-1.2.9 net-nds/openldap !!net-fs/samba[ldb]" @@ -36,13 +37,10 @@ pkg_setup() { } src_configure() { - econf \ - --disable-rpath \ - --disable-rpath-install \ - --bundled-libraries=NONE \ - --with-modulesdir="${EPRFIX}"/usr/$(get_libdir)/ldb/modules \ - --with-privatelibdir="${EPRFIX}"/usr/$(get_libdir)/ldb \ - --builtin-libraries=NONE ||die + waf-utils_src_configure --disable-rpath \ + --disable-rpath-install --bundled-libraries=NONE \ + --with-modulesdir="${EPRFIX}"/usr/$(get_libdir)/ldb/modules \ + --builtin-libraries=NONE } src_compile(){