gentoo resync : 11.01.2018

18 files changed, 262 insertions, 562 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 18a095451cc5..dc2bdfca41cf 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index c1ccdefc7b59..36604294f1b0 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -1,3 +1,5 @@
 DIST bfgminer-5.4.2.tar.xz 1039200 BLAKE2B f63a7fa2c85d352a366794a39619599db6ccc3f98508ccd90387b315374227d74edfcfd2329db8b57c96539b194b0d2ee746cbea032c241dab1cf93e717b137d SHA512 b5ae8ae44df166d5576f89683ce9ee0832ca1f506b2522da7e3cd432abc5e218e9080e2a79f4da29e40db0d3179e63c9a8907d5d6b60d5d4895d6cac2b15d8ca
+DIST bfgminer-5.5.0.tar.xz 1054664 BLAKE2B db841a73bca10b19205744be531c13f2c4435bd69c9f2af7b8aba84381af640028cc4db33df399cf05dd0bbec7b79a5b65679bcb2a8bec7624f6fbc47e9ebd79 SHA512 d1adae473e01fcf1cd0efde74d3e8ce10609e520397d688bf4e226c1113c1606c782e3cfdba6847f1a3886cac30de6b5baa03b731aca86287d53bf01ef705cdb
 EBUILD bfgminer-5.4.2.ebuild 5123 BLAKE2B 68574f29aad9afa2e485db092f515c356ee0fa50438bde7e5d2382e0a6cadf246494ff91c1cbc10ee077ab94337e5929e244d0d84c8ddc25615d75cac8b868aa SHA512 70462cbbfd7537f8f0ef305a7b98ae0d961aef9ce317332ce94dc152ecd29499c6aa36b13ea2f75107c3a7a6eba99875cdb83acea6517c39d797dc1bb4fe8e73
-MISC metadata.xml 3868 BLAKE2B 6581fc69178d063e921791ec0f32da2c4cbd87d15c96d42060e4502dcc5a537c9c44671ea60334dc58a27e15b2d9851b583320e746f3729f22042ecedc25f728 SHA512 5231fc476a9478cfe043554f0ed2ca4e7a0986d8ba7b8a74fe1a235c6ebfe01e931dc9d3e9bb9b7d6733acdf49b87a3cc5ba92c240a12f812e0854388d7b207f
+EBUILD bfgminer-5.5.0.ebuild 5185 BLAKE2B a076eb6a8556e46faa7b9c83c9f44dea29ac3a31fe43f2afb3488a1abc64687a9d9d388c3106fddd1ec9c91d6972b81970a55bff965b24247d99654870edcc22 SHA512 3b1991110480d052ce46ad02e74289cca297f35f7f48b1e0e311cf3999845f1832c9068f58d96a3172d02672512019d7633beb08668d7069dbe9a1b6402fbf83
+MISC metadata.xml 4029 BLAKE2B b9ed1a1c14386e3c4c3d11d40ae60988e2d7170c2363418b1dd9f33e0e32516bcf45ea08c96310d598173b43cd0fa23d7c1f6033656c3914ded0e685f39b6de6 SHA512 17f36d0d7f9055d1860acf7fe83f036184303cfa095d872f40877fd2f78cfb3433bdb01eba6c39058117dcbdbe5c7645e6b5eb0d24922288d34256c80624fa21
diff --git a/net-misc/bfgminer/bfgminer-5.5.0.ebuild b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
new file mode 100644
index 000000000000..1c179d3aa697
--- /dev/null
+++ b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
+HOMEPAGE="https://bitcointalk.org/?topic=168174"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+
+# TODO: knc (needs i2c-tools header)
+# TODO: kncasic & titan (need systemwide knc-asic install)
+# TODO: minergate (needs actual miner_gate)
+IUSE="adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+REQUIRED_USE='
+	|| ( keccak scrypt sha256d )
+	|| ( alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
+	adl? ( opencl )
+	alchemist? ( scrypt )
+	avalon? ( sha256d )
+	avalonmm? ( sha256d )
+	bitmain? ( sha256d )
+	bfsb? ( sha256d bitfury )
+	bfx? ( sha256d bitfury libusb )
+	bifury? ( sha256d )
+	bigpic? ( sha256d bitfury )
+	bitforce? ( sha256d )
+	bitfury? ( sha256d )
+	cointerra? ( sha256d )
+	drillbit? ( sha256d bitfury )
+	dualminer? ( || ( sha256d scrypt ) icarus )
+	gridseed? ( scrypt )
+	hashbuster? ( sha256d bitfury )
+	hashbuster2? ( sha256d bitfury libusb )
+	hashfast? ( sha256d )
+	icarus? ( || ( scrypt sha256d ) )
+	jingtian? ( sha256d )
+	keccak? ( || ( cpumining opencl proxy ) )
+	klondike? ( sha256d libusb )
+	littlefury? ( sha256d bitfury )
+	lm_sensors? ( opencl )
+	metabank? ( sha256d bitfury )
+	minion? ( sha256d )
+	modminer? ( sha256d )
+	nanofury? ( sha256d bitfury )
+	scrypt? ( || ( alchemist cpumining dualminer gridseed opencl proxy zeusminer ) )
+	sha256d? ( || ( avalon avalonmm bitmain bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) )
+	unicode? ( ncurses )
+	proxy? ( || ( proxy_getwork proxy_stratum ) )
+	proxy_getwork? ( proxy )
+	proxy_stratum? ( proxy )
+	rockminer? ( sha256d )
+	twinfury? ( bitfury sha256d )
+	x6500? ( sha256d libusb )
+	zeusminer? ( scrypt icarus )
+	ztex? ( sha256d libusb )
+'
+
+DEPEND='
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses:=[unicode?]
+	)
+	>=dev-libs/jansson-2
+	dev-libs/libbase58
+	net-libs/libblkmaker
+	udev? (
+		virtual/udev
+	)
+	hashbuster? (
+		dev-libs/hidapi
+	)
+	libusb? (
+		virtual/libusb:1
+	)
+	lm_sensors? (
+		sys-apps/lm_sensors
+	)
+	nanofury? (
+		dev-libs/hidapi
+	)
+	proxy_getwork? (
+		net-libs/libmicrohttpd
+	)
+	proxy_stratum? (
+		dev-libs/libevent
+	)
+	screen? (
+		app-misc/screen
+		|| (
+			>=sys-apps/coreutils-8.15
+			sys-freebsd/freebsd-bin
+			app-misc/realpath
+		)
+	)
+'
+RDEPEND="${DEPEND}
+	opencl? (
+		|| (
+			virtual/opencl
+			dev-util/nvidia-cuda-sdk[opencl]
+		)
+	)
+"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	>=dev-libs/uthash-1.9.7
+	sys-apps/sed
+	cpumining? (
+		amd64? (
+			>=dev-lang/yasm-1.0.1
+		)
+		x86? (
+			>=dev-lang/yasm-1.0.1
+		)
+	)
+"
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	local with_curses
+	use hardened && CFLAGS="${CFLAGS} -no-pie"
+
+	if use ncurses; then
+		if use unicode; then
+			with_curses='--with-curses=ncursesw'
+		else
+			with_curses='--with-curses=ncurses'
+		fi
+	else
+		with_curses='--without-curses'
+	fi
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable adl) \
+		$(use_enable alchemist)\
+		$(use_enable avalon) \
+		$(use_enable avalonmm) \
+		$(use_enable bifury) \
+		$(use_enable bitforce) \
+		$(use_enable bitmain) \
+		$(use_enable bfsb) \
+		$(use_enable bfx) \
+		$(use_enable bigpic) \
+		$(use_enable bitfury) \
+		$(use_enable cointerra) \
+		$(use_enable cpumining) \
+		$(use_enable drillbit) \
+		$(use_enable dualminer) \
+		$(use_enable gridseed) \
+		$(use_enable hashbuster) \
+		$(use_enable hashbuster2 hashbusterusb) \
+		$(use_enable hashfast) \
+		$(use_enable icarus) \
+		$(use_enable jingtian) \
+		$(use_enable keccak) \
+		$(use_enable klondike) \
+		$(use_enable littlefury) \
+		$(use_enable metabank) \
+		$(use_enable minion) \
+		$(use_enable modminer) \
+		$(use_enable nanofury) \
+		$(use_enable opencl) \
+		$(use_enable rockminer) \
+		$(use_enable scrypt) \
+		$(use_enable sha256d) \
+		$(use_enable twinfury) \
+		--with-system-libblkmaker \
+		$with_curses \
+		$(use_with udev libudev) \
+		$(use_enable udev-broad-rules broad-udevrules) \
+		$(use_with lm_sensors sensors) \
+		$(use_with proxy_getwork libmicrohttpd) \
+		$(use_with proxy_stratum libevent) \
+		$(use_enable x6500) \
+		$(use_enable zeusminer) \
+		$(use_enable ztex)
+}
+
+src_install() {
+	emake install DESTDIR="$D"
+	if ! use examples; then
+		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
+	fi
+	if ! use screen; then
+		rm "${D}/usr/bin/start-bfgminer.sh"
+	fi
+}
diff --git a/net-misc/bfgminer/metadata.xml b/net-misc/bfgminer/metadata.xml
index aa456e90bcef..0a9f60a01dab 100644
--- a/net-misc/bfgminer/metadata.xml
+++ b/net-misc/bfgminer/metadata.xml
@@ -11,11 +11,13 @@
 	</maintainer>
 	<use>
 		<flag name="adl">Enable support for controlling fans and overclocking on AMD cards with AMD Display Library</flag>
+		<flag name="alchemist">Enable support for mining with AlcheMist</flag>
 		<flag name="antminer">Enable support for mining with AntMiner U1 sticks</flag>
 		<flag name="avalon">Enable support for mining with Avalon 1 ASIC modules</flag>
 		<flag name="avalonmm">Enable support for mining with Avalon 2/3 ASIC modules</flag>
 		<flag name="bifury">Enable support for mining with Bi*fury USB sticks</flag>
 		<flag name="bitforce">Enable support for mining with ButterFly Labs BitFORCE ASICs and/or FPGAs</flag>
+		<flag name="bitmain">Enable support for mining with Bitmain Antminer S* series</flag>
 		<flag name="bfsb">Enable support for mining on BFSB host Raspberry Pi</flag>
 		<flag name="bfx">Enable support for mining with BFx2 USB sticks</flag>
 		<flag name="bigpic">Enable support for mining with Big Picture Mining USB sticks (Red/BlueFury, BF1, etc)</flag>
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 1d25d605a7ae..cad29cb849ca 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -2,5 +2,5 @@ AUX dropbear-0.46-dbscp.patch 500 BLAKE2B 268b3a065ff9a9d52659c969195a712e8bfcbc
 AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f
 AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8
 DIST dropbear-2016.74.tar.bz2 1622234 BLAKE2B c729a2c1afd13e1ca07f3c9cfe3ff0ea7888cc1687ea2793275134b3224118164ef81583f55dbec53d6322be53eaa7a7324216133919722390d0e2dfbd929f07 SHA512 c0f4ea7840077b8302b48e27b5b588a4babac6583740dfdb845c40f633aa3ec96174d1d2ade81d2c3e23ea99b75e906312c512d8c7580e6e4105b2dbd37e5e22
-EBUILD dropbear-2016.74.ebuild 2480 BLAKE2B 9557d31e740bca44056854d08cac3d2c74833d4f288b611f93cad4cc780d6b04544e12fd4f90ea121b1ca905584f0e5d5d3b7d8357ae364e13828d820ecd19e6 SHA512 aaf43ba85a8263110a368772d021f47cb876b0e1ac40bd82a3ff0099a07103093593cebb27d2fdd2bf7f6863bfea4992d0f9bcd34ef4e53288e029d014e1dfab
+EBUILD dropbear-2016.74.ebuild 2476 BLAKE2B 41d21f7aecf0d056a63ab5150af700d2fd36659dd25f29dc67cbb7acf852ee4e583b5ef1c7f2c74710d5409988ed91a4e3eecb2e9821911cf5a8c67cfef41795 SHA512 a1bf33919cce4fab7c1b23dac884db81883555eb9c249f30e5ff96cc856375e3849b18350a52abf7e78bcb3fc12418ad2d86508cd396562230cb155fb15f9420
 MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314
diff --git a/net-misc/dropbear/dropbear-2016.74.ebuild b/net-misc/dropbear/dropbear-2016.74.ebuild
index ba624f584a3d..ef89e09d0f11 100644
--- a/net-misc/dropbear/dropbear-2016.74.ebuild
+++ b/net-misc/dropbear/dropbear-2016.74.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
 
 LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 6059afd8f487..3e2204080fdb 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,15 +1,9 @@
 AUX 2.7.15-no-user-root.patch 704 BLAKE2B d7353f8338be379cd31f42cc29c4346930c191b3157084df658eebc0d1e4202d9711d8694b6b6ba65285f0de1e83ab55188d9d79a2e6a45c919c1dcb64003b91 SHA512 3bce2f6b0605e708107097b8bb033681c901afc535c1921712d3b2db172cc296b50cc4a833b0d21c9718fc094d37d9d9b3c2e9abb65d6f96449ae91635d3101c
 AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
 DIST Electrum-2.7.15.tar.gz 1967697 BLAKE2B 94a189fb1b950dc2691cfa92143d68052f615e534fb9d3d7feed92a39bb717199b227d0e265715e86c3ed9b8ccd743fa77f2691dfc5b47073b03f80152185565 SHA512 2f4f5181dcf0b98ce34348c296e50383b677db1fd14fa0052a0168a7c880d18d04ebb9a91dbb7316e09adeda275cc87b5457c8f0925b3635a1c769c81f31165c
-DIST Electrum-2.8.0.tar.gz 2241359 BLAKE2B 9d87768cc8bebf8f95d5e3ced3df5f62001b3afaa3f460ea64f0a8efc771e12a737551accd4c34148ad6acd315a5e2c86d882b90c865e2d57ce30c69c851d92d SHA512 dcef8c84677ff6045ee00a7b26aac7ded00b54753737c32a0c9b8939647a8467769ba93be3ce6beecdc5030c94dc6647121681ce22e84f487b36ede6d0d69e1c
-DIST Electrum-2.8.2.tar.gz 2277689 BLAKE2B 7016315e5a7bf6446ef22007b5e0ba15d5675186b73b1f12c18038a485a982854b845facbf419b42b9ad61d52fc0c6f3882b9868fee358fdc4cb1bb9dbb40922 SHA512 4f4dd4b017e1b4ef3de311d840e9704e0169d4813f646296f99aa00afe39ea83c5b53b320fd31244dd2a67c320be1537b7132b54d775b7c1a9f1da54627ecf9d
-DIST Electrum-2.8.3.tar.gz 2321524 BLAKE2B e0947a0dab5cb1381cc95fd64653712dd815cd8272f1d6612e07aa7ff409828eae1805b86713a7ba91bb232b7503c6f2a0d1d67bed8aac0b5b01bdd33e71196a SHA512 40988667538eb2c8733f9cede52380cb3c9212efc0780e5c4665b93b55677f0705262216fafc7544c5c18e77621bac4828312b792acbb35ac6048f54b17877a9
-DIST Electrum-2.9.3.tar.gz 2389367 BLAKE2B 9470cc2ee1b0b10166bbbb264df765b351db6ad97a038c7a2f45a0c49debb38e393a4b306af34457c800d61ec93b7ec669c443b597e84c5fba88c309bb8c5d62 SHA512 4f0be390ad10ec37a27b8ad9beaa4ebe003186a2ba583aa313466b89d8867ab61eec80a09bd575ceec08be060c2998f58231c7c77a4b78be0d1fcd690a090f57
 DIST Electrum-3.0.3.tar.gz 2590410 BLAKE2B 676422bc14ce597a2b4903ea4d7e3dcec1bd23424d678aa1c248e824a1656a60afaef284c8ba22242da3cfdbe4421dba04f4aeef42ca507043988067a340d0b9 SHA512 6628b6621e3502bb9782ec7ce0fd11a657c10dfaab6a5c4de4e4bae5bc1207fa55f642a92fcca08e1f342e0ecf8dd0c72134db7020e03df2ed6f81b27c49aa30
+DIST Electrum-3.0.5.tar.gz 2639766 BLAKE2B 28587ca056247a5671d84c0b79824e8eea8df8ca2e3204333e6edd7db98ecbeebdf81f4ac819de8b87c7593e83f948d091d48d55cdff08af76322d94bacec0fd SHA512 27cfa44ce8eeb5eef8038f1f68b4a42d173daaf7a940ffc9e9b1dad16a8f7f49bd53d5eefdbaf242e5e09aa2f887bce536f17941c2250225cd92c78f62c52e39
 EBUILD electrum-2.7.15.ebuild 4097 BLAKE2B 47368e67b82f77c16a37492dc766695cbdc8da78e98052262a9213febcad4b6ed5d958b126566f118951b1b4fc26f37874052417d5fa92cb16000b37e24fadeb SHA512 1a147ff600c857c1b4743d19b4bfdab6d474d2d31a0b97b6f4692ed639514cb8965200c41e5e6666eb119e3f7af35f6d47aeb4408489d4ef83929ceaa433ad8f
-EBUILD electrum-2.8.0-r1.ebuild 4321 BLAKE2B cfa75ef5d37b6e2f81296e84ee70bc94a9dc22017eace8d0bde165365ae2a8f2aa6d9deb55e2b6a85a189eeab29f13a903afa9c5848155d8eba35043d8dfc9af SHA512 e8da314ce8892503d84293e332c97eac769c9d3bd198fdb9b8880f76cdb840db73d2ce7a9e93721d0b70dea9a1842fca918ad7947e05dc4ca55d503cca7204af
-EBUILD electrum-2.8.2.ebuild 4327 BLAKE2B 7c237eaad7e1c717368c95c066bba8e986279c9627ff870093c8e389be5b705865b957bae73d873ee432f2147b6a35bf592c8a872c71eb661d025af7e7e46d76 SHA512 3d30bc0fca3c5a81943d9043d06ce108f398aa87aec6228aa9fc4446e1daa3d9c5d6c274798c327624da23fff4df558a6c1f79bf53c0ceb649f53d9f57c31c1a
-EBUILD electrum-2.8.3.ebuild 4333 BLAKE2B e0390c1a72a71548c1e6ae1e73306582081426df461e738444bfe9bd65608ddf86dd97d6ad87e4553f09d753fba1077ef81b864cab1d6865d0245792d01fb76d SHA512 9009aae8d0cf92b6e0399ef43c90ed2c9f8519fd9c8eda8599d2827b461e70a7eb5d359fff3d2a7671faf67fc9290035b5e6f608a43c800d0864c602ad7f6419
-EBUILD electrum-2.9.3.ebuild 4333 BLAKE2B e0390c1a72a71548c1e6ae1e73306582081426df461e738444bfe9bd65608ddf86dd97d6ad87e4553f09d753fba1077ef81b864cab1d6865d0245792d01fb76d SHA512 9009aae8d0cf92b6e0399ef43c90ed2c9f8519fd9c8eda8599d2827b461e70a7eb5d359fff3d2a7671faf67fc9290035b5e6f608a43c800d0864c602ad7f6419
 EBUILD electrum-3.0.3.ebuild 4258 BLAKE2B 322b1ae7d0ee7b936b70ec9a476470e2e9dc713a1115b7a4b2e9a7d23e484fa24a3ea85cab25b64bf6d734c3b17b96cbcf84f3013cbe8fbae364982ed80e26d5 SHA512 442cecdaedf04d2af3fab57a5144e15b7ed13681ab6181326a257cd0415f6335d09d61acc24155d0f2b67a19678e5ea6b69a59a81a5a48a67c81005bf0f4761f
+EBUILD electrum-3.0.5.ebuild 4258 BLAKE2B 322b1ae7d0ee7b936b70ec9a476470e2e9dc713a1115b7a4b2e9a7d23e484fa24a3ea85cab25b64bf6d734c3b17b96cbcf84f3013cbe8fbae364982ed80e26d5 SHA512 442cecdaedf04d2af3fab57a5144e15b7ed13681ab6181326a257cd0415f6335d09d61acc24155d0f2b67a19678e5ea6b69a59a81a5a48a67c81005bf0f4761f
 MISC metadata.xml 1327 BLAKE2B d0029a93d9b105b621b2053498ff5c570e97e3945fb1c33252f85ab3110d06395b03d05b2625dc278ca8c36521762c74d52fcb9317055f9532e82c18168fb02e SHA512 3047791e1985494eeec1348c64e9a7ef6f9055cc01b0eb462dcb8958a6fb448d75ace206c33498cdd45a5470efc4091f5bc0bc062284a2bd2b0f4a6299591d09
diff --git a/net-misc/electrum/electrum-2.8.0-r1.ebuild b/net-misc/electrum/electrum-2.8.0-r1.ebuild
deleted file mode 100644
index 85efdde7134f..000000000000
--- a/net-misc/electrum/electrum-2.8.0-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses?"
-
-inherit distutils-r1 gnome2-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt4 )
-	audio_modem? ( qt4 )
-	cosign? ( qt4 )
-	digitalbitbox? ( qt4 )
-	email? ( qt4 )
-	greenaddress_it? ( qt4 )
-	qrcode? ( qt4 )
-	sync? ( qt4 )
-	trustedcoin_com? ( qt4 )
-	vkb? ( qt4 )
-"
-
-RDEPEND="
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	|| (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-libs/protobuf[python,${PYTHON_USEDEP}]
-	)
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] )
-	qt4? (
-		dev-python/PyQt4[X,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PV}-no-user-root.patch"
-
-	# Don't advise using PIP
-	sed -i "s/On Linux, try 'sudo pip install zbar'/Re-emerge Electrum with the qrcode USE flag/" lib/qrscanner.py || die
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "lib/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt4      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt4      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt4; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex sync            '' labels               ) \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/electrum/electrum-2.8.2.ebuild b/net-misc/electrum/electrum-2.8.2.ebuild
deleted file mode 100644
index 01a96e470f05..000000000000
--- a/net-misc/electrum/electrum-2.8.2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses?"
-
-inherit distutils-r1 gnome2-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt4 )
-	audio_modem? ( qt4 )
-	cosign? ( qt4 )
-	digitalbitbox? ( qt4 )
-	email? ( qt4 )
-	greenaddress_it? ( qt4 )
-	qrcode? ( qt4 )
-	sync? ( qt4 )
-	trustedcoin_com? ( qt4 )
-	vkb? ( qt4 )
-"
-
-RDEPEND="
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	|| (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-libs/protobuf[python,${PYTHON_USEDEP}]
-	)
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] )
-	qt4? (
-		dev-python/PyQt4[X,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
-
-	# Don't advise using PIP
-	sed -i "s/On Linux, try 'sudo pip install zbar'/Re-emerge Electrum with the qrcode USE flag/" lib/qrscanner.py || die
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "lib/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt4      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt4      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt4; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex sync            '' labels               ) \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/electrum/electrum-2.9.3.ebuild b/net-misc/electrum/electrum-2.9.3.ebuild
deleted file mode 100644
index 312903f737a6..000000000000
--- a/net-misc/electrum/electrum-2.9.3.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses?"
-
-inherit distutils-r1 gnome2-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt4 )
-	audio_modem? ( qt4 )
-	cosign? ( qt4 )
-	digitalbitbox? ( qt4 )
-	email? ( qt4 )
-	greenaddress_it? ( qt4 )
-	qrcode? ( qt4 )
-	sync? ( qt4 )
-	trustedcoin_com? ( qt4 )
-	vkb? ( qt4 )
-"
-
-RDEPEND="
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	|| (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-libs/protobuf[python,${PYTHON_USEDEP}]
-	)
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] )
-	qt4? (
-		dev-python/PyQt4[X,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
-
-	# Don't advise using PIP
-	sed -i "s/On Linux, try 'sudo pip install zbar'/Re-emerge Electrum with the qrcode USE flag/" lib/qrscanner.py || die
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "lib/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt4      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt4      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt4; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex sync            '' labels               ) \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/electrum/electrum-2.8.3.ebuild b/net-misc/electrum/electrum-3.0.5.ebuild
index 312903f737a6..2b62832e8ba6 100644
--- a/net-misc/electrum/electrum-2.8.3.ebuild
+++ b/net-misc/electrum/electrum-3.0.5.ebuild
@@ -3,10 +3,10 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{4,5} )
 PYTHON_REQ_USE="ncurses?"
 
-inherit distutils-r1 gnome2-utils
+inherit distutils-r1 gnome2-utils xdg-utils
 
 MY_P="Electrum-${PV}"
 DESCRIPTION="User friendly Bitcoin client"
@@ -16,7 +16,7 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
+MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
 
 my_langs_to_l10n() {
 	# Map all except pt_* and zh_* to their generic codes
@@ -26,7 +26,7 @@ my_langs_to_l10n() {
 	esac
 }
 
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
+IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
 
 for lang in ${MY_LANGS}; do
 	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
@@ -34,16 +34,16 @@ done
 unset lang
 
 REQUIRED_USE="
-	|| ( cli ncurses qt4 )
-	audio_modem? ( qt4 )
-	cosign? ( qt4 )
-	digitalbitbox? ( qt4 )
-	email? ( qt4 )
-	greenaddress_it? ( qt4 )
-	qrcode? ( qt4 )
-	sync? ( qt4 )
-	trustedcoin_com? ( qt4 )
-	vkb? ( qt4 )
+	|| ( cli ncurses qt5 )
+	audio_modem? ( qt5 )
+	cosign? ( qt5 )
+	digitalbitbox? ( qt5 )
+	email? ( qt5 )
+	greenaddress_it? ( qt5 )
+	qrcode? ( qt5 )
+	sync? ( qt5 )
+	trustedcoin_com? ( qt5 )
+	vkb? ( qt5 )
 "
 
 RDEPEND="
@@ -62,9 +62,9 @@ RDEPEND="
 		dev-libs/protobuf[python,${PYTHON_USEDEP}]
 	)
 	virtual/python-dnspython[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] )
-	qt4? (
-		dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)
 	ncurses? ( dev-lang/python )
 "
@@ -76,9 +76,6 @@ DOCS="RELEASE-NOTES"
 src_prepare() {
 	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
 
-	# Don't advise using PIP
-	sed -i "s/On Linux, try 'sudo pip install zbar'/Re-emerge Electrum with the qrcode USE flag/" lib/qrscanner.py || die
-
 	# Prevent icon from being installed in the wrong location
 	sed -i '/icons/d' setup.py || die
 
@@ -105,7 +102,7 @@ src_prepare() {
 	for gui in  \
 		$(usex cli      '' stdio)  \
 		kivy \
-		$(usex qt4      '' qt   )  \
+		$(usex qt5      '' qt   )  \
 		$(usex ncurses  '' text )  \
 	; do
 		rm gui/"${gui}"* -r || die
@@ -113,7 +110,7 @@ src_prepare() {
 
 	# And install requested ones...
 	for gui in  \
-		$(usex qt4      qt   '')  \
+		$(usex qt5      qt   '')  \
 	; do
 		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
 	done
@@ -121,7 +118,7 @@ src_prepare() {
 	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
 
 	local bestgui
-	if use qt4; then
+	if use qt5; then
 		bestgui=qt
 	elif use ncurses; then
 		bestgui=text
@@ -143,6 +140,7 @@ src_prepare() {
 		ledger \
 		keepkey \
 		$(usex sync            '' labels               ) \
+		revealer \
 		trezor  \
 		$(usex trustedcoin_com '' trustedcoin          ) \
 		$(usex vkb             '' virtualkeyboard      ) \
@@ -167,8 +165,10 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 2d5f43144161..8c1bc64b7e78 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -32,6 +32,6 @@ EBUILD iputils-20121221-r2.ebuild 4051 BLAKE2B 05bb4832d99c0c065b5caffb695929c91
 EBUILD iputils-20151218.ebuild 3977 BLAKE2B 1b51c297b6231fcc7edac3c28ffd5347263ed8cb8fa30aca729c9bf85d301b290123b99b82c9abb279e80f8a39c4721987fb3c1cbd5a3a286cc3708f9f25aa2e SHA512 b07ffea44d85ea3aa0a92ab606386d7d1a917eed700c421aabb4af6ae4b46b1fc5e9ef1f942a441441ec4171548b9dc04f7bd73b75804568579ec044b297dbc0
 EBUILD iputils-20160308.ebuild 3838 BLAKE2B 62aa96ba316885c62f9716a6ae488c349bb0b530a81f2b8497c70d92d235034b3556ed2256c588a979cd198de8d11665b6c1d83ac59cabce0a22ba25ab4f33cf SHA512 596ab450370cb8883d3480e8e0a21cc27ecaa19ba7499296a0c67e84fa8bce3c085f66d87eea03be19d54b780a8933f752999196b13d2b3d0a66faec2f756d08
 EBUILD iputils-20161105.ebuild 3870 BLAKE2B 800dd0dacaf970aed7a2d21d2f3931be41d0e2469dc7a2b9cd1fc1c3c58266759669cf393d0832ad1e27a8e550960bc6f7ede6fd0967f8b2c83526e004dd25ff SHA512 64f9077c8e69b02db0560a1213293d27cfebbd5a02d62f75b53f6ee3d76b46c64ce2995ca1c6e7b3fb22185f33fd40a0da4a1796307883adcbbb47ed123b9611
-EBUILD iputils-20171016_pre.ebuild 4082 BLAKE2B 6e5e02b149c71b1e36d68147107835bf9924e662c8f40e7f585702b6bd5ff4c1f55da28323cfaed7e62232c281df842162a2eed8b509998738067960e3038847 SHA512 ee9aacdd7964c46d05d93eed95a1fa017c0239e3769e6290137b4eaa5ae8411fd2ad1aa9716e80ba83fec875084bf963e691ae8c089143b83ade4256b8292150
+EBUILD iputils-20171016_pre.ebuild 4081 BLAKE2B d60595111d158d303f6249b171223de14918300124db2c88d7ce7af107d392247eedc541abdcb0cabcc622d41a6111509b4ee5c3982f5493b2c5fc8bf35adb73 SHA512 f13b1e025e8e54b2ca9a37d4130ce0f32245af87a742a664fe925aa42d5594fccb73d053e731e4a8f13d4e8f5e0cbfe74aa22269245951e123ab6fe0c6a8a6e7
 EBUILD iputils-99999999.ebuild 3905 BLAKE2B eee7bf20dc61ad938df5535fafbb197f94e0a1de5dd1e514d981bff627ec285f456e3f2b28e5a587ad763d206236cd0f72e61d9039100a5a3e030d4cc3159f5a SHA512 a7f056364c5394b6b9845930ba721492f1d8a4dc2a0231fbca9b5cdae14d8fa5d2f47460a85d2c6189c4f4288c26798b4c475c515cd441ed80114c510b82a437
 MISC metadata.xml 1698 BLAKE2B 0351c77626f66e4a50d83072124088cc7195c4666f6a66f6a981fa66b16b3740da6a08d63da9db0b2a4d02f8a75a04f97142e5b78099525ee8ed4921738d0236 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc
diff --git a/net-misc/iputils/iputils-20171016_pre.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild
index a8851208473b..fe38bf85b812 100644
--- a/net-misc/iputils/iputils-20171016_pre.ebuild
+++ b/net-misc/iputils/iputils-20171016_pre.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 02384eca3b27..b4a02f11b122 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -4,6 +4,7 @@ AUX openssh-7.5_p1-CVE-2017-15906.patch 1180 BLAKE2B 37fca347fc1fa969f410d514a76
 AUX openssh-7.5_p1-GSSAPI-dns.patch 11137 BLAKE2B a54ed4d6f81632ae03523b7b61f750402d178d3213ec310bc0e57c0705ed67607a89a786d429599395722eaf40b2fb591c5b8de87ffc4f1dd7f6713b543c31c2 SHA512 f84e1d3fdda7a534d9351884caaefc136be7599e735200f0393db0acad03a57abe6585f9402018b50e3454e6842c3281d630120d479ff819f591c4693252dd0e
 AUX openssh-7.5_p1-cross-cache.patch 1220 BLAKE2B 7176b86024b072ff601421143f8567e4e47de3d89b1d865bc92405da75bf7c64fa50b9f746d9c494dbf64bc09e04afc1960f673e68ea1d072a5381027afea63d SHA512 03cf3b5556fcf43c7053d1550c8aa35189759a0a2274a67427b28176ba7938b8d0019992de25fb614dc556c5f45a67649bb5d2d82889ac2c37edd986fc632550
 AUX openssh-7.5_p1-hpn-x509-10.2-glue.patch 2847 BLAKE2B 8a6151ab121871e4f2d93ace0e07dce1106c6841031cacfb197e00cc76fc1d0cf153aae52757dcf98a5fb89971125493d0572bd4964d0e59cb3f391fd1256aef SHA512 bc23fdf5995ae38ff166f12f64082f79a2135ca28f2240e89bee42b1e3ba39ce94467ece9ddea99173f1829b09b069dbf56a0bce7dfd1ae5f63c12f73b5ffba7
+AUX openssh-7.5_p1-s390-seccomp.patch 624 BLAKE2B 0bf595d72cd65993dde4e5aae0a3e091bb48021ef8affa84c988d55d9fe6a823b0329b6d9707c88e1556d45c304b6630ade7008f63fd649975594a75f570bb33 SHA512 058dc269eb032151e88e0ac79a0b0fd6fcd56d489e90e299ee431b1475a8f8080e8f4649244864af33e743820b081c9f90b32a1a93b8b60feeb491c0201a4d61
 AUX openssh-7.5_p1-x32-typo.patch 772 BLAKE2B 3f27d669ee76e191f2f6f7c7d86b1d9cb7297cecf17b2d88d86ef498c9ca35231adb0edc9fb811698ec86fd65527cc3fe9f2ce514836aebe5dc27bca2a3a55dc SHA512 20d19301873d4b8e908527f462f40c2f4a513d0bb89d4c7b885f9fc7eb5d483eea544eb108d87ff6aaa3d988d360c2029910c18f7125c96e8367485553f59a5e
 AUX openssh-7.6_p1-hpn-x509-11.0-glue.patch 2182 BLAKE2B 02953663257816c71734fc8bf9f9b4619860d75cd49e7758d8895d8368acda7fb8117322747af61cac6a8b57f24a5080397af4307f9f681b0cf25caa75cc9cff SHA512 387222fe9b46f0f2df3cb9f6125995c46f7428955784175c718e902a36e90994f5bcecfbbe160d28fc810e4e43e6f070937c39546f0df36ebb9b47bda3c3e032
 AUX openssh-7.6_p1-warnings.patch 324 BLAKE2B d9fb6e710f797b687b285f70b7c7b32abaa34bd57aeb32558f5d9978df5b5eb5ba5dc1ac8c46ed430619318fa3cfd3475a9c24e3f594ad05d081decd0e4c2f36 SHA512 08a9caf1cbb4dbde2828f14075b41762dad24a8a88882cc61cb133783caa1200f63f052824409b0334c832365c0d934f44b2eeac947228ff52be24a09548cd22
@@ -24,7 +25,7 @@ DIST openssh-7.6p1-hpnssh14v12.tar.xz 15392 BLAKE2B 6888ea4054a470116b2ab3d115f5
 DIST openssh-7.6p1.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c526e354a7d344a08742cb70ab1f4a41d325b31720f2fba5c4afa4db11f3fc87055c8c9c8bea37b29cc11dc8f39 SHA512 de17fdcb8239401f76740c8d689a8761802f6df94e68d953f3c70b9f4f8bdb403617c48c1d01cc8c368d88e9d50aee540bf03d5a36687dfb39dfd28d73029d72
 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
 DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 BLAKE2B a31dcb15848d3a22306108a4e181b1d52b195e6adcd2a78d5c7bf57f33c8ed62c3affa434c8d31c07eae84b59f1a3968a3f2a92e702f9225b121127616cb9d61 SHA512 e9a2b18fd6a58354198b6e48199059d055451a5f09c99bf7293d0d54137a59c581a9cb3bd906f31589e03d8450fb017b9015e18c67b7b6ae840e336039436974
-EBUILD openssh-7.5_p1-r3.ebuild 11018 BLAKE2B ab0ed31e0d4d4e283afc02d3f287070faf96a257252b07b3e2f52f35950b2fa2f9e038289db640bea49a74103a371dca61824184e9a35fee5fcfc14862204661 SHA512 a12d5f5f4794f5996f0ebd67f34ebfa4ff1826c9f5e74e19c2efbc46ee810f1cec7295fbae0ae3d290108896a7d0868213e48d790744c0ba5e2b4c87e7e5ffc9
+EBUILD openssh-7.5_p1-r3.ebuild 11069 BLAKE2B 0efa1ef57d36fa9f0065f47e6fb5eecf1a15d860123232df4e6c6d5ac2a9539e3698b31b055219f35cd1104485db9befe120395db87fdfd31f9fa8d715b4243e SHA512 9ff09f013015a94c2c47ac8e4206b3039eea861b4c5597fdc4fe4766081057e337ca121a7b32456f4ac842a5ffcbb3a8246c2710aaa68c195a8fe4b39c4f4a1d
 EBUILD openssh-7.6_p1-r1.ebuild 11184 BLAKE2B c864783cdb2798c4b51986f08ab959117e57965f60a6d718caf508928a154344b5e2934db619dab7fc698b7c1411b8b79db01bb4076246662db5b1d034ffab58 SHA512 5ee9beacb3acf9d9b195e02ab10b390432ada244fb4c9e97a0cb1f04a8fe902c6816e0e1a6807bce8401c9827bc220a508fcdfd6650d43885a4e699c08e30884
 EBUILD openssh-7.6_p1.ebuild 11183 BLAKE2B 1d83808228655f59f0c44f65c6b61901f1b650b59447e15382c72e5477238d0fda4a669f8982afb295604e4a72e71fb7eed98d373e4ea6403c1cc585024ef9b5 SHA512 3b779a728ab8f1b0f8d2973be0c2534c0572b33b17f4e51e407c92502d33c23eece1e35ea118aa374422f8a8c5aea27adf86f863f19c01f199981b639146046d
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/files/openssh-7.5_p1-s390-seccomp.patch b/net-misc/openssh/files/openssh-7.5_p1-s390-seccomp.patch
new file mode 100644
index 000000000000..d7932003f8f8
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.5_p1-s390-seccomp.patch
@@ -0,0 +1,27 @@
+From 58b8cfa2a062b72139d7229ae8de567f55776f24 Mon Sep 17 00:00:00 2001
+From: Damien Miller <djm@mindrot.org>
+Date: Wed, 22 Mar 2017 12:43:02 +1100
+Subject: [PATCH] Missing header on Linux/s390
+
+Patch from Jakub Jelen
+---
+ sandbox-seccomp-filter.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
+index a8d472a63ccb..2831e9d1083c 100644
+--- a/sandbox-seccomp-filter.c
++++ b/sandbox-seccomp-filter.c
+@@ -50,6 +50,9 @@
+ #include <elf.h>
+ 
+ #include <asm/unistd.h>
++#ifdef __s390__
++#include <asm/zcrypt.h>
++#endif
+ 
+ #include <errno.h>
+ #include <signal.h>
+-- 
+2.15.1
+
diff --git a/net-misc/openssh/openssh-7.5_p1-r3.ebuild b/net-misc/openssh/openssh-7.5_p1-r3.ebuild
index 0dbe3c7fa22b..1f173bc6211f 100644
--- a/net-misc/openssh/openssh-7.5_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-7.5_p1-r3.ebuild
@@ -25,7 +25,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
 REQUIRED_USE="ldns? ( ssl )
@@ -132,6 +132,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
 	epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch
 	epatch "${FILESDIR}"/${PN}-7.5_p1-CVE-2017-15906.patch
+	epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch
 	use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*}
 	use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch
 	use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 06b6b66d94ad..20c128492971 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -11,6 +11,6 @@ AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99ac
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
 DIST rsync-3.1.2.tar.gz 892724 BLAKE2B e366514ae9835ba7c201a9e09fb9342c5e52fa36d45d46300d080403de25a64ba3ed7a703e56b4f47a743a597694a2d0a50bb4bab6cfa0aa7b59a4f7b93b9f21 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b
 EBUILD rsync-3.1.2-r1.ebuild 2869 BLAKE2B 039b1290b3e5ae9ea76f2d0ae1f8a7f31cb5044a456feeac3a81f450ef6482a145d98b3b9ba611baee40de96fdd266b09ade4a010d5f1aa4769f3add743f3bf2 SHA512 3ebd1ea8837837474c7bd3a791e4b9961470cb52eef482ea2c0b19250bfac98f7b92467299f3c415a56ff5575aef7d9939d09b5b7ad6cf4d461d6ae2a9fb643b
-EBUILD rsync-3.1.2-r2.ebuild 3084 BLAKE2B 44c55db366bc8f0257c49a4695940017e70477ef1a1d00f6fdb058b80cdd1669f0051a5a133f18ee7b783e56db6413dc05aab956758f07f6e69f622a9517842a SHA512 ded287346ba30893bfa1a1651f32351869e07cc2391e0530bc5ec0c8f4f11e18f43fbd42b749af915a54c5308ae1b3f082376c6d25a984274793dfbd0a4995ff
+EBUILD rsync-3.1.2-r2.ebuild 3080 BLAKE2B a78563994b1bcefa55bb71b3ecd66224be4f6d46177f80fcb3597bcfa0944313b7aa4a37c05ee1801a5fca293978cd8fc51c15a8d4b0da2aa9c2d6c32498a605 SHA512 1627518be854536ba26be38dd98cfb2f563ff855625742cbcd6d401252d42f17e2830188dd2de6de3e07404979de922a63b69bb71874773b7cb36c92014a327f
 EBUILD rsync-3.1.2.ebuild 2840 BLAKE2B 2ee399fcfa6ed8b11b2446178653d3ae55a4bd2f920f4ca5430f397741f9161ce6ccfd472030e7f008225fa28f9886d92751767be5b2213a5f0706207f9c448a SHA512 2f0998787e96cfbb29398923998905fc029520a1352ae4420561471f8342e3876e0ed9dec935d4d5677bed2693aa6aa810b7f713914633ba97676a2dfa1edcb1
 MISC metadata.xml 449 BLAKE2B 961dae7e8c69c0d452c9eedf67223d14ff8ff481821206d6fe2daed3a23a0da704155d61339b0d32182e5ba9195ff25b3383bd90945ea474b21da7f66f09c77f SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920
diff --git a/net-misc/rsync/rsync-3.1.2-r2.ebuild b/net-misc/rsync/rsync-3.1.2-r2.ebuild
index 385ca9235721..ba5738ec8f8d 100644
--- a/net-misc/rsync/rsync-3.1.2-r2.ebuild
+++ b/net-misc/rsync/rsync-3.1.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 if [[ ${PV} != *_pre ]] ; then
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="acl examples iconv ipv6 static stunnel xattr"