bug 518136, disable build x86_emulator under nomultilib profile

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

3 files changed, 34 insertions, 24 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index c6fbca8a1c95..4977c68a9afc 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.252 2014/07/12 14:13:38 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.253 2014/07/29 09:40:45 dlan Exp $
+
+*xen-tools-4.4.0-r8 (29 Jul 2014)
+
+  29 Jul 2014; Yixun Lan <dlan@gentoo.org> -xen-tools-4.4.0-r7.ebuild,
+  +xen-tools-4.4.0-r8.ebuild:
+  bug 518136, disable build x86_emulator under nomultilib profile
 
   12 Jul 2014; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.4-r2.ebuild,
   -xen-tools-4.2.4-r4.ebuild, -xen-tools-4.2.4-r5.ebuild,
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 7ad3b9ad694a..08378656c3b0 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -53,23 +53,23 @@ DIST xen-4.4.0-upstream-patches-4.tar.xz 98388 SHA256 84dd81b8d1126edebcff72f1ce
 DIST xen-4.4.0.tar.gz 18116578 SHA256 6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021 SHA512 84bc293415b8ce9686240b0145a92be190cdd7032c66b5b07906baacbfeb33ad1e6148336e951fd4506b7f4e0b250937c702226c0207d7088a50e643bedabd17 WHIRLPOOL 87886cc83bf1eaaf5dd5b67d7cc82823d98dd9b4b47c0a178ea70ee2367c1a4a142aa66df13f58603840d0e310fb5c09dc0d5b87f6361c934e1c83c95d09d406
 EBUILD xen-tools-4.2.4-r6.ebuild 12430 SHA256 6811006559e02b3ac419095e8d11416b2b50ff26101b75fc09c73a6e1e9ccf57 SHA512 f723612e8598973af312c3dfd3ad745a8233c2dc5968eb41892ab3f5d98f341706cea74ef65567723cc0e1a6c24071c40cca2d7d4af408d44225593feb90a5e1 WHIRLPOOL 44bd483ef8a2a42b34dc7ec696f2a33258bc4fb992f4a38b2a05347d9ce32d4adf93929f9cc9ba18bb6b05a4c2cbc9b058c83d89d95af2dc67e243d8edd94cf3
 EBUILD xen-tools-4.3.2-r5.ebuild 13639 SHA256 039ff778be6fe4dd30ee4d41167f00d3e0badeaa0f2f19980a92ca1a104a4021 SHA512 ba1aab6e65c2030e4e5fc14ef3655dd4a54b79b37a31e1c90ddcab2abfc49134b44480b354b90f4549b607436ef6efb22999ff63a55720642aea4944749d7dd5 WHIRLPOOL d749a70bfc44cd4cc7763613383b8b430af3fc056fd8cc110562651da927af5812f0a7f6411a79eec7fca223fa4485c6435db463877f333f4a245dfef849d078
-EBUILD xen-tools-4.4.0-r7.ebuild 13407 SHA256 ba4a5a19ef33f8bb967f5932ae72940909ce7c07b0f94788248683ad12115450 SHA512 2d3c80f9718e46bb87cd2f7e64cbc255ef327dcee9af90f8bd14069030e3122066f43feb8359ea21426c911338b9b606082a409f17eb3a9c2f00c795eed2d9b3 WHIRLPOOL 462599f354f8c98ed27f32c18d9efc83b14f885d51729df38ce58317a6baf5b28c212a1fbe58cc33166654bad28a13fd365e41a0d1e8a4e5e08caf3fda9d0266
-MISC ChangeLog 59510 SHA256 be0a9ccac6dfa43592b2585874c80fad8d6dec445d7f15e621b109f0b2324363 SHA512 7628be34265ee6c196fc3b20a6037af59861edb40bafec7715890c23fa7ddcddb406326e804d4fb3cd9ae30c6afca18195e195c6c6df35557221acadee2f78bb WHIRLPOOL 54e493a17443f79adf3fe64afe70a246cd1d9aba0a18369987d57a9f02f4df9bda78bacdf2307288579336d28d809a8a637b2f391797e6166a0e4ffd9bb9f691
+EBUILD xen-tools-4.4.0-r8.ebuild 13531 SHA256 7b4c880f9d450404e6e45629e3043434f16a0c603537b5dfeaf5daee66cc455b SHA512 c875a5ccff12a2d65665a7c1dfa5e95b993cf4f133d9257518949e94fe0d1d0cbacfb42fe6832cae56515bd3bd53f6a5235f626cfbe4dae5e6b81996d4734d18 WHIRLPOOL 491e73a615a2b3a8ffeb2910a7b2f7a1ea22f87fd4bb64d8eba10713a280d033a773db21c22a9f5b02d7c1c10ea48c19ff67572fe6b736cc480e7507a56523ed
+MISC ChangeLog 59713 SHA256 f67065ecfea3df489cb0668c0a70fa2da272af709b26a99fa872bccffd0b6a47 SHA512 099b6bdd6d6bfa746390689daf48b9a6d942fce46484374639a62145cf69ab8182f47452b10f908f52cc6286231e17c6ca5e095dee1c7eb169eeca12784d72b9 WHIRLPOOL f2d8757c240c0e90e55cf382406e4050379b6690930f9e245ec45a36d7f518a929731cec124a6561fb18d816aa7a9ad3211781184a242378282a4e8ffd7cd90f
 MISC metadata.xml 1009 SHA256 9e8e2c5b191fffbbdf2dd0772213f5b2fe13b10e0413f9d12081f87e7ba6565b SHA512 bdd573cf6cb7664d4f0512f99f7ba5c81758d59986d764423328ce1fccc2149f0f7ca9eccefe3953ecec5f4d15bf829792f9ed07a60a5c447e1a3f5ed0d26c26 WHIRLPOOL 08f65daec784396532cc0700847d5e8545a73b49e840a491a6089945bbb9a8597ecc012bf65a6835ad5dff1623377d80360692ae9c41589130f9b4bedc909e76
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTwUKvAAoJEJIMDbyqvv1VXcsQANM1FnJpN87iSap7WQ4feazO
-8FfFHLMD2Wizz/DSAZ2EL0BN4g2MUeHUrfVrhuhPh/kDZfUl2AikH1LTplmQaB62
-486w9XXByRLr8b+bwkrIvow1oiezm9cnnU84gtw22lvTpArZ13vM6TH0yQuNontX
-rpRBobC9U3fXY4qFiP1O9ebHxB198J/ChcxGdAxzXIfqomX9jdyILg/Y9sWokw3i
-H8dGdeADPzm1+5EnR/icDF++7CCji4Jsz7B4YaseDCLQVamXRRF5tkS97ZN3QCW/
-0ds6QacpdzfJ2ANHg0zEEE9t5uv2Fzbj1Vx567M8nGiTbHYuXaOE+9HyFiN8jcsH
-G++qmfHa/EtencEUI/+dus2kni9mb7G+wor+Qxr8hugsvi1mBtOPEKiZYpRfxJDd
-3L0OZRCCxRg+w6kpMTI9GmPxmNg+6akfQ4tPAWyJ804J0HalhAMu5M6OB2iHUF47
-93Tork168+ZoAqxJH1lVAZp9lSjM+znI388h2bLK4wHNcz9eW0uQyiclOj1eP6mM
-B50ciuWgf0PERn0w9QgjVAXyJPDkV5Cyk5dGHJEFVw5k8lzVzj/XoPYhq4m0WmON
-soLtt3n6f9MYstLj0uYdDq2S0DqKk3tPqqymlkARxcdsg78K9YO1/cGZWEgfS7/Q
-M3Cc0Q8Oz1FLE/67ZApu
-=RKpZ
+iQIcBAEBCAAGBQJT12upAAoJEJIMDbyqvv1VKc0P/juXJlgldb8hJY5tSMoKszVi
+KPUb0cNscTf4HMwV3V2DC9gifVBl97LBewxjvZaTU/Qcwy1ujXPMLXwPNjKANL3O
+erZtn5i8PPqNjKdR/P/xOO5qet/XWZEvgfDi4r1E0o6h5vA6ahaZeiZWB4HwNU6S
+GMWy+dL3BfZ3m2BVwAASMKC0mYGlNkHVpqoiIxExrx4rDh+YjDlCwrK+TKKmitb1
+vBpsU9nCMH4pzAlnm2i1kbDZZOnDM8Bwqj7aLYYfp+G6hiLnHtwqn03VuoDGXkxX
+sVXWc+qFzGbxPx/t4z0cLBgQaQ3QVoy9ov+XfNKB7QksWRd/mCao8QD9PBIjqSRr
+L4j0KGqE7VaQ0DuDf43pYBGGbcvQS0dg+n0MuDG0hSrS0C1+ZrYJ4zXKjZhCYKLn
+XMximM9ridxiPovhMGmp1KinY84RMUIHc4TFCRBMZPHKGlk2HF2cCxjf84Z3kFf5
+tOU4qs+Bc0LSd2ZOhxdo1zizTuYWipBv7xCOf9Hj7vxxII9RWBwQg0tpM6imcDjB
+xqBQtyf4rOXTTWccCZBBd2JmBHrqG/iEMoUxADl85JHsjTDV7L6nLT78jCtgVj7O
+0GOr7jrph4XuIYZ7FeUg8hnSv1UmUPyqdfT4E1cZ0BNHz8tj/VcGQtFQa898sh5v
+VPBigWSr13jpkqQ0rZdH
+=GsKy
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/xen-tools-4.4.0-r7.ebuild b/app-emulation/xen-tools/xen-tools-4.4.0-r8.ebuild
index 01b010a2bacc..c55c7340b6e3 100644
--- a/app-emulation/xen-tools/xen-tools-4.4.0-r7.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.4.0-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0-r7.ebuild,v 1.1 2014/07/09 06:35:44 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0-r8.ebuild,v 1.1 2014/07/29 09:40:45 dlan Exp $
 
 EAPI=5
 
@@ -254,6 +254,16 @@ src_prepare() {
 	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
 		-i tools/qemu-xen/configure || die
 
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# Bug 477884, 518136
+	if [[ "${ARCH}" == 'amd64' ]]; then
+		sed -i -e "/LIBEXEC =/s|/lib/xen/bin|/$(get_libdir)/xen/bin|" config/StdGNU.mk || die
+	fi
+
 	# fix QA warning, create /var/run/, /var/lock dynamically
 	sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
 		tools/libxl/Makefile || die
@@ -360,12 +370,6 @@ src_install() {
 		keepdir /var/log/xen-consoles
 	fi
 
-	# Move files built with use qemu, Bug #477884
-	if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
-		mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
-		mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die
-	fi
-
 	# For -static-libs wrt Bug 384355
 	if ! use static-libs; then
 		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a