gentoo resync : 02.08.2019

30 files changed, 315 insertions, 129 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index a24d8510c48e..2f4b2d0ab427 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acmebot/Manifest b/app-crypt/acmebot/Manifest
index 681acef924b9..8ea94e3e4738 100644
--- a/app-crypt/acmebot/Manifest
+++ b/app-crypt/acmebot/Manifest
@@ -1,4 +1,4 @@
 DIST acmebot-2.3.0.tar.gz 64841 BLAKE2B 92bfb9a58722b9955fe908e2fcb1a3ee593bf87e3fdf3dc9564bcbe291b13c553ad426673c337a59344287da64c4ee5cffc734f8dfb60447f96d6234814f0167 SHA512 3951cc7138eb0b83bd802a2e0a221fa985209ba276028606d887b7d2eff84c35db034f4a3d8a6836b3ac149c6dbfa27b1ea47e864f549f8d88b758b40407c4f4
-EBUILD acmebot-2.3.0.ebuild 1213 BLAKE2B ef6a6adea38df262c8099e2996dacc04ebadcc32526a5ff4b1b1cad85f447d528e7426be36d21dfd572c4615f5c28d368cf8617edcac5a4b007ce965ec605df6 SHA512 b555957d102f6707f573fb2eed0865c7b2729fed86265a9427648ba51ff715873f0de7b138b679d052d1eba1e36119e44a425c61417df438f847ce8bffc4acad
-EBUILD acmebot-9999.ebuild 1213 BLAKE2B ef6a6adea38df262c8099e2996dacc04ebadcc32526a5ff4b1b1cad85f447d528e7426be36d21dfd572c4615f5c28d368cf8617edcac5a4b007ce965ec605df6 SHA512 b555957d102f6707f573fb2eed0865c7b2729fed86265a9427648ba51ff715873f0de7b138b679d052d1eba1e36119e44a425c61417df438f847ce8bffc4acad
+EBUILD acmebot-2.3.0-r1.ebuild 1208 BLAKE2B 792893c9e3293bfad5aaef34d5866a6f2c01c829d479cb0916834409776f6e8c51757752c6902ed7c5af26c40ba8961ca12d3878e0a5d5af66c5ddeabf4dcb8c SHA512 0c69ff9b2c6180cdceffbefa02afffa7364e400074fc8402c72e65ab63332334a81af2115c6d04459821abeaba53edc98fcd49032fe372696de7010dae99fe5b
+EBUILD acmebot-9999.ebuild 1208 BLAKE2B 792893c9e3293bfad5aaef34d5866a6f2c01c829d479cb0916834409776f6e8c51757752c6902ed7c5af26c40ba8961ca12d3878e0a5d5af66c5ddeabf4dcb8c SHA512 0c69ff9b2c6180cdceffbefa02afffa7364e400074fc8402c72e65ab63332334a81af2115c6d04459821abeaba53edc98fcd49032fe372696de7010dae99fe5b
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-crypt/acmebot/acmebot-2.3.0.ebuild b/app-crypt/acmebot/acmebot-2.3.0-r1.ebuild
index 80bd249ecd73..a179ed4c74a8 100644
--- a/app-crypt/acmebot/acmebot-2.3.0.ebuild
+++ b/app-crypt/acmebot/acmebot-2.3.0-r1.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-CDEPEND="
+CDEPEND="${PYTHON_DEPS}
 	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
@@ -34,8 +34,7 @@ RDEPEND="${CDEPEND}"
 DEPEND=""
 
 src_install() {
-	dobin acmebot
-	python_replicate_script "${ED}"/usr/bin/acmebot
+	python_foreach_impl python_doscript acmebot
 	insinto /etc/logrotate.d
 	doins logrotate.d/acmebot
 	insinto /etc/acmebot
diff --git a/app-crypt/acmebot/acmebot-9999.ebuild b/app-crypt/acmebot/acmebot-9999.ebuild
index 80bd249ecd73..a179ed4c74a8 100644
--- a/app-crypt/acmebot/acmebot-9999.ebuild
+++ b/app-crypt/acmebot/acmebot-9999.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-CDEPEND="
+CDEPEND="${PYTHON_DEPS}
 	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
@@ -34,8 +34,7 @@ RDEPEND="${CDEPEND}"
 DEPEND=""
 
 src_install() {
-	dobin acmebot
-	python_replicate_script "${ED}"/usr/bin/acmebot
+	python_foreach_impl python_doscript acmebot
 	insinto /etc/logrotate.d
 	doins logrotate.d/acmebot
 	insinto /etc/acmebot
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index f702576afdfa..9d58a533fd24 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 1200 BLAKE2B cdd1c6ae1e3fbc1cc6d8084fdbe19136525ba45d8b8b5a2124e999ea329cb614ae7c5346758285c8eb426e2c1e26d08b79c62c174ce9bef77f191a2fbe3a131b SHA512 ecb415571b4a562089743df6ba2a503384ff9014eabfd73419381c9833ed4a25f6ca9601a647e2409ec21d3b5b4f99986aada82969f86b2022962dc7ecfdf031
+EBUILD argon2-20171227-r1.ebuild 1199 BLAKE2B af897c86e6f85587d760f7d3e7493df361f1803a7e14b66870e3235e2463fff6319854e9a32bb40087f7d5fef859774796612f34ab2c32130db8786a31f0f113 SHA512 bd6a3a1d24bd77e6d75f466100bddc0d4703b7703baf6572ea62dc6086b8d53dd6f944a3dce736129a619bb20b48b9264785eebdbc6aaf492738812277e17f6e
 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 3c178c04a043..619565bd4c99 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/cfssl/Manifest b/app-crypt/cfssl/Manifest
index 639d410b936c..a48cce0844db 100644
--- a/app-crypt/cfssl/Manifest
+++ b/app-crypt/cfssl/Manifest
@@ -1,5 +1,7 @@
 DIST cfssl-1.3.2.tar.gz 6867118 BLAKE2B 775b3419ecf878d9add13faf03a3e1d4cca7b30d965f1ca55c8faa5abf679188a1ea1f80c1416f19c85bc551395628a31da8669ca647e1c1e7a1a313d68f4c7b SHA512 aba27a282c8ca8e95769996aea7e5300b0c3f8fea7ae26484d19a7e1a0330f0b3a0649407062f1a10e8c93136693954e3b24c92456f69db3abee509f982ba554
 DIST cfssl-1.3.3.tar.gz 5005924 BLAKE2B 81e7ec1f27a6597d69f16254a5ded672b9b3ac0bc8dee0f5bb00939e86147b1ed0389d38ea406fe671f3de052ac2e88fe320ffbf6065a83c2d9627ac3c497740 SHA512 39b42f3f8c22e254fa8ed4079308ecad1b0f77cdb56e57099e434389866e58863687307d6cf0f5ec8e4664ad4743ee8728f47a6a1375f3f74f8206a709f0ffc3
+DIST cfssl-1.3.4.tar.gz 7092440 BLAKE2B 85a7a73ae5b18ae0e4ac02b1a4d5f633d73f2c0f81cb49ef85c39b6a241ac538220a8cebb448af795140a6308f46f6e53003f25a31edad452cb6db39ff95a9b2 SHA512 796f24f9a7cd9966b3586b5b08deb410570cc31ec747b0c834215c105df1b4fea4907bfa223d196ad71fb296724dc690b6ffd298c8ef81db1333ed3e69f1ecd4
 EBUILD cfssl-1.3.2.ebuild 750 BLAKE2B 68a9cb8b12c8f5accdd88c17dfbb061ba9213e5ba3e975ccc3b40bc69d6a16e8b4092462f45c84863e576a3586dca0d2d256b03a0fce8a4dc679f933a0645a76 SHA512 aefe6c912d5b40145a01bcdc273abacc1a93e5c76b12f26b0a04db13e6fccb9041939469fd98ed507adc5ca4ca84ecdf8833422643f87777331ddf27ca9448fe
 EBUILD cfssl-1.3.3.ebuild 751 BLAKE2B 8d4ed51cb89139b96f1dc089843dc667e1e9209f95c7cc387815da16abebf224c123c68dc38ea81f57ee26d6bbdf3ea223401b3efe1067b26ce2ebe2443c3e05 SHA512 4dcf38025a8c280e310a92e97560cba2b3bac9a4ac4e8e15010e14d63023ebb407470976425d7b7342a9236195925afbb72a6ac736bb51ff646f508475f43b04
+EBUILD cfssl-1.3.4.ebuild 751 BLAKE2B 8d4ed51cb89139b96f1dc089843dc667e1e9209f95c7cc387815da16abebf224c123c68dc38ea81f57ee26d6bbdf3ea223401b3efe1067b26ce2ebe2443c3e05 SHA512 4dcf38025a8c280e310a92e97560cba2b3bac9a4ac4e8e15010e14d63023ebb407470976425d7b7342a9236195925afbb72a6ac736bb51ff646f508475f43b04
 MISC metadata.xml 329 BLAKE2B 5188aa700150b22b0d2972d57ee0db2d1a2239017edbf9547961126b7158060c74aaafd1ffedfa25f76402766a4403d41f3875a8bd2c43d84150177879e35186 SHA512 b56f2d72ad1a5ef0c2531cc1d3524bf13f7089d099bbd774d1774aca5dfb7f8c074b945203ccb80672c154f98d8728cf9d8671e7df9b328c01c2e79cb9ba8be5
diff --git a/app-crypt/cfssl/cfssl-1.3.4.ebuild b/app-crypt/cfssl/cfssl-1.3.4.ebuild
new file mode 100644
index 000000000000..64942d2fca9b
--- /dev/null
+++ b/app-crypt/cfssl/cfssl-1.3.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/cloudflare/${PN}"
+inherit golang-build golang-vcs-snapshot
+
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Cloudflare's PKI and TLS toolkit"
+HOMEPAGE="https://github.com/cloudflare/cfssl"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="hardened"
+
+RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src || die
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${S}" go install -v github.com/cloudflare/cfssl/cmd/... || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+	pushd src/${EGO_PN} || die
+	dodoc CHANGELOG README.md
+	popd || die
+}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index e031cfd3ce0e..de5e7661c3f4 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -15,5 +15,5 @@ EBUILD gnupg-2.2.15-r1.ebuild 4510 BLAKE2B ace05abf02aa56cbceb46fd205398ca110b78
 EBUILD gnupg-2.2.15.ebuild 3700 BLAKE2B b2502a5e584a7c611b1635c33e3aaa1187a7a2ff84d2337c392fae922d7c4f50d24bafd022b9c27bd942306306f18e9905ca19a5218c8fecd2c7573c85f1418d SHA512 b54de720e1885a6010c00fc8f3e1c30acb1540eb6c9796e0f7165db18ecbc002d48c149f0270634bc1bb060791cfc2a3fe0e6020cbd80bf00a8f77197a50386e
 EBUILD gnupg-2.2.16-r1.ebuild 4559 BLAKE2B 0296c31e7c20dc25a49de6f6cb23c393cccfa1dab610eead32fca98b09e37c1ab84d9bd00ca2c613b1444649f949cc725e4d9c99f83b809257bcd38f882df9dd SHA512 6b5b67d717a6a6c23bb2cf6dad7c746aa7d4a20bad767a3e7916fb2bda76710e3c3ebf33d6eb4e4dad8bcb58b054d6c3c7bcc0b586a180243f1a288af0f08f80
 EBUILD gnupg-2.2.16.ebuild 4510 BLAKE2B ace05abf02aa56cbceb46fd205398ca110b785c38889fea575a32dc4e21bff0933112ccf6c59acd5bc1cb700e33349d67ab2af900cd7098f6874e2bef5b9c4da SHA512 8289b2921ed18514a81d80b7c685e691de2c1c0aff6159a354f2e0e86a0d5b788099b98ed7b8770a5fe5372207cd9779b42d638a25e954f629a537f8a6f4e2c6
-EBUILD gnupg-2.2.17.ebuild 4551 BLAKE2B eec2a109b79ed2aa1523aa124ca880b86c10068d44fb66403fcb2b8bf84bf51d63b0f5abcc9c2e1365215a3dfc61242cdf3f1b8639813bdc3e1b9902bc8f2414 SHA512 c3f8bd53bf6d32ace5c06dcc21e3ccd822bc58f351f69a332c179688588c5ec0c9aab6f2f534a5746f9888854252eb32b694ecec75eb7d53d7f0ab307343144e
+EBUILD gnupg-2.2.17.ebuild 4548 BLAKE2B 143d02639279e1d16c544e660aa17f1b28ae157d0ea8224e55002c89c1c7b607f4eb3dba2a81f479f985e2a4672436ae7dff77903474d2fb62c9232879ae277e SHA512 67352dd85c666ee2256ec9a324a9d385fdb4afa7d746e93002445c9cc199e2670077ca4244529bf97d70fa14d8b133f81cea3e569af07beb97fe6d1b97434e43
 MISC metadata.xml 1313 BLAKE2B 2bf26407bdea8af215d09d28640b961ee98c86c297595736fbe477c8b9cfaf0f8970982ce22038dabf0d8529e39032a3fec9da0c17a5acca0cf3cb197f31f1c0 SHA512 0500f03936eba67706cea87c1f5b16db280b159fc31780b93e696e8ab20e3dece90f0bd80af5aa9582cab557cc337c65e8e101daa935ba6ca31b7f126328c0ac
diff --git a/app-crypt/gnupg/gnupg-2.2.17.ebuild b/app-crypt/gnupg/gnupg-2.2.17.ebuild
index c20981352f96..f7806268df02 100644
--- a/app-crypt/gnupg/gnupg-2.2.17.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index 5617e9564514..b5bb2f34d22e 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,5 +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-r1.ebuild 1722 BLAKE2B b04cc826b6a8e8e0e6d575c518e6ea51885c44366255e50cb3ced39ca9c1e03f38a32f114d30d7627cccfeeee9d1964ad7bc174377d85e91655be1bb2db47484 SHA512 4bca5c5d93383dd653eb443302d6697c7b924a2419bbb8b3f9154e2531d9645126bbcedb6aeca7e10f13091683988ddb3e333d6fe4c0e7acd23e7d93b1e88c91
+EBUILD libb2-0.98.1-r1.ebuild 1741 BLAKE2B b7b7b30fbb8f2a32550ca4b44d5ea4c5819fa08b9447dd0f2d06f8725dcaeec7d22fedf538c930e3b10ba92a6322603ef3ad9391c49e4c8ac99c330fec8d48bb SHA512 13995a48064628dbfc3c3df1d4e2594c72ef64b8fa7e57830439250c01092896938d3b79f523680456f068b20fede844e02660fb51ddd18995e77f31bd6c81ba
 EBUILD libb2-0.98.ebuild 1015 BLAKE2B 8f6fc70a953aea90fa5dbecd894dd5b1335fe9bf737547f8c2c42ab46cc8b718f0bf1ad941b54820b36ce62829a3d2d4d0de1d6e8c34c90c839d4019781a0765 SHA512 7d1a55ff33988e20ab4588f17dc0a1d982c02ea785e1d9535ff740b923129c5491282191e77d6a8dddcb500bce22626face82b40354fcb4da207a2bdcbbdab2b
 MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11
diff --git a/app-crypt/libb2/libb2-0.98.1-r1.ebuild b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
index a67c7e32b461..e0138e8f515a 100644
--- a/app-crypt/libb2/libb2-0.98.1-r1.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs native-cflags openmp"
 
 DEPEND="
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index fb25c7d9aefa..3d1f0c2768cf 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,7 +1,5 @@
 DIST libsecret-0.18.6.tar.xz 487836 BLAKE2B d38a41743142d33e634d77bbf55ccab044def9658b3f50bd3f8cec9be6372ad1a56dcc4de58126cba1246c16da2863c003bf14ea6c8a90d8667658cf492f4b9a SHA512 4997519762f1470cfc0a4b3a791362d030af3c9b6ce6f58f8f8073b3a8adeea9b8caacedc884163997081dc39f395f9172330dbb41fed45d6c43ac5809de48e3
-DIST libsecret-0.18.7.tar.xz 508392 BLAKE2B 9774df97c2abb362940c3b373e381afb82ee6af3866cdc18ad52159e824dd9097739d4900eb2dffe117e5b28e2057d0db0cadc3b02e063112309b63fd4d1b870 SHA512 a8890ec52dcfba585fd665ee89e81f4a1d6a04b67bcf4f3422f27973a4ef6fc1281bf54e92160d39dd696ae08a633bab5fe25c1124baf32eb5b414e98ddfa084
 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 2641 BLAKE2B 789217298995f5538fdf48382c11083ea84f7e218236df33382c8c69596d9752557f4ceb5ca0078e2846a7666a97bab8e6fcc71c0e1360f54a67d1462fcb8075 SHA512 0e9fcb2215ad9eb3ce9b17cf510070a69645e3c85382b6bf8371137e6f3ccd8ca3a7d356b892a94bc39fd7f82afebf07c0cfe0ea51df57ee1f7edcbf25b86c0d
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.7.ebuild b/app-crypt/libsecret/libsecret-0.18.7.ebuild
deleted file mode 100644
index a54021526b73..000000000000
--- a/app-crypt/libsecret/libsecret-0.18.7.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-VALA_USE_DEPEND=vapigen
-
-inherit gnome2 multilib-minimal python-any-r1 vala virtualx
-
-DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
-
-LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
-SLOT="0"
-
-IUSE="+crypt +introspection test vala"
-# Tests fail with USE=-introspection, https://bugs.gentoo.org/655482
-REQUIRED_USE="test? ( introspection )
-	vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
-	crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.29:= )
-"
-PDEPEND=">=gnome-base/gnome-keyring-3
-"
-# PDEPEND to avoid circular dep (bug #547456)
-# gnome-keyring needed at runtime as explained at https://bugs.gentoo.org/475182#c2
-# Add ksecrets to PDEPEND when it's added to portage
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.9
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? (
-		$(python_gen_any_dep '
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
-		introspection? ( >=dev-libs/gjs-1.32 )
-	)
-	vala? ( $(vala_depend) )
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version --host-root "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	has_version --host-root "dev-python/mock[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/dbus-python[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	# Drop unwanted CFLAGS modifications
-	sed -e 's/CFLAGS="$CFLAGS -\(g\|O0\|O2\)"//' -i configure || die
-}
-
-multilib_src_configure() {
-	local ECONF_SOURCE=${S}
-	gnome2_src_configure \
-		--enable-manpages \
-		--disable-strict \
-		--disable-coverage \
-		--disable-static \
-		$(use_enable crypt gcrypt) \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_enable vala) \
-		LIBGCRYPT_CONFIG="${EPREFIX}/usr/bin/${CHOST}-libgcrypt-config"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/reference/libsecret/html docs/reference/libsecret/html || die
-	fi
-}
-
-multilib_src_test() {
-	# tests fail without gobject-introspection
-	multilib_is_native_abi && virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/app-crypt/paperkey/Manifest b/app-crypt/paperkey/Manifest
index 110c7c572105..7041bb68fd48 100644
--- a/app-crypt/paperkey/Manifest
+++ b/app-crypt/paperkey/Manifest
@@ -1,5 +1,5 @@
 DIST paperkey-1.5.tar.gz 266722 BLAKE2B 8b838b70690a080ca3e579780af890021f218e86dc73099e2adc457c169d2268795e34779d839b63cfe4fec549f44df058d49a853f9c02a878c2163a5e03b393 SHA512 3abe6be913748c08dd2a8fad1e0624dd77a14972abdc76722507ec454aa31cd24fe9ae9f85e256300e568fbc84da6369fbf07f93ae8520f71c46edae4f0f6fe6
 DIST paperkey-1.6.tar.gz 271424 BLAKE2B 625a26bbae93122acf553036e902421ec630f6f92507b1f6dd231e970fc8d94a9d7017018bb783f934a37577de3e0c4f1fa68ca359c3de06f1a87590c188d266 SHA512 a07fc22bf56cd9524ecba61d1bf00102e6e97842e219682771187a2a2327c9daa885d457417bb2ea960f5ebd66bd711fa1d86687fda159647ff47980dee21b01
 EBUILD paperkey-1.5.ebuild 350 BLAKE2B 8476d7e01275eb1beb1ff2833c9d497ab229256e62e6778df478ad29eba3a54110257d22aac315b0f4bdbc3bfb4fa20f5384ef00a4898a7705775c1d110a4809 SHA512 215a9f17c548b6254d37a6f9d9faaa335916d37bd13ec262dcac2d663e66b4de8730b34c70bd1eb6108149afde67ded43571fe2e8e9c5b8950b4ba2c342b03a8
-EBUILD paperkey-1.6.ebuild 342 BLAKE2B 433d27fadc9ab867e10304cd5249b9bc754212a9182d521b9cbc98dc877c6201a687194e98f11d0a027a858adf7fbd7e5fe76a4362e537c8e6fe885f3a7c00f3 SHA512 8f4a95c230e961ed56e2bda6e2d61edf4f05c59fdc3f2f05d30926e18f43588f0882df4113aaf938bd466192857cef8272fd5d077e9469c91b48bed4624d8701
+EBUILD paperkey-1.6.ebuild 341 BLAKE2B 2e24b6da3a58148351585e2252255202b84976f4038b212997e8cbead2f69737499395f6558ab4c8285f0687c9baf8d3f0df2b3a2dc5495f2768b1e110d79d88 SHA512 faab520b974a66f8b5ee9faa2c962800c7af8e1be3641c3c8dd1579bc4ce7c4c3d9b34dc5ffd717d05f3d30e69e0c6ecd35aebfa4e4235c2d574c7966a258d4b
 MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3
diff --git a/app-crypt/paperkey/paperkey-1.6.ebuild b/app-crypt/paperkey/paperkey-1.6.ebuild
index c5eb3c6a14da..3171c4d84293 100644
--- a/app-crypt/paperkey/paperkey-1.6.ebuild
+++ b/app-crypt/paperkey/paperkey-1.6.ebuild
@@ -9,5 +9,5 @@ SRC_URI="http://www.jabberwocky.com/software/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~x64-macos"
+KEYWORDS="amd64 arm64 x86 ~x64-macos"
 IUSE=""
diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest
index 78cd24ee9063..bb28254bf8d3 100644
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@@ -1,5 +1,8 @@
 AUX pesign-0.112-fix-cli-opts.patch 2228 BLAKE2B 6037340b1bc0c659ec2be5358d781b29f0fe755a17e7c17f612ef7c8dc514dc5d5ed2c49121463caa269e01a206a160ec725f7545a004fe10ffc35841f23625a SHA512 62d2ec0059ff518b576b6399a217f47b1f361c41292055b8a7326e81cda30190b4a62dad7dd8150855b2025af1ad25458a2cbbfd3ae89ca6c870067224662695
 AUX pesign-0.112-fix-initializer.patch 388 BLAKE2B e5beacd2503dbde5c6e4ba748c4dc5151747028b3448e91fcb2e52f6e2622ba5f84cb29a816c67979dcf7ab40b9f3d2ea10ff31033027c18b68c863ab2eed86e SHA512 1b76c6dfe7ddc76a2051038894b7e2da72c01ebc05a46d4b6ebc05a092a55d699161e04c4df73d1afb7752e6a138ed8c9c28eda55897c82934ca852be42dae84
+AUX pesign-113-nss.patch 2092 BLAKE2B f75730c2ab48f0ff6af4237fc46c535b3ceead357e31a548c28b78648fec7d52a5cc1bc9dfdb9db4e6cf22b7312cc452afb04a3088810140055ae88b55fb2f1d SHA512 7a4ebd4c875cf6678a6d2ca4083eafea552259e2c1692d167d0b948ac73d50244db3feea1c6d7c403e152236421609da5d92cd6405fb3107e1c3933c2f94fece
 DIST pesign-0.112.tar.gz 107632 BLAKE2B 737b75aec7efa9f41dbdb509405dede914cd5aa563572f0d2ede96a321f4a669170c696c7bd93bad1a5c1a6f2c65715b66317544fa6fc55d6b7f85436d778e8a SHA512 9a0cd266f973fbd7bbbd23939d0be3c34dbccd9ab20941bf967ca1b18aa5bf5d2c41cdef0799399e09e7b0fc59a0b34bc660afb6da292eb1c127db2893362018
+DIST pesign-113.tar.gz 124618 BLAKE2B 36cdface6ecdf9003251da3058b21b2ee8e94eb655e47a8668b38c4ea576d990a71860952eea277d5e029bb007039c8e3ded9918e89d47f6db404423acbd1cc7 SHA512 e71dc90c2ab8085d1b000c0d2cf9cb00ddaed1ea1393db75c2d19a96f1b1c188a26b76850533ba97ec254a3b48db6b07a69b597c329ac891e64422780a358c24
 EBUILD pesign-0.112.ebuild 1222 BLAKE2B c72e2506d5a391db63c12f2f299772d3531aa029eb4116ce731e6608f9f10496c64489475d56473e5896b2649c0312359c3f6ea009cb3a1c9357a9d34c53b60c SHA512 17314da5a476af1543bb5ce71e764e0a93bd4ddd7ea61f0ced626aebf5abb9683f204af08845d13b7e84f591c580cb8fb4ef205134cb38c1087d717585a6f00a
-MISC metadata.xml 466 BLAKE2B f7c15efd0e75918931fb23acd033a3273820cd449e397af5dd1195e3de85e9b5b9510ac22fef9bcc3be820cfc2f09f61cb5e4fd8742797aa28d915cb275c098f SHA512 cffb289b804411ba72b52113ac4784e2873c0c0730496eb3b29a35c2d2a8891031f579e70cb7a64f0da685fedbcf3f0787ed2c630664cb6c363ddbd66e0d1364
+EBUILD pesign-113.ebuild 1177 BLAKE2B 2ac7fc3a2197194d5e1518ea110789054947eb94b2001190c34dcc6883559052681517361152ffdf39b807572d338f7764511a3dc109b27daf11c47ea557c8f7 SHA512 42308998cf9546dc4e844c96688c3c9990e51ee001925783e2e985cec4ec5470e63d62302cd8d81a5ae55492fc64e15eec8ff07a03da56c0bc53d1239a2ffdb1
+MISC metadata.xml 248 BLAKE2B 53654091f15005bbc49262b840fd687c88b36450646c7639f9767a891a973f393dbbdc093143b3b120e50b1263e383d674e227c44de4c204b34a3a7892ed59e7 SHA512 c77276afdf688db707b87d976aa741c359c9152d0de1ffbdb9d3202a3b62aa2797cd8beb86354dad9fa2158be17948f53995ab9b92ea04ef79e6dd8ac3ede1fa
diff --git a/app-crypt/pesign/files/pesign-113-nss.patch b/app-crypt/pesign/files/pesign-113-nss.patch
new file mode 100644
index 000000000000..5a227a87268b
--- /dev/null
+++ b/app-crypt/pesign/files/pesign-113-nss.patch
@@ -0,0 +1,47 @@
+From b535d1ac5cbcdf18a97d97a92581e38080d9e521 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 14 May 2019 11:28:38 -0400
+Subject: [PATCH] efikeygen: Fix the build with nss 3.44
+
+NSS 3.44 adds some certificate types, which changes a type and makes
+some encoding stuff weird.  As a result, we get:
+
+gcc8 -I/wrkdirs/usr/ports/sysutils/pesign/work/pesign-0.110/include -O2 -pipe  -fstack-protector-strong -Wl,-rpath=/usr/local/lib/gcc8 -isystem /usr/local/include -fno-strict-aliasing  -g -O0 -g -O0  -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants --std=gnu99 -D_GNU_SOURCE -Wno-unused-result -Wno-unused-function -I../include/  -I/usr/local/include/nss -I/usr/local/include/nss/nss -I/usr/local/include/nspr  -Werror -fPIC -isystem /usr/local/include -DCONFIG_amd64 -DCONFIG_amd64 -c efikeygen.c -o efikeygen.o
+In file included from /usr/local/include/nss/nss/cert.h:22,
+                 from efikeygen.c:39:
+efikeygen.c: In function 'add_cert_type':
+/usr/local/include/nss/nss/certt.h:445:5: error: unsigned conversion from 'int' to 'unsigned char' changes value from '496' to '240' [-Werror=overflow]
+     (NS_CERT_TYPE_SSL_CLIENT | NS_CERT_TYPE_SSL_SERVER | NS_CERT_TYPE_EMAIL | \
+     ^
+efikeygen.c:208:23: note: in expansion of macro 'NS_CERT_TYPE_APP'
+  unsigned char type = NS_CERT_TYPE_APP;
+                       ^~~~~~~~~~~~~~~~
+cc1: all warnings being treated as errors
+
+This is fixed by just making it an int.
+
+Fixes github issue #48.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+Upstream-Status: Accepted
+[https://github.com/rhboot/pesign/commit/b535d1ac5cbcdf18a97d97a92581e38080d9e521]
+---
+ src/efikeygen.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/efikeygen.c b/src/efikeygen.c
+index ede76ef..2cd953e 100644
+--- a/src/efikeygen.c
++++ b/src/efikeygen.c
+@@ -208,7 +208,7 @@ static int
+ add_cert_type(cms_context *cms, void *extHandle, int is_ca)
+ {
+ 	SECItem bitStringValue;
+-	unsigned char type = NS_CERT_TYPE_APP;
++	int type = NS_CERT_TYPE_APP;
+ 
+ 	if (is_ca)
+ 		type |= NS_CERT_TYPE_SSL_CA |
+-- 
+2.22.0
+
diff --git a/app-crypt/pesign/metadata.xml b/app-crypt/pesign/metadata.xml
index ac456968425e..05b4bfdb6570 100644
--- a/app-crypt/pesign/metadata.xml
+++ b/app-crypt/pesign/metadata.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>david.michael@coreos.com</email>
-    <name>David Michael</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+  <!--maintainer-needed-->
   <upstream>
-    <remote-id type="github">vathpela/pesign</remote-id>
+    <remote-id type="github">rhboot/pesign</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-crypt/pesign/pesign-113.ebuild b/app-crypt/pesign/pesign-113.ebuild
new file mode 100644
index 000000000000..40d481c35cc5
--- /dev/null
+++ b/app-crypt/pesign/pesign-113.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tools for manipulating signed PE-COFF binaries"
+HOMEPAGE="https://github.com/rhboot/pesign"
+SRC_URI="https://github.com/rhboot/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+RDEPEND="
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/popt
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-apps/util-linux
+	sys-libs/efivar
+"
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	sys-boot/gnu-efi
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-113-nss.patch )
+
+src_compile() {
+	emake AR="$(tc-is-gcc && echo "$(tc-getCC)-ar" || tc-getAR)" \
+		ARFLAGS="-cvqs" \
+		AS="$(tc-getAS)" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		RANLIB="$(tc-getRANLIB)"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" VERSION="${PVR}" install
+	einstalldocs
+
+	# remove some files that don't make sense for Gentoo installs
+	rm -rf "${ED%/}/etc/" "${ED%/}/var/" \
+		"${ED%/}/usr/share/doc/${PF}/COPYING" || die
+}
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
new file mode 100644
index 000000000000..e69c3734d01f
--- /dev/null
+++ b/app-crypt/swtpm/Manifest
@@ -0,0 +1,5 @@
+AUX swtpm-disable-test-dependencies.patch 774 BLAKE2B 8089885d5b21cea09fb5ec59d69640754671ba27763d57bdb45345768722166d4cd5fa0d890542aa79a90c2b8e609f611ac4ccd58be71ec13128d81daccb50bd SHA512 d803222c8fb04a7909f8a60563dfd23327c842f12138309f3b901309651857d6c545ca8e46c68c9b60b97f0e03ab79575784e242409d41b3d69e6ad8516428e5
+AUX swtpm-fix-localca-path.patch 1197 BLAKE2B fb94a734303e1c71158ffda2958275a377d9c75b98262061b06bb22d2dce6efd3b5d126758b65cbab8141a78549c4ab99d3aa2c241c4870de67f871706840b5d SHA512 c9a0e6ee27f0b38b65f2cad65a48622c3b9e9e8913bba002f0c82168f22162dbc62ed2b104942ed8141889625f225f29516ecbd20ba6ffb5091eb2201df0f107
+DIST swtpm-0.2.0.tar.gz 297419 BLAKE2B 9045cfd127d2f7e8e2e202818a375b4f6398806a097ed0df73abb76426db3af65a0d27f5e7212ce099d796862d3a9b3d421e987cf159bdce8879fc764eb5e923 SHA512 bda54690c0438138ff7adcc212fb125d2bb62618b10305eeced776e014bb135ea1a1dd1271a99fb2c60bf7e418644ded029c3c09ec2c6c1258e5062122cacf19
+EBUILD swtpm-0.2.0.ebuild 1224 BLAKE2B f19ffd5b4e918974c89a03e3ba7274f1264f913103a54c98e1fdff55359c0ae0daa6d077bbfc6d3a1ae2a944bcfd33d54494e352621933f677d7a7d29dcc18db SHA512 e7db96d26f01ae0ac36e6f889ff2dc30bee375240ac18815660f7e5e6acd4a786ecb555e8b7861431561b18a04783b35e5c57f3839bd2fe703a07f0934678daf
+MISC metadata.xml 457 BLAKE2B defc06c2642823aa760cafc22e90f891f9337358bfaa446778e1f4107f6e295ec21b5987f49bdcee3fd7b68084be1b864d7569e74bd729345e4886b08c617a06 SHA512 c80e24dc4ec41e5aae1e7fe67208c945e62c02f469164d0a76445269e3e0204674cd593956f99fa1539505e1a70a15bbf6c02afcf6b38592f04f3c4d3f275e08
diff --git a/app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch b/app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch
new file mode 100644
index 000000000000..ff2536676637
--- /dev/null
+++ b/app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch
@@ -0,0 +1,36 @@
+diff --git a/Makefile.am b/Makefile.am
+index 47b091a..61192bf 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -9,9 +9,7 @@ SUBDIRS   = \
+ 	include \
+ 	man \
+ 	samples \
+-	src \
+-	tests
+-
++	src
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ EXTRA_DIST = \
+diff --git a/configure.ac b/configure.ac
+index c7b4e98..8e6445b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -330,16 +330,6 @@ if test "x$GAWK" = "x"; then
+ 	AC_MSG_ERROR([gawk is required: gawk package])
+ fi
+ 
+-AC_PATH_PROG([SOCAT], socat)
+-if test "x$SOCAT" = "x"; then
+-	AC_MSG_ERROR([socat is required: socat package])
+-fi
+-
+-AC_PATH_PROG([PYTHON], python3)
+-if test "x$PYTHON" = "x"; then
+-	AC_MSG_ERROR([python3 is required])
+-fi
+-
+ AC_ARG_ENABLE([hardening],
+   AS_HELP_STRING([--disable-hardening], [Disable hardening flags]))
+ 
diff --git a/app-crypt/swtpm/files/swtpm-fix-localca-path.patch b/app-crypt/swtpm/files/swtpm-fix-localca-path.patch
new file mode 100644
index 000000000000..c83758da5636
--- /dev/null
+++ b/app-crypt/swtpm/files/swtpm-fix-localca-path.patch
@@ -0,0 +1,29 @@
+diff --git a/samples/Makefile.am b/samples/Makefile.am
+index 4558d66..6fc6d77 100644
+--- a/samples/Makefile.am
++++ b/samples/Makefile.am
+@@ -16,9 +16,9 @@ samplessysconf_DATA = \
+ 	swtpm-localca.options
+ 
+ install-data-local:
+-	$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/swtpm-localca
++	$(MKDIR_P) $(DESTDIR)$(localstatedir)/swtpm-localca
+ 	if test -z $(DESTDIR); then \
+-		chown @TSS_USER@:@TSS_GROUP@ $(DESTDIR)$(localstatedir)/lib/swtpm-localca || true; \
++		chown @TSS_USER@:@TSS_GROUP@ $(DESTDIR)$(localstatedir)/swtpm-localca || true; \
+ 	fi
+ 
+ EXTRA_DIST= \
+diff --git a/samples/swtpm-localca.conf.in b/samples/swtpm-localca.conf.in
+index 1f0b48d..63f1fed 100644
+--- a/samples/swtpm-localca.conf.in
++++ b/samples/swtpm-localca.conf.in
+@@ -1,4 +1,4 @@
+-statedir = @LOCALSTATEDIR@/lib/swtpm-localca
+-signingkey = @LOCALSTATEDIR@/lib/swtpm-localca/signkey.pem
+-issuercert = @LOCALSTATEDIR@/lib/swtpm-localca/issuercert.pem
+-certserial = @LOCALSTATEDIR@/lib/swtpm-localca/certserial
++statedir = @LOCALSTATEDIR@/swtpm-localca
++signingkey = @LOCALSTATEDIR@/swtpm-localca/signkey.pem
++issuercert = @LOCALSTATEDIR@/swtpm-localca/issuercert.pem
++certserial = @LOCALSTATEDIR@/swtpm-localca/certserial
diff --git a/app-crypt/swtpm/metadata.xml b/app-crypt/swtpm/metadata.xml
new file mode 100644
index 000000000000..261b73cab058
--- /dev/null
+++ b/app-crypt/swtpm/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>salah.coronya@gmail.com</email>
+		<name>Salah Coronya</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="fuse">Support sys-fs/fuse based /dev/tpm interface</flag>
+	</use>
+</pkgmetadata>
+
diff --git a/app-crypt/swtpm/swtpm-0.2.0.ebuild b/app-crypt/swtpm/swtpm-0.2.0.ebuild
new file mode 100644
index 000000000000..0ee3facecabc
--- /dev/null
+++ b/app-crypt/swtpm/swtpm-0.2.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit autotools python-any-r1
+
+DESCRIPTION="Libtpms-based TPM emulator"
+HOMEPAGE="https://github.com/stefanberger/swtpm"
+SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="fuse gnutls seccomp test"
+
+COMMON_DEPEND="dev-libs/libtpms
+	dev-libs/openssl:0
+	fuse? (
+		dev-libs/glib:2
+		sys-fs/fuse:0
+	      )
+	gnutls? (
+		   dev-libs/libtasn1:=
+		   >=net-libs/gnutls-3.1.0[tools]
+		)
+	seccomp? ( sys-libs/libseccomp )
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? (
+		net-misc/socat
+		${PYTHON_DEPS}
+	      )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	app-crypt/tpm-tools
+	app-crypt/trousers
+	dev-tcltk/expect"
+
+src_prepare() {
+	use test || eapply "${FILESDIR}/${PN}-disable-test-dependencies.patch"
+	eapply "${FILESDIR}/${PN}-fix-localca-path.patch"
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+	  --with-openssl \
+	  --without-selinux \
+	  $(use_with fuse cuse) \
+	  $(use_with gnutls) \
+	  $(use_with seccomp)
+}
+
+src_install() {
+	default
+	fowners tss:tss /var/lib/swtpm-localca
+	keepdir /var/lib/swtpm-localca
+}
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index aabdabaf4a72..c7834bbc0f83 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -2,8 +2,8 @@ DIST yubikey-manager-qt-0.5.2.tar.gz 337194 BLAKE2B d6020116b9082671c039b521bbee
 DIST yubikey-manager-qt-1.0.0.tar.gz 8038084 BLAKE2B 9e1082be62dab2d43bfad3050dd38dbcd10e5b8761bf567ba4f3e1b4627a25709cfa29ac7a23560fff76e0a75b4668932a407268c8d90d791c381ad485fea029 SHA512 2cf5f70b2734a7c0346649f5419dbee39bef9bb80bb498631d4879abc48d422d70468713a48945e284f2bdef20f3bb570a0ac5a4daab6c1ff195d86e39168843
 DIST yubikey-manager-qt-1.1.0.tar.gz 10893455 BLAKE2B d83f76b83f35380377beb0e5c5b4a605049211685ff3ec44f60c909f8bc8f60dcd0868ad666bebce13e7c0459f604dd5d77cb1bd01035fe8584c019aacca39e8 SHA512 b54f1e6908b190ccb9273b906ace9ce2e1d189b794ba9b0ae00dbda4808b3f376b37c5f010ae06eaa63515af9b48698499f87780c59394f8b80f35d64d599c59
 DIST yubikey-manager-qt-1.1.1.tar.gz 10893572 BLAKE2B 22c37332601986495da8c70d9867dc04ad565ea06b38e219ed465586d741ddcb177ada9d5f74c04b46ddd2a5b7c445f05c3055ba1fd61e0696226541dbfb2bce SHA512 e1460abf024f045bffff2cf17a1b8fde2eb508b99957198d8de251315684c9fd591a93b3ad8063da2509ab7f054dce40a4267c1cc97c9dcc734ee18215070fe8
-EBUILD yubikey-manager-qt-0.5.2.ebuild 1405 BLAKE2B 825ca31f82c7bb2eab94f261861b4e7505345fc2e45760b7cf83d89ca3eaeb511ffe103ac97fe0a2d27de62e17f2e6c3554e9bb5a62bbb1feb998f6b16c1381c SHA512 c5e52fb6ccbbee3134268f5c66b6fedef60fcd566f7f1876f75a5fb4299ba102f9ede4cfcbabde6c5904d5ac9ee14c058b2a886a3f1890f1ecc7f8966de7ffa0
-EBUILD yubikey-manager-qt-1.0.0-r3.ebuild 1476 BLAKE2B 2a1632a85ab7e4740c8f6e3e53a7600349799c4e64b0783d5820618ba002b15c37cb0c346a1d0fd71f21bdf5010942f41b4bfa9472c4d2719e122c5cf13b4814 SHA512 15a3194054cd23c67d1dbd0007a29590b6b679cf357991a30304b6fbc9d33f7dffa572767dfe7049323316b9243f4a32a6dcde04283497889cb34b0e90666306
-EBUILD yubikey-manager-qt-1.1.0.ebuild 1367 BLAKE2B 245db63afd23a6281eb21658870af734b11015594a98f14b54a2246253ec4a0227e5cbe2494b504ecd218ff7bdf9f17242c37942a61362ed2f7ba0edf6816ef7 SHA512 f83671edc4d9fbceb7c10be94864c1f0fc87d12202f88be8c47e78a50f5a56c2f48df65c91c4bc8dc56c5d9267a297f9ba030d0d6cebcb84f42037245ce62ab0
-EBUILD yubikey-manager-qt-1.1.1.ebuild 1367 BLAKE2B d72e899dd74cfd132b0bbce7b600a649993bc9baa31afbf2f3a28760b6f201ee8dd26227397a0bca81f2db9d256bb7bce6e8af5ac5c590e670f835b12ff00150 SHA512 1bef77007ed0c00cb412db9d5e68c454a9f64e45f95f18a34e99a6969cea454f093cdfd6d0675ac753e3913a95d93ba61dc479d7b60d3ce9a8fc3a833f6742a6
+EBUILD yubikey-manager-qt-0.5.2.ebuild 1455 BLAKE2B e3c3b884e379b83dd58c843138de076399546121eddf495a624699e609b6ae69ff2169194d9238f3a7040ff53066942fdfd229ce676cf649ecb0de424e8d3470 SHA512 40d013c77453b3a2c3b11124ff98c4c81e7dcce973cef2fd15092576c91c8396e2156ef275673037d1c6c2a8f77c17b1241d95c125278ef4546789b004581759
+EBUILD yubikey-manager-qt-1.0.0-r3.ebuild 1526 BLAKE2B 12ac24fae46efd537fd9992bc4ca4b76040bcaf6b73a7c6849881f868981ee8721cf6497e04f843dddd6c71663e8991fa295ce0faeffff4c4c3788b329b97bba SHA512 b4e7c4a57ced148167ae5b72464627f98f25366705faad34b91c21398d0d8a0b43134b2651368a8dfd395c6987401910e8f12cbc6e756ad8d8121a7450599d97
+EBUILD yubikey-manager-qt-1.1.0.ebuild 1417 BLAKE2B e61a9ce2da02eb298b068cca39ac11fc6fe4cd3683352abc548ade78d4cccf61fbfe266e759182d869d32eac77cf3d0374873f8acac759da1603d1ed687fe036 SHA512 2f33429b5e54af52548778dfc884a87c32e7cfd83b71d964849977d83a9c1c51ebc49774b060880e9e7a8225dc86d2e6461ae46631907193d4c081810be72b22
+EBUILD yubikey-manager-qt-1.1.1-r1.ebuild 1417 BLAKE2B 2e34d6d0166b06dff567cd097ec2392fa99823f839dc4c1abd6dccf69db2ab13abb4e1d110b64e8c76d04fa22cecfe61e308737e66f97a74f707589aa88064e8 SHA512 68b6d44285d4d72b47a000ce078a76a3ba02113e2cd99aa29dfd9d405368df38458250900000d7900f5c122c62e843a9d62e2223652e358e9f111604aca97aca
 MISC metadata.xml 371 BLAKE2B 1081e69aeb641c9d7de472bed98dfb336bc37e5374becbec4603316176419dcdb337f29b355b3395b778d250a99e32b181b84b42d4b7c10dedce7c47a6a187f6 SHA512 ed480648e967bfa3d95f71a5131963290e4265c487a345b69e34ad23c4ab18d82b08cd1e4a12f389533cc9690163fed90c05d471375fadd074c99a235105e837
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.2.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.2.ebuild
index d420feb341cc..e6b61d7f969e 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.2.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.2.ebuild
@@ -14,8 +14,9 @@ SRC_URI="https://github.com/Yubico/yubikey-manager-qt/releases/download/${P}/${P
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-DEPEND="
+DEPEND="${PYTHON_DEPS}
 	>=app-crypt/yubikey-manager-0.7.0[${PYTHON_USEDEP}]
 	<app-crypt/yubikey-manager-0.8
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r3.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r3.ebuild
index 3f3125b92317..0c586a4f439c 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r3.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r3.ebuild
@@ -14,8 +14,9 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-DEPEND="
+DEPEND="${PYTHON_DEPS}
 	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
 	<app-crypt/yubikey-manager-2.0.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.0.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.0.ebuild
index 7c469b8c89a9..78abdfc9c1c8 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.0.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.0.ebuild
@@ -14,8 +14,9 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-DEPEND="
+DEPEND="${PYTHON_DEPS}
 	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
 	<app-crypt/yubikey-manager-3.0.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1-r1.ebuild
index 7d4eb939e34c..360775f894b6 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1-r1.ebuild
@@ -14,8 +14,9 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-DEPEND="
+DEPEND="${PYTHON_DEPS}
 	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
 	<app-crypt/yubikey-manager-3.0.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]