gentoo resync : 21.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-21 18:59:32 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-21 18:59:32 +0100
commit: 520a5b56dff7c24c9d42eafec142cb78b44f8e3e (patch)
tree: f562f705600dbd2292e97c0b4145787c2a8d1f97 /dev-libs
parent: 3811bc3072bf19e2be351d2c63f81532945c0f21 (diff)
66 files changed, 1165 insertions, 359 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a3589196ee2e..c9d76c1cded1 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 6a5411c3c54d..4e7f11f3f8a9 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,6 +1,6 @@
 AUX appstream-0.11.5-fix-meson-po.patch 501 BLAKE2B 40d5f00cd7e883ddbd580ba7acfef6c956003a8a50f618b1f7e4810338af1ec41d6595828987132d175c2c07721ce60ba368033919a49ede9c659089fefd50eb SHA512 d4b4fb770ad84a6bf365e998eb749939a3aa4553aad9730f6d99d5072de37eb6594ad2ac00ee17706621483afe58f44c9f9f90aa9f666d0e2f6379f40ad78e71
 DIST appstream-0.10.6.tar.gz 1821879 BLAKE2B 49e0476ef41c37d2e9bb12a7c046fcbb2cd8fcb1f521321dce4cda15e504a966cf59a1cbf56fc7359a82f677c54906ba041ad37eeb7f639ad69691e8d2ccd24c SHA512 9f8b4ddc39d580c62b166df0d9a2c5e4caac1b433d25a4e9118b7c73ceea5c7b1ff78f02d682a68cdfeb8da29e806a4838cfc11637fca2982f436af333605256
 DIST appstream-0.11.5.tar.gz 1856204 BLAKE2B 9f1e423e71e40b569cae0fb259bf5a0203a0abcba64f877c951c941f1dfdbc8005509ca46040586b8937cc168ad9315978dd2a3763592de1686c9648eac6c928 SHA512 308f65df2d03f09a5fdfe1d5b61ed37ddfd73a6f7cd861f685463c45ba17a2a937ba34216b4d5f533cb5f9f56c65ff9b261e03d07aaab74bec3f89e5bfb57d7b
-EBUILD appstream-0.10.6-r1.ebuild 1474 BLAKE2B 7b70518da8b410ae9e9843d8238a4408ea571a5c1e7ff8d037d33636e4ea6d75758ba9bf33b03a6d084880caa8b1a02d0ebcf392fb6f81c5430bc83f0546e498 SHA512 53f95d11310cb6926059ece55a46240883a7e6f7dd6322b319cd8697ac306f4bd106e38aa05f04ebee33c481ea4bb82ab3d94ae664f925ee58df4fc63066e80e
+EBUILD appstream-0.10.6-r1.ebuild 1490 BLAKE2B cf0ea93f614715937e74088b70502574a644c641f8853bd359eea753f0376c8ba1f846990f95e927865e5f1c6479e450fcf4f3b292b1ec0b13743acfbfd2ad5d SHA512 b4f43642d9648bc9956ae4212e3d5b7fc7bb5f5c86293b5c9fd1196acf6fb37e5a2553ff3ae789f50ab9cd75c94a92cf46957a4d19e9d3aecc43036628abb0f3
 EBUILD appstream-0.11.5.ebuild 1376 BLAKE2B a4505ffee8274eeeff1d78a79ba1e2bf47588dda71a2dfb5993985ab4d689380fe94d473b5cb4f43a018228e0a59f1ae72d294190e4e89e9df52512ac121c449 SHA512 de2b3c1a9ea20715572b94dcd78b23a0c7e9a41545d9c1898a33d50a263c5b82b7b2b99a9d0cc2e61e02598b6b8885df48d9ab5f4c88c58e0f9548fea60ea62a
 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.10.6-r1.ebuild b/dev-libs/appstream/appstream-0.10.6-r1.ebuild
index 5d7a92367ffe..02eef9f850b9 100644
--- a/dev-libs/appstream/appstream-0.10.6-r1.ebuild
+++ b/dev-libs/appstream/appstream-0.10.6-r1.ebuild
@@ -35,6 +35,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
 	dev-util/itstool
 	sys-devel/gettext
 	test? (
diff --git a/dev-libs/console_bridge/Manifest b/dev-libs/console_bridge/Manifest
index 0773e6b6334e..f91ff59fa81e 100644
--- a/dev-libs/console_bridge/Manifest
+++ b/dev-libs/console_bridge/Manifest
@@ -1,6 +1,4 @@
-DIST console_bridge-0.3.2.tar.gz 231243 BLAKE2B 015be13b15b65ac36f81079b09d339c4d2806a404a5caaa4ffc7915df0d824ed14e270b1f84229a65460ead347de33af9a2c49988efff5208f5185ebea79bb90 SHA512 41fa5340d7ba79c887ef73eb4fda7b438ed91febd224934ae4658697e4c9e43357207e1b3e191ecce3c97cb9a87b0556372832735a268261bc798cc7683aa207
 DIST console_bridge-0.4.0.tar.gz 230398 BLAKE2B 9f8473402d3df14284530be1285b62201fce6d08db7fca6675725fa104bbf929999a2ef84d7a2b7ea12f5645e609447ed7af6e4babe0832d953b3e181ada6071 SHA512 ebfd2ee31bd27380db750e1c40d9f09f50cc7db72f4aceaac9c5bf94894eb8db8ac7cbf67d82cfc27aa154d0e8f2c25ad80b12d06ee90679b5fd6d10fd8d4037
-EBUILD console_bridge-0.3.2.ebuild 661 BLAKE2B 59e8e93ebc6ede57edec40515d973415324b7439a03cd662d35a33bba35fafa7adbb92599f87617e382ebf62ca6f8fe6225245d15b5aa05cd097045a1a31ada6 SHA512 c0480ede139b256c0c1937133bfaeb5679a336d3ad32d0ee15f9e312bf59f89c9417eb0d7fa2f00ae094431d16fe3fbc64361b93d64141a3311ed18a726bf9c0
 EBUILD console_bridge-0.4.0.ebuild 663 BLAKE2B f1157b2f0c44f5d4f3b0c6f1112e786259795fef7ec8e8cca233588883b8557c521fa08807d5072c7baccf22b6e8afc081ca65dde72c4742545d95ce7bdcf644 SHA512 80b2bde2ddea1977510af71c8d1516b46a61477bf02523fc72c7f879011aa8ca2bf0d2441e371dcef768f24dba887ceb66dc8eb230dcc0e1df6296e81e95627a
 EBUILD console_bridge-9999.ebuild 663 BLAKE2B f1157b2f0c44f5d4f3b0c6f1112e786259795fef7ec8e8cca233588883b8557c521fa08807d5072c7baccf22b6e8afc081ca65dde72c4742545d95ce7bdcf644 SHA512 80b2bde2ddea1977510af71c8d1516b46a61477bf02523fc72c7f879011aa8ca2bf0d2441e371dcef768f24dba887ceb66dc8eb230dcc0e1df6296e81e95627a
 MISC metadata.xml 342 BLAKE2B 27f453549abc2dbcca6275e79549c765f3802eccc8161d95baf12311844a9a2b4b42ad7f20e84ca07bde29048436dcfb2b9644b88f30f5a2889b50516afb1e10 SHA512 a438639c10d92d4ae5b4b54b7dff6dcdecfe829544dc7480dd830f38803efe0207f142d5b6177aafb1b170979d11dea590d85d75ac7814dead2edce720367aaf
diff --git a/dev-libs/console_bridge/console_bridge-0.3.2.ebuild b/dev-libs/console_bridge/console_bridge-0.3.2.ebuild
deleted file mode 100644
index 505bea12ffe1..000000000000
--- a/dev-libs/console_bridge/console_bridge-0.3.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros/console_bridge"
-fi
-
-inherit ${SCM} cmake-utils multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/ros/console_bridge/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="A ROS-independent package for logging into rosconsole/rosout"
-HOMEPAGE="http://wiki.ros.org/console_bridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/boost:=[threads]"
-DEPEND="${RDEPEND}"
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 8ce2286db69e..3b1307f37d01 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -22,7 +22,7 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.26.tar.gz 5220231 BLAKE2B 08fe5c1624e7cccb4b5e562f6987fddd047e1221b671cedbbb684d5a2f39e09a438ad14ffcedb5f398c203ca0b6e23574106c87f43a632028d50a69619c54970 SHA512 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0
-EBUILD cyrus-sasl-2.1.26-r10.ebuild 7751 BLAKE2B 8af27fd54e6b9a3418cd4929f5993cfa6e79e6c08c743161ab23e2859d950dad6b25877d91041f8ef4612fd7aaba48e12ed5bd84f7b96b77dbc79603a4cee26b SHA512 e98e9ba6c55c0767b3d95fc34cf5d7193f3b7a82ec1d256aa26392a0036c532128a99e114b88d15af87b56c88cc8831be6540fa39d8f7f78a7f32e4495d5f201
+EBUILD cyrus-sasl-2.1.26-r10.ebuild 7750 BLAKE2B 19ec378a1212a5c20c768037e992d62dbf234bde838292f51f4dcfec36d32b0f505dbd5057deb304d40b211590ec67c3b56f19f264f3b296fe506254a4e920c2 SHA512 11a244bc643269e84d4ba59bb43b68622340c9be4c25427a6c5e17083c81f8c6a836322eca05478cde9d12908ead7c0ac94a17e6094865e0fa89771ade1b3cb1
 EBUILD cyrus-sasl-2.1.26-r11.ebuild 8401 BLAKE2B 23750f3f5b6cf63dd1c6e80dc8591ea175c76d4abdf121fcdafab30cae631ae72e10cffb2769b2a8d7df8669d398061abd7a26c0b3d492cf9822b848ece30429 SHA512 ba488a57851285de62c53bb74bc61231660d924783cb354ffbddfa62657f6f8d3b3a3a4d357bd46ed694c1fc006ad9b189bb9456d75cfd2427f640811e6f1c0d
 EBUILD cyrus-sasl-2.1.26-r9.ebuild 7660 BLAKE2B 3a1594ef7878d89065aaabefc5928a9ad4489ccb2812de4adc9fe1979d6861238e26a32d523c6bc63c32a1b83627797416df74d857156425ac8d8aa544dcf1c4 SHA512 c1db771512006137faa09716fd67ac04bf984870a0aca83e393b577d6a6c4b4530796b53c8d5bc91a0bd6963226953f2d2e80dfb4039016d60554e904d57c15e
 MISC metadata.xml 706 BLAKE2B a5682e5daac9c1a7a3a021989ae9ca856bb08c9eb0ba3a71070b7150cccc7ddfcd1d3d0fe1df33e688d0223ab7fb760ae028e4753523b28a4cedcb625c899d73 SHA512 1e7495deff4727296d29b25b7af535c0b36054b9172763ca8634b40f324dbc33697424a7e5565791c3131def3708c9ffb7e3e2362cbd8b334d650921fc2291ce
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
index d37c40eafd29..714f49875667 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite
 srp ssl static-libs urandom"
 
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 17260d41e75b..b740d5fde142 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -4,5 +4,5 @@ AUX gjs-1.43.3-disable-unittest-2.patch 1119 BLAKE2B 8ab995513b63faee201f84ec45f
 DIST gjs-1.46.0.tar.xz 490812 BLAKE2B d7b71d6c611404d9313cdd19959e2a0cb7f035bbd2528db77ccb0030e685019b756216bfbc64885b3641c14cab2f29110492c87047c3ceb1a627765857b19a95 SHA512 14af40668e95d269ac87556c75cf45680c41bc8246f04c46726d34bd80e9344045c0a510567f156c2c25c1f10dd474dc38bd50581d1b2e5abe0daa0cf570e2bc
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 EBUILD gjs-1.46.0.ebuild 1559 BLAKE2B 8e46f9f4a7f06ed43132e023b25203eef301345e8de0d52183edb25c07b79fc1dec1c2285ea5b4b57b4923092e165901ebba049362cbce73c50a377b4a7e5d0e SHA512 083fd06684cd111f77b35f251c9d1418614550947366e838408daa2f214204d530273a2954304f6e3aba092c8160dec9ae581d7422f033cbf3aaaf72ec99ccae
-EBUILD gjs-1.48.7.ebuild 1553 BLAKE2B 2557beed75a4747209898983b0bd3ebf863ff3f1d40a1e6f3c8c85b9e6b15ae948b3b081488d7b6a0fc03d5bb1dd108bc218918614ff4ed7d42b87a8451717a4 SHA512 92004a2797688b4e275d83185d655cd2c027f53c768fc039223e2db2bfcd8a2d0703cf01e9b4886d6a97dce53f71619a68d05179a13db331c16e40950a354f02
+EBUILD gjs-1.48.7.ebuild 1552 BLAKE2B e73f0771b9cca26ed1720083502a1bff29d328c55a1a0c340c4e55941e51e683c72d41ef1af7d13269cf2cc34480a79775b5652c47244bbdfaec60e03c74f9e4 SHA512 ace6e02f405ef1433b9f8a1ee17a7d26ea695b9b8bb954ca6bc1ff3730c8246a9561e9c28b80c42f7c3713d2f40b37e020a2297cfac517e84044518ba8718920
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/gjs-1.48.7.ebuild b/dev-libs/gjs/gjs-1.48.7.ebuild
index 910ff1edc3e1..e21c88092638 100644
--- a/dev-libs/gjs/gjs-1.48.7.ebuild
+++ b/dev-libs/gjs/gjs-1.48.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk test"
-KEYWORDS="~alpha amd64 ~arm ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.52.1
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 1d7a1387c372..496ddfeb1e3c 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -2,7 +2,9 @@ AUX icu-layoutex-58.1-remove-bashisms.patch 5888 BLAKE2B 03a7197360a956799eb52a6
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f57d53a7450c68cdad5f84941f771db07fab1f5a16451d59c7aa2750e5a4d5b5fa9a904c43d131529b648263ea SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694
 DIST icu4c-61_1-src.tgz 23400587 BLAKE2B 6c6c78b4169ad3e900ff8a8a8fc7286f3dfb692dc04cc88103804799d1ce1fc7d1a3a7b1fc1b379e92196dd5976cfea3fe014a09dc65d387f34f141eae5b9465 SHA512 4c37691246db802e4bae0c8c5f6ac1dac64c5753b607e539c5c1c36e361fcd9dd81bd1d3b5416c2960153b83700ccdb356412847d0506ab7782ae626ac0ffb94
+DIST icu4c-62_1-src.tgz 23468750 BLAKE2B c0b665af53a494fc064425e6b3e66ae11d31509f4edc42268b12b85ece5ea635ebc76a8f3ab65a49b74a849a67ffd526e15e6d1b5b07e13c7f94cc94bef1d31c SHA512 8295f2754fb6907e2cc8f515dccca05530963b544e89a2b8e323cd0ddfdbbe0c9eba8b367c1dbc04d7bb906b66b1003fd545ca05298939747c832c9d4431cf2a
 EBUILD icu-layoutex-58.2.ebuild 2518 BLAKE2B 885f5583a750f60830f94e4fab7b80070cd9633fc16aca7d2713b16418685ce3eb8eeea27ac33f52a864edb8c3508e77592b729b63f690e9849c562f79d16c42 SHA512 f2b385bc0bad96157f3d321dc9f1b418438b3d390729b372d6c47b28bb7acf3792ff071288d25ed6a78741feb2831dc3e0733109380d86eda2e0631dd75bd8d7
 EBUILD icu-layoutex-60.2.ebuild 2525 BLAKE2B 71f0e92ffabdfbafb429837c1c9241252fdc898da64ad2128fb4427ce7cfc492a9369c0d38e6545bfa3f39d5434a7a8dd9dd809b242bdab4a5b57c5bb2c2f477 SHA512 bf1d94af09720cdd5cb6461004182bc2debad0e12dcf46bcae21ac485a36011dee14ce54433940ee035f9306a1a986acdb697ecb8023aa6f0be25b15b285cee2
 EBUILD icu-layoutex-61.1.ebuild 2532 BLAKE2B 1816a69d005b941c307cc07b2b39a3e7ea6de68b34a5f974f83ec094fbc9ac5309a8343abeae46d345b6b30475392e87ef819b05c275f4861070317b5f9fa581 SHA512 93e0e30b393881b7e649fff1962f6764751303972f1f081f33f40f6b99615765d4cce70cfa08c15be42653c5fdd60a89e3d8886758fbb3b65ea59640074fd171
+EBUILD icu-layoutex-62.1.ebuild 2524 BLAKE2B 3ca648c43e0cd815b338d1096b44892c252ec6d82054f6ea6051b19fb05462b56b30777ae91786ed3f8f0990a35d99810944eb795995093766ed96fd237312a8 SHA512 cbc383eee712119e35b85c69601e839b75023816695f38c2db73a808d392c35f3a2b7f76c9a0bea71f750eb2891a1d38ad9549dc75555f1d021f76af4b9da1c8
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-62.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-62.1.ebuild
new file mode 100644
index 000000000000..f0879bb2332f
--- /dev/null
+++ b/dev-libs/icu-layoutex/icu-layoutex-62.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs autotools multilib-minimal
+
+DESCRIPTION="External layout part of International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs"
+
+RDEPEND="
+	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
+	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
+"
+
+DEPEND="
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	${RDEPEND}
+"
+
+S="${WORKDIR}/${PN/-layoutex}/source"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
+)
+
+src_prepare() {
+	# apply patches
+	default
+
+	local variable
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Use C++14
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--enable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	pushd layoutex &>/dev/null || die
+	emake -j1 VERBOSE="1" check
+	popd &>/dev/null || die
+}
+
+multilib_src_install() {
+	pushd layoutex &>/dev/null || die
+	default
+	popd &>/dev/null || die
+}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index f466f3f6cc54..25ffcbb7e3bb 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -6,7 +6,9 @@ AUX icu-58.2-glibc226.patch 463 BLAKE2B 840440c4a3eb0882ac6733d3c5f44568bc081fce
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f57d53a7450c68cdad5f84941f771db07fab1f5a16451d59c7aa2750e5a4d5b5fa9a904c43d131529b648263ea SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694
 DIST icu4c-61_1-src.tgz 23400587 BLAKE2B 6c6c78b4169ad3e900ff8a8a8fc7286f3dfb692dc04cc88103804799d1ce1fc7d1a3a7b1fc1b379e92196dd5976cfea3fe014a09dc65d387f34f141eae5b9465 SHA512 4c37691246db802e4bae0c8c5f6ac1dac64c5753b607e539c5c1c36e361fcd9dd81bd1d3b5416c2960153b83700ccdb356412847d0506ab7782ae626ac0ffb94
+DIST icu4c-62_1-src.tgz 23468750 BLAKE2B c0b665af53a494fc064425e6b3e66ae11d31509f4edc42268b12b85ece5ea635ebc76a8f3ab65a49b74a849a67ffd526e15e6d1b5b07e13c7f94cc94bef1d31c SHA512 8295f2754fb6907e2cc8f515dccca05530963b544e89a2b8e323cd0ddfdbbe0c9eba8b367c1dbc04d7bb906b66b1003fd545ca05298939747c832c9d4431cf2a
 EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
 EBUILD icu-60.2.ebuild 3710 BLAKE2B 11a56611d570980031040391168bd5c18ca2000c30e9e56edf2662b9ead959c684cada13656726e5e868803ab9c4f81309b51f3b65693175298cb163417f32b0 SHA512 65919063056eb718f860664d42f466278da3bf5d78e54e4ad24b22768b244c76c81053ead55871fefd2d185dfcdfb065e93c38ccc4515000996d7ef307d4a1cb
 EBUILD icu-61.1.ebuild 3721 BLAKE2B 72fd1527eb1bd7425397de5eccf60ed03c22a58dc113f6fe4c9a1853f0553c3cde723583d24c875e2f928393ff8b494a889a98800bfb9948a314fa804c15f6eb SHA512 d766de018dfe7a908dd23914ac0994dbd98c9d515ba0cee76a4b7d6c1a9f44809cefe414c9a8ca556aef08e3e7f3a4d249b6af12449651cd2ea303818f12effd
+EBUILD icu-62.1.ebuild 3688 BLAKE2B ff8e850ead70730bfe852bbf2795d72d41325afd7b723e6abf815cad316a4b777ba0f94a71952eaa06dec331aa122d1dc4958728ba9ade5239e39d62cf18a4c2 SHA512 7ce709631d488554ca575361126362973f74589380367acc5b0cfedef93ea5d9ce339326e1fc9969640c3eff4537d4b6f669342400cc9cae7fc3a6a721e32c50
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-62.1.ebuild b/dev-libs/icu/icu-62.1.ebuild
new file mode 100644
index 000000000000..6d1550b32d6a
--- /dev/null
+++ b/dev-libs/icu/icu-62.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs autotools multilib-minimal
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="debug doc examples static-libs"
+
+DEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+	)
+"
+
+S="${WORKDIR}/${PN}/source"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/icu-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
+	"${FILESDIR}/${PN}-58.2-darwin.patch"
+)
+
+pkg_pretend() {
+	if tc-is-gcc ; then
+		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
+			|| $(gcc-major-version) -lt 4 ]] ; then
+				die "You need at least sys-devel/gcc-4.9"
+		fi
+	fi
+}
+
+src_prepare() {
+	# apply patches
+	default
+
+	local variable
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	# Append doxygen configuration to configure
+	sed -i \
+		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Use C++14
+	append-cxxflags -std=c++14
+
+	if tc-is-gcc ; then
+		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
+			|| $(gcc-major-version) -lt 4 ]] ; then
+				die "You need at least sys-devel/gcc-4.9"
+		fi
+	fi
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--disable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+		$(multilib_native_use_enable examples samples)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	# make sure we configure with the same shell as we run icu-config
+	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
+	export CONFIG_SHELL="${EPREFIX}/bin/sh"
+	# probably have no /bin/sh in prefix-chain
+	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	emake -j1 VERBOSE="1" check
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/html/*
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	docinto html
+	dodoc ../readme.html
+}
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index 74cd3621a39f..fb056afbdb2a 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -6,4 +6,4 @@ EBUILD json-c-0.12.1.ebuild 1003 BLAKE2B 0ed22e1e1f8562ba0350ddaa3976a5ac66bd6ed
 EBUILD json-c-0.12.ebuild 934 BLAKE2B 7ce3932192a70416f32220d08a86da5e889d50a4aed197c12926748bd3cc825a8f93cacaeaf242d99ea800169e4d75a6769ad0197562b32f54d104d81d4a8c88 SHA512 dcd19ea54f182d8d73dace713d3c364d394e83615c4912fdc9ad23980fa39801cfe04848f033578287ae533e9a87af8d13c35d00717f7c874ee2be4753d5904b
 EBUILD json-c-0.13.1-r1.ebuild 1000 BLAKE2B 1629144920cf22b40d23598382afbb3b33a5946da9daca9806ae615d8fef77870df6cc8865cde090b50bd07bdd8cd20034d0afca1a7416b1f979503bc2f37764 SHA512 3e62acbce184a908b8b581ab3d42c31fabd5d908f020ba9d30172e2a5bb12030a255c3b4f70a4dbea29d672cbbda49d6bbca649e680fe110ca828825b614317c
 EBUILD json-c-0.13.ebuild 1000 BLAKE2B 8c2b018dc6783ebac76ecbb777a628ef59d8796752038f28e1e57437c28fd72145a930af858e16c52e70b0a173b0cf4bb9f476364c39df6da26d5bd360e43300 SHA512 d3719bb33500ea92f7376c4b2f6ba994a4c8a18281c525eaf8a7b81da6eb8e8b4a77caf47fa02bb6df6a771619a36b77fd236e976cd2f83c701ce15a44aa0181
-MISC metadata.xml 693 BLAKE2B 70ce2577d4c34f376a26b1180103c7bd4105338e2e876f991d0a8db39c8affedc63a34d637b0339c7bb1a130f1869f4c16d087e6632e97d11cdb9e97353dd0fb SHA512 83445296602d14fed7857d99008c596d06a55ee4a1a9382afb5b2a2a80b0810861cd9a95e9ee5903cac082a338358bbbff7b936087875e407602496a50d3ebd5
+MISC metadata.xml 605 BLAKE2B 2290e9eb5ca3ad7c82de9d23062cd6b4a5cf3bc3f3b56900e72be88a96b04f7f6ca4b904b8eec476da9ce450f335312b9774f022b8c16fb88a710ad1de57f031 SHA512 485dcf4f7c9e63ee399862f09448965d675ae6580eb74c13c430547a8eab78c3c9890f3a06daf76d028e2bb194daa407f6abb9911648e4827eaf92fd3714154c
diff --git a/dev-libs/json-c/metadata.xml b/dev-libs/json-c/metadata.xml
index 55f771562070..1eb1c472b30c 100644
--- a/dev-libs/json-c/metadata.xml
+++ b/dev-libs/json-c/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hwoarang@gentoo.org</email>
-    <name>Markos Chandras</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
 "A JSON implementation in C" is probably the better description, and then
 "JSON-C implements a reference counting object model that allows you to 
diff --git a/dev-libs/kproperty/Manifest b/dev-libs/kproperty/Manifest
index 5f31ff0907ba..0b37ade480aa 100644
--- a/dev-libs/kproperty/Manifest
+++ b/dev-libs/kproperty/Manifest
@@ -1,3 +1,3 @@
 DIST kproperty-3.1.0.tar.xz 123528 BLAKE2B 79d94bcdb83c343241d233b528f27e8fcabab587000562e695e03ac3877572c73be28574ecdb1fe2f538df9ea0ee20bc71e95f4c13943da585abccc7eeaf2f5d SHA512 6c6b9bc7db8e82b3c5ec216e42c439dfe30071804b2392026e6284ba7154338e2b6b108f0f14b5db556692de3230d8a780099e73349a740ce6edc68fd7fa54f5
-EBUILD kproperty-3.1.0.ebuild 640 BLAKE2B 435646f298ba221b1279589e84ebb4bd67c30db5de0bcec2919d2c62b0ce7358dd326b9e4a45f8aa1ac13a3731f49c889d9e050db173cca38232bc981b71c896 SHA512 d9301c712d476ac605eaa785aed209444366088a07f05e5d2f64a1627a9a29b1ebb419565df7bcf23013177458b6dfe619fc190c491c2767d429f675d61ad247
+EBUILD kproperty-3.1.0.ebuild 719 BLAKE2B 1cc093a55bdf549ddf4ab075b376151ccbfa5f90b1043f063b9ab568203982107f2eba2eadcea527b95d800d68cbd6d7ca87509b9a98795fd8d81307a95d2d8e SHA512 494a9d4cdcf4477177a53cbb6bc2d899d771175bd1d023f77f31e5d270804367acc2458ebc8124ae8fffc69e3dd668d45ae4f20946e8a09a2d278b407b80d912
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kproperty/kproperty-3.1.0.ebuild b/dev-libs/kproperty/kproperty-3.1.0.ebuild
index f1c5aa1d63f1..8efc5889fc9b 100644
--- a/dev-libs/kproperty/kproperty-3.1.0.ebuild
+++ b/dev-libs/kproperty/kproperty-3.1.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+KDE_TEST="true" # build system adds autotests dir based on BUILD_TESTING value
 inherit kde5
 
 DESCRIPTION="Property editing framework with editor widget similar to Qt Designer"
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index fe9088d9151f..63c29e7e5385 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,8 +1,7 @@
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
-DIST leatherman-1.4.1.tar.gz 814131 BLAKE2B 53851ce0e875a5953a445b594659d494b127956694b2488c343694b9d4adff9890dc0e462671950c9d920dd5828951ad7629cae20de57625aef02522789024f5 SHA512 71fa4723d231ffd6c582a332d6e57da8d1631d787ac7eeef55a505217b9d216ada11efc2636f2238c0272c30d943c61e1f391941f1c4531f911cce597062ffa6
 DIST leatherman-1.4.2.tar.gz 814263 BLAKE2B 5ca8123f264ed0f7843c6fc1b0966c577fb9d12933e5baa375e0beef8ba17afe4388f1e05e1022e392c50e32e159b765531137cf069bd0f5b8baa3626c860949 SHA512 e0cb19605163b68ac5a8fc74e875d856af5e34345f19c38f0db45da7536ec27ba6cf4b4e8c5883ceb9a5978cdc8831181ec89ad4105252366b198af4f3f22bff
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
-EBUILD leatherman-1.4.1.ebuild 1222 BLAKE2B 7aedb4f5a32614583bc4754e25cf8fe875948c79f85dd816766208061d3d778e15aaa69e639b0d6ec578a74c5f84b1f742c486600fe064ebd97425898feb1a82 SHA512 8b3d6ae0c8d7057e0ab55d9a1dc37b763c0898b1ad0dc1c79a682987f323fdb60b1bf967a516ce8e93ffe3f4d70c62851cdb5ddfeb1efe771d166cc07fed8cb6
-EBUILD leatherman-1.4.2.ebuild 1153 BLAKE2B ae6f98d151fa7b8a8862d1ca1454d6d5e732e67846a100a611bf26c641fb61cb8a9ce38c3be31bde8860d94004debdbaef062fbcc1d48d879e35af30abf32a21 SHA512 d4f38671f271dcc5d70c762b30312580836b96ed21a5f8667bf9839100a4051a9b1bfb8e26b8e1d3ab1700cb58068bc19688fcc47e4b0cfee0b64c261a379160
+EBUILD leatherman-1.4.2-r1.ebuild 1155 BLAKE2B 1b6663520e7a3245ccc085cc5a5a3f9cc36a8d7112394224155f63851c7d52e42622c347e303f64f38959bbfcae4a38942fe571490e11a9bd4b4099a0a9c2041 SHA512 2d64e5114ebd7ced81278737367bb5470e6d431e5c517d67e23b7fc20dcaf0b3f58029b8be21f39bcfb4f684a82005ff8c7767d7ebe3feb017f3dd7f774cfb77
+EBUILD leatherman-1.4.2.ebuild 1151 BLAKE2B 8cde9882d7506f59fc13ebd6395efbdf8ebaf413eb17edff53b790f24394a6f68620ac39b9a4eb61c107cd8b898462fd603107764c805de52e24227e205a9dd1 SHA512 49c05ce146a7e89f9b18a856a96d8864f98a2e7dfde2818029c61c15da2b73409c44d5eb7d56015e6d32d9b21bff96176021a22937a3f768174e68a0d55dc04e
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.4.1.ebuild b/dev-libs/leatherman/leatherman-1.4.2-r1.ebuild
index 41db96ea9c04..f0eb93027909 100644
--- a/dev-libs/leatherman/leatherman-1.4.1.ebuild
+++ b/dev-libs/leatherman/leatherman-1.4.2-r1.ebuild
@@ -11,8 +11,8 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-SLOT="0/1.4"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0/1.4.2"
 
 RDEPEND="net-misc/curl"
 DEPEND=">=dev-libs/boost-1.54:=[nls]
@@ -31,8 +31,6 @@ src_configure() {
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
 		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
 	)
 	if ! use static-libs; then
 		mycmakeargs+=(
diff --git a/dev-libs/leatherman/leatherman-1.4.2.ebuild b/dev-libs/leatherman/leatherman-1.4.2.ebuild
index 2df52d6356d6..94a5c158e9d5 100644
--- a/dev-libs/leatherman/leatherman-1.4.2.ebuild
+++ b/dev-libs/leatherman/leatherman-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="0/1.4"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index da13ec413200..bf91439928f3 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,3 +1,5 @@
 DIST libarcus-3.3.0.tar.gz 29695 BLAKE2B a63ca06133cf7db556fe82cc7ea060badd7838d697822d64e09c52aaa81a8509bfa6010037004593da3b1e66dde510767a992524f8e1719e614932b88b9393fe SHA512 a911fb5784ceb835ba2c175ce42cc10544bdd0834e987d8ac1be2517293f00e596f94910d8bf5f37f61e63246ba6e78d28a23bc061809e70b1bb6ad1a21107c9
+DIST libarcus-3.4.1.tar.gz 29699 BLAKE2B 73f132ff9d908468f1d67c54b7430ac84c0aebb5dd12282dc894b877a91da3f9822e4db8bf16cb53f313396598d3890be9e06e50737b0a50edfc84543285f251 SHA512 63ed8d8da389641b91ed955624c04ca5488f98d3ef409c4a94ad1962155d6aedd8d61ca0231543cfe4e92ae10beb00001f957eb48f74b0c21447a1bd9b66d85d
 EBUILD libarcus-3.3.0.ebuild 1085 BLAKE2B 9d15a9454356b09eb8f05a4548bf49ee8d9ce710d47ec89baf5d11cfbc8b1c9dcc2db503e491f3558eb9da4e5456e823a51fbf7aec33d7ef68b6906d572d5d99 SHA512 95709735d9f791bb344442964ca877d480060ea8fe13c82941a30fbcdc84da2ab9c055570f37f6dd757c5347dd1451759558c73f8a02f7fd22215cd5c9f54a77
+EBUILD libarcus-3.4.1.ebuild 1085 BLAKE2B 9d15a9454356b09eb8f05a4548bf49ee8d9ce710d47ec89baf5d11cfbc8b1c9dcc2db503e491f3558eb9da4e5456e823a51fbf7aec33d7ef68b6906d572d5d99 SHA512 95709735d9f791bb344442964ca877d480060ea8fe13c82941a30fbcdc84da2ab9c055570f37f6dd757c5347dd1451759558c73f8a02f7fd22215cd5c9f54a77
 MISC metadata.xml 860 BLAKE2B 9375bca572d46d985fbbf11b222728cdaba22c2fde64e1b4a057d2920b9845bf442bb35ce0b2b1e78fc949cd687604f9f89d5b5665e3cee7afe5b69f09f5ed2b SHA512 9dbfeff3c641642edfd27fbbd27d2ef5810833e4cb3ae5b949c1a20c27377ac70364010fc9fbc759f456e93f294af62f3c08c59bb0585a3ca01f5cd157b3b33e
diff --git a/dev-libs/libarcus/libarcus-3.4.1.ebuild b/dev-libs/libarcus/libarcus-3.4.1.ebuild
new file mode 100644
index 000000000000..d0e49ef66b98
--- /dev/null
+++ b/dev-libs/libarcus/libarcus-3.4.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit cmake-utils python-single-r1
+
+MY_PN="libArcus"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libArcus"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/sip[${PYTHON_USEDEP}]
+	dev-libs/protobuf
+	python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_EXAMPLES=$(usex examples ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+	)
+	use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index 2fdc063f0be3..b28bfc69e2c8 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,3 +1,5 @@
 DIST libcharon-3.3.0.tar.gz 141001 BLAKE2B 80d880ac274a53dc6673d9993ef8474091a036e6faac8fa44df3ace0f4b2fcf0102229b0f407acf9f7df7c56fb08a60c7ac3b7078e5e5daf86e1f0fe3fa453fa SHA512 92e7a33c77d05224f0b07c92f105d66010e727f67ec51e6dc314c001953e14047a7d59e2e0887950dcd38d25595df5186161ff1c0272a1193bcd8ccd64b0033b
+DIST libcharon-3.4.1.tar.gz 143489 BLAKE2B e8eb5317c708b808981cf8cb53614b54a34abca284457716b7997633a86e3cc2101f788b5c39b9292944d884985f3c342459626282695be484be5adf32b53501 SHA512 9aa269e477ce6c5c563986fcfd0061032dc58df30a7bd687a243db06ef071e888d45cc2c47cfeaac0837672529d6b3150a0a60d0cb357cea5035e47ba16115f3
 EBUILD libcharon-3.3.0.ebuild 504 BLAKE2B 188e3bfd6a13b1525123e03a0280de11a4b7a2b67d5cae076e42451fea4ff5e8b2a8d4f5d4a75c3dd92f0d64afa16998fa470d160e42df06dc344ba090953772 SHA512 dfa8d0be05a34962782ca993312882155f1b945e35d2ba4257825639e13b3b1fece2b97cee65bf3595ff38d6424f59c680adab0ddb06e796b076d571e1f1f7c8
+EBUILD libcharon-3.4.1.ebuild 512 BLAKE2B b5594e176423627d35f1371ffba5c29495fc824d11c3b6b25a698bab2765bcb7c01c30c23a8811e64cb9434a0bb0dc5098612aa103619ae53ee73f349002d2f3 SHA512 44f8c7fbdf5392cec38dce8873c6ffe118fff658e8fd9309db2021b81eed827b23de7038168f1654273782c13d67562bbc1150a5c58a604458f12c2ad061e851
 MISC metadata.xml 861 BLAKE2B dd8d5bdc3a7e48870daffb19659eba707b1c43c6682fbd5cadf52babd3282315419451c1d5352f0a2e044e60d6fc16c19d546b1dc32ec9da7dceeef4deb45eca SHA512 15a172c082a1cbcdbd0ecd93f475f9a193d3bb0707980904d8f7d6adde745297f64b906134c0c338cdd088f6f54e736b29ee3df39638ffc941dd5eda5f15f735
diff --git a/dev-libs/libcharon/libcharon-3.4.1.ebuild b/dev-libs/libcharon/libcharon-3.4.1.ebuild
new file mode 100644
index 000000000000..ca9cf5b39c66
--- /dev/null
+++ b/dev-libs/libcharon/libcharon-3.4.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils python-single-r1
+
+MY_PN="libCharon"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libCharon"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index 9aaa623c6774..499f7294cb01 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -9,5 +9,5 @@ DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fba
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
 DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 BLAKE2B a7c8466fbe9f6613108a6a1b450c47c69018f9f252c17647b07591cf9fba2ba3a08cc344ca54f4647a9c809cecaa18b42bf9f2eff9e253749518b68565024b48 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD libgamin-0.1.10-r5.ebuild 4042 BLAKE2B 7422d4f2111861a4f023da426deb968c1d62dc9fb56ce2ffe4f013ef55c0cd69faa53d30be0401285f65fb6734819d63576445c37f63d18f212d5f293f3fc4e8 SHA512 baf40876d9af784cd793a14ab496057051d6e620af1d72d274b22dac4ed710e71297d0cbbd44ee88bc9e897df71a975782cb7950e9751a4f8c38bb75de405265
+EBUILD libgamin-0.1.10-r5.ebuild 4041 BLAKE2B 785841cf3331cf45be7d8270a6fe7fec3c6b8d704c7b00cb2b63a8e702d6876669e904abecf49bfeb2483a814b529ae00eba823765777de5b5feda2c84e019aa SHA512 3a1615f6824fcf1da8390558a39bd85894af5e9f5b5fe7faffdcd8967641baa649bd4fe2005c0e892f54c2abc2d7d61244af02cbe0e1c0ad969630ed0f1ceb63
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
index 47206c41151e..82ef17bc6fd8 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-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 ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug kernel_linux python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index d85d53dd6ec7..6f1c40ab3e41 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -11,5 +11,5 @@ EBUILD libgcrypt-1.8.1.ebuild 2098 BLAKE2B 05f395da3900dcc66b319f25c1a4ad57fe51a
 EBUILD libgcrypt-1.8.2-r1.ebuild 2145 BLAKE2B bf0273a1c467077406890da14fcd055dc7b144a834b04554fbd1cf9949530a6c4905dc701a42fa945b93bea6d6ae031b2dc22073d9873487906b75aed60fa0d4 SHA512 e3aeeafeccff8e5c70c7d3c5784dd26c7f250f08a8dba378856ed065e1e7dfa18da989fce814872a36d548829ebeddd48758ebaf40d4c9031ebfd012575fa580
 EBUILD libgcrypt-1.8.2-r2.ebuild 2210 BLAKE2B f34057ad59eca6355567b72bbfdf1985e44e4746d7fbb1b0522f2306ebf645aa73f4760561520beed81ff51ad713787fcced4f4af0fbbeec3f6865e325a95850 SHA512 d2e53d31e04a409b5dd58012416ed0470dadae9cc8a0eabaeffc35131d390a9a77466c2a8bd61ce3e4a90585db9a8352660ca7e66df7849a90dbf1c23edc807d
 EBUILD libgcrypt-1.8.2.ebuild 2111 BLAKE2B 8102d7a2504f12054a8a6b99960651930b22df9961d9df8efd72ba4f5ce76e89741a4607ee96118eadc2cd91cf2f1c2467405d2aaae145e709d382091b1ace08 SHA512 e8977abb9bc4313b09222d4945f487b0f3dd39e7bd1455e2186cb65965f77f653c7618b7c8b10d9d8028d50ff3d054b06b9565df7ecfd0f8849188fc783d78d1
-EBUILD libgcrypt-1.8.3.ebuild 2201 BLAKE2B 56b9089acc154f834d5682ebad620cfab84aefd1b9146c63526148a07635e1186b03ec1c5c200d572549bbc210a929af777e9f64c8980b8615047e3909e18f0e SHA512 db93fce4ccb773b04c4f216fd3eacfdec783bcf263491bae43cc0c20ad3cb3684b713384ca7ce747582192fa8c5feb544aac9203af654973985b6026dc0c32bd
+EBUILD libgcrypt-1.8.3.ebuild 2200 BLAKE2B 49055b778612f9dac9286897a3e49a54bd88f91de6a9f49f178568c026eeb0073cf69a0267d853c97c745ec851aca63ecd11be4518d11f0e7c9c6fda430cbe6d SHA512 5bcddd9905f05888514f4506d317d25981ec610883181f4a58ec431bb83b2d361e7bfae8dc9a8f099f3befec5925886650293c896875673ed20351cee3dcd89d
 MISC metadata.xml 436 BLAKE2B 63494d2110caa2744cb7e2a43bb1622cc1709698a914bcda9958ee6fb9f8e5c5cee94e5cc9ce744a6638650e6bb78a0cea719a7afad53868513a15314ebb75f6 SHA512 953eb7a141dadcdb8f4c997924169a5e9dc5ce9e86a37b3171417f3825fad7763891ddf71cf7f05e36e2c39c534474dcba3e958b06bfb0f384d0ddf26afc10e4
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
index 7286569a35b5..8820d507dbb5 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~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"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 8181205699b6..2dfc4b6c3bf6 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,8 +1,6 @@
-DIST libgit2-0.26.4.tar.gz 4733342 BLAKE2B 76dfacbf6df9128625e52f4c554814a971f446a44c9706a915200976f5a873a2add1869c0534360ccad821df11246faacfff43765f311162bcb6afca46088a77 SHA512 c65a0ef8e7ef2dc60d07bced36b8cfd26ce9c40f99978058fc67b30e5bbda8d6b15e26aec7b1277bb277123685e763d106bab175540fceb449bb5b50f776473a
 DIST libgit2-0.26.5.tar.gz 4734075 BLAKE2B cdc34a5792576d97d8bc8a8c998e610e9c2caab4899f55bfd11da382d73d3061277ac068edd20c8e31d7cf5c3b26ca688fd67eb43ca7b9e0b82413fb04d04b3f SHA512 7dd7c567ad776db76b3514e6532f52841a4279b58dc51b44d39ab53b6911220cb60ee8f37b4c6ad6f369edbbd43a2591cf5f46aca354282f56735c8b215d533b
 DIST libgit2-0.27.3.tar.gz 4771877 BLAKE2B a15aed24d0391cf8d5c74329f5064d703def5db1cbf132881279d501d1ba31002367e54171e8a341b75862d327eddb1abebdaeeaee6878a14ad1d8abbbc8402d SHA512 e470050b89289908ec64dafaa954ad9bfc8f557ba7dafcab440d9efde474f736c025d8202bfd81a508070d9cf678f3fb1f3687d72a849ce86edd1ee90ad13c3b
-EBUILD libgit2-0.26.4.ebuild 1874 BLAKE2B 5da6902f0c5983909b465a287db11c2ca95192a73bfbf9b76f27b02925c62372a6c90085202cebf76a1eca9cbed828b825abdaca48f767422722ab8bf2ecbeee SHA512 8b7009bd803c553b94c575526dd704bea6c39546ca7a1f9cd8291a11a24dcbb4188c22604e055711ba806b7957af7f5cc461bcc8971969dcda0b020dafa76703
-EBUILD libgit2-0.26.5.ebuild 1875 BLAKE2B 61a7dba555ae02c7a89d4a2e15d4f13bdd8063d95f9736ead540ba7cbf81643e72d4b36b0b43d654338199127ffa5f56dfb41c8149d0cff1f2432e84b284b487 SHA512 001cc3cf9c525ded47f1bb8a8bcfea39fafe4a0b65b592d955997586843e8f5b1e354ab00066a5f840b23a8484b7e9af7ecd5378df8d7da534b9ff55bb82dbb5
+EBUILD libgit2-0.26.5.ebuild 1874 BLAKE2B 5da6902f0c5983909b465a287db11c2ca95192a73bfbf9b76f27b02925c62372a6c90085202cebf76a1eca9cbed828b825abdaca48f767422722ab8bf2ecbeee SHA512 8b7009bd803c553b94c575526dd704bea6c39546ca7a1f9cd8291a11a24dcbb4188c22604e055711ba806b7957af7f5cc461bcc8971969dcda0b020dafa76703
 EBUILD libgit2-0.27.3.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
 EBUILD libgit2-9999.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
 MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/libgit2-0.26.4.ebuild b/dev-libs/libgit2/libgit2-0.26.4.ebuild
deleted file mode 100644
index c94b6bca4718..000000000000
--- a/dev-libs/libgit2/libgit2-0.26.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/26"
-IUSE="+curl examples gssapi libressl +ssh test +threads trace"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib
-	net-libs/http-parser:=
-	curl? (
-		!libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
-		libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
-	)
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-src_prepare() {
-	# skip online tests
-	sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DBUILD_CLAR=$(usex test)
-		-DENABLE_TRACE=$(usex trace)
-		-DUSE_GSSAPI=$(usex gssapi)
-		-DUSE_SSH=$(usex ssh)
-		-DTHREADSAFE=$(usex threads)
-		-DCURL=$(usex curl)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake-utils_src_test
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-libs/libgit2/libgit2-0.26.5.ebuild b/dev-libs/libgit2/libgit2-0.26.5.ebuild
index 1ffdfff08098..c94b6bca4718 100644
--- a/dev-libs/libgit2/libgit2-0.26.5.ebuild
+++ b/dev-libs/libgit2/libgit2-0.26.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~ppc-macos"
 fi
 
 DESCRIPTION="A linkable library for Git"
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 68a72fd32a40..9351d1d985be 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,5 +1,7 @@
 DIST libgpg-error-1.27.tar.bz2 813060 BLAKE2B ece50b2f6f2fc21584724c07e4285ba6e3cd7c11def7155ef1e7be1d496e0d3a7abf977afa1f618b33ca8bcd0427c0c3b46fce2d0a2b9613378f06780f1aa47c SHA512 51b313c1159074fdbbce84f63bd8afd84b3b58cd608714865b25bed84c1862d050708aa06ac3dab92f1906593df5121161e594c2809653b0fb2c236cae5dcc2f
 DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88abecf87aefb655eb7847546148a6a887caf7f574aae101274da20375b90b32c35d599508711f7b5eac2addfabfe4b8 SHA512 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b
+DIST libgpg-error-1.32.tar.bz2 904382 BLAKE2B 92141af9e00725015ef31152ccfe4db9535a7a6ba0aa6d011f2404bc998d7b0932fdce742a45d271995c838d34342e5197a081a42eb2e5e29c11271a1c11c6f7 SHA512 0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20
 EBUILD libgpg-error-1.27-r1.ebuild 1298 BLAKE2B ab43e3a8adb285b7932a607cd242af87aa1e7db2731fef7d77227d058ff1737802fda662e1f2b96e6116ee60f3d41dde98ca9a742a97caf5a2dc7ea34bdf8231 SHA512 9e285f2989b2e9fbf2a2e8a8ce1cbd3cd93433c302ecc0216ab8a977cada3f3edf753c02ef24b57b44af8bc6be23cdbf42dc46ba7846b55dcfa73b33db26f139
 EBUILD libgpg-error-1.29.ebuild 1302 BLAKE2B c9f564d30f7b141add8edddfe94e6881abb56626ead8223b7bf69dff8c720902d264382b77debdce1a5cdda5ad64d58a10c703c94a27a6b8eff1ad96fa8ed2d0 SHA512 962fa276d0a57dc236a08935b7eb08c869763de3709bcba8bc360de714fc15e9b786dbe161b8f0b51aa39f79da58cfa0038458ce13279150952fa5209701ee6c
+EBUILD libgpg-error-1.32.ebuild 1311 BLAKE2B 4d114d8dcadbf6f89df3c20fdf0d0b31bafa84c46bdd4098975c12b3774ae448f00c2628d22fa9f0a3bc51a873823df25cbc95efdca9e6d4d646f2d69fb2380f SHA512 2f13e457f63751fb4f03051d7ccb0f4d1f30bd5a36d37ab2274b14af748f9e3f38afc17a7f4241ca9fbc8501a7627984e2a2c92212d509f44c4d7835d30e6fe4
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/dev-libs/libgpg-error/libgpg-error-1.32.ebuild b/dev-libs/libgpg-error/libgpg-error-1.32.ebuild
new file mode 100644
index 000000000000..2576649e58dd
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.32.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit libtool ltprune multilib-minimal toolchain-funcs
+
+DESCRIPTION="Contains error handling functions used by GnuPG software"
+HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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"
+IUSE="common-lisp nls static-libs"
+
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gpg-error-config
+)
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/gpg-error.h
+	/usr/include/gpgrt.h
+)
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		--enable-threads \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		$(use_enable common-lisp languages) \
+		$(multilib_is_native_abi || echo --disable-languages)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+}
diff --git a/dev-libs/libmix/Manifest b/dev-libs/libmix/Manifest
index 26362f1296e4..a7e1a7a15562 100644
--- a/dev-libs/libmix/Manifest
+++ b/dev-libs/libmix/Manifest
@@ -2,5 +2,5 @@ AUX libmix-2.05-fix-pattern.patch 415 BLAKE2B 7a203b13fb8718ceccc8f173c08306bef0
 AUX libmix-2.05-gentoo-r1.patch 8328 BLAKE2B 56c32ae2f6d8c69a461c360bc8a2f73d642b9031ab216e296b99a89074883a057ec82cd9470dd145ee97a4d6e20d80ec4aebfead90c6cb4f53418aee9dbf48db SHA512 24043efc6a7ebdee97425e63e97bcd298d0e920604277bdcd176c22e20119cacd6ef33a296df815cd98ae327bd149003e3e34c33f939d96bee71be3bac79bf75
 AUX libmix-2.05-libnet.patch 509 BLAKE2B ab9f57a1f49750d32f77095824637a9588dd8234b90cc5fc906c29105c1df0547552488a38d54ffe48755b0a27e8a46b30fc4553ebead19ce2f806ca5006398e SHA512 3c5204728db7fdecadbd3149a4edb544dafadedffa7d8f1afe2e3290a378865f68ac1189eeab7a6e73176bb4af045f4049dfc75417c143a5aad705906c96b498
 DIST libmix-205.tgz 79860 BLAKE2B 35f2480c609ed62bb0f277cba38e325cb387acf250d78d6db81dcf83cdc8002be9482d834d14f3e026452b493f4794b0a9ffff42b5ba3cf15b1263fb5ebe59da SHA512 412a1506d15b5ff3fff7f32caf50dca9283c9d667e4bce40a20be45465fcfe72e177159f546d4b8059de94c107faf641d116621ea395bc0ddb91c2a1d77257ec
-EBUILD libmix-2.05-r7.ebuild 877 BLAKE2B 7cb9c116607fd72611e86c19e1ce959de7cabc3cb15ed674fed012ba848910868dffef0408c6c75c30b1e19856a27af686f8ae6abb62190358708b620962788b SHA512 c2adfa9597732fb7fac2d140bf04550d25dfb713fb2d585aa8b7b7e2799540aa3112842281a21d9a7d464767f033ca69e5f26091240a622771142011b1973abe
+EBUILD libmix-2.05-r7.ebuild 876 BLAKE2B 43bd87c97dae2bb567827c749bb748a30b555ae977db8f67dbe936ead6e0d6e1498593236b68516bd5bf046d7325dab5b4d0f2509ca709d67215c640d5928223 SHA512 354b6d12deb7aad76bf9f55f3b58ad58727c6ee1a44083dc82dd1ffeebae8175c07017aa11cc8c1506a86da995916909f3c49c93eacee87c56d0b431b10d55c7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libmix/libmix-2.05-r7.ebuild b/dev-libs/libmix/libmix-2.05-r7.ebuild
index 9d54fe56def6..9fbad4d8abfd 100644
--- a/dev-libs/libmix/libmix-2.05-r7.ebuild
+++ b/dev-libs/libmix/libmix-2.05-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://mixter.void.ru/${P/.}.tgz"
 
 LICENSE="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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
 IUSE="static-libs"
 
 S=${WORKDIR}/${PN}-v${PV}
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 475474d94a1b..1d71b4b38f48 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,4 +1,4 @@
 AUX libmspack-0.6_alpha-fix-tests.patch 575 BLAKE2B 35a8342f103926bfff555237cbd432fd679ab61620aeaf654041cfb6c39a18f3be475bf7e0a93c004d7c953d6f2ed66e4528d3b546e9d22b28e1e666c6d9caeb SHA512 8c715e174d3eca76fb33c2a5eccccd4f7c4c7702320d0db9db5dec6038129f508afade126ae791191ffaaf60740a722db7a87fc76f8c00c86912a1e2e2323eda
 DIST libmspack-0.6alpha.tar.gz 476992 BLAKE2B 3ff510e108e12741b661a4960f204ce268572f79917d4ec18e105d09cee3f515d76e02a2432717ad6c2118c7eb191b51902ce86e3c5b441ee269740816b2a392 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d
-EBUILD libmspack-0.6_alpha.ebuild 1171 BLAKE2B 41bbf26a893cdc85f016d288d7374745c077e5bd72bed9ea870a9c2786c39ef4c66f5d5477411d67a03a142e14983356256ee09f7da2c71ad2b0872df5a47613 SHA512 e384b00cbc8dc3b150a72c44b8c1acfae1539e1a7a15751b9995780ed258b0cee9ddb55b56bddac3de3abe2f7dfe2abe0dd227afcd6a94ab9205af1edf2fee56
+EBUILD libmspack-0.6_alpha.ebuild 1174 BLAKE2B 3a003e82b406829fe28948fb21b0f630e5c5092180db5d0c9679e2c6d0e9ea7585ff64d80e4b8a99c66d9ebc4c3e5fbfc8dc06552381614d4d583df5a8bc19f2 SHA512 fde2287c2fea47b862ca1daedb02d29fc03f658576d5770f6b47f6e41f108b1bd5349e7144170066c60c4a07037240fe9edb87a19703168b50635dfc7487417a
 MISC metadata.xml 355 BLAKE2B 27dbf410ad5287ffc5ec6336a0c4cfc8eb02b52d72c9cceaaf39518dd435fc647e5c667f003c2b00141bd076fb574e6914f8cd3ad37de693bccfef9942e46689 SHA512 08390d344d23931d0c418eb18e0db2dbaba1f9942fac4984786fab7fa15045a9ccded1acc98d8ff4fdb4a2d5d83cb68383818745cb06b1b743489a2efaeb69d1
diff --git a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
index 2d660ecef548..979b522ed2b2 100644
--- a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm hppa ia64 ppc64 ~sparc x86"
 IUSE="debug doc static-libs utils"
 
 DEPEND=""
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 3846e2069cd4..4bd3234e61f1 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -2,11 +2,9 @@ AUX libnl-1.1-flags.patch 441 BLAKE2B b07df1490a4485468aadbe7dc3aa025fa2514c3611
 AUX libnl-1.1-vlan-header.patch 2378 BLAKE2B c6d72cb5c7437bc6600e2c34eb6f17fd22df4338c37cee53f0112d3824bf2e940c9166f233fe32df3d451ea37fee2c08db27db7f46d7522f5d04169abdecd28c SHA512 ea45d780b16e6045735aaf2e3febf19ddccab4ca0e03710aebfe51655adc50177aefa3bd4d06e0ccce0160f4c6db73cfa4eb7cebe53b3e15c1807c3b00dc1c9c
 AUX libnl-1.1.3-offsetof.patch 320 BLAKE2B 5edb7d935321ae40784d16fdf289470deee86921f2372d200468206ab06cb391a3fce01998d7e4924fd6d235e9292bbbd6134dbc87aa3ebc3dafd16610b4a2a1 SHA512 fe625a9ac6ea8776c8f7ef3d7e3553651c0244e830883587bd7e86490e0ec6e8b29865e172a0e39947e213b910a4279202eabfdd5d7f08e835f5be91d4ff9d6b
 DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4
-DIST libnl-3.2.28-in6.patch.xz 6368 BLAKE2B cafea9217a9aaee7a8d1a33598279a717cd96e08f326d003ebb833d501a4c9e3be3546fc4570aad137c579e88d82d3e2501546875d260fb4c2ec6c69544d2edd SHA512 de14f7540e514871db2058236a339192443423e56f2f5bd52e02ff06873c9e411029b12f3119e57eb01201ce3643ce78ca3e8d9ada4f6ba318df96288304bead
-DIST libnl-3.2.28.tar.gz 941954 BLAKE2B c36817832f36ef2f3e32af8703024c92c874a85f898fc02673c6f3ee983757ffa8c7c3340942dd47880d94da7d907f4a867a99fa252628d816705dd4318a85a0 SHA512 b5f145ecafb2625ed1c42594afd6063f112a601077de5c35884b3c3bc8c562b29b52a006ccebd795c127fe69692a82def425c8605afed7e6d441582943e803d9
 DIST libnl-3.4.0.tar.gz 933443 BLAKE2B 735da9f800277c48a5deceb78084f510f56f7017b1184e91b2bb45ba61a2e95355e7a3f5d0a74bdaf7ae003393a6c7556d5b201d0d0052dfc66042aa9e137986 SHA512 6336e5c55c79ff2638de9c812cc1842871769236bad7f65c547dec35fafd91988b257fceab144a0cc133c4b29f61172f6552c53aa9fc723bdc783079c2b1851e
+EBUILD libnl-1.1.4-r1.ebuild 1165 BLAKE2B c53d5fc1b86e016bf89cf590a9bb8f65f9abc45d4a994d9f405a63d35415234dd8501c7bbd948ba10074e2c5e48e08426a1484fdebc95ef82c345e2539edd6f7 SHA512 2c28a5244287710b2b69aabcd210cb09304ba487e2fb35872243adf59c46af6281606b18c0a3a6de3544b04ed952640a7452c2b9681b14b5deae33374e8b0601
 EBUILD libnl-1.1.4.ebuild 1141 BLAKE2B 16521e18a8b986a96540245ed54c5737c1ba8d17d3a492fe34b2e504216ba21186d1eaf4685716894f826186a87dd3b4ad82c87d9a4e439cd984fdf0472b4828 SHA512 1c63d4eabb1268b349918acbdc3cbc7d2fabc09a75e4b07793f1e380309404f460bfc3b90c7426377d57be65f5b679a5d20155003ab589497b225dea2f9c281a
-EBUILD libnl-3.2.28.ebuild 2486 BLAKE2B 2f99ac310c3777c72d36d7eb2ee3ca8d165fcef9385e67385297f384606bdc69675d23e85fb9b4cdadf0dca25639e51d677ce266005a0e9a405f9e069c61e789 SHA512 e6fc4f0076da3a41c6ec89cd52619f42ca5e966f2080e2150b5697612a4edad5c5f47fa34bb3188611fec7f04574db57cbbb1fd94ac3ca992771bd8f8086c30f
 EBUILD libnl-3.4.0.ebuild 2403 BLAKE2B a387a668f1a038addbef80b494d242963ea748e01bf8a3b4c63f605d68c0a1a74d2a54117e8bca8419461a105d8a5851e79c422c57091861987a11ed6e3cddb8 SHA512 c3c0d850a5a0a950222f89efa0d7fe8ca95b130a3d7f97aff6a4f4eae3987aa5af6f5d92ddb21496412975058fae099b3b60de3e7cd814bfcaad96c6b722b6a7
 EBUILD libnl-99999999.ebuild 2196 BLAKE2B aeff1715ffd0c59e7524386f82283e1c41d0aa39548e2f4ebdcfed77624ed64ae975a74bf1796644411c846c32c275b3465f89878cdffe4fa757d54f184136b1 SHA512 65b184e96b140b5e95dc1623175c5b042d8fade476fde6a8f58e462d31e6db4d1fda6d998097f75c6acae0f6ab65fbbce6502a0737e8c051d2358885e5ef54e6
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..2b9928fc0566
--- /dev/null
+++ b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
+HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
+SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="1.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+DEPEND="doc? ( app-doc/doxygen )"
+DOCS=( ChangeLog )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
+	"${FILESDIR}"/${PN}-1.1-flags.patch
+	"${FILESDIR}"/${PN}-1.1.3-offsetof.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/@echo/d' \
+		Makefile.rules {lib,src,tests}/Makefile || die
+	sed -i \
+		-e 's|-g ||g' \
+		Makefile.opts.in || die
+
+	if ! use static-libs; then
+		sed -i lib/Makefile -e '/OUT_AR/d' || die
+	fi
+
+	rm -f lib/libnl.a
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+
+	if use doc ; then
+		cd "${S}/doc"
+		emake gendoc || die
+	fi
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		cd "${S}/doc"
+		docinto html
+		dodoc -r html/*
+	fi
+}
diff --git a/dev-libs/libnl/libnl-3.2.28.ebuild b/dev-libs/libnl/libnl-3.2.28.ebuild
deleted file mode 100644
index d623fb202531..000000000000
--- a/dev-libs/libnl/libnl-3.2.28.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-DISTUTILS_OPTIONAL=1
-inherit distutils-r1 eutils libtool multilib multilib-minimal
-
-LIBNL_P=${P/_/-}
-LIBNL_DIR=${PV/_/}
-LIBNL_DIR=${LIBNL_DIR//./_}
-
-DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
-SRC_URI="
-	https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz
-	https://dev.gentoo.org/~jer/libnl-3.2.28-in6.patch.xz
-"
-LICENSE="LGPL-2.1 utils? ( GPL-2 )"
-SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs python utils"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	python? ( dev-lang/swig )
-	sys-devel/bison
-	sys-devel/flex
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-DOCS=(
-	ChangeLog
-)
-
-S=${WORKDIR}/${LIBNL_P}
-
-MULTILIB_WRAPPED_HEADERS=(
-	# we do not install CLI stuff for non-native
-	/usr/include/libnl3/netlink/cli/addr.h
-	/usr/include/libnl3/netlink/cli/class.h
-	/usr/include/libnl3/netlink/cli/cls.h
-	/usr/include/libnl3/netlink/cli/ct.h
-	/usr/include/libnl3/netlink/cli/exp.h
-	/usr/include/libnl3/netlink/cli/link.h
-	/usr/include/libnl3/netlink/cli/neigh.h
-	/usr/include/libnl3/netlink/cli/qdisc.h
-	/usr/include/libnl3/netlink/cli/route.h
-	/usr/include/libnl3/netlink/cli/rule.h
-	/usr/include/libnl3/netlink/cli/tc.h
-	/usr/include/libnl3/netlink/cli/utils.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-	"${WORKDIR}"/${PN}-3.2.28-in6.patch
-)
-
-src_prepare() {
-	default
-
-	elibtoolize
-
-	if use python; then
-		cd "${S}"/python || die
-		distutils-r1_src_prepare
-	fi
-
-	# out-of-source build broken
-	# https://github.com/thom311/libnl/pull/58
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		--disable-silent-rules \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable utils cli)
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use python; then
-		# Unset DOCS= since distutils-r1.eclass interferes
-		local DOCS=()
-		cd python || die
-		distutils-r1_src_install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index 8b70bc76d3c7..695c9b959c0f 100644
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -5,7 +5,9 @@ AUX libprelude-4.0.0-fix-python-bindings.patch 1136 BLAKE2B 287f5e3c049ef4d3af54
 DIST libprelude-3.0.0.tar.gz 2900153 BLAKE2B dd03b46a11b673252dc36701e4568c445fe1e3a61a79c92ce04ed6fefac804983ba03e39928038a67768d9e5e0542d74703c07254c0112d5a6906a7c37ae4403 SHA512 a1fd51aa3bb1b68759a00dd1636cb96379f0e954a66f4e39887ab20a5b4c191a0455dd6bd5f41b20ad94d06fff59af7f89b258f42e1c0dd4cfc99185a77d1797
 DIST libprelude-3.1.0.tar.gz 2949462 BLAKE2B 52764791766c54e2c1baa96231c6578f06219a6d1c48a97ad318fc8445fc64f90a63019654f7350d65ec4e0a336eef66bd449484321c590d1ee4596a6a386724 SHA512 f2878b19b4ba3cc74b0530f8741525ecf1425540d30356d182c4e0a797dbb5f4023792351bd059105dafc6b7818d4caa2e9c8b39be9a7039a89680244fcf1239
 DIST libprelude-4.0.0.tar.gz 2864402 BLAKE2B 2e51eb1af74b63140bc66a358b112a753c1a0fd86d6bb8bb43ccddca4cd396e34566168edca55a626a0b43ba56e676301f3792247c25f64c7a31430af3708311 SHA512 5d88e8f211b09cc3e43dbe299e935d8f11575ae3f1894059793966cd14a8e47177ef8963d45305e1a24f9efc4048520329b31681301a21815909bd38606c2ce7
+DIST libprelude-4.1.0.tar.gz 2852916 BLAKE2B a18babb24795d17d72eb1c0755f4b0330125c8b289af0b52753f6f69b5e820f0f972019b57eaded3abfc45c69bd75c0d120fe29982887e55d75f2c4c8b6486f7 SHA512 073307ca070794b47643e2ef2db4788fa92374735558b466441f0663f420cab45aecc7a1d99bb487ad23ebe602d5668369ffa6ab29fa3b0504356420ab3a7878
 EBUILD libprelude-3.0.0.ebuild 1795 BLAKE2B b515c9cc9e685dfd0584abc38c169ffe232b80817d2568d0643a574cda233262133adec1439a9ec8ded278fc4f37f79e22df9f7b191e079a44bf664abd9fbe04 SHA512 334217f69b8c55b5bcc5e76116a330c77d053d3c4c6f3e0912efc73fef4d8bc299706687977009c8c42abc4795b560cfad5ff1b316f1d1d096344464f920eafb
 EBUILD libprelude-3.1.0-r1.ebuild 1630 BLAKE2B f299532775781f50784ca2430a8c0e5349be44389998abc6db100b667868aeec0ead7d0e6a76fad26823a518b0405e5e557d2925c465b09a19c3b4a074c5cd98 SHA512 415c10afc56e9ae8f841cedf17239e9a337ee01291706b192e0cf429b2a5380afaf703e111fdee179896143afa234bad76f0bd514ce9d2bac921d82bdafca30f
 EBUILD libprelude-4.0.0.ebuild 1843 BLAKE2B ec2155103f408bcdf1f66c367676b1ca310533dad0703f52c26826d7e154b5640937d349b8b2eecd51cede8da682eef0584365005979d70333da982d078c14bf SHA512 4dca9697d94e6c527e27448c3224d9c4673e72132a9be442dae74116135fae487a037289a3540c0808978ae4a80f0a0c6830b39e9b01f0da3497a6b76b48f8eb
+EBUILD libprelude-4.1.0.ebuild 1851 BLAKE2B c82dd12729edd9434fc8c7f059bf6cbcefebb07462a5f1ee45a2bd806c1d00c37b609a42db52bf564b9bbec26c73aff55905c5ef863487a90eac5c64c301522b SHA512 c57ef3e33064872fd2d7530bc4fdac6d2e4c5191146cc98c6999e37de382fd713b69527c8f77441414d232e02651ef116670d00fbc82db8f411a46c40875658b
 MISC metadata.xml 871 BLAKE2B bf71e839f29918c8b71d3bd9e45c6afa99391f476ff8c94eb43d9378e754ddafb9cf4aeef69dce4fc2210819b08f62898d7ec4717a9d7f13d04ee3df24e0a734 SHA512 bf4e35e6d51f1797b24c262a6cfd38ef1ce06e80b504afabb2f3f0aa7f069335e96562f3716b819abaa1bcb1f8f88bcb1a72a11047cd87fd4d62d7903b200cec
diff --git a/dev-libs/libprelude/libprelude-4.1.0.ebuild b/dev-libs/libprelude/libprelude-4.1.0.ebuild
new file mode 100644
index 000000000000..975d9e553ea4
--- /dev/null
+++ b/dev-libs/libprelude/libprelude-4.1.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 ruby-single
+
+DESCRIPTION="Prelude-SIEM Framework Library"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lua perl python ruby"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="net-libs/gnutls:=
+	lua? ( dev-lang/lua:* )
+	perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-3.0.11
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
+)
+
+src_prepare() {
+	default
+
+	# Avoid null runpaths in Perl bindings.
+	sed -e 's/ LD_RUN_PATH=""//' -i "${S}/bindings/Makefile.am" || die "sed failed"
+
+	eautoreconf
+
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--enable-easy-bindings
+		--with-swig
+		$(use_with lua)
+		$(use_with perl)
+		$(usex perl '--with-perl-installdirs=vendor' '')
+		$(use_with ruby)
+	)
+
+	if use python; then
+		python_setup
+		if python_is_python3; then
+			myconf+=(--without-python2 --with-python3="${EPYTHON}")
+		else
+			myconf+=(--without-python3 --with-python2="${EPYTHON}")
+		fi
+	else
+		myconf+=(--without-python2 --without-python3)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_install
+	fi
+}
diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest
index 84adcccfa179..c72db0184c16 100644
--- a/dev-libs/libpreludedb/Manifest
+++ b/dev-libs/libpreludedb/Manifest
@@ -2,7 +2,9 @@ AUX libpreludedb-4.0.0-fix-python-bindings.patch 1075 BLAKE2B 414a9308a10b2c0aee
 DIST libpreludedb-3.0.0.tar.gz 1269937 BLAKE2B 6f6bad7b9529b88bd03b224c1ea4066b9e806ff82960d1c2e336ebc5c345353a3b63224e0ea84407f159443b6ec53c1cb6bba8009d48dfb53a26bab96960467e SHA512 9d80e01be8cf028b8a843e68e45eeb84c561ff37e688fe5b8156e717f337b1db4d3de983f37a0544bf018238bec07580dce0c7208df005113efbba0aab34b981
 DIST libpreludedb-3.1.0.tar.gz 1291186 BLAKE2B 90b3b6264f0042b14e54abfc3068071419646076fc6cfa3dd84ba6c14797fb0ea88885edef47b8a5d0dc455468e6daaa8e795b621a4f9001d19d8edc33630a88 SHA512 dcb98eff2521979c2956bdd6f3b661c346c0f6748ef820a75d77c948e426a996de26c7fc6b6c2abddc93277db3820eb2f44b61c87feb86483e720cf9b0e0124c
 DIST libpreludedb-4.0.0.tar.gz 1325812 BLAKE2B 7a506f7cd7b51898e26201f2cc640b1f34227f9cf7c5c6e2385480f1fc0ad854b6d747293ab502b641cc65f1ee9ae4a8f225e6a1d4489bcaa59901c6342f1279 SHA512 13f5dbcfa6af965f2075d60c645ebb19cbd6b18807b26f4f13a7a05f1cf552996f9846e856728a4e1dc621efda693016e82623d4a3cbf74849b3e7114f19faca
+DIST libpreludedb-4.1.0.tar.gz 1333638 BLAKE2B 380a6d4ef8836555510f9f9882b6100417f2567520c421355fb7eec8d2cd7e2f3942c4cb90ea21fa1557327026edd5c1e35e338a79e06a21cfb2bd6813a289c2 SHA512 de1fa5106d7f34edb5a23e726c968de84bb8b10257587b6ee36276ed75ddc54f4f9539aecb7836e114eb3bfa90104dd3b5e097be0c3d12347dcbded94f293dc4
 EBUILD libpreludedb-3.0.0.ebuild 1572 BLAKE2B 6a80c44ac91eb49044fd908e77b458e26203d7c5937e6764f0789e5c5fe048e6c4dcd0e84b8dfdcc331afd9cc03259c91a8dcb4f79b033c51e0d740a8876d8fc SHA512 8b8b5dbf1b1a5aabaab7b1191f79353aa197254b39ae8517f5f9b230ea8b7f946ec29395e7d7b5429bc542aabbb4a7b61ac8a611823f49d6eab356f432e450d6
 EBUILD libpreludedb-3.1.0.ebuild 1496 BLAKE2B 01fd701a2c6c2b14f3f1e75478f1d823d9f4441d183ac8bef243c6a8da44c03c4d6c0a6636cefbdcebf97c7c8e6decf091a45e1decf2e81ca8e8f9f2ef749464 SHA512 86eb7b065814b5a07e5908e57a2952ee82d61441dfd748afcff4d2c052c4353c4aae866e98520de84b76a63ee50e39f3bdb33e224d9456e48fe55f704b6842fa
 EBUILD libpreludedb-4.0.0.ebuild 1741 BLAKE2B 66618e59ac7cd62ccd480dc18ef2014ef04c930679da0af3427c2ea1b4d42a5c22fe6546dc0917895d1e32b88f493dcadc974d2feb72160be62f5f796659783a SHA512 f3f59361adb1907fbef8ca5d88755d4ef85b02ee2a4e1f7712c5bf13b1d2f6dbcfa472eb73e06cc54db86348c482df2a641517752924382a639ff15abb246b68
+EBUILD libpreludedb-4.1.0.ebuild 1749 BLAKE2B 46fc0b5d697fe050650c4f5d3bf90bc1337509b0c26c550b2fc66506ec487c28ddce99d19b524e3b3abd205a2dcdfddf7b0d1657ad6c298904c6ac1473d4ef80 SHA512 2760fb289a962f78a7d21303154e7ca9f672fdd2f3966f80b7c0e2f655846c3c4704ec8f4182c1cf2f183d32fabe2f747aa8c72f9f044dfaaa0bdef215adc24e
 MISC metadata.xml 740 BLAKE2B 4378279b071469fe4b56d29d93bbfa596c007ed9be028c028c0b3cea7b4a4d206b8dfada84f8dbefdc56ec1d355c0a81f8a5f719a3819761ef532a85fbdc2490 SHA512 336a155dddb152697e44246184aaf0cfa928f1a3acd226c3f048aaeca81e96e1c5c7bceaee2bcc5e6ff731b59de1eadb02698e01c3e9443e6d9a37859da8e973
diff --git a/dev-libs/libpreludedb/libpreludedb-4.1.0.ebuild b/dev-libs/libpreludedb/libpreludedb-4.1.0.ebuild
new file mode 100644
index 000000000000..ee315b82f581
--- /dev/null
+++ b/dev-libs/libpreludedb/libpreludedb-4.1.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 ruby-single
+
+DESCRIPTION="Framework to easy access to the Prelude database"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql postgres python sqlite"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="~dev-libs/libprelude-${PV}
+	net-libs/gnutls:=
+	mysql? ( virtual/libmysqlclient )
+	postgres? ( dev-db/postgresql:* )
+	python? ( ${PYTHON_DEPS} )
+	sqlite? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-3.0.11
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--enable-easy-bindings
+		--with-swig
+		$(use_with mysql)
+		$(use_with postgres postgresql)
+		$(use_with sqlite sqlite3)
+	)
+
+	if use python; then
+		python_setup
+		if python_is_python3; then
+			myconf+=(--without-python2 --with-python3="${EPYTHON}")
+		else
+			myconf+=(--without-python3 --with-python2="${EPYTHON}")
+		fi
+	else
+		myconf+=(--without-python2 --without-python3)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_install
+	fi
+}
diff --git a/dev-libs/libpthread-stubs/Manifest b/dev-libs/libpthread-stubs/Manifest
index 85fee5a3c33c..df82bec7b483 100644
--- a/dev-libs/libpthread-stubs/Manifest
+++ b/dev-libs/libpthread-stubs/Manifest
@@ -1,4 +1,4 @@
 DIST libpthread-stubs-0.4.tar.bz2 57565 BLAKE2B 0c59ba509aa24ce0d255790363d78d670be0bae5fd9556798f276466ecaf70c4d93064b531dd9870da8f934da6660fba71a7f0b402bb6ba5420fd6ee5ca546df SHA512 0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954
 EBUILD libpthread-stubs-0.4-r1.ebuild 814 BLAKE2B 32d51c2d5a14a72c1d9b88a413331966b20dff6957d6c7b920e2f0c0315da325cec14d8957ab17fd783c46a065f42e0a399a0de01f9dcab502cde30164b8a3e3 SHA512 dcf57e1df4bbcc60155074cbab63b79af0a0f4be1f81b35f17d64094ea6da72aa944b912ae711df9945fb7b7e090b3dd21b0b22de9ce67b23f19532abb0e44d4
-EBUILD libpthread-stubs-0.4.ebuild 559 BLAKE2B 5a167e159355ae1fff81ce825d23d87ffd4bc9538997f402a2c92b24f58a40f92ccaa1b9db4b2014bf16c6fe49c24c740881c632be3f5339b10aa778aebabe1c SHA512 4b899d6f4941f824b0d0b6efd4c23a134ecb40579d56d30dba0377cb81590ad7f85a5573610dc0c83468d95a843af9a5e85a8221f218fd4645ef08d977e8ecc6
+EBUILD libpthread-stubs-0.4.ebuild 558 BLAKE2B fbdf5eb277d82abd40c467575f23c62518d5202be6bbfcb6bdea017da32d57cf8c9a022e9b5a1149735aba6270d321c4d30aec83a40569bdf58f8b9180a4d0d8 SHA512 11c659e774a557599cec8388436eb85628b191d602f378a2e9e233f26309ff4b6ced321aa0e6947a84f7fa270ec904720502c1319d59409be46f1cde6ae2395a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild
index 4aa8714ea11e..cf314be164bb 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild
@@ -10,7 +10,7 @@ inherit xorg-2
 DESCRIPTION="Pthread functions stubs for platforms missing them"
 SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 00030d952101..72513c048ccd 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,4 +1,6 @@
 AUX libsavitar-3.3.0-remove-packaged-pugixml.patch 3294 BLAKE2B aa31da750cf1adcba252560a9160b96d7289a4d5fbc417396cb3c01e655e48f8014bc99b65554c8b03d28f0d00f99dfaad47a8fa0c2d3364221ae2971a42e4ec SHA512 5f944f2e32ca0b6b9bf161802816a32e9835198923a5ff5dc0f483df3ce41a69d08c1eb49c2e932c4cf5347aafeba0f29c88dfc091c06ca2057f7f92ed55d21c
 DIST libsavitar-3.3.0.tar.gz 92460 BLAKE2B 7b68e42b41092986452684f5778873a2636741fcd5659d2ff543b3a81fbe1e9fc7a216b77506873e08e9a1c76dfa8d365d7524a83b974db864ca60727a6a8d4e SHA512 9b64e18496dac00f521294ae2401002b0cca1249a80426ac0c1a1edb0d41984aba957a0c2e9acbd1ac1678307f2778617dab3c88db5d244bd746314d1a991eba
+DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235f46c8abb1365eb5e439b6f1cf3eed6ff1fa4f2a3476a6f3ed0193356d8019a6ccbce044c29339ec2693b96db3d4 SHA512 4273723536578816ab16c2d9f8c0fba57651a2cd5730e45a27e5ed5ec6a7986f59ef932094392b6bf7bd9dd9555cc44e09505c843e9b364a2c7bcc1770af1f35
 EBUILD libsavitar-3.3.0-r1.ebuild 1034 BLAKE2B b82848b61888ced896ee8c6a4aa4e121db0aa75303fd1470f52cc8ed9777d8544bd14ad4e2a172734b71550a15241073a7d3bd97934951f95c2c56ed4308dc1f SHA512 f1fec09df09fb5629de89ea3804119286dd1b2c81ee374671aa820cce89f5e74e2ede83ef6cce6d8830b17468949c06131f3b4517024352c50b874c8ff431b97
+EBUILD libsavitar-3.4.1.ebuild 1039 BLAKE2B a6b6119d55bcc19b7cccf71e143cdee21798f0e60c6177c1fb43aec4bc707441746cf4517009e544e0bb9ba2a90177a5a422de3cf6512bded01d4194d83ab1f7 SHA512 fbee3ebe2af9fae1622428b260cbc937482000bf5e4e15430bd3041cf41d84a074422bd59f7fc6bf0254839025493b11aeb8abaaee7fda06eef2a0cb5e098a13
 MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304
diff --git a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild
new file mode 100644
index 000000000000..19171d1a74ed
--- /dev/null
+++ b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils python-single-r1
+
+MY_PN="libSavitar"
+
+DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
+HOMEPAGE="https://github.com/Ultimaker/libSavitar"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="+python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/pugixml
+	dev-python/sip[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.3.0-remove-packaged-pugixml.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+	)
+	use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/libwbxml/Manifest b/dev-libs/libwbxml/Manifest
index c5b34927e470..d49a6749c59e 100644
--- a/dev-libs/libwbxml/Manifest
+++ b/dev-libs/libwbxml/Manifest
@@ -1,3 +1,3 @@
 DIST libwbxml-0.11.2.tar.bz2 354176 BLAKE2B bedc86dc269c876d788b682b67fbc021a50ee6742dad4424a118edee061e5f745941dff5589c2b4da562822f655b277c09858382615564831317bcb5b51a4c16 SHA512 1eb01e35b1fab548163caca8ba024216926995adaf2e3bd7a001927858c51a792620eb7e9ca111fc6bdf5af5c1a1cbd3eac3fe53d427cd1a6d9e8aadfc51bf1f
-EBUILD libwbxml-0.11.2.ebuild 666 BLAKE2B 406a5dc42470a62b3f8abdf6b3a0278d92177f222bdb4c2b76d54123fc45ce92e28c9b49b054909f722f4d47ffe7ba6fcf64c3cb37c9f0fcafae4cdb42a2a254 SHA512 aefdf01fb7148d2c070c17e6b2c2282e1eb38dc2cfe7804e5bdc29a2f315dcbae4ae8a013ba3ace22ae5f7070277428e27db418ceeff7e164fe3361a3a7ccf0c
+EBUILD libwbxml-0.11.2.ebuild 666 BLAKE2B 8c4f01df31241a5bcea45baae1468fa56b998b4cb43c6697804edd4e6c40d0cf49fb3e76227d549bb2996e77e4b7507a336c204c3a826982c7225b974e5170bc SHA512 34c840db0e85e4d4fd2955c01c32b03a622eaadc60afdfad68ef3a2be1c4bc2b69cb3be267c18229a0d5f5cba91dea2b5c135d447e9d6eeee4372ab0fdd67510
 MISC metadata.xml 245 BLAKE2B 6178519b15a18e4e5672f6729b122ab28f14951d4245e66eaf53d68a89a5cf756d0102e395e52277272f96d25744e966fc133e3dd94f4dc176d5f76dcdc5b4e5 SHA512 b59406b926c018a2592790e9966ad9380601aa79700a6ca14ef4d3e2d9f2236791f7d7cf1f6b0f4e697fa3eed9a7e0c0b3fcf5090a744dba4e808a3f14e3d7d8
diff --git a/dev-libs/libwbxml/libwbxml-0.11.2.ebuild b/dev-libs/libwbxml/libwbxml-0.11.2.ebuild
index 914eeba6a1b1..5c14fc4f61f0 100644
--- a/dev-libs/libwbxml/libwbxml-0.11.2.ebuild
+++ b/dev-libs/libwbxml/libwbxml-0.11.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils
 
diff --git a/dev-libs/nmeap/Manifest b/dev-libs/nmeap/Manifest
index f5c3bacb3808..2bab55528db2 100644
--- a/dev-libs/nmeap/Manifest
+++ b/dev-libs/nmeap/Manifest
@@ -1,3 +1,3 @@
 DIST nmeap-0.3.tar.gz 29380 BLAKE2B d4828a1a3d8a66ae529e40c034bf180da9657c2a3dec1ab09f32a9062430952a568612d2071acb887c6f1afdb19de82cb4b6d1788c6e9c2e1e859d9914209b3a SHA512 064a7fe27a192b4abe1393f8f343c8956bd9dd1d0de1441ca96597ab1f155001905b9b0b35d47b61e1f68891b820c602c024e4c74fb809719108711c5b1df815
-EBUILD nmeap-0.3.ebuild 1150 BLAKE2B ae0492569c3ade809f666742abf3dba71fb0d4f0421d1777edfcf129a3c2084a7711b0bb12b1da3d9d2736a5d7f8d6804f3ab55d2ff46e66e1bfc09ed9d87cd8 SHA512 067a0c9a5a9834ac05cf659e4e0f13ae82aaa7b64182a67c8de0f47a0af4d4dd5dad30ee652432fe9ab8e0dd43689e867a1e2c45318aba39451a1f203b15ae9a
+EBUILD nmeap-0.3.ebuild 1155 BLAKE2B 61784b9a1831908fca9cce24476b7707fb8d3e1800a8051bb4b8b30f16495b6d437ad14d6e87dc1d093312a70c16bbb78ff27f6db77118eca26142b1550fd1c8 SHA512 f9b660ee8c22fa14637cbdb67b5c8fa6a0cfebcac3fdc908cc18cdfb0bcd943df208488244c86f4a61ac0064d2fa2ebc1c5f1282d91e22132088fddfc70d52f1
 MISC metadata.xml 654 BLAKE2B 523e88d73eb697049f2ac07c0ee3d42afc2e5f349f32e872d3671f5c70f5122565c108fb869b4a93644f55af82dd488ab85a38480ca68ac7481a63c4791e33d5 SHA512 84398ecadc7c15731e396625fd3f428760bb3797cf35627fffc96d741b3328582b75a4b80d510bfd44a81e1659b3d2a7757d3ce5998573e11641fff3c55d64bd
diff --git a/dev-libs/nmeap/nmeap-0.3.ebuild b/dev-libs/nmeap/nmeap-0.3.ebuild
index 50bc2004a9f4..4472bec01eee 100644
--- a/dev-libs/nmeap/nmeap-0.3.ebuild
+++ b/dev-libs/nmeap/nmeap-0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/onigmo/Manifest b/dev-libs/onigmo/Manifest
index ea69faea87cd..7abc91caaee5 100644
--- a/dev-libs/onigmo/Manifest
+++ b/dev-libs/onigmo/Manifest
@@ -1,3 +1,3 @@
-DIST onigmo-6.1.3.tar.gz 834303 BLAKE2B f9b0a49716b817baa71d99bd3aaa6161b96f8073c4b4f87ea5eb70ebc7f7104b4844bb9763924c16a4ed90276bc2a2a18ab2f93dd546892b07fe81235b027f3d SHA512 dbae545ca79f8976b5e7f90f08301eb53a2c2f36c1ea62492badfbcfdd61679b68e3197765a2f9753bc033829c15d7fb24db307654b0ddb65774c88d122476fe
-EBUILD onigmo-6.1.3.ebuild 880 BLAKE2B 871414d33ef128a8bf05b679b9526aface35b23c78f53d98179652470f92a568ded402bffbe379018270856069dade7c6278133553684cf866f7dfe59ce0ebdb SHA512 e3ca3ece250e328a81a43a941a87545d654d9ae733a88b378e495a42cbeb75d42dd6a93a17a464fdceb795af6d0663cedded635c3ad0569f8dfb7bb7ea251292
-MISC metadata.xml 535 BLAKE2B c2a9c3d82cba7874fa42d267fc719aadaf608e2b4b1702f947456defd43b0ae192cb8d6c47f8a44d782f0c0bb784574878ebac4a21ff0577678b875fc729302f SHA512 fd7e420cba982c3f58970918014a7f5d898e011a9aea497d567d4510b91d3e197499a80e566a8245fe446f0406b40fae2e5d9fa389cc2f559ab6b9199b49d418
+DIST onigmo-6.1.3.tar.gz 822127 BLAKE2B b2f020ba37c039022ee4ad0840006b7d84bd5c2b24975d3cc34a625379c478cdfacbb7247d5f2315da2e56beaa74fec5390140d4a3f0c29c66906d78d7207b8b SHA512 13ee0e97e5e7ea2a379cdfd8bab121ee116fc07495c6b3131621f6cd9b1748897e5e2c7dcf43845794b2ad4adef3b4076daf06f51aaf965e32cbac5d7bace1e6
+EBUILD onigmo-6.1.3.ebuild 874 BLAKE2B 262440b3e06a3956bfca717a13195f239952bc8a2d9ba39afad234ee548773c54ec2c221472b76000d420e8b930713d24a4f0192f17da8164760f1208844f19e SHA512 a9c29f664650d9ea42c3b8d6e4dc6bebb3395894545a86c8e1241c158cb6dda0d85f2ab08950a7aafc8d287a42b136f78a6bad00cff7698f64d635d4cf158cab
+MISC metadata.xml 607 BLAKE2B 0905f9762b2a1705657d992299cd1c793e019140257845437171497551028dc5056450daf14931e57621ddaac82216526fe0df101e08ac2e2deb26ca7467c4dc SHA512 6b734fe90fdb3ac48abdcd9941494190d90c1889ef43adeee93574c09a28b233c7eaa51b8600e2d220a3d1c54dc181e09c1a93a7d95eb76d25179faf6c9361ef
diff --git a/dev-libs/onigmo/metadata.xml b/dev-libs/onigmo/metadata.xml
index b9924f7d1fec..b1cea8c977b4 100644
--- a/dev-libs/onigmo/metadata.xml
+++ b/dev-libs/onigmo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <slots>
     <subslots>Reflect ABI of libonigmo.so.</subslots>
   </slots>
diff --git a/dev-libs/onigmo/onigmo-6.1.3.ebuild b/dev-libs/onigmo/onigmo-6.1.3.ebuild
index ec34f26b6f16..4c34afcf8ac8 100644
--- a/dev-libs/onigmo/onigmo-6.1.3.ebuild
+++ b/dev-libs/onigmo/onigmo-6.1.3.ebuild
@@ -1,37 +1,34 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
-inherit autotools
+inherit autotools multilib-minimal
 
 DESCRIPTION="Onigmo is a regular expressions library forked from Oniguruma"
-HOMEPAGE="https://github.com/k-takata/onigmo"
-SRC_URI="https://github.com/k-takata/${PN}/archive/Onigmo-${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/k-takata/Onigmo"
+SRC_URI="https://github.com/k-takata/${PN^o}/releases/download/${P^o}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/6"
 KEYWORDS="~amd64 ~x86"
 IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
 
-S="${WORKDIR}/Onigmo-Onigmo-${PV}"
-
-DOCS=(AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} doc/UnicodeProps.txt)
+DOCS=( AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} doc/UnicodeProps.txt )
 
 src_prepare() {
 	default
 	eautoreconf
 }
 
-src_configure() {
+multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable combination-explosion-check) \
 		$(use_enable crnl-as-line-terminator) \
 		$(use_enable static-libs static)
 }
 
-src_install() {
-	default
+multilib_src_install_all() {
 	einstalldocs
 	find "${D}" -name "*.la" -delete || die
 }
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index 2f682669ecb9..a9325551c51a 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,3 +1,5 @@
 DIST qtkeychain-0.8.0.tar.gz 34686 BLAKE2B bb20ace4393e04a8c8167ce112499fed75615ed165824bfcbba6a243e374523ff397aa85eb324ee8d742295a1bd4618a363fae6f92aae74caf09b9ca18d76c1e SHA512 be83ebc665a7916e96a2fd9990c72cd29373196591cf557fa6f9691f332ab67cc5475cab240c3e50e76cb37e0b7f189f0a1f2c3a70a6f655918e1d2465ed2f33
+DIST qtkeychain-0.9.0.tar.gz 35614 BLAKE2B b8fbcc3737808f8415f703cd92dd1f036fd6d1d83c056562e0142f67a234ddc29ad7f029ce9f520c8bcf179d8b99b5cf8b702ad010763956ff0fb8ce3f030934 SHA512 d8e7895169e9746c234a156e00edb939926d14da1a5eadab7cb1e67790958973bfd11c9c04c6fa5cf776aafbd0af40dcd50c683f1c80bef60d47d1465bb350df
 EBUILD qtkeychain-0.8.0.ebuild 771 BLAKE2B 0cce7f8a6e103b0a982454fe6d6c3faf82d0b2bc69060a59a80e1cd2e766eb80d87329614e04e441b7471741bee23c67d6b463c13d24df8493b3fef4ec7fbbc5 SHA512 41a537d69f072adf00720c891382795d6c4cd38fc7936cf91517f5ee56005defddda4d51d16dd8317bad2d8afa23ee0bfc4a7e47689b3ee315efd1bc5fa04e8e
+EBUILD qtkeychain-0.9.0.ebuild 903 BLAKE2B 9a24be53e7ae0c5280efebb82d307f967750cbeb0b2aade9705a70efc6076917168e11b33931d5164916739fa6eaef2d9d889fbfc5daa31cdc461afaa8fd90a4 SHA512 978d622d0ddf54d58a24cb6a2cb36404cae848558cf236d033e781bac9185b5b51cc260706e971ea70bfd277940e7a394f027949ce8bfea7846d69b8aa1e8b69
 MISC metadata.xml 335 BLAKE2B 676879e385fb11722b2c2d90478178b06223e401992e5c55b88081e513fc11904e4766f4525eba3349a0e9f2fdc81b08cbeb2d973f9b77cf70e9985afd63e40a SHA512 72e060f41c90aa2a177af6c32b35109f0489fd277f5864cae4f6be7e2577f0920ba75f811081b058a210d54415dfc7e8aed35ca233748e35dcd1233b59d47342
diff --git a/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
new file mode 100644
index 000000000000..ac90679ec32a
--- /dev/null
+++ b/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
+DESCRIPTION="Qt API for storing passwords securely"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="${HOMEPAGE}.git"
+fi
+
+LICENSE="BSD"
+SLOT="0/1"
+IUSE="gnome-keyring"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	gnome-keyring? ( dev-libs/glib:2 )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	gnome-keyring? ( gnome-base/libgnome-keyring )
+"
+
+DOCS=( ChangeLog ReadMe.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT4=OFF
+		-DQTKEYCHAIN_STATIC=OFF
+		-DBUILD_TEST_APPLICATION=OFF
+		-DBUILD_TRANSLATIONS=ON
+		-DLIBSECRET_SUPPORT=$(usex gnome-keyring)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 7d18c975bacc..3e7b1b203900 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,5 +1,5 @@
 DIST quazip-0.7.3.tar.gz 439536 BLAKE2B 7b91d12f14e060f3554e6d9b4041aef56f269c3e5cc3a4e67eaa415cf990f474da8581a248037d2b741117c5f83c514f3dc4e30310dccc954cf363435acfc4c6 SHA512 d4b55bd040e47e97e7bd5d080399ae4aa5fbc4985d6ab5979b468abc852c91b2e3e5d35af90d4b4de3bb01ea9135d0247473d6eab0413392b1c8567dc799a9fe
 DIST quazip-0.7.6.tar.gz 149029 BLAKE2B 7eb99f550dc06d8d2911b22214294accaa5126657598bfd60614267715ea968790f470cea2820e1a78a8581ab0d4b75c90589c0da1ae815067e083e389020762 SHA512 4325a69918216bb66c6a7c53589ef73473c3752151522a135dd9c92dbf722b29656aea7be0314c84399a214391eca79296ecda5811ab31845d8cf53c010110d1
 EBUILD quazip-0.7.3-r1.ebuild 1153 BLAKE2B 8eade14de50d7cb1d107047a4499a729c3485b63401dcda2ac2582d189e8623873475ca4e26ee38f7fc9cc2826ed610f12ba56e39da07fe73da42eb6013a725c SHA512 c136346ee3d3da176fad5458a82cea7d9c98c0e78084238a6d17c308daf3a155244f83d01e318c36829233518632167819b15424fc9a0f27fcb7d2654556296b
-EBUILD quazip-0.7.6.ebuild 1132 BLAKE2B 8a79c2b24759fcc6f456b544b4748b202b600c4491a77ba2d23798d3eb31de2d88a9300193c43b4091540dee0a73e78338494774905758e2d17271741fd9b38b SHA512 63028fceb0597f08988199ac2a475c138bda5892289bb6ca7af966539fb6aa4ea3095853088a14e2d6f64096821e6529eb4062fdf244189cdb289f68b13efdf5
+EBUILD quazip-0.7.6.ebuild 1130 BLAKE2B 2c136da5203fe29c055cb04f7f782eb531ce97845e38e7c0c77ec48981681167eb015e12123af694983e667b6135a3d0a25e8cd7f420426b1df8c3fb4cd81f88 SHA512 e8d4dbffa69b2db8d01c5da05ba84004b6cdacc7b8f585be9b78e194eca894240ada789066c5d4eac6942822586c6b2ee39dad9fcbf9edd56669b33130f9da70
 MISC metadata.xml 291 BLAKE2B c82030a8bb517384360ea44225c9c472868d2460ddc9f95f267ef58f8275d7386a87fc7f074995636bf88e056cdf516a3a89500d6d0da09ea97d0d70507eca73 SHA512 4bbb5644633f8430cf5aa8e2e0108154b9480129ebdfcdcd2e3138c550d03d4d4b2d5554ec2a2fcf592375cda4ce4825f59db8921256c491a3216500f8df0a98
diff --git a/dev-libs/quazip/quazip-0.7.6.ebuild b/dev-libs/quazip/quazip-0.7.6.ebuild
index e9f4d698d203..77d1a132a899 100644
--- a/dev-libs/quazip/quazip-0.7.6.ebuild
+++ b/dev-libs/quazip/quazip-0.7.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stachenov/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 7f44edb2ddac..88ec7ad80e8a 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,11 +1,9 @@
 DIST vala-0.34.16.tar.xz 2795676 BLAKE2B 64428099c209e13a6aad09233af650f412efa191ff4873fae1dbfb9bcc252e13d4e152733c9f199cd23323872fd912807a685980f651c1f784bfaffae7bf4162 SHA512 6411d55524a6c717c2eaf5cc1231ac931400e3f66d151a8b8856910258eb5bd7affe3a90946de34feb51aabfafce721b8d57f61e0475095b275d20b73cc4bbec
 DIST vala-0.34.9.tar.xz 2783952 BLAKE2B e90728075ac546e8abc125886182abd5fc357be5138bfea1ed058f41bf07968e55e032469cc068cefdb6a4d53f1c029ca7e728c57b00f6b9845e32c4410e8258 SHA512 8128dfbb50d0db2317feb4a358310de972ecb6f4dccaceb4d55cf3a024f4d83422e3137c92238e1a0a0b4766367ad307909a1310445017c71944ac30fc68d01f
-DIST vala-0.36.11.tar.xz 2862788 BLAKE2B e6355669e1f70812ba3db12f3f9fa4f9eb7f8cfe2faa7496e850d93e6acaf74b1f25231acce32001e9e1697518b1e3ffe10646eaf10b62741758aa962dc38b92 SHA512 7b6a5b24be9b35cd3ad28cff9444600f3d4b15f39f1fefb14b35f441fdc7a4a0c439cd729af6064a0c55341ae5e616bd57c744635d394c4bf02d24f74be3e1cf
 DIST vala-0.36.13.tar.xz 2869616 BLAKE2B adb22fa45e34c2be2accde2bc928148d3115dc0757338d66feb111b4225879f21f2af5f49511eff53697127d3431d22736be827d3663ed8a5de6d8ac718b0cee SHA512 7c9bb2e50f660ec28d55f755019ba81eb0358327967d8046a14691b5fe9c805f731c6277cbb732fc19af60322e2293bb25176387944ca2de709cde0c22b44d1f
-DIST vala-0.36.7.tar.xz 2854668 BLAKE2B 2fcb528b26a56ee9f9d362ec1891c873ee26580132c052554a3d021fea32c0cee6dc6e8c6419f88798f5066a70d54084757893b2d46e3b286b441a51a4169c92 SHA512 7a6daac5be72240ae998b2c26e240a8b6bbc44c8bb6a036357fc0419cd7b40e14ea76c8125eb49a8d252627425613512410ba7868eb579b13d299e2ff0f4082b
+DIST vala-0.36.14.tar.xz 2874504 BLAKE2B 217178c9018e8d6623e5997f36210ecccfa0176ae06a52bed6b54b5d6af3504c7157b9bfb162d44ef96e0b95fa2ebfff4171b935f911491f62f88c69f6087d57 SHA512 123c54a3ba2198b6cc7d40bfce20dee687a369e26346fb6675ce07692755ceb91bea7137f707b9f5a7972c99b12a77e9d4cc65ae055053f48909c80377661fbe
 EBUILD vala-common-0.34.16.ebuild 2542 BLAKE2B 4cdc068195601507e5d82dd5aae28c76f8793af489ddee1df1c9a48193ecdd006ae125775126eafcf9caee83537041369b2b3303cf2f97f214dd27224c057fda SHA512 edf400f4a70b300b13bc1086b1ee9923979d9bc21a81a3e4efce05944842a035d1c8701bd35b026b84f062a9465e037eca70690723f8e6fe05e1608f0030eb22
 EBUILD vala-common-0.34.9.ebuild 2533 BLAKE2B 6cd8150927a49de7daa2d3a6394b72ad7e06b33a1459eea21b52e1fb751b7095d5b731930af9d22647e5767bebd5d028b3aadbdb9d6c6e097999c1c17e566907 SHA512 798a4ab1f0d5b22ee2a3cd259e89a52ef6b122bb9605f1cbcf346f8aba5bdfad4c49d9ac1c19127e3244b011ad914173123a3418121a7c2ece32c8970169c9de
-EBUILD vala-common-0.36.11.ebuild 2542 BLAKE2B 4cdc068195601507e5d82dd5aae28c76f8793af489ddee1df1c9a48193ecdd006ae125775126eafcf9caee83537041369b2b3303cf2f97f214dd27224c057fda SHA512 edf400f4a70b300b13bc1086b1ee9923979d9bc21a81a3e4efce05944842a035d1c8701bd35b026b84f062a9465e037eca70690723f8e6fe05e1608f0030eb22
 EBUILD vala-common-0.36.13.ebuild 2533 BLAKE2B 1e834f43de5670f211052c5ba6be783806cfe25fd6aa4a2890efad0eba1db06953dd656dfbd58b880f4be2e87f9855f9300adeeb2c517b9d68028c73af1f0b28 SHA512 5a5b8eb3e3f25aa08d28eb2016e9514e7f3789aa8c32e81711190218900a4a90df3acf711269a03fbd395e78d88516e894ae7eed87fc32767ae9e731c1ac6e9e
-EBUILD vala-common-0.36.7.ebuild 2533 BLAKE2B 1e834f43de5670f211052c5ba6be783806cfe25fd6aa4a2890efad0eba1db06953dd656dfbd58b880f4be2e87f9855f9300adeeb2c517b9d68028c73af1f0b28 SHA512 5a5b8eb3e3f25aa08d28eb2016e9514e7f3789aa8c32e81711190218900a4a90df3acf711269a03fbd395e78d88516e894ae7eed87fc32767ae9e731c1ac6e9e
+EBUILD vala-common-0.36.14.ebuild 2542 BLAKE2B 4cdc068195601507e5d82dd5aae28c76f8793af489ddee1df1c9a48193ecdd006ae125775126eafcf9caee83537041369b2b3303cf2f97f214dd27224c057fda SHA512 edf400f4a70b300b13bc1086b1ee9923979d9bc21a81a3e4efce05944842a035d1c8701bd35b026b84f062a9465e037eca70690723f8e6fe05e1608f0030eb22
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.36.11.ebuild b/dev-libs/vala-common/vala-common-0.36.14.ebuild
index 914750231de3..914750231de3 100644
--- a/dev-libs/vala-common/vala-common-0.36.11.ebuild
+++ b/dev-libs/vala-common/vala-common-0.36.14.ebuild
diff --git a/dev-libs/vala-common/vala-common-0.36.7.ebuild b/dev-libs/vala-common/vala-common-0.36.7.ebuild
deleted file mode 100644
index 21649ff52ab6..000000000000
--- a/dev-libs/vala-common/vala-common-0.36.7.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-# Previously ${PN} was part of dev-lang/vala
-RDEPEND="
-	!<dev-lang/vala-0.10.4-r2
-	!<dev-lang/vala-0.12.1-r1:0.12
-	!<dev-lang/vala-0.14.2-r2:0.14
-	!<dev-lang/vala-0.16.1-r2:0.16
-	!<dev-lang/vala-0.17.5:0.18
-"
-DEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
-
-pkg_postinst() {
-	# Hack to prevent alternatives_auto_makesym in previously installed
-	# dev-lang/vala's pkg_postrm from overwriting vala-common's files
-	if has_version '<dev-lang/vala-0.10.4-r2:0.10' && [[ -f "${EROOT}usr/share/aclocal/vala-0-10.m4" ]]; then
-		ebegin "Removing old vala-0.10 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-10.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.12.1-r1:0.12' && [[ -f "${EROOT}usr/share/aclocal/vala-0-12.m4" ]]; then
-		ebegin "Removing old vala-0.12 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.14.2-r2:0.14' && [[ -f "${EROOT}usr/share/aclocal/vala-0-14.m4" ]]; then
-		ebegin "Removing old vala-0.14 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.16.1-r2:0.16' && [[ -f "${EROOT}usr/share/aclocal/vala-0-16.m4" ]]; then
-		ebegin "Removing old vala-0.16 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
-		eend $?
-		if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then
-			ebegin "Removing old vala-0.16 makefile template"
-			rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null
-			eend $?
-		fi
-	fi
-	if has_version '<dev-lang/vala-0.17.5:0.18' && [[ -f "${EROOT}usr/share/aclocal/vala-0-18.m4" ]]; then
-		ebegin "Removing old vala-0.18 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
-		eend $?
-		if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then
-			ebegin "Removing old vala-0.18 makefile template"
-			rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null
-			eend $?
-		fi
-	fi
-}
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 27400ee6817d..0ae73d8dfb45 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -4,9 +4,11 @@ DIST xapian-bindings-1.2.25.tar.xz 1711860 BLAKE2B 66367dbc503333c4f59da8bb5bd48
 DIST xapian-bindings-1.4.4.tar.xz 1117140 BLAKE2B 2240ecbe136443e9beea8871731a720a7382f0b59533ecb50983ff3cf8142500aaf762e4d1282be26de9f7e862c1071e21fa3cd67c50203d7bbc687fb202fb6d SHA512 006e771b3ea654130b4f76f1a1caee576fd5a3fa6317ca44f1e5483671e8c83073ecbde4f3fc7f84c75590eec53acb59701af4cf9bcd72355ed9d53924492b53
 DIST xapian-bindings-1.4.5.tar.xz 1118884 BLAKE2B 507b06f0121e5a56224250bfe7b19795eb9fd2fba977d12022d054e7b832fd70af70085ad576dab41efcde261f9ecd48179646f1ea67aaa266fb6272358eb69a SHA512 e39ece495e25077990db3d06554306567c52c6f45ad55a65005cb97e18086ee18947e41d0d612157b891b61e015881385bcb082a03aa0c6452565e90d09e8275
 DIST xapian-bindings-1.4.6.tar.xz 1121532 BLAKE2B ecac35f9510fadb39f260c1ebd03220ebe01131e4a5fcc2842778adccdf9bf3e3ae6161dd66dc75774bfb1643f1dccc99a3bbb99894e49dbbdd65f838f827a4d SHA512 e1d8d4c79ef8eb1b890be955b14eca7e9c7aafc6051cf9080d67948455f82ed68ab518343f532cde2a1c9e07d94b3aae8b8f5130db158c6badc9b6d118ceb733
+DIST xapian-bindings-1.4.7.tar.xz 1121700 BLAKE2B f8492113b76aba322c975aa2b957a627a32e5209d8b79f435dc85c899cf14619af6165265e624e2ba8806f3c91dd35d71d98c4a47f5d6f4fba1b7fb83700c0d0 SHA512 c904cd3abf19d68495b0487ea77265fdc92a3cd8b1c2437b89034efd349ce41198bbc4abca49f259f71a1ba0fd269b2cf9b6dd4c1607678a73cbed4de9c5a1d5
 EBUILD xapian-bindings-1.2.24.ebuild 5550 BLAKE2B 8715a21a7277695c9bb328ca20d52f188405f4306efaca6fbd89d79d0949fd82c5fb6a77b2e045bf472152aae5c1100904702856f457e4b10c051ec9d5821f63 SHA512 4961916df0b4cb265b3e4f68566f0c0f66f767c31d762cd044095a897e916910d3adaebc549e90d924ac738435863095664731272c8c12df6be0fd94dc0039c6
 EBUILD xapian-bindings-1.2.25.ebuild 5551 BLAKE2B d0e1431b390f2ce7f43bc5ceddb0e205dc0118255cb6a9a9844a3005845a1de10ff9834369118532ee956ebdd8f5d4fb43e5636df4d488502967ad26b37e78d6 SHA512 cea9b9dbb61721ce41ec481099c8cdc27fc7d6da5b88c7777503348b124442aecb70b0c888d3d1560332679ae3c8a3ab60eacde4b6154abba9c2be60a853c36a
 EBUILD xapian-bindings-1.4.4.ebuild 3522 BLAKE2B 1dcaa9c2383685db410e9d7421cc55990598444c3360b698ece2d9ce051cf11d28966ec93d08f599e6036154fb5fb7a07855cf5b7dc6319f140a90d6d989312e SHA512 f57942ee1c7b2ffdb42799df989fc3634f3bdde4b61f9e423d7c5e343645cf28eb67b99694a6b82695f371f52c2b235e9e3dff7d07112dda1267a80dbcacadf1
 EBUILD xapian-bindings-1.4.5.ebuild 6506 BLAKE2B 434e72be2ed959609954eb139f5f1583f2cf83e0ce05ed3f641a6f7e637b23b10a89940d5ab61eb1dc32556f58d4ece8a91879442c6502e9f56325ad766778da SHA512 41ab32456e622583f3e5bba8bdf6a0cad970a42030b3c7ea858f5cce7d39cc2e4ae629646c740d61da14fb6fbc438b164ac392d32f52e95a21798a3efd7185fc
 EBUILD xapian-bindings-1.4.6.ebuild 6509 BLAKE2B 01fbe871700b6d4d7f7f5a93c971c1ec4463dff5a2a7165e7e1b603b5f02fb2b09e3a1286ac0f22b65ed8e7ef6794f5ae692abc8aab59541a9e0537ba67e96e8 SHA512 5ca05c47b2f9344c698b2825c28a378a0c15ea2cb44adc4f4de0a227ae1240dee21b2272d3d3db187e05a4facaa5c1ac877ccdf4448ac2b262a01c336a3ce603
+EBUILD xapian-bindings-1.4.7.ebuild 6509 BLAKE2B 123fddd3675c9006a6d1b284660346e4d5f02f3ab399613d0c492bc0a0beb7abde3fe8dc9daa2eb25739cf7b21ea845aefcde99dc66fd23b879158ded7fe0d9d SHA512 ff467ef72f453a6e860a5509e40f26e5d34c07484e318a1ccb472e337d1c094e42fa5cfdb21b0390203691371086999c0de4fd64c0a9fd6ecf0ce4156bdbfd40
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
new file mode 100644
index 000000000000..cf6a09b525a9
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="threads(+)"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+PHP_EXT_NAME="xapian"
+PHP_EXT_INI="yes"
+PHP_EXT_OPTIONAL_USE="php"
+
+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/"
+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 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	ruby? ( || ( $(ruby_get_use_targets) ) )"
+
+COMMONDEPEND=">=dev-libs/xapian-1.4.7:0/30
+	lua? ( dev-lang/lua:= )
+	perl? ( dev-lang/perl:= )
+	python? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	ruby? ( $(ruby_implementations_depend) )
+	tcl? ( dev-lang/tcl:= )
+	mono? ( dev-lang/mono )"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.6 )"
+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"
+
+	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() {
+	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
+			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
+		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
+
+		econf "${conf[@]}"
+	fi
+
+	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
+
+		econf "${myconf[@]}"
+	}
+
+	if use php; then
+		addpredict /usr/share/snmp/mibs/.index
+		addpredict /var/lib/net-snmp/mib_indexes
+
+		php_foreach_impl run_in_build_dir php_configure
+	fi
+
+	python_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-ruby
+			--without-tcl
+		)
+		if python_is_python3; then
+			myconf+=( --with-python3 )
+		else
+			myconf+=( --with-python )
+		fi
+
+		# Avoid sandbox failures when compiling modules
+		addpredict "$(python_get_sitedir)"
+
+		econf "${myconf[@]}"
+	}
+
+	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() {
+	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() {
+	if has_basic_bindings ; then
+		emake DESTDIR="${D}" install
+	fi
+
+	if use java; then
+		java-pkg_dojar java/built/xapian.jar
+		# TODO: make the build system not install this...
+		java-pkg_doso java/.libs/libxapian_jni.so
+		rm -rf "${D}var" || die "could not remove java cruft!"
+	fi
+
+	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
+	fi
+
+	dodoc AUTHORS HACKING NEWS TODO README
+}
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 5f6944f43b4b..0028ec16d8a9 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -3,9 +3,11 @@ DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf
 DIST xapian-core-1.4.4.tar.xz 2807952 BLAKE2B 92f30c063dca4bd7806c1ab025d6b75564acc3a33a129bdc2cbf496518897addb2b63bd772b648a7a199041ea7b90534fb5c4692e94e1e3ef0a7f20301e28e8e SHA512 dc88bab1d82c68b29d51c2113319ddb5d16840f3544b9d5fcc7a3671f97d58f16ddff58b865ad3521ea778cbaacf73fe7346bb514a1275f1f739283a4128d001
 DIST xapian-core-1.4.5.tar.xz 2810612 BLAKE2B 7784e69e3ca064751d829173949fcde65661c2c2070fdc8392cf2b6d40874a3e5b1265e61f25dd39b33e179b3fe3842b67f33a55523c3a18e9b65528e6a23a1e SHA512 cff97a856a406583ca81164ddb704a0eeae7d8d6f94ce3b3f53d5208d657423e87dd06bdc7acb5e5904765bce1cefbc98365cde315c1d46f7b18cfba7b022ae6
 DIST xapian-core-1.4.6.tar.xz 2839964 BLAKE2B ab35e3098d8cf99656539968171073683811dc9a98b7d26e389c0cb1e8d1b70f9007e0ba61defe496713cb0f304a0fed7afa253174e900c0756084ab40721573 SHA512 f08168eba26a24ea00c2219d2cdfac1d904b51162fdd98d437564786375245e00010986a7d6e9c8c7548ae19aab80434b5cb0051252f902b40db2976b1008fe2
+DIST xapian-core-1.4.7.tar.xz 2874172 BLAKE2B 917a35ca717ed4437f4a617ce0b6ac07d5936e07aac6bfa9d6878c12ed0c38e7ca994ad943b6dc7a5cd2fe131a445c5a7859f2286c2201dd048020569ce1a0bf SHA512 9e77a78bd63036966ebb9bbed91e36fef17b37c9465c8d4b7dc8041f0e24b040e6520de645babfeeade952771d145176a204328718cfa8bc2291bb6fdbe840d2
 EBUILD xapian-1.2.24.ebuild 1553 BLAKE2B 77d756575e5d0fdabd59f970ad6edfa4a197c1083a9080392725b6d74e6d9d0f948bed1dd7dbdeb29c0a16bbe70490af0a5b4505e539cee62272949768ddb931 SHA512 9e7f9ed40d9087f3c1fcb1cfe32e30646d2041e4abcc4f5f26940356b40e6d8bf9a80d7d57c86d3f4ecae369d974bbc0f141628fae831903f16d0b81ca336a48
 EBUILD xapian-1.2.25.ebuild 1827 BLAKE2B c5482b6cab85fcc237ef1c6b8728af9ab3438538a117f378bfb1e32c8779990465054e6235bf184da0f13744fac80498bdba85a22b142ce905064d832a9b320a SHA512 32bf0df37b927f5c1a470d6706d0097edf4b270e7e5251a614eb12fba11068caffaef31ee77cfeb9098c2e5c737642bfebd1f7fbc70736144de6523c8dbbda6f
 EBUILD xapian-1.4.4.ebuild 1908 BLAKE2B cbb63641f65e5bd48dcf353a5131e5199d9b9574a166528375a8dbffeb324e89b8c0129778241486e9cc8e9ac9ff18c464651e63f09b21a9e9e473698ad31444 SHA512 d1369efedd3aebc02ae4bbb7e2c201accad3a825248cb51cc14682266692a860c57e621ae3f7c2fc2a8183b612a9d824d99dff5ad5bbb6d3a9dd47f199a31b2d
 EBUILD xapian-1.4.5.ebuild 1913 BLAKE2B af5abd9a3a4e6b0e6ba459912725aa25c0cac1fdce6d2e9e4f309a838082914ea8461089f7e07d0ed5f1d3eea30c1a5a78efca158c7837355e5ed986fdba4b89 SHA512 13f8ff4880b45edd0f06b266e2ddcc27289c34f8dd4de99fbd7cbb203b67e2108043030afaf764b417e74dd1099138711237f22126e2e401bb5f5af5dcb2fe4a
 EBUILD xapian-1.4.6.ebuild 1917 BLAKE2B f7a307085cc7322e471a9e0418c6d8f2f65b78b387f32dd4cd8a0bab719c8646cb22d18ffa6707ae5689288b7d6cefdd324e2b10cec20882828d9c6bde89022e SHA512 64b7c6a931b1611795cd62327529a7eef4a4897e0c345c20ba8c5e4c559e7d45ec2f932d87174b49fdfe8a309de8d9cf4c298ded68fb1b67214db8fd637ee032
+EBUILD xapian-1.4.7.ebuild 1917 BLAKE2B f7a307085cc7322e471a9e0418c6d8f2f65b78b387f32dd4cd8a0bab719c8646cb22d18ffa6707ae5689288b7d6cefdd324e2b10cec20882828d9c6bde89022e SHA512 64b7c6a931b1611795cd62327529a7eef4a4897e0c345c20ba8c5e4c559e7d45ec2f932d87174b49fdfe8a309de8d9cf4c298ded68fb1b67214db8fd637ee032
 MISC metadata.xml 932 BLAKE2B 303ba679d42d5917930aa698ca96fa22e2000b4ffbfe3113b67119b61dd51140b1662bc090078027f7b00d0ad04e0e61792e74d1bddfc625e46258568b5c5f57 SHA512 874335952e31a9da1d105b82eac0c209259a85dfcdc8b7171cc1ff7d48694838bf9c3037fc4ff0450298b3c6b6fbb143ecfe7497727e8f18b684ff630caeb49c
diff --git a/dev-libs/xapian/xapian-1.4.7.ebuild b/dev-libs/xapian/xapian-1.4.7.ebuild
new file mode 100644
index 000000000000..564cf8ba016f
--- /dev/null
+++ b/dev-libs/xapian/xapian-1.4.7.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils multilib-minimal
+
+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/30" # ABI version of libxapian.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-solaris"
+IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="inmemory? ( chert )"
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local myconf=""
+
+	if use cpu_flags_x86_sse2; then
+		myconf="${myconf} --enable-sse=sse2"
+	else
+		if use cpu_flags_x86_sse; then
+			myconf="${myconf} --enable-sse=sse"
+		else
+			myconf="${myconf} --disable-sse"
+		fi
+	fi
+
+	myconf="${myconf} $(use_enable static-libs static)"
+
+	use glass || myconf="${myconf} --disable-backend-glass"
+	use chert || myconf="${myconf} --disable-backend-chert"
+	use inmemory || myconf="${myconf} --disable-backend-inmemory"
+
+	myconf="${myconf} --enable-backend-remote --program-suffix="
+
+	ECONF_SOURCE=${S} econf $myconf
+}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/xapian/postingsource.h
+	/usr/include/xapian/attributes.h
+	/usr/include/xapian/valuesetmatchdecider.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/types.h
+	/usr/include/xapian/positioniterator.h
+	/usr/include/xapian/registry.h
+)
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# bug #573466
+	ln -sf "${D}usr/bin/xapian-config" "${D}usr/bin/xapian-config-1.3"
+
+	use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
+
+	dodoc AUTHORS HACKING PLATFORMS README NEWS
+
+	prune_libtool_files --all
+}
+
+multilib_src_test() {
+	emake check VALGRIND=
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-21 18:59:32 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-21 18:59:32 +0100
commit	520a5b56dff7c24c9d42eafec142cb78b44f8e3e (patch)
tree	f562f705600dbd2292e97c0b4145787c2a8d1f97 /dev-libs
parent	3811bc3072bf19e2be351d2c63f81532945c0f21 (diff)