14 files changed, 472 insertions, 5 deletions
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 91447ecdecf3..996b09ebd2c4 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -12,8 +12,8 @@ DIST coreutils-8.28-patches-1.0.tar.xz 7264 SHA256 fe9e8f347d104472d357ad8021299
 DIST coreutils-8.28.tar.xz 5252336 SHA256 1117b1a16039ddd84d51a9923948307cfa28c2cea03d1a2438742253df0a0c65 SHA512 1e592d0dd03b9227bf92af9a82bed6dc3bcbee46e984c7fb09833dea0962e86b309aa34d5e43823b73d4522c066bfa5cdc8ec694aa190910fb246ff32ceb63a1 WHIRLPOOL 58bdd9681d07794da70dc012d03de2f791bc8e40a16de85302cbb5ea247f6d81f0a92c3b90d655b9947057c5e5eb99b9347152d41150c1a613dd1f891942a73f
 EBUILD coreutils-8.25.ebuild 5839 SHA256 0d18564c2dc7106d9882bb4e7597c0fc910c7dbfb0e7a802ff23d8dc2ab57310 SHA512 86a917921cfd7c20755c2570c58438f7bfe923f8838e91508300a745a4417038cc81112a50972f288a02ff3acbb0405ac01784170fbebd62c9ac4c1e40294816 WHIRLPOOL 2e08adaa8f170ae83ab956867d576d7b105a02f109108e7af3d06fd152a553c9633e009ad699657f366ad2809743316f368d98b72f03e9a20be84b602709ac36
 EBUILD coreutils-8.26.ebuild 5863 SHA256 2593c865c6c60ad50f5f61ca3d18857ddc63784b0e9e8d9b668a620b0da9e5d0 SHA512 5583c226f1dcfe303f06301432bf00952fb7fcd5eb86959aeb1189777d64e85c2c96d331c4f833d513a86512ede04de9435c6ae2c79866dab721a5ca7faeafdb WHIRLPOOL 986f5c0bc72bf8003708ff64da97eb068c48f76a54d088ca54a8822112a2896fa9b74144479105d687c17321c92987c24efb7e5a867904cb291632c2a73b9672
-EBUILD coreutils-8.27.ebuild 5873 SHA256 9000511a122ce39be138740e207d950af3d64f61cc2e807e7cd44adedd9bd894 SHA512 d6fcaa23d648987bfbd84b8525fc7efc33029bc12db12de3af92f745b49bd8d7a5d69c513f95ce3969c30c579e86e4e434c1ede716db220d0205b794a74b27e4 WHIRLPOOL c1d921c459d346a1ee527d455fadf4f6bd4332a86e8a5cfb2098fe73e828d8ce009a8cab3c76b4402cada570cd83f5888cfcac7444cec0260614c77124db1fa0
-EBUILD coreutils-8.28.ebuild 5841 SHA256 3c5d4bef22900d4feb8501d7aa7e82a778589f29d4af31e99ecebc930e3ed1be SHA512 0f391e187178f2c49b8807450a9a3bed17c53794f221f6af35f3df20e30fab378070f82ec4dcf74f2bccbe547c5e3d9eb0e02781cf2a632327d424527edbe915 WHIRLPOOL 8110fea30800c6495d23edb0adfa2845fd107b4a9b20f84dd1c618c372282e96d87e266b91b63fb092059b2c77ae3fde0909da1fda1e9dd4c70e4916b1f2be40
+EBUILD coreutils-8.27.ebuild 5901 SHA256 e48b42c3d0eae8703c22b7b0d0d638a210e11c7caba036bfde9bce8871529f08 SHA512 a230b81b5913e0b98efe30f2876587178539c9dd462424c4eb71f5572fd496e4b0224f76cef92be973601f022f439ee36da393fabf4b70c2bfec71785321e8cd WHIRLPOOL 948e7a87be1e56fee5e879af681860dd5bcc9b02e30435d84117cc790b0ba5f368f6f49a6615246a061dc014f1a44c65ef293907358b0531957779c87c066c6a
+EBUILD coreutils-8.28.ebuild 5869 SHA256 c42674858864cb12c270e9431888f93778bc2996425f97691b952dea08fa0c61 SHA512 8c98e0e5cee83a5d3a6c138fde77888dc8b6df45e16e2cb48f93bffd91391a957be2489656b95030c1be14f04400a98b4cbde258e4a78559ac2de24cd8199d70 WHIRLPOOL 1cc452904196ade41ee491ce83e92d3263e63b3abb2ecf2b05bfa9c52460fedf0e0609ea8edefddf3ec32054febfbd0ba23954d6b236812168018dcf4c976017
 MISC ChangeLog 7611 SHA256 95cfa59136c273c96f0197f728a444d3337cf408e6d974d07553188148c77d14 SHA512 a1a429745e1d5b7efb21b321abd21e1b064bde4f271bbd600f6be3dd32dced5e04cea1fe8a2bc9abf12fdadde55ccefea1257730d5d944f5dc1b97d98d25e4ff WHIRLPOOL 93253eca9c20b770912675ad30f312e803fc1bf8cd17f59e0fd02446298d4f327e8f9c90ab4c90636fd9b4bc0dcbaf3ba477b3ba86f6820ff4040a676e057529
 MISC ChangeLog-2015 57093 SHA256 368347193225a6204bd2454ecbdf549ca614cb8fc5e183ac14c2f767288323e9 SHA512 ef4eff9a3d748641bf1b745599e951308801e1d00d67c5504d17e4d740f5cd7f0c75cd5ee34c8345e8017ee8b6397b84a41df84b4f342ff899a04fd35a0c8f28 WHIRLPOOL 43464de8d0d85fa5b35797c95049591d0a225e4e6f0ab596d8c637da0538f0605c15c35749195fea181b9d5e6a75ea7573a96dbe9da70f28e131a47c913d43b5
 MISC metadata.xml 738 SHA256 1b3907f92a4f6f20b1267d1c4a2b4d126e2a27b9820f6a3b2cb671b438edeeb6 SHA512 c074b29033dae300fa02fb35edf0b595bf00bd5616bac8af5b88525980dc8542dc336145b19942d0f849189b7abe0201f2a40d86d0ed02ddad602eb131b3a87a WHIRLPOOL 206dd26110118d307e0f1654b9e20e26805c90f968c1c00ffc71878503bd6112510ee334a44a031d05884fe8f3576a07efcab630f4823f5527c5d32adc918938
diff --git a/sys-apps/coreutils/coreutils-8.27.ebuild b/sys-apps/coreutils/coreutils-8.27.ebuild
index 396636ee5d93..f2bba2686c97 100644
--- a/sys-apps/coreutils/coreutils-8.27.ebuild
+++ b/sys-apps/coreutils/coreutils-8.27.ebuild
@@ -43,6 +43,7 @@ RDEPEND+="
 	)
 	!app-misc/realpath
 	!<sys-apps/util-linux-2.13
+	!<sys-apps/sandbox-2.10-r4
 	!sys-apps/stat
 	!net-mail/base64
 	!sys-apps/mktemp
diff --git a/sys-apps/coreutils/coreutils-8.28.ebuild b/sys-apps/coreutils/coreutils-8.28.ebuild
index a7253367560c..ffd2a59938c7 100644
--- a/sys-apps/coreutils/coreutils-8.28.ebuild
+++ b/sys-apps/coreutils/coreutils-8.28.ebuild
@@ -43,6 +43,7 @@ RDEPEND+="
 	)
 	!app-misc/realpath
 	!<sys-apps/util-linux-2.13
+	!<sys-apps/sandbox-2.10-r4
 	!sys-apps/stat
 	!net-mail/base64
 	!sys-apps/mktemp
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index def2b3d1cd2f..1211ec245b53 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -4,5 +4,5 @@ DIST fwupd-0.9.6.tar.gz 1404749 SHA256 cf406eb11b284cd89228db53bff787cb8468d4e14
 DIST fwupd-1.0.0.tar.gz 1466486 SHA256 179ee1fb5c0099ba9bfb8c07178574cc7408297d2af80ddf483e9f147b30e31a SHA512 6bf5e691b2d958b28e6002bfbc06bd19440876aea8dc55f761e10e039141e12df14a6ec8c2f2479b82770feeee4a15296229dd662653841bb0b41d4ea61fa422 WHIRLPOOL 0db3183049921b8ac30b5855c3657d6c51a948bba2728178ed4932e18401f15f6af7178ac866a56347219b334385c826ce5cec0ac72ddcba799251b3f91468b9
 EBUILD fwupd-0.9.5-r1.ebuild 2172 SHA256 99c484d513fd6bd8616dac100aa31e0e63bae5ed7a9d94fafda17a64821267f6 SHA512 d4b49cb711efd77ef2835294a92e6c61d2f0d3d833758befe4c6dc264e879c60c20d2fc4463c7600b942ed73aad2b379e691008ab94cb31e9e8530b213c77ad3 WHIRLPOOL 0ee614fe4bdf932c81df03adef3010f589d9823f54e6f7f52d924145c43dc73a10fa8d2a1ccb1e8e65e201c628bde6fd0b464c3622fb1f1aafcea0f406768284
 EBUILD fwupd-0.9.6.ebuild 2111 SHA256 6c8119cb23e4fd69168600656a1447eb4b2bd0be32de296d8c7712f71c7770b1 SHA512 8a62187f7aecdc16bda9d30751ac9f3767621ea6588f9c24e8b141f5e7a334f437a3eb473cb9f4929e9714d9bd9bd970abbbd2c224454580a3daf5570c2e46f0 WHIRLPOOL 9cabf66f41a805d3fc234c9a4dcda3b21a1f79c9d7c4acc8e30eff44dfb21976bcdefedfdd5605b4df2570f4a7d187b5d549946de2bd3a1937b8e844c9f3ea3a
-EBUILD fwupd-1.0.0.ebuild 2316 SHA256 92fad17fdad824099f950b5868ecd3d60e50760e1b6927cab43fc81d31f2deea SHA512 c0705b53af2f760cf29c72468876dcde5f48e9916701acc42b3f47b071222e4f5b48dbd36f5015761f95158f7d9ad9cad16e1b0d5e63874bcef9cc6e6027da8d WHIRLPOOL 3fa4d4fa6d208cddb4eaad69e613521ecd548165153d26a1667173bf5c26da1eaf5a8bae9b6129415e29e49436957083e99b9d45503d5644eb7ee1cec49e44f7
+EBUILD fwupd-1.0.0.ebuild 2366 SHA256 986dde4e9fdb58398b3a5660a57000fb706f5d39cc8062221defcf33792a97e3 SHA512 7a04646aefec3344873c3604ae7249538529817987361ffb47ac696c590c39a8e580414bc5a5e60f289ea8bc43a56c8f2c3a58243add2569f7fa4bd06b711b50 WHIRLPOOL 9f019eafe3c4c93373c100fec3713f92529a5aef86f80a81a03973156e15796e9e9731c68d3be0468b2b8e9c3bc7be72201041cb757139777cc5a897bb8883d7
 MISC metadata.xml 790 SHA256 9b1124ba722d81b7e43ad29aee79bcb8196e87260fdedcbbdd1044aad1ddb6c5 SHA512 5b0e4ce1e52ffc53059e995698820ad7f426a13e81bf9fb7f7e41f8c706839c5493bf72d3b75c55e8bf12be97dc6bde1a1a4eee473e8022e387b4256e6f67f49 WHIRLPOOL cd57b4e130e61ff7baa0cea4df3aa483bfe96a4e72faca7c00f2ba0444667a363101673453104ba711af04d1f279aa2d782e7b4d9f1b2912e6145cbc305c4c18
diff --git a/sys-apps/fwupd/fwupd-1.0.0.ebuild b/sys-apps/fwupd/fwupd-1.0.0.ebuild
index 41c904522da3..6d4d3f01c65e 100644
--- a/sys-apps/fwupd/fwupd-1.0.0.ebuild
+++ b/sys-apps/fwupd/fwupd-1.0.0.ebuild
@@ -16,7 +16,9 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="colorhug dell doc elf +man systemd test uefi uefi_labels"
-REQUIRED_USE="uefi_labels? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
+	uefi_labels? ( ${PYTHON_REQUIRED_USE} )
+"
 
 RDEPEND="
 	app-crypt/gpgme
@@ -76,6 +78,7 @@ src_configure() {
 		-Denable-doc="$(usex doc true false)"
 		-Denable-man="$(usex man true false)"
 		-Denable-libelf="$(usex elf true false)"
+		-Denable-synaptics="$(usex dell true false)"
 		-Denable-systemd="$(usex systemd true false)"
 		# requires libtbtfwu which is not packaged yet
 		-Denable-thunderbolt=false
diff --git a/sys-apps/iucode_tool/Manifest b/sys-apps/iucode_tool/Manifest
index 317249542275..aa27cf2ee575 100644
--- a/sys-apps/iucode_tool/Manifest
+++ b/sys-apps/iucode_tool/Manifest
@@ -1,6 +1,8 @@
 DIST iucode-tool_2.1.1.tar.xz 143204 SHA256 8f94ec73f5d4d1a6801aaa894fa1c6544d9b27aec16e1a00e18e8241c7e0f6ba SHA512 07ebf1919a997e7270d9c53f0287f53975253eb53e678f30bfc55acefc6fba7a51c6a4edbdcdbba88a7643ecbcba6acd0c93847d6d1648659789af37c9c59cd7 WHIRLPOOL a20e659047bc8eb8fbf83b91d7014004711c0713f450a5ff41f7919b3d7f4b192a5fcaec89cdba43ea40878c0b2c63d4bc628dae001cb5bc88d571b3b328b27e
 DIST iucode-tool_2.1.2.tar.xz 143352 SHA256 01f1c02ba6935e0ac8440fb594c2ef57ce4437fcbce539e3ef329f55a6fd71ab SHA512 f1af71843160500fb9c0b56bffdb1d3db09acf42f6c0a84a5d5311eedfe809f9ac27f89bf1778cab8261d3a540cfe62f3698a45c76be76e7f40179b9c49050e0 WHIRLPOOL 3ca861e36565c9126041c3cdaf05cc27f18d64580482a2d6b3d889c44b8f08bd1a3f8ae1cd1e27dd708c0a38a75e2fb2ed292e42458065cfc029ae8dba575580
+DIST iucode-tool_2.2.tar.xz 149896 SHA256 9810daf925b8a9ca244adc4e1916bcab65601c9ebe87e91c2281f78055982971 SHA512 edb5969c1e00480e537cddc49d7cbb190ce70e6f0c44d9c40a481038bfa048fade1b454a7f4eef3048cc204ee303758fe76222f9c9fb9b407ed463ee0ccdd429 WHIRLPOOL 96c4082f44fbcee882f01e04ffa17ea35726ecfd0c15863f99607d15cddab2a4c97ef53a32da308cd2eb412bfc6a7ffdae6bad6b31add01abc66448bb0ae6924
 EBUILD iucode_tool-2.1.1.ebuild 428 SHA256 986a164b7ec60009b3136acb10001deda62b0751c685fbfa766257ca237d6116 SHA512 62d09ae12e31934b7f37181327e3da5bf9d8cf9a0296fdc25ec832fde2555e7d78f7bd409fbcef0fd69da360b4b5f14fd5f221a8a675e66c5e6a294f14bcb0bd WHIRLPOOL 775fa16576b6d8c98017a3164b380bc25bc82e7221a7dd4c77cf93418618e3d9590eadb62317ff4e870fda1f89d8947738f152df00deda0a54c01db575b7977a
 EBUILD iucode_tool-2.1.2.ebuild 430 SHA256 868c4e5909f694d5fcf372fa7a94b104ec7380e6ad1995cd5a3fc766d3a712f0 SHA512 d4a8b86cd113cce64c4a6b8d11e70aa01e638d1e5f5649c3f92073ccc9252e3abcea36cb8ba3709a92b306e783d8f081483888ae2818baf9ddce67ab488144aa WHIRLPOOL 1566aea5bec9034049fe49a6bf8795e3fe2c4321c153c39332108c625a722c47b162394e62d2cb84bd91d3a0b023e957d3795072c7bda2233f86598465815819
+EBUILD iucode_tool-2.2.ebuild 430 SHA256 868c4e5909f694d5fcf372fa7a94b104ec7380e6ad1995cd5a3fc766d3a712f0 SHA512 d4a8b86cd113cce64c4a6b8d11e70aa01e638d1e5f5649c3f92073ccc9252e3abcea36cb8ba3709a92b306e783d8f081483888ae2818baf9ddce67ab488144aa WHIRLPOOL 1566aea5bec9034049fe49a6bf8795e3fe2c4321c153c39332108c625a722c47b162394e62d2cb84bd91d3a0b023e957d3795072c7bda2233f86598465815819
 MISC ChangeLog 1935 SHA256 ccd6236f12515ac1188efd0c0f3cd9b2a3dc2d4bf9a8df241d72d19ff541075c SHA512 8b7ea3f295d52f2c4dbee4cb17f7d2f219f58be760859e1b3bf58384b3566e24e3185d60edeba4d3f75e7e41a2e93e03a744162457ef810b241f35eb75e55c47 WHIRLPOOL 808182c143ce62188d24bbd803086d9c6f6ead8edb3504b801c85c4d70e04eb29cf224e654e50f7d1e347a303d380c162d69b1e7dc78c4818132f636fd7317fc
 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-apps/iucode_tool/iucode_tool-2.2.ebuild b/sys-apps/iucode_tool/iucode_tool-2.2.ebuild
new file mode 100644
index 000000000000..dcfaa908e494
--- /dev/null
+++ b/sys-apps/iucode_tool/iucode_tool-2.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="tool to manipulate Intel X86 and X86-64 processor microcode update collections"
+HOMEPAGE="https://gitlab.com/iucode-tool/"
+SRC_URI="https://gitlab.com/iucode-tool/releases/raw/master/${PN/_/-}_${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${PN/_/-}-${PV}"
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 5be57c7635e8..6ada818c7b64 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -9,6 +9,7 @@ DIST openrc-0.30.tar.gz 222383 SHA256 29b4d565bc37f51585c4a9aabedad46d7903186120
 DIST openrc-0.31.1.tar.gz 224059 SHA256 2a5cb07ce64fec2b3fd35c11be6b7dfe383fdc6a5449278c67b2f0af026650cc SHA512 98001e05896d113e20fad27ba100e2db5588262cb9c0b52c2800b38fd320b9baf4a99302044ef4045ba3a746d685d0cc27f8fdb42dccbc0574e32c6db9e6d3d2 WHIRLPOOL 00cb1d252d79700b79828fed6e319c124ae1c89bd10f506ff2f0e36961288c1d9a7366abb19e77f866aaa1695b176ecaad892ddd4b5a26713d084d4744470acd
 DIST openrc-0.31.2.tar.gz 224891 SHA256 6865733e8abeced128537937587e1cecc233227dea4b760c92f3ed6b980341f6 SHA512 c7a43eddd0652b8b9a62914d7aebcb6eab5fbd8f041a25f95c68f15c97eab3d27802a335da3703ce1e9828bd9a4fdc7e7c311075b875164af024c82a181b10df WHIRLPOOL 5e0d1d90d50915bc9a5844a3dba6362504a22612bdd12397c3f830f5407986374f27fb550dabb97b0b6aac5cc661ac40967819582216a14256276db5c9024db6
 DIST openrc-0.31.tar.gz 223966 SHA256 9d1631b647b3b8981dcbb5251f9d2444859c6cf0791c1b6b07469953e657eeee SHA512 2c28daa5b2bfd3c31a2b87b08a7b39dc078ab0224c713a2b738e991f968f07d4761770a813fb449df551d6e3db58ed997ac8bbe210d1fb17b4c88ead859eba7b WHIRLPOOL 929dbd2724b6f6aaeaae1d9bce913068ac94ec3e21aefae859d782ed7f6f2a948042a5371afc3a8f631b10552776225b4b8487a11188847366877bfd12889001
+DIST openrc-0.32.1.tar.gz 223808 SHA256 ef037a468d87009c8a21a62f04c3b5fa5eb56ce2808a2c6dbd3c73383469b638 SHA512 9cd48978fcd69a6d80b474a06b56550cc8c538d6d7a1cb6f88b90087593eebb8185ee5192ec05be2f87f61de53dbe6ded9058aee7ae8f806bb0d7d7da70f62d8 WHIRLPOOL 021f1dacf4a4a0fb7fb1577f2bfdb4db2007e7e414b17536f7709e05256489e5a692376611df674301ba90a879d14c9bd9c5684b4dc063d26e678158fa2a74f3
 DIST openrc-0.32.tar.gz 223935 SHA256 d452f5c8dd49a0819de368e7faeb56bd7460f8704cb029d9cc4e0b1dc56e791e SHA512 a355ba31d50b1c58f724d446449a8e31bb6f4c13b2da886880579e2666bcefe612a4eae64732f3ef7549fbfc84f3e088c4ca98e6be30108adfbf0a6d648d2635 WHIRLPOOL 451d9e549a175d14b5ed23c9b16e2cf7815e8cf7e616d964161b1e583e899ad0ac1f7bfe4cc4fccd4e1f5155d1c85f8d77f206d083bc02a0f2ad6a1348ac776f
 EBUILD openrc-0.27.2.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
 EBUILD openrc-0.28.ebuild 10123 SHA256 850255977878f273ec0fb3f0bfa117f4637dc3507f855e5d549b3eaad904f6f2 SHA512 f32502ebbd8e1a8e13044cd23d8b0e136eaf26e86001ae5f225640f085069c78921392a492614d3d1b734542bb0f99a9c781706158bdf5cd1ec91634d9f89e72 WHIRLPOOL 40fff2659443e04b037a5d722f0380423977c70001cd10076020ea5a6107ab8c7436ea0727ad00a0371a707daa90dda840bd4143ba5e2b180165dcc07fd15186
@@ -17,6 +18,7 @@ EBUILD openrc-0.30.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625
 EBUILD openrc-0.31.1.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
 EBUILD openrc-0.31.2.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-0.31.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
+EBUILD openrc-0.32.1.ebuild 10168 SHA256 194de0e29a431d4dd8ab1db172961e5a60440e9a670ae55b02a6d7e162d4b532 SHA512 fc1f3fc646a7c4b2eb03a426dd0f9b149cd2b7e2722c842835ed986fa44a5a0d4c5a462fd3d08e5f379f62f6dc5624c4f97034587ef78e714d88d9d2cb2271a0 WHIRLPOOL 1f757410e2c11a69abf44afb859a049ea5e00a54843643d6279e92e19862b6fc5e48043fc6b0f34f197c6abaf214c545a3f4c31ead434685b6e3245229b45fa5
 EBUILD openrc-0.32.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-9999.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 MISC ChangeLog 18468 SHA256 b0c4464a2179009f3683606b8c9ed6b6f1e5c543e5dee53d0b44e9cd51804d94 SHA512 f1269f5f534a2fb2c5643b8cb5735e969e4bc18f2f8474c23784cfebc92ac72a3ed77f00eafa7430ec2944b4a5476a4688172d9fc47a32eb04bbb43893a80143 WHIRLPOOL a912f296cb7272dded544d045cc9dee06c9319fc500dbdef9e000300c3fc73aaae4e72c7574428ce4dddeedcd2055e594acf315cfa53db95d48aaf20c8a8907a
diff --git a/sys-apps/openrc/openrc-0.32.1.ebuild b/sys-apps/openrc/openrc-0.32.1.ebuild
new file mode 100644
index 000000000000..e50431efc97e
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.32.1.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+	unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? (
+			>=sys-apps/sysvinit-2.86-r6[selinux?]
+			virtual/tmpfiles
+		)
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+
+	sed -i 's:0444:0644:' mk/sys.mk || die
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /$(get_libdir)/rc/init.d
+	fi
+	keepdir /$(get_libdir)/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+				"${EROOT}"etc/runlevels
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Handle the conf.d/local.{start,stop} -> local.d transition
+	if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
+		elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
+		elog "files to ${EROOT}etc/local.d"
+		mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
+		mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
+		chmod +x "${EROOT}"etc/local.d/*{start,stop}
+	fi
+
+	if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+			ewarn "The dependency data could not be migrated to /run/openrc."
+			ewarn "This means you need to reboot your system."
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index e1f64bba1495..1e8c6b4305af 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -8,9 +8,11 @@ AUX rngd-initd-r1-4.1 494 SHA256 3ad9a52d86e54eb755923242b1314584d5c66ab55221f60
 AUX rngd.service 133 SHA256 a05b1075157d39302106221594e1640479fae5dee4595de09442901a3a2d1648 SHA512 51e9ea84b624cda8d3689d6a9a8d60da4a556aa9d2a1a04e698d9a1490717aa47172e152c93711f8d04be8a5b68b1dfd568a762bd8ee7219afb7cdfff15657d2 WHIRLPOOL 093b0cd19a147abd9fc10f366c2c5a167d31b839d755cf2e56f6ae35409b6eb764db0651858d20dc95b71fe1d90b4ca33bde88053c80e40665613d132357366a
 AUX test-for-argp.patch 1245 SHA256 56824e3d80c931c3f907486cd8bf7b5a3bcc20fa507f452a9c63286443c06756 SHA512 0fe4b37eb3d2e93ff9ce17aed8cfcaa29c7f04289ba692d10fd0f8ef6d9b1e5f64a5734a508aea548f13fd00217972a68bcbeaf6977e763087ad20c19d456ed6 WHIRLPOOL c515fc9a8adf6bd49a4a622c05881e9ad22b514634c25d4f894be96d46f67a886bdcc092cafa57521e17d53bba1f1a3995dc673c24292b0aca276792e575073b
 DIST rng-tools-5.tar.gz 122182 SHA256 60a102b6603bbcce2da341470cad42eeaa9564a16b4490e7867026ca11a3078e SHA512 58047c37cad4f5f1210b696e4dba122878f78e57d05d9cb822f79234240ecce31efd2d39061fea1eb5b2e81d48d8c3bf6b92d06451f1ce5d5db7117704e89c50 WHIRLPOOL 073dbeb9d27189db44658a9f25657b93a320b125fbfc8230f7ce7849b8e7c1f7802b4c3a53de3417525b02739194fab8a6e5eb03d5db317a23deb275d72fbb21
+DIST rng-tools-6.1.tar.gz 29814 SHA256 6144818cd9c93008f72f14e2d23d8f717640d3f45afcea666a32b12bedd4dc03 SHA512 388593ffeef0b5f2770532629418cdf1b6421092ae9c5fe0a68d198a5cbd4ff733fbca8091d497e09620c61a9e8b982298fb064edfd05a0fc36fa49c22eef5c9 WHIRLPOOL 08185ebcb796daa25d4db69a2a46d2336c8db109ecfdd342a016fac6601e5feda09e4365431ec46284883b82fe1bbf4789588dfb2060bb4960233ffd8c8b929e
 DIST rng-tools-6.tar.gz 26024 SHA256 6d9c3f72824d1ea15dd2a80bfcf71f6a73c8843c6344f7f774a97a4ca7641b4c SHA512 2aea947c4dba5e8c4df33396957f7224b62200be0e3d10aac08c84155fa473a67df5f49e07a07b2cbea4dfd772d90c1b194e8fce3d8eea762463a7f4a16d6ce4 WHIRLPOOL 4e53c626288219a7cb9c94cf29d22878df5ad3298ca5ebedea46978e519d9b5b0ad94f765e217563105258f4b02b72b0033e551a7d37939ced9ca5d92f0a1048
 EBUILD rng-tools-5-r2.ebuild 1098 SHA256 a6e9a693947fdcff18969be0ea392e8171cab38be6367c6c30cda84f24137613 SHA512 b4a612e14a4e556c57c182a5e709bf497eb11c2b9ca850ca1dd32f94c313157d3273b02715eef907b570d5aaaa06e9786ce33f9085f83423d61fb5af4bbe1b52 WHIRLPOOL d27df6207498055f147981ff7b0f63c30fc1e0d458c8ab550829de00396b7772a5c50fa2d7f057764a35092ec3e30c45a79d5a48dfd94568bdc8e15dfceab603
+EBUILD rng-tools-6.1.ebuild 1227 SHA256 7029dc428b47d4d5e93a7cac1ce59efb599588623d49add2535884dc0b1aa0ac SHA512 5298ade15fe3d3e04ecc68e4a2353eef2c30fa052c16bb4bdbf0156ddeb2fe3869f30ff9a3b6eacd7357824f53d3d4397cbe84f14fe0440036cbb6377671f287 WHIRLPOOL a47c9903cfaf9706d84424d76bf523aa452eebc96a139451abf870678ad1e5b67c5b9b05ea9d6e700c0dc438c9caea2511d4fd0ebae13b994895c83a1cbfa37c
 EBUILD rng-tools-6.ebuild 1114 SHA256 b783fda920969b210d53a6b8d84f519ded1bfa5be641b2390a93732a15205f91 SHA512 e218c2147b5879418647e85103d7c0bd3f5fe3fcfd42855d64441c1228eb3a2caf462b2b4e553125e88374db64c94894497645421606853968ccbb4ddb2d5f38 WHIRLPOOL fa5a977e4949cdb582902703e3212d8feea462f27c344a5782287b4da1eeda4f58bca03ecb68345da9b5b94a34c62377867a257f60c1ed504601229b453e72d0
 MISC ChangeLog 8067 SHA256 a232bfd53ae71bba942c0065e502fa2087a6af4b14bc5664cb3177c9e0f4ae40 SHA512 b9143f297136c37d810755bb899b4353008d2982eff54d29de73f62a9790506468ba0034206877f894fe681effed2921bf9e8af54e771f46ef60d288955aecc5 WHIRLPOOL 5c62a5780931f8d50387a08076410aa815d6c7637260eec4f69b17a1ea6f51278d3d15786cefda3213527f47816f9dfaa2e296ed240bb6a543dcb70c0ecd2383
 MISC ChangeLog-2015 10419 SHA256 429b14666b303f77b8081e33cb4d2bc4da29c06af72895b37cf17ae3658381ce SHA512 9ef68cdfe956b4918d101ec0cfe3a69a9cf748b52326976edf234b58a48eb8c48fdb32b011fa8fe5e3d0cde8576b212b24d5b4003f87a4e4b327dc2cc0ff59ea WHIRLPOOL 525eb6a7d62820bda06d801c2721e2c38a9ca8af5d26d961c57a9d62c26a8dfec1ab08573f4237f3e6f4ee576de03d6d63a5514424011e773541f29c2b8e3915
-MISC metadata.xml 435 SHA256 853adcedbd25773649ea54cda891d50ddb76210f8a09dccc387a7dd8f656d711 SHA512 8e6882d47d45613afd58beaa45cb41134740efab0c34381789eaabd5938441e98aa59fde0efb922766075ecf3f608b40c632bc4e4cdf786d256d954e502296b7 WHIRLPOOL 6dc3ea1f0a1273a6f33e76898b298b1b0e3cb827bf436380b9ab15f425b47f7e16ec1c2d95f2232c2012fa41da4c0992a3d7598ed844bd1e8f2611559b90d3ca
+MISC metadata.xml 576 SHA256 d9a641541810a9e63447fa616d1e4d25163ad6b8937d35f962b9fc9add16613e SHA512 306d4b47230443cf82abd2c7e934b8fab73e695305a8981d3c011cbc2bbb193a87ae7a9c265a56c0454f4c0103f136211a4aabc2e35e030107b5ab2ac457c6e3 WHIRLPOOL ed537ec604e553367ad2354a787660d30c8a7ef116e94baeffe59bdf60d07199fd93994fced93a62ab08ee817a2befcc12f84f2b00bd304f9ad586f4aa9c9369
diff --git a/sys-apps/rng-tools/metadata.xml b/sys-apps/rng-tools/metadata.xml
index 6a6818baee38..bda25e86a520 100644
--- a/sys-apps/rng-tools/metadata.xml
+++ b/sys-apps/rng-tools/metadata.xml
@@ -9,7 +9,13 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<use>
+	<flag name="nistbeacon">
+		Enable NIST beacon entropy support
+	</flag>
+</use>
 <upstream>
+	<remote-id type="github">nhorman/rng-tools</remote-id>
 	<remote-id type="sourceforge">gkernel</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/sys-apps/rng-tools/rng-tools-6.1.ebuild b/sys-apps/rng-tools/rng-tools-6.1.ebuild
new file mode 100644
index 000000000000..2b37de32bff9
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd toolchain-funcs
+
+DESCRIPTION="Daemon to use hardware random number generators"
+HOMEPAGE="https://github.com/nhorman/rng-tools"
+SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="nistbeacon selinux"
+
+DEPEND="dev-libs/libgcrypt:0
+	dev-libs/libgpg-error
+	nistbeacon? (
+		net-misc/curl[ssl]
+		dev-libs/libxml2:2=
+		dev-libs/openssl:0=
+	)
+"
+RDEPEND="${DEPEND}
+	sys-fs/sysfsutils
+	selinux? ( sec-policy/selinux-rngd )"
+DEPEND="${DEPEND}
+	nistbeacon? (
+		virtual/pkgconfig
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/test-for-argp.patch
+	"${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962
+)
+
+src_prepare() {
+	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
+	default
+
+	mv README.md README || die
+
+	eautoreconf
+
+	sed -i '/^AR /d' Makefile.in || die
+	tc-export AR
+}
+
+src_configure() {
+	econf $(use_with nistbeacon)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/rngd-initd-r1-4.1 rngd
+	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
+	systemd_dounit "${FILESDIR}"/rngd.service
+}
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 9bac0abcfc13..9ffaaaae7f0f 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -3,9 +3,11 @@ AUX sg3_utils-1.42-sysmacros.patch 925 SHA256 d4b616076dd09b8cf66a911d8710730ee6
 DIST sg3_utils-1.40.tgz 1179730 SHA256 44a9ecfd3af018fa9f3586067a8fa5f4874451c3d773d74436d262a7e530ee83 SHA512 cf4909c46d509ea7c1c8930d81df2b20ce56c56092830f017e69fa4ce7eddb395ae1d17f51657d8dfb539fdd78229223e54e0db2d61d2612d23313cd6846043a WHIRLPOOL d092fdd6ab46da73cda9bf2b0a85dc468bb222a443ca20e8d2f55ad91ed83b8a523fbd4946cd2e40874a56673085629227996f1f5e686273c8d2d44093797687
 DIST sg3_utils-1.41.tgz 1194212 SHA256 c4e2893c36df1ee5b07840ab7c22129544f5dc8a55f7cc8815c9cd8e44ec31c0 SHA512 ceca778a2f4d16dd341dd47cc1d92df5bc85d7f75d75e6b7c1a99c31e03e98103a18abf624880172e162bd0b751f760f0e919cbbb989303a9e1fbe9ff3eb1f46 WHIRLPOOL 9476f0f180879f1386b824b367314648d616b6925ff7b735760f25de6e086e38efa0eb12dd8fb9f9305eb367f7d8c2053ceabc83fc6270492357abce25de9784
 DIST sg3_utils-1.42.tgz 1219231 SHA256 1dcb7a0309bd0ba3d4a83acb526973b80106ee26cd9f7398186cd3f0633c9ef3 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad WHIRLPOOL 7cf34461312c55031b317b18defb69b57190ca22e83a162e957e213c658f6cb990675ec60b78849da40f54679027fa27f0c809be568fb1bdd31a8498c8b8665f
+DIST sg3_utils-1.43.tar.gz 1180760 SHA256 cbb88682f11169fd234109843381785ffaeea4f94627620e57dcf26ad1361482 SHA512 5f2eea6f61300e288ce32ca613179a944de34576fd6e596c4c3aa6cc2c0ef397cf5bfd2c148b737f678aac0c574321994525486430ea14ae8e7cb1c02184636f WHIRLPOOL b6c822115b1e24810b60d1e903aa72f6e6047e0fe7b479f4730737dc72434dfc818cad666c33837b6f4d398dc9d2a34c233c2860d4210b53b71c367c5d3ee768
 EBUILD sg3_utils-1.40.ebuild 958 SHA256 97eb426b1f0c2b11e4f3c8611a7386aaa576a3369c90f397a61adeef4094ecbc SHA512 e347e8fc51a5875b71f4f6350ae03a6d03c8d77b5aab42dab36c0ec43441ebf75a8b291a906dd6a2ee0f07d053bdb453dda8476d2a569c3e16b52eb95fec1102 WHIRLPOOL 336517798552c8da669921dbfdc40625a731683ae7fef0af8d6a2799614be8e4d4ef6ca3d12c1b20592d5923606ac1e4884169d8d21b9b5e21a6216ae4be8f0f
 EBUILD sg3_utils-1.41.ebuild 969 SHA256 dac8fa6858736292fcc8242138a2851eeaeabbdd717f30955e30f4936ee6f1e3 SHA512 542582bd4130f2cc0bbacbc30a2a487ff8300845b43f0f7e4b83edfea4274d34468ddcf65ce919123afb93ecbd2d76853d80ce708456c4852390cb207f2e4055 WHIRLPOOL 187bdb017cbc7e426c2b85c632974304ed7d7e7648b2e69360c4b3eb4fc4d50617d89f08b9bf56369fe22002700038a38792b0e92a88ffe8e8d45949946768a5
 EBUILD sg3_utils-1.42.ebuild 1030 SHA256 9076086de4233b973e793526f85ebc5983a7c7bf9b1dea768d3d3f6cd209aac4 SHA512 8e8ac9d7b4293e8361e593685988fd92fb38a22e58e22b5f556216160fe494d9f2862509225ffcc75064bb18dc3eb9088a9c8595d6d6a7ed978d9189b8de2b59 WHIRLPOOL f4b0ac1e6b1a16f4c06a584e05396bf29dd25bf20b4f266327f0bf96c0d0260f6d24d13916de21f0d4c9725378538192f68865c1b642c8bec44ba28d230adb26
+EBUILD sg3_utils-1.43.ebuild 1082 SHA256 0e39492d22f464cad8dbe595f2e4ec2b62374f9ef4505cb58f153d325cea542a SHA512 ebb7d708d91268e3e23b54a07060e8a351f97a32815821212872cc6645a8da06c5f558ea37c036e70b579bfcad03e7423e283f4d6e11445e2f1b7d6cfe8a44ff WHIRLPOOL 00f9d4740052809f3c8d9257a87faf7ac04bd4ca51d60fc169a6081ea99e46bdf73f1972d80509605aa073cc16c34377cb8c10a50f3e9e45529939df5745d113
 MISC ChangeLog 4613 SHA256 565d90151dbfb94aef57806f65991ad25bd3c12e4c95ea733f0537b83ed50d0d SHA512 335fb68fed08dc59dc5d6b09a815b8de37c2d8d77267bd96a877585b07ee0fcdbdaa74ad0ceb778a3b687228ecc61ebdc61ee109992ef79e106f2f415da8dd51 WHIRLPOOL 7aabc17f5d94f7383c4fdd213b422f9dca360b36293edf53ab08a45c2891f06918d637beb2ce389fdcbb211cc631c72e47ed62ef67f86ecfb0360d7b95e04313
 MISC ChangeLog-2015 17273 SHA256 f6ce86dfa22bafb48babe7138b5db42549f37e8e3b907c08723e586c10e05715 SHA512 d2e1e48dede7dc23241b5d5672479ab91390364429c585566e9a4600b319aab5f3dae3780633590589688111c83683fd382303a839d7b8f6c864c2cc22797a5e WHIRLPOOL e899a18712bd20a4f21681b86f4e1481f3a1f1e1167d50b118566487611f472fbad87245e28aaaef75d8e1dff5f51546352a8bf43405bda574808860c62e898f
 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-apps/sg3_utils/sg3_utils-1.43.ebuild b/sys-apps/sg3_utils/sg3_utils-1.43.ebuild
new file mode 100644
index 000000000000..78f997750df5
--- /dev/null
+++ b/sys-apps/sg3_utils/sg3_utils-1.43.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+DESCRIPTION="Apps for querying the sg SCSI interface"
+HOMEPAGE="http://sg.danny.cz/sg/"
+SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="sys-devel/libtool"
+RDEPEND=""
+PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.26-stdint.patch #580236
+	epatch "${FILESDIR}"/${PN}-1.42-sysmacros.patch #580236
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	dodoc COVERAGE doc/README examples/*.txt
+	newdoc scripts/README README.scripts
+
+	# Better fix for bug 231089; some packages look for sgutils2
+	local path lib
+	path="/usr/$(get_libdir)"
+	for lib in "${ED}"${path}/libsgutils2.*; do
+		lib=${lib##*/}
+		dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
+	done
+
+	prune_libtool_files
+}