gentoo resync : 19.11.2017

22 files changed, 190 insertions, 197 deletions

diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index 05e52a6829cd..baf17e0d1a8f 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -6,9 +6,6 @@ AUX jemalloc-3.0.0_fix_html_install.patch 333 SHA256 859aa0ca3e04afc0f17a9d4c74e
 AUX jemalloc-3.5.1-no-pprof.patch 822 SHA256 41858870b20554a2548482cff92a5daeac6a2f2ab940228f2a835e1fd12e642b SHA512 1560154337302c7a56d79af21822d27b5d5bfd64afa4af3753306ca0d0a307b5abb9b240be168c7591d858a9c4be15e8d6571fd52da2d6732c472755dffa545f WHIRLPOOL b4ed0dc44d70a97787767babc5f9e7ebd8d7b46ccb1d6174110236bd94c0da7b22d188555382ecfde7b95c7a2f1480b69279f9df21a0277a1cc0999b285c0ff0
 AUX jemalloc-3.5.1-strip-optimization.patch 886 SHA256 e92fe09b12766d8b3dddd9f26f6c581e43f4c71ba0ee2c1048752f2ef30e3443 SHA512 5835c534ccb04b47216d3678b08d663a09a93e60fb651e9c0b489fb747ca5f32060c89da3dc0f44b45964ffbffbd8da32b75a842198c180a79179266565b204a WHIRLPOOL 6e2a2caaf7c29d4fa9a797c6eabb5d930124cf96c8bd7ac36dc989d1b9488dbfb58e21ecfaf610ce559db9b001210c93f08b37196747fff8287fa17afc183f63
 AUX jemalloc-3.5.1_fix_html_install.patch 356 SHA256 e4b5f3d2cd085bc4584ef7cfbab05415be4d5b9953659e653c15975f1159fa1f SHA512 d5ad9e7c9b93f2b0311a43bdd963cea6f32f2e5a53a916ce52b89918d3d76e0306158239cf2a7b508f102607fa550374a9ec8463f2b3a064015cf7bb2ce852cd WHIRLPOOL a166c08abd0459f175fd366fd7c26cbdb2b026a6a72e4ff1b03a7de12317083a8cebca314826366807f19401c37e2be82eccc05bc3b688513c950fb8cff54c25
-AUX jemalloc-4.1-fix_stack_corruption.patch 2313 SHA256 8130ca02b70e89d84c9d278d3b81fc98b70803b7eb53d1915e749e1fcf2dedc2 SHA512 3c3f91c9906db1c562d6df5f43f4c24a2d842568875930a47f90a107bb6f71a2e6465c8ea9db07017a9268a39bcadf1c7c8f3317e1465a7be9ec41f53eadf909 WHIRLPOOL feedeac2118786b0247b9c55102eb8a13f6c0ccaaab852bbcdf900faaf9d61e3e6b1b3a3f7fa6e8ff3500010e683a1d084f75ebbfe0a4bb55a9d419f36129990
-AUX jemalloc-4.2-issue_399.patch 744 SHA256 9ac50a3e4e654fa61a9645aa8e1ab3c99962684a36a51da964c965780a8d7859 SHA512 a09fec3c779f25434d0824a892406aec7a1895515d33c36606a484a54bfc04aa35ef2610cf10bb0bf298eea3f89802e2e32dfbbb6c99bc50b8705523851c2468 WHIRLPOOL b6e355d49ad947101d3a88547eca52f78e44e2da18f715ee4abe71196b4e266b3164dd3f3c66c673be1630e3088a263fd151b438b4fe19db93693c4b3068cfb4
-AUX jemalloc-4.2-issue_443.patch 1595 SHA256 d98179f3f0d3544e5a2e51c311b97776fed0ef54fd43323152dfc7465bdd8248 SHA512 352086ddca04c321feab39212e6824a64a7f43bfbe3f9f4c34b2fc36b62dec1b84d2c6b6767e477be04b6e6c06a3083d01a15661b27fabab39b070a3f69ec159 WHIRLPOOL 1fc5f9136f1e6f7c825cb8af1386114b9b1f139b882899f663ca614e48b9c76149cfeac7a9841fd42bf6baeec1a421e019855b83cdc3017e46dfa31e69378f6e
 AUX jemalloc-4.5.0-fix_html_install.patch 581 SHA256 6847526a2bf7c47bda7ac78f01c3aa5518918100b218278f6a501e48d51eecf2 SHA512 ce210e9c9394a9ba5a16b5524322f1e477a140e55c076543a1f4dcfb1c8491f7839cb49fba433088773b24d2656b821c3072e729c0c7e41cb90dc131ad6828ff WHIRLPOOL ccc503257220d8926b8feef095b2ad0bdcd7dad1cf78df97d5d6f04ceb0d1e8b24ec952f2bb91eb14be98b1b0e1fac136be7e3a72f77be6b4bc1ab829a535599
 AUX jemalloc-4.5.0-strip-optimization.patch 880 SHA256 7e5a7b0ec1a1142495becbdbaba9fb9e23adc1f3a8cbd3cfbd948bad72a99faf SHA512 6c6dd0a99fe58ad0f6cb6306e14e2724dcd39d372e91c01540aebb31e8228b33d17ba0819e6a5c9cb7a3009eedb8f3a58319f0cde322cdf31c2c1cb47f98ff41 WHIRLPOOL 4a00120df62c7604b696794edd55207add7d5922cac84925e2ebb89d0fdc7413f7c893bd48b88c3c2a4fa9b7c919a4fae86b42f57d5ed9f9d71f373af6b61144
 AUX jemalloc-5.0.1-strip-optimization.patch 685 SHA256 c07f2b9aba9548f5895f024e38bdf7bda3343968c8f0e8c0db86b18814214628 SHA512 dd4452feea0004b3f61d664a63da0751179a4be8095e76d94938034045114a68b32e0fe9872cb4810c2f3fc927963ef1b1886d210dc558b3c5a3f5eb9ef4240e WHIRLPOOL f4918e20eb81cbc3ece5f23e33ed0e6c197826fbfcc45f0346e2a65add78f1988a3e6afdf33146bb683d6ff8a26f199b1ce9c89516706c8577822b225a07b404
diff --git a/dev-libs/jemalloc/files/jemalloc-4.1-fix_stack_corruption.patch b/dev-libs/jemalloc/files/jemalloc-4.1-fix_stack_corruption.patch
deleted file mode 100644
index f36c188616e8..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-4.1-fix_stack_corruption.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 33184bf69813087bf1885b0993685f9d03320c69 Mon Sep 17 00:00:00 2001
-From: Dmitri Smirnov <dmitrism@microsoft.com>
-Date: Mon, 29 Feb 2016 14:30:19 -0800
-Subject: [PATCH] Fix stack corruption and uninitialized var warning
-
-Stack corruption happens in x64 bit
-
-This resolves #347.
----
- src/arena.c      |  2 +-
- test/unit/hash.c | 13 +++++++------
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/src/arena.c b/src/arena.c
-index 99e20fd..965c0fe 100644
---- a/src/arena.c
-+++ b/src/arena.c
-@@ -2423,7 +2423,7 @@ arena_malloc_large(tsd_t *tsd, arena_t *arena, szind_t binind, bool zero)
- 	uintptr_t random_offset;
- 	arena_run_t *run;
- 	arena_chunk_map_misc_t *miscelm;
--	UNUSED bool idump;
-+	UNUSED bool idump JEMALLOC_CC_SILENCE_INIT(false);
- 
- 	/* Large allocation. */
- 	usize = index2size(binind);
-diff --git a/test/unit/hash.c b/test/unit/hash.c
-index f50ba81..010c9d7 100644
---- a/test/unit/hash.c
-+++ b/test/unit/hash.c
-@@ -64,14 +64,15 @@ static void
- hash_variant_verify_key(hash_variant_t variant, uint8_t *key)
- {
- 	const int hashbytes = hash_variant_bits(variant) / 8;
--	VARIABLE_ARRAY(uint8_t, hashes, hashbytes * 256);
-+	const int hashes_size = hashbytes * 256;
-+	VARIABLE_ARRAY(uint8_t, hashes, hashes_size);
- 	VARIABLE_ARRAY(uint8_t, final, hashbytes);
- 	unsigned i;
- 	uint32_t computed, expected;
- 
- 	memset(key, 0, KEY_SIZE);
--	memset(hashes, 0, sizeof(hashes));
--	memset(final, 0, sizeof(final));
-+	memset(hashes, 0, hashes_size);
-+	memset(final, 0, hashbytes);
- 
- 	/*
- 	 * Hash keys of the form {0}, {0,1}, {0,1,2}, ..., {0,1,...,255} as the
-@@ -102,17 +103,17 @@ hash_variant_verify_key(hash_variant_t variant, uint8_t *key)
- 	/* Hash the result array. */
- 	switch (variant) {
- 	case hash_variant_x86_32: {
--		uint32_t out = hash_x86_32(hashes, hashbytes*256, 0);
-+		uint32_t out = hash_x86_32(hashes, hashes_size, 0);
- 		memcpy(final, &out, sizeof(out));
- 		break;
- 	} case hash_variant_x86_128: {
- 		uint64_t out[2];
--		hash_x86_128(hashes, hashbytes*256, 0, out);
-+		hash_x86_128(hashes, hashes_size, 0, out);
- 		memcpy(final, out, sizeof(out));
- 		break;
- 	} case hash_variant_x64_128: {
- 		uint64_t out[2];
--		hash_x64_128(hashes, hashbytes*256, 0, out);
-+		hash_x64_128(hashes, hashes_size, 0, out);
- 		memcpy(final, out, sizeof(out));
- 		break;
- 	} default: not_reached();
diff --git a/dev-libs/jemalloc/files/jemalloc-4.2-issue_399.patch b/dev-libs/jemalloc/files/jemalloc-4.2-issue_399.patch
deleted file mode 100644
index da9f2d8ad771..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-4.2-issue_399.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c8c3e9e9b59b6e34a222816a05f0a01a68919b3 Mon Sep 17 00:00:00 2001
-From: Jason Evans <jasone@canonware.com>
-Date: Mon, 26 Sep 2016 15:55:40 -0700
-Subject: [PATCH] Close file descriptor after reading
- "/proc/sys/vm/overcommit_memory".
-
-This bug was introduced by c2f970c32b527660a33fa513a76d913c812dcf7c
-(Modify pages_map() to support mapping uncommitted virtual memory.).
-
-This resolves #399.
----
- src/pages.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/pages.c b/src/pages.c
-index 2a9b7e3..05b0d69 100644
---- a/src/pages.c
-+++ b/src/pages.c
-@@ -219,6 +219,7 @@ os_overcommits_proc(void)
- 		return (false); /* Error. */
- 
- 	nread = read(fd, &buf, sizeof(buf));
-+	close(fd);
- 	if (nread < 1)
- 		return (false); /* Error. */
- 	/*
diff --git a/dev-libs/jemalloc/files/jemalloc-4.2-issue_443.patch b/dev-libs/jemalloc/files/jemalloc-4.2-issue_443.patch
deleted file mode 100644
index d2b065a3b6e0..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-4.2-issue_443.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From c443b67561891ae68d688daf5f8ce37820cdba2b Mon Sep 17 00:00:00 2001
-From: Jason Evans <jasone@canonware.com>
-Date: Sat, 29 Oct 2016 22:41:04 -0700
-Subject: [PATCH] Use syscall(2) rather than {open,read,close}(2) during boot.
-
-Some applications wrap various system calls, and if they call the
-allocator in their wrappers, unexpected reentry can result.  This is not
-a general solution (many other syscalls are spread throughout the code),
-but this resolves a bootstrapping issue that is apparently common.
-
-This resolves #443.
----
- src/pages.c | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/src/pages.c b/src/pages.c
-index 05b0d69..84e2216 100644
---- a/src/pages.c
-+++ b/src/pages.c
-@@ -207,6 +207,11 @@ os_overcommits_sysctl(void)
- #endif
- 
- #ifdef JEMALLOC_PROC_SYS_VM_OVERCOMMIT_MEMORY
-+/*
-+ * Use syscall(2) rather than {open,read,close}(2) when possible to avoid
-+ * reentry during bootstrapping if another library has interposed system call
-+ * wrappers.
-+ */
- static bool
- os_overcommits_proc(void)
- {
-@@ -214,12 +219,26 @@ os_overcommits_proc(void)
- 	char buf[1];
- 	ssize_t nread;
- 
-+#ifdef SYS_open
-+	fd = (int)syscall(SYS_open, "/proc/sys/vm/overcommit_memory", O_RDONLY);
-+#else
- 	fd = open("/proc/sys/vm/overcommit_memory", O_RDONLY);
-+#endif
- 	if (fd == -1)
- 		return (false); /* Error. */
- 
-+#ifdef SYS_read
-+	nread = (ssize_t)syscall(SYS_read, fd, &buf, sizeof(buf));
-+#else
- 	nread = read(fd, &buf, sizeof(buf));
-+#endif
-+
-+#ifdef SYS_close
-+	syscall(SYS_close, fd);
-+#else
- 	close(fd);
-+#endif
-+
- 	if (nread < 1)
- 		return (false); /* Error. */
- 	/*
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index fbaed2b0a9ba..3983e2265744 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -6,6 +6,7 @@ DIST leatherman-1.3.0.tar.gz 434229 SHA256 282bc54ca28e8269a392bbda423b940177a59
 EBUILD leatherman-0.10.1.ebuild 1006 SHA256 18a04e95eafad79743e3be4b3fb9ed0426e075fa6f2ed74ba0365a312a40f703 SHA512 7e1ffa3ef5eeb5de86feee509d146b06739d077f654b437b7f7a05c4a9df6b8b5e4b31730917b1c49e17ff9ab6c820c97fc5d9abae6e39129ed5ea0082ee0e12 WHIRLPOOL 5708b1b2f150a39cae3bc4179a67e5f9ef2f466acef0e4ff1d9ad0f369605ab973c52eddf1ba5f0ec816e6f623ae8f12022291a398c5f93641cfaf6df3a21238
 EBUILD leatherman-1.2.1.ebuild 1094 SHA256 82b1f2a4829d6f76f7323694793aa5c53623bcc71cfd5f3839d450624a1edc87 SHA512 9919bb0911a0fb9c4dd2ed589e960f915d3ff91697561088fc166ca56fb9a17c3c10cc187b1d5180c378be39e607bb08551eb49607b336f22acf91e8a33f1800 WHIRLPOOL d1730f44669f1858ee4d7588d265ac76e2d920559a265bb31dc3c3dad832edf8c998a0615eb6b11348156db402cd88868f28680742935db02b55aab413a4407b
 EBUILD leatherman-1.2.2.ebuild 1098 SHA256 9fd272ed6ff09622f898f8b252551e424d7e93c939c75f84ef1aec214af1ab84 SHA512 5aced8fdeb84970c8997e786b6176344104fddae30adff7ba9c31e1c095da0a89a5a661dd017ed9bacf79fe5ac2b14db12f236fed034afff4e37edbb121a0dae WHIRLPOOL 8ee9238bae100558535a5fa9c1b5d82bfa7b6e2b30ba34d367107bc4d5f7875167396d5553725b3b5d6701bfd7b8b0f87c7cb983dca3048d61ab49986a0e9754
+EBUILD leatherman-1.3.0-r1.ebuild 1243 SHA256 2e45cea782f7f1629d7b67cc426b2051f39eb1a966ba751d41c6d6ac99d9a747 SHA512 cbc019964195df0b9f53039690774e01d0f79ea8b65b4ec77b37bf265a37a1510092338f794cb1832bf44b13b7cbfb83b50c39a1c2de19fbfceca0822589f1b0 WHIRLPOOL e3b2af763a9656b4ada84c68a75a24d2e06990ff6b58b50c813b32fbdac9966164cfeb94b899fd71703946c7fcf95f85b00a1722acc53404af4d63ee71c2cf3b
 EBUILD leatherman-1.3.0.ebuild 1096 SHA256 a67cb821ac816646e093711ef957295ca294fb36af4d3a77759c1f66e9dcec60 SHA512 276c0420542709ede287dca0cf16f37da81d6b02f7ed5f2a6b0b6c80e624b6f0fc5d1f41dec05f82d5f9f3f1e6c59996914698731febcf3b63871474aa85833e WHIRLPOOL 7c82a77adee32aa9037cb99ed378743e39ccbae515e5bd81beef49ac493fe2efa889eb2976ba9c3e648b7816d02514d942aae578e192d76af7bd1b3440c917e1
 MISC ChangeLog 5469 SHA256 db5463745ef232013745135c8365712246d2e48682e2449790ab9c3df74cdd7f SHA512 0afe283097801fee37f09caf8737a7efa075d8fed15baedacb741a28541235e1d7d55bafb1d248a0a32120e397869e6a55bf65b14a122f058af7154330b7a482 WHIRLPOOL 029ea00501cef5b9036d5ba9fd32682d4b7195d7cad677e344363072a9a1408d87d806aa4bbc7c3106b22945574284a740918108eb69c4ca51bc973e7575bb2a
 MISC metadata.xml 415 SHA256 361f617e92d34fcf27259db400353da423c9d585ec2bb2128ab58f5cc7fd3a86 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023 WHIRLPOOL 016361dd4c0590f34c5f838f7d7a3056e06c3bbc2c90cda029424dffcf203daa4bb39076c0889016cd796aa8b48130e25d49d9e813b959aa95727c0c391c340f
diff --git a/dev-libs/leatherman/leatherman-1.3.0-r1.ebuild b/dev-libs/leatherman/leatherman-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..a38cf2698c5a
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.3.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22"
+
+inherit cmake-utils multilib
+
+DESCRIPTION="A C++ toolkit"
+HOMEPAGE="https://github.com/puppetlabs/leatherman"
+SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="debug static-libs test"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="net-misc/curl"
+DEPEND=">=dev-libs/boost-1.54[nls]
+	net-misc/curl
+	>=sys-devel/gcc-4.8:*"
+
+PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
+
+src_prepare() {
+	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+	)
+	if ! use static-libs; then
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=ON
+		)
+	else
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=OFF
+		)
+	fi
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${WORKDIR}/${P}"_build/bin/leatherman_test
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index 06200e49ca5f..622882b88894 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,7 +1,7 @@
 DIST libburn-1.4.6.tar.gz 975088 SHA256 9d36faab25478c01122a65873133b7fc60eb5ffbe12710d5757a7c3574227071 SHA512 2bdbe832168ed430a66d8f733e9f28bf0c2fc8180673da383c4aa014448569614b9f0680d9f0ea5d61b2ed76bd8b9ecc38bd5a63788fc6b32ba0f4bdac2cee78 WHIRLPOOL 59e05928d2b5df73cac0514eef0f9d7fc133fa0d7256b0201daf702422b0d2b0a0e3c4ae0772faf681c5a17583d8d778501da048ea040deabdd49c19f5fd530b
 DIST libburn-1.4.8.tar.gz 977757 SHA256 3e81a2e359376c38d96239a9c9967be715f706d150d89c337de0fc85ecb79da6 SHA512 e02c08078313abb19108bb394741d4bde1c5098c1a200129940744e03078d8350b6ac951bf5523872a343b3f9b7a4954dda60a3336997f975abdee6dbae9b87c WHIRLPOOL ee7367b0bb4f182f55094db481182d4f9ab29debcc24a1ce5a985c9d99c64b5f2f7dcf1bfc0a3a147a493ec85cf06e6c375097b967c6f0d43a0906e66ef289b0
 EBUILD libburn-1.4.6.ebuild 975 SHA256 506f7dd46b7c54a9d16ec0717b9bd02633bab7017e292408480a32dbb7bdbc16 SHA512 1615f45043102505df42f4d92fdd4a2b3aa0b88e3e0f94b022ee4441051171680c8cb38f0a8d802d3ef5f72b352f008c5a81160fb2c0a458e12fa55dc9a2fc9b WHIRLPOOL 9d1497e8b8ae717cbecb07c819aa56a9d6a1e537370276666d7ca0b0935addeaa2b4b14be8c1cd4a44d37cbbd3216f27e77f2769004ff38b781b7e81413da722
-EBUILD libburn-1.4.8-r1.ebuild 885 SHA256 c9ad1b0e9e5f23baf55604231b15a473de1164f867070fc656b50dd3d5820082 SHA512 d916bd0cc95ccd44aafb4345ae8cb92dbf1df08ae907def3bb32c3a0d09d96d9b4e486e2a2a76dd454e914510c2293a2de080b660c8641f4abe335b349a9f6e4 WHIRLPOOL 2bce96057b6272d2cdbb4d2a6aa8def7435270b088220d5317430cc19de2fdbeaef1cd00755e241b74cbf420dcff1dbbf855db83590bf8dfee1f228621ab7d40
+EBUILD libburn-1.4.8-r1.ebuild 881 SHA256 a5510f80a1f6659cb41912dbfbbf7b3e44d3d95491604b2c00820486b8e9cd24 SHA512 8882ff554b5d7ca3d3fbceb406c71ce2a5f40a4bd0ceba005fa672b5bf7b494fc5ab7120732ab03607b5e7ae13275572f1cc0b0810805b90c3d8ba2fd4bdfd75 WHIRLPOOL 5fd7bd7751196951351d458a571f2e987dae6bdb8d8e087c67e5bf9186b2adfde9ba1346fe334038b2142b7208d986ef0898cf2ba55350482a86a381e08301c6
 MISC ChangeLog 4021 SHA256 7c825852c1423d43b34410b4553cc2cd5f5d92605f0554d83061f95d0cd39ce7 SHA512 835f6e3a60f682717177b36d70d25d951a7c1e8ceb92673df774db71650eb79d24da852b4a825d4ff058c6cbbd3d0034e533dded3596e61adcd9fbe0a9af1287 WHIRLPOOL 63b5bfa27a4256e5895d6fde4b375af0d7217ad6d418cf3ec80851546d438387c439f60d36f2cd430cfac3e165c4d4d4f367a169a0c2c70e6c46e5402bc5daa7
 MISC ChangeLog-2015 23627 SHA256 aaa370c118fd2cf665bfe90aa472d0ff632793be99d3f21695737b1abb039b66 SHA512 641cae02debe1764297dd000798d73654901e3df07129647d0dbed0b8760cf53aca780953a5c142ae2045f129ebd81bea9ac4a7b9a2a10032e4e39b460a09f25 WHIRLPOOL f7dca4680f36dacbb80c00fe619b5827b1e97b620c79cf1f16c0f5ec5734d044cb95d609766a16700f04d6fdab587ad0df95b944ad00cc480161dd4d3408fb32
 MISC metadata.xml 616 SHA256 b5c0bda0f52ade3fead4550a14550cc7eea3053bdb0323e57feb28c3aef0f4a9 SHA512 c46af3cbfbecbe5303a3a1c6f3c98e5c7a1dfc6aae2f6873360bd1704f58f1368592d9b5a4d8698059ef8954a7994fcd5902280d4a44cf390c7d5242fa112101 WHIRLPOOL bf2b25dfca2d58743a7275f18adfc0bcf98cd0a8cebd597a1f7775af4e1dbf3a549941752de6f7595bda05867c6f5aa82161a159f5bb21ea6a7651fcc3c0e0c9
diff --git a/dev-libs/libburn/libburn-1.4.8-r1.ebuild b/dev-libs/libburn/libburn-1.4.8-r1.ebuild
index c19cd09961c4..c2df9f93efbc 100644
--- a/dev-libs/libburn/libburn-1.4.8-r1.ebuild
+++ b/dev-libs/libburn/libburn-1.4.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc ~x86"
 IUSE="debug static-libs track-src-odirect"
 
 RDEPEND=""
diff --git a/dev-libs/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index b66242ee3443..78056222529e 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,7 +1,7 @@
 DIST libisoburn-1.4.6.tar.gz 1528141 SHA256 69efe9490e9ed6dbb1d8cad387ccaf5dcc5bb39dd466eef208a6b77a48584def SHA512 329d3234e8ae31abcab8d8a61a6531ab7ccdd8340148f84a6c77a23bbe16b303bf1dc95cafc751bf13f83e855f158b59ddd9e93c3dd1fe6046c1b5ea27eefb69 WHIRLPOOL 2b325541fe72e32acbd19c261a82b2c1475046467e33f5e1dd47d4aa64ed73f1a9f5d69281acd5978d65c046ff4c70dd7a4b6f3ef713f971e646cc5d12b7eb20
 DIST libisoburn-1.4.8.tar.gz 1537097 SHA256 91cf50473f0f19400629515974bda441545aaae29862dcbbdb28d87b821ca5a5 SHA512 26dd6f6884d98d9d3f54bf18b529a688d28aa0ff54b7fe6fe7926c7765755a1c7f7b2d0ef02ca6ea2bdac9ddf6f928c01c89a3547aea1e9f0b47346b160d0d46 WHIRLPOOL 88f2337bac0401f75a89e0ccfa5b259a87a282e7ce3594d02fc03da8765e3e164a77cdce38d959cbc31ad05798a7d0ad8887b601be0bfaf640adf39dd1378021
 EBUILD libisoburn-1.4.6.ebuild 1887 SHA256 3e41590da409c90f1df0d454bfd8151a90f7a36f2065fb11a4462989d007f3b6 SHA512 d1e70e25a18ca89b4cf5b767c2129a77e91a02a1eb0bc51078c3a80670c9be6dadaabbd2d579ebb18770c0194789e0e091b2baec4fb58d4ae849de34ee0b6a4c WHIRLPOOL 0e4421b683c43c58255e8cc0ea1a82699db526f9f191f76e188283ac8dbbaffcd6955c888a385e12054a9a4dfdde9d639c19898346425b13e5aabefdcf1700ab
-EBUILD libisoburn-1.4.8-r1.ebuild 1824 SHA256 5dcb0fbbce166cbcac531c46b252ca6eaeba8187a106f12b933d7d02dcc5a9e1 SHA512 e050796e639d261dd714c961c0696efbd5bb40fbc6c51223f6b734a30e2dab2f24f02f98af86a4ad80735eb54e22b88db5154e978dc4ab1630afed706cb9f13f WHIRLPOOL dd394121e4dbf645cd27e79a464b2ef47aa98ed3fe366b8cee09992dedb9e5bacccdbbca1710c69bf36cfa7e6eb64d3ac60913e9bc820e720d3954de13643ec3
+EBUILD libisoburn-1.4.8-r1.ebuild 1820 SHA256 7c2c310ac86f6840ef6e86708e101f9e4dfc7051875a47bfd0cbaabf69ab35bf SHA512 057c832385ae50cb449af6ac1ecf0d3d1cb743edf1956a805b16e191dd47f8f85238f086a27e48206ec6bf3a461211c8691a59e535b84a1a25477e9609d17a74 WHIRLPOOL c629743d322b7d35da4a31e6a6131e830b6e9c1b9da2d8bb0064d0a6a743a08daf25b9c6954203ac5f66a01cc94816eb48fde7cdbe36e77466e592b937596c9c
 MISC ChangeLog 4044 SHA256 b554a28c47696b5312dda0b6c674fd0b3c6cd1b43c3c8c17a7b981911f73abdc SHA512 7ab649672f1f1acd90a3bde27b85cea8362adb677cdf2150d1a371d9576f8e74163c83e89a5df22698fbf414891637309aaea20646af9d84bc7e622f6d8a0446 WHIRLPOOL b5134dfb9f0dffc3946660ba538571c9502576b373cdf3fd95366088977cfef63b4a0b3f2767ecf6df4e2bafd42fe49f5200d6099e82b98b264e5f9303db5f60
 MISC ChangeLog-2015 19756 SHA256 a88c2f337c4f13d65336b7819b54fd16b63a4931b20c259690b54f75d13ccd88 SHA512 56f49d9d6c4662fde951a886b061ce5c810160e8b9a332f7d6702e99c9e05bd67ce6f16c517da2b055a91beebcc21bb5394d30f91df43ccd0ff04af67e7b9026 WHIRLPOOL 46c977c1f9ba259870ef03c686caa96e084ef331b474b4867f87747b245443ef09991f6d112cc6a6692e8c5c9583e602caf2f77b725650a17a06689d5adc15a8
 MISC metadata.xml 907 SHA256 8c2fbd939f6fdd98d3a0e708dbfd7b270879559a91b09a80c256ed1b38004353 SHA512 a1ef1aaf1bb3f0250a3a73bd9420a24ad1f34ad0ff4fbf2a075284eed10430c8b3c989b932b5061439212001b76b483b7b5de7ed1e708e1c6fe14a0d80dd5166 WHIRLPOOL 5a55549344819908ada86fba9b5b0be90795dd0ee12aa49775aaecce08fd6d3e1034109abaac52a66de5387fe455e4bb4f55306afa14da48e53a434b9bc3b42d
diff --git a/dev-libs/libisoburn/libisoburn-1.4.8-r1.ebuild b/dev-libs/libisoburn/libisoburn-1.4.8-r1.ebuild
index b13a81842bd6..0e5857325b25 100644
--- a/dev-libs/libisoburn/libisoburn-1.4.8-r1.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.4.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc ~x86"
 IUSE="acl debug external-filters external-filters-setuid frontend-optional
 	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
 
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index 8688be49cb0d..e52731db5402 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,7 +1,7 @@
 DIST libisofs-1.4.6.tar.gz 826874 SHA256 14ab0b384e988d651092ca184d5f18dba83a9cfa05ff5e581770d6baa879a50a SHA512 7eed78a4194f96a019465e8f80bed0cd9f75a803eb11e31e60815b94712c7aa3ac218c6c6f39202a35cbe27b323f94f6d87502395975aa86805116cfbaf2b13e WHIRLPOOL 428ee41a7f611d45988ade4b60c2b2c6dc8b313521fffcd7e803c9f90d77fc6658147cfe98a24ac9f611173bcdf621f6a450c3073d8163920fd2d1a91e1b3707
 DIST libisofs-1.4.8.tar.gz 829979 SHA256 dc9de9df366c27cf03d31d860c83a08ddad9028fe192801ee344602ccec29b69 SHA512 0c6f505a951a1b7fce63bf63c715e5acb3158c15be2660627d2380771f025ec88bd67a4c2b8c86ef9dbb649a23cb26b826e875e7c87ff46c8bcd13d831fe8bcc WHIRLPOOL e9e6438446a462e8be31ca33aa87fbb7127b63e35213cd6144cabf5e84d980a8c5a27cceae69179b13c2db8a86bef74657c11de5e3b787669fadc336d38761d6
 EBUILD libisofs-1.4.6.ebuild 959 SHA256 9900f789bdcde9d63e980117b1777544cb8fe6e65cff2345a5a10484dc2d98b6 SHA512 f57e293c4f04ae2107b4967c0324dc92a80b430ef46b606c9f3188865ac3595b0b301727db29e3eaeda1b49ec9b0dc0a45c0ee62ac35335e76e43392e42f54ee WHIRLPOOL 88e875f663cf25e121b7cec5a274a8ec96ae32cd93ea37ef80eb120c1477fb012545b229cae030a96c5b8654fba8ac487013b44c846b19d19894e3b9ddbb6f61
-EBUILD libisofs-1.4.8.ebuild 951 SHA256 2b9371b8ab98cf08179c512ac0c17b0f2feae3be5fe7fcc1788f19c21c7aa873 SHA512 e38bd5be7786fc5eb6c5083af2de0436373acbf561d7a53cd2d5d2f72a589e58c08ed95d139d614ce156a1519433c26b04bfa2e140395df2656d3be6df158abd WHIRLPOOL 0a85c501837aa7fc75a923260a1ab233b6f6becbfbc6a251ecb579f787ed76cabe46a335468c0b9fc74b3cfb844ccbf7fed52db034d74a323c57cc0988eadade
+EBUILD libisofs-1.4.8.ebuild 947 SHA256 b40c199a0c3c6db790db4ab8108fabe9b4bd8919fe9bf7e27ca6bec910b51ab3 SHA512 1f917754efa7c12d24576a8d7aaf41f77709a3f09be736ab1492c057721e98684cabe3e7f84cfc2381a585b5d5f005eab554a1ac9fe4865697a71ecc71fa3b7a WHIRLPOOL 32cee64444965b7eb5797d7c847de0994e902f4dcfe985274aaaf230270368b2103b17907b38e38daddc03f3b2470f60c986fe7f9b50de22eb2bfbcc79061ebf
 MISC ChangeLog 4010 SHA256 20f1ba28c90262f94af3baa73c345946730f8f0c7d67467be073b8dc0ccfea36 SHA512 6926b3e9fa45d615394fc92edb20eee549cb3e12dda247160014410cc694543c8686777f814be5b7aa771577846877da3960522075b4a3fb894a9d4d5f8187b5 WHIRLPOOL 571ce8263212fc78811e88ddd1e72985176ff2b80287e230eeff245828d26d12c180efece83778c1eabc265167d28e16b4d487c9c36c38baf23e0f5f3d769e71
 MISC ChangeLog-2015 21864 SHA256 cb2e4d6bfb74a71334eb147acf792da59d39412d1f419c93a1fe943b6297a927 SHA512 e6c036d2473165e31a5543934ab4f7061b789610cd766790986a5016bafda0671b563e2b47d02395ad74af3bd8e920013b125e3c28c8c51f17d7dfc1b66d4e22 WHIRLPOOL d2a8b3bcfbe68d390a0f8e333a6094fe9d45d7bc5c5b8526f85646aa6bc1e01e274f3f2fa69c9de6a94883b2cd20f33ac4b9a07a4c3db4f5ea4baab85d8a7ab9
 MISC metadata.xml 320 SHA256 91dc28e02f3e5d149f526b34807e4a8f1a321370d4f09f0b91c673358c69836f SHA512 cce70181ca955dc89d0d02186bbc8fca4608e41ac59b00ad1e10dca94fb259797bf93d9bf942b38d00feaad274f85c0b79ab0f5e672dff405af799a4799871ce WHIRLPOOL 3226feeda3f1b96f8337e551e97bf9fe9394795233461fc6b1f49d3ae0bf7fbc47bd4bb5dcfcc301f665dd6c0ac2f180dd5c770dde8b5124722e65d53e3768b0
diff --git a/dev-libs/libisofs/libisofs-1.4.8.ebuild b/dev-libs/libisofs/libisofs-1.4.8.ebuild
index 9a2e0ba1f8b1..8127ed0ef98a 100644
--- a/dev-libs/libisofs/libisofs-1.4.8.ebuild
+++ b/dev-libs/libisofs/libisofs-1.4.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc ~x86"
 IUSE="acl debug static-libs verbose-debug xattr zlib"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 734308067a3d..08041964cccc 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,8 +1,10 @@
 DIST libixion-0.11.1.tar.xz 366660 SHA256 c9e9f52580d618fa969fc0293f55af21a9c74bfb802e655c6bf239202f95bede SHA512 e205a5cf532e0522291f5f2a52c2e2c0cdf8d2ed094e5553943650744359d67adf629229a6ffff3c8fa90b15dde7765fee14d4f147fe51a6cdf79b2855509858 WHIRLPOOL aff1350bd1e3a5fec3f0a0cd3f51a88c873bd28469884b48d3fc316782819465f7d193e019fc753474663326b27680c1d12ce3050e6a082a75073040147dfbd8
 DIST libixion-0.12.2.tar.xz 407280 SHA256 8b44008836bb4e1a3dff4d3e40afec6c73037e3518e72cc85b5cc675fbc2daae SHA512 0a85120a08c79c73a252a997c8b3df461fe1f8ce8b2334aee0e50bfd887a440a220b44922edd18fbd402b1c8ea8be629e6181493bc618eda198f35159813ddcd WHIRLPOOL 3090887ffaa1222a3f15e4d5b96932d50392684ffaa4ea1022f14aeac7fc43972ed84fe6986c58360621e4ab1ad2ca5aa31694fbf081e8014de38b9ade1a060b
+DIST libixion-0.13.0.tar.xz 413756 SHA256 5ae360c52ba2d17c4abf5ae21fa947f75925459e085acef5972395f77333c7e5 SHA512 15784e947164d106e677c59ece53b3cd401d4f9433cc5331a35d3be8332ae4f20a469ca73b30b253433c86da4afde886dfb4ac23e46ed46376a7349e0276c3a0 WHIRLPOOL 702b8bc869273e9ccab4605426573ca514ad4ca7e898bc6f43cb442b4c55b5c129eddd524dc8a412b2fcadcb7501e6f5d70bd40b5f86525aa4c8690fa44962f2
 EBUILD libixion-0.11.1.ebuild 1082 SHA256 f96eb3c66584ca1b37015d2e2054e660700c95504838c3fee4d5a28d04cb6810 SHA512 51a331b7b589eeb339f5b1824562e0ab878265116a4e42f2a41c4c102c5309e228a0e61a91071190445d7618d72404b7e78792dca476633bfa08164c4aa124f8 WHIRLPOOL 2f7ecf589fdfb462908aa434402331512377af868cec19401f6d6892ad4095f8dd7714967cc39738e1085b99add3c5cd262aba9b8502203279575609479f4abf
 EBUILD libixion-0.12.2.ebuild 1141 SHA256 18e27ad565900c4e5833d18c797acae02c922cadf262af4cc4a3abe9344230b9 SHA512 993232ee16cf3682214bf7b36f1af69354578c0e398ab2e269bb0f511e91ecd622da69ccbdf82187d0bec94bf01f9edad968abdbeedb15202433ab36d756b822 WHIRLPOOL 0d73358d54d31095c16bc7cd658f51db6a2eefe16438a86ae275db873dba82e441b14b5180893b28ce4c0c2ddc89f69cd3c926ddf04554fb6907e82886ecdc96
-EBUILD libixion-9999.ebuild 1142 SHA256 e2e5691aafca664a965303bd0b076325544768119518ce4820b102e4d81c4048 SHA512 89981130ad52c0026336c60bb994dd7fc396195d8ca2bb11a13ef70e953d962293572cfda4e08c4f55f8d540b242abdb2d1b04325e160662d2168d7fed42a75b WHIRLPOOL 5b701eebbae296b2239855c2353956a5bd537a1ef6aea7e9d42317bf21ba9ed9355db824d55fb708a5d0012355db773a5952d3dc779c54e8a54e71ebdeecdcf2
+EBUILD libixion-0.13.0.ebuild 1154 SHA256 e7606c124efec79837ee3b796687d76602d9fc31124df0639ebe57821fae157e SHA512 d37e823bdc2226c3e854ed5142c100f300743214ab1ecfc23213bda3dc923c0e26722be301d7e6fa5baeb06109bf376b1327bdc1b9f7c27d189d12c7e5bb3590 WHIRLPOOL de0fd6a5c719d0ced3e023fb9fc492f3f33dd83a7714837a02c918ff088d602d5ca8a7ca49fdbcdc1051133c8351a1bb15cecb58669719dc221a3e3830860b5c
+EBUILD libixion-9999.ebuild 1150 SHA256 22441d63b6a7660e30841b2de54baa3f380e44924bac6444a27e8fe1078c2815 SHA512 46d1e9174374413fa3a9bec611d202420efbfe3e1d6da0da3772775d6a486739cfcc0177c0bf76c13f3a8bc983584a81e3b32c83dd8db102aa67755470d989a5 WHIRLPOOL afeb7e4c820a5d032c147fa2e117f5b2d660619a6f0f154cdc6e7f4bfb06a27ead34bd5c9e868ef3496c998d1215b8b68379402787b2ccbba47156af9158538b
 MISC ChangeLog 5809 SHA256 03ccd6cc2343839ce8ac5a514a33d161b4c9dc94685fd48291d70ee64753f688 SHA512 c07be6cd3e33a8b827766624a2f7f54c34434e8275387f9e3201a8aacffb27b7a5d17f310294576f14b59610adcbc67d8b2d4ba6fcddd9435ff152ce1cdcb1b0 WHIRLPOOL 56601b5fb27fe59b4fa83c4eb7c1178467fa4523cc5437f31080bdc324d0a3eb35873b60a5e7f54ec34afc465a231c4fd4c3bd29e0adbbbd978c7dd0c455aa41
 MISC ChangeLog-2015 4223 SHA256 b56b391c74e89daa862c57bcf28c1526284ab49cb0546962af6e5bba5e224eb2 SHA512 df82b54f525ae3876550ca2a2224eb349aa3dd5162bb880c118233111287d261e1f9dfb907012667bd26e49e7e807a1e5782b84f32ebf92a38866f3e5b7f217a WHIRLPOOL 8373abae020a9b9b35ed22c9964fa715c051982e6d2db73061c693ed79e3e822991729f53943dcee4cc06268b53924b6719de877ab64716d0aebea34c480885a
 MISC metadata.xml 397 SHA256 3d370c714602ab47cc6cb3adc47917c501e43ce5ca5c0c762e4b01b8ade02504 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312 WHIRLPOOL 280137510a4bfa390459de46b8ded7ceae87a08947d32e117948cad8df37b1cb0a88e31b0f1812d33ce9436c599f5c1444beaf9dda9a88c86bc0d94a2c3bd756
diff --git a/dev-libs/libixion/libixion-0.13.0.ebuild b/dev-libs/libixion/libixion-0.13.0.ebuild
new file mode 100644
index 000000000000..1cf9c89f9768
--- /dev/null
+++ b/dev-libs/libixion/libixion-0.13.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
+inherit python-single-r1 ${GITECLASS}
+unset GITECLASS
+
+DESCRIPTION="General purpose formula parser & interpreter"
+HOMEPAGE="https://gitlab.com/ixion/ixion"
+[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/0.13" # based on SONAME of libixion.so
+# [[ ${PV} == 9999 ]] || \
+# KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="debug python static-libs +threads"
+
+RDEPEND="
+	dev-libs/boost:=
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/mdds-1.2.0:1=
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable python) \
+		$(use_enable static-libs static) \
+		$(use_enable threads)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index cd31a4887aae..7fed246e3057 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -13,12 +13,12 @@ unset GITECLASS
 
 DESCRIPTION="General purpose formula parser & interpreter"
 HOMEPAGE="https://gitlab.com/ixion/ixion"
-[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/ixion/src/${P}.tar.xz"
+[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/0.13" # based on SONAME of libixion.so
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="debug python static-libs +threads"
 
 RDEPEND="
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index b4ec6880bb49..005a278350ec 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,8 +1,10 @@
 DIST liborcus-0.11.2.tar.xz 1627540 SHA256 6911dc65a4d8276e42d32764e9ebee920b325cf59cfa7070fc72744d43b259ad SHA512 2100ae273e5c963123a5212d51793fe11a7fae9268a21629007034b92c3bf283522313a033de78a6a732b367c42a6eb4f6d3288d33124827fa0788f75abdd741 WHIRLPOOL caf9d7d977501620ad7eade470e7988159d93521c48d3b930bf212349d9ee03db971d68943dc9b0690429f3677d8d87b9a7f35e697b8307c9e2338043e4bb0f4
 DIST liborcus-0.12.1.tar.xz 1673880 SHA256 d1b936c66944d23e1b2582d0e7129e44670052510d03f19fef644e9814ae2b9c SHA512 294b24ad7fccae77070edd9d8e6e1a370f609ec8af9a2c58567431e641fc0f3f27c4cd4b6ac1825a8179a22a1d1a81d84827859eb631d2625194f9e59ca1a8c3 WHIRLPOOL f62dd79ccb94e2b054cec12147d6c10505a3d64309566703469eabf6da1aa71530c74901dc2ee66d21199999fc0661fac391d6abd5e7eefab186f9bbca729ea4
+DIST liborcus-0.13.1.tar.xz 1814552 SHA256 bce854ae699468305c08f97225d49d2013888f96d5f57baf535ea759ce04a9e6 SHA512 1c81332974cada2d3526e86ef564211100fb765b611a2239fe6aaabb8666e38a7c8cb52696e5d7c402794ea5b5ceb23b083f7adf2c4417d2e635007d9baa4420 WHIRLPOOL c1577d121f0bf73f74a3678b865c9c8541112dcb6858f3ad61d4a02ac120f364a38aa91bf161176fc82f0c1fcf40a66176eb5e1f22f67301dcba6cc36aee159a
 EBUILD liborcus-0.11.2.ebuild 1287 SHA256 94a433be102d84cc06cb73342111af2b1f401bee1638aea981bfa3fc6002c266 SHA512 3c61115ed7b9e9dd802c96c1acc05584c6c37c1f842b69a4d9138c7e53969ad87235600f110c0d4cab62eaa08a56dabb24a61ce9954f8ba12575fa09cd8d140e WHIRLPOOL b68dfec8a510641a259c058b018442aadef9cb09c48df3bdcdddd4ad968fb28406f65082ec9c475d15e97a494aed4c18ed5e89334bddd6502368c4c9bff573d4
 EBUILD liborcus-0.12.1.ebuild 1294 SHA256 4b94ffcebb275066397cdd7d6954ace06c07ac278f90d2e7ff63aa9db777303e SHA512 86b0e04d7223f2932e913013cff0e42c6c22d1540bbe873a90e59c4828f9a528c3942444a993983aad113e75d4f887160dcd8791a6167e0e750851a37e303df2 WHIRLPOOL 6170def4132a3ba62253e1ada6b128b3a2dcb7aa552c07d6d8e92b007f97499c6c911b455f6da202399a293fb668d00de680d3ec36bb3869a5c22ba67a48a300
-EBUILD liborcus-9999.ebuild 1291 SHA256 32dacc519387247210e311c476a21faea924efaca693111d2abdabd07d3fbd43 SHA512 e664589149d2dff609bdfd018f6cd5a5f6a1b876bc7522f9229d5de2929470de52405dfd6665e8143b36281efcb9d8d5cc0b9d29c7a841fbe587526dbde11564 WHIRLPOOL 22cb1376703fc457a4e46fe7c97c547fb695388d5a485fdeb62fa3b39a5986e57a17f5ec395502c2836dc332dfd3c661b2a3d33363ac6d724ebad6b098b1a566
+EBUILD liborcus-0.13.1.ebuild 1296 SHA256 927443e095549d5f5e370ce75bdd6b01b3175b1541eb046ecf6722004abd332c SHA512 31797d5cd7192a607d84ad19d7dff3abd1fec016818befcbd31c0fd410eb47fce8f61a0b55c082624aca5cf2733e5ef5033803b6c0efed86d211d7da3c8daed6 WHIRLPOOL eaf8434487dcc277bab743ef6ff293c710edcb320b22f2f7045a5a943e615a7e3aca1eaf3548a5a2bee81e3f3db809bf159091022740e1ddf73754c6b177c381
+EBUILD liborcus-9999.ebuild 1292 SHA256 06f824d201ab8ed060e5256cb3c2dfbdb8c5ed0d15510705042effc47c78daa4 SHA512 396b36969d8b5fe5eddd409f3f91391aa01492e003afcddd9c2b4d7f9a1970c84380122960068ff22dc138953fcd7726d2adf693656a4e5c55c2f20d9c7491ab WHIRLPOOL 8e102ef4f609b6fb09ed6502af003a1b9ea2fffacb025c793a0efdc6a4847576c2a8af842983af4b12370d395b0b6da9affac92b4b293a37cd9dd9a9b84212ba
 MISC ChangeLog 6503 SHA256 b61089395929b3751281d838ee96385d0620bb31a557aca7ed083ca4a5e29af2 SHA512 e3a10f6e5ca898680479deb100693f01c21cdbf9cdc1b667edbda272744842b79e0325885549ba17ddbaa0fdc40983b0264f750fd2f290ab30dc70197bfd0b1f WHIRLPOOL 7e52cdbfebb6b9b9d085de546ded3208100714daf50cab44e1642b6e3eceadf0b0e255d4fea92937bc4128402898e72148b2f6c1d86192f986a5a1d38bc0d36c
 MISC ChangeLog-2015 6422 SHA256 a8250a7558af9bb8d5e0deeeefdf5ec649c397cccc9a512a3aae443cafe3509d SHA512 2c8f93191c51c2212a27f6f39b860bd67f95e166d8d8bb794f5d514992b18704ea19c516320434a2305bbc51f504b0862eb47e4a97487a68afde5962cf99f4d4 WHIRLPOOL 24d6eb32345eef8bce2f2d65ae395dc4b8db4ba6fd4a2ed2b81f0801236be5073bc3c0145531ea725ac214cafacd103a757b21142dd9159a0692ccb0efd0811b
 MISC metadata.xml 556 SHA256 efbc0c256662c0fc9c25f1be42679f255ad97bd482a7fbbaacafd19a1c13db22 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2 WHIRLPOOL e51c22bf028089f795e251c9cde7295fe625c3993042bdf4e589597bf15cb7a462e550d261c4b67b7d492af388ea686cf2a614fe519bf4ef76f28c2e500c73c9
diff --git a/dev-libs/liborcus/liborcus-0.13.1.ebuild b/dev-libs/liborcus/liborcus-0.13.1.ebuild
new file mode 100644
index 000000000000..103168023cec
--- /dev/null
+++ b/dev-libs/liborcus/liborcus-0.13.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
+inherit python-single-r1 ${GITECLASS}
+unset GITECLASS
+
+DESCRIPTION="Standalone file import filter library for spreadsheet documents"
+HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
+[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/0.13" # based on SONAME of liborcus.so
+# [[ ${PV} == 9999 ]] || \
+# KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="python +spreadsheet-model static-libs tools"
+
+RDEPEND="
+	dev-libs/boost:=
+	sys-libs/zlib:=
+	python? ( ${PYTHON_DEPS} )
+	spreadsheet-model? ( >=dev-libs/libixion-0.13.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/mdds-1.2.2:1
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable python) \
+		$(use_enable spreadsheet-model) \
+		$(use_enable static-libs static) \
+		$(use_with tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index d823004fce38..e2c9f8f07405 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -13,7 +13,7 @@ unset GITECLASS
 
 DESCRIPTION="Standalone file import filter library for spreadsheet documents"
 HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
-[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/orcus/src/${P}.tar.xz"
+[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/0.13" # based on SONAME of liborcus.so
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 259d4939b6ed..12efcc7512a9 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,5 +1,4 @@
 AUX nspr-4.10.6-solaris.patch 973 SHA256 996942383de76958405f4817033eb1c848306c0724db33a8281cf95f5ef6bc84 SHA512 d4e4c44d02be7aafe09e633f2ee747c323036f7438cb87864d91bcd9bb8ac072065353aa4e8a785e38724d33bfdc8adb0e460dbf44ff7fbd8c8dd32b569074f1 WHIRLPOOL 339bfe192069f740ab20b6ad4792db9c8f1e353db7afc8f68c5f8accfca8112d5a4c96ab522331bbe14afddc850b593a8eaab8a109b4f09a0436463a30444419
-AUX nspr-4.15-configure_in.patch 737 SHA256 7cd7b85897e0d88a0f7b0e9591219d49099b192d7e46657929c0e81a20ec5376 SHA512 a17c50642aceb7a50ef1be378e1cee09f4932d1cb66398eb2f740dd608cd2da492e8dad406474208cd1b7b8144bbef13ef7553f14dc731131c0e60f005dcedf6 WHIRLPOOL 69bde4f337e2d025a524db0ee2eafabb9d2be069fe4895c80bdac4549559b434cd39f8f6ff853763c4bc1ae5a405f9803ca0903d63ec2fac138490d6a01e4eaf
 AUX nspr-4.7.0-prtime.patch 859 SHA256 b34d6232a463e2a3075eeb475cbcc0448c43ccaa33fce0771df0fcc28216e517 SHA512 d8421bc11de5ec5e116c7eba3f31fcdde27796a64948d16aa1fb1822a29a92d8810056719ca60bcb96b1734b0e84c95250075c18acbcb631786249af7d679492 WHIRLPOOL 6eb9d51dcbae16c629504a3b7224c693d6f375bc1c4035503614ae49ea329449c647a0a462e91bd94c94272bd93993fafb8e64af8f2400dff271aeb6be0afab5
 AUX nspr-4.7.1-solaris.patch 411 SHA256 c989f0a6521f604e808dac2aeaa36ebaed9174280a1a40de18c5442531782fe7 SHA512 11bd4ab3f98cbad2586f999370291d387fe7a817bab9feda9f5493f284410a73318e90072c0052a8216d9ae1cdc5b2a862a99315e09b72560d9bad6ebc16eb79 WHIRLPOOL 71f43a347208412291c47f8eacc195c301e271f14f237bd7e5645dfd59574051417e0a419d50eb6d1319687e6990a6c96c9f236277a3e455c9c3d98d2aaf93a3
 AUX nspr-4.8.4-darwin-install_name.patch 1046 SHA256 45466a4746bad849f794429a2f0d727a795362b9e45a5ec0b40e207b7973bb81 SHA512 dd00bc2108d6c7a64945afeaf97f31189250c90c3d63c86fa2b2b091ef812cc7c5f8c0f17211a02b497f50efc1c3668c840e21a45f514ff1103e22c659e820f2 WHIRLPOOL c196bffad698c9c1bcb307af7dd6fcc94c6e2ffd58cdc10f98558a680f9f06497e079e3dd8b329b1a4e224b45986a1886ec1d6b519cf1ced174e9489a7463258
diff --git a/dev-libs/nspr/files/nspr-4.15-configure_in.patch b/dev-libs/nspr/files/nspr-4.15-configure_in.patch
deleted file mode 100644
index a33717f41d6c..000000000000
--- a/dev-libs/nspr/files/nspr-4.15-configure_in.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9c751b2e857db1760d2fa82d9c20e7da518a5da7 Mon Sep 17 00:00:00 2001
-From: "Jory A. Pratt" <anarchy@gentoo.org>
-Date: Wed, 7 Jun 2017 12:14:46 -0500
-Subject: [PATCH] Close out darwin if statement, will breakage configure.in
- rename to configure.ac
-
-Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
----
- configure.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.in b/configure.in
-index 4b2e46d..dc14ee5 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1389,6 +1389,7 @@ case "$target" in
-     changequote([,])
-     if test "$HOST_DARWIN_MAJOR" -ge 15 ; then
-         AC_DEFINE(HAS_CONNECTX)
-+    fi
-     AS='$(CC) -x assembler-with-cpp'
-     CFLAGS="$CFLAGS -Wall -fno-common"
-     case "${target_cpu}" in
--- 
-2.13.1
-
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index aa53252529d8..bac1c7bc4cb9 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -21,7 +21,7 @@ EBUILD protobuf-2.5.0-r2.ebuild 3191 SHA256 71a4befc70b337d51ece6d8402e9ec1e413e
 EBUILD protobuf-2.6.1-r3.ebuild 4027 SHA256 43d05e709c003daeb8a7e1567c784bc2212ad81ce6c1589fd62a125b60602d7d SHA512 4b962beeb1ab36101de1d3a7452ae727b0d01fbcfea996c47d3ecd9d2cf8561420a7500f6a1a15c8fb9a00484dd1b566c26dee1649c5da7c03b9d68c0caa65b3 WHIRLPOOL 829bf1ea85ea1af000229a7c9d11ca9a0331d2df7a9f3f55e405965806018933e573f7520949943c263ccc5ffb1b790b9de5405cdde67b8ca13e8da0080399d0
 EBUILD protobuf-3.0.0_beta3_p1.ebuild 2975 SHA256 24370ff5f671f5f8a84d9cddd8be8575d61056f1ef33ca13af588e838452e15d SHA512 ddcf129fbc3d6fcc1979acc9db0efb263c0b258f7d8e44f83e72b1c66ba1d0a36fdd8c1f4958d39f19801ddd8838896378d36ad365caf44a3bc78d256e3f14eb WHIRLPOOL 54bf560cc79b51db06a127d78a9137837af2eeee1ea7ccfacaccac9267e40e00af7ad394002c869436baadfc1b85358332b0b9bff9c5775d7d4fafa7a1b040e9
 EBUILD protobuf-3.0.2.ebuild 3063 SHA256 83ce841eb68c588623226f89daefb3b64153f30cdd26749a1259d506c9bc6219 SHA512 7e4ef8c910e9b7e7a4db2cd5419426a96aeada8970284130771e2c48eaa2bfca47cdf0963e0422118ad0894d4f8bfcd8abd0af59da71fb4a137c863d88a8316f WHIRLPOOL f3eb1208e487b9a30c7a03a41f77c6e987c3dadb1287f45dde8e905578b899f89fe4714fc61bbf8ebc6647fd2ec48b77b18df0a156cc77f78df81d7e0fa301f9
-EBUILD protobuf-3.1.0.ebuild 3017 SHA256 854232f21b2de07868897542b8824c8b38de7a72d5fd5a060d039673c62e51db SHA512 bbaac553b6f478916400e8f7a3ae6592986244733ed894646a2bdb28bd1d2402e1b226365baa320345fd6a988415f0d7863a975026ee88a2e03b15550fae9444 WHIRLPOOL d5644bc22a1eb2533b95c714df13c1791133c4160f2e7a0c1fdabe626dc5b931989ae3eeef246c8c9846d8193167a47e16731dd22296a5ae8851325c91ba0505
+EBUILD protobuf-3.1.0.ebuild 3015 SHA256 0d98950bebd5d531ae422fef70df484362272b80f5f2d331dba616687cba5a07 SHA512 57e7c94fca54c7e44546ba00c899b73753606bb92b2af7f1386fe3713b7c3e0f37f870eb58de91ebe5ad8a9fb221be8e9dbbd6465fce65be1c6bff860b4d23cb WHIRLPOOL c2e3f3b3a42df6f748130501a7438413b35b1c0419a57a9f9da8985cc0aa76dd99f027658ece730cdbe828b21399771442a093c21bc9888fc1e7a101ad48358a
 EBUILD protobuf-3.3.0.ebuild 2923 SHA256 e0fe3c063f1267f6131c380e1c22760c314a2cad9e86f9cb29de410118540e18 SHA512 307008f8508679e1e54a86d4ca85547c24d5cddf4a5abbfd7835981a8194fd3d36e630eaa280847f727511211e2f9cbc532aeed8c9df6b934bd4f0b50ce341f1 WHIRLPOOL 49b7f9edc1a6a97ad3d666323f87eb585d9bf27ff1854046f867064f3f04f8ffd34ddb1f8de9f6419d58c4da1b9a5c7d5d19a28965bb4ffee8e91da7cf93829e
 EBUILD protobuf-3.4.1.ebuild 2523 SHA256 4ff46daba0e6dfa907a2b864d45dd52e5573e1d39f05a4eecf3ef890853a0e2b SHA512 61f7adaeb0b4c88aa3955ebeb4e703f007d1c98e04d6856becac21be0378af85dc18b60b3f8d36a5e7fb639f4a61f5c8f518c724544ce7bd2e5faed93c2e6980 WHIRLPOOL 097df1bf51d12430e3ecdae0d4a68466c41ca8c0404039be390a05ece372d641c611ef8fffe433f64fb6b8d010a387810d35d64e486a70587828f65d03e0936e
 MISC ChangeLog 5750 SHA256 aa2c6bcb54e89eded01c2f1fcc419617072e4dc5b3bbc18d3d96490b3d83ce2a SHA512 e200bc26b4dfd01d8f6cbb355b378932a3ceb6d85dd28662d8d5ab6ee4c92153fb49c1763a7b1a6cd2296f5c1e9dd8a32a01f8fec4e979807cb35b6b9bec38ed WHIRLPOOL 0a8e637ec68eae6404559f8d88e8143bc0268caa70cc95ac3c0813fc186182de3d15082872ca75ef39db5b1289946f4bafff148cd2766f3a06c9fe3e4454c24a
diff --git a/dev-libs/protobuf/protobuf-3.1.0.ebuild b/dev-libs/protobuf/protobuf-3.1.0.ebuild
index 3376393e0f7d..beec6b0e7174 100644
--- a/dev-libs/protobuf/protobuf-3.1.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0/11"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples java python static-libs test vim-syntax zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"