gentoo resync : 31.01.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-01-31 20:30:04 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-01-31 20:30:04 +0000
commit: 4650985dd0e898b82e0d2ec225931297d4fadccf (patch)
tree: eb0e8002cf3ebf1009110b6fec47fa90f873d824 /dev-libs
parent: 67f76a858f1ac826bd8a550d756d9ec6e340ed4f (diff)
53 files changed, 292 insertions, 212 deletions
diff --git a/dev-libs/DirectFB/DirectFB-1.7.6.ebuild b/dev-libs/DirectFB/DirectFB-1.7.6.ebuild
index c42e4dad4a61..9c044f0ba4b3 100644
--- a/dev-libs/DirectFB/DirectFB-1.7.6.ebuild
+++ b/dev-libs/DirectFB/DirectFB-1.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,18 +9,16 @@ inherit autotools eutils toolchain-funcs
 I_TO_D_intel="i810,i830"
 I_TO_D_mga="matrox"
 I_TO_D_r128="ati128"
-I_TO_D_s3="unichrome"
-I_TO_D_sis="sis315"
 I_TO_D_via="cle266"
 # cyber5k davinci ep9x omap pxa3xx sh772x savage pvr2d
-IUSE_VIDEO_CARDS=" intel mach64 mga neomagic nvidia r128 radeon s3 sis tdfx via vmware"
+IUSE_VIDEO_CARDS=" intel mga nvidia r128 radeon tdfx via vmware"
 IUV=${IUSE_VIDEO_CARDS// / video_cards_}
 # echo `sed -n '/Possible inputdrivers are:/,/^$/{/\(Possible\|^input\)/d;s:\[ *::;s:\].*::;s:,::g;p}' configure.in`
 I_TO_D_elo2300="elo-input"
 I_TO_D_evdev="linuxinput"
 I_TO_D_mouse="ps2mouse,serialmouse"
 # dbox2remote dreamboxremote gunze h3600_ts penmount sonypijogdial ucb1x00 wm97xx zytronic
-IUSE_INPUT_DEVICES=" dynapro elo2300 evdev joystick keyboard lirc mouse mutouch tslib"
+IUSE_INPUT_DEVICES=" dynapro elo2300 evdev joystick keyboard lirc mouse tslib"
 IUD=${IUSE_INPUT_DEVICES// / input_devices_}
 
 DESCRIPTION="Thin library on top of the Linux framebuffer devices"
diff --git a/dev-libs/DirectFB/Manifest b/dev-libs/DirectFB/Manifest
index c4701acfdf47..afc1612ba5ef 100644
--- a/dev-libs/DirectFB/Manifest
+++ b/dev-libs/DirectFB/Manifest
@@ -7,5 +7,5 @@ AUX DirectFB-1.7.6-cle266.patch 410 BLAKE2B 666dd67efbb1de4a7f5139022f3e02e95d2d
 AUX DirectFB-1.7.6-idivine.patch 1805 BLAKE2B 8198bcf18969f4f98c2f0e1d1cedb6f89b7499e249caae9f224a85eb1928c634a69bc06eb7f9af3039e331ee1e2a4ed52fd60d709a0bcbcc938250e78f02d1e2 SHA512 29f7b7c7bcf0eeb33b295c681723c2f1203ddca43879d430d15619d6d92d67df813acd4e6d237c297e407fe0d919952badb3901f54b32a7c025ec38b8ac55593
 AUX DirectFB-1.7.6-tslib.patch 1220 BLAKE2B 110259255dfe8d664f258b4f91388e6a886b0dd1a04a9b94a81fdc725554a82ba809ec338a1f3125631b1e1a5d9cb335c91d2a3ddca4a463aaa948187c89b9c8 SHA512 60f0dc5fcefde34bb65bbd034e9e29f2776eec0260c93ce1cda2d5ea714d940b270d83ebaf343d888bab5ed748ab24affdfe5393b4dd87b702034d319cba493b
 DIST DirectFB-1.7.6.tar.gz 5975444 BLAKE2B c28f95ed73b79766c377a5440517dc83fb5c11264c7d3b6c1ebebee0dd44bec21afc778032aa03af111ea2839dfbbbd26d33f86f46b61eff3e0036377d97dbbc SHA512 18cf1aad6c277a6de147a9b0aff1cd7408ddd7c7159ef21dab9a548db7399c681603624e7820b186a29e03edaa7737350a61e2abaec572887e9cc56658bf85a2
-EBUILD DirectFB-1.7.6.ebuild 6849 BLAKE2B 78960a1bcb7f1f693241fd9acab6a264250b6d1847787621fef37c4f7d2d8243f3911c6769fd616d5e99269c1f6a16246b5285cb6388a94ab2b233e8bd739ed5 SHA512 fa1b2f640b7de9c7d29743a3f2be652d82e88bdd2a21fdba93f1e897b64a3199f5328a5e01ce4d8ae8a5b813441c478bf142d5d36250d356334f3b8324e16c36
+EBUILD DirectFB-1.7.6.ebuild 6776 BLAKE2B bc97063e42954b2fd1719dec4c00d536b9720d920188c1e378b0a60de3126729f0aa97d97414ba8508efd2b731b3d3b83af9ac61e93afa73ccf920e9b923d399 SHA512 88c131235e683b94a480bff36418b15db89dead9e015a08a5c99a34d2617cdc84a813ebb59c8924a15aecab8a187972369b8b7886f5dd9e6764179c6acc591fa
 MISC metadata.xml 1948 BLAKE2B 4d40e92ca69e987e668e00a087cd0a3c223524f4ced9e9846cc483120f91315cbfa1dc2a34003eeaffd25282b08b92d2aae5838a31699bc58bdd497621fc4c43 SHA512 6d1dc07a903d8554fda072001ffaaaf685ee1363fc820626c3c271965f7589409c3a95567bc8b4b820bd643c752e570b8a4be9cb938da1ca53b6ac6643800dd1
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 06a275527be9..32b5eedb933f 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/capnproto/Manifest b/dev-libs/capnproto/Manifest
index e7f0b4644622..f65a013a2ffa 100644
--- a/dev-libs/capnproto/Manifest
+++ b/dev-libs/capnproto/Manifest
@@ -1,5 +1,5 @@
 DIST capnproto-0.6.0.tar.gz 1199198 BLAKE2B 90db934f8fd2affeef8908a9f8aa955892c8d25d556a76003f7d2e8e5634ea76e3759ace94b3bff42235e6da666e97657f69327ecdf620067e13ad2dde2a8105 SHA512 4882b2e5d1544517348e436600705d18b41fc82e6fc141a934ad960556ed73781c974d4a45f8c949a297edd5c95fb156fd75f1d7179666dc7ab881f98ac9e69d
 DIST capnproto-0.6.1.tar.gz 1720489 BLAKE2B 5fad902bb4221fa872bd52311442a4073c4e58e3d21726f24e06430246f1d757bc4d4e7e122df0a7cd9401ff2c47cb48d1791bb0b7ceda8889a819ac52edc02b SHA512 baea7f867bb789d3bf8cdc9c1a4a0d31cdce3beb7ae1fd9464690a006a86eca841aaac5d86599c2a84a39d62c4d01213b29789c2b7385ad6636fef95fc867dd6
-EBUILD capnproto-0.6.0.ebuild 785 BLAKE2B c01adda366e36e909f504812dfa72a38af335c13fe5734c9fb21dafd8319770e546e8d35d9f36f76cdc48a4897c5c865cafd83869cb4a8a5d5d12945f6d43048 SHA512 689f7349847e1c0c7fd1719688ca4aaaea5e4ac65966afc9ceca60b024505b779f9134f4c5b5b799e304e2a00034161a9ac8197196a90007b86d0e88991cdd3f
-EBUILD capnproto-0.6.1.ebuild 785 BLAKE2B d431afa89f010b09d1da68727c286d84cdac2c60c5480b7fac1609c2358d00b2e8e37c648fda255075bd009369f2188a06694cd261bcdf5fa151f7b8ae45bdf5 SHA512 51f8fd78cc10c2b553f2ea438ba18c98a77d8408c9d8725eb37bdd1b58df7169155729f99b5d43c51b37bd578c805908c3b2dd6ac64feb4549fa659916242de0
+EBUILD capnproto-0.6.0.ebuild 790 BLAKE2B 817ed1a14a05e6db318b03c35b1ff722cb578fdcb6a083d0742ef660baafa550bd92933c4c3d07de09c03ef5fe688090333099119cbdde224d3d36b6847ff16f SHA512 954df202a1889d1c58f2bf462817955a67663e17de4a94531ae725dd8658ed74a86f2dac97861c7821ad8b70bfa79e2cfe839790e98e4d01be5af79fed07ba5e
+EBUILD capnproto-0.6.1.ebuild 790 BLAKE2B f67a47e89c832b5be595e09989f8e2d5fbfdfd15cb0c34fd0211a4d0c492e023ca89ddaea546ce516e09bb5f636a97022bdb1539a7c230e4dd5c8b20d580378b SHA512 ee6720ff57616d0262a5a7f8796717f62a18cddba80479ef9480d5d9d847bd9b359535e40b8463a1abea8b40f92d8fab2d00e47a989bdb2f0a7f40ca9f4808f8
 MISC metadata.xml 346 BLAKE2B eab1f05d43ea625945b539ea49039ac08905f9b4e0d6b85ace2c1c31cc7aa6719b15697e75d472afb2900e3810c19c091fee57f900f8688cc3586d713ec4206f SHA512 c3c8f965d691c76d1f31fd9d8edcb1c623eac59b81caf4bbd51a184a6b7f8c74b1c1459c15957341700fe443c18946fbaac0a28b46976fa23cd55c9e57a03879
diff --git a/dev-libs/capnproto/capnproto-0.6.0.ebuild b/dev-libs/capnproto/capnproto-0.6.0.ebuild
index c0c951cad31c..6510e318c5e8 100644
--- a/dev-libs/capnproto/capnproto-0.6.0.ebuild
+++ b/dev-libs/capnproto/capnproto-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0/060"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/capnproto/capnproto-0.6.1.ebuild b/dev-libs/capnproto/capnproto-0.6.1.ebuild
index 483f105f07e0..fd4142995470 100644
--- a/dev-libs/capnproto/capnproto-0.6.1.ebuild
+++ b/dev-libs/capnproto/capnproto-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0/061"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index b8866bf660a1..b0c5007c9a1b 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,5 +1,5 @@
 DIST check-0.10.0.tar.gz 769119 BLAKE2B d5e256bef4aa010322844ce748e620ce884658d74b14e1ea5b0e1bbd4565ef7b0cb7b86d315a36f7a5e4d225e40f242ff9730790bd55fc036757b4296396d153 SHA512 82103a98382c41cf16f172ded66c0399d3da6eceb6728aab11120c028e8796f6d545a98dc4aa5f76ee68c0bfd1f842a4dd371f5d670c8ba84ce4209812bf1ac5
 DIST check-0.12.0-github.tar.gz 281127 BLAKE2B d7dc89c10022594a37e9a4bc6b9fe1e8f355af864a5012c292cc3f1152e9e3e9be01fa34b39e5168f65650e540f36dbc8195952908a871d1c111283429f2f538 SHA512 f7b6452b69f999a90e86a8582d980c0c1b74ba5629ee34455724463ba62bfe3501ad0415aa771170f5c638a7a253f123bf87cbef25aadc6569a7a3a4d10fce90
-EBUILD check-0.10.0-r1.ebuild 1814 BLAKE2B e28733e0697de60412d040c06c6b3e6ceb649d4221774859dbe328ded67215980b3de770b705e098f3ee529c0c2bcc5bc5bcf937ca0de6d1726038ea5eefe0a9 SHA512 4c90aa710e4c5605b76ccd4f5ffb6048225fee346d6e9b7097fb5c20fe098dc214feae702381b2bb3a2d1b92c87601950c4f8a3bd43ef851ff5cba7d66e304c0
+EBUILD check-0.10.0-r1.ebuild 1810 BLAKE2B 106168f6f135594653ce061d0dff535ba56d4d9de205d994d6e3dd91405496fcbc6d3c3835c3bf886a8cb29b7775fc8001024dce3e732028b9e6c5367da14d45 SHA512 9ce0cd9f3b3809823f4bdd5441351528ee04f4e470ca2b4f7f2622e5c4c22892870008fc6e9179e3d03225d709055c995e44767d5b07367d39e42bc07dbd0d56
 EBUILD check-0.12.0.ebuild 1706 BLAKE2B 72d9518956b23df84abf16fb72c86e7bd6015005ef60f859c76ea7f7e5d767c8cc6c44e823ef31ca1457b4523334e04863abc2915864366e51263806d65872fc SHA512 c940bdecfc5a9aaa01d70136929b790205af4959af8ad92c4b17c7151f8e51715e24267dda58b011b7aefc658c6f90ad027ac10d3510202419a00191813f63a1
 MISC metadata.xml 363 BLAKE2B 5cdadc9ead8f98c8a417954ff38f8c32a79ee2d0b12171204239305d66e69247758ed237b45e369cb6aa40e4bd56777f74296baecee6eb571801f61e3ddf730c SHA512 b025f88785c7d2f4eb01ccc5f9730c2ef81171fc94a01802f7832088eb20aae42aff7cf4ecd89c3de6e87cf583f873fe5ed9dc4c7fab9f124ce3ebc8441ccfaa
diff --git a/dev-libs/check/check-0.10.0-r1.ebuild b/dev-libs/check/check-0.10.0-r1.ebuild
index 58b13fb046bb..4f0967eefc85 100644
--- a/dev-libs/check/check-0.10.0-r1.ebuild
+++ b/dev-libs/check/check-0.10.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs subunit"
 
 RDEPEND="
diff --git a/dev-libs/dotconf/Manifest b/dev-libs/dotconf/Manifest
index 9013fd356d7a..2c9b7b709b59 100644
--- a/dev-libs/dotconf/Manifest
+++ b/dev-libs/dotconf/Manifest
@@ -1,3 +1,4 @@
 DIST dotconf-1.3.tar.gz 333301 BLAKE2B df3f4c9bc4539ed5b21bd4d6059bd911bb319d9dbe4f48c6d45c34559eaaa646abea847f6d0b35678c12d9b5e89e2f112047557d458be608215d76bb50af004c SHA512 ced0e66f70d11a309e77add1bfac1da8e85dcbe193633bd4bd1ae4bfd043b66880406e93ec18327b8c5d3de8d4bfc5278db6e5cb39b030ee1dabfa1ce267a98e
+EBUILD dotconf-1.3-r1.ebuild 604 BLAKE2B b5de58e667252fef1b956a43f273c0c9cb508dbd3f53739ece61ff3d37b857013f3ce20338f49e091b5c26fef997162994fdb66744d2069bbbd16ce650a80d74 SHA512 976a231075967bc476b416984af31bd38ba3b5b6ebc3a13607559fed50feb29f94fffccdbfeb2c406809ff27663cdd442fbc844cf32f057e550d529b826bc833
 EBUILD dotconf-1.3.ebuild 650 BLAKE2B 2f8da66670f02a809ab4c861aefac4a275fd7de30f20fdc7c894c7ca7308d88be12a8791f2334aa871116c05c2f591021d3e2de348b2df7be64acf6eb98b6c06 SHA512 81c1595f0382bbd0f90648b02fd030c9aeacfd1b146786f0f3fa3aefa5901114311ada7de8f692dd696021d77095acc58108de6788254dfe44f08c48efc819b2
 MISC metadata.xml 444 BLAKE2B 32e2f3c775e22987798a07050c3e2446d658f9124ae02b8edf60d05cf65b14b68b912987838930518e100e8e09b914b493ae71a1e60aaee758517799ec065ed8 SHA512 cf7e9367f5c1184b089375d0922a60e01bf985b215c59b2272dae535c948d5d1044de614013cd38978a28a59b28d86cc6d60085d5c39f59ea6b714309c8fba86
diff --git a/dev-libs/dotconf/dotconf-1.3-r1.ebuild b/dev-libs/dotconf/dotconf-1.3-r1.ebuild
new file mode 100644
index 000000000000..22a423f82214
--- /dev/null
+++ b/dev-libs/dotconf/dotconf-1.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="dot.conf configuration file parser"
+HOMEPAGE="https://github.com/williamh/dotconf"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=">=sys-devel/autoconf-2.58"
+RDEPEND=""
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+pkg_postinst() {
+	ewarn 'This version requires that you run revdep-rebuild after'
+	ewarn 'the upgrade.'
+}
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index ee2186977d2b..c736aaa8fb16 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -6,5 +6,5 @@ DIST expat-2.2.4.tar.bz2 505038 BLAKE2B 4d40629621bde41b44cdef4fa37937ce064cdbd6
 DIST expat-2.2.5.tar.bz2 510868 BLAKE2B 9d4709c2d157a04c08afd80b05f120407dc320023c3dbfe9e6872fadf0de2d6fa497f85ad9a21679fa0689c13cbb25adfd92912ae374d08de791dfeb4eb6918d SHA512 8226970a7e5d2b8d7818081758ca59bb6ce2d655feaa9d3a92481629000b73fde4782f50343d58ec4e1cebe75649e1980f636775a731d8aa4b55ceb843d9f637
 EBUILD expat-2.2.1.ebuild 2346 BLAKE2B 7a343c52553b838d76536142f7e67b78b02668c3a2efca8515f63ed6e9df5ce6f748228be4c6a3145487bbb2f7574df84bd3e374881169bdeba734a54e1c6195 SHA512 535d45f523a083cf3c3099ae912d3508a301a098239473add3ea6834e08fe386098346db810672038f361bab63b62bbc310a0710b9946546c154bc4dcd683be1
 EBUILD expat-2.2.4.ebuild 2538 BLAKE2B 9a758011bc642c6ef1c51661b0fe5289509e6e65fa19bbe337bf0758c6f00fc3b35191330477a4b2d69b828298cb796b754cb2c2a66729a902390b018a7933b5 SHA512 d5a54082586a67a06de13d5693ee1e2b9c604df4e021f9bb4fb936e6a413d6583f7ec16f1f9b4086cffbe29260e3acf968d376020ddbeb5a0a632312dfb7cb54
-EBUILD expat-2.2.5.ebuild 2599 BLAKE2B 8489521884ce616c2651c071c02c379a469bb65ef70f607026e62a4bbf6f6fd22be19dbe9ab1e8ab20c871becfa6a55837fd1250c3d1671a101b75174be5711b SHA512 b9417d95b2388b88ea42c91c4ddd34a016c59a736b9cd4d52d4eb1b82523d3c7b9067f120e521775df98ecb1c93267eb12732f90f05bc90dff01d8f5979d33cd
+EBUILD expat-2.2.5.ebuild 2597 BLAKE2B 768f29eefdd45ba8d365ca71fa4746a46afb91b08f93bfd1a763c90f8e59fba32d25a9377cdde490a24d05d690de748be6e44f65d10e5b5edbc067c68670439b SHA512 f78592f6e42ebee1c4fdd8864ea323adf682acf4abc23ccb48895128b672b94e88355e793f098f4c771aed8994f828fa14fcc30f959735ed848dd71e797016ad
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.5.ebuild b/dev-libs/expat/expat-2.2.5.ebuild
index 89481cd1dad5..a4ab3b8cb0e5 100644
--- a/dev-libs/expat/expat-2.2.5.ebuild
+++ b/dev-libs/expat/expat-2.2.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 6bb3cf3cf84e..fbd56a9b7397 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,6 +1,6 @@
-DIST girara-0.2.2.tar.gz 72553 BLAKE2B fd1475162161233affbc906c2aee21cf23b9274a821894df8f2a62ec877eabaee9ff6b4eeddadab12469e5c090f72d2282764382b3a0f8e270b0b2af9713c8c1 SHA512 216f737843523542697f995c08792adfaa0961414b7002d9b2740cc54f6fc94e61cbf06d5a71fa3e56637ad7594fe8c7cf5abb96784ff492c8305c2a7848ec8d
 DIST girara-0.2.7.tar.gz 76723 BLAKE2B 7438709e15b9272260cfa9f5419b40672a2c33b2cdeed1d915b51b4d53b301a4347cb0c051155a9a20b09b61efb0ee13df7eb0fdc3a94d1a428a7cb1e296f0d2 SHA512 4229565b8a5fad1ecbf42e4f3f852644964a7d5c90154dab9b7dcb5ccd5f25731911452472bbeb28927d1e30d4df6ed066926e11c6a73f0fd5740570493a036f
-EBUILD girara-0.2.2.ebuild 1369 BLAKE2B e56c81a61ced43a2cdfffa645fb58358cce7b1180a80cd0c66435f8f6b018e5121d149801d002d21b62bdf0a678370aee3556eabd2e1d68a09926dc7ae58f77f SHA512 168f2dbbf5029edd06d0293b5a779cf37a65c37099095e25fd3dcd57aa58dc9dc67e0733f8d60041d317abfc0840de348f79449b1308cbba4cac026fe9cbf572
+DIST girara-0.2.8.tar.gz 73646 BLAKE2B 08a3fea194922cfb84793d14905f15aac6e73daf3c4304842b88e7f517046daa287deaef770176bc06358b37c52418f1e42204df302c2c7d4f82c2f4a10a44a9 SHA512 d853f8337a63ae2ed319547a2daa2ccd3ce6f31b3dbb52522705c78dbbb94da1dc1efc4ac62d3c2af94531d4dea309323b878619ea0c9778c37960791ca0cb4e
 EBUILD girara-0.2.7.ebuild 1412 BLAKE2B c9069c137145b4d932a24b33588a3c340a18198b9bbdfb850b547f92b8b24c9dfd6b5efcea7a930443fc1b0713dd289800d138065bdc5ccb1b6eb025f0a50bc4 SHA512 2aa6417cc01dd5805bda754847f4d7d37426daefe62175e36bb3f314bfd30a3cea55f70502c81d6e4c8aea69bbee11c48c79c7f3745fa0596b321fd8cddd5be7
+EBUILD girara-0.2.8.ebuild 1415 BLAKE2B 5d9bf05a1229100f8913c3058cb48f1a3990a9049cd1375741658254005aab9d9f49b9ff159e0410391e517a604b6026f939608ca21b5b93303836f2338f416e SHA512 8be8ae50099e1f8e54eb75d365f035e7c160ad7c427ada8c51f900717e87f05bb323e816db3b3cc358bd96be86ade7c1929f4d955882a8b5da781c7a997ce666
 EBUILD girara-9999.ebuild 1372 BLAKE2B 1cf16cfdd6b6d85ba63bc21b61256dadd080fa756cbe86d5d486a0ca1338403fd1f76d8f12f6393ae8415f05f890bf0e1da6933ae693a8c851097d6c8574877c SHA512 90d5fe8e9b14cc50e825937e6868ed30e8849298ce7773c11cbc4a0347cfe5d08a830c4143114bdc306f7fdf0675f3afaf16d9d80f16225940be5839f70dd9e9
 MISC metadata.xml 700 BLAKE2B a40c7ce11c9e6ccee885e8da21856f4b74b9845b358f560e7cbd597a87cdc70942fbdc2a4a30c0ad156a964c4c07754ccd03be8be9a98021813dabc12c5483e1 SHA512 96d4e1a4d9d59be1e2613ae45def5357af5a20d2f9511f1f56418bf2eb3e41198a062ff3af741cfca9b644201703a2e7979cb533c4e00fc9b85336844b10e5c2
diff --git a/dev-libs/girara/girara-0.2.2.ebuild b/dev-libs/girara/girara-0.2.8.ebuild
index 2f5449d8fa92..6b885251d866 100644
--- a/dev-libs/girara/girara-0.2.2.ebuild
+++ b/dev-libs/girara/girara-0.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,19 +17,20 @@ EGIT_BRANCH="develop"
 LICENSE="ZLIB"
 SLOT="3"
 if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-else
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 fi
 IUSE="libnotify static-libs test"
 
 RDEPEND=">=dev-libs/glib-2.28
-	>=x11-libs/gtk+-3.2:3
+	>=x11-libs/gtk+-3.4:3
+	dev-libs/json-c
 	!<${CATEGORY}/${PN}-0.1.6
 	libnotify? ( >=x11-libs/libnotify-0.7 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	test? ( x11-apps/xhost
+		dev-libs/check )"
 
 pkg_setup() {
 	mygiraraconf=(
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index 3fb1f0ccee49..be17bc409eb3 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,5 +1,5 @@
 DIST jansson-2.10.tar.gz 487855 BLAKE2B b1d83ad1a37e66cb7c497284a7958882d5a7e13cec2260d9cc2b5eaef648feea66b70305dec9193f10cf77f37bdda17605277ea41735708ca6a9898b79fef807 SHA512 e331d5c097b4acb0b1df7d90d1d3453c26bd34bfe2e06af0027665bee9efecc2bc61cc7ab5b70dab1262bf80a3315ffb53b4176874fe07e20eee4b9ea7071d44
 DIST jansson-2.9.tar.gz 485095 BLAKE2B e874738b5bf1783a9d162f2cfa8ffc81a833c5e7d69a41a2eb298b130550bffb44d3caf2f6a524ac2b902952b31ce0cae8a9213186801bef818c31e43a202b59 SHA512 ae239e1a825c252d7a3b0ee97004c129a0968f7e9da8679dc665a8e54a34c073b0c274bd5af004700b442f7b703bcc76f5e3360ab82172da7203b3458a5e9cb9
-EBUILD jansson-2.10.ebuild 850 BLAKE2B 379eee10f3c197468b33b09709c938d47fbc8af9d335138568c1d284e21749ac4e159ab9692e77c07df0ffb44dad00479edd216c778850edb6a5a8b44ba1325f SHA512 1fccd4edfae702cad97dd431150db76218e136bab31d056848394f6e6fd893bc5737601e53651382498d7b99907aa1b890ab45480099141f33ebd31a2b23940b
+EBUILD jansson-2.10.ebuild 845 BLAKE2B df18a1634b08fb9426d34a86acd81b4fd38fb67e15bfff9e0539a2facc8fd7de6ae720617c1d64922d4305cddb52585cca0e4e1ef5cb0e8ed56ca5b96a780c8c SHA512 c2d483590d9d71e0f7fd9352645886e39b1bb47145dee92c865ba9110a5026600a5297a79e6a212835b6de659640f2c8ac16beb084a4c27647937ddb1650621d
 EBUILD jansson-2.9.ebuild 849 BLAKE2B acdffea667a7130b43379bf04a8e71ea2cad5b1b834abf5e697b2a525fa7215c449e396548e8dc96eadf500af607e664d9b380548eac08f8c5687c94aa37cb4b SHA512 1882a3cece74d76e1481d369fabf7091c9909cb2a460fbc7e08a47631f8dbd7c0f29e1ecd071339e911226cf25927e527d83910e1e0d95cd918d8667ae0cb156
 MISC metadata.xml 360 BLAKE2B 5f8dda81c918e9d6c2b9c22ecf34ebbcdaef4633aefe1886007f7dbc837e655919d3a20a61f58dca36ee664e39cf570d4a4a26f578c59ee5e2923e0ab8e06132 SHA512 6b1aee9669e285e78836aac48ec56301d4398fe766263c64be3648e3f5904acde901d3625306f1ca3430e7a7f58f6ab2dbc29cb8c5f7e370ab1a5b83e36f38ff
diff --git a/dev-libs/jansson/jansson-2.10.ebuild b/dev-libs/jansson/jansson-2.10.ebuild
index 87de9efc93f9..640f85ad4c99 100644
--- a/dev-libs/jansson/jansson-2.10.ebuild
+++ b/dev-libs/jansson/jansson-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index c55fa16df169..7a9820cab1e9 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,7 +1,7 @@
 DIST libbsd-0.8.3.tar.xz 356772 BLAKE2B 7f45f0300e170f02a0c7d4d0e8d3b56b10035af5a0c5749695978fff549c11ae2d13fa8c85e07b059dc30f458d6b0f7fe36129c934070a77ae185f8be0a4e0c3 SHA512 155b895d6bd62b180718d65a2cda7484946c492d52735a57b51005705dfe4528b6a72e8745acea47b01fe68e3bbbe3c036c5e9998a8d06fc79efe2b96a04767f
-DIST libbsd-0.8.5.tar.xz 370680 BLAKE2B fd6ec5994d1a13bb46d9edea4c6df8bebfe86f979aebb372f4f22dff50d9127bcd400dbc22209224717576b40b42b288dc69433128258705dd23c3cd752f0fd7 SHA512 bb122862ce8b789e530e9ca1a777d4219db2066ad89fe6028a833a5dc33ac0cd6b553ef5a0a42962d4a594c1f410304fd553b8fab583db539989ec7cca85baf0
 DIST libbsd-0.8.6.tar.xz 371112 BLAKE2B adab6c17267e0cff128351efccf5c1225b7dd85dc61dd8168bf212ba5aff8d726fa5be687c041821af9a427ddad9dfcd3630cac9134b9e81c86ab2599e43aef9 SHA512 ece01ced324f840c2cee6321c7dcf97ff123d55ea9f203c1ce35e1b46643dc7b34ef6dc6c8d128252b36848624850b40823411cc96b99a66a401eb1e9d8cea6b
+DIST libbsd-0.8.7.tar.xz 371772 BLAKE2B aa4aa1c19872edf9e7e6ed270275199366345531a48ee28c25e209f17c5403a22269b91ab1c806cb1b54ba33a8464f4b035fe7ee2bc5dddd0a4fda09c540b058 SHA512 605a14eb5d33c0e45c3bd29e585ebc15832e2ed1efa9356291a0562622168da96db1a20766e9dae8910ea0c1516429f43905edc8d4f2a40a5a341a689d08fcc3
 EBUILD libbsd-0.8.3.ebuild 1156 BLAKE2B f217031f7319057cc0a9b3ef7b8940812f9e149f58fd9484a1e6271b13f3b6514a33c0045a0523562038bcfee8b944061e039e299847a53f3716e126888ead85 SHA512 58344f547ce2e835a9f01c44c31f364f162a1ecfbb54a5b056996e9f4b6abce777d7699b6224a5b0642d4d9b12545d269418129acc7c7b392ff03d9ea3287f40
-EBUILD libbsd-0.8.5.ebuild 1180 BLAKE2B c33406ad0de32fdb290b2e9d8532dc0d7cc110253bdb7988a5b740a62780fb711b991347e489729422abbe1e1cef5bd94b005158c3e3029961da150e14e5f6e0 SHA512 999ef1c3bb65735bb30de122b7dff5b7bd51aa0b095b34ac236ba4dd873c78cde054c1e278725aff8c55f186f91e390ec2b6ceea61d24f9612f53a29db8ddb8e
 EBUILD libbsd-0.8.6.ebuild 1172 BLAKE2B 118b1fbc3582ad7ba47d3c6e752552eece7fd62aadad34281d9d4b9a60290b14c5e15a155e01494828780a1f964c28b906e40b316681aac5e2b0b5836aa985b5 SHA512 54c0874720539ca96d5ea789685e9d20d1904cfaffc5ee52969d292e638b0b65ac22293cafcb551a33229cd5dfe54c229390a9ce278cd4e959c496e4325b2b9d
+EBUILD libbsd-0.8.7.ebuild 1180 BLAKE2B 485f9f85395b785633baa62ba88741c30737e36f190f9fe20ea2093d924c64963296c10f1de5852418a2a1c697f2c463baf7ae963449300130d58bacf6cb3db0 SHA512 6f44e592dcfd2d71bd65bedf7107dd71d8eb0ee76b1f0ac20a1e386fa1abc296bde0381e4757e1b7c2f981134f0b59bb30e4f96a9fada6fa74187a6bb2cef063
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/dev-libs/libbsd/libbsd-0.8.5.ebuild b/dev-libs/libbsd/libbsd-0.8.7.ebuild
index c9b85c118e93..bde7f808bf8b 100644
--- a/dev-libs/libbsd/libbsd-0.8.5.ebuild
+++ b/dev-libs/libbsd/libbsd-0.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index 774c1ec39a2e..348229c5fb51 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -11,5 +11,5 @@ EBUILD libbson-1.1.2.ebuild 975 BLAKE2B a7c1cc4f20a4849c54cdec5810b5e157f7560abb
 EBUILD libbson-1.3.5.ebuild 1145 BLAKE2B 6467960799504edf6ad9ecd42af2ec474e0884cc63380cf736a0e771a5994f7aac46236965c5345dc4f5576ea4fdc7070c9d4579a1189e96dd9200dcd079cdf5 SHA512 015f73d09a48b70c80943cccfcba82a4978bcbbf72e41d5f44fb3137b81384f78e3811528f5292b4d57d88ebfdeab03f2779552ecd0359b5a460d054eabe83e5
 EBUILD libbson-1.3.6.ebuild 1118 BLAKE2B 362ca8d609da74abf57f541c4bd8c91a0634dea5b734f6068f9954bec665865f8a597b4e2587740720bcd955a73151eb653059e4c4641bdb2f7a47eaabeb65e1 SHA512 ac2607347570113f109d85d20d24c918a133265b3ca2497c108b30b80e457d33275a30d6a1587a5af87134f3987996048ef9e0ba2e555829cb9e7bad3d540feb
 EBUILD libbson-1.6.2.ebuild 1024 BLAKE2B cf1c41f81d03ba6cb2ffea9728d713540c2aee97b8fb3f4ad1d0371233896a23857c8d166aa683fa22e5e81433a37da006b2716dc316700df34aad5755e26cfe SHA512 aaf96d91eddb70e532fde927aaa7e412b46d5858a46949597e3729fdef23869c5e2e4ac49c90fe601319689fe7437072e54f5db6f936cb875b2a7560f7e18331
-EBUILD libbson-1.8.2.ebuild 772 BLAKE2B 2ca9dda012fe40a7078258356ecfb38943d91ae54fdc9d1cdd84e0c9830e30fa1b1504529702f1194759fd2f659a548e3b369bd750234a9eea472ffe30a5c410 SHA512 2a585eaf63e1c7bc2c74302d59460cee44b5aae81406902b514a90d8cd9cad6c10fd4fbc6df5888b16e1cb459cc8d49fd6309f07a8ed4e57e300b02ebac10530
+EBUILD libbson-1.8.2.ebuild 771 BLAKE2B 521505b360cbdbbe236d5dd76d7c8a5fb65851e81724de7ccd60499c2cfaed0b4c6c16fd78f5f3c4cd898702ab2d0d615f92994563f9d08e90edd921b0c199c7 SHA512 a23c11352a751049df5fb368b4d5680e670ac930d14b833e1789139d625a27437ea1ffc287c16bc855d279a8bb36d4a71c15b271731d054e77f8a9df909cde05
 MISC metadata.xml 404 BLAKE2B 09f99f8595c089c30e13406a3dfe969c444b325dd1fbbd8ced6c9f3e257556dfe5ef762bd97cc16067c9691dba04fe38e855280c2058d90e7970a01474324a98 SHA512 081d2001bcf61d7cb00a36ddaa1869cdce615fa706693efa907676e4224c297871cb65a3dbc64397f87b29c751125735b35ba595e4344a654f2682092411e8c9
diff --git a/dev-libs/libbson/libbson-1.8.2.ebuild b/dev-libs/libbson/libbson-1.8.2.ebuild
index 1cbd090d5d82..7a17bcdd3ea9 100644
--- a/dev-libs/libbson/libbson-1.8.2.ebuild
+++ b/dev-libs/libbson/libbson-1.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
 IUSE="debug examples static-libs"
 
 src_configure() {
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index 4c2e2f8b9e67..240e211e366f 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,5 +1,5 @@
 DIST libebml-1.3.4.tar.bz2 606205 BLAKE2B d13c33777e9afbc4d370e0b8e68fdcb42597fbd62f61197a4aa72e2b229ef06819efc0864f9783c87c90f8fcfa572b02d9b1767b57c31c6bc22a020b9eace94e SHA512 ebf5b71afe725e40ee6415463e51ca14810eecc2fef186caacd0269077f5febeb62623fd48674b21ea732f43a620d0c91603fa48d3f8d163284d1cf204642194
 DIST libebml-1.3.5.tar.xz 274184 BLAKE2B 954411bba6fc9ff3893a17a5147babff18352ac2c436523eecafac8e2921dd968e83f5672428f4f22e61cee97f7ce1a4f905781b4468cfd9f3ea7d8cd15d961f SHA512 cdf05015724919b19281bf99c562bb7e0bdf16990da274010f664ff316b6ce95ecbeaa1e479f03505281a7f45d5796aee6e7750a9e1c0596b630911d220dca24
 EBUILD libebml-1.3.4.ebuild 834 BLAKE2B 11fe2d8ebf1fa93a7fd9c866a9bd556d00ce6da0553be6e39b85c61e711a8277eb3f27e212c00609cb092f16e7fb403285ad29623f7e8941a7bc7c96443becd7 SHA512 edc8bf5f0137d8fb44335b0ceb64a66c98d2eb88bde15b93f7350fdc2b80077006c5e31c8ea567b0ef6050f08789a1566ccdeafb8f6ef98e3559d344f85047b4
-EBUILD libebml-1.3.5.ebuild 841 BLAKE2B 8225594201028e9bc9c8e2bd8b03d06f76e9cd66d6e4cf09bf4da555e33563d825e3940aaa6d8bbc70f8470e407964fef719a1afb0e85e5652d231643f37b69a SHA512 44b0b9e74cfdd0ad4ddde85c1a4ab380aaa2f40ddf9f251f5ee77268eb0cf2718872ca7bf0a615d95218acf4c56889d84917d76cd4fe66b4b24d3029560fa615
+EBUILD libebml-1.3.5.ebuild 839 BLAKE2B e67e06ffacf1ce95a400056ee84d357a859003edd8824458d6df2f1795271e3a8a3690c6540f85a8b00c6d86535a6badfc5c60f0e2c3923b3ca8ad01f38da591 SHA512 f338f18d05e03f80b0dac9e19aaefe4f30f9f617b4e8568a8f3550bd7acfa9ba8470dc638c87e895151d6a377fd6c9e5b69551dfc3befdb72c6de8a14f30c76b
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/libebml-1.3.5.ebuild b/dev-libs/libebml/libebml-1.3.5.ebuild
index ecc1cd998b6d..a56f2901e345 100644
--- a/dev-libs/libebml/libebml-1.3.5.ebuild
+++ b/dev-libs/libebml/libebml-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug static-libs"
 
 src_prepare() {
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index 93f7c7a78dd7..a3b5a3417514 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -1,6 +1,6 @@
 AUX libev-pc.patch 1031 BLAKE2B 395e57ac5b71761c9603bc5355265ac7bc73aac78c2d6e0aaf9a53cc378c4a1ea3d819960d412e3cf0b6081c46fcf2120b6cef0ef9aa8be26d64e1241d090217 SHA512 09905e5bdd28b06e92bf0023b659c339e2dee05c78657f0871275ad3816cd050db346cfa6621d569b3b12977b2f99a63edcb9a5613367167d7187d705ee44fbb
 DIST libev-4.23.tar.gz 524184 BLAKE2B bb8c15665e0ff59322bc2f076f4256ca8f5acff5bc55bb3f5f10ac9704f9311ad90f581e4ced25dcc22c39988ffacce1958f195234a60039d33ba7b7beb9aee2 SHA512 e3d98364b3788a7f5c56be49b99cecc98da6323fc7e6d47aff808580653ab9effffe88636a2f5d357d596a9a580e778c20139cc162467e3e2c5fc736713c6e39
 DIST libev-4.24.tar.gz 524264 BLAKE2B 92a480cfba67119c630211b9acfadfa2dc6ab1806ed015cca693829fa6deedeb4fc5530aa47e0a0d21304b0f626136110596ccdbeb75bc13ea5d23eeca7b9ded SHA512 e4cb3b5dd4b9828d5b8da840c73ae4604258a8c4330aafa5472298b83bf944628f36918f0ddd47d9069d255639f0b24a2cf8d349f0644ffd50de823bcb54a31a
-EBUILD libev-4.23.ebuild 1102 BLAKE2B fc232651dd39079c40395ba5609f3269fb1364e74cda5edf1c2652593f59163a6d4346e780362601070aff9332f9a528a2369b5f46755099ca0ddbf8a8d1b63d SHA512 59e0ec5435b84f9db4f5086de6ad09ea6a814cfb2952e1f80ae98abe35f8ced08192a7c149deca7e89b7d1425ef83860d44b7d9883d6d4448bf962ed4970fe91
+EBUILD libev-4.23.ebuild 1098 BLAKE2B ed8a663be761548bf235607134c83f867cac6a090dad8a1a0fd27ae79c7124308cebdb58713631c23fa98eb40515bcf39f6d5d3a7e1393738982787f304ccb31 SHA512 ff3e6e3d8674b5c82f725039cc302e80600df10d4d428e1986720710409b9d26a2212a52a6c79c4ecc5d83bf7ebbabfd3226be377269dcc67dbe63ded9e27209
 EBUILD libev-4.24.ebuild 1111 BLAKE2B c1251d01343ea745e8c3fd5ffd11ce267bd2f311b039c09b4cc2bb7b5ea3bc1fd67103c63d9b2369eb68839ac399e7742ee0929a764cbd6faf081fb65f3f4eae SHA512 cac9462246a651075f49f3a5d8009d0d0e2582edabe159fd2d5c8134dbbd66ce270a883a371a7d9758a0eb21b88a0da9ccd80f3cd27e08ebaee41305cb16d642
 MISC metadata.xml 246 BLAKE2B 65c152b918cef5b72db59bbb3fd1a71a6fd444bbbb3e95a87aa880e23f33d418b96f842f4a2070ad1bbd0c1d1c3753e935841e6fccf088954bb58f297b672dc4 SHA512 9977bb6fcdb8374bf6148fef57fa31bf04fdd8eb3701ecd75be5ea62a48382fb0ef703b3d01bbc996f91322b6fd0f8365dfa4134426770fa98d624d69d8073d9
diff --git a/dev-libs/libev/libev-4.23.ebuild b/dev-libs/libev/libev-4.23.ebuild
index 9a694ef1a9a5..f325fb0596a8 100644
--- a/dev-libs/libev/libev-4.23.ebuild
+++ b/dev-libs/libev/libev-4.23.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="elibc_glibc static-libs"
 
 # Bug #283558
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 63fd0c460d83..a1d781d74df8 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,5 +1,7 @@
 DIST libevdev-1.5.6.tar.xz 407024 BLAKE2B 1475de52bf27b505fca1aee3d98426b68cd8a7e05c126c94c7824915a091ffcf2495686c4d0feed628fec73a5b5c7c8bf70e062f25c06dd28024ae11e75b2868 SHA512 4e9f44e0957d9d83e46de095f1eb8a64d7db808ac5a397d266ec1149948b82aa3f123fcf3d47cd72aff2741cce13b2162324c195f892861de97d7beb19ef6b19
 DIST libevdev-1.5.7.tar.xz 407452 BLAKE2B 7558bee09dfa1bfe99483d32c99da6011b8234b3dd19084c9d88eb69aafbf221d6f51ee4f0f360225f2aed40b7ff49052256704dcb9e592947adee175a1f40b2 SHA512 53adf6c92ec61f0635b643a88d8762a18f7cd3088d23ac95831be32cc7150ebd19f20265b90f6a1f9a63420c2f8968c2d17d8dc4892c0e90f9dfcce82c622df1
+DIST libevdev-1.5.8.tar.xz 408132 BLAKE2B 82f33affe2ac285861dc584f6e8dd6a79e4ed52820b3e16c330037b28cc5f070c55eecd9afc1b5ba34cfc88063d63c1cc8ec63e27b7380a123330eb5c5ed8b9c SHA512 e9485d8c6b48ebf762b32b003bc6b761c548024ad3bc34a0793485b53383746881fcc9b206a078d571937291e519d9822e50c5d8816778d347094691b65ec3fa
 EBUILD libevdev-1.5.6.ebuild 652 BLAKE2B 2c58e3595d43a4502ad48bd05ab28e1d0b6193b944fbcdb97bb8d0e6556d4acd5e6dd27f2375e8a83feaed068220653160d32364d471158c96c1ab2d13133376 SHA512 27b180e3a64a0221fc8a10b4a7d7f26b7e37cec8206404a48d1628ef248948a7e5d04541ecaecc212064c482e8ed5856948cd6eb3a41b51df689d838389fd104
 EBUILD libevdev-1.5.7.ebuild 657 BLAKE2B 85517866518fe08a57aaef66b5ce3f907f0e6548fd5cdd1354672126983489856218f9fc6092edb508baff78499f2d5aca5906a7be72aa655ef73e11653bb0c5 SHA512 86cd614cff11f8a8d9001a6933bd3a08a0165154c1688ec914facd1637677462774f82f0f7a3ae2aff02352800f867011db60c8351c1c76ae7a0e44e7ab625fe
+EBUILD libevdev-1.5.8.ebuild 665 BLAKE2B 1b98370c34be6709965b27cfc40ad2933c21f0e00ceac046e68bd349eec791e92d00f954365e0bd9872b850960a32af319481a91e33e02901d28a54336a4f145 SHA512 d4a0f50bc8a45952849f00eafbfd58a103abf752fcd4237663a9e444a3a4eaee4780f308090d54b3bbcba0d482aad85ea0ed37845e21a7357a6776b1e6451bb2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.5.8.ebuild b/dev-libs/libevdev/libevdev-1.5.8.ebuild
new file mode 100644
index 000000000000..8b9f30261c7b
--- /dev/null
+++ b/dev-libs/libevdev/libevdev-1.5.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+XORG_MULTILIB=yes
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit python-any-r1 xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/libevdev.git"
+
+DESCRIPTION="Handler library for evdev events"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/"
+
+if [[ ${PV} == 9999* ]] ; then
+	SRC_URI=""
+else
+	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
+fi
+
+RESTRICT="test" # Tests need to run as root.
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
diff --git a/dev-libs/libfastjson/Manifest b/dev-libs/libfastjson/Manifest
index ae804286c7eb..1ff19e702c44 100644
--- a/dev-libs/libfastjson/Manifest
+++ b/dev-libs/libfastjson/Manifest
@@ -8,5 +8,5 @@ EBUILD libfastjson-0.99.2.ebuild 845 BLAKE2B f6a2a5b117c7f86f68c3d6fa4c85669f776
 EBUILD libfastjson-0.99.4.ebuild 789 BLAKE2B c905cb98cebdf179660cffabd316fe2d31d6e1da20a532df0cf74039aac0006280c1a9ef346162b3370c5916c7e0b532a11096efdf63cfd37bb473e180903e27 SHA512 b8c4fbe3608dc700cefcd5df756938ff84512b19d5645b9926d0049b6b27ac0bd560d8552d96b4534f8577e3e03dd76736f48c144089f51f7e09611158d46a8a
 EBUILD libfastjson-0.99.6.ebuild 798 BLAKE2B 09e1c0e8e57ba5105026a278157515f8f16e03301cde6fb5570e32b77290e1cd91aa5fcb9a09e59d6215b2e089a6f86bc7f44b70a81d6d5dcc3d320939d4cf47 SHA512 bf42cf408c173eeb17eccfe838be353334571610d3ff6c6d0de4af6339276d27cc5b87d8405b11310af639ee0ce3e31c4ad72dea51bc05fdb459eacd9f521641
 EBUILD libfastjson-0.99.7.ebuild 802 BLAKE2B 534983a17ca7f60f2bbab10863504fe5831ce7d8f70bd9e91f3741059ed37c12cbf49e7b78445243bb870608a16157967be48baab6b1cf9d13de7881372343c9 SHA512 d5dfe419c5660fba3d6a99ee4d10299a0d88ed3af62183e9ae820c464e058583140b1dfff8c64e29107efeb43a1ca6011b92d1b48fb6613a00ef61273c20421b
-EBUILD libfastjson-0.99.8.ebuild 802 BLAKE2B 534983a17ca7f60f2bbab10863504fe5831ce7d8f70bd9e91f3741059ed37c12cbf49e7b78445243bb870608a16157967be48baab6b1cf9d13de7881372343c9 SHA512 d5dfe419c5660fba3d6a99ee4d10299a0d88ed3af62183e9ae820c464e058583140b1dfff8c64e29107efeb43a1ca6011b92d1b48fb6613a00ef61273c20421b
+EBUILD libfastjson-0.99.8.ebuild 801 BLAKE2B c55a2b6020be896a516b209526b77aaaac2eb2f4562b587397c3c113a4f16c3643e94442aad719048b101162ba13c3331ba76c8eff27c8114387078d8da3761e SHA512 14138e8408ea6c8049dff3236ac11da2bc45390dd546bb04cbcf72e1ae52da387990f14b2fb270bb54e8a8365fa0437deacfe44f1aefb8aa40d13aa039f2f0b0
 MISC metadata.xml 475 BLAKE2B 946401e3ea48549fde46fe9433a69aadce62be5d9f9f7b5caff83106e1b494405f5765515537d590fb6119f7a262b24f9cece25a751b34efbbc1cb08b9591b2d SHA512 e347c97a42efce88d50f71438072af0cc1c758990873985a6292606b6e2af8797a63c35ab549ace15c50dd0120d465d0f0b38b24ecf08160fdda45738082bf82
diff --git a/dev-libs/libfastjson/libfastjson-0.99.8.ebuild b/dev-libs/libfastjson/libfastjson-0.99.8.ebuild
index 684987488e61..ec9759901f85 100644
--- a/dev-libs/libfastjson/libfastjson-0.99.8.ebuild
+++ b/dev-libs/libfastjson/libfastjson-0.99.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.rsyslog.com/tag/libfastjson/"
 SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/4.2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 IUSE="static-libs"
 
 DEPEND=">=sys-devel/autoconf-archive-2015.02.04"
diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index cd344d3949c0..bd885d0953f2 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -12,5 +12,5 @@ EBUILD liblognorm-1.1.2-r1.ebuild 1186 BLAKE2B e79b4b33ec87aca46385a1ed939de37e0
 EBUILD liblognorm-2.0.1.ebuild 1487 BLAKE2B 0981917a8d99334a933cc7c1136029596e03bfa383347cef4114c19ce5ae79965272a4b75d587d4d072873f2b5527520f4a802f1fd1d7c2ae4d05fd2ae9403d9 SHA512 e773b83301151707eef61699d62b2b81581209dbea8e9b26df896452b1026fbc9c825472368c849c15de10a8a948ab75ff70b53fcb5dbe69836e4027997c2bea
 EBUILD liblognorm-2.0.2.ebuild 1487 BLAKE2B 0981917a8d99334a933cc7c1136029596e03bfa383347cef4114c19ce5ae79965272a4b75d587d4d072873f2b5527520f4a802f1fd1d7c2ae4d05fd2ae9403d9 SHA512 e773b83301151707eef61699d62b2b81581209dbea8e9b26df896452b1026fbc9c825472368c849c15de10a8a948ab75ff70b53fcb5dbe69836e4027997c2bea
 EBUILD liblognorm-2.0.3.ebuild 1495 BLAKE2B 3c1881695081f296d23235b0517840ce3930f2e470cf449f9bda426d16e90090c98a388e1d9e3b1fb8d74d6f45f3b6dffd2bc9ed6bf174c8efb212b9f29f1a2d SHA512 1c57e99573af96893554ae3d622c5a90b04b5bda5bd79c8588d883ded230be8173bf8c440b9a5e724bed4ec255639534c17b1636b376d7f454808cc5559c4552
-EBUILD liblognorm-2.0.4.ebuild 1498 BLAKE2B 401e478800e1134fb6ccb2d33edc05496e1b492ec0b885cc8cbf9d39e6f100e2d6a58ff6f75c4c978b5328873a73118d7396a007ea107e89827ec8f3b75e516d SHA512 ad46c6dda5a2ed91792c3f0d60e4b457951ff2383227eacff24bd34d2109210819351a64b5a2893187f15ec3f4aca0e5c7162d50c0fabdcf2116bf1984befa7a
+EBUILD liblognorm-2.0.4.ebuild 1497 BLAKE2B fd37e755422206d6505769a761c53c14148587dc122fc576d120a80e0529689c625a2270a5db0297a585cbad7b24dbe277da96ada7408cdda59c3426fa853681 SHA512 9d613cc129b0299a403ba01c7114337b85ca2e1307dbd7a2356620dfe9bb20217973a6e44c2c6a55e8fc6735db45ce3b7d0a05459372643fffb3d5631c075a13
 MISC metadata.xml 630 BLAKE2B 0090341ab6245d0b9ef50c09b4f110c2dbeaa83a7dcffc0318c72310a2e3d99f31d69f60134ba292e1243618116045abf99cb5e7af3b04894b1a9c11a9cc9d39 SHA512 b7d110a4e2c0fa1131ce3382ded840a17b9776331b5872fdd537a486a53d2821154c3d132649dfc989f5bb5f19a36792b171356aa971e4867f7006f870b4b0d2
diff --git a/dev-libs/liblognorm/liblognorm-2.0.4.ebuild b/dev-libs/liblognorm/liblognorm-2.0.4.ebuild
index 35c8f1f974c0..ab37a2ee9ce0 100644
--- a/dev-libs/liblognorm/liblognorm-2.0.4.ebuild
+++ b/dev-libs/liblognorm/liblognorm-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
 fi
 
 LICENSE="LGPL-2.1 Apache-2.0"
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 09c1f2ed948e..f379f78ad7e1 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,6 +1,8 @@
 DIST liborcus-0.12.1.tar.xz 1673880 BLAKE2B 6f85f1ce04bd7c797f8fccc9b4d860189b6fa9f51623587a668c343e8897bf17a3e62a5465354776044fabe9347ec35913eb1433dc551e4e509ce260ba92c3b9 SHA512 294b24ad7fccae77070edd9d8e6e1a370f609ec8af9a2c58567431e641fc0f3f27c4cd4b6ac1825a8179a22a1d1a81d84827859eb631d2625194f9e59ca1a8c3
 DIST liborcus-0.13.1.tar.xz 1814552 BLAKE2B 27c31a2a6ab2de392aeb36d72417184c37d6f76707b570a0beed53d4b817fd093758381ad4b0e64258d3d9d7d9d9434dfa0be447d9a6c28f47af6fb7496c1a6e SHA512 1c81332974cada2d3526e86ef564211100fb765b611a2239fe6aaabb8666e38a7c8cb52696e5d7c402794ea5b5ceb23b083f7adf2c4417d2e635007d9baa4420
+DIST liborcus-0.13.2.tar.xz 1816884 BLAKE2B e9e7635969cdeb2dcf7274a9d54774ba3b49a40db203624e7351eaca6dfe8c87605a1a5ff8c844f50faa47b88379504cc48a3aa432f75c1d00e5974ef244b93a SHA512 3f79787a62ee0ab59ee61d5b46e1e777b27529e20d6dde9a98db75c8b6c54a11f5f78fa46d018bb31a9ef9df19a60535936e645e5fa43e71bd4e25d9f3a802b7
 EBUILD liborcus-0.12.1.ebuild 1294 BLAKE2B d5fa81bd750f1376f09116ae40f68c5449ecacc894908bb3e706defbcb3cefe0b0866946e55eab79098d7dba5dbb8feaa39efaed741ea6567609e3f78bd38448 SHA512 86b0e04d7223f2932e913013cff0e42c6c22d1540bbe873a90e59c4828f9a528c3942444a993983aad113e75d4f887160dcd8791a6167e0e750851a37e303df2
 EBUILD liborcus-0.13.1.ebuild 1296 BLAKE2B 3a037ff13bbe11b0128d1c2c76d83544e02eeabe5487ce17578e6faf3a2457f0cec2b509d42e328c4d42172a984d59ca9bdcb9aa1ecf9e390854e2e6f174ce86 SHA512 31797d5cd7192a607d84ad19d7dff3abd1fec016818befcbd31c0fd410eb47fce8f61a0b55c082624aca5cf2733e5ef5033803b6c0efed86d211d7da3c8daed6
-EBUILD liborcus-9999.ebuild 1292 BLAKE2B d11ed02c10e9bd52fd16d23e92bc66cbd29890c156af6159d4483a21104e2e675b3e59f535d76fa1d28824ecdce63feb090e96d9aa900de3f2db1f5526e5395b SHA512 396b36969d8b5fe5eddd409f3f91391aa01492e003afcddd9c2b4d7f9a1970c84380122960068ff22dc138953fcd7726d2adf693656a4e5c55c2f20d9c7491ab
+EBUILD liborcus-0.13.2.ebuild 1296 BLAKE2B 44f3a9c2386d50bf86e47e7b4fd8d6c063c10bb66f99d187f4915c731071b7a584ef796b70416ca618c6ea0221f9f76f3f111f611edc078830f30728abe168b0 SHA512 2eed04b7ec34a303c871405a2412f74359afc4376f92eb3e899f6034fe5555dcc8797a2c082300f1e1cfde1230f01482e800b649107565d98abc627bbd1b4fa1
+EBUILD liborcus-9999.ebuild 1292 BLAKE2B 52149e76f11747cc7cb66f05e841038efade9dd9e0b06bf10f93af345461e27f6e9683d7c89d28c83273d153d58f92ba994817f75452f567c249ad3a6cf3430b SHA512 eb81d6e9163ff61123b678f86b4eeee7b7cffb27c8e98e1518e20543c082ac857af9298ea6a997bf69a7876853513b081da755cbbb86c67416741ebef7195e6a
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/liborcus-0.13.2.ebuild b/dev-libs/liborcus/liborcus-0.13.2.ebuild
new file mode 100644
index 000000000000..2f6e72a16cd9
--- /dev/null
+++ b/dev-libs/liborcus/liborcus-0.13.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 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 e2c9f8f07405..a4d905a62839 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index fb8c5618a0d4..dfb229130a30 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -9,7 +9,7 @@ DIST librdkafka-0.9.4.tar.gz 696078 BLAKE2B fa3b5b1cff0ffaa495e0a62c2886665c0d57
 DIST librdkafka-0.9.5.tar.gz 753196 BLAKE2B 48e9c2aba02f1a3c720b48c7962af7a1e26cd7604d325344a1b68cb107420f37a2fad406e256ec5d1ac281cc39aaa2d9831f42db9888400d706b0954f35f5113 SHA512 06b2c7e3dd1c8a84322d256f2470804ba0ac205777cf66c0c98222d3f90ed26d6fcae375ee0343558ccf901d7a8d354009f377a435ecd0ce2d02c73848fbc8a4
 EBUILD librdkafka-0.11.0.ebuild 1238 BLAKE2B 5517b883241ce8a07e44e41c8f9df9859db8a077b8318546761f55f47f232f46d14a4b09b6e7821c45d231eba7129b77b6eba4900cd2deabeac974a59123f3e3 SHA512 1a78a8e00cb86f6b4209023c296e406384948fa2a1c7230fc01b70b0f6fc5ce9e97e21ac626d9f0f9d5590bc51d8295fc2e4c9fab77b872efa0684f80b07f10f
 EBUILD librdkafka-0.11.1.ebuild 1238 BLAKE2B 5517b883241ce8a07e44e41c8f9df9859db8a077b8318546761f55f47f232f46d14a4b09b6e7821c45d231eba7129b77b6eba4900cd2deabeac974a59123f3e3 SHA512 1a78a8e00cb86f6b4209023c296e406384948fa2a1c7230fc01b70b0f6fc5ce9e97e21ac626d9f0f9d5590bc51d8295fc2e4c9fab77b872efa0684f80b07f10f
-EBUILD librdkafka-0.11.3.ebuild 1238 BLAKE2B 5517b883241ce8a07e44e41c8f9df9859db8a077b8318546761f55f47f232f46d14a4b09b6e7821c45d231eba7129b77b6eba4900cd2deabeac974a59123f3e3 SHA512 1a78a8e00cb86f6b4209023c296e406384948fa2a1c7230fc01b70b0f6fc5ce9e97e21ac626d9f0f9d5590bc51d8295fc2e4c9fab77b872efa0684f80b07f10f
+EBUILD librdkafka-0.11.3.ebuild 1237 BLAKE2B fd1e3c6dfdda7b4c543455aaf05d7729e651acb8019c9194006cc05c67d85e4cedd11f63d6253f9cd97777923f7e025ffaa59cf332dfbdc001ad6a3401f552ec SHA512 474d8bf92b2dc94eccf1ecef3559d03ae92eb1a25918eaaa1929c5728ec437ed8fba529e9c644106be1365fa43007b8c20748915270a64c88587eda2bc5e0d90
 EBUILD librdkafka-0.9.2-r1.ebuild 1288 BLAKE2B cd9f140cb8c34659d0121af5e073a29871b6ffb9d1c963802c888927b3f1528d93f55c446c3a5f76c73c4183567414a1d0d55e7b152508555fd92947be924a40 SHA512 1269fc2b6392ecea08d09299f9740e5f2a90b121fcbc1617e63beceffa16db5dae0c2a7a289c0c33ca112ef75087e5c991272967d687cfeb636215cd64494880
 EBUILD librdkafka-0.9.3.ebuild 1292 BLAKE2B b23378509efa2206fb03bc7763fe1ee159fbe2f16983ede1e05971ba1bc534a5ed3617e34d65f42577b85049e641a693a33f11e4eb8c6f21cbdc3b3ab7e98d29 SHA512 a24bb014f1b8fdc8c946b618b0afbbb96a75b925e87d3cf85839c19013516da0a3b622a0373844a353c4022a9aa5b1c91428db0e8995a7d3d92b76934b1d8e86
 EBUILD librdkafka-0.9.4.ebuild 1226 BLAKE2B 62e334f66a75f44e92cd34f9cc23ca5d3f9f52301820f662f55e921741ce49fb53ef9e7de84ba62b8cf329b3718dbbf6611e3cccbd9ae0dd1ea8709afd9e6e53 SHA512 195b6d8f752f432eecf25d53fa3adfa61ed0c89959a582037035adde522814a8d1e0c60b410542e82508fbda5fb0aca1af312779401f932da193fece7accd9f1
diff --git a/dev-libs/librdkafka/librdkafka-0.11.3.ebuild b/dev-libs/librdkafka/librdkafka-0.11.3.ebuild
index 8d6fd40533bf..109a714b5210 100644
--- a/dev-libs/librdkafka/librdkafka-0.11.3.ebuild
+++ b/dev-libs/librdkafka/librdkafka-0.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index 85aacdcfd22d..2769b36d4d98 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,4 +1,6 @@
 DIST libsass-3.4.7.tar.gz 319824 BLAKE2B ca3e7091816474e318fb1eaefa01e5e361a66715b6267500a93f80dfc8b34bdc595e6ddc4b1872e4399093468d4ac06a9760685d8941d92f18e1834df7715b04 SHA512 5d743d4345b11e9e5315aa858637d3388d2b464150a46bc8a712e1e5d1b3df9c1e6b4dcac26f91827f1c38db24a5a084d04c0962a428f2994f42ad66a25b35a8
+DIST libsass-3.4.8.tar.gz 320415 BLAKE2B dc7b377134ffe6619687e3a7f4c47b5a5d79d0dc530c2d301845f2af0956b674a840bb8cacbc764abfb15a001b15db2642c3f51142c746e98a15cca184c51adf SHA512 5cbf5621ee45111f4a31113d2ea39f03be51d42c6e8978e7b2bfd89a8863c262a19fc17a31b910c9547dc687696b1fd4e17f2d050ec2afc4c4266dbc2ad00b72
 EBUILD libsass-3.4.7.ebuild 1096 BLAKE2B e9eb6a53d6155feb93703d991b63b41d45e14e9d8bc556a99639bc05aa02b630efa163dbb8def6328c997c8a987c03a9bab68ff24131e33d541f3f58c0358d47 SHA512 740bc1eba61b1fd5f8faf5fce4520836f63fd1b17220948c48674fa579007b2c8d3e6e389a21b923c1dc94fef295a154161b11f1fbc84cc4198edfd730bf6190
+EBUILD libsass-3.4.8.ebuild 1098 BLAKE2B 67ac9b84f6caae5f4f5b56fed6317642e66cb2240a354714f5e58b976fd16c6e0cf43400154272e6781669fc8feaf286f7e836387506b053ef90242a34b0c7f1 SHA512 2cf59e5ed7533017a4fb7e5ed3ae3d526b3f4c8beaa33f9f2476c7d49508626f723dda7a146cc44e4dd7e930c74b2a52b540cef52b19a7d8f511329d0cf3fd8d
 EBUILD libsass-9999.ebuild 1098 BLAKE2B 9bfaff1b30ff11fa8cb8c2082a2e91a61d8be9df2cb290444203b8d56111e63a914e439526ffa99a0ae21ec229ac4f7d672c2e58e2baafb2bb80edb947c0be64 SHA512 48833dfaf5b5c815d7922a93a988a15ea59b5d38d6f6cfb063109b89be479d617df8c8d9ff7394ece9901970c5f569efa59c80a6a3adfe6ecf4baffdcb803b32
 MISC metadata.xml 631 BLAKE2B 186d066c5e07a86e3b9878c3beb4453b1f708ddc456863fd43992955a6557df1151c92a5119614ea619b7e0aaad32248982170e5de514551c2cf6a4273ad4235 SHA512 b48a370653c205fd753b4a4d23346c58304c78ae9fe2ef4b63316bdeb29d641e5f4e1e2917d96ac05e59be7bef5663713b55ca8ff225bd8fee029da018789ddb
diff --git a/dev-libs/libsass/libsass-3.4.8.ebuild b/dev-libs/libsass/libsass-3.4.8.ebuild
new file mode 100644
index 000000000000..78b45f223a4e
--- /dev/null
+++ b/dev-libs/libsass/libsass-3.4.8.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils ltprune multilib-minimal
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/sass/libsass.git"
+	inherit git-r3
+	KEYWORDS=
+else
+	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+fi
+
+DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
+HOMEPAGE="https://github.com/sass/libsass"
+LICENSE="MIT"
+SLOT="0/0" # libsass soname
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+DOCS=( Readme.md SECURITY.md )
+
+src_prepare() {
+	default
+
+	if [[ ${PV} != *9999 ]]; then
+		[[ -f VERSION ]] || echo "${PV}" > VERSION
+	fi
+	eautoreconf
+
+	# only sane way to deal with various version-related scripts, env variables etc.
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--enable-shared
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc -r "${S}/docs"
+}
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 17c87d160f37..e0ce5dea3449 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -3,5 +3,5 @@ DIST libusb-1.0.20.tar.bz2 795247 BLAKE2B 9b3b4b9e372487ca355611917eb00a41d439df
 DIST libusb-1.0.21.tar.bz2 607417 BLAKE2B c76352a19f416ad27b8940e99f38878e248cdbc04ef97752f8c8468ab0391869ab611197e3e143d69e0e23563da59f1691c14fce72958fdf28ebf10dd8c1521b SHA512 015ca07bdb559aa40af5db1302ab0b1c8a30d593699fe2f3c9f45162673dc7b608cecc58d60fde8f3bde2a68370794a045e8efa48fc55402eece11261e525762
 EBUILD libusb-1.0.19-r1.ebuild 1640 BLAKE2B b772c5fc3e9b8c7dfb4923da67d1eea3f8c8358f0784643f42ddb2414423daa9f922b650d06c4fa9e6457018e77f450376a81cae98e9ce1c22375317602194b6 SHA512 141aee9763ccc76e11ce4d074cece02369c7f65fda639a3c754e548b9ff1bd7ac00f3244cc1a04d8f2a5ca4507a5a8192eb11e8f30908ca239700012c982239a
 EBUILD libusb-1.0.20.ebuild 1733 BLAKE2B a0281c5ce42922e235c7ad7b78bf76d62dd5441fff8e7cd7b98f334c5e0906de32c284067d5bbcfd92b7b1c3a82041bcf411bf9ec53159516fa74933025dbfbe SHA512 5f926dcca1eb2e7bc614626fe1a751a2632e88abcf4b9152781e23ffb77a4d1a72971ea5a0bd5f4e7679d348eba294db30d18c55298860a9d09555e0126d0eea
-EBUILD libusb-1.0.21.ebuild 1580 BLAKE2B 935d4383376708e3cab6847629c2335d63a64dd5874ff65843713a794dbab2912f461e40fae7fbc8aca8135dd90b5d2ed1aafa59fddc3ebb5681ba71d5ff5e71 SHA512 f726137760bf3983c8f7d44684c8b0b2912d5d40dbd3c8b9b3b8eebc46032f69b6771ab9012a1f555cd53973e91e149f803b82bcd1fc42b254c9f598b0c9f746
+EBUILD libusb-1.0.21.ebuild 1579 BLAKE2B e4f6997a68b52bf21cc205674253491514276bd6818269323520dbe89ff3b5aa5dab17a8585794f7569ba765b9e89493a09bc7e0e101a96bee9e810f8e77b3ba SHA512 248fe410b7041cb77476576ba535768d2218db297fbb502cd1f0c37f73839b8a1f52371f905cfdd9cf1af260d3e26956f825beae98560166f16cd21d7be905aa
 MISC metadata.xml 437 BLAKE2B 19a1ea2b26db27c6441a15502f61ca4240b1180b9aaaaf3942ce5b8cce5ee45724385401ec067901e31a0da785a636ca2e2a9d27efe231094d3952288374d169 SHA512 a67b2294e73782a948e338bc8820bc023e39ad612319a38387b3ee15e63903687ce4d90d8246df93cf2ea498c5c8dab25cb760c3f333d6dffc5d4d7b8c77a0a0
diff --git a/dev-libs/libusb/libusb-1.0.21.ebuild b/dev-libs/libusb/libusb-1.0.21.ebuild
index a5afca1e9650..9fb9f8134b11 100644
--- a/dev-libs/libusb/libusb-1.0.21.ebuild
+++ b/dev-libs/libusb/libusb-1.0.21.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 
 RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
diff --git a/dev-libs/libzeitgeist/Manifest b/dev-libs/libzeitgeist/Manifest
deleted file mode 100644
index f8400d4b146f..000000000000
--- a/dev-libs/libzeitgeist/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libzeitgeist-0.3.18.tar.gz 527117 BLAKE2B efbeef879be5a72011477e5699ccb8ec7a97ae358800bd6e9ab616a22fef1a6111908f62f22d1f1bafdfa5d6ad49d30354ace02c8660f7cd1cc8456cb7b9a2a6 SHA512 6ad3f0ed74935c20ce23d80208c5a787e4db2e2d58ae5036c6681c3d531e20cc0981be961d66a408a7e1b03909af0212693feddc515240d724acbd5ac5c8cf6e
-EBUILD libzeitgeist-0.3.18.ebuild 1004 BLAKE2B 462e5bb066a545e428ccc7e8d02209bfde5a6484fc762747d95d34b410e924ed8233cb380675144174421bb61371ef35d7e97c9e3ac75d60438547d1eaedc17a SHA512 fc4b68baeca73ec902677712338229a360c8fe9eeb37a82bce3eaddc60b3b295630b048f748ceb50bcf810e745baedc7bb80e98d5755d74031444ec272b84bb4
-MISC metadata.xml 468 BLAKE2B dc3345ad4b54473c64f4001e13ba6a79eebb70d33e3e8ad505a9dff551b8e62de4835ea1a546615e6cb09ba420689e64d2b496fde7a032a2630494fbc073abd6 SHA512 2ac6feeb6a13dbb4bdc9bb7d302522c302c0f83ef328c105751b5feb2f5146306fea81d156b3c8922aa965a7532952973e61ef6b6d91e96bdc283b0d8a73279a
diff --git a/dev-libs/libzeitgeist/libzeitgeist-0.3.18.ebuild b/dev-libs/libzeitgeist/libzeitgeist-0.3.18.ebuild
deleted file mode 100644
index 83fc85cf5b82..000000000000
--- a/dev-libs/libzeitgeist/libzeitgeist-0.3.18.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils versionator
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Client library to interact with zeitgeist"
-HOMEPAGE="https://launchpad.net/libzeitgeist/"
-SRC_URI="https://launchpad.net/libzeitgeist/${MY_PV}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="static-libs"
-
-CDEPEND="dev-libs/glib:2"
-RDEPEND="${CDEPEND}
-	gnome-extra/zeitgeist"
-DEPEND="${CDEPEND}
-	dev-util/gtk-doc
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed \
-		-e "s:doc/libzeitgeist:doc/${PF}:" \
-		-i Makefile.am || die
-	# FIXME: This is the unique test failing
-	sed \
-		-e '/TEST_PROGS      += test-log/d' \
-		-i tests/Makefile.am || die
-
-	sed \
-		-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
-		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:g' \
-		-i configure.ac || die
-
-	autotools-utils_src_prepare
-}
diff --git a/dev-libs/libzeitgeist/metadata.xml b/dev-libs/libzeitgeist/metadata.xml
deleted file mode 100644
index 7d8ffd7fbba9..000000000000
--- a/dev-libs/libzeitgeist/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>eva@gentoo.org</email>
-		<name>Gilles Dartiguelongue</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">libzeitgeist</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 6e992749799c..ac71659722c5 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -14,5 +14,5 @@ EBUILD mongo-c-driver-1.1.10.ebuild 1803 BLAKE2B ed8a0f4296418db9836fe3cc4052a9d
 EBUILD mongo-c-driver-1.1.2-r1.ebuild 1800 BLAKE2B 61782ec9c74e2d67bd884c1e1aa1b51eda2aa7148b3df90de3b45187c2823efb3afff7edff1eb5047bb205004a3b9cb8977c0945e6609df7a7c037ca97ab2bf1 SHA512 0183addeff7e2bac1add74db48b727edaf09f1b24b774bafe717c43c0e9a4a083081f12ab1d2afb743b61fd3591d6d3fa04f1b6c2be9339a2ab55a27ef4791ea
 EBUILD mongo-c-driver-1.3.5.ebuild 2023 BLAKE2B fc14f7ffb1d3f6c6d8495b10276944240d57a712d76ce58f909de934ee3f1ddd9f9d57723d1e686692de422033859dbec384aff65eb0e16a4a915674980d923f SHA512 30eb5a0bdd2d92de202dc28df98b3038a8015af39d6bc8fdc7b76299efd509bc9bf0690f824d34c1d7ff4a59dabd036567d18e4846411759560a65ae027f4469
 EBUILD mongo-c-driver-1.6.2.ebuild 1963 BLAKE2B 6a65450eb17c0de23d4525d9028ecba3b69f8cf6b8be52af3ec81893d3295d30cb25f06869b915da4c6f87e2344777356dac99f1aeb506eaca2def1e1550bae4 SHA512 776b41fa17aa7859aae0a8861647cfa4072e31c75a9189cf59da53b3798d5832b45abb60073cf37176ee05a2abc734da3c9e1f9e5fdad718002670bb99e54cfc
-EBUILD mongo-c-driver-1.8.2.ebuild 2024 BLAKE2B 13af08dddac6ea084e2c4fc3dd4e86e3a37f3b5376582239e7f2c9e186acba636d964cb1d159429f5a1bedee6de999973cbb357a86314f0d8119f37a345698ee SHA512 f9446351e81787f43ab27cff1e8c13e5462fd7042652ba25cafe5b477dc6c523ec0cfb56c9b3713b0d454b81c0f88e51c91b4745a54da59d8ed3f0d974e612c7
+EBUILD mongo-c-driver-1.8.2.ebuild 2023 BLAKE2B 45258c2733fa1d0791308d1ca6de68e69a64d22f04d741b4c457836135d2075af843242ebe0167200c84fe37e19497eea4dd46f6928924ff73224201f8a8cbdc SHA512 b9a5372969413310d613d267421db2fecd36f13d425e12370f793bbd8c02c6202f6a206bd8a760b6688bb5cf1b05ebabb079bad67ac3f04b68823c065593e42d
 MISC metadata.xml 334 BLAKE2B 7e10c3396a8bf28586240a95cc10a42de507d995b9f67dcf3b016cd586a973ce7478fe3974188dfb215123c8ca7188479d0d5be46ebcbb6b7790472f4e6ce225 SHA512 80ff1ae78c264618a7d5253d80ea5f4d1a15a568d5215d03dbe3062a591ec1c99d6625feff3b7baabe314bb284b5e5340c873b8846d05fd932f8cbc78df00d34
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
index 86291cab07b9..179b8e0a1758 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
 IUSE="debug examples libressl sasl ssl static-libs test"
 
 RDEPEND="app-arch/snappy:=
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index bd0b5214fc1f..8e43ba850bf5 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -22,7 +22,7 @@ EBUILD protobuf-2.5.0-r2.ebuild 3191 BLAKE2B ae6634f1e962709035137c70e529eaba18f
 EBUILD protobuf-2.6.1-r3.ebuild 4027 BLAKE2B 0d3947311800c913a84e03b2b6f46ad3d180a49d385c6780f7e1678afc6dc80ed18160fbe666dfea07848132d37b434a73857ee98f379d30786166b8a4665922 SHA512 4b962beeb1ab36101de1d3a7452ae727b0d01fbcfea996c47d3ecd9d2cf8561420a7500f6a1a15c8fb9a00484dd1b566c26dee1649c5da7c03b9d68c0caa65b3
 EBUILD protobuf-3.0.0_beta3_p1.ebuild 2975 BLAKE2B 4ac95a7690767a5e32325b16afcb0666fa0ab850cda645a8bc4070cd27b20223ed49d8e32d825e63c45399e947461a1037e1e267ba70f31647d0d59fd8579e17 SHA512 ddcf129fbc3d6fcc1979acc9db0efb263c0b258f7d8e44f83e72b1c66ba1d0a36fdd8c1f4958d39f19801ddd8838896378d36ad365caf44a3bc78d256e3f14eb
 EBUILD protobuf-3.0.2.ebuild 3063 BLAKE2B c63eb054a4a792527a10946c512c1476907a69c5fee2b010b51b081b3abf72c2506f30c73c408f872de3b9ba2c623a8c70883b7af69a6ec027b5ab9c3b33cf8b SHA512 7e4ef8c910e9b7e7a4db2cd5419426a96aeada8970284130771e2c48eaa2bfca47cdf0963e0422118ad0894d4f8bfcd8abd0af59da71fb4a137c863d88a8316f
-EBUILD protobuf-3.1.0.ebuild 3013 BLAKE2B 413b14e41f99b63c7ef4e4f4320f4b5d7a3f4430e6fa5361aafe56d1c1a7bf30562b09469ecf6cdd960c01b93b868b9cccb35dde66d9d4bb2d1aa3e78a78d999 SHA512 85d98550c69ac3c49fbde0bbf0b50f47dda9567ee332c90e2a1969a159a8870860ebf9239f906cea5da46f75bfceebee1b6d25e147458adbf020e43d65fd603d
+EBUILD protobuf-3.1.0.ebuild 3012 BLAKE2B 1ca83e01980372a2e6f2ac29500ece536162c64bace65414efd69c01d9484d9d76bdb93133c8b28f63bd982db074022c94c7cd1687ac9a2ff8339dcbb3c794c5 SHA512 673cb5e3ede77b7a68a1ff2c6e32fb0ebdb5b712b98253525be958a94272d340b885c6efc36c5066985667b70aae417f00f8fd7fd0816650968f10ea84e760a4
 EBUILD protobuf-3.3.0.ebuild 2923 BLAKE2B a8f3e9277cc151c971106d5285ebb1c5e6457f5ace09823c453d43cfe1197d8368ed9e6277fe29f51070098d7908689e83ed5bd99c4ac360bb7d9d59823aac3f SHA512 307008f8508679e1e54a86d4ca85547c24d5cddf4a5abbfd7835981a8194fd3d36e630eaa280847f727511211e2f9cbc532aeed8c9df6b934bd4f0b50ce341f1
 EBUILD protobuf-3.4.1.ebuild 2523 BLAKE2B a774fdcde73cd91848e3d9ce0a04af49d2716598d3437db4dad303653173aea1d0348a35e8676323d8e80c55c56423ad8e1d521ef335eb055ce83082cf03a1ea SHA512 61f7adaeb0b4c88aa3955ebeb4e703f007d1c98e04d6856becac21be0378af85dc18b60b3f8d36a5e7fb639f4a61f5c8f518c724544ce7bd2e5faed93c2e6980
 EBUILD protobuf-3.5.1.1.ebuild 2523 BLAKE2B f22c62ab48794fc46f99a897a04817a13d98f91dd2e16e497c077f5fea5591ed39ca90ec496ed192e4dcb01e8ac9098bc3ea3fe0393eef62e5558485b4edb666 SHA512 59d0dea4bdafbd016799032e488796af153ebe797ea026ce7bcd8c156cad78150684fe186c899ee2bf27e248d256b16c412faa87cb5eae213b7f1490581f8786
diff --git a/dev-libs/protobuf/protobuf-3.1.0.ebuild b/dev-libs/protobuf/protobuf-3.1.0.ebuild
index 5e952b42da22..22bb288f8b48 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/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index f2e790d13f1b..f4ca595239b1 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,5 +1,5 @@
 DIST qtkeychain-0.7.0.tar.gz 18913 BLAKE2B df8d54b5436ee936ba9aa8b7613f035b8c23d7eb998565e5cffc68e286f1bd972b223968628d1bba008960bfb16a3451b2d83c7f412ba7140b53e150d4fb061d SHA512 b7e98fa6c7f6a8a5e4d79468366b30c859db4edf08984d685d2cd8d87c5ab60b5f4769b5af96c8d9ca306111e46a63e4d23be7c07d77d6c3492f2e81ae8cd88b
 DIST qtkeychain-0.8.0.tar.gz 34686 BLAKE2B bb20ace4393e04a8c8167ce112499fed75615ed165824bfcbba6a243e374523ff397aa85eb324ee8d742295a1bd4618a363fae6f92aae74caf09b9ca18d76c1e SHA512 be83ebc665a7916e96a2fd9990c72cd29373196591cf557fa6f9691f332ab67cc5475cab240c3e50e76cb37e0b7f189f0a1f2c3a70a6f655918e1d2465ed2f33
-EBUILD qtkeychain-0.7.0.ebuild 1277 BLAKE2B fbb1f54907d2d0f049f70cbaeeba8aca1dc1a4f41964ab307888d31c91d5e9cb7dcc344d1d3a2b0a62c17251dc53b919971fa26a736ac90dfe689b1b0e0dec62 SHA512 ec42535365a93f8ac25a7d93a09aded55b9c74b77bb9e7b95a940fb9faa75717243a40954bf508b36b53425cba4fd04aa0632bd9e8426fe271aa5343ee37acd5
-EBUILD qtkeychain-0.8.0.ebuild 1386 BLAKE2B 3e61412b56c26791a9fbfe5075b5d6cb6438676538f26a9f05e384717564cd7ed1d820d50b5179e54715f272797ed44e0edc8b8675dc9e286612ca9e653605fe SHA512 87c0e4dda269cec58187d825ff9f0e1ffbccd9b029cb3c0e088d86bc5b48140c73539ef92774907f49009edace9f0c2a0769608bbc7c183a85605d1ddd147bb7
+EBUILD qtkeychain-0.7.0.ebuild 659 BLAKE2B 01b0eb1ac04c9ed7e24e0cbec4239ce092cf578cba3bb0d2f5e341ef12c8ee92fc3141ceea386063e51b19c21aab8d17d493f63532e77b9dae5661cf2a7bef5f SHA512 f5f62497692e7d28f0dea0e28ab182fe19143c807e042cbbd17abcc5ae20ee4797dcb8333ab2860bb52bd8f246656a82484c24560e756f49651db6d20e5f34d3
+EBUILD qtkeychain-0.8.0.ebuild 766 BLAKE2B 87220338cc8e8cb1ff69c4bff3d36e5b81adbf6d524ce41bcd6d9a4cbe9462aa5a4b0fdfc9b26dfa11f9cb8e9a69eaf54ca6448b699d33621cf7dc8f43c6e046 SHA512 6cd288ed7dd0dc2cdd4f4af5e375bbb191ca94952117ad34099d287b71a1d45ed895ca67df1d2578e101ea42ca8ca117d58103fe873cb90d072c2c3f8e26d402
 MISC metadata.xml 335 BLAKE2B 676879e385fb11722b2c2d90478178b06223e401992e5c55b88081e513fc11904e4766f4525eba3349a0e9f2fdc81b08cbeb2d973f9b77cf70e9985afd63e40a SHA512 72e060f41c90aa2a177af6c32b35109f0489fd277f5864cae4f6be7e2577f0920ba75f811081b058a210d54415dfc7e8aed35ca233748e35dcd1233b59d47342
diff --git a/dev-libs/qtkeychain/qtkeychain-0.7.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.7.0.ebuild
index 3ef9895a0449..bf34a98d3df9 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.7.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils multibuild
+inherit cmake-utils
 
 DESCRIPTION="Qt API for storing passwords securely"
 HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
@@ -12,58 +12,24 @@ SRC_URI="https://github.com/frankosterfeld/${PN}/archive/v${PV}.tar.gz -> ${P}.t
 LICENSE="BSD"
 SLOT="0/1"
 KEYWORDS="amd64 x86"
-IUSE="+qt4 qt5"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
+IUSE=""
 
 RDEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-	)
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 "
 DEPEND="${RDEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
+	dev-qt/linguist-tools:5
 "
 
 DOCS=( ChangeLog ReadMe.txt )
 
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
 src_configure() {
-	myconfigure() {
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			local mycmakeargs=(-DBUILD_WITH_QT4=ON)
-		fi
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			local mycmakeargs=(-DBUILD_WITH_QT4=OFF)
-		fi
-
-		mycmakeargs+=(
-			-DQTKEYCHAIN_STATIC=OFF
-			-DBUILD_TRANSLATIONS=ON
-		)
-
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant cmake-utils_src_test
-}
+	local mycmakeargs=(
+		-DBUILD_WITH_QT4=OFF
+		-DQTKEYCHAIN_STATIC=OFF
+		-DBUILD_TRANSLATIONS=ON
+	)
 
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
+	cmake-utils_src_configure
 }
diff --git a/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
index 8763ecfe4d8f..41ab3af92eec 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils multibuild
+inherit cmake-utils
 
 DESCRIPTION="Qt API for storing passwords securely"
 HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
@@ -12,60 +12,26 @@ SRC_URI="https://github.com/frankosterfeld/${PN}/archive/v${PV}.tar.gz -> ${P}.t
 LICENSE="BSD"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnome-keyring qt4 +qt5"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
+IUSE="gnome-keyring"
 
 RDEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-	)
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 "
 DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
 	gnome-keyring? ( gnome-base/libgnome-keyring )
-	qt5? ( dev-qt/linguist-tools:5 )
 "
 
 DOCS=( ChangeLog ReadMe.txt )
 
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
 src_configure() {
-	myconfigure() {
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			local mycmakeargs=(-DBUILD_WITH_QT4=ON)
-		fi
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			local mycmakeargs=(-DBUILD_WITH_QT4=OFF)
-		fi
-
-		mycmakeargs+=(
-			-DQTKEYCHAIN_STATIC=OFF
-			-DBUILD_TRANSLATIONS=ON
-			-DLIBSECRET_SUPPORT=$(usex gnome-keyring)
-		)
-
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant cmake-utils_src_test
-}
+	local mycmakeargs=(
+		-DBUILD_WITH_QT4=OFF
+		-DQTKEYCHAIN_STATIC=OFF
+		-DBUILD_TRANSLATIONS=ON
+		-DLIBSECRET_SUPPORT=$(usex gnome-keyring)
+	)
 
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
+	cmake-utils_src_configure
 }
diff --git a/dev-libs/sdformat/Manifest b/dev-libs/sdformat/Manifest
index 049023ba5e29..3d6a2cd7bb8c 100644
--- a/dev-libs/sdformat/Manifest
+++ b/dev-libs/sdformat/Manifest
@@ -1,6 +1,8 @@
 AUX urdfdom1.patch 15931 BLAKE2B abd7a35201cc3e768555ce6c1d99ff0c2fba45cb86891abe26970f0fedde3190ab8a07f2f6f9037640bb43bd94334b010dd8b51c1fea9577a03abff88c86ba33 SHA512 3acc8f2c3e7908a09e5e71d64d13bfc6f439c0a83c56ec2b70ec1ec1491483d370f837e70db9872d02f1e1c77c0127263d8e28ccb8d5ac44c527d664a2b1694d
 DIST sdformat-5.2.0.tar.bz2 445542 BLAKE2B 89daf9e03613bd88aceb1a2034cf0f9efe7b28ffb7aef8add4fc484a6e78d7189b4b6183fca83db4bb8017a4901d2fb3df7dc43e995bf2da8bb0fcde9510c6c9 SHA512 65df9f0d351ab894af41cc2081dc8ab179336092ceba17979720bed4d58f77e9648863501d83f073ea8478197e7e0a7d7a9f8efd3a54d22ee28d74765cebcee7
 DIST sdformat-5.3.0.tar.bz2 447471 BLAKE2B 9b511782f5d2517778fc0c977d1deab00ee7789f50628546b5ca8c1f464cc3ca132b83e1054867ec1d6678bca664232e1d9a499ff095d4f9a623f5061fc340c1 SHA512 63106bc438decb00157eca5fd3f7f783197a1f17a76008bee5d18d5c146f199e67852ef74cbbc53918760a0cdf382628ea84d2b4618512738cd574de1fc719d8
+DIST sdformat-6.0.0.tar.bz2 473765 BLAKE2B af3ed14323c2bed8ee5a22580dcb6d73a5e5c772f39ad7f806bf2cdb88d6f2c885585f36a666f2ec711dbd7ad6051ba69d79d2a9f0af7ad3b3681543b9feafe7 SHA512 2188de97cb1eb1117a694d54a0a42112bd7e5b5a4b00c04e049de73a10947904940565e36df93ca08ea5910e628983e234d07c57694c463e0794c48e20cedb21
 EBUILD sdformat-5.2.0.ebuild 984 BLAKE2B a1ba8fb82e2424fd57be0d9eea2acf71088eda48d49e933d40c83cf89814b100f04f13a6490ec652218e47da7024b9cf16ff5951e8d0db08659f296eb030e5c0 SHA512 a6dedd6d405c876665d85fe6c7b21fde03563e374d04a84587e7dffb1efb63e55cb6f53946e74f4749114cee3e80219f2adddc94a8a7dabe65ba028a55de8e7a
 EBUILD sdformat-5.3.0.ebuild 984 BLAKE2B a1ba8fb82e2424fd57be0d9eea2acf71088eda48d49e933d40c83cf89814b100f04f13a6490ec652218e47da7024b9cf16ff5951e8d0db08659f296eb030e5c0 SHA512 a6dedd6d405c876665d85fe6c7b21fde03563e374d04a84587e7dffb1efb63e55cb6f53946e74f4749114cee3e80219f2adddc94a8a7dabe65ba028a55de8e7a
+EBUILD sdformat-6.0.0.ebuild 944 BLAKE2B 1f9dd5d2c061f0964e8e3314d0cc68e09c5cee6861418eac1578f002ec016119000e5e2b7b516da129b7ee57c3399de75adc7355651ff5954a80f1a28c776226 SHA512 0d3563149ef99bb6805f02c71365378ffd7ea630251d52d8e7b818070ecc87c581d3a792b347c345955845e07e7ebfda08c79fe26ad23251bdb925e26e252e83
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/dev-libs/sdformat/sdformat-6.0.0.ebuild b/dev-libs/sdformat/sdformat-6.0.0.ebuild
new file mode 100644
index 000000000000..559a61abd081
--- /dev/null
+++ b/dev-libs/sdformat/sdformat-6.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Simulation Description Format (SDF) parser"
+HOMEPAGE="http://sdformat.org/"
+SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# subslot = libsdformat major
+SLOT="0/6"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/urdfdom-1:=
+	dev-libs/tinyxml
+	dev-libs/boost:=
+	sci-libs/ignition-math:4=
+"
+DEPEND="${RDEPEND}
+	dev-lang/ruby:*
+	virtual/pkgconfig
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_configure() {
+	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
+	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
+	local mycmakeargs=(
+		"-DUSE_INTERNAL_URDF=OFF"
+		"-DUSE_EXTERNAL_TINYXML=ON"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index bde7d20cda15..e6fcaa218149 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -2,6 +2,6 @@ AUX uriparser-0.8.4-doc-install.patch 615 BLAKE2B 593418040cd88f9753918320d6ee45
 DIST uriparser-0.8.0.tar.bz2 433581 BLAKE2B 0f39f891634de86fe1696c5d000c6325203561347c83f3144fef2319c9dc58657d82b92bd8499efda15bfa966230f3c2ca4b9051caced0fe15c7e480e564ac86 SHA512 e80efc8484f0b67107cad317cef72db9de906a86020c3ab31178e06e958782f0a744fe257b1e6cd130dd25c6747e684ece93ce5f755864303df34c6b763d2e5b
 DIST uriparser-0.8.4.tar.bz2 358408 BLAKE2B 1f270442a4812fa3e86a495109f95cfac6980c8145a701990dbe6f6396743de9ce0dfbce7b9cff2b331e8c9038a2b6c5281d2e562596543b660c168d3e678187 SHA512 b6238c6495eaa9f7178269d66dbea05a39c51c27137d8ebf39cd02d1c3fa96aa0d1608f5ccb36bf7b454f3238830dd46d7de8299b608f185b2520fc2c955aa1a
 EBUILD uriparser-0.8.0.ebuild 1101 BLAKE2B 1ce433e4c4b04b16f8d7d3b988795e42f3358bf7ef8b07f87d0eec3dea0b0d6be6655518ae950a04a21ca773c385085cb6c8b6222ff6d4d3f7314b35f7a559d7 SHA512 7a554f51d594177792b935b19b1b2b964936b5d27c9d50bc4faebc35479fca38f3d612273af6ca04a2d65e63263d06286dddcf84ef7fbd5b899ceb50f42f7c10
-EBUILD uriparser-0.8.4-r1.ebuild 1068 BLAKE2B 797cd9004fb4ce9108c1acb48e3116f77672bdb530c6ce7fec178f76d4e49d0112453353be311cda2d786214d5a9a3525e07063bc08b5abd0de873995622d79e SHA512 4a906147237682d061aef5fefc5c5d77fb801d11aca5eca7e5def4fa05e0d373b35c98d2fe439b0e0f442aec5010dc79349611329e0377ec0b08ef40af05d044
+EBUILD uriparser-0.8.4-r1.ebuild 1067 BLAKE2B 6472465ff996735959c4b9c08ad04a086705fa88af74f7e664bf1c90d290c1708f569217ea9ca28f3f9d01120d7b2a83fa3351ad0a5f3414a7f3a70ddd70a7f3 SHA512 09c743fabede08eb6c0b2991aee771a50683193488ddb51ecc1e2d5be85051fb361bd1db96e3fadbd9a5b3be4f550e44b1a37a7c168bdeef2fa7f99e6817bce6
 EBUILD uriparser-0.8.4.ebuild 1121 BLAKE2B c588049aae6874761ab9be7f69d0d847fdbba0a2fe8f9cb2e2747c4293c69f6b8c73eebe83c9bc2c4876cc50682950644fc0e9a4b25d10fafc029e27e9b134cf SHA512 f7d66431f203c3b5aa6c2c28443045db29d866f39c98675058140f16b810a5b8b277b7354cf1b3cb77bd0b29d783d27e360aa86de7d859fdd6e4a5e2c44aee9d
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild b/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild
index 545d35ee9aa1..2fab3de24b25 100644
--- a/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild
+++ b/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc qt5 test unicode"
 
 RDEPEND=""
author	V3n3RiX <venerix@redcorelinux.org>	2018-01-31 20:30:04 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-01-31 20:30:04 +0000
commit	4650985dd0e898b82e0d2ec225931297d4fadccf (patch)
tree	eb0e8002cf3ebf1009110b6fec47fa90f873d824 /dev-libs
parent	67f76a858f1ac826bd8a550d756d9ec6e340ed4f (diff)