gentoo resync : 19.03.2019

17 files changed, 187 insertions, 669 deletions

diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index f06b6040d481..461a74c1fe77 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -3,34 +3,18 @@ AUX rng-tools-5-fix-textrels-on-PIC-x86.patch 2677 BLAKE2B af3911de5a8d7c91bc8a3
 AUX rng-tools-5-man-fill-watermark.patch 765 BLAKE2B 1e99d4961ba0e132fac5fbc7d5794ff638497662c0f9b16810d42428eb7fbdaa5dfe657ac961115587db2acf0672e67387077a317fe2afdc7eabdd4d1eb83e92 SHA512 8bc7a9903f9f77da2d55321605a2421bef27d8cedd3ea67e5547f4e59b85b3139b3cf269efe4c3abd767d87666e3e28b03e4fbf6984122febf45ea14af3332a0
 AUX rng-tools-5-man-rng-device.patch 398 BLAKE2B 6781f201e9c87143aa56dbb35702e95441cdfc304233be40d9f28c929c18f955d710b32128eede20bee71bab789bc72318cd71af294c2e6bc6d721882c3d030c SHA512 cd4c0cbcc32f6ace0f05c0dca82461c2a676a986c000850a422c3b509d79f22ddb98732749e63a1d9ec6d90db1745b7a163a590ada61f0ebcdde07b160647d3f
 AUX rng-tools-6-fix-noctty.patch 2188 BLAKE2B 73eebe43b950e0ef261208c073f5b6c0fee6b4cabd216373c0973de61604c936200943a4b0574533ec3cacee8701253de55f5d6a730765fcadc9a6e099eed3b6 SHA512 dff3d3ef81e847d378ca45531e4eaa81f4028b2b08adc17c68bba108cb4604f3bf13daa8b0e46ccb8aec2626ff8fd983038544508f3117828cecfbb282762116
-AUX rng-tools-6.1-fix-nistbeacon-validation-on-x86.patch 1615 BLAKE2B 63b8e975bcff85d0990d8ffe172b394167083fb95c0a9425425dd0b9aeb84a5c7265cc3181451b299cbbc7b965b957f472e18d7f1c109c38a564819581d863da SHA512 44a23471ba5dec1da76d4ff9ff77caa83a26fdebabcfbf561bc87ab838885a55a6fac7e31b64798e5ed0f67c4a47da03961a150efa7bb5ec4eebfc4889a21784
-AUX rng-tools-6.3-jitterentropy-linking-fix.patch 1057 BLAKE2B f07a9f6621c814237a71956f18b267c009181677fb47b3e0f1ed3b6417e3b33afd620cdb9bd1d5e9746ba195b1d861d86d03c16f7f2839931677c400cfe6281c SHA512 e64f4cf670143d91b4ac0dd4844d120308badfbccbe8764f9c5ed6badee90e9c5b58cc8cce3a3d6e53ac0c8fe906f155c629acc42ae3b414ff2559713844863a
-AUX rng-tools-6.4-jitterentropy-linking-fix.patch 1140 BLAKE2B 8233f70b487f5992d646d3894d908e29a708660513380e3d12a48e359fcaaafab9cab18d5a14dcc2c90c6bacc3a4aa4e1aa2ef38f084e57efb3006e06de23c3b SHA512 46036a9856b115974d92284f586b0f8874095e2e4c120e24b94828dee55aaea4bd5af7b27da690dcf0e82a2e0f6d299d1e57ba225bacf5d4a32fd04236fc953f
-AUX rng-tools-6.5-jitterentropy-automagic-detection-fix.patch 2121 BLAKE2B 33fe402d23759e4a50545e0f89a670ebe724719babeb62654b80470db2b52bf3761bb1a23c98c10a5408400c36e863695a7422afb72abfa43d9c44f90ab32ee0 SHA512 559f0e3ac4d5873c90d629d85a795192f555f6d3fd1b5c9b2bd85712c409493cceec01da0d19d2369f0673b6776b886a0a7ae92621ae47b7b003a86cb8b7a2ab
 AUX rngd-confd-4.1 562 BLAKE2B 8fe0147a1f9e67541c709f793ed1f34ed173204739973abbb1df629fb79ebf47d78c7d2e0f1aa9a867aff1f77133271325e2dbb2bfe5440921f5c16c2f0e8e5b SHA512 45e0e9cbe0180162f659bf05c15ee99fb8c1b80274cd8744384ba7f791b1c9a46a63e81eea665b4f492c13b7d5cc1fdb6e524a49a25af77f3791f527b31f688b
 AUX rngd-confd-6 2038 BLAKE2B 0f239923693d167a6a53609822d15a92e0c0e98d9c090c17ea3a73ad4a187528cd9a5d4bf071ec544592ef3ce801c2c364ccba193c22940411629b14a486cd69 SHA512 fe58599105fbcf8e1bf5f584aeefa54681dfa9fa2cd73cd682acd348f170ca825b692a1a8d153b438096c580a4b0cdab56a03b32b5f9ae8e73f06c3535c1ea46
-AUX rngd-initd-6 481 BLAKE2B 0642727e7dfb7cafcca269ce2b559880743f85402c5df26f28dd144766c8f5c0661d5a4d563d121550bec31c1ae103a4b6169ec5143ab895a7e1b7cf5bc77f0d SHA512 d15b462aa333bd0d64fa827626fa953d30cadce861dfc070598218104f072ffad26d88531d48bd22b5d627dc4fe8560a2808cc9e2e27310dcd74a6efad8a9baf
+AUX rngd-confd-6.7 2245 BLAKE2B 7643525d9a57479ba1b725ea6f976421c3df990c56d9f694b6fd2d3283c51ccf42e1be403a2208be70bc09dbd946c0cb803bfb303ae3999e97b3c3baa1162aaf SHA512 f16c5bc417e7bae86311397b3bf51927cc2cfbb0b4ee14a835fff5b62f4d12ab194329942e21cae4eec56953e4271b1fc655dcfa0be4ccbff1df1f1defdc70d8
 AUX rngd-initd-6-r1 1577 BLAKE2B be6d70877e840c8d95a029057e03f533219e7b45d87d493af80f9a88df72b3eb272e9565e238a05665ed50c2b417815aed96be82c739ba1ab8de26ee463d0a1d SHA512 5e133f0572920b48a56734bc86edece5f655c6dde11b669307e3c49591e2678fcf9135017aafbc3b37f2af8d6c9c5cf8e52217ee50ff68abc2a7bf2330576f37
+AUX rngd-initd-6.7 1687 BLAKE2B 0d597acedd2e37f2c2a455773aaf882c7e26af5ccb997f5d78391ada2f3c7fedf9ae00cbfe76188d20643d88f34db9ccea44576578010b5be6f5057f02360930 SHA512 22658113020cc1f0e73a2d30960e92211a3f939f87807992a88e5c226ac578da090d3509c3ff78eb3298d7ee40b0d0bba85c10956dc758049aa45d8be39dd5c8
 AUX rngd-initd-r1-4.1 494 BLAKE2B 1f11526717fcc9b88125e89474e1f06fc11621435811f4997e9e6197f634794df681ef698ab08d3f7c610dfb47c156231a157cfda05c804a6293a27dc276322f SHA512 8bf9a0bd25bcc9c1cc4eacdf875077208ba0899c626a55e57f055cc93b62e23a427e0622859c5b4a31c3aebe550b180777528b43942a3efb2e2c0b4243c3c9c6
 AUX rngd.service 133 BLAKE2B 1c3059e7ee924b42bc6567f5142973d550282248b3e49053b96782039ebd63096a0a8960d3e5a43cfac1d505c57e71015ad706099f06ac2809adf52c0b108d7c SHA512 51e9ea84b624cda8d3689d6a9a8d60da4a556aa9d2a1a04e698d9a1490717aa47172e152c93711f8d04be8a5b68b1dfd568a762bd8ee7219afb7cdfff15657d2
 AUX test-for-argp.patch 1245 BLAKE2B eb60f4d921f395d713e0ab9f132e47ce8783a096600f050c45212bae6929dc9546ff5f7b5ddf92d66570d82041b1e31ca3d690abd1e17d1c0fc688629a462e06 SHA512 0fe4b37eb3d2e93ff9ce17aed8cfcaa29c7f04289ba692d10fd0f8ef6d9b1e5f64a5734a508aea548f13fd00217972a68bcbeaf6977e763087ad20c19d456ed6
 DIST rng-tools-5.tar.gz 122182 BLAKE2B de7085d530e38de21a1c33792d67a72e0131b221082d690cdb299367b80b0a123c2976174aa3f895a4a2ab1216aacfaa8e09de485c85154dc4a5b8f960d05245 SHA512 58047c37cad4f5f1210b696e4dba122878f78e57d05d9cb822f79234240ecce31efd2d39061fea1eb5b2e81d48d8c3bf6b92d06451f1ce5d5db7117704e89c50
-DIST rng-tools-6.1.tar.gz 29814 BLAKE2B 4102c03ced36b33f9db6f7e5f77e8f918c4b9286a4c94cfd9ea9645c394f054fb3165255c3beb0f73d897d066831301f69a64e2758296b4418808343c97f3269 SHA512 388593ffeef0b5f2770532629418cdf1b6421092ae9c5fe0a68d198a5cbd4ff733fbca8091d497e09620c61a9e8b982298fb064edfd05a0fc36fa49c22eef5c9
-DIST rng-tools-6.2.tar.gz 30421 BLAKE2B 646628095cbc611aee4113198e0874b5f0672cd787f04f1649ff350883edebe6b31753aef3ac2bca1f05eedcf3c1400435c084382bde9f97fe6dcdd71adf18c2 SHA512 ffd8be5b232f092f8bcfdb6281580ce9053ec8bb87ff6bcae76585c38e3e91b9e464a9544a33ecd9814a9f244a89bac973d15c9bd3560d1164559685c720d174
-DIST rng-tools-6.3.1.tar.gz 31797 BLAKE2B 00d75d8436b4b49798bca8fb76e43a98feac8805b47a57d2315c22e72ed3dff30c6305b206168531c85c0576dc1d9864585eb3d4c2af833e9bec8dc5a478e19b SHA512 cb85674e6448e8152f92b4a82e944a9258dcc9ce68349404c0000c09378ac5f6fb298c50ed2d9a1b18d76c5f35b0a4884d5efd0f4dd434ec0952107e0738b937
-DIST rng-tools-6.3.tar.gz 31474 BLAKE2B 4d3924b3ca85d31d1999ceb45908cf64e8d2978d2e0aa638d9bbd3054a11a41251f9db54db35583c8fc080fd0667387cd63792c15486048d1f52300217e02fa9 SHA512 c00ac28c059ba689f114480958fe993e2199a1428137b151779a0331b9cc5a667f08770aa7b28d98c801166a509e8bd40d6b92f5c29b6ff73eb50a1cb0f2dd13
-DIST rng-tools-6.4.tar.gz 41248 BLAKE2B 16000e0779cf7aa25936a95661a0c40d4f0f12ed91fa36160924782d22a1057838bfb466f60614f91ef6c5576e0a29b6c1028bb72d5f5403c9a61d8f5ec16edd SHA512 12da9819b6e9a9ea688e82d1689642a690f6c9d78ad5fcf159a71b37a49f79120c8f62d4e1b8e81a496eac46a28137c5c87973499b31e1881a7866de99a168f0
-DIST rng-tools-6.5.tar.gz 51484 BLAKE2B 92700cbe1b48244effeae4f058507c27f8c9714f9bb5435ee7c6c08e260ce57891084208ea62391ab68b6551a3d95997c91d88020e9541564488abcf2041e479 SHA512 ae356ae18cb8584a594519038789d17e0f1b3d30122c058f86f3919a9c5ebfe0c48f8d7bfa6154b37d4f92d89c8b8a4a91007de0d1262ce5b86af19248c57bd0
 DIST rng-tools-6.6.tar.gz 51468 BLAKE2B 47231c60d78a48ade07855dfe8a807d6c10b8e27dc662ff7d98cf232b50e6c32f24197291a813d6ed6d15325a33fe9683d82943109a80cac1d9e348fc30cb849 SHA512 00bbe7f817d8f228f357a79ca270c27c62c0e588a99cd76917ecb7e88dfb627028c66497a59c9918205f3551aaf631963c8fd6504cb4198ddf57f714204c21c4
-DIST rng-tools-6.tar.gz 26024 BLAKE2B a523328fcce56997e2847940cdc096abd5a539135f857f0a4cd3d782a1659f4d2978870149caac47b839c80788df6a3d891adcd39371d5968149dd29bc46bc62 SHA512 2aea947c4dba5e8c4df33396957f7224b62200be0e3d10aac08c84155fa473a67df5f49e07a07b2cbea4dfd772d90c1b194e8fce3d8eea762463a7f4a16d6ce4
+DIST rng-tools-6.7.tar.gz 52792 BLAKE2B 3789aa4c6e2f024dcaef6b9b51521e206d65500a94ab456db61dc45c69ac5e4849a1e74abbe0f7640827ffb4bb20675c1f639a5be852d21d0d1a3c6b2e96bb5e SHA512 2f09edacb5448087041257326faf570c303b42f90bb695a1999b2c7543f20a28b15cdf705a2eca55cae8e9cf9fb5205c056fc26cfaf6af958bcda2cde1952b4d
 EBUILD rng-tools-5-r2.ebuild 1137 BLAKE2B 23776b640082f19239e62f95f940f42fd88f0cd2d9c448f2fadf3f30fb101059ebf8768646772a627dbebad8aa4174aef5e476ebabc09304ada927766aaee1ee SHA512 f0b5a692da2a5a692f72da546526cef1edbd398ae484eb6cc66f8e822fc64c374899b1c31dee1ab51df3b0ce66ed13a485948c466779359852055e77e9d03847
-EBUILD rng-tools-6-r1.ebuild 1148 BLAKE2B 1ed62bae780d2dd1cb3738215b629eb39065bf28513877b83bd627a6ba8e4bbae80ac0fa4ea1e8eaf8014220be73ca1911e1790671adf6574c366c8839d8bdd0 SHA512 8246b7431492b7c943e8b3fbd034314896d81baacb1e5d43d5c73124648caa4bd87177c89b9f46aa87301f9765daafb22af8682ccef82d7fa5f0dfdb8aa4e1cc
-EBUILD rng-tools-6.1-r2.ebuild 1325 BLAKE2B 20c596aaccf78725b9852e88018a201ce219bfa1104b89006bcfd7f2109d6466900156c7a3606bbd31412712a43bdf8e962cb16b45a7cc9a4710da2d567405bf SHA512 fbf47e00d8ed538852f27118ddfa1bfc90b5d013ccb254ef5cd1ed021cbf58cd140764cf2e69375c626816a7146f2ab21abfd0cb7afb724d33dc4122b25e5f18
-EBUILD rng-tools-6.2.ebuild 1261 BLAKE2B 3158e2a374b49924c54292ac4789d8c512c0ed429757ae0d403c83c920f24e9a840d39183c74a4d13d123a1da5d54fea32579707ebc3ab786335945dd848a25a SHA512 4f7b1ad046a56b98189d5d0eb8f22b6781ef6ecf2c79afb27107da0c81846ebdf9440ac42dcd46675a8ddd451684d7032ad80e51a56d2fc38c8c5b58650c6ca6
-EBUILD rng-tools-6.3.1.ebuild 1548 BLAKE2B 0fcf8f662414e005598b185504b75943d79feecbe5175b37d367d4a6bb2e455459a246bcf9b913221ffa1df64f6b70341a85a7eeca30bd599c2239dcc88679de SHA512 f5d032c3e22aa114971c37846a78862e2f68111209698d9e8f4b80e02cb858c48fc13bdc62b05f04319ae527858d57b913339c95eacb25cefd66f596ec2de581
-EBUILD rng-tools-6.3.ebuild 1548 BLAKE2B 0fcf8f662414e005598b185504b75943d79feecbe5175b37d367d4a6bb2e455459a246bcf9b913221ffa1df64f6b70341a85a7eeca30bd599c2239dcc88679de SHA512 f5d032c3e22aa114971c37846a78862e2f68111209698d9e8f4b80e02cb858c48fc13bdc62b05f04319ae527858d57b913339c95eacb25cefd66f596ec2de581
-EBUILD rng-tools-6.4.ebuild 1548 BLAKE2B 1257b070723618b064d9eb0cf8ebc37e9bb0db9eac758e49f8bf45579600d5654f69d151aef1d3d34cebabb4a97d95f8b409347f251c78ab1b2bb62597dbe0ec SHA512 b29286fa3b738a15ae6403ad3b48d91a52f75ba80d6a987cbd5a02d29d3a6a672d265aaf4159b6156eda12e809ba5a3e9d3373e8ab91821f25445b99c083cafc
-EBUILD rng-tools-6.5.ebuild 1475 BLAKE2B 4a99f3c45228254e61cf3da12877df07db05185feeb61b21c55f711acdb452efaa21fc8bfcebebd5a992fece1135319b21c03128343460753d911faefa4b6d7c SHA512 a3bf04930314f46741e84b1127445542790489fa3c689f25c258cb2da397919a995bc3bf74c675e696fe578c63ec9fdb9abba0d363a4efa8835a45fad633e6bb
 EBUILD rng-tools-6.6-r1.ebuild 1402 BLAKE2B d57feb1614af1b1a03cba4176772459ac91504dfe675b6b6f4090cace54e7f13c84becc8ec4c8e37124818587bb456058603712c6d1dc2bdecb01bedec470707 SHA512 1a356d298d7f4dba3c621b57dd0d8a00a4e13c1f5eec24bd72e70e3b2d8807b6e170ecc4dad1681858db65870850d73c8070e4b153a64f35f7e8f1ae121c004d
-EBUILD rng-tools-6.6.ebuild 1401 BLAKE2B 55b1507e5c1dc31899cbc49ad90a678e6e86b22958df5c0f98795e857c73193f0e5a546bc9f94302935ff7e09a81dbd2d8eaa5fcc2e818cfcb3b749cd5130c5c SHA512 1eed539bf410d565843f9f60bb44a8dacb1b17daf9aba00c53adfa253015587b61c55510c634bb58a6548d2309d6b3ee1ad4db08df50850c49195c3e9030eb81
-MISC metadata.xml 650 BLAKE2B d34f1f678d081e26075a4defa96ae293e2c8d06a6ff7a1091ddfe4c324b4e2c98db4f763664455008fba84d656b75220e5e16be9183fe8a5ddbe5aa250aadb8c SHA512 afe5c54ac87af8f1802160cc0e67198b1b0c8ddcf86dbc70571d5b879d128ddb4343a69da16a9fda789520a3e092735a5ea906d321b12bb329009c49e9813d41
+EBUILD rng-tools-6.7.ebuild 1891 BLAKE2B 1586f90ee426728ff69f0d96a4f8dc4b973d6b65a0fc37fb36b9ed75fe909694e2b8614257c7986bae174dbd2c800de3ca33d2ee8640573dca9cb3efbc402ec3 SHA512 c16d90d297a1c5cb8cb0f625e68b9f57e87ea139ac19f0604f4adfc1c5227f27e553d01bee4675f78da795b5fdf375a0eed981f58fb58d675a2f422c9274107b
+MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/files/rng-tools-6.1-fix-nistbeacon-validation-on-x86.patch b/sys-apps/rng-tools/files/rng-tools-6.1-fix-nistbeacon-validation-on-x86.patch
deleted file mode 100644
index 1872444bc4a8..000000000000
--- a/sys-apps/rng-tools/files/rng-tools-6.1-fix-nistbeacon-validation-on-x86.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From e8d7ea04e39f1209a79c003f3b62c9f1761dec0e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
-Date: Thu, 19 Apr 2018 05:29:01 -0400
-Subject: [PATCH] rngd_nistbeacon: fix the size of frequency and timestamp on
- x86_32
-
-The members "frequency" and "timestamp" of struct nist_data_block are
-defined as int and long, respectively. On x86_64, their sizes
-correctly correspond to 4 and 8 bytes. However, on 32-bit x86
-architectures, both int and long are defined as 4 bytes, causing the
-digest verification to fail. Fix it by using uint32_t and uint64_t
-explicitly.
----
- rngd_nistbeacon.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/rngd_nistbeacon.c b/rngd_nistbeacon.c
-index fbebc53..eadde39 100644
---- a/rngd_nistbeacon.c
-+++ b/rngd_nistbeacon.c
-@@ -97,8 +97,8 @@ BIO *bfp;
- 
- struct nist_data_block {
- 	char *version;
--	int frequency;
--	long timestamp;
-+	uint32_t frequency;
-+	uint64_t timestamp;
- 	char *seedvalue;
- 	size_t seedvaluelen;
- 	char *previoushash;
-@@ -355,8 +355,8 @@ static int validate_nist_block()
- 
- 
- 	EVP_VerifyUpdate(mdctx, block.version, strlen(block.version));
--	EVP_VerifyUpdate(mdctx, &block.frequency, sizeof(int));
--	EVP_VerifyUpdate(mdctx, &block.timestamp, sizeof(long));
-+	EVP_VerifyUpdate(mdctx, &block.frequency, sizeof(uint32_t));
-+	EVP_VerifyUpdate(mdctx, &block.timestamp, sizeof(uint64_t));
- 	EVP_VerifyUpdate(mdctx, block.seedvalue, block.seedvaluelen);
- 	EVP_VerifyUpdate(mdctx, block.previoushash, block.previoushashlen);
- 	EVP_VerifyUpdate(mdctx, &block.errorcode, block.errorcodelen);
--- 
-2.13.6
-
diff --git a/sys-apps/rng-tools/files/rng-tools-6.3-jitterentropy-linking-fix.patch b/sys-apps/rng-tools/files/rng-tools-6.3-jitterentropy-linking-fix.patch
deleted file mode 100644
index f7b87c88715d..000000000000
--- a/sys-apps/rng-tools/files/rng-tools-6.3-jitterentropy-linking-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c9f795da2dbeb0e85025f6264321aef1ba12059e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
-Date: Fri, 6 Jul 2018 17:20:28 -0400
-Subject: [PATCH] Makefile.am: use the libjitterentropy available on the system
-
----
- Makefile.am | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index b80e9a0..5d33aaf 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,9 +2,7 @@
- ## Toplevel Makefile.am for rng-tools
- ##
- if JITTER
-- JSUBDIR = jitterentropy-library
-- JSUBLIB = ./jitterentropy-library/libjitterentropy.a
-- AM_CPPFLAGS = -I./jitterentropy-library
-+ jitterentropy_LIBS = -ljitterentropy
- endif
- 
- SUBDIRS		= contrib tests $(JSUBDIR) 
-@@ -33,7 +31,7 @@ if JITTER
- rngd_SOURCES	+= rngd_jitter.c
- endif
- 
--rngd_LDADD	= librngd.a -lsysfs $(JSUBLIB) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS}
-+rngd_LDADD	= librngd.a -lsysfs $(jitterentropy_LIBS) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS}
- 
- rngd_CFLAGS	= ${libxml2_CFLAGS} ${openssl_CFLAGS}
- 
--- 
-2.17.0
-
diff --git a/sys-apps/rng-tools/files/rng-tools-6.4-jitterentropy-linking-fix.patch b/sys-apps/rng-tools/files/rng-tools-6.4-jitterentropy-linking-fix.patch
deleted file mode 100644
index e6cf95d13f32..000000000000
--- a/sys-apps/rng-tools/files/rng-tools-6.4-jitterentropy-linking-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ac00de69665a14bc1884be90ec83f8e8bc4d69f0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
-Date: Wed, 19 Sep 2018 16:45:37 -0400
-Subject: [PATCH] Makefile.am: use the libjitterentropy available on the system
-
----
- Makefile.am | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index fa8ecca..abc759a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,9 +2,7 @@
- ## Toplevel Makefile.am for rng-tools
- ##
- if JITTER
-- JSUBDIR = jitterentropy-library
-- JSUBLIB = ./jitterentropy-library/libjitterentropy.a
-- AM_CPPFLAGS = -I./jitterentropy-library
-+ jitterentropy_LIBS = -ljitterentropy
- endif
- 
- SUBDIRS		= contrib tests $(JSUBDIR) 
-@@ -33,7 +31,7 @@ if JITTER
- rngd_SOURCES	+= rngd_jitter.c
- endif
- 
--rngd_LDADD	= librngd.a -lsysfs $(JSUBLIB) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS} $(PTHREAD_LIBS)
-+rngd_LDADD	= librngd.a -lsysfs $(jitterentropy_LIBS) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS} $(PTHREAD_LIBS)
- 
- rngd_CFLAGS	= ${libxml2_CFLAGS} ${openssl_CFLAGS} $(PTHREAD_CFLAGS)
- rngd_LDFLAGS	= $(PTHREAD_CFLAGS)
--- 
-2.19.0
-
diff --git a/sys-apps/rng-tools/files/rng-tools-6.5-jitterentropy-automagic-detection-fix.patch b/sys-apps/rng-tools/files/rng-tools-6.5-jitterentropy-automagic-detection-fix.patch
deleted file mode 100644
index b03960180ed9..000000000000
--- a/sys-apps/rng-tools/files/rng-tools-6.5-jitterentropy-automagic-detection-fix.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 76cfc06afb69019dcf0bbd9938f6378168e37411 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
-Date: Wed, 26 Sep 2018 13:32:39 -0400
-Subject: [PATCH] configure.ac: control jitterentropy support using
- --with-jitter
-
-Replace automagic detection of jitterentropy DSO with an AC_ARG_WITH
-macro so that rngd can be compiled without jitter support even when
-the jitterentropy library is available on the system.
----
- configure.ac | 26 +++++++++++++++++++-------
- 1 file changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b1544d9..1e58184 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,6 +40,13 @@ AC_ARG_WITH([nistbeacon],
- 	[with_nistbeacon=check]
- )
- 
-+AC_ARG_WITH([jitter],
-+	AS_HELP_STRING([--without-jitter],
-+		[Disable jitter entropy library support. ]),
-+	[],
-+	[with_jitter=check]
-+)
-+
- dnl Make sure anyone changing configure.ac/Makefile.am has a clue
- AM_MAINTAINER_MODE
- AM_PROG_AS
-@@ -61,13 +68,18 @@ AS_IF([test $target_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])]
- 
- AM_CONDITIONAL([JITTER], [false])
- AM_CONDITIONAL([JITTER_DSO], [false])
--AS_IF([test -f jitterentropy-library/Makefile],
--		[AM_CONDITIONAL([JITTER], [true])
--		 AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])],
--		[AC_SEARCH_LIBS(jent_version,jitterentropy,
--			[AM_CONDITIONAL([JITTER_DSO], [true])
--			 AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])],
--			[AC_MSG_NOTICE([Disabling JITTER entropy source])])])
-+AS_IF(
-+	[ test "x$with_jitter" != "xno" ],
-+	[
-+		AS_IF([test -f jitterentropy-library/Makefile],
-+				[AM_CONDITIONAL([JITTER], [true])
-+				 AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])],
-+				[AC_SEARCH_LIBS(jent_version,jitterentropy,
-+					[AM_CONDITIONAL([JITTER_DSO], [true])
-+					 AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])],
-+					[AC_MSG_NOTICE([Disabling JITTER entropy source])])])
-+	]
-+)
- 
- #AM_CONDITIONAL([JITTER], [test -f jitterentropy-library/Makefile])
- #AS_IF([test -f jitterentropy-library/Makefile], [AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])],[AC_MSG_NOTICE([Disabling JITTER entropy source])])
--- 
-2.19.0
-
diff --git a/sys-apps/rng-tools/files/rngd-confd-6.7 b/sys-apps/rng-tools/files/rngd-confd-6.7
new file mode 100644
index 000000000000..20aa3281d535
--- /dev/null
+++ b/sys-apps/rng-tools/files/rngd-confd-6.7
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# /etc/conf.d/rngd
+# Please see "/usr/sbin/rngd --help" and "man rngd" for more information
+
+# Space-delimited list of entropy sources to enable
+# Note that some of the entropy sources may require certain USE flags
+# to be enabled or require hardware support to function properly
+# Entropy sources not specified here (or in the exclude list below)
+# will be enabled/disabled based on rngd default behavior
+#
+# Choose from the list:
+#         hwrng:  Hardware RNG Device
+#         tpm:    TPM RNG Device (Deprecated)
+#         rdrand: Intel RDRAND Instruction RNG
+#         darn:   Power9 DARN Instruction RNG
+#         nist:   NIST Network Entropy Beacon
+#                 (UNSAFE for cryptographic operations)
+#         jitter: JITTER Entropy Generator
+#         pkcs11: PKCS11 Entropy Generator
+#
+#INCLUDE_ENTROPY_SOURCES="hwrng tpm rdrand darn nist jitter pkcs11"
+
+
+# Space-delimited list of entropy sources to disable
+# This is useful for disabling certain entropy sources even
+# when they are supported on the system
+#
+#EXCLUDE_ENTROPY_SOURCES="nist tpm"
+
+
+# Entropy source specific options:
+#
+#
+# hwrng device used for random number input:
+#
+#HWRNG_DEVICE="/dev/hwrng"
+#
+#
+# rdrand options:
+#         use_aes:(BOOLEAN)
+#
+#RDRAND_OPTIONS="use_aes:1"
+#
+#
+# darn options:
+#         use_aes:(BOOLEAN)
+#
+#DARN_OPTIONS="use_aes:1"
+#
+#
+# jitter options:
+#         thread_count:(INTEGER)
+#         buffer_size:(INTEGER)
+#         refill_thresh:(INTEGER)
+#         retry_count:(INTEGER)
+#         retry_delay:(INTEGER)
+#         use_aes:(BOOLEAN)
+#
+#JITTER_OPTIONS="thread_count:4 buffer_size:16535 refill_thresh:16535"
+#JITTER_OPTIONS="${JITTER_OPTIONS} retry_count:1 retry_delay:-1 use_aes:1"
+#
+#
+# pkcs11 options:
+#         engine_path:(STRING)
+#         chunk_size:(INTEGER)
+#
+#PKCS11_OPTIONS="engine_path:/usr/lib64/opensc-pkcs11.so chunk_size:1"
+
+
+# Kernel device used for random number output
+#
+#RANDOM_DEVICE="/dev/random"
+
+
+# Random step (Number of bytes written to random-device at a time):
+#
+#STEP=64
+
+
+# Fill watermark
+# 0 <= n <= `sysctl kernel.random.poolsize`
+#
+#WATERMARK=2048
+
+
+# Any extra arguments for rngd
+#
+#EXTRA_ARGS=""
diff --git a/sys-apps/rng-tools/files/rngd-initd-6 b/sys-apps/rng-tools/files/rngd-initd-6
deleted file mode 100644
index c3b48bf22099..000000000000
--- a/sys-apps/rng-tools/files/rngd-initd-6
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-	after urandom
-	provide entropy
-}
-
-command=/usr/sbin/rngd
-pidfile="/var/run/${SVCNAME}.pid"
-command_args="--pid-file ${pidfile} --background --random-step ${STEP:-64} ${NO_TPM:+-x 1} \
-	${NO_DRNG:+-x 2} --fill-watermark ${WATERMARK} ${DEVICE:+--rng-device ${DEVICE}}"
-start_stop_daemon_args="--wait 1000"
-retry="SIGKILL/5000"
diff --git a/sys-apps/rng-tools/files/rngd-initd-6.7 b/sys-apps/rng-tools/files/rngd-initd-6.7
new file mode 100644
index 000000000000..e85581ba6cb4
--- /dev/null
+++ b/sys-apps/rng-tools/files/rngd-initd-6.7
@@ -0,0 +1,64 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+	after urandom
+	provide entropy
+}
+
+command="/usr/sbin/rngd"
+description="Check and feed random data from hardware device to kernel entropy pool."
+pidfile="/var/run/${RC_SVCNAME}.pid"
+command_args=""
+command_args_background="--pid-file ${pidfile} --background"
+start_stop_daemon_args="--wait 1000"
+retry="SIGKILL/5000"
+
+
+# Parse rngd confd file for extra command line arguments
+start_pre() {
+    for entsrc in ${INCLUDE_ENTROPY_SOURCES}; do
+	command_args="${command_args} -n ${entsrc}"
+    done
+
+    for entsrc in ${EXCLUDE_ENTROPY_SOURCES}; do
+	command_args="${command_args} -x ${entsrc}"
+    done
+
+    if [ "x${HWRNG_DEVICE}" != "x" ]; then
+	command_args="${command_args} --rng-device=${HWRNG_DEVICE}"
+    fi
+
+    for entsrc_opt in ${RDRAND_OPTIONS}; do
+	command_args="${command_args} -O rdrand:${entsrc_opt}"
+    done
+
+    for entsrc_opt in ${DARN_OPTIONS}; do
+	command_args="${command_args} -O darn:${entsrc_opt}"
+    done
+
+    for entsrc_opt in ${JITTER_OPTIONS}; do
+	command_args="${command_args} -O jitter:${entsrc_opt}"
+    done
+
+    for entsrc_opt in ${PKCS11_OPTIONS}; do
+	command_args="${command_args} -O pkcs11:${entsrc_opt}"
+    done
+
+    if [ "x${RANDOM_DEVICE}" != "x" ]; then
+	command_args="${command_args} --random-device=${RANDOM_DEVICE}"
+    fi
+
+    if [ "x${STEP}" != "x" ]; then
+	command_args="${command_args} --random-step=${STEP}"
+    fi
+
+    if [ "x${WATERMARK}" != "x" ]; then
+	command_args="${command_args} --fill-watermark=${WATERMARK}"
+    fi
+
+    command_args="${command_args} ${EXTRA_ARGS}"
+    return 0
+}
diff --git a/sys-apps/rng-tools/metadata.xml b/sys-apps/rng-tools/metadata.xml
index 911b7587f660..69907447109c 100644
--- a/sys-apps/rng-tools/metadata.xml
+++ b/sys-apps/rng-tools/metadata.xml
@@ -16,6 +16,9 @@
 	<flag name="nistbeacon">
 		Enable NIST beacon entropy support
 	</flag>
+	<flag name="pkcs11">
+		Enable PKCS11 entropy support
+	</flag>
 </use>
 <upstream>
 	<remote-id type="github">nhorman/rng-tools</remote-id>
diff --git a/sys-apps/rng-tools/rng-tools-6-r1.ebuild b/sys-apps/rng-tools/rng-tools-6-r1.ebuild
deleted file mode 100644
index 1cee6b6717b8..000000000000
--- a/sys-apps/rng-tools/rng-tools-6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="selinux"
-
-DEPEND="dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	elibc_musl? ( sys-libs/argp-standalone )"
-RDEPEND="${DEPEND}
-	sys-fs/sysfsutils
-	selinux? ( sec-policy/selinux-rngd )"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
-	"${FILESDIR}"/test-for-argp.patch
-	"${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962
-	"${FILESDIR}"/${PN}-5-man-fill-watermark.patch #555094
-	"${FILESDIR}"/${PN}-6-fix-noctty.patch #556456
-)
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
-	default
-	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in || die
-	tc-export AR
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rngd-initd-6 rngd
-	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
-}
diff --git a/sys-apps/rng-tools/rng-tools-6.1-r2.ebuild b/sys-apps/rng-tools/rng-tools-6.1-r2.ebuild
deleted file mode 100644
index c51a2821f9d5..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.1-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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=
-	)
-	elibc_musl? ( sys-libs/argp-standalone )
-"
-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
-	"${FILESDIR}"/${PN}-6.1-fix-nistbeacon-validation-on-x86.patch
-)
-
-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-6 rngd
-	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
-}
diff --git a/sys-apps/rng-tools/rng-tools-6.2.ebuild b/sys-apps/rng-tools/rng-tools-6.2.ebuild
deleted file mode 100644
index 45197defe8b0..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-	sys-fs/sysfsutils
-	nistbeacon? (
-		net-misc/curl[ssl]
-		dev-libs/libxml2:2=
-		dev-libs/openssl:0=
-	)
-	elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="${DEPEND}
-	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-6 rngd
-	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
-}
diff --git a/sys-apps/rng-tools/rng-tools-6.3.1.ebuild b/sys-apps/rng-tools/rng-tools-6.3.1.ebuild
deleted file mode 100644
index a8887e279b07..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.3.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="jitterentropy nistbeacon selinux"
-
-DEPEND="dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	sys-fs/sysfsutils
-	jitterentropy? (
-		app-crypt/jitterentropy:=
-	)
-	nistbeacon? (
-		net-misc/curl[ssl]
-		dev-libs/libxml2:2=
-		dev-libs/openssl:0=
-	)
-	elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="${DEPEND}
-	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
-	"${FILESDIR}"/${PN}-6.3-jitterentropy-linking-fix.patch
-)
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
-	default
-
-	mv README.md README || die
-
-	if use jitterentropy; then
-		# Fool the build system into thinking that
-		# jitterentropy source code exists
-		touch "${S}"/jitterentropy-library/Makefile || die
-	fi
-	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in || die
-	tc-export AR
-}
-
-src_configure() {
-	econf $(use_with nistbeacon)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rngd-initd-6 rngd
-	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
-}
diff --git a/sys-apps/rng-tools/rng-tools-6.3.ebuild b/sys-apps/rng-tools/rng-tools-6.3.ebuild
deleted file mode 100644
index a8887e279b07..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="jitterentropy nistbeacon selinux"
-
-DEPEND="dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	sys-fs/sysfsutils
-	jitterentropy? (
-		app-crypt/jitterentropy:=
-	)
-	nistbeacon? (
-		net-misc/curl[ssl]
-		dev-libs/libxml2:2=
-		dev-libs/openssl:0=
-	)
-	elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="${DEPEND}
-	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
-	"${FILESDIR}"/${PN}-6.3-jitterentropy-linking-fix.patch
-)
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
-	default
-
-	mv README.md README || die
-
-	if use jitterentropy; then
-		# Fool the build system into thinking that
-		# jitterentropy source code exists
-		touch "${S}"/jitterentropy-library/Makefile || die
-	fi
-	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in || die
-	tc-export AR
-}
-
-src_configure() {
-	econf $(use_with nistbeacon)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rngd-initd-6 rngd
-	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
-}
diff --git a/sys-apps/rng-tools/rng-tools-6.4.ebuild b/sys-apps/rng-tools/rng-tools-6.4.ebuild
deleted file mode 100644
index 3ee017a12dc1..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="jitterentropy nistbeacon selinux"
-
-DEPEND="dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	sys-fs/sysfsutils
-	jitterentropy? (
-		app-crypt/jitterentropy:=
-	)
-	nistbeacon? (
-		net-misc/curl[ssl]
-		dev-libs/libxml2:2=
-		dev-libs/openssl:0=
-	)
-	elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="${DEPEND}
-	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
-	"${FILESDIR}"/${PN}-6.4-jitterentropy-linking-fix.patch
-)
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
-	default
-
-	mv README.md README || die
-
-	if use jitterentropy; then
-		# Fool the build system into thinking that
-		# jitterentropy source code exists
-		touch "${S}"/jitterentropy-library/Makefile || die
-	fi
-	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in || die
-	tc-export AR
-}
-
-src_configure() {
-	econf $(use_with nistbeacon)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rngd-initd-6 rngd
-	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
-}
diff --git a/sys-apps/rng-tools/rng-tools-6.5.ebuild b/sys-apps/rng-tools/rng-tools-6.5.ebuild
deleted file mode 100644
index b7c7cd5116b7..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="jitterentropy nistbeacon selinux"
-
-DEPEND="dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	sys-fs/sysfsutils
-	jitterentropy? (
-		app-crypt/jitterentropy:=
-	)
-	nistbeacon? (
-		net-misc/curl[ssl]
-		dev-libs/libxml2:2=
-		dev-libs/openssl:0=
-	)
-	elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="${DEPEND}
-	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
-	"${FILESDIR}"/${PN}-6.5-jitterentropy-automagic-detection-fix.patch
-)
-
-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() {
-	local myeconfargs=(
-		$(use_with nistbeacon)
-		$(use_with jitterentropy jitter)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rngd-initd-6 rngd
-	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
-}
diff --git a/sys-apps/rng-tools/rng-tools-6.6.ebuild b/sys-apps/rng-tools/rng-tools-6.7.ebuild
index d32e279caa03..3259cb07f84b 100644
--- a/sys-apps/rng-tools/rng-tools-6.6.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools systemd toolchain-funcs
+inherit autotools systemd readme.gentoo-r1 toolchain-funcs
 
 DESCRIPTION="Daemon to use hardware random number generators"
 HOMEPAGE="https://github.com/nhorman/rng-tools"
@@ -12,7 +12,7 @@ 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="jitterentropy nistbeacon selinux"
+IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="dev-libs/libgcrypt:0
 	dev-libs/libgpg-error
@@ -25,6 +25,9 @@ DEPEND="dev-libs/libgcrypt:0
 		dev-libs/libxml2:2=
 		dev-libs/openssl:0=
 	)
+	pkcs11? (
+		dev-libs/libp11:=
+	)
 	elibc_musl? ( sys-libs/argp-standalone )
 "
 RDEPEND="${DEPEND}
@@ -54,8 +57,9 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		$(use_with nistbeacon)
 		$(use_enable jitterentropy)
+		$(use_with nistbeacon)
+		$(use_with pkcs11)
 	)
 
 	econf "${myeconfargs[@]}"
@@ -63,7 +67,23 @@ src_configure() {
 
 src_install() {
 	default
-	newinitd "${FILESDIR}"/rngd-initd-6 rngd
-	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
+	newinitd "${FILESDIR}"/rngd-initd-6.7 rngd
+	newconfd "${FILESDIR}"/rngd-confd-6.7 rngd
 	systemd_dounit "${FILESDIR}"/rngd.service
+
+	if use pkcs11; then
+		local DISABLE_AUTOFORMATTING=1
+		local DOC_CONTENTS="
+The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
+to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
+	'${EROOT%/}/etc/conf.d/rngd'
+reflects the correct PKCS11 engine path to be used by rngd.
+"
+		readme.gentoo_create_doc
+	fi
+
+}
+
+pkg_postinst() {
+	use pkcs11 && readme.gentoo_print_elog
 }