gentoo resync : 27.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-27 12:48:57 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-27 12:48:57 +0100
commit: 70b82ae359a5538711e103b0e8dfb92654296644 (patch)
tree: 8412b84ff9ce02a22be5251052b00feefe1d5b70 /dev-libs
parent: 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (diff)
58 files changed, 1406 insertions, 134 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0b18a337173a..ec69b97f647f 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index d1526f6fcf69..b2d1e5184bba 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -4,5 +4,5 @@ DIST appstream-0.10.6.tar.gz 1821879 BLAKE2B 49e0476ef41c37d2e9bb12a7c046fcbb2cd
 DIST appstream-0.11.5.tar.gz 1856204 BLAKE2B 9f1e423e71e40b569cae0fb259bf5a0203a0abcba64f877c951c941f1dfdbc8005509ca46040586b8937cc168ad9315978dd2a3763592de1686c9648eac6c928 SHA512 308f65df2d03f09a5fdfe1d5b61ed37ddfd73a6f7cd861f685463c45ba17a2a937ba34216b4d5f533cb5f9f56c65ff9b261e03d07aaab74bec3f89e5bfb57d7b
 EBUILD appstream-0.10.6-r1.ebuild 1490 BLAKE2B cf0ea93f614715937e74088b70502574a644c641f8853bd359eea753f0376c8ba1f846990f95e927865e5f1c6479e450fcf4f3b292b1ec0b13743acfbfd2ad5d SHA512 b4f43642d9648bc9956ae4212e3d5b7fc7bb5f5c86293b5c9fd1196acf6fb37e5a2553ff3ae789f50ab9cd75c94a92cf46957a4d19e9d3aecc43036628abb0f3
 EBUILD appstream-0.11.5.ebuild 1376 BLAKE2B a4505ffee8274eeeff1d78a79ba1e2bf47588dda71a2dfb5993985ab4d689380fe94d473b5cb4f43a018228e0a59f1ae72d294190e4e89e9df52512ac121c449 SHA512 de2b3c1a9ea20715572b94dcd78b23a0c7e9a41545d9c1898a33d50a263c5b82b7b2b99a9d0cc2e61e02598b6b8885df48d9ab5f4c88c58e0f9548fea60ea62a
-EBUILD appstream-0.12.2.ebuild 1433 BLAKE2B f4ff70d22221543cb3e92d24f11f5ff3ff68f6c61911e55682d62f2ceba582c73aeb9c5b70aed00c4a28cd3f566346808eed78bd7f70d1e32e6a0a08c75ddb15 SHA512 d7de0c22242350e5c8471c5721424eaa3d96742c32d39b7d53e1d35cdd74bdb896b1a5e59f5fd5125f30b0ff85e220c8a9ce10a39cb5426bcc08cbf961af4c3d
+EBUILD appstream-0.12.2.ebuild 1456 BLAKE2B a7aaed498184987107ca5436235ca9401dc573f3fc937d16743f2bea1b8e21a2c237711f5d0ac8b06c64a338a28060b5e5a15b2fdf3204fdee8e8312f1097291 SHA512 bd50cab254590ceffe6bb7b47663b9f9534cf049c82a219dfa4aa501b3a71c54c024fd8f69ec56463ec9fa7bb8b06ee33f1eb5b49029a846aabf7d0089fb4106
 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.12.2.ebuild b/dev-libs/appstream/appstream-0.12.2.ebuild
index 230751c476e3..f2aa30c08f78 100644
--- a/dev-libs/appstream/appstream-0.12.2.ebuild
+++ b/dev-libs/appstream/appstream-0.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,8 +37,9 @@ DEPEND="${RDEPEND}
 	dev-util/itstool
 	>=dev-util/meson-0.42.0
 	>=sys-devel/gettext-0.19.8
-	test? (
-		qt5? ( dev-qt/qttest:5 )
+	qt5? (
+		dev-qt/linguist-tools:5
+		test? ( dev-qt/qttest:5 )
 	)
 "
 
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 5d9c82c946db..ecbb3d6b70bb 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -3,5 +3,5 @@ AUX crypto++-5.6.5-CVE-2017-9434.patch 1728 BLAKE2B 0cfd25fca89d59486ba9c49a87f0
 DIST cryptopp565.zip 4220843 BLAKE2B 0c42da3564cdd175c2f2c5c4272caf826f21e47d2271c7f54acab86f5f79dcdad8d6cb946bc88f55fde6189bb2d24ad8fb03dda6b3b8c6f105434b55b8b217d0 SHA512 f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7
 DIST cryptopp700.zip 7296665 BLAKE2B 1b1a60e240a9d94b4edfea16beef0ec48ec26c61f7f9a3d89d29bd2e77b13a83ce942f81467bb90d3086253560a3c4acd6b89178dcb416ed4328340ad5222dfd SHA512 8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec
 EBUILD crypto++-5.6.5-r1.ebuild 1530 BLAKE2B df7d53463e39d86aa3eb905911e5ccdd6cd6ae435b4a51059978b68109c3448c555bbe91984f285671856d5ab7c98232cf2b171d154a01a97655d5aea14cf94b SHA512 f8065ac14fcffa77b75a439edcad34214d62a40184c27f79b073d4f788b2ef3b8667110ef9766d901ed69a25cb1f1639d494f4a0ad2e97391879821569b5a06b
-EBUILD crypto++-7.0.0-r2.ebuild 973 BLAKE2B ae9cbb5042009a6206a8662b6be7da9cb0c2e742aa1f9c8cb4014a9ffc6c080e569c0a5b3c1edce948064714ab619847cc31ed3e569ddcec225f2fef443d3984 SHA512 3bcafbf3ebd72a3e1180aa69ae127392474ddf7ea065edd5435e042d1b2afa1cf5049b5dc29413543f461b0cbfcf7b77998ae7a2f825673d63af20269df09fc2
+EBUILD crypto++-7.0.0-r3.ebuild 1078 BLAKE2B 8ef04dadc10e2cbfa9703682b45a14cc38710c78562f8b8fe649c1908befcc7715d5746b13ab9da56d1526895372bd9d2679ea4137e20d8d354f17b91709ed03 SHA512 b40b4762b563d7b39a15daf4116b4afb10089765f7cca9639876546e2dfe04c672fb67f1cdeb32e796a466ca01d039fea9600e27b4a4b4e3a825e5d68be08835
 MISC metadata.xml 597 BLAKE2B 8e8dd9fb9a60f2a5e7fdda6de99b6a07264d54aaa666a41d7fb30da338f91867bdda7135bd21e92191722de7e14ac10f394ac8d8f3118109f4ce6800fb12ebc0 SHA512 e20fd2e76765968417d659a6342ff9229dc822c2291bca00dd6cccd55dc3195563574aaf3a88c68b111821b41c9bce172f4d79bbb462f2b913ab15bcc2c2ee5a
diff --git a/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild b/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
index 48ed4e46d471..00541d4446d0 100644
--- a/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild
+++ b/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
@@ -11,26 +11,33 @@ SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
 
 LICENSE="Boost-1.0"
 SLOT="0/7" # subslot is so version
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ppc ppc64 ~sparc x86 ~x64-macos"
 IUSE="+asm static-libs"
 
 BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
+config_uncomment() {
+	sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
+}
+
 pkg_setup() {
 	export CXX="$(tc-getCXX)"
 	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 	export PREFIX="${EPREFIX}/usr"
 }
 
-src_compile() {
+src_prepare() {
+	default
 
-	use asm || append-cxxflags -DCRYPTOPP_DISABLE_ASM
+	use asm || config_uncomment CRYPTOPP_DISABLE_ASM
 
 	# ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
-	[[ ${CHOST} == *-darwin* ]] && append-cxxflags -DCRYPTOPP_DISABLE_ASM
+	[[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM
+}
 
+src_compile() {
 	emake -f GNUmakefile all shared libcryptopp.pc
 }
 
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index d433e4d6bacb..95413c17b7ae 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,17 +1,18 @@
-AUX cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch 782 BLAKE2B 2573c8784bf0abbb86b873a333a244330d2a7ba22767792b38261ba122081f82dbfd8f1c5c3503d9e7cfb82349ead903ce7893f45d75194b73b001d3902b9f80 SHA512 524b199559b5f8f363f12bd1dd677f3354eacb68e88fa43ab8dd227465121c00841ce48ce01ba7e9e64629d5871418ed424d0c9bdda6895914c07ae7f1035595
+AUX cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch 714 BLAKE2B 7943685af8707162db33ba2970fb8336f9f25af844357216b9e5e01ea92010f71485c85979ffe30dac5734b0f4cd104e58502821856194cdf9f33530b6acae92 SHA512 39dcd0d96cd7c5baaf09b5cd36279e45618498cc545696665a54a5fdccfddd351ef178e888c138e945669814ff2bb72e57161f1d77ef78dd0dbba1d730ee8619
 AUX cyrus-sasl-2.1.25-as_needed.patch 1083 BLAKE2B d6a2c9e2bf6d41ea4a30f2043b6cbaff5a26acf6f8da8f681afcb9c9b4dbab2b52dbd6a37c219b337acf35ea2c67a0afe6ebdcbdc3d8f9ad489c4317656cd4a7 SHA512 8fdc7039fda79e95ec310cd63d72871d7b5b35b5a1b6cf30b9693f6a02e265d924e375ddc65158f38de129b5da058ecd26038f988153ff0aacf2665d66f40abb
 AUX cyrus-sasl-2.1.25-autotools_fixes.patch 3926 BLAKE2B 33817cdaeb79b03ecd6f75eb98b4946f4c7ca9a7f0ccc194200409d045d158642fecfc7dded004b25735d85e8fd55b378625ffc2bd97f045490414b9eb6b55fc SHA512 d1e39d856addf6b53a278669df6e87f0fddd9a1ceadc0fadf2bdac239fcec8540c797118be642a58e65e2ec667d3c2a4b604f68f659433e64dbcd5bfe35b9a82
 AUX cyrus-sasl-2.1.25-auxprop.patch 552 BLAKE2B 2d932e05863da6b108eec405e792003d6d8df4bde07bd044537729232a9b23e7261cbb33b82df7c5685ee96aae3e0aed62317f89e970fbedffea65bf9d89ccdc SHA512 73ae914e684ae698eb56a1579ba9a477a946625a3b079e2b400d88583074f1701d8a6926ed17dea36b923050f21c04fbf746d54284568bd21c14be3d10283b6f
 AUX cyrus-sasl-2.1.25-avoid_pic_overwrite.patch 1076 BLAKE2B ed64d970d3321d4f4e8dcfc0ea28638cbfbbe9dc29f585462c81cde945759d3ef9dde275b1472377176973fa8ba15d0beddfa4c32f30762e5e71b618e2a7bbe6 SHA512 033e3634116e1d3b316052dbe0b671cca0fcfb6063fca1a97d990c422c2ce05109a1e424e84ed9928dc0312a325a7248f2d2e3f9547f84453b36331c01f63be5
-AUX cyrus-sasl-2.1.25-fix_heimdal.patch 601 BLAKE2B 373fd892c8b641d51ac5e3a905707cc781662e637525d8a911e6f059dae2f768aaf3b2264c6c5c34f1d68f679cda22ea82786761e42212ae6fe49b522c815bc3 SHA512 80a5181a3c324551ae64ead2d6199691ac9994653e4b86de21852d2caf201b5fccde6464af4189351edcad4b87dc60cab5f1c03148db77f90c6c52a16465045a
-AUX cyrus-sasl-2.1.25-missing_header.patch 292 BLAKE2B 9a2d5ae510b08daf9e0b90d1b68ebe7de2e41d4e3573a82f2763dc82148fbe2fb634d5161ad728ddf99740d2160246d22324c2f7b3ce43fb6f7f216d6b21de5a SHA512 b1dc1fa2663c5bd9b051353e6c18ece48460c2de4aff3b6f13672e0aa08e651462af4dae38a2821367728e503ade577218d2645f8c0a96c85e77226ee77ac1a6
+AUX cyrus-sasl-2.1.25-fix_heimdal.patch 465 BLAKE2B 63a7eac7a5a36010d73be0d522a83036125025f8996e555ca31291826fb8d9455b4eabce816a0db5056033c6ab36df74a01d572acfbf9443b3cc30e5c382bdec SHA512 fcf498e70069205d07a5bd4de781d2005d762faca620a39094c9e3885bc1208b7bac499bb959ab91cf09a927476ce80ea995ba701dfa35f6c7404382a9549492
+AUX cyrus-sasl-2.1.25-missing_header.patch 224 BLAKE2B 5b42d952bf72e8886fd0e6f470cf0e23aca49942d31698aac9e271884b95fa4ab3f49d539a3dfe34d08c734c7f5a13c5063d5169c1ae73c6c788692d7ab4316f SHA512 6da051b45a47db2852d9ff0fdb1bfeb28b7f4d1fa450a9e15d96a67c4b9d3f376cb8dc1c544b5e9e6e1354a85965001e87306a821b7e48437db702a7a16d574e
 AUX cyrus-sasl-2.1.25-saslauthd_libtool.patch 280 BLAKE2B d65e15151232a0c8812b4ba48d796c1948965525f092dff1c0f70bc19bbfe2318355a54d8e1ae6d6ebd955adccd19f5487e4f0c4c519be7cf7f047d230740f1f SHA512 1e79230a3891f1492c7d6f5969f6a4890aaae2f488e9f3942cafeda574bf8810c4fb3e004836f769244db02bae663fa3ac1eeca19658e6fd3c94f2a891ed2653
 AUX cyrus-sasl-2.1.25-sasldb_al.patch 555 BLAKE2B 27a9ca344098a361bdf2aa5089c87e48d8e7717f7c97b965d8e8eda8b00629fbce9d9aebabb4c02f59ffdf50bcdb667dc3fb7bbadd140eac8e3363321a033fb6 SHA512 2da553298b482ca3115294de7264428925911f8d1b6a15ae1af38ee7e0a3191a0f4ad90bcbaeef599c994842a86eea5157b663cb6944f035d9a377dba91dbbf0
-AUX cyrus-sasl-2.1.25-service_keytabs.patch 932 BLAKE2B bef7c27d8bcb67e966ed770a43fb29b97e24f31809dc29ea12971466cb6f21111d0d80f70cb46c0f98a6d45772fdaddf35be4f25cb484748007ac001fbbc2974 SHA512 bd5ceebfe1b8f72d275db487a6f11bbb8e6f20f3b44c05040fd9d0bb5c72e656f2c8f22924fecaa9c268e50d54d272f25f4a5a3b72ca49d1c23ef9f178d00733
+AUX cyrus-sasl-2.1.25-service_keytabs.patch 796 BLAKE2B f41ec0639e0c592dbeb78ac41f85f517742056dacf151a502ac0c4978045d56b3f7e09753ba40c7e2bd05c316409ec46850e5e3683f6c19330c0cab2c207de67 SHA512 1635c20938d7dcfc53f5bf2d48881846e9167d27883eaa8eff8715ce6cebba7307aa0e44d9264f42a8c8d6a1485885b0661a7821703127d8d0f147e44e4a4267
 AUX cyrus-sasl-2.1.26-CVE-2013-4122.patch 3838 BLAKE2B 5a124ef7e4af8749881339a30e66286b83462e10113b51168fd3d67ca77dac34506293fd949688731ea51e8b857157cef6ef071a6828aabf2d16a82f7c0d725e SHA512 3df09f16dc2f4efc601339743eb6e66087977fae4e174aa82c4abb7f85a77aa9eb98629837079236446ef3b494fb48931c9dc8850362a49615749e162b4699c8
 AUX cyrus-sasl-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch 284 BLAKE2B 77ce4733f92515a98a8f74c68c7e7479d9f0f84302d91d9c3b0e92230f644d59a74588113447320c389c7e48768415f26dbb62fa1a48f3b283b739657f141350 SHA512 f3b789b7dea3f6a51fca6fd1877c81b5f5a3be342fa5c90ddae98a822e0c2a71e8fa582c6cb60c696363aa5cb99db8609cd6b3a91c5d402a0ad1e6124c726f5f
-AUX cyrus-sasl-2.1.26-fix_dovecot_authentication.patch 2603 BLAKE2B 1c37d595841da820ee244f6649d4fc9d3e7f68a7024efe3273eb5e53c9f0066f51d531d9b74bc2c080227c115ddb2f107a01455af3c88a25e9053ddee0d399e2 SHA512 4244015451dfd41443a0cf8b56ae19a1dfb550e374fcdc37dc091a54f73ab36818c25fe96f7837e3ddfe5c7952d309a5b51bedfe0b7c7f1dec8ecf15f067acda
-AUX cyrus-sasl-2.1.26-missing-size_t.patch 348 BLAKE2B 7d98d1e13cd9abc766c94ec1cbc3c7d58df1f900395a5e5e28f18c2a056e06f89e7c7209115d5d3efdcd7b3f9b698c7a9c51f25d2cf136e975f2ef2d162c4f1d SHA512 026183880caa504af9dda5fb93a6f47a159c7ab6af79463bc512709681dd260489411b8b8da78a9f8cd260b77ae5d1977854a39de80bc48f3a03e3ffa1b09fb2
+AUX cyrus-sasl-2.1.26-fix_dovecot_authentication.patch 2467 BLAKE2B 83acc34ebe969d2b7cd0868d7811c182181c2588e5973b88c09469e599ae6fbd854762438ce672a4e23d4d0c1000b3da8158b6f1ea2a9428915c472c35aeea94 SHA512 38095e3f6a832893fb1c342f6e19f684a6ee7621fc44b93649b3f301dbc08e2936aba52533ffa97cfd33f320941e19de824e495af26ba628d574548749ef1ade
+AUX cyrus-sasl-2.1.26-missing-size_t.patch 280 BLAKE2B d686930b0b04f994ef9f5315ee86e69b61b8e800e192ab45f0b891d3f13a12c2bbd11f99a15533169d0690e9558dcc0327f6632a1a3baaa68679784079884088 SHA512 d6ed3a981da06f60d63b0364d8d841922bb007bf478b67558e88e9b297a4ed7c8eee9501e232d9ca17601f63f6c1cf04962a59c4f0c24fc641868d56006b3616
+AUX cyrus-sasl-2.1.26-openssl-1.1.patch 10798 BLAKE2B 4b304d0767b0467ef8df20ca51d6f64339e7b0eb7204dd630e364fa760c532f54d655365d7c96887e7276d40e42377a546e847827a93487318716dd2438a321e SHA512 8fa8370853d0e1f03b701453f79edf783015b354f221467cb64770d88cd0c7bb56b813a16a3777811082b3a2492699264c0447d254b32d033d2c6eaced19486e
 AUX cyrus-sasl-2.1.26-send-imap-logout.patch 1897 BLAKE2B 4b817b78cfb81181bc2c57402e2e621ccf1cea346c1460d46e76a605cdbd426aefc0fcae5c18c193dcde1562e8fe16a177ead00b3bc3084c03dd0e2466866ac3 SHA512 b30a4faea9fb66d8fab95a27b8ec87371d3650c5d2d4475449b8cebb223631d1afe9cdebd8c9b076e77bc3d2e2f5c32b24fe9292db26523212a72754cbff9995
 AUX cyrus-sasl.conf 34 BLAKE2B f41e1d0d58f484958648cc6f6e2903cf7555f825a1f073b247b4080f575f8508b9a73c9d02c155178d2031019a48ff6300adf60bbb0286a6f7dc710c72f433c3 SHA512 67b9bb97191d091ffc2b8f450ad88a558df304a29651a9a49407c50df0a316666a96e7d1a2ca3ac8ee5e60a58a5d5b618ce963661f4f45049dc6b3ef2cf8099e
 AUX java.README.gentoo 934 BLAKE2B f3447c8422f07cfc17b5e240d5c2fe894f94118132360dda4a5eb04fa51acab10b13d01fcb68beaf6308926256e7c95c457a43f3f697e0c755c7c08143e6c3f6 SHA512 afcecb94e8e8c427b9491fc21312f4bed2a7d4ecedbbec8fec895cf8ca1e747073979f4415e12d8499eadbc29e8d74c6029f7cdfd7a2cb732454faaa19d52dd4
@@ -23,6 +24,6 @@ AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.26.tar.gz 5220231 BLAKE2B 08fe5c1624e7cccb4b5e562f6987fddd047e1221b671cedbbb684d5a2f39e09a438ad14ffcedb5f398c203ca0b6e23574106c87f43a632028d50a69619c54970 SHA512 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0
 EBUILD cyrus-sasl-2.1.26-r10.ebuild 7752 BLAKE2B 3b242e93223a6538e456a96f42baae31fc097cfcd198030d0a2f8da4971a30c6e457f35a78f9cf98ba32c523f5edd5184d201c49ed62b8cf6fa328f68caa8da5 SHA512 d111f3ddf99ec9bb1439e3f3894cda00f257f312778475d20ecdb80d469bba2b91c70c6b9b05df0e2c737768469351a770254976d7db9fa0f44c953e35cac3c1
-EBUILD cyrus-sasl-2.1.26-r11.ebuild 8403 BLAKE2B 6b23212c3187228fc5bba149368ff67313a4ef7e902d4bc2f9d894e645a31f0de2798f45c10a392f093d0221aabde050cadae29ca71b6fb78e36eab35463918a SHA512 796e8c3c834a5add924aecc6fd5b3ddc9204621198b6a20c39286aa719df58ea9ca14f551ef8da946aec1bbb1915fd8fc52072be841a77e7b714389a1eb2371e
+EBUILD cyrus-sasl-2.1.26-r11.ebuild 8389 BLAKE2B 9d185734b523dd8b700299b351633f9e77ee2000f8626343af4032d749fb474e599f8c79c7eb538b8276edc64f925280afddc1d924efa2136f6112c9edbfe78d SHA512 cd9d13a2c9505a636d2d4836fd9f4ff14dc624ce1d10bf64a1185c73d5c33bfd4404cc72da46317833ef7b82180c0f3a12625cef8c4ed2a5055f12540f6d21aa
 EBUILD cyrus-sasl-2.1.26-r9.ebuild 7662 BLAKE2B 8a7b96ca43d133164a9818727486f2d15bd6f66d66e083dee2ac0a8d83c921a86e3e1f34dfa04689c81b5227cf80f06d1fea3c1da74b48c828e4a31f51b67c9e SHA512 6515a66682bc8c0d18b13a3cc540d00f07d26374a6bbefdcb6c974b3184164cfcce80e965b29bc10e81345e2abb8c04eb7edb21adf4097af741d5df1557ae04d
 MISC metadata.xml 706 BLAKE2B a5682e5daac9c1a7a3a021989ae9ca856bb08c9eb0ba3a71070b7150cccc7ddfcd1d3d0fe1df33e688d0223ab7fb760ae028e4753523b28a4cedcb625c899d73 SHA512 1e7495deff4727296d29b25b7af535c0b36054b9172763ca8634b40f324dbc33697424a7e5565791c3131def3708c9ffb7e3e2362cbd8b334d650921fc2291ce
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
index 582c8463da1e..f7cccc351ba2 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
+inherit flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
 
 SASLAUTHD_CONF_VER="2.1.26"
 
@@ -58,6 +58,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.1.26-send-imap-logout.patch"
 	"${FILESDIR}/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch"
 	"${FILESDIR}/${PN}-2.1.26-fix_dovecot_authentication.patch"
+	"${FILESDIR}/${PN}-2.1.26-openssl-1.1.patch" #592528
 )
 
 pkg_setup() {
@@ -65,7 +66,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
+	default
 
 	# Get rid of the -R switch (runpath_switch for Sun)
 	# >=gcc-4.6 errors out with unknown option
@@ -103,73 +104,66 @@ multilib_src_configure() {
 	# Java support.
 	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
 
-	local myconf=()
-
-	# Add authdaemond support (bug #56523).
-	if use authdaemond ; then
-		myconf+=( --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket )
-	fi
-
-	# Fix for bug #59634.
-	if ! use ssl ; then
-		myconf+=( --without-des )
-	fi
+	local myeconfargs=(
+		--enable-login
+		--enable-ntlm
+		--enable-auth-sasldb
+		--disable-cmulocal
+		--disable-krb4
+		--disable-macos-framework
+		--enable-otp
+		--without-sqlite
+		--with-saslauthd="${EPREFIX}"/run/saslauthd
+		--with-pwcheck="${EPREFIX}"/run/saslauthd
+		--with-configdir="${EPREFIX}"/etc/sasl2
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2
+		--with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
+		$(use_with ssl openssl)
+		$(use_with pam)
+		$(use_with openldap ldap)
+		$(use_enable ldapdb)
+		$(multilib_native_use_enable sample)
+		$(use_enable kerberos gssapi)
+		$(multilib_native_use_enable java)
+		$(multilib_native_use_with java javahome ${JAVA_HOME})
+		$(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
+		$(multilib_native_use_with postgres pgsql)
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir))
+		$(use_enable srp)
+		$(use_enable static-libs static)
+
+		# Add authdaemond support (bug #56523).
+		$(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
+
+		# Fix for bug #59634.
+		$(usex ssl '' --without-des)
+
+		# Use /dev/urandom instead of /dev/random (bug #46038).
+		$(usex urandom --with-devrandom=/dev/urandom '')
+	)
 
 	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
-		myconf+=( --enable-sql )
+		myeconfargs+=( --enable-sql )
 	else
-		myconf+=( --disable-sql )
+		myeconfargs+=( --disable-sql )
 	fi
 
 	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
 	if use gdbm ; then
 		einfo "Building with GNU DB as database backend for your SASLdb"
-		myconf+=( --with-dblib=gdbm )
+		myeconfargs+=( --with-dblib=gdbm )
 	elif use berkdb ; then
 		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myconf+=(
+		myeconfargs+=(
 			--with-dblib=berkeley
 			--with-bdb-incdir="$(db_includedir)"
 		)
 	else
 		einfo "Building without SASLdb support"
-		myconf+=( --with-dblib=none )
-	fi
-
-	# Use /dev/urandom instead of /dev/random (bug #46038).
-	if use urandom ; then
-		myconf+=( --with-devrandom=/dev/urandom )
+		myeconfargs+=( --with-dblib=none )
 	fi
 
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-login \
-		--enable-ntlm \
-		--enable-auth-sasldb \
-		--disable-cmulocal \
-		--disable-krb4 \
-		--disable-macos-framework \
-		--enable-otp \
-		--without-sqlite \
-		--with-saslauthd="${EPREFIX}"/run/saslauthd \
-		--with-pwcheck="${EPREFIX}"/run/saslauthd \
-		--with-configdir="${EPREFIX}"/etc/sasl2 \
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2 \
-		--with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2 \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with openldap ldap) \
-		$(use_enable ldapdb) \
-		$(multilib_native_use_enable sample) \
-		$(use_enable kerberos gssapi) \
-		$(multilib_native_use_enable java) \
-		$(multilib_native_use_with java javahome ${JAVA_HOME}) \
-		$(multilib_native_use_with mysql mysql "${EPREFIX}"/usr) \
-		$(multilib_native_use_with postgres pgsql) \
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir)) \
-		$(use_enable srp) \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_compile() {
@@ -215,7 +209,9 @@ multilib_src_install_all() {
 
 	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
 	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
+
+	docinto html
+	dodoc doc/*.html
 
 	docinto "saslauthd"
 	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
@@ -233,8 +229,9 @@ multilib_src_install_all() {
 	# The get_modname bit is important: do not remove the .la files on
 	# platforms where the lib isn't called .so for cyrus searches the .la to
 	# figure out what the name is supposed to be instead
-	use static-libs || [[ $(get_modname) != .so ]] || \
-		prune_libtool_files --modules
+	if ! use static-libs && [[ $(get_modname) == .so ]] ; then
+		find "${ED}" -name "*.la" -delete || die
+	fi
 }
 
 pkg_postinst () {
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch
index 9eeab1b42ff9..beea8eb28d19 100644
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch
@@ -1,6 +1,6 @@
 Gentoo bug #389349
---- cmulocal/sasl2.m4	2009-04-28 17:09:13.000000000 +0200
-+++ cmulocal/sasl2.m4	2011-11-02 17:55:24.000000000 +0100
+--- a/cmulocal/sasl2.m4
++++ b/cmulocal/sasl2.m4
 @@ -217,7 +217,11 @@
                   [AC_WARN([Cybersafe define not found])])
  
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch
index abf0df2568c6..92be26003488 100644
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch
@@ -1,7 +1,7 @@
 Fix compiling against heimdal
 
---- sample/server.c	2010-12-01 14:52:55.000000000 +0000
-+++ sample/server.c	2011-11-30 14:54:42.000000000 +0000
+--- a/sample/server.c
++++ b/sample/server.c
 @@ -85,8 +85,10 @@
  
  #ifdef HAVE_GSS_GET_NAME_ATTRIBUTE
@@ -13,8 +13,8 @@ Fix compiling against heimdal
  
  #include "common.h"
  
---- plugins/gssapi.c	2011-05-11 19:25:55.000000000 +0000
-+++ plugins/gssapi.c	2011-11-30 14:54:33.000000000 +0000
+--- a/plugins/gssapi.c
++++ b/plugins/gssapi.c
 @@ -50,6 +50,9 @@
  #else
  #include <gssapi/gssapi.h>
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch
index 597d45a76795..a413e00bf428 100644
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch
@@ -1,5 +1,5 @@
---- pwcheck/pwcheck_getspnam.c	1999-08-26 19:22:44.000000000 +0300
-+++ pwcheck/pwcheck_getspnam.c	2011-11-30 13:22:24.601023316 +0200
+--- a/pwcheck/pwcheck_getspnam.c
++++ b/pwcheck/pwcheck_getspnam.c
 @@ -24,6 +24,7 @@
  ******************************************************************/
  
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-service_keytabs.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-service_keytabs.patch
index 117e8eb88802..43b6162a66f0 100644
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-service_keytabs.patch
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-service_keytabs.patch
@@ -1,6 +1,6 @@
 Bug #445932
---- cmulocal/sasl2.m4	2011-09-02 12:58:00.000000000 +0000
-+++ cmulocal/sasl2.m4	2012-12-05 08:37:16.425811319 +0000
+--- a/cmulocal/sasl2.m4
++++ b/cmulocal/sasl2.m4
 @@ -268,7 +268,11 @@
  
    cmu_save_LIBS="$LIBS"
@@ -14,8 +14,8 @@ Bug #445932
    AC_CHECK_FUNCS(gss_decapsulate_token)
    AC_CHECK_FUNCS(gss_encapsulate_token)
    AC_CHECK_FUNCS(gss_oid_equal)
---- plugins/gssapi.c	2012-12-05 09:03:31.000220161 +0000
-+++ plugins/gssapi.c	2012-12-05 09:01:55.043380204 +0000
+--- a/plugins/gssapi.c
++++ b/plugins/gssapi.c
 @@ -50,7 +50,7 @@
  #else
  #include <gssapi/gssapi.h>
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-fix_dovecot_authentication.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-fix_dovecot_authentication.patch
index 46bbdd1ca1a0..6fc9de80287e 100644
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-fix_dovecot_authentication.patch
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-fix_dovecot_authentication.patch
@@ -1,6 +1,6 @@
 Bug #510320
---- saslauthd/auth_rimap.c	2012-10-12 14:05:48.000000000 +0000
-+++ saslauthd/auth_rimap.c	2014-05-15 05:23:02.000000000 +0000
+--- a/saslauthd/auth_rimap.c
++++ b/saslauthd/auth_rimap.c
 @@ -371,7 +371,7 @@
      if ( rc>0 ) {
          /* check if there is more to read */
@@ -65,8 +65,8 @@ Bug #510320
                   rc += ret;
                }
             }
---- lib/checkpw.c	2012-01-27 23:31:36.000000000 +0000
-+++ lib/checkpw.c	2014-05-15 05:19:35.000000000 +0000
+--- a/lib/checkpw.c
++++ b/lib/checkpw.c
 @@ -587,16 +587,14 @@
  	    /* Timeout. */
  	    errno = ETIMEDOUT;
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-missing-size_t.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-missing-size_t.patch
index 42f20fb8096b..0177b52567f2 100644
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-missing-size_t.patch
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-missing-size_t.patch
@@ -1,6 +1,6 @@
 Gentoo bug #458790
---- include/sasl.h	2012-10-12 17:05:48.000000000 +0300
-+++ include/sasl.h	2013-02-23 16:56:44.648786268 +0200
+--- a/include/sasl.h
++++ b/include/sasl.h
 @@ -121,6 +121,9 @@
  #ifndef SASL_H
  #define SASL_H 1
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-openssl-1.1.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-openssl-1.1.patch
new file mode 100644
index 000000000000..3b0ffac24f0c
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-openssl-1.1.patch
@@ -0,0 +1,353 @@
+diff --git a/plugins/ntlm.c b/plugins/ntlm.c
+index 79ea47c..554a00d 100644
+--- a/plugins/ntlm.c
++++ b/plugins/ntlm.c
+@@ -417,6 +417,29 @@ static unsigned char *P24(unsigned char *P24, unsigned char *P21,
+     return P24;
+ }
+ 
++static HMAC_CTX *_plug_HMAC_CTX_new(const sasl_utils_t *utils)
++{
++    utils->log(NULL, SASL_LOG_DEBUG, "_plug_HMAC_CTX_new()");
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++    return HMAC_CTX_new();
++#else
++    return utils->malloc(sizeof(EVP_MD_CTX));
++#endif
++}
++
++static void _plug_HMAC_CTX_free(HMAC_CTX *ctx, const sasl_utils_t *utils)
++{
++    utils->log(NULL, SASL_LOG_DEBUG, "_plug_HMAC_CTX_free()");
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++    HMAC_CTX_free(ctx);
++#else
++    HMAC_cleanup(ctx);
++    utils->free(ctx);
++#endif
++}
++
+ static unsigned char *V2(unsigned char *V2, sasl_secret_t *passwd,
+ 			 const char *authid, const char *target,
+ 			 const unsigned char *challenge,
+@@ -424,7 +447,7 @@ static unsigned char *V2(unsigned char *V2, sasl_secret_t *passwd,
+ 			 const sasl_utils_t *utils,
+ 			 char **buf, unsigned *buflen, int *result)
+ {
+-    HMAC_CTX ctx;
++    HMAC_CTX *ctx = NULL;
+     unsigned char hash[EVP_MAX_MD_SIZE];
+     char *upper;
+     unsigned int len;
+@@ -435,6 +458,10 @@ static unsigned char *V2(unsigned char *V2, sasl_secret_t *passwd,
+ 	SETERROR(utils, "cannot allocate NTLMv2 hash");
+ 	*result = SASL_NOMEM;
+     }
++    else if ((ctx = _plug_HMAC_CTX_new(utils)) == NULL) {
++        SETERROR(utils, "cannot allocate HMAC CTX");
++        *result = SASL_NOMEM;
++    }
+     else {
+ 	/* NTLMv2hash = HMAC-MD5(NTLMhash, unicode(ucase(authid + domain))) */
+ 	P16_nt(hash, passwd, utils, buf, buflen, result);
+@@ -449,17 +476,18 @@ static unsigned char *V2(unsigned char *V2, sasl_secret_t *passwd,
+ 	HMAC(EVP_md5(), hash, MD4_DIGEST_LENGTH, *buf, 2 * len, hash, &len);
+ 
+ 	/* V2 = HMAC-MD5(NTLMv2hash, challenge + blob) + blob */
+-	HMAC_Init(&ctx, hash, len, EVP_md5());
+-	HMAC_Update(&ctx, challenge, NTLM_NONCE_LENGTH);
+-	HMAC_Update(&ctx, blob, bloblen);
+-	HMAC_Final(&ctx, V2, &len);
+-	HMAC_cleanup(&ctx);
++	HMAC_Init_ex(ctx, hash, len, EVP_md5(), NULL);
++	HMAC_Update(ctx, challenge, NTLM_NONCE_LENGTH);
++	HMAC_Update(ctx, blob, bloblen);
++	HMAC_Final(ctx, V2, &len);
+ 
+ 	/* the blob is concatenated outside of this function */
+ 
+ 	*result = SASL_OK;
+     }
+ 
++    if (ctx) _plug_HMAC_CTX_free(ctx, utils);
++
+     return V2;
+ }
+ 
+diff --git a/plugins/otp.c b/plugins/otp.c
+index dd73065..d1e9bf4 100644
+--- a/plugins/otp.c
++++ b/plugins/otp.c
+@@ -96,6 +96,28 @@ static algorithm_option_t algorithm_options[] = {
+     {NULL,	0,	NULL}
+ };
+ 
++static EVP_MD_CTX *_plug_EVP_MD_CTX_new(const sasl_utils_t *utils)
++{
++    utils->log(NULL, SASL_LOG_DEBUG, "_plug_EVP_MD_CTX_new()");
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++    return EVP_MD_CTX_new();
++#else
++    return utils->malloc(sizeof(EVP_MD_CTX));
++#endif
++}
++
++static void _plug_EVP_MD_CTX_free(EVP_MD_CTX *ctx, const sasl_utils_t *utils)
++{
++    utils->log(NULL, SASL_LOG_DEBUG, "_plug_EVP_MD_CTX_free()");
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++    EVP_MD_CTX_free(ctx);
++#else
++    utils->free(ctx);
++#endif
++}
++
+ /* Convert the binary data into ASCII hex */
+ void bin2hex(unsigned char *bin, int binlen, char *hex)
+ {
+@@ -116,17 +138,16 @@ void bin2hex(unsigned char *bin, int binlen, char *hex)
+  * swabbing bytes if necessary.
+  */
+ static void otp_hash(const EVP_MD *md, char *in, size_t inlen,
+-		     unsigned char *out, int swab)
++		     unsigned char *out, int swab, EVP_MD_CTX *mdctx)
+ {
+-    EVP_MD_CTX mdctx;
+     char hash[EVP_MAX_MD_SIZE];
+     unsigned int i;
+     int j;
+     unsigned hashlen;
+     
+-    EVP_DigestInit(&mdctx, md);
+-    EVP_DigestUpdate(&mdctx, in, inlen);
+-    EVP_DigestFinal(&mdctx, hash, &hashlen);
++    EVP_DigestInit(mdctx, md);
++    EVP_DigestUpdate(mdctx, in, inlen);
++    EVP_DigestFinal(mdctx, hash, &hashlen);
+     
+     /* Fold the result into 64 bits */
+     for (i = OTP_HASH_SIZE; i < hashlen; i++) {
+@@ -149,7 +170,9 @@ static int generate_otp(const sasl_utils_t *utils,
+ 			char *secret, char *otp)
+ {
+     const EVP_MD *md;
+-    char *key;
++    EVP_MD_CTX *mdctx = NULL;
++    char *key = NULL;
++    int r = SASL_OK;
+     
+     if (!(md = EVP_get_digestbyname(alg->evp_name))) {
+ 	utils->seterror(utils->conn, 0,
+@@ -157,23 +180,32 @@ static int generate_otp(const sasl_utils_t *utils,
+ 	return SASL_FAIL;
+     }
+     
++    if ((mdctx = _plug_EVP_MD_CTX_new(utils)) == NULL) {
++	SETERROR(utils, "cannot allocate MD CTX");
++	r = SASL_NOMEM;
++        goto done;
++    }
++    
+     if ((key = utils->malloc(strlen(seed) + strlen(secret) + 1)) == NULL) {
+ 	SETERROR(utils, "cannot allocate OTP key");
+-	return SASL_NOMEM;
++	r = SASL_NOMEM;
++        goto done;
+     }
+     
+     /* initial step */
+     strcpy(key, seed);
+     strcat(key, secret);
+-    otp_hash(md, key, strlen(key), otp, alg->swab);
++    otp_hash(md, key, strlen(key), otp, alg->swab, mdctx);
+     
+     /* computation step */
+     while (seq-- > 0)
+-	otp_hash(md, otp, OTP_HASH_SIZE, otp, alg->swab);
++	otp_hash(md, otp, OTP_HASH_SIZE, otp, alg->swab, mdctx);
+     
+-    utils->free(key);
++  done:
++    if (key) utils->free(key);
++    if (mdctx) _plug_EVP_MD_CTX_free(mdctx, utils);
+     
+-    return SASL_OK;
++    return r;
+ }
+ 
+ static int parse_challenge(const sasl_utils_t *utils,
+@@ -693,7 +725,8 @@ static int strptrcasecmp(const void *arg1, const void *arg2)
+ 
+ /* Convert the 6 words into binary data */
+ static int word2bin(const sasl_utils_t *utils,
+-		    char *words, unsigned char *bin, const EVP_MD *md)
++		    char *words, unsigned char *bin, const EVP_MD *md,
++                     EVP_MD_CTX *mdctx)
+ {
+     int i, j;
+     char *c, *word, buf[OTP_RESPONSE_MAX+1];
+@@ -752,13 +785,12 @@ static int word2bin(const sasl_utils_t *utils,
+ 	
+ 	/* alternate dictionary */
+ 	if (alt_dict) {
+-	    EVP_MD_CTX mdctx;
+ 	    char hash[EVP_MAX_MD_SIZE];
+ 	    int hashlen;
+ 	    
+-	    EVP_DigestInit(&mdctx, md);
+-	    EVP_DigestUpdate(&mdctx, word, strlen(word));
+-	    EVP_DigestFinal(&mdctx, hash, &hashlen);
++	    EVP_DigestInit(mdctx, md);
++	    EVP_DigestUpdate(mdctx, word, strlen(word));
++	    EVP_DigestFinal(mdctx, hash, &hashlen);
+ 	    
+ 	    /* use lowest 11 bits */
+ 	    x = ((hash[hashlen-2] & 0x7) << 8) | hash[hashlen-1];
+@@ -802,6 +834,7 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
+ 			   char *response)
+ {
+     const EVP_MD *md;
++    EVP_MD_CTX *mdctx = NULL;
+     char *c;
+     int do_init = 0;
+     unsigned char cur_otp[OTP_HASH_SIZE], prev_otp[OTP_HASH_SIZE];
+@@ -815,6 +848,11 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
+ 	return SASL_FAIL;
+     }
+     
++    if ((mdctx = _plug_EVP_MD_CTX_new(utils)) == NULL) {
++	SETERROR(utils, "cannot allocate MD CTX");
++	return SASL_NOMEM;
++    }
++    
+     /* eat leading whitespace */
+     c = response;
+     while (isspace((int) *c)) c++;
+@@ -824,7 +862,7 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
+ 	    r = hex2bin(c+strlen(OTP_HEX_TYPE), cur_otp, OTP_HASH_SIZE);
+ 	}
+ 	else if (!strncasecmp(c, OTP_WORD_TYPE, strlen(OTP_WORD_TYPE))) {
+-	    r = word2bin(utils, c+strlen(OTP_WORD_TYPE), cur_otp, md);
++	    r = word2bin(utils, c+strlen(OTP_WORD_TYPE), cur_otp, md, mdctx);
+ 	}
+ 	else if (!strncasecmp(c, OTP_INIT_HEX_TYPE,
+ 			      strlen(OTP_INIT_HEX_TYPE))) {
+@@ -834,7 +872,7 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
+ 	else if (!strncasecmp(c, OTP_INIT_WORD_TYPE,
+ 			      strlen(OTP_INIT_WORD_TYPE))) {
+ 	    do_init = 1;
+-	    r = word2bin(utils, c+strlen(OTP_INIT_WORD_TYPE), cur_otp, md);
++	    r = word2bin(utils, c+strlen(OTP_INIT_WORD_TYPE), cur_otp, md, mdctx);
+ 	}
+ 	else {
+ 	    SETERROR(utils, "unknown OTP extended response type");
+@@ -843,14 +881,14 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
+     }
+     else {
+ 	/* standard response, try word first, and then hex */
+-	r = word2bin(utils, c, cur_otp, md);
++	r = word2bin(utils, c, cur_otp, md, mdctx);
+ 	if (r != SASL_OK)
+ 	    r = hex2bin(c, cur_otp, OTP_HASH_SIZE);
+     }
+     
+     if (r == SASL_OK) {
+ 	/* do one more hash (previous otp) and compare to stored otp */
+-	otp_hash(md, cur_otp, OTP_HASH_SIZE, prev_otp, text->alg->swab);
++	otp_hash(md, cur_otp, OTP_HASH_SIZE, prev_otp, text->alg->swab, mdctx);
+ 	
+ 	if (!memcmp(prev_otp, text->otp, OTP_HASH_SIZE)) {
+ 	    /* update the secret with this seq/otp */
+@@ -879,23 +917,28 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
+ 		*new_resp++ = '\0';
+ 	}
+ 	
+-	if (!(new_chal && new_resp))
+-	    return SASL_BADAUTH;
++	if (!(new_chal && new_resp)) {
++	    r = SASL_BADAUTH;
++            goto done;
++        }
+ 	
+ 	if ((r = parse_challenge(utils, new_chal, &alg, &seq, seed, 1))
+ 	    != SASL_OK) {
+-	    return r;
++            goto done;
+ 	}
+ 	
+-	if (seq < 1 || !strcasecmp(seed, text->seed))
+-	    return SASL_BADAUTH;
++	if (seq < 1 || !strcasecmp(seed, text->seed)) {
++	    r = SASL_BADAUTH;
++            goto done;
++        }
+ 	
+ 	/* find the MDA */
+ 	if (!(md = EVP_get_digestbyname(alg->evp_name))) {
+ 	    utils->seterror(utils->conn, 0,
+ 			    "OTP algorithm %s is not available",
+ 			    alg->evp_name);
+-	    return SASL_BADAUTH;
++	    r = SASL_BADAUTH;
++            goto done;
+ 	}
+ 	
+ 	if (!strncasecmp(c, OTP_INIT_HEX_TYPE, strlen(OTP_INIT_HEX_TYPE))) {
+@@ -903,7 +946,7 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
+ 	}
+ 	else if (!strncasecmp(c, OTP_INIT_WORD_TYPE,
+ 			      strlen(OTP_INIT_WORD_TYPE))) {
+-	    r = word2bin(utils, new_resp, new_otp, md);
++	    r = word2bin(utils, new_resp, new_otp, md, mdctx);
+ 	}
+ 	
+ 	if (r == SASL_OK) {
+@@ -914,7 +957,10 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
+ 	    memcpy(text->otp, new_otp, OTP_HASH_SIZE);
+ 	}
+     }
+-    
++
++  done:
++    if (mdctx) _plug_EVP_MD_CTX_free(mdctx, utils);
++
+     return r;
+ }
+ 
+@@ -1443,8 +1489,10 @@ int otp_server_plug_init(const sasl_utils_t *utils,
+     *pluglist = otp_server_plugins;
+     *plugcount = 1;  
+     
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     /* Add all digests */
+     OpenSSL_add_all_digests();
++#endif
+     
+     return SASL_OK;
+ }
+@@ -1844,8 +1892,10 @@ int otp_client_plug_init(sasl_utils_t *utils,
+     *pluglist = otp_client_plugins;
+     *plugcount = 1;
+     
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     /* Add all digests */
+     OpenSSL_add_all_digests();
++#endif
+     
+     return SASL_OK;
+ }
+--- a/saslauthd/lak.c
++++ b/saslauthd/lak.c
+@@ -729,7 +729,7 @@ int lak_init(
+ 		return rc;
+ 	}
+ 
+-#ifdef HAVE_OPENSSL
++#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	OpenSSL_add_all_digests();
+ #endif
+ 
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 2d0180d9d130..c78edff97b18 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,5 +1,5 @@
 DIST ell-0.11.tar.xz 398012 BLAKE2B 61ca89e3cd59add835bac44f6de8078e76061dd3af1e135113d92f3b6431da426b4fb4b52e5e5bfd5577288fcea647e5a62c3f2086a19c225a051cd45058ac3f SHA512 9d70c441e2acaa91d61d82d84cd14b97e883b6d8a3fa457eec61d4fc29943dd72ff52a528d29ab4206fcf9994b0ad03008ddc0ec1934ce99d1262237b924742a
 DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
-EBUILD ell-0.11.ebuild 768 BLAKE2B 7794aa0a34c2ba483f838a6b1556dd9a186d35f1f320822f9549c7ac34b7f93191b033bc2639298bfe46a5c4e85ac1173530e2518a0b16d4390d239c38734602 SHA512 69b84b4af59d25d1849f06842036e84d646097d2ec227bccd33825e72f2c5583eeaaac6e0b59fe104536532748ced0b554d0b57d19330ba54d25f47c84578f69
+EBUILD ell-0.11.ebuild 774 BLAKE2B 0aad3afe87ad07413b33bf1b37c3b10db5c54ea14a07702fb8291556c70dfceafe20c07e0ca9ff3940afa4b305f2d1cdbf27191a557bafeceed36b028303eb9d SHA512 bb9f7f5041ba54bb900a42f783ae2359fd2237d9c8facd22c3f9c246810d3cff436b522c7e85066f9257ca787fe6dead888378db1c1e1a47084e14214d51c679
 EBUILD ell-0.9.ebuild 768 BLAKE2B 1d8bb3eb2ac59821d47058c5d6e3244db2b66240710b2c2bbd2b27715b9f48740f91ca58cab9749890b82231a461ed60875cb4ca8b8e6015fd917262e819b334 SHA512 c2313d3629b3ea728432e28b6a2a94d57237b062d659cc6ee2b7e6097da03ccff3afb2a34e556c9b259daf18ea8fed6a23862bdd576adc8b0eda9a985367313f
 MISC metadata.xml 343 BLAKE2B 520f23aef2f64a4592c7252ad8a956763fa337b746fa8b968d66cbf94c06e2c2cf435553340ca82720c83b653e7caab95394c3ce20c52cdc53bf7fbd4099e7dd SHA512 0a4654d2652442d1ab324cc2ea849506381d7f250e3c52bceb966a61795a81072d35e9656b9d472725f4ff78a84bd58b3576fcc837b4ec9e93cc5c34c92d6fae
diff --git a/dev-libs/ell/ell-0.11.ebuild b/dev-libs/ell/ell-0.11.ebuild
index afb7985f2b41..69fc97dbb17b 100644
--- a/dev-libs/ell/ell-0.11.ebuild
+++ b/dev-libs/ell/ell-0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="glib pie"
 
 RDEPEND="
diff --git a/dev-libs/gost-engine/Manifest b/dev-libs/gost-engine/Manifest
new file mode 100644
index 000000000000..50fcd512246b
--- /dev/null
+++ b/dev-libs/gost-engine/Manifest
@@ -0,0 +1,2 @@
+EBUILD gost-engine-9999.ebuild 669 BLAKE2B ae0d1bfdd19a6c6f0c2ed395fd46d7aa6c59ce131993a3a0b8cbdf6d8ab7d16aa6336db1b7e6bc863c4ac02c06f62dfebde43be9c7d6ecc488a8160bc355455c SHA512 3f861aaf80855beeeac4d773bbaac7091b7a4932d3edb4c68d02048387bae59a4f0344e061546664a7c39ec3b9c75c7ca4dee11eb1ff5503b7552049b08c7328
+MISC metadata.xml 464 BLAKE2B 9c303e26fd69fa53be0d278f86502ced45a06a8e07a14a954ec999445f774f606e6db0a4892b325bc715c1c7062c62a8104ffdbaebfb97bc9b03f5555f0c0b3e SHA512 0b13e24bbe8d4d629a886000eee238df48d31fdc697e6ae86fc1b4d71284799f3a714df10ddee243139479a632eedd72e11235760cad0f45d9471637d140891a
diff --git a/dev-libs/gost-engine/gost-engine-9999.ebuild b/dev-libs/gost-engine/gost-engine-9999.ebuild
new file mode 100644
index 000000000000..782e02fbd454
--- /dev/null
+++ b/dev-libs/gost-engine/gost-engine-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A reference implementation of the Russian GOST crypto algorithms for OpenSSL"
+HOMEPAGE="https://github.com/gost-engine/engine"
+
+SLOT="0/${PV}"
+
+DEPEND=">=dev-libs/openssl-1.1:0="
+RDEPEND="${DEPEND}"
+
+LICENSE="openssl"
+
+DOCS=( INSTALL.md README.gost README.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/gost-engine/engine.git"
+	inherit git-r3
+else
+	KEYWORDS="amd64"
+	SRC_URI="https://github.com/gost-engine/engine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/engine-${PV}"
+fi
diff --git a/dev-libs/gost-engine/metadata.xml b/dev-libs/gost-engine/metadata.xml
new file mode 100644
index 000000000000..bf5591b8aef9
--- /dev/null
+++ b/dev-libs/gost-engine/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <longdescription>
+    A reference implementation of the Russian GOST crypto algorithms for OpenSSL.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">gost-engine/engine</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index d56c2dbda1be..f9a338a0ae77 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -1,4 +1,6 @@
 AUX hiredis-0.13.3-disable-network-tests.patch 1297 BLAKE2B 49b87fc28763d551c51524941dd8254765569546997dea69d427473799fe4921b96013cff79a9c09af3341bee848274a5b2281c16785fd44592ebbec866c6978 SHA512 bfbf4ee0a6780cbdcac4c8578aacac241d2b00c94dedd4f298ff06d65cab100f446072573ea0b57a513d3f7146070776fa08e949374e43272c2b05e601f250fc
 DIST hiredis-0.13.3.tar.gz 58291 BLAKE2B 2af5853475a48b1f05c17100197633af61663a23a1259c702545938367b6a5b9fc09b886e12f57d27f23db3f5c636bb42d7e58887cc1481b7016cea405345ddb SHA512 0d8b71d5ee4105e8aaeeee308795afc2c1f60a04b0bfe8ae873d800a0c157882ec307efa04a8d0e63b538fd3fc3f88eedf4d46cb87c8937e2403927aeb7e434c
+DIST hiredis-0.14.0.tar.gz 63061 BLAKE2B 1923a63317f5f4a5bcbc9f8fd35e11fda15c30bb766d377f3be1eaf961cf34339e16b9b7c468b5bf07e513db4913c564e49eb29a2684b945db6c914b07d01905 SHA512 57a81a35b4750f0ca9dba830789483667f8ca1559f13b0ebdc3fab3e34ad16b2809f9734cf88157041263784e11447556b7a748bfb7ef318a60bb5dda3e358a0
 EBUILD hiredis-0.13.3.ebuild 1857 BLAKE2B 9217947c72f5744bf2d01ba12e647672417d8ee16379320cc9c1edbf3a8840478ef09bb14f132b4d42a381271c3a2a5b39bd4ba047b44cf3cd0335d65c5e9f7c SHA512 9bfb698ebfe74a1b9400b7ac25c0b9ec4b04efa2751f4a1f7b646a1d536cc15cfb57e9017a86e5661f74da66ec7521834a9fca7a00474363429a29877756a881
+EBUILD hiredis-0.14.0.ebuild 1867 BLAKE2B e931eba327408e8def1cf4b3b027a87dd093d36cbf3d10e2781178fbc748246eb323d51d9dd02c43f860e4415e8550aa0b1bc5059723b9d22cf5b2dc02f0d8d0 SHA512 e03538599cf8d21b1df2e15579960865adf14083b23512e88e1402659ca0e629c854839005c98f156b59d305aa7f0e3139947c97feeedeaad22ec568aaf893dd
 MISC metadata.xml 297 BLAKE2B ba20b03da98e6f0ffb782592b6985c7ee18af0b4415302304e23af4886f32fc6c0228086dca3a5162d68da95ea617d919f3d838a2c27b1f396d1c60b1e1e1c62 SHA512 066533b525b755fc03d453dbec7c7af33a1f550d493e12fd96d773cb9b1b754ff02f689019277840bc29e3b1f9efc8226729637ed3c50b4b4cba1a64d3afaee9
diff --git a/dev-libs/hiredis/hiredis-0.14.0.ebuild b/dev-libs/hiredis/hiredis-0.14.0.ebuild
new file mode 100644
index 000000000000..ab120cee20da
--- /dev/null
+++ b/dev-libs/hiredis/hiredis-0.14.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Minimalistic C client library for the Redis database"
+HOMEPAGE="https://github.com/redis/hiredis"
+SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/0.14"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x64-solaris"
+IUSE="examples static-libs test"
+
+DEPEND="test? ( dev-db/redis )"
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}/${PN}-0.13.3-disable-network-tests.patch" )
+	default
+
+	# use GNU ld syntax on Solaris
+	sed -i -e '/DYLIB_MAKE_CMD=.* -G/d' Makefile || die
+}
+
+_build() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		PREFIX="${EPREFIX%/}/usr" \
+		LIBRARY_PATH="$(get_libdir)" \
+		ARCH= \
+		DEBUG= \
+		OPTIMIZATION="${CPPFLAGS}" \
+		"$@"
+}
+
+src_compile() {
+	# The static lib re-uses the same objects as the shared lib, so
+	# overhead is low w/creating it all the time.  It's also needed
+	# by the tests.
+	_build dynamic static hiredis.pc
+}
+
+src_test() {
+	local REDIS_PID="${T}"/hiredis.pid
+	local REDIS_SOCK="${T}"/hiredis.sock
+	local REDIS_PORT=56379
+	local REDIS_TEST_CONFIG="daemonize yes
+		pidfile ${REDIS_PID}
+		port ${REDIS_PORT}
+		bind 127.0.0.1
+		unixsocket //${REDIS_SOCK}"
+
+	_build hiredis-test
+
+	/usr/sbin/redis-server - <<< "${REDIS_TEST_CONFIG}" || die
+	./hiredis-test -h 127.0.0.1 -p ${REDIS_PID} -s ${REDIS_SOCK}
+	local ret=$?
+
+	kill "$(<"${REDIS_PID}")" || die
+	[ ${ret} != "0" ] && die "tests failed"
+}
+
+src_install() {
+	_build PREFIX="${ED%/}/usr" install
+	if ! use static-libs; then
+		rm "${ED%/}/usr/$(get_libdir)/libhiredis.a" || die
+	fi
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	local DOCS=( CHANGELOG.md README.md )
+	use examples && DOCS+=( examples )
+	einstalldocs
+}
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index b92e85217ec5..9014ec1cbae2 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,7 +1,7 @@
 DIST libfilezilla-0.12.3.tar.bz2 398275 BLAKE2B 0ba30e64b6aeae0bed58913248992b7152b389fc560291174388196a02a583dcbc485c9fb9680e0541e788c2d6691a6050f465e8719c2c3e7974eb5fd293bf8a SHA512 a08343a418b4147b42d38afd04c66a26c405770109818b48a291c127a5fde6c98515b716990fb056b319c3be859f44060d4ee83e96ec5c4bfa40c755ddc01bba
-DIST libfilezilla-0.13.2.tar.bz2 398889 BLAKE2B 8e4368fb3b0246aaac7ebb3f6bf515a6176bb8d72b2064d2390c4c585951472edaafe71d335599b6951e9a155689010f85fa4cd39304481c4ca3882d39565186 SHA512 97fd49fbfbfaabb0354c69f9a26d674e7cda7a085201eb0e3454558e5773404f4c13f87ae4e11cba9bd0737dbd7c65778d02a8de2f07dd39636514134cce5c88
 DIST libfilezilla-0.14.0.tar.bz2 399398 BLAKE2B 25c1397769adaf532823f85abcc8bec0a885f5c92af49219a1aa9379c12692bdcc94d223ac2ddeefbb221f0ce0d709b058b7018f3c358a40cc046e7c45c4ee82 SHA512 f20932e14ab81df9562e030ce10009b9ab55b6798f7bfff7249e9f472fc8cae4278eb142a655dffb63fec53894783874973eb33444bfdacdb06fa682c2dd66a6
+DIST libfilezilla-0.15.0.tar.bz2 404535 BLAKE2B 9390025ef14553ce6ce9494ba84c888efbf78799b681eb6d6f6ae3f3a626026587eca1898aef907adbbbe970ef6f1cd30aef66a94fc287331e6e29f66761ff3e SHA512 64b0e2a8dd4dd06a1c2daf52f3036fcaed60b95240672f28032ec390361ddb1a59cd26a91b7b7c525cfc8262381db09a081a29c723f487cc5b41454ce4e9d47e
 EBUILD libfilezilla-0.12.3.ebuild 921 BLAKE2B ddbbfbb499653641009d4ce494b7308bc92d6ffb58ae13888dfe892761c993fe03b5ead34638b238e96a171310d21f794981051d321d01f1d4b64ef63a47afa4 SHA512 7d04b1cd40129c05ffef86da072ef5da8fc91420ebe5444c6e5f8c471c0627502ee0575d19d3de2903e7bf8dc2a256aaaf7369cf165f62b868d35b54baa0f34e
-EBUILD libfilezilla-0.13.2.ebuild 920 BLAKE2B 43c040cd73c96a0dc869b0bc7d32b2eefc5dcc636cd22f6ad5922ba4b302b67fc8b77485cabbba891a3067dc7a8c4c48af5d5429fa6d2c7a85186a96cde2209b SHA512 322fd404e89418b1219115d1bf7652100f2c2d79639a032e0d7387f580712f1e0c3d9de88e998475efcfdaf9019aa5a4fef8bc23ec2b6b0a698c631494911a66
 EBUILD libfilezilla-0.14.0.ebuild 920 BLAKE2B 43c040cd73c96a0dc869b0bc7d32b2eefc5dcc636cd22f6ad5922ba4b302b67fc8b77485cabbba891a3067dc7a8c4c48af5d5429fa6d2c7a85186a96cde2209b SHA512 322fd404e89418b1219115d1bf7652100f2c2d79639a032e0d7387f580712f1e0c3d9de88e998475efcfdaf9019aa5a4fef8bc23ec2b6b0a698c631494911a66
+EBUILD libfilezilla-0.15.0.ebuild 920 BLAKE2B 43c040cd73c96a0dc869b0bc7d32b2eefc5dcc636cd22f6ad5922ba4b302b67fc8b77485cabbba891a3067dc7a8c4c48af5d5429fa6d2c7a85186a96cde2209b SHA512 322fd404e89418b1219115d1bf7652100f2c2d79639a032e0d7387f580712f1e0c3d9de88e998475efcfdaf9019aa5a4fef8bc23ec2b6b0a698c631494911a66
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.13.2.ebuild b/dev-libs/libfilezilla/libfilezilla-0.15.0.ebuild
index 5fcb3b82864e..5fcb3b82864e 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.13.2.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.15.0.ebuild
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 392db32e74d2..c7b87f2b7d33 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,3 +1,5 @@
 DIST libgit2-glib-0.26.2.tar.xz 421956 BLAKE2B d38698f00d85b484d17078e78ad051a4c068b87df73fcf4d7b852dc6966628580cc4e5b3899a6edd5dc29fb47ef97ebe2c458992701b7642549f3e411d917dc5 SHA512 35fb3ec7a3757212f53cc884760f69725beff8462018b8e716fad389ba57d1acba99ece0fcd148ff40dc63e1fc7e7d566fe84759bd88d3a0ff9fdf970b0a5563
+DIST libgit2-glib-0.26.4.tar.xz 138492 BLAKE2B 725c14076fb940186faac079cff1ea87c456ed41e943ae95a4a674632c1be261ab6d4d5bcb5c0800bbde5d86c1ff3095d59045a2fda1342a1cf5c691a2b424aa SHA512 9eb78f292583862890ca0cd27d7621da2f8f633a76f4679f897ce6cf9e06b64a3cb7b0ddda39d231d21d3faa830fe1a9a9326b4abd420df8356d50a734360b37
 EBUILD libgit2-glib-0.26.2.ebuild 1304 BLAKE2B 9a3bedeca6910a8bb1dc73783869b733c8135375748ee3be8ae1695636b7cb0e92f12fbadd701ce08ea438a10d898be30a5d10bbc25ebb3db31d82b32c6d6ecf SHA512 b111e69cd3c5ba40f24b12060c9b3cd5d61a3b425c173e14743c82dcf425b27da9786d52b79cb3c0af94302a29cba058ec70196b752cacad2262bfecdd72ebd3
+EBUILD libgit2-glib-0.26.4.ebuild 1329 BLAKE2B 1c9c368df50d5c65f0605b503255582c14e0ab0f487acaaf7e198d720d8a7510ef1f15449aeb9afb314f2ce3b7fcd57a2f8cdeab0e768a73e977636699ead4cc SHA512 0f58111ed32d83a14ff6f1a6f8eaa8cab306a527a15c26678e92965dc25e56587b3e33d973c1af15c7089b99c23451d06980947a835a129abc3c78988de06526
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild
new file mode 100644
index 000000000000..28f3698ede9d
--- /dev/null
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson python-r1 vala
+
+DESCRIPTION="Git library for GLib"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python +ssh +vala"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Specify libgit2 dependency with subslot because libgit2 upstream has a habit
+# of changing their API in each release in ways that break libgit2-glib
+RDEPEND="
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libgit2-0.26.0:0/26[ssh?]
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		# apparently broken; fails to build
+		-Dgtk_doc=false
+		# we install python scripts manually
+		-Dpython=false
+		-Dssh=$(usex ssh true false)
+		-Dvapi=$(usex vala true false)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python ; then
+		python_moduleinto gi.overrides
+		python_foreach_impl python_domodule libgit2-glib/Ggit.py
+	fi
+}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 9610161997c1..320f3fcc31f1 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,6 +1,10 @@
 DIST libgit2-0.26.7.tar.gz 4737641 BLAKE2B dd87ab3048dec361619ff0e42d19161e4b20a07d334ad42aa077b77202bf5e84b85e33a6d6668afef36a7ff23f85a68f28049e08dd7502b241e40a730a78bb44 SHA512 5ad0c514b6c1c58031029f4ada278a164cc112f25c36745973df27711f12888000c054816b65889576124e93b71ec9a1c4f4cc0b538f177d93a57bc145fea1e1
+DIST libgit2-0.26.8.tar.gz 4742478 BLAKE2B 31326987961ed42740f6c0ddce6a80c278175899a62cabd65ce9eef60854553e6a91fd9947ca23945104d4e1b46f9ab0bb1a1a793d8dd87bed792528e5c32839 SHA512 efb9229b2882ac36910d75778d7431bec40f3529f2ad2dd6a950d5580ceb0d4dd798242a422ea6cbb880f515df4dfbb7055a65dd5a8106696d3d458851fca56e
 DIST libgit2-0.27.5.tar.gz 4775158 BLAKE2B 118af462a4969bc802451b887386e87da0f855641a774ce7460d6fe7ad9c62ce71a4b35a7461a95c7c4a96c59143c9c1acc78c5a1b21143a651491713f4fa15b SHA512 318b981456d55f60f8aa1897f1f70274329e48f09769b661eb4bbe76399071eca0fbc7deacb3191db16bc89dba8cc69a64adaf8cbc65e34a65b6e72ca122e21f
+DIST libgit2-0.27.7.tar.gz 4782856 BLAKE2B c844eca24b5053b3391ace6ebeea047bbba4fd429786e08144151109bfbd22f5c1b2609a176816a5d7eff63f1fe91122f88d89d3613dc4c770051cf095ae5ac3 SHA512 de2e266939bd40bc580603539e1156906b97299523336ddc6a66c3bec26729495bef2daa2d240b83b7e011e93852381e95a4407132b0440a5aa1e1b7642c0011
 EBUILD libgit2-0.26.7.ebuild 1943 BLAKE2B 1b307186052d51167fa1cc022aac4f847de31e36398c8ba58b178399e2aa527e0619a09bbcca20414f122008a4e7f8344ffd8f67b0948b605ce42d3c95c4fba9 SHA512 11a0a56558a263784838c185f6967a9fba0f2206591cc1bce6f18be73ea2a990c6012cde6c370fcb7ceace0433a07353735a6d0cb0d0580cf27005f090581fb1
+EBUILD libgit2-0.26.8.ebuild 1823 BLAKE2B 3cab4e9d924618f0ae65fc074087c4db0d3b2c73b57e7196083d9194101ff67b8d91b68ec78e45275984eec1d94ee9d2e34fc8180f7b30ddd8ae8f42a8f0e67f SHA512 6adac344bac4a817955037e60b42caf18d2eb95e6c91fe15995f7f8591cf3e193e773c1fdb40b7264d6195ebf2e6b79b6af1d116834e49d193ceab3d20f65798
 EBUILD libgit2-0.27.5.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
+EBUILD libgit2-0.27.7.ebuild 1823 BLAKE2B 4a34b7c5f15e9191bfb2b236166fb1e68e8908b30c2fccffb7f80ccfbc32607f6ac03314a2d2ace2b43496cbb4f76b180ec4692ee47b91ad63870418c1c18c0b SHA512 e9c84a0e241c83359a8fd04d9374e94f6be46345b942c6344f655ce955fdd815dd9ca08c6c7bcb9aa15f5befdc5898457236f280b078a892419e1d31a143a430
 EBUILD libgit2-9999.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
 MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/libgit2-0.26.8.ebuild b/dev-libs/libgit2/libgit2-0.26.8.ebuild
new file mode 100644
index 000000000000..5936e8a00286
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.26.8.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit cmake-utils python-any-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
+fi
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.github.com/"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/26"
+IUSE="+curl examples gssapi libressl +ssh test +threads trace"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib
+	net-libs/http-parser:=
+	curl? (
+		!libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
+		libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
+	)
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace)
+		-DUSE_GSSAPI=$(usex gssapi)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+		-DCURL=$(usex curl)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake-utils_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libgit2/libgit2-0.27.7.ebuild b/dev-libs/libgit2/libgit2-0.27.7.ebuild
new file mode 100644
index 000000000000..d39c0a7a0268
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.27.7.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit cmake-utils python-any-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
+fi
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.github.com/"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/27"
+IUSE="+curl examples gssapi libressl +ssh test +threads trace"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib
+	net-libs/http-parser:=
+	curl? (
+		!libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
+		libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
+	)
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace)
+		-DUSE_GSSAPI=$(usex gssapi)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+		-DCURL=$(usex curl)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake-utils_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 945adb0a35ec..0f1c900795b2 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -2,6 +2,8 @@ AUX libmspack-0.6_alpha-fix-tests.patch 575 BLAKE2B 35a8342f103926bfff555237cbd4
 AUX libmspack-0.7.1_alpha-fix-parallel-build.patch 954 BLAKE2B 545d90548a32c296d6bcbcd9e880574ba76bbb2d06a0ed41446b1632e8fdcf32c61dbdb6455cf9d9080d49840a1739983f9746614be0f08532c4db70ab16cf0e SHA512 251d7dd86f44f06bea8b1589b860e126e849743c4433703b4420da85737373af4b52c3f55dd8dab94e3bfb4a5e9626eee341f19f1ad649573727b7613170f2ef
 DIST libmspack-0.6alpha.tar.gz 476992 BLAKE2B 3ff510e108e12741b661a4960f204ce268572f79917d4ec18e105d09cee3f515d76e02a2432717ad6c2118c7eb191b51902ce86e3c5b441ee269740816b2a392 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d
 DIST libmspack-0.7.1alpha.tar.gz 486840 BLAKE2B f97abba7b261cced6e5c500c50243920c44ae8bc245e54386c4568e17989f2bad2c3316d83ebbd75220b50b09ed4ded156965e9aa430bd207aaa6b7c6218d800 SHA512 e903629a34c29099a261a108e4eb9cda485ab999bbc3383e3cd6a39715077d00b26a1c641b0f3df0eef60d2e15a7ef623379df0cfe25b99d4eda080529ffec7b
+DIST libmspack-0.8alpha.tar.gz 488869 BLAKE2B 346609f86e1668f012794c89704991d9e1c206f73f47febcc6c32b6523819f00bf13aeafb250611b73ab8eb25764a6ada0cecaf138452ece64674784aeaeaedd SHA512 d178afc4d2eded204594c81af1c91be17d3be4f1a09829e08c103023aa7badc6b2595e9ec13cc7f77e3262d2cd874ed40ce6da01695c5c839682562740d2bf0a
 EBUILD libmspack-0.6_alpha.ebuild 1185 BLAKE2B decc95044aeab67c2031bccf940a2c00f71263b4321d58e58ad8753aae67578b37d75964bad79457943be49e821d99c8d7bef56dcff383f02a23483c633adb97 SHA512 47ea82678d2701d15391697a498c8099b88742c82772bb79270d0c5138ea1061e5112a3609cfa4724517ce13790084e680deb385d48cc065bb9abd508ad6a50f
 EBUILD libmspack-0.7.1_alpha.ebuild 1350 BLAKE2B 2547d6a0d39530f7e019ea0073cd809c563094fc4ae8198f7b0c27c29d714b34c8f5f2a308d6a8df3a3cd5c847715e97a3d154483a90c3314e32a9761d0a3d4c SHA512 c4bd1afc5c42640541b70140295a860412beabfc7f90407acc2dc7263f711531bd3cd00b4f1280841a2fd556c7e4e32d554519e5a54ea258f5e24b963d08a274
+EBUILD libmspack-0.8_alpha.ebuild 1298 BLAKE2B b62b3be7492625949a8fa1e25c536c27fa4781c07c8eac0cf3e503981d7b66be8d3223be02eccf7b37a9dfa75bd6bff4fb8f9da408098e2596deed6d0a6e0445 SHA512 5a9ba806bd8973788c6839ea19cf7b69fc2cc7fb7b35156b59e58ea78bb8d619a3fdb95363d88ef9f640c0326cc2b35f6cc5f41e66707febaeec74f7c1e0712b
 MISC metadata.xml 355 BLAKE2B 27dbf410ad5287ffc5ec6336a0c4cfc8eb02b52d72c9cceaaf39518dd435fc647e5c667f003c2b00141bd076fb574e6914f8cd3ad37de693bccfef9942e46689 SHA512 08390d344d23931d0c418eb18e0db2dbaba1f9942fac4984786fab7fa15045a9ccded1acc98d8ff4fdb4a2d5d83cb68383818745cb06b1b743489a2efaeb69d1
diff --git a/dev-libs/libmspack/libmspack-0.8_alpha.ebuild b/dev-libs/libmspack/libmspack-0.8_alpha.ebuild
new file mode 100644
index 000000000000..79a9df1e7940
--- /dev/null
+++ b/dev-libs/libmspack/libmspack-0.8_alpha.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools multilib-minimal
+
+MY_PV="${PV/_alpha/alpha}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A library for Microsoft compression formats"
+HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
+SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug doc static-libs utils"
+
+DEPEND=""
+RDEPEND="
+	utils? ( !app-arch/mscompress )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		default
+		cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS=(AUTHORS ChangeLog NEWS README TODO)
+	use doc && HTML_DOCS=(doc/*)
+	default_src_install
+	if use doc; then
+		rm "${ED%/}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
+	fi
+	if ! use utils; then
+		rm "${ED%/}"/usr/bin/* || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index 8de22d91ae95..a8f14e3ddfbe 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,6 +1,6 @@
 DIST libsass-3.4.7.tar.gz 319824 BLAKE2B ca3e7091816474e318fb1eaefa01e5e361a66715b6267500a93f80dfc8b34bdc595e6ddc4b1872e4399093468d4ac06a9760685d8941d92f18e1834df7715b04 SHA512 5d743d4345b11e9e5315aa858637d3388d2b464150a46bc8a712e1e5d1b3df9c1e6b4dcac26f91827f1c38db24a5a084d04c0962a428f2994f42ad66a25b35a8
 DIST libsass-3.5.2.tar.gz 326773 BLAKE2B 65d2dd82872ef76a45597104cc2a531786c0cd33f8e61172b0c973c8262fbddced3b988e143f27b3b7cac2f9d17c481cf58201bfb432aa2656763319ac072b51 SHA512 a06f0047358eeacf5fff9ab44e833ac285e4a971829610b56ae7ed00128b4bee9fe33630c299e61337cf975caf0bc3067242c3af4db1f8aaf3898d3e63920f67
 EBUILD libsass-3.4.7.ebuild 1096 BLAKE2B e9eb6a53d6155feb93703d991b63b41d45e14e9d8bc556a99639bc05aa02b630efa163dbb8def6328c997c8a987c03a9bab68ff24131e33d541f3f58c0358d47 SHA512 740bc1eba61b1fd5f8faf5fce4520836f63fd1b17220948c48674fa579007b2c8d3e6e389a21b923c1dc94fef295a154161b11f1fbc84cc4198edfd730bf6190
-EBUILD libsass-3.5.2.ebuild 1098 BLAKE2B 9e19272999e60c43b276e68b3842ae11b2533311534e2eab439a84c3639373593496f972c25235be84e134524377a7d4ef5a67b5e8c9cd18c42e1cd8f93613c6 SHA512 692c31d43a9da56424c15054a629d46aec956f0ea2338fcd0a7d1c5f50bb5ba90041ccd8a3e1e955fd54028d14d21c17315bdb3af31c6fd0e6f9a20c9171eb9a
+EBUILD libsass-3.5.2.ebuild 1100 BLAKE2B aee271be3d3aaa80a985b50c0a0dbe7a1f56ff2500a639c7b0fcf00dce72e1bfbea5910695f0c24ed1f0dc3214626118dfc824336abf2adb7fbf1ab63e1b2524 SHA512 30dba4424c3492aef518a0ae866fe387c57b207e4b8cbe68adebf41b968fe439409d5ab700fe5ebe0c27a7d5844ce1f3c803ce6169880380e2770f15080ef17e
 EBUILD libsass-9999.ebuild 1098 BLAKE2B 9bfaff1b30ff11fa8cb8c2082a2e91a61d8be9df2cb290444203b8d56111e63a914e439526ffa99a0ae21ec229ac4f7d672c2e58e2baafb2bb80edb947c0be64 SHA512 48833dfaf5b5c815d7922a93a988a15ea59b5d38d6f6cfb063109b89be479d617df8c8d9ff7394ece9901970c5f569efa59c80a6a3adfe6ecf4baffdcb803b32
 MISC metadata.xml 631 BLAKE2B 186d066c5e07a86e3b9878c3beb4453b1f708ddc456863fd43992955a6557df1151c92a5119614ea619b7e0aaad32248982170e5de514551c2cf6a4273ad4235 SHA512 b48a370653c205fd753b4a4d23346c58304c78ae9fe2ef4b63316bdeb29d641e5f4e1e2917d96ac05e59be7bef5663713b55ca8ff225bd8fee029da018789ddb
diff --git a/dev-libs/libsass/libsass-3.5.2.ebuild b/dev-libs/libsass/libsass-3.5.2.ebuild
index 3766263a4952..94f29d59692f 100644
--- a/dev-libs/libsass/libsass-3.5.2.ebuild
+++ b/dev-libs/libsass/libsass-3.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 	KEYWORDS=
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
diff --git a/dev-libs/libwapcaplet/Manifest b/dev-libs/libwapcaplet/Manifest
index 71bce97e1901..af4868f98e97 100644
--- a/dev-libs/libwapcaplet/Manifest
+++ b/dev-libs/libwapcaplet/Manifest
@@ -1,4 +1,5 @@
+AUX libwapcaplet-0.4.1-makefile.patch 391 BLAKE2B 0536fdc5fd0e8bca72b0fc33198eba058cefc253d9e6ca112e2d7d0cdfb082a024c739e101eec03470319ce766694507d6d4ed2cd3b1810242c5313e8b3af5ad SHA512 62d0e6b7a5ec8c5e5c695933a886002bf81c5ac73e2f47917d9942932045cf66f5023eac039e21b8cf915a145dba2d3c12da4a85e9ae1a7340e522f36bdc3157
 DIST libwapcaplet-0.4.1-src.tar.gz 31448 BLAKE2B a686a357dc84135da902380de17b0f8415a682cdb258ea0a8f7899581d23f6fef3aa1600e2657aa728b5689a8fa31a3fe489a7ce8a339adf958c3c25f6151a04 SHA512 49efb958ee79e932916a956844970780723cc71b4b2e5f442507566b2d632cc17c67d984018b48ae31a9bd7d92797766e39110dec02937b45ead26523e8cc2e1
 DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
-EBUILD libwapcaplet-0.4.1.ebuild 521 BLAKE2B 6ce29fd6054fb4efc353cdf8b484788efd7ec8fa333930244531a7c412a7dced958e12a81ea132c79dff45e6a44cddb816de9fda67fd58a6feff162b248c0931 SHA512 7b09ff1c9425f28d6c8337396b78e4033bcae04838820cf52b4c5487e45f0430c0242c072348a70bc5164b6b5b46e9cbeb86842a64ee37d3a306509b5559621a
+EBUILD libwapcaplet-0.4.1.ebuild 590 BLAKE2B 7fc9397fd01c7ea2a3b2edfc8eeb65e08d1887341319b124d99f3f2601a4c1665078460057543869c100bdbbe77d88cb0b4fd3a85513f01de8d0d889bc9fdafb SHA512 bc9e8f242a7edf3ff2749f4712ca7707587958bedbe963f712f1bdcf943cb099826f484025e91b48a7ebd8dbadca6c0d87320262f6c9f2adfebcb72cdf1b260e
 MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/libwapcaplet/files/libwapcaplet-0.4.1-makefile.patch b/dev-libs/libwapcaplet/files/libwapcaplet-0.4.1-makefile.patch
new file mode 100644
index 000000000000..6d84e24de433
--- /dev/null
+++ b/dev-libs/libwapcaplet/files/libwapcaplet-0.4.1-makefile.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile b/Makefile
+index a220258..0e0799e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -24,7 +24,6 @@ WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
+ 	-Wmissing-declarations -Wnested-externs
+ # BeOS/Haiku standard library headers issue warnings
+ ifneq ($(BUILD),i586-pc-haiku)
+-  WARNFLAGS := $(WARNFLAGS) -Werror
+ endif
+ 
+ CFLAGS := -D_BSD_SOURCE -D_DEFAULT_SOURCE \
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.1.ebuild
index a291732ab001..4e1c13da9b4d 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.1.ebuild
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.1.ebuild
@@ -16,6 +16,11 @@ IUSE="test"
 
 DEPEND="test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
 
+PATCHES=(
+	# bug 664288
+	"${FILESDIR}/${PN}-0.4.1-makefile.patch"
+)
+
 src_prepare() {
 	# working around broken netsurf eclass
 	default
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 13c01a6c83a1..0c2a05367291 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -16,14 +16,14 @@ DIST mongo-c-driver-1.8.2.tar.gz 7308675 BLAKE2B ca82c2824486cee78b164d1fdfcf1de
 DIST mongo-c-driver-1.9.3.tar.gz 7716783 BLAKE2B 9f5fc8cddbc1c4cf1f85016027e49d4c3bf2ebe50b1df45eda8569d48b88e174fe2c73e76f7afd4f3a36b74c5d02b826f55c610b8c4df273d8ebd4047e823edc SHA512 2c3f915c4f367f5614a904741b4b480896dd521b7039158b2f421d0d7579a45862d5099cd26b6d14cb088f9db49019538aca553c5cf72d9706ec9ab6516ff40a
 EBUILD mongo-c-driver-0.7.1-r1.ebuild 1265 BLAKE2B 8dd36363056eccf480098c353f77eb89c66e2be3e38568e97a6a92b0adef6c3887324df07fcbf10a81784e2508e2249a7131c6eb288ece61b6691c341a43a476 SHA512 eb9f7c198354e5daf80cccfc3cae0640dbeb5b748bd5e4bd9f9c94400ff56df7616c389234063c362a2dbe89d0bf8908593df06b68d4fb6bce4d350f795ccc94
 EBUILD mongo-c-driver-0.8.1-r1.ebuild 1204 BLAKE2B 1dcdd5945923fde34f50fba03998f88096e598e1f1cde394eab22a74ba1d537531e5365317383609dac5baa5932fde85ca5d426e03cc649b6ec6e2e5370474e2 SHA512 c66b8e7d836d5ca9845bbbb73ca643a74d2568c70ec9b08912b4b55bbfb08ed581579373f2c2443713ced62b72620b7462bfdc1cf7a9fda009f288d82305fcda
-EBUILD mongo-c-driver-0.98.2.ebuild 1692 BLAKE2B 247c26866b8eb10aef7b0894300157a7522d2e579d7c5f19022f086e0352afaca4d5f6a45f9eea94f99049b102fcca84bcbfa56a138ef8d6afc4cd44008ebe71 SHA512 b74806852fbc46322c52966c987d882866fcf551c865eac0bba641b4ccf0f7f4a2129feb3f610e4fa57d3a0be99f50cd1e4796aafec2a1d6ed851c16125c370e
-EBUILD mongo-c-driver-1.1.10.ebuild 1803 BLAKE2B ed8a0f4296418db9836fe3cc4052a9d2c72562542d5588c9219803ee408ba8106829945ab22d1cb64b49428f7a78991d086652f68bebc592ba5872f7aeba2a86 SHA512 3f5a4deeb9115b9a31b1229cf560f62d28611281fa76e1c2d043602f49264a0b75b67540a872621a72bb20bf3aafdfdc4b528aaccaf206ad538127bb69e8587e
-EBUILD mongo-c-driver-1.1.2-r1.ebuild 1800 BLAKE2B 61782ec9c74e2d67bd884c1e1aa1b51eda2aa7148b3df90de3b45187c2823efb3afff7edff1eb5047bb205004a3b9cb8977c0945e6609df7a7c037ca97ab2bf1 SHA512 0183addeff7e2bac1add74db48b727edaf09f1b24b774bafe717c43c0e9a4a083081f12ab1d2afb743b61fd3591d6d3fa04f1b6c2be9339a2ab55a27ef4791ea
+EBUILD mongo-c-driver-0.98.2.ebuild 1818 BLAKE2B b42ebcdfb950ae5040b1d07e77624094768a2188b1e27b4bff2cb375a56deadf6995ccfcb3ca4dda5baaaf18c60828ffacfa3f3af1ebd937d33a66c179f4c563 SHA512 c6d2dc9d599f299cda55cd49e5722b48427b5255ddf40ddeee947e89a950fe8421ac7516b54d7a99a372d06a8379aca9a70c8ccb1c6f2da6a76528293057d3f4
+EBUILD mongo-c-driver-1.1.10.ebuild 1929 BLAKE2B a887abdec4b88b564c0ce1ea543bc9365a0f3bae6277bc2c31d77206054309af9cee440f924bdb7e45a9ae055093d201e5070d7d5291d20952e3b50e17ac2c11 SHA512 1f30065fc31742ad8a7c5f11b2ad69ac880deb79f0c32f834d584f8dfb00bf41e21416cc8d7fd7f6cf5e9198dda7eb94bec3ff51b53661bd6ae123b77e859c53
+EBUILD mongo-c-driver-1.1.2-r1.ebuild 1926 BLAKE2B 9d924e541fd57a5b87f406f898b05f8238786c46ce5119ed34652a82daa4bcf2e2b4cf80f6d79649cd818eab5e3fdb3d45f55de4457b5cc06ae6f28aee651ca5 SHA512 54a10290f998d2e8c634c2819e491cf108f92978e508ac08fe6eddc43bbacffd50c0620297d94e576885d58633e5f908c91806776c5f7dffa5890a9f3cf4ca5a
 EBUILD mongo-c-driver-1.10.3.ebuild 2191 BLAKE2B 43dba477bba4672c2846b940e30f87a1db9d22b20f2f8b333b73ca0903236fc10da2f5a2a022121b06d09f0037418eca3aad1f54ddc13e2813e9c64c8a4b665e SHA512 cc8ddbdfd8dcbb8ac48315ac880e7c36036c42ab87357661a1ba50caa375590371550415c4f4b4a934a65556549c5208fdaa565dd9b4fda143c26a650af82633
 EBUILD mongo-c-driver-1.11.0.ebuild 2293 BLAKE2B edd5b631add3c2f7813c82be5938141edc54ae59634b8c2ef8980f3b553551b340e01837006e88d9f30a2c0ab7c5f8865e3817ac126ed251b88386167594a59b SHA512 58baa8d3f4f66ab6cae3d4b27c9dab1fa0435b4d7f94169d32563c0f9e7bbdb479244e7ae09a8106a810e774bdbe975ae4a49fd4c5a166795a38a01f5283dc68
 EBUILD mongo-c-driver-1.12.0.ebuild 2340 BLAKE2B a9ac25791b3c66a7b9192bbe4ac3ec0274d191fdc4d0994bc223afa144d2159e83190c0f13d52454a8aabde00e4331fdb7cfcf54ae697afca1c967c5f195f8b6 SHA512 b0288069c8776c6d5ddc5953526dfe44911e0f88d4e6b0274577d9133370ada1c7679912fe53a24021b4d7b5f549f784560a73e6910e45a351787bee1bc6557e
-EBUILD mongo-c-driver-1.3.5.ebuild 2023 BLAKE2B fc14f7ffb1d3f6c6d8495b10276944240d57a712d76ce58f909de934ee3f1ddd9f9d57723d1e686692de422033859dbec384aff65eb0e16a4a915674980d923f SHA512 30eb5a0bdd2d92de202dc28df98b3038a8015af39d6bc8fdc7b76299efd509bc9bf0690f824d34c1d7ff4a59dabd036567d18e4846411759560a65ae027f4469
-EBUILD mongo-c-driver-1.6.2.ebuild 1963 BLAKE2B 6a65450eb17c0de23d4525d9028ecba3b69f8cf6b8be52af3ec81893d3295d30cb25f06869b915da4c6f87e2344777356dac99f1aeb506eaca2def1e1550bae4 SHA512 776b41fa17aa7859aae0a8861647cfa4072e31c75a9189cf59da53b3798d5832b45abb60073cf37176ee05a2abc734da3c9e1f9e5fdad718002670bb99e54cfc
+EBUILD mongo-c-driver-1.3.5.ebuild 2149 BLAKE2B 773a2fb9a1e5365d77f9bb0351524331e319bc740623ead4bd779706565c2dba71b20f31752e31313fe75eafc052165b638d6596d46d5a475793274f0175a855 SHA512 86d0292f1d2a4bed46a7b0ef7d68d2f1bb1b18aef3bf60210054d59a020603f8c89a130d835284bad3c4cbb62703bbbd408ec125f386b199ad4868a7787c7fcd
+EBUILD mongo-c-driver-1.6.2.ebuild 2089 BLAKE2B 0e49a73628df5df2ba90627ae42cb553aa4c593fe7b4b68f5b06ac74149549e395658cd075510f5876072f39386e6c5da8fd060d42cbdd4f816271514203913e SHA512 df452c236e0c8db8aa5404ada5a33689b892a10628c83cdd09e8db58a527ce8073de62a6e8747a231787ffc2089ecd5ff4a8fdfdba51e0b64ca3ee2618cc900a
 EBUILD mongo-c-driver-1.8.2.ebuild 2150 BLAKE2B 1ff46d08933c2d525b4dd60cfbd1ba4c3e8183cea11923f3b851b9fe1e0b25bdaf1d08e70f68a3dde383ff4ee7ca9127ea0cb7d0ac011c4aac2f42f46dd4a6f8 SHA512 55338086d4a8c91527f62758b153031751385b975eec7b8dc35a0d07132eb8120b4d0ccf8cdce419f4623ddb8b7deea62556dd7c9c41ad8a01abf04bad6869a9
 EBUILD mongo-c-driver-1.9.3.ebuild 2153 BLAKE2B d6abb8f98f741dc893ad46c50b8ff92f7f151b83ac402bb07c5a3335f648c04eafa26e85f4f9dceaa3bd2a89e96df4d673f755135fd1e31cd03a203ba4643193 SHA512 75657ac140fc3aeac90342be78a18e999f62813a5ac0dd6de782c1ab603e7b602c2d6351650563d95113d9d936413178650bcdeac66d6774255708a6e4d025d7
 MISC metadata.xml 334 BLAKE2B 7e10c3396a8bf28586240a95cc10a42de507d995b9f67dcf3b016cd586a973ce7478fe3974188dfb215123c8ca7188479d0d5be46ebcbb6b7790472f4e6ce225 SHA512 80ff1ae78c264618a7d5253d80ea5f4d1a15a568d5215d03dbe3062a591ec1c99d6625feff3b7baabe314bb284b5e5340c873b8846d05fd932f8cbc78df00d34
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-0.98.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-0.98.2.ebuild
index c8cfa98b12d5..c5f0ca6a8576 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-0.98.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-0.98.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( NEWS README.rst TUTORIAL.md )
 
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )"
+
 src_prepare() {
 	# https://github.com/mongodb/mongo-c-driver/issues/54
 	sed -i -e "s/PTHREAD_LIBS/PTHREAD_CFLAGS/g" src/Makefile.am \
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.10.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.10.ebuild
index 270c3fa25494..2af17a8e308f 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.10.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( NEWS README.rst TUTORIAL.md )
 
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )"
+
 src_prepare() {
 	rm -r src/libbson || die
 	sed -i -e '/SUBDIRS/s:src/libbson::g' Makefile.am || die
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild
index 44af34364f24..aa9e3818623a 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( NEWS README.rst TUTORIAL.md )
 
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )"
+
 src_prepare() {
 	rm -r src/libbson || die
 	sed -i -e '/SUBDIRS/s:src/libbson::g' Makefile.am || die
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.3.5.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.3.5.ebuild
index 4ae9ba800142..90f322d03b42 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.3.5.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( NEWS README.rst )
 
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )"
+
 src_prepare() {
 	rm -r src/libbson || die
 	sed -i -e '/SUBDIRS/s:src/libbson::g' Makefile.am || die
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild
index 09d274361f4b..841127cf7d9e 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( NEWS README.rst )
 
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )"
+
 src_prepare() {
 	rm -r src/libbson || die
 	sed -i -e '/SUBDIRS/s:src/libbson::g' Makefile.am || die
diff --git a/dev-libs/mini-xml/Manifest b/dev-libs/mxml/Manifest
index 9b4819f17eec..b4906eef35b8 100644
--- a/dev-libs/mini-xml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,6 +1,8 @@
 AUX respect-users-flags.patch 762 BLAKE2B ccce0e60b4f3edc18b5fb58215f6f0cd677a91db470a48e67a996f1ce6ba622f2cddb8e84e7ee756c3cab9da167b3fba6cc4e46be874d06887028bb778c07004 SHA512 31cae98c5802e2802df7e6a90275b28a14c1c0c453e456a40ddfb66ce418c34eae8a32eafb3579d4dc7622670f12381232e2ac1eedd1a0509198e691c18e0349
 DIST mxml-2.10.tar.gz 265398 BLAKE2B eb3edec5615d727dec9285e2b74f4c877e8332be8f8183483e85a91d92ca1f48e5fc6d06afa3650c133c9762998abfdc8e846a9961ce55251d0c5bbcba0a970f SHA512 c3838611979c4228df476166e4e987fc1ff8f9b8bd30139066b475dcd99e25be81ecc5171235bc80b1c2291c9d78c9ceae9a1dfc928272a983740d6a67372f5c
 DIST mxml-2.11.tar.gz 9164003 BLAKE2B d124b7d779e7ea9609a91b823fe7f6b45ab4049e79eb72729ca2ffec93a83479d5fed1ef21efc76881a11de58be71b1f3de79fc3e4f07c26f35d3f68e25c017b SHA512 046421f91eea16f0ca99fbf611891c367ea9c3c54d04080d08acf108d7749ad9bbf2f4b3ef234a5130f00f77618196e2c5a245f32230daf645c1f775e961d378
-EBUILD mini-xml-2.10.ebuild 1338 BLAKE2B 3c61f9345cbcbd53d045f391b81bbf177622728da6f340cdc2798d32354cd05fca221fdd4cadb9eef6c45222bad0f92bc3484d5660e5e61623b8dd25b86153b8 SHA512 eddb5ad74946de41caf859faa624e7d7f40c49ef1e2abd21ddd25503a29a940969783a65efafd0cfa48b47e428260953dafaec56ef3148e5d91f126f1baea8c5
-EBUILD mini-xml-2.11.ebuild 1010 BLAKE2B f19a2817893162d7b9260eadd1ca418d41542b4d6696eb8c2e0f1d8803e299734c87b21df9c97a2430cf2aa135368ee269d99465708524cbe8478c7b5db3c320 SHA512 62cafdae355f84775e77f494fdf506e8f0205f6ead1d708d0332042327da14f5a4999f93d0d7cf86e3b4a57ac2c326689e33b70b343f54ce458d7d3556861d2f
+DIST mxml-2.12.tar.gz 9112072 BLAKE2B 29e63abdd567c76209ca41adf608bd752863cdb2911d5bda482a2c6ac50ccdae2179941a3899d7e58480bab8903fee8a6c431619072d2861acd01f18d0eeb9e5 SHA512 49233a0087f3ef73a01ef71bb79511af36bb72027e3d9f6df919385e9ff0b03a489a3ccc590941bc4af1f558f82b2ed9bf8ff641863300a7791ce6dddfd56e77
+EBUILD mxml-2.10.ebuild 1284 BLAKE2B 9f29bdc742076d837d79c979298c8ca50c760c6680333ec7abb31e8be92429b0c4434c1169ad0c2a2886aeafd6efae4ff9abff26c6ec1be1d1f5470efee96b73 SHA512 2dbf597eec60cb1226b374335b9ee372d82f5823aec2e973c30f300b12449f8798bce538b2623db367e9d264e2de8823abcda3192171b762c65267efa18f4230
+EBUILD mxml-2.11.ebuild 980 BLAKE2B f0ef58bc339a064dee07e6d2ccade2932d48cbec80c2e61d5a53ef04dc972734986a16f9e549a05d511b23d5c0125d16c1d03a846d7cc4e11022aba523a3fc99 SHA512 40d366403f141c5c83b59303767bf4c248440080bc3fc7121dc9196998dc1c8585220792aeb1cba7b4d6dfa151b97cd82a83df3dcf6f53d2ff1a04cb6a513717
+EBUILD mxml-2.12.ebuild 1403 BLAKE2B cf322daef45ead5791235a5f3e12924c3650aa6f585720804ab042260448c03c90a1b194ae3d3e2418a10ee06bcbea6bab18d88d9b5f54c8f11328e4784ae16d SHA512 7576e7e5b3b55b517766e4ef7fed4606c52168fd552b527325fcc93072a1217994be86c150122817e9e9abeb6d5fd139fc014f88f2310a8d774a73c06f5da11e
 MISC metadata.xml 1498 BLAKE2B b0ff99450cec828ef5614c2b3819d02cc97e402b60ce7b9bca20962166c47a9e3053e2457eb7b29210886aa7b0297e97340b55cf74a0aabc20ecb4c451d576c6 SHA512 5ead3d76daa42879139a96cceb0a12a84a23df8372a8e2e9e9d1e38ede0266b480ca404f03047f4e66ed7d989171d37333051e2a111dfa0900b9cbba703b22d6
diff --git a/dev-libs/mini-xml/files/respect-users-flags.patch b/dev-libs/mxml/files/respect-users-flags.patch
index 90e49cf2198e..90e49cf2198e 100644
--- a/dev-libs/mini-xml/files/respect-users-flags.patch
+++ b/dev-libs/mxml/files/respect-users-flags.patch
diff --git a/dev-libs/mini-xml/metadata.xml b/dev-libs/mxml/metadata.xml
index a4af87ab4c46..a4af87ab4c46 100644
--- a/dev-libs/mini-xml/metadata.xml
+++ b/dev-libs/mxml/metadata.xml
diff --git a/dev-libs/mini-xml/mini-xml-2.10.ebuild b/dev-libs/mxml/mxml-2.10.ebuild
index 1b30124a228f..2406db40c704 100644
--- a/dev-libs/mini-xml/mini-xml-2.10.ebuild
+++ b/dev-libs/mxml/mxml-2.10.ebuild
@@ -5,11 +5,9 @@ EAPI=6
 
 inherit autotools
 
-MY_P="${P/mini-xml/mxml}"
-
 DESCRIPTION="Small XML parsing library to read XML and XML-like data files"
 HOMEPAGE="http://www.minixml.org/"
-SRC_URI="http://www.msweet.org/files/project3/${MY_P}.tar.gz"
+SRC_URI="http://www.msweet.org/files/project3/${P}.tar.gz"
 
 LICENSE="Mini-XML"
 SLOT="0"
@@ -19,8 +17,6 @@ IUSE="threads static-libs"
 DEPEND="virtual/pkgconfig"
 RDEPEND=""
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
 	default
 	sed -e "s:755 -s:755:" \
diff --git a/dev-libs/mini-xml/mini-xml-2.11.ebuild b/dev-libs/mxml/mxml-2.11.ebuild
index 6a29195944da..6a58f55a52bd 100644
--- a/dev-libs/mini-xml/mini-xml-2.11.ebuild
+++ b/dev-libs/mxml/mxml-2.11.ebuild
@@ -5,12 +5,10 @@ EAPI=6
 
 inherit autotools
 
-MY_P="${P/mini-xml/mxml}"
-
 DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
 HOMEPAGE="https://github.com/michaelrsweet/mxml
 	https://www.msweet.org/mxml/"
-SRC_URI="https://github.com/michaelrsweet/mxml/releases/download/v${PV}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/michaelrsweet/mxml/releases/download/v${PV}/${P}.tar.gz"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 LICENSE="Mini-XML"
diff --git a/dev-libs/mxml/mxml-2.12.ebuild b/dev-libs/mxml/mxml-2.12.ebuild
new file mode 100644
index 000000000000..7a98fc553860
--- /dev/null
+++ b/dev-libs/mxml/mxml-2.12.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
+HOMEPAGE="https://github.com/michaelrsweet/mxml
+	https://www.msweet.org/mxml/"
+SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="Mini-XML"
+SLOT="0"
+IUSE="static-libs threads"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-Os -g//' -i configure.ac || die
+
+	# Don't run always tests
+	# Enable verbose compiling
+	sed -e '/ALLTARGETS/s/testmxml//g' -e '/.SILENT:/d' -i Makefile.in || die
+
+	# Build only static-libs, when requested by user, also build docs without static-libs in that case
+	if ! use static-libs; then
+		local mysedopts=(
+			-e '/^install:/s/install-libmxml.a//g'
+			-e '/^mxml.xml:/s/-static//g'
+			-e '/^mxml.epub:/s/-static//g'
+			-e '/^valgrind/s/-static//g'
+			-e 's/.\/mxmldoc-static/LD_LIBRARY_PATH="." .\/mxmldoc/g'
+		)
+		sed "${mysedopts[@]}" -i Makefile.in || die
+	fi
+
+	eautoconf
+}
+
+src_configure() {
+	local myeconfopts=(
+		$(use_enable threads)
+		--with-docdir=/usr/share/doc/${PF}
+	)
+
+	econf "${myeconfopts[@]}"
+}
+
+src_test() {
+	emake testmxml
+}
+
+src_install() {
+	emake DSTROOT="${ED}" install
+}
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 2c7474e1949d..7dcc81a4919b 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -7,10 +7,12 @@ DIST nss-3.29.5.tar.gz 7480246 BLAKE2B 9ab16cbbd95aa31358b5b686bee64cd81c8343524
 DIST nss-3.37.3.tar.gz 23034239 BLAKE2B 3e30b0fe14501ca0e6b9d14322af73f191164989e6857b9ba46572b7363cdc65c88b672285982f2764ed44fcaf615cb249eea2f45b98050dfc6675003dc74a3b SHA512 11b21818f9fcff11d0e7f4c066ae9fbce0052a30a6b30df9a20022792039b5348554834a472e1b1195e467b9902067f9719678d5ca32efb4e60f1df161feed6f
 DIST nss-3.38.tar.gz 23023474 BLAKE2B 72500827955a25c53124ca6054850beef91868019ba155b70f8268fe79261b71e4f11ab42382241c2855478be7e6def57378cda5f398bf5e25f7fa5c035d630e SHA512 06804163daa08f1f65cfe0e9546ddf066ec7f773aa615431a5952f6c04956dd62425fec38d11037ff7fb02b709de03e5a7637c6ba13de5b7686db4f9ecda52ab
 DIST nss-3.39.tar.gz 23048561 BLAKE2B 74214b6ed23a44a0b6e0d52b9a327f908668079413ee637d172e4f0c7769f252a6c6ecca33215c1865606eaebe4630f31b435f2d40cf1a24ab373874508531b9 SHA512 16358c2d8660ca301410b1d39b2eae64fe2ebbbfab797872410e5fcc67f802ef48f4e362edeecb0591626c77013537019094a6a5dfc8d24487b6b6e54564da8f
+DIST nss-3.40.tar.gz 23308315 BLAKE2B 02cc3ea9589f888e108bd3a6a99d5f52927bb4c63b2d9e03df88b7c1a188b6f2cd47d281dd5234b141b41684043e71d9fbee8f99223d0f5ae9778a4e1cfaa1ce SHA512 3781c94595126757c95ea82c3134eb3f06f4c3814e9ed2bfceae22623a413d622349d08c6779e1230b2dbebd1f07aba58094fe83dcddebb3e043481e7a478239
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
 EBUILD nss-3.29.5.ebuild 9187 BLAKE2B f2c2a4d1470950405afeb2acdec4443818406ad60f85fd88dd399efaf30b62c7bb2e8d8002cd6c1fb1a7e3e3af6e85c953db10d0e2340d64dbe3dbcce1379219 SHA512 b0244c44bfdaf7f24fb36aaba4c9efea40d4e9439df81981b9f83f5f415aabcab17ed1726f0ab55729b82f8198b4b39c699eef4422259e95262f7a7f69f64802
 EBUILD nss-3.37.3.ebuild 9428 BLAKE2B ff335d4edc83f45859d84cbf10514062adede17c3e5a0931a80125e70fd8e3e415809f1ef1ea4ac2549695bdd626fe56fbc4bca658d7c92f3657b16c32ee72c1 SHA512 57fd38ea8f3a71e8c880358f11f5ea5603a103563d2341ce280d188e3b2451c1bbcc38a6fc2b2ba01b7166a87952dd9922e553595c0851ba9d240e989362c414
 EBUILD nss-3.38.ebuild 9430 BLAKE2B df5002039f14bbddec5f0ee8fcf36e4cbdbe3b5e7ac3b5e7b48e8df65de339dd8db7ccebf68cfcb9699caaefbdad78d8f20965135e20f43faf5537bd5db29e5c SHA512 356e735118784a06ac4be499df2888d41b7a16cca4ab015a7ef7a21363c578a0acbdf495e2a07cd408721800e57f0e005cad61f9b000e75679e1a3c9e6db8ef3
 EBUILD nss-3.39.ebuild 9430 BLAKE2B d465d134977270ae52f893c87d3af1e80b999a022e4478009c1313080d07d29e10c8c132e1242e2fdfd43ff0b604835260e7125f1c8fee60a129d8501582dd74 SHA512 99709454db815aef2430f7b80b1321d247424075594941d25f45068fce1afb528e330ba0d9190ac432e17d8153f84ad792c1ee7cc08907cc175db0452984e094
+EBUILD nss-3.40.ebuild 9427 BLAKE2B 979ee7a2382bd013c32aabadf6746872088878d5319832cd3d8b3149a55f9f0981126b824236ded714df7170e538ed7632ee575faf7605b2bbbe79be68148557 SHA512 143da8d4a2a5cfe8e6c8bdaab6dffe24745c85953346febfceec46d0e91d9d0fa7dbeedf2459174e4a1d872509ef81353c7721d0845cdb8033714f45e6dfff8c
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/nss-3.40.ebuild b/dev-libs/nss/nss-3.40.ebuild
new file mode 100644
index 000000000000..9ce8edd66595
--- /dev/null
+++ b/dev-libs/nss/nss-3.40.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.16"
+RTM_NAME="NSS_${PV//./_}_RTM"
+# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
+PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
+PEM_P="${PN}-pem-20160329"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
+	nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cacert +nss-pem utils"
+CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	${CDEPEND}"
+RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	${CDEPEND}
+"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_unpack() {
+	unpack ${A}
+	if use nss-pem ; then
+		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
+	fi
+}
+
+src_prepare() {
+	if use nss-pem ; then
+		PATCHES+=(
+			"${FILESDIR}/${PN}-3.21-enable-pem.patch"
+		)
+	fi
+	if use cacert ; then #521462
+		PATCHES+=(
+			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
+		)
+	fi
+
+	default
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		aarch64*)echo "aarch64";;
+		hppa*)   echo "parisc";;
+		i?86*)   echo "i686";;
+		x86_64*) echo "x86_64";;
+		*)       tc-arch ${t};;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	# Do not let `uname` be used.
+	if use kernel_linux ; then
+		makeargs+=(
+			OS_TARGET=Linux
+			OS_RELEASE=2.6
+			OS_TEST="$(nssarch)"
+		)
+	fi
+
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export NSS_ENABLE_ECC=1
+	export FREEBL_NO_DEPEND=1
+	export ASFLAGS=""
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits:-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d}
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED%/}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED%/}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index bc7c20a3b0ae..0d6e10c3ae24 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -1,5 +1,5 @@
 DIST pugixml-1.8.tar.gz 357806 BLAKE2B 7f7b9c0a1e51186b6511c53dfd11a3fabbc28343e87fcb98c0480a6b8216bb6dbbfc7bc6bfa7b06b649061910b542747a60c7b04d76b5683f4d823da5f9d4dcc SHA512 f59d83e6685949ab392fb08a60b9153f709697e7c1f93989c3d07ac1817b381fa13b2bea23914de803c4db090e3f503d943db0baf53597f7f8c7d734e8028f42
 DIST pugixml-1.9.tar.gz 377369 BLAKE2B 39b5b0d63a20e9c15c5634e56f82207aed63843d252900db94dbf06d100d03916a16523ccb9de433cc94ded4a9e9d1dc11f47bfd6fd75e348a9a2af31c305db6 SHA512 853a9d985aae537391c6524d5413ef4de237d99d96cc58ea7fe7152f786df1e408cdacd2e4387697e23c3e67cdc1d42b29de554501309eae16d86edd0e24785f
 EBUILD pugixml-1.8.ebuild 587 BLAKE2B d0ebc6c9f3f5f8f2ec7f4f83021ff9738f8998fe3a604134029ea3db35543a3fd764a67eb7bab6324a6b4b9d206c857c29a2349bfd65abaa7a69123c91821279 SHA512 e876cbfa8d2191c3c189e08dda7c54b47d4e89c7107b6618cea1f77b3d59bfd1093e46decda7c0175b465dc23dc63b2dedbf2627efc823b4ab0954df47472968
-EBUILD pugixml-1.9.ebuild 593 BLAKE2B ab8fa95b5ef07c4bf14753f3e24e7a1cfc3670130898ce4dc5833df846d52c022504e40886686f64ff3d6f9d3c4d90de2789d9f3c9ace7fe6c4313d7ed55c6e4 SHA512 2131eba7435153b591a4f36cff4cb7fe97979b7f1b5b504b40a17bc46dd7d96ff294643ebf1893fcaf4f515258f2e1cdfd7291ef520189d71150ad3cfaecbdef
+EBUILD pugixml-1.9.ebuild 595 BLAKE2B fdcea3a006480c5ddf8c60ad27d01be9c75b6791409809a39bb1985b881e62269cf3b387ece63ff1b0bd123cf85df06713f78ee636bf768e0f3d6e01414eafbe SHA512 e0f17a0ee26983ddc62cd9b751868e0abe1e8272957a981df199b324e93653f2a4275fd45d8736bc2c02331a672794178d3f11d4823cc0b28de2106e62de2935
 MISC metadata.xml 346 BLAKE2B 68e81d68ef327995169a33c1716bf546958902854870095704000abc97634073a87945a54968a1e167bb94b845032b5ab3d8822b1663e7fb3fdfdb5abaf0d789 SHA512 90152b3b666bf26a6b0be0a411aff980d340ab1b38e2068a170b809c883e7a1c29de6adc0c8aef90b5702682a8fe548ba59e2bf077cc3ad145f9d1e3699afcaa
diff --git a/dev-libs/pugixml/pugixml-1.9.ebuild b/dev-libs/pugixml/pugixml-1.9.ebuild
index 04fe0f235c99..afcc7834a96b 100644
--- a/dev-libs/pugixml/pugixml-1.9.ebuild
+++ b/dev-libs/pugixml/pugixml-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 src_configure() {
 	local mycmakeargs=( -DBUILD_SHARED_LIBS=ON )
diff --git a/dev-libs/sway/Manifest b/dev-libs/sway/Manifest
index 102b7f850bd3..05949ff415c3 100644
--- a/dev-libs/sway/Manifest
+++ b/dev-libs/sway/Manifest
@@ -1,4 +1,4 @@
 DIST sway-0.15.2.tar.gz 5398956 BLAKE2B 6bb527e802b7837ef39cb1e29597d55fd33831231dbfb7f12225e50c38e49ae17d8bf2eb43672c195c6e074986d254b1680bac7c9d60b80b84feaf07e09718df SHA512 c457ace514f5c69ebd366d313cce93a76b199bb51c7540debc9c0586bff490401e6374f9725c784474afdfcca15bcab686a972c6c178117e45e2de83825ed370
-EBUILD sway-0.15.2.ebuild 1929 BLAKE2B 454e3a4b045daf4fdb206cb8f3e24ff8a349e1f5d6cf8baadfe61f819edd0ccbc89c1368bf34fae1e8e9a134866af1222afc885670d53f82f6cc3d946a72e2cc SHA512 943d0990f2c5e0ddfaac4f4ccf76d10b822a26c8dee7b9973a5388de15172cdb54eec90140c9ed547fadf1d808903e37c75cbdc6d98720d4dc12afe9aaeebf70
-EBUILD sway-9999.ebuild 1889 BLAKE2B e324f60205740a5dcf1440bad7baf4a18d21bcf08eb3ecba84d608bc63873bb3245b5f5f2833fff29fc67d0f6def64d3d4c372bebb18a32621ddd202b8da45cf SHA512 36de11a38d5efc324d6bb77f34d26dcb2d05bfe0b1e1b4ef489ffe4e6d99a153368595d4db5d4a36d3205ce42f822781273bd331b0c65301982bd800a4a9d5c2
+EBUILD sway-0.15.2.ebuild 1925 BLAKE2B f6c56c97ce70d2b01ad6b836894faccff11f0ed74a782ac4621b1ce544c0f167b1a632835842cc5ac97a6ea8c897f50f1b06a8fda5d33e279ebd62213a0eef97 SHA512 7fb00b02563b71dc818d46a7211687499eac1cd6a677a13d76b8e62f0c3394c4fe3a6fbf1e98dc1b36d9d7141e2410dc12e261832f71828612418d03664a22b2
+EBUILD sway-9999.ebuild 1885 BLAKE2B 7e289919c2910ff3d70900ea48b3f1cb67b38d69f279a6bce4e1fe20c4cb77dc05582786ac7552cefeee20330ee02cd1de280bf599e979077b31abba4964685f SHA512 8cdf3e6a4c42a207e5a32379ac9c5f03d23bba139888370385102260c70b84a33e76e3d7397a03bfc370fa46fb96e2adf28a6103eeeec61f0d746005aa967274
 MISC metadata.xml 1756 BLAKE2B 98c5ea811df7218a945de7d8ae3891692ae7fa137f320ab316f985c99ac288ac62fe006879cdd539f48ea9207a953434f3a5dbaf815f32a40a5c7ff73376c594 SHA512 c66066c76ea1c1cbbdf79664fdd123d22a681e82bfa5c3ffe92ae12fd6fd4adaf51d12767b3ca4e2f88405df59a386e7dfe8f9f5a8fd382918b7566f6461d27a
diff --git a/dev-libs/sway/sway-0.15.2.ebuild b/dev-libs/sway/sway-0.15.2.ebuild
index 4c02b8d32662..7d8204ffd001 100644
--- a/dev-libs/sway/sway-0.15.2.ebuild
+++ b/dev-libs/sway/sway-0.15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/swaywm/sway/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~arm64 ~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+gdk-pixbuf +swaybar +swaybg swaygrab swaylock +swaymsg systemd +tray wallpapers zsh-completion"
 
 REQUIRED_USE="tray? ( swaybar )"
@@ -76,8 +76,7 @@ pkg_postinst() {
 	fi
 	if use tray
 	then
-		optfeature "experimental xembed tray icons support" \
-			x11-misc/xembedsniproxy
+		optfeature "experimental xembed tray icons support" kde-plasma/xembed-sni-proxy
 	fi
 
 	optfeature "X11 applications support" dev-libs/wlc[xwayland] x11-base/xorg-server[wayland]
diff --git a/dev-libs/sway/sway-9999.ebuild b/dev-libs/sway/sway-9999.ebuild
index da318f9247b2..68d15fce04ab 100644
--- a/dev-libs/sway/sway-9999.ebuild
+++ b/dev-libs/sway/sway-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -76,8 +76,7 @@ pkg_postinst() {
 	fi
 	if use tray
 	then
-		optfeature "experimental xembed tray icons support" \
-			x11-misc/xembedsniproxy
+		optfeature "experimental xembed tray icons support" kde-plasma/xembed-sni-proxy
 	fi
 	optfeature "X11 applications support" dev-libs/wlc[xwayland] x11-base/xorg-server[wayland]
 
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index e3b274a8653b..e493a642f1b9 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -2,7 +2,9 @@ AUX uriparser-0.8.4-doc-install.patch 615 BLAKE2B 593418040cd88f9753918320d6ee45
 DIST uriparser-0.8.4.tar.bz2 358408 BLAKE2B 1f270442a4812fa3e86a495109f95cfac6980c8145a701990dbe6f6396743de9ce0dfbce7b9cff2b331e8c9038a2b6c5281d2e562596543b660c168d3e678187 SHA512 b6238c6495eaa9f7178269d66dbea05a39c51c27137d8ebf39cd02d1c3fa96aa0d1608f5ccb36bf7b454f3238830dd46d7de8299b608f185b2520fc2c955aa1a
 DIST uriparser-0.8.5.tar.bz2 359469 BLAKE2B 44fb7d8bd5dac8bb0dd68bfbc4fb2adec310a913a7ebb92850fb2b8833c159db7cb29fa4f8b5de3e3b3def018024d1e69a0814bcd12aa24b6a14deca6f6768fb SHA512 e9b0228092cf12b824975000b0a6dbe2e413d3642203666d77c5b42f04bc13e0ec3f61d6a2c44d9613bea15e8cf7ec42cc4c92c5bc4318ee3349c1b380409d5c
 DIST uriparser-0.8.6.tar.bz2 360214 BLAKE2B 18a0e02f5dc6efa840cd6647c4595f238f811e8131750959b31f5283c5632b8892fa38767f883110ff2fbcb9dd07afabcaef64b206b9a951a773bd9d4b1cd9e9 SHA512 b95e6d7c7f835002f6ea1a9c0962f4d385cd16519c40b921e9a9679140fd5d6cd326002b452fc73431aa2f36d049ae510c034a423eca143a6285f9b4b3dd7b83
+DIST uriparser-0.9.0.tar.bz2 371895 BLAKE2B 13479fe75d8dcc9514da6c26d9a60a68256b895f012d3b36e156353f1f37b2e572a3c8014f5cab30fe1d6da58ef840ea9878eabb48625a7449e46c7dbc13247c SHA512 8ad631726c59d244b945221e803dcb13daa6df6550b3de94da19745f4b4d53a5ce17dba54280273181479f2803dea4ca7b0154ac3b54ca39fc4eda2c8a03e3f7
 EBUILD uriparser-0.8.4-r1.ebuild 1065 BLAKE2B 1ae3176b5642f9fb5e037dd3eb06d8e1ac1f00027f7e5226e1063172148054efc4dd49b42b6f21f0ab5f21e44849e93957651457836e20649507aa26c8e0243a SHA512 1e4f875b4e8a88540ed16d0043d728485df7d92a20d4a89cd7fa1b00ea40f01587532e7e4ab1705bcb2bccc35f9345f945338f86030917daa71dbae8fe8d0ffc
 EBUILD uriparser-0.8.5.ebuild 980 BLAKE2B 145266c02bcac0f9129cd644b3950161ee68a04fceb41a8002bf7275ada1c3fb3d681dd214aa9b604a10c7a5cd1006945a2536e45728b88152d9fdd9fb7717b0 SHA512 0af97e47d0b3bccd0d9b2eada5e9145a239729818991aef769b26ff6ef6258ae919a8b6bf0d644d01f93a4a4b36735f0fe2b8ee5ce8aa83aa85f12dc17058f68
 EBUILD uriparser-0.8.6.ebuild 980 BLAKE2B 145266c02bcac0f9129cd644b3950161ee68a04fceb41a8002bf7275ada1c3fb3d681dd214aa9b604a10c7a5cd1006945a2536e45728b88152d9fdd9fb7717b0 SHA512 0af97e47d0b3bccd0d9b2eada5e9145a239729818991aef769b26ff6ef6258ae919a8b6bf0d644d01f93a4a4b36735f0fe2b8ee5ce8aa83aa85f12dc17058f68
+EBUILD uriparser-0.9.0.ebuild 951 BLAKE2B cea02d809f6651663191db84f6fd497f2d222355ebbbbc2dfcb1b5cb16a60d3df231887c077fdbd02d70c8d2907fa303715766d51eb3a550978a6211d9235053 SHA512 330943bfb6f3a962cdabd509a1ae8019249eff565d1e19dd5bd123c01809f518f60c4a2f648b77e7bbd526910019627e9e5736587cb79f344811dc9fccf7dc5e
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.9.0.ebuild b/dev-libs/uriparser/uriparser-0.9.0.ebuild
new file mode 100644
index 000000000000..8118165df673
--- /dev/null
+++ b/dev-libs/uriparser/uriparser-0.9.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
+HOMEPAGE="https://uriparser.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc qt5 test unicode"
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig
+	doc? ( >=app-doc/doxygen-1.5.8
+		qt5? ( dev-qt/qthelp:5 ) )
+	test? ( >=dev-cpp/gtest-1.8.1 )"
+
+REQUIRED_USE="test? ( unicode )"
+
+DOCS=( AUTHORS ChangeLog THANKS )
+
+src_configure() {
+	econf \
+		$(use_enable test) \
+		--enable-char \
+		$(use_enable unicode wchar_t) \
+		$(use_enable doc) \
+		--docdir=/usr/share/doc/${PF}/
+}
+
+src_install() {
+	default
+
+	if use doc && use qt5; then
+		dodoc doc/*.qch
+		docompress -x /usr/share/doc/${PF}/${P}.qch
+	fi
+}
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index f14d5ced2cf4..cea8b0dc9d12 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -3,7 +3,7 @@ DIST userspace-rcu-0.10.1.tar.bz2 503347 BLAKE2B 32e75d5d94b15fdcb28397aa64c871f
 DIST userspace-rcu-0.9.1.tar.bz2 468197 BLAKE2B ac2ae4ea788feef5463571e1a0d5dac35a5d6e298f628e0b0b2acea68d01e52a513cd5d1b58886d8b42d07455823fdfb91c1548caffb969cb9fe8c6b4d17adc7 SHA512 958234d72319decef07093c13b067e398c1b285ac714ab1dda89c2ad2ba0627d053e0cdabb07d480e399ebd60215445002876bd99f2829ca1e5582ada639f730
 DIST userspace-rcu-0.9.2.tar.bz2 468871 BLAKE2B f8a13b9683e8c32942a3d675ca94715de82b40b1a39be8161e1ea6009373f2ea6ae57b2e9ba4068544db2c9064457aaa8e83bad5e4af600bede248bf0780d11f SHA512 36264119d68569565a7b1222c4b0ca90128d121f032b388f27204ceaa9c964901f35be25584e1553b1a7613aad01d11766983ae245860df09444eb2f8ac913fc
 EBUILD userspace-rcu-0.10.0.ebuild 663 BLAKE2B 2d1ad36229c78b15bf3e9c738a383aa39c201329bf814e7e29d4726cd9828c6e9575e3af4ac02b5f54db3ba703a1f0aa46b90eb88028709299ed13bcb0285889 SHA512 2e945347710ff7f1459e33def817e4c4ce4e640bcb8f94726559534ce5f14aa45752bc6e169fdaeeefb491751743b30f744cd56dbc4a56fcaf1bff1c0227619d
-EBUILD userspace-rcu-0.10.1.ebuild 683 BLAKE2B 3860c7e252f07feec4a4416959caaa78d76bfaf4a855904ee2346fbee44856e63a486667c33a371efab35ef03ad8f4805e77ced0569c7b4cf976d82d2e562b65 SHA512 4dceb17136ada3b7c12ecd30ec62dcfb3787256f000ab8c18913e37d14acda98d7573c2290f17daa8e115f91e1e317bcb7a9a64705362262235dd9e120d5d06c
+EBUILD userspace-rcu-0.10.1.ebuild 678 BLAKE2B fc7ee479272cb89884a92fba11ef75ca3a07470ae20dcae7c95110e77406427857910f7ce13d8491987e3a0a1081778f84373f33a1c8931b4a8bc8ab9640eef7 SHA512 110d0a3634b4a92932899b4f589a5ea24f6e40d4318e72c1cd157ca5d1f45dcf9dde9033688e1129759ccafe73ccd2bbb95385c87722ffc45ca60d4446fa7941
 EBUILD userspace-rcu-0.9.1.ebuild 736 BLAKE2B 2254c2ca484cde4821753e7c2d8a2a5c8f71700d77068234f9215608104104f4eda13dd4d78e20222a5dec2295bd05b75dc9aaad733e8555e0bf57218079e330 SHA512 c6e0ddf946e8e07392545e52f2bad49d2da3637e800b77689112128374c6367d5efa6b9d44d6143b3f17a8d74cdcfb877f2922e6a112c0ee8bea834242af4818
 EBUILD userspace-rcu-0.9.2.ebuild 749 BLAKE2B b7782ed9c88695473c2bb23dd9025eca95aa54eec2109fb4f2574f39b985b86ac1c53f5728a0b224b628717556427ffcb78325cc07f6e2f079d2fe05da514827 SHA512 61c3e1d51f225d39c5e521016605c01a4cf6188344af5a71785dc71f0a6cf4c1108139e38f32a093898c76f547decc794c19dfe70367461445abbb5816b7a6ae
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
index e2b5412e6a97..239504b15fd8 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://lttng.org/files/urcu/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="static-libs regression-test test"
 
 DEPEND="test? ( sys-process/time )"
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-27 12:48:57 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-27 12:48:57 +0100
commit	70b82ae359a5538711e103b0e8dfb92654296644 (patch)
tree	8412b84ff9ce02a22be5251052b00feefe1d5b70 /dev-libs
parent	64e107b9b6058580ff0432107eb37cefb0b2a7d8 (diff)