Fixed compilation with abi_x86_32 (bug #556920)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 78 insertions, 17 deletions

diff --git a/sys-libs/tdb/ChangeLog b/sys-libs/tdb/ChangeLog
index 49dc047f71f1..46d673ff2353 100644
--- a/sys-libs/tdb/ChangeLog
+++ b/sys-libs/tdb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/tdb
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v 1.85 2015/08/07 07:39:36 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v 1.86 2015/08/08 09:18:14 polynomial-c Exp $
+
+  08 Aug 2015; Lars Wendler <polynomial-c@gentoo.org> tdb-1.3.7.ebuild,
+  +files/tdb-1.3.7-fix.patch:
+  Fixed compilation with abi_x86_32 (bug #556920).
 
 *tdb-1.3.7 (07 Aug 2015)
 
diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index 2e36d6668ed1..7926fc739fbb 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -2,28 +2,29 @@
 Hash: SHA512
 
 AUX add_missing_stdbool_h_include.patch 735 SHA256 d183183b15242ca3f2273983a5ba6f900e49626f21f1d6b4efad81769161497f SHA512 cbfd63c4af8cff139648b136ce1ca619a21e7606256196297bb487dab6a7c4055bd7ab6d7462fb1d336518dbb9399cb1c25563f384f84aec575ef89f71faa10e WHIRLPOOL d774b0ac858b76b1355dc64ba1167867f3fa337620fb20fb9dad6760f2ce56916443f7fcd6c1c3a1c94ef0a62f9d5fffcd1bd45d2ce3acdf0ce4f7b923844f1d
+AUX tdb-1.3.7-fix.patch 1919 SHA256 8255ef8cadebead48554cf011bee43e75d26513c450c973f4a9fc9d5e3695051 SHA512 c40be31c19b733a4174909daa743145319b4701f691d5dc77aee97001165140943980e126e55dcc15d4be438c014e76026103b65245dbac4d11666942c9f3013 WHIRLPOOL 6fe5aff37eed69db6c8b8acdca0da106b6b1e3200d24b0e7e636ab2eaea202872a2b6ed970ae3b0af4ba04b47fc1bc5824d41fc33a56454825df896c9c534499
 DIST tdb-1.3.0.tar.gz 479096 SHA256 04bee48d405ab7815810575a6e0cb364cc0eea6187b54b18c84e9c18a768ba20 SHA512 b9a66070002879119627bae82d8bafeb52ae336afdc4d97e14a7e4ff78e42c7c516f8349781964c2bfbbcc6949247c5fa9519f936c884151ffff9e121f9f9334 WHIRLPOOL 88da0b12ecdc8746bf627f2e1ce896b1a2b435c1dc34cd5649cd1554aa2cf90fe16014dd31fc45605d6a3dcdf02c3a09b1a43e68527497379734a96a3dd99711
 DIST tdb-1.3.6.tar.gz 490881 SHA256 85d7dd247e58d8b303de542a2bc39a3dff9e5f54dea39a94c1c910cee25a59a5 SHA512 be372865e3b809897d46b3ac134de3569185366a0b608e09836e6e37657ae7d0afdcb6b1d4990fee54d16a004e7e792987f51a974fc44fa4632c695e8b1e9341 WHIRLPOOL f278ab51e2716b0948cb8c802d3380d8ca08a31d414d71168d7e786f0113f8a78fbda39977b8b0f8d0007a50df98f4e19d4c2a4f24b192cf20e67c1c4efa491a
 DIST tdb-1.3.7.tar.gz 493847 SHA256 a64d95ca0cc06a28fed24c6e952aed7660cae04983108735d6bc30b925136412 SHA512 661404df8328a2e7bbb0d7865759e299edafee186f3798c11034c36b2076402a826306007986d6cdd5bf8774d2af7ebf4312a501ca9d9e62a26e504bc13652e4 WHIRLPOOL 92586febe155e87ffadd7cdfd3e83b75d51d41cb3e3e70b886a371f01b1e7c628a02217afff9eb33dadab23849afec18e5c4f78f30def549e629adafa1437479
 EBUILD tdb-1.3.0-r1.ebuild 1498 SHA256 eb2ae221eff80ad5cf8b4ad729a5385b38e3d9e9d91517f25ade2205126d7ecc SHA512 f6e194041b3498fb598e7a7dc0e055bead8fe1ad173c7a67ae2e1651a9868dcf957c09c0a2bb49e9f350d55c83f8249dd8bffcc997887f9fb3c9dca658dd8fa2 WHIRLPOOL 2005a1944b07fa592ddf1de538297e7fbb8cc9546a2a147af91b46944359e175af4230cb797b09b678b062da563cf356b013a8176589c39bc4b6141d012fa6ff
 EBUILD tdb-1.3.6.ebuild 1458 SHA256 34b56b9d489c58a1aeefe64b003941f94ab00d7372c10e4ca3d9379828590fbc SHA512 f1b6de3823a4d91a9df8a6939471e143a121b13437212c586add10c7921c33947c4ae2fc702c5b720c91e28e703fde4055eaf6df0c9a2bc68c4d735b104f49c5 WHIRLPOOL bcf3427a1694ba91d86861e3086df6500019361237c23bb49df6a574c0751511f7fb8f1324c16705e847245e0f96dcacd08efc6c9f053e5fda91ec61236167c7
-EBUILD tdb-1.3.7.ebuild 1458 SHA256 8aed8430cfbd45dbe04e5acb3b270c1e39e98acf5f1e4e6001991d193857ab20 SHA512 035d39b8fe05d87b96847bfaa8bc872341a61d40528de4c53d1f16d7b21c4d1b3dfb2aab84e0d0cc83de13a825f13f86ba33271fcb147b6dba6b4688bd2042a9 WHIRLPOOL 28f0bdc230a07090585e8029ca9c4b2f2e5b41989c5b3537a45eb5fc0e9ac9e5fdcd7a8e2f0fe1993d79f8ff6b725f77692d833c38c39e3679b7ccfe1355c92f
-MISC ChangeLog 10635 SHA256 03cbc5b8011ed475829de22a884fa4e5b55d5745057cd7d7b1f335a5374dc214 SHA512 316eed970e6a9ef84379e8674956c728a017b32ecbc9708f894934138a83c6a5fcc19ebca9bd292d19ebb2c197e103227257e85b4ad61255f525ceeeacf73957 WHIRLPOOL 14f7e84b2677d09f15055bf200fa3a6663863e7f2542563e748ef754bd9e124a252df00baf2e611b4381f154409deca3aefcaacdf5df0bf3de182902aef3be1a
+EBUILD tdb-1.3.7.ebuild 1502 SHA256 499cc930e9a3ca6bf82ea154e7dceefcdf3d1ef97d97bb7aabb1297fbaaa1276 SHA512 038593fe9590e985b3e4c86359a769297848777dd7fde117bd117b8f7fe07f762e76a516cba1f932081ebc08c0f940634b63733eb0813e81ec04a89c319d9ef3 WHIRLPOOL 27b1517e7c79b1016add5a356827cc22b658f774bbb88904f66342c7fcc89caae3d97987dc71f13f5da1aaee66432f79d45332d77b42287682e2b5569200dac2
+MISC ChangeLog 10789 SHA256 1bb910d8c68511c73b356cc9e77591fa92bcade8e8547b3828ff8251e9902cc1 SHA512 65da20134221c0588c7b772dbac6170c101ec2d9386569052af14da87a57e226b66f2353510b0fda6fb870ae3aa12ccf006730bd2b0346b4bbef2fe1db561b80 WHIRLPOOL 7b3a8814bbe259d8cd4b0978f9c8f5b066f98918c98838dfa4739703a5af6edda6217854e0ef3943941e6e00544913b11285f2503fbf5b6eb84d4375f1e06b5c
 MISC metadata.xml 260 SHA256 9c67a75d6c6db8d88233eb27271c93874a4b763907a61f189970574fc957e0e6 SHA512 611e0004aba6d842ba71a9b9f74b8301d1a7d8d366208122001f5d164ae34b88c1ba2d41c0b25c760cea155387e5e7a4b3d141d6b21cc997f894a21c519a07c9 WHIRLPOOL 1bf0ee15987eee963adc9506dff9e8e978bcb8b7bdc9381f468fdc92ed39e356c69dc67af161da4eac8b46098a28ab8b6249f0efeb5709f7cd4f3f8a4749b675
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJVxGC5AAoJEPiazRVxLXTFDJIQALAS0gSvpcsxWf47AaK4h0bm
-hy5cET/z9WsZCRpbme6CqwaCc8p/amq6Es4vZNYvpgnh+oya55YgGMw88qbm+427
-L4JOQf74JeRO54rhTJsusKJ+i1ebyTmqIMSr5FQlldh0cNpjljOVzOEeR0bRLvr7
-FrNtgn06PDsZL78qqWmSWw5xSrPbXPd3r3KZL/VV9Xx6ENYlVS3YpfPheMYTiM1I
-4EzPYOQzWo51Iqv+fQ0+heTs9TYGjTPUlLUvrW+e3aKDzkdhQDv9ABLPjQWM1yXv
-2hT4WKhY8PvWIq7cF5ufoeR2lNz+zsLBuUdju9nWWcE6QMb/oqsbOqFxcTSlvRQg
-M/htlTYIJbWAOxHwmkv/jKQXdWJ2X/frGSLOHAvOOO35GA+dFZKR5Wv5lqTcUz9H
-pdRnyP8FUp0r1IhL7KMysIGBgNRh0+SHpGLoSdT2LIelDL55MQpmrK9vi+FsUCYe
-rPa5ByEtbf05bp+RPqVJVVd4r1WFZf0wgI5dTymSpDvsRDmvpprE4vQzk6+CuJ9Z
-mJbESjLbHCGN/lCmxGz84muxJwoojlRrjxog3QV7KanHRR6M9g+L/ipryweHBKkC
-9MlMTKLeoQa6WEnoODcnMyDN9VDVAV/h0ty22h8F5L3lqqsi8N+mVZbmqSAi3JLS
-zI//hI7k3joHbu5OqX6j
-=8WiI
+iQIcBAEBCgAGBQJVxclXAAoJEPiazRVxLXTF9/IP/3ZHvYDbHrqzqZEXF7jS8e3x
+S9eznM3qK9AF9Mj+McI08aKY+buhELfuvzIbZus0EALFrKURSyJnG7BuBZMn+KOR
+2YSBpFDF+ZpUySwmDgdDxfB2wHyhbXDl6za8tiVpSqPdfpfPTCF6Sf0LL/2PXBcv
+ZHZ4fWDbQyS792QMVv8ZIt3Iq75vKsoUrAHvBLro7IHhZVcQDbmFhaIjWEVscTG4
+eNgh9tXHX1xzB+q52PnT4UE7iU044WEP5bV1PTmKeU7aqS8nZQ13XWXXNUymGOJj
+lM7rJ73X6L6dTbfjm/upRMKJy0dWCWGhcL2/j0DB0JYwfWmGNbt0eJe1WFi0lWS6
+ttnI8D8jmeR9n8qzWqaE6rDqhFSOguMLYfjLwUyT2WJ84BUROJB+uq9oHfuf1JZr
+vcxNmD5NR5YTzeEUYI1JdjdtEnLHTu28tSGhpuptYnOlvplK6yW9minReaiGFmwz
+ocMSK/NIRcWttUsdAS2pVFhWgmXBQ6qaGcNLs/uKTmhiuCPBJpQLk/dmDkWe/JKA
+tXp5MCI1+KNd57opoCUB0vG1Q4vc5bT/DskGUqpTYfEdEVyi5xu8lRt+GNuyL4uw
+h/EQRLL7aP1PC5sktuyYi58YuRwYbKS1KXOdVb/3LHaweIwpKHQ945mRtiDg2/cC
+iLj48In11kg5gbhYvCjF
+=UmH8
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/tdb/files/tdb-1.3.7-fix.patch b/sys-libs/tdb/files/tdb-1.3.7-fix.patch
new file mode 100644
index 000000000000..bfbd8ab70a98
--- /dev/null
+++ b/sys-libs/tdb/files/tdb-1.3.7-fix.patch
@@ -0,0 +1,55 @@
+From patchwork Thu Jul 23 05:10:38 2015
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: tdb: Fix broken build with --disable-python
+Date: Thu, 23 Jul 2015 04:10:38 -0000
+From: Martin Schwenke <martin@meltin.net>
+X-Patchwork-Id: 11098
+Message-Id: <20150723151038.617e1c49@martins.ozlabs.org>
+To: Samba Technical <samba-technical@lists.samba.org>
+
+Please NACK if you don't want this pushed...  :-)
+
+peace & happiness,
+martin
+
+
+>From c7609c35b6bdb488b74d63ebfd27838b9b8e7e2f Mon Sep 17 00:00:00 2001
+From: Martin Schwenke <martin@meltin.net>
+Date: Thu, 23 Jul 2015 09:47:24 +1000
+Subject: [PATCH] tdb: Fix broken build with --disable-python
+
+With --disable-python, we should not install any python files.
+
+Signed-off-by: Martin Schwenke <martin@meltin.net>
+Reviewed-by: Amitay Isaacs <amitay@gmail.com>
+---
+ lib/tdb/wscript | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/lib/tdb/wscript b/lib/tdb/wscript
+index 5845fa0..1822e74 100644
+--- a/lib/tdb/wscript
++++ b/lib/tdb/wscript
+@@ -187,12 +187,13 @@ def build(bld):
+                              realname='tdb.so',
+                              cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION)
+ 
+-        for env in bld.gen_python_environments(['PKGCONFIGDIR']):
+-            bld.SAMBA_SCRIPT('_tdb_text.py',
+-                             pattern='_tdb_text.py',
+-                             installdir='python')
++        if not bld.env.disable_python:
++            for env in bld.gen_python_environments(['PKGCONFIGDIR']):
++                bld.SAMBA_SCRIPT('_tdb_text.py',
++                                 pattern='_tdb_text.py',
++                                 installdir='python')
+ 
+-            bld.INSTALL_FILES('${PYTHONARCHDIR}', '_tdb_text.py')
++                bld.INSTALL_FILES('${PYTHONARCHDIR}', '_tdb_text.py')
+ 
+ def testonly(ctx):
+     '''run tdb testsuite'''
+-- 
+2.1.4
diff --git a/sys-libs/tdb/tdb-1.3.7.ebuild b/sys-libs/tdb/tdb-1.3.7.ebuild
index 35f6275ccfd3..155cda48fa81 100644
--- a/sys-libs/tdb/tdb-1.3.7.ebuild
+++ b/sys-libs/tdb/tdb-1.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.3.7.ebuild,v 1.1 2015/08/07 07:39:36 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.3.7.ebuild,v 1.2 2015/08/08 09:18:14 polynomial-c Exp $
 
 EAPI=5
 
@@ -29,6 +29,7 @@ DEPEND="
 WAF_BINARY="${S}/buildtools/bin/waf"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3.7-fix.patch
 	python_fix_shebang .
 	multilib_copy_sources
 }