Fix push and pop usage for amd64, bug #142682. Disable the 32bit-only vmxassist, if we can't compile x86 32bit code, bug #138314.

(Portage version: 2.1.1_pre4-r4)
 (Signed Manifest commit)

2 files changed, 30 insertions, 32 deletions

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index f7d5a2f4f36a..2790ac9c9938 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,11 +1,18 @@
-AUX hardened-bx-clobber.patch 430 RMD160 0a3aa0ab2d4132750792f2edd53e4dacf9ad2454 SHA1 489b19f4ffffd227dab463ec2effca619c74fe27 SHA256 304b4ade4092e5b6bc39f43815516ac2d2b7dda5ae49b9c3c4794e5d00fb9950
-MD5 0ce96a3ac592d4e21e5f19a76df84495 files/hardened-bx-clobber.patch 430
-RMD160 0a3aa0ab2d4132750792f2edd53e4dacf9ad2454 files/hardened-bx-clobber.patch 430
-SHA256 304b4ade4092e5b6bc39f43815516ac2d2b7dda5ae49b9c3c4794e5d00fb9950 files/hardened-bx-clobber.patch 430
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xen-tools-3.0.2--as-needed.patch 283 RMD160 852e850b72b9860420f5f2132c2e071474bc87ba SHA1 cb33bd39091a7ddca2a97a3e80d673adcec77895 SHA256 9fcf772662863f74f4dc7cbc7ec195c2ad447ea757364e0cd6907d633d237919
 MD5 7c8f508f547c0e1f78b185fd9f980b1b files/xen-tools-3.0.2--as-needed.patch 283
 RMD160 852e850b72b9860420f5f2132c2e071474bc87ba files/xen-tools-3.0.2--as-needed.patch 283
 SHA256 9fcf772662863f74f4dc7cbc7ec195c2ad447ea757364e0cd6907d633d237919 files/xen-tools-3.0.2--as-needed.patch 283
+AUX xen-tools-3.0.2-bxclobber.patch 734 RMD160 a23e93b14048ac091b044673a6bc12fffdfaca19 SHA1 438b38917239aa4e40d65b2378ca44f2c2aaca5f SHA256 8e72dfeb69b1ac6409177d2943966d89aeca5a5a96f5fc142b3f2bd1af936191
+MD5 fc279066e82ced30850c046be2642ee1 files/xen-tools-3.0.2-bxclobber.patch 734
+RMD160 a23e93b14048ac091b044673a6bc12fffdfaca19 files/xen-tools-3.0.2-bxclobber.patch 734
+SHA256 8e72dfeb69b1ac6409177d2943966d89aeca5a5a96f5fc142b3f2bd1af936191 files/xen-tools-3.0.2-bxclobber.patch 734
+AUX xen-tools-3.0.2-pushpop.patch 796 RMD160 d15cb8ed948f4706912da53d9406852103438895 SHA1 1fc228381bfcbfa5c0203cd37352d912e66f7b37 SHA256 b09d5ff8afc0bf5878b97e1a59a9bfe8ec028a99f62b824c68fc9d42eb576b96
+MD5 d77478e538be4f38ca70f3b3ead939f4 files/xen-tools-3.0.2-pushpop.patch 796
+RMD160 d15cb8ed948f4706912da53d9406852103438895 files/xen-tools-3.0.2-pushpop.patch 796
+SHA256 b09d5ff8afc0bf5878b97e1a59a9bfe8ec028a99f62b824c68fc9d42eb576b96 files/xen-tools-3.0.2-pushpop.patch 796
 AUX xen-tools-3.0.2-test-uuid.patch 777 RMD160 268ddfc7d8c194d43e8c24a9966561df04246196 SHA1 2c60427e1dcc7995a25e38295297a2c7ae620893 SHA256 e789ef34b4a7066b7b476675d04d14b1a4272708c8ba51c5d4930119acbec76c
 MD5 3b1e6f226e33f6d583cd1a6b6760c9f4 files/xen-tools-3.0.2-test-uuid.patch 777
 RMD160 268ddfc7d8c194d43e8c24a9966561df04246196 files/xen-tools-3.0.2-test-uuid.patch 777
@@ -35,21 +42,28 @@ EBUILD xen-tools-3.0.2-r1.ebuild 3945 RMD160 326ea8e281030efb84b47dbbeea895b253a
 MD5 ad525ca59ea78e60e0a7c4c139ca57b3 xen-tools-3.0.2-r1.ebuild 3945
 RMD160 326ea8e281030efb84b47dbbeea895b253a04752 xen-tools-3.0.2-r1.ebuild 3945
 SHA256 9550c198f5c2d03385d1708860f3be79cd612c51b1c0008485b08ba062df5ae9 xen-tools-3.0.2-r1.ebuild 3945
-EBUILD xen-tools-3.0.2-r2.ebuild 4453 RMD160 ede4345c48c95c368a772526a21e07f82d0c9e9e SHA1 4cf7a7fc0e3732afabefec14d516204be8d4ca28 SHA256 e564a3da031a8d56b3f659b0e2cc6da91aa1439292651176d9884358be0338d2
-MD5 f6a206ad4f81c7caf3c138f3403bf63f xen-tools-3.0.2-r2.ebuild 4453
-RMD160 ede4345c48c95c368a772526a21e07f82d0c9e9e xen-tools-3.0.2-r2.ebuild 4453
-SHA256 e564a3da031a8d56b3f659b0e2cc6da91aa1439292651176d9884358be0338d2 xen-tools-3.0.2-r2.ebuild 4453
-MISC ChangeLog 3200 RMD160 a51cc8ae50ad2fc8f1dd9c60dcd4c51ae22aaf41 SHA1 0c6d43ae9674b8fdcede2325a916d6f4c6de9f06 SHA256 292ce8c42598a4f98c6ad4c88840b3fc0d84ecd8f0eceb036d1d164c0f7b71cd
-MD5 0c4007c9674d60f286cba7bafed010bd ChangeLog 3200
-RMD160 a51cc8ae50ad2fc8f1dd9c60dcd4c51ae22aaf41 ChangeLog 3200
-SHA256 292ce8c42598a4f98c6ad4c88840b3fc0d84ecd8f0eceb036d1d164c0f7b71cd ChangeLog 3200
-MISC metadata.xml 432 RMD160 eafc439c7269ef22e0d750e94dcba03baeabfdfd SHA1 1c3b3f8f85025c2302322357be761f0a798b2a07 SHA256 8fd16f4fcd3ec230fe35684215f427844000f430170fd002ad95a880701fe440
-MD5 ed1af8b3d29a9c324a2d8041592287a5 metadata.xml 432
-RMD160 eafc439c7269ef22e0d750e94dcba03baeabfdfd metadata.xml 432
-SHA256 8fd16f4fcd3ec230fe35684215f427844000f430170fd002ad95a880701fe440 metadata.xml 432
+EBUILD xen-tools-3.0.2-r2.ebuild 4735 RMD160 d6d30a244905ac1a77f44464f207bca1b1ac1444 SHA1 a757b0f7ef59575bfce7f89090c5fe6bdde8d679 SHA256 31a5f0e02648e518b483025f99e5be7b89ff1b87334ec869ea54fd204abf7184
+MD5 19042a2a90d2e26d504d649459097c6e xen-tools-3.0.2-r2.ebuild 4735
+RMD160 d6d30a244905ac1a77f44464f207bca1b1ac1444 xen-tools-3.0.2-r2.ebuild 4735
+SHA256 31a5f0e02648e518b483025f99e5be7b89ff1b87334ec869ea54fd204abf7184 xen-tools-3.0.2-r2.ebuild 4735
+MISC ChangeLog 3547 RMD160 f4753ec24ac49fb87cd8a3f3a3b58262f915f035 SHA1 5ca9d112f10b079914c4dbe58e497423f2f7549e SHA256 0389074d89c6e92d1e6ec1761caf202f1ada098f38b2d3dd1a412a2d09a5ded5
+MD5 97929cc0abe05ad4c333a9f511796511 ChangeLog 3547
+RMD160 f4753ec24ac49fb87cd8a3f3a3b58262f915f035 ChangeLog 3547
+SHA256 0389074d89c6e92d1e6ec1761caf202f1ada098f38b2d3dd1a412a2d09a5ded5 ChangeLog 3547
+MISC metadata.xml 524 RMD160 a43ce42da1c3cfc48117f045ac519b57b77e06d2 SHA1 1ba13aa3a6a9f6edca131b8b0071a9513b8434de SHA256 730f26575bf2ac3451ee10b5b01a0eda163459ef40dfc79e0acc6c64c5f974c8
+MD5 639e560e9eb2bbfde0747a0712d35b02 metadata.xml 524
+RMD160 a43ce42da1c3cfc48117f045ac519b57b77e06d2 metadata.xml 524
+SHA256 730f26575bf2ac3451ee10b5b01a0eda163459ef40dfc79e0acc6c64c5f974c8 metadata.xml 524
 MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-tools-3.0.2-r1 235
 RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-tools-3.0.2-r1 235
 SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-tools-3.0.2-r1 235
 MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-tools-3.0.2-r2 235
 RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-tools-3.0.2-r2 235
 SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-tools-3.0.2-r2 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE26UoI1lqEGTUzyQRAsLZAJ47FXw407FmHyDokSMd9mOGit8Z/gCgqMJt
+YXzDGXV2+mVk6LwqWDi5OMc=
+=PhOH
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/files/hardened-bx-clobber.patch b/app-emulation/xen-tools/files/hardened-bx-clobber.patch
deleted file mode 100644
index a4baf196a5af..000000000000
--- a/app-emulation/xen-tools/files/hardened-bx-clobber.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -r 1f4ec950e186 -r 408f51a850f4 tools/ioemu/hw/vga.c
---- a/tools/ioemu/hw/vga.c      Mon Apr 10 16:14:15 2006
-+++ b/tools/ioemu/hw/vga.c      Mon Apr 10 16:14:36 2006
-@@ -1369,10 +1369,10 @@
- {
-     unsigned int eax, edx;
- 
--    __asm__("cpuid"
-+    __asm__("pushl %%ebx; cpuid; popl %%ebx"
-             : "=a" (eax), "=d" (edx)
-             : "0" (op)
--            : "bx", "cx");
-+            : "cx");
- 
-     return edx;
- }