gentoo resync : 20.11.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-11-20 18:45:28 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-11-20 18:45:28 +0000
commit: 796cae72cf9ed18ba01256ac1f83a686a2a76036 (patch)
tree: 5ca737a2562d8c0a09fcfacd81d1f9004df37b00 /dev-libs
parent: 20d8e9cfb95a9f054d654ab6405e848807186aa0 (diff)
36 files changed, 294 insertions, 514 deletions
diff --git a/dev-libs/amdgpu-pro-opencl/Manifest b/dev-libs/amdgpu-pro-opencl/Manifest
index bc5f6449068f..7629f6724c7a 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -1,7 +1,9 @@
 DIST amdgpu-pro-17.10-429170.tar.xz 121382128 SHA256 cb1ea7f9756f197a976138d2c00f239ae4ee43b839fbb1ea57f8770957d4afd6 SHA512 2d9d0a97478564e259dc8494083df8dc13e3bc664384978aff369070b1105703653d8dc4dca38e94dc8bdf3ddfb5c6f4de39cec5a9b263423de8fb91fd0117c6 WHIRLPOOL 1e07579d2c9d5d8a796973658cbb6627418b133a630ca5e977f93da0d27b900da2078d2ea8b35a13071b0b05e3d5e7f47e17d61042dcca60709f6599c18380a2
 DIST amdgpu-pro-17.30-458935.tar.xz 393634984 SHA256 3652a5c9476a650a3e3cd89bcd7ac119ed7d16a570501eeeea6a902cbc6f9488 SHA512 3f517ce13e102edb820f8f9538e0894c794d767816f99774fbfec342adb6912712664f069db2542412baabb24ee198204f38757407c29aff238ed1772dc3caab WHIRLPOOL 29a5b06657767255ace0529467ca56a904a021254f7dab854b1fd3ac843108ac346d3c4e97e10ef53844152de116581bff7c3aa8f4f066a08becb88e59918da3
 DIST amdgpu-pro-17.30-465504.tar.xz 394216628 SHA256 b74494d142542164b5582e8bed845315f788aa3d9eb0c1ed5f2a6c5f982beaf5 SHA512 fa515d5397488ebd4271988f7b9b538190c4277a3c4dcaeb4b05f5cd5bdec657f13546de644b1a6825c88bd3b73e6c1a6aaa6b6c74e3cf942783b2df530cf4c7 WHIRLPOOL 3a1617cd8b8fd096614cf04b7e716b607ec718d122b286533d8dabc862c82b644ba864eb661b1d5e5da45c8fe674192d3f8038dbd85311d9ffc5c6f793f7d32b
-EBUILD amdgpu-pro-opencl-17.10.429170.ebuild 2212 SHA256 dd252f3ec7c46d309d5f649b657a20b31f1f50074bf32d6a643aa050a5fefdb1 SHA512 a8b6ed2b70ec0ed77fb65e23797a31303402f7072c22cd1ea6b63a76318e325e61875da76998d2fde7fd72494d9fcac48b4472610b8408e7584b301b97637a8b WHIRLPOOL 8a2c875ece21945796598f37b4656fe7738b8a2213467cb741e003bff837fb1b67d4e6a76675328d67b10fc15f45436988c8595867d68f39d779455d38584e4e
-EBUILD amdgpu-pro-opencl-17.30.458935-r1.ebuild 2356 SHA256 fad3c146dd00814913132a9ea6cc9e696faa8a0628c8a1ed2526302c5dd3115f SHA512 0c834c94be9975bf7c727243912bcc4bce46af8d734d4a8b65bdf769643769549883193e029bc7aec7d423588030423a3116c08a016352e10b203e39c550b13a WHIRLPOOL 715c5c6c7ec72e59ffec3ac8599705cd15576b3460d1a4f14197cb342105e5d35b95a62880d223cce431c569411215282c29f415056113488ccaf082aa876a08
-EBUILD amdgpu-pro-opencl-17.30.465504.ebuild 2356 SHA256 fad3c146dd00814913132a9ea6cc9e696faa8a0628c8a1ed2526302c5dd3115f SHA512 0c834c94be9975bf7c727243912bcc4bce46af8d734d4a8b65bdf769643769549883193e029bc7aec7d423588030423a3116c08a016352e10b203e39c550b13a WHIRLPOOL 715c5c6c7ec72e59ffec3ac8599705cd15576b3460d1a4f14197cb342105e5d35b95a62880d223cce431c569411215282c29f415056113488ccaf082aa876a08
+DIST amdgpu-pro-17.40-492261.tar.xz 361491288 SHA256 b0645157577c9ff175dc02487c4c682ded2624c8c2cfd6aa603960962e1d07b0 SHA512 b10d67f4fc7bfbf8f1de46e5202fabc3443e969759817d497449d911d4c591256cfdf73372013fdc67bd89c44ffe389c021c9f77ba27f55cbb5257af550bd148 WHIRLPOOL 61af42850786eb585442692437327e8a1baeb0dc905b6d84586f0a58e77e36e76c754334e5da3bbd25d813a73a9cd1303885a1267821a53bb6bb99b780108503
+EBUILD amdgpu-pro-opencl-17.10.429170.ebuild 2211 SHA256 9c2fc673691be44c476c64ade9686f479c86a52f9a23d69651a9eaf1b8735665 SHA512 7a9200bbb6c1c18910d7b5df032f0ec6abbd9e0727668cdc11c3f14ff85bc3244b955e1cf58fc63db7dc44ad672f4306327c1d716b66d6360bcddb796f25f789 WHIRLPOOL 309fd1f8cb2f11eff5c49b0ae51378b9462b5d823df6dd33ac3c242db2ade379ff3e5d886955d52575f4514028a6875e11c07d47bd0f2ecde9ca331ccba0474c
+EBUILD amdgpu-pro-opencl-17.30.458935-r1.ebuild 2355 SHA256 48aa6951ef8a33f04147e0fa83df0e0f036006967e6817e37b5b0f94f1ab439b SHA512 298c685f44f426443301d621b87d3dba3aa10b3e01e4f25ba84e17deffb1480730b093c218f45615a52ea72fbffcb3bc464d73d0cc7b872dc9e8452e9f2dfde1 WHIRLPOOL 342d58f0c5dd73d2ff7a2b12f6908169ff5f3904bcb71a2cb4db860d9e743dbc1461183add4af605a1718364fe7995c7c0011b1d8bcda0312fe864a5fb33959a
+EBUILD amdgpu-pro-opencl-17.30.465504.ebuild 2355 SHA256 48aa6951ef8a33f04147e0fa83df0e0f036006967e6817e37b5b0f94f1ab439b SHA512 298c685f44f426443301d621b87d3dba3aa10b3e01e4f25ba84e17deffb1480730b093c218f45615a52ea72fbffcb3bc464d73d0cc7b872dc9e8452e9f2dfde1 WHIRLPOOL 342d58f0c5dd73d2ff7a2b12f6908169ff5f3904bcb71a2cb4db860d9e743dbc1461183add4af605a1718364fe7995c7c0011b1d8bcda0312fe864a5fb33959a
+EBUILD amdgpu-pro-opencl-17.40.492261.ebuild 2355 SHA256 839467bf768a2489060a1b8e23e8bda80643b6017c1aba5a82c84e99917d2344 SHA512 f3d5cd29520939d1127efd8a30bf2922092fba1b085416b61f8cd0c950db490c2074407dfab317a2facb72a89c4b4cb0a898eef3bc904c84813016b6184da8be WHIRLPOOL 88f8f5c79a3a241511f55527dd977efc1894b04ffeae041e9f2617651cb2d358667382e818ccac519e5462d661b91b344db6052e510de90ed52b1c19acb4579e
 MISC metadata.xml 536 SHA256 470656217ffaa8fb735bea6b795f5206a727d783ec8ae671dc518af9b7e6c40c SHA512 912ff2f26e27d5c20219a26505f3a4545409773f1f761de4591cbd7086cd1ff241fca18d7ae5081ed12e04c1b5dc46deeb02b4a68e2a3787d1d20739a818325d WHIRLPOOL eab775a0a603cc6562a02a7cb79585d1dddfb837e67cecf82a6c325148b53cca7e4079e79f6d9a6e09486fb31a2f5a1fadbc92ee30a5b09313c5aa0871b1837a
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.10.429170.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.10.429170.ebuild
index 6d8da00df440..1b985ee16fa3 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.10.429170.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.10.429170.ebuild
@@ -50,7 +50,6 @@ src_prepare() {
 }
 
 src_install() {
-
 	into "/opt/${SUPER_PN}"
 	dolib opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
 
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.458935-r1.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.458935-r1.ebuild
index 971d4999df46..93c286d09744 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.458935-r1.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.458935-r1.ebuild
@@ -52,7 +52,6 @@ src_prepare() {
 }
 
 src_install() {
-
 	into "/opt/${SUPER_PN}"
 	dolib opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
 	insinto "/opt/${SUPER_PN}"
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.465504.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.465504.ebuild
index 971d4999df46..93c286d09744 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.465504.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.465504.ebuild
@@ -52,7 +52,6 @@ src_prepare() {
 }
 
 src_install() {
-
 	into "/opt/${SUPER_PN}"
 	dolib opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
 	insinto "/opt/${SUPER_PN}"
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.40.492261.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.40.492261.ebuild
new file mode 100644
index 000000000000..88731bbbc217
--- /dev/null
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.40.492261.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit unpacker versionator
+
+SUPER_PN='amdgpu-pro'
+MY_PV=$(replace_version_separator 2 '-')
+
+DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
+HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Driver-for-Linux-Release-Notes.aspx"
+SRC_URI="${SUPER_PN}-${MY_PV}.tar.xz"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="mirror fetch strip"
+
+DEPEND="dev-util/patchelf"
+RDEPEND="dev-libs/ocl-icd"
+
+QA_PREBUILT="/opt/${SUPER_PN}/lib*/*"
+
+S="${WORKDIR}/${SUPER_PN}-${MY_PV}"
+
+pkg_nofetch() {
+	local pkgver=$(get_version_component_range 1-2)
+	einfo "Please download the AMDGPU-Pro Driver ${pkgver} for Ubuntu from"
+	einfo "    ${HOMEPAGE}"
+	einfo "The archive should then be placed into ${DISTDIR}."
+}
+
+src_unpack() {
+	default
+
+	local ids_ver="1.0.0"
+	local libdrm_ver="2.4.82"
+	local patchlevel=$(get_version_component_range 3)
+	cd "${S}" || die
+	unpack_deb opencl-${SUPER_PN}-icd_${MY_PV}_amd64.deb
+	unpack_deb libdrm-${SUPER_PN}-amdgpu1_${libdrm_ver}-${patchlevel}_amd64.deb
+	unpack_deb ids-${SUPER_PN}_${ids_ver}-${patchlevel}_all.deb
+}
+
+src_prepare() {
+	default
+
+	cd "${S}/opt/${SUPER_PN}/lib/x86_64-linux-gnu" || die
+	patchelf --set-rpath '$ORIGIN' libamdocl64.so || die "Failed to fix library rpath"
+}
+
+src_install() {
+	into "/opt/${SUPER_PN}"
+	dolib opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
+	insinto "/opt/${SUPER_PN}"
+	doins -r opt/${SUPER_PN}/share
+
+	insinto /etc/OpenCL/vendors/
+	echo "/opt/${SUPER_PN}/$(get_libdir)/libamdocl64.so" > "${SUPER_PN}.icd" || die "Failed to generate ICD file"
+	doins "${SUPER_PN}.icd"
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		ewarn "Please note that using proprietary OpenCL libraries together with the"
+		ewarn "Open Source amdgpu stack is not officially supported by AMD. Do not ask them"
+		ewarn "for support in case of problems with this package."
+		ewarn ""
+		ewarn "Furthermore, if you have the whole AMDGPU-Pro stack installed this package"
+		ewarn "will almost certainly conflict with it. This might change once AMDGPU-Pro"
+		ewarn "has become officially supported by Gentoo."
+	fi
+
+	elog "AMD OpenCL driver relies on dev-libs/ocl-icd to work. To enable it, please run"
+	elog ""
+	elog "    eselect opencl set ocl-icd"
+	elog ""
+}
diff --git a/dev-libs/eventlog/Manifest b/dev-libs/eventlog/Manifest
index 3a67b25b25bc..83ac2905b3b5 100644
--- a/dev-libs/eventlog/Manifest
+++ b/dev-libs/eventlog/Manifest
@@ -2,4 +2,4 @@ DIST eventlog_0.2.12.tar.gz 303925 SHA256 494dac8e01dc5ce323df2ad554d94874938dab
 EBUILD eventlog-0.2.12.ebuild 676 SHA256 7bfe613d230c20a9987b3cc18d7967ff4f2ba8dbf7f7dbd20b2678e665023761 SHA512 d0085e0fcb8d2e682b9999608badc326a54ec6dc6ebd2e55f047cbe681f44d9f0aabe12407f752cd3b37bceccdb33432e6a3835ac1ccece63d8cae7bb6108446 WHIRLPOOL e96579008b016e1171c0381d94b2904ec8e64886c361886695211f67abce10fb5857603c27342394eb936bfe997b55862b0a4e73bd34ef7d9bb09634d6bb6a22
 MISC ChangeLog 2181 SHA256 30849e70ba0957cb258eeb0b1c3f666b6eaae7898a10b37dd62d8b5ac079644f SHA512 76bcf144935157d40625f7bc901483e69924c82324c6ab9f68f66fa678a82a063b8ba920a30872cf243e8d757861b874523f3764cad05313b55357754816ff3f WHIRLPOOL 027dad1973ec5bb0d7fbaf9d87209560a05b348f06cdef37af1be8bdb8c36ee4ce5e9476847e7218700406c37165ce66290f4e67ae29ace336df7d9abd7c5904
 MISC ChangeLog-2015 6123 SHA256 f790ed9ba58db48f64345f9b70e23d54544596d5fae9fb5de1bbe983fca10941 SHA512 5332d6944a75af21deef1468721cda74db92726a0c83556563377340bf2ebe17e4c2099bc61e0da93f77d6017afcae16d0945da351b2b71d078d7157c72d9b3e WHIRLPOOL f0f4e51c281172603375c10ef6265c4d781589ffbb136b8307e3e139f80eab9de40efa83f9a2ac06b6956304231043a962b2c59e25e5df017e03330c419fa7ce
-MISC metadata.xml 250 SHA256 330593b7301a7ca7544565eb8afc55f987da35d67b47277636e8a5df6d5db8cb SHA512 557d17c3ccb474a7fc5f8a3becba76a3e98a5b17ee00d1fa639713c12cfaed2e88800f726d289a2c4156f806c9b0e938e2256a3544c63fecc8484aa764d1ed79 WHIRLPOOL 394eeaa2e9f5d86ef1e498b1f775976c05c5748d7065addb3c384830e92ce812c5d2ede3141434ddc4d2fb3cebe7b14bf9be0cd0dc5259966e1256d66546206b
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/dev-libs/eventlog/metadata.xml b/dev-libs/eventlog/metadata.xml
index 507265b7974d..6f49eba8f496 100644
--- a/dev-libs/eventlog/metadata.xml
+++ b/dev-libs/eventlog/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>mr_bones_@gentoo.org</email>
-  <name>Michael Sterrett</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index 622882b88894..ca0b8fcedfcb 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 881 SHA256 a5510f80a1f6659cb41912dbfbbf7b3e44d3d95491604b2c00820486b8e9cd24 SHA512 8882ff554b5d7ca3d3fbceb406c71ce2a5f40a4bd0ceba005fa672b5bf7b494fc5ab7120732ab03607b5e7ae13275572f1cc0b0810805b90c3d8ba2fd4bdfd75 WHIRLPOOL 5fd7bd7751196951351d458a571f2e987dae6bdb8d8e087c67e5bf9186b2adfde9ba1346fe334038b2142b7208d986ef0898cf2ba55350482a86a381e08301c6
+EBUILD libburn-1.4.8-r1.ebuild 880 SHA256 9fe68a7f7a299cb15b1fedc36131f8f54f59d49a0ff76050758f5b683070954b SHA512 6f3db3016e8802d8a6677f16b942e9b89ec6de7f7708ed10d82c3f4f1c06add050c317662b883fce10b5eba574763e453aa7950894912e5f95d1024e97ad3315 WHIRLPOOL ae00d2a8808a56584614c24a88b672bfc136b7c0586609d9bbf12f87ab8d0a0356387e2fcdeb6818f7b8839a65a6b4388ce67fe839516bbb5a9c6bbebb2b73f4
 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 c2df9f93efbc..0c60f94380f5 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 78056222529e..9cfbbac967c4 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 1820 SHA256 7c2c310ac86f6840ef6e86708e101f9e4dfc7051875a47bfd0cbaabf69ab35bf SHA512 057c832385ae50cb449af6ac1ecf0d3d1cb743edf1956a805b16e191dd47f8f85238f086a27e48206ec6bf3a461211c8691a59e535b84a1a25477e9609d17a74 WHIRLPOOL c629743d322b7d35da4a31e6a6131e830b6e9c1b9da2d8bb0064d0a6a743a08daf25b9c6954203ac5f66a01cc94816eb48fde7cdbe36e77466e592b937596c9c
+EBUILD libisoburn-1.4.8-r1.ebuild 1819 SHA256 9481678b009f60c87b2a81bf8144dd92e0f3b6fdf60e0092aa1394c59ddd8661 SHA512 64c205ef6e05aeb93c15b9138b00e8c08f61622392ebc8d056e7db2f1234283e0d02b22e373918dd9310fdcabd375b82bf69fdbadfc449228d54b767567b8a9c WHIRLPOOL 1541e8ed21a75b096878b948d28c4902529ab25b3ed6dc5e754221903523d7b4e101f25f48e15dc170499ac373d9679caff4bb06fd52631b2ec457fe17c2f52d
 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 0e5857325b25..932de5fb8978 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 e52731db5402..da1e44e96baf 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 947 SHA256 b40c199a0c3c6db790db4ab8108fabe9b4bd8919fe9bf7e27ca6bec910b51ab3 SHA512 1f917754efa7c12d24576a8d7aaf41f77709a3f09be736ab1492c057721e98684cabe3e7f84cfc2381a585b5d5f005eab554a1ac9fe4865697a71ecc71fa3b7a WHIRLPOOL 32cee64444965b7eb5797d7c847de0994e902f4dcfe985274aaaf230270368b2103b17907b38e38daddc03f3b2470f60c986fe7f9b50de22eb2bfbcc79061ebf
+EBUILD libisofs-1.4.8.ebuild 946 SHA256 6bac75b9dbe2a482593d5113a964c2ca07974bfe7e8863966a8754a0c9f43201 SHA512 63cfc012dacdea9a900c1a81cb2646f905a3b5448f3322d0b427b6ecfb6635b37eb79277c8a0dc1c05409af60cd79886ef5ef7047d111c76e59f28a10a0675b2 WHIRLPOOL 0a133c599817dddeaeea6d7458ff913b317b6f4df4d938988e8da4ed132532e426dd4a1d0772692259b89deb7bb7fc9691a4911f880a1a21421dc2b933d69716
 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 8127ed0ef98a..7642feefd8fc 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 08041964cccc..3a5a6ad1dd42 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,7 +1,5 @@
-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-0.13.0.ebuild 1154 SHA256 e7606c124efec79837ee3b796687d76602d9fc31124df0639ebe57821fae157e SHA512 d37e823bdc2226c3e854ed5142c100f300743214ab1ecfc23213bda3dc923c0e26722be301d7e6fa5baeb06109bf376b1327bdc1b9f7c27d189d12c7e5bb3590 WHIRLPOOL de0fd6a5c719d0ced3e023fb9fc492f3f33dd83a7714837a02c918ff088d602d5ca8a7ca49fdbcdc1051133c8351a1bb15cecb58669719dc221a3e3830860b5c
 EBUILD libixion-9999.ebuild 1150 SHA256 22441d63b6a7660e30841b2de54baa3f380e44924bac6444a27e8fe1078c2815 SHA512 46d1e9174374413fa3a9bec611d202420efbfe3e1d6da0da3772775d6a486739cfcc0177c0bf76c13f3a8bc983584a81e3b32c83dd8db102aa67755470d989a5 WHIRLPOOL afeb7e4c820a5d032c147fa2e117f5b2d660619a6f0f154cdc6e7f4bfb06a27ead34bd5c9e868ef3496c998d1215b8b68379402787b2ccbba47156af9158538b
diff --git a/dev-libs/libixion/libixion-0.11.1.ebuild b/dev-libs/libixion/libixion-0.11.1.ebuild
deleted file mode 100644
index 7ad53ecd7a71..000000000000
--- a/dev-libs/libixion/libixion-0.11.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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 eutils python-single-r1 ${GITECLASS}
-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"
-
-LICENSE="MIT"
-SLOT="0/0.11" # based on SONAME of libixion.so
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="python static-libs"
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	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() {
-	eapply_user
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable python) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-}
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 005a278350ec..68d851853ca7 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,7 +1,5 @@
-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-0.13.1.ebuild 1296 SHA256 927443e095549d5f5e370ce75bdd6b01b3175b1541eb046ecf6722004abd332c SHA512 31797d5cd7192a607d84ad19d7dff3abd1fec016818befcbd31c0fd410eb47fce8f61a0b55c082624aca5cf2733e5ef5033803b6c0efed86d211d7da3c8daed6 WHIRLPOOL eaf8434487dcc277bab743ef6ff293c710edcb320b22f2f7045a5a943e615a7e3aca1eaf3548a5a2bee81e3f3db809bf159091022740e1ddf73754c6b177c381
 EBUILD liborcus-9999.ebuild 1292 SHA256 06f824d201ab8ed060e5256cb3c2dfbdb8c5ed0d15510705042effc47c78daa4 SHA512 396b36969d8b5fe5eddd409f3f91391aa01492e003afcddd9c2b4d7f9a1970c84380122960068ff22dc138953fcd7726d2adf693656a4e5c55c2f20d9c7491ab WHIRLPOOL 8e102ef4f609b6fb09ed6502af003a1b9ea2fffacb025c793a0efdc6a4847576c2a8af842983af4b12370d395b0b6da9affac92b4b293a37cd9dd9a9b84212ba
diff --git a/dev-libs/liborcus/liborcus-0.11.2.ebuild b/dev-libs/liborcus/liborcus-0.11.2.ebuild
deleted file mode 100644
index a2878fa17014..000000000000
--- a/dev-libs/liborcus/liborcus-0.11.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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="http://kohei.us/files/orcus/src/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/0.11" # 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.11*:= )
-"
-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 \
-		--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/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 724de9209c46..4f229c48ccdc 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -6,7 +6,7 @@ AUX libpcre-8.41-sljit_mips-label-statement-fix.patch 584 SHA256 d91c7b3f71e1e09
 DIST pcre-8.40.tar.bz2 1560119 SHA256 00e27a29ead4267e3de8111fcaa59b132d0533cdfdbdddf4b0604279acbcf4f4 SHA512 b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2 WHIRLPOOL 6711688972b3db4b98902d548b84e8b03b61c3a12d24a4e42fc49ddc5e2b4be51f98f91873166e550866e88b6cd55092ea27704a3b7e71d58a2af21148ad3340
 DIST pcre-8.41.tar.bz2 1561874 SHA256 e62c7eac5ae7c0e7286db61ff82912e1c0b7a0c13706616e94a7dd729321b530 SHA512 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551 WHIRLPOOL 24d891c4f6580af20aa07a166038a2bacb52cdb305987f8b91b2fecae65e7b5277d3ef0b26ddbb3a33fd34794e6340e77df6a321e770b3aca4393d1ed144cf64
 EBUILD libpcre-8.40-r1.ebuild 2849 SHA256 71b6ae4b11f222072bf9776f4e701cd17e7819b82ce58d62c65a6380fa87f364 SHA512 b6969ee98be6c15c5e698a03c78956159f147a08fa9646711e75122ebae03df3e154d8a394a033a70ac2d5658b02b67626396433993639491b8753cc03fdd02f WHIRLPOOL 99012339d40a2857e83602e58b7b23f89d9385537df57a84b9ff38492ea443d48445d1151c9a442debee19e3fcfda14ae66ac11c50c702640ef18afc05dc8252
-EBUILD libpcre-8.41-r1.ebuild 2908 SHA256 d80ff90351e20c4d18c588f8c9a86c32bc5a03f21e0ede9e357045c843dc3c96 SHA512 9d91c32b0cce6658c86ad58e80aa49245276cf6b7f05bd10e13be774ed72e0c50be3e22f9ec217941df053afe140e005fa5d9832293fe32eae518103837a56fb WHIRLPOOL f33525ba66c2ee596b3c862ebdb7b6b1847feb68d7ede7497fb10e94512d122515f0429cc00399db2d431f14546b69d79fd489d581d1569865c51e3a4b588fee
+EBUILD libpcre-8.41-r1.ebuild 2907 SHA256 98e0e2f77ab7ce9cc20d9fa2775b14dd58f96cc6f4e5525737ffd438c518b9a6 SHA512 bec108915777d4cc8326334bae9224c53fda4f5e72dad05d0643ab65af4545e59cfb94a4b5336351133c7a581858015151c526868b219bb2cc3ab9fabdf87e3f WHIRLPOOL ae6a9e14090820c736278d9c6b062f28a09bd10cda35597e3a1ec8cc5391f45a70c3029056f2b1cf2c1716761f3aef79c60f73288e4f9e60f573deb9fd8afe22
 EBUILD libpcre-8.41.ebuild 2845 SHA256 5f2b52ec408b03e9a548ab2b58a9fa31429c5e40dd75ee39238b5a01df7f202d SHA512 7b12d7fa5da2b152a3ba581cebe3d2f5535f3bd810887b17acff16271441d0d5350853fb0e8f3b407019c7d2e0910dab01b7b9dab0f16426a909b73f6f6b49cf WHIRLPOOL b68769e948d00c3d7b78026c03987476089cea3f77cd85b887ff5b1d4e9a7d4483bd1a06d189fa73f1f9b85761136698711646fff590da7765fa96bac779570b
 MISC ChangeLog 9358 SHA256 6d71cdef5ca28f5d0c3af958daa73122d374a64088bf960961f9eec235572595 SHA512 ad1c6ff26e6198bda9f8c5d31d03a5337b0bd7c620f564b31b98117982d12677426ec4d703325028c44ea371dc15c3b2530d0c91ccd9e8b40b5710761a2e7ef0 WHIRLPOOL c8f1726ad29d83ee380eeeaae0a385a7de8db1e99751357bbf59dcf0af751e4f6ddb8f88d836dda0d0d6e132ef4db126fa3e64610491ceadce550b3017b2ee5d
 MISC ChangeLog-2015 35335 SHA256 dfdfc43bcff86898d74db532baf46e6d88c70a3e62e82ceab69c285934f802b5 SHA512 94411b185f75967d240777124272d04b13f3cb3e43de6f751baa9944e07086f9fa2972e4854514fb39f85d69422a07fd1ee1cc7fc587dacf54b777bdf68439ea WHIRLPOOL ec71b8c06e85b5ec0a4040def4447e6aa2589bbaf9bd4b5d7479a2b968357a2b5c4a30e7c2739bd1b4607e074cdc9d15e0f730ed1a69cb936d514056d53578e0
diff --git a/dev-libs/libpcre/libpcre-8.41-r1.ebuild b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
index e6f6f9e0aae7..148a915675aa 100644
--- a/dev-libs/libpcre/libpcre-8.41-r1.ebuild
+++ b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/nanomsg/Manifest b/dev-libs/nanomsg/Manifest
index 41aa26813986..2eff2463ac7c 100644
--- a/dev-libs/nanomsg/Manifest
+++ b/dev-libs/nanomsg/Manifest
@@ -1,11 +1,9 @@
-DIST nanomsg-0.8-beta.tar.gz 589221 SHA256 75ce0c68a50cc68070d899035d5bb1e2bd75a5e01cbdd86ba8af62a84df3a947 SHA512 457e99e2b2568370bf052a20e2abb38faad9afa9019d38aa35df6cf49d1d3f50e3a0b26a64089e823b7d907041e8069c99a06706678b070a26e0cbe2e26588d2 WHIRLPOOL a0c00848b8ca2178588047aaaedb9e3b10a993e5ae5d2c0da6716b861003deaf1ce3891850919db73202de8d1aa36e21c1f440600ce2be852189988fae4994fd
-DIST nanomsg-0.9-beta.tar.gz 310601 SHA256 4c15248baa594523fc34368166cdb42e766e50c58b41a73f925879f6d87ba601 SHA512 3a7141dda6152e5192faaa9354116a9dc43636dbc03ebff0598796210c310756d3841cf7bb6857be46722d8952894f5bebe192ec538511825f72e700ac4e03cb WHIRLPOOL c2150f1a71b8e35e2258a4f3b264e4356553312f07ef079d2bfd5279cf52df4ffa3a7bb4738f85d86945ab17ee04a7f1d2c17d8011bb6ae396be2b689282e8d0
 DIST nanomsg-1.0.0.tar.gz 305040 SHA256 24afdeb71b2e362e8a003a7ecc906e1b84fd9f56ce15ec567481d1bb33132cc7 SHA512 06fc4eadac29439024bd24230c73f43ddc46e6b6848ad75952b67bf301066be5752a844173597c1b42e55c1ebb66a2d2cb7693e4cbfc07584b4398597cbc9200 WHIRLPOOL 97ac9ff5170ee649c7803f7ea22713889506ce54a1fb0a55c5d2ac82a1359e8367189d9e3d8d8ecb85193ec8770c78365aa7a9daeefe5705fc3049c27558a52d
 DIST nanomsg-1.1.0.tar.gz 308801 SHA256 e81b79e073f5388a5070623136c7896244f8bbc24fd5f5255da8d5aa2e2a50e3 SHA512 2d7d4b36e5c50cb7590e7dec0c271a021f05478cadeced6b5c9e27b76c3c5b59a11318c70b51e10efed6be2681dea7881a2f883f576fa5343c2aecfa18cbee50 WHIRLPOOL e56ed012b6f6f1aa9951f4ba190158c911586e09ec4933c39de2392a8e280090503656891af625dc4b09562eae3b71b84322bc8fe18460496f8fce7c71e4316b
-EBUILD nanomsg-0.8.ebuild 965 SHA256 cf8cbaefbb8680bf6908613f92cc1562d1088427470cf20236db17e545b6086c SHA512 ef10e05e8c4ab7119f7561bc59c61c716bcfc15c2d5e25c2bb005f4347d408e36063873963ec5f4584fa7d248011524d719e4d88ea83b6ab5b0455d817afbeda WHIRLPOOL 76961b8819de116dff9cbede521c232377bcf70c1b4b03036e4ddd4ce60cec351773cca85627c481dffcd60bc4b0a2d77be394a243344506e550f3fffbffdad2
-EBUILD nanomsg-0.9.ebuild 814 SHA256 4dd4017930ef51cb96eecb9f523da8ca76385b6254c33e183f67d738b30ab589 SHA512 71edb0ea498be768e753478986429e67b47c13333444d27bdb7c974970590b6ebf27ed6dcc1172916e7fb97216f181df562d384f15f8e3af717abc1eea2208ae WHIRLPOOL afabc00bfd0ce38748d88083fda7288ac52aa3da3c71b93a5ababa2ac2eea97cd82291c9e33c6b281e64ac62c24e54083b2a80308791b59fe7b62222e8759f57
+DIST nanomsg-1.1.2.tar.gz 308420 SHA256 3c52165a735c2fb597d2306593ae4b17900688b90113d4115ad8480288f28ccb SHA512 f95ce24b34c25d139cf3de46585f6354e0311a9d5e7135ad71df62b8bb5df26f81a58b9773c39c320df2d0e97cd2905a8576f9f00b0a4d33774f1b610271cee5 WHIRLPOOL b9aceaae3eb6dcebadc88a15c8be2d938f5e5f29e7916e542d1e473d9ece0eb793a56fc1019b900da626d1e2d715fc9c047322f6fe93090d32f0c325e98d41ad
 EBUILD nanomsg-1.0.0.ebuild 790 SHA256 1203fa290eb7e07704a99232a3f610dba85d6f2a205074223399bf2a2906f257 SHA512 0865e73cb6042f5fc57b2bfe456b9608536bb5869fd63ac5c534ea11c99cfaa854bf1ebc3d0167eacfb4b8b71e24f0cfb7c3546d4c61cc3b90d4629750cf06d6 WHIRLPOOL 0e5904f3699a1f5e63e2a2a41cda37d5eca11551ddae85ef69fa1c472a990544b849c13ab7779ceba74f8190527dda58d2a167bba7f8d103244ffb779310a2d7
 EBUILD nanomsg-1.1.0.ebuild 790 SHA256 1203fa290eb7e07704a99232a3f610dba85d6f2a205074223399bf2a2906f257 SHA512 0865e73cb6042f5fc57b2bfe456b9608536bb5869fd63ac5c534ea11c99cfaa854bf1ebc3d0167eacfb4b8b71e24f0cfb7c3546d4c61cc3b90d4629750cf06d6 WHIRLPOOL 0e5904f3699a1f5e63e2a2a41cda37d5eca11551ddae85ef69fa1c472a990544b849c13ab7779ceba74f8190527dda58d2a167bba7f8d103244ffb779310a2d7
+EBUILD nanomsg-1.1.2.ebuild 795 SHA256 cd9087bd48881d5f15c49cbd36c422a5c177e9cac17176261ebd6f4875fc35a6 SHA512 949a245704d727e607ff5919aef5bffa801b899d22c83c117cc2b26a2595ebbd78ad73c969df14739a2f436704a684fbfeedc9b9da5b03648bd9f74645eb1923 WHIRLPOOL d91a2dac016a5ce76363c1a9bb538e05d1222389fd3d6a80fbdd888b32e372485dfa556bb46e01e792d1c4860d7a37decfda11013be81656a36c60609589587a
 MISC ChangeLog 3290 SHA256 4c00b87d4b01b9f7c374904ac56cf971be6537d1c3dbe23f8ee0c7ca979cf45a SHA512 9ed656df71e833cdcf4f49d2203e6755edf74977ccdc3c34f5ae7807e8b528dc39362a7a423012843e2fc999203f630c89ed1089b82808f36202233e4c0a6e9e WHIRLPOOL 943524c799b2fa0f7db27bccdd3c01e41bf005dd05b11316472459fd9b917c1de00dc054ee79a9bda4b754bf7f7a6754203dff954b89ef21c47cad891582cc68
 MISC ChangeLog-2015 2189 SHA256 b4772ba5000ab7e3c3a936c8ab39f7e068b74b9ced84d5aa1f555bd17c86db55 SHA512 66f2bed36276fd25cb6846e64a884f3bd96ec6253e60e3a2749f05ba3e4f3e9d3ae47c546e405e288ee22d3faed24a314b71dd29f0e4d6a2312dc8b1f7c486a4 WHIRLPOOL 6cc3f2e670d53dd86df57c33d8cfdcf9e180c27ff392ae4b7e410ce7d994f9eddcac30b81fc4f834a0aad195a32418ec87770ba131f284ae77e7c6a8df6bdc59
 MISC metadata.xml 433 SHA256 699f2e4da7f454f8ba0cd3e296ef58afc2c535cbcc004518c953f0c0b96f4888 SHA512 3fd07647af6e9d7c4b3996674b0376a22ec9727a86b9e1af89a3a9695d547f36a745b9c448aa1cc57c37f094965ca64524f1ba465b6cf1938f731b0d0caa9d6d WHIRLPOOL 01b4d60493bfa6fe489970e2b748fae7e848c88490cab4f801d5b8103c2c4aeb918a36d5cdace3ebb0d13211c3a0e84c73f092a0271f22782494db72c7164221
diff --git a/dev-libs/nanomsg/nanomsg-0.8.ebuild b/dev-libs/nanomsg/nanomsg-0.8.ebuild
deleted file mode 100644
index a1284b8b5871..000000000000
--- a/dev-libs/nanomsg/nanomsg-0.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-multilib
-
-DESCRIPTION="High-performance messaging interface for distributed applications"
-HOMEPAGE="http://nanomsg.org/"
-SRC_URI="https://github.com/nanomsg/nanomsg/releases/download/${PV}-beta/${P}-beta.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/0.2.2"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~x86"
-IUSE="doc static-libs"
-
-DEPEND="doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)"
-RDEPEND=""
-
-S="${WORKDIR}/${P}-beta"
-
-src_prepare() {
-	sed -i -e 's/doc_DATA/html_DATA/' Makefile.am || die
-
-	autotools-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--htmldir "/usr/share/doc/${PF}/html"
-	)
-	if multilib_is_native_abi; then
-		myeconfargs+=(
-			$(use_enable doc)
-		)
-	else
-		myeconfargs+=(
-			--disable-doc
-			--disable-nanocat
-			--disable-symlinks
-		)
-	fi
-	autotools-utils_src_configure
-}
diff --git a/dev-libs/nanomsg/nanomsg-0.9.ebuild b/dev-libs/nanomsg/nanomsg-1.1.2.ebuild
index dbda891fb38d..d76c8310c051 100644
--- a/dev-libs/nanomsg/nanomsg-0.9.ebuild
+++ b/dev-libs/nanomsg/nanomsg-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,18 +7,16 @@ inherit cmake-multilib
 
 DESCRIPTION="High-performance messaging interface for distributed applications"
 HOMEPAGE="http://nanomsg.org/"
-SRC_URI="https://github.com/nanomsg/nanomsg/archive/${PV}-beta.tar.gz -> ${P}-beta.tar.gz"
+SRC_URI="https://github.com/nanomsg/nanomsg/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/5.0.0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( dev-ruby/asciidoctor )"
 RDEPEND=""
 
-S="${WORKDIR}/${P}-beta"
-
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DNN_STATIC_LIB=$(usex static-libs ON OFF)
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index cc6b609aa313..10222c679ada 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -32,10 +32,10 @@ EBUILD openssl-0.9.8z_p8.ebuild 4997 SHA256 68825bbb48e4862340690badf5f4fdffb671
 EBUILD openssl-1.0.2k.ebuild 8334 SHA256 81be072ce297e7426353f5fc5e1021b464aab6c08317ab0798b3f2f3511e25b9 SHA512 69041d575f7542984cdbc9ef32aa04af49610e1e5752ce77e2566b63d0c60d0cfde6aab808d9c32390ca986911de3b67de057d09c1e036204bf119136e386efb WHIRLPOOL 8b5445b07d05613e3003348c5518d1fdd5fdce4415739b0cfbd3589f5a2801747dcbd5bad2c034cc28b6f8bb73916aeeec4d3d3c591462d024147f494180f2b5
 EBUILD openssl-1.0.2l-r1.ebuild 9930 SHA256 78d0509140e5187d636f21320a6bf125d4a1a03d797bf545c7741d31d7ea7864 SHA512 86ffa8e9d2ad2e69fdfdf7888cdc3f885ee3b5fb7bae6af3a9dbcf977d4fe00d1f4fce1642b7c1bc5eab0f7d8a3c2247beb2d80a731d0b14e6aa0b545e323c23 WHIRLPOOL 5765b2ac767c04ccfd1ceb7e5998513aab7e18a80e77124eec63f729f054fc479318612a567b6a8141afabc9e4bdc65101b0811bc25f266960580465e0de0513
 EBUILD openssl-1.0.2l.ebuild 8338 SHA256 072d91bb6cdf1e356a450d995e1a43026f6a86800a601b853f17ab7da1f17c44 SHA512 2435e1f4b4b8f766d1ea5ed0a21fece5109559e16c9d4260d2ef052ab82795bb7005d3f2777bed3978f0f4940521eeb5bd10c85ab2e2037ac2d053f501646f3d WHIRLPOOL bfaedc69471ef1ef1496c2f87de036b29496d903967a66f6a13154aca7b4ecb85eb7abd668dd4652bccee7a8bb6a1a0ab9d5492b19db8ed0e9360f7fbf67b775
-EBUILD openssl-1.0.2m.ebuild 8341 SHA256 e7d89322ae108c4224c68691a4183d7777c363a1dc7a5441ff3f12fae76fc525 SHA512 917896dcf3971ff2e36491d5c5a72461f7fc586e1c538561169ce38b4eaa8b3465447f315f2b8c5bf6b7c6f5ddd8a682a056fd61c42fea6659158a0196f67ff6 WHIRLPOOL 54720e81c59c711f0759846aeabb8790149a194888ec1d551ab929c2b01bc89f812a7496805135b8090ce981c6039ebe5fde9ce7575b405ce3cfebe343cad32d
+EBUILD openssl-1.0.2m.ebuild 8340 SHA256 037f98c8e7b8fdf9a0d8984b80322ea099803a0b7a5e2e6d34f907057303b614 SHA512 8184e51f08596cf73a1a65200bf6ec4a6ad93e03ca10a4d30d333fd6d255d376ec86538d7ca2a3755b86cf4ca8a2b4a1f5038de2b1561612469b0038905ee7bb WHIRLPOOL ca7945e2412e78887336a17322e6bae3360b51c34267ffca7240bb76ee6258725edcb50cc2a8ba577096e391d722c6622ad2cc8fd8eb255d9323b91fb7832a86
 EBUILD openssl-1.1.0f-r1.ebuild 8960 SHA256 59b50a19926a7cef6c0d366e40c4e2ee36cf9f8349c3a5be511f974ad1d7036c SHA512 5d7c628faa89d56a58f5d732f30d495743e6cfa94962e036042f396902aeb71d6e997a2ee2db904f7e04e21a6c2d75e879fdb172f74f28d51b0e2569d532d33e WHIRLPOOL ca550601ac03f73ac41e1c10b882b93c3b351a65fddfc6febcee3e5a3a3b545e04cb38bfb3fca8a8b3d32cc36149933772cba764b731141f1a8f4c5a832aa934
 EBUILD openssl-1.1.0f.ebuild 7419 SHA256 553325ec8be13740869ef1416fb62654c7ec6ea1755a55f2eec81db6797d0950 SHA512 30d243d3d3e13571c8b55f9b13abc8b39ad0e719bd482b54d22ee7cb01217e8288cf2594dca1511bd5bd3945acf4e2963a16d3a172c59c11af93008a7a8874b2 WHIRLPOOL 1248a75677f564b74c2f0e575994fe00a8421c12b6a420a5782c3c3646eeb249dc391cc5b3838ee5d5040a9b0d0a4ec281a3af79a1392aefb9455607a21656c5
-EBUILD openssl-1.1.0g-r1.ebuild 8960 SHA256 59b50a19926a7cef6c0d366e40c4e2ee36cf9f8349c3a5be511f974ad1d7036c SHA512 5d7c628faa89d56a58f5d732f30d495743e6cfa94962e036042f396902aeb71d6e997a2ee2db904f7e04e21a6c2d75e879fdb172f74f28d51b0e2569d532d33e WHIRLPOOL ca550601ac03f73ac41e1c10b882b93c3b351a65fddfc6febcee3e5a3a3b545e04cb38bfb3fca8a8b3d32cc36149933772cba764b731141f1a8f4c5a832aa934
+EBUILD openssl-1.1.0g-r1.ebuild 9012 SHA256 4e208e444d9ca9533a2c0aa0fc4daecaf1985540a0e63da78953f0481544234a SHA512 ab9e8ee59b302ef609fc15c1727335b3c6c40b332914846524badb6e48d6344f0f4bb71accb636b818ec23cc3a3602c1de34977fcb2be867698e1fbdce4ac55c WHIRLPOOL ea1b1a3c09f8f144f6a96fc561cc2360d5662c019ecb5bb5970774e53d5885944af7eccec98b348e947e57edf28200e0aa84f94ff0991f4f987bea6a372e0cba
 EBUILD openssl-1.1.0g.ebuild 7419 SHA256 553325ec8be13740869ef1416fb62654c7ec6ea1755a55f2eec81db6797d0950 SHA512 30d243d3d3e13571c8b55f9b13abc8b39ad0e719bd482b54d22ee7cb01217e8288cf2594dca1511bd5bd3945acf4e2963a16d3a172c59c11af93008a7a8874b2 WHIRLPOOL 1248a75677f564b74c2f0e575994fe00a8421c12b6a420a5782c3c3646eeb249dc391cc5b3838ee5d5040a9b0d0a4ec281a3af79a1392aefb9455607a21656c5
 MISC ChangeLog 27134 SHA256 73f6780806505aea9831be5f3b6f45b68a0520bff223e7306988b89bdd5b0762 SHA512 4529bfdc72026bdff344610f7e64c56deeb14711f7dc3d522340e37c264498db57c8e0e10615b5437dc80613b54c4f39c5027797e6893f5283c3fb4eae54939c WHIRLPOOL 32420b6acefa4db82b392a0505c032c3ca8adfb0731f3767b9a10ad6bc0288f07d999d832e053d93ed6265ed971143f8f0b995841b0e0b0168defb65cbae68ae
 MISC ChangeLog-2015 105012 SHA256 78da8e54f925dd55fa0e87800ab2e3ad9833cb33f6c334a4364339195d44a8a8 SHA512 fa8deec570b40406f273a5ea929f10113d81d828815c67f225968bbbaa6737f6c4832502a100b06fe6c8cf124529fedaa04cbaf7a70f037680a420ce244be1e5 WHIRLPOOL a2acbfb3283a9521492b4b96d9d2283aefc3445df87e47e584c66f87547cfa954914beaddd040c7097fded7029897f9481cded1d1f2d1ad7fa7b2e5425b285ba
diff --git a/dev-libs/openssl/openssl-1.0.2m.ebuild b/dev-libs/openssl/openssl-1.0.2m.ebuild
index 25aa9f3e3257..bb666d8ce617 100644
--- a/dev-libs/openssl/openssl-1.0.2m.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2m.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/openssl/openssl-1.1.0g-r1.ebuild b/dev-libs/openssl/openssl-1.1.0g-r1.ebuild
index 151632bbbcb2..f698c4714e65 100644
--- a/dev-libs/openssl/openssl-1.1.0g-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0g-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+asm bindist rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
 RDEPEND=">=app-misc/c_rehash-1.7-r1
@@ -181,6 +181,7 @@ multilib_src_configure() {
 		enable-ec \
 		$(use_ssl !bindist ec2m) \
 		enable-srp \
+		$(use elibc_musl && echo "no-async") \
 		${ec_nistp_64_gcc_128} \
 		enable-idea \
 		enable-mdc2 \
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index bac1c7bc4cb9..0a5de8b6a760 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 3015 SHA256 0d98950bebd5d531ae422fef70df484362272b80f5f2d331dba616687cba5a07 SHA512 57e7c94fca54c7e44546ba00c899b73753606bb92b2af7f1386fe3713b7c3e0f37f870eb58de91ebe5ad8a9fb221be8e9dbbd6465fce65be1c6bff860b4d23cb WHIRLPOOL c2e3f3b3a42df6f748130501a7438413b35b1c0419a57a9f9da8985cc0aa76dd99f027658ece730cdbe828b21399771442a093c21bc9888fc1e7a101ad48358a
+EBUILD protobuf-3.1.0.ebuild 3014 SHA256 247582ef639f0b2fed7a5a8d362901ab823ed14718a051039c68422dbcc7b5e4 SHA512 52bbf7fbe272a79eb738d7c63dea58f66181635ac48f89254b068686363b302594aae417530a8dff6b3e2f54eb5016882af67d08e28ba7880facdc0c9c02dbed WHIRLPOOL cf08c28d3b9e9c7e9e2914b28381ff6eda8823bc1157c715707f6d869f54348fadd81093fdde2c3b5b7acd5ffaa739fd92bed36127157e1373d98b68e1c9c5a5
 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 beec6b0e7174..c5936afcf7e2 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} )"
 
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 55d10e9abe03..52ac17c507e4 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,14 +1,12 @@
 AUX xapian-bindings-1.3.6-allow-ruby-2.0.patch 477 SHA256 3805bcf6f89888a22ecaa755feffd6707230892f885fb7f5121b26bb82a3726c SHA512 ed9d5a5542054cb9a239d1adfb6e88bfeb9a4931545b9b60208f9a9a8658822329005fae6707fcaebb08e16ece3a8dc44eb23e0f8dd045bce16aa7b008243198 WHIRLPOOL a65144ef393d4861d94e4be58c0f5a401e1fcdf2b9c9787b6b5b1f7c7eaab3c027e54d8a2436f44b1f5fcd5f02098026aabe5428c5333d8344559b9cc54bef01
-DIST xapian-bindings-1.2.22.tar.xz 844040 SHA256 b15ca7984980a1d2aedd3378648ef5f3889cb39a047bac1522a8e5d04f0a8557 SHA512 0eec204ebb92f1230b9dbd080ad2b56ea5fa8e6170eb4354556e5790c7a7da7ba4c8475aaf86fb8f10f102a461d91590184271220626315f55c0631e73e122e0 WHIRLPOOL 05ac5b31d73f9de0c101da832ef289f6a505baa68216eba6fa0cf80df1709feef7e42c7b8f4cf9af35f775e8514c6d4b944c2acebffff10bc558a83305a637ce
 DIST xapian-bindings-1.2.24.tar.xz 886148 SHA256 0c2a0df0a4616e2bd8e578d372c9bb4684780573abebbd1ac515502177229965 SHA512 aaedac02ec9fb192ef8b45b07bef5584bc60aff7068c2e3fa0008430ed8296a653780cad04176431d81fe014802df333a3090469dce63204923eead15e6bbaef WHIRLPOOL 996b960727a79dbe669ae8139863c3896c6efdbe781177098d00960982b86a43739433c69db32e62b6660dd4751736d859f5d950d26d6b635c310c35d75a8a0f
 DIST xapian-bindings-1.2.25.tar.xz 1711860 SHA256 5f07425d6c5fc540fab965cd011bb043e3ee0df7da03a8814d6fc20dc5e9dd0f SHA512 5d27b2ae2722409ea99a1b9e6bf3f5c61ed9195b67121c090f1533340d3b11c546014985d0989a0725b60a07b392b9705bce054495f423bd3a7c99835aa336c7 WHIRLPOOL aa5c5c310bee6d10f75bb0586386982ec9c32af0b9fbffde8f8c12c37d4a306c66bea69f6dd5502aa6ca93d9d288720fef0d8f7ab6bcea235803c2e3c5b3e57e
 DIST xapian-bindings-1.4.4.tar.xz 1117140 SHA256 3b323eac41c42750b7dacc9319b1477a7c1b552c95f590127643dee3b44d8a39 SHA512 006e771b3ea654130b4f76f1a1caee576fd5a3fa6317ca44f1e5483671e8c83073ecbde4f3fc7f84c75590eec53acb59701af4cf9bcd72355ed9d53924492b53 WHIRLPOOL 6932654e8fb4feea2de6db9f58273ab1fd253e0a90992377224c94a671979e102992052396fc319a5a3a8b3122d6a12d43a4bcd73e81e9dfc2b1a3b04838beae
 DIST xapian-bindings-1.4.5.tar.xz 1118884 SHA256 647886730a71bcc0e9f666fcd702b7141d4e9a82e1085e44eb4470624e1a9d33 SHA512 e39ece495e25077990db3d06554306567c52c6f45ad55a65005cb97e18086ee18947e41d0d612157b891b61e015881385bcb082a03aa0c6452565e90d09e8275 WHIRLPOOL d634e91cd815dc963acec0259d26e4ee96acf28d234bda639a6f927e2165f95a389e7c5f6cb5fe3aa17b70d0838fa3de9a967a26d027268e4d98d67aa0fd580b
-EBUILD xapian-bindings-1.2.22.ebuild 5543 SHA256 a2e433ef7f014430f40e53005a0d0799fae682c75adf1df4919842b22360c49a SHA512 f854e192cfad5da24d2e2334b49e122971dcdf058e1e0a4b29227770906d2e9d3731a782857326f31fe639b347bca66e6c67deff38a18ec77c374ba12bf42dbf WHIRLPOOL dd57b7c016c019fdb940d32b4b4e7af85f21476f7c2564d68d987018c151d193435e455c1e3d6b480f9130f8a0b668ee03949ebcc2ed2553cf5ea8ff3fefba1b
 EBUILD xapian-bindings-1.2.24.ebuild 5550 SHA256 6666fa0d07b12f775efd5acfccc80731dc76da976682435304c4b2deb9b12d9a SHA512 4961916df0b4cb265b3e4f68566f0c0f66f767c31d762cd044095a897e916910d3adaebc549e90d924ac738435863095664731272c8c12df6be0fd94dc0039c6 WHIRLPOOL 04dd121595ce0031ad00d1e384e1063b86e5deacbc188bf1204bb642ea71f2b0c26aa99f51e74ea3d08ed72aa692e4c26b7921e9a7a7be17fafacad14d4a8e02
 EBUILD xapian-bindings-1.2.25.ebuild 5551 SHA256 e0c63e5f17099410d6c9e62bfc0e1b80d77e4c229816a9d3354e702889fed29c SHA512 cea9b9dbb61721ce41ec481099c8cdc27fc7d6da5b88c7777503348b124442aecb70b0c888d3d1560332679ae3c8a3ab60eacde4b6154abba9c2be60a853c36a WHIRLPOOL 9f801041c82076cf9cf13b5c4c8725b7f2625140d37a2fc39b2394e19cc5f5ec848e871e11fcc8f2cfb6ae90b18d312c2e9d03a63835b988de70704a9cd29b31
 EBUILD xapian-bindings-1.4.4.ebuild 3517 SHA256 1c6ce5c180f445d6ce3ce9b14ae452a03fa8bdbc295bb2cc607aa9fa55c2cdc0 SHA512 bbd8f9e3b01b2c87e4d02630d7f61fc1e3ac10380352199ef5cc0853c71e5fa2432e8cd02229c640394871a284dbc73e3612b8b62c57517510da758565fe4071 WHIRLPOOL 104a5a4b25eef78d60a1325fb23b1d365059d2eee81344e1d4739c46580524be87018fae0eb4f4c9f37ddf871c6f881560e3eaa2b4680251e16fa47fe2d34723
-EBUILD xapian-bindings-1.4.5.ebuild 3539 SHA256 eaf3c4880d65e02240e59a07fe10e8ca5453785738643c5ba9d19aae8eec557f SHA512 cac4a5f37f462c41341d0f917e848ff1dd4c60d4f63280befdb1fb1051c6ff67d75db0c8c68dca1d05bc887566054dfd38d38e230d84cfa9418f4dba048937ac WHIRLPOOL bbbda1c88e63c1ef7e8ac80b983a8589b306c3c9066d1b254c75d287411c4f26c566c21245c4462244314cf4967e1972c7e3cc3646f0e08ba3dde469acfc043e
+EBUILD xapian-bindings-1.4.5.ebuild 6505 SHA256 7a58f6ea027d9347d66e437927af4d36017ece2896ba2c0681b164c01b63ab21 SHA512 774debfff344112f1df68eb7278243fbfdbd30392e9ee42ec735793eef2b77cf47d5eb39182f83707b0a3f5b14caf4303e8d9ccd5149d9877e38ded4427d7940 WHIRLPOOL 6c096771f8c4e37a160963cdc1dfd0917b444daa83f8dd4c6213ba05c8b2f6d84dc3c68e200a60609e4767e23b4b15b83faa45ea40224a4b4f476cab5dc3e4e5
 MISC ChangeLog 11298 SHA256 355a7ec45f8a7f8dab2028fcdfa14c54f2a205275362b8191bb14c21eb0aa0ac SHA512 63a350ab3561b84a1b9aac73bf936e7f0e40a3b8541053c96007571563aac1a44f96c11fbbdf07d2425659d866ed16f81a8c66b97eaa703b0e273b6ba5a07214 WHIRLPOOL cbf7c5432a60e382073265335d5870435bc8fe8984e0930019bc603e1abecaaed1792fab7d9c515e99cfc3466379ece99ab5a106a31717014163ef96622ab412
 MISC ChangeLog-2015 16665 SHA256 166eec91a7534f172df62c046909000890125664c04f559d21476b32c4b2cdae SHA512 136d0ffff7fc842849ba48fd99f009500a829d8f2c755721584abc4725213b0a183d9159b1043fe8b2601550dc41a08bd7910d7ba8edccad81cb22963a23c04a WHIRLPOOL aea2dc8ac317c6610ba06d41c5b412e21d86f9a559be85a3188cafdab6d9207291dac5c891501f1b9a4b3818d1770d366f162cfd97dde0d2d093a8c682e176a3
 MISC metadata.xml 252 SHA256 a590e5133cd97a615db4f977b0e28e5c60c56cac76eb3d339109cdf379003b60 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65 WHIRLPOOL b209a730a169969b9e3c4d4612368bc5b30bfa5fae275d98d83ba96fd0ad01d308a8fed4f7d67a7c9fa417c624dfeb23ce89ab58923a8a0b5b1bd68ee73f288c
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.22.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.22.ebuild
deleted file mode 100644
index f04d5d805817..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.22.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-USE_PHP="php5-5"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-#mono violates sandbox, we disable it until we figure this out
-#inherit java-pkg-opt-2 mono-env php-ext-source-r2 python
-inherit java-pkg-opt-2 php-ext-source-r2 python-r1 toolchain-funcs
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
-#IUSE="java lua mono perl php python ruby tcl"
-#REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
-IUSE="java lua perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua perl php python ruby tcl ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMONDEPEND="dev-libs/xapian:0/1.2.22
-	lua? ( dev-lang/lua:0 )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby:= )
-	tcl? ( >=dev-lang/tcl-8.1:0= )"
-#	mono? ( >=dev-lang/mono-1.0.8 )
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.3 )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.3 )"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-	if use java; then
-		sed \
-			-e 's/$(JAVAC)/$(JAVAC) $(JAVACFLAGS)/' \
-			-i java{/,/org/xapian/errors/,/org/xapian/}Makefile.in || die "sed failed"
-	fi
-
-	if use python; then
-		sed \
-			-e 's:\(^pkgpylib_DATA = xapian/__init__.py\).*:\1:' \
-			-e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian.so|' \
-			-i python/Makefile.in || die "sed failed"
-	fi
-}
-
-src_configure() {
-	if use java; then
-		CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-	fi
-
-	if use perl; then
-		export PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-		export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-	fi
-
-	if use lua; then
-		export LUA_LIB="$($(tc-getPKG_CONFIG) --variable=INSTALL_CMOD lua)"
-	fi
-
-	econf \
-		$(use_with java) \
-		$(use_with lua) \
-		$(use_with perl) \
-		$(use_with php) \
-		$(use_with python) \
-		$(use_with ruby) \
-		$(use_with tcl)
-#		$(use_with mono csharp) \
-
-	# PHP and Python bindings are built/tested/installed manually.
-	sed -e "/SUBDIRS =/s/ php//" -i Makefile || die "sed Makefile"
-	sed -e "/SUBDIRS =/s/ python//" -i Makefile || die "sed Makefile"
-}
-
-src_compile() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			cp -r php php-${php_slot}
-			emake -C php-${php_slot} \
-				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
-				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
-				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
-				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)"
-		done
-	fi
-
-	if use python; then
-		python_copy_sources
-#		building() {
-#			emake -C python \
-#				PYTHON="$(PYTHON)" \
-#				PYTHON_INC="$(python_get_includedir)" \
-#				PYTHON_LIB="$(python_get_libdir)" \
-#				PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
-#				pkgpylibdir="$(python_get_sitedir)/xapian"
-#		}
-		building() {
-			emake -C python \
-				PYTHON_INC="$(python_get_includedir)" \
-				pkgpylibdir="$(python_get_sitedir)/xapian"
-				VERBOSE="1"
-		}
-		python_foreach_impl building
-	fi
-}
-
-src_test() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			emake -C php-${php_slot} \
-				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
-				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
-				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
-				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)" \
-				check
-		done
-	fi
-
-	if use python; then
-		testing() {
-			emake -C python \
-				PYTHON_INC="$(python_get_includedir)" \
-				pkgpylibdir="$(python_get_sitedir)/xapian" \
-				VERBOSE="1" \
-				check
-		}
-		python_foreach_impl testing
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	if use java; then
-		java-pkg_dojar java/built/xapian_jni.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso "${D}/${S}/java/built/libxapian_jni.so"
-		rm "${D}/${S}/java/built/libxapian_jni.so"
-		rmdir -p "${D}/${S}/java/built"
-		rmdir -p "${D}/${S}/java/native"
-	fi
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			emake DESTDIR="${D}" -C php-${php_slot} \
-				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
-				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
-				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
-				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)" \
-				install
-		done
-
-		php-ext-source-r2_createinifiles
-	fi
-
-	if use python; then
-		installation() {
-			emake -C python \
-				DESTDIR="${D}" \
-				PYTHON_INC="$(python_get_includedir)" \
-				pkgpylibdir="$(python_get_sitedir)/xapian" \
-				VERBOSE="1" \
-				install
-		}
-		python_foreach_impl installation
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}"
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
index 2a25212d28da..8124da90fdeb 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
@@ -3,16 +3,19 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
-USE_PHP="php5-6"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
 
 PHP_EXT_NAME="xapian"
 PHP_EXT_INI="yes"
 PHP_EXT_OPTIONAL_USE="php"
 
-inherit distutils-r1 libtool java-pkg-opt-2 mono-env php-ext-source-r3 toolchain-funcs
+USE_RUBY="ruby22 ruby23 ruby24"
+RUBY_OPTIONAL="yes"
+
+inherit java-pkg-opt-2 mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
 
 DESCRIPTION="SWIG and JNI bindings for Xapian"
 HOMEPAGE="http://www.xapian.org/"
@@ -22,7 +25,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
+REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	ruby? ( || ( $(ruby_get_use_targets) ) )"
 
 COMMONDEPEND="dev-libs/xapian:0/30
 	lua? ( dev-lang/lua:= )
@@ -31,7 +36,7 @@ COMMONDEPEND="dev-libs/xapian:0/30
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}
 	)
-	ruby? ( dev-lang/ruby:= )
+	ruby? ( $(ruby_implementations_depend) )
 	tcl? ( dev-lang/tcl:= )
 	mono? ( dev-lang/mono )"
 DEPEND="${COMMONDEPEND}
@@ -40,64 +45,140 @@ DEPEND="${COMMONDEPEND}
 RDEPEND="${COMMONDEPEND}
 	java? ( >=virtual/jre-1.6 )"
 
+S="${WORKDIR}/${P}"
+
+has_basic_bindings() {
+	# Update this list if new bindings are added that are not built
+	# multiple times for multiple versions like php, python and ruby are
+	return $(use mono || use java || use lua || use perl || use tcl)
+}
+
+php_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_copy_sources
+}
+
+php_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_foreach_variant "$@"
+}
+
+ruby_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_copy_sources
+}
+
+ruby_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_foreach_variant "$@"
+}
+
 pkg_setup() {
 	use mono && mono-env_pkg_setup
 	use java && java-pkg-opt-2_pkg_setup
 }
 
+src_unpack() {
+	default
+
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			# Unfortunately required for php-ext-source-r3_createinifiles().
+			mkdir "${WORKDIR}/${php_slot}"
+		done
+	fi
+}
+
 src_prepare() {
 	use java && java-pkg-opt-2_src_prepare
 
 	# http://trac.xapian.org/ticket/702
 	export XAPIAN_CONFIG="/usr/bin/xapian-config"
 
-	# Accept ruby 2.0 - patch configure directly to avoid autoreconf
-	epatch "${FILESDIR}"/${PN}-1.3.6-allow-ruby-2.0.patch
+	if use php; then
+		php_copy_sources
+	fi
 
 	if use python; then
 		python_copy_sources
 	fi
 
+	if use ruby; then
+		ruby_copy_sources
+	fi
+
 	eapply_user
 }
 
 src_configure() {
-	local conf=(
-		--disable-documentation
-		--without-csharp
-		--without-python
-		--without-python3
-	)
+	if has_basic_bindings ; then
+		local conf=(
+			--disable-documentation
+			$(use_with mono csharp)
+			$(use_with java)
+			$(use_with lua)
+			$(use_with perl)
+			$(use_with tcl)
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--without-ruby
+		)
 
-	if use java; then
-		export CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-		conf+=( --with-java )
-	fi
+		if use java; then
+			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
+		fi
 
-	if use perl; then
-		export PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-		export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-		conf+=( --with-perl )
-	fi
+		if use perl; then
+			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
+			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
+		fi
+
+		if use lua; then
+			local -x LUA_INC="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_INC lua)"
+			local -x LUA_LIB="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_CMOD lua)"
+		fi
 
-	if use lua; then
-		export LUA_LIB="$($(tc-getPKG_CONFIG) --variable=INSTALL_CMOD lua)"
-		conf+=( --with-lua )
+		econf "${conf[@]}"
 	fi
 
-	if use php; then
-		if has_version "=dev-lang/php-7*"; then
-			conf+=( --with-php7 )
-		else
-			conf+=( --with-php )
+	php_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-python
+			--without-python3
+			--without-ruby
+			--without-tcl
+		)
+		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
+			myconf+=(
+				--with-php
+				--without-php7
+			)
+			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
+			myconf+=(
+				--without-php
+				--with-php7
+			)
+			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
 		fi
-	fi
 
-	use ruby && conf+=( --with-ruby )
-	use tcl  && conf+=( --with-tcl )
-	use mono && conf+=( --with-csharp )
+		econf "${myconf[@]}"
+	}
+
+	if use php; then
+		addpredict /usr/share/snmp/mibs/.index
+		addpredict /var/lib/net-snmp/mib_indexes
 
-	econf ${conf[@]}
+		php_foreach_impl run_in_build_dir php_configure
+	fi
 
 	python_configure() {
 		local myconf=(
@@ -107,6 +188,7 @@ src_configure() {
 			--without-csharp
 			--without-perl
 			--without-php
+			--without-php7
 			--without-ruby
 			--without-tcl
 		)
@@ -125,18 +207,72 @@ src_configure() {
 	if use python; then
 		python_foreach_impl run_in_build_dir python_configure
 	fi
+
+	ruby_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--with-ruby
+			--without-tcl
+		)
+		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
+
+		econf "${myconf[@]}"
+	}
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir ruby_configure
+	fi
 }
 
 src_compile() {
-	default
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake
+	fi
+
 	if use python; then
 		unset PYTHONDONTWRITEBYTECODE
 		python_foreach_impl run_in_build_dir emake
 	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake
+	fi
+}
+
+src_test() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake check
+	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	if has_basic_bindings ; then
+		emake DESTDIR="${D}" install
+	fi
 
 	if use java; then
 		java-pkg_dojar java/built/xapian_jni.jar
@@ -145,12 +281,21 @@ src_install() {
 		rm -rf "${D}var" || die "could not remove java cruft!"
 	fi
 
-	use php && php-ext-source-r3_createinifiles
+	if use php; then
+		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		php-ext-source-r3_createinifiles
+		# php-ext-source-r3_createinifiles() changes current directory.
+		cd "${S}"
+	fi
 
 	if use python; then
 		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
 	fi
 
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
 	# For some USE combinations this directory is not created
 	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
 		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" || die
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 2ab7dcf1789c..0f0141a76609 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,9 +1,7 @@
-DIST xapian-core-1.2.22.tar.xz 3204096 SHA256 269b87ca3faf79d444e8bb82ed58a96f1955008d7702f9966dec68608588527f SHA512 cb6bd565eb307f9bc8f801fc9cda0cc6ad5d7cb8bf0af2ab6e42d48ca4ea4169f08621db810ab87d15957d0f873bcb0336e16b12fdb6026375d9c0192781e0d6 WHIRLPOOL 580c16889a6c3e99a00f8bb791f878a08ff3522c3dffb18ace18d54575247332f0fff8866f46475513dde7544205fe08971cbd284ec3714ce0d6b9b445e8746e
 DIST xapian-core-1.2.24.tar.xz 3210192 SHA256 57a82717ba07e9777958b6ef48d94b81ea41ac4c74d544f74da597fab1e1f87b SHA512 1f8ae5848f94b5f0bee03024f12ae8c336b6d85e58f7b36e885fe604f9fb962c0525e1f44e6cfcd183e811226c61b23f0f2fcc35c7d2e63544b19347a0f96c80 WHIRLPOOL fef6db7f393d4563828e1650eecd02e30d37f5837042b6a8992cfddb962593675f9c3af4eb5d387db71f99468235905bdbe5666f91975b260cb649fd422425ae
 DIST xapian-core-1.2.25.tar.xz 3253292 SHA256 7c77ff259bc92414c620015d6798f5f3e2c52907936096ec97c23c17fc0d6403 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe WHIRLPOOL 6b6335fcf2beff23930ea20822fdd1251307d095f09424b36734a9ba001cecbf7398d525022c37b1d8b8d7d612f509946469dcbacc207cd51e68ce8bb75ce3d1
 DIST xapian-core-1.4.4.tar.xz 2807952 SHA256 a6a985a9841a452d75cf2169196b7ca6ebeef27da7c607078cd401ad041732d9 SHA512 dc88bab1d82c68b29d51c2113319ddb5d16840f3544b9d5fcc7a3671f97d58f16ddff58b865ad3521ea778cbaacf73fe7346bb514a1275f1f739283a4128d001 WHIRLPOOL f1b89b0a5ad47111eb4fe068a5aee29033b694fdd6405041972ebfcc81333662ce74bfc0251a37be9a0d04d7cc232681173e1443840277eedac814b46d9bc728
 DIST xapian-core-1.4.5.tar.xz 2810612 SHA256 85b5f952de9df925fd13e00f6e82484162fd506d38745613a50b0a2064c6b02b SHA512 cff97a856a406583ca81164ddb704a0eeae7d8d6f94ce3b3f53d5208d657423e87dd06bdc7acb5e5904765bce1cefbc98365cde315c1d46f7b18cfba7b022ae6 WHIRLPOOL 287fa5a952a492da4b9f00a43e32474e40a0d6b3efc0c7585e5842f0f3d219aa87c0c29561d1ee0dd77db680e6f2bc2b755ac4a140c8b7e4bde63ff62717165c
-EBUILD xapian-1.2.22.ebuild 1543 SHA256 d8d5e9588a329f378a575734db321251b0f85c08b0fef9e8cad08c1cb7dfaf0a SHA512 635579b3e91fb76c1298a96696ccf1087bcd389b0cda6e9f90809b0d7e856f63e03c4915769a14786a2efeecd903b684f46172ebb3904b022806589e6e493587 WHIRLPOOL 7985b6a1f758809945b7c52c6c02be13a6311ff7b3326bdfbefed0e6bfcd3b5504959802d751c33ab71cdfe34ebbcb77dde453f5f0d6e57b2d36abd0047f3258
 EBUILD xapian-1.2.24.ebuild 1553 SHA256 1b2879d68f0c7488bee3eabcaf2a85ec2a9a6daa7f1f0a165211085a79302776 SHA512 9e7f9ed40d9087f3c1fcb1cfe32e30646d2041e4abcc4f5f26940356b40e6d8bf9a80d7d57c86d3f4ecae369d974bbc0f141628fae831903f16d0b81ca336a48 WHIRLPOOL 45470d9154bb763e1f4d60c350adffa4c12bced8b2542f32075f1530ce1783ffbc664738304afa47e2e03372b6ed42664a9b43ebd2002304acf27f9cd54235be
 EBUILD xapian-1.2.25.ebuild 1827 SHA256 32a045351d12aa7bc9add0d60e24fda64cf1d1ceea02d2f15471426540e8ca33 SHA512 32bf0df37b927f5c1a470d6706d0097edf4b270e7e5251a614eb12fba11068caffaef31ee77cfeb9098c2e5c737642bfebd1f7fbc70736144de6523c8dbbda6f WHIRLPOOL fe7cdec882b94a70d452adcca762c2e26b1e2f143783e6b9518294c187f5df6950972a35b140d86dc8bb593b4cbc4eec0eac6dca9dacfb46fe7afbc79947c588
 EBUILD xapian-1.4.4.ebuild 1909 SHA256 e37f97625913c2b6d7d8695f8010b28f5215b7153155d25d2001fb8437fa22ac SHA512 acfe4e97e25e33eac5a77de8fc690ac589768bd272367b51eb0a1b2310a8debc29bc201dc344d7677bf42c050da165eb643f9f8c2fbe56c79ae301c60ba7f6f2 WHIRLPOOL f5d299d381201a00997d2b785edbb2ca5c7fdfb34e70a21c1857fdbe3b90070a3a5736c68b22732fc3267dbc685ce9e312d18267ae2958c0d3a93cfa3d5f8c3b
diff --git a/dev-libs/xapian/xapian-1.2.22.ebuild b/dev-libs/xapian/xapian-1.2.22.ebuild
deleted file mode 100644
index 64943e9c15db..000000000000
--- a/dev-libs/xapian/xapian-1.2.22.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/1.2.22" # ABI version of libxapian.so, prefixed with 1.2.
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local myconf=""
-
-	einfo
-	if use cpu_flags_x86_sse2; then
-		einfo "Using sse2"
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			einfo "Using sse"
-			myconf="${myconf} --enable-sse=sse"
-		else
-			einfo "Disabling sse and sse2"
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-	einfo
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use brass || myconf="${myconf} --disable-backend-brass"
-	use chert || myconf="${myconf} --disable-backend-chert"
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-
-	myconf="${myconf} --enable-backend-flint --enable-backend-remote"
-
-	econf $myconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	mv "${D}usr/share/doc/xapian-core" "${D}usr/share/doc/${PF}" || die
-	use doc || rm -rf "${D}usr/share/doc/${PF}"
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	prune_libtool_files --all
-}
-
-src_test() {
-	emake check VALGRIND=
-}
diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest
index d76a4c5fb21f..6ed62a47f5d1 100644
--- a/dev-libs/zthread/Manifest
+++ b/dev-libs/zthread/Manifest
@@ -7,7 +7,7 @@ AUX zthread-2.3.2-no-fpermissive-r1.diff 2008 SHA256 d7fa1ef2d7c5c75860d4f38745f
 AUX zthread-2.3.2-no-fpermissive.diff 2010 SHA256 f1f37cffbff4c3dd825ff482b80686672902b817529519851f1b554d50ce29d3 SHA512 95f89cad5f531bb5374ae1e300080977defb69bf304221188204f3cbfbf4e23a1445cbe4174e279453a005ab410925b0111ce56ffac4aaf8656b50483a9f1a8d WHIRLPOOL 2ff99434d56f9c7a31ff98657f13f23245a3a5fdd11a5c65c045e82eed94b80029ef1b41b30bc3c88d4a28c1de2b4ea8c2c3c660e79b6af738274bef93eab364
 DIST ZThread-2.3.2.tar.gz 412527 SHA256 950908b7473ac10abb046bd1d75acb5934344e302db38c2225b7a90bd1eda854 SHA512 e17e12746d16f32f6f1dc8ec041795f3c05a541c015b9579252599b51de9f97dc780946e6e83b41ca78d1af892455e6f00169a089f6e1a7c3196d6a4f49a7f7b WHIRLPOOL c5ceca4639b26a86936ff49e781737b9b7e59abcd0ececa5a0799b01460a23c88c18c84027dcdbf16cd5c98549dfceba3a4d30a71c0052f8ffdbe0a824e2c254
 EBUILD zthread-2.3.2-r3.ebuild 1461 SHA256 ec1db4baee921f16b6d5b6982fc51b5cacac8dc7ff7493d19d48c2d3daee9ce8 SHA512 0001e221cf7368c9f6ec9174a6792f53e4bd7174244e4eaaaa6d81cd95a260afaef647a58fccaa60e0be20aa3ccdc2a9d30cfe8483f0e40e6ffd5f7de06378b0 WHIRLPOOL 00f62338f7e52ead46e454c5e9b489028224ebfef853e0baadc0147fc8b18a172de54268e19533233ef8f5bb7a1b40591bf0145376d1f18d949cc8286dcbae26
-EBUILD zthread-2.3.2-r4.ebuild 1401 SHA256 2a3f903de1c3bd8c5874d49bf09494358852359d7b9afb670114191324bbd31f SHA512 33c5d1f95e833d04180e402e113ed2a6e95c77b55bf9870e05d53f6180fadc2141d9b45d19b8c76366e775d0eaacc035f2659e814553b77d164110dbd0607ab4 WHIRLPOOL 53580ce50f325f40582830a5c016f57f18451ee06aa45608d9790dd8825dc3351581378294310dee2a1b85dedd1ea16bac720d7f1b7003b4c0d16a11b3eab2de
+EBUILD zthread-2.3.2-r4.ebuild 1400 SHA256 f4690d1391f66933c9161d0e7e4d1120b76ed88d3a5999524427121188fb55ee SHA512 dbad90c961fd55ae16a068c0bd433f201ec6eee145e9e8b6c2086cb1f38c35601bd8cc9be4e88aa231a61109f0ee09739c3ac80ea63d28bd3d3721985fa4fde5 WHIRLPOOL f167168a7c0f192c9277cf35df8a294350c7affe8d82466f0ffdf1a0d8239f91efe897e10e058e2c00c125d0c93b88b55a1cbd2e6efe178c25809e117c656cc6
 MISC ChangeLog 3226 SHA256 d5915a5bedcf9b990e1379c8222124a75f1aa9e2f3db4156e57bc8a87c14e65c SHA512 cde125ab210c5745ea5ba4c706e5574196cdccb7261253c8caab2056572d12cf15b4cb61f6108a3a9acbe3b64fdcf6c13807e672182f417760ab3eb578fa596b WHIRLPOOL ff9aa4de83c97865a8ccaa89b6c8fa7789f23c7f91af4ebb774cdec1ddb15281120d1ec90a18314e41d472b6d0da60ab6148b39e1ad2fdb0a5b5f640100f5344
 MISC ChangeLog-2015 5897 SHA256 e4da5a1ecc0aed3a55bd26f150a22db8a6e9fc2c559e2b6e01c4835c5b53d979 SHA512 339a109d1d89ad83de913c9bfa27f7198c67fa6434a295bd01c65e54ed3d816fa26008247eb5dff843e1cc38c3b49e4170a2896c6a100f99e76d0f7b27494a0e WHIRLPOOL 05f109e36e70e16af6b1961c32f2c3533de9bd84b80b0c3c0740113f6f85881ea9fdec74fe8ec49f17cec311658b05c80644a2d09730c4b740758def833cf41d
 MISC metadata.xml 326 SHA256 210c8d16f72efbe69a7bc2954b22d48d4156610695762609f56a00a6d6269096 SHA512 b01487803f5222c80e0bec2b0acf7bc85a30c7314642ae8e178274b4872a17986ca88ef324700a732b1afb573b74eee64c2e1bf95c08e8fddeee5910969f2230 WHIRLPOOL 868f905de7f37b162a44695e01f15ce8f23f2a512f6431597bbf7b77fe9c839d64398550fe3ca3223ad4d16a40fa4a6dc9dddb9bcc0ad61c2efce3d3cbdec7f6
diff --git a/dev-libs/zthread/zthread-2.3.2-r4.ebuild b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
index 33b3ecb1670d..02a19d70ea2b 100644
--- a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~mips ~ppc ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86"
 IUSE="debug doc kernel_linux static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 9b1793719acc..ddfe802ea116 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -3,4 +3,4 @@ DIST zziplib-0.13.62.tar.bz2 685770 SHA256 a1b8033f1a1fd6385f4820b01ee32d8eca818
 EBUILD zziplib-0.13.62-r2.ebuild 2184 SHA256 f01b36ef928bbbbafcc695473f0212ed978d27e83784c3a6815d402bfba8fcdb SHA512 dcb8c0707bc32bb7a27b08e45163b994c31444127258d3b211c25c1f6192639356f9953898c72c8850d88f99b8d77b418445f25a0d925f1b21a1d924ac332326 WHIRLPOOL 710d422b1ec7d13e5759d32c323ffc54b29d9422f83924c676233e176ab3148ce88d1ae36299f60d48890729c78a6596d621ed222c5e2bdcdbf81c4363e1125b
 MISC ChangeLog 3386 SHA256 467afceff8a960511995fa46c5246b8314abbccd5db4356cc7f50caa7087292d SHA512 5ab94d9b97f00d551e63034db070a560a36466a29fc97330c12b9d0f87cfc1fbd92b77eebb102d1bd65649695fc6f9da5415b2fa6e7a407e018d63d979588961 WHIRLPOOL e93b75d714d4943129309926c648e7986228acf753a4cb99fc86f3696c6e1516f4b6323bfc955f9be2df317dcb055c87fc7208f6fcc72fc88d597792e5bec543
 MISC ChangeLog-2015 14997 SHA256 5ff6f9f9feb2a4d785ec108cfa3a2bb170007bdb7c6aad2feb67bdc7d5900e37 SHA512 20d91f7605cdfcbe3efbd3bf182c4a918dfaa13fcf8dcc8e35e84b42684fab13c6a810116842da2c707f17495965273dff7c05052859f08af7e8350d48198a72 WHIRLPOOL 4e4df182ad2555e21a9f8301197973ddb2cb163eb34eca28b7e20017825ff3f14ba7411d5c78c9a5d958f7cb14c8b3cee5f25bbf440c292feaac9e82a46e0505
-MISC metadata.xml 375 SHA256 b1c90f1532f11b04421650015f14ffe397d6fbcbe15cb6e5c4991fb0e4bd0468 SHA512 13cce017e88810e03febd0c88784a43627d7b62b09cd432203cceef5b072be8d64e150b74ba959e374e19175e164fdd884f67c09782052e81605d3e042b9ef51 WHIRLPOOL f12a4779e182599a8d10bbfd9c3ed79956038280a3de3075f44311d527aa9e36b78e54fb0aa31b4c25dcb72a3b68091937e2d23e641db664739528666c02155b
+MISC metadata.xml 294 SHA256 c5bef0b75b70003e703125acd7deef314c5c77e422bb04df11e19ea2ac3b5e83 SHA512 3787053a00c07a2ca3059c38c00f84714d68176cfe4d4d8d2517d05319c4bc5fb2d7d62ffe0095b81577e52c74986fcdc08970c061cc7c5c06f02441ccad0baf WHIRLPOOL e4b84a47a6422ccda8a7cfbda54e86acf7ed66b6ffa7cc07669538146535e700286b9038b3c05642ebe3008c59fc74244e77d2438d7656b479c5a651c13f22dd
diff --git a/dev-libs/zziplib/metadata.xml b/dev-libs/zziplib/metadata.xml
index fea29d2bd600..b9912473f510 100644
--- a/dev-libs/zziplib/metadata.xml
+++ b/dev-libs/zziplib/metadata.xml
@@ -4,9 +4,6 @@
 	<maintainer type="person">
 		<email>vapier@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>mr_bones_@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">zziplib</remote-id>
 	</upstream>
author	V3n3RiX <venerix@redcorelinux.org>	2017-11-20 18:45:28 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-11-20 18:45:28 +0000
commit	796cae72cf9ed18ba01256ac1f83a686a2a76036 (patch)
tree	5ca737a2562d8c0a09fcfacd81d1f9004df37b00 /dev-libs
parent	20d8e9cfb95a9f054d654ab6405e848807186aa0 (diff)