Enable multilib support, required by samba-4.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 75 insertions, 17 deletions

diff --git a/sys-libs/ntdb/ChangeLog b/sys-libs/ntdb/ChangeLog
index dbe6f5a97f32..bfeeb5a2f3e1 100644
--- a/sys-libs/ntdb/ChangeLog
+++ b/sys-libs/ntdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/ntdb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ntdb/ChangeLog,v 1.4 2014/04/18 21:04:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ntdb/ChangeLog,v 1.5 2014/06/12 20:49:40 mgorny Exp $
+
+*ntdb-1.0-r1 (12 Jun 2014)
+
+  12 Jun 2014; Michał Górny <mgorny@gentoo.org> +ntdb-1.0-r1.ebuild:
+  Enable multilib support, required by samba-4.
 
   18 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> ntdb-1.0.ebuild:
   Hard block older samba versions again.
@@ -16,4 +21,3 @@
   17 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> +ntdb-1.0.ebuild,
   +metadata.xml:
   Initital commit.
-
diff --git a/sys-libs/ntdb/Manifest b/sys-libs/ntdb/Manifest
index ad01380fccc9..21064d243ab9 100644
--- a/sys-libs/ntdb/Manifest
+++ b/sys-libs/ntdb/Manifest
@@ -2,23 +2,26 @@
 Hash: SHA256
 
 DIST ntdb-1.0.tar.gz 794585 SHA256 817ae862b1e6976cab867468f209d8417a90c7c2fcf0ec079a45645d7e7ebf49 SHA512 27f550f85a7bfd105d4115b55f9919f1871964f576a8470688fe8040fb9e2be209246a291d78f55c61cf0920238d7f41917ad7e2d44b202382b3ea47c8c97100 WHIRLPOOL 71a007312eacf7805dadc0b0089f7344b270a628e9dc3c1d8aeb505efdeead3b66cb8006377550c672a15cbf814264cb16c93892f7319bc031b8fe669bf29747
+EBUILD ntdb-1.0-r1.ebuild 1157 SHA256 7b969e97b933f2efbf94a5b53b225de3757b8aee90b0cc54c4f9d86b078f156b SHA512 401d3e1ff5ba3a7411a81382d7fc9853d9b843281ca38a5f9af76f35757385d76ae02f032c1ca10b5063aaf61f5684fa97b21fae791061fa8bf7be4bc435d51d WHIRLPOOL 2a417893f5ee3c174ee3fd61e39ef9935fc282312ed73d589d66ca8dc56048b4f8ee177536e74927fd9a75ecfe8f8d104df83e1df91f860beb12498a1e80514c
 EBUILD ntdb-1.0.ebuild 982 SHA256 a4449834c2e25015d7cae9c514e9f7801786ea5f887d493870966c6c88fc2ed2 SHA512 7550323c01334ca8c794a40fa149000b8826e0cdbac5f6763e1ebe0d5c0507d39773e10e2f2e022bbfd924569a8f29138c8f02cc43b17506a09106e231314546 WHIRLPOOL 9334dc71ed90d87d9432ecb861ba290a442443b1d2893e43a31cc9d7195a6b3f783231fc9dd7b26f39eaecd7b5690ef51683b9f5ea5531d14a6a574d27ebc9ba
-MISC ChangeLog 649 SHA256 eae49627052a739e914add5b4dd50727498f1252e2f1525c44601fce91a18013 SHA512 045830e0966efea5c9492f4883695dbb366ad00e7dd2f07a9edc863ac87ab2b2e0c2afa1aa3c1cc9477a52c1055b2864bf716a51d3703c571c6b94fca39b00c1 WHIRLPOOL 9941f4b8a7f6efae0c0927e9ad7f0599f52c257cac072479178c15c6e1c4dd0e14d1d1b1aada862c528bd6813392b2177033dfc4e1b618b600df05a43f3f57f9
+MISC ChangeLog 790 SHA256 12a1cb1024e0305b9c9727f0a8ca6a5b0e149d3474fbf200cb6276ac2962939b SHA512 f6021983bb14a604efef78a429fa4d84c845a6d13d5e470138ccae1ea4dc3aec51734d526e8aa21f2bc284b5069278a652742781b66b691acaa9c32ed7142463 WHIRLPOOL 74c53b49d8e71dc8b61f32db18c41650b91bb808f4217fc47a549c46b22b6a93de7c9af4a5a38cc196c3d3c76e3a39610997ed2cb1f7076d1a90533cfd293a28
 MISC metadata.xml 264 SHA256 297353bce8cc7b093406ad382b1e6e2c25d5194bb434207b1c7ea1b2edd464f0 SHA512 f5bc8064adcec52c015c91355fc246e7de3a3e8939f41eb35374dc41f8e2b6e91e1b27723ff7f002d57fea3efee8765c299c591fa4a2d70f0785aadb4de26578 WHIRLPOOL 6756d15890cf4aef5bea76af5aff9744ba6f00ece611d22b38218efa9293bc4aff248c595865fab6344bcfb5d5d63d90bc03726c47ea21de0289452389cd12c4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTUZNQAAoJEPiazRVxLXTFblIP/AmCnE6REsyweIOZPtKOOX1a
-sEbV5I52br3hDHP0AdunKd8M9HlXvT4072PYdEzo0a3nH/JnphaOhAmilUrxeXEy
-eyh1EUfGalMzwxCkjpYyzs8+hluVs6ze2+maxFQvfyAiljY+9d4o2LgxDQqc7HjI
-Nm4XS36/19agHOkdRv5HXDqLYv0RlcLp6Dlu+kXIjCLU7JV0aGfZgIdUbGk4c57F
-hfS2aTq0YJogZrZ2d92PQYcbhltoFcsKDhgt7weVDH3gNNESdyYXabBtmRuuwRKI
-Pi+5OO2YGjpPRvq9EiNq0dTnLxpt3FOurHtwb0+Yu61Evf2tKhtLBdDqvC+6seUr
-aXXxlG6wvSddv/+O2nGrQbefaFFIqR7MtU20790sM4y/dJqEtRtzZofwEWral09o
-5HpUxnJp2dvjcOa/n1GPd3KRmgTX+ZdYXzN1zgW78/4tC/k+b80pmPFMSH7JWnmf
-p0pFTlrN/AcbnVOy586vmUsI/8TAkomhcrrORHL2yleOA+xRsLVgLgmiBCyds7/M
-dHxrzGgz4sDqfjSLzOrVB3Lho9J87eWmXyBeIX+LGeCWtzUIm7krsOd1dLqi/wEg
-9L/stgQmnoVZ6lUi1DZJoryDJn3iozlILb5g6EAbJYYkwh2ljd4/SDIIu9kly0yw
-Rz9Oj+Afodm+fp+egdWc
-=Xefn
+iQJ8BAEBCABmBQJTmhJlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOxQ4P+gPx0es5KqaMBvqTk+nnQhcU
+Z8RxGEv0h9f5lKnlAdnCFNcKRCwCM09k/XzDrboPa0ijg+0QZE93o9IbvHeqIkWD
+lXHa6tLEKbKFN3TPFkDlPG/+0rUp32liXSOiUSRiz48C7/jAEv0TAC0WcTRb4kSR
+u/MEyvZMMMmfs+ozSC+MKYvi6RT7YC2b09Gc4Cne8yzX8Q4UCFXmaP6A9ZTzPV0A
+LthruGUhF9LfnXCsTEjOeEgsjsL+5ZolrM1ttCHjaRX8UltbGU2a5ABKovX7zir6
+hnQmCPHhYC+VJrQcAqgokg1997QhlM8ZFWaPw7lrQbYG5hS4ndrtBmRNvfEF3n6E
+3hWshyv9IaggjyI9KMophfK7zZ0125XVgOhtWTcPOb9NYmu1vU9S4fr8ug9XUoM0
+UgwWu1kDqacclvtfqAvqmd8Wemcd/f2KYPNYl9ZrRDTNFH9oIRHFHp2MWJJVOYAs
+S3V8fEoiRjMMrNVRCGWiexfER9D9xN7H0GTi5TTforWnu62BDr+Up5rHuXudfxr+
+iGaehWligx0QxGB9AL+A9u45RKBA7nLs03sTbq9f4yTFPhVUwnAINhOwE596UC+k
+VSjUMNuEXwGIhQD0GWKyZsyihVxcfc09IkWflenqQe5+xB/+FnhABbX4A+agrhlK
+LYLFxQEYxVm0gkQ0RI2X
+=8LZU
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ntdb/ntdb-1.0-r1.ebuild b/sys-libs/ntdb/ntdb-1.0-r1.ebuild
new file mode 100644
index 000000000000..768b365d16f7
--- /dev/null
+++ b/sys-libs/ntdb/ntdb-1.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ntdb/ntdb-1.0-r1.ebuild,v 1.1 2014/06/12 20:49:40 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit waf-utils multilib-minimal python-single-r1
+
+DESCRIPTION="A not-so trivial keyword/data database system"
+HOMEPAGE="http://tdb.samba.org/"
+SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="!!<net-fs/samba-4.1.7
+	${RDEPEND}
+	app-text/docbook-xml-dtd:4.2"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+src_prepare() {
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local extra_opts=()
+	if ! multilib_is_native_abi || ! use python; then
+		extra_opts+=( --disable-python )
+	fi
+
+	waf-utils_src_configure \
+		"${extra_opts[@]}"
+}
+
+multilib_src_test() {
+	# the default src_test runs 'make test' and 'make check', letting
+	# the tests fail occasionally (reason: unknown)
+	emake check
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}