gentoo resync : 07.05.2019

16 files changed, 14 insertions, 255 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index fa52be58c709..f788f60176e2 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index feb342da73ba..74328b7b0073 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -2,7 +2,7 @@ DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606
 DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
 DIST certbot-0.34.0.tar.gz 1346939 BLAKE2B db0d7bc716206ff9bebcf953b72e29f46e335209d70e518eeb11d944bab26e2fbe15c6bbe448861cbd71c744dfc22aa8cb54b96dfc5d15d497af8a91cfbc6e45 SHA512 24d4a58bcc220451532b1b7d1ddaa90ef773935ff65c2b06e121f044b5575d159555a757660abebd72ff4134a257394dbc99c981729d846d565c75f692317a30
 EBUILD acme-0.32.0.ebuild 1263 BLAKE2B 5486282dd90bee28ca65a9170546ed0d09de38880f7945dcef1009cb7c20b991e5d22e7efe89eae07a13013b24e627624c0da907604359e10c75cda5607478f0 SHA512 6517cd06f5430885b072407d11971850cec39c3bca45545006fb58c970f121aaafb725e6a77371bb08151b05a803fd274b45cb9c2e10e48c02e29e5bf9634d3a
-EBUILD acme-0.33.1-r1.ebuild 1716 BLAKE2B fb4fc28892c7b2ee25479a49521b02a80dd077031d68958af253c014398fb4689cf4b920c4764c4cea5fc4e007d722c58b7403d89a78cd7f5daa84db8d28bf4d SHA512 3b807ba729c2e51fea72d8f4d077328ed430006b0c6f6b46d1153e71ba15f4a04b715ffe25901f218a563b1ae6e8efcd9b5f792d9906c02fcb28490e3eb82629
-EBUILD acme-0.34.0.ebuild 1718 BLAKE2B d463fec2156cf80bf480424865fb96f516f78f5fa4959178eaba7bf7c286e722c61c9bce4b8e6405f7d09cb7a628ff7f9a9d287e492f78b2d0339fb2be85ad19 SHA512 785ea278cccfa8e014043c44efe5ff15d58a7380f02686e3a424f9031abb3b7e0368bf077f21c10d3208ff3c6e85d1b412b6512766de29171f15a5019f1383f7
-EBUILD acme-9999.ebuild 1718 BLAKE2B d463fec2156cf80bf480424865fb96f516f78f5fa4959178eaba7bf7c286e722c61c9bce4b8e6405f7d09cb7a628ff7f9a9d287e492f78b2d0339fb2be85ad19 SHA512 785ea278cccfa8e014043c44efe5ff15d58a7380f02686e3a424f9031abb3b7e0368bf077f21c10d3208ff3c6e85d1b412b6512766de29171f15a5019f1383f7
+EBUILD acme-0.33.1-r1.ebuild 1681 BLAKE2B 020b1e9b09cc794ebd39ecffeaa904e260b375dd1bd853e62c926d6065501da6cec10977fcf45b7addc660e85b838012e1a5bacfa4f7015ab62496672a0138b3 SHA512 5330cefe084d1b20801bc34b7c8ef30f9f4891f9f3407b28ed84a307b7afe574a2df7bea29fbf208c09520b5075b1c8195e48cd6ba3051387dca8b0bf86d84da
+EBUILD acme-0.34.0.ebuild 1683 BLAKE2B 76931500e9d92a856cdd0d5e26c6df199d111fca3bab417a49bd0373e4f3522f0ea31dd53d43d53436d3e83097617214f9b381193e3e46207b00ba15f347b0ea SHA512 ccbb885ab6021ae583d48cae27e7b32cd24aa88a39cc453c27818cb84911eb7d9fce9d7cc1d42e1afed98cb9349ed05823fa4d1ea2b127a4fdd287da9b320966
+EBUILD acme-9999.ebuild 1683 BLAKE2B 76931500e9d92a856cdd0d5e26c6df199d111fca3bab417a49bd0373e4f3522f0ea31dd53d43d53436d3e83097617214f9b381193e3e46207b00ba15f347b0ea SHA512 ccbb885ab6021ae583d48cae27e7b32cd24aa88a39cc453c27818cb84911eb7d9fce9d7cc1d42e1afed98cb9349ed05823fa4d1ea2b127a4fdd287da9b320966
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-0.33.1-r1.ebuild b/app-crypt/acme/acme-0.33.1-r1.ebuild
index 58b7f12c6356..52953d1abca7 100644
--- a/app-crypt/acme/acme-0.33.1-r1.ebuild
+++ b/app-crypt/acme/acme-0.33.1-r1.ebuild
@@ -44,7 +44,6 @@ DEPEND="
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
 	)
 	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
 "
diff --git a/app-crypt/acme/acme-0.34.0.ebuild b/app-crypt/acme/acme-0.34.0.ebuild
index bfa507fa149c..64b8beb25ff0 100644
--- a/app-crypt/acme/acme-0.34.0.ebuild
+++ b/app-crypt/acme/acme-0.34.0.ebuild
@@ -44,7 +44,6 @@ DEPEND="
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
 	)
 	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
 "
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index bfa507fa149c..64b8beb25ff0 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -44,7 +44,6 @@ DEPEND="
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
 	)
 	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
 "
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index ab8c74590dcb..9518f7da5862 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 1205 BLAKE2B 7547ae58c7e6bd749241648d99c70c4a0ba5c489828af0a645c03ae6123fca92d637967c43c0f7938546ef31c825cb996de0278eb2fb8ed9448772418d5a71ed SHA512 e3084ef11bcfeaf59ff0a8b3c4c06038fe94a15d56203577c274a1752aab682cb72b535a034f8abf541054cc069e07dc0ef8a392872b325761923ad581fe270e
+EBUILD argon2-20171227-r1.ebuild 1204 BLAKE2B 2c0cac04bc8677b26f17cea0fc9a6c85dc898be90f26deabf8bfb202ed0097cdc6710924b6c6dac04f35d424398a67409fe71fc5acec12c57ab6eca212003fee SHA512 21caa9762207712b66254a1d63dde40b7611028a980014596657e8e9d550d7d4beab5519dad56273a06ccf6c59b5419a7e271fd6638c22a531d74ff2ad506a4c
 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 d0976a328a2e..3e3d4dc8b8a5 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/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 3dbeaf4a65b0..5c030c058394 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,7 +1,3 @@
-DIST gpgme-1.11.1.tar.bz2 1419232 BLAKE2B 93980c24e6d692f35105db23a02db891ef022addd583d5bda8e55ec3552dfebb87c9feebb74fdd59fa353a3b08571e51537f8dcaf63af018beff467a848e97e9 SHA512 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a
-DIST gpgme-1.12.0.tar.bz2 1658803 BLAKE2B 630646af597074c06a99c1170c4f8170ad0fe4ba643a27a87a61dd8df681ca14f023b07817657bb049eaeaef01df3975bd1fe1b75a026634a62f832c6c311b56 SHA512 c228b3df28377df882be536ada56dc9c73150048a58e591aa4495f89c854af95820152cd60139840f994c249e9c7df50d8b89eb9d6dc4ce02aa80bbfebcdd014
 DIST gpgme-1.13.0.tar.bz2 1820504 BLAKE2B 71fbb034e3c5939d1953554ccbe0e89e2089c53a4c79e90ee51bdf96500bf4be8a5e1633772ab8dadd44616dde7be551ad7d3af0a59d7e1df10a19cd9cf56baa SHA512 47a7a67dcc6d111cddd805d288d42e870948114a6dc09ce0675ad8b3d1580bbc2a683e1e70cb2f416919cf2129c72a9ff30e2e3b9527809d04e863cc1f87267b
-EBUILD gpgme-1.11.1.ebuild 2870 BLAKE2B acc3b608c7d4b3cbd9fb332a5a3d3cd73472bda235206a1ea48cc5df9dce9142a00370261da5ec0d6b8c952acc5735f65e54da8513b94b59c4bcbf65955a9739 SHA512 214bae0fd2eb2476217bb3b0603e1e66ded5631e4729548f80cb17f8fba6f903ead28b27647ca4f2929902470fbe71ff712683da2284c1d3a8b2b2758a52f932
-EBUILD gpgme-1.12.0.ebuild 2881 BLAKE2B fd0fca35dc3da4da150245ec2fb17defa71535cc0e3faec5e5accfa9f623a8c156743e9c4c064e13918d173f2d4f6e16224ebe62cdb4f0f2ce5f5fee463adcce SHA512 22d8e5ef92093e5fb7c006c7f17ee2a660f8f0ffa33f02b189ad691e8b99317d6aeba419667f3a26b28ca8aedd881c71861758cd6557b8ab0a34e03678e07159
 EBUILD gpgme-1.13.0.ebuild 2871 BLAKE2B 572cb59de54390a6a6dc18c6838f67caf6797c977da0ae8850f3eabc363c0928c08c21140827c08401103b27f0f0b2c826ff0b8b01a1d2f387df55832aab9cc6 SHA512 a1ca175c8a6d608bc928b7b5f76c195c2ad235a760d3f476be3409bffefa2ec7acf57d4df207ef08fbf50d4e69ac0ccaa2f148efb3caf3374fd38fa5f4f1cf54
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/app-crypt/gpgme/gpgme-1.11.1.ebuild b/app-crypt/gpgme/gpgme-1.11.1.ebuild
deleted file mode 100644
index e8510ed6bc6d..000000000000
--- a/app-crypt/gpgme/gpgme-1.11.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
-SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1/11" # subslot = soname major version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs cxx python qt5"
-
-COMMON_DEPEND=">=app-crypt/gnupg-2
-	>=dev-libs/libassuan-2.0.2:=
-	>=dev-libs/libgpg-error-1.29:=
-	python? ( ${PYTHON_DEPS} )
-	qt5? ( dev-qt/qtcore:5 )"
-	#doc? ( app-doc/doxygen[dot] )
-DEPEND="${COMMON_DEPEND}
-	qt5? ( dev-qt/qttest:5 )"
-RDEPEND="${COMMON_DEPEND}
-	cxx? (
-		!<kde-apps/gpgmepp-4.14.11_pre20160611:4
-		!kde-apps/gpgmepp:5
-		!<kde-apps/kdepimlibs-4.14.10_p20160611:4
-		!=kde-apps/kdepimlibs-4.14.11_pre20160211*:4
-	)"
-BDEPEND="python? ( dev-lang/swig )"
-
-REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-do_python() {
-	if use python; then
-		pushd "lang/python" > /dev/null || die
-		top_builddir="../.." srcdir="." CPP=$(tc-getCPP) distutils-r1_src_${EBUILD_PHASE}
-		popd > /dev/null
-	fi
-}
-
-pkg_setup() {
-	addpredict /run/user/$(id -u)/gnupg
-
-	local MAX_WORKDIR=66
-	if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
-		ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
-		SKIP_TESTS=1
-	fi
-}
-
-src_prepare() {
-	default
-	elibtoolize
-
-	# Make best effort to allow longer PORTAGE_TMPDIR
-	# as usock limitation fails build/tests
-	ln -s "${P}" "${WORKDIR}/b"
-	S="${WORKDIR}/b"
-}
-
-src_configure() {
-	local languages=()
-	use common-lisp && languages+=( "cl" )
-	use cxx && languages+=( "cpp" )
-	if use qt5; then
-		languages+=( "qt" )
-		#use doc ||
-		export DOXYGEN=true
-		export MOC="$(qt5_get_bindir)/moc"
-	fi
-
-	econf \
-		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
-		--enable-languages="${languages[*]}" \
-		$(use_enable static-libs static)
-
-	use python && make -C lang/python prepare
-
-	do_python
-}
-
-src_compile() {
-	default
-	do_python
-}
-
-src_test() {
-	[[ -z "${SKIP_TESTS}" ]] || return
-
-	default
-	if use python; then
-		test_python() {
-			emake -C lang/python/tests check \
-				PYTHON=${EPYTHON} \
-				PYTHONS=${EPYTHON} \
-				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
-		}
-		python_foreach_impl test_python
-	fi
-}
-
-src_install() {
-	default
-	do_python
-	find "${D}" -name '*.la' -delete || die
-
-	# backward compatibility for gentoo
-	# in the past we had slots
-	dodir /usr/include/gpgme
-	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
-}
diff --git a/app-crypt/gpgme/gpgme-1.12.0.ebuild b/app-crypt/gpgme/gpgme-1.12.0.ebuild
deleted file mode 100644
index ea40cac30514..000000000000
--- a/app-crypt/gpgme/gpgme-1.12.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
-SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs cxx python qt5"
-
-COMMON_DEPEND=">=app-crypt/gnupg-2
-	>=dev-libs/libassuan-2.0.2:=
-	>=dev-libs/libgpg-error-1.29:=
-	python? ( ${PYTHON_DEPS} )
-	qt5? ( dev-qt/qtcore:5 )"
-	#doc? ( app-doc/doxygen[dot] )
-DEPEND="${COMMON_DEPEND}
-	qt5? ( dev-qt/qttest:5 )"
-RDEPEND="${COMMON_DEPEND}
-	cxx? (
-		!<kde-apps/gpgmepp-4.14.11_pre20160611:4
-		!kde-apps/gpgmepp:5
-		!<kde-apps/kdepimlibs-4.14.10_p20160611:4
-		!=kde-apps/kdepimlibs-4.14.11_pre20160211*:4
-	)"
-BDEPEND="python? ( dev-lang/swig )"
-
-REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-do_python() {
-	if use python; then
-		pushd "lang/python" > /dev/null || die
-		top_builddir="../.." srcdir="." CPP=$(tc-getCPP) distutils-r1_src_${EBUILD_PHASE}
-		popd > /dev/null
-	fi
-}
-
-pkg_setup() {
-	addpredict /run/user/$(id -u)/gnupg
-
-	local MAX_WORKDIR=66
-	if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
-		ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
-		SKIP_TESTS=1
-	fi
-}
-
-src_prepare() {
-	default
-	elibtoolize
-
-	# Make best effort to allow longer PORTAGE_TMPDIR
-	# as usock limitation fails build/tests
-	ln -s "${P}" "${WORKDIR}/b"
-	S="${WORKDIR}/b"
-}
-
-src_configure() {
-	local languages=()
-	use common-lisp && languages+=( "cl" )
-	use cxx && languages+=( "cpp" )
-	if use qt5; then
-		languages+=( "qt" )
-		#use doc ||
-		export DOXYGEN=true
-		export MOC="$(qt5_get_bindir)/moc"
-	fi
-
-	econf \
-		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
-		--enable-languages="${languages[*]}" \
-		$(use_enable static-libs static)
-
-	use python && make -C lang/python prepare
-
-	do_python
-}
-
-src_compile() {
-	default
-	do_python
-}
-
-src_test() {
-	[[ -z "${SKIP_TESTS}" ]] || return
-
-	default
-	if use python; then
-		test_python() {
-			emake -C lang/python/tests check \
-				PYTHON=${EPYTHON} \
-				PYTHONS=${EPYTHON} \
-				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
-		}
-		python_foreach_impl test_python
-	fi
-}
-
-src_install() {
-	default
-	do_python
-	find "${D}" -name '*.la' -delete || die
-
-	# backward compatibility for gentoo
-	# in the past we had slots
-	dodir /usr/include/gpgme
-	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
-}
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index ae08fb6eaf73..becbd2f177d4 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -7,5 +7,5 @@ DIST john-1.7.9.tar.bz2 717505 BLAKE2B ea720451b4544a975d5baca75242f22d8b306ad41
 DIST john-1.8.0.tar.xz 4468704 BLAKE2B 90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60 SHA512 e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543
 EBUILD johntheripper-1.7.9-r11.ebuild 6534 BLAKE2B 008ae23a7c0f34613cdbbde75db6c4b488ce5dca2ef57a7726c55663eef563a7bd7a133424aa359e0c8dca659678a4fa62179f57b5a333316c545a71b99e30b9 SHA512 3b8fa826d67f349c8eafbb96c509def97e21bd1688fe762c211214a4def243c6db02d3afae0b23dcc7dae62a717d25cef302de2b782edc4a1d468424063066f7
 EBUILD johntheripper-1.7.9-r6.ebuild 6038 BLAKE2B b1f1791dd6bb0990b894aa04808f7593be46e44dc10760c2099152dca60fac9903f0af9466b83c17a380e3a2b281c1abc964d677c8d32dd5df734d97dc0cabbd SHA512 212da5ebef507b1a37d2c3a8ef4da5e9dd3072c30dbe86012bb304e364eb02f2a1d131eae50f7d66b5b5aea60e23b4b0c58cc76cbd0fca093194cc26ad645fdb
-EBUILD johntheripper-1.8.0.ebuild 3223 BLAKE2B d3b8685091a2635645e674abfd3d56013d250622ca89b6e96d56d23c0bf07d45cb37a57dc59c544553fcc65d4ac0b6e313c6c0245d94db72fe15139bd751c951 SHA512 dfe72d8d3513eeed262d5dd755f36000ea50140633e8e1d0d3789bc326498715b7759b475007b1a20c7f371ad014561a9a803f6986a0db0117feecdbc1a5d5e6
+EBUILD johntheripper-1.8.0.ebuild 3222 BLAKE2B 4d011f719e09701bcd1a8cebda9192f72637e043dd0ae4f8f351b33cf5ea924fef8c66674c08f737ec3679764aebc2c2f550906d7749c88cad7d5c4adf225bab SHA512 8d71013773e4ff8bcb15c9c9fb1f00bb74f95b002cabb934322bf4cf5e5b63c9017fb1907b3c17018e361f602cf019ae93550c612b90ec10505b38aac59ed2f6
 MISC metadata.xml 793 BLAKE2B 8650fe215af0de8946b72ebbd2c2979c437e90634fc48d9d1ac20350b23922a418093301641589a9d524de2908e2c715dc1e0419a2206a34ff20bb7eb0b2a3aa SHA512 29234712e9b5631919aa400e207b36cefa84819cf2609547f5244745d81559d10e79b50e296681b65d14fcf813eea69acbb97fd8f8f487bb4240e4087f4b098e
diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 8cd2dafa1828..95f542e6070c 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 57160afcd6f0..342c10ea2854 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,3 +1,3 @@
 DIST p11-kit-0.23.12.tar.gz 1257028 BLAKE2B 8add003ad298b7c4548c40f863835e9aae4234a66a4b216149be7c473f2b3b7ffb633b95883d58e5b039c974dd8571e56e23f6dcc77e484672605e6178d75ad2 SHA512 ae43b1f6ba5400cf5ae7b64b8c93aa47e5c7ee927196828600fd88beb6fdf6bcb6a63bc822d356757255638f9fbf10896e0604e32a1332a9a833836fa0468726
-EBUILD p11-kit-0.23.12.ebuild 1993 BLAKE2B 0087888a61487bf5d9bc57a4ed413cc462d6216564f1b83b553f88ad556b9b971731ad8eccdf697607c446ba93aa70c79dde438427a06724daac9f8eb7b35885 SHA512 efa79a2a2424277a1db11946a8434a7c5d0e52b02b4a627209abbdd6d7fc1f1a044e12617e6eef41f7ad0c70f1cca6ee718248437a7ee1f8e14f8a45b7b0eb1a
+EBUILD p11-kit-0.23.12.ebuild 1967 BLAKE2B f9682318b563cd514742a7bd1e9383bb04c348ff657f350d5e70a71eadc85dc4466d16c624da9c93d951bae27e2b4ebee1501f6a82e0611edb01ff428fbb557e SHA512 bb787b54b30d7cf3bc761fce7ce8774568b5594b549e3618d568e4ac2d6ebedfad5847bc36ba1adec7f1fb670b80c3a181ea83394211c4cac2af04e7c276396f
 MISC metadata.xml 454 BLAKE2B 82db424896936d17b167806a47d54674d1d6eebe192ad1f8b4e985b00f74f10aa5f18ea587b866906571a91dcfda83626f6b25ebdbd6a6e02da65b34511b2b0e SHA512 24042c945cc3ab622b74c30eaa08819ebce4af9320b083ceb1f3f4db110fba6539121b4dbf0d245afdc395a9854bec022575861f7ae4e9418018d6bddbd4a888
diff --git a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild b/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
index e26190e0dcd9..cce5c647a22b 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
@@ -6,12 +6,12 @@ EAPI=7
 inherit multilib-minimal
 
 DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
-HOMEPAGE="https://p11-glue.freedesktop.org/p11-kit.html https://github.com/p11-glue/p11-kit"
+HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
 SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asn1 debug +libffi +trust"
 REQUIRED_USE="trust? ( asn1 )"
 
diff --git a/app-crypt/ssdeep/Manifest b/app-crypt/ssdeep/Manifest
index 3b5e60885d40..02611f4d60f3 100644
--- a/app-crypt/ssdeep/Manifest
+++ b/app-crypt/ssdeep/Manifest
@@ -1,4 +1,4 @@
 AUX ssdeep-2.10-shared.patch 174 BLAKE2B fff5447389ca80a63bf8ac422ca8c06aa1d17715bde05e00e9922b57004f807a435cef58d2d32af269eb39c764ba53b81daae4b745f69f74754f83f13923ee21 SHA512 9429c38e22cf100809062818c286419d141089e0dd081c11034d7f62143ef9fe2d2bac0ad67104d448c387b7bd4b84ff364933f363faae3dda527e5e8390ad1f
 DIST ssdeep-2.14.1.tar.gz 408831 BLAKE2B 7e0709a18876a192568e37d1deb63df11f2feadaff7b53c3bcb3a9f2566b18897e50b7543a29ec5cd3132981bcaf4609615793f31fa9cf654334e8fc5a90afac SHA512 a8f87e21f654d482a67709da273cf58808af377cfcb20f189986bad58530e382f8f1d3a5eaf33aa02284015a6fa7ccfc7fc383e487de6e0e4f57405a16537217
-EBUILD ssdeep-2.14.1.ebuild 764 BLAKE2B 2c00880ebae052c3fd6663147e44060beeacf9274b8fb24b2d7b1be57bd925daabe7e9796259b5b14fa14830d80d6086b6d9650f1e104e2b7a013afac1a1f20b SHA512 ecbb7c3a599fc47751a3b7cac607b2c4f9b2e4d272005310f7a226300082c564575a6ddcfaa765f8cf12d9c73fe6b7ad458f92ca59b4d27940c168a5f1142bf4
+EBUILD ssdeep-2.14.1.ebuild 774 BLAKE2B f61a6ad44d40811c4acebbf8d9422d198e188169600c78b4992ffd1081ae49b2dd0989ef7605aa68324c5a00acb8fb8fe6b34286a1afb7ceb545b271bd028a74 SHA512 fcdae0f0d2d3d36f699ea48bc403069b85d4e8e7d760888bca8b9cb517e9c81838f5020c7ba4aa708f89fe4f907671d980003502b23f5a282627c422cfb83d7e
 MISC metadata.xml 316 BLAKE2B 1916bbf9c489db6a30a7ee238630b4c5b137c1d795ab18183761dd49a5d7bdd40c970c916201c6e217435569f35e7e74ade29f1c3b65b43997dcc0f0f9625d4a SHA512 3fd64f3472e5d036fb4617b2f44d074eff34eeb940cc90c55334712f745b5f4abe02939f423fbf5e28ab6b4eddea2655016711efeffd4707932fe136b0562707
diff --git a/app-crypt/ssdeep/ssdeep-2.14.1.ebuild b/app-crypt/ssdeep/ssdeep-2.14.1.ebuild
index 306ea16efa2a..6c177a3d4261 100644
--- a/app-crypt/ssdeep/ssdeep-2.14.1.ebuild
+++ b/app-crypt/ssdeep/ssdeep-2.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools multilib-minimal
 
 DESCRIPTION="Computes context triggered piecewise hashes (fuzzy hashes)"
-HOMEPAGE="http://ssdeep.sourceforge.net/"
+HOMEPAGE="https://ssdeep-project.github.io/ssdeep/"
 SRC_URI="https://github.com/${PN}-project/${PN}/releases/download/release-${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"