gentoo resync : 18.11.2019

18 files changed, 187 insertions, 75 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 2b4827f44111..ed2560d88987 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 8b301b3abebf..f93de60cb757 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,4 +1,6 @@
 AUX 92_pcscd_ccid-2.rules 2275 BLAKE2B a72b8d2bb8cf56f621a0762dac95500f93afa224228f403395c9590758c8fa986b3e8d0d1b12353ec7fed5a40f6af900fcd57eaaa7b339018fe42c2b509c0c5d SHA512 f327eee35ca6009069389f935ca89feea4e693e8f0c73f8f218d2639faee4ce35df85832a71e3fe98ce24aae31861aa8bd290833e59ada75c1e1a2df9ff0a477
 DIST ccid-1.4.30.tar.bz2 642342 BLAKE2B fd43aa2a4c8840abb0545760f6ceb31bb9d7dc22d7283888c9a142e0c3b34310ec4530d18986451b21c6b1a3975b1212ab653a4c8d58466b28713f0f72ce1cdb SHA512 1761a4053a99eb28184d0ffece951aec5d4b646080597b4ae36b18a31fb7a76c55fabfa57ee8e5d7f2db1a6e13d209f7fa995fe6ed067f44558bea34a26d46da
+DIST ccid-1.4.31.tar.bz2 644039 BLAKE2B bd8e9c69e122348ffbeddc4f85f939d7d4c93dbfe5f712bc16f671af144570ce2c3bc6da04503851f4ce0f95f0c89bbbe6bbf0852be97cf5574993875d865870 SHA512 51d102c6be5b234ed568522d51b97bdb27c4c22d9610874abd7a18314f4e8ebe81fcb18a16a1edbdc814ee652a037d50202673a50de2fdeb0eac74063b149ed3
 EBUILD ccid-1.4.30.ebuild 1498 BLAKE2B 1e75dbc1b0915b33eb6ac0d5e59f6ccfbf9764c40650019f733dbd22349e49c162ce122aa82899e6c5ece831a2244fb5cad69f5878d3a033a85a870a711c0a70 SHA512 cf9e017e901bb007a883f31fc509c32d8bd1a0d55d60d191840a1023c30bf92918f73982cc725538b67f973e0c296127c5ad783b28ad2435b4d02fdf29889bca
+EBUILD ccid-1.4.31.ebuild 1506 BLAKE2B c9f59215cc58436a6eca45c9b0717f2154304c682c467681e4d5d91492fcec30dbfe3f877a073fc933a0357a02984f17db4589f32cee9b5dce809460b31ea53f SHA512 b461008f4539566e941bd81abd1f7303b35f33cbb62987ea037f558480ca1d8ebf308c8f9182b2eca2c428d6e5dd4ec39f0f676d02c0826c939571bbc3791986
 MISC metadata.xml 397 BLAKE2B 0b62fc531114bb9221d17ee3524db0858f4ff373b71a1b7beda520035eaf5679a63a420381dc52e40942a519bf15f95fae97b531267df133cf68687c49dad565 SHA512 8e8643f46728232ffffe25fe9906948c6a8bb94733dbdeaf2700afd0cf4a7567a27698c1832edf858c2a433187cac9d847dc7ad709d6398133b40b639e37cb4b
diff --git a/app-crypt/ccid/ccid-1.4.31.ebuild b/app-crypt/ccid/ccid-1.4.31.ebuild
new file mode 100644
index 000000000000..12813fa63a2e
--- /dev/null
+++ b/app-crypt/ccid/ccid-1.4.31.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="https://ccid.apdu.fr/"
+SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="twinserial kobil-midentity +usb"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.8.3
+	usb? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="kernel_linux? ( virtual/pkgconfig )"
+
+DOCS=( README.md AUTHORS )
+
+src_configure() {
+	econf \
+		LEX=: \
+		$(use_enable twinserial) \
+		$(use_enable usb libusb)
+}
+
+src_compile() {
+	default
+	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
+}
+
+src_install() {
+	default
+
+	if use kobil-midentity; then
+		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
+		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
+	fi
+
+	if use kernel_linux; then
+		# note: for eudev support, rules probably will always need to be
+		# installed to /usr
+
+		# ccid >=1.4.11 version changed the rules drastically in a minor
+		# release to no longer use the pcscd group. Using the old ones in
+		# the mean time.
+		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
+
+		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
+		if ! use kobil-midentity; then
+			sed \
+				-e '/Kobil_mIDentity_switch/s/^/#/' \
+				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
+		fi
+
+	fi
+}
diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
index 35a58ba9e900..8391d88a67fc 100644
--- a/app-crypt/jitterentropy/Manifest
+++ b/app-crypt/jitterentropy/Manifest
@@ -1,3 +1,3 @@
 DIST jitterentropy-2.1.2.tar.gz 24112 BLAKE2B 9328fcc6ac09b79765d53248e4d6d01be47348c6f22f660175de888a884ea9e65253cc2e6fd3620a96f69dd0051b97ea3c46462a24c8e0c94d2bba19afab059e SHA512 b1ba2fe22c6b7d5bca64bb1611f2da3f53f1979e515a16141ccf330e3ca27a6944f0e45f0db57f4e3963a30ea4b34920ce9173f9c4f3ea82b820dc739cbd95f4
-EBUILD jitterentropy-2.1.2.ebuild 1012 BLAKE2B b7614024865b2a103ba420a7eaee28c261e81ed3db50cb82c6b9c8263404aa3ffff4c4a50db34817f1187338b3499c328bca261ec90d8e834e2bd8d5ffa6c2e7 SHA512 69fbf1d285e5dd7a0e5200991f6e41859ff35516fb8f7240c5fc78756573325e158caf942d98d4b60f5dcb94dbe44c3d590e3e3b14e8b92cd071f8dc09e23acf
+EBUILD jitterentropy-2.1.2.ebuild 1009 BLAKE2B 1f8127f94b0c3c79afb1c4f9344320fd7a62c89596f1caa4ef84fc60c62200d67cc8fce06ed65e065172ed892ef028d040e925a826873e94b49fe6be36fdf3ef SHA512 0ce333852db58648d251019e79df22374f37c56d3c9489552e99e4bdddec97820264d8b58a9fa98b8a805cca1963895445ebf92dfaba83051d129587388eea56
 MISC metadata.xml 666 BLAKE2B 88598964271ee05c8427e8547d25dd50eb50bec1dafcaef064328dbca5140b9221b1d1823a1dc54289b73501556579fb39a85c49a6c25d6447a677e8db0f6252 SHA512 d6baaef1aa2e0958492872e7b0ba2c6c86dfa7e281268b6cb230c2cc2c8132df04e664e0449d24885357a1a791bb354253778e0e5f2436fa612b6e0c509729e0
diff --git a/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild b/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
index 281998201e21..e516259e8f5b 100644
--- a/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
+++ b/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="static-libs"
 
 S="${WORKDIR}/${PN}-library-${PV}"
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index c08a4a4471f9..f0d4a075d58b 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -2,9 +2,11 @@ DIST keybase-3.0.0.tar.gz 47018995 BLAKE2B 73aaa00a94af707dc7e0713c4e0a5b2d7d7ae
 DIST keybase-4.4.2.tar.gz 57819398 BLAKE2B 0852aa850ad4d66457a123e97449ae24081b695b2a6a70aa0b7ad928d59aa163b9a199e806090586579cc87ee77ebd5dcb18fb137b57aec7d61007be1cba51b5 SHA512 5eccfde7cfa35277fae71c4527c0d93bcedd0657311a9c055e50330a97a24e8c339aa3778e6e926f1230542c898e6a27c4fad18c4e2486c084c6b8d58eb2e125
 DIST keybase-4.5.0.tar.gz 60207510 BLAKE2B 11acd22139fa33988a13cce3db62c7000aedb9d157de37d589a450910628a9325edd38a5dab150b7b053112e3f40930c0e569be6c990cff559bdc64dd0d34376 SHA512 5299d7eab28d487299200a97beb894a2254a2d6a525053b9acac8bd2088e581097bdb8515c9d37ed54ce3f27996e0dacd5ef943acef3c976646c85f00003bf52
 DIST keybase-4.7.0.tar.gz 63827539 BLAKE2B 237a638b9b4e6dad9a0b0e0146d355f94ea87c459e64edca4253dd8f2eba4ba959a0d1e4ebd768b6572d0ab9c4f05abed539a3d8a778b23ae840a202e3fc6144 SHA512 4dc49b102f7d18345c960081a0a8cfa4d36f19159ec09ab468eb3c86e0ec2c259e9c4b2b769ea57c555c79f3cfb457c7896ca05bf185c9c5725f9458377e4048
+DIST keybase-4.7.2.tar.gz 63834062 BLAKE2B e4d2977982d60e191e51ea54b64d52930524a71d1159da15fac8280a4be866d51804a928b2db60fee211a9ba499a6af63a7ae2698d7879ed2eaa3704cd7f49ab SHA512 4d43e2ab222b8c82fc97c15c52c718323ea19ffb2be35d19b5f631960d452f8cfe2ac48bd87e13f8e03587a7ed32ded233774a3230bafced7adb6c6f2818c891
 EBUILD keybase-3.0.0.ebuild 1306 BLAKE2B c6607f27d1433f6405e605cb66efcfd8198bc6c5de194748c2620609d11c22541128a96d16eb561a57015f586cc2219e0cd3070dd62b71c75f0dc71495433513 SHA512 54a92ee6235461d3c8ef8293d8334a9b89c94fffc71373cf95d25c47be6e8cf977f642b54e86a21a8e809f5cebd00afb6d7651baa080185b460f2680f18d414d
 EBUILD keybase-4.4.2.ebuild 1280 BLAKE2B 7fbd0a92a0fab91a0095112eb2036c01b1f932ee3d79aa05b1dfa37190d428f9ebd18c278d6d1b7fa1e498ab5fa6d11f31c3aa0113e7b14a800df65903c38b2e SHA512 da8172a038a2dc7f93ba6e48baf783d6ebe236e4ec20ea189a4f2758d5eed1cac9151a7c826aaa184fea7e095c76ec1704fc9cff5c61b6beb5e7e6e088a01cd1
 EBUILD keybase-4.5.0.ebuild 1316 BLAKE2B 48a2935ad0328de10bccdbbcaa51defbbd844f2ae4e8b96e9de258c18308e78ba7ff3ee81057ee6060f927d81ca7bc76e2488fb324871e5524da6206607a51e9 SHA512 bb531b75c9be611e5d7bfe6e247e8af391dee2bccc0c172feaa3ddd2cccc5c1ac0f39521bcd19e270c66b51cbeedb2e6e9a55387b63529b11b6a1fe220adc1d6
 EBUILD keybase-4.7.0.ebuild 1316 BLAKE2B 48a2935ad0328de10bccdbbcaa51defbbd844f2ae4e8b96e9de258c18308e78ba7ff3ee81057ee6060f927d81ca7bc76e2488fb324871e5524da6206607a51e9 SHA512 bb531b75c9be611e5d7bfe6e247e8af391dee2bccc0c172feaa3ddd2cccc5c1ac0f39521bcd19e270c66b51cbeedb2e6e9a55387b63529b11b6a1fe220adc1d6
+EBUILD keybase-4.7.2.ebuild 1316 BLAKE2B 48a2935ad0328de10bccdbbcaa51defbbd844f2ae4e8b96e9de258c18308e78ba7ff3ee81057ee6060f927d81ca7bc76e2488fb324871e5524da6206607a51e9 SHA512 bb531b75c9be611e5d7bfe6e247e8af391dee2bccc0c172feaa3ddd2cccc5c1ac0f39521bcd19e270c66b51cbeedb2e6e9a55387b63529b11b6a1fe220adc1d6
 EBUILD keybase-9999.ebuild 1276 BLAKE2B a38e94b63e54ace5927b6d7c58fe6586c374b73c0836898db0d073ffea4dbe3cacc0538fd048883ae86c34cffe53d9d1ea3a1acd211d7cd80d88b5f630d4ab48 SHA512 044e15f79885d5987bee77c8332537d155b9e6a876032bcbfc8670c073b26828afed653073a003e9c17a256f2e9823ba776fda0689274e81b13c9614f302bd72
 MISC metadata.xml 465 BLAKE2B a1dcb592edbf2e5a45bd985adea8fa09504f75b17f689f38c415dff3efd0a4c67b3476c8c7568dc2b8351117281c94da4235cb1b9144d1636f04ae3b2055164e SHA512 68da266d0856035ec7f0b2ac5f8746ad6c7afa023ccf2d592be43fbf45f12f1443afdceb075ab57efeeceb97dfcc0a3997ed7177e12ae6291467e97c17e10810
diff --git a/app-crypt/keybase/keybase-4.7.2.ebuild b/app-crypt/keybase/keybase-4.7.2.ebuild
new file mode 100644
index 000000000000..b394003e10e1
--- /dev/null
+++ b/app-crypt/keybase/keybase-4.7.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-crypt/gnupg"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	ln -vs "client-${PV}" "${P}" || die
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/client" || die
+}
+
+src_compile() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \
+		golang-build_src_compile
+}
+
+src_test() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		golang-build_src_test
+}
+
+src_install() {
+	dobin "${T}/keybase"
+	dobin "${S}/packaging/linux/run_keybase"
+	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
+	dodir "/opt/keybase"
+	insinto "/opt/keybase"
+	doins "${S}/packaging/linux/crypto_squirrel.txt"
+}
+
+pkg_postinst() {
+	elog "Start/Restart keybase: run_keybase"
+	elog "Run the service:       keybase service"
+	elog "Run the client:        keybase login"
+	ewarn "Note that the user keybasehelper is obsolete and can be removed"
+}
diff --git a/app-crypt/kstart/Manifest b/app-crypt/kstart/Manifest
index 71a99e1369e2..68fea2abab05 100644
--- a/app-crypt/kstart/Manifest
+++ b/app-crypt/kstart/Manifest
@@ -1,5 +1,3 @@
-DIST kstart-4.1.tar.gz 269215 BLAKE2B 0d979953206e1598c121e21b2c52a123a4b5d93872ce8292638e21c5d9a4c1be0345990f1a74fa60e9a5ce58d6f166cca5ae525f97c67f7a908d73e7657d6fe8 SHA512 74a8a3f2c8d2c95f166f5861fb05a2d659a31db3165e27e81e5cf216bde44809d937ebc00995f89fa3b9df68609e3081303eb30742f5c4d90151b1410f0bd3cc
 DIST kstart-4.2.tar.gz 296651 BLAKE2B 127bf28ef538681d188ae79ed67cedaa7d9022c1fe6741b3486ce7d5901c4a77d0aec7d00164240a79ffc70b56dd7fdeaf42e76dd2b02effe79bcad41ad8e271 SHA512 7ce9c1f964c0d469b4b8a5de88ae83186e99116959941c4e7f69c59165d0c22aac432ac26dd5fe54f7c2f725048bb55b787107aea8408e2fd6c9ad02dcb31552
-EBUILD kstart-4.1.ebuild 706 BLAKE2B 3f43a948aa353100c667e7629132bdbcf22d076d207442a7e0c97b690009dc4d3054811c1ea98af7046182227fb4d5024d1bb24b64e9848b7b983b4d8d6b7865 SHA512 2b8865c5460966d049363d1ddef18db1abbadb1c7e527b9a22dfcd4eac9eca6938485772756ad906183e076dee9d29ef459c2b877335196f81033bf1c5f01c98
-EBUILD kstart-4.2.ebuild 666 BLAKE2B ce11818d2327c2ca3d8ff561a5f22248523b1c13162dbec270eadc05667dfbedd262c5b3d7adba98486e93f2bbfe9a6f5de275516fac6d027a1b81db5d6f9605 SHA512 d267f318c97bb1843f9ce3da3f7af0fb5d2cb570037d4c2e3ea8edcfc446c69a027caa05c9d9523d2094949925afbf71b75efc913ac42d1fd5de953920414bad
+EBUILD kstart-4.2.ebuild 661 BLAKE2B a317453fee5da7a9601e7c9b6ce4f04670a6e66f52e644b329bfa7712d94921aec81c239300ee986fc61077b417384cbd4ab13185d51242a157ca29d29d75a33 SHA512 90f6cfc5bc0b693e5af1f14d7c13d0fac4f6cf345c8ae1af9f6bd19b7ba3cae83194d9d0d253e702ca3275f24e7ae36d2ff058a66ad1714220f9efafe6507a63
 MISC metadata.xml 807 BLAKE2B 9c7c0283dce5943b74d5d57b21fdfb11cd2f9b994ca1930e62997576e20e3a74cb468565824c44051b67fd87b44f70f08defcd834d2dc03e98b5de62289cf08c SHA512 d854205e8829d141c3cd94cc00db039fce23376cb4f75c2498ae46d714765103890329526d2fe85f2eeff238fe2620f616686e78c62c9a115051d5fc161d19b5
diff --git a/app-crypt/kstart/kstart-4.1.ebuild b/app-crypt/kstart/kstart-4.1.ebuild
deleted file mode 100644
index c80974b18abb..000000000000
--- a/app-crypt/kstart/kstart-4.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Modified versions of kinit for refreshing kerberos tickets
-automatically"
-HOMEPAGE="https://www.eyrie.org/~eagle/software/kstart/"
-SRC_URI="https://archives.eyrie.org/software/kerberos/${P}.tar.gz"
-
-LICENSE="|| ( MIT Stanford ISC )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="afs"
-
-DEPEND="virtual/krb5
-		afs? ( net-fs/openafs )"
-RDEPEND="$DEPEND"
-
-src_configure() {
-	econf \
-		--enable-reduced-depends \
-		"$(use_with afs)" \
-		"$(use_enable afs setpag)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doman k5start.1 krenew.1
-	dodoc README NEWS TODO examples/*
-}
diff --git a/app-crypt/kstart/kstart-4.2.ebuild b/app-crypt/kstart/kstart-4.2.ebuild
index 0f9b5ae1131c..b4634629b712 100644
--- a/app-crypt/kstart/kstart-4.2.ebuild
+++ b/app-crypt/kstart/kstart-4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://archives.eyrie.org/software/kerberos/${P}.tar.gz"
 
 LICENSE="|| ( MIT Stanford ISC )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="afs"
 
 DEPEND="virtual/krb5
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index 92018e4c3ab6..600426635066 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,6 +1,6 @@
 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 1744 BLAKE2B b2256260ca7312c87184a92e9b495fb7a7f4fed6353756f3c995c108f71b1abcb9dc304174760a8b624a743c3c39d9e4b275dc50c1daf3bfddfd18d100b0f2cc SHA512 73a90667e0786c443cccc566d43964ad78bfd10cd019f8d3544d2a3842721a58c225d509fedde0b34888da7031e04aabaac5f6311fe3f67ffa6034db646c4f01
-EBUILD libb2-0.98.1-r2.ebuild 1816 BLAKE2B 06cde1fe73772227b6697175aa75b60865a5a70dcb5e12c4c84a56efe977b56be1680ee5f6c3c936be393893785085625e1cf7b032a5c8048d0fb30cb2d45b2a SHA512 32314c62552f92ede4ccc4badc646c5038fbb0854a5c7c36890c1761c5546e088d16f705bc143b101123759b668ce39aaf20eb6143885e4a9fc95ee859d49480
+EBUILD libb2-0.98.1-r2.ebuild 1812 BLAKE2B 01c49295346ecf7c2f80f3a689176b28ae60fd577bf0b51e76c0d227c502c93f06d90c2959de77df4c27d9c4f219443f201a4cc43a64e6f3ff35966c65ddcd43 SHA512 d1855184fca4bcf094b0ccbba0d5e5d25df28193e208b9df8208048e841358a7c2d7239635e8bc92a44e1f21ce03cf9b2ebf0161dc2890a92ec15b6c8884f40c
 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-r2.ebuild b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
index 3b919c6717c6..56d05cc6f86b 100644
--- a/app-crypt/libb2/libb2-0.98.1-r2.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r2.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="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh 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 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh 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/md4sum/Manifest b/app-crypt/md4sum/Manifest
index 9823e490de38..4a738bc57d95 100644
--- a/app-crypt/md4sum/Manifest
+++ b/app-crypt/md4sum/Manifest
@@ -1,5 +1,4 @@
 AUX md4sum-fix-out-of-bounds-write.diff 271 BLAKE2B 44573278991d38979ca6f7d18b51be2d9f4150b1491c0650b0ae99d203be475a9c15bfcbdba1dab557a5467aff3c78a16b098d417905b24270164a9969d81ff3 SHA512 bcf06b6da80b67965547d359774c4462516dd69d36ed84723d9baaa93472405ed4d790ce687affa148be39157137ef46399e355540c18271f9164318f7731d65
 DIST md4sum-0.02.03.tar.gz 26819 BLAKE2B 6e7fb76a21d13276a7444e1c1d1d0a05e90399dc7a99b3e2e6d24d1dc46f45b086b99d00e4c9e1821c4a82a9fe985e4823a235e254abba475bd639f98536aea6 SHA512 5a05760aa6a770d9f55a41e42bdf6801dcd67bc804ead5bd84aecc48e5ee5a7c8b01d4a1e1767a4cc1f8695d66ed16c6a1f09b58d236c27db317f227e02e3762
-EBUILD md4sum-0.02.03-r1.ebuild 684 BLAKE2B 95fbc4bae123d46598ec172dfa01b2c8eb7229e8ef4d508483e4240c840043bbb0d78bf7cfbec7c09167bb679c027ddc36a1b7568a20235ef06e04422e6c9da8 SHA512 e6b07aa9a06e94010bc84e3534bb670a2946c0b7b5c503271a6524d4163cb90a55fcc8299ef80394598cebcc3a4674f4db143a9c600725051bfed4fdfb3d06c0
 EBUILD md4sum-0.02.03-r2.ebuild 625 BLAKE2B 64d034954e34b51bea2dc9dc85372ece1ee5c5424d155c8dede791cdc28d273b58c9310e469277d4e165077bec785e0b8220f5be2855d9bbf34aaa3f9337b3f1 SHA512 98269dade29e683dbf9e0c044abe08c96b56e21b2754e0bad5a62f26b1d3a2c1e273fb14228da74c91fd1b9659093c3b09bdddb185e9e2c08c30db8865e18374
 MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/app-crypt/md4sum/md4sum-0.02.03-r1.ebuild b/app-crypt/md4sum/md4sum-0.02.03-r1.ebuild
deleted file mode 100644
index 089194c7affd..000000000000
--- a/app-crypt/md4sum/md4sum-0.02.03-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="md4 and edonkey hash algorithm tool"
-HOMEPAGE="http://linux.xulin.de/c/"
-SRC_URI="http://linux.xulin.de/c/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}/md4sum-fix-out-of-bounds-write.diff"
-}
-
-src_compile() {
-	sed -i -e "s:CFLAGS=:CFLAGS=${CFLAGS} :g" \
-		-e "s:install -s:install:g" Makefile
-	emake LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	mkdir -p "${D}/usr/bin"
-	mkdir -p "${D}/usr/share/man/man1"
-	einstall || die "einstall failed"
-}
diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index 89baa0950eda..c1eddd8cbf04 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -29,5 +29,5 @@ DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD nitrocli-0.2.4.ebuild 1404 BLAKE2B c55db4237e6da0c17bc4038e3c2c15f7c86a060aa8112015285b6b10559432e49b377caf496b6c0cca99affff63660de91f5a488111895a51f601732de475c08 SHA512 715f67f86d29ac16d78d3ad90423f46cf04cab040fabb6449f9d0669898e836cbfe22923fc44eb15d741a1cf7d54698963f458d5064b9663c909a0d9ab8e640c
+EBUILD nitrocli-0.2.4.ebuild 1403 BLAKE2B efbdb2fdc154eba3e3dd5a42d025fcd390462277571f660360558dc11932099f9facc44ebdc07fc78e966990f3510a23b3e8bdf260c1fdbdf8a30d2f8c5da2ac SHA512 66baff3f91c7173359de13826734f412cad69f09a0bd0234e5495e65b822326c8e531db5f41eca91394f11acdbbddd28f52c9f6c8719b40dbd83283ce2f8d1d2
 MISC metadata.xml 683 BLAKE2B a973761f8df97168483a0adc13bf44f088f13fb9c472986cffed08d53f69cdbc27a4bc195babcd86796853968c8face6c00004e060086b2ba4d09c52ce978815 SHA512 3f4615ba5af13e358c1c3a4b28c3dbec77c0b99af4692c0b2feedb4f21a1e5f8f76cb7fbd2cdaa5a8c899d340094b8029a6967dd68d591586bef551f8eb61b1f
diff --git a/app-crypt/nitrocli/nitrocli-0.2.4.ebuild b/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
index 74bf7e9cd067..56251e3060b6 100644
--- a/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
@@ -45,7 +45,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="Apache-2.0 GPL-3+ LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/app-crypt/seahorse-sharing/Manifest b/app-crypt/seahorse-sharing/Manifest
index a0356460e3bf..6148cbf50b3d 100644
--- a/app-crypt/seahorse-sharing/Manifest
+++ b/app-crypt/seahorse-sharing/Manifest
@@ -1,3 +1,5 @@
 DIST seahorse-sharing-3.8.0_p20151117.tar.gz 496497 BLAKE2B 5107eb37c57d8311390399fda59d8df76f59afc6b21f107dfb1cb38dd6c68ea25bda619b1898637ff009c0e9f7617b0557b86f0194ee2c8704d804aa9f8827f9 SHA512 aa43240040f637e3c79c08f07620a92e5e76e81b758c939a8eee5bf43cdd32657f85d4b9d7440401e092ef4d556849ba0a64dc9d5a83e708bc84d9a2d7baf01c
+DIST seahorse-sharing-58db1e5b8615d74afaa5d888237ef6556368147b.tar.gz 101549 BLAKE2B c0ac487e826426c5f0a7fcfdc1078bd9b96442751821ac6597da3ffae3f5ab06b3fa4c4cf514536f9b8375f2a36529768942e6b15d6f4ea57ada543e7d95586c SHA512 6b91a8498f6065a0ddfcc53edf96dbf7720f82a73bc904ce6af18b1f52b559459e21ad9c3d550fc24730e3200c2ff9acaa9bdfe64b5bd83939b55db97ea116d9
 EBUILD seahorse-sharing-3.8.0_p20151117.ebuild 1574 BLAKE2B 6ac878db3280b82d833c40fc4f3f8009ec1b607b3dac020e0ae0e560c8762d76cd560f2e04a7ae914eaee3035283fc8abbe38e5a8c4e6cc34d590055d63a368b SHA512 809c041826a217365d5872f710bf51d0f8f99e3704e10916b5a70d56f50a0c282adbae120d51d9baaac0103363de54d95c3cbfb17617c3716185c44825a4d31c
+EBUILD seahorse-sharing-3.8.0_p20181216.ebuild 1505 BLAKE2B fd622edb1ade606341ae6a28950804a0bcbe09f4f7442655d9d344a2d09a3740f6a9ebb29a4a74e6389697bdb49b63f7e57295bab01b6b13caeca30189854178 SHA512 893298589e9f0355098d00f03d7929bf5eb2fd83e7cbd019734cbd5d81800a7651b34377270a051e447727e4f75b93c0aee51c193278472a9165df88fc4e1f95
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild
new file mode 100644
index 000000000000..6aea8f21d54c
--- /dev/null
+++ b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="yes" # disable asserts
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="Daemon for PGP public key sharing using DNS-SD and HKP"
+HOMEPAGE="https://projects.gnome.org/seahorse/"
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/master/${PN}-58db1e5b8615d74afaa5d888237ef6556368147b.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	app-crypt/seahorse
+	dev-libs/glib:2
+	>=net-dns/avahi-0.6:=[dbus]
+	net-libs/libsoup:2.4
+	>=x11-libs/gtk+-3:3
+
+	>=app-crypt/gpgme-1
+	>=app-crypt/gnupg-1.4
+"
+RDEPEND="${COMMON_DEPEND}
+	!<app-crypt/seahorse-3.2
+"
+# ${PN} was part of seahorse before 3.2
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}-master-58db1e5b8615d74afaa5d888237ef6556368147b"
+
+src_prepare() {
+	DOCS="AUTHORS MAINTAINERS NEWS" # ChangeLog has nothing useful
+	# Do not pass --enable-tests to configure - package has no tests
+
+	gnome2_src_prepare
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version net-dns/avahi && \
+		! rc-config list default | grep -q "avahi-daemon" ; then
+		elog "To use ${PN}, the Avahi daemon must be running. On an OpenRC"
+		elog "system, you can start the Avahi daemon by"
+		elog "# /etc/init.d/avahi-daemon start"
+		elog "To start Avahi automatically, add it to the default runlevel:"
+		elog "# rc-update add avahi-daemon default"
+	fi
+}