gentoo resync : 03.02.2018

22 files changed, 101 insertions, 219 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 32b5eedb933f..72d8f16d9a99 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index f2e027bcc54b..634ce8d943c1 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,9 +1,4 @@
 AUX boost-1.48.0-disable_icu_rpath.patch 1077 BLAKE2B 367246d711de06ef20a93a0e2a354fff4e8360ef79582a75d262b2e6dfcd76a5c2bb00e719a05ca79c7f5f0f3fefa975713251e65cb9f2c09e76cb6c3b16888b SHA512 013503fd16bcb609c624c9952a5448e612b81150db9ce60b5a51acbb57b62ce1cf0e7c5dd4a58c110ca7895c86effef24d8fe55ea3f316c9e47d5c549a33180c
-AUX boost-1.48.0-disable_libboost_python3.patch 1513 BLAKE2B fd0f5d8d3ff67861725e18b10a7191025b5f0cf242dbf38a44896d5b305268d6e585f093077b2e9a6ae9e13b7b94a01e387f7858215fbe78b127f84f6a8d8de7 SHA512 9a2b189530af9fa149203f0621b171461f11212306aeb4d94075a2896ed97abb12d47e6bc0429814405829244604044c2101ad34686a10b12ebe3536b2289ed7
-AUX boost-1.48.0-no_strict_aliasing_python2.patch 745 BLAKE2B 204ab844356219e90c80bcd0824090672ebe90ea95b79c5dd94d2759a1a522d1b6fa487fce1c991439848cf5581a85bfb8eca6a79150b78aa703bba8efc06993 SHA512 ad4c7b8ec59154e2e9588b72a23453f4dc915eecc87a065b10eccc6f713e4a55270f0766bad7766c53dfb934e4d94a25d006567c9e18d0e7dc32649f5a601296
-AUX boost-1.48.0-python_linking.patch 1282 BLAKE2B 06365a2fc9348829d673aa06756adbb0681af062bac8ea1a569f54a20c6680630d4d2cb38d7a152a1ff14d7795fb3373310a6da32c01c6a3f745c110fa5aae4b SHA512 9aff888908476107bde818f306fafd855408d214dd13abd3406339b911ba3c56a7a76ac2a549c63be16ba73a86275860fc1bf78c2fd976c872772b4199ecedb6
-AUX boost-1.51.0-respect_python-buildid.patch 1577 BLAKE2B 0db82775912e88d84bfbf152912db4754e42bf17c954e4b505d3ce796bd3883c589902570f0c6762d073c7827e044e2d3b174329f7f8dd132cf46fadc069a1c8 SHA512 bbe7e586a95c615d51612bf0404c07179b07c33a33e67957af5056ff80f44c620f81244d7fe30519f08f2d19e1d87f8fa09fa32c7f5d37f6f13de4590c050731
-AUX boost-1.51.0-support_dots_in_python-buildid.patch 617 BLAKE2B 1e95323dacd3c351bfa5a7c2d92a358e3068439fba12e01fc8889b4f3d607cd8640f2d2547f2fa1453a04f972022a47a70b11066ff7632a89dd976428085235e SHA512 667452299f96ac3008340f901c6a5355956676b10f82134e650f8c8e06e7c6f8814c2b92d07e958c31b11e013601c0b3ad4020cdc35bbd558761fcd33bb68b3c
 AUX boost-1.55.0-context-x32.patch 1077 BLAKE2B 76ff0e52ca076ccddd58a469b4531f49782d6373bfa9d65ac63fe365fe90d25d10557fa041584f8d0bcf04438a90e78b69624006220f53983a456485b868cbc9 SHA512 0e2e45abe5833396508666355e26bafe114fa4ada628b24d8d9953268edddcb2f8e3dcfe8bc7f27d6c1794418990dc9ef914c936dfa64ed6e5e647a40e3f8a73
 AUX boost-1.56.0-build-auto_index-tool.patch 412 BLAKE2B 4449dbe600547f339eba9afc4d3da5310f08baa2dd1beb30f9c1b4076e95e867c8fa84fef8a84e2aa38bf35368173e52057e73499a66766cbb81e2d3312fa07b SHA512 9fe245adddf76375d0ee8066952c46d229c9e37fdce83ff608fcc1fb5942b1c226a0fba6e28f859bbcd58863dc49a356f32c7fcc3b90baca4069c6bdc9c0f203
 AUX boost-1.63.0-fix-python.patch 4210 BLAKE2B f39a501c9a2718ff77300d97ec8d1ec0a99e90b6f4f2f4ef970a5daaebe1065a870d98f759c0e946707251a93bda0c54f3f864b1e4189f915226d638738e7dca SHA512 0f390cae5a53f48f548e65149aaca4b1191ca6610863e7e471686556107c8ac398eb4bcad71a92849e941cad031cec9cbd543c646ee122238579ca881c420aad
@@ -11,5 +6,5 @@ AUX boost-1.65.0-fix-python.patch 9210 BLAKE2B 31e32cfbc8fa0c4e8a5c142f56a4a7b1d
 DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6ae289996501812cd8b13bf74bbe9b677d0110948265cab59a60deb36c4fc08440af74ac5a5219ea4eaea4fa6918f SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
 EBUILD boost-1.63.0.ebuild 12466 BLAKE2B 6fde392860974292dccb109facefae5e06632023b361769815090451d8d216e9028e0466843a87bc24e5e24608f595ffe0841b52e32155f7a7fa2facfe72a494 SHA512 c405a5a6e1ea19e4309227a7c2204b5f0f46ff564644925bfbf02cbd43108422e04b378f24dafcdabdb0154f7f41fb5532594acc61666c8c8aa21a024e04db5c
-EBUILD boost-1.65.0.ebuild 12450 BLAKE2B 9f7bb3bfaffee041564cad3ba995a2199d28a256769e99aadc4140a5051b6f9edd8c73846deb62a8f5c568191ac52cec026e784eeff9995bfa9de4e935485d03 SHA512 2a7d731578afad051602c25ce8d6d7c14f3dab3c1619f91e83c5edb22ebcca601d2652ff90662945e55f289ab96210e1452a4ffac6473b471d3a4d0618dae0a8
+EBUILD boost-1.65.0.ebuild 12449 BLAKE2B f5a4a3dc783fdd747ce572cc21a8ddc6408c777b9c30aa3613644388e1766786fc8936c913841bb2204f6c481641ff96c304ddba16819efe599a7204cad33bb7 SHA512 fcbe87aaa97a98c7b4e13fc22e946f9b239e53b0c01721f4f239589a5dfc418825bbdb432b2645d7eed4855d78bdb0414f7f22200630d33e8d04a3f4c08a1fd1
 MISC metadata.xml 1526 BLAKE2B 11c2e9eb5b41e3fa0b100d58d672acefe4a949d0fa428b4ce1d100cc8f95eec7c1279c725741033ca50f61cb258b388270c18361a5b714a684398cc3ae1a445c SHA512 4ba131f2492ae41f642a28dd69e5bd1d5d79c013e42a6c18ba135b36d470990ea20c8aa7cec6e3cb1d6ea8d7f6b6a5b45efb4b3dcba198bcf43809eff0f65ae6
diff --git a/dev-libs/boost/boost-1.65.0.ebuild b/dev-libs/boost/boost-1.65.0.ebuild
index 031429c5de87..e5f8c570c1b0 100644
--- a/dev-libs/boost/boost-1.65.0.ebuild
+++ b/dev-libs/boost/boost-1.65.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~sparc64-solaris ~x86-solaris ~x86-winnt"
 
 IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
 
diff --git a/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch b/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch
deleted file mode 100644
index d4560400d7d5..000000000000
--- a/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/libs/python/build/Jamfile.v2
-+++ b/libs/python/build/Jamfile.v2
-@@ -39,23 +39,6 @@
-     PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ;
- }
- 
--
--rule find-py3-version
--{
--    local versions = [ feature.values python ] ;
--    local py3ver ;
--    for local v in $(versions)
--    {
--        if $(v) >= 3.0
--        {
--            py3ver = $(v) ;
--        }
--    }
--    return $(py3ver) ;
--}
--
--py3-version = [ find-py3-version ] ;
--
- project boost/python
-   : source-location ../src
-   : requirements
-@@ -82,7 +65,7 @@
- rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
- rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
- 
--rule lib_boost_python ( is-py3 ? )
-+rule lib_boost_python
- {
- 
-     local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
-@@ -91,7 +74,7 @@
-     {
-         python2 = true ;
-     }
--    lib [ cond $(is-py3) : boost_python3 : boost_python ]
-+    lib boost_python
-         : # sources
-         numeric.cpp
-         list.cpp
-@@ -148,7 +131,6 @@
-             <dependency>config-warning
- 
-             <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--            [ cond $(is-py3) : <python>$(py3-version) ]
-         :   # default build
-             <link>shared
-         :   # usage requirements
-@@ -160,9 +142,3 @@
- 
- lib_boost_python ;
- boost-install boost_python ;
--
--if $(py3-version)
--{
--    lib_boost_python yes ;
--    boost-install boost_python3 ;
--}
diff --git a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch b/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch
deleted file mode 100644
index cb26792f99c9..000000000000
--- a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/libs/python/build/Jamfile.v2
-+++ b/libs/python/build/Jamfile.v2
-@@ -85,6 +85,12 @@
- rule lib_boost_python ( is-py3 ? )
- {
- 
-+    local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
-+    local python2 ;
-+    if $(python_major_version) = 2
-+    {
-+        python2 = true ;
-+    }
-     lib [ cond $(is-py3) : boost_python3 : boost_python ]
-         : # sources
-         numeric.cpp
-@@ -119,6 +125,7 @@
-         :   # requirements
-             <link>static:<define>BOOST_PYTHON_STATIC_LIB 
-             <define>BOOST_PYTHON_SOURCE
-+            [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
-           
-             # On Windows, all code using Python has to link to the Python
-             # import library.
diff --git a/dev-libs/boost/files/boost-1.48.0-python_linking.patch b/dev-libs/boost/files/boost-1.48.0-python_linking.patch
deleted file mode 100644
index 330cbb11e885..000000000000
--- a/dev-libs/boost/files/boost-1.48.0-python_linking.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/libs/python/build/Jamfile.v2
-+++ b/libs/python/build/Jamfile.v2
-@@ -109,20 +109,7 @@
-             <link>static:<define>BOOST_PYTHON_STATIC_LIB 
-             <define>BOOST_PYTHON_SOURCE
-             [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
--          
--            # On Windows, all code using Python has to link to the Python
--            # import library.
--            #
--            # On *nix we never link libboost_python to libpython.  When
--            # extending Python, all Python symbols are provided by the
--            # Python interpreter executable.  When embedding Python, the
--            # client executable is expected to explicitly link to
--            # /python//python (the target representing libpython) itself.
--            #
--            # python_for_extensions is a target defined by Boost.Build to
--            # provide the Python include paths, and on Windows, the Python
--            # import library, as usage requirements.
--            [ cond [ python.configured ] : <library>/python//python_for_extensions ]
-+            [ cond [ python.configured ] : <library>/python//python ]
-             
-             # we prevent building when there is no python available
-             # as it's not possible anyway, and to cause dependents to
diff --git a/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch b/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch
deleted file mode 100644
index 17a681611b6f..000000000000
--- a/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-https://svn.boost.org/trac/boost/ticket/6286
-
---- a/boostcpp.jam
-+++ b/boostcpp.jam
-@@ -99,13 +99,6 @@
-     BUILD_ID = [ regex.replace $(build-id) "[*\\/:.\"\' ]" _ ] ;
- }
- 
--# Python build id (for Python libraries only).
--python-id = [ option.get "python-buildid" ] ;
--if $(python-id)
--{
--    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
--}
--
- 
- ################################################################################
- #
---- a/libs/mpi/build/Jamfile.v2
-+++ b/libs/mpi/build/Jamfile.v2
-@@ -8,6 +8,8 @@
- #  Authors: Douglas Gregor
- #           Andrew Lumsdaine
- 
-+import option ;
-+import regex ;
- import mpi ;
- import indirect ;
- import python ;
-@@ -24,6 +26,13 @@
-     <tag>@$(__name__).tag
-   ;
- 
-+# Python build id (for Python libraries only).
-+python-id = [ option.get "python-buildid" ] ;
-+if $(python-id)
-+{
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+}
-+
- rule tag ( name : type ? : property-set )
- {
-     local result = $(name) ;
---- a/libs/python/build/Jamfile.v2
-+++ b/libs/python/build/Jamfile.v2
-@@ -2,6 +2,8 @@
- # Software License, Version 1.0. (See accompanying
- # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- 
-+import option ;
-+import regex ;
- import os ;
- import indirect ;
- import modules ;
-@@ -30,6 +32,14 @@
-         ;
- }
- 
-+# Python build id (for Python libraries only).
-+python-id = [ option.get "python-buildid" ] ;
-+if $(python-id)
-+{
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+}
-+
-+
- rule find-py3-version
- {
-     local versions = [ feature.values python ] ;
diff --git a/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch b/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch
deleted file mode 100644
index a8912eb5e048..000000000000
--- a/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/libs/mpi/build/Jamfile.v2
-+++ b/libs/mpi/build/Jamfile.v2
-@@ -30,7 +30,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
--    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ;
- }
- 
- rule tag ( name : type ? : property-set )
---- a/libs/python/build/Jamfile.v2
-+++ b/libs/python/build/Jamfile.v2
-@@ -36,7 +36,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
--    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ;
- }
- 
- 
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index c736aaa8fb16..464a47d4e0b7 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -6,5 +6,5 @@ DIST expat-2.2.4.tar.bz2 505038 BLAKE2B 4d40629621bde41b44cdef4fa37937ce064cdbd6
 DIST expat-2.2.5.tar.bz2 510868 BLAKE2B 9d4709c2d157a04c08afd80b05f120407dc320023c3dbfe9e6872fadf0de2d6fa497f85ad9a21679fa0689c13cbb25adfd92912ae374d08de791dfeb4eb6918d SHA512 8226970a7e5d2b8d7818081758ca59bb6ce2d655feaa9d3a92481629000b73fde4782f50343d58ec4e1cebe75649e1980f636775a731d8aa4b55ceb843d9f637
 EBUILD expat-2.2.1.ebuild 2346 BLAKE2B 7a343c52553b838d76536142f7e67b78b02668c3a2efca8515f63ed6e9df5ce6f748228be4c6a3145487bbb2f7574df84bd3e374881169bdeba734a54e1c6195 SHA512 535d45f523a083cf3c3099ae912d3508a301a098239473add3ea6834e08fe386098346db810672038f361bab63b62bbc310a0710b9946546c154bc4dcd683be1
 EBUILD expat-2.2.4.ebuild 2538 BLAKE2B 9a758011bc642c6ef1c51661b0fe5289509e6e65fa19bbe337bf0758c6f00fc3b35191330477a4b2d69b828298cb796b754cb2c2a66729a902390b018a7933b5 SHA512 d5a54082586a67a06de13d5693ee1e2b9c604df4e021f9bb4fb936e6a413d6583f7ec16f1f9b4086cffbe29260e3acf968d376020ddbeb5a0a632312dfb7cb54
-EBUILD expat-2.2.5.ebuild 2597 BLAKE2B 768f29eefdd45ba8d365ca71fa4746a46afb91b08f93bfd1a763c90f8e59fba32d25a9377cdde490a24d05d690de748be6e44f65d10e5b5edbc067c68670439b SHA512 f78592f6e42ebee1c4fdd8864ea323adf682acf4abc23ccb48895128b672b94e88355e793f098f4c771aed8994f828fa14fcc30f959735ed848dd71e797016ad
+EBUILD expat-2.2.5.ebuild 2596 BLAKE2B 156558de3e2aee4ba3f8188ea5aa7cc4daee1f70ead33e5acf4a2028090f03a75c031adb9ca5eea82d300e24911a6453c15df730e9f0187dc5a99e1187f86722 SHA512 9b85bf73b263c03c3c7afa8da37d5828baec74a342c207ab039200258f34db0b5d0d2f4a79bd2013bfb6a727011e293cb7f3d46c98a633504eee36fdd79ac718
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.5.ebuild b/dev-libs/expat/expat-2.2.5.ebuild
index a4ab3b8cb0e5..432a7bd35c0a 100644
--- a/dev-libs/expat/expat-2.2.5.ebuild
+++ b/dev-libs/expat/expat-2.2.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index c8244bc63be9..23523f6e73ea 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,5 +1,6 @@
 DIST flatbuffers-1.7.1.tar.gz 475449 BLAKE2B eb5030cb899e579d7e875cb934c691af2711628c91f398407babb92c9c0e68aaf399d9c15d3ae0a229516fb438eb3332ded576c3ffb07a906a063b80d4dcf1fc SHA512 57732fc352c216c4be6d3237f93b872abf9dd2b62361d7d2856f99804a178760e4665ead2e33d5acdd00984ad03a746f581c9784ece583e1b2df1a10776f967a
 DIST flatbuffers-1.8.0.tar.gz 616362 BLAKE2B 545b568fbc1671005c351ba255f9dc2b5f97b618eae13bc74b717d1e08875e465a0afd3965b35ec8243c1dc80223fdab7f15abbfb4196a129700e4a1532a8965 SHA512 8f6c84caa6456418fc751ea9de456dd37378b3239d1a41d2205140e7b19a5b8b2e342a22dc8d7fdd0c36878455e9d7401cc6438d3b771f7875e8fcfe7bbd52f1
 EBUILD flatbuffers-1.7.1.ebuild 757 BLAKE2B fffd60fe03499cf34b4827db34382fb3257676a1b29e1f675a006771dda2bae56c86370f0e10b113035868a2349e2609e10e82c949545a9da5580fe30825605f SHA512 a501a99c56475eba20f9d726ce4215ae61f1165b5185fde26461757ae0a77c6fafd73e51b6e59db2a3746f972a8a81ff3cc8256384d50f52d3825198b72869c2
+EBUILD flatbuffers-1.8.0-r1.ebuild 710 BLAKE2B 8d56bcf7a01f88839f94ae26e976e1e159700f21827addd0e8938e6a618da3c057c1f3d0714b38457d678bec40bc7ff1a7f6aa037c1378e81661499ec2808752 SHA512 b7ac615fb1a0db489fa47abe2649ab82f29ca4df6e649aabf9874aeeb859549b5f54c2437113dd972ed8b9e146d1d8c4fbd31de806265a2d3779ed49930e080b
 EBUILD flatbuffers-1.8.0.ebuild 632 BLAKE2B 7bc57afcf6aadcf6e36dd6368561ddf88a2d5c5b132a9a8c9f01219f80217737e5b05997004e2b4d098660c922518d27af445aea663b293f9f38447089e50cd5 SHA512 8db440b05ecc3c1dfc9264ab73d58ed3aedbda8f28c87231c40549811b58e8295cc23a175ff53e5236656fad52e3ae68a67334494b800396ba633793f05b13fe
 MISC metadata.xml 332 BLAKE2B db6517401d85991288145c5665477a48e6d546a522dccdae0856f127b273879965de38cbc17e054e99387c96da859b89cbd0d6bbd357e9388c15a43b708a7589 SHA512 c30e9735c09dc9df55b25e8943fb2bf4b9b780b396bd82ccdc9ae45c22940599ea38d4bf7a000721e3a0d9b84955fee047a545ce23f3c4c919b349f437182719
diff --git a/dev-libs/flatbuffers/flatbuffers-1.8.0-r1.ebuild b/dev-libs/flatbuffers/flatbuffers-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..4a387f3894c1
--- /dev/null
+++ b/dev-libs/flatbuffers/flatbuffers-1.8.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Memory efficient serialization library"
+HOMEPAGE="https://google.github.io/flatbuffers/"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+
+src_configure() {
+	append-cppflags -std=c++11
+
+	local mycmakeargs=(
+		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
+		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
+		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dobin "${CMAKE_BUILD_DIR}"/flatc
+}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index c52a9062f3f7..0429fa47c42d 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -12,5 +12,5 @@ EBUILD icu-58.1-r1.ebuild 3332 BLAKE2B 951e0963b151c25950a2373a5d68575a14b6f9d06
 EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
 EBUILD icu-59.1.ebuild 3342 BLAKE2B c3f45fbbeeab2cc2a92cae23b5058783f5aec1c7bbbd28f6922e7e091077e7aece5f43365b8b16a54a60c714ac2bad31e18eda24010b7a7b74ac4cc7ab519e0a SHA512 708ec7e483bb078b1d0f7067ba720197b37280de9a09ba1fb92a944aad3613fd1db93f94cc1d53ce457a2ec610afe88232a040a25128d873bc401b91f0bc5911
 EBUILD icu-60.1.ebuild 3721 BLAKE2B 98e5114b569dd89706c2aac9043d63c97822ad37c7b200fd5591843d9c81e1fefc6550d2f094c132cd5a3fc69f9fd42d4383a1774fb12fc2ede47e46dfaccae6 SHA512 622002eecc800f595b159a125a62306ca94b4d3f924a4ab9c31a50bb5b2c2a3bb2aac38a90384a5bfda13347fbe025a39e5538598e706d8b9d34a392e212a3a6
-EBUILD icu-60.2.ebuild 3721 BLAKE2B 98e5114b569dd89706c2aac9043d63c97822ad37c7b200fd5591843d9c81e1fefc6550d2f094c132cd5a3fc69f9fd42d4383a1774fb12fc2ede47e46dfaccae6 SHA512 622002eecc800f595b159a125a62306ca94b4d3f924a4ab9c31a50bb5b2c2a3bb2aac38a90384a5bfda13347fbe025a39e5538598e706d8b9d34a392e212a3a6
+EBUILD icu-60.2.ebuild 3720 BLAKE2B 3c1ff6958adf973f251a3d27488a646ab0ea2c45c061091df1f36d1272de054b15c595d5a3344d1bef6723f4042c02f7c53ab3c585026529c53570f04b5671c6 SHA512 092c62680d82394e382b539ec3b322e53f10cda373df2a8888413776d0e0dc55629ba65d96282f6791d3f3f077dc45091418a39605ec11f1a770df4cabbe85dc
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-60.2.ebuild b/dev-libs/icu/icu-60.2.ebuild
index 773d5b35d4ba..bce4879eb694 100644
--- a/dev-libs/icu/icu-60.2.ebuild
+++ b/dev-libs/icu/icu-60.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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="
diff --git a/dev-libs/kproperty/Manifest b/dev-libs/kproperty/Manifest
index d9984ce15afe..b22927438f4f 100644
--- a/dev-libs/kproperty/Manifest
+++ b/dev-libs/kproperty/Manifest
@@ -1,3 +1,3 @@
 DIST kproperty-3.0.2.tar.xz 82556 BLAKE2B 57bde244b58d022c88cea6ff00776ebaecefbd865abd939d8a576f77ee8814077ed61f7576440185c71723e64b8a5d838b95f867df6c8892366d9c5f6bd52d06 SHA512 de37dbe3e0aa979c0c9fa75b0b26eef708b332a4b3f65d0b4c22926aa534c54b4f39643df107fabb136071940abd791b31ad8f864e40d514e20171af6fc16ea9
-EBUILD kproperty-3.0.2.ebuild 564 BLAKE2B ae00aacd481e8a98966ce393682dfa872c28103ddd5d21ad294d78ccff7e5beda51cd689ac30985ea84cceebf38a73ede23102d2edf20755dd801bf22ee1127e SHA512 7d9f2b025e65a554fd80573b137007fe4d94f817689a151adb3572971e95519cff0773e7da18af874301b4e34c79513d4735199f64b0904e7587e24e4c0cb5d4
+EBUILD kproperty-3.0.2.ebuild 629 BLAKE2B ee5132509ddcef9debf7b0ba7543fda77e07d1d519933c42e25e7f20008308bd4fe5ae3b12cfb87f4efee03dd6f999139009dcb171a2419fbc8455e195cc1a71 SHA512 767de6120290beec82a8c127c6788541c60f3106c6dbbd089729d17e62a0eb8c2d54c7ef8b480f5b95d5a724775b5724fc602f69ca77c65885f8337b3c5c0cbc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kproperty/kproperty-3.0.2.ebuild b/dev-libs/kproperty/kproperty-3.0.2.ebuild
index 832eabff04c5..89b43279613d 100644
--- a/dev-libs/kproperty/kproperty-3.0.2.ebuild
+++ b/dev-libs/kproperty/kproperty-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,3 +21,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}"
+
+# tests require installed headers, bug 636108
+RESTRICT+=" test"
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index 240e211e366f..6a21a15e986e 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,5 +1,5 @@
 DIST libebml-1.3.4.tar.bz2 606205 BLAKE2B d13c33777e9afbc4d370e0b8e68fdcb42597fbd62f61197a4aa72e2b229ef06819efc0864f9783c87c90f8fcfa572b02d9b1767b57c31c6bc22a020b9eace94e SHA512 ebf5b71afe725e40ee6415463e51ca14810eecc2fef186caacd0269077f5febeb62623fd48674b21ea732f43a620d0c91603fa48d3f8d163284d1cf204642194
 DIST libebml-1.3.5.tar.xz 274184 BLAKE2B 954411bba6fc9ff3893a17a5147babff18352ac2c436523eecafac8e2921dd968e83f5672428f4f22e61cee97f7ce1a4f905781b4468cfd9f3ea7d8cd15d961f SHA512 cdf05015724919b19281bf99c562bb7e0bdf16990da274010f664ff316b6ce95ecbeaa1e479f03505281a7f45d5796aee6e7750a9e1c0596b630911d220dca24
 EBUILD libebml-1.3.4.ebuild 834 BLAKE2B 11fe2d8ebf1fa93a7fd9c866a9bd556d00ce6da0553be6e39b85c61e711a8277eb3f27e212c00609cb092f16e7fb403285ad29623f7e8941a7bc7c96443becd7 SHA512 edc8bf5f0137d8fb44335b0ceb64a66c98d2eb88bde15b93f7350fdc2b80077006c5e31c8ea567b0ef6050f08789a1566ccdeafb8f6ef98e3559d344f85047b4
-EBUILD libebml-1.3.5.ebuild 839 BLAKE2B e67e06ffacf1ce95a400056ee84d357a859003edd8824458d6df2f1795271e3a8a3690c6540f85a8b00c6d86535a6badfc5c60f0e2c3923b3ca8ad01f38da591 SHA512 f338f18d05e03f80b0dac9e19aaefe4f30f9f617b4e8568a8f3550bd7acfa9ba8470dc638c87e895151d6a377fd6c9e5b69551dfc3befdb72c6de8a14f30c76b
+EBUILD libebml-1.3.5.ebuild 838 BLAKE2B 5fc778a5aa5792108559f2c50de965721fa419656a0bcfadbed3df21df41c048028cebb23abecf43a1082e8e204db8ae6dc15eda751c97de44f4fb65115f73dc SHA512 ab3cf254601f6b81c23e0ad67b8e93df063764ba23e95fa49b12ca58bd23e023436e1c44ab76f7365b4a22fcde336cba09f24cc34df4a66ec3c4a681bbeb3982
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/libebml-1.3.5.ebuild b/dev-libs/libebml/libebml-1.3.5.ebuild
index a56f2901e345..5dde7f7bc850 100644
--- a/dev-libs/libebml/libebml-1.3.5.ebuild
+++ b/dev-libs/libebml/libebml-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug static-libs"
 
 src_prepare() {
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index aac53b9cfe37..7e7615a8d5ed 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -7,6 +7,6 @@ DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d
 EBUILD libsodium-1.0.11.ebuild 1042 BLAKE2B 95f1c5cdf1ef19da389bb03c973cec7c5e93cb7c09dced6eb2b0b7c772c18811b82ce9db2e41adeb7e91a0ec94a58103ca129b4f7fe8e4d5013e0a75606858be SHA512 d70a16a7e9c752f7d649b23f697f7f8b52e1b51ff5bf8904b73ebe2bc830ca314ca7dd574b91ecc28e7458776a98b79bd36f3c5457081e1576242cfb5bb8955b
 EBUILD libsodium-1.0.13.ebuild 1052 BLAKE2B ea8f2cb2872ff2803d9c2b56572b864fc47885645516d966f5ca0a7b77a06f7af76c5973461bc6bbecd6aec106205999291337762c850a36396d5a515fed1462 SHA512 46407c1cdec13c2db6f5399ccdf915d51bf3b34fa1f6fea094360e4a295347ea47356bd340729efc5511fd92246f2a087f829a57d72a00e48184392a101c7bb4
 EBUILD libsodium-1.0.14.ebuild 1052 BLAKE2B ea8f2cb2872ff2803d9c2b56572b864fc47885645516d966f5ca0a7b77a06f7af76c5973461bc6bbecd6aec106205999291337762c850a36396d5a515fed1462 SHA512 46407c1cdec13c2db6f5399ccdf915d51bf3b34fa1f6fea094360e4a295347ea47356bd340729efc5511fd92246f2a087f829a57d72a00e48184392a101c7bb4
-EBUILD libsodium-1.0.15.ebuild 1045 BLAKE2B 7e4e7cf862c8a36d00b8793d4cd1674d44d3f2a57eadfcbc58152bdcdbfe3ac06804c35dc5194ae590c8398787f453fff959f812ab7b5dd478d20465b6ea6177 SHA512 7e491d1837ff290b080b731e62ab87a69e80f14fc4c9cd25736a78759ea6c9221a56129c29fc6a3df67e973b0dba5f8959ead02c2dca410be0a736dffacd8271
+EBUILD libsodium-1.0.15.ebuild 1044 BLAKE2B d9a2defe3e152d92c626296b171d3cb4e9cdabf2ce0587e4cc438e2472a9e91ef9ea6107cbd879fc909a46440c4ba32c948125e5256d04b09539d43ff31603bc SHA512 ff96bc32fd2027750e020f9671e85dbd35d7a9d5a463f277043455ccc38cc6c8328dd6a6d5ef330c461db4bef05272c9c4373c20fe3de098cdfb3bb76ce75bad
 EBUILD libsodium-1.0.16.ebuild 1052 BLAKE2B 21aa9d136171cfde5a9106a35da055ed49e64c0003199fb227c6ef2e84c81f52aaef410d7e4f87d437a2fe2405db9a22cae678a21f559cab15e73c421da6243c SHA512 2b8fa23e372b705de59318fca3f4e06eb66a95ae2105da8d05c180f8d083f702c180b4b328191eb1d720ef05ec886b73c88cfb4f9882faf7cd61fa7a92be2113
 MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
diff --git a/dev-libs/libsodium/libsodium-1.0.15.ebuild b/dev-libs/libsodium/libsodium-1.0.15.ebuild
index f21ed3884527..ba359218ef0b 100644
--- a/dev-libs/libsodium/libsodium-1.0.15.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/23"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
diff --git a/dev-libs/sink/Manifest b/dev-libs/sink/Manifest
index 3a65a79f394c..19c46527fddf 100644
--- a/dev-libs/sink/Manifest
+++ b/dev-libs/sink/Manifest
@@ -1,3 +1,5 @@
 DIST sink-0.3.0.tar.xz 215636 BLAKE2B 2e63ca47deec9aec97e146c48dce4530d5599e2efaf883e35e950a114cde77501830b0670fce4be75b6282d9b71323b3d18a8ec859c68213abbd3811d9599ecb SHA512 066050339603b80efd7edb8b903d675f0434a7147cb7ad0fd810c82c29184f39762948bc75c45ea98e0ee4c455fcaeaa326ace95908745d51ad58bead5d70e1a
+DIST sink-0.5.0.tar.gz 330203 BLAKE2B 5b0448dfb984c1aa4bdb913f8ce5e5e4e3f1a6ee33d840ed3d9fdf9e0ea6003a928970d2e6dc25e824241768da9abed7dce31ef857e4986990aad16e7aecd667 SHA512 e47f3d99b934abb184a5f8293f1a092fccabe0bb550573cd8c35918471a4caa94eaaec0361c43376c93cdb480612dd0f78626d6649077f777c5cccc8c5d4389f
 EBUILD sink-0.3.0-r1.ebuild 1181 BLAKE2B ad09c23a3bf65184c1e0dec2157cf619371c489ccb1e345a705f7e08af473c06ea7898a9bbe4821fe8b762474aacb4a7397c42d45b1ee92bbeb2da6bb542e2f5 SHA512 8c78a5ebe4d9b17845618a92a2429cdb1cdf5effc9bacd859a44807d8827ff1e9b45dd949d9a2b1101d933e2cb9a9060bbf968397f1897c792d5dcb848adfa1c
+EBUILD sink-0.5.0.ebuild 1196 BLAKE2B ec09fa49e1d20266d74b2b314da4ce08282e68082e83768c2dfeb23e09c7d66661ff935fffe12f3a413d6a849ef6f5655793aa109cd7c1e0694c94c2db726abe SHA512 b224fb3e7a56ff03dcf84b30f7b25643c7cc460b725a2d29c2036fdd489a2a8eb835325981ded8b27a5cb20e0cf026dd71f2882b61f275a8e7c7afddf00df95b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/sink/sink-0.5.0.ebuild b/dev-libs/sink/sink-0.5.0.ebuild
new file mode 100644
index 000000000000..06692c9740c7
--- /dev/null
+++ b/dev-libs/sink/sink-0.5.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true" # build breaks otherwise. tests not isolated.
+inherit kde5
+
+DESCRIPTION="A data access layer handling synchronization, caching and indexing"
+SRC_URI="https://github.com/KDE/sink/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+# qtgui is bogus but is required because something else in the deptree
+# uses it as a public dependency but doesn't search for it properly
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	dev-db/lmdb:=
+	dev-libs/flatbuffers
+	dev-libs/kasync
+	net-libs/kdav2
+	net-libs/kimap2
+	net-misc/curl
+	sys-libs/readline:0=
+"
+DEPEND="${RDEPEND}"
+
+# fails to build
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+	# FIXME: sink is useless without its 'examples'. Workaround our eclass
+	sed -i -e "/add_subdirectory(examples)/ s/#DONOTCOMPILE //" \
+		CMakeLists.txt || die "Failed to fix CMakeLists.txt"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
+	)
+	kde5_src_configure
+}