gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
commit: bb72e65b6d6ce95abb5d486dad35d37dc105e89b (patch)
tree: b31a9263d386dcae4cb06764136672508dc5efdf /app-emulation
parent: 9b1e6d491f32eb4caf0c8e197bdec075713c97ca (diff)
115 files changed, 1534 insertions, 434 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 68011522cfe7..19a0d6a5dc9c 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/cri-tools/Manifest b/app-emulation/cri-tools/Manifest
index 443b32a312d7..d5bb0562fc44 100644
--- a/app-emulation/cri-tools/Manifest
+++ b/app-emulation/cri-tools/Manifest
@@ -1,16 +1,9 @@
 DIST cri-tools-1.14.0.tar.gz 3647742 BLAKE2B 1a308c87e7be05dd71cf11d79c841a837156529d398f1475323ff9585f9080cd0356a007f8b8c505a02943ff479a7c26869f35288d178ac8187ca6766032c488 SHA512 c8978e4380ebb2dd59ce533ade94486ae1e4091fda7acd8cf5cce662034a1d34a1851c43bf766a723c5ba71c15972733a2e80c6e82fb1c27e5a1dfc2e85476bf
 DIST cri-tools-1.15.0.tar.gz 3672568 BLAKE2B d4e9a0b2ca43efdb61c7626de518801a124fb61991f1df6a7eac106f7516ab59effa70038db7c4cbfddaf1c345c648f359c86d298dae08abb34f4b801b82b2a1 SHA512 43115fad485c2c6603e724f3529371133bcea6de069dc58d36e7880f558fa1696244b6129fe3a96fd669b27a3d9bd07bda1219e89afa348e36a85087992adf7f
 DIST cri-tools-1.16.0.tar.gz 6912563 BLAKE2B 09ceaf0ebccfdd39d7a325989447ca8c4c9e94ec0f20e8c26a5c9447d1ad6591df1c237abf130edbc84b4b1b65f81f109976d20195b3b34afca1aac460ad48e2 SHA512 c577328e11e975b15302b49082592f065be389b384cebbaa4615ef5c4ea81a4bfc88e02de6ef2749beff75ea6a27bb9d72b30af47d0f9870b297e9da53b3e25f
-<<<<<<< HEAD
-EBUILD cri-tools-1.13.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
-EBUILD cri-tools-1.14.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
-EBUILD cri-tools-1.15.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
-EBUILD cri-tools-1.16.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
-=======
 DIST cri-tools-1.16.1.tar.gz 6915584 BLAKE2B eb2bc397b3bbeadb64d4d13610189f18bbf49ff93be1b1f3edf504305ed1a2ca8e271d3c041f5af01117f6c7403671a29df30d7aaab270cdb7ab84ac921fa914 SHA512 df15e6f3c4fe697070547d804bfa6755f780b3f0562f06312f39d3ee8756931bbec7c07482e2ef73413d85c1e9ca58064a769a15b04b3832da17044d180e8b4c
 EBUILD cri-tools-1.14.0.ebuild 917 BLAKE2B dad3bb3fbf2e3bcb2580c323a7efa715aaf1ac143c1775ed6c724b07791c8a124b21c73ffad628dd93517d9ab1c446add7c40d948c9830a9249e26ceebdc9bc4 SHA512 6d5b4c2306e2f8e5bbe30f83186000a4ee98aad4de91d7c6907e3726cb5aa193ddf7d243355fe5920ec20a76996c0cf771a590f1a181d05d5a446f7a66a34149
 EBUILD cri-tools-1.15.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
 EBUILD cri-tools-1.16.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
 EBUILD cri-tools-1.16.1.ebuild 1127 BLAKE2B affd783a11f2d267ab8f014ea323a2e14d651213fde9c8b7d2f8f27ea3daadf220aa7e9a25bb0aa407a1cbb4f534c3ec915020fefc4ff5e82e2e72bce14f2f59 SHA512 f1a99d8265fc5b5c445b9c79c7a7e3e76a7cfce8b05ec85478859859f281f941b9dc08a0b09514248717ff38471c2c8e98d2b93c3227145eedea3d940c94ee99
->>>>>>> next
 MISC metadata.xml 345 BLAKE2B a0a36cc291e52c9625d8caf20d81a06d5a94d69987a912ff9b7cc50582b06df285544ba2e050deea23628c2de34ccec9cfbb7c9beeec486733b86e54d5f73081 SHA512 bb952b4fe9687fa36406793426a8f6c922db248d75794e4f17e31b4056b10e7ce17dddb5f47eb68045babfaa9e63005cc5d408f96d52eb7c67b78b034408e7d8
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index d172e7162759..f0d245aa8ec6 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -21,28 +21,28 @@ DIST install-crossover-17.5.1.bin 198278549 BLAKE2B e53504177eb4a4030a31ae73baf2
 DIST install-crossover-18.0.0.bin 206792916 BLAKE2B d1784ddd2dc568d2b6f1fe60b7fad149e6128e61d2315b2179f4d87b7d49bc0166851df3fb3e39b911bfbbba6366f8c98f63e47e18abb173a1129f11795454c7 SHA512 3ad7393714a43e7323ad6e81ea8f165df9253dfdfff20fc68f5091e77b288b86c3a3e11883732dc73ec5c89e500005b6451899b7e43fc4900c6bd40445739281
 DIST install-crossover-18.1.0.bin 206784995 BLAKE2B 4e8ae8330373b505b2ed361e314bcdaf3564a0b846484d2708e64e94d3fe856c35e1d235fa474d4a079a8c0e88dade02bb1e93f0608d1ec99dca2a3a74f7865c SHA512 a679f0a801a6c2045a724ae5935745457689ae73ea4246daa1fc89a387f42c55ba0431db8fcdf48ba7253f616613adb51ca0402fe19480c0254f614fcb6884d8
 DIST install-crossover-18.5.0.bin 224996342 BLAKE2B 300141bcf7c54ab1ce8229c6930df783454d450aee7b1be3cc3a193d1501320dee3e6fdfb3f37c56ae76e97f83f1b45838f1d5b7ed9793888a51df0203fe6dfe SHA512 ce44d7f79280adb36ecbcbdee3fa743dcca47b629fd1cb0ae2afbca56514df96e78e1103f09f5059aaf971a3a561f992158104ffa30bdd28925b14e58bd96855
-EBUILD crossover-bin-12.5.0-r2.ebuild 3826 BLAKE2B 24425ebe8a3b3a72d79a2e220100f0f20b9920af6c63bab4076311c7e090a5b8083db760f81c6187f749dd7ea90e5a518daa76b1379f86399bec5c492a5fd29a SHA512 11a19adc597929fd09efb0c6abd674f53e848f025cd70e26d5b2265ac2f54361e919b08925941c40c40bd4c041603396e5d5447f46c36d67547723437739032d
-EBUILD crossover-bin-12.5.1-r2.ebuild 3827 BLAKE2B 2fa8323277472c38c5cfc37a56be63ebde03401944424b0ded4e17fc1c960b8f8ada589e711c07d9a50f9dd9d0668bac834ec079b9d4eac354421c6fdd64fe77 SHA512 87d25a097a2ff8c69b04318f5eb0037a812da9244f4e48a574cb29d7cab7612668fe87587d4bf7ba30463e3145560387cb3dca9530a299bce6c9511e6bf01157
-EBUILD crossover-bin-13.0.0-r2.ebuild 3827 BLAKE2B 2fa8323277472c38c5cfc37a56be63ebde03401944424b0ded4e17fc1c960b8f8ada589e711c07d9a50f9dd9d0668bac834ec079b9d4eac354421c6fdd64fe77 SHA512 87d25a097a2ff8c69b04318f5eb0037a812da9244f4e48a574cb29d7cab7612668fe87587d4bf7ba30463e3145560387cb3dca9530a299bce6c9511e6bf01157
-EBUILD crossover-bin-13.0.1-r2.ebuild 3827 BLAKE2B 2fa8323277472c38c5cfc37a56be63ebde03401944424b0ded4e17fc1c960b8f8ada589e711c07d9a50f9dd9d0668bac834ec079b9d4eac354421c6fdd64fe77 SHA512 87d25a097a2ff8c69b04318f5eb0037a812da9244f4e48a574cb29d7cab7612668fe87587d4bf7ba30463e3145560387cb3dca9530a299bce6c9511e6bf01157
-EBUILD crossover-bin-13.1.0-r2.ebuild 3827 BLAKE2B 2fa8323277472c38c5cfc37a56be63ebde03401944424b0ded4e17fc1c960b8f8ada589e711c07d9a50f9dd9d0668bac834ec079b9d4eac354421c6fdd64fe77 SHA512 87d25a097a2ff8c69b04318f5eb0037a812da9244f4e48a574cb29d7cab7612668fe87587d4bf7ba30463e3145560387cb3dca9530a299bce6c9511e6bf01157
-EBUILD crossover-bin-13.1.2-r2.ebuild 3827 BLAKE2B 2fa8323277472c38c5cfc37a56be63ebde03401944424b0ded4e17fc1c960b8f8ada589e711c07d9a50f9dd9d0668bac834ec079b9d4eac354421c6fdd64fe77 SHA512 87d25a097a2ff8c69b04318f5eb0037a812da9244f4e48a574cb29d7cab7612668fe87587d4bf7ba30463e3145560387cb3dca9530a299bce6c9511e6bf01157
-EBUILD crossover-bin-13.1.3-r2.ebuild 3827 BLAKE2B 2fa8323277472c38c5cfc37a56be63ebde03401944424b0ded4e17fc1c960b8f8ada589e711c07d9a50f9dd9d0668bac834ec079b9d4eac354421c6fdd64fe77 SHA512 87d25a097a2ff8c69b04318f5eb0037a812da9244f4e48a574cb29d7cab7612668fe87587d4bf7ba30463e3145560387cb3dca9530a299bce6c9511e6bf01157
-EBUILD crossover-bin-13.2.0-r2.ebuild 3827 BLAKE2B 2fa8323277472c38c5cfc37a56be63ebde03401944424b0ded4e17fc1c960b8f8ada589e711c07d9a50f9dd9d0668bac834ec079b9d4eac354421c6fdd64fe77 SHA512 87d25a097a2ff8c69b04318f5eb0037a812da9244f4e48a574cb29d7cab7612668fe87587d4bf7ba30463e3145560387cb3dca9530a299bce6c9511e6bf01157
-EBUILD crossover-bin-14.0.3-r1.ebuild 4202 BLAKE2B 54eaad65c84246b4efcc582e5575a9c433f653298b90a5f69405334814ca4137b2e7507ccf3e8a95bc472f9862dc191b66786c5b45aaae0c17026269a6552445 SHA512 a580dc1b502ddf1e0ccc01e24d80875999f67ec1d2dcdf1f44a5c467226ff860f1f78d5ba0c2ab2fa4e211b5cb12bd261f1e90596dada95ff17686a789bcc676
-EBUILD crossover-bin-14.1.4-r1.ebuild 4203 BLAKE2B 6a3c1fc549093cdcb91dc68b17de25aea61d1d4f45c0d5adcbc1a7129dc5b68ad6a40ba5f8d18fe5961333665061def45f8ef59174eca4c9416421d3ab74ea0e SHA512 97df061f5abb23afd055059e50bf8cadb026d4779f2cbe2c1091dffd421e620bdfceee3892434c79cf99c963d31da7ef253cc3693d475bc19767c0994dbbb4a1
-EBUILD crossover-bin-15.0.0.ebuild 4533 BLAKE2B 58f1853b557e183a756b6ce3602db8a006b72ecb30c518e963c29e01706c4efdfee00b32fec8f86fcffe2ca2842576d765e3778ca363fc47c100c2531cfb6a60 SHA512 b5f548942d2e6a201e10be7f779e42da00abde0585a66ca76e68f9ea03bb4f878f38503c4e1a9760dc9df117c747cd73082a0569f7211aa851e542fd4975c038
-EBUILD crossover-bin-15.0.1.ebuild 4705 BLAKE2B d8a2391310d3d939a86e0da57d2996a62fb214eb6609a90ddce6b5a5e2d9ecf4dc5fb69bf3a2760e9aac8df5fb94b3fb10e667b897005f143aacca1b655c8cb3 SHA512 e40782eaddc88fca7b7590144021960a086dad403c07b0adcbb790bd487ca1f7916b3002557b470db4b7a122673e8285bd8fda6b1b24dbf5c9dcd0c8e31f99b3
-EBUILD crossover-bin-15.1.0.ebuild 4705 BLAKE2B d8a2391310d3d939a86e0da57d2996a62fb214eb6609a90ddce6b5a5e2d9ecf4dc5fb69bf3a2760e9aac8df5fb94b3fb10e667b897005f143aacca1b655c8cb3 SHA512 e40782eaddc88fca7b7590144021960a086dad403c07b0adcbb790bd487ca1f7916b3002557b470db4b7a122673e8285bd8fda6b1b24dbf5c9dcd0c8e31f99b3
-EBUILD crossover-bin-15.2.0.ebuild 4880 BLAKE2B 67c2576099eb4a3597028ee572e5766c71b10486cfda3d996e03da8e101d15c7f7901a24fc89fec5937b592b832422c419eae892144727ac4c6f8580557c72eb SHA512 c0fda036ae10a6cde2608f19fb834d70f405ac9b82543ca57b8f7db9bf398a337bead90d4444c234cfcfd1dcdd8517df9f552fd98fa9d87f034c70c71eec961d
-EBUILD crossover-bin-15.3.0.ebuild 4877 BLAKE2B cf3367255b3c70fdb75559e0c04f27df0ea4f86466562cb6bd6577ce313871c01e630089ce769fc21e8dac7ce71ff3e062f6dd83ac80e7913a6b372e34d18199 SHA512 24dc4e11b959c101b4bc52adcc9633772ddcb2831e844221539f96ea493e5507510b51a1a842ddefac5cfaeea14a1bc6fdf4154f739f35efb4fe885a9b0b282b
-EBUILD crossover-bin-15.3.1.ebuild 4877 BLAKE2B cf3367255b3c70fdb75559e0c04f27df0ea4f86466562cb6bd6577ce313871c01e630089ce769fc21e8dac7ce71ff3e062f6dd83ac80e7913a6b372e34d18199 SHA512 24dc4e11b959c101b4bc52adcc9633772ddcb2831e844221539f96ea493e5507510b51a1a842ddefac5cfaeea14a1bc6fdf4154f739f35efb4fe885a9b0b282b
-EBUILD crossover-bin-16.0.0.ebuild 4877 BLAKE2B cf3367255b3c70fdb75559e0c04f27df0ea4f86466562cb6bd6577ce313871c01e630089ce769fc21e8dac7ce71ff3e062f6dd83ac80e7913a6b372e34d18199 SHA512 24dc4e11b959c101b4bc52adcc9633772ddcb2831e844221539f96ea493e5507510b51a1a842ddefac5cfaeea14a1bc6fdf4154f739f35efb4fe885a9b0b282b
-EBUILD crossover-bin-16.2.5.ebuild 4877 BLAKE2B cf3367255b3c70fdb75559e0c04f27df0ea4f86466562cb6bd6577ce313871c01e630089ce769fc21e8dac7ce71ff3e062f6dd83ac80e7913a6b372e34d18199 SHA512 24dc4e11b959c101b4bc52adcc9633772ddcb2831e844221539f96ea493e5507510b51a1a842ddefac5cfaeea14a1bc6fdf4154f739f35efb4fe885a9b0b282b
-EBUILD crossover-bin-17.5.0-r1.ebuild 4753 BLAKE2B 9f563dd81089d4c679da849045c4ef916ea402dcff297c0d23c48d19e9a17e59b7d0b21e6712a8992072850a9e12b56d3613b5799aeee9da037d809bebdc8f6b SHA512 52cbb0f3397ac910bcd6d7323c998db31077f9c32555d3d8d8b0003486be14448d14ce6ef533eb74f0344de2bf12b2c930ca51fbf3b36762a47904d64d0efb82
-EBUILD crossover-bin-17.5.0.ebuild 4719 BLAKE2B 455cda74b397ccfdc4f3c6feab4a45e47aa3c4a2c0297da7496c0e317bd6038878aa6bbf7dabb2af767f9acbd44e7cd8095b64355562fc6d3d47a240ea7e813d SHA512 e1b782674ef33c04a3ffa9d60c663374401af16dae4fef4c083da01fe386b6b5e4acd188f81658d12baf4d09b67892a8ee5ee1ac14ee680ab57fad47b13d5c99
-EBUILD crossover-bin-17.5.1.ebuild 5267 BLAKE2B a950f38197953793d0d2bae5aa36fde557dbcefd16123251c77d31c5ac17c7cf34daf8bff38582e81e221fb06702c34da7909e94fc0c2ea75c216211ca0f78a1 SHA512 48230468afbee95831482c8b5142e512565dc86c8efbd2ed46a41d1327d96eac63ae50c675d49b7977874f8b61bd485bba79304e88a2223eb849a92b0d9d33ce
-EBUILD crossover-bin-18.0.0.ebuild 5491 BLAKE2B ff1a9582219869b460e0da79d7760f9bde7e4d1d3a422ff4548801b160ac2251c00e856c827fb96ba3fbd6c6ad115e6db5d0328f233a960244c99952c932b22b SHA512 6ca9bad5d61b6b82c23046783af86a587eb5a4fa35e72e7e41665242d605543f112bbc41b617d99d6b3e7c68f0dcbc729a946984cffe9f882bb2e783dc3a6c78
-EBUILD crossover-bin-18.1.0.ebuild 5491 BLAKE2B ff1a9582219869b460e0da79d7760f9bde7e4d1d3a422ff4548801b160ac2251c00e856c827fb96ba3fbd6c6ad115e6db5d0328f233a960244c99952c932b22b SHA512 6ca9bad5d61b6b82c23046783af86a587eb5a4fa35e72e7e41665242d605543f112bbc41b617d99d6b3e7c68f0dcbc729a946984cffe9f882bb2e783dc3a6c78
-EBUILD crossover-bin-18.5.0.ebuild 5491 BLAKE2B ff1a9582219869b460e0da79d7760f9bde7e4d1d3a422ff4548801b160ac2251c00e856c827fb96ba3fbd6c6ad115e6db5d0328f233a960244c99952c932b22b SHA512 6ca9bad5d61b6b82c23046783af86a587eb5a4fa35e72e7e41665242d605543f112bbc41b617d99d6b3e7c68f0dcbc729a946984cffe9f882bb2e783dc3a6c78
+EBUILD crossover-bin-12.5.0-r2.ebuild 3831 BLAKE2B 417c21afef0d423da3ac0081de40dd1f406b832ee9bbe9de78672c47d6ade15b3cae312a795ee66112cb6879419e65f8f092ba32a7f46e207430bfd0516c87c3 SHA512 1d4c46b5710a16e50203c215eb0e76162a870702fbe58452c76eb1de1c407f08f54f477f6e7894bb8831ff1b601bcea220ec7bea15c97cb0151f55ea4fc45f6a
+EBUILD crossover-bin-12.5.1-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
+EBUILD crossover-bin-13.0.0-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
+EBUILD crossover-bin-13.0.1-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
+EBUILD crossover-bin-13.1.0-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
+EBUILD crossover-bin-13.1.2-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
+EBUILD crossover-bin-13.1.3-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
+EBUILD crossover-bin-13.2.0-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
+EBUILD crossover-bin-14.0.3-r1.ebuild 4207 BLAKE2B 5b9a6b2e5a2507661ded1a422de8eec241c52c72c9572d797e17dd5b7a60d1f901d1953af6a2fa7a231a5d4438511c12337db27783a9098f2d29f420842ac5c2 SHA512 616dde819ae73718e13ece9623ff51127beba851b929b6ff4a03d3c31a3da33f355293e0c6ecd154afe40ab51efa0288946a7b486c184d0fa252ee1c4456beef
+EBUILD crossover-bin-14.1.4-r1.ebuild 4208 BLAKE2B d1c7cad342ade2a42770d614838118b55f91756f77aaa9bca1fa7dc4fdd401d027022dfa1bf255e103a1336c21639289e0d4173a5a56c90902ea2b6b6ad67797 SHA512 42b5169b27c8d882997386eb50d446d5b35ae949306c2d435fbada834ae44bad03491d80fc6c8459d03560ec963be24f4cfb271cb09fe5d46770fa61f8bf0fb5
+EBUILD crossover-bin-15.0.0.ebuild 4538 BLAKE2B 30ae6ff406a8d2e2d4622d04e21246fe7475589f9f5f89022d6b6f04c6950845dd5142e7cce2e7a3b11e0e8b81e7ac1d684c40495e00fca41889a36318e09b86 SHA512 4b2de97c09a0e5f10206a37e0432b93b9380b405f0015332c57328335c5838ecdeaf8c69a347f789afb8e8196016e20b5febac6e86dfa9b8933e8f4d6ba1f235
+EBUILD crossover-bin-15.0.1.ebuild 4710 BLAKE2B 8e15a2d9d70f1b5e571a3bd1486dd59289b87fb087826f6aba692b0ca71f31adac43d3cee37f68b31ee5bf6085c50a11619132b0ca504ef8be1bdedb35f4197a SHA512 e0b2776b1f91f6c42175db3350fd3426f1dbe056a6a2965358f039daedf0fff89598bbd675232b82333fd7e3b078befc259e267c41520b0e8cf79349d53e62ad
+EBUILD crossover-bin-15.1.0.ebuild 4710 BLAKE2B 8e15a2d9d70f1b5e571a3bd1486dd59289b87fb087826f6aba692b0ca71f31adac43d3cee37f68b31ee5bf6085c50a11619132b0ca504ef8be1bdedb35f4197a SHA512 e0b2776b1f91f6c42175db3350fd3426f1dbe056a6a2965358f039daedf0fff89598bbd675232b82333fd7e3b078befc259e267c41520b0e8cf79349d53e62ad
+EBUILD crossover-bin-15.2.0.ebuild 4885 BLAKE2B 8e26cb3add2ee735ee071bb75415167627db681f3937e4e8b934de912ca8252d3486915c0978a52ecf452aedccc104c263ab7bcc9ddb53516ee0f051824baa17 SHA512 98f6b32f0bb9701716104c9523424e6843b42363dc4f7dcbab34f8a460ba06a11ea1e7043c8b20d0b31f8efccf499a3a29f11d8b40339e947b8ebc7fdcce475a
+EBUILD crossover-bin-15.3.0.ebuild 4882 BLAKE2B c09b3073970195dedc5692d2ea4272fd761ccfdd18885238da599cfa9172dee72839aa127988845c8f540b5149993930d4ddd2a0fc38c338e58000be7fbbe014 SHA512 aa206405ff57361b3bcdd4af3e3a0ae78a083a992c0aa9ed8443d45b288fa3f6b98c479f84b9c42578c3760c3689fc62c5325037e690ffba08319d408d8327e3
+EBUILD crossover-bin-15.3.1.ebuild 4882 BLAKE2B c09b3073970195dedc5692d2ea4272fd761ccfdd18885238da599cfa9172dee72839aa127988845c8f540b5149993930d4ddd2a0fc38c338e58000be7fbbe014 SHA512 aa206405ff57361b3bcdd4af3e3a0ae78a083a992c0aa9ed8443d45b288fa3f6b98c479f84b9c42578c3760c3689fc62c5325037e690ffba08319d408d8327e3
+EBUILD crossover-bin-16.0.0.ebuild 4882 BLAKE2B c09b3073970195dedc5692d2ea4272fd761ccfdd18885238da599cfa9172dee72839aa127988845c8f540b5149993930d4ddd2a0fc38c338e58000be7fbbe014 SHA512 aa206405ff57361b3bcdd4af3e3a0ae78a083a992c0aa9ed8443d45b288fa3f6b98c479f84b9c42578c3760c3689fc62c5325037e690ffba08319d408d8327e3
+EBUILD crossover-bin-16.2.5.ebuild 4882 BLAKE2B c09b3073970195dedc5692d2ea4272fd761ccfdd18885238da599cfa9172dee72839aa127988845c8f540b5149993930d4ddd2a0fc38c338e58000be7fbbe014 SHA512 aa206405ff57361b3bcdd4af3e3a0ae78a083a992c0aa9ed8443d45b288fa3f6b98c479f84b9c42578c3760c3689fc62c5325037e690ffba08319d408d8327e3
+EBUILD crossover-bin-17.5.0-r1.ebuild 4758 BLAKE2B 49d065f71467fb68b2815bfa6bd2fe5d94ae8393735eef7cd152252f370f281eccc48c288a05ddc56c83785327e8c7fee45e2b3c1fa87ae4aeb12b3c14e74397 SHA512 80413aa52bf1301547d3a43db2ded483808c4e64eb5a6bb4cfe397bc38bf964cbb1468b30d37f5017d0ad62129d75ea5d4f7a02e6f73237a868b1f3159d0e507
+EBUILD crossover-bin-17.5.0.ebuild 4724 BLAKE2B 62d1ff8c293a921f9bbf9d2cdd34b11a1916a22f660884ab29c5ce987082fabc2766368be7d4c3956767229a621350158fb1282128e393dcf9d90b16e7488b03 SHA512 d59a7752b81d24b118d1f1494ab4e08acfa68f1268c75a0bdd19d7377db9ab5f9121c263a96408f64968fb508bda8a1e03938ebb97deb68ddf2175e37b625b94
+EBUILD crossover-bin-17.5.1.ebuild 5272 BLAKE2B 8926ff071b5895551c91b594688c2ef26a542795271458cb75a3075a990a8164013d7e701e54552a6a1cbed1b68570716bb6677ddf48fb444791ad7e8ac0cbde SHA512 0bf118e7a94166c645d0c3441fc1030c6f43e9435604d2af9bc3ba0abd817aaeb84bac7e84dc294853928cbd8e01ef694a5dc749e277428e882a189f834f8711
+EBUILD crossover-bin-18.0.0.ebuild 5496 BLAKE2B 2b1bd7bdecbda88184060410a2f08e3fa0d870e12faf97fb0d7245afd9141434269c25ecf5f15a9271f6cd7ba0472d3292ba8e9b1b0f6ca68de4c5ba3fa3ee9b SHA512 308ac99409c0e13ba9a3356919870565ae2b4d97f68dbd838e4d884f335c066eb00a0de318efa10e7088f1ac017b31a9a3595a4b6807d3cc0e4844833f95be45
+EBUILD crossover-bin-18.1.0.ebuild 5496 BLAKE2B 2b1bd7bdecbda88184060410a2f08e3fa0d870e12faf97fb0d7245afd9141434269c25ecf5f15a9271f6cd7ba0472d3292ba8e9b1b0f6ca68de4c5ba3fa3ee9b SHA512 308ac99409c0e13ba9a3356919870565ae2b4d97f68dbd838e4d884f335c066eb00a0de318efa10e7088f1ac017b31a9a3595a4b6807d3cc0e4844833f95be45
+EBUILD crossover-bin-18.5.0.ebuild 5496 BLAKE2B 2b1bd7bdecbda88184060410a2f08e3fa0d870e12faf97fb0d7245afd9141434269c25ecf5f15a9271f6cd7ba0472d3292ba8e9b1b0f6ca68de4c5ba3fa3ee9b SHA512 308ac99409c0e13ba9a3356919870565ae2b4d97f68dbd838e4d884f335c066eb00a0de318efa10e7088f1ac017b31a9a3595a4b6807d3cc0e4844833f95be45
 MISC metadata.xml 364 BLAKE2B 9978c9532a9bd1adcfa22f00db6a8fd80fda155a6adc69ee0c0693093e7a7ac0a0eba1ef5a0657e6dff5aabdb7e6259c883aceffbba89b495a25b0d3e26e5174 SHA512 68f361d337b167c549eafab8e45dcb33548ac67a206ead2f7118330a77888c6e2ba4dbe7755ca23c81a5e619458f25359e3f2d8eee4f6d0e359b5c3a28475096
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
index cd406f48fce0..15750dd80789 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
index b9bafdf34a34..c00511cf666c 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
index b9bafdf34a34..c00511cf666c 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
index b9bafdf34a34..c00511cf666c 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
index b9bafdf34a34..c00511cf666c 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
index b9bafdf34a34..c00511cf666c 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
index b9bafdf34a34..c00511cf666c 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
index b9bafdf34a34..c00511cf666c 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
index 5059344edfb5..ba03accfe227 100644
--- a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
index 26db02be05a9..cf4b4f10d80d 100644
--- a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
index 21436e43fba9..c8154f99883d 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild b/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
index 68a57637b478..bdb0de9d05d2 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
index 68a57637b478..bdb0de9d05d2 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
index 6d80fc91d2a4..79500b6a3914 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
index e707286b6b06..b3537aa9c934 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
@@ -63,7 +63,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild b/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
index e707286b6b06..b3537aa9c934 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
@@ -63,7 +63,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
index e707286b6b06..b3537aa9c934 100644
--- a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
@@ -63,7 +63,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild b/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
index e707286b6b06..b3537aa9c934 100644
--- a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
@@ -63,7 +63,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
index ad18cd6fcd7e..00827f7ddb60 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
@@ -65,7 +65,7 @@ RDEPEND="${DEPEND}
 	media-libs/mesa[abi_x86_32(-)]
 	sys-auth/nss-mdns[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
index 16712dfcb5b9..a160f02ad3ea 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
index e8abb043c907..006df8e97168 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
@@ -65,7 +65,7 @@ RDEPEND="${DEPEND}
 	media-libs/mesa[abi_x86_32(-)]
 	sys-auth/nss-mdns[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
index ff1c9fe1fce1..f2e4d02eaa7d 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
@@ -77,7 +77,7 @@ RDEPEND="${DEPEND}
 	media-libs/mesa[abi_x86_32(-)]
 	sys-auth/nss-mdns[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
index ff1c9fe1fce1..f2e4d02eaa7d 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
@@ -77,7 +77,7 @@ RDEPEND="${DEPEND}
 	media-libs/mesa[abi_x86_32(-)]
 	sys-auth/nss-mdns[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
index ff1c9fe1fce1..f2e4d02eaa7d 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
@@ -77,7 +77,7 @@ RDEPEND="${DEPEND}
 	media-libs/mesa[abi_x86_32(-)]
 	sys-auth/nss-mdns[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 66c87e28352c..be3b7d1cf08d 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,6 +1,6 @@
-DIST diskimage-builder-2.26.1.tar.gz 421821 BLAKE2B 11c0ba668494285f33f3461e1a2c091ce6d622e4be164c4ab56a93cd000c82cec6702a6ed2ae37007120320f053760473f45f58ad8b45ee14b7b3eb47ac82d9a SHA512 e8bb68d15fc0bdd4881e76a7277f3e5e481b77decb4591546a576eda015bf624da3746326735add299551e168b82ab8bb165a18a64e96532c5b846e49815528f
 DIST diskimage-builder-2.27.2.tar.gz 421433 BLAKE2B 089e68b07c6f79e54b8fb30e7a9328a6c55d1abb5f77b6592cc0b29b30a44a83803bdde93631e95e39d7fc82d9b5ff3fb425a7b94821b96f56421cbde9f8b078 SHA512 e2cc6f24d5bbfdf741d6b6e7e216d0e9631d6394cf3f3f4d34ce8a78ba2ba2ddbcb0b1434121f7ab1bd3600194777a5538651d9039c3bca06bb8cc621f06f037
-EBUILD diskimage-builder-2.26.1.ebuild 1278 BLAKE2B 8a763c66fa85499b81a5f74315a87bb38573a5c03675d9201ebe22fc803db75bf84d5828dbbbb5008ea746da8a9a8340cee2e8dee7aadab91d4edf0f32c2d90f SHA512 9bfc9661ad8b4c27b32a9c15653bed831abd1d8a7923bf9c0468c8d3a2e8f5acf48d783689c20ac90f834344ee629a0d6525f43e19e68bbfe3044bcf219dbe37
-EBUILD diskimage-builder-2.27.2.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
+DIST diskimage-builder-2.28.0.tar.gz 425808 BLAKE2B f3cceec35f019b248df8aaa94f70231dc51a9fed06cf93b16366536cfcf45b4477b7aa09371bb3cffe95f51c74d0abf9065285b7b74c5d805604c2b00df8f38f SHA512 6eddef513e8550fb6f90e917a504bac1166ef4355791bd9b0c10addebb8f84b783bf4e53dd472e6ed9acb5d3dcd951e675f4e9983ec4170c31afdb257b84e24d
+EBUILD diskimage-builder-2.27.2.ebuild 1278 BLAKE2B 8a763c66fa85499b81a5f74315a87bb38573a5c03675d9201ebe22fc803db75bf84d5828dbbbb5008ea746da8a9a8340cee2e8dee7aadab91d4edf0f32c2d90f SHA512 9bfc9661ad8b4c27b32a9c15653bed831abd1d8a7923bf9c0468c8d3a2e8f5acf48d783689c20ac90f834344ee629a0d6525f43e19e68bbfe3044bcf219dbe37
+EBUILD diskimage-builder-2.28.0.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
 EBUILD diskimage-builder-9999.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.27.2.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.27.2.ebuild
index 86d3bb124b34..20cf3dfed3ae 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.27.2.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.27.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.26.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.28.0.ebuild
index 20cf3dfed3ae..86d3bb124b34 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.26.1.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.28.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-emulation/dlx/Manifest b/app-emulation/dlx/Manifest
index e7fad12e2edc..e5f904da0f7d 100644
--- a/app-emulation/dlx/Manifest
+++ b/app-emulation/dlx/Manifest
@@ -1,5 +1,5 @@
 DIST dlx-1.0.0.tar.gz 112589 BLAKE2B 307785d08fd69e45264471fbc21e3b2bdba99798c0b7144c3d6a92819c29e4ac6449a6db83fdd55ba81d3b2e3f8ca6c991ee6c117ddc490a88ae210e5bc07ab8 SHA512 99297f14f6716ada7a29b204723a0c951002529362a22f695b3647517462f43af563ea55467985dda3e21d79a14d46b84dbc9b22a8c0751fba49257e30f70a7f
 DIST dlx-1.5.20.zip 137039 BLAKE2B 99dbb2e5bcd89b3e9f3d8edc2fe7e7cc0a59f870f597a40a61a993b95d8b27c4f95b8d0490fdbcbc15693040d6e3abdfb8b0062e109916f5299c3da3c203d755 SHA512 5c832c2a486a82574ae03ec0cb4e30bfec74ef968658a38fbd896a1383dcdc558501baef7cbbdf99df453ba2840622d16c1619f9c5fe34b6cd058a7718bd3790
-EBUILD dlx-1.0.0.ebuild 375 BLAKE2B b9a5b9cfca4eb241491f272abf08bf2fd95935571404274f6df5b07ba044ca143b01d5e2dc25b4f07d289e732a84c45fdbe734fc1ae0eb092ed01b0dcfab3044 SHA512 c65ee800a5658c356972568a4ab7ed986b73cb3647e5ba71e071ed5a73ea5a5d8df3b829b6f07b6150bea9e078b9da7c91108e18dea0f6c95f55949f6559a499
+EBUILD dlx-1.0.0.ebuild 361 BLAKE2B f57216e8868285ae5deade698290f8041e0f5427ce0f04342f10f09880d252a19ca175e3d97ffb14b2108fac52d1d6df75d4fb811e769c7e89d8a96166d25ca0 SHA512 da16791fd192500ed45faed474cf85f1e664dad93f5b7253583660a7a070cfb9276ce1f77ccfcbc45bebb31ef88c236665e4db57bb511e7d03dca8b20afb3379
 EBUILD dlx-1.5.20.ebuild 594 BLAKE2B 25a39d4195d1995c58d3206288ee9d73f34010a0dd986b4a91b4dcfa5cb1d9a422c909d1cd1290dc63c2b4ec1b478e85c2dbbf495ac5e0ad8c3c86a25f8a60e8 SHA512 85cfc7920a765d93c13c002ea73b4d4853ab52be99c535892e0231bba339ec813d881339b22394bbb3186a22db8c96db0fed8c19e89fdf951ebc3e7573bce4d5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-emulation/dlx/dlx-1.0.0.ebuild b/app-emulation/dlx/dlx-1.0.0.ebuild
index 07a21a906582..401c626c72df 100644
--- a/app-emulation/dlx/dlx-1.0.0.ebuild
+++ b/app-emulation/dlx/dlx-1.0.0.ebuild
@@ -7,7 +7,7 @@ S=${WORKDIR}/dlx
 
 DESCRIPTION="DLX Simulator"
 HOMEPAGE="https://www.davidviner.com/dlx"
-SRC_URI="mirror://gentoo/dlx.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest
index fbf4bce4c8b6..199ebf9e03e2 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -1,5 +1,7 @@
 DIST docker-proxy-0.8.0_p20190513.tar.gz 2705298 BLAKE2B ff897b18b8265b3d718caf7afaf10f7b8eeed9be0cc9c73b02d5c42c5c9ddd1be32cf7d1259ce26d56219cda57707e25e154e50cfa2cc80e823a4b924da4e5e0 SHA512 0a833510df0029999bfc05c23445a58a8b2ff165c0fb2fd5c411498d1e89b5b1990d2778b32346dd2b6d61c166ff707c6277a5d1937db6345c77d3825eb59875
 DIST docker-proxy-0.8.0_p20190604.tar.gz 2721379 BLAKE2B edc36302ca4b2be297505a5bfd8acd45f17bc752e88bcaa72f34e2d972230d92b9bfe3d0dccbb2f1e04718fb1adc95631fc0f533ca5572bdcfc468d843ce480e SHA512 dea31fd82ab2d445fbd39fe15550a91f7e489a06f6dedd32ea1925f7e9a7971952d26b874f9687249609a0d204ea35da357e0a957b819df2026a0cf8109cb354
+DIST docker-proxy-0.8.0_p20190807.tar.gz 3377742 BLAKE2B c1ccc76dd9157c715d09db27b6800a86b0dc7532089d87eb78a6e656f3b42d4c4824c34e972196038f915e3b08b12197f305fd1a86e3fe75fec621ed49e5e71a SHA512 ffe18805dc6b85f8b058e342cde2baedf2497465298daa444fecba8222885606c85242ca59016bc32a5c2c0164c1c980b92ed3d5f82e011a7e9871a67d67b947
 EBUILD docker-proxy-0.8.0_p20190513.ebuild 780 BLAKE2B 46a02fb28634760b3fb4b048eee895b152f53fde4f501df7896966bf7e8290d2438c61a0545a2c9782fb2b7bb308a1040c493b8f180991b05a581eda747d7d02 SHA512 bd52763fab7f7b59361e6acdd2249209e72bae8cc50542f0dfa3ea8010a65cc8ebee33c4bb5891a59840d35988048c6a8a3bafc82f6c735f01860a66c066ed95
 EBUILD docker-proxy-0.8.0_p20190604.ebuild 770 BLAKE2B b89a0056ae26fa7e122bbf72b9a6b7688e44de38f1c6173d4c80641e4c1a98bb403349863fa16f05aedc30b658836748e85b28018a79f6345baa76dc5ea6536c SHA512 77d3f27c7beb8c2208774d81954f5b699ab685a0e6aa5d39d973be74050128fda2c753790c06976aebc2aa4e8f842d7df2bcebba897424d6b09ef3841fc93257
+EBUILD docker-proxy-0.8.0_p20190807.ebuild 770 BLAKE2B 8a90022b2b412cc1e0d389b55e84bfac47c3d3965c5b0a1817b0b68acd9f2e446fe458e8c69aa1136f5c965f9b586b33251213aaca6fee5a1d3af64d3f374f39 SHA512 6b634b77da647e181ed5ba4d546919cc8dc068ddc6055fd7ebddba099b3f938b47aa862af3c2946c9221f20befadc626b05e86bb6417904c986e9fc61893b03e
 MISC metadata.xml 543 BLAKE2B 69df333c0432bae7b2211dfa93683e3aee83fd63283fd7e34e0917e3292bd5d8947580fe7977fbc6f5d60fa0ca2d7902416bf4b878e27cbf2cf3413abacd18d6 SHA512 8580076d68f5803bc66fb9cdc088d13be2610ce1f200e614efcdabe75cfbeae5b72bcc4d043ce18844b4774f18e7861c3b6c788fa294c29e856bbcdd091677f6
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190807.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190807.ebuild
new file mode 100644
index 000000000000..1c5ef257e177
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190807.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="45c710223c5fbf04dc3028b9a90b51892e36ca7f"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test" # needs dockerd
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || die
+}
+
+src_install() {
+	dodoc README.md CHANGELOG.md
+	dobin bin/docker-proxy
+}
diff --git a/app-emulation/docker-registry/Manifest b/app-emulation/docker-registry/Manifest
index d55153d01ab9..3be58a6ccda5 100644
--- a/app-emulation/docker-registry/Manifest
+++ b/app-emulation/docker-registry/Manifest
@@ -1,4 +1,3 @@
-AUX docker-registry-2.6.1-notifications-expvar.patch 2360 BLAKE2B 15cf7bbc25503c6af51552ec18a8d585a5ae4e2b79ed385da01da568e79e5f68e6fbd4dfbbd5ed8a40ffc86a337b44fd78457658d28f57f76b081a4509c6ff6a SHA512 2a1aa8fd0f5df6380c8b0b11bdbc0c8f62c02cdbd87d1b697f691189c04409c71a69cf50e36704cb8b7c3c6040c88c77110076aae439aa9e173f95b4347dbc0a
 AUX docker-registry-2.7.0-notification-metrics.patch 15565 BLAKE2B 31d3bc9d40c07939aca340d0c9bb516eb5afb9191f5d5d7c92b85f9f6dc8e1d86b659df337565eb09a0d08558ee50e1301734fcfa0449a920fcb332c00452c1a SHA512 a2161e5d2638f5682d70d900aba86cba3ca61ae99f7e325a5691c2cc4e5408f4a543c6204a05c19748494f1145e8468cf27e359ffad624fdac1e710974654e2c
 AUX registry.confd 85 BLAKE2B 0997c1ad7ee8fc165a87cfebeea75694487c8d8b62130fb19fd4d9c55cc605754537deaea6e114a9fb28e46eb67bb6ab9d01de0971163acf22f223ca8ec84605 SHA512 7cbd19f545b659e2d295938b320710ae20b3c2222fcb6668216985c6e55bf51647041dec1c33ab7271e464f13001d8095fef9240d3390cff7e65028d3432c4f4
 AUX registry.initd 606 BLAKE2B ed8af2651d91be13578edb561c067cfd3e72dfe42a6111be8930d61f233248b7364659a8db5a9800eaa167d76a8b2daf9d121970622de235e61fa0f10ad85174 SHA512 af7780264d068adcd0d6a6768b88ab43c26081b71d1ebd591ca6d175e413cdeee935a6f50d9833775690f0b47daadcc33286f86fb5eb98d2e674b225122aabce
diff --git a/app-emulation/docker-registry/files/docker-registry-2.6.1-notifications-expvar.patch b/app-emulation/docker-registry/files/docker-registry-2.6.1-notifications-expvar.patch
deleted file mode 100644
index 1d40edf1f0cd..000000000000
--- a/app-emulation/docker-registry/files/docker-registry-2.6.1-notifications-expvar.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 9a58c91051e03b46f1461e371a7bf527c1284612 Mon Sep 17 00:00:00 2001
-From: Noah Treuhaft <noah.treuhaft@docker.com>
-Date: Wed, 8 Feb 2017 11:38:44 -0800
-Subject: [PATCH] notifications: fix expvar for Go 1.7
-
-Remove EndpointConfig.Transport from the return value of the
-registry.notifications.endpoints expvar.Func.  It results in an empty
-value for that expvar variable under Go 1.7 because it is a non-nil
-*http.Transport, which Go 1.7 can no longer encode as JSON.
-
-Signed-off-by: Noah Treuhaft <noah.treuhaft@docker.com>
----
- notifications/endpoint.go     |  2 +-
- notifications/metrics_test.go | 28 ++++++++++++++++++++++++++++
- 2 files changed, 29 insertions(+), 1 deletion(-)
- create mode 100644 notifications/metrics_test.go
-
-diff --git a/src/github.com/docker/distribution/notifications/endpoint.go b/src/github.com/docker/distribution/notifications/endpoint.go
-index 29a9e27b5..44d0f6d7b 100644
---- a/src/github.com/docker/distribution/notifications/endpoint.go
-+++ b/src/github.com/docker/distribution/notifications/endpoint.go
-@@ -13,7 +13,7 @@ type EndpointConfig struct {
- 	Threshold         int
- 	Backoff           time.Duration
- 	IgnoredMediaTypes []string
--	Transport         *http.Transport
-+	Transport         *http.Transport `json:"-"`
- }
- 
- // defaults set any zero-valued fields to a reasonable default.
-diff --git a/src/github.com/docker/distribution/notifications/metrics_test.go b/src/github.com/docker/distribution/notifications/metrics_test.go
-new file mode 100644
-index 000000000..03a08e2c8
---- /dev/null
-+++ b/notifications/metrics_test.go
-@@ -0,0 +1,28 @@
-+package notifications
-+
-+import (
-+	"encoding/json"
-+	"expvar"
-+	"testing"
-+)
-+
-+func TestMetricsExpvar(t *testing.T) {
-+	endpointsVar := expvar.Get("registry").(*expvar.Map).Get("notifications").(*expvar.Map).Get("endpoints")
-+
-+	var v interface{}
-+	if err := json.Unmarshal([]byte(endpointsVar.String()), &v); err != nil {
-+		t.Fatalf("unexpected error unmarshaling endpoints: %v", err)
-+	}
-+	if v != nil {
-+		t.Fatalf("expected nil, got %#v", v)
-+	}
-+
-+	NewEndpoint("x", "y", EndpointConfig{})
-+
-+	if err := json.Unmarshal([]byte(endpointsVar.String()), &v); err != nil {
-+		t.Fatalf("unexpected error unmarshaling endpoints: %v", err)
-+	}
-+	if slice, ok := v.([]interface{}); !ok || len(slice) != 1 {
-+		t.Logf("expected one-element []interface{}, got %#v", v)
-+	}
-+}
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index e84b7827ae27..f480b228fdda 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,5 +1,7 @@
 DIST docker-18.09.9.tar.gz 15299640 BLAKE2B 2a4fa670ddac0136e85300fd137a8ea91651c51c54fa3d52ddc5b1a640a1ee202a34f428fcf9eea286c581f49a2c28b711100e7541773e5bc1f2e37884cae2dc SHA512 d0235ae54e4d8d4d0893f6f35293f36177afabc71d0b3e6a74341260e52dcd9351a924efe8fa299cf9a51efdc68b6b284f6435d7210c44193a673f7fff71ce0b
 DIST docker-19.03.2.tar.gz 16657356 BLAKE2B 3e48ea67f1ef65786c30b4d47b29dbe92d7fb7b043d2c4f15c07cdc929554a07870ce5ade2c1fe26eebea74d28dc71752e9c96e86fe12e0d96608059b5c91f11 SHA512 6b594fdbb53dcc0228781375a3884eb370446738c44f7c1e42945c4ccc263e75f53d984bc8ea6a6a498446859e667305bd967299c12956f1cb925d868a4bf2b8
+DIST docker-19.03.3.tar.gz 16960782 BLAKE2B 8ce23ca22edf7c4435dbaca5a0321de52b108951b935d5ed82439c57409757cd054698934f9dbabbbbb0db74d5c9f6a6d04c5ca33e64212dedc0c9bf92d06ddb SHA512 251756ca8b5d8eb962fde447fdab8307ce8013e14dc3b955387af5d8bdfdee16ea170ecb37a59e5900fa5c2e366f0d4080e79c28e5b8ef945cc67cb959d88eef
 EBUILD docker-18.09.9.ebuild 8354 BLAKE2B 5e0ab831398f7c54025bb0d03001c13625758dfb3988e0828ad2b5cda246aa55ac4536396df8c62c14b7df353e32709d2306b50220d0b9f00c2ae32ad40b24c6 SHA512 62d3bfd28f0b4feb9846fc6befe15d2b926801a7b7015784b9ca7435874a3d974c85f3ec000b1ad8dde40141ed42de5dca5e2630db7028cfeec3ad662802a437
 EBUILD docker-19.03.2.ebuild 8355 BLAKE2B 5d2b42bfae72f37eccbeb127643f2757c2379fe1b5709aa9c3cd27e194835bfe059ee6e5bd2f9617d80222cd2ae659b1efb73cf3f9669de8042d5afe467b6a62 SHA512 c6d1c6bd79e51e728b38bbc6505020cdd650525edfb961c192fd5dd99a51962e6c3e6f1f5b1d7462a4f6ea8dd318e46b172410a8f432fc2bfdaeab7943e1b141
+EBUILD docker-19.03.3.ebuild 8358 BLAKE2B e3341a43f8d8f049ce5a2d47076ac612a15e68317b05274277dca827d3fd174f0ca2e5fabcacd08d80d4784668c41700b9cc0f8992590189d91a527e2bb26809 SHA512 f07974b7fac5f9563df351ca07519383edb1f877d56872621f27ae22b8d0e0a51548040fff7f3081c79b4cc3aecb375bd88842d5080b4136f9e4ed0595398721
 MISC metadata.xml 1576 BLAKE2B 7a378d4abcda0352c4c96108a238d693e9104a1de624f8fb4e808bfbf5ad4960c1f6155b1f6c78ff2bc6609653285e911e7eae9f319696e39c60b63e5127ef11 SHA512 9944178c2202c12bc7364f9722e70b71583bfc60a318348060d0ee8ba713c892259da46c222ce7fea4b1294be8b01b7d1b359976931e287f574733b65403e762
diff --git a/app-emulation/docker/docker-19.03.3.ebuild b/app-emulation/docker/docker-19.03.3.ebuild
new file mode 100644
index 000000000000..1cbb014cfdde
--- /dev/null
+++ b/app-emulation/docker/docker-19.03.3.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = *9999* ]]; then
+	# Docker cannot be fetched via "go get", thanks to autogenerated code
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	inherit git-r3
+else
+	DOCKER_GITCOMMIT="1576bd7"
+	MY_PV=${PV/_/-}
+	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+	inherit golang-vcs-snapshot
+fi
+inherit bash-completion-r1 golang-base linux-info systemd udev user
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://dockerproject.org"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+	>=dev-db/sqlite-3.7.9:3
+	device-mapper? (
+		>=sys-fs/lvm2-2.02.89[thin]
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+	apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+	${CDEPEND}
+
+	>=dev-lang/go-1.12
+	dev-go/go-md2man
+
+	btrfs? (
+		>=sys-fs/btrfs-progs-3.16.1
+	)
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+	${CDEPEND}
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	~app-emulation/containerd-1.2.10
+	~app-emulation/runc-1.0.0_rc9[apparmor?,seccomp?]
+	~app-emulation/docker-proxy-0.8.0_p20190807
+	container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+	~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+	~VXLAN
+	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if kernel_is lt 5 1; then
+		CONFIG_CHECK+="
+			~NF_NAT_IPV4
+			~IOSCHED_CFQ
+			~CFQ_GROUP_IOSCHED
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	if use overlay; then
+		CONFIG_CHECK+="
+			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
+		"
+	fi
+
+	linux-info_pkg_setup
+
+	# create docker group for the code checking for it in /etc/group
+	enewgroup docker
+}
+
+src_compile() {
+	export GOPATH="${WORKDIR}/${P}"
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# if we're building from a tarball, we need the GITCOMMIT value
+	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
+
+	# fake golang layout
+	ln -s docker-ce/components/engine ../docker || die
+	ln -s docker-ce/components/cli ../cli || die
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	pushd components/engine || die
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	VERSION="$(cat ../../VERSION)" \
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	# build cli
+	emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat ../../VERSION)" \
+		GITCOMMIT="${DOCKER_GITCOMMIT}" \
+		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
+		dynbinary || die
+
+	# build man pages
+	go build -o gen-manpages github.com/docker/cli/man || die
+	./gen-manpages --root . --target ./man/man1 || die
+	./man/md2man-all.sh -q || die
+	rm gen-manpages || die
+	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+
+	popd || die # components/cli
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+
+	pushd components/engine || die
+	newbin bundles/dynbinary-daemon/dockerd-${PV} dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/syntax/vim/ftdetect
+	doins -r contrib/syntax/vim/syntax
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	newbin build/docker-* docker
+
+	doman man/man*/*
+
+	dobashcomp contrib/completion/bash/*
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+	popd || die # components/cli
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
+	elog "  rc-update add docker default"
+	elog "Similarly for systemd:"
+	elog "  systemctl enable docker.service"
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog "  usermod -aG docker youruser"
+	elog
+
+	elog " Devicemapper storage driver has been deprecated"
+	elog " It will be removed in a future release"
+}
diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index b7bcdf399a90..e388fb66d160 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -1,5 +1,7 @@
 AUX faudio.pc 245 BLAKE2B 8231bb42f6d90dd814eabd12d4d582d74ea0f154d6913fa710814d1bd75168d667463fd430d827ac7854aaa76bc07d16e5ccb3f6455e990ae0e2bc21bc633291 SHA512 bbdce2d90fcf848b8ef6a7a47a5bdf535d261aa833d6821de21907be05cca8693fede48c0e4161ae8087522297a2ec5af8c5ff5ed42efb814bbbc195ff963059
 DIST FAudio-19.06.tar.gz 899089 BLAKE2B a59ad9613bcfa71e1fc8be1f2d389f56b8f96430c354b7c7148d1e1e084102b6d8559cd258f3ab6969a4ac93e55ea2397b18dc417857e9ee0f022ea0dae65c0e SHA512 ba3ee18b47d8d85dc39e777c420522349f9873cf1528dd6c266f7254fe27cdb5bb6ab5bcbeab870938b509bfd006590d2380908b7d1e3fd679d2a434ce82eca6
-EBUILD faudio-19.06.ebuild 2433 BLAKE2B abec98d564c929b8aee5945ee92d1eac2614bfe91bc1daf394bbe5486761ee4777f69ea67f8f1081341ab7a13f33fe5b421fee2fd7a972dd63d7934102e23cef SHA512 52beb934cc86c94303c44dba96d586e64434beefa7b25674813f2f6df29dfcd2e2cf8bbdcb8a9e149f15421a8b325799945dc69497afad3fa6995ee2a4afbe40
-EBUILD faudio-9999.ebuild 2433 BLAKE2B abec98d564c929b8aee5945ee92d1eac2614bfe91bc1daf394bbe5486761ee4777f69ea67f8f1081341ab7a13f33fe5b421fee2fd7a972dd63d7934102e23cef SHA512 52beb934cc86c94303c44dba96d586e64434beefa7b25674813f2f6df29dfcd2e2cf8bbdcb8a9e149f15421a8b325799945dc69497afad3fa6995ee2a4afbe40
+DIST FAudio-19.09.tar.gz 901659 BLAKE2B 8bb99c67b6da2660e71c7a8a70f83130738a07e7f4ddd2001fb857c81a593935506a8c1fe6d24bfd064537ea4a5a603973c32d839228d7b3f45c9c300ba15147 SHA512 127f975c68e2b449fa7cadae0723925f35ca7a2841ea3fd85037febe964331de4b2e3031ab09c292ee5f40d90902dcf78c75cc3fe7fbe4d6f37a822b4d9eb966
+EBUILD faudio-19.06.ebuild 2423 BLAKE2B 821535d584103610f27a00f7353d0a0cf646cd2e5f5079b7e4c9031e6bd3d7348464c710b729231bea6d54fb42c7412f6eb9a29e59f3e454ec486ec69792f820 SHA512 1804c42d0af6a3b325a08de3f9ec2a6b8ed1553e432d6a1b6a9411debc081114d918af15742d25a33cfab70280517efc00aafb2efff81aaeafbff0d1548b04f8
+EBUILD faudio-19.09.ebuild 2423 BLAKE2B 821535d584103610f27a00f7353d0a0cf646cd2e5f5079b7e4c9031e6bd3d7348464c710b729231bea6d54fb42c7412f6eb9a29e59f3e454ec486ec69792f820 SHA512 1804c42d0af6a3b325a08de3f9ec2a6b8ed1553e432d6a1b6a9411debc081114d918af15742d25a33cfab70280517efc00aafb2efff81aaeafbff0d1548b04f8
+EBUILD faudio-9999.ebuild 2423 BLAKE2B 821535d584103610f27a00f7353d0a0cf646cd2e5f5079b7e4c9031e6bd3d7348464c710b729231bea6d54fb42c7412f6eb9a29e59f3e454ec486ec69792f820 SHA512 1804c42d0af6a3b325a08de3f9ec2a6b8ed1553e432d6a1b6a9411debc081114d918af15742d25a33cfab70280517efc00aafb2efff81aaeafbff0d1548b04f8
 MISC metadata.xml 1341 BLAKE2B a5fe79fca0c7f184466254e5f251c6248c20415795933b8797a4bd899535735ed93b54754937ed1003103cbbe3d5d6c5ffc5848c255cfd759cb06fb973065003 SHA512 8ad14c2ae094ff4ffd013458db62263b97cc5e616885cb229ef57ff8a4ab0dd943c2ab3840d086a81a4a10962c0d7411741ac6a8daaefb5167fe988a1dd8122a
diff --git a/app-emulation/faudio/faudio-19.06.ebuild b/app-emulation/faudio/faudio-19.06.ebuild
index a8490f1cf230..5c40e2ec7566 100644
--- a/app-emulation/faudio/faudio-19.06.ebuild
+++ b/app-emulation/faudio/faudio-19.06.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/FNA-XNA/${FAUDIO_PN}.git"
 else
 	SRC_URI="https://github.com/FNA-XNA/${FAUDIO_PN}/archive/${FAUDIO_PV}.tar.gz -> ${FAUDIO_P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 	S="${WORKDIR}/${FAUDIO_P}"
 fi
 
diff --git a/app-emulation/faudio/faudio-19.09.ebuild b/app-emulation/faudio/faudio-19.09.ebuild
new file mode 100644
index 000000000000..5c40e2ec7566
--- /dev/null
+++ b/app-emulation/faudio/faudio-19.09.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# shellcheck disable=SC2034
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-multilib virtualx
+
+FAUDIO_PN="FAudio"
+FAUDIO_PV="${PV}"
+FAUDIO_P="${FAUDIO_PN}-${FAUDIO_PV}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FNA-XNA/${FAUDIO_PN}.git"
+else
+	SRC_URI="https://github.com/FNA-XNA/${FAUDIO_PN}/archive/${FAUDIO_PV}.tar.gz -> ${FAUDIO_P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~x86"
+	S="${WORKDIR}/${FAUDIO_P}"
+fi
+
+DESCRIPTION="FAudio - Accuracy-focused XAudio reimplementation for open platforms"
+HOMEPAGE="https://fna-xna.github.io/"
+LICENSE="ZLIB"
+SLOT="0"
+
+IUSE="+abi_x86_32 +abi_x86_64 debug ffmpeg xnasong test utils"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
+
+COMMON_DEPEND="
+	>=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}]
+	ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+"
+DEPEND="${COMMON_DEPEND}
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_INSTALL_BINDIR=bin"
+		"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
+		"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
+		"-DCMAKE_INSTALL_PREFIX=${EPREFIX%/}/usr"
+		"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
+		"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
+		"-DBUILD_TESTS=$(usex test ON OFF)"
+		"-DBUILD_UTILS=$(usex utils ON OFF)"
+		"-DFFMPEG=$(usex ffmpeg ON OFF)"
+		"-DXNASONG=$(usex xnasong ON OFF)"
+	)
+	if use ffmpeg; then
+		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)"  )
+	fi
+	cmake-utils_src_configure
+}
+
+src_configure() {
+	cmake-multilib_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_make
+	emake -C "${BUILD_DIR}" all
+}
+
+multilib_src_install() {
+	# FIXME: do we want to install the FAudio tools?
+	cmake-utils_src_install
+
+	sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \
+		"${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \
+		|| die "sed failed"
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins "${T}/faudio.pc"
+
+	if use test; then
+		mkdir -p "${T}/$(get_libdir)"
+		cp "${BUILD_DIR}/faudio_tests" "${T}/$(get_libdir)/" || die "cp failed"
+	fi
+}
+
+faudio_test() {
+	XDG_RUNTIME_DIR="/run/user/0" virtx "${T}/$(get_libdir)/faudio_tests"
+}
+
+pkg_postinst() {
+	use test || return
+
+	# FIXME: FAudio tests are broken and also don't appear to work
+	# in the Portage sandbox.
+	multilib_foreach_abi faudio_test
+}
diff --git a/app-emulation/faudio/faudio-9999.ebuild b/app-emulation/faudio/faudio-9999.ebuild
index a8490f1cf230..5c40e2ec7566 100644
--- a/app-emulation/faudio/faudio-9999.ebuild
+++ b/app-emulation/faudio/faudio-9999.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/FNA-XNA/${FAUDIO_PN}.git"
 else
 	SRC_URI="https://github.com/FNA-XNA/${FAUDIO_PN}/archive/${FAUDIO_PV}.tar.gz -> ${FAUDIO_P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 	S="${WORKDIR}/${FAUDIO_P}"
 fi
 
diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest
index f3c32f6b4ff7..f759d5829362 100644
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -1,8 +1,6 @@
 AUX 0.3-nine-dll-path.patch 414 BLAKE2B a1747c90521f2fec6ba70ea77c2b7a2adafd705e04a46ea14fe983859f00c0aa33ec73dc24a03805579b84b57a2528857994943bb999e2f38c6f652404fd661e SHA512 423a7ebd8284c475d226109e0af9d867753b75ff1d1a9100d948c91e71dbc76bd8d8973e4ecf3fdb8fab5555da6339484459c623f028f7091e9d010395f24970
-AUX flags.patch 928 BLAKE2B 62f7d6c3e904ad13f39f6e554fb02784b1d68bcea92208c16f0583d41dbd95c1bc52d6b58ee7b88aff54073f9afc078839759f752ee765ebb8059a81fe52dee3 SHA512 e37221abb35a4c170a38db0129a0413b54863952ed00efa36dd0b8af67850cde3949d8b81547bad8c13783ddd7a32407b6eaf33881505cdfe165a29ec9c31c19
-DIST gallium-nine-standalone-0.3.tar.gz 63887 BLAKE2B bd198617a5d3d3830bd5127b63eed2c82bff037141ae72ff9237ad5062fdbe9b6797e233eaf86e06d92153487c53389eb094b0be3b0cbdbf3fe565292a15cbb0 SHA512 80fedca58523fbf318109d2d3d5420e97d26ebf5b89b9f1965165c7a33c9dab9c62a65f14b75569b5126c549f5df91beef372d54e94dc90c608932eeb6a59829
-DIST gallium-nine-standalone-0.4.tar.gz 66820 BLAKE2B 7e7b0028f0c7e7c26fa1ee164e7e867fee39a5f315b750bfc3537e8720e9fbc625ca27fb28a58e8e521af455f8ab347d6fd6ca82786fe5ac9d76e368cd43466e SHA512 6af31e828400c6f711c76d91fb65215f4ba79c31b8d98f3e953b319593d96d1e5e78e07aca96529de37bbb89f3479a4d4db5f58e32ce7b98667284be10a9e532
-EBUILD gallium-nine-standalone-0.3.ebuild 2933 BLAKE2B 442d7846ca83823a7f0149ebfdc45ff4956089c3c474632f8db2bc2ede2d83e17cc18ace983b0c987077d5a8a5ae8ec1ed1b0208b362989d7c8ff9cb1738ad90 SHA512 03e4c024fd647581e83ebd7702a3f79d0438e533c164760cf332075ad4ade69c8baef2f2d4cebfaf7109dcaa7acb20db33d54678b3064eb9e89897b7b6881720
-EBUILD gallium-nine-standalone-0.4.ebuild 2787 BLAKE2B 18a81e313b78b1f5eb85af12620e3e40ed249470a62385ad1ccd90f53f0680803ee7cac7849dee19462f794411e0f206bb44e386fcffb56aece3f3989fad7c6f SHA512 ec186e36f80cd37e403f23d99720f356d6b1da2ec62d3da4e04e0179af0992943cc475112c92396fe82c547a5dd736ef3b0ddfe4cb509357eae2ca0672577c5f
-EBUILD gallium-nine-standalone-9999.ebuild 2787 BLAKE2B 18a81e313b78b1f5eb85af12620e3e40ed249470a62385ad1ccd90f53f0680803ee7cac7849dee19462f794411e0f206bb44e386fcffb56aece3f3989fad7c6f SHA512 ec186e36f80cd37e403f23d99720f356d6b1da2ec62d3da4e04e0179af0992943cc475112c92396fe82c547a5dd736ef3b0ddfe4cb509357eae2ca0672577c5f
+AUX 0.5-flags.patch 852 BLAKE2B 22423ccfcfcc111a52a3daf2c46f4e7e39d08f63d59c8c85ba3f8be97d972b1e251d4328e8ea8c123cbf7b403d0a94f84b97b9c16df2b1d5d14e82a44b36f2a6 SHA512 696069c9b70017be64dea6607ea67d49fa53057508cc75124161a44f0b8dc52053698612a8ba63ae2060c1dcfa80a57eb7e1546e2bf35be988871ce4e794cb90
+DIST gallium-nine-standalone-0.5.tar.gz 69056 BLAKE2B 6acfd500a31e480e2e09e751097beaa2bc94c574edd2b313adb707dc65447be1868ed190bf13549cc38eae945d421242a5d3b2c068486ad35347903e27e0bf80 SHA512 6223a851536c67d32e3a834d7a3c7b93fb59c226b127e1ee1b5a72a7cc93172173f5004ca4944a842015650ef80e8427a684109ae5a4a9e9ef838961e0767c78
+EBUILD gallium-nine-standalone-0.5.ebuild 2791 BLAKE2B d82061051d85588e32381f98a8fd067a241258a1398bf3c9083e96f966da811da520e16c6dc521fa2a763ff10adac5c2581b00baede67cb5699e9ebc46cc5921 SHA512 9444138cfe3a0081f1c9f32043818c5af488657db8a365fc8a943c2148d825ab30975063b6c4c1c1c58a12aec4dfae6120a6c91a80082e1bc33103fe601c90ff
+EBUILD gallium-nine-standalone-9999.ebuild 2791 BLAKE2B d82061051d85588e32381f98a8fd067a241258a1398bf3c9083e96f966da811da520e16c6dc521fa2a763ff10adac5c2581b00baede67cb5699e9ebc46cc5921 SHA512 9444138cfe3a0081f1c9f32043818c5af488657db8a365fc8a943c2148d825ab30975063b6c4c1c1c58a12aec4dfae6120a6c91a80082e1bc33103fe601c90ff
 MISC metadata.xml 774 BLAKE2B 8b793ed6e079a800628ed7e59786bc82dd191c05367ef5e1600f903f3ebfd32c9ab0034a1dba1701ec104348cf1b9a8b437b63300e607a65ee92b1887be4800f SHA512 9453d7d767ba7f788291c6980a86388a0f952b893a474aa17e249c4f3b9b77b864108230fdc8f8b94e74eb45443f608a8d9ecde10cbc121234c9b91f59e7b752
diff --git a/app-emulation/gallium-nine-standalone/files/flags.patch b/app-emulation/gallium-nine-standalone/files/0.5-flags.patch
index 217dcddf35b9..7c0e883d697d 100644
--- a/app-emulation/gallium-nine-standalone/files/flags.patch
+++ b/app-emulation/gallium-nine-standalone/files/0.5-flags.patch
@@ -1,27 +1,27 @@
 diff -Naur a/tools/cross-wine32.in b/tools/cross-wine32.in
---- a/tools/cross-wine32.in	2019-01-12 16:45:09.190471883 +0000
-+++ b/tools/cross-wine32.in	2019-01-12 16:48:22.569404982 +0000
+--- a/tools/cross-wine32.in	2019-09-25 13:25:24.000000000 +0100
++++ b/tools/cross-wine32.in	2019-09-30 23:05:00.121344967 +0100
 @@ -5,8 +5,8 @@
  pkgconfig = '@PKG_CONFIG@'
  
  [properties]
--c_args = ['-m32', '--no-gnu-unique']
+-c_args = ['-m32']
 -c_link_args = ['-m32', '-mwindows']
-+c_args = @CFLAGS@ + ['-m32', '--no-gnu-unique']
++c_args = @CFLAGS@ + ['-m32']
 +c_link_args = @LDFLAGS@ + ['-m32', '-mwindows']
  needs_exe_wrapper = true
  
  [host_machine]
 diff -Naur a/tools/cross-wine64.in b/tools/cross-wine64.in
---- a/tools/cross-wine64.in	2019-01-12 16:45:09.190471883 +0000
-+++ b/tools/cross-wine64.in	2019-01-12 16:48:19.865349306 +0000
+--- a/tools/cross-wine64.in	2019-09-25 13:25:24.000000000 +0100
++++ b/tools/cross-wine64.in	2019-09-30 23:04:57.340283350 +0100
 @@ -5,8 +5,8 @@
  pkgconfig = '@PKG_CONFIG@'
  
  [properties]
--c_args = ['-m64', '--no-gnu-unique']
+-c_args = ['-m64']
 -c_link_args = ['-m64', '-mwindows']
-+c_args = @CFLAGS@ + ['-m64', '--no-gnu-unique']
++c_args = @CFLAGS@ + ['-m64']
 +c_link_args = @LDFLAGS@ + ['-m64', '-mwindows']
  needs_exe_wrapper = true
  
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild
deleted file mode 100644
index b71e44053307..000000000000
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson multilib-minimal toolchain-funcs
-
-MY_PN="wine-nine-standalone"
-DESCRIPTION="A standalone version of the WINE parts of Gallium Nine"
-HOMEPAGE="https://github.com/iXit/wine-nine-standalone"
-
-if [[ $PV = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/iXit/${MY_PN}.git"
-else
-	SRC_URI="https://github.com/iXit/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-# We don't put Wine in RDEPEND because you can also use this with
-# Steam's Proton.
-
-RDEPEND="
-	media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	virtual/wine[${MULTILIB_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}"/flags.patch
-	"${FILESDIR}"/0.3-nine-dll-path.patch
-)
-
-bits() {
-	if [[ ${ABI} = amd64 ]]; then
-		echo 64
-	else
-		echo 32
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Upstream includes a bootstrap.sh script with hardcoded CHOSTs to
-	# create the Meson cross files. We improve on that here but also
-	# inject CFLAGS and LDFLAGS, partly to simply respect these, and
-	# partly to allow d3d9-nine.dll to be loaded from a location outside
-	# WINEPREFIX. This avoids the need for the nine-install.sh script,
-	# which doesn't play well with our multi-Wine environment.
-	bootstrap_nine() {
-		local file=tools/cross-wine$(bits)
-		local g9dll=Z:${EPREFIX//\//\\}\\usr\\$(get_libdir)\\d3d9-nine.dll.so
-
-		# Yes, these ridiculous backslashes are needed!
-		g9dll=\\\\\\\\\\\"${g9dll//\\/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\}\\\\\\\\\\\"
-
-		sed \
-			-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
-			-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} -DG9DLL=${g9dll}")!" \
-			-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
-			${file}.in > ${file} || die
-	}
-
-	multilib_foreach_abi bootstrap_nine
-}
-
-multilib_src_configure() {
-	# We override bindir because otherwise the 32-bit exe is overwritten
-	# by the 64-bit exe and we need both of them.
-	local emesonargs=(
-		--cross-file "${S}/tools/cross-wine$(bits)"
-		--bindir "$(get_libdir)"
-		-Ddistro-independent=false
-		-Ddri2=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-pkg_postinst() {
-	local bits=$(bits)
-
-	einfo "Don't remove the Z: drive from your WINEPREFIX as this relies on it."
-	einfo
-	einfo "To set up the ${bits}-bit library, launch your preferred Wine as follows:"
-	einfo "  wine${bits/32} ${EPREFIX}/usr/$(get_libdir)/ninewinecfg.exe.so"
-
-	if use abi_x86_64 && use abi_x86_32; then
-		einfo
-		einfo "To set up the 32-bit library, launch your preferred Wine as follows:"
-		einfo "  wine ${EPREFIX}/usr/$(ABI=x86 get_libdir)/ninewinecfg.exe.so"
-	fi
-}
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild
index 3c025087d82e..1358e3c9e1ce 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild
@@ -38,7 +38,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/flags.patch
+	"${FILESDIR}"/0.5-flags.patch
 	"${FILESDIR}"/0.3-nine-dll-path.patch
 )
 
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
index 3c025087d82e..1358e3c9e1ce 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
@@ -38,7 +38,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/flags.patch
+	"${FILESDIR}"/0.5-flags.patch
 	"${FILESDIR}"/0.3-nine-dll-path.patch
 )
 
diff --git a/app-emulation/gxemul/Manifest b/app-emulation/gxemul/Manifest
index 487d3810815e..841d402234fe 100644
--- a/app-emulation/gxemul/Manifest
+++ b/app-emulation/gxemul/Manifest
@@ -2,5 +2,5 @@ AUX 0.6.0-fix-mkstemp-test.patch 384 BLAKE2B d7a5f2f222bf4875cdcc695645ea9a04244
 AUX 0.6.0-fix-mymkstemp.patch 253 BLAKE2B 583b6717f5d15bc235fd1933be9c7ba70e560aaa8be84f5bc63caea28d00e715e1062a98d9af9a30259974e540c7abc9587ae46e9baa4bbd021646d0c319481e SHA512 e7117b95fc2559442ef444417f8b6e59246a4e1476674de70926d9a9e589b5d9d45ad82ec52fac9873e4f052e9c00087a18ad36c0caf4ae93ffa0852073d2e4b
 AUX 0.6.0-gcc46.patch 418 BLAKE2B e098bc1d64a911e9f9c67dda43bf4a1249ac450d88217f92938b9662b72d5f33b75f419ad12630bb9c8638b6e6aed5bdb487eb9e861f9d6563ed3a2d0d98f6a6 SHA512 0652b82645c75a56b24ed88e3cd9d68bdbbd927e64819aae22d61614db520dcb4fa8b9eab06b2ccd5c01f78d20008c587f3245c520b9bde0cafbc5cfdf3083c1
 DIST gxemul-0.6.0.tar.gz 3598795 BLAKE2B 01bab252b8497379cc819899d9030fd267cf7679a90a421f435c6cb9ce84fedbdbd0ff23a11e0c91a17e41e166488562b4e173b3793cdbc2dd53b70701351429 SHA512 38108c7e4f1332bf80046a63e4a7c5e0fbce7f83a62fdeaa4518ef02947d7de83aac20b0307d286b7eb5d9c721b8400d449d4f244b2bc9358a2502fa21f56b73
-EBUILD gxemul-0.6.0-r1.ebuild 1034 BLAKE2B 59b382033033ea0807ef409e025e4a8dff6d2fc328b045bc5a4bfc5a3bcfbf822de7b66850af6a0ebca03ff8ed8367c9ff1455198954bfcd0c584494a4026690 SHA512 6fea228b23216ca715fa560c41cc7b3ddad2b32d6fdeebd028eca6f97bb717bedce8afd05975c42c2cacfbba398d0a16f63b03a4142a8c3997c5a56e3e35fe6b
+EBUILD gxemul-0.6.0-r1.ebuild 1024 BLAKE2B 9f2b58434d6eec76f7d2ec673f1e41236eac4689220b43e3d955f838c9fe8c7e8d458ba6278fe715a4f9d874c618a1e3b0cfc1f291ba0159d24331335d0ed0b0 SHA512 1b3afdca43d976dd370f6128269043da98b69356697085b8434d6b120b225e05f63588729b87f61100185dcca024543b830bd1b6f37792488da0e275ce5f7610
 MISC metadata.xml 422 BLAKE2B fafd4fe4407522b0d25cdd546c636eba02a245ccb86ec2affa49f479c069cd73aa677f524fd73e41c441f10fd759d96c82157b9a1f8d7fc3ff715fe35e1dc637 SHA512 78942cda34c7b5fe85d937f517846730a76c2b52688a871c683630c122db7fb4ae8db2fbc8a03fa06218e2c3d18ffc406692f81b021ae5613a818feefa54513a
diff --git a/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild b/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild
index 889530285923..c928aefaf117 100644
--- a/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild
+++ b/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/gxemul/GXemul/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
 IUSE="debug X"
 
 RDEPEND="X? ( x11-libs/libX11 )"
diff --git a/app-emulation/img/Manifest b/app-emulation/img/Manifest
index 2867f64c9358..1a5afffa41e4 100644
--- a/app-emulation/img/Manifest
+++ b/app-emulation/img/Manifest
@@ -1,3 +1,3 @@
 DIST img-0.5.7.tar.gz 3875988 BLAKE2B dd8f13f6861eadc3a4c3d2d07ac826e53a8f3b83d66974717e9312c579967e0c9b57657c8fe6e86f03bb91fd7a82bc6d8d7d87a70be4dd85da10800d8909a51d SHA512 a42247c2ceac0ccfcc2cfd6a561a058855869f0219994cd8fa2bdd5092be17803057e4cb48a2d5277fdfded74dd06eb7c3c3db590fbde91502aebcaf593ddef7
-EBUILD img-0.5.7.ebuild 889 BLAKE2B 50e79b991e0398aa79085dee21ab1d37e7c4e46d7a77794d88080de7d67e1101e1e8f0a1a5f0ea88492afc4f91416077e382345bbbabde8f16bfc00480f08d29 SHA512 d1ca0e8d9a670a16389d3e06683a6ca3873a8761ef29b317496e45d1461ec6bf624a79561caca39e79b4d9c325f2ef5164f7b9cc576a6bfe89bd6613bc2bf96b
+EBUILD img-0.5.7.ebuild 901 BLAKE2B 4defdbd3caba5453bbda0a639a0bba14c7632a413de03d03203b51697d16ff259a229c39a58d0ca807a3fa5303445bed714696b470e4e44dac5b43aa9b66db93 SHA512 d9d45aa49a391d8816789bf2b8985c0d233bf6979acf9ead6b2dd45b26a82fb2358ff5e881ec5f3f8f4e9019b6699c7d623dffc59f17fa039708e8feac4698f1
 MISC metadata.xml 248 BLAKE2B 65f712fa82650530a08edb7671e6c6104649422106cd65d55253bdf920e84cc64ed47038feca9da18e770997c52cc6fdec416a6d82eb4146677b78d8509048ca SHA512 0de2cc5b3231aa87bc19df0801003e020b1599bf4a006a991a2d46d84495569245bb04756c1537376293765593167f2c083c46470389a5438ca7b44abafb0a2c
diff --git a/app-emulation/img/img-0.5.7.ebuild b/app-emulation/img/img-0.5.7.ebuild
index a83d24d7c281..21373b5f486d 100644
--- a/app-emulation/img/img-0.5.7.ebuild
+++ b/app-emulation/img/img-0.5.7.ebuild
@@ -21,7 +21,7 @@ RESTRICT="test"
 src_compile() {
 	local TAGS=$(usex seccomp 'seccomp' '')
 	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -tags "noembed ${TAGS}" -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die
+	GOPATH="${S}" go build -mod vendor -tags "noembed ${TAGS}" -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die
 	popd || die
 }
 
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 29e2f34a67e4..34940724b9cd 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -11,6 +11,6 @@ DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 5fca516540a886729434579ff99acf3baa06977fa0
 DIST lxc-3.0.3.tar.gz 1263371 BLAKE2B 77d0f593119654f570ae748d305e86c27117fd4e9ec7bdab1110f5356afb4a00d81c105ae9757d9da5827f6883a4a5d8ddc43b5b6e56a2927ed990e757f7c7b6 SHA512 cdc411364153d7ed494bab604260f5cbdfd5bd7734a59af970b3198c7b3cb340b6736856a2189d5989e169945a817ac8b531bc3ab62217a4285dd63a851f9c8a
 DIST lxc-3.1.0.tar.gz 1277877 BLAKE2B e114855659c8199378d14bc23f667ce1927bb32c55d336fa9c222a60198da51e7ded6aeb6d1c89cbeb1e9edc101e424a847be1e4a2330d2a0bceda52d0df5e30 SHA512 706cee9bc8ac57300574b59d728437e41baa4eb16c68f8548142e53b4e13679ef6698df30a4fbf8617e4f07338f898464e9f818e80d32648fe9717370dcbbb20
 EBUILD lxc-2.1.1-r1.ebuild 6813 BLAKE2B 71dde4ab097e5181ea3459933a89c438e8554f0dd8e4aa75bd901ae751744e93fc1dd23093cffa89d0b8164392ff9f0c8be44379614e5eaa145d928a9421d316 SHA512 fa4af7126f54534ae0f356273cb790e42aa5e444bb5ae5986754b686a82603413cf400a1147bd0fb7f8f01f35bf4295ae8ad02581bf42e4e122e8b7b17dae8fb
-EBUILD lxc-3.0.3.ebuild 5046 BLAKE2B 08d606673d5aa08f26b75ae398cb43801a864ac7175cf2d6935ca08362f441839a36294804e675b3954b517194a075726f69b1df6c183ac8bf018bea12c723b7 SHA512 a88d6b7e53a08822af7ae39e5f83ee1e725368524431bd436e510761d636ea5b937faf316810d6c631bdd9e48bcf79c193810f3466623d822a99315fb6813564
-EBUILD lxc-3.1.0-r1.ebuild 4926 BLAKE2B 37e74e5569c388657982b9a7ea67f194dd1ae79dd4b472a69ba20a47efb33fd39ec9a26a8b779576b52457e140b6b5b7429cd5098df54ebc35c82af45bb11caf SHA512 56571d727c4c5574b1d5547692c5cc68565c6396acc7353b5916ee00b03cab0ded30c3e6b5b486f0d686a6fc3a59ab7af79cd55df69c54459a4d4a0c8765f616
+EBUILD lxc-3.0.3.ebuild 5047 BLAKE2B a648bfd8160f61c1798a6540350ad2b45ae38b5ac8587a5b1a7db7a4f750756b2d65f798c022500c7ea1bfef312aa083f403e8cb61dc116f6ebc91ae5510b077 SHA512 273ff2df6188f58bdc55efb702bd6c92f276bee3baa2cfe0ec550f7ee9707ce6dc2db0bd0ec60276fcfb137c5963dfc7840a6b750a3036a65378bb108d17f47e
+EBUILD lxc-3.1.0-r1.ebuild 4927 BLAKE2B 8787be6be89d6400da0150fca03eb50ac383b89691484c0baae71a4f0f81e3126050753c23791c88d74fe39b00d5465619020a5101ab3111217efd3b1ed9c4b1 SHA512 7d4989b49c96ff2a5df1ac7ba3807ab168955daacb8214651bd169f2077f1dbf2175196a6e1535622a97679440ae510c027bcd9774483e0738bf9e328916772a
 MISC metadata.xml 644 BLAKE2B a8bb7f99e51e8380244f625feac1752536bbca7fe07a40afc47698e4a831f4d44ece2820c5e73e04a978cea7abcb5789df3d5898d55df0298d6787af1260ea96 SHA512 aa11f327c8ac4f98f7f5ac6357b7fc2eac18521507b27df531db5ae09d7608ae526917430afe00f110889f391a12d1bac110c7c7377bad6e9c07ff22020d97d9
diff --git a/app-emulation/lxc/lxc-3.0.3.ebuild b/app-emulation/lxc/lxc-3.0.3.ebuild
index bf7dc89a778e..136493184f47 100644
--- a/app-emulation/lxc/lxc-3.0.3.ebuild
+++ b/app-emulation/lxc/lxc-3.0.3.ebuild
@@ -18,7 +18,7 @@ IUSE="apparmor examples pam python seccomp selinux +templates"
 RDEPEND="
 	net-libs/gnutls
 	sys-libs/libcap
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	seccomp? ( sys-libs/libseccomp )
 	selinux? ( sys-libs/libselinux )"
 
diff --git a/app-emulation/lxc/lxc-3.1.0-r1.ebuild b/app-emulation/lxc/lxc-3.1.0-r1.ebuild
index abe9c6c7cb4f..138938369b9d 100644
--- a/app-emulation/lxc/lxc-3.1.0-r1.ebuild
+++ b/app-emulation/lxc/lxc-3.1.0-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="apparmor examples pam seccomp selinux +templates"
 RDEPEND="
 	net-libs/gnutls
 	sys-libs/libcap
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	seccomp? ( sys-libs/libseccomp )
 	selinux? ( sys-libs/libselinux )"
 
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index 39ced4eaadf0..d008ac363cd3 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -7,5 +7,5 @@ AUX vgauthd.service 339 BLAKE2B 8f80d6d2f017623a8594c060e38e319c9406f5cf0008002e
 AUX vmtoolsd.service 244 BLAKE2B 65bf0e80b580c2c29a06a2cbf37f8428dbfe03404cea92d0d62c2d0f4d1ccefea8f1b553ca9cdaf5693f5f1546db5733061218e4c95b953e5f140e602fe68ba2 SHA512 0e29b56eb1495a6a9d3c84862e62aac78f29d9940aa19717d2a15ea88fe9484bf84ac858bbbcf22ed9194ecd141758a4398d5a193dd0d74172fd8fe53df53505
 AUX vmtoolsd.vgauth.service 312 BLAKE2B dba8ddb1b701cea490b117d08c93738a38bd668cf5444501bad8aabc503da4b87e53103a26ca4664247f14582c5546a28f093768833182581a850f0c50bc61e3 SHA512 fce9af2a3b98bf1fd5063af6c0d00bac7eba4ca02456d9266be5b74f2dea168521ffd44c38df1e28b0684f7ce21e4cb44ec2570fcbe01ff2ef432b55ede585f3
 DIST open-vm-tools-10.3.10-12406962.tar.gz 4625419 BLAKE2B 1cc3759740f1384e5ae53d3afb8e49e7546c078914ff8d2da12782cb19bcf513d4cd7a0650179eece6ed17fc29bcfc2fd67f629e1d02edeabaf09d401d7922b9 SHA512 fd35794896c2de5a3b6c7fad0e86558ae0f16c7ab09c791d0d9b8a61cff8052d3d5fcfd19613f793251050f86edda2335b29f49503b3fee41f48495b2ab80a0a
-EBUILD open-vm-tools-10.3.10.ebuild 3354 BLAKE2B 963fa8dc0cdddc543dadbb5acc4577ccb4c476c434ef269898b6631efb3b905520bd915106e0ef46e076a8708230a0931fa376d77806329ee55ae607bfc5317e SHA512 55c84ea65d2be7812d705a71100499f4042271460c056d7716f72761f9055159bb452a3dd28e46f0b71fa9417fb3a51bbc130135292376ff970952cd70da7215
+EBUILD open-vm-tools-10.3.10.ebuild 3355 BLAKE2B d2273e1cc0096b59f0b0c625ef5288e7a36afeef740329a676933750585957c92badf5a116fdd25b244ebd366686eee311c091c6a1a80ba6a4a97feeb50d1102 SHA512 d389ace67a786772c470cf223694e25c68d7a40bab75213d0a030465484c474495828b6483bf989d10db87fc16fc0603cc4b0e8b44e64c2e0b0e0772a1604c39
 MISC metadata.xml 1163 BLAKE2B 56cf697217d4b04f9ac436ebe306afdcfd5a57cf0e4c83f3aa942fdb130ca64a4482ec17ecc15f85db70afd3c16d7d3bcdc9097d870234a0816a16ca91d07834 SHA512 c8fb1c1df33be572712943993a4b2b1766c941fcf5d5f91242a9b89ff0ed523cfc37309777b86225f014632692dd994ef935b1544d8376cfa6bb5face76f1631
diff --git a/app-emulation/open-vm-tools/open-vm-tools-10.3.10.ebuild b/app-emulation/open-vm-tools/open-vm-tools-10.3.10.ebuild
index bfb651aac5af..c820c884e1f9 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-10.3.10.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-10.3.10.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	net-libs/libtirpc
 	deploypkg? ( dev-libs/libmspack )
 	fuse? ( sys-fs/fuse:0 )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	ssl? ( dev-libs/openssl:0 )
 	vgauth? (
 		dev-libs/libxml2
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 833f913e037f..5a4e68542d4a 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -6,6 +6,6 @@ AUX qemu-ga.logrotate 128 BLAKE2B 99035fefeccc6334c0cd5ae16e8550a07cfe4256d2374a
 AUX qemu-guest-agent-2.5.0-sysmacros.patch 365 BLAKE2B 0468e23b64612b0a9375ab6d47bd40447003f151d7f9421d1338d66663af390d69af6a8f9233eab66a69b7d38868e9735a19eefd16dd65f42853e4919ed27046 SHA512 a608a3d96f03c54fcccb7bcb354f0deec4bcb570f03b8ac9044ca5c6ee7a6252ae7cac05fb142d7c95feecfbb17e0499bbc1d6935c3e3e9ea7db319c4c11f6ad
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
-EBUILD qemu-guest-agent-3.1.0.ebuild 1721 BLAKE2B e5431c5fe7028db73468c19f209a631d3737a2591142820bc6407d73fd5ee35ff107b9f1e8083c05756aeab325fa3526070177bc61e790d400ec2a9b1b5fa714 SHA512 d1d75d7c7fd0bd84d675ae83d723dc8c1dd0932a9c9b950218486eb82065744a9958262de051df9f29ecd346f5979a870acb0d0c04f7b0407da1ed77021550e2
-EBUILD qemu-guest-agent-4.0.0.ebuild 1721 BLAKE2B e5431c5fe7028db73468c19f209a631d3737a2591142820bc6407d73fd5ee35ff107b9f1e8083c05756aeab325fa3526070177bc61e790d400ec2a9b1b5fa714 SHA512 d1d75d7c7fd0bd84d675ae83d723dc8c1dd0932a9c9b950218486eb82065744a9958262de051df9f29ecd346f5979a870acb0d0c04f7b0407da1ed77021550e2
+EBUILD qemu-guest-agent-3.1.0.ebuild 1711 BLAKE2B f1630771fbc29876d5a9f825cb486b4c248000ea9952cd65e98839af88418e5baa132332cc3f9bb88c7197b0d1e9f00e61b4394963aa48542215693d53309f82 SHA512 1d79e5c8701c937815741b2ac5bf87aac6c8c2d6a1d5c49cd22c6120668bb48815665be376b805f7b3622175ed5afc090e752592289c709f99b6ed39e7977bf2
+EBUILD qemu-guest-agent-4.0.0.ebuild 1711 BLAKE2B f1630771fbc29876d5a9f825cb486b4c248000ea9952cd65e98839af88418e5baa132332cc3f9bb88c7197b0d1e9f00e61b4394963aa48542215693d53309f82 SHA512 1d79e5c8701c937815741b2ac5bf87aac6c8c2d6a1d5c49cd22c6120668bb48815665be376b805f7b3622175ed5afc090e752592289c709f99b6ed39e7977bf2
 MISC metadata.xml 379 BLAKE2B d27991e18ed82ad5892cd44e50c965f8eacef9e8f2e11a6655306cf6913ec8e6d871c898cc8763140d5fd7d2be97ea7b4fc6377a0cab1978113a311dffaecdb4 SHA512 ee5deeb07591c7adb54bee8b80ea5a35e6047c308265d5363d239ed067416967c87cba01d6369bb5f2cd7792d1b65b9d0f1e7068b362ff5a2bad35232e272f05
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
index 00cdc52433d6..85d6f1db112c 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
@@ -11,7 +11,7 @@ MY_PN="qemu"
 MY_P="${MY_PN}-${PV}"
 
 SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
 HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
index 00cdc52433d6..85d6f1db112c 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
@@ -11,7 +11,7 @@ MY_PN="qemu"
 MY_P="${MY_PN}-${PV}"
 
 SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
 HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 85df92414089..44707eacb8d7 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -14,13 +14,7 @@ AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
 DIST qemu-4.1.0.tar.xz 54001708 BLAKE2B fc89d0c967fb31a73cbdca556e79c05c44b241382a83f02150a8e39b00cb7de7fb6f248e82e1364e314680481bfb3843e74804534c0ba91a5bb2ff1b8d771130 SHA512 82fd51702a7b9b1b00b2f1bd3b4a832b80249018dbba1add0b0a73e7d4bee452afd45574b4d8df7ce4477d8711f3bda4ca072a1a6de25895c93eb21cf78fc4b2
-<<<<<<< HEAD
-EBUILD qemu-4.0.0-r50.ebuild 24059 BLAKE2B 1b37f45dfc3f73f23fba024bed185f75df72f55ad8d68a273ce954eb01021a51ecffecc08ead6b92f015319861b3906ca1d54e731db8a81717d090828bc65570 SHA512 240b96516c7cea8f1b8d9be3d8a736e05384dd984b7d1f0973f71fd68337d2ae6955fa7e129c3b8c5cfce0c1cde1596b760412068694bc5835c124d199d2234d
-EBUILD qemu-4.1.0.ebuild 24163 BLAKE2B 33a35941a60017acec0e4600504c3462d0aae79de320da812be097a9b2c3f4971c279a8ed8a5c38db4c83026cdc847b7f877d3d263791fc856746cded9153b81 SHA512 48686acbb7b97737e7851c53798afdc9601a521db4c719364d72de8915779abc1d9d0f06d129f69dd57e0fde2d362a278d0624bffce81e1f4bca6b3d69ab6b61
-EBUILD qemu-9999.ebuild 24066 BLAKE2B 391e815b990ae5bd97e24ff35f58c0abb818688d82785f0f6449ca32a170d5df84087d2b82db581318b23f1fe51a5db9865b31ecffdec64ec15bebd40873ba22 SHA512 7084f305e683c1a625704ba99f4d17abb188bb3090f83222d1bb8fc0e54c98fb3560331bf1ed7e769dab8a56811e658e0763e02754cdd11e3368abbe6b6959a7
-=======
-EBUILD qemu-4.0.0-r50.ebuild 24058 BLAKE2B 985a90476641bdadb888034f01bea1613060288caf18c9b33ef2d984bdb0b49e356670ab540b8f75517ef65000b019659ba85bc87951fc8e23472eb8ef7e05bd SHA512 de8bdc762becd2915a8f42b8a6b202d6a044a2c17d0116555dc7ff2b7288ef13766ac350b28a77dc8594a58fd67d75238d45b757630ce12edd224caa3bcbb575
-EBUILD qemu-4.1.0.ebuild 24162 BLAKE2B 162a8478f4d3de04b20da363a4aa5a5731a7bb22a157e4695d252479ae287e89f757904d60b79ba136fee563163fff524c885e0ec4cfbdde6985613d2d81a832 SHA512 58784a1760c1879c3f152bedb07bca429de329a14a57bbcc8902d13e11d51affc303cf1add8e9e303c088e6c921a46411ed15d173b726181f43c32d7de7289e8
-EBUILD qemu-9999.ebuild 24065 BLAKE2B ae91939955dc990470b479c41862e3f81a28472ec69bfa7ca62ddc15a9fe8dbefa3c344a0e022e1cd228dfaa2340a5dae039a190336f733dd260ef4e7045ca17 SHA512 70e7830e23bf0ba44486392653fd12ee4fe2cbf5ff1f545f989d42acd76340bc33505e6e2520139fda7131b828ce0c95fc5764f38b7949fb3ff6aa421a2db095
->>>>>>> next
+EBUILD qemu-4.0.0-r50.ebuild 24048 BLAKE2B 53508cf3218ebdb7656b82166373fd32005280fe6fac21c7704fed295824165b2493270ec3a639ff6d8ec37f70b5c5b0fd6ad7ec6358402041d6310b903262c1 SHA512 c539799bffaf2e246e7893cfbcffafe9aec94f0056c9d139322214dee090900c7678aec2e1c72a2c4b08babaef9afbb9554cf0d0cd34dea6b707738a28d98580
+EBUILD qemu-4.1.0.ebuild 24152 BLAKE2B db3d5364929c9c995546ba7638ad69513b07c96f607b320f9fd3509a3db633b88eead39112fc2b2d954c2349a7a8567aef5fb98e7ca336295c59ad418e48520c SHA512 fb48a1806b8015345fc34cb5b1575ef86d15d4c89c358de7bb627580ba853da6c9e30cfcb27779121536afe4c428c1e588c8ce2fc520ea869bdb880817a3b7b6
+EBUILD qemu-9999.ebuild 24055 BLAKE2B 1969956b298b301448b1cd1ab0a48469ca8bacfd659d69e45fd7593efdde0a82d1a9790719ae94f7825980db0412b9941e2dab32856832008964c1fa93596235 SHA512 c1dc3cfe71735d63f4196c2017509c29704baa4c5c0a34a5e282309b59e24d47352231b9dcc923018fa76b6684022322b9ca95925101d421bc76a07059553d7f
 MISC metadata.xml 4012 BLAKE2B 1777649cce22dce3bc047584df1ab428fb3216f126a175b727df0857de99f857b6f6a1465a39eedb81355a0348e11ae504f92d60d03b0ffddeb3529ac4854a85 SHA512 85a4126971ea026e21371a4eb1f2e6f0c194644902bd9cc64a066f161b353e4a39cdcdd51af8fc554e446c0b13817c3416cce9f6261d5d8ab93ba50d58eb6dab
diff --git a/app-emulation/qemu/qemu-4.0.0-r50.ebuild b/app-emulation/qemu/qemu-4.0.0-r50.ebuild
index 872c8ec75e57..d585d58e2726 100644
--- a/app-emulation/qemu/qemu-4.0.0-r50.ebuild
+++ b/app-emulation/qemu/qemu-4.0.0-r50.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-emulation/qemu/qemu-4.1.0.ebuild b/app-emulation/qemu/qemu-4.1.0.ebuild
index 36cddd2c6991..d0bec4380dbc 100644
--- a/app-emulation/qemu/qemu-4.1.0.ebuild
+++ b/app-emulation/qemu/qemu-4.1.0.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -684,11 +684,7 @@ src_install() {
 		emake DESTDIR="${ED}" install
 
 		# This might not exist if the test failed. #512010
-<<<<<<< HEAD
-		[[ -e check-report.html ]] && dohtml check-report.html
-=======
 		[[ -e check-report.html ]] && dodoc check-report.html
->>>>>>> next
 
 		if use kernel_linux; then
 			udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index c9ec7d176c3d..d024b5020691 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index 00b1e42995ae..24da611d80a1 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,3 +1,5 @@
 DIST runc-1.0.0_rc8.tar.gz 1665924 BLAKE2B 542cbdefaaa1ef89d2abf8e31ca8116f26cddbfc3fb94dc8c7e94c51750b179ed557bee857ec80ede7280856c66c01c7961a26dc7e6202276baca46c691a3903 SHA512 f213b6a7fa96597d2ba1068f77752bccc0a1d62e0aac02ec8d2a2552dc3c1140fd4e52b2daeb0ac8fc09c48abe4521834450baae01ad4165308813eee7654a2b
+DIST runc-1.0.0_rc9.tar.gz 1885161 BLAKE2B 638f00b857f43204cdc2b4e65927d6280e48b075d8363570e9da166ec35febaa749c733478d5c190c0119e0d95418e3295adcc129b68afbc5fec20ca3d9e9b59 SHA512 56c46fbe4d637a83d67e0aabf2549ba687d8b1e357fdecfffca343c8b166edf4158830aa0a4419edd6994c589b874bb8504eb3969ed3430cda6e233940d34194
 EBUILD runc-1.0.0_rc8.ebuild 1487 BLAKE2B 5a3ad59b6d6f8582f8f86d3f5887294bbacc9db973e0f3b0090a085dacb07b993a68a5f6da40824c99312534d033da03ec3e1e7230bf1d459f9025bbfd691d6d SHA512 41e23944c8bce42d7043d0fd4a6ea01096431c73d5636bd1f0b6a68452cb70aea7aa69d91588be7091d103a227375ca1dec3f4e10e96d8108f4591494cb6f816
+EBUILD runc-1.0.0_rc9.ebuild 1487 BLAKE2B 99a37b4281c595242104484419ff679963e590bb841f08ae84386e0fde31ae8e97c0ff95b879d8e8b0616e0b8a3ebb9ef9b4fb1dbaf2e93a09fc22cf411fa533 SHA512 af7591ad892b998ff8154b2d8329958fd82aed8897d673efb8e5ba131206e0ab9afb2e5ade0b51776fb8e0c2f6f110272f7718905d0ef2f63a54e4ab8d11deaa
 MISC metadata.xml 870 BLAKE2B e7fdbbe8bd178b4781f9a1345cb3473b9b2371db7f824ec3351a117d8c07c4dfa208eb1d1ef946576a6aa972bb055eba03c934f2388538998bee0e742e31151f SHA512 090b4cdf0cf933ad782e9b68df78aec48265222083a17c5f8e387943b9b535fe3d3ba751629f5c3978987572a2f1e821514e54a7f5327164f0ee8f5ce48efcdd
diff --git a/app-emulation/runc/runc-1.0.0_rc9.ebuild b/app-emulation/runc/runc-1.0.0_rc9.ebuild
new file mode 100644
index 000000000000..8ee71c06ab27
--- /dev/null
+++ b/app-emulation/runc/runc-1.0.0_rc9.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/opencontainers/${PN}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-build golang-vcs
+else
+	MY_PV="${PV/_/-}"
+	RUNC_COMMIT="d736ef14f0288d6993a1845745d6756cfc9ddd5a" # Change this when you update the ebuild
+	SRC_URI="https://${EGO_PN}/archive/${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-build golang-vcs-snapshot
+fi
+
+DESCRIPTION="runc container cli tools"
+HOMEPAGE="http://runc.io"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+ambient apparmor hardened +kmem +seccomp"
+
+RDEPEND="
+	apparmor? ( sys-libs/libapparmor )
+	seccomp? ( sys-libs/libseccomp )
+	!app-emulation/docker-runc
+"
+
+src_prepare() {
+	pushd src/${EGO_PN}
+	default
+	sed -i -e "/^GIT_BRANCH/d"\
+		-e "/^GIT_BRANCH_CLEAN/d"\
+		-e "/^COMMIT_NO/d"\
+		-e "s/COMMIT :=.*/COMMIT := ${RUNC_COMMIT}/"\
+		Makefile || die
+	popd || die
+}
+
+src_compile() {
+	# Taken from app-emulation/docker-1.7.0-r1
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
+		-L${ROOT}/usr/$(get_libdir)"
+
+	# build up optional flags
+	local options=(
+		$(usex ambient 'ambient' '')
+		$(usex apparmor 'apparmor' '')
+		$(usex seccomp 'seccomp' '')
+		$(usex kmem '' 'nokmem')
+	)
+
+	GOPATH="${S}" emake BUILDTAGS="${options[*]}" -C src/${EGO_PN}
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin runc
+	dodoc README.md PRINCIPLES.md
+	popd || die
+}
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index f817700c97f0..55f29300bbd3 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,8 +1,8 @@
 DIST virt-manager-2.0.0.tar.gz 2629465 BLAKE2B 8795985afb8805fdb4f1ee94c7344361a7d09d3e62e361f3126859c4d1b1077286b720de7629fd876e5bff10500cc6cea6f1d4afbba5c2c83fd61b137c40a3a7 SHA512 5d0eb65dceb5c913973edaa52414b1665d1ed9cd3f226e28a592decddec2acd8fdb589f60736edf9b7d95830893812f9aecca2cbdd715033ca7ea53a95472876
 DIST virt-manager-2.2.0.tar.gz 2628726 BLAKE2B d2f6bc7a7bcf8b220109702b7cd65dd9484c197252cf96e4748c27921a45749c476ed9d03eadac6ef3053df01ceb267c4756b0c602fad431ad9de0035d4ed5d5 SHA512 09975f7628ee302687eb6572b5f35797b4710aaae60c17542ee9edd72c65e80e93d7bbc7a2050667a9280effdbab28272886ae155b3ba73c104153ae3c048d99
 DIST virt-manager-2.2.1.tar.gz 2623754 BLAKE2B c81e730f2d685152bd0ef0a0327a74a70c50bff91e80ed0e3de92d0b848183c4bc092be333f2f0785c6a0b39f0b6d6abbd1f38c902f52ba4af7c56d64ee9b026 SHA512 aa97af52b3552c087beab8701762c21e8e6d818c9787d5376ed4e1ae40a34d5e8870c4c00fda9cb17a2340d1dff5b17e853182df720cdd9ea4c91cf01502a33a
-EBUILD virt-manager-2.0.0.ebuild 2292 BLAKE2B 2d0b799a31fae20e1819f4d30bdac38cee7656d2512ff1f2898771e905bb73d362022e2166ba4d1d809aab505e7d5fc5c5d8338c857812da0601f04d663f96b3 SHA512 cae9b2fa3e29a34796f6b098c09a513bd3af6b13f63d4cdcd0429f3d5573bc0c5c9bf1070d1a7c988dbb0d720bafd0d07a765f2704e642faff9067e178d311c8
-EBUILD virt-manager-2.2.0.ebuild 2378 BLAKE2B c449c5661fce1ad8140a3ba4dbd153c34c73f897b4ced0be84eff93d715b6065cca70352f2f8bc62eaf1e96282547f8565fe7c7fad36f8729b080f5edf4d6524 SHA512 7163fb2a80bcda2524d3f3a6bbd5d8ab2b01ecd0e66a700916b046df58209070a830173745beb44292d60f99e4a2d7cb1ebb2db0b04b79d88436b2f4caa755f4
+EBUILD virt-manager-2.0.0.ebuild 2334 BLAKE2B 01fc3f428a679717bdea416fa9c6eda63772d54dd0b4eeef7eeb4ea11f31e00b4ea43b97e75812619a6ab074f74100dfd1a88fb635542d8a8a99fb7d4dc41b64 SHA512 93db4cbf88463d9e951bf8a8be19a9e3a4b811b29e63b4c3faf314f30bca6a8131dc3f1c4fd9a75fe0b407aee49e2fabf4ff758e2b77a45779b5d593a13e85ca
+EBUILD virt-manager-2.2.0.ebuild 2420 BLAKE2B 74bbedf1a6c5296606ccd3ac2f38de562c174c53493b659b468d1fcd2a8f93cb36527dabd0c8ef79379e72ebbf908eae48cdbc5089f58d58d66f9a3b3d34913a SHA512 75fe8f3c8ab169d45f2bbdae6ce20e0dd4f8b1d015591e18ffa919aada9a9958185e05182606e6eaa72f4af57d6dd14d0156a5f50057be3400fca8f100617f01
 EBUILD virt-manager-2.2.1.ebuild 2385 BLAKE2B 49a51f35b26eb7cdc6faeb8f530aa381edb3c48922b4f9e0cebda8ca6e78d436eea5caa426b8d2c9551d44c471c73aa6300e71d1af6303c71cec2ab802e0c2b3 SHA512 8b6cb7c09595b449a300c34dd41d62faaed158be68a00a3483c3f9a97b94364c28f1498837bb7544f33db1381653084b5427b1ade9b58cd232c9b0bceffbed2a
-EBUILD virt-manager-9999.ebuild 2378 BLAKE2B c449c5661fce1ad8140a3ba4dbd153c34c73f897b4ced0be84eff93d715b6065cca70352f2f8bc62eaf1e96282547f8565fe7c7fad36f8729b080f5edf4d6524 SHA512 7163fb2a80bcda2524d3f3a6bbd5d8ab2b01ecd0e66a700916b046df58209070a830173745beb44292d60f99e4a2d7cb1ebb2db0b04b79d88436b2f4caa755f4
+EBUILD virt-manager-9999.ebuild 2420 BLAKE2B 74bbedf1a6c5296606ccd3ac2f38de562c174c53493b659b468d1fcd2a8f93cb36527dabd0c8ef79379e72ebbf908eae48cdbc5089f58d58d66f9a3b3d34913a SHA512 75fe8f3c8ab169d45f2bbdae6ce20e0dd4f8b1d015591e18ffa919aada9a9958185e05182606e6eaa72f4af57d6dd14d0156a5f50057be3400fca8f100617f01
 MISC metadata.xml 662 BLAKE2B 4ddc8ee05f0679380316f8c175194b325d931967c9faee576f042fa42e0c7d6f8aa6b688464c1a839b8b20e184646d6e356095ffad136141c6c1fc7aa5d4f4f6 SHA512 7aaac81b00bb77562616d6ba9442c2e37d7cdd1142af090e3fe07be36315b5179bdb9cf78073c3f901e9a924c089ba00474e3c7121d785b6622b60be1fce682a
diff --git a/app-emulation/virt-manager/virt-manager-2.0.0.ebuild b/app-emulation/virt-manager/virt-manager-2.0.0.ebuild
index 98b7bb0ad72b..78b8321a2e2c 100644
--- a/app-emulation/virt-manager/virt-manager-2.0.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-2.0.0.ebuild
@@ -30,6 +30,7 @@ RDEPEND="!app-emulation/virtinst
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	dev-python/argcomplete[${PYTHON_USEDEP}]
 	dev-python/ipaddr[${PYTHON_USEDEP}]
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
diff --git a/app-emulation/virt-manager/virt-manager-2.2.0.ebuild b/app-emulation/virt-manager/virt-manager-2.2.0.ebuild
index 5472726ccd7f..b1e68c1f3d86 100644
--- a/app-emulation/virt-manager/virt-manager-2.2.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-2.2.0.ebuild
@@ -30,6 +30,7 @@ RDEPEND="!app-emulation/virtinst
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	dev-python/argcomplete[${PYTHON_USEDEP}]
 	dev-python/ipaddr[${PYTHON_USEDEP}]
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 5472726ccd7f..b1e68c1f3d86 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -30,6 +30,7 @@ RDEPEND="!app-emulation/virtinst
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	dev-python/argcomplete[${PYTHON_USEDEP}]
 	dev-python/ipaddr[${PYTHON_USEDEP}]
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
diff --git a/app-emulation/vov/Manifest b/app-emulation/vov/Manifest
deleted file mode 100644
index 214ac56bb060..000000000000
--- a/app-emulation/vov/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vov-2.0.0.tar.gz 510667 BLAKE2B cb138fd5c1c28f958d01dbb7a717fe21595a57d06fdf2b7c18b3d68b9adaf4a349edc94a7d54e36e7367b69b9a92af5feb8fcc822a011ed7518a4113a255ac3c SHA512 67a3b552dc768dff57ed2b7119ff288f4ef120a5f48279a4a003ff39add051b7fec9f22c3278449c6e96b7b5da1cc40a5fefef7a320fbfceadddf73b317a57a7
-EBUILD vov-2.0.0.ebuild 1007 BLAKE2B a7006d4903ce0db53067d41cc9277f610558f9bced854a09415f6fb3873ad0bcfc1c6394d34a302a92a1ce2f602e6a738402b363757b4035de737371d3497eae SHA512 2912134a33c836d4a41ed1f45a18ded733c8a9eb1cb112bda3a84baadaa5d95329a75b22c8c5f81c4964ffbac92700963638484883b58b3e4f42ae55f8da3c0e
-MISC metadata.xml 739 BLAKE2B 0bf78d3a36024590426aa30d0e5cccdd6b31d44dfe332fdb12ff3bc26d6c8a3e223c3f9f43ca2048270a6da9c7f19067efe7944a848b55691fd2cfbfaac5568d SHA512 25a9a61adfac2afd4ea78a085bd0af09d6e160ee98fe172cc94562ced220ddea0523ea4087a8885fc602dde5930f867d6a7e0834ac1f61f498a284b62869e83a
diff --git a/app-emulation/vov/metadata.xml b/app-emulation/vov/metadata.xml
deleted file mode 100644
index ea5b19f45fc0..000000000000
--- a/app-emulation/vov/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>dlan@gentoo.org</email>
-    <name>Yixun Lan</name>
-  </maintainer>
-  <longdescription>
-  vov (Vov's Obsessive Von-Neumann) is a tool that emulates the behavior of a Von-Neumann machine.
-  It is basically an interpreter, which reads files in the form of memory assignments and executes
-  the encoded instructions. The vov's instructions make you able to perform simple arithmetic data
-  manipulation. It is a very useful tool to see if your programs work and how.
-  </longdescription>
-  <use>
-    <flag name="gprof">build with profiling support</flag>
-  </use>
-</pkgmetadata>
diff --git a/app-emulation/vov/vov-2.0.0.ebuild b/app-emulation/vov/vov-2.0.0.ebuild
deleted file mode 100644
index 17fe7ee6c79f..000000000000
--- a/app-emulation/vov/vov-2.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit flag-o-matic
-
-DESCRIPTION="A tool that emulates the behavior of a Von-Neumann machine"
-HOMEPAGE="http://home.gna.org/vov/"
-SRC_URI="http://download.gna.org/vov/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="debug gprof"
-
-RDEPEND=""
-DEPEND=">=sys-devel/flex-2.5.33-r3
-	>=sys-apps/sed-4.1.5"
-
-src_unpack()
-{
-	unpack ${A}
-
-	# do no install redundant documentation
-	cd "${S}"
-	sed -i 's/src scripts docs/src scripts/' "${S}/Makefile.in"
-}
-
-src_compile()
-{
-	local fp_support=""
-
-	if use gprof; then
-		filter-flags "-fomit-frame-pointer"
-		fp_support="--enable-frame-pointer"
-	fi
-
-	econf                       \
-		`use_enable gprof`      \
-		`use_enable debug`      \
-		${fp_support}           \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install()
-{
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS README NEWS
-	doman docs/vov.1
-}
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index 800df2ff41f6..7197d6f82935 100644
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@@ -12,9 +12,9 @@ DIST wine-staging-3.20.tar.gz 9950555 BLAKE2B ee66217b708287bd95d61e23fb92009d92
 DIST wine-staging-3.21.tar.gz 9945982 BLAKE2B 988927c644e9abf472c42021cae39f38cdae24b397072fb53dc803da32bc80e8b6256554d787db0b6bffafac4104a9abf4ab8fa6e78fd0a308bf8906d658a65d SHA512 17f8194954a420d1424d564ba9ad5e6d4dd574dc38da4895d5b6740c1990f8655cb573bd57c77ace2c78c71da4782b511a5ac937ca1f0fc958e3c925abaeefde
 DIST wine-staging-4.0.tar.gz 9945756 BLAKE2B bfd27d5677d01b4a14c4ef593b741b6fa6e75194de04a90659ecceaa8b087d594cafdd0a53cc2ad2d05e9c73928d70d0b6681ac0052df79f7b45cbb370b31d3d SHA512 4c2277449be17b83235bab7898818a886e84e82c0c5eb8216a5bc42e3d9a0e1dcf09d4522e1165d503fd9237673fa91c2c07d837cde58897f1b6fc8bc6fa5d33
 DIST wine-staging-4.1.tar.gz 9941329 BLAKE2B e455a411d782dcb52b29ad6150b108a4a9b3fd7cd548e35c1392ee3bce581206d99520df19a153ddb80f135156a8d33f6acbbfe086c28f6bfe404fe9eae96556 SHA512 8f52fdae4f98fe67053b00d03234e0937652a9a9506c9e94b717502244eb741c062990678ede11342dc182a4fe9c066227814ebe394ef5f6aedec73983c08554
-EBUILD wine-any-3.20.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
-EBUILD wine-any-3.21.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
-EBUILD wine-any-4.0.ebuild 21144 BLAKE2B 944b2cf5e0b95d98ca4013d04af617a540373f3511f89124bde0150e5342d9937453056902115e805d07ab4196def2f8c73e82bfbb27a96b6e06d7d4b368e6de SHA512 5785e584a489f8fd1df47e7a0d34c516b9390d4b8349004187729e8cffe77180d10a933cceffe9ea717f88da33104f112559018231e983a33c156367c3fe2fb9
-EBUILD wine-any-4.1.ebuild 21120 BLAKE2B c5938e3247808913ae91039d3a8c8697ad61f19f7752bc726159cda9363ad8388a4c5f3db51d0fcf2615a49c937a4e54e815a83f9b6e25efcf6a5b3901437e8f SHA512 30232e794eef9c6fa8121d0130ab5757bf0aeeecfadac44e7e4790da54ea06408272d25cb23ada429bc8995b8302aaf831b396d8bb4965e3bbbdd65a01a70b5b
-EBUILD wine-any-9999.ebuild 21176 BLAKE2B c731221fbe73257d7e2265b2ab0f695290e6db1fca7e190f2dfb4f9e249e31e79f933f01313587ee6ec8fa1d3561527fe0076ab0513e8934a6728cc93c12b301 SHA512 dfa9e6f8e1bb24c36038fc9151f3a703f20dae4db2a60180ba45419fd235155fd3834a465e9db24e1237c273ee6bc6fb1659af5c72492a74dafd3360d0397789
+EBUILD wine-any-3.20.ebuild 21103 BLAKE2B 2688854f4b6fde18e1704879219a565afb69a62a9c9cd4d74e9087f3627586c6c114f7188930cdddb82c23e0027068ec7a07cfdf8e096a9a876a963a0553e838 SHA512 04ed9492c5aaedf3b34bdfd31c58f15cb632a691aa3da59e68463f9877d4f1f757f78b87618786f85efe87675576d58049fbbe2354991120f4df10796dbe79fa
+EBUILD wine-any-3.21.ebuild 21103 BLAKE2B 2688854f4b6fde18e1704879219a565afb69a62a9c9cd4d74e9087f3627586c6c114f7188930cdddb82c23e0027068ec7a07cfdf8e096a9a876a963a0553e838 SHA512 04ed9492c5aaedf3b34bdfd31c58f15cb632a691aa3da59e68463f9877d4f1f757f78b87618786f85efe87675576d58049fbbe2354991120f4df10796dbe79fa
+EBUILD wine-any-4.0.ebuild 21134 BLAKE2B 1d887eead788371e903561cf292be6a9e010348b13f8ee35cf0c308e2b08f528f057ccfde7e5ab432ffc456c19e268fb93204cac453c0c067ff97d47b36903ce SHA512 777d01dbbf9f7e68bf7e083a8f287a5daafe072b787ebc2088b472531643cbb8ddf0b1b0c3fb0e3c3fd7693f922b011a1cba95c0d14e7ecb6e5658df8689efac
+EBUILD wine-any-4.1.ebuild 21110 BLAKE2B bdf2d7506017315596e79fa8b0ddde97996c779326bf1fbc047f92c2e8712e216b1efb9b0780382dc1e543bebfaceb6d722942a019f5abf1435c4bfbb2876e9d SHA512 d76ef4701ff97d654f7f95c9336311c0c71d33a38b7f98650f34995a46a6f95dbf9cb42c2a3c65f769e0f4d68ef8d198ddfa5baaf2a27aa3423c11b356c88021
+EBUILD wine-any-9999.ebuild 21166 BLAKE2B 620fc472c546d54838cbd250e026ce763932984d552357be061ee543c41d7c56374aca2b09333fbe4c1ba0d91a9f7ee4b8ebd556b52cc22c9932dc61ca5ff8b2 SHA512 cc14fe3949e986d18f4f2405dfc8480dd55f14d32aa03fd34db3864f9db93b09d2e650a4881a6928efd46abfaa2a1d172e992d57e7e6159794730204480b4ad2
 MISC metadata.xml 3844 BLAKE2B 95bb006c1635ae34e88097f588585809785bbe45b333eb618baa7ee71b64ada59b13c7d16bf138395e1e72ddecb430c07a75b3edbf4bd74948e97415a375fe78 SHA512 43160447d94163a67d9e356ad9fa887e35f2a27e8b496e034a3e8fb2b047b1cf1deda9596f6d7ea9b5f52cc7005ffd2e7fb37983d6ddd33fb699fab5fe6d50b2
diff --git a/app-emulation/wine-any/wine-any-3.20.ebuild b/app-emulation/wine-any/wine-any-3.20.ebuild
index 24ab26fa3a3c..23b93ceac9f9 100644
--- a/app-emulation/wine-any/wine-any-3.20.ebuild
+++ b/app-emulation/wine-any/wine-any-3.20.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-any/wine-any-3.21.ebuild b/app-emulation/wine-any/wine-any-3.21.ebuild
index 24ab26fa3a3c..23b93ceac9f9 100644
--- a/app-emulation/wine-any/wine-any-3.21.ebuild
+++ b/app-emulation/wine-any/wine-any-3.21.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-any/wine-any-4.0.ebuild b/app-emulation/wine-any/wine-any-4.0.ebuild
index f732dac7bcb0..618c9dd15249 100644
--- a/app-emulation/wine-any/wine-any-4.0.ebuild
+++ b/app-emulation/wine-any/wine-any-4.0.ebuild
@@ -21,7 +21,7 @@ else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-any/wine-any-4.1.ebuild b/app-emulation/wine-any/wine-any-4.1.ebuild
index bbd3651dacbf..0a8c0641c7c3 100644
--- a/app-emulation/wine-any/wine-any-4.1.ebuild
+++ b/app-emulation/wine-any/wine-any-4.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild
index 30eb8fe231ff..af955b3caf31 100644
--- a/app-emulation/wine-any/wine-any-9999.ebuild
+++ b/app-emulation/wine-any/wine-any-9999.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
index 1819b702ec2c..19e0c08fe386 100644
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@@ -7,9 +7,9 @@ DIST wine-d3d9-3.20.tar.gz 50539 BLAKE2B 53549364113f9dd9d7c9383ec74cc7eafec61dc
 DIST wine-d3d9-3.21.tar.gz 50545 BLAKE2B fec93df7a464feba5ebd5c1f9f9b511a89065cc668122c4ddb2c91027b68e2aa93fe58832c4e143832c5b5f4ace57c640ab218525f0749bd5f1c632e80009660 SHA512 b2263d26b671b45a59c03ca5dc88aff35444e4d47caccf3de1493fa86ac834bb178819b9a80aa52838e510f814ed404e6c3ce9724aa6eea6a6d5f019253e6248
 DIST wine-d3d9-4.0.tar.gz 50535 BLAKE2B a5815c4d1b8ea34a0afac565b01aaaa6af418a7d84bf12c4c0591e316d31987770d1d5e99837f1c63e91810db821a2cb76cba1b97c71d5fcee8060a48915e83d SHA512 98e2d4d47fdc376e4e8fed0624657d40ea0a077998baab1d89ef0320714e66f4899414b04fa747b78c172fb85732e9376553c0b20cfd1ae0807cb3de58cfe78a
 DIST wine-d3d9-4.1.tar.gz 50520 BLAKE2B 53f1c4a7fe077776d648a927e75f11a8fa627d3fa15b01e22c18da7a4489ebc883470901e75afc99e07b85201ec05132be4c357923b8ab2ce6ac5f0beedeadd0 SHA512 2e8e3dca86a919a6e6bbdf87f2ffa67f90febcd4ba11351a20785c8dcf732077e1ae1ec0f34f3a4743cb23bb3d8483fd67d9e746e2887d000dd9f0220404b672
-EBUILD wine-d3d9-3.20.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
-EBUILD wine-d3d9-3.21.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
-EBUILD wine-d3d9-4.0.ebuild 18672 BLAKE2B 12d701b19f193a56cc9544b23cc4b381804bb5899ee885402fb32ed5c434edecf0cf905512633fd2fae09a562dcf4d87e3ae160a637077df165b52143d94d368 SHA512 932e0aaede2b0fdda05a1476e31ddaf488fd41c80a4c09345d4ce0648ad29566353696a943e44dffc883b9860cd0234207a5e85890dbb635796640f17ae63f74
-EBUILD wine-d3d9-4.1.ebuild 18641 BLAKE2B 66fe7823a307418a85a5f6bd1cf5adbdec4d9b64c381c0b16e89da56b40286e2ea427e83f1f03366263c93a03f7446144a94fd9427c9ed0329f9c27df429d712 SHA512 7e452bbf8f36298487dcda525ad5e2c8f0cfb2cfa6de9c0947764c2e4791f205c7e946f0216dde7a39f1c55a7acdf7344ac71ea56c5cdb92dcdf5cbf3374c23b
-EBUILD wine-d3d9-9999.ebuild 18704 BLAKE2B db8de0d3fcedc8987819dbd39227ad6f6af3430edd6d2edf078760ee1d2fb077439cf453cb589f19cb945c195fd094453fb55bebb5771dfad7c33896b4696685 SHA512 4044502d09b877f856b4687d5017bb2a5e0822bfe07518c5b33d82f2648a39478f8597b32e01748ffeb4cc1a6576e813a5eec73152088d6a5b6a5c241b1ed2d4
+EBUILD wine-d3d9-3.20.ebuild 18631 BLAKE2B 9919d782c773a45d4956ba6fc9d4d531b28cdd9fe5f3724cb7d681eef230f088bc75058f66d7fd31e679094c586f6f17f2b71546bee9e10672d0ebb627cb7dc0 SHA512 d31c1c39969e07bcab1d4d8281cc4e717169661c6bbdb9b3b6c8aee9f281919f16c18f9eb1884a8cb101196ca4bcc36cf4ac7d3fd8a1dd4a5da132b0aa536fbc
+EBUILD wine-d3d9-3.21.ebuild 18631 BLAKE2B 9919d782c773a45d4956ba6fc9d4d531b28cdd9fe5f3724cb7d681eef230f088bc75058f66d7fd31e679094c586f6f17f2b71546bee9e10672d0ebb627cb7dc0 SHA512 d31c1c39969e07bcab1d4d8281cc4e717169661c6bbdb9b3b6c8aee9f281919f16c18f9eb1884a8cb101196ca4bcc36cf4ac7d3fd8a1dd4a5da132b0aa536fbc
+EBUILD wine-d3d9-4.0.ebuild 18662 BLAKE2B 0a356b4cecdcbd62b014f5f7e23ae2b8707b547f31ce4ccf13ee34eba43274875583b85ef7c3ada77dadd0cc51c2c3ab4d2e193a1c2773f9a65b80aba6379d4d SHA512 f3175d4f4919b6a1aba11904ae435e443195b907b7e940c4b40c03defc43cd29f0b3add45d3cb259df566d9defb91796f87d82b5ad96e7f457e6f37d692b42d2
+EBUILD wine-d3d9-4.1.ebuild 18631 BLAKE2B cd3d4089f77ca4f49d0eb0a30fc346130eba250f6e4f692180f79af277dedd1603fc0a4fdbff59ced837567cede1c203f4a5385e07b34bc704a157d015c12479 SHA512 a1b303623eab0b7e520523ca8b1360ce7cbc4cf85649f1bf26b8950b5d7a33548d9e73e7a7ec90af06b07db0ff832f6f3535c44ff68322576528689fee936ca3
+EBUILD wine-d3d9-9999.ebuild 18694 BLAKE2B e9a3d1083cb9e197528a4b531e0352a943e7d6262353d5ea1d137e44b6cf0a660fab30ea170cdb3b82d1af321e907922c48f86ac0a6162f3467100a1cc06fcf3 SHA512 ad94425e67aa597568bb00a0022d1cddcbaa4d1091fbb81ac3b798da72ecb794bb16f1340ad018b36983fadc42a17207f168e5bb09e2e5e2d8f1db4d871acd22
 MISC metadata.xml 3451 BLAKE2B 83f6906b20cb3effb9c37152cc36c2d2853d3c313707151e5f1962ea51fbbf5983300edfb7282c367e393ef2ba09534277a4349ef6bdd630802fda04b4861357 SHA512 9c7fa199e699e6df3728c7f9e522a1bd64526198d0a96274d14da00627587c357f6d5ee9678770e2e150065b1246e1803c3a39f0fb6f01182a896a563f8205d6
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.20.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.20.ebuild
index fb4d194b4fbe..b7f926def60f 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.20.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.20.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.21.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.21.ebuild
index fb4d194b4fbe..b7f926def60f 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.21.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.21.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild b/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild
index 7e9256c8ffd0..421d3c0d5108 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild
@@ -21,7 +21,7 @@ else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-d3d9/wine-d3d9-4.1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-4.1.ebuild
index f9e7a4e47808..3a9f0461d366 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-4.1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-4.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
index d19971156d89..4128b502f603 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-desktop-common/Manifest b/app-emulation/wine-desktop-common/Manifest
index 3daa65c7717f..0c28d8acb701 100644
--- a/app-emulation/wine-desktop-common/Manifest
+++ b/app-emulation/wine-desktop-common/Manifest
@@ -1,3 +1,3 @@
 DIST wine-desktop-common-20150204.tar.gz 99491 BLAKE2B 7427c08d00a7ec11319908c908c5833e1a3fc297ec2ebfd942ccdf2adb9e657d1fd751da74bd67e7efb3d4b8ad769a11b1aa5e1a56e33e181f149f4f6245fac3 SHA512 1f3d7022c5cff87ed3b8fd3b7cd14397c6f23b98fe6a7c583ac0d2f439ff29d943f57375f23687aa6519ff1d84ff07624a9a712d6f19fa207fd26d01edcb6688
-EBUILD wine-desktop-common-20150204-r1.ebuild 967 BLAKE2B 5d3e47ded71f89eea4160503376b661f12d2bc3c364110bbbdccb9675220aa2f92e0291be22514a10e1347474f7781d380208919cf1d41dd01e2b715e85f7e55 SHA512 dcaca8e8ac885a9e5da87492b7b4c5a7861d331da1da339a6bf2360cb1f035e67cd23ae28bdb6b26b742990e3862a24e50d53704e523760bcbae24950082e685
+EBUILD wine-desktop-common-20150204-r1.ebuild 957 BLAKE2B 7fc9059805ae68d1da70b13144808641035719a0b64184dfedc8352b0cf328d01b54e11b82577a8dd0b7fd636f664f51a2f63b88969a36e413dc7e75b28d259d SHA512 98932bfe14ee4a20b54d80744b959df25a6d635dedba80f1eec4e6014f34edeb197a3f77672e58c2df95469fcc52a748c72585b430dc53820936971828c24722
 MISC metadata.xml 439 BLAKE2B 5748ff1f9d8a97a6c0496f66672ba2131d46db6391003fdb2090b2627561e62519580c1ad78138857111963ec9ea56ff2491b56b63c0bf321ab7de88a3c2f445 SHA512 c9bb03bc6753c6c40c280d477ef343b1cc4bf79f49f0dcd83aab6c5c1f4770e93c65c33a51628453e326618b44fe2a18610667d7177e503366dbfdc882fa471d
diff --git a/app-emulation/wine-desktop-common/wine-desktop-common-20150204-r1.ebuild b/app-emulation/wine-desktop-common/wine-desktop-common-20150204-r1.ebuild
index f15707a38006..6a8cc0cdde9a 100644
--- a/app-emulation/wine-desktop-common/wine-desktop-common-20150204-r1.ebuild
+++ b/app-emulation/wine-desktop-common/wine-desktop-common-20150204-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/NP-Hardass/${PN}/archive/${PV//./}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="-* amd64 x86 ~x86-fbsd"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND="!app-emulation/wine:0"
diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index 51bccab59e9e..47cb783cd104 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -8,6 +8,7 @@ DIST wine-mono-4.8.1.msi 115878912 BLAKE2B 88bd9b35efd89aece2dd0cd9529bc081fcd2a
 DIST wine-mono-4.8.3.msi 116183552 BLAKE2B 5e82c2e6e456311de817b7870e02d60abc3e359a9b5989257cae4a31e24206e7c8289f417dbb5fa2e315537b4e8352f9f1237f576b3c06cb2dbaaa7a5443a4f0 SHA512 5b5c1c147453cc691ceb17c850be66e3701e784d2ed4bd27abd92a815f7070850b5e0fc1778c3a3aa2b84516b4c5e01abe350d6ccc5578037e75cb1afe1dfb6a
 DIST wine-mono-4.9.0.msi 94960640 BLAKE2B b60debd41ea33eee15ab1a546c526858b97cf4d5d896c856cce21f09210e3e10f1abf98dfb723abbe75657dd44011c1c793a08a329e037144d3266001739467c SHA512 76142fa7233aa3f8111df9112927e699cfc39f8bd0f02f0fc4d065eaeb37964f9e2b49bf53c406fa6ec72c247ab85ddba244ac97b4d6a377adeb63d9ae339e24
 DIST wine-mono-4.9.2.msi 94981632 BLAKE2B b70a5177fad3c6ee2b04ef40105c7700a08339786a23d7378ba72005da5b3cb6b3a797f0173ba32224bcfd25a4bb0fa01c92a83b88e005973b33320717f5b31a SHA512 73e46ec57c7a78d8c32ead4698c299fa557bb97739ce22c9405f95f48f55d604743aa01cc64183c9f89f99aec6f04b664bac0ef96e6a436d38ebcd9d7cf3b329
+DIST wine-mono-4.9.3.msi 95017472 BLAKE2B bf054bcff51e986ddb95788fdd1925ee13efe6e881089a23192d4ccb2527ccb2a2969917b9c3bb16a2161a2bd1d60c24605fd07e6c432f8f77c7c506222045f9 SHA512 4631d4e3b5118eb726f614e2f58f9e95f44bb97a1285fa726d3542d44e2a77ce818997ecb4de42e0d318d364d7c929f10d7c5176b59732e8b468e7695633706c
 EBUILD wine-mono-4.6.4.ebuild 491 BLAKE2B ca3c7d026b50367f574915102069052519ecef3f49b1ca7185a64902807939f1b149fdb2e120097751261ad7e0ac6dae0ceef08d0fbd3658c5c5ab7c3178bc34 SHA512 459ebb021fc4f9401de138164c90e139a3592587da66a25cbc6ac6db6a24e46257d4a2b63cdc2edad1783413924a04d574301123ef7fe93f4ca3a9a0045acac3
 EBUILD wine-mono-4.7.0.ebuild 493 BLAKE2B 062ba95f20540e8cebca2b2dc1ceea8a49ab9be791d11de595ff300337bcd4d015f21825a0bbbd62837d618ad093ce7b24a95bd87b7eeae4e1e3479542fc034d SHA512 5cf9052ebb4a0cf0f7717be83ed059d2622836edad31f9bdb314afeb51a9f6ab9c65e5c7a9884f802dd0c4f9b47bf4262ecc24ad49c439f8b826e025f988022c
 EBUILD wine-mono-4.7.1.ebuild 491 BLAKE2B ca3c7d026b50367f574915102069052519ecef3f49b1ca7185a64902807939f1b149fdb2e120097751261ad7e0ac6dae0ceef08d0fbd3658c5c5ab7c3178bc34 SHA512 459ebb021fc4f9401de138164c90e139a3592587da66a25cbc6ac6db6a24e46257d4a2b63cdc2edad1783413924a04d574301123ef7fe93f4ca3a9a0045acac3
@@ -18,4 +19,5 @@ EBUILD wine-mono-4.8.1.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a21179851
 EBUILD wine-mono-4.8.3.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
 EBUILD wine-mono-4.9.0.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
 EBUILD wine-mono-4.9.2.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
+EBUILD wine-mono-4.9.3.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
 MISC metadata.xml 614 BLAKE2B e45f9e8581cec69afc21a5af29aa71eec05ba7fa626624e6c06000a5f013a3606674074beec999a0f8f91c91fc8912995b20cb88f8ad8a40bffbd964c5bf020f SHA512 5655c4bd737975334e66b4ea0c6cdb447dd647a7a3c76c0cd9782c405c9540ae396c87677bde408d3977b838813e00f12249f0f84267b75894e5554b2c6bcb6c
diff --git a/app-emulation/wine-mono/wine-mono-4.9.3.ebuild b/app-emulation/wine-mono/wine-mono-4.9.3.ebuild
new file mode 100644
index 000000000000..15aab248909e
--- /dev/null
+++ b/app-emulation/wine-mono/wine-mono-4.9.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="!!app-emulation/wine:0"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/wine/mono
+	doins "${DISTDIR}/${P}.msi"
+}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 137e76b5c734..07261cb8d31e 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969
-DIST wine-4.13.tar.xz 22137820 BLAKE2B 6aab4930fd176757e2594a580ba73694cf04b5411eaf26dc332a8aee5efcd1a181781d010610b22aaa6dd91b4f9161502609b8a23928d6848329d773f98c41cd SHA512 b359db3c99d10b489f7f72172b624e7b2e2b826c206e842a524d781ab5947e2b03623a115c2345fc71df22eb508936c2f7667d4c420a2fb6cdc34e3d2ba5e75b
 DIST wine-4.14.tar.xz 22151304 BLAKE2B 04983c21fa58091a36e681c90b92b4f014287ea7edb105bef560ed0505682dd1d3832292a0e2cc72489f0c4a2247ce9c1ec7481f80cf2baa05953e525ce00b1c SHA512 cfbcad1685abf3a3810c5f29c50e47f1340aab2276e54d8d22b9b764df5099ff7ad399a6cca200c7a622be0470992d3aee1c0c64c2e6ea90221fee6d391d911c
 DIST wine-4.15.tar.xz 22196108 BLAKE2B d3b28ad1bbfb7e1522a3acb120049dd3ac3fe0473d0f84529e86b5b9163401869e39f7c4c0e14795a97362722c41ea1476e4afbd1a545e5518504df2628c928a SHA512 f8290bbfd3779cb967c1cf689106fa48d1a1daeac2bd42fb91a2d4beed48e0c398ed9239437756bdbe3cd826cef59f5cd660381f637e184c47a865ff3ace91aa
 DIST wine-4.16.tar.xz 22205248 BLAKE2B e7f7daeb4f75a5cf38478609512317e55ead862812a409e4f094178c0b7dec2a969b0a96e83059a1bede3610d3986529f926041765cfa536b786ee53fdc27b84 SHA512 f3097b06e490356e68484239b7a2ac1cfa968818565c79386ba6c0e70a318c092af5549da8218935cbe891876fa519d361a3775d0ab5d4adc192555ae0e45d86
-DIST wine-staging-4.13.tar.gz 9913015 BLAKE2B 125b96fbe2de3c6d5c302dc25f0d1ba65fa3deb00a76c30a55e9fe43ad06bc3cb7ea18f542638268c1e854effedca557e837512b54c92905b928d83b33aa6aae SHA512 a5240b3999b1ba605d16148022e57a4574c0e9288763a5c4a259ea06c3a7152af8b136b0e2b8a74b1a40fb6adaf5ce012695160afdd5364fa1b4c7a903fd82b1
+DIST wine-4.17.tar.xz 22230616 BLAKE2B 428d9b781acbadabb2ce677b08c1a38f130c39d2acb95364dc0ac4cfef8f7c9efe4199846bf0bfc745dc25ba632847f224da1b0a09b8ee6c4927154771a538cf SHA512 f762aab2596a4b5cf73d3282be561d25a2fe69e5d4a5ec2e29db47b3eda7496ca9eb7e57ff7765853d258422898bfa775bf9b458e61eef837b213e422bd748b8
 DIST wine-staging-4.14.tar.gz 9910499 BLAKE2B 2e9d2983156a3f309e740503825ff0ebb2461ffc785147e9853122e7d64269409f7e73fea0b5a0fac149a4fb7d27a11cdc8ba0759ca9fc0fb0492d8d3884c503 SHA512 481a50f4ba3f1c445bd5b9754d7b27bdcd0bc386930e3597051a0962778288f8d4649e9f4e8bc188738c6896821a198f3af15b47e9db719f52d0b3db16a407f0
 DIST wine-staging-4.15.tar.gz 9904734 BLAKE2B 163d6f51a6fe649c8c107b013aafa5c5729bb93cafe94446cde966138c18d5aed2e950ce9a71ae4c719efb358406af079efb21cc8546d97e2b7146a5cae27a56 SHA512 0c34695c1d39773fb34a58f0cdb91d427945615e7b76b8a7222bc84fda8df08125832297b75aca55e69511b6b3686df70dade84bcc7cc9324f30c042146761b0
 DIST wine-staging-4.16.tar.gz 9905714 BLAKE2B fe72d1123c7f418dc9702b113679de7d21a8f20b2bed5e9b2f7a2b411ca28b407e0d2d134dee19ee06414df7a3ccfaa784d5689e3dc79043544d17c6768e6a17 SHA512 8782e4aecb34443404b1ac02c6b1ba91887ad12f07c7960601f879b034937d5ee6f1c1493437e765804beed6e68fa20383f7c02a09534526cc5f4bb857048faf
-EBUILD wine-staging-4.13.ebuild 20202 BLAKE2B 3a396d740c0fbef5461274b043c1d80f14d8d5d4cf0f46cd36b9761c06dfe09d5946e98d1378c2b1ad4561d37a04c33057ebd5bc7305d40261cfd040dddc94b6 SHA512 ea7fcca738893b74b4d6fc4d61e0ecb2c81a00c9a71e2ab8e5d5667b37f2860897a0cc89360446610e5420ce348fe8eed246497c0b965865e47f4e4c3db050e4
-EBUILD wine-staging-4.14.ebuild 20302 BLAKE2B d0c68ad8015af573691ead5df63ee89db9e9175c97c575c9bdd2623208f572d7bbd4615490fc6b03ca6d06ff4bd63807804c1d4da2bcdad84698568310f427bf SHA512 f425b2184519c56c49a93fc7ba47c14221a50fe4461c99a256581e5a7c6966b471fcd28981d25c4a54470e2a4fa0a96eccc7e2929e397d94367421da8f01bddf
-EBUILD wine-staging-4.15.ebuild 20302 BLAKE2B d0c68ad8015af573691ead5df63ee89db9e9175c97c575c9bdd2623208f572d7bbd4615490fc6b03ca6d06ff4bd63807804c1d4da2bcdad84698568310f427bf SHA512 f425b2184519c56c49a93fc7ba47c14221a50fe4461c99a256581e5a7c6966b471fcd28981d25c4a54470e2a4fa0a96eccc7e2929e397d94367421da8f01bddf
-EBUILD wine-staging-4.16.ebuild 20302 BLAKE2B d0c68ad8015af573691ead5df63ee89db9e9175c97c575c9bdd2623208f572d7bbd4615490fc6b03ca6d06ff4bd63807804c1d4da2bcdad84698568310f427bf SHA512 f425b2184519c56c49a93fc7ba47c14221a50fe4461c99a256581e5a7c6966b471fcd28981d25c4a54470e2a4fa0a96eccc7e2929e397d94367421da8f01bddf
-EBUILD wine-staging-9999.ebuild 20302 BLAKE2B d0c68ad8015af573691ead5df63ee89db9e9175c97c575c9bdd2623208f572d7bbd4615490fc6b03ca6d06ff4bd63807804c1d4da2bcdad84698568310f427bf SHA512 f425b2184519c56c49a93fc7ba47c14221a50fe4461c99a256581e5a7c6966b471fcd28981d25c4a54470e2a4fa0a96eccc7e2929e397d94367421da8f01bddf
+DIST wine-staging-4.17.tar.gz 9914906 BLAKE2B a5a430588aaede6f6ac2e30710bf58d57100a37444a2610b57529116b2d9b88a6f4bcfb56ad71153734d8f1a99a70eab4cb568d3cfb6d5ce6198eb662e3cc201 SHA512 1f27511c8ff6619f4138eb3b2cd0cc1cdf42c0cd4206c68bdf792ae17c339611016e32babad121f0decf20331f7ce4400033be03c4db26cb6a4dc601c9c4b14d
+EBUILD wine-staging-4.14.ebuild 20292 BLAKE2B 2fade16f762642ec7292a42c5a1af18039745fe15e09102419fd46bb99870b0b2b8804ed38ff1e6f46b19631b756ba80c40833844d2d97db378232ea67c65d63 SHA512 3551365f1392d538ea63a133fa3019e6fee8e1556ea47a8d9c23ebd5e614243a6271096f2f89829f105af9d3d340774f3c3c0ee2e0f6d6343baf8daebbc5972e
+EBUILD wine-staging-4.15.ebuild 20292 BLAKE2B 2fade16f762642ec7292a42c5a1af18039745fe15e09102419fd46bb99870b0b2b8804ed38ff1e6f46b19631b756ba80c40833844d2d97db378232ea67c65d63 SHA512 3551365f1392d538ea63a133fa3019e6fee8e1556ea47a8d9c23ebd5e614243a6271096f2f89829f105af9d3d340774f3c3c0ee2e0f6d6343baf8daebbc5972e
+EBUILD wine-staging-4.16.ebuild 20292 BLAKE2B 2fade16f762642ec7292a42c5a1af18039745fe15e09102419fd46bb99870b0b2b8804ed38ff1e6f46b19631b756ba80c40833844d2d97db378232ea67c65d63 SHA512 3551365f1392d538ea63a133fa3019e6fee8e1556ea47a8d9c23ebd5e614243a6271096f2f89829f105af9d3d340774f3c3c0ee2e0f6d6343baf8daebbc5972e
+EBUILD wine-staging-4.17.ebuild 20292 BLAKE2B 4c1ba41598f20b35edd662146668490724a427cf376365bafb3bf9d40d1b59f7f1f69e0dfb3bcb10470f44f6f72428b18db488fba9c1c9a8062b3887caf6f0dd SHA512 067376270208bed03c1dbc932e74913db737555b72d1d4e879d102214e309969d276eafbdf4b69f033e239b8a99ed3a507ac267b3c43cd0236df4933e7ef8da4
+EBUILD wine-staging-9999.ebuild 20292 BLAKE2B 4c1ba41598f20b35edd662146668490724a427cf376365bafb3bf9d40d1b59f7f1f69e0dfb3bcb10470f44f6f72428b18db488fba9c1c9a8062b3887caf6f0dd SHA512 067376270208bed03c1dbc932e74913db737555b72d1d4e879d102214e309969d276eafbdf4b69f033e239b8a99ed3a507ac267b3c43cd0236df4933e7ef8da4
 MISC metadata.xml 3712 BLAKE2B e42b36bfa8f6d0f4c9b2538c04bb0b7650c411b621a1be5cba58ca8f6f64a1bc68517eeef385351461ef72e33152b05df14775777de14e848802ee8eb4980909 SHA512 1a904083074cad42013d9a8798ea32898332fa0697f79a1a11e6a0f5b6dcf35cb42dbb52a3b5baaeb3fe2012f80dfbbafbd874df4eef783e8a151b13b98afe77
diff --git a/app-emulation/wine-staging/wine-staging-4.14.ebuild b/app-emulation/wine-staging/wine-staging-4.14.ebuild
index 52c20dca7b4a..1c459adafb0f 100644
--- a/app-emulation/wine-staging/wine-staging-4.14.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.14.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-staging/wine-staging-4.15.ebuild b/app-emulation/wine-staging/wine-staging-4.15.ebuild
index 52c20dca7b4a..1c459adafb0f 100644
--- a/app-emulation/wine-staging/wine-staging-4.15.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.15.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-staging/wine-staging-4.16.ebuild b/app-emulation/wine-staging/wine-staging-4.16.ebuild
index 52c20dca7b4a..1c459adafb0f 100644
--- a/app-emulation/wine-staging/wine-staging-4.16.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.16.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-staging/wine-staging-4.13.ebuild b/app-emulation/wine-staging/wine-staging-4.17.ebuild
index 358f66f96ae8..2d1bd8b5970e 100644
--- a/app-emulation/wine-staging/wine-staging-4.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.17.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
@@ -130,7 +130,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.0 )
+	mono? ( app-emulation/wine-mono:4.9.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -435,7 +435,7 @@ multilib_src_configure() {
 		--libexecdir="${MY_LIBEXECDIR}"
 		--localstatedir="${MY_LOCALSTATEDIR}"
 		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
+		--sysconfdir="${EPREFIX}/etc/wine"
 		$(use_with alsa)
 		$(use_with capi)
 		$(use_with lcms cms)
@@ -555,6 +555,9 @@ multilib_src_install_all() {
 	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
 	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
 
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
 	if use abi_x86_64 && ! use abi_x86_32; then
 		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
@@ -565,7 +568,7 @@ multilib_src_install_all() {
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
 	eshopts_pop
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 52c20dca7b4a..2d1bd8b5970e 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
@@ -130,7 +130,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.2 )
+	mono? ( app-emulation/wine-mono:4.9.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index b1f6447ebd17..6d4ac4cfa0f3 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -3,16 +3,16 @@ DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f88
 DIST wine-4.0.1.tar.xz 21665840 BLAKE2B b33b5ce8b4624dfbbbf473a88ed8c52d5e53855fa98ac3128e9b89dbeee6e92044ed1e662e1dc9669bd8d805424c36f2dd2c836c51bf6a5e4d78350926a13150 SHA512 dd240525e389f841123a569fd2f9b8da698b7707bc0de408dfd60ae73c5e24d522abb42b76571c840df52c686fdeae56e0a9c69db2cd31f04cdb345feeacf1dc
 DIST wine-4.0.2.tar.xz 21668348 BLAKE2B f1aa8ba3add9ae1e6fbb930a0c557c0015a699b21ba9988c6832c9a1b5180f98cbaadc561fbe4a22e97ff78732ee121a14f5a82b0637c71a4856fa5524ff2f5a SHA512 14cb7eeba188562b73125c668f2020e1df6802e486552e422d3aa75b95f6fccedc0f87868f7e58ce71697941ff49757981ec93b9ef288da37ca8570658f194fc
 DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
-DIST wine-4.13.tar.xz 22137820 BLAKE2B 6aab4930fd176757e2594a580ba73694cf04b5411eaf26dc332a8aee5efcd1a181781d010610b22aaa6dd91b4f9161502609b8a23928d6848329d773f98c41cd SHA512 b359db3c99d10b489f7f72172b624e7b2e2b826c206e842a524d781ab5947e2b03623a115c2345fc71df22eb508936c2f7667d4c420a2fb6cdc34e3d2ba5e75b
 DIST wine-4.14.tar.xz 22151304 BLAKE2B 04983c21fa58091a36e681c90b92b4f014287ea7edb105bef560ed0505682dd1d3832292a0e2cc72489f0c4a2247ce9c1ec7481f80cf2baa05953e525ce00b1c SHA512 cfbcad1685abf3a3810c5f29c50e47f1340aab2276e54d8d22b9b764df5099ff7ad399a6cca200c7a622be0470992d3aee1c0c64c2e6ea90221fee6d391d911c
 DIST wine-4.15.tar.xz 22196108 BLAKE2B d3b28ad1bbfb7e1522a3acb120049dd3ac3fe0473d0f84529e86b5b9163401869e39f7c4c0e14795a97362722c41ea1476e4afbd1a545e5518504df2628c928a SHA512 f8290bbfd3779cb967c1cf689106fa48d1a1daeac2bd42fb91a2d4beed48e0c398ed9239437756bdbe3cd826cef59f5cd660381f637e184c47a865ff3ace91aa
 DIST wine-4.16.tar.xz 22205248 BLAKE2B e7f7daeb4f75a5cf38478609512317e55ead862812a409e4f094178c0b7dec2a969b0a96e83059a1bede3610d3986529f926041765cfa536b786ee53fdc27b84 SHA512 f3097b06e490356e68484239b7a2ac1cfa968818565c79386ba6c0e70a318c092af5549da8218935cbe891876fa519d361a3775d0ab5d4adc192555ae0e45d86
-EBUILD wine-vanilla-4.0.1.ebuild 17343 BLAKE2B 57e3ea58827294e7719352b84038074a2a2e7a56f1030db21891afc2d275eec4481751a53bbea59d23028e40967dc9f1751f3b170cb36e669e55d3f7152708db SHA512 2b04e442062e88e663b12139ab82d20df992787936987ada9394d62b1c208fa5be6a7bd192456fb027a3d730843a135091155956cc539e8481c916e3dbfe209e
-EBUILD wine-vanilla-4.0.2.ebuild 17345 BLAKE2B 72ea2e1202b57a6da506c22daf73d9201296b5c34879960ca0217b31a50c7f798535478bbab307c7568d4e0e75c053e0ba2cda5770e9801bc95c68f67b073366 SHA512 260cf6d90fa053a8c06bf602ae918f42b95c1f56b51fc374086cff4e370d1d5be1c1a9eeb458130f6d9e1bc03a31b8afc2922c6b57e1488e4d59423037f35cde
-EBUILD wine-vanilla-4.0.ebuild 17340 BLAKE2B 44d7b71fec5fd62ad3403f881da67b2f6bbd7eb21cfb5e766fd6542967f88aa8dd42e9c4e2760ffb2e209ad45f7e7c64e522cfd0a01101765867f7e8260c9a08 SHA512 fc2eb099e3687cabb2f3a361760c5261f06e858f8046e2298df82c51b9b1541ed4c00a48709ff89674f48ad466ba409fa8e1702d1949d69ea86770079ffcc9cd
-EBUILD wine-vanilla-4.13.ebuild 17562 BLAKE2B adc4845a27faea7d3d46db2dd8488bb3efb5f769b6217936d2734da9e99d412f60890b01d5d666a9d43aef94588ccb21500c209cb1d78ab7071c29744cf211c6 SHA512 d187f0b09ffabe340b49685aa0cc992bf6d425d8f598e07685b609565c4b287e11134a87953f5943c8521ef5894e4885d1ba56327127d6c9552fa9664f5e1b48
-EBUILD wine-vanilla-4.14.ebuild 17562 BLAKE2B 3d0fe7847fc3345b100fb3f1e8cb9019b9c31253d649c1e794c0d36fafa7d8b555eba8be60ed571f0b3d094a60cd64b32b2797bd3bc49a0637c6a13eea63effc SHA512 c39a9db6d4a78d8765bd3271c4abd625a7cf291d93b9ce3952779b202d7ef45439d9ba2d76f280fa5cfd3eae9918e94ad51e64a5d37d000c4f4478a639bb114f
-EBUILD wine-vanilla-4.15.ebuild 17562 BLAKE2B 3d0fe7847fc3345b100fb3f1e8cb9019b9c31253d649c1e794c0d36fafa7d8b555eba8be60ed571f0b3d094a60cd64b32b2797bd3bc49a0637c6a13eea63effc SHA512 c39a9db6d4a78d8765bd3271c4abd625a7cf291d93b9ce3952779b202d7ef45439d9ba2d76f280fa5cfd3eae9918e94ad51e64a5d37d000c4f4478a639bb114f
-EBUILD wine-vanilla-4.16.ebuild 17562 BLAKE2B 3d0fe7847fc3345b100fb3f1e8cb9019b9c31253d649c1e794c0d36fafa7d8b555eba8be60ed571f0b3d094a60cd64b32b2797bd3bc49a0637c6a13eea63effc SHA512 c39a9db6d4a78d8765bd3271c4abd625a7cf291d93b9ce3952779b202d7ef45439d9ba2d76f280fa5cfd3eae9918e94ad51e64a5d37d000c4f4478a639bb114f
-EBUILD wine-vanilla-9999.ebuild 17562 BLAKE2B 3d0fe7847fc3345b100fb3f1e8cb9019b9c31253d649c1e794c0d36fafa7d8b555eba8be60ed571f0b3d094a60cd64b32b2797bd3bc49a0637c6a13eea63effc SHA512 c39a9db6d4a78d8765bd3271c4abd625a7cf291d93b9ce3952779b202d7ef45439d9ba2d76f280fa5cfd3eae9918e94ad51e64a5d37d000c4f4478a639bb114f
+DIST wine-4.17.tar.xz 22230616 BLAKE2B 428d9b781acbadabb2ce677b08c1a38f130c39d2acb95364dc0ac4cfef8f7c9efe4199846bf0bfc745dc25ba632847f224da1b0a09b8ee6c4927154771a538cf SHA512 f762aab2596a4b5cf73d3282be561d25a2fe69e5d4a5ec2e29db47b3eda7496ca9eb7e57ff7765853d258422898bfa775bf9b458e61eef837b213e422bd748b8
+EBUILD wine-vanilla-4.0.1.ebuild 17333 BLAKE2B de24979de56828f96c53353f02cc44940e7f524eb76bdf9a832d08e21d04eb8e7f3f5a174f20f04e3dcba24a53414822987805ea046066da05824a04a6aab486 SHA512 f5fde5c2ab86543c9e0dfbec9d1e0234c5b0a0e66cf71201a94c7b7be82062c7b2551d6ab4719f7e371d49d22bdaf2fe02b190d145c79923f3024d28b87e0f97
+EBUILD wine-vanilla-4.0.2.ebuild 17335 BLAKE2B 6c313ee907ba258f737b19a9e2c1ab3bf04555649c558d569d7372170704ce2134b6a9d009cfb0e8040ebaf7d50a68c5e8a44fd109557a0e0d77c8293fa0f8ff SHA512 e8b8fae470d371aae55cd69677dadf14da758443f4be3ca19a9782ae8ec51696a1c7e113be38ffeef3270160d155c383daf6482e283def2ccebb5df0cfd3a803
+EBUILD wine-vanilla-4.0.ebuild 17330 BLAKE2B 1dbe6a5dc59af64bfebf087f84efdcad0a1ad56b3f29e567926d4f036ed36ba53bed1ad5072363cde853b18e1ecc848a2804e716b35e85f0ea04faf7e7306d82 SHA512 5535dd99e33a4895d8e6cc9a42c4fe47ccc69e44ff7270e0ebd89701cee1262a1270d2a781f0ac35ef708d9e1c194c02e43c98b1fec7895bd6f83d4b88c02353
+EBUILD wine-vanilla-4.14.ebuild 17552 BLAKE2B a3d8858dae156aaf8e64c5dab402db4ef89f0d000da275374aee488d7be1e2c3c4e402f12c1ddcccf2d3da47f9c2c97328fbf843046b8638e3948b039c1ac92d SHA512 dcbb3c9a513c2cca2cd23da3fec45a817500de43d5dfae7a4cfe551bb3fb2848da8859373e97dd598e8ffd3ab464b38da91d930d5f090fae64b3edd464a63246
+EBUILD wine-vanilla-4.15.ebuild 17552 BLAKE2B a3d8858dae156aaf8e64c5dab402db4ef89f0d000da275374aee488d7be1e2c3c4e402f12c1ddcccf2d3da47f9c2c97328fbf843046b8638e3948b039c1ac92d SHA512 dcbb3c9a513c2cca2cd23da3fec45a817500de43d5dfae7a4cfe551bb3fb2848da8859373e97dd598e8ffd3ab464b38da91d930d5f090fae64b3edd464a63246
+EBUILD wine-vanilla-4.16.ebuild 17552 BLAKE2B a3d8858dae156aaf8e64c5dab402db4ef89f0d000da275374aee488d7be1e2c3c4e402f12c1ddcccf2d3da47f9c2c97328fbf843046b8638e3948b039c1ac92d SHA512 dcbb3c9a513c2cca2cd23da3fec45a817500de43d5dfae7a4cfe551bb3fb2848da8859373e97dd598e8ffd3ab464b38da91d930d5f090fae64b3edd464a63246
+EBUILD wine-vanilla-4.17.ebuild 17552 BLAKE2B 48bdadd0a5f2e4eb55a6db288f527718b2fa9fea34ecb55190f7ea39db379ba1d5c1cab188894ac8968ab72613c344644697279e1f108140b2784f041d4f7bff SHA512 168ccb8c38467d6978af5f05aa180d8e529d3f559e5424b1d50e50c55d357c43ee0ea8ea684ff3bc276fa19380125834dabb748a682c7e46274bdfadc5407f63
+EBUILD wine-vanilla-9999.ebuild 17552 BLAKE2B 48bdadd0a5f2e4eb55a6db288f527718b2fa9fea34ecb55190f7ea39db379ba1d5c1cab188894ac8968ab72613c344644697279e1f108140b2784f041d4f7bff SHA512 168ccb8c38467d6978af5f05aa180d8e529d3f559e5424b1d50e50c55d357c43ee0ea8ea684ff3bc276fa19380125834dabb748a682c7e46274bdfadc5407f63
 MISC metadata.xml 3259 BLAKE2B b750a29db90841c9fa04e19ce9e5811945bb1d1d3b6a3b4a071087bf73f9386706ab28b7af29e7e89afcff2e1b68ca79944546e5f68c0d0f248b95fb1a5ac2fc SHA512 84fb94a9a9e4c9e8bf59391c9c1414e55994f80df0b264fdff77f43defa13ef0becdfc24316ef9eb3d824ea8edca5af3aed0586224a96b25fc3e90d7dfc32394
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
index 7f17dc2812b4..fde52036375d 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
@@ -21,7 +21,7 @@ else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
-	KEYWORDS="-* amd64 x86 ~x86-fbsd"
+	KEYWORDS="-* amd64 x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
index 5f5e60da9273..78f6dd16ff0e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
@@ -21,7 +21,7 @@ else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
index 9872c68e6a2b..70e34aebbe37 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
@@ -21,7 +21,7 @@ else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
-	KEYWORDS="-* amd64 x86 ~x86-fbsd"
+	KEYWORDS="-* amd64 x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild
index d6779b0d96a5..85ad8429a752 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.15.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.15.ebuild
index d6779b0d96a5..85ad8429a752 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.15.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.15.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.16.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.16.ebuild
index d6779b0d96a5..85ad8429a752 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.16.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.16.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.17.ebuild
index 42d4ca69bfa1..d502188edebb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.17.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
@@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.0 )
+	mono? ( app-emulation/wine-mono:4.9.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index d6779b0d96a5..d502188edebb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
@@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.2 )
+	mono? ( app-emulation/wine-mono:4.9.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/x48/Manifest b/app-emulation/x48/Manifest
index ded0be9e0c4d..c54d2e2ad36e 100644
--- a/app-emulation/x48/Manifest
+++ b/app-emulation/x48/Manifest
@@ -1,3 +1,3 @@
 DIST x48-0.6.4.tar.bz2 227991 BLAKE2B 8db2962860eeb161a8efc9d46730c71d95d0331157e3e2481a978385ad54b04b7a4eb601c68e7df966194b23e0cd04bed4e80511d22695bb7ccdd3959d8fd8d7 SHA512 60fdba1171a02e4a5f9bcefb29fff9398fdbda50553c3d3b952fab0b4ebf87b219d4615139ca3673b1c61ff6d6559aab3e93218334aa6cdb442d4861347138ce
-EBUILD x48-0.6.4-r1.ebuild 1728 BLAKE2B 556cf772f97059b55e666e7a83929da28cb53f0e1275775b8054775428c90c155455a273f0f8aeac8c50c39e3e563756f7a094f400769a71f6a21f9eee22cd15 SHA512 79572ae1bb8b28b46b1255fc0b25a5bf3e61778e89484857e0d131f6981584225a608664462ee0e9d940600d2a967df676a5718ff7df74bc6076ca854908c800
+EBUILD x48-0.6.4-r2.ebuild 1675 BLAKE2B 770f6e53f63ac2d04c433593a1e3ceae3a2692df4503138dc5bccc8e8267587cb627b46837f402ded40a09978ba300849fcafcbacbe4237d4fe2d95cf043ae97 SHA512 49893698148039187771e891ef9752ee9ddab31648d8f23b556126af531c7e3447e9458eedb0dbf14be2dfd32ffa4cf32e4157fd7769f6455895bc70a1e50def
 MISC metadata.xml 723 BLAKE2B 98911516312cc5d5617bbf9d6e33915608b30639c2354024cc74407888a699cf7464261fc7d40afad3fd6632ae39da74b5f90ede1bd51e491d0193c759d8ed07 SHA512 0de7f42012bc6624f1eca6d08c3807185f5fcd7b44a34fd701cd7af2ede5b0ab21f41b41fc7b784b3fe641b3b12b58ae412a2969679fbfcc1edbfd99b6e39685
diff --git a/app-emulation/x48/x48-0.6.4-r1.ebuild b/app-emulation/x48/x48-0.6.4-r2.ebuild
index 25255dc0248c..60123e66d5ad 100644
--- a/app-emulation/x48/x48-0.6.4-r1.ebuild
+++ b/app-emulation/x48/x48-0.6.4-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -14,9 +14,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="readline"
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXext
-	readline? ( sys-libs/readline:5 )"
+	readline? ( sys-libs/readline:0= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-libs/libXt"
@@ -28,7 +29,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	eapply_user
+	default
 	sed -i '698s/inline/static inline/' src/emulate.c || die
 	eautoreconf
 }
@@ -38,10 +39,10 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
+
 	insinto /usr/share/"${PN}"/romdump
 	doins -r romdump/{README,ROMDump*}
-	dodoc AUTHORS README ChangeLog
 }
 
 pkg_postinst() {
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 35e076bd8b2f..d945a392587d 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -9,9 +9,11 @@ DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 014b664e90c64e7255c9e21fc25a2cc60d57f
 DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad
 DIST xen-4.10.3.tar.gz 24695778 BLAKE2B 50a9e31fb4cf587eeedb357fc710405a1cd4506174a38eb9b032a0cdd9b7f7343d98624ecb07cf605b1403664c7117cdc8f011290309caa18ca9604b4008b906 SHA512 030d23109ce4c0ebf50ade6841d5525a39032bcf8fd0599ccaa9502ff301c1f61f9c5f49233b41a5934a71228958febc1e529a9fc6822ba401a0c18c490ad412
 DIST xen-4.11.1.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
+DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
 DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a SHA512 0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de
 DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
 EBUILD xen-pvgrub-4.10.3.ebuild 5043 BLAKE2B f3a0b8b7e2f1ed974273191c962d1c8889002f4edaa1a0eb173e8b78775fb2ef8792b7861298d7d525323b5e098f46a90e7eaab4f34f9dfc481f427dd80eb45e SHA512 5d10c9a3558291613b431d8a11e1cddcedb30dbe7c98cddcfcdfa51b2784b79a86f91cf5dc4894d1802ca0683614bb35af1605eb95d4b6bc57074980e8dba8e8
 EBUILD xen-pvgrub-4.11.1.ebuild 5106 BLAKE2B 611e4797e596f5e7c5117fa284e7841319119bdf2745a63bdd743da993140225fa5e1dd026c8966dedec0a976bcd1c8419b7cac08f5efbad5d3243ac5653a7c5 SHA512 1dc318e1179a8e8bee5212c323ff887fd991b39f5803499cb8472d2d963eb7928ecb676fec674aedad34bd07a82d9188f1759e1a6751c5223eb52a703b410977
+EBUILD xen-pvgrub-4.11.2.ebuild 5108 BLAKE2B 2e88a5833f1b58b4e3aabb9f7479bfac4e3f2b5308ebc6bc5579fd48208bc26a1039e87b5b083ac55919c375fb1967efbabf52d74b2498e189e8395c9dbc6794 SHA512 a4135ffbd9e8fb167bfc81f3d500d770c0b08ff3dd7b525629428fa19d3cf84abee03fd43827c363c456bc8a16744bc1dfd04a934ff1382edda227663fd7bb72
 EBUILD xen-pvgrub-4.12.0.ebuild 5108 BLAKE2B 2e88a5833f1b58b4e3aabb9f7479bfac4e3f2b5308ebc6bc5579fd48208bc26a1039e87b5b083ac55919c375fb1967efbabf52d74b2498e189e8395c9dbc6794 SHA512 a4135ffbd9e8fb167bfc81f3d500d770c0b08ff3dd7b525629428fa19d3cf84abee03fd43827c363c456bc8a16744bc1dfd04a934ff1382edda227663fd7bb72
 MISC metadata.xml 245 BLAKE2B 2bf2c7848c8c513915aaad9305b6146cf46201bbcf3ffa040c943b7188d2d2a9fe27e2b5ecde84ed2099dceadd4b057856df01ac603a6aceca0f7b7f466174c7 SHA512 3f646ec3197e46d25dde4f698b571fb85b040198f4cba7508c8d38405b4d9d0fc31dbd5ae6242aea8c2acd613aabe0486cb347a1db4811fa807b861148661f8b
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.2.ebuild
new file mode 100644
index 000000000000..90600bb0eeef
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+inherit flag-o-matic multilib python-single-r1 toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+
+UPSTREAM_VER=
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="
+		https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz
+		$GRUB_URL/grub-0.97.tar.gz
+		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
+		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
+		${UPSTREAM_PATCHSET_URI}"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext
+	sys-devel/bin86
+	sys-apps/texinfo
+	x11-libs/pixman"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-emulation/xen-tools-${PV}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+retar-externals() {
+	# Purely to unclutter src_prepare
+	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
+
+	# eapply can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+		-i "${WORKDIR}"/zlib-1.2.3/configure || die
+	sed -e 's:^AR=ar rc:AR=ar:' \
+		-e s':$(AR) $@:$(AR) rc $@:' \
+		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} || die
+	einfo "zlib Makefile edited"
+
+	cd "${WORKDIR}" || die
+	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz || die
+	tar czp grub-0.97 -f grub-0.97.tar.gz || die
+	tar czp lwip -f lwip-1.3.0.tar.gz || die
+	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz || die
+	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz || die
+	mv $set "${S}"/stubdom/ || die
+	einfo "tarballs moved to source"
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+	fi
+
+	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+	eapply "${FILESDIR}"/${PN/-pvgrub/}-4.10-externals.patch
+
+	# fix jobserver in Makefile
+	eapply "${FILESDIR}"/${PN}-4.8-jserver.patch
+
+	#Substitute for internal downloading. pciutils copied only due to the only .bz2
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	retar-externals || die "re-tar procedure failed"
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
+
+	if use x86; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+	elif use amd64; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+		if has_multilib_profile; then
+			multilib_toolchain_setup x86
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+		if has_multilib_profile; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index ebe85c92d724..7606874a1af4 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,4 +1,4 @@
-AUX gentoo-patches.conf 2037 BLAKE2B a07a8d7a001f37c6d2f516e95f6df700ec59305323dd7015eb9935aa42e93a7aa88c4c9c59b8818a0643f13a4721e2ed1e1c1ab458304c9edf207a74fb9e541c SHA512 0265d8d53de2aadfc6341fc5a6241ee1476d5a51e6216ccab871f970be2cf8d51199cba64e51457c40474679b87c0f9ea833eb0240c05ab965d2d1b9daa18857
+AUX gentoo-patches.conf 2303 BLAKE2B a3c16fcc06a861aba37cfc9ff6a186b52e292b6bd3dbfcc7493b2cc2aa2191a8c4d342a947cb8ed039d08b7f147aa356061f9d995e01e25ae9bb9cf1b9f360dc SHA512 eb01cdb6d013d64bc575e1f39b4e9319f8d7302d078ddbe0fbd27a343cabea4be012ccce5fc950ea7dfa524b26436d5b762d60ddf663e4b2769d7f1030f0bb2b
 AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
 AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
 AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b
@@ -24,13 +24,17 @@ DIST xen-4.10.3-upstream-patches-1.tar.xz 24064 BLAKE2B ec9339d00afd4057738a7816
 DIST xen-4.10.3.tar.gz 24695778 BLAKE2B 50a9e31fb4cf587eeedb357fc710405a1cd4506174a38eb9b032a0cdd9b7f7343d98624ecb07cf605b1403664c7117cdc8f011290309caa18ca9604b4008b906 SHA512 030d23109ce4c0ebf50ade6841d5525a39032bcf8fd0599ccaa9502ff301c1f61f9c5f49233b41a5934a71228958febc1e529a9fc6822ba401a0c18c490ad412
 DIST xen-4.11.1-upstream-patches-2.tar.xz 78292 BLAKE2B 762c0b33500503854d3195af752a4510090b22a7212abb6bd72a74fd55b64ffc622db5d3b18ff5c2f1b804002537a82bdf5036ec23acf15c8b8e3f0ed8c722fb SHA512 4850ab53de811dc7a5499f603584624c7879f41cbacc223cbfd5fdf0042d39ba0195aa51356215d26136dab536f1b713274d21e3d265b62ca06fdab0aa923a77
 DIST xen-4.11.1.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
+DIST xen-4.11.2-upstream-patches-0.tar.xz 11532 BLAKE2B e36509d6256ac4018f20711baba77619a7c3a684d81e25a94cffba9c9f53ec9e0efdcefcd6a7ffa26b49fd3d4e0dfc2126f1ea620f0bd35ea83188b4587e5b38 SHA512 4a97d1e56cb3e5152372f0c0b99f8838194b2e03ed1255e87611d8bb28af9c9199fe123d3542f5ba9b3f652c29a519b5e4255b8925c0c8dfbd588f83ed8806d9
+DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
 DIST xen-4.12.0-upstream-patches-0.tar.xz 32864 BLAKE2B 994ca1f9fdd89f25e225348870ec97257795644f0314437f8d2927b77ce5b53de6b9e043636cc2c9e4f8fda4ff7b7c26917f2912f2a287c57bc00606846fb617 SHA512 6f7ab80cac0afd8bcd88109cd052e29f9b028b0c363a4e1f1e845f4fdbb3d7782dffd1f20dd80f2923c507625abe9648d7fbe7d52c6fd565ab550c9c5a416eeb
 DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a SHA512 0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de
 DIST xen-gentoo-patches-16.tar.xz 36980 BLAKE2B a59fcb221a915e39fbbc463fa8b1ca1ef00007654936cc17f64853d91737478a6f78480a3e459b07b8c3ddcc81ab9400beb9ea3906750ba69864d1b97db349d2 SHA512 7727e5c7f4ef997eea830618bc26b26f3a99539a1c702264132401e41a328b384346a06b6721f18e3056fc91a2d2d2bf6320e0ae3c79432c7458a24a0d269c56
 DIST xen-gentoo-patches-17.tar.xz 15688 BLAKE2B d5e3bdb15e182c5f0c21adfa5cb5b88e3453e5035659823e3322074646c3ea89b55bf54d0ec6c54966d9739544d156de365a60acf928b799b68978be3380a002 SHA512 f1000ca36166fa21d4b18fb9ecf36f55b1450c312622fbe38545f78aabc150e2d6cce4bd58472c41bd9be8945940a0bc953ba7e470cd5095cf2e7d8a87769b2b
 DIST xen-gentoo-patches-18.tar.xz 16840 BLAKE2B 7243b363c78250ae1928d75813cfd6035a87ca03f1605cbe02233e009a19105a0712711d622eef8606f3e7e1a5db5203342e56a1b00496d5ce37ddc4ffb9e4ea SHA512 328d7b1a57ab6bf9c7200b934aeb241f6d4fecccc600130d1c80460540212eb658cb74ae0502c008e040fdb2d95db20c2a3d71a8e73fd1361070d70adeab6e30
+DIST xen-gentoo-patches-19.tar.xz 17460 BLAKE2B 6f25c4c9bb438ba0ceded75d04ba6c05ca74e6319d14cf744ea23ecbed2e8283c3c00275a4609b583402d352216520a10197fd4ab9e056eac1c841b0f79bc6b8 SHA512 586e88eea0f2dcc5bae0eb4691cc1d722a8b1a7ca849fd8992d72c0990b2832b3e78738c936e8e46bc9623aa1c8e8afa341a22608479629ea012474d5ff6b69a
 DIST xen-ovmf-patches-3.tar.xz 4208 BLAKE2B 0df8f85667a33c91cbfd86c59aec2ae65eca892b45d66eed76f793a52e2748989bc2785861f8bfdf94235ef7a6c0be6572c6e6cce9695469e40f0facd0ce3947 SHA512 abe001053ca702138bbcdd6bea14e2daae5c785f862d6a15001ca894c8ed8617f0c5dc439c6f54a41433b988acf57c71911af1db074aa76732c39d98622a3b5b
 EBUILD xen-tools-4.10.3-r2.ebuild 14271 BLAKE2B 6d5754c5a1e83c5d32cb569d19836e866fbe52ac5db68e0ad85e2a47873af97b457c6fb5709e912aebba72df91efdc28c57c63aab14173993d22eb80af12c478 SHA512 6748ed5b0871043334293561ec588256f079d81059d60fd5e486563d5274aee775cacde2bfc01ed45836fc8b8858f8df8107e118ff89766477832ac00f788dbd
 EBUILD xen-tools-4.11.1-r5.ebuild 14524 BLAKE2B 04c598fec6b8764c5d28584b52798f38f245e92ea890276b15eb6f2ee01b15526bd2789113a70fac5a42dfc57da854c2701bb810d865460e1714f224a053c649 SHA512 c8e7d2a272f4cb12d12557826ee7a0e4ba8c20dc90dec27168a341e3272951bdd291fe3c102bb5a9b7434a1409a93364a75d87d7ddb92d1ccc1a331f8ac6316f
+EBUILD xen-tools-4.11.2.ebuild 14526 BLAKE2B b8c61fd3c7860d068bfceab36c34b24d8b1f935ad9436d69d34c77f1b6b1846f3275272c9bef8acf42c71a937fda053889dae7cc230c3a6abdc041182c409bb2 SHA512 0ee7d364a9bad6d6bf292cc5ecc5af7605cd1c0f277dd9effbc40f2a5ad38e5094ef755fd49c4e75f2e8735300995309a1d90894e7aa55bad51621cbb92637a2
 EBUILD xen-tools-4.12.0-r3.ebuild 15250 BLAKE2B 2b4085469cc0d28bb8eca87c053857e8b3902391b4a8aa54529126f6dbc9ca8b5e64cb43fb22b420797d6844a83dcdef01646f0f09592a2aa816060439100ba7 SHA512 14a58addc05c4a0d90017212ca44ddac1c94cff35ad3ae4e6c2dbd8bf00a99de3d6cdaebb4555f03fa457db26efd766a633931747a11c472da2c412dc1974258
 MISC metadata.xml 1479 BLAKE2B 1b994f8dcaa5cf67f588af6ce9533467816f7c4726e412566640138e631427decaf890856fa255b516580502c97c2e29c21bb84b4888df7603a9491a012381a5 SHA512 d125649737e0b34407fb32b67b741feca60d100454fdbc84b07305849295f134e1b657f5e13b6e74a90d25d7b408880316d470ee94447b7a6f99abd75eb82a83
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 7b4465859fe7..6c12664cca1c 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -39,6 +39,9 @@ _gx048=" xen-tools-4.11.1-gcc8.patch"
 _gx052=" xen-tools-4.10.3-gcc8.patch"
 _gx053=" xen-tools-4.12.0-gcc8.patch"
 
+# Fix building with gcc 9, bug #689082
+_gx055=" xen-tools-4.11.2-gcc9.patch"
+
 # Fix pdf document generation, bug #650396
 _gx049=" xen-tools-4.10.1-pdfdoc.patch"
 
@@ -72,6 +75,16 @@ ${_gx045} ${_gx046} ${_gx048}
 ${_gx049}
 "
 
+# xen-tools-4.11.2 patches set
+_gpv_xen_tools_4112_0="
+${_gx038} ${_gx017} ${_gx043}
+${_gx027}
+${_gx028} ${_gx029}
+${_gx037} ${_gx042}
+${_gx045} ${_gx046} ${_gx048}
+${_gx049} ${_gx055}
+"
+
 # xen-tools-4.12.0 patches set
 _gpv_xen_tools_4120_0="
 ${_gx038}
diff --git a/app-emulation/xen-tools/xen-tools-4.11.2.ebuild b/app-emulation/xen-tools/xen-tools-4.11.2.ebuild
new file mode 100644
index 000000000000..409d2a256949
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.11.2.ebuild
@@ -0,0 +1,474 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ncurses,xml,threads'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=19
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=
+
+	SEABIOS_VER=1.11.1
+	EDK2_COMMIT=ef529e6ab7c31290a33045bb1f1837447cc0eb56
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+	https://git.seabios.org/cgit/seabios.git/snapshot/seabios-rel-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask +hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	ovmf? ( hvm )
+	pygrub? ( python )
+	?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	sys-apps/pciutils
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.11
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-firmware/ipxe[qemu]
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		sys-devel/dev86
+		sys-firmware/ipxe[qemu]
+		sys-power/iasl
+		system-seabios? ( sys-firmware/seabios ) )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-base/xorg-proto )
+	qemu? (
+		app-arch/snappy:=
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-keymap
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-pr-helper
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/s390-netboot.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	local i
+
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			eapply "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			eapply "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf || die
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			eapply "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/edk2-*/ > /dev/null
+			eapply "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		-i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+		unset CPPFLAGS
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	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
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	# disable capstone (Bug #673474)
+	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+		-i tools/Makefile || die
+
+	# disable glusterfs
+	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+		-i tools/Makefile || die
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--localstatedir=${EPREFIX}/var \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable api xenapi) \
+		$(use_enable pam) \
+		$(use_enable ocaml ocamltools) \
+		$(use_enable ovmf) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	tc-ld-disable-gold # Bug 669570
+	econf ${myconf}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}/tmp" || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+		dodoc -r docs/{pdf,txt}
+	else
+		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+	fi
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	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
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+	keepdir /var/lib/xen/dump
+	keepdir /var/lib/xen/xenpaging
+	keepdir /var/lib/xenstored
+	keepdir /var/log/xen
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config system at boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 7f3aa8d7d78c..67616039e28a 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -4,9 +4,12 @@ DIST xen-4.10.3-upstream-patches-1.tar.xz 24064 BLAKE2B ec9339d00afd4057738a7816
 DIST xen-4.10.3.tar.gz 24695778 BLAKE2B 50a9e31fb4cf587eeedb357fc710405a1cd4506174a38eb9b032a0cdd9b7f7343d98624ecb07cf605b1403664c7117cdc8f011290309caa18ca9604b4008b906 SHA512 030d23109ce4c0ebf50ade6841d5525a39032bcf8fd0599ccaa9502ff301c1f61f9c5f49233b41a5934a71228958febc1e529a9fc6822ba401a0c18c490ad412
 DIST xen-4.11.1-upstream-patches-2.tar.xz 78292 BLAKE2B 762c0b33500503854d3195af752a4510090b22a7212abb6bd72a74fd55b64ffc622db5d3b18ff5c2f1b804002537a82bdf5036ec23acf15c8b8e3f0ed8c722fb SHA512 4850ab53de811dc7a5499f603584624c7879f41cbacc223cbfd5fdf0042d39ba0195aa51356215d26136dab536f1b713274d21e3d265b62ca06fdab0aa923a77
 DIST xen-4.11.1.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
+DIST xen-4.11.2-upstream-patches-0.tar.xz 11532 BLAKE2B e36509d6256ac4018f20711baba77619a7c3a684d81e25a94cffba9c9f53ec9e0efdcefcd6a7ffa26b49fd3d4e0dfc2126f1ea620f0bd35ea83188b4587e5b38 SHA512 4a97d1e56cb3e5152372f0c0b99f8838194b2e03ed1255e87611d8bb28af9c9199fe123d3542f5ba9b3f652c29a519b5e4255b8925c0c8dfbd588f83ed8806d9
+DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
 DIST xen-4.12.0-upstream-patches-0.tar.xz 32864 BLAKE2B 994ca1f9fdd89f25e225348870ec97257795644f0314437f8d2927b77ce5b53de6b9e043636cc2c9e4f8fda4ff7b7c26917f2912f2a287c57bc00606846fb617 SHA512 6f7ab80cac0afd8bcd88109cd052e29f9b028b0c363a4e1f1e845f4fdbb3d7782dffd1f20dd80f2923c507625abe9648d7fbe7d52c6fd565ab550c9c5a416eeb
 DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a SHA512 0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de
 EBUILD xen-4.10.3-r1.ebuild 4795 BLAKE2B f1b5a6416aa0157162eda97a4d889f46325b51144d9aba769832ec7f503d7ee4cd74c580fdb6b61c51894abb9fb2761eef80183c6c4666fb65e1295aaf08c510 SHA512 6d82456c23ea10b238edb48920d5bc00ac262b2593415dd6f1528336487c036b100c0f8fe00afc109dd9dbdeede9909d1c7d8f2e0423e586f5746af280b8fc6c
 EBUILD xen-4.11.1-r3.ebuild 4918 BLAKE2B 2af67b4cdf322365f397f4a74adb1cf306934bca6a30034b2730701d1bd52025a0db6cc3f50a48900f781e5a5590aa6c22b77baea0c56c00a75ff2e14ab917d2 SHA512 60a9948a680cf588fb9d82cce1d73350b91062df69c0c086831af0ada3f7b63fe80a2560e942ec4d0d157461f47bd9b642569289c956b5b070b0707f56a23b06
+EBUILD xen-4.11.2.ebuild 4796 BLAKE2B f653a6ad08d02979ae08574e30ec1e5f32022f9837c3f0fad1ebda5a9a421bfe55025b9446181d3f3ec70749000d21591924ca7afb97a1253494d6517e638ade SHA512 76671cb83ea9303bae0a8b6c1acdca345a1727fc57465261620ab2fd06472ed48f60a993cabe405e3a3a462cdb5dc37a0e0dce36591164084c3cf4832686b2b3
 EBUILD xen-4.12.0-r1.ebuild 4919 BLAKE2B 2c1bbe11f0342fef28e7315dd8a0635cae7c40508f8ac9e177be1051bb3b3618835b37e155f8734996aea4b9a65e5d8fa6102f579a4ef2ed8adb3234aed20d9b SHA512 baf9d3881cd2ad8810dc9960aa4b27798aabec125b65d62c1824089eb2b91a140cd1821693fca0ad7b5739f1d5b8c83633764745a4c73fd542c62dc4b784c7db
 MISC metadata.xml 417 BLAKE2B 5713c8e5f27d56714938b7d2bed096c3b3f9fbb0ad9bce2bb3240e4a8556134cfc88efe0e2c7feb2e9cc722c11800e8433afa0d03746b05998909dd976230225 SHA512 2708f84b8a1508eebc96539993ae1bde4b921d4401229c221e2bee9a0cd643fdf1f854fcbba6033ed68667d0efb00c25222f4c68535a96f2200084d8d8759946
diff --git a/app-emulation/xen/xen-4.11.2.ebuild b/app-emulation/xen/xen-4.11.2.ebuild
new file mode 100644
index 000000000000..18215b62c1d6
--- /dev/null
+++ b/app-emulation/xen/xen-4.11.2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+}
diff --git a/app-emulation/xtrs/Manifest b/app-emulation/xtrs/Manifest
index e56d6533c085..ada747a689ca 100644
--- a/app-emulation/xtrs/Manifest
+++ b/app-emulation/xtrs/Manifest
@@ -2,6 +2,6 @@ AUX xtrs-4.9d-lcmod.patch 3717 BLAKE2B 1172d6bd65ab10f983cd7793157a45505e16d6300
 DIST ld4-631.zip 106955 BLAKE2B 1c0e04186f14fcc840568521b09c7b55318a87dc49e394d516aa742fe7e5c499ac79771782f9b7ee687cdf55df159cef09897d19976879d4c60fff2a33f7f7c6 SHA512 8c6a24bc0af9326b5b935d7cdb1932b4cb714ab336167fed36f4f6d976cd80fe1d4d6a76e6374366fdc3fce623b2bdd6f9059a964bd6d29f59d6a052a1924c4a
 DIST ld4-631l.xd3 692 BLAKE2B 7870135e999cd358d7a3e5c254908757fa059a61654403ba146b8b866bda450b53fd1821dd3e3f8fc5c0acd17d0935d83b5df814c8e12eb5748bfcdf5688c509 SHA512 401d36fdfbceaf90673c5e9f821d26aa0a58b901d7e950d34361e5cde3252a070ff902019fcc1eb820fb1b2d3277e4c1da57ccc442ee407b0be4e5ca26dc2d13
 DIST xtrs-4.9d.tar.gz 455355 BLAKE2B b7ffda48f9a9bb534e33711b85c02734b7d3f8cee8d3cf2c2bc0a801954dcc1851b12451da03a14a7196368a9066cbaea953e871e8b68b4951f7439412e9e34e SHA512 5d6a2e1d4c2f2df63eaec8d015ea9e485615d82b7923af5c03c394862a31b1e6be2329aca18c0fa0c7d6b984164bb9b4d18f94a3d8cd140a683c5197ddff2249
-EBUILD xtrs-4.9d-r4.ebuild 2237 BLAKE2B c0e06cb12250c6a796f2b831a84d003174d93c000874581c09e713e420497dff83675fd70270c9fad616d18362f45d7d13b22cb243cc49ea02dfb8bf4390bbb5 SHA512 f32d06b4349a53ecd99ae920f5c315f23c072b0b5b1def63c3a406ad9509fa0c130461398b55b02630d319ea7d24f3f57f341cc3d7f9c5f820c70eaee5fc660c
-EBUILD xtrs-4.9d-r5.ebuild 2278 BLAKE2B 7d97182ea47117b04890077ee159522fad3230c2312ffd492bbef08a84ea2022e34b2288d6f4cb523ed2b3f6aaac62fdb36d375734fd18c7e3565bc65f9b0918 SHA512 fa2dab0f5c2583f341cfe947ff24845f72a589dd35359c9c61c04640c701941e7ec5dd7cc890325ec8c269903e0e46ee11e9ac63826abdfabeee49659d5114b0
+EBUILD xtrs-4.9d-r4.ebuild 2227 BLAKE2B fab124629b0c93011d20b714b17fa3fa32feb0350257f088a710113c3639b22dc4d18799683e69b4e0fc4d9d58427a05953e27c54a49756b31bcba944b83f5fd SHA512 14ba99a2142aded7beb5e3d46f9af5511223158372684c5ee851779d7712442023bb7ca7037c18f9db321371bc6d8fd91c654828f0a378813546b7f1d8e12037
+EBUILD xtrs-4.9d-r5.ebuild 2268 BLAKE2B 02ebaf0413321add42a85d3698171ab464696bc3d3504e33a2ac9db8e6739ecc6988c62705cd28445806f4a2fdebfc6f4c8560dd948b12badeb749ee8f22d8ed SHA512 1714f366904a4a4d6a6fbba8600c9c655d2d7dd4acde97eb124ecae6f104f4f709e8ecac4a8612c25000ac244dee372bada0f93f8c564866fec25fea86a84f8c
 MISC metadata.xml 1106 BLAKE2B c19193deafa9ffc2b7e00df6386b1633b9180bad0ac7a6884822d38d8539f3734375a3ba5ce74c5cef895bb41d54c0b252971bd8dd03da7faa79c327c1db1b22 SHA512 fc12b813ea60239dbf8a94d98263cd77d4e35051fc7f9772547c0f52e37c02ed466f72eb5f63070d67bc86a6c546cfab4b2b01e4f994a91ae4e88569cb1beacd
diff --git a/app-emulation/xtrs/xtrs-4.9d-r4.ebuild b/app-emulation/xtrs/xtrs-4.9d-r4.ebuild
index e8b9d7590219..fd2008dfbd37 100644
--- a/app-emulation/xtrs/xtrs-4.9d-r4.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.tim-mann.org/trs80/${P}.tar.gz
 
 LICENSE="xtrs ls-dos? ( freedist )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE="ls-dos"
 RESTRICT="ls-dos? ( bindist )"
 
diff --git a/app-emulation/xtrs/xtrs-4.9d-r5.ebuild b/app-emulation/xtrs/xtrs-4.9d-r5.ebuild
index a61a8c7997e0..ac298ae303fe 100644
--- a/app-emulation/xtrs/xtrs-4.9d-r5.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d-r5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.tim-mann.org/trs80/${P}.tar.gz
 
 LICENSE="xtrs ls-dos? ( freedist )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="ls-dos"
 RESTRICT="ls-dos? ( bindist )"
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
commit	bb72e65b6d6ce95abb5d486dad35d37dc105e89b (patch)
tree	b31a9263d386dcae4cb06764136672508dc5efdf /app-emulation
parent	9b1e6d491f32eb4caf0c8e197bdec075713c97ca (diff)