gentoo resync : 19.03.2019

38 files changed, 401 insertions, 248 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 57146acc7973..0a6fdeac1125 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 4a3e7b6b0cda..ccf3380db140 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,6 +1,6 @@
-DIST certbot-0.30.1.tar.gz 1267198 BLAKE2B dc1ce89f376d8cd0ca02dbec50cb39e8c7fc5e140c342b8b80e1226ddffa0a3cf798683679d7815cc9da24ce0371e19f5288619ba69941226f6170f8ec9948fc SHA512 31b790ed6911a9e632327d0833209c679535403d71a9977c8b785cc7585c67a4e18971b33f407598da4c7c67e073b0c2164203df34ec69bf3a0feb6bb326fbce
 DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
-EBUILD acme-0.30.1.ebuild 1267 BLAKE2B e078066c1470516142932c097afab73641b9c5e6cb7b8df411dbd40d898fd743a4cfe0032b793882c59ce3487f609eff0cf5fc588b5f09d36caeb63c2564be3c SHA512 6af21d683a48f864f1c12f4892152ea0c0f22dc44dc39cefa05cbb973ab39cb4f8f9ebde6e6ff0e6a77cca6aa1dcf5840e28e29b6812ea9e71116295a336a972
-EBUILD acme-0.31.0.ebuild 1269 BLAKE2B 2a40ff630b70761a98d9a69428863ccaf9b5e944082079841fe29efa08e5b5dd0a8f7d8fad38d2e078497a99682471201bd87e9f0170cba1eba0c57ef2700a50 SHA512 7e52abd6d65d2bc76ae9d495f2eb6b3d380452a47757fe9294c04d4e121873e13c75ff7f950c905c08e03904e01dc9ac921736e6121940753dbebc06d6043a69
-EBUILD acme-9999.ebuild 1269 BLAKE2B 2a40ff630b70761a98d9a69428863ccaf9b5e944082079841fe29efa08e5b5dd0a8f7d8fad38d2e078497a99682471201bd87e9f0170cba1eba0c57ef2700a50 SHA512 7e52abd6d65d2bc76ae9d495f2eb6b3d380452a47757fe9294c04d4e121873e13c75ff7f950c905c08e03904e01dc9ac921736e6121940753dbebc06d6043a69
+DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
+EBUILD acme-0.31.0.ebuild 1267 BLAKE2B e078066c1470516142932c097afab73641b9c5e6cb7b8df411dbd40d898fd743a4cfe0032b793882c59ce3487f609eff0cf5fc588b5f09d36caeb63c2564be3c SHA512 6af21d683a48f864f1c12f4892152ea0c0f22dc44dc39cefa05cbb973ab39cb4f8f9ebde6e6ff0e6a77cca6aa1dcf5840e28e29b6812ea9e71116295a336a972
+EBUILD acme-0.32.0.ebuild 1269 BLAKE2B ef7aeb0f5927edfd7b83e225ece400a71739b08fdbcc84ccb39261b29a77cf598e54abac55016965d698c686ab5631769a6192f35dd073f98ab1e3436a4d436f SHA512 59920c0d93120f4d01b174d8a868b214d735d96e36bf90b704feaaa44b00dd882e8a86dfc27561bd80326f3e399fb5cba0dc9b411a297bda1d8fb602843a1788
+EBUILD acme-9999.ebuild 1269 BLAKE2B ef7aeb0f5927edfd7b83e225ece400a71739b08fdbcc84ccb39261b29a77cf598e54abac55016965d698c686ab5631769a6192f35dd073f98ab1e3436a4d436f SHA512 59920c0d93120f4d01b174d8a868b214d735d96e36bf90b704feaaa44b00dd882e8a86dfc27561bd80326f3e399fb5cba0dc9b411a297bda1d8fb602843a1788
 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-0.31.0.ebuild b/app-crypt/acme/acme-0.31.0.ebuild
index cc94bdaee734..d4ea2b9f2e65 100644
--- a/app-crypt/acme/acme-0.31.0.ebuild
+++ b/app-crypt/acme/acme-0.31.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-0.30.1.ebuild b/app-crypt/acme/acme-0.32.0.ebuild
index d4ea2b9f2e65..8a9d37f4aec6 100644
--- a/app-crypt/acme/acme-0.30.1.ebuild
+++ b/app-crypt/acme/acme-0.32.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
@@ -25,7 +25,7 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index cc94bdaee734..8a9d37f4aec6 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -25,7 +25,7 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index 2a82762ca94c..03fa724e4ef5 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -1,6 +1,4 @@
-AUX argon2-20161029-makefile-soname-symlinks.patch 807 BLAKE2B 128d7f8db6bc85839ba243a821ab4ba2a40708e8a4dd30be4f264b6280375defa716b430cd4a029f047e08a06a8a29ab4a07abbec50619155fa5e015bd59b48e SHA512 de2e9e0f5b378700aa01004684f7aa9fc60d6e49cd6f994663bb8bb7c357732cbf19c31a563c44b485d5b85a75ea76c283f606ce1d453864b987febd2cbeaa27
-DIST argon2-20161029.tar.gz 1506864 BLAKE2B fbb0588439e811666af027710d1e5ef182b4d1c9012ca2c60d22ce103ceca14bb392dd8916b37c1c07799dc97f9401aa66d3bd08b250dd48314aa57a8599dff5 SHA512 e1f947a97e8b5f292dd32a6f1ea0ef3f2e411629218653821886ec4e1d5f8289d5b8f4b8bf0a37e69c344a83b975c695947d6b49fd2001a0e4273bebd4792892
 DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
-EBUILD argon2-20161029-r1.ebuild 1059 BLAKE2B 5af6cfcc657b155477979103e641b1449c3c95430aed7594d5a7678b6c1622672e4b8581b6465721a8645065dd3bbf8c9be9bcd6d58f8f44c8844c9a4de09992 SHA512 bf74945ccbea5cd3017a91502a4ce67c5b39b02df1882b175c9d3c857b70914f3f91d41b10c7c46fc82ee4ab8e03b4b0b291e9f16a3a41f8f54f28216533ffec
+EBUILD argon2-20171227-r1.ebuild 1209 BLAKE2B d4817c6a5b21a1aba841d8a590ce5583212741a6a374d1b6667b17eb15e89964b6540b2ef01ae08e014b69edae22416b91e24d8723198c20fba8d3070ed51f95 SHA512 bdcaaaf5d45ca6cf397dcf2f870e58bbcae2f319737de185dea594a8659d9841e875bb22c18c832b208a787c47febc3d697e445824a54f4a32fbb90f1a90fb44
 EBUILD argon2-20171227.ebuild 932 BLAKE2B d4d35467d79c15fe30fdd120261f0452ff20e2433cfb59734d98dfca35bd587114bd49cb7e6186100ba57dd14b12371703eb7465298a8ee585286838e207f8c6 SHA512 88b54c07cc75e2011ebeb5c43636deafbc248d013b52e97a876aad02a1019477087d9c2652dcf21d4939f871c84a2255e826e5126cae1be8e9111e6b3055c498
 MISC metadata.xml 660 BLAKE2B 1843f019c2cf7e8438209df6d90a20a9bcc88f5346aa02c953a28d84d712983fe3880b39b4b1766819bb88c670245447c37dc0c1da3b02b3f800a3d9706c4287 SHA512 76c1048a35a75b60d9e5fd56da50ba4bfe9537457e2021c226671d72e0456d2533f05361cad607cc86b8e01fd00a137a4cbc26a6d70c122918fe4e0f2ae3bee5
diff --git a/app-crypt/argon2/argon2-20161029-r1.ebuild b/app-crypt/argon2/argon2-20161029-r1.ebuild
deleted file mode 100644
index 1af92a371835..000000000000
--- a/app-crypt/argon2/argon2-20161029-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib
-
-DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)"
-HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
-SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 CC0-1.0 )"
-SLOT="0/0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="static-libs"
-
-S="${WORKDIR}/phc-winner-${P}"
-PATCHES=(
-	"${FILESDIR}/${P}-makefile-soname-symlinks.patch"
-	)
-src_prepare() {
-	default
-	if ! use static-libs; then
-		sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!"
-	fi
-	sed -i -e 's/-O3 //' Makefile || die "sed failed"
-	sed -i -e 's/-g //' Makefile || die "sed failed"
-	sed -i -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" Makefile || die "sed failed"
-	sed -i -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBRARY_REL=$(get_libdir) install || die
-}
diff --git a/app-crypt/argon2/argon2-20171227-r1.ebuild b/app-crypt/argon2/argon2-20171227-r1.ebuild
new file mode 100644
index 000000000000..c7176327af16
--- /dev/null
+++ b/app-crypt/argon2/argon2-20171227-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)"
+HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
+SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+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"
+IUSE="static-libs"
+
+S="${WORKDIR}/phc-winner-${P}"
+
+DOCS=( argon2-specs.pdf CHANGELOG.md README.md )
+
+src_prepare() {
+	default
+	if ! use static-libs; then
+		sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!"
+	fi
+	sed -i -e 's/-O3 //' -e 's/-g //' -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
+
+	sed -i -e "s/lib\/@HOST_MULTIARCH@/$(get_libdir)/" -e "s/@UPSTREAM_VER@/${PV}/" lib${PN}.pc || die
+
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${ED}" LIBRARY_REL="$(get_libdir)" install
+	einstalldocs
+	doman man/${PN}.1
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins lib${PN}.pc
+}
diff --git a/app-crypt/argon2/files/argon2-20161029-makefile-soname-symlinks.patch b/app-crypt/argon2/files/argon2-20161029-makefile-soname-symlinks.patch
deleted file mode 100644
index 11892de11158..000000000000
--- a/app-crypt/argon2/files/argon2-20161029-makefile-soname-symlinks.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 1838c13..85aa710 100644
---- a/Makefile
-+++ b/Makefile
-@@ -87,8 +87,10 @@ endif
- endif
- 
- LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
-+LIB_SH_VERSION := $(LIB_SH).0
- LIB_ST := lib$(LIB_NAME).a
- LIBRARIES = $(LIB_SH) $(LIB_ST)
-+INSTALL_LIBRARIES = $(LIBRARIES) $(LIB_SH_VERSION)
- HEADERS = include/argon2.h
- 
- INSTALL = install
-@@ -153,9 +155,11 @@ format:
- 			-i include/*.h src/*.c src/*.h src/blake2/*.c src/blake2/*.h
- 
- install: $(RUN) libs
-+	mv $(LIB_SH) $(LIB_SH_VERSION)
-+	ln -sf $(LIB_SH_VERSION) $(LIB_SH)
- 	$(INSTALL) -d $(INST_INCLUDE)
- 	$(INSTALL) $(HEADERS) $(INST_INCLUDE)
- 	$(INSTALL) -d $(INST_LIBRARY)
--	$(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
-+	$(INSTALL) $(INSTALL_LIBRARIES) $(INST_LIBRARY)
- 	$(INSTALL) -d $(INST_BINARY)
- 	$(INSTALL) $(RUN) $(INST_BINARY)
diff --git a/app-crypt/ccrypt/Manifest b/app-crypt/ccrypt/Manifest
index c97423bbf9d3..b0933e631037 100644
--- a/app-crypt/ccrypt/Manifest
+++ b/app-crypt/ccrypt/Manifest
@@ -1,3 +1,5 @@
 DIST ccrypt-1.10.tar.gz 669491 BLAKE2B 61aabe48fd3e368c4915697acc4a63837cb97246e31c2268385e419fc6912a1d0bf3f3773c78266bde0d648bb10f739628a55560e0eedbd397c5826b5019b602 SHA512 b0130998f9830f63e8181340b3138260ab3c2014174e74fbcca77299dc9e0f807471fbfb7cc403dec7d0809f136e8afcb4c9bfd4ee5e43a1b3cc7185e14c3188
-EBUILD ccrypt-1.10.ebuild 357 BLAKE2B bba77387ef299da2bded1e05efc71313f8821017af9589d4dea76e9602b9b95e2cb407e5d915264fdec00cd1152111fe28fb4e0a8f9f6246763191eed61d0c3f SHA512 4b8d7c74c6dac9032721fa320b0334a163bbc52771a327c1020d7559f94b2076ebef2684573d39d47e46a6217e50d554ee5a3a5f1fd6313eaa48d1ebe694fe64
+DIST ccrypt-1.11.tar.gz 834575 BLAKE2B 6b3441f6b1c58ed63db43ddc999ee64e67afc3ce02222de2a41562bc066aad0f076e75ab496d94e7f3f1a9554b1382c083f3af04074904c1110f610cb5ac19b3 SHA512 75c2b93e855d36e717d3b7cabee7ce43ce372a21c8291beb43f24fd69e11114bb0e19e6dd03ec5d901e7e60eac9351afab65c346b7304b16054b91d392050313
+EBUILD ccrypt-1.10.ebuild 358 BLAKE2B fc4735bb7aa9d73e3be45d96e95f1bf7008399d7ca2131210f35866c666860f0ca688b6119fb2ad3daa31eb2280fcc3698d519e95224889efeece5e280121b7c SHA512 ae6c14e585992e53f2087783d8479ea7ecb2d905276c157814cdb5378e8d0c7b911c1da0dc238ae40dd600478602b10627d48272b67fcfef2325db0a293117a2
+EBUILD ccrypt-1.11.ebuild 361 BLAKE2B 201490ae6c3f90b2bb51838291abb67d4a9df956af06129c5b0e29a25a7657458e291ed12605faec10468202e0760b053000cf6c6ec49c07a12353c8e016e069 SHA512 92cc8780108f51e8e3f77f33531cee7a648598d2301c45049b858f01f816c83abcf18dde7e6df9633bd8e87e4a3d35fdee83b0763a4c00dbfe0abd0a4a54c19c
 MISC metadata.xml 316 BLAKE2B b3ea9516824d2d6abce5b52bff59ef3935be62158f4b5f35c4946ac46ad6cbce01637f82979c0c7bc0d881b385dbef860b4ee1aaa28cba9121d388640ced2f11 SHA512 fd88aee15282c7205e31caa296006cb6e6d887843b5757676c00d7a0ed054046d9285c9d01ddf120131463eb03cef1ad7e9835a01f4fd71d9483bae2ecde296b
diff --git a/app-crypt/ccrypt/ccrypt-1.10.ebuild b/app-crypt/ccrypt/ccrypt-1.10.ebuild
index 1b3edd99dceb..279e8559ec7f 100644
--- a/app-crypt/ccrypt/ccrypt-1.10.ebuild
+++ b/app-crypt/ccrypt/ccrypt-1.10.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 DESCRIPTION="Encryption and decryption"
-HOMEPAGE="https://ccrypt.sourceforge.net"
-SRC_URI="http://ccrypt.sourceforge.net/download/${P}.tar.gz"
+HOMEPAGE="https://sourceforge.net/projects/ccrypt/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
diff --git a/app-crypt/ccrypt/ccrypt-1.11.ebuild b/app-crypt/ccrypt/ccrypt-1.11.ebuild
new file mode 100644
index 000000000000..140cb93941e6
--- /dev/null
+++ b/app-crypt/ccrypt/ccrypt-1.11.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Encryption and decryption"
+HOMEPAGE="https://sourceforge.net/projects/ccrypt/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 9840114a31bd..9441b807a2fc 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,6 @@
-DIST certbot-0.30.1.tar.gz 1267198 BLAKE2B dc1ce89f376d8cd0ca02dbec50cb39e8c7fc5e140c342b8b80e1226ddffa0a3cf798683679d7815cc9da24ce0371e19f5288619ba69941226f6170f8ec9948fc SHA512 31b790ed6911a9e632327d0833209c679535403d71a9977c8b785cc7585c67a4e18971b33f407598da4c7c67e073b0c2164203df34ec69bf3a0feb6bb326fbce
 DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
-EBUILD certbot-apache-0.30.1.ebuild 1078 BLAKE2B 88db3076d6c2b3e9cb6a19c40ecfb4ed2f42e9f534040bfce18e785adeae93d963ffdf1f1a38ba2fe54e9bb749a8b8c1960af1e5319f884cb85a6e3ef19337d6 SHA512 d9bc1e40c1a77bc8f27725aea41fab71aa870cf4aef1e93f187ba2502bcb89304011e581052235838ad7282b03c6cff4f6f0d1264435d7f8ca53c9a3307ffa65
-EBUILD certbot-apache-0.31.0.ebuild 1080 BLAKE2B e7d4c037fae078bc6538768d507ac109af6c2d676187ed90aebc76ae1900532ae3fc7675ee3d4ba62d0dfefcc573eb3bc92bfdc33e0eede11fb7c0e066dace35 SHA512 672863267ac83c966c208c9ecf6fc83c704ea034092c30169064453fbe92cd3c73cfd2d6d6ace3f52c8d14d46f50e0b8e70b24ad282529f5f99acfe3b2f3bf94
+DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
+EBUILD certbot-apache-0.31.0.ebuild 1078 BLAKE2B 88db3076d6c2b3e9cb6a19c40ecfb4ed2f42e9f534040bfce18e785adeae93d963ffdf1f1a38ba2fe54e9bb749a8b8c1960af1e5319f884cb85a6e3ef19337d6 SHA512 d9bc1e40c1a77bc8f27725aea41fab71aa870cf4aef1e93f187ba2502bcb89304011e581052235838ad7282b03c6cff4f6f0d1264435d7f8ca53c9a3307ffa65
+EBUILD certbot-apache-0.32.0.ebuild 1080 BLAKE2B e7d4c037fae078bc6538768d507ac109af6c2d676187ed90aebc76ae1900532ae3fc7675ee3d4ba62d0dfefcc573eb3bc92bfdc33e0eede11fb7c0e066dace35 SHA512 672863267ac83c966c208c9ecf6fc83c704ea034092c30169064453fbe92cd3c73cfd2d6d6ace3f52c8d14d46f50e0b8e70b24ad282529f5f99acfe3b2f3bf94
 EBUILD certbot-apache-9999.ebuild 1083 BLAKE2B 0e03488f0c19b669c4412fa608b32a3c7b77093163f73779268eb0b1e45fdce664a998b7e6bab882e41ea9cbee1ba8f1caf3f0589b84695f0002712b8976c774 SHA512 0b25f93cb6c50b80edc1b65302d97f70d16f73ef46ede9d25314970eb7f02a8a87e318ecfc30e42819e6be8264e3a772d640b991eafed261aee4f68800ae1460
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.31.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.31.0.ebuild
index b6c158fb2f52..8bf039bdf51a 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.31.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.31.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-apache/certbot-apache-0.30.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.32.0.ebuild
index 8bf039bdf51a..b6c158fb2f52 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.30.1.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.32.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 70380f4908b6..916684b403eb 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,6 +1,6 @@
-DIST certbot-0.30.1.tar.gz 1267198 BLAKE2B dc1ce89f376d8cd0ca02dbec50cb39e8c7fc5e140c342b8b80e1226ddffa0a3cf798683679d7815cc9da24ce0371e19f5288619ba69941226f6170f8ec9948fc SHA512 31b790ed6911a9e632327d0833209c679535403d71a9977c8b785cc7585c67a4e18971b33f407598da4c7c67e073b0c2164203df34ec69bf3a0feb6bb326fbce
 DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
-EBUILD certbot-nginx-0.30.1.ebuild 1012 BLAKE2B e6611cbbb8f7eb76ee4d81f78389afc3a2698ef0909ff67d91d77bc3e92a68e728434b3a237c6791991ca82e014506bd83016e6a5da163792a32581d68967bbf SHA512 cd52ce383de026c14c54f24b30ad044074c16c26760ea8f22d8e56f5f4afae3e1f0368cad36cadb8839b3e062daa6bc2744393b6cf9b8402292c3c66bdeb7a71
-EBUILD certbot-nginx-0.31.0.ebuild 1014 BLAKE2B e49941f79f8c7b2e55480aa96f72c52d9f2e79e7e8d62055c35589a31022d60b40e10fa47b55058f17b92d74f23ae4245dcb1f08062c39e85a7b326529708307 SHA512 ae848d635d1479aa216d908724d478ff7cbaffe67724c287e7de5c0de81b96281b09acaf5d8267ea446ba31b3d36beb3c2c52d2675a95f4ed8255a153da49dca
+DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
+EBUILD certbot-nginx-0.31.0.ebuild 1012 BLAKE2B e6611cbbb8f7eb76ee4d81f78389afc3a2698ef0909ff67d91d77bc3e92a68e728434b3a237c6791991ca82e014506bd83016e6a5da163792a32581d68967bbf SHA512 cd52ce383de026c14c54f24b30ad044074c16c26760ea8f22d8e56f5f4afae3e1f0368cad36cadb8839b3e062daa6bc2744393b6cf9b8402292c3c66bdeb7a71
+EBUILD certbot-nginx-0.32.0.ebuild 1014 BLAKE2B e49941f79f8c7b2e55480aa96f72c52d9f2e79e7e8d62055c35589a31022d60b40e10fa47b55058f17b92d74f23ae4245dcb1f08062c39e85a7b326529708307 SHA512 ae848d635d1479aa216d908724d478ff7cbaffe67724c287e7de5c0de81b96281b09acaf5d8267ea446ba31b3d36beb3c2c52d2675a95f4ed8255a153da49dca
 EBUILD certbot-nginx-9999.ebuild 1014 BLAKE2B 4b719b8703b3639e58ee36c5c0d03d6e5890a5b5c9848b1dc13eae93fb2bd542f8de9f3ddc1bb683d88481f851ee2594987868d519cc59fc8a4cfb8022aed212 SHA512 5beee8a666a3dd36a13b83e65616b6a0f3b11dd90d98a360447807e5b7e02b4a0029f4221dd0eee842a9106255c1d61958373b0c2a50a1d72cf707cd2ccd0e1d
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.31.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.31.0.ebuild
index b84d186a8cd7..ec0e921c2c8f 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.31.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.31.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.30.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.32.0.ebuild
index ec0e921c2c8f..b84d186a8cd7 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.30.1.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.32.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 426999e1ea72..5f9e5eaf44d3 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,6 @@
-DIST certbot-0.30.1.tar.gz 1267198 BLAKE2B dc1ce89f376d8cd0ca02dbec50cb39e8c7fc5e140c342b8b80e1226ddffa0a3cf798683679d7815cc9da24ce0371e19f5288619ba69941226f6170f8ec9948fc SHA512 31b790ed6911a9e632327d0833209c679535403d71a9977c8b785cc7585c67a4e18971b33f407598da4c7c67e073b0c2164203df34ec69bf3a0feb6bb326fbce
 DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
-EBUILD certbot-0.30.1-r1.ebuild 1262 BLAKE2B d2fd392ad43dcf2319140eac1bbedb551814cc20ede0d21a6817cecae422acbf22001de635089d3097219976bb963824645252365e72bba5c070372c2991f793 SHA512 f117d8a3441fb390f7908eb608df300f9e24301a87dede456d7d78f8bdc27bc1fe78c6c7c40937427661544a80a23c11d6d98c83eb8ceacb3fd9e9894140c580
-EBUILD certbot-0.31.0.ebuild 1266 BLAKE2B 69d4a9b53f5d36c9d01e1ffce38f91267ea097d58c346c041c4c71fbe220e17a80d3493de919afc1c277bff0cb05d7a88157a67fc775b851e99085d3ab193746 SHA512 2dfdce6eb12914f93d2d0e2e7193a5828dc30391b2efc9eaee1f606c9afb36fec583b6ddb73ffc5279ed6a14660628615175023aebd15f6daec1e3f3b1c68f80
-EBUILD certbot-9999.ebuild 1264 BLAKE2B 87d7d0de1448b779c4e44b28ff1dda3fa2441b0779b1a00a2d3efe6db1b9489b595cb3f4c31989e2cdcb3c0cd9c1ad47058e6530365107dbc3d2b85f108e803f SHA512 687528fcff2f41b4923edae2f5ce30daf04fe5671f359a2b8e33fcfb840560bbab7514a61417b56b2e5171a251a8e5acc5a19cf2fd1e3adf5c356079897f0c6d
+DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
+EBUILD certbot-0.31.0.ebuild 1264 BLAKE2B 68db0d81c00ee276a4d3ae4d0e2b3405a19bda044b054356a18cd356f36faa0bf9f536e9bdbdd7f02e0ef0408c732b691e0ce4defa6b9768ba262e53fbe5d919 SHA512 0a3d80a71e0fe990caf0d836dad9f2eeb55f61dd0e491e412555ace2de9b697f8721cca77da6e4cddc9e1fb8e45f516d7b1df550043e39cb092c3dd4750fe1d7
+EBUILD certbot-0.32.0.ebuild 1272 BLAKE2B 00bea629a7a28ee6f810fbca1412538b15d8c02732a348082d7b6d68b883dd913cf03a9e1ae2c25c9a7e99f0a7a8cdada547616b28fad5c38d87beda534c869c SHA512 ef2b4ea47566c43f3e32d016e2c6aa84fd4617e7843ff633c308fec01f7e67521f048bdaa2116b6afd6ef009a2b6904f8b361b9b0ce85ee688692ac871966d7c
+EBUILD certbot-9999.ebuild 1272 BLAKE2B 00bea629a7a28ee6f810fbca1412538b15d8c02732a348082d7b6d68b883dd913cf03a9e1ae2c25c9a7e99f0a7a8cdada547616b28fad5c38d87beda534c869c SHA512 ef2b4ea47566c43f3e32d016e2c6aa84fd4617e7843ff633c308fec01f7e67521f048bdaa2116b6afd6ef009a2b6904f8b361b9b0ce85ee688692ac871966d7c
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.31.0.ebuild b/app-crypt/certbot/certbot-0.31.0.ebuild
index 24ed55a9e6c8..9fe3a6058249 100644
--- a/app-crypt/certbot/certbot-0.31.0.ebuild
+++ b/app-crypt/certbot/certbot-0.31.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 inherit distutils-r1
diff --git a/app-crypt/certbot/certbot-0.30.1-r1.ebuild b/app-crypt/certbot/certbot-0.32.0.ebuild
index c4d5a2b84884..1c019d37388a 100644
--- a/app-crypt/certbot/certbot-0.30.1-r1.ebuild
+++ b/app-crypt/certbot/certbot-0.32.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 inherit distutils-r1
@@ -28,7 +28,7 @@ RDEPEND="
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
-	dev-python/josepy[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 7dcb4fadad64..1c019d37388a 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
-	dev-python/josepy[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
diff --git a/app-crypt/debian-archive-keyring/Manifest b/app-crypt/debian-archive-keyring/Manifest
index 8b1dfc9a357b..81dd2fec1d86 100644
--- a/app-crypt/debian-archive-keyring/Manifest
+++ b/app-crypt/debian-archive-keyring/Manifest
@@ -2,8 +2,10 @@ DIST debian-archive-keyring_2014.3_all.deb 40060 BLAKE2B 8cc046e484ec2f0f1028a36
 DIST debian-archive-keyring_2017.5_all.deb 56438 BLAKE2B 3dfe5e2fc1397eda72491b32eb1bc77a7b2f197a880fc5ca4a8aa79d54d6ecd3d080fca234ca5b418d96123af680ff2fe915af7b6050740f86a2d6f57f9a0fd7 SHA512 8e7dafd850a7ad0a322790e41ace819ad51c1a17be4bd506c5790ccef97f1a0dc0cb78841225b4c6a85c20d502800fbfe991ea9c8c48a5bb58598754dcbd6173
 DIST debian-archive-keyring_2017.6_all.deb 56618 BLAKE2B f16e0ad9e7a86b57e5011495747acecedd6901919a3b267bca3a41a3f0b212f8158a552c374d8e8a43a7260fec3c64d4634ee8c49ed2155fab9edd168d72505e SHA512 728252b029dc72ff341b5eaa1bcd1b7e0669c1e0f0cf120ad4cb5ec36e600ffb7d344e9b24d1daa964272f07c90e3ed70a1b7fb9b8507da0778a8370a4b18029
 DIST debian-archive-keyring_2017.7_all.deb 56940 BLAKE2B eac1f8399e6f3176721f4b6f8463849053f5dffaac0cd9d297e5774a62582a30caf9281614d71de6f302a15784082b99963eff910d253cdbeef26ad66337bdf2 SHA512 9802058a9de69d941eab9ebf7a8370b1b5af0130444ca8fd46996d1699f940775fec2820f7963fdcf70e49a467682d1ac023a1da72e34f90cf3c09a04dface74
+DIST debian-archive-keyring_2018.1_all.deb 57392 BLAKE2B 3262a1f49af9792ce378a0b6219287ac868d3483783218f55a0ab3d37b9fa0a857da2dcd4c83742d8b47ce4a2df5ecd985d2345d5367908f2f353e8cc0a6a5e3 SHA512 7bf98cda5b9639d68538a8d47e35d422e552bd8afa067e844f0e8e76a366f9d5e503e0f47dd646789fa0264a47b77d0bfcc22559ad09bdc95453e4a5c2169f0f
 EBUILD debian-archive-keyring-2014.3.ebuild 432 BLAKE2B 289363d69c61a3398570843275c3139a6d7da37d5cec506f566d0dacf73353c3e0bee4e459ea0000c1a3ae6601c01c9303479cca8782f97bf4ead03f7f883716 SHA512 f1f30dd36d9ebc007f616d8f47530e73440556c1607c31542c66671a5d15ee8c28ca76d2036bf379a1600acaf1db805fc8af5090308873e621b13587c20a45ad
 EBUILD debian-archive-keyring-2017.5.ebuild 432 BLAKE2B 289363d69c61a3398570843275c3139a6d7da37d5cec506f566d0dacf73353c3e0bee4e459ea0000c1a3ae6601c01c9303479cca8782f97bf4ead03f7f883716 SHA512 f1f30dd36d9ebc007f616d8f47530e73440556c1607c31542c66671a5d15ee8c28ca76d2036bf379a1600acaf1db805fc8af5090308873e621b13587c20a45ad
 EBUILD debian-archive-keyring-2017.6.ebuild 432 BLAKE2B 289363d69c61a3398570843275c3139a6d7da37d5cec506f566d0dacf73353c3e0bee4e459ea0000c1a3ae6601c01c9303479cca8782f97bf4ead03f7f883716 SHA512 f1f30dd36d9ebc007f616d8f47530e73440556c1607c31542c66671a5d15ee8c28ca76d2036bf379a1600acaf1db805fc8af5090308873e621b13587c20a45ad
 EBUILD debian-archive-keyring-2017.7.ebuild 432 BLAKE2B 34deacf36b65c15a0c8274ae20efe2d16189f5a9dc739f561a5c53a8c2705ef8877ea985637421ed011ee87a0c2e98ab407e9252a2cd0f4f2912e9f9db5f9237 SHA512 d102d6d8dfe899e516f33ee824f2842ec36a5280082ab243f1d7d7960bf8afd7b603284fc61b0b857985a64627abd7579fb73c7ae8525c9a249bf3c380587847
+EBUILD debian-archive-keyring-2018.1.ebuild 475 BLAKE2B f10d5d944aaaf7a76c60e56e82b469deece91b9c5756874890696bad485bb21f3a53d77d2ed6cde678a2c3ae0ce8e1d78317f189d3df6221cd41daae45d696d7 SHA512 f80c382c04eb60d953f8a3ad1e87211adbff5a2425b9e6be6ce4644c22fbefd0a63d044c429b6379903184ab7ee6045a8b0b790f7fc8c4287ff82fa1c1514655
 MISC metadata.xml 255 BLAKE2B 4c7bf34bcfa727317b7cc808eb50bbfd3d1aae64fa098b599480cc8ae6cfc527956a0d593db2ecc55b1b3cea48c5ce46642b64cda5b40753d6fe5e883129147b SHA512 92faa797311ee8b7bab9f5f5070d5fa6b75ca5f3a07643f8fc4d67a28d50d746e904009b7fb1a8214c4b0fc296b4b3ab3f695786103dc6c26479c5542165a587
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2018.1.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2018.1.ebuild
new file mode 100644
index 000000000000..f9d5bd12a13f
--- /dev/null
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2018.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker
+
+DESCRIPTION="GnuPG archive keys of the Debian archive"
+HOMEPAGE="https://packages.debian.org/sid/debian-archive-keyring"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}_all.deb"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_install() {
+	doins -r .
+	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
+}
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 15a50062ceb9..b244d0bb0c42 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,5 +1,7 @@
 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 2660 BLAKE2B 4840e5cfcc512aeef800d324f77d9d083d690963042903c0bdd6513a146b565106057b9ab9969b5ea905118e36cd06c9d12d025865ef190ab15c94383cc81ab5 SHA512 160be3b6686b700fe5d69251f1560cf6f15ecb5ebd9f0a1298952501294e60938584fc8ab62c0f36da32db4809710827c59f41782f5d756b65ec25aaab4cd997
 EBUILD libsecret-0.18.7.ebuild 2649 BLAKE2B 1ae04eccc247529a08f3e52747d8db6f03e11c37f7bf672cf35020ea006cec9b77c83aeacde3540f035a372268ace53c88624178567d7bf75175de6766556929 SHA512 2fc273d7d573c9fc56e78712d94e419dce1a1a9559ca9262c53c2165e7ef28fdd10a084baf9c561046c647c55cd656b1a81f70ede2de1f914ad544fc961789e0
+EBUILD libsecret-0.18.8.ebuild 2650 BLAKE2B 97beb88872d5542269e7d60a8a61437e30bb846c2f7727b95dff1f31534d488be32eed23abd8c0ad7e246bd2fe10f205c1a964206805da7170d3ff69fbb80673 SHA512 a4fb021ac449583a63295aeccbf6062df0b6f2b3fac90e9f6b98f3e94c1a4175d3b1612ba577209e38a3b7d5994fc122f67a1578134c5d85e910ed68ed1d29e7
 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
new file mode 100644
index 000000000000..18bfb758ce25
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.18.8.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,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.44: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/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest
index e41efd25dbc2..732b8f35a47e 100644
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@@ -1,11 +1,4 @@
-DIST gentoo-release-test-sigs-20180706.tar.gz 1437 BLAKE2B 00fb0a491c84853068ea578e68e8ab0a57842f6098c14da7ec44faf20abb23deef480aca958a7e352b9c55a024681eabc0c9aaf400e5dcbf8873277a3a940e38 SHA512 2a7cc2c650693c0e1fdf7083d77bf975e05ece3ab1495ed03362d02e8411481c80a62a9f21b23861bdc602d74c656a618e9a39d2bdef7ccd253ea9f3e4c7531a
 DIST gentoo-release-test-sigs-20190224.tar.gz 3235 BLAKE2B 924c69a62d5321716f536144f0607bd3ec4a65d76be492adc729864fd9bef82df0086541ae13034a83152ea0c8dc3cbd168be6cff111a3484128a22cbc8ef1d4 SHA512 f8cc2e84bedbdf14ace6abe4aacf8f0c9810c77ff6ae0fac301829d9d4d5cf0c128a76516c773ac993879215bcdb0aab097e1e7e747d8e1a7c4cfc815bd4d3e6
-DIST gentoo-release.asc.20180706.gz 44805 BLAKE2B 1ba26b90e564738a1282c5febe426628144ab70e526397b866f97214254c73bbb517cdaa48ba0e83ca75a7d88cd622375fda0f362c43d13b66720ffb682682d2 SHA512 ba48cb6d7e72c6a720df3ff2430a4b4dd261f947c23762cd0c1255a93391d10becfb491db1bb80b295edd1f8192580315d5c7be3670b8689ef702ed228b05894
-DIST gentoo-release.asc.20190102.gz 51067 BLAKE2B ace66e603afb9a171e705992ae550439dbc51e6dd9a788e78a9e85d938b7f9841bd0dd866306b32066cab5c23995ed2278d4d22670b238227de28d08c914c142 SHA512 eea90df98e795edcc0e4cbc26f48313c0cf4593424106ff79e0dc237835e51536777840fcf54619252438515ad10930992bcfbcd32596bb203a75151cee10553
-DIST gentoo-release.asc.20190223.gz 50407 BLAKE2B 6e3788da555fbb012c76ad174ddf6d0fd034c522b466b58c12e52eef5c900824724e32c51b53c7f7b542cca43073d1ab02ebcb7fc7560f0ff8c384cb47ee2fcc SHA512 3d71a91ae889ee1d237003f017d1cb7aec9129a9bcc9aa9cf2256656a88aaf96048c308994eda0b9f6b6fc2041fdb81cf91eb31d0b1ab7b380fe692b43e70d62
 DIST gentoo-release.asc.20190224.gz 42534 BLAKE2B 9b8bc98dbd66fdf44eb1b0b5a8e83bd4d08d85a3f9a95b293ae3e900de291567f36d59cb8dfb412e3f71db453184e2eefa453cf3e340d5b3091c55919fccebc7 SHA512 4f46c303faa134fc17903859527a9fa81d1015f4f2d2908509437ee2d07a992eb181c5a05544b333c310eda8ee2c1861cb07e978d92ef3f02955ade36110da67
-EBUILD openpgp-keys-gentoo-release-20180706.ebuild 1145 BLAKE2B 937f2632087e94da638b49d8eda2af8344d1bfc9599b53450159bf6310e5a3ccb779d54ee7b692168a4e23568f148af275eb4fde4d907f0f69c8b80220cb4672 SHA512 d288fbfa00b490fa833ac744fd58ff3ed2219b5d5c69c9d23efe548cf0629ab4afb3925f907080083fb6d8205424c15477e029ec99df81aa279530a560cfa028
-EBUILD openpgp-keys-gentoo-release-20190102.ebuild 1145 BLAKE2B 02ca7151e5e751d7faa255f8ee136780f0be8034662bb3002d0538d64d035d18d92408377cefce36b7e91d7878e0582a3a8f2ecc01d024211fad659a5da9b3b6 SHA512 00925cec194574662a545d8e7753605055c48206850b2431eb51bcd48a1b9916d249d41e60e7cea0e2e19b7e2469e642775256211d0b39e6bca5f241da816ea8
-EBUILD openpgp-keys-gentoo-release-20190223.ebuild 1145 BLAKE2B 02ca7151e5e751d7faa255f8ee136780f0be8034662bb3002d0538d64d035d18d92408377cefce36b7e91d7878e0582a3a8f2ecc01d024211fad659a5da9b3b6 SHA512 00925cec194574662a545d8e7753605055c48206850b2431eb51bcd48a1b9916d249d41e60e7cea0e2e19b7e2469e642775256211d0b39e6bca5f241da816ea8
 EBUILD openpgp-keys-gentoo-release-20190224.ebuild 1145 BLAKE2B 955d52e47d997f46ce2d1a098912173ca822cd892cf7b8aa03c61f3d718d3893a7a81faec33181d7aab30a909127615847a86a6f215cfe3f8d7d90c50930aa55 SHA512 805441a7fcb7375173085747769f85bfa108d8cb29fc93b0907cfe274c893ffc93294c233c94bc428bed4f82f8b0e046daca9732ebb4f4faca7628d7f106edd7
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180706.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180706.ebuild
deleted file mode 100644
index a36da1acafbd..000000000000
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180706.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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-${PV}.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/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190102.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190102.ebuild
deleted file mode 100644
index b9a927fd8e1e..000000000000
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190102.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-20180706.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/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190223.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190223.ebuild
deleted file mode 100644
index b9a927fd8e1e..000000000000
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190223.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-20180706.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/seahorse/Manifest b/app-crypt/seahorse/Manifest
index c4cb136fe40b..0e7e82e74d68 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,3 +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
-MISC metadata.xml 871 BLAKE2B 5497bf54b134fb991034614308c76230b647a95ed4609d2271c83af737c5ff86325ca3e56ff3682752585d16cf9389e17bca47e3a673e386ca201aba78a006e6 SHA512 3e4844cf29c6343c93ee51a9d5643464256f7ad884e6af946166c251004d3cbbf6d1aaa6771faf27b1a531939a8401413b52aa84a6bee8a2a4365775b09e8514
+EBUILD seahorse-3.30.1.1.ebuild 1545 BLAKE2B cb6bb2b4436ce2a978a69ab6589196d0bddf289c629bfb689fc6bf8898f14fe8a2a476a796d13df5af575d334634a84d3a8d694f34962f936dae51cd43b48935 SHA512 6c35500d7c1ce6833630c6c0d9241235139b97007742dc8694a5680d03b6420d4186cea966b186470410bced0e485caf869a22d1d774d6a414a46774f02ad3d3
+MISC metadata.xml 742 BLAKE2B 11cc6cebe3f395ccd9f2570a419e812951287d7a9af2bd88720a66c7349305c108c451b67a33f9a6da0c82d7b0731ca74980dd7515db3d167993008633973a6f SHA512 cf7cceeaedb1fdb503def974d945a7a5d38a95105dda77f7e917abcec8ce823b461bf3cd1ab5f1a458de859e48a4d58abde71a5a4599685772936eb3525ae3af
diff --git a/app-crypt/seahorse/metadata.xml b/app-crypt/seahorse/metadata.xml
index 6789dec723b8..87c065b287db 100644
--- a/app-crypt/seahorse/metadata.xml
+++ b/app-crypt/seahorse/metadata.xml
@@ -8,26 +8,11 @@
 <use>
 	<flag name="ldap">Enable seahorse to manipulate GPG keys on a LDAP server.</flag>
 </use>
-<longdescription>Seahorse is a Gnome interface for GnuPG.  It's main purpose is to be a PGP/GPG Key Manager, though 
-it has other components including a text editor and file manager.
+<longdescription>Seahorse is a GNOME application for managing encryption keys.
+It also integrates with nautilus, gedit and other places for encryption operations.
 
-Key Manager Features:
-Generating a key
-Deleting a key
-Importing keys from text or a file
-Exporting a key to text or a file
-View key properties
-
-Key Properties Features:
-Show key info
-Change owner trust
-Change primary key's expiration date
-Change passphrase
-Export key
-Delete Key
-
-Plugins:
-Nautilus Integration
-Gedit plugin
+With seahorse you can create and manage PGP keys, create and manage SSH keys,
+publish and retrieve keys from key servers, cache your passphrase so you
+don't have to keep typing it and backup your keys and keyring.
 </longdescription>
 </pkgmetadata>
diff --git a/app-crypt/seahorse/seahorse-3.30.1.1.ebuild b/app-crypt/seahorse/seahorse-3.30.1.1.ebuild
new file mode 100644
index 000000000000..58940bf5718d
--- /dev/null
+++ b/app-crypt/seahorse/seahorse-3.30.1.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome2-utils meson xdg vala
+
+DESCRIPTION="Manage your passwords and encryption keys"
+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"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=app-crypt/gcr-3.11.91:=
+	>=app-crypt/gpgme-1.7.0
+	>=x11-libs/gtk+-3.22.0:3
+	>=app-crypt/gnupg-2.0.12
+	>=app-crypt/libsecret-0.16
+	net-misc/openssh
+	ldap? ( net-nds/openldap:= )
+	>=net-libs/libsoup-2.33.92:2.4
+	zeroconf? ( >=net-dns/avahi-0.6:= )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	app-crypt/gcr[vala]
+	app-crypt/libsecret[vala]
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dhelp=true
+		-Dpgp-support=true
+		#-Dcheck-compatible-gpg=false # TODO: https://gitlab.gnome.org/GNOME/seahorse/issues/217 # assuming gpg 2.3 and newer will be fine for us too; keep lowest version listed as compatible as min dep for gnupg RDEPEND
+		-Dpkcs11-support=true
+		-Dkeyservers-support=true
+		-Dhkp-support=true
+		$(meson_use ldap ldap-support)
+		$(meson_use zeroconf key-sharing)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index 0e5e75b8d810..af9f0bc0373f 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,7 +1,9 @@
 DIST yubikey-manager-qt-0.5.2.tar.gz 337194 BLAKE2B d6020116b9082671c039b521bbeebe7c1f0be022e233abbf8d6d788ea94e69e5f88aa3d6ec26a7b2edffa698327bb049e83ce54db2e0ba2ed1ad1dd536ab0961 SHA512 29265a10ae1dfe14dfdf4f1ba225516bf3bcbeb0115ca81696a4c5c506e957d6a99b0bb11a608e3175df99b8c04e8ae9250d5d42aab2b44b633d18fd2fc4c227
 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 1410 BLAKE2B 7da065e45b89bc70d7e3a577f9312bd6a955ad071fbc066c7401773fa9defe49aed871c3e4db7b6931309eff67a5a470014459a09c78568c159a582b9ae85d6c SHA512 d18d8da49e4080a2f84ac3ea1c800002d40eae7a584f35a430f3571a65b1e792b4e0f9275065dd392332d94998cd59c50183bf25bcfa310c3340adbb584c2376
 EBUILD yubikey-manager-qt-1.0.0-r3.ebuild 1478 BLAKE2B d2b6273e43c6e0361700f0eacd838ab4c46b8d7db99d368787d06b7bf43dd07841d33fcc27b4a19b07990b89d7c74c7647ac64e596110f9c33fe18fc463b75e5 SHA512 c16c40c10d98c491214dfe46678b08488041a3a26d8e155edc4749a8c66d36d4e3f84bbe693e858c10eee676c6b98c0789520de75e306d0827d1a0ca61adab4a
 EBUILD yubikey-manager-qt-1.1.0.ebuild 1369 BLAKE2B fe38abf93e1d1b2ff89714bc7d207631ed547332ff1d9d19ea748d4d91cfbf09066355491c19115a11e536823fdcc05b53e1815f755af6845262d5497f1560cc SHA512 8c921e8773daa11054c69427d4a52660c5925cc02051d611afdd460d77585be06c0b366935297d38e997b87887fc70b26f53ab61ce8d6de215926ac1393b9aca
+EBUILD yubikey-manager-qt-1.1.1.ebuild 1369 BLAKE2B c9d6766c3358bac0210ab56eaede7fbd6a3594482bbd0a78e725a4aed1a303dca8f78902b24517fcbdafc38c9776912ecb0959226bf2572b84b38bf8747cd9f8 SHA512 922bfa42ba63138d4048607c83e4cade444bf266502b22e0179a4438c0861454241680e1cc1026ebdbe10b20896a1c9ecaba4a9ba9fda687067e3523ed8d6553
 MISC metadata.xml 371 BLAKE2B 1081e69aeb641c9d7de472bed98dfb336bc37e5374becbec4603316176419dcdb337f29b355b3395b778d250a99e32b181b84b42d4b7c10dedce7c47a6a187f6 SHA512 ed480648e967bfa3d95f71a5131963290e4265c487a345b69e34ad23c4ab18d82b08cd1e4a12f389533cc9690163fed90c05d471375fadd074c99a235105e837
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.ebuild
new file mode 100644
index 000000000000..e8a772f902e7
--- /dev/null
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit eutils qmake-utils python-single-r1
+
+DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
+	<app-crypt/yubikey-manager-3.0.0[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyotherside[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtgui:5
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtquickcontrols2:5[widgets]
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/ykman-cli//" ${PN}.pro || die
+	sed -e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
+		-i ykman-gui/ykman-gui.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	domenu resources/ykman-gui.desktop
+	doicon -s 128 resources/icons/ykman.png
+	doicon -s scalable resources/icons/ykman.svg
+
+	einstalldocs
+}
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index c290d0335a28..b07420faa158 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -3,7 +3,9 @@ DIST yubikey-manager-0.7.1-test-files.tar.xz 9756 BLAKE2B 5a2e2a2a58d04c8f9954c1
 DIST yubikey-manager-0.7.1.tar.gz 71834 BLAKE2B 45b0366531c8a158b3d8ebcfa8b76d608c14dba02224d4e4962c3757446829e3dff5f5e0d0ceda67caab7c67ad0510e037770c58a50552c2c6971136cb75c806 SHA512 3e9105f1c033f9314b90cf209eb52f7879fa1ea69e9ae6dac8de0b24d7d2ff6e45b6dd530917535fa645d6eea461f5b4f23bb8deb103ffc27d1f3483cfa681c7
 DIST yubikey-manager-1.0.0.tar.gz 90653 BLAKE2B 5d8522181ad460521995d3cae63976e06a444816a24efdc83b526d50262c902c8cc76b29d43f6f07725ee714666c853b690f1dd6fe98c9409f0cc1e722ada6f5 SHA512 9fd1926bf4e2c1278a42136a05db3e5fe0b7cb3d740f601fd0a420ab851badb61c2dd165157ac5b1f47e934f771b9d0b3cca4e07d1772d0f743556d482f77c11
 DIST yubikey-manager-2.0.0.tar.gz 102078 BLAKE2B a2b8f90dabefb1014881cbe709222bf5cb48c9f409b415a8a2b27d7101c2da6189d0ebfe21a2701d10798c48c44e546659f9424ba6bf9257f7311abb0fc90b9b SHA512 42bebb88ba78bcce00a228109d0b4c815b3242ddbe43fd26c1209ba8666eb033ab77d5acd39a157e8310ce327de8d38bf88cfa0ffaed6273236b220c39e72e3b
+DIST yubikey-manager-2.1.0.tar.gz 132797 BLAKE2B 39a170901dd10443f7cd639d1f525b12074ed042f606c083fe5b1bf04f463f608c4968c1e7f06dd057ff519a2a4bf712d36643e7db164ef92a3152ea5fb7ae15 SHA512 05cc1a106ffd2b40bc0a1286fa2f9c19f022bc7db04b85c9aaab3c67cad92a0c8ee4ba70f9b62ffa7f02ce67525a7d5f03bf9160b9bbe38909232cf75eb39373
 EBUILD yubikey-manager-0.7.1.ebuild 1579 BLAKE2B 65991c1ec1c6acc26baac225043924eb7dd5fdcad0e99d8ba26931ef9da0318dd47ca9a5f602c75c3fb35eedfc0a275695231b5a03e191c9c30a323ef89bf95a SHA512 d24bd03dc385339b96e36fc8056e4044233b784ad73a9464ae2eb797d5ac48bef907e3c27a63125c34c41b8578f8a98c03f9b3cc18db263c3ad656724f532ba3
 EBUILD yubikey-manager-1.0.0-r1.ebuild 1529 BLAKE2B c6e82a3279aa4ea3a179df00c95f53d41626ff825b9c0e43da9670fd724ac8e3156ef54056b2b70c951dd73e0d8b4bc5594cedea16270e034a6cbd92233cfc8c SHA512 ccae1748ac051677ff46517a88e18affaadda2508dd05c261a0a0377d7f75cbdaaa5b114c70a74e5195ce8c9624cdb820c3f883dcd1be74f8046472614ba453c
-EBUILD yubikey-manager-2.0.0.ebuild 1677 BLAKE2B 282c378e36d1c379284ec5948c26b367fd81dd58cb0eb0910a711ae5a0ade12a8b621b1652aaed7d47f3f47622a6a8097133ff665ac01869f0e4947611986796 SHA512 272734ca97f87a56c350e0f040b72640726942602b78f5e85161b2b718a19e150ea8ed7d6a62f6406fc8597cf9853daef9c8f1dd815fa3c0ea2dbb3000d3ada6
+EBUILD yubikey-manager-2.0.0.ebuild 1676 BLAKE2B 3737a80f7f6bfe9f712dc4abce6d6ca3ee196ddeeb4e60b0080226958580455f1d57cdf2a3d1d0f8de5456ffd2f2361ff27017ad64c820a0a913149547a2383c SHA512 70e17d694ae9a2ef45f09d28988daa91ccd4afabb5cd3bd4f7d21fe7e85a013507668bebd5242ae23a0153945a21db30abfce6abd34e9fea3c7f4a654ac35e3e
+EBUILD yubikey-manager-2.1.0.ebuild 1530 BLAKE2B 299579dc9d3e3e56a502ae3140226bb80b8cfc7cd0d7a41b82877fd86ced9c382c419e276615e07f84552504b83f93a4d1cd266244930bc74ce177f916794324 SHA512 d5da375e7eb7166db9de436eb1978d6b2b89e882fdea62d1872be22495ed09f6f2cb150753087423c57da71fad4c49ac85ecbd650d838e6bd92ce0b1401b40a8
 MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild
index 7fa00f1c34db..0172b68ddf9d 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}" # <- need this only for github-based SRC_URI
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 RDEPEND="
diff --git a/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild
new file mode 100644
index 000000000000..30b06435964d
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit readme.gentoo-r1 distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
+# the official source for tarballs, not Github
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	dev-python/fido2[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sys-auth/ykpers-1.19.0
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2_7')
+	)
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOC_CONTENTS
+
+	distutils-r1_python_install_all
+
+	DOC_CONTENTS="
+		The 'openpgp' command may require the package 'app-crypt/ccid'
+		to be installed on the system. Furthermore, make sure that pcscd
+		daemon is running and has correct access permissions to USB
+		devices.
+	"
+	readme.gentoo_create_doc
+
+	doman "${S}"/man/ykman.1
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}