Revert. It does not work as intended.

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

diff --git a/sys-libs/ldb/ChangeLog b/sys-libs/ldb/ChangeLog
index 417d19b60b68456c37df21c3d98fcbe2f404811e..6f8ec7a752614a8c461c088f7c96915578b47395 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.4 2011/08/10 17:46:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ChangeLog,v 1.5 2011/08/10 17:54:09 jer Exp $
+
+  10 Aug 2011; Jeroen Roovers <jer@gentoo.org> ldb-1.1.0.ebuild:
+  Revert. It does not work as intended.
 
   10 Aug 2011; Jeroen Roovers <jer@gentoo.org> ldb-1.1.0.ebuild:
   Run waf-utils_src_compile, not econf.

diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index b05b4b78b84f8969ad4429be2f8bb491f6147f9f..1d0da43de01595e7df4f1a8fe082866b00c99aa1 100644 (file)
--- 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 1306 RMD160 bcd5d042157c4491e613569ea4761ee07e522568 SHA1 1c2eb74c32393309f28d2130c8415023c6346936 SHA256 30dcc495a1fb9b7becc7ef012090619e6a8cf92ca14f54a9e298da2c35d30f05
-MISC ChangeLog 734 RMD160 bcd20e19cab3901145a7f25b97aeca135c6b01a1 SHA1 20a5aa5cced354577ba942c654705b76453cf563 SHA256 81057fdf6939f7e4ef0727ca1372291a401db2c7e61a80c80c959ee69634342f
+EBUILD ldb-1.1.0.ebuild 1523 RMD160 ca20adc06f9d0fecbe2317517edbce65f06c552c SHA1 d0d23de69114f202db5e5d3cb339378ab32f4087 SHA256 65cb5786287d609ff52d00577f4b1143bce8b5ef220a831b44f2df744e453152
+MISC ChangeLog 840 RMD160 54e36d2fbebfc177909efcb87fad53731d4139ee SHA1 f3f3962f00e0fe87d739e02c2c940c9be87c4c79 SHA256 6ddea11ddcaa73fde41753e40c1a7f14e43bcbd1d2c6620cc9190772e67b53c8
 MISC metadata.xml 394 RMD160 3e29a648ac544e1cabb1dab00c7df6703a112759 SHA1 5fabc86b263d39ab56aaab5cc67ce080e6a3495c SHA256 bf4846b7d49d8eb197c1a51281d2a39e7bc013b006f6ca797a09561403a606e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5Cw/oACgkQVWmRsqeSphOjjgCfV+JNNxzZcrhZtXArK8P5mebB
-aZEAn3tHl8eN1SQcbjrETwTOd0cM3uMs
-=drtG
+iEYEARECAAYFAk5CxccACgkQVWmRsqeSphO8NwCeKjlqwo5Uystka+kQSElHh0RN
+JpAAnjuaKI8ARBY2+hGHHTB1Lt4agIBl
+=nSdA
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/ldb/ldb-1.1.0.ebuild b/sys-libs/ldb/ldb-1.1.0.ebuild
index 4f450ec8c92bb6edeac7c3e1d65dfd1828133d0f..7b8d001b4ee228e1fabd205480c1bd97141dee94 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.4 2011/08/10 17:46:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.0.ebuild,v 1.5 2011/08/10 17:54:09 jer Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -36,7 +36,13 @@ pkg_setup() {
 }
 
 src_configure() {
-       waf-utils_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
 }
 
 src_compile(){