gentoo resync : 18.05.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-05-18 00:10:51 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-05-18 00:10:51 +0100
commit: eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch)
tree: 3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /app-crypt
parent: a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff)
65 files changed, 522 insertions, 471 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index f788f60176e2..739f9e230daf 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 74328b7b0073..082fb5026519 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,8 @@
 DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
 DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
-DIST certbot-0.34.0.tar.gz 1346939 BLAKE2B db0d7bc716206ff9bebcf953b72e29f46e335209d70e518eeb11d944bab26e2fbe15c6bbe448861cbd71c744dfc22aa8cb54b96dfc5d15d497af8a91cfbc6e45 SHA512 24d4a58bcc220451532b1b7d1ddaa90ef773935ff65c2b06e121f044b5575d159555a757660abebd72ff4134a257394dbc99c981729d846d565c75f692317a30
+DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de
 EBUILD acme-0.32.0.ebuild 1263 BLAKE2B 5486282dd90bee28ca65a9170546ed0d09de38880f7945dcef1009cb7c20b991e5d22e7efe89eae07a13013b24e627624c0da907604359e10c75cda5607478f0 SHA512 6517cd06f5430885b072407d11971850cec39c3bca45545006fb58c970f121aaafb725e6a77371bb08151b05a803fd274b45cb9c2e10e48c02e29e5bf9634d3a
 EBUILD acme-0.33.1-r1.ebuild 1681 BLAKE2B 020b1e9b09cc794ebd39ecffeaa904e260b375dd1bd853e62c926d6065501da6cec10977fcf45b7addc660e85b838012e1a5bacfa4f7015ab62496672a0138b3 SHA512 5330cefe084d1b20801bc34b7c8ef30f9f4891f9f3407b28ed84a307b7afe574a2df7bea29fbf208c09520b5075b1c8195e48cd6ba3051387dca8b0bf86d84da
-EBUILD acme-0.34.0.ebuild 1683 BLAKE2B 76931500e9d92a856cdd0d5e26c6df199d111fca3bab417a49bd0373e4f3522f0ea31dd53d43d53436d3e83097617214f9b381193e3e46207b00ba15f347b0ea SHA512 ccbb885ab6021ae583d48cae27e7b32cd24aa88a39cc453c27818cb84911eb7d9fce9d7cc1d42e1afed98cb9349ed05823fa4d1ea2b127a4fdd287da9b320966
-EBUILD acme-9999.ebuild 1683 BLAKE2B 76931500e9d92a856cdd0d5e26c6df199d111fca3bab417a49bd0373e4f3522f0ea31dd53d43d53436d3e83097617214f9b381193e3e46207b00ba15f347b0ea SHA512 ccbb885ab6021ae583d48cae27e7b32cd24aa88a39cc453c27818cb84911eb7d9fce9d7cc1d42e1afed98cb9349ed05823fa4d1ea2b127a4fdd287da9b320966
+EBUILD acme-0.34.2.ebuild 1683 BLAKE2B 76931500e9d92a856cdd0d5e26c6df199d111fca3bab417a49bd0373e4f3522f0ea31dd53d43d53436d3e83097617214f9b381193e3e46207b00ba15f347b0ea SHA512 ccbb885ab6021ae583d48cae27e7b32cd24aa88a39cc453c27818cb84911eb7d9fce9d7cc1d42e1afed98cb9349ed05823fa4d1ea2b127a4fdd287da9b320966
+EBUILD acme-9999.ebuild 1687 BLAKE2B ef1c4040e3808237c26b628b8fb7911dc748753b3b30c4aee8e3fded2a4ef6610ddf39117ec8c1164a323b3fba9f0243d3a650f769d4dfad87633c2d4607da03 SHA512 b9de277e5db419c5c80b63d266f07890bb5446103779794c70b877ce4db638d3d9a2aa23d37da04b82a725b0d2ba2e624508d35c67521265dc7fb76ccd993c58
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-0.34.0.ebuild b/app-crypt/acme/acme-0.34.2.ebuild
index 64b8beb25ff0..64b8beb25ff0 100644
--- a/app-crypt/acme/acme-0.34.0.ebuild
+++ b/app-crypt/acme/acme-0.34.2.ebuild
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 64b8beb25ff0..9500982ce873 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index 9518f7da5862..70e664ee7744 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -1,4 +1,4 @@
 DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
-EBUILD argon2-20171227-r1.ebuild 1204 BLAKE2B 2c0cac04bc8677b26f17cea0fc9a6c85dc898be90f26deabf8bfb202ed0097cdc6710924b6c6dac04f35d424398a67409fe71fc5acec12c57ab6eca212003fee SHA512 21caa9762207712b66254a1d63dde40b7611028a980014596657e8e9d550d7d4beab5519dad56273a06ccf6c59b5419a7e271fd6638c22a531d74ff2ad506a4c
+EBUILD argon2-20171227-r1.ebuild 1202 BLAKE2B 4cac9f9cf041ca4378a9d9d63797d54c198b82070a14147dcd07d97c8cb1bfd64cb974b15a79388c3797bcc6c61c064e34b09901729526a53d0143818558a981 SHA512 36a915e81c6cc0de26f337c7ddb33827ab9f8ce3d0de6842a712d8d7550e9d3abfd8935f9f3570c7af637b14f374b03c37510c7fb493709bd81f2bc44762415c
 EBUILD argon2-20171227.ebuild 932 BLAKE2B d4d35467d79c15fe30fdd120261f0452ff20e2433cfb59734d98dfca35bd587114bd49cb7e6186100ba57dd14b12371703eb7465298a8ee585286838e207f8c6 SHA512 88b54c07cc75e2011ebeb5c43636deafbc248d013b52e97a876aad02a1019477087d9c2652dcf21d4939f871c84a2255e826e5126cae1be8e9111e6b3055c498
 MISC metadata.xml 660 BLAKE2B 1843f019c2cf7e8438209df6d90a20a9bcc88f5346aa02c953a28d84d712983fe3880b39b4b1766819bb88c670245447c37dc0c1da3b02b3f800a3d9706c4287 SHA512 76c1048a35a75b60d9e5fd56da50ba4bfe9537457e2021c226671d72e0456d2533f05361cad607cc86b8e01fd00a137a4cbc26a6d70c122918fe4e0f2ae3bee5
diff --git a/app-crypt/argon2/argon2-20171227-r1.ebuild b/app-crypt/argon2/argon2-20171227-r1.ebuild
index 3e3d4dc8b8a5..9bd2cb97ed98 100644
--- a/app-crypt/argon2/argon2-20171227-r1.ebuild
+++ b/app-crypt/argon2/argon2-20171227-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
 IUSE="static-libs"
 
 S="${WORKDIR}/phc-winner-${P}"
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 81ade8cbe23f..45060da43c3f 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,8 @@
 DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
 DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
-DIST certbot-0.34.0.tar.gz 1346939 BLAKE2B db0d7bc716206ff9bebcf953b72e29f46e335209d70e518eeb11d944bab26e2fbe15c6bbe448861cbd71c744dfc22aa8cb54b96dfc5d15d497af8a91cfbc6e45 SHA512 24d4a58bcc220451532b1b7d1ddaa90ef773935ff65c2b06e121f044b5575d159555a757660abebd72ff4134a257394dbc99c981729d846d565c75f692317a30
+DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de
 EBUILD certbot-apache-0.32.0.ebuild 1074 BLAKE2B 4a0867a89a9a3f9cce6771b3c7e1b44f1e644b03ad3f5318fb0d1c4411f1b8b18c8cb6f902558effbbc10f2bf31961119d97af1ddaf51c7b962eea545b0486d5 SHA512 a281f2cfe0b59ceaa3caa5e0aa06deef85d6dd3b07d83e3b8d6078822d203a6fd5658eb61fa72b71f0dcf99d98bdaceda2472f09678b2fb2165dd6f4f20a4c9a
 EBUILD certbot-apache-0.33.1.ebuild 1074 BLAKE2B 4a0867a89a9a3f9cce6771b3c7e1b44f1e644b03ad3f5318fb0d1c4411f1b8b18c8cb6f902558effbbc10f2bf31961119d97af1ddaf51c7b962eea545b0486d5 SHA512 a281f2cfe0b59ceaa3caa5e0aa06deef85d6dd3b07d83e3b8d6078822d203a6fd5658eb61fa72b71f0dcf99d98bdaceda2472f09678b2fb2165dd6f4f20a4c9a
-EBUILD certbot-apache-0.34.0.ebuild 1076 BLAKE2B 04c24a70b59c93892bad5c8f2e51da4484f47357da5481c382bc8026be40ae903e403f3fca9013115cf1dbb9bdce20c783f9d0ce3cd870f62e38aed97c9fecdc SHA512 19d250829fbb9a15000f426332489cd443945cdbebfa1c383d7c64fb26fc0d4657de11b5b553c73787f158f6607cdcb6a2892411aea8aa3c9376c12e63a91ebd
-EBUILD certbot-apache-9999.ebuild 1076 BLAKE2B 04c24a70b59c93892bad5c8f2e51da4484f47357da5481c382bc8026be40ae903e403f3fca9013115cf1dbb9bdce20c783f9d0ce3cd870f62e38aed97c9fecdc SHA512 19d250829fbb9a15000f426332489cd443945cdbebfa1c383d7c64fb26fc0d4657de11b5b553c73787f158f6607cdcb6a2892411aea8aa3c9376c12e63a91ebd
+EBUILD certbot-apache-0.34.2.ebuild 1076 BLAKE2B 04c24a70b59c93892bad5c8f2e51da4484f47357da5481c382bc8026be40ae903e403f3fca9013115cf1dbb9bdce20c783f9d0ce3cd870f62e38aed97c9fecdc SHA512 19d250829fbb9a15000f426332489cd443945cdbebfa1c383d7c64fb26fc0d4657de11b5b553c73787f158f6607cdcb6a2892411aea8aa3c9376c12e63a91ebd
+EBUILD certbot-apache-9999.ebuild 1080 BLAKE2B 441715a50c110b85b886389f1f94822669ca4167b4a068c2b5b0a8b984f37e4e45168e330e5dafc3e0414e3192354b6d7a1de0897e084a11ab5b05509d89bdec SHA512 afedc9ecd49619d81e8151da98d6676a8684ceaf1b72eb7c428e9534ab86c0e04eb01b4b779613bcad9e89900485e10dd2784fc65f7ab5d94af5722d944ee2f6
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.34.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.34.2.ebuild
index 0384278e8878..0384278e8878 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.34.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.34.2.ebuild
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index 0384278e8878..3a00f63544a8 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 4c6cc2d32e00..9721c6835858 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,8 @@
 DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
 DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
-DIST certbot-0.34.0.tar.gz 1346939 BLAKE2B db0d7bc716206ff9bebcf953b72e29f46e335209d70e518eeb11d944bab26e2fbe15c6bbe448861cbd71c744dfc22aa8cb54b96dfc5d15d497af8a91cfbc6e45 SHA512 24d4a58bcc220451532b1b7d1ddaa90ef773935ff65c2b06e121f044b5575d159555a757660abebd72ff4134a257394dbc99c981729d846d565c75f692317a30
+DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de
 EBUILD certbot-nginx-0.32.0.ebuild 1008 BLAKE2B 3e321c0b16817a2d1a0751863d12a3401a76cdef9cb40d9d45b472a7dbfebf9a0bb8e665b89139c41c4415a1c08e059a8f1262ab01973966c89e210d0b147ab7 SHA512 0ab8809448cbe9a2e1e318e4cf9ad03680e2bdaff92a0c53c52a4519bd15bd3c2f7647c910cc08cd627fade6b62ee021ce0816efc35d9c98df05d65f3ed817d8
 EBUILD certbot-nginx-0.33.1.ebuild 1008 BLAKE2B 59d075f34cbe0a2c0714014493ed9aa3d5fef243de2002af6c6281f5867599f2d1936cfe893095628986793a4d0f59c397a6b27c4909dc91027d1063e4b6816e SHA512 7884dbb738ff661c5654d44e657edd8d516391e5186e5f6d712b316208f467c8e602964d6dacb3ca49932f36eeaf3b9755d79db85078cc0af07e221551adee2d
-EBUILD certbot-nginx-0.34.0.ebuild 1010 BLAKE2B 144ca363c1580f8855d181e5011ac9181379627eb6704b6f38961672ce76d1691925becfdc7f9b203b88faa4a655a680017da3ebfcf94ead2f798fbf5a710226 SHA512 3424be73e7f33dd43066acbdf96eba3d17f510b3c6289371f710663c56971b925a631b533c807625b477f2d6079694db92aca74eda18f05575f4d4ab148edef5
-EBUILD certbot-nginx-9999.ebuild 1010 BLAKE2B 144ca363c1580f8855d181e5011ac9181379627eb6704b6f38961672ce76d1691925becfdc7f9b203b88faa4a655a680017da3ebfcf94ead2f798fbf5a710226 SHA512 3424be73e7f33dd43066acbdf96eba3d17f510b3c6289371f710663c56971b925a631b533c807625b477f2d6079694db92aca74eda18f05575f4d4ab148edef5
+EBUILD certbot-nginx-0.34.2.ebuild 1010 BLAKE2B 144ca363c1580f8855d181e5011ac9181379627eb6704b6f38961672ce76d1691925becfdc7f9b203b88faa4a655a680017da3ebfcf94ead2f798fbf5a710226 SHA512 3424be73e7f33dd43066acbdf96eba3d17f510b3c6289371f710663c56971b925a631b533c807625b477f2d6079694db92aca74eda18f05575f4d4ab148edef5
+EBUILD certbot-nginx-9999.ebuild 1014 BLAKE2B 82e082a1043f8eb283be0379a6a2d30510c2d1e02555cda56653a7b918caf0ce05f68206705f2ebe1638e144ead2e210af63ab761ece3ab5c8eea25bc09832b8 SHA512 a1f6ab23a4408d38d567d13a452aa6f2615c8ad6d1892c1dda8c7ce06485912c4ad563865ce4d212d40ec3c317781500156de1d70e730775e7b71dcc12972b99
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.34.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.34.2.ebuild
index df664e759af5..df664e759af5 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.34.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.34.2.ebuild
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index df664e759af5..3eea110a0e53 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index c1b49601f82e..9301fc1dc059 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,8 @@
 DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
 DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
-DIST certbot-0.34.0.tar.gz 1346939 BLAKE2B db0d7bc716206ff9bebcf953b72e29f46e335209d70e518eeb11d944bab26e2fbe15c6bbe448861cbd71c744dfc22aa8cb54b96dfc5d15d497af8a91cfbc6e45 SHA512 24d4a58bcc220451532b1b7d1ddaa90ef773935ff65c2b06e121f044b5575d159555a757660abebd72ff4134a257394dbc99c981729d846d565c75f692317a30
+DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de
 EBUILD certbot-0.32.0.ebuild 1266 BLAKE2B 6cb82789b271eb23a993a091b7626e8dcf0e05e63c84e6f99c7ff0c9b4d7f0a00234593744119f7104183ff77757e1a4650325830309cc4f2c2b50fe9abf0573 SHA512 76e99c0a99ae6b2c9fa0e042b8ea9953a8e31d0e338cf1f54ee5af20e8cbb4924c89fdb86cd7f23909ce96763f32dc59f4086c5761c4c45267d49908f4965f83
 EBUILD certbot-0.33.1.ebuild 1358 BLAKE2B dd1f1d87864da2747a2ab9f043bc18a2a783827febfa1ed7d8a6ba2b2b3b51e6a11820840745f49dcf34dbbff1ceefa5de517e66ab698529a628e9f5e2ba3575 SHA512 fa59ee71d7f9b058667f705c18acd49b845988c316cf27e2881383f61d7f784193bfaa83c28472543a7115043c9778ae333a882bf77f7b64f82a8d6ed1708275
-EBUILD certbot-0.34.0.ebuild 1360 BLAKE2B b30e0c90eb19eed434cff29529847f7fa71b8b00c1d1db2ea06a619682b1a2de2e775c70d54bc999ce5cbeaa9ad902b097db6cbd2565397394e16d53e98a8456 SHA512 8f5a02f9594274a4c1360457e62b200acd54d0f2e2a05f7a577b4e44e30cc454d19e6e6e09c9811c7242a0b64580bf9538082a3623552fdebef277a61001365c
-EBUILD certbot-9999.ebuild 1360 BLAKE2B b30e0c90eb19eed434cff29529847f7fa71b8b00c1d1db2ea06a619682b1a2de2e775c70d54bc999ce5cbeaa9ad902b097db6cbd2565397394e16d53e98a8456 SHA512 8f5a02f9594274a4c1360457e62b200acd54d0f2e2a05f7a577b4e44e30cc454d19e6e6e09c9811c7242a0b64580bf9538082a3623552fdebef277a61001365c
+EBUILD certbot-0.34.2.ebuild 1360 BLAKE2B b30e0c90eb19eed434cff29529847f7fa71b8b00c1d1db2ea06a619682b1a2de2e775c70d54bc999ce5cbeaa9ad902b097db6cbd2565397394e16d53e98a8456 SHA512 8f5a02f9594274a4c1360457e62b200acd54d0f2e2a05f7a577b4e44e30cc454d19e6e6e09c9811c7242a0b64580bf9538082a3623552fdebef277a61001365c
+EBUILD certbot-9999.ebuild 1364 BLAKE2B fc049f9649de92130c0cc56eadfffc37953e5adb238cb2b06ab4eee90f2da4410f31d4c2a850549df74b3c471b718310b9b70135687bc4fb1240343850426e39 SHA512 d320f137873e85b0749f4f972ee1cff33935c21a475cdcb7953c758f384d1b67c16d2d181abb401666ba1d5fac976802b5dc525009e431c724277d7d5bc39d29
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.34.0.ebuild b/app-crypt/certbot/certbot-0.34.2.ebuild
index 261fd8251037..261fd8251037 100644
--- a/app-crypt/certbot/certbot-0.34.0.ebuild
+++ b/app-crypt/certbot/certbot-0.34.2.ebuild
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 261fd8251037..d1e115014c9a 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/dehydrated/Manifest b/app-crypt/dehydrated/Manifest
index ce40df596773..76b68a091c39 100644
--- a/app-crypt/dehydrated/Manifest
+++ b/app-crypt/dehydrated/Manifest
@@ -5,6 +5,6 @@ DIST dehydrated-0.6.1.tar.gz 76693 BLAKE2B 5ecca2942aedc024e87e7b5aac05d836adbbc
 DIST dehydrated-0.6.2.tar.gz 77819 BLAKE2B 5a1cc097b42d5c4d9513b5a13c86f0b101b3442fb6cfbe54563357095619764724a2158e050a8e8b13a60a9effe83a5339ec647ef5a93622c8d63f1fcdb72be8 SHA512 97cce8f4936482d6b3a7d4227d8735b1c91f3b6cb7c728669a4a5139605932a88171c7e5d715d269782f260454d06ee95a0f6cd2735521e22c4f69bdc3e38f86
 EBUILD dehydrated-0.4.0-r3.ebuild 1554 BLAKE2B 3fbd4b2d0eda6858f085d2644709897faefbfab26855e37682b7f45a4d262bf80c8a72f8d757df94179f72b7b9a94e7b163cdfcde7d8a72f5e5cf655e05b2e4d SHA512 619e37279c8f7070d2e74f15033d7b6d098479b1837d73cdc9789b6a810160643b2561f268a63acc712abad365ee645150c76bd8c6f5c35e75d734dd3ec280c4
 EBUILD dehydrated-0.6.1.ebuild 1569 BLAKE2B 543ed28a4ff57bc5306f939e4ce0131af9434a437b867fee4e28ca4b0fec39478a370d97d0e3eec02b169c72e405170ad9d89a8f733a7a6f7936d9a49ae7b4a9 SHA512 9d5f30868d67e3e8bc8968142e5f27cb39aa5ff71897c993c15af598d5caf33329ae85947befda40a956ad7c10f78853d3269cc54f908885466cea47680eabec
-EBUILD dehydrated-0.6.2-r1.ebuild 1639 BLAKE2B f9cca3f93e60645ebd6bc1e3edf167ddd26aa87098a0a777a4efd204f66ccb14eb9820de587f5d0feff8316b0add52a4e613a39f291cb10681c8a5206e97bfb2 SHA512 03bb4eb275bed3ad1d43bfdeda4de82fe2de19716500cb289fa01443996dac217696b5a0326b8b28288b41e6d62460a0d64222c5c8b0c10a1d2c2c4d2a7ba177
+EBUILD dehydrated-0.6.2-r1.ebuild 1637 BLAKE2B 566e689ada4d1d02cc4144a56aa3fec70919f671ccc7d923e331e123dd5f4873163f215e7606e528f5679db4b6247837c7c29fd5f696b2cba36ab8de9935f1a8 SHA512 0d604f788a1fd37f4c32d0dc5d34fb71c9639a2453105a860918cb961409b8e67bfde7bdadb329fe6130ba8bfae1f95332c611c996918db6905b8eea4f64c1b4
 EBUILD dehydrated-0.6.2.ebuild 1569 BLAKE2B 543ed28a4ff57bc5306f939e4ce0131af9434a437b867fee4e28ca4b0fec39478a370d97d0e3eec02b169c72e405170ad9d89a8f733a7a6f7936d9a49ae7b4a9 SHA512 9d5f30868d67e3e8bc8968142e5f27cb39aa5ff71897c993c15af598d5caf33329ae85947befda40a956ad7c10f78853d3269cc54f908885466cea47680eabec
 MISC metadata.xml 531 BLAKE2B dcd597fde3bafe2970275a99609546b1a2ef764729cd410a62389a29f8ce95e269f2155970503e041c937a28026c3d70763c86f492c4a8a3478026125eb5eecc SHA512 fe42f3b7b8ca0d2f18d389348599f468eaa80928a05fa7151bae23f5dd73d260fca6ebd3a701eed450b639438e44ca038aef420732e92ab9ddc672c0022bfbdd
diff --git a/app-crypt/dehydrated/dehydrated-0.6.2-r1.ebuild b/app-crypt/dehydrated/dehydrated-0.6.2-r1.ebuild
index c277dcec96d4..10c0e84728bb 100644
--- a/app-crypt/dehydrated/dehydrated-0.6.2-r1.ebuild
+++ b/app-crypt/dehydrated/dehydrated-0.6.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 x86"
 IUSE="+cron"
 
 DEPEND="cron? ( virtual/cron )"
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index 9f94ea55286f..d618940b1dd5 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -1,7 +1,10 @@
 AUX 1.7.0-Make.rules.patch 296 BLAKE2B ca12dbe2f0bb60cffcbe2646a99f421e1f7f9d3b9eab0c96481cbbcfe064efc81afb25e8819746051e3f47b325eb97d213b7ebf95df60a195a5d16d68332f42d SHA512 a8d6245b09e80e2c9082589e62c2687234ee7838d19255e07aadfd05ddffdb1817e38eac434e71d5f0e19b7f9a88a51126349ae4aa324a634769050dbf433f0d
 AUX efitools-1.8.1-libressl-compatibility.patch 495 BLAKE2B 8c4aa46f422012b36601cac7d797a7e0de7ca3bc59d5799f1a63b6f6a8ac0a2edf87b50ecc4bc9eba21778ceab3e4fab23280dde92b2ce6e8294268a2886f720 SHA512 27a5331f00fc3d8f18187120940b6e46c6267c0478663378a28c5beb80a761422162e002836a4f0db096a6386cbb2e2c5e328e9355638aab82b9556c992b9e0f
+AUX efitools-1.9.2-libressl-compatibility.patch 495 BLAKE2B 8c4aa46f422012b36601cac7d797a7e0de7ca3bc59d5799f1a63b6f6a8ac0a2edf87b50ecc4bc9eba21778ceab3e4fab23280dde92b2ce6e8294268a2886f720 SHA512 27a5331f00fc3d8f18187120940b6e46c6267c0478663378a28c5beb80a761422162e002836a4f0db096a6386cbb2e2c5e328e9355638aab82b9556c992b9e0f
 DIST efitools-1.7.0.tar.bz2 96042 BLAKE2B b0042df906282d878b1400c359c1eece24588f5df7ab753b62f5f0b95e97467cfaa17e04a2ef40a7ec85155c4d13bd438dd94471e0ec98ab23030dd54e7d4214 SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb
 DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a
+DIST efitools-1.9.2.tar.gz 116037 BLAKE2B b3540932eb112e362fd0eed47090360603807dcaec8c6a10058618f8252eeb5dcbbd703d313cb6fadae62c1312815080cf2c77fc86f9dfc9f9afca24ad97f584 SHA512 77e0ad7e865814ed388ff6daabe0f4b49ba51672bf2cbb98b7905e209cbd28f9ede2f73213ce45af8a978c1e67dba24ec88a1188661317cc22317b47e575cde8
 EBUILD efitools-1.7.0.ebuild 787 BLAKE2B 9c2daade67b20bb4fb7b38413ff174695a40889e509c0828f68fc8d1eb1a0d0c7ed2cdc32d05608cff53317c4ca4db3133ec041cb86ffdac2b1d1287c00c3043 SHA512 66b40139afd0f071db68891152a25c9d6993be948e100817b26eb3fa547d09580bd4e9bfff8916c58a7f2bd38bfe4221edd1452d58a59e251629f5689f88740e
 EBUILD efitools-1.8.1.ebuild 1349 BLAKE2B ffc55485773daf9bfab8069f8c6b1cce41daef3bcd6d5df82868aeec8e0c8fc83f69b2b4cf9565b66f8e03ada9042637902d54516772ff850d79c17423c595b4 SHA512 e686d262e3973b1fe727d960d3b97bb284b1d3795644a2dccb89204b377db0e30d2b435174ed5d622f00da2256994a4c997fe92fdc2954dfe1964d25a1ab0ef5
+EBUILD efitools-1.9.2.ebuild 1346 BLAKE2B 15af826971a8805c6c106e501a3cc8272225e6a845423a5650561893edbf8ca7ccc9508133b4cdd74b017e038de661338e1b38764196395f908aa6462b31289e SHA512 c57ea1a4632e51e08c5504a82309d09c024af21807f04c9cda4676e27e6b1537848ddf604c1fd624b7cfcc4bd13bdfa083fc4b81ebc55d336f23213647cb7d05
 MISC metadata.xml 217 BLAKE2B 42ce05c77b1d33a62b5cd9e26a0dbc801edf537bd1482da9f3680a430e3714cd9adea45649fd6bec858e3de1863d0c855451ae8fe1e4b8aa2c6b2ae9a8e343a3 SHA512 b9ca3681462c901c78bdc3ee840596fb6f5151d6b555abd1b74c570fa83e9b5b964cc0988538c892bbf70d2963add9d39af56a6fe353ca7641a6f3aede49be82
diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild b/app-crypt/efitools/efitools-1.9.2.ebuild
new file mode 100644
index 000000000000..d7fc14afab88
--- /dev/null
+++ b/app-crypt/efitools/efitools-1.9.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="libressl static"
+
+LIB_DEPEND="!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+	libressl? ( dev-libs/libressl:0=[static-libs(+)] )"
+
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	sys-apps/util-linux"
+
+DEPEND="${RDEPEND}
+	app-crypt/sbsigntools
+	dev-perl/File-Slurp
+	static? ( ${LIB_DEPEND} )
+	sys-apps/help2man
+	sys-boot/gnu-efi
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/1.7.0-Make.rules.patch"
+	"${FILESDIR}/${P}-libressl-compatibility.patch"
+)
+
+src_prepare() {
+	if use static; then
+		append-ldflags -static
+		sed -i "s/-lcrypto\b/$($(tc-getPKG_CONFIG) --static --libs libcrypto)/g" \
+			Makefile || die
+	fi
+
+	# Respect users CFLAGS
+	sed -i -e 's/CFLAGS.*= -O2 -g/CFLAGS += /' Make.rules || die
+
+	# Respect users LDFLAGS
+	sed -i -e 's/LDFLAGS/LIBS/g' Make.rules || die
+	sed -i -e 's/\$(CC)/& $(LDFLAGS)/g' Makefile || die
+
+	# Run 'default', to apply user patches
+	default
+}
diff --git a/app-crypt/efitools/files/efitools-1.9.2-libressl-compatibility.patch b/app-crypt/efitools/files/efitools-1.9.2-libressl-compatibility.patch
new file mode 100644
index 000000000000..876baae16f81
--- /dev/null
+++ b/app-crypt/efitools/files/efitools-1.9.2-libressl-compatibility.patch
@@ -0,0 +1,11 @@
+--- a/cert-to-efi-hash-list.c	2018-04-21 20:59:24.814748503 +0200
++++ b/cert-to-efi-hash-list.c	2018-04-21 20:59:51.868581307 +0200
+@@ -135,7 +135,7 @@
+         X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);
+ 	unsigned char *cert_buf = NULL;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	int cert_len = i2d_X509_CINF(cert->cert_info, &cert_buf);
+ #else
+ 	int cert_len = i2d_re_X509_tbs(cert, &cert_buf);
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 83d1d5776afe..7da7961f5234 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -3,5 +3,5 @@ DIST gcr-3.28.0.tar.xz 1329044 BLAKE2B b35bca9b62605c4e0c3d71604ea5e6b7cdd97bb32
 DIST gcr-3.28.1.tar.xz 1334896 BLAKE2B e7035dd0ac5ef9e9b0898e3e4512768ec7cb548cf0ec4ace5a4f0f9a63d3015f8a041bc6f0a0c990c1666eb92c047eab4c19338a8ccf2d8aa9b11830dbd9d5c5 SHA512 ae36c39584d6bc2ba9d86de8bc71eac21fb3251b966ab1eddf467d01ed5789ba6e6597c83ea2ed9403e632893e7c7cb6c17e04878d726b72528af9199bebb3da
 EBUILD gcr-3.20.0.ebuild 1851 BLAKE2B 532e60ee150d6886ea24abda75d29b90acc66f7e055e5941a8c53293dc5491e3850729bc68b8a9f7d5658e0a2b5dd97dc3c0e1a75418fdbf132e0c6b4dbbde29 SHA512 f0c952bff3d6f66c8d75a0671cd886ac0611bd60f7b8a3b29dc71798d545baee9f2e2842ac76a87e34acb05fb200a472fc3bf58d4c0201e5fbaf60bb96efcbbe
 EBUILD gcr-3.28.0.ebuild 1892 BLAKE2B 4dbe4a19c0da7470fe68daa6191e1469fbc192dfd122dc2581340ab54e795289fe8d8ace674d159c851dd0da00fe544587a189c64ad7d50345f4a4b0245b4597 SHA512 c9d40cbf32c1570a9b152a26db32dcf1888945713fdefb3c0bc46add3c5e04d0bf7f4ac62a38e673265380d04b8a7428f511560390c0f756bab44abfaf989fb6
-EBUILD gcr-3.28.1.ebuild 1901 BLAKE2B 635931670d41e19328bec1a51c2149903317da498ab7026f03258ae3e11bf3775c36687d7e5dadf1fcdc0ddaf581f08ac4d9350717cc6ef454a2a87f3ebc73dd SHA512 f6b599ab6b372865017cbcb710c9a0208492b78c34cb6772be973e2ebfbf954eed638e988a31e79f9fd0e81ccdd8749b656e2f9af60c6b59bb6f033307fa6f65
+EBUILD gcr-3.28.1.ebuild 1899 BLAKE2B 2952bd953ab6fba7ef70aecb3d965827107132c6f4a1b59c2b44487a6ab34eb3db87cf77c8fb38c9ddd4bd97af509b20b9f2b2ccdef44125397f2bf6d1a5f930 SHA512 2fe157ddfee0e8db223ef4275d5113b6857a45a14f983c9d6e0e99a00dd025447c96eba5add75f16077145efe6efacf24e201a577fb13b5c8961b8554cefa7a3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/gcr-3.28.1.ebuild b/app-crypt/gcr/gcr-3.28.1.ebuild
index 1dd1ec804c67..25f9d574cd2e 100644
--- a/app-crypt/gcr/gcr-3.28.1.ebuild
+++ b/app-crypt/gcr/gcr-3.28.1.ebuild
@@ -16,7 +16,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index 1c0945fa9417..40bab3734fba 100644
--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@@ -1,7 +1,7 @@
-DIST glep63-check-6.tar.gz 61318 BLAKE2B 9310a70556deabf90003c154c326480e7a5fb58992bf79201100c21fbbeb17ebfdb560d861586d1c206a8d4ed3e64500a8eca4d99dacd072dce121736cdb2d3e SHA512 f0729683095222f60243923bcb7d9c1b984eb10cb0d8a0da2ec756b40a11c3f4f3de466fa533a66d4f645a2de09137a12a47eda5e80d7d5d562b0926a30b1a72
 DIST glep63-check-7.tar.gz 66680 BLAKE2B 33c332b6f90a2b9bcecc174c2a0cdd4e99f3e03d6b5c663b3477b486a96e03116612e8d63ead29d7036c115e0a21dfcf952d1085d23b1bce966fd784f1c12f23 SHA512 7990f2c926f23a92164b9aaa8da549cfe8194b7fe864f8787daf0e24d4dd7812cc917f0d5beea0355c14c0cf737a9ea2351a570da39a19a0dfc7bcd42e0cac05
 DIST glep63-check-8.tar.gz 67982 BLAKE2B b6f785e7f589521f719c4bbf6452bd74c1926c24889be404680b3edefb88b335e52f991e63c3fa33ee3a0a59b5112d01b6ab62785c3074d21b4fce473cb3b17f SHA512 1063889290820d4581a11de7a74058c85889864846de635581b4d9f5b46378d64acfc8c41827de1e54276dc941e8d08a59c86e06e8090795c192437c8c39731d
-EBUILD glep63-check-6.ebuild 658 BLAKE2B 3e742acbd0fdde1670de3348739b10f70b0ccee4b50615ddd3b49225847c5c2e2454652ca8748330e3adac7f9079ea7bb272b3160f4b8daa14a4113fd4793265 SHA512 470627606b86e27d4fb20e6f0281dc13db43e193ae4f3c2d71da21d949d91253afdbc5a375fd36f8505bfca210a86d733663c2ac4dd64785da63be75c73542de
+DIST glep63-check-9.tar.gz 73445 BLAKE2B cd229065da9a4663491a891787d2a9e719cd9d61ea5974393199ca418413e7e1c6b73a3146577b26029ceb3302f430ed1051c9d050278b098b18407e95c1cac3 SHA512 86c49ffe2b8dde3735b85ff4808862c460b1e832fa9c3fca4fc2ea776d314c29ed2442adef2e1dbca1cec81b6ea29bbb417b123306602dfaa611b5153dddb7ac
 EBUILD glep63-check-7.ebuild 658 BLAKE2B 3e742acbd0fdde1670de3348739b10f70b0ccee4b50615ddd3b49225847c5c2e2454652ca8748330e3adac7f9079ea7bb272b3160f4b8daa14a4113fd4793265 SHA512 470627606b86e27d4fb20e6f0281dc13db43e193ae4f3c2d71da21d949d91253afdbc5a375fd36f8505bfca210a86d733663c2ac4dd64785da63be75c73542de
 EBUILD glep63-check-8.ebuild 660 BLAKE2B cae7887511523f495f88aa4f4a2a3178c6b9437aaa51e14ae42a3611de67f64844a0fce2f2c102d53ebbb646a154a7119d929d4e6e5916659e771f62cee835d0 SHA512 481b395c429eedc70bb83e2bbe30298201a8d7981bbf6798ab7f8360597f2b4c42204748732caf3f73ca9e2d362d82a7564a207c406dfb9aa05a2af1bd5a9328
+EBUILD glep63-check-9.ebuild 660 BLAKE2B cae7887511523f495f88aa4f4a2a3178c6b9437aaa51e14ae42a3611de67f64844a0fce2f2c102d53ebbb646a154a7119d929d4e6e5916659e771f62cee835d0 SHA512 481b395c429eedc70bb83e2bbe30298201a8d7981bbf6798ab7f8360597f2b4c42204748732caf3f73ca9e2d362d82a7564a207c406dfb9aa05a2af1bd5a9328
 MISC metadata.xml 513 BLAKE2B dc5036a6556ebfefbbfc1ad01f436b9793c5c0c51e7cbda49ee896ff364a30761f92ec63531317b4bd55bb9cc018d6ee62d07776a61ba75d7d1245c3d0c1339a SHA512 44aac823dedeb848696d166e28d151449b59d30a7dd87a0c2c339c044e2704908a1882e3b818ad7007822b5fd2efc52ad81564fad953862851b44480d61642fe
diff --git a/app-crypt/glep63-check/glep63-check-6.ebuild b/app-crypt/glep63-check/glep63-check-9.ebuild
index 4f614942037d..13996cabd8a0 100644
--- a/app-crypt/glep63-check/glep63-check-6.ebuild
+++ b/app-crypt/glep63-check/glep63-check-9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mgorny/glep63-check/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/app-crypt/gpa/Manifest b/app-crypt/gpa/Manifest
index 4c9578b6c8a4..849f7d29e487 100644
--- a/app-crypt/gpa/Manifest
+++ b/app-crypt/gpa/Manifest
@@ -1,5 +1,3 @@
 DIST gpa-0.10.0.tar.bz2 782455 BLAKE2B ef663432cbe20fb5c543696627f448b3970099b6a0f8f68b57e3d87af03550597adcfe4c27c2774d1f278cfc9d07a089652f42ef4f8c3cbc0192b645c465ac0e SHA512 87004fb0806e76012bc194f95afe9ef6044aec890b26e845f45c314e1bd8864f056ba5e32f9ef2e15b24b50840235e6e548a5e3006b255b4f1c20e0fd7710a3b
-DIST gpa-0.9.10.tar.bz2 763239 BLAKE2B 60763d63c39ca73c5f36d569e27388650060989386df10a867b0235d1b37ce3a46f1526668a1975b9e8c9ebd1c98ffaedab0fe92e55c80787a24dd412939e6a4 SHA512 ff81a78e6b7c46307af6648a2e691a5e8185db229ccc5e259f2c3c05a3c86b337dde492069e7e9510c155fbc64d71cc4e2f109a00400bfb7560c558b753c42a9
-EBUILD gpa-0.10.0.ebuild 819 BLAKE2B db0ec278f2a040c4d98d4769f62c5284b62ca18025366762c74239bc0c040ecd05e43964686bc18b851cb4fa36647c0ca6d072f6f41214278c9c70fba0a1d2ba SHA512 468b09d09a745fe3ca603c29308e4fe8365ae13b3d154d87cf21bb20e350829854a594851a7dc7bd95246a5bc2db29e3b083a29b89e6da168ba53d98a6299e9d
-EBUILD gpa-0.9.10.ebuild 814 BLAKE2B 0dfd28852ffb2c119a891a4061711c1cfb1685d252c429d39cd1609e235e3213b766a83f7bf2ce1ad1299f7d8dc7656f3499494e8d09c1e7173e8245efc236a4 SHA512 4584ec11fe1c2bc335a68fa51eeed0f006e2e1f3b6add9af14d53ef5ac06c5931a2facd5735bc0df4798ae75ec7005acbbcdf3cd7ae5758b26059a8b37c8b220
+EBUILD gpa-0.10.0.ebuild 817 BLAKE2B b22b22370bf02d4cadbf7cce92ea82998c5038a76696cc054c06567ce895ad210b60ab6941007f4330e6506c8b43aac0dc82c046684649b79b64fb2c52b29635 SHA512 7d4c2fdb650842c1548bf23841773e5a0d6b51a8f6c43cf87e9fcf4bd29e1803d92ebfb06272bbbb6eea5c29f71f3daed5d21fa670c1eed87f4ad6e48917aecc
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/gpa/gpa-0.10.0.ebuild b/app-crypt/gpa/gpa-0.10.0.ebuild
index e4901e04125f..6dc36a184f1a 100644
--- a/app-crypt/gpa/gpa-0.10.0.ebuild
+++ b/app-crypt/gpa/gpa-0.10.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-crypt/gpa/gpa-0.9.10.ebuild b/app-crypt/gpa/gpa-0.9.10.ebuild
deleted file mode 100644
index c75d84bdf0b1..000000000000
--- a/app-crypt/gpa/gpa-0.9.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG"
-HOMEPAGE="http://gpa.wald.intevation.org"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="nls"
-
-RDEPEND="
-	>=app-crypt/gnupg-2:=
-	>=app-crypt/gpgme-1.5.0:=
-	>=dev-libs/libassuan-1.1.0
-	>=dev-libs/libgpg-error-1.4
-	>=x11-libs/gtk+-2.10.0:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-	sed -i 's/Application;//' gpa.desktop
-}
-
-src_configure() {
-	econf \
-		--with-gpgme-prefix=/usr \
-		--with-libassuan-prefix=/usr \
-		$(use_enable nls) \
-		GPGKEYS_LDAP="/usr/libexec/gpgkeys_ldap"
-}
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 373fcd65c83d..28ab34288fa4 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -6,9 +6,14 @@ AUX heimdal-kdc.confd 130 BLAKE2B d0cd1667fd48f4fa4fe3ea995e810919225c0976e76818
 AUX heimdal-kdc.initd-r2 434 BLAKE2B 2790f2d0732c8ff6d3c0dd0917322f33a1215d523db386465af4eea64b973674abd85ab27e83858d38726711f81ed9f72414de34d4a578f47cf3e34b6afe74ac SHA512 1698a29ff23aef6bcc83153076036297639f38e5b42f12a3f59324ecce3fe7483f99f84e2bc88d27f010d07ebec4f2758d0249a9cb5bd62be40c3e6cc79353c1
 AUX heimdal-kpasswdd.confd 148 BLAKE2B 74c70bf236789e8c87bfd928d9108f181ad31c254b02e4cf9b45ba925a2169d8ccb7bd59999f5e98f265020f0a5cffd03ac88ad39aedf0c305346821d9688afb SHA512 198d8f219abdd349213d26119e7cc343956981a5cb7d031186c81cb1a0b3f017097f4a429481089787b1cde6f8f013a8ee3909f6807f44b51531ac19a7a3a17e
 AUX heimdal-kpasswdd.initd-r2 448 BLAKE2B e9280b18c06ad50579eceec52fe7bb83630b868e5b3ec16bc6ba0bf80c04f303fb8405cb6a728be79052729076de4df4b85e08277198e75d3c0d3093c464680e SHA512 e7de18a197ec6d56fac61c3d014c9f7d5cc10e4ee6c7ee432f9e4658ad5feee7be6c26d175755863321bf927e082e9da34a576647eaa428c98cf80f9eaa99176
+AUX heimdal_build-headers-before-use.patch 1128 BLAKE2B fa8f4a481304b619797a20dce8a8ac9f912d7f3f3402980da35259839fa9ecea0a84b1fb04dfee93af64699beefcdd9b0cedaa27c0323a568861307fa53ef3cf SHA512 df3257627300456afe4bd4a3a18bff5641cf1f0a9d1f0e74716b46a45ad0e58194ee284930cc1f856e7b74eecd6a590d1a6ef93d40a4b275d899856b46e14128
 AUX heimdal_disable-check-iprop.patch 577 BLAKE2B 1bb2be5bfd172988a00fc71c0429a0948437f20228aec0508788de30fe657765dfe3be3955680a8e006d4afdc1396c7810d26775bae936d72f927e14e8dbd46f SHA512 c3a337d7683dba271df13cad9d5ea716449a0a8ed2b178e15ee1e8caf53f28774f96cff92b652af952a9d1b45c0afc6607fa16c115b80c87e90db9b974bb9f9e
+AUX heimdal_fix-db60.patch 443 BLAKE2B d89892570100dcc4a9b5bacd672cd28ce284ae9ad753189addf11359a01236a03280eb605ff136b290dcc379d182741d924e2392fc05642520278af8ecc310f7 SHA512 b6e80678801eaeee8c1aa2ec317a80b58cad3ca181aad14136cf352c55246ae36a43344b48a01bc9fc19c9ecfa383d9ab10892534ea60d25e36255fa049523a7
+AUX heimdal_hcrypto.patch 1522 BLAKE2B 3a66fe288a7bede24a6aa124fde058d5ea891a4f829566b3bccfb1d0800d7f9f076c2958ec756821f2b5f2d4249a59d4c9bb320ffa07c3a0e14533a013dbebe6 SHA512 6427258ba47c28415cf2b02e483ab2b29670cc803a7581a4d0102be14f5a102fab478b7c2735436603e44fd6e2d34fa2bbcd0dfc7cf15eca575fe424356baf99
 AUX heimdal_tinfo.patch 711 BLAKE2B 730ef4b1ba79d80c7257d1bd04783584cf616b2e51d6028fe3160dfdc113b6243c7af8c116ff969de439ebb79bab9091f8e5d6e9037c2b48541e6cbc83ba1026 SHA512 b4c63c9e945b914009569e62fd53229032ffaecde11dc4d02a89d5ba65f2c28020d43af8f2c26d87e2b383ba6dd3c3f4c4b69529471bc1928b45a9b5c437958d
 AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16bdf6f554c585572ed9d3835bed976c8953fc92d0f42270c6a0767e943ec5efa5b79f6f4cf89 SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38
 DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84581b9c3bc8d42c328e5f878ce24c5596c5a1e3fbca786a71be04984068efbb817f7336135056d1feae38895758f SHA512 6d1ad77e795df786680b5e68e2bfefee27bd0207eab507295d7af7053135de9c9ebb517d2c0235bc3a7d50945e18044515f0d76c0899b6b74aa839f1f3e5b131
+DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 EBUILD heimdal-7.5.0.ebuild 4334 BLAKE2B 33303601d32d3b2c6f54a3681012f854b6addc55b09c65e6d0cea74e8ac91c12de09624e37f3d4f9933c54dbe8de3cf7f258bb99d33d26a25a0c280288777b44 SHA512 6d40e8a30e74b95c918e7ee5bf10b3d017178bd4775bba707ff2dfc02d208c121426b66ebdbb50df09a96f4caa5c55b35f2e8d53cad9eac4f8ebf46b0f6de266
-MISC metadata.xml 638 BLAKE2B f886a9862a4143b2c9f2a2e5af79c6ce72d23e883a2285f16ad22e61c8acc301f8a838b2fea65f42168edfda9a8652a420c01dc34482123d0ec6ccc6ef0a5ce9 SHA512 1fb671028d7d798c9a6e0be09e77b94a2d7f25598f6d9238f1b7897c9fcd68bed1d3fe84e84d98c1f276979cf782fedb13f1ea44ad876c4658ce1f142aecdf5f
+EBUILD heimdal-7.6.0.ebuild 4584 BLAKE2B ff8eae26b4d710214f4f57a2c519b1f86d37d9ca9ea479458cee91480c09ea5bb4b4ed5ef5e73cffd53de039d80fd9af106a321e86e98cabbeef114ddd93fb64 SHA512 9bcb272d136ec85950cb3e8589ca95be0caa23a432c719460b146e1487ae4384f984f9f584e47af6261b1d3e30f5ff022cbcb54f492a1ff92cb6b6e71f147c28
+MISC metadata.xml 722 BLAKE2B 9ec2bb074bf4932b0bb2f949eb3c33c8ed8b82305d6641a6954084120c658005cecc2cac57ad85a1df520f5bfd115deef57f80d874ba850d857a813b5a87c139 SHA512 5f3c28c222eb668e3c1d3b7fe24ae3622c82f94b6008a4c3458aa76afac9508d6e7f150de0f06e4845a5b0653ea04112fe0c2b421f199b5feb9ef771ab0b0b28
diff --git a/app-crypt/heimdal/files/heimdal_build-headers-before-use.patch b/app-crypt/heimdal/files/heimdal_build-headers-before-use.patch
new file mode 100644
index 000000000000..9460e3dcc245
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_build-headers-before-use.patch
@@ -0,0 +1,29 @@
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906623
+
+--- a/lib/hx509/Makefile.am	2019-05-16 08:59:34.326758842 +0300
++++ b/lib/hx509/Makefile.am	2019-05-16 08:58:43.140804423 +0300
+@@ -147,8 +147,8 @@
+ 
+ $(ALL_OBJECTS): $(HX509_PROTOS)
+ 
+-$(libhx509_la_OBJECTS): $(srcdir)/hx_locl.h
+-$(libhx509_la_OBJECTS): ocsp_asn1.h pkcs10_asn1.h
++$(ALL_OBJECTS): $(srcdir)/hx_locl.h
++$(ALL_OBJECTS): ocsp_asn1.h pkcs10_asn1.h $(dist_include_HEADERS)
+ 
+ $(srcdir)/hx509-protos.h: $(dist_libhx509_la_SOURCES)
+ 	$(heim_verbose)cd $(srcdir) && perl ../../cf/make-proto.pl -R '^(_|^C)' -E HX509_LIB -q -P comment -o hx509-protos.h $(dist_libhx509_la_SOURCES) || rm -f hx509-protos.h
+--- a/lib/hcrypto/Makefile.am	2019-05-16 09:02:28.154602045 +0300
++++ b/lib/hcrypto/Makefile.am	2019-05-16 09:02:10.600617878 +0300
+@@ -102,6 +102,11 @@
+ 
+ TESTS = $(PROGRAM_TESTS) $(SCRIPT_TESTS)
+ 
++ALL_OBJECTS  = $(libhcrypto_la_OBJECTS)
++ALL_OBJECTS += $(test_rand_OBJECTS)
++ALL_OBJECTS += $(libhctest_la_OBJECTS)
++$(ALL_OBJECTS): | install-build-headers
++
+ LDADD = $(lib_LTLIBRARIES) $(LIB_roken) $(LIB_openssl_crypto)
+ test_rand_LDADD = $(LDADD) -lm
+ 
diff --git a/app-crypt/heimdal/files/heimdal_fix-db60.patch b/app-crypt/heimdal/files/heimdal_fix-db60.patch
new file mode 100644
index 000000000000..7f012007e1ed
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_fix-db60.patch
@@ -0,0 +1,11 @@
+--- a/lib/roken/ndbm_wrap.c	2016-12-20 17:23:06.000000000 +0300
++++ b/lib/roken/ndbm_wrap.c	2019-05-17 10:00:00.107905769 +0300
+@@ -175,7 +175,7 @@
+ 	return NULL;
+     }
+ 
+-#if (DB_VERSION_MAJOR > 3) && (DB_VERSION_MINOR > 0)
++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR > 3 && DB_VERSION_MINOR > 0)
+     if(db->open(db, NULL, fn, NULL, DB_BTREE, myflags, mode) != 0) {
+ #else
+     if(db->open(db, fn, NULL, DB_BTREE, myflags, mode) != 0) {
diff --git a/app-crypt/heimdal/files/heimdal_hcrypto.patch b/app-crypt/heimdal/files/heimdal_hcrypto.patch
new file mode 100644
index 000000000000..ff3228d4973a
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_hcrypto.patch
@@ -0,0 +1,45 @@
+From 329918bd671c89de6e1c2874baba48d658a89a10 Mon Sep 17 00:00:00 2001
+From: Damir Franusic <df@release14.org>
+Date: Sun, 9 Dec 2018 19:53:58 +0100
+Subject: [PATCH] hcrypto: fix include path
+
+---
+ lib/hcrypto/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/hcrypto/Makefile.am b/lib/hcrypto/Makefile.am
+index 469176b6c6..195117d174 100644
+--- a/lib/hcrypto/Makefile.am
++++ b/lib/hcrypto/Makefile.am
+@@ -9,7 +9,8 @@ AM_CPPFLAGS += $(INCLUDE_openssl_crypto)
+ endif
+ 
+ AM_CPPFLAGS += -I$(top_srcdir)/lib/hx509 \
+-	       -I$(srcdir)/libtommath -DUSE_HCRYPTO_LTM=1
++	       -I$(srcdir)/libtommath -DUSE_HCRYPTO_LTM=1 \
++	       -I$(srcdir)/..
+ 
+ lib_LTLIBRARIES = libhcrypto.la
+ check_LTLIBRARIES = libhctest.la
+From 572a6fd7ac41e9210ef3eb765fe7da4ec8a94bb2 Mon Sep 17 00:00:00 2001
+From: Luke Howard <lukeh@padl.com>
+Date: Mon, 24 Dec 2018 02:21:32 +0000
+Subject: [PATCH] hx509: fix dependency, hxtool requires ASN.1 headers
+
+---
+ lib/hx509/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/hx509/Makefile.am b/lib/hx509/Makefile.am
+index b58deb3e37..09643c43a0 100644
+--- a/lib/hx509/Makefile.am
++++ b/lib/hx509/Makefile.am
+@@ -164,7 +164,7 @@ hxtool-commands.c hxtool-commands.h: hxtool-commands.in $(SLC)
+ dist_hxtool_SOURCES = hxtool.c
+ nodist_hxtool_SOURCES = hxtool-commands.c hxtool-commands.h
+ 
+-$(hxtool_OBJECTS): hxtool-commands.h hx509_err.h
++$(hxtool_OBJECTS): hxtool-commands.h $(nodist_include_HEADERS)
+ 
+ hxtool_LDADD = \
+ 	libhx509.la \
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
new file mode 100644
index 000000000000..8f46bd07e4e4
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+VIRTUALX_REQUIRED="manual"
+
+inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic
+
+MY_P="${P}"
+DESCRIPTION="Kerberos 5 implementation from KTH"
+HOMEPAGE="http://www.h5l.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp +pkinit selinux ssl static-libs test X"
+
+CDEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+	)
+	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
+	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
+	lmdb? ( dev-db/lmdb )
+	caps? ( sys-libs/libcap-ng )
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
+	afs? ( net-fs/openafs )
+	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXt
+	)
+	!!app-crypt/mit-krb5
+	!!app-crypt/mit-krb5-appl"
+
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	dev-perl/JSON
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	>=sys-devel/autoconf-2.62
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/krb5-types.h
+	/usr/include/cms_asn1.h
+	/usr/include/digest_asn1.h
+	/usr/include/hdb_asn1.h
+	/usr/include/krb5_asn1.h
+	/usr/include/pkcs12_asn1.h
+	/usr/include/pkinit_asn1.h
+	/usr/include/rfc2459_asn1.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+PATCHES=(
+	"${FILESDIR}/heimdal_disable-check-iprop.patch"
+	"${FILESDIR}/heimdal_tinfo.patch"
+	"${FILESDIR}/heimdal_hcrypto.patch"
+	"${FILESDIR}/heimdal_build-headers-before-use.patch"
+	"${FILESDIR}/heimdal_fix-db60.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-kcm
+		--disable-osfc2
+		--enable-shared
+		--with-libintl="${EPREFIX}"/usr
+		--with-readline="${EPREFIX}"/usr
+		--with-sqlite3="${EPREFIX}"/usr
+		--libexecdir="${EPREFIX}"/usr/sbin
+		--enable-pthread-support
+		$(use_enable afs afs-support)
+		$(use_enable gdbm ndbm-db)
+		$(use_enable lmdb mdb-db)
+		$(use_enable otp)
+		$(use_enable pkinit kx509)
+		$(use_enable pkinit pk-init)
+		$(use_enable static-libs static)
+		$(multilib_native_use_with caps capng)
+		$(multilib_native_use_with hdb-ldap openldap "${EPREFIX}"/usr)
+		$(use_with ipv6)
+		$(use_with ssl openssl "${EPREFIX}"/usr)
+		$(multilib_native_use_with X x)
+	)
+	if use berkdb; then
+		myeconfargs+=(
+			--with-berkeley-db
+			--with-berkeley-db-include="$(db_includedir)"
+		)
+	else
+		myeconfargs+=(
+			--without-berkeley-db
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		emake -C include
+		emake -C lib
+		emake -C kdc
+		emake -C tools
+		emake -C tests/plugin
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
+	else
+		emake -C include DESTDIR="${D}" install
+		emake -C lib DESTDIR="${D}" install
+		emake -C kdc DESTDIR="${D}" install
+		emake -C tools DESTDIR="${D}" install
+		emake -C tests/plugin DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog* README NEWS TODO
+
+	# client rename
+	mv "${ED%/}"/usr/share/man/man1/{,k}su.1
+	mv "${ED%/}"/usr/bin/{,k}su
+
+	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
+	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
+	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
+	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
+
+	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
+	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
+	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
+	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
+
+	insinto /etc
+	newins "${S}"/krb5.conf krb5.conf.example
+
+	if use hdb-ldap; then
+		insinto /etc/openldap/schema
+		doins "${S}/lib/hdb/hdb.schema"
+	fi
+
+	if ! use static-libs ; then
+		find "${ED}" -name "*.la" -delete || die
+	fi
+
+	# default database dir
+	keepdir /var/heimdal
+}
diff --git a/app-crypt/heimdal/metadata.xml b/app-crypt/heimdal/metadata.xml
index 0862feb8ed96..c31b6673e508 100644
--- a/app-crypt/heimdal/metadata.xml
+++ b/app-crypt/heimdal/metadata.xml
@@ -16,6 +16,9 @@
 		<flag name="hdb-ldap">
 		Adds support for LDAP as a database backend
 	</flag>
+		<flag name="lmdb">
+		Add support for using dev-db/lmdb for lookup tables
+	</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">heimdal/heimdal</remote-id>
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index becbd2f177d4..e017c6bbe911 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -7,5 +7,5 @@ DIST john-1.7.9.tar.bz2 717505 BLAKE2B ea720451b4544a975d5baca75242f22d8b306ad41
 DIST john-1.8.0.tar.xz 4468704 BLAKE2B 90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60 SHA512 e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543
 EBUILD johntheripper-1.7.9-r11.ebuild 6534 BLAKE2B 008ae23a7c0f34613cdbbde75db6c4b488ce5dca2ef57a7726c55663eef563a7bd7a133424aa359e0c8dca659678a4fa62179f57b5a333316c545a71b99e30b9 SHA512 3b8fa826d67f349c8eafbb96c509def97e21bd1688fe762c211214a4def243c6db02d3afae0b23dcc7dae62a717d25cef302de2b782edc4a1d468424063066f7
 EBUILD johntheripper-1.7.9-r6.ebuild 6038 BLAKE2B b1f1791dd6bb0990b894aa04808f7593be46e44dc10760c2099152dca60fac9903f0af9466b83c17a380e3a2b281c1abc964d677c8d32dd5df734d97dc0cabbd SHA512 212da5ebef507b1a37d2c3a8ef4da5e9dd3072c30dbe86012bb304e364eb02f2a1d131eae50f7d66b5b5aea60e23b4b0c58cc76cbd0fca093194cc26ad645fdb
-EBUILD johntheripper-1.8.0.ebuild 3222 BLAKE2B 4d011f719e09701bcd1a8cebda9192f72637e043dd0ae4f8f351b33cf5ea924fef8c66674c08f737ec3679764aebc2c2f550906d7749c88cad7d5c4adf225bab SHA512 8d71013773e4ff8bcb15c9c9fb1f00bb74f95b002cabb934322bf4cf5e5b63c9017fb1907b3c17018e361f602cf019ae93550c612b90ec10505b38aac59ed2f6
+EBUILD johntheripper-1.8.0.ebuild 3215 BLAKE2B f9a9b61c415871fc60d49df4f6b14fca0b5253617a973c7c5a6b6b7a99b9569d1b56ee22768e013727775eea1569773ef319302a671d91d1f2bcbaffe459d44d SHA512 c53429f8cbba8ea6e06511f2f389acc1a29ec3b663dbf96b0162ddaf9327078cfd4066175ef41b639f269dfe4ac791c2d40738833defe19f7e00e85e805d1853
 MISC metadata.xml 793 BLAKE2B 8650fe215af0de8946b72ebbd2c2979c437e90634fc48d9d1ac20350b23922a418093301641589a9d524de2908e2c715dc1e0419a2206a34ff20bb7eb0b2a3aa SHA512 29234712e9b5631919aa400e207b36cefa84819cf2609547f5244745d81559d10e79b50e296681b65d14fcf813eea69acbb97fd8f8f487bb4240e4087f4b098e
diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 95f542e6070c..78b619fda5a9 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index a642089516dc..b805e21396f3 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,3 +1,5 @@
+DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
 DIST libb2-0.98.tar.gz 275076 BLAKE2B 7c0aa473a58a5ceb6e913487cc6f0078e6cab661bd26cb1f5611473b430213521a23adbde227da6d7561b4d581369e268308ae6b2a10da5399c0d2d6ab288b26 SHA512 be400d16ab00b3006ec7412dcbf580427600f4997cee19c0448d849ff8bbbb58bbb7be3d49e4052cb1b6791b6bed9c9cc48b51da3ec77b2fdf3d197ccf0c8073
+EBUILD libb2-0.98.1.ebuild 1311 BLAKE2B 3627d6fe7a4ce4bb84af4e2f39e3e06110c8a1677d2972a2a04d44aa6d8ec478009c1d2be6c994b42ad592f1e04151a54c237189f2058069758fb1908e68c9a1 SHA512 dcc298e5edf90c4557ff5eb6a0dd55d6307115a99aa7f498de86b54ee685097c12fd7b61e58077a6b8c38fbe0ce22c8499af4b413e8fc01960424366513c9dff
 EBUILD libb2-0.98.ebuild 983 BLAKE2B ef56ce606348776f1bf24a3e275c95ae40e0569e46dad425c5e47b30b6df4ea512477f41bf117b4e4b0562d4ffbbc2de9ef2d9e4e6b897bc25859ee5f6c63816 SHA512 8e69f8cee42a75680d4aa616127482c36f986cf32f5c2612e0c1af7418b8b62cbd0cb73163ba93190b9359389a13eb31fd75528110391318dc3d14d0d78447a4
 MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11
diff --git a/app-crypt/libb2/libb2-0.98.1.ebuild b/app-crypt/libb2/libb2-0.98.1.ebuild
new file mode 100644
index 000000000000..2664bc570e7a
--- /dev/null
+++ b/app-crypt/libb2/libb2-0.98.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune toolchain-funcs
+
+DESCRIPTION="C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp"
+HOMEPAGE="https://github.com/BLAKE2/libb2"
+GITHASH="73d41c8255a991ed2adea41c108b388d9d14b449"
+SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="static +native-cflags openmp"
+
+DEPEND="
+	openmp? (
+		|| ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] )
+	)
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}-${GITHASH}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && ! tc-has-openmp; then
+		ewarn "You are using a compiler without OpenMP support"
+		die "Need an OpenMP capable compiler"
+	fi
+}
+
+src_prepare() {
+	default
+	# fix bashism
+	sed -i -e 's/ == / = /' configure.ac || die
+	eautoreconf  # upstream doesn't make releases
+}
+
+src_configure() {
+	econf \
+		$(use_enable static) \
+		$(use_enable native-cflags native) \
+		$(use_enable openmp)
+}
+
+src_compile() {
+	# respect our CFLAGS when native-cflags is not in effect
+	emake $(use native-cflags && echo no)CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
index 8e17ba85fc70..bd389711669b 100644
--- a/app-crypt/libscrypt/Manifest
+++ b/app-crypt/libscrypt/Manifest
@@ -1,4 +1,4 @@
 AUX libscrypt-1.21-build.patch 2460 BLAKE2B 139168dc59ea0001b5106a62731379c8a54e713d0bb5a30ab736eab36b2e8918d2ce47c8b3dc264b50172868c9c5108d0cd093c68e4fe4d3668301d84b15269c SHA512 74891b020e6115aa938368f43d727b3653160406f887f9958e66c688eb1191f7ba2ce6d753541af9369cf7724ecffff9b6633bef26062ebc0f74a092ed8cdd0d
 DIST libscrypt-1.21.tar.gz 19425 BLAKE2B 4f9f21c6ba36bad005d95203d1d2c206f50200973233670c4819fe2cc32de6941cc100360ba1683453fc7abcb0e0e024e32417beec06d5b43cbda56bfa89be5a SHA512 0f894bc2f47016cdd043ea692a4e4b08891b1a961443265230d5ccb76820d40e50b0d4d63588c44c985cd24e214f07b126d30989d3ce4cd79366f3b8f16c4d34
-EBUILD libscrypt-1.21.ebuild 709 BLAKE2B 1c2bfa6f478996809d468000838d310208a1e79fbc5db4a4b0a2cf5b631c48b5b2fe8bf5c7bd2708a6ffba0b6e63d858aadcfcbf3f382308cfdf520b25d5d1c5 SHA512 6999f0a1a937c7b7fae9e3af4c60a4385e7c3662e9625760d2c3392eaad2cd11e5a0e1b2f863f35368fc66c16f765539275eeafdc20afaa5d44826e59018f30e
+EBUILD libscrypt-1.21.ebuild 716 BLAKE2B baf93494616119166deea11a244f313f51af3e120dfc816cb9d0fa60894135b2fa1358be7e67de6b937a6082bbb47a0b468609a35a97c05bdd3c2fd7076aec26 SHA512 cc09950aee74c7114bd2db5142c4a34e321247cad9af5e84cb750850ecc402b5b7f79fc7f3d61a6a09e004528a5f7b4ac5d597ad80d8b175be4b04f029f693a3
 MISC metadata.xml 345 BLAKE2B affc5819c29d3b72ccc6a15e4d0b01bbff5bd3fdbe617c1b90dbd3af812127731d9981bab6a5ddd4a66cb1dcbb6bfa91b692cae1e5daf8247b84f25aa9bc01c1 SHA512 d123a54ae5536171b145454494d00e340797239bc5614a36451b9b975ad7bb2f38c5330069e78dd99f1d23cdb6f252736885af78d8cef63eb57dc93d68033383
diff --git a/app-crypt/libscrypt/libscrypt-1.21.ebuild b/app-crypt/libscrypt/libscrypt-1.21.ebuild
index 62491faa8ab2..e4ac4392954b 100644
--- a/app-crypt/libscrypt/libscrypt-1.21.ebuild
+++ b/app-crypt/libscrypt/libscrypt-1.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 2aadc139b8d6..36a892b6ff77 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -3,5 +3,5 @@ DIST libsecret-0.18.7.tar.xz 508392 BLAKE2B 9774df97c2abb362940c3b373e381afb82ee
 DIST libsecret-0.18.8.tar.xz 509432 BLAKE2B 3e3995d2c44367e31f3914087494764acfe82fb597b524c4982b4fca4e16612509c675f545191ee3cdae59698614395bef54ad82ae88a7e4e19898ba0be7828f SHA512 9e2ec8d458af6ed078bf3c6d956599f73f2cc7720332c424e9aede1f77f3d969c5122cf7b70899bc07ad96a3a628bf79bc5fffa88274d1ef2bcaaca6719f90d4
 EBUILD libsecret-0.18.6-r1.ebuild 2658 BLAKE2B c413830dc2598673d5a0f70c83bc3709c6f2749b2ee7da24da880b52b1c69af977632a45c3c654523a9f0c3271b4d5b0bae7c6c9a776e4e7a6bbe603d5acaf40 SHA512 056cfe38971719b9bc6c97ccf330fb0dd98abbb9637a3e6fd362aa89bd348ed024d415a41ac954fddd5dcf98a81284a48c78f428fab2f7fb56cae7fac3c1b7d9
 EBUILD libsecret-0.18.7.ebuild 2647 BLAKE2B d64cfb08b81738a7f0161c3b3204c5a9371bf4f5493760d06dcce5ba087d0d9cd7274475fff43d9cb265706c1721d0ba6a26456faecfe56ae4662dc9b3082675 SHA512 be27d948abff0e425af426600d95c4dbb484e542d0df9e453efcf81e738b3cd492c0c8aa4dfaa9bb2e46357c884598a770a7c8b81440b985086cf052ff68c615
-EBUILD libsecret-0.18.8.ebuild 2648 BLAKE2B bc315ec0daa20944e26053155563b980dcb6d7d96c6395891a7120a3f3e6a64041b0d7a4491ba6b75a374969f1c8f78754c302d2373f88e91841142b6cbdd44a SHA512 1df74d77c39c241cc962928a459902bc5db56123d8535fe9d7d1620126a8575d2f94c4c7506bef31186bf5cd03533e33603022b7ed8056d706f82949e136803c
+EBUILD libsecret-0.18.8.ebuild 2646 BLAKE2B 16c6b8f41bbf11c9f9186eeb7a325ca491902cb611af984ec72937c8cc95dcdbce6195d388675c7d9fe2b09c87619c518c1ae8602929d090dc316587f64eafca SHA512 eb2228826dbdeaf9150ba2331582237fb17fdc1ecd8c7813772b0d547d3690343eee1d0a101b74159aaf67c67ec9f6f58952571ff304f31c53b8e7b543189ca7
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.8.ebuild b/app-crypt/libsecret/libsecret-0.18.8.ebuild
index 91a9cc02a573..1e0869979120 100644
--- a/app-crypt/libsecret/libsecret-0.18.8.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.8.ebuild
@@ -18,7 +18,7 @@ IUSE="+crypt +introspection test +vala"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/minisign/Manifest b/app-crypt/minisign/Manifest
new file mode 100644
index 000000000000..9b599be6e829
--- /dev/null
+++ b/app-crypt/minisign/Manifest
@@ -0,0 +1,4 @@
+DIST minisign-0.8.tar.gz 14045 BLAKE2B 3c0cb0ebaeeacee5f56c788a48eef8d0a324c2db2fe8f63fc16a197870c327ed2cacc618cb6422f8d7d7ef35860b58aa0a2769c851e8af9b1a7a7cd9d2ca3a07 SHA512 79bf626d0c15e39ce3bdf53600038028c0b22904b648074bf516a9ea6962c9486c41244e80637a5fbac090cce1ed9b4b3d57b8a02632646e01b43aa413cd8bd9
+EBUILD minisign-0.8.ebuild 558 BLAKE2B 9b6013af92efcea9b269f5672b858e904bc0cdf617d6c6839efed303272b095005d74d8c3883f52f8f5704c37a7a23c3e86bfdebe8a0e4d811f85deee767997a SHA512 8f8520a1311f2f553105c779bcbf15ab511e987219e600aceb3f4e6fc175edfbc8c17117c2666f1d1a7bad37ad9780bc7e44e018c5f7f5b8db7712c65b2dba63
+EBUILD minisign-9999.ebuild 558 BLAKE2B 9b6013af92efcea9b269f5672b858e904bc0cdf617d6c6839efed303272b095005d74d8c3883f52f8f5704c37a7a23c3e86bfdebe8a0e4d811f85deee767997a SHA512 8f8520a1311f2f553105c779bcbf15ab511e987219e600aceb3f4e6fc175edfbc8c17117c2666f1d1a7bad37ad9780bc7e44e018c5f7f5b8db7712c65b2dba63
+MISC metadata.xml 681 BLAKE2B 590bbd6d73e1a9d5ac5e3381ffa5f29e8f8a0f329874e5372f52425a679c8966211b689a699d75cd6bc299e6d670f7724284fd87fc8f6ce0f8038133dfcc33eb SHA512 2840cf105039a5bb4a7564f4d10f759c1cf0f7f183a9684fabc2a1a158ea01a8dc7c552bad57991b30bf676c88b2b00d1f7304a2c565d388e798cf931e566242
diff --git a/app-crypt/minisign/metadata.xml b/app-crypt/minisign/metadata.xml
new file mode 100644
index 000000000000..974452080b5e
--- /dev/null
+++ b/app-crypt/minisign/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		Minisign is a dead simple tool to sign files and verify signatures.
+		It is portable, lightweight, and uses the highly secure Ed25519 public-key signature system.
+		Signature written by minisign can be verified using OpenBSD's signify tool:
+			public key files and signature files are compatible.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">jedisct1/minisign</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/minisign/minisign-0.8.ebuild b/app-crypt/minisign/minisign-0.8.ebuild
new file mode 100644
index 000000000000..da90d6d5d3f4
--- /dev/null
+++ b/app-crypt/minisign/minisign-0.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Dead simple tool to sign files and verify signatures"
+HOMEPAGE="https://github.com/jedisct1/minisign"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
+else
+	SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+
+IUSE=""
+
+DEPEND=">=dev-libs/libsodium-1.0.16:=[-minimal]"
+RDEPEND="${DEPEND}"
diff --git a/app-crypt/minisign/minisign-9999.ebuild b/app-crypt/minisign/minisign-9999.ebuild
new file mode 100644
index 000000000000..da90d6d5d3f4
--- /dev/null
+++ b/app-crypt/minisign/minisign-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Dead simple tool to sign files and verify signatures"
+HOMEPAGE="https://github.com/jedisct1/minisign"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
+else
+	SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+
+IUSE=""
+
+DEPEND=">=dev-libs/libsodium-1.0.16:=[-minimal]"
+RDEPEND="${DEPEND}"
diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index 8838181a1c1f..2add1dfdd613 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -43,6 +43,6 @@ DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2a
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD nitrocli-0.2.2.ebuild 1536 BLAKE2B f435c1a84cb4ec0e0cfb8ff8e467fd1995f6939180cb4a9161c1f0b73ac01949d67480d11c96830e5171fec0b920f9c1ea1eed1fda2e5aee4e92be90f0e51754 SHA512 3c36f03822e07998c679dafbb7a62ea33ea72db38480e8645713fde4dbb8dc74c69abe5121a6f3a0b31b79491b6b80e26a251000a37cf61c0a5acb98fb7eb6d7
-EBUILD nitrocli-0.2.3.ebuild 1408 BLAKE2B d6113a8177db6595c3771bcf3f0f3759e6c3ce3e4997d7031d4adde9498ffc6fb2524925fa88ba79a3a9e915aac34b8597333a6338867f257c858f2f20e2fce8 SHA512 522a14916286f8b94caec21daacaafd46d3936273157704db57b9a56094232ba4d0c186ccb368adeea1bafb525e18c3c004c31f82e59aa012b31978572826ccb
+EBUILD nitrocli-0.2.2-r2.ebuild 1535 BLAKE2B 7639eaea62dc5f7e2b7e51813248b33a60899ce84e20f55572716aebb14155dcd74a42339e3d9009364dc162906c1fed14f4ec9371b2dc3e729c08ee5e4f2ab6 SHA512 e45bff033b969119f3e0658d692d7a6324ba020e8212a2a48709b6aa94bfbd5df5e84ea4ecfaa98a59a62aeb312025b643f12134b8df4896b984e1146d058bb8
+EBUILD nitrocli-0.2.3-r1.ebuild 1407 BLAKE2B e8bf0442d55a5cf48f57b65b1f47c4b5f0a1cf7bfb3fd363f818353ef433af1f7e9339a3c996505f1fb78ea12a3edacc5e540d36008d9051115e025d4c10ea57 SHA512 a4533889b8e9bc753489bb1f1f9a419ce46b52a96733649b5c153647c1983f589d334a3f6ab29f3ff8badf2d728b155cd0d2315715f34855c6956656d26fa407
 MISC metadata.xml 683 BLAKE2B a973761f8df97168483a0adc13bf44f088f13fb9c472986cffed08d53f69cdbc27a4bc195babcd86796853968c8face6c00004e060086b2ba4d09c52ce978815 SHA512 3f4615ba5af13e358c1c3a4b28c3dbec77c0b99af4692c0b2feedb4f21a1e5f8f76cb7fbd2cdaa5a8c899d340094b8029a6967dd68d591586bef551f8eb61b1f
diff --git a/app-crypt/nitrocli/nitrocli-0.2.2.ebuild b/app-crypt/nitrocli/nitrocli-0.2.2-r2.ebuild
index bd432facd469..653a9ce8ef2a 100644
--- a/app-crypt/nitrocli/nitrocli-0.2.2.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.2.2-r2.ebuild
@@ -59,7 +59,7 @@ KEYWORDS="~amd64"
 IUSE=""
 
 BDEPEND="
-	>=dev-lang/rust-1.31.0
+	>=virtual/rust-1.31.0
 "
 DEPEND="
 	dev-libs/hidapi
diff --git a/app-crypt/nitrocli/nitrocli-0.2.3.ebuild b/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild
index e5ac6ddbfe68..41cca617eb9e 100644
--- a/app-crypt/nitrocli/nitrocli-0.2.3.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild
@@ -50,7 +50,7 @@ KEYWORDS="~amd64"
 IUSE=""
 
 BDEPEND="
-	>=dev-lang/rust-1.31.0
+	>=virtual/rust-1.31.0
 "
 DEPEND="
 	dev-libs/hidapi
diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest
index 7ee39849aff9..30b3d94d8f6a 100644
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@@ -1,6 +1,4 @@
 DIST gentoo-release-test-sigs-20190224.tar.gz 3235 BLAKE2B 924c69a62d5321716f536144f0607bd3ec4a65d76be492adc729864fd9bef82df0086541ae13034a83152ea0c8dc3cbd168be6cff111a3484128a22cbc8ef1d4 SHA512 f8cc2e84bedbdf14ace6abe4aacf8f0c9810c77ff6ae0fac301829d9d4d5cf0c128a76516c773ac993879215bcdb0aab097e1e7e747d8e1a7c4cfc815bd4d3e6
-DIST gentoo-release.asc.20190224.gz 42534 BLAKE2B 9b8bc98dbd66fdf44eb1b0b5a8e83bd4d08d85a3f9a95b293ae3e900de291567f36d59cb8dfb412e3f71db453184e2eefa453cf3e340d5b3091c55919fccebc7 SHA512 4f46c303faa134fc17903859527a9fa81d1015f4f2d2908509437ee2d07a992eb181c5a05544b333c310eda8ee2c1861cb07e978d92ef3f02955ade36110da67
 DIST gentoo-release.asc.20190427.gz 59649 BLAKE2B 138c6bad0ec688c515888433256c95cea7d8ec1e76587e0e89d3c11078eb1b85931ba9f6630f60dc8bc168b8303204ebe05b9bad7abe946a74730123b1c36d89 SHA512 1491fb2bcf9c6a29adf8ff08cbf8cd40517ee3de7adc048be29a2300f460e78594548c3e47bd18da68585248c560d868815ded5584ed18929e4072c4933484f0
-EBUILD openpgp-keys-gentoo-release-20190224.ebuild 1145 BLAKE2B 955d52e47d997f46ce2d1a098912173ca822cd892cf7b8aa03c61f3d718d3893a7a81faec33181d7aab30a909127615847a86a6f215cfe3f8d7d90c50930aa55 SHA512 805441a7fcb7375173085747769f85bfa108d8cb29fc93b0907cfe274c893ffc93294c233c94bc428bed4f82f8b0e046daca9732ebb4f4faca7628d7f106edd7
 EBUILD openpgp-keys-gentoo-release-20190427.ebuild 1152 BLAKE2B 119042b4fa94ca2da40e44d1ee3ce1c0b261671244962a50a94224a1bd38372d1c5f0eb31fd672431e69933d75ce27851cc77384cc81ff1bf29d19c437fe613c SHA512 d3a7c13f79f968b963821dea5648333cbc061878864dd6c551f16a37b8d74b2edb3e0a332a1a9988b9dde92ddf2092ea6e328088b6a24095a5ba075377719bc5
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190224.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190224.ebuild
deleted file mode 100644
index d6cd99646fb7..000000000000
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190224.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
-HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz
-	test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20190224.tar.gz )"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="test"
-
-DEPEND="test? ( app-crypt/gnupg )"
-
-S=${WORKDIR}
-
-src_test() {
-	local old_umask=$(umask)
-	umask 077
-
-	local -x GNUPGHOME=${T}/.gnupg
-	mkdir "${GNUPGHOME}" || die
-	einfo "Importing keys ..."
-	gpg --import "gentoo-release.asc.${PV}" || die "Key import failed"
-
-	local f
-	for f in gentoo-release-test-sigs*/*.asc; do
-		einfo "Testing ${f##*/} ..."
-		gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}"
-	done
-
-	umask "${old_umask}"
-}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-release.asc.${PV}" gentoo-release.asc
-}
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 7f9befe23b26..15d433f1418b 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,10 +1,6 @@
-AUX qca-2.1.3-c++11.patch 3555 BLAKE2B 68b9e4a9e13543b2f98c564f19deef32090be25bb425d83bebf78bc0141411bd447223562c920aea80765811084360fbc964afb7841291081f80cc94060070b2 SHA512 605a602d184c86426d6d875954ad2cb3bee19252ce56e6581df7574a3e324f97ccfcb919fef32f6ff8a393683b8375d97586ed886ae01d87fbe015f2f83f0e3b
-AUX qca-2.1.3-deps.patch 1040 BLAKE2B 4bf0179bf2383328dd97f365c433ee40a87e465b8c0b5396d4cfde07f27a4aedfa2d229900e630606fc43e5a5a35042ffce999f59401c34439e656b0b6f1bf0e SHA512 e20a3a06fef8415287d8837ea5fa2acf3ef60f8a1da6aec7c994987f63336e52ac2460fa76694b82b59f30aa1d59cd22decac246423adbef8ae1658a7f7db78f
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
-DIST qca-2.1.3.tar.xz 686340 BLAKE2B 60ebf9add907632ed17426ee53c6c35a9aed279a4492012f1c174608cbe9579d366feb7ff7bff551d2e9e4ef2f271e8f340fcb4c9e1f67f209657d388567d44f SHA512 0aec277e0695da2e45298f0a9006213829fe4c449a79969e472947db54f45000ba6e22361b782465bdc03f269b7301d318c843f5a83db459a118e58a03f3116a
 DIST qca-2.2.0.tar.xz 691264 BLAKE2B 3b9196372c8a8f2e50a86a8a581a549d52a324cbfa919945683222d605747f7127af469a1de0310e24e823243ab4cd884a763b7baac94048e739f49d2a31dcbf SHA512 2a3f73bbd73ae8f74b2b4ec143bc010b7efaba267fc3349fc681623f29a288f69e5c457597f4964f88172a98e0a7eba6d2555675704d5d7026df794b8f772e69
 DIST qca-2.2.1.tar.xz 691676 BLAKE2B d5bcc0d6e791811e1efcdbf2e09916fe40ad682b0e59b2993c73a5bd79e09fc28facdec81259a982bee05223c8dfce78b9a6b729ca4e566c0901a13b91575379 SHA512 3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
-EBUILD qca-2.1.3-r2.ebuild 2180 BLAKE2B a74a2d7378bad48e8ad20c30ae91416b79e6f79393566e499a7821cf6fc904f6966c36751b285da4320da5a541fefadaf35df6df192ec4338dfc363323e20469 SHA512 ebca007f517945d9f26ca4fba9536418371013764c95f668774da8f23c1dce722ae1954e2e5505ea5b87446576ac757e2248f829ca515db7249c97d28e0d83b1
-EBUILD qca-2.2.0.ebuild 1966 BLAKE2B 53110260956c2d6dd55e52c5f5b28326bc95c4efb9a8a4584e87bf771a4c51fbf6881684e22afcd92078418ea7979f71754f86d379ca4845a2ac66e0d75cad88 SHA512 36d459adfc0d649e4e941566ad1a49e48f9dbb16bc83885c090ad64307999316d6e1abf4302a246e8e2db1a285562185dbe00ff95a08cfc570d42153718c4a14
+EBUILD qca-2.2.0.ebuild 1965 BLAKE2B 9215472e01605560d3210345f76ae74f95f9909db4639c8e6b09762f10daa71e27494d22f68a936e60659da33eed583f10e976703259e72d7693c36bef2a9c0b SHA512 4955ec3ffe41fb89d19d722772a58eb4ac023d5957bed4e9a62baed6d0263ec8e33e3e3798390a297f034385d18679f5c12e279466631ad6a1ab59c6b5080cc9
 EBUILD qca-2.2.1.ebuild 1967 BLAKE2B a41078f18a95acc876566fda3d9a3018b5f1d8befc9cff5c6e1054f42a653cfd39f079430afb11e119d672c51048de2bb981b758585aeb78dbec21cd9122775b SHA512 ad17644227fb282cbcebb15510a070d283e5eb7e783f3bd7acf2611a7d7006ab7925d0e25017872f442259f22d97f5b0792cac28d818a83035a2732ba6dbdd37
 MISC metadata.xml 842 BLAKE2B 1732f7a0efeba7de6c54bfb817a69f9be88eab8bb37a75f5ee685ba7893ad9be13a10ea8b2a404954846e1ea73dc617d0a89ac3b1f69a83928275b9e8d5fc7ab SHA512 900de0e8b914d1970b3e4fcfbdbeea48c1e56ab596e6c959e4dce29a0fd0cb0b6969ab6899784a80b6c233a656f3a4501513d8af6b4acc8519a5ecf1c9a1a622
diff --git a/app-crypt/qca/files/qca-2.1.3-c++11.patch b/app-crypt/qca/files/qca-2.1.3-c++11.patch
deleted file mode 100644
index a12f96bfcf4a..000000000000
--- a/app-crypt/qca/files/qca-2.1.3-c++11.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 5f18ebc705ec98e883aa63cb537e36e6a08b7e34 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 21 Mar 2017 12:23:17 +0200
-Subject: [PATCH] build: fix C++11 throwing distructors
-
-For >=C++11, explicitly mark throwing destructors `noexcept(false)`
-
-Thanks: Peter-Levine <plevine457@gmail.com>
----
- Doxyfile.in                                  | 2 +-
- src/botantools/botan/alloc_mmap/mmap_mem.cpp | 2 +-
- src/botantools/botan/botan/allocate.h        | 8 +++++++-
- src/botantools/botan/botan/mem_pool.h        | 2 +-
- src/botantools/botan/mem_pool.cpp            | 2 +-
- 5 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/Doxyfile.in b/Doxyfile.in
-index 59d9afe..844c234 100644
---- a/Doxyfile.in
-+++ b/Doxyfile.in
-@@ -1070,7 +1070,7 @@ PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS \
- # The macro definition that is found in the sources will be used. 
- # Use the PREDEFINED tag if you want to use a different macro definition.
- 
--EXPAND_AS_DEFINED      = QCA_EXPORT
-+EXPAND_AS_DEFINED      = QCA_EXPORT QCA_NOEXCEPT
- 
- # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
- # doxygen's preprocessor will remove all function-like macros that are alone 
-diff --git a/src/botantools/botan/alloc_mmap/mmap_mem.cpp b/src/botantools/botan/alloc_mmap/mmap_mem.cpp
-index 362b688..54f0d23 100644
---- a/src/botantools/botan/alloc_mmap/mmap_mem.cpp
-+++ b/src/botantools/botan/alloc_mmap/mmap_mem.cpp
-@@ -107,7 +107,7 @@ void* MemoryMapping_Allocator::alloc_block(u32bit n)
-             umask(old_umask);
-             }
- 
--         ~TemporaryFile()
-+         ~TemporaryFile() QCA_NOEXCEPT(false)
-             {
-             delete[] filepath;
-             if(fd != -1 && close(fd) == -1)
-diff --git a/src/botantools/botan/botan/allocate.h b/src/botantools/botan/botan/allocate.h
-index 0ac351e..52bc397 100644
---- a/src/botantools/botan/botan/allocate.h
-+++ b/src/botantools/botan/botan/allocate.h
-@@ -40,6 +40,12 @@ namespace QCA { // WRAPNS_LINE
- #include <string>
- namespace QCA { // WRAPNS_LINE
- 
-+#if __cplusplus >= 201103L
-+#define QCA_NOEXCEPT(x) noexcept(x)
-+#else
-+#define QCA_NOEXCEPT(x)
-+#endif
-+
- namespace Botan {
- 
- /*************************************************
-@@ -58,7 +64,7 @@ class Allocator
-       virtual void init() {}
-       virtual void destroy() {}
- 
--      virtual ~Allocator() {}
-+      virtual ~Allocator() QCA_NOEXCEPT(false) {}
-    };
- 
- /*************************************************
-diff --git a/src/botantools/botan/botan/mem_pool.h b/src/botantools/botan/botan/mem_pool.h
-index 32834b8..1cb903e 100644
---- a/src/botantools/botan/botan/mem_pool.h
-+++ b/src/botantools/botan/botan/mem_pool.h
-@@ -63,7 +63,7 @@ class Pooling_Allocator : public Allocator
-       void destroy();
- 
-       Pooling_Allocator(u32bit, bool);
--      ~Pooling_Allocator();
-+      ~Pooling_Allocator() QCA_NOEXCEPT(false);
-    private:
-       void get_more_core(u32bit);
-       byte* allocate_blocks(u32bit);
-diff --git a/src/botantools/botan/mem_pool.cpp b/src/botantools/botan/mem_pool.cpp
-index 00280ec..baa47aa 100644
---- a/src/botantools/botan/mem_pool.cpp
-+++ b/src/botantools/botan/mem_pool.cpp
-@@ -171,7 +171,7 @@ Pooling_Allocator::Pooling_Allocator(u32bit p_size, bool) :
- /*************************************************
- * Pooling_Allocator Destructor                   *
- *************************************************/
--Pooling_Allocator::~Pooling_Allocator()
-+Pooling_Allocator::~Pooling_Allocator() QCA_NOEXCEPT(false)
-    {
-    delete mutex;
-    if(blocks.size())
--- 
-2.10.2
-
diff --git a/app-crypt/qca/files/qca-2.1.3-deps.patch b/app-crypt/qca/files/qca-2.1.3-deps.patch
deleted file mode 100644
index e1ef2e5c0e7e..000000000000
--- a/app-crypt/qca/files/qca-2.1.3-deps.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e854f357f4037e2c8c781ebd04ec5164a882b9b3 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 12 Apr 2018 00:45:50 +0200
-Subject: [PATCH] Make Qt5Network conditional on BUILD_TESTS
-
-Summary: I did not find it in use somewhere else.
-
-Reviewers: iromanov, sitter, rjvbb
-
-Reviewed By: rjvbb
-
-Subscribers: fvogt
-
-Differential Revision: https://phabricator.kde.org/D12129
----
- CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 28b0169..65b95f8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,7 +59,11 @@ if (Qt5Core_FOUND)
-   message(STATUS "Building with Qt5 support")
-   # Got from ECM
-   # Distros have no ECM. So I just copied required cmake modules.
--  find_package(Qt5Transitional REQUIRED Core Network)
-+  if(BUILD_TESTS)
-+    find_package(Qt5Transitional REQUIRED Core Network)
-+  else()
-+    find_package(Qt5Transitional REQUIRED Core)
-+  endif()
-   include(ECMQt4To5Porting)
- 
-   include(GNUInstallDirs)
--- 
-2.17.1
-
diff --git a/app-crypt/qca/qca-2.1.3-r2.ebuild b/app-crypt/qca/qca-2.1.3-r2.ebuild
deleted file mode 100644
index a1d5bbb0df5f..000000000000
--- a/app-crypt/qca/qca-2.1.3-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils qmake-utils
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="https://userbase.kde.org/QCA"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-
-IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	botan? ( dev-libs/botan:0 )
-	gcrypt? ( dev-libs/libgcrypt:= )
-	gpg? ( app-crypt/gnupg )
-	nss? ( dev-libs/nss )
-	pkcs11? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-		dev-libs/pkcs11-helper
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		dev-qt/qtnetwork:5
-		dev-qt/qttest:5
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-crypt/qca-cyrus-sasl
-	!app-crypt/qca-gnupg
-	!app-crypt/qca-logger
-	!app-crypt/qca-ossl
-	!app-crypt/qca-pkcs11
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-disable-pgp-test.patch"
-	"${FILESDIR}/${P}-c++11.patch"
-	"${FILESDIR}/${P}-deps.patch"
-)
-
-qca_plugin_use() {
-	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features"
-		-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)"
-		$(qca_plugin_use botan)
-		$(qca_plugin_use gcrypt)
-		$(qca_plugin_use gpg gnupg)
-		$(qca_plugin_use logger)
-		$(qca_plugin_use nss)
-		$(qca_plugin_use pkcs11)
-		$(qca_plugin_use sasl cyrus-sasl)
-		$(qca_plugin_use softstore)
-		$(qca_plugin_use ssl ossl)
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc; then
-		pushd "${BUILD_DIR}" >/dev/null || die
-		doxygen Doxyfile || die
-		dodoc -r apidocs/html
-		popd >/dev/null || die
-	fi
-
-	if use examples; then
-		dodoc -r "${S}"/examples
-	fi
-}
diff --git a/app-crypt/qca/qca-2.2.0.ebuild b/app-crypt/qca/qca-2.2.0.ebuild
index 8454bdb8253a..af427423f54d 100644
--- a/app-crypt/qca/qca-2.2.0.ebuild
+++ b/app-crypt/qca/qca-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test"
 
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 0e7e82e74d68..be325f94530c 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,5 +1,5 @@
 DIST seahorse-3.20.0.tar.xz 1556556 BLAKE2B e0742996045b50acb2d60f548f321e1ff0121c166209e2230d5839cc971f8560f316c91c3a88a30c302c5339ba0251e7faf64ae805c4f80e853cc67a6952d350 SHA512 a02d3da7af95256941ef065ac024bd5bfb53a026767b951fa2e26446fb0eed23707e69f72f6e8ebfa7d538823fa41411709fa2bebad4fbd662af1e81bc15ab82
 DIST seahorse-3.30.1.1.tar.xz 1428904 BLAKE2B 54760362fc452b2ff3f7a0d72b25540568703cb91cd46321fb8cd60c9b51f84c3f48575ae9f6c72080cbe0b29e8a38f5e6afdb6c3120b2783a8a04688bd219c9 SHA512 971b8bea484f456d2942f1d1b407ca5b11c1d431f2ee524e58348a421a235dd9d2fa463e73487c6137bde116b34a5d1c0291b479d8562d4ce03766081e0dc469
 EBUILD seahorse-3.20.0.ebuild 1628 BLAKE2B 72e5b4170c9a9e57f8742b025bb9bb7a816e67dfacbf08e80f715178e06f9cbec10654366c0f74899a816f1f0cbc6d988fb17d258e31873e43eac7f337cb7e51 SHA512 d53d488ab47a2681e075df1894288e81e7c32d05c28b027a091fb91d903da3275e235774e3d0f0caf18dca51d077afce63c2ed40ad5af9a319682956521b593e
-EBUILD seahorse-3.30.1.1.ebuild 1545 BLAKE2B cb6bb2b4436ce2a978a69ab6589196d0bddf289c629bfb689fc6bf8898f14fe8a2a476a796d13df5af575d334634a84d3a8d694f34962f936dae51cd43b48935 SHA512 6c35500d7c1ce6833630c6c0d9241235139b97007742dc8694a5680d03b6420d4186cea966b186470410bced0e485caf869a22d1d774d6a414a46774f02ad3d3
+EBUILD seahorse-3.30.1.1.ebuild 1543 BLAKE2B 0ee21bca201471aa05695dded47978b49f47ef22c3cb6aff6fff9d1e3203949ded7475c7ccaff709037ed1ee977d8c5c076ed4ce0682252f94c58a54a1324ccb SHA512 0c4dd017edc2193706fef790329f84dbf452e89aa1a5e28fbe4df239da59986dda44e50f3510a914aa749f68cf4198aa524125da24f6d0e74e2bc18612d1c9c4
 MISC metadata.xml 742 BLAKE2B 11cc6cebe3f395ccd9f2570a419e812951287d7a9af2bd88720a66c7349305c108c451b67a33f9a6da0c82d7b0731ca74980dd7515db3d167993008633973a6f SHA512 cf7cceeaedb1fdb503def974d945a7a5d38a95105dda77f7e917abcec8ce823b461bf3cd1ab5f1a458de859e48a4d58abde71a5a4599685772936eb3525ae3af
diff --git a/app-crypt/seahorse/seahorse-3.30.1.1.ebuild b/app-crypt/seahorse/seahorse-3.30.1.1.ebuild
index 58940bf5718d..93445eac432d 100644
--- a/app-crypt/seahorse/seahorse-3.30.1.1.ebuild
+++ b/app-crypt/seahorse/seahorse-3.30.1.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="ldap zeroconf"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/app-crypt/sgeps/Manifest b/app-crypt/sgeps/Manifest
deleted file mode 100644
index d9df51e9a507..000000000000
--- a/app-crypt/sgeps/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sgeps-0_pre15.tar.xz 3284 BLAKE2B e30662e1353e6b4bf1680f730152d972c769d7728b9d30fa8a01d76c40b65549f8cb63d616cf70119201952ee1b0f7ec7aae087a1e37f36e7c6df3ece1259494 SHA512 8ebf5f492baaf6ee7f93054a9afcc6c4318f755d85190ce2576c89a88908ee132283af873a37f60f611683689bc7e2e77903c95c6020c80ad916ebabf4583702
-EBUILD sgeps-0_pre15.ebuild 1061 BLAKE2B bd5e52dea7d2bf72c90a0d38a98f70995b83cec285320f473c48ee9f984096878e07ab235d1c9f45da6fd5dc2394d7794bc69f7e76d57e89d137b054016e7b46 SHA512 abb2a1b87a76543dcfcfbab1c2cc7e06ade77dfd8f6d98fe3c66d597e1b2077cb266a86f3ad43a8d235ff953c0729ca62b2018f6b38e9e7af1ad24a32e4ea868
-MISC metadata.xml 387 BLAKE2B e1dedc093efde04e635a60abe48bed920fb6a799faaeb8ff6ed4bf05ae3fcebaaa36b7ccd0b13db1940ba740fde5ed8e7a7931567f601bcd1797c5013c6fac5e SHA512 80eccb576d91e4abe4b472528f8a0f145dec34fdb8a120b43943e742dd077dbe6b45256c4634e6f00f7e240d46fcf174b5eedd9f10954b51b69e25d53ccbf22c
diff --git a/app-crypt/sgeps/metadata.xml b/app-crypt/sgeps/metadata.xml
deleted file mode 100644
index 6bd8c99de505..000000000000
--- a/app-crypt/sgeps/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>enrico.tagliavini@gmail.com</email>
-    <name>Enrico Tagliavini</name>
-  </maintainer>
-<maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-crypt/sgeps/sgeps-0_pre15.ebuild b/app-crypt/sgeps/sgeps-0_pre15.ebuild
deleted file mode 100644
index 62be47628e95..000000000000
--- a/app-crypt/sgeps/sgeps-0_pre15.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="simple GnuPG-encrypted password store written in perl"
-HOMEPAGE="http://roland.entierement.nu/blog/2010/01/22/simple-gnupg-encrypted-password-store.html"
-SRC_URI="https://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="zsh-completion"
-
-RDEPEND="app-crypt/gnupg
-	dev-lang/perl
-	virtual/perl-Storable
-	virtual/perl-File-Temp
-	virtual/perl-Getopt-Long
-	dev-perl/Config-Simple
-	zsh-completion? ( app-shells/zsh )"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	dobin sgeps pwsafe2sgeps
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		newins zsh-completion _sgeps
-	fi
-}
-
-pkg_postinst() {
-	elog "To make use of sgeps, remember to create a configuration file as"
-	elog " ~/.config/sgeps.conf with these values:"
-	elog ""
-	elog "store = ~/somewhere/safe"
-	elog "keyid = 012345678"
-	elog ""
-	elog "If you want to use the --copy options you should install x11-misc/xclip"
-}
diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
index 5f38cd5cb5e3..b8228916b076 100644
--- a/app-crypt/shash/Manifest
+++ b/app-crypt/shash/Manifest
@@ -4,5 +4,5 @@ AUX shash-0.2.6-format-security.patch 413 BLAKE2B 4bcb4a803b8a69c7568d89dfbb9006
 AUX shash.bash-completion 856 BLAKE2B 259204c4579326baa2b68d32e87bb8d6bcb4bd25646d851a68efe28927dc4c61e409092581036a777cddcf4941c12ff51e53f97c30b361cde05f4e89b65abda8 SHA512 1d6f57c5d1d75a576bb2536dc9a7518263e2c34da127f0450e1c7900038a8c9e4a379533ff34ddccf0c62cb53284f0fdab41510f71a05a337e39bcab578ed2b8
 DIST shash-0.2.6.tar.gz 105641 BLAKE2B f7421aa9ed7b242e14a585461e96f44e35f1acf38cba358807ec06e6678c82f7f3b070a218de71cccde9f18a1e7e13f8dd4cf66b48e9d6626f16b2e1fc33757d SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b
 EBUILD shash-0.2.6-r2.ebuild 895 BLAKE2B c1cc57e9531b91cfe7da1d1d8f3bfab28ca536de1bf6d67e8c158bb21a34344bb1c69c799f858097827107868222af854f97a6c6a4008b859b665db5904ef3cb SHA512 ad6aeeda95e2c205af81816ca05593a163966bc0fff9ffd42aec90237d70d3331645fc711829b49685a219e2f383d36550e56b146c77ac7972308585a955588e
-EBUILD shash-0.2.6-r3.ebuild 921 BLAKE2B a874c4f80af42fa4126d29c75e774d80e17c9fb90868412231aad3929ef89d02c2a9416bc63e3b20e9b3764206295b60162ba500275511cd1371d9dd568f8c33 SHA512 713b54d89d7be1b3b347c02335cb4acfe9d1fb6e0369652b86e586365c5915b4eca40b9ee09e787b01324e4329fbca4257610a1875eaf1e38149ad1d3f753b96
+EBUILD shash-0.2.6-r3.ebuild 920 BLAKE2B adefcace3aa01326e563d859d24599b5e3d10b1eb56cf1fd0838f813e81616e6f4c41247a6ede453a726cca8b81c71293384f58420625a957b9fe3373a021bbb SHA512 90e3031f3e4177e0af7bec18f5094d6f840351a8c8119a64b3be7df5aec892452b9db02429f1e109bae77c928a609a6541b884b77cffc39ffc5ff501fc2268c2
 MISC metadata.xml 389 BLAKE2B 0f19c78e6c95b99b0de3da4896ded3dbfcd482650294efb1a7b0961a6ea884e30241bfe431fe9c85ced61c45cc0e123f52847953b4e4a2bd86e4a14894190d2e SHA512 dfecd29a48ac51dfbb2d4ab6bc71d4538da61541b7ca3beb34edc4d321a97d881044e4f5815d8cb1a4715dc18dc5a9b58520e3d8697b8cbf35a6f795c13c87d6
diff --git a/app-crypt/shash/shash-0.2.6-r3.ebuild b/app-crypt/shash/shash-0.2.6-r3.ebuild
index b566b8c1951c..eaa99cc0729d 100644
--- a/app-crypt/shash/shash-0.2.6-r3.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 DEPEND=">=app-crypt/mhash-0.8.18-r1"
diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index 0aad92437879..11aa5ac6aa87 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1,5 +1,4 @@
 AUX tpm-tools-1.3.9.1-openssl-1.1.patch 6028 BLAKE2B bd7a7b3dc748618004cbbfb7dc51a6f4e3f1c53654193b227c4b3eccd75fbb6d22ed46241a3e201399daa418d58cdd5b124cc2a467f8f59b4b33f54394035602 SHA512 caf3f9a3f82073d71618305132b883ab51ba3220d30ce5c160b9785bcb2e7268cf47621381530d39e1641e0b27bfeb30dcbfd62ae235d82d07942824f533cc7a
 DIST tpm-tools-1.3.9.1.tar.gz 482859 BLAKE2B ee915679e23bead04672bf719ce59bb6f20b550be39855b5304caeff554bf54d3cfe9104d464af7762388995e51d2bed0f9bedad83e42146cb7457382d09f4b2 SHA512 63a9c0e761cd890cc0a218de79a9c0169e151aba7824c19bf6b7ec894cf41c4950de1f63bd849aa93a4bdff36cf0fe557bc17113912b6d77f57f2bf1190b6a08
-EBUILD tpm-tools-1.3.9.1-r1.ebuild 1020 BLAKE2B 3a19ca05edbd6993dd3c452eec68816f327d2c55a4ca04e3b959f4745916ed7fa89d8309b70fa22d934317c0c170d202ca4a4036bdccd59d8f4405745cda63f6 SHA512 ce1efb677fd6144e13bab0a0f6e2e0a452088992632249f828bc4223442253799eb230f177355382a69f106d49f9ba72dc6c2555af71f1d291188af8293cd073
-EBUILD tpm-tools-1.3.9.1.ebuild 970 BLAKE2B 8b6308d0965230b3d332d838f967fd23aa85b21a153866e535b5dcc077c5fb3c6e29e36866f533a0833390d286b1bad697fcb633398533407f5e78995b7c4a54 SHA512 acd3fa4d308c24c41c3704a2b0a7995c1e5073bd47cfd36df0d00c29f0149dd2491319c7b5ced7d99e53e9ee285182dd9df01e2e803b343ab01a33b841d74d62
+EBUILD tpm-tools-1.3.9.1-r1.ebuild 1018 BLAKE2B ec2e15103c01f08048ccf9beacc3e7505d45add816a2871301f3c566365f75c514759907ee2fe3bfdd01e75a7ca4ed5e1c0c4c40fbdc1d199dd0073e87362bf5 SHA512 f196ad0f3b5a0f4ffc37280d26bac4faa4ae072de3a032822d68d6ed41859c33a1e8036fc294e010bfc8af0046d65c4290ce5a61af9b520839bfee4be54f377a
 MISC metadata.xml 515 BLAKE2B 06991185c31f6e40b7cda3c9842339911e9806d024e1493ef674751b4d253f5f701a8386a8969f7124b29b2c984f109ec98cb767380b48781fb22bd266d7863a SHA512 5aea8cabd5ae0a00b4a49717efaf8ed6d6363131ff8bdc2a9167108297d32dee72c5419bbc84ae9ba1263d515dff2aa092b991c8411771a2b8c361bcf000258a
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
index 17a81045fb12..f92377d57912 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~m68k ~s390 ~sh ~x86"
+KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 ~sh x86"
 IUSE="libressl nls pkcs11 debug"
 
 DEPEND=">=app-crypt/trousers-0.3.0
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
deleted file mode 100644
index 3be16cf93ed1..000000000000
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
-HOMEPAGE="http://trousers.sourceforge.net"
-SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 ~sh x86"
-IUSE="libressl nls pkcs11 debug"
-
-DEPEND=">=app-crypt/trousers-0.3.0
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pkcs11? ( dev-libs/opencryptoki )"
-RDEPEND="${DEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	sed -i -r \
-		-e '/CFLAGS/s/ -m64//' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags $(usex debug -DDEBUG -DNDEBUG)
-
-	econf \
-		$(use_enable nls) \
-		$(use pkcs11 || echo --disable-pkcs11-support)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-05-18 00:10:51 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-05-18 00:10:51 +0100
commit	eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch)
tree	3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /app-crypt
parent	a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff)