gentoo resync : 30.06.2018

24 files changed, 3 insertions, 1553 deletions

diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index 34838a5a4259..e6338b42d67c 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,41 +1,4 @@
-AUX intel-microcode2ucode.c 3484 BLAKE2B ff203133c00813884e61a7e1c3cfd5ca34cc8b6bbbac2940e0f9161594355d6d2ed9aa96e83c7d5dd64559ad7945e7daf0bb84d64831128a86970e4e1d3a73e1 SHA512 0e29f995dee47707026cfb6224580c2166d000e91af7b1afe12f00158be8606093d07cdbc0d583a0af79370cf1d9c16b5f35a306bae7f545a5c774ea253509b7
-AUX intel-microcode2ucode.c-r1 3533 BLAKE2B 5d6863c069526ae472bc4510b0900017ddd9d7723e86241536eff7b97a225c15bab8d53f14872a7bab7d5599ad0f0492b8df50baa5d3edc01c4d32808b1781ad SHA512 2b234a0080461f27440047d870b3a2769425499c35807f6ccc89a31e4ee87a14bc74ed2ca95a8b9744f07b93f8042a3d6486cda07011585e3e634663834ca49e
-DIST intel-microcode-collection-20180527.tar.xz 4315096 BLAKE2B 2ab4fe3d8469d98bc890e7f1347e4da442d814e945253e2c400a0ba954925f6c622d259711a9ce89a2d013365c65b002e24e182afc5c53ebd4e14828b2f5631e SHA512 45e46905156a0b4d8b272760d84030651a034feaf2afbc564f99fff89303457c0d7d694f174de5abed666d5107f2f7db93c04acd3cc36a77b1cf1a0495584b1c
 DIST intel-microcode-collection-20180616.tar.xz 4413444 BLAKE2B 4ba5371914f64c8a7261720512dff128f83cc25950a4bdf8d41e9eeb724c6d3150212b1a7f2ee966a2b9c835a2622ac885625fada497ec2bc0aa3c435a2968e8 SHA512 5c0cd4e764397f8c2593153256d573db8f57cce1fc062f5e687a108e5a430c7ed506f63d0d324ea2b88cc8bf8762d3fec507252ee9890c55bb9d3b5604151afe
-DIST microcode-20140430.tgz 785594 BLAKE2B e51a187ca99ad496804f117871b50693b03b50759c9dd23002149ff7fa4b74888c83e8e1fcf078a973dea82e6a9439de8415c56c902ed0163e55ceaaff0eaf23 SHA512 12954522629ce15c4b95c158b6288b3877a3d1f87bea838f8138e53987ef1b6c0edc7a8cbb802a981ccca178b70b4323907aafa7479c0c2fed4497f6fb7bbc1c
-DIST microcode-20140624.tgz 787237 BLAKE2B 1c2d8f39bf142570283e80f370f41c502ef04d24b4348ca4b44c881e3b1e54df72a88e09350d45a33d47d9955d84a80ae8a11e44561b1a8944a59f9326d4d81a SHA512 c774006aae639e7fae90bc1f5d8308b407e7cd3b7d0da6e35577560bf6201c2b15f7d7b6b0cd727c50be1e9d508b484b067856631fa2598498982109bff0e44c
-DIST microcode-20140913.tgz 830537 BLAKE2B 665c72fc3a3e1e13d9e58eba0ed202b30856532eee590006c02112df926b879985a97ba9a96b58a6aad0285bff95a3fbb27b22d533f958fe170887f0ab37eef1 SHA512 e179fe0001b1157cc95aee39185f51fd182d53c1bdb30bfc95bc3a70795c32012050f3a4adf06735a77d8ef9c703a330c6a2610b73b70f09f5760e31d39cb89c
-DIST microcode-20150121.tgz 850761 BLAKE2B d5859b98de645ed255ac4244640979b4c197a1d1d9c2b562c052405f487ccd0f0e570c5054cd55870b4eb4d51237b9c2627547e30b7245174f887605cf049b1b SHA512 f62edd1b666cf381605613766d7e123f0c6debee4448c0ff0882d33c144ad2174656d2501a449f24eb3e4708259e7ec0ff42810739b7d1f34a6a1d9950d17bc4
-DIST microcode-20151106.tgz 892805 BLAKE2B e384a445ea645510dbef1e564963509893ec5beefe90f04490aa7d1b91fd036ae928bbb7a68e291b1633e2d671ce8995518967fffddcc3edc336bc06c3f60251 SHA512 606ce97f0fe76f6a34a857923d3432d8e2368e8a5c504ffa0313f9f016d61b0a5dea26e67662ce1283c1f772ace7318e96a34ebeeeff50b25deb3005ccc6978e
-DIST microcode-20160607.tgz 1236385 BLAKE2B 477b8c8df915d8800f1d5836f2882ba63b152d5e67f6c7eecb71539176d77454b2482fe10308fc3b352a03563582f9626296a3eae48496351b54e81435d4e09b SHA512 17f62ebf3e9f262d21ffa00546da4d711a9a810ad0a9bf4b2805c33090d75e9a07df1f3449baf6009ec5ef1f9af470fd32285b6100f0819e0b9989f5c55dc5bd
-DIST microcode-20160714.tgz 1239344 BLAKE2B 9af6d4d7db21d7316a4e331c5e70a81b9a5d0d95c3476b56d2281a2c7e652e800bcdcec9ad8857563abf378512ecf48c06b3112604fe2602d50b71558d608428 SHA512 f9e09b6669a86aafcc77642d6e33acf9326109c3a2bc3e0d62b45a062b9ecbde6605b5a0ae31d4a3ad2b0ed3c6d3aadbd18088431fb72216bfc31fc452b0e342
-DIST microcode-20161104.tgz 1290125 BLAKE2B 9274bebe3f9104f0afc6378ae40810b2a634c85e5d26f8250666a45c6dd0d75e35d051e8702a6ca26c70d8cdfea0144614bca9c5568294817ea8f522e474b8a3 SHA512 73a7310c1da5bec7ce82bce5cf7c2aafa3d0189e7524bdebd20e1ea3568cf8242be39d9041fa055fe06e759f98703c5d0a631e57ff185aae3ba3c91dbe83cf7a
-DIST microcode-20170511.tgz 2143617 BLAKE2B a2185b44cfca9832d2a80f12a189c49365ed323692b8fd94e99a0f4e8d3f0102a21cfce806ad9e53f172c3ae038f4ffafbafc8421bea6668bfbfdd1262bbd8e9 SHA512 4e2066096d56430c2df73631f15cf16f2317c1d8ff745d7b7cdd784ebccc2b797565eb52703cce9b4238774dbfdcaecacd892d729b7869fdfd7644008ce74a60
-DIST microcode-20170707.tgz 2908882 BLAKE2B 545d94ee9292d1ba730932f11660d0e0378b4a6f2a5232cdcc26333a8d707ec13b040d41617fb28c17e4b81f1df5bc4180f1979925d2fa5198f2edfb3623967c SHA512 2f0643c332318e9c818b9a23a996b59086e86e80e649589e43dbab19f13083d6d9505b8557f67b45ce56de0da043c753a14bb146e597b6669f24fe543656c65f
-DIST microcode-20171117.tgz 3594762 BLAKE2B 7a02c28ec6b9b22a367f8fd7d59f244d0195fef3b256fa2542bca734026e869fdefc7b368a230e94ac0554473d18d1b80aa00511ad4ab6580279f512a106c17d SHA512 b1f09dd7bb04c00e456e34bf42bf786c780aba6d2ef3231a45769216a093876e9bb15123c82ddb7d8ef5426fe10b946509f363770af3b4eba16ba76043a064b4
-DIST microcode-20171117_p20171215-r1.tgz 1477015 BLAKE2B 3911aed3bbbd350be69a99bc855cdec6e8dc2a77f64c4d3a6c1aa24455d5c97eb1c03917eddb4cac2018f6da20a1751cc819a5f27f866f64fc56c7279b5ca40f SHA512 05466e16f9778a3ab148fa5485cd605bca7990067040aa9133ec4c3c1b007519cb260fe8811b44df1192ca0e84237f00d7afccfa11103f3dd4a99c08c692ecb0
-DIST microcode-20171117_p20171215.tgz 1468587 BLAKE2B 58777a39f843ae880f7dd8971a9570dbfc176d69541bb9d3cdc948d7be71a7df2559265fb1c8a199bc7567bb5a60176ade1d2c36624d0193dbac98d82401d0dd SHA512 25db94dbf18b1fea9497ec1e61bb5349d7bc78b0578d8869546bc3ec579b96bee7cd62657e66ebd3d4616805e85d790ac7ee7c0fed70b5db30236ffd12b33293
-DIST microcode-20180108.tgz 3676678 BLAKE2B 197e0188e516a3071be9e2e7a6261d78208613db8b746c7df533ce37884197dbd06a4e6ab027cbddba38903f590130f2d974e46da8fbab0613561523653460ab SHA512 f4010d83353948df27beeb804ef11e4f019f63397a4936f9d139e2842f7944d1ae864b9376987eaffc7db5b97201d5de2f4c1d7cc6b0f545ae15ec53a61fce2b
-DIST microcode-20180312.tgz 3789662 BLAKE2B e948d74833fe75b9bbdff1e4676f5d49a13bdd06aa6525c39be3448b822203947a5f55515484401ee0c96e8ade19ea580718949bed65883d983509661a16e637 SHA512 cc2cabf6d12c83b65eeb30fca7eb0b503e037dbee3d7ce9cb307b02ed8ac9426b2bafc2c1f1281dddff0945f8308f0d3cd320edea4596551354188d64760b854
 DIST microcode-20180425.tgz 1565473 BLAKE2B 70e0a56f0f5f720e00ab18d6553bc221147589e83df34fdc0c130c6f74a239e48355bfe1845b1de919ed1bce9ade7b7db298883eb3de1d53732a694b15d76f62 SHA512 6cea53cc0f486891fb9ddffc1e03e8e0a6d1d91df6bfda81250b2c60714e7b4111caa9df5afa7f13d8144e591550ef7eb4fd1e153fc67fc904afb83ccc2e3bb0
-EBUILD intel-microcode-20140430.ebuild 1169 BLAKE2B eab5c169361c8954bc6adf7035e2cdcb6602cd777cc0d02fc9308f0be06863c1e760e23e01c47458d329a11dfc5a6dd4bc5acc2eab88d4c6e4b7e9ff23515e71 SHA512 c0b31a6fcac608c7ba811b4ffc068172fdaed22c58dc29a5526275b0935d7c9210381978f224f419ca4071dd79d04ba3b8e2e788e5d2343bc46bcb3b4a3c570a
-EBUILD intel-microcode-20140624.ebuild 1171 BLAKE2B 9376abe8e21dbafb22978fc8607638380a6d69727df313300b4527a6afbaf56d74a72432b57d2b67cfad829aa2b93da8a2bd4e93d86ed6e44c704fbab0a512c5 SHA512 c8ea78ebe459ff578f11c06c29fa58f87793f1b5ea6f7b93586af36ecc586cc5f03576b71f15b729c0c9bb97886244de4febb2dcd73fa6206ffb312622ff83c9
-EBUILD intel-microcode-20140913.ebuild 1171 BLAKE2B ecb957649f70ff9e0cd52b7332870f5cb3917afde0e19e7bfc250e777468e39d2cece9dc5265962b0b779abca5e36c4f43793b5d2d30f9e24c66d5467a0d554a SHA512 a52bd7f6e9b2e35d207d6a3f819576e8654435220034631ac26a352159fc34edd6cc49d3545f50dcbb44ea824be59dd775938c86f432226e8334c5bcc12c4f8e
-EBUILD intel-microcode-20150121-r1.ebuild 1299 BLAKE2B cdb2bb5fe7c4c390c4e6abf05ea5ef83868f47dfbe4d03b81189f64ced27a0ec9c9921e47c0eb2c79f60b884d078907e9cb655c1fd45fbf1fb3010f9a050d09a SHA512 fe94bed3e9292c1b6590319eaa825e7757fbe4256081d27027e5478ba883d14985f530588fae4ee091123fead6e007cb1366f139e7f5efae2daec07a228b9657
-EBUILD intel-microcode-20150121.ebuild 1169 BLAKE2B a5e324ba74fda2299cdbec45b70b1e3b79929d4a756bf5da9833f1c8428f540af4b067c8ece8a753bbbce59d8615eeb71120293f76beeb998f3e3de8ec079810 SHA512 efb958716b0b3ab6bb7b942afb55a19cdb8423f91f178b90abf5bf80df2dbff31d05505fab91d01e31ab453d954d702e5e7724ed3cf30ddefc0d301b450c7008
-EBUILD intel-microcode-20151106.ebuild 1297 BLAKE2B 8f73a11988ccb1962bb2ab08a1c04187d862f8d9b9441a7eb741fb1b00eb0356bc7419626d2ab0d269408ad9c61c3a3eae27af6862863b401545da8b3e64fb49 SHA512 ff5bf38e0542c0ec15f16eb2f5f336a116df72dde71fe357fa74c3bf374f076bd3ecc41ffaa575964801b7fd9d4f552a24cceddd68fd8a3b0a3d0fa588146733
-EBUILD intel-microcode-20160607.ebuild 1304 BLAKE2B ed4e065abc92b83582f499a347f99954f306ca4e8f186e45b02e02aac23f6cee9cfe57a59904dcaa2ab20ad27043969be230d41783846e76efb379d8139fe6ac SHA512 01337b3c316d59ca6c6a67879ae6f1bd0a933863c4f46a899447a7a5e420c36eb7475656ac97a1d69d58990fc6fe727e0478d31822181a7ed2c15bdac46e23a1
-EBUILD intel-microcode-20160714.ebuild 1304 BLAKE2B 7c7b3538894f3d0103a1b8069c6afc660462329b39728f52180af0f79ffb56861e5c6e5caa928059153e1837d9bdeb7227e39dfc63b37ef8069f3c964bf3734f SHA512 a7ec2093ba146442f69c9ba3e0c2427b63b58b43f92676c4be5a4e8c1dca683a4dd94afd1c54ecc97177d7ad998937a525496309ddaf20985ded23398c806a7c
-EBUILD intel-microcode-20161104.ebuild 1302 BLAKE2B 7203e77ba2d5a021d6019863bc8dc15c154913dee0fc005e134304e46092d99d4b6bda185527fedd4367e0c5f2944ac380fd946b4d6bfde19c3620738d01fe1e SHA512 fbe032d5a4db41643a416f6c55dadb50b05e6c94eecd56e418f89a130312eb4de8ff655d6c81b90644ce728399ac1315ff0f62c93a17d11ef5d46c22f4102db3
-EBUILD intel-microcode-20170511.ebuild 1302 BLAKE2B d9e27642414d014c5bb6003441f86bb4ce3d07e64dd01f67b8ef962a5b0de6abd5049785a6ea8dfff3ee16be41990d4baadd15093f3a37bdbeb9545e8c0a265e SHA512 4a1fce5bcc5a1d15e2116ea5b9453edaf90326976e7a3c35caecd2fd515087a32755df178f75790c5629952b14aceb3ffd6dff585605eea3812af58eaeac909b
-EBUILD intel-microcode-20170707.ebuild 1328 BLAKE2B d895077fb51ed4abcc2b49088ed73dfd9ba6d95790a2cdac193beba937c164e023c26f43c6a7bc7f5ffedd09edafd84382e863195eb6c340e366a3bd51704716 SHA512 163e4553b7411bc9328fce7649eddaed10d07bf6c1adbdfb583bcf8b3680fa4ea8602f4aeeb43b59424ddad96dc1c320d92817a954f8c77f011906284731b7ab
-EBUILD intel-microcode-20171117-r1.ebuild 2589 BLAKE2B 16225141f5551c85bad2ec23fbedb5590e771fcb69a40eb9252da0c65de4e8ca87af460126e0d5e1519270aa95e2d135569dd0412afd1a866ca850932676b23a SHA512 d2ef44c2905303ca5ce5b7e9f8a3c5594c8ae84ceb8ef9fa3480216f29c9c6a98404c40cb39d8408c2fdc0e7ac34c7107af89754c86dc7f530063024c46060be
-EBUILD intel-microcode-20171117.ebuild 1330 BLAKE2B ce06a3bbba626f8c9c8c0b6c0c9c8e2dbe2063f9cdb4ac984891396bd68d8f1e746b92e3748650a88977ac62baf58b87275d0513158bf6071bc0dabfb92d4bf3 SHA512 f2106b69382b5ff7c1635ea56c68a966a28c9b2a630f9fb07ecf0347c9c5d997b75b1516d85fe14922edcebcdffb30c9a082335b51b732f3c370c72a696be2bd
-EBUILD intel-microcode-20171117_p20171215-r1.ebuild 1155 BLAKE2B 12b179939ea6c2e80794f77ad77f0bd6c283b4a9891553283e3c6aab8b2cf73151a19e7f671af802c6b59f51550fed944bf80e0f4c208fa580636ec9541311a8 SHA512 38ca815b1cc6f2bd6f85bf38d1aa7ef544756fee598a5a608e2ffc489dbb24157e78a511e345732162050f62f0615166f60ef0273954048d627003d76b6f5b68
-EBUILD intel-microcode-20171117_p20171215.ebuild 1149 BLAKE2B 54add03072f87c0e1083a637d08143dc7457f1164958e5228e9968c762f24f4731a359a44d4eded63ff501faa9df9e3fd90d01131042da53f0fa411d47a53e7d SHA512 298d7d99b7d715abbd64d02f6762186b4fb556e05d9c2adef563c9c5659dee334127ac12e170a39779f466609500c2e74307799b6b8796095356803d3c194696
-EBUILD intel-microcode-20180108-r1.ebuild 2589 BLAKE2B aa50ed2760d43058427b2f01a4d7464f4ed2539d5c9adcf45034cf6a52d36d00557c12e244eaae4dfc2ac0f0381a58f4e44f971edc2bf279e39ecf1f8b7396ba SHA512 24e62065e2a261591d765b1fd2b7097ff99ac44f973bf5e22f07ba4615293c90b79bab135de09312e78cc2c2a07ac1b857309923b4b560adf1fdfff88dcc3980
-EBUILD intel-microcode-20180108.ebuild 1328 BLAKE2B 27e9dfb4283a5ed844514b1fc0df0afe793776454fd9748fd00b68947834465a667b86e9b262a4161d142b42fef80651391fcf872857abaeef66de5492528f3c SHA512 d6a0b50abe64c41bac70172e0672442e46458789ee9fac3df39f91c66f16011f4bd639dcb3cbe236429223d4d51c581ed345e2048bfce205c98a3b05a580839b
-EBUILD intel-microcode-20180312.ebuild 2590 BLAKE2B cf489e4899380a5672e78fd5d8f81f5896dda301d1f82478301c1367839285631d0e1d90e67a676b59ff68b65823f7ff5354a7ac227866304457efab1ff98ccd SHA512 325b6917aa5415145ba1193d59b8a57b5667e0fea8fb3dd3d97bc0ad2e1172a5f161f94e660aebfee4057cb5f11dfcb3e3935bc4664b339b8250bc45510d47a3
-EBUILD intel-microcode-20180527-r1.ebuild 7246 BLAKE2B 1f69c9facd89055ee8e49ce7abd69b13278b084f1241b34240aed49fca1e2943ffb3c89a594b0042db71e2eb889b1fbda3dfd290f0b49589b13f72ff7785c43f SHA512 ad5745698925f0561f04521dbec1e18ebdb90c66139b4b86b68754fb9ba8c7f2f0c7b40cec7cc510c31b39a84d6f716cdc91222511425bb14a76ce1c2c2af2d5
-EBUILD intel-microcode-20180616.ebuild 7248 BLAKE2B ababb918b0ae5113ff7b367153fab87478c20b1877c92fe13b22fa6b8c9d0977e5e9833ed16a8c7913ac81d499cb24cf0e6591619879bd7149547106ddd9a11a SHA512 1a591cbc8fce332a8e43dbdae9995f011cb5f0fa592536d76f5ef8b983fb2378393df93be4192fac0b86c579e56428eb8018cb17d550e8c434b9d234087128b9
-MISC metadata.xml 778 BLAKE2B cdbbf186c80a9a7c910912871336c2ee768af5cbe3939399beb94a30b141e499ce1ca4b098e5c12c6632fff57cb6de172c83ebd7a0a6637d228e10b244db0d75 SHA512 030f595dd6b5d50e7b6e5dabc47df75e08506eac59354a6e7d6e51f27c29fc3765bd9213cd7e13d65990226b0e5fe34e090dc35669bd9dfdf5ab7a1d7d581306
+EBUILD intel-microcode-20180616.ebuild 7246 BLAKE2B e3fd6eddc68b5c98d263f4d546e9c0c590f79c735ce9ef9fb3c76eb17857784fc95823bfab26f461b8c97f42dd82d2f38605d0c7b00c0f2b9ef93073be8229fa SHA512 d97ffa0cee802f5fcd0a720d6609aab76d16f73f36cc5c19d8c886777af43b160bee50a9f5e1ef935d96b9730d08da63831341c9921cff6fcc8db177a8c22269
+MISC metadata.xml 667 BLAKE2B f229775df839b3ddf34fcc289803ae113ad4b0ce293e036c24f3025bbd146d51c6e3ac55b4a7eb9b2ff0b6829aa020179ea4603f5e481de1c822a1deb66fd594 SHA512 a2d6bc54901a9eb12732e8fa0720c03b51ab615383f12a52019453b3a13f5c70233ee88a8d81706ce7e86eaec6d85155484cf32da288c3486d4b1a19647d2698
diff --git a/sys-firmware/intel-microcode/files/intel-microcode2ucode.c b/sys-firmware/intel-microcode/files/intel-microcode2ucode.c
deleted file mode 100644
index caad0323e805..000000000000
--- a/sys-firmware/intel-microcode/files/intel-microcode2ucode.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Convert Intel microcode.dat into individual ucode files
- * named: intel-ucode/$family-$model-$stepping
- *
- * The subdir intel-ucode/ is created in the current working
- * directory. We get multiple ucodes in the same file, so they
- * are appended to an existing file. Make sure the directory
- * is empty before every run of the converter.
- *
- * Kay Sievers <kay.sievers@vrfy.org>
- */
-
-
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <limits.h>
-#include <stdbool.h>
-#include <inttypes.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/stat.h>
-
-struct microcode_header_intel {
-	unsigned int hdrver;
-	unsigned int rev;
-	unsigned int date;
-	unsigned int sig;
-	unsigned int cksum;
-	unsigned int ldrver;
-	unsigned int pf;
-	unsigned int datasize;
-	unsigned int totalsize;
-	unsigned int reserved[3];
-};
-
-union mcbuf {
-	struct microcode_header_intel hdr;
-	unsigned int i[0];
-	char c[0];
-};
-
-int main(int argc, char *argv[])
-{
-	char *filename = "/lib/firmware/microcode.dat";
-	FILE *f;
-	char line[LINE_MAX];
-	char buf[4000000];
-	union mcbuf *mc;
-	size_t bufsize, count, start;
-	int rc = EXIT_SUCCESS;
-
-	if (argv[1] != NULL)
-		filename = argv[1];
-
-	count = 0;
-	mc = (union mcbuf *) buf;
-	f = fopen(filename, "re");
-	if (f == NULL) {
-		printf("open %s: %m\n", filename);
-		rc = EXIT_FAILURE;
-		goto out;
-	}
-
-	while (fgets(line, sizeof(line), f) != NULL) {
-		if (sscanf(line, "%x, %x, %x, %x",
-		    &mc->i[count],
-		    &mc->i[count + 1],
-		    &mc->i[count + 2],
-		    &mc->i[count + 3]) != 4)
-			continue;
-		count += 4;
-	}
-	fclose(f);
-
-	bufsize = count * sizeof(int);
-	printf("%s: %lu(%luk) bytes, %zu integers\n",
-	       filename,
-	       bufsize,
-	       bufsize / 1024,
-	       count);
-
-	if (bufsize < sizeof(struct microcode_header_intel))
-		goto out;
-
-	mkdir("intel-ucode", 0750);
-
-	start = 0;
-	for (;;) {
-		size_t size;
-		unsigned int family, model, stepping;
-		unsigned int year, month, day;
-
-		mc = (union mcbuf *) &buf[start];
-
-		if (mc->hdr.totalsize)
-			size = mc->hdr.totalsize;
-		else
-			size = 2000 + sizeof(struct microcode_header_intel);
-
-		if (mc->hdr.ldrver != 1 || mc->hdr.hdrver != 1) {
-			printf("unknown version/format:\n");
-			rc = EXIT_FAILURE;
-			break;
-		}
-
-		/*
-		 *  0- 3 stepping
-		 *  4- 7 model
-		 *  8-11 family
-		 * 12-13 type
-		 * 16-19 extended model
-		 * 20-27 extended family
-		 */
-		family = (mc->hdr.sig >> 8) & 0xf;
-		if (family == 0xf)
-			family += (mc->hdr.sig >> 20) & 0xff;
-		model = (mc->hdr.sig >> 4) & 0x0f;
-		if (family == 0x06)
-			model += ((mc->hdr.sig >> 16) & 0x0f) << 4;
-		stepping = mc->hdr.sig & 0x0f;
-
-		year = mc->hdr.date & 0xffff;
-		month = mc->hdr.date >> 24;
-		day = (mc->hdr.date >> 16) & 0xff;
-
-		asprintf(&filename, "intel-ucode/%02x-%02x-%02x", family, model, stepping);
-		printf("\n");
-		printf("%s\n", filename);
-		printf("signature: 0x%02x\n", mc->hdr.sig);
-		printf("flags:     0x%02x\n", mc->hdr.pf);
-		printf("revision:  0x%02x\n", mc->hdr.rev);
-		printf("date:      %04x-%02x-%02x\n", year, month, day);
-		printf("size:      %zu\n", size);
-
-		f = fopen(filename, "ae");
-		if (f == NULL) {
-			printf("open %s: %m\n", filename);
-			rc = EXIT_FAILURE;
-			goto out;
-		}
-		if (fwrite(mc, size, 1, f) != 1) {
-			printf("write %s: %m\n", filename);
-			rc = EXIT_FAILURE;
-			goto out;
-		}
-		fclose(f);
-		free(filename);
-
-		start += size;
-		if (start >= bufsize)
-			break;
-	}
-	printf("\n");
-out:
-	return rc;
-}
diff --git a/sys-firmware/intel-microcode/files/intel-microcode2ucode.c-r1 b/sys-firmware/intel-microcode/files/intel-microcode2ucode.c-r1
deleted file mode 100644
index 4b3ba4b48ed4..000000000000
--- a/sys-firmware/intel-microcode/files/intel-microcode2ucode.c-r1
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Convert Intel microcode.dat into individual ucode files
- * named: intel-ucode/$family-$model-$stepping
- *
- * The subdir intel-ucode/ is created in the current working
- * directory. We get multiple ucodes in the same file, so they
- * are appended to an existing file. Make sure the directory
- * is empty before every run of the converter.
- *
- * Kay Sievers <kay.sievers@vrfy.org>
- */
-
-
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <limits.h>
-#include <stdbool.h>
-#include <inttypes.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/stat.h>
-
-struct microcode_header_intel {
-	unsigned int hdrver;
-	unsigned int rev;
-	unsigned int date;
-	unsigned int sig;
-	unsigned int cksum;
-	unsigned int ldrver;
-	unsigned int pf;
-	unsigned int datasize;
-	unsigned int totalsize;
-	unsigned int reserved[3];
-};
-
-union mcbuf {
-	struct microcode_header_intel hdr;
-	unsigned int i[0];
-	char c[0];
-};
-
-int main(int argc, char *argv[])
-{
-	char *filename = "/lib/firmware/microcode.dat";
-	FILE *f;
-	char line[LINE_MAX];
-	char buf[4000000];
-	union mcbuf *mc;
-	size_t bufsize, count, start;
-	int rc = EXIT_SUCCESS;
-
-	if (argv[1] != NULL)
-		filename = argv[1];
-
-	count = 0;
-	mc = (union mcbuf *) buf;
-	f = fopen(filename, "re");
-	if (f == NULL) {
-		printf("open %s: %m\n", filename);
-		rc = EXIT_FAILURE;
-		goto out;
-	}
-
-	while (fgets(line, sizeof(line), f) != NULL) {
-		if (sscanf(line, "%x, %x, %x, %x",
-		    &mc->i[count],
-		    &mc->i[count + 1],
-		    &mc->i[count + 2],
-		    &mc->i[count + 3]) != 4)
-			continue;
-		count += 4;
-	}
-	fclose(f);
-
-	bufsize = count * sizeof(int);
-	printf("%s: %lu(%luk) bytes, %zu integers\n",
-	       filename,
-	       bufsize,
-	       bufsize / 1024,
-	       count);
-
-	if (bufsize < sizeof(struct microcode_header_intel))
-		goto out;
-
-	mkdir("intel-ucode", 0750);
-
-	start = 0;
-	for (;;) {
-		size_t size;
-		unsigned int family, model, stepping;
-		unsigned int year, month, day;
-
-		mc = (union mcbuf *) &buf[start];
-
-		if (mc->hdr.totalsize)
-			size = mc->hdr.totalsize;
-		else
-			size = 2000 + sizeof(struct microcode_header_intel);
-
-		if (mc->hdr.ldrver != 1 || mc->hdr.hdrver != 1) {
-			printf("unknown version/format:\n");
-			rc = EXIT_FAILURE;
-			break;
-		}
-
-		/*
-		 *  0- 3 stepping
-		 *  4- 7 model
-		 *  8-11 family
-		 * 12-13 type
-		 * 16-19 extended model
-		 * 20-27 extended family
-		 */
-		family = (mc->hdr.sig >> 8) & 0xf;
-		if (family == 0xf)
-			family += (mc->hdr.sig >> 20) & 0xff;
-		model = (mc->hdr.sig >> 4) & 0x0f;
-		if (family == 0x06)
-			model += ((mc->hdr.sig >> 16) & 0x0f) << 4;
-		stepping = mc->hdr.sig & 0x0f;
-
-		year = mc->hdr.date & 0xffff;
-		month = mc->hdr.date >> 24;
-		day = (mc->hdr.date >> 16) & 0xff;
-
-		if (asprintf(&filename, "intel-ucode/%02x-%02x-%02x", family, model, stepping) < 0) {
-			rc = EXIT_FAILURE;
-			goto out;
-		}
-		printf("\n");
-		printf("%s\n", filename);
-		printf("signature: 0x%02x\n", mc->hdr.sig);
-		printf("flags:     0x%02x\n", mc->hdr.pf);
-		printf("revision:  0x%02x\n", mc->hdr.rev);
-		printf("date:      %04x-%02x-%02x\n", year, month, day);
-		printf("size:      %zu\n", size);
-
-		f = fopen(filename, "ae");
-		if (f == NULL) {
-			printf("open %s: %m\n", filename);
-			rc = EXIT_FAILURE;
-			goto out;
-		}
-		if (fwrite(mc, size, 1, f) != 1) {
-			printf("write %s: %m\n", filename);
-			rc = EXIT_FAILURE;
-			goto out;
-		}
-		fclose(f);
-		free(filename);
-
-		start += size;
-		if (start >= bufsize)
-			break;
-	}
-	printf("\n");
-out:
-	return rc;
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20140430.ebuild b/sys-firmware/intel-microcode/intel-microcode-20140430.ebuild
deleted file mode 100644
index 4cfb5a96974f..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20140430.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="23829"
-DESCRIPTION="Intel IA32 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
-}
-
-src_compile() {
-	tc-env_build emake intel-microcode2ucode
-	./intel-microcode2ucode microcode.dat || die
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins -r microcode.dat intel-ucode
-}
-
-pkg_postinst() {
-	elog "The microcode available for Intel CPUs has been updated.  You'll need"
-	elog "to reload the code into your processor.  If you're using the init.d:"
-	elog "/etc/init.d/microcode_ctl restart"
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20140624.ebuild b/sys-firmware/intel-microcode/intel-microcode-20140624.ebuild
deleted file mode 100644
index 9f69a6c0b6dc..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20140624.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="23984"
-DESCRIPTION="Intel IA32 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
-}
-
-src_compile() {
-	tc-env_build emake intel-microcode2ucode
-	./intel-microcode2ucode microcode.dat || die
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins -r microcode.dat intel-ucode
-}
-
-pkg_postinst() {
-	elog "The microcode available for Intel CPUs has been updated.  You'll need"
-	elog "to reload the code into your processor.  If you're using the init.d:"
-	elog "/etc/init.d/microcode_ctl restart"
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20140913.ebuild b/sys-firmware/intel-microcode/intel-microcode-20140913.ebuild
deleted file mode 100644
index 648c274af8d0..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20140913.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="24290"
-DESCRIPTION="Intel IA32 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
-}
-
-src_compile() {
-	tc-env_build emake intel-microcode2ucode
-	./intel-microcode2ucode microcode.dat || die
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins -r microcode.dat intel-ucode
-}
-
-pkg_postinst() {
-	elog "The microcode available for Intel CPUs has been updated.  You'll need"
-	elog "to reload the code into your processor.  If you're using the init.d:"
-	elog "/etc/init.d/microcode_ctl restart"
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20150121-r1.ebuild b/sys-firmware/intel-microcode/intel-microcode-20150121-r1.ebuild
deleted file mode 100644
index ea34c1254119..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20150121-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="24661"
-DESCRIPTION="Intel IA32 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="initramfs monolithic +split-ucode"
-REQUIRED_USE="|| ( initramfs monolithic split-ucode )"
-
-DEPEND="initramfs? ( sys-apps/iucode_tool )"
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
-}
-
-src_compile() {
-	if use initramfs ; then
-		iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die
-	fi
-
-	if use split-ucode ; then
-		tc-env_build emake intel-microcode2ucode
-		./intel-microcode2ucode microcode.dat || die
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	use initramfs && doins microcode.cpio
-	use monolithic && doins microcode.dat
-	use split-ucode && doins -r intel-ucode
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20150121.ebuild b/sys-firmware/intel-microcode/intel-microcode-20150121.ebuild
deleted file mode 100644
index 46c67d4d05ec..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20150121.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="24661"
-DESCRIPTION="Intel IA32 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
-}
-
-src_compile() {
-	tc-env_build emake intel-microcode2ucode
-	./intel-microcode2ucode microcode.dat || die
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins -r microcode.dat intel-ucode
-}
-
-pkg_postinst() {
-	elog "The microcode available for Intel CPUs has been updated.  You'll need"
-	elog "to reload the code into your processor.  If you're using the init.d:"
-	elog "/etc/init.d/microcode_ctl restart"
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20151106.ebuild b/sys-firmware/intel-microcode/intel-microcode-20151106.ebuild
deleted file mode 100644
index b852df2c4f0a..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20151106.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="25512"
-DESCRIPTION="Intel IA32 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="initramfs monolithic +split-ucode"
-REQUIRED_USE="|| ( initramfs monolithic split-ucode )"
-
-DEPEND="initramfs? ( sys-apps/iucode_tool )"
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
-}
-
-src_compile() {
-	if use initramfs ; then
-		iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die
-	fi
-
-	if use split-ucode ; then
-		tc-env_build emake intel-microcode2ucode
-		./intel-microcode2ucode microcode.dat || die
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	use initramfs && doins microcode.cpio
-	use monolithic && doins microcode.dat
-	use split-ucode && doins -r intel-ucode
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20160607.ebuild b/sys-firmware/intel-microcode/intel-microcode-20160607.ebuild
deleted file mode 100644
index 98ccc671d016..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20160607.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="26083"
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="initramfs monolithic +split-ucode"
-REQUIRED_USE="|| ( initramfs monolithic split-ucode )"
-
-DEPEND="initramfs? ( sys-apps/iucode_tool )"
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
-}
-
-src_compile() {
-	if use initramfs ; then
-		iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die
-	fi
-
-	if use split-ucode ; then
-		tc-env_build emake intel-microcode2ucode
-		./intel-microcode2ucode microcode.dat || die
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	use initramfs && doins microcode.cpio
-	use monolithic && doins microcode.dat
-	use split-ucode && doins -r intel-ucode
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20160714.ebuild b/sys-firmware/intel-microcode/intel-microcode-20160714.ebuild
deleted file mode 100644
index 7630a2dd1d70..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20160714.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="26156"
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="initramfs monolithic +split-ucode"
-REQUIRED_USE="|| ( initramfs monolithic split-ucode )"
-
-DEPEND="initramfs? ( sys-apps/iucode_tool )"
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
-}
-
-src_compile() {
-	if use initramfs ; then
-		iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die
-	fi
-
-	if use split-ucode ; then
-		tc-env_build emake intel-microcode2ucode
-		./intel-microcode2ucode microcode.dat || die
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	use initramfs && doins microcode.cpio
-	use monolithic && doins microcode.dat
-	use split-ucode && doins -r intel-ucode
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20161104.ebuild b/sys-firmware/intel-microcode/intel-microcode-20161104.ebuild
deleted file mode 100644
index 6e0c51a6f19a..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20161104.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="26400"
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="initramfs monolithic +split-ucode"
-REQUIRED_USE="|| ( initramfs monolithic split-ucode )"
-
-DEPEND="initramfs? ( sys-apps/iucode_tool )"
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
-}
-
-src_compile() {
-	if use initramfs ; then
-		iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die
-	fi
-
-	if use split-ucode ; then
-		tc-env_build emake intel-microcode2ucode
-		./intel-microcode2ucode microcode.dat || die
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	use initramfs && doins microcode.cpio
-	use monolithic && doins microcode.dat
-	use split-ucode && doins -r intel-ucode
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20170511.ebuild b/sys-firmware/intel-microcode/intel-microcode-20170511.ebuild
deleted file mode 100644
index 20126a02fada..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20170511.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="26798"
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="initramfs monolithic +split-ucode"
-REQUIRED_USE="|| ( initramfs monolithic split-ucode )"
-
-DEPEND="initramfs? ( sys-apps/iucode_tool )"
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
-}
-
-src_compile() {
-	if use initramfs ; then
-		iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die
-	fi
-
-	if use split-ucode ; then
-		tc-env_build emake intel-microcode2ucode
-		./intel-microcode2ucode microcode.dat || die
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	use initramfs && doins microcode.cpio
-	use monolithic && doins microcode.dat
-	use split-ucode && doins -r intel-ucode
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20170707.ebuild b/sys-firmware/intel-microcode/intel-microcode-20170707.ebuild
deleted file mode 100644
index 386a152c3e26..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20170707.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="26925"
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="initramfs monolithic +split-ucode"
-REQUIRED_USE="|| ( initramfs monolithic split-ucode )"
-
-DEPEND="initramfs? ( sys-apps/iucode_tool )"
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	cp "${FILESDIR}"/intel-microcode2ucode.c-r1 ./intel-microcode2ucode.c || die
-}
-
-src_compile() {
-	if use initramfs ; then
-		iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die
-	fi
-
-	if use split-ucode ; then
-		tc-env_build emake intel-microcode2ucode
-		./intel-microcode2ucode microcode.dat || die
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	use initramfs && doins microcode.cpio
-	use monolithic && doins microcode.dat
-	use split-ucode && doins -r intel-ucode
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20171117-r1.ebuild b/sys-firmware/intel-microcode/intel-microcode-20171117-r1.ebuild
deleted file mode 100644
index 368cbee79e52..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20171117-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="27337"
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="initramfs +split-ucode"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-DEPEND="sys-apps/iucode_tool"
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-# TODO:
-# Blacklist bad microcode here.
-DEFAULT_MICROCODE_SIGNATURES=""
-
-# Advanced users only:
-# merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-MICROCODE_SIGNATURES="${MICROCODE_SIGNATURES:=${DEFAULT_MICROCODE_SIGNATURES}}"
-
-pkg_pretend() {
-	if [[ "${MICROCODE_SIGNATURES}" != "${DEFAULT_MICROCODE_SIGNATURES}" ]]; then
-		ewarn "MICROCODE_SIGNATURES is set!"
-		ewarn "The user has decided to install only a SUBSET of microcode."
-	fi
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/microcode.dat
-		"${S}"/intel-ucode/
-	)
-	opts=(
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
-	# split location:
-	use split-ucode && dodir /lib/firmware/intel-ucode && opts+=( --write-firmware="${ED%/}"/lib/firmware/intel-ucode )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote
-}
-
-pkg_preinst() {
-	use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_prerm() {
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
-	use initramfs && mount-boot_pkg_postinst
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20171117.ebuild b/sys-firmware/intel-microcode/intel-microcode-20171117.ebuild
deleted file mode 100644
index 6e1904bba7ff..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20171117.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="27337"
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="initramfs monolithic +split-ucode"
-REQUIRED_USE="|| ( initramfs monolithic split-ucode )"
-
-DEPEND="initramfs? ( sys-apps/iucode_tool )"
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	cp "${FILESDIR}"/intel-microcode2ucode.c-r1 ./intel-microcode2ucode.c || die
-}
-
-src_compile() {
-	if use initramfs ; then
-		iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die
-	fi
-
-	if use split-ucode ; then
-		tc-env_build emake intel-microcode2ucode
-		./intel-microcode2ucode microcode.dat || die
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	use initramfs && doins microcode.cpio
-	use monolithic && doins microcode.dat
-	use split-ucode && doins -r intel-ucode
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20171117_p20171215-r1.ebuild b/sys-firmware/intel-microcode/intel-microcode-20171117_p20171215-r1.ebuild
deleted file mode 100644
index dd7ca58108ad..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20171117_p20171215-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="27337"
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-#SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-SRC_URI="mirror://gentoo/microcode-${PV}-r1.tgz
-	https://dev.gentoo.org/~whissi/dist/${PN}/microcode-${PV}-r1.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="initramfs +split-ucode"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-DEPEND="initramfs? ( sys-apps/iucode_tool )"
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-src_compile() {
-	if use initramfs ; then
-		iucode_tool --write-earlyfw=microcode.cpio intel-ucode/ || die
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	use initramfs && doins microcode.cpio
-	use split-ucode && doins -r intel-ucode
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20171117_p20171215.ebuild b/sys-firmware/intel-microcode/intel-microcode-20171117_p20171215.ebuild
deleted file mode 100644
index d6f302140125..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20171117_p20171215.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="27337"
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-#SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-SRC_URI="mirror://gentoo/microcode-${PV}.tgz
-	https://dev.gentoo.org/~whissi/dist/${PN}/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="initramfs +split-ucode"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-DEPEND="initramfs? ( sys-apps/iucode_tool )"
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-src_compile() {
-	if use initramfs ; then
-		iucode_tool --write-earlyfw=microcode.cpio intel-ucode/ || die
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	use initramfs && doins microcode.cpio
-	use split-ucode && doins -r intel-ucode
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20180108-r1.ebuild b/sys-firmware/intel-microcode/intel-microcode-20180108-r1.ebuild
deleted file mode 100644
index 1d106fb3d7cb..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20180108-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="27431"
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="initramfs +split-ucode"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-DEPEND="sys-apps/iucode_tool"
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-# TODO:
-# Blacklist bad microcode here.
-DEFAULT_MICROCODE_SIGNATURES=""
-
-# Advanced users only:
-# merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-MICROCODE_SIGNATURES="${MICROCODE_SIGNATURES:=${DEFAULT_MICROCODE_SIGNATURES}}"
-
-pkg_pretend() {
-	if [[ "${MICROCODE_SIGNATURES}" != "${DEFAULT_MICROCODE_SIGNATURES}" ]]; then
-		ewarn "MICROCODE_SIGNATURES is set!"
-		ewarn "The user has decided to install only a SUBSET of microcode."
-	fi
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/microcode.dat
-		"${S}"/intel-ucode/
-	)
-	opts=(
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
-	# split location:
-	use split-ucode && dodir /lib/firmware/intel-ucode && opts+=( --write-firmware="${ED%/}"/lib/firmware/intel-ucode )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote
-}
-
-pkg_preinst() {
-	use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_prerm() {
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
-	use initramfs && mount-boot_pkg_postinst
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20180108.ebuild b/sys-firmware/intel-microcode/intel-microcode-20180108.ebuild
deleted file mode 100644
index ac2bcc44f598..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20180108.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="27431"
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="initramfs monolithic +split-ucode"
-REQUIRED_USE="|| ( initramfs monolithic split-ucode )"
-
-DEPEND="initramfs? ( sys-apps/iucode_tool )"
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	cp "${FILESDIR}"/intel-microcode2ucode.c-r1 ./intel-microcode2ucode.c || die
-}
-
-src_compile() {
-	if use initramfs ; then
-		iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die
-	fi
-
-	if use split-ucode ; then
-		tc-env_build emake intel-microcode2ucode
-		./intel-microcode2ucode microcode.dat || die
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	use initramfs && doins microcode.cpio
-	use monolithic && doins microcode.dat
-	use split-ucode && doins -r intel-ucode
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20180312.ebuild b/sys-firmware/intel-microcode/intel-microcode-20180312.ebuild
deleted file mode 100644
index a71b4d9fd8bd..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20180312.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="27591"
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="https://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="initramfs +split-ucode"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-DEPEND="sys-apps/iucode_tool"
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
-
-S=${WORKDIR}
-
-# TODO:
-# Blacklist bad microcode here.
-DEFAULT_MICROCODE_SIGNATURES=""
-
-# Advanced users only:
-# merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-MICROCODE_SIGNATURES="${MICROCODE_SIGNATURES:=${DEFAULT_MICROCODE_SIGNATURES}}"
-
-pkg_pretend() {
-	if [[ "${MICROCODE_SIGNATURES}" != "${DEFAULT_MICROCODE_SIGNATURES}" ]]; then
-		ewarn "MICROCODE_SIGNATURES is set!"
-		ewarn "The user has decided to install only a SUBSET of microcode."
-	fi
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/microcode.dat
-		"${S}"/intel-ucode/
-	)
-	opts=(
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
-	# split location:
-	use split-ucode && dodir /lib/firmware/intel-ucode && opts+=( --write-firmware="${ED%/}"/lib/firmware/intel-ucode )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote
-}
-
-pkg_preinst() {
-	use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_prerm() {
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
-	use initramfs && mount-boot_pkg_postinst
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20180527-r1.ebuild b/sys-firmware/intel-microcode/intel-microcode-20180527-r1.ebuild
deleted file mode 100644
index 27b8f2ad1686..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20180527-r1.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-COLLECTION_SNAPSHOT="20180527"
-INTEL_SNAPSHOT="20180425"
-NUM="27776"
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
-	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="hostonly initramfs +split-ucode vanilla"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-DEPEND="sys-apps/iucode_tool"
-
-# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2
-	hostonly? ( sys-apps/iucode_tool )"
-
-S=${WORKDIR}
-
-# Blacklist bad microcode here.
-# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
-MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
-MICROCODE_BLACKLIST="${MICROCODE_BLACKLIST:=${MICROCODE_BLACKLIST_DEFAULT}}"
-
-# In case we want to set some defaults ...
-MICROCODE_SIGNATURES_DEFAULT=""
-
-# Advanced users only:
-# merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-MICROCODE_SIGNATURES="${MICROCODE_SIGNATURES:=${MICROCODE_SIGNATURES_DEFAULT}}"
-
-pkg_pretend() {
-	if [[ "${MICROCODE_BLACKLIST}" != "${MICROCODE_BLACKLIST_DEFAULT}" ]]; then
-		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
-	fi
-
-	if [[ "${MICROCODE_SIGNATURES}" != "${MICROCODE_SIGNATURES_DEFAULT}" ]]; then
-		ewarn "The user has opted in for advanced use:"
-		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
-	fi
-
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# Prevent "invalid file format" errors from iucode_tool
-	rm -f "${S}"/intel-ucod*/list || die
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/intel-ucode/
-		"${S}"/intel-ucode-with-caveats/
-	)
-
-	# Allow users who are scared about microcode updates not included in Intel's official
-	# microcode tarball to opt-out and comply with Intel marketing
-	if ! use vanilla; then
-		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
-	fi
-
-	opts=(
-		${MICROCODE_BLACKLIST}
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# we want to install latest version
-		--no-downgrade
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
-	# split location (we use a temporary location so that we are able
-	# to re-run iucode_tool in pkg_preinst; use keepdir instead of dodir to carry
-	# this folder to pkg_preinst to avoid an error even if no microcode was selected):
-	keepdir /tmp/intel-ucode && opts+=( --write-firmware="${ED%/}"/tmp/intel-ucode )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote
-}
-
-pkg_preinst() {
-	use initramfs && mount-boot_pkg_preinst
-
-	if use hostonly; then
-		einfo "Removing ucode(s) not supported by any currently available (=online) processor(s) due to USE=hostonly ..."
-		opts=(
-			--scan-system
-			# be strict about what we are doing
-			--overwrite
-			--strict-checks
-			--no-ignore-broken
-			# we want to install latest version
-			--no-downgrade
-			# show everything we find
-			--list-all
-			# show what we selected
-			--list
-		)
-
-		# The earlyfw cpio needs to be in /boot because it must be loaded before
-		# rootfs is mounted.
-		use initramfs && opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
-		# split location:
-		use split-ucode && dodir /lib/firmware/intel-ucode && opts+=( --write-firmware="${ED%/}"/lib/firmware/intel-ucode )
-
-		iucode_tool \
-			"${opts[@]}" \
-			"${ED%/}"/tmp/intel-ucode \
-			|| die "iucode_tool ${opts[@]} ${ED%/}/tmp/intel-ucode"
-
-	else
-		if use split-ucode; then
-			# Temporary /tmp/intel-ucode will become final /lib/firmware/intel-ucode ...
-			dodir /lib/firmware
-			mv "${ED%/}/tmp/intel-ucode" "${ED%/}/lib/firmware" || die "Failed to install splitted ucodes!"
-		fi
-	fi
-
-	# Cleanup any temporary leftovers so that we don't merge any
-	# unneeded files on disk
-	rm -r "${ED%/}/tmp" || die "Failed to cleanup '${ED%/}/tmp'"
-}
-
-pkg_prerm() {
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
-	use initramfs && mount-boot_pkg_postinst
-
-	local _has_installed_something=
-	if use initramfs && [[ -s "${EROOT%/}/boot/intel-uc.img" ]]; then
-		_has_installed_something="yes"
-	elif use split-ucode; then
-		_has_installed_something=$(find "${EROOT%/}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
-	fi
-
-	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
-		elog "You only installed ucode(s) for all currently available (=online)"
-		elog "processor(s). Remember to re-emerge this package whenever you"
-		elog "change the system's processor model."
-		elog ""
-	elif [[ -z "${_has_installed_something}" ]]; then
-		ewarn "WARNING:"
-		ewarn "No ucode was installed! You can ignore this warning if there"
-		ewarn "aren't any microcode updates available for your processor(s)."
-		ewarn "But if you use MICROCODE_SIGNATURES variable please double check"
-		ewarn "if you have an invalid select."
-		ewarn ""
-
-		if use hostonly; then
-			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
-			ewarn ""
-		fi
-	fi
-
-	# We cannot give detailed information if user is affected or not:
-	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
-	# to to force a specific, otherwise blacklisted, microcode. So we
-	# only show a generic warning based on running kernel version:
-	if kernel_is -lt 4 14 34; then
-		ewarn "${P} contains microcode updates which require"
-		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
-		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
-		ewarn "can crash your system!"
-		ewarn ""
-		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
-		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
-		ewarn "re-enabled those microcodes...!"
-		ewarn ""
-		ewarn "Check \"${EROOT%/}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
-		ewarn "requires additional kernel patches or not."
-	fi
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20180616.ebuild b/sys-firmware/intel-microcode/intel-microcode-20180616.ebuild
index 4dbc0b6dd956..66dbdc30dc6a 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20180616.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20180616.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}
 
 LICENSE="intel-ucode"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="hostonly initramfs +split-ucode vanilla"
 REQUIRED_USE="|| ( initramfs split-ucode )"
 
diff --git a/sys-firmware/intel-microcode/metadata.xml b/sys-firmware/intel-microcode/metadata.xml
index 6708ec7d79db..6613dbb47ed8 100644
--- a/sys-firmware/intel-microcode/metadata.xml
+++ b/sys-firmware/intel-microcode/metadata.xml
@@ -8,7 +8,6 @@
 <use>
 	<flag name="initramfs">install a small initramfs for use with CONFIG_MICROCODE_EARLY</flag>
 	<flag name="hostonly">only install ucode(s) supported by currently available (=online) processor(s)</flag>
-	<flag name="monolithic">install the large text microcode.dat (used by older kernels via microcode_ctl)</flag>
 	<flag name="split-ucode">install the split binary ucode files (used by the kernel directly)</flag>
 	<flag name="vanilla">install only microcode updates from Intel's official microcode tarball</flag>
 </use>