gentoo resync : 10.01.2018

19 files changed, 461 insertions, 88 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6e7fd6324164..18a095451cc5 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest
index 46314dd4979e..69f81c160178 100644
--- a/net-misc/cadaver/Manifest
+++ b/net-misc/cadaver/Manifest
@@ -1,4 +1,4 @@
-AUX cadaver-0.23.2-disable-nls.patch 399 BLAKE2B bcb117053ec200cb57f92c60980713c381aef98581bf5bbdee28e97edc6ca9b3bc7d4fd7a6adc9bcf57ded1696e19a06e1d837aff717b8c7e881a77fffe987d8 SHA512 5c48bd17c555bfd4e1b157615273b1343f364ad99d0a98c0b8c045863172a90f94f3652b7456fc5d7c3e29380547311b7a62a889c2868aa6cbbdf9197734a6d8
+AUX cadaver-0.23.2-disable-nls.patch 324 BLAKE2B 5ae07a17eb6079f9801ece8b8a3b893c1d52e13d2cd3693a1e412a873329709b86b2eda9c2bb68d07f850708a49185e6c63602148f9530ab729a2b178fb52b31 SHA512 4c9d7d93af1d747432bfb393b33d5f575f7ad1c2dda1c88238cb40a274f979aee91b75c1cd5c2f91787156e3085df0864204989944be6cfe1b7013c61db25f4f
 DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41
-EBUILD cadaver-0.23.3.ebuild 1061 BLAKE2B 1ef24303626df39231045c973516028d0dea4818bc86425baf86bdbb416dea3f3925705de0f97f4cc876f28c7b4ede54ca2042b9efe173a125ca34dc9bd22e23 SHA512 ca0af0e9ef94f0243d43247965ea00387470d2f0277a6787bbaa6fae5be37e20f8441e787c5a28f61f1c795890cd37b0631194b5d5206868f92a7bf41602e1d2
+EBUILD cadaver-0.23.3.ebuild 1006 BLAKE2B 9196f01e1d76ea65b3fc534f9631b38e48f4ca5b6a8a4f9d9ee77e6093405a96d4ac1d002e06ba501eff3b414002a4da713475c3534c69ef938d09095e377418 SHA512 ffd08740adec1d75862d2c0cf1e51f8ac55ec890870b4749b468632cc04a9a801cba8eacb596b942767d4cffeb45ce16b924c8d53c1cc1faf3be6661195e7da2
 MISC metadata.xml 338 BLAKE2B b00867702effd06d43020a0a3f5962d8aa1ae94197580af3d08c43458e0094f9967abdaa8f3cbf204d14c31c9ee37b31151cd05926978f18dc3344b52c2ca397 SHA512 7d37b09863b6d2a4a6c00930f8f4b9d2237cd216e52af58ea002875d0f65325b7c1a112a9832046db347d7b4bd5881e01cd06257be61516f9e1f975939989749
diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild b/net-misc/cadaver/cadaver-0.23.3.ebuild
index 89897109b85e..0401ea0f0cac 100644
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI="6"
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Command-line WebDAV client"
 HOMEPAGE="http://www.webdav.org/cadaver"
@@ -18,10 +18,13 @@ RDEPEND=">=net-libs/neon-0.27.0"
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
+DOCS=(BUGS ChangeLog FAQ NEWS README THANKS TODO)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.23.2-disable-nls.patch"
+	eapply "${FILESDIR}/${PN}-0.23.2-disable-nls.patch"
+	eapply_user
 
-	rm -fr lib/{expat,intl,neon}
+	rm -r lib/{expat,intl,neon} || die "rm failed"
 	sed \
 		-e "/NE_REQUIRE_VERSIONS/s/29/& 30/" \
 		-e "s:lib/neon/Makefile lib/intl/Makefile ::" \
@@ -37,8 +40,3 @@ src_configure() {
 		$(use_enable nls) \
 		--with-libs=/usr
 }
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc BUGS ChangeLog FAQ NEWS README THANKS TODO
-}
diff --git a/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch b/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
index 6610d479b30d..ead3d70553b8 100644
--- a/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
+++ b/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
@@ -1,12 +1,12 @@
 Fix building with --disable-nls.
---- src/cadaver.c.~1~	2007-08-22 14:17:27.000000000 +0200
-+++ src/cadaver.c	2008-03-29 08:58:57.248793293 +0100
-@@ -838,11 +838,12 @@
+
+--- /src/cadaver.c
++++ /src/cadaver.c
+@@ -838,11 +838,11 @@
  
      progname = argv[0];
  
 +#ifdef ENABLE_NLS
-+
  #ifdef HAVE_SETLOCALE
      setlocale(LC_ALL, "");
  #endif
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index cb53aa712f83..6059afd8f487 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -6,10 +6,10 @@ DIST Electrum-2.8.2.tar.gz 2277689 BLAKE2B 7016315e5a7bf6446ef22007b5e0ba15d5675
 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
-EBUILD electrum-2.7.15.ebuild 3909 BLAKE2B 1441842d95753fa7bc62a716953ad70b4447ef4af0e99a347d5a13c8b47d6cf8fb6986fbee4b17630eb0bd7634fe0657e2d5b2b459d81ab414135ec19575528c SHA512 42b84f4262d4d104c547e25695638ae9b9340e33ba2bf18793252db3396817582defb2264bb898eed7b98a84e3211ef5a3cf3f716be246df9ca66ae4e7e7b84c
-EBUILD electrum-2.8.0-r1.ebuild 4133 BLAKE2B b6f68a569f1159b027ac9f5857e76c6b47a1590de580d75ff053bff6469c4c90289554341f6169961bcfcf2fe7866108e47528aae799515ed6614496e9d2c1ca SHA512 71d53b7056845138d870c558489ef8660c9fe999db3a0e1125385ea46f03ebe6435b6f06cfab8c93d9c0e8c8c5ca91188223152f7e25f80968e5bc00daef1359
-EBUILD electrum-2.8.2.ebuild 4133 BLAKE2B 1c089818634034c9f7c606cdaaddb60626f021777bb67a671958fe8736747e0990f751809c7700dcaed4166a9417704bc56d1600fe388996b619640797f7a0dd SHA512 abcaa6c286f6734f1e6832af8698d72333af19c5b758fba4d9b2a3645cf96fd8e94194cedc49a7fd31ca70bec33ddff83915677e436767249fc0ab50e3ce99db
-EBUILD electrum-2.8.3.ebuild 4133 BLAKE2B 1c089818634034c9f7c606cdaaddb60626f021777bb67a671958fe8736747e0990f751809c7700dcaed4166a9417704bc56d1600fe388996b619640797f7a0dd SHA512 abcaa6c286f6734f1e6832af8698d72333af19c5b758fba4d9b2a3645cf96fd8e94194cedc49a7fd31ca70bec33ddff83915677e436767249fc0ab50e3ce99db
-EBUILD electrum-2.9.3.ebuild 4133 BLAKE2B 1c089818634034c9f7c606cdaaddb60626f021777bb67a671958fe8736747e0990f751809c7700dcaed4166a9417704bc56d1600fe388996b619640797f7a0dd SHA512 abcaa6c286f6734f1e6832af8698d72333af19c5b758fba4d9b2a3645cf96fd8e94194cedc49a7fd31ca70bec33ddff83915677e436767249fc0ab50e3ce99db
-EBUILD electrum-3.0.3.ebuild 4052 BLAKE2B 1be57f821fdb013287b3f7d3a4730485bf0b8dd95319ee5bdb054ae2c4ce2f3aaa39780845212b83cd60dc4a63aa4a323eecdf866c546c38f2f740fdecea293b SHA512 a3bb0d78a78ba4ff2c3368575cd1450d6c5ccafa45ba2ee508523d2ecfaeadf0aceda89cacc8d6869720a26576784b5d9f4a357075d112eded7dcd78d3d16de2
+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
 MISC metadata.xml 1327 BLAKE2B d0029a93d9b105b621b2053498ff5c570e97e3945fb1c33252f85ab3110d06395b03d05b2625dc278ca8c36521762c74d52fcb9317055f9532e82c18168fb02e SHA512 3047791e1985494eeec1348c64e9a7ef6f9055cc01b0eb462dcb8958a6fb448d75ace206c33498cdd45a5470efc4091f5bc0bc062284a2bd2b0f4a6299591d09
diff --git a/net-misc/electrum/electrum-2.7.15.ebuild b/net-misc/electrum/electrum-2.7.15.ebuild
index 536d54d9c396..ef6c1839e594 100644
--- a/net-misc/electrum/electrum-2.7.15.ebuild
+++ b/net-misc/electrum/electrum-2.7.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,13 +16,22 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-LINGUAS="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="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="cli cosign email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
 
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
+for lang in ${MY_LANGS}; do
+	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
 done
+unset lang
 
 REQUIRED_USE="
 	|| ( cli ncurses qt4 )
@@ -72,17 +81,18 @@ src_prepare() {
 	sed -i '/icons/d' setup.py || die
 
 	# Remove unrequested localization files:
-	for lang in ${LINGUAS}; do
-		use "linguas_${lang}" && continue
+	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 linguas_ja_JP '' japanese) \
-		$(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
-		$(usex linguas_es_ES '' spanish) \
-		$(usex linguas_zh_CN '' chinese_simplified) \
+		$(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
diff --git a/net-misc/electrum/electrum-2.8.0-r1.ebuild b/net-misc/electrum/electrum-2.8.0-r1.ebuild
index b00584832176..85efdde7134f 100644
--- a/net-misc/electrum/electrum-2.8.0-r1.ebuild
+++ b/net-misc/electrum/electrum-2.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,13 +16,22 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LINGUAS="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="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 lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
+for lang in ${MY_LANGS}; do
+	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
 done
+unset lang
 
 REQUIRED_USE="
 	|| ( cli ncurses qt4 )
@@ -74,17 +83,18 @@ src_prepare() {
 	sed -i '/icons/d' setup.py || die
 
 	# Remove unrequested localization files:
-	for lang in ${LINGUAS}; do
-		use "linguas_${lang}" && continue
+	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 linguas_ja_JP '' japanese) \
-		$(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
-		$(usex linguas_es_ES '' spanish) \
-		$(usex linguas_zh_CN '' chinese_simplified) \
+		$(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
diff --git a/net-misc/electrum/electrum-2.8.2.ebuild b/net-misc/electrum/electrum-2.8.2.ebuild
index 82aa0e5d8a49..01a96e470f05 100644
--- a/net-misc/electrum/electrum-2.8.2.ebuild
+++ b/net-misc/electrum/electrum-2.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,13 +16,22 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LINGUAS="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="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 lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
+for lang in ${MY_LANGS}; do
+	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
 done
+unset lang
 
 REQUIRED_USE="
 	|| ( cli ncurses qt4 )
@@ -74,17 +83,18 @@ src_prepare() {
 	sed -i '/icons/d' setup.py || die
 
 	# Remove unrequested localization files:
-	for lang in ${LINGUAS}; do
-		use "linguas_${lang}" && continue
+	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 linguas_ja_JP '' japanese) \
-		$(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
-		$(usex linguas_es_ES '' spanish) \
-		$(usex linguas_zh_CN '' chinese_simplified) \
+		$(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
diff --git a/net-misc/electrum/electrum-2.8.3.ebuild b/net-misc/electrum/electrum-2.8.3.ebuild
index 82aa0e5d8a49..312903f737a6 100644
--- a/net-misc/electrum/electrum-2.8.3.ebuild
+++ b/net-misc/electrum/electrum-2.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,13 +16,22 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LINGUAS="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="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 lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
+for lang in ${MY_LANGS}; do
+	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
 done
+unset lang
 
 REQUIRED_USE="
 	|| ( cli ncurses qt4 )
@@ -74,17 +83,18 @@ src_prepare() {
 	sed -i '/icons/d' setup.py || die
 
 	# Remove unrequested localization files:
-	for lang in ${LINGUAS}; do
-		use "linguas_${lang}" && continue
+	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 linguas_ja_JP '' japanese) \
-		$(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
-		$(usex linguas_es_ES '' spanish) \
-		$(usex linguas_zh_CN '' chinese_simplified) \
+		$(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
diff --git a/net-misc/electrum/electrum-2.9.3.ebuild b/net-misc/electrum/electrum-2.9.3.ebuild
index 82aa0e5d8a49..312903f737a6 100644
--- a/net-misc/electrum/electrum-2.9.3.ebuild
+++ b/net-misc/electrum/electrum-2.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,13 +16,22 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LINGUAS="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="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 lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
+for lang in ${MY_LANGS}; do
+	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
 done
+unset lang
 
 REQUIRED_USE="
 	|| ( cli ncurses qt4 )
@@ -74,17 +83,18 @@ src_prepare() {
 	sed -i '/icons/d' setup.py || die
 
 	# Remove unrequested localization files:
-	for lang in ${LINGUAS}; do
-		use "linguas_${lang}" && continue
+	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 linguas_ja_JP '' japanese) \
-		$(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
-		$(usex linguas_es_ES '' spanish) \
-		$(usex linguas_zh_CN '' chinese_simplified) \
+		$(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
diff --git a/net-misc/electrum/electrum-3.0.3.ebuild b/net-misc/electrum/electrum-3.0.3.ebuild
index aca1ddb7cae8..2b62832e8ba6 100644
--- a/net-misc/electrum/electrum-3.0.3.ebuild
+++ b/net-misc/electrum/electrum-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,13 +16,22 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LINGUAS="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 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="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
+	case $1 in
+		pt_*|zh_*) echo ${1/_/-} ;;
+		*) echo ${1%%_*} ;;
+	esac
+}
 
 IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
 
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
+for lang in ${MY_LANGS}; do
+	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
 done
+unset lang
 
 REQUIRED_USE="
 	|| ( cli ncurses qt5 )
@@ -71,17 +80,18 @@ src_prepare() {
 	sed -i '/icons/d' setup.py || die
 
 	# Remove unrequested localization files:
-	for lang in ${LINGUAS}; do
-		use "linguas_${lang}" && continue
+	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 linguas_ja_JP '' japanese) \
-		$(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
-		$(usex linguas_es_ES '' spanish) \
-		$(usex linguas_zh_CN '' chinese_simplified) \
+		$(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
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 3d1019b90dee..653bd3d8efac 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -15,5 +15,5 @@ DIST ht-20040304-classless-bgp.patch 1581 BLAKE2B 64df9a86c235c4f6d35be0f19fe1b0
 DIST quagga-1.2.1.tar.gz 2922514 BLAKE2B ab0a59c1162bb4ac8ba3a75c015a433e2022bc35cd2a4678dbc7c80510f8c687d944b5e2bac03e9d3362bdb20badb2c17228dfd4172eebc6c87b24b2be2276e4 SHA512 ab7693ccb0cfa0f9ed90cc2b626dcd27aa6cc52e626646a2a37914a01f4b38dd80bf8d0e35d8a6a113718e82024203dbc3704c017f7c5c07bcdc2fe0109e89eb
 DIST quagga-1.2.2.tar.gz 2986142 BLAKE2B 2c2326e015ed4ce7364a960b56108bbd04c184b7cd78dca0cac528cd2869e65e6efbd40c303ce2b6eb29eed809e8b384baa36329b365ae6799a5b25fa21daa4c SHA512 861f6524bcdc01d1a895762bf1904744c12ae4dfc7c3583ecb7e55b3978c98187bde76df0ff85093c744139be9d5cf324fec75b5ba86cf1fdbce70d923710d14
 EBUILD quagga-1.2.1.ebuild 3679 BLAKE2B c71ad696b777ddec0bdfcee4fbb142fc7c55aa7b3d676d1caf56515915aa0fef6d8c825da864c23a685d02f977b0cb9b6eec5335c2a952facaad136ec7efef2e SHA512 c17c0b0d74088b0dd05ca2c3a7fddc471ff5b1fcbb888b94c0117d73f4e74842e21e832923a050cef3fb3666fbba4d20d1a13b0a75836a902fc4b1a1da60d516
-EBUILD quagga-1.2.2.ebuild 3644 BLAKE2B 1ca0771faa12ca428a070407a018cff6199bce19a685dae046c7888333d85e0a19c2ef0947c2ffc72e7b25c6dc7f4461d8bda1840f23bb69f59ca318a451ac7b SHA512 a970adffb0fe708e5724b4b947d45eda16116806014e1d3602e69b86e220b8b6f5b14244819c31e65956829c53066de64ef4ab3f31fc1e18cabf5b6a556f403b
+EBUILD quagga-1.2.2.ebuild 3677 BLAKE2B c00173db06bc9d1e9a17b8cdbbcb8aec3d6dc0a1ba25a9a8a9c37faa23b52d2b59f2cefc3f8e8d23c5309f144a2d725610087b76de0a3ab4d984366e607cd8f2 SHA512 1d4638973eacf1e985f59182d4d98c6c2e339f13caa387d7aed8302a99b2f208e78fe5d902219839b9cad71b4306130c4bc6dbe6d608fd4022a64abe0f8640f7
 MISC metadata.xml 2375 BLAKE2B c3bb85308f39337c4bfe74dc7f373dbf3999fa38ee800d63b543f00771d580f52db69005227f778105209b703e1fa7e1ce88e4a6549f5fc673e8defcce4cd97b SHA512 77ae3e9edac846d80a8b9bf2cc6c7582bffbf9b43cffc0649dfdd1f3dcf528ebf0c99ebd70c4fe27c524f98ba453798de7f320d50f7b76287623b8ac8265a6db
diff --git a/net-misc/quagga/quagga-1.2.2.ebuild b/net-misc/quagga/quagga-1.2.2.ebuild
index 850189d108a9..9832536b3f54 100644
--- a/net-misc/quagga/quagga-1.2.2.ebuild
+++ b/net-misc/quagga/quagga-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ppc ~s390 ~sparc x86"
 
-IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra"
+IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test"
 
 COMMON_DEPEND="
 	caps? ( sys-libs/libcap )
@@ -30,7 +30,8 @@ COMMON_DEPEND="
 	!elibc_glibc? ( dev-libs/libpcre )"
 DEPEND="${COMMON_DEPEND}
 	sys-apps/gawk
-	sys-devel/libtool:2"
+	sys-devel/libtool:2
+	test? ( dev-util/dejagnu )"
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/iproute2"
 
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 65cda08eeaef..bc43735d64f8 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -4,7 +4,9 @@ AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33
 DIST rabbitmq-server-3.6.14.tar.xz 1508216 BLAKE2B 1ca3f933e91ce204cc90df7df619742e6d42e211b6350c629015a15a0ea6cdad05ad1e0139db5b2f1f353f314d1709ba468112a4059c6894ef9fb454fd616cf2 SHA512 22874b81fcebfd954e5ee8f4701bd8743bbc9559c1a1c09f8de03e16039153aa6e6b0bea71067770913493299e57da6b3928ff0ade4ee9ffb5ea48a30a154d9f
 DIST rabbitmq-server-3.6.9.tar.xz 1422316 BLAKE2B 08f88cf3b592c2fecf3e2a9c7f9a4a2997f7bea6f14a2d72cb42ad8d3254b2bcd32b0605c7687eeae8e1c39a6d3ad1776f89e84292d508903b956ec05f6cd858 SHA512 a003d2343c97e546ac01a5aadc46e94e2dbcc78349072b362950e5c5e11229e2a6fc4020d281f9fbb5cc0f577d2a166ef09671e931ec1470ab2edcdd98443662
 DIST rabbitmq-server-3.7.1.tar.xz 2466028 BLAKE2B 37bb69dd031bc9f9c345ef00128b8eb2ef719c8f48280b41e30d5cd82ed431430798eabe8eceb88a2edf112d2807bf6465aa19ffd108a5e84d4d8c0ea29fe143 SHA512 66c47f54ab3a725e7caec37e6ef632ab8b367af47431e89893085463c676775a9f42c8f89e7fb9ac174768805790d4cc70a1b964963267cf586de2d13fc55d0c
+DIST rabbitmq-server-3.7.2.tar.xz 2466952 BLAKE2B 99065384e4a8c3362200c1cea9225e243952d1c7eae2e5feb5a5cbe6d17c1a803cb904edc9a1e3f9e23a99b6e5b2f119b4ce226765e97db1310776b19977c00d SHA512 8972efd81c03d5499393ee87000f86373a1e933ce327318122d603ce4e76156f1c8588f3740adccc74c00afa5256ea6a040f1c420bacf3eaec170224259e1c3c
 EBUILD rabbitmq-server-3.6.14.ebuild 2865 BLAKE2B 64a85b0d626e222182a167c5edff69e55802c4a2261a4507a6164dc57cf0d36dddc4db58d3c3aa47152557cbc3bec84fe6701a438ed735ab4b4597ed0f25519c SHA512 bd84518cdee06f69be05ef141ff6d10ffaca2312410621ed35508315878ae7dcbd5ae17f654dd539b6dbd7e0a46850fdbbb3c444564357a352e175107f814ffd
 EBUILD rabbitmq-server-3.6.9.ebuild 2860 BLAKE2B 51d41a29be6986157954f3b675e31b9d813baeff9023c6f6c31ec104039ee2544bd1216ffbed27e0b69437dbe5f396a864fa18b789d33d5f9d8702a32aed4cdd SHA512 17951e227b45b1230bae2992b3f4530e7c2e7dabd62cfd8c9950254cdf0633dace11b45da1ff34934adac1a365032d72e87adf3ad64051e3942d1077b9b59303
 EBUILD rabbitmq-server-3.7.1.ebuild 2957 BLAKE2B 441e49fc8e818d7024403e38186c2c9c7fa685c34dddb2e7103bdd887acea549e9d32ad9f495ca3607d7aaf50f0de76cca81ab972bc4ddc9d0bf385405d16b98 SHA512 aa5e96ae41e1b62d0b78b76a151aa8622a92dc6e0bd586c6f2204d4a9e705e922e917141524c83545e4643f36f028a2e412826ce1b73b9ae25f1c7139b4847be
+EBUILD rabbitmq-server-3.7.2.ebuild 2957 BLAKE2B f68c321491caf442d9ba82ade95dae22184562077cd92523d27a0de7614cf0b17eb4744b9c7271674d3c74934c640b7f0eb97efd907eeca230ce91e1e16ca216 SHA512 cdaf44929a1113b1757a7b076901a74fc49aa8be816eb7de15bcacca191aca4668974f92425390c700f79813980aa64646da20ba88650777bb83e2287cc1b843
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.2.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.2.ebuild
new file mode 100644
index 000000000000..5f86107a94be
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-any-r1 systemd user
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="http://www.rabbitmq.com/"
+SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/erlang-19.3[ssl]"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	dev-lang/elixir
+	dev-libs/libxslt
+	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+pkg_setup() {
+	enewgroup rabbitmq
+	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake all docs dist
+}
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+	einfo "Setting correct RABBITMQ_HOME in scripts"
+	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+		-i deps/rabbit/scripts/rabbitmq-env || die
+
+	einfo "Installing Erlang modules to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r deps/rabbit/ebin deps/rabbit/include plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-defaults rabbitmq-plugins; do
+		exeinto /usr/libexec/rabbitmq
+		doexe deps/rabbit/scripts/${script}
+		newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script}
+	done
+
+	# install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# install documentation
+	dodoc deps/rabbit/docs/*.example
+	dodoc deps/rabbit/README.md
+	doman deps/rabbit/docs/*.5
+	doman deps/rabbit/docs/*.8
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq /etc/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	dodir /var/lib/rabbitmq{,/mnesia}
+}
+
+pkg_preinst() {
+	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "RabbitMQ is now running as an unprivileged user instead of root."
+		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
+		elog "Please run the following commands as root:"
+		elog
+		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
+		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
+		elog
+	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "Please read release notes before upgrading:"
+		elog
+		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+	fi
+	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
+		elog
+		elog "This release changes the behaviour of the default guest user:"
+		elog
+		elog "http://www.rabbitmq.com/access-control.html"
+	fi
+}
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index b5d8bdcc063c..749aa9822ea1 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -1,6 +1,10 @@
 AUX suite3270-3.5_p8-tinfo.patch 2793 BLAKE2B ca7c74e15022d5db381ef49103d966614e5b23e295af9766e8d5f0bc4c5af21ef0b0013772f34e962267aa9ea5f531b4ea9e729d4d21fdd571e0314be15cd410 SHA512 67a7fe63228dad755f73582eda7d1bc7efda18f454b99258f6bbfb45aa081a14c583797a6c940b80604eacfc719d4ba1be83ba2425c99de3afa4d1e027b3402b
 DIST suite3270-3.4ga10-src.tgz 3398730 BLAKE2B 4adc02b416d5fbf2facbf4e42c58a2bd3ed551ce46494ece039ef129663957632316882d5a5b28e272fa47010105a3682618b8ac2d355e745c576af74d0bb310 SHA512 d9ed4aa41c45a2e961d5c2d0c00c6b81526da64b9c1765b0c5e39cb647157026a787db2054b2feb55c57e5a458a31062141471447b1177fd46cbbeb7d71e3f28
 DIST suite3270-3.5ga10-src.tgz 3412329 BLAKE2B c9ed308cf970da150da985d76ec377c83a03041eddfcbad9baa7211776a7b68292109cccb2ec250952edb77eeca79143137eb8a94da8b774e952c3e5790c6231 SHA512 0cce1212ca7589595cd2f775d18086f231a9e6d621716be5a41123a379358d9ac08c9668de2bd6a2e401ae54d12a4905c3c260cb7ba90482bbce6790d8e3efb8
+DIST suite3270-3.5ga12-src.tgz 3412286 BLAKE2B 5602f8bbe7b916a977c97848ff9a413a873f61e1c0c62b8c118dc43703adcd4a668e3cc301f9e37a139eebeeae44aca3cdedd0c10de15870ad8ead00d783e1ef SHA512 c7cb25b5c82b0d7ccac8c3ed17317a5a5ebce24fb32dcdfcaf7158157578617a7bccc265fdb67fce0557caa9c75d1afc2d8152a06b98af43ad9a9e29b5f2a267
+DIST suite3270-3.6ga4-src.tgz 3288095 BLAKE2B 34245d6050f7d70ef6195dc669fea55eed70cb9b6c616a4bc88bc52bcfd9d837e527debc87eba4ccdc47c4a453e16749c23b9618d5bf4198e4131573f437209b SHA512 5309c4b4ad0d730033166b0bdb7638bba5fc00908776a229d5f0a131f72741897a0bf6b86dee3b1c9f3d480dc4f23e03e812d3349cec7094908c6a54a87d5ccb
 EBUILD suite3270-3.4_p10.ebuild 2057 BLAKE2B f564e1887c6488af0a736e6da5fa03f4f450d2adaa4b46f9bc3b5283182374f69a23d59ba341123a15ceae56079d450bb8136f47264b101108c106a4f175b75e SHA512 91e3015a1ac9460c037464b93d69339e4ec454cf72ee1bf37181d940fc6519086d7571d930c85db9878eb9b5bd01edd8d982a2526191bb48c1fc4096c0bf2759
-EBUILD suite3270-3.5_p10.ebuild 2106 BLAKE2B 0f4ad55638e919f2d2472a8f9013de787b7b41e1032ee868309431a2b1ceecc672d078227ecf40e53dc474ad341ef32f554dbf85dcf9a061ba0697c9c7e9d983 SHA512 30c12b4ad8cc2b57e633bcbe1b018828b743999ce7ba41dea369a703a520c2e1d8d2a42da0e4b2465b53136d06c8311ccdb70585e02851730ed0fdfab0865daf
+EBUILD suite3270-3.5_p10.ebuild 2101 BLAKE2B b798bc6218d65434b08686ecb452c027012ed86f91408bbceb960bf4d1c05a94a4208f0dc7dd99d0926e3f221a0625c58ca88e263c4730e2dac5bd20127613df SHA512 01048cf1b08d52e5d56a2d842c537a472fe78d5d2f0434e07562d50189f175c23f745ea43b8bfeab0c1ea001398517d3f59c615296f1e3c9c5fdfd8e6f0af657
+EBUILD suite3270-3.5_p12.ebuild 2106 BLAKE2B a0f9ae7eb8d7d022e3b46687dbdf5c08d0a03c6baab1baac31345fb151abc242dd78ebf507ff50da9126c9d674ca2bf9a97528abb783979aaf5d215814277bef SHA512 df18bce9cef81130d8b066e80d2d1f2e3d9b6e0d7f362024584668d8e5d518d29be2b1d6a8383b96dd88065dac0bcdcb84640bc3529caed74feb029912ebddd6
+EBUILD suite3270-3.6_p4.ebuild 2106 BLAKE2B a0f9ae7eb8d7d022e3b46687dbdf5c08d0a03c6baab1baac31345fb151abc242dd78ebf507ff50da9126c9d674ca2bf9a97528abb783979aaf5d215814277bef SHA512 df18bce9cef81130d8b066e80d2d1f2e3d9b6e0d7f362024584668d8e5d518d29be2b1d6a8383b96dd88065dac0bcdcb84640bc3529caed74feb029912ebddd6
 MISC metadata.xml 505 BLAKE2B a7692d952278fcd0389312dba1ffb6832a4c0c0579df1c10702401d6997b82c9e37ebecd0a681e2e95f6a16ce17715cc1e3c32227b3e501913e4ad0c08e88e66 SHA512 6ee647bea5e0cd996fab203be0fee4867265bd79b521d4b5a467fcb293662842c782a7490d5c8f213ac3c61fbe669da7d0348675673c330d69172c826c9ef92c
diff --git a/net-misc/suite3270/suite3270-3.5_p10.ebuild b/net-misc/suite3270/suite3270-3.5_p10.ebuild
index f1c8a5a44734..54e2cc5b3a59 100644
--- a/net-misc/suite3270/suite3270-3.5_p10.ebuild
+++ b/net-misc/suite3270/suite3270-3.5_p10.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ppc s390 sparc x86"
 IUSE="cjk doc ncurses ssl tcl X"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )
diff --git a/net-misc/suite3270/suite3270-3.5_p12.ebuild b/net-misc/suite3270/suite3270-3.5_p12.ebuild
new file mode 100644
index 000000000000..b3723ee24476
--- /dev/null
+++ b/net-misc/suite3270/suite3270-3.5_p12.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PV=${PV/_p/ga}
+MY_P=${PN}-${MY_PV}
+SUB_PV=${PV:0:3}
+
+S=${WORKDIR}/${PN}-${SUB_PV}
+
+# only the x3270 package installs fonts
+FONT_PN="x3270"
+FONT_S="${S}/${FONT_PN}"
+
+inherit eutils font
+
+DESCRIPTION="Complete 3270 access package"
+HOMEPAGE="http://x3270.bgp.nu/"
+SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+IUSE="cjk doc ncurses ssl tcl X"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+	ncurses? (
+		sys-libs/ncurses:=
+		sys-libs/readline:0=
+	)
+	tcl? ( dev-lang/tcl:0 )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-misc/xbitmaps
+		x11-proto/xproto
+		app-text/rman
+		x11-apps/mkfontdir
+		x11-apps/bdftopcf
+	)"
+
+suite3270_makelist() {
+	echo pr3287 s3270 \
+		$(usex ncurses c3270 '') \
+		$(usex tcl tcl3270 '') \
+		$(usex X x3270 '')
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.5_p8-tinfo.patch
+
+	# Some subdirs (like c3270/x3270/s3270) install the same set of data files
+	# (they have the same contents).  Wrap that in a retry to avoid errors.
+	cat <<-EOF > _install
+	#!/bin/sh
+	for n in 1 2 3 4 5; do
+		install "\$@" && exit
+		echo "retrying ..."
+	done
+	exit 1
+	EOF
+	chmod a+rx _install
+	# Can't use the $INSTALL var as top level configure also uses it.
+	# https://sourceforge.net/p/x3270/bugs/15/
+	export ac_cv_path_install="${S}/_install"
+}
+
+src_configure() {
+	echo "${INSTALL}"
+	econf \
+		--cache-file="${S}"/config.cache \
+		--enable-s3270 \
+		--enable-pr3287 \
+		$(use_enable ncurses c3270) \
+		$(use_enable tcl tcl3270) \
+		$(use_enable X x3270) \
+		$(use_with X x) \
+		$(use_with X fontdir "${FONTDIR}")
+}
+
+src_install() {
+	use X && dodir "${FONTDIR}"
+	emake DESTDIR="${D}" install{,.man}
+
+	local p
+	for p in $(suite3270_makelist) ; do
+		cd "${S}/${p}"
+		docinto ${p}
+		dodoc README*
+		use doc && dohtml html/*
+	done
+
+	use X && font_src_install
+}
+
+pkg_postinst() { use X && font_pkg_postinst ; }
+pkg_postrm() { use X && font_pkg_postrm ; }
diff --git a/net-misc/suite3270/suite3270-3.6_p4.ebuild b/net-misc/suite3270/suite3270-3.6_p4.ebuild
new file mode 100644
index 000000000000..b3723ee24476
--- /dev/null
+++ b/net-misc/suite3270/suite3270-3.6_p4.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PV=${PV/_p/ga}
+MY_P=${PN}-${MY_PV}
+SUB_PV=${PV:0:3}
+
+S=${WORKDIR}/${PN}-${SUB_PV}
+
+# only the x3270 package installs fonts
+FONT_PN="x3270"
+FONT_S="${S}/${FONT_PN}"
+
+inherit eutils font
+
+DESCRIPTION="Complete 3270 access package"
+HOMEPAGE="http://x3270.bgp.nu/"
+SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+IUSE="cjk doc ncurses ssl tcl X"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+	ncurses? (
+		sys-libs/ncurses:=
+		sys-libs/readline:0=
+	)
+	tcl? ( dev-lang/tcl:0 )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-misc/xbitmaps
+		x11-proto/xproto
+		app-text/rman
+		x11-apps/mkfontdir
+		x11-apps/bdftopcf
+	)"
+
+suite3270_makelist() {
+	echo pr3287 s3270 \
+		$(usex ncurses c3270 '') \
+		$(usex tcl tcl3270 '') \
+		$(usex X x3270 '')
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.5_p8-tinfo.patch
+
+	# Some subdirs (like c3270/x3270/s3270) install the same set of data files
+	# (they have the same contents).  Wrap that in a retry to avoid errors.
+	cat <<-EOF > _install
+	#!/bin/sh
+	for n in 1 2 3 4 5; do
+		install "\$@" && exit
+		echo "retrying ..."
+	done
+	exit 1
+	EOF
+	chmod a+rx _install
+	# Can't use the $INSTALL var as top level configure also uses it.
+	# https://sourceforge.net/p/x3270/bugs/15/
+	export ac_cv_path_install="${S}/_install"
+}
+
+src_configure() {
+	echo "${INSTALL}"
+	econf \
+		--cache-file="${S}"/config.cache \
+		--enable-s3270 \
+		--enable-pr3287 \
+		$(use_enable ncurses c3270) \
+		$(use_enable tcl tcl3270) \
+		$(use_enable X x3270) \
+		$(use_with X x) \
+		$(use_with X fontdir "${FONTDIR}")
+}
+
+src_install() {
+	use X && dodir "${FONTDIR}"
+	emake DESTDIR="${D}" install{,.man}
+
+	local p
+	for p in $(suite3270_makelist) ; do
+		cd "${S}/${p}"
+		docinto ${p}
+		dodoc README*
+		use doc && dohtml html/*
+	done
+
+	use X && font_src_install
+}
+
+pkg_postinst() { use X && font_pkg_postinst ; }
+pkg_postrm() { use X && font_pkg_postrm ; }