gentoo resync : 28.04.2018

16 files changed, 305 insertions, 45 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index d187a1075d9a..82cc3f46994a 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 78fa8a43b9d8..10f18b533007 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,10 +1,11 @@
-AUX catch-2.2.0-fix-pkg-config.patch 703 BLAKE2B 538ae153edbb8d6ef13c15ba89e9ab35cf71f654fc01c3999235a74ee59fb6d6a2372c18340c2c5e42dfc8f3801b989409f162527559c5ebfc7a9b4e398a894f SHA512 631bedca0eecc96002fc07064b0c1fa6d47ffa4d9235b123e9effb7f7e1355e5bd38e58982b2788b3515487d0cea10bc191be5aef0fb3b54ba1757fdc5725888
+AUX catch-2.2.2-python-automagic.patch 1096 BLAKE2B c1c5ae6cc0fa4f8066255581ab29bed966f4051eea79941c0a0f3e51f3639894b216dcc229de2ca932f0e41b8c3277f687d5d4dd2d226a2872f58ea486b9315f SHA512 d6b7198f60e45a52a40496eeecc1b34f5394af5dcccbaa7b2afa3af674d83f05a258311f151147ee8fcacae7764c4d742a92591c910a7beedfba5c71f547dfdc
+AUX catch-2.2.2-test-python3.patch 1521 BLAKE2B 6329f5d4995216e685c3404ef99fea1deed0be3e5f4849e7b24448b7a6c3d2aab47442a29dadbf0684888360c4a5a2e09667d765182a8a5f9245e64c7723cb34 SHA512 ca4ba7bfd87edcd06775d4d3fc7f19eb7188f95c73f4f26a08ddddd63a86249e2f4e3380b6a7cf449f1d6a32a6181557d5f82af6f79ca0c315b72fa9f7198166
 DIST Catch-1.11.0.tar.gz 376132 BLAKE2B 23a1a6292dd91ec1c71923b4902b42b59ff6be5227b666f68ef0dc33756a58a63edd70a9b139dda0b1860c2b7a0cfec7ab9262e6447eff3184cfe28ea9b0aa77 SHA512 33085c2671f78c7562eace909564b2730eabcaf4490cd463402e66ab4ac2be1fe4fe360916c11aa589ba4a010622444126ee2ae747783b5869b5d7276361f132
 DIST Catch2-2.1.1.tar.gz 481236 BLAKE2B 8a8110611aaf4ea913462884d8293bcae7d0abf3075253a26385a56b2cb5bf50b769e2117430c9712e4644f430cc16461fabfef921c5fbfceb82effb0da74e93 SHA512 64947672e614301a45efd812eb3eef98d871c9719005a441b6f6bb1dc26820bd9643ba285bcc0eaef9b212c5ab6ada4a875433c47a020ce436bcc411cdc8ad72
-DIST Catch2-2.2.0.tar.gz 487585 BLAKE2B 2d8f58e8d3630cb30e438da7a169df3afff387d38dd3054cfcdb8860aa507ecc3c614471fa1110f64b0dba3d6855edfc68ee4e0b7eb97164be833827078e82fd SHA512 9dcc409939df61f84b965ee3147a7a7578b3a816ff285e103b7666115bf38a608d9a0075e06e98f93b9f06882d2e41d6c51cdaae352abbfaa2a3c1b408f22df7
+DIST Catch2-2.2.2.tar.gz 497244 BLAKE2B d5073d56b9399bd7f50bafc7758e60e31ba4434e229f92ca92cd04257f4a54cec925ad3180cc964c4f69edbaa7fc14f8af8e828421e2bb2b4f6c59eaea5cc06d SHA512 ab91036c6c3ace087d0382ce99f26b2c30a4b75d52f285619ca282a618470fe388afe47495f3b2764268d600c6834c60ba464483d06f3a1c4316c099477c8e38
 EBUILD catch-1.11.0.ebuild 725 BLAKE2B 49c5034310812a931d9155d0aa3d791c30ab1f381c14bf102a26e23cd7c24ca97c4d4b7b11c8c859e665fdbd7beea44416e193ec06ad1d8e883f7459023ce3d6 SHA512 e7fa7e70cb02ab499606e656650d4ddb0c11c4990c720457dc0e21ebcee4a44e67356dfc89d3bdd0caf5e943fb5b59b5fa4ff9f2bd1963b6db20f362c1725560
 EBUILD catch-1.9999.ebuild 558 BLAKE2B bafe5cb18017202bd684d631b8839caab6bb128d8fc42d7772dd74aa91dcd99b139393fa22463536924da114fc508a92d5b49639590933397a57cab9f2159ac0 SHA512 1952c96b2fa49e674a32466f2ec709b2f92c8e2502eecb1f25c24d81d11c73e8c28cfbb1da5b7e322bbebd28d6ade06f6b157e07f47f1a06ad258c30efc118f0
 EBUILD catch-2.1.1.ebuild 789 BLAKE2B 1eefb971644a62d137bd3af77bd3155fe82382f1520e5da503ad80bb4ace697ce461f5d3c6311ac0b241224f6df603b87ec00f5c9225d8d6bb6c7a6ecf9bb303 SHA512 930839ea809a06dcb8f66ade29cf3e5b109327ceaef66da33c55fc958974b2489bfb003238b560189868bc08246ca4ddb7b5f239ff0b804973c6fab50ab4b4b0
-EBUILD catch-2.2.0.ebuild 849 BLAKE2B 9a60b16e90754ccc4b815ab2b1b077c694dc8ab17effe63197f7721dfc0e9de2f6080a80960201d3ec66500bb331f3d9b293ae3497e7113ada6937a78672ba31 SHA512 046bf2c8d913595a3d6fe66d5a0f32d0772a6a221f112eda1a4b981a9a0972f6b24100102d5207704643bd6c5c20456ce0e09f2c540d6f6b177fd8291a832bd7
+EBUILD catch-2.2.2.ebuild 1078 BLAKE2B 5c33d53d303e552418f2957e8c1c9f640fb03b356bb3e4f6d2988c2fc98225d1bc6a50621a1285d5ab0d255cd1a00b5916788de16527c3f7f436bdf9d4ba3f28 SHA512 3912a227443c1eff86b65831ea3f5c2703811c0978c8750e5b69c75cca0079d1ecc31d2c643aad6a02a2b210da061f111097db390e9be00fab807d4e54eb5534
 EBUILD catch-9999.ebuild 789 BLAKE2B 1eefb971644a62d137bd3af77bd3155fe82382f1520e5da503ad80bb4ace697ce461f5d3c6311ac0b241224f6df603b87ec00f5c9225d8d6bb6c7a6ecf9bb303 SHA512 930839ea809a06dcb8f66ade29cf3e5b109327ceaef66da33c55fc958974b2489bfb003238b560189868bc08246ca4ddb7b5f239ff0b804973c6fab50ab4b4b0
 MISC metadata.xml 324 BLAKE2B e32ed47ddce7e517244ff26e70d1bd31cdaa33bef0bf4a6cf4284f3688745760a9538f9bf6d9d25a9fabd3f5f6901a1b91c76d2fe290427a55bcc74d4f17be7b SHA512 094af03b1e2befa015f1faaca9ecf4158fffedfe7ef8a2873e9e6cd6e4e7d26f276e357ac1989c2809702abc3ada590668adc37c9d804cee31ae564f88c3315f
diff --git a/dev-cpp/catch/catch-2.2.0.ebuild b/dev-cpp/catch/catch-2.2.2.ebuild
index c9f6247c2842..2cce0298b3a4 100644
--- a/dev-cpp/catch/catch-2.2.0.ebuild
+++ b/dev-cpp/catch/catch-2.2.2.ebuild
@@ -3,8 +3,10 @@
 
 EAPI=6
 
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-inherit cmake-utils
+inherit cmake-utils python-any-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -25,13 +27,23 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.2.0-fix-pkg-config.patch )
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.2-test-python3.patch
+	"${FILESDIR}"/${PN}-2.2.2-python-automagic.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
 
 src_configure() {
 	local mycmakeargs=(
 		-DCATCH_ENABLE_WERROR=OFF
 		-DBUILD_TESTING=$(usex test)
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
 	cmake-utils_src_configure
 }
diff --git a/dev-cpp/catch/files/catch-2.2.0-fix-pkg-config.patch b/dev-cpp/catch/files/catch-2.2.0-fix-pkg-config.patch
deleted file mode 100644
index 1c1463921b2b..000000000000
--- a/dev-cpp/catch/files/catch-2.2.0-fix-pkg-config.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From c778848b09df073b9f84f22622ea7a632642c4a5 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Tue, 30 Jan 2018 11:13:53 +0100
-Subject: [PATCH] Fix pkg-config
-
-* All uses of Catch involve #include'ing it without
-  a prefixed folder, such as `#include "catch.hpp"`.
-  This requires fixing the pkg-config file.
----
- catch.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/catch.pc.in b/catch.pc.in
-index abd0b66b1..4f48bc7fb 100644
---- a/catch.pc.in
-+++ b/catch.pc.in
-@@ -3,4 +3,4 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- Name: Catch
- Description: Testing library for C++
- Version: @Catch2_VERSION@
--Cflags: -I${includedir}
-+Cflags: -I${includedir}/catch
diff --git a/dev-cpp/catch/files/catch-2.2.2-python-automagic.patch b/dev-cpp/catch/files/catch-2.2.2-python-automagic.patch
new file mode 100644
index 000000000000..ecc99905d7f0
--- /dev/null
+++ b/dev-cpp/catch/files/catch-2.2.2-python-automagic.patch
@@ -0,0 +1,25 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -308,6 +308,9 @@
+ 
+ include(CTest)
+ 
++# Approval tests require python 2.7 or 3
++find_package(PythonInterp)
++
+ if (BUILD_TESTING AND NOT_SUBPROJECT)
+     add_executable(SelfTest ${TEST_SOURCES} ${IMPL_SOURCES} ${REPORTER_SOURCES} ${SURROGATE_SOURCES} ${HEADERS})
+     target_include_directories(SelfTest PRIVATE ${HEADER_DIR})
+@@ -384,7 +387,11 @@
+     set_tests_properties(NoTest PROPERTIES PASS_REGULAR_EXPRESSION "No test cases matched")
+ 
+     # AppVeyor has a Python 2.7 in path, but doesn't have .py files as autorunnable
+-    add_test(NAME ApprovalTests COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/approvalTests.py $<TARGET_FILE:SelfTest>)
++    if(NOT ${PYTHONINTERP_FOUND})
++        message(FATAL_ERROR "Python not found, but required for running tests!")
++    endif()
++
++    add_test(NAME ApprovalTests COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/approvalTests.py $<TARGET_FILE:SelfTest>)
+     set_tests_properties(ApprovalTests PROPERTIES FAIL_REGULAR_EXPRESSION "Results differed")
+ 
+     if (CATCH_USE_VALGRIND)
diff --git a/dev-cpp/catch/files/catch-2.2.2-test-python3.patch b/dev-cpp/catch/files/catch-2.2.2-test-python3.patch
new file mode 100644
index 000000000000..0712f1577077
--- /dev/null
+++ b/dev-cpp/catch/files/catch-2.2.2-test-python3.patch
@@ -0,0 +1,44 @@
+From dc6b83bec9bdcc149db08711cc9dfd555a8620fa Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Fri, 6 Apr 2018 13:59:08 +0100
+Subject: [PATCH] Support Python3 in approval tests
+
+---
+ scripts/approvalTests.py | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py
+index a2ab5d5a2..16cc7b7d2 100755
+--- a/scripts/approvalTests.py
++++ b/scripts/approvalTests.py
+@@ -72,10 +72,17 @@
+ 
+ overallResult = 0
+ 
++def openFile(file, mode):
++    try:
++        return open(file, mode, encoding='utf-8', errors='surrogateescape')
++    except TypeError:
++        import io
++        return io.open(file, mode, encoding='utf-8', errors='surrogateescape')
++
+ def diffFiles(fileA, fileB):
+-    with open(fileA, 'r') as file:
++    with openFile(fileA, 'r') as file:
+         aLines = [line.rstrip() for line in file.readlines()]
+-    with open(fileB, 'r') as file:
++    with openFile(fileB, 'r') as file:
+         bLines = [line.rstrip() for line in file.readlines()]
+ 
+     shortenedFilenameA = fileA.rsplit(os.sep, 1)[-1]
+@@ -139,8 +146,8 @@ def approve(baseName, args):
+     subprocess.call(args, stdout=f, stderr=f)
+     f.close()
+ 
+-    rawFile = open(rawResultsPath, 'r')
+-    filteredFile = open(filteredResultsPath, 'w')
++    rawFile = openFile(rawResultsPath, 'r')
++    filteredFile = openFile(filteredResultsPath, 'w')
+     for line in rawFile:
+         filteredFile.write(filterLine(line).rstrip() + "\n")
+     filteredFile.close()
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index f25dc399b3f3..f54bdb928242 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -4,8 +4,8 @@ AUX glog-0.3.4-fix-gcc5-demangling.patch 1992 BLAKE2B 086661e687a98e34777fd0baf9
 DIST glog-0.3.3.tar.gz 509676 BLAKE2B 21d8893ff535c0e8c1de27214f535aaea99727128d80f421da096969c19504da6a296054db2931232b4fd372446f96189464e4000f44c5720152085aa9976978 SHA512 95418ff0857415a0fbc15caeb22a13f3b6736618adcc3c30e054626f1397bc58399c45f68784c70b1f5dc594ebc6ea66e386896beab5c20be72dd53b25f5a4ac
 DIST glog-0.3.4.tar.gz 522508 BLAKE2B 4a188d5998005b29afc52f2ea548f33e06a68da993bb74960e5aedb214ec52ef9e9fc39efb1a34f38f217b92df7db064ff01d58df36c3e4ad789becc97335ec2 SHA512 139525b546a9eccacc9bebf7cc3053ba52229e9488485ad45344c3d3134ca819d3b571250c0e3a6d84097009c8be89b0f4fa16ef5ec838ffcc237ae11c3a034c
 DIST glog-0.3.5.tar.gz 532275 BLAKE2B a455f3ff8fc7cf2861a4351a0305db9455bb79977e57c49b6269b3fa2c147cd9627bfaf4c7aaa04fe4a49158d79abeb5b985813fe8c473d6005e915335c0d693 SHA512 a54a3b8b4b7660d7558ba5168c659bc3c8323c30908a4f6a4bbc6f9cd899350f3243aabc720daebfdeb799b276b51ba1eaa1a0f83149c4e1a038d552ada1ed72
-EBUILD glog-0.3.3-r1.ebuild 1834 BLAKE2B d916387f3779f4de88582b4ffac1225b87696d3708fce86436c800aeab6f523ee6b9357c4694836f1831e08fbb803a15ad56869fb4e6752bb67f0506c52ebfee SHA512 6a399224979c430102861f0bcd80344c1227d270e1eb175e0df4172f6294c5800112fd0c9a94c84a3e6baf8b77880c6447b1c13d75ddf941a44e1ffaca482606
-EBUILD glog-0.3.4-r1.ebuild 1245 BLAKE2B 4ceae0391b3b19821492310b8dfd314eb401fbce7f5b01a515a99d71b7eccb200c94644abf1fe5320e8d81e6f2991130c059aa81106fa0588e8b00e5ca4d8c80 SHA512 a2a03fa729dcf6cd3c46f432c609eb98d7a63bbafd8590ef21019b0c89659ce64ea72f706aedb54895bdd8387cc77adb5be8ab961175f1f304b0fceb8188ad00
-EBUILD glog-0.3.4.ebuild 1855 BLAKE2B 32eaaedc1ce19d93d999f30e6acf8a5a70643ee0f364eb7dd04762e4535dd35d0261491eddab4bd5f5e7ebbc0ffdfa5417a87f5b90c3b8dc35c817cf09dfe333 SHA512 f9feb687feb6d5141580ade93318bdaa505c98697f86a1c51e7f4e3e61819df41bb131f317db721723865a5a49856147cd8284fcaeaae8b0250044473478d613
+EBUILD glog-0.3.3-r1.ebuild 1781 BLAKE2B 14b1654553f9c52c9f0f7a3efaffd3e6ae408212b25ac35db9b51eb543e92a99bab32392ae3cb2df410c12330bf618d347f13a102b4da16025880cf46ac43de1 SHA512 d116e48b3cd2e2513291b006d94100414399d3f77ce5bd4058c86a28241b690476cdbc7c189684bc86758dc0bb08d11bbd575beb71d1f4969bff8477c8a45f2c
+EBUILD glog-0.3.4-r1.ebuild 1192 BLAKE2B cb2259d727bd5629059a4848f0efd990ab054a587994c0b951007c58cdff3b8991936c391fc431d41e17d475178e83f48fd29ad4d3fd1f3fc278e2525d404576 SHA512 cd39b6f0edc218fb67b20a09e37a0149e3b1d165beed2614654db7ba6ee50d94480a83ef602728f4b8aedaf33547dd06512925c46b48d0f02ed77da1a88c5f0d
+EBUILD glog-0.3.4.ebuild 1802 BLAKE2B a0d46af823ee228ad860a96dbf11cc26cc97cd49c96e3d3f860324ab3809273ffe2db3744a566beb73b5e01f8dd85447320e53c067c006fed12dc98ec6d77ea5 SHA512 b445fa06f2260544a4b61da19f9dae1d3272d77348be4c381da6e862b6ced086d4916c743bb29882678458b0ef93704b96f2d7494989f726795ef874ee870037
 EBUILD glog-0.3.5.ebuild 1198 BLAKE2B d30874550c821e6bc4e1127660c43fbf23e3ce1f4fe74d05246fe97d1f0912f9452b6ed43c78cf93e70e460fcb14268f18ea64439c82e3ce196f236e81f08acb SHA512 f60474a111c82217991ef31825cc9d3f19914815d011351216f814041902e77e6dd44aaf8cb3a90fd0601654add6d82111532143227fbba41ed8c5db5afaa1ea
 MISC metadata.xml 609 BLAKE2B 44e06e9039e048b3be88b61ad11a3b698a99e78fcd8df49e66c5a63bea43422e3c8f197f847e5c22057828d23ddc37efb09cb9015f5a6b252e20c8d038ecf5b3 SHA512 9dc4390cd212eb4a9d05ea2eeae26d7556c7ddc01444a917a9d5958d4604a4808b73ab7a7f9f4c6809ae396a53c1e9c73c5ce6b96595c7dd7d86dd6ec7a739fb
diff --git a/dev-cpp/glog/glog-0.3.3-r1.ebuild b/dev-cpp/glog/glog-0.3.3-r1.ebuild
index 3b6207ec2075..667d65726491 100644
--- a/dev-cpp/glog/glog-0.3.3-r1.ebuild
+++ b/dev-cpp/glog/glog-0.3.3-r1.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="4"
@@ -16,10 +16,7 @@ IUSE="gflags static-libs unwind test"
 RDEPEND="gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] )
 	unwind? ( sys-libs/libunwind )"
 DEPEND="${RDEPEND}
-	test? (
-		>=dev-cpp/gmock-1.7.0-r1[${MULTILIB_USEDEP}]
-		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
-	)"
+	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch
diff --git a/dev-cpp/glog/glog-0.3.4-r1.ebuild b/dev-cpp/glog/glog-0.3.4-r1.ebuild
index 522feb232f90..ad7b6587ddb3 100644
--- a/dev-cpp/glog/glog-0.3.4-r1.ebuild
+++ b/dev-cpp/glog/glog-0.3.4-r1.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
@@ -18,10 +18,7 @@ RDEPEND="
 	gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] )
 	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	test? (
-		>=dev-cpp/gmock-1.7.0-r1[${MULTILIB_USEDEP}]
-		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
-	)"
+	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch
diff --git a/dev-cpp/glog/glog-0.3.4.ebuild b/dev-cpp/glog/glog-0.3.4.ebuild
index a6e1d7719cb0..a6b6ee4e3fb4 100644
--- a/dev-cpp/glog/glog-0.3.4.ebuild
+++ b/dev-cpp/glog/glog-0.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,10 +17,7 @@ IUSE="gflags static-libs unwind test"
 RDEPEND="gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] )
 	unwind? ( sys-libs/libunwind )"
 DEPEND="${RDEPEND}
-	test? (
-		>=dev-cpp/gmock-1.7.0-r1[${MULTILIB_USEDEP}]
-		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
-	)"
+	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch
diff --git a/dev-cpp/mm-common/Manifest b/dev-cpp/mm-common/Manifest
index f5ae17466f3f..ff82e00be5bf 100644
--- a/dev-cpp/mm-common/Manifest
+++ b/dev-cpp/mm-common/Manifest
@@ -1,3 +1,5 @@
 DIST mm-common-0.9.11.tar.xz 266928 BLAKE2B 51f0d7e78d19c1f28d7ae0bb45d9380f37c3893f5a4278d6663611582b2299d02a37fa1cf4e0235f67e46548e1f003bacd9d45133bae38de7cb524128a556645 SHA512 c1072ad35996e748b14ce09253ab64b8eb302da8a78932149325e4485e9684ad3c0555d5fc6787fad2b5d912b8110df60608dfafa418892b901632ebbd5b1007
+DIST mm-common-0.9.12.tar.xz 304588 BLAKE2B 8fd443b4077d803bb1513c897aa44965e50591cf36518469f1f2f74c40ff2b4f687152f9fc31e2d543ac97ae7a5a0a58efdc8c362959e015eee54b8bd518809e SHA512 99701d91994ca2783fe5b8bfd44cdea9f14e16dbbc116f894d9f3df746912cdbcdbdb0d5fdf6e235c9d22621a314de7aaac9b87a18f3ab742a0ad2ebbaad8ec7
 EBUILD mm-common-0.9.11.ebuild 381 BLAKE2B 0327a3173a49a1dd871f2e0281b2ed44561f8781cc6dd6c2ba2887c53ca01cf14bc54fa5254933ec33ea1f3d935f7167653abe4d9e6727069321f3964a94be36 SHA512 d8a29a00ba756ae29c571698e083591121463205b91a17ba2db5e429175b5a8313b44e75fe72d8e9c21cd4a77b66140f576fdf544f1ed349bf57deb962a2b389
+EBUILD mm-common-0.9.12.ebuild 381 BLAKE2B 1c169a4822b5c726b0590e9d90b7474bfc93d41e7d4da7666afd6474fdd47f1c802a2bfab8b33da62b5582a3dd9e857564ee492943b42e4604cd9a580d387c15 SHA512 eb0659657896dde63eb9de28858f8208ff1afc6db71382f301c7d277c5fda7b995d5330d322961e164b67aacc2c569f7b283fc3793dd298893797f0fb4fa87e2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/mm-common/mm-common-0.9.12.ebuild b/dev-cpp/mm-common/mm-common-0.9.12.ebuild
new file mode 100644
index 000000000000..5000f18771c2
--- /dev/null
+++ b/dev-cpp/mm-common/mm-common-0.9.12.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Build infrastructure and utilities for GNOME C++ bindings"
+HOMEPAGE="https://www.gtkmm.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 1d490cb09bb5..988fd4b96287 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -4,11 +4,13 @@ AUX tbb-4.3.20150611-build.patch 4806 BLAKE2B dd5f785a8c3d6d715c1573a14aaa3dda12
 AUX tbb-4.4.20160803-build.patch 4838 BLAKE2B 3e410208ee260dc0839b3658e436d742b8c03eba5eb6f7c6b697bae75d0078a2099b1cf012f32b1a3486d87a2eba123fcad7e651c3ce63dc883491b2e7192af7 SHA512 cee8733f667fec20ea5760176bec587e4c0dfc9286841ccc6f72702a3440fe5ea4054b7e7c22c98d4d4814ef4bd160264962d3a4d58d177141c15cf391c5f30e
 AUX tbb-4.4.20160803-underlinking.patch 389 BLAKE2B 88b85cf0a2c8706dff908d4c4e73e1399aa8ac85f7c2df1bd5daebc564e4007c4bf0df27647e53764c6dd437422ed48885e798a6e4fc6b5900810c7855c9ceeb SHA512 bfd3b9d5221a89a120e115447a9aa653e93a208422c68c8cc74a672f42037fd1af3dc755480d746570f2c5dbeb173650d9b4acfb38aaec5d3c3feea6c2232af1
 DIST tbb-2017.20170226.tar.gz 2856407 BLAKE2B 10c9f1230a57e0cc778f4f7ad9395a7dc9044b7f203e704cfdc479632e2aaf35f05caa168d9caea490abc6d96ec7d77ea6e7effbc9d5b589a6e41e3374b8b9cb SHA512 d07eeca53138432a4ac20145169907f5271e234bedfb53e0eabbed2b6fafaecdc0a2ad7bdbead205993f822e7c415233cce9afd7575d366c17a117d5cc971a65
+DIST tbb-2018.20180312.tar.gz 2911740 BLAKE2B 5c6dab4a892f3b61ed0b02ea36dc41bebd5b33a22bcc3d5f2960f21e134f2eb9bccf1466193a573489e12638c0bb0bccc2da83f699968ffd62417f2d0f093289 SHA512 7ac74e714122e25f7704630d3d52992dbea54d1e761b5e487251a771f401aa864f78b8ddf11d78f38758088df387abb6987f6a2db562c86cbb28ba8f33a25680
 DIST tbb2017_20161128oss_src.tgz 2965854 BLAKE2B 8c5aed6d8477297922767803617346feebb712d1f4b2df6d71a86f039b5563afc666454985e68a528a812aaad40b5fd0562bb91d357c45156fec46e5389ec542 SHA512 3c48ce196d2d3557e86cea7ede9dea456bbaeb29dbed34210f99c6f380406403a6056ccfa3d5befe6b29c4f8a9ee58ca6da545249cf4ec4ec85b463e04e4518c
 DIST tbb43_20150611oss_src.tgz 2757631 BLAKE2B d1a00b531b747aeae05d052ac2d894b4d5dbee628988794ac9721058e5b3cd7efb60877ff1183d155d75bc2a0b413863911c438da9db1c30ec8e74e2de442118 SHA512 83d5d827706b774ef5cd6df8082e5d7f48683388684423bb40565dfc25892fc2e57c382f719b78087d83e51edb3f7f7215f33d8b5039b55c32788d80efa6e0b8
 DIST tbb44_20160803oss_src.tgz 2874050 BLAKE2B 097e4e4fb2c14b6ab073409b26c7d5044cd7f2edb56efb0b307b1e07b4496a668d34eec88086d2f8e68eb050df9e2b48af81b5e47c860b15786e0c48df736d9c SHA512 01b1dcdaffa96c3d503e44d7b236b1115f419c122dab0f40de4c9dc90db315a1f3755cc91adf9df91d5d31d8927df115230db94cf175edac09ae438b46374a92
 EBUILD tbb-2017.20161128.ebuild 3328 BLAKE2B 87677082f5c83d0bee403d212ddd8b45c33243ac56c817619d32ed9dfd645ab33f120e309443e2dcf12c594da7912488a8558a2c7f242235db7b03ce8a947a6a SHA512 b6e06f73c2000ff7e56c9a885e09fc03ae33dfd70a619f158f42b062cf728e9d90e125fee620e0a58120086314f09783583d46b4de390a8b08b342c63ff2e9e4
 EBUILD tbb-2017.20170226.ebuild 3332 BLAKE2B 911d659df7fe32baed6ad3ec1cd3d487b852823d436c06efb0110db481a2c8a31e5b845eedea923629c0d51fbcd5f4106e150ba25ab7c20fbc5db428a5b52091 SHA512 329ac79bd5bda7340ef089e15cc119678a5a8bb1a1fee6357d8b79174673e1d12ffd36faf221a2157641892e744de3b7ba4ff95e6aafdeb9c91f9ba80491b649
+EBUILD tbb-2018.20180312.ebuild 3332 BLAKE2B 128485861f702e4e194b9aa702f9d5cd8bcb5c02f54c0f73206c87b71f878e197e63089b14ebcf9650ace6501352445932409293df996ea3553fdc9f822e8c3b SHA512 2961bfb4169abcccd298840e7078d3b01a72cff4030f7cfd7bb2aad6a470c1a1650f1aceaab7f9f61d283171ba9838da2cf37aa1184b615ea487393e93159efc
 EBUILD tbb-4.3.20150611.ebuild 3142 BLAKE2B 1014e7cf3a5615a7533ea37bbf0a4995e4a60d4669cfef3baf4630df59877bdc947fa308192b3e9752d19570beea0e42752072d04269bb41f45baf3fd2ec1073 SHA512 9f35df30d1641eca5adbf57cc99757cb80a25ed15dbf5aa9b8aff1163ccd5e67fb7ec0c47b1283f613d82b05e69da5cf7243a9d9dc55bd8be1bed7a1f0cf5bde
 EBUILD tbb-4.4.20160803.ebuild 3387 BLAKE2B 17e64dd187002b351aaa55673186928d85eb3150d34245f7611840da3d5da47187b1fb0b75edc5cd01b51af97dc185ca07d22921db1e422ba9ec9a75f5083be5 SHA512 e651def030a55e3dad14c8938d5e0f4a43dfd6fc9903ef8c938824e60e8e79b92cae9c480d18380b95c2695bf96726013b8ea4ac8bbf9ddf921caff13b35ff18
 MISC metadata.xml 687 BLAKE2B c094e0e1a7f9939540292663dceefcacf0468b91563cf051ce487edbdf27b7c07392102fedf6df18aa2852465eb1e6b6f72bbe93c0ca1669c1fba2bbc5840c48 SHA512 bfdebc9e52c9c46424854b519e8ff60f7b473e33189235a50e1110af1f8264c2ad2b4f71110be1147387491fc078ec6c9e451347b47f69d0f2b15e60ad2e9a0b
diff --git a/dev-cpp/tbb/tbb-2018.20180312.ebuild b/dev-cpp/tbb/tbb-2018.20180312.ebuild
new file mode 100644
index 000000000000..3d6b1e11f0b8
--- /dev/null
+++ b/dev-cpp/tbb/tbb-2018.20180312.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib-minimal multilib toolchain-funcs versionator
+
+PV1="$(get_version_component_range 1)"
+PV2=3
+MY_PV="${PV1}_U${PV2}"
+
+DESCRIPTION="High level abstract threading library"
+HOMEPAGE="http://www.threadingbuildingblocks.org/"
+SRC_URI="https://github.com/01org/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug doc examples"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4.20160803-underlinking.patch
+	"${FILESDIR}"/${PN}-2017.20161128-build.patch
+)
+
+src_prepare() {
+	default
+
+	find include -name \*.html -delete || die
+
+	# Give it a soname on FreeBSD
+	echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >>	build/FreeBSD.gcc.inc
+	# Set proper versionning on FreeBSD
+	sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die
+
+	use debug || sed -i -e '/_debug/d' Makefile
+}
+
+multilib_src_configure() {
+	# pc files are for debian and fedora compatibility
+	# some deps use them
+	cat <<-EOF > ${PN}.pc.template
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: ${PN}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Cflags: -I\${includedir}
+	EOF
+	cp ${PN}.pc.template ${PN}.pc || die
+	cat <<-EOF >> ${PN}.pc
+		Libs: -L\${libdir} -ltbb
+		Libs.private: -lm -lrt
+	EOF
+	cp ${PN}.pc.template ${PN}malloc.pc || die
+	cat <<-EOF >> ${PN}malloc.pc
+		Libs: -L\${libdir} -ltbbmalloc
+		Libs.private: -lm -lrt
+	EOF
+	cp ${PN}.pc.template ${PN}malloc_proxy.pc || die
+	cat <<-EOF >> ${PN}malloc_proxy.pc
+		Libs: -L\${libdir} -ltbbmalloc_proxy
+		Libs.private: -lrt
+		Requires: tbbmalloc
+	EOF
+}
+
+local_src_compile() {
+	cd "${S}"
+
+	local comp arch
+
+	case ${MULTILIB_ABI_FLAG} in
+		abi_x86_64) arch=x86_64 ;;
+		abi_x86_32) arch=ia32 ;;
+		abi_ppc_64) arch=ppc64 ;;
+		abi_ppc_32) arch=ppc32 ;;
+	esac
+
+	case "$(tc-getCXX)" in
+		*g++*) comp="gcc" ;;
+		*ic*c) comp="icc" ;;
+		*clang*) comp="clang" ;;
+		*) die "compiler $(tc-getCXX) not supported by build system" ;;
+	esac
+
+	CXX="$(tc-getCXX)" \
+	CC="$(tc-getCC)" \
+	AS="$(tc-getAS)" \
+	arch=${arch} \
+	CPLUS_FLAGS="${CXXFLAGS}" \
+	emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" $@
+}
+
+multilib_src_compile() {
+	local_src_compile tbb tbbmalloc
+}
+
+multilib_src_test() {
+	CXXFLAGS="${CXXFLAGS} -fabi-version=4" \
+	local_src_compile -j1 test
+}
+
+multilib_src_install() {
+	local bt
+	local buildtypes
+	if use debug ; then
+		buildtypes="release debug"
+	else
+		buildtypes="release"
+	fi
+	for bt in ${buildtypes}; do
+		cd "${BUILD_DIR}_${bt}" || die
+		local l
+		for l in $(find . -name lib\*$(get_libname \*)); do
+			dolib.so ${l}
+			local bl=$(basename ${l})
+			dosym ${bl} /usr/$(get_libdir)/${bl%%.*}$(get_libname)
+		done
+	done
+
+	cd "${BUILD_DIR}" || die
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins *.pc
+}
+
+multilib_src_install_all() {
+	doheader -r include/*
+
+	dodoc README CHANGES doc/Release_Notes.txt
+	use doc && dohtml -r doc/html/*
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples/build
+		doins build/*.inc
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples
+	fi
+}
diff --git a/dev-cpp/waylandpp/Manifest b/dev-cpp/waylandpp/Manifest
index dae07ffb0da5..9786ccf1d1f5 100644
--- a/dev-cpp/waylandpp/Manifest
+++ b/dev-cpp/waylandpp/Manifest
@@ -4,11 +4,13 @@ DIST waylandpp-0.1.4.tar.gz 168409 BLAKE2B 43811051f1c4cf8795c63d24c54f6f3fac59b
 DIST waylandpp-0.1.5.tar.gz 168432 BLAKE2B 0d3efcb489a713be1ae9db0366b47436b0789468b956ac781f981b3bf1feaebdf2be083f6d1263190e202a45e4416d2d972ffc67d8b87115146f14a5c4af41a5 SHA512 bce1f29607fe61f4b8464abc6111121e3c18777d2e982f143b33087d53af58e9d3a61e412c46dbe73d8cbbaa889da806978e9b3854ce01db8feb53d777625a6f
 DIST waylandpp-0.1.6.tar.gz 180123 BLAKE2B 552dbea6b6d9c3f937aa56a69c90485f6946366589793e53817bada7b2dc1eca0c58a741b22f5f0f7fac04bb14d668f01a1c2418343ebf32845dc1bf02656957 SHA512 93ed7157017394f7df0d7cdf2f56e1d8621893cc8cb77b01206534b8ca40528aba6bd2b922b359809bdca7831fa45668f85903e9e3dd6f0759839c7318349c94
 DIST waylandpp-0.2.2.tar.gz 180313 BLAKE2B 558f26e9ce2edcafacfbd874bcf99176a3bc10b2991eaba0dee64c06f0e7a25f3800b2facdd7e86c775003bd2f06ddb6911a3f956f9d8089512e95fd5d03c120 SHA512 e9288482e1b59eacf71a4164dfec3236f2d6d63aee6d530d1f71bbdb20db6986137a50ac34438219463a4208897424d28d2346d2c51dccaf3e77953e4db085f2
+DIST waylandpp-0.2.3.tar.gz 180539 BLAKE2B 8941200b46235c8b65926065a3a758871581fe21ffbcc17dc33a00c546c920247739d3137b528fe8971b7c1c2240b5a056387dcbaa1437047709e079cb2e58c2 SHA512 424ccef67e1faedfb03aa7465917e4dfc0eae578a1eb42bcdbe71df02955fef00fc1b480acb4828e168f051a82a13f923e0c9be93d3ede221e791a7af88647a5
 EBUILD waylandpp-0.1.0.ebuild 1246 BLAKE2B cb14f13bef95773ce5ea8edc6a94dd8917a658953a4b88ead8d3d3de61bffdeaf075aa14bdd2164549735db40f1bfde315af883110d722d3cf05407a150d90ba SHA512 cdeb50fcad7a3630338a1b830c81313ae2af699ff3b3dc7f16c2b4cd20fe25a55821afbbb56d741ba10d0352429683160fe22bb5f54f6e3c28a5d0716465cc6c
 EBUILD waylandpp-0.1.2.ebuild 1276 BLAKE2B f9acf8a81b75abcd6563c50967fc2e6935908b152d8696d94be7bb11867057c45893be2bf53a6e70c82aa99d9ada3a9c5207e2a7cd2bc1b143ff49f70187f20e SHA512 d41b8ce0f9f0fcc4c5ba5a0eccea6498a0750cf441d2bfe995d38a6ecc1c8d8e94d01147b28e9c1fcb0da6c45c593c27637eece7462cdd045e8f5441678d3182
 EBUILD waylandpp-0.1.4.ebuild 824 BLAKE2B 0de5bffc21852ee018103a2403fc83fbd93691e5fcd014c2f78408b8ce905cc5174cf52f4dd17705f30610a6527ee85d04baa6f820722e30cbde7d985e254929 SHA512 af76bd5c8fee9b019cde74af63bc56a0c740ddfd2455a7e86672b94773dc3c946e1d7d912134d3d8371e12bb5202de3521f385a30797c7553f6454bf59ff9750
 EBUILD waylandpp-0.1.5.ebuild 824 BLAKE2B 0de5bffc21852ee018103a2403fc83fbd93691e5fcd014c2f78408b8ce905cc5174cf52f4dd17705f30610a6527ee85d04baa6f820722e30cbde7d985e254929 SHA512 af76bd5c8fee9b019cde74af63bc56a0c740ddfd2455a7e86672b94773dc3c946e1d7d912134d3d8371e12bb5202de3521f385a30797c7553f6454bf59ff9750
 EBUILD waylandpp-0.1.6.ebuild 824 BLAKE2B 0de5bffc21852ee018103a2403fc83fbd93691e5fcd014c2f78408b8ce905cc5174cf52f4dd17705f30610a6527ee85d04baa6f820722e30cbde7d985e254929 SHA512 af76bd5c8fee9b019cde74af63bc56a0c740ddfd2455a7e86672b94773dc3c946e1d7d912134d3d8371e12bb5202de3521f385a30797c7553f6454bf59ff9750
 EBUILD waylandpp-0.2.2.ebuild 838 BLAKE2B ff161112d3fdb95abaa1d7b1df081faf705dfd4f4e704af21ee4f724b551aa97ac5cf913800f6f1fde6d0615771cda497d668c4e4cd15b43278b79adb576a304 SHA512 8265df8c99fa23b48680a98cdf78c7702cfe48aaf93dd77feb67275a5063aa2ebea93a044f3202c151d5d8d1aad89300d0bb7bbe8016b062058e19c161a6731b
+EBUILD waylandpp-0.2.3.ebuild 838 BLAKE2B ff161112d3fdb95abaa1d7b1df081faf705dfd4f4e704af21ee4f724b551aa97ac5cf913800f6f1fde6d0615771cda497d668c4e4cd15b43278b79adb576a304 SHA512 8265df8c99fa23b48680a98cdf78c7702cfe48aaf93dd77feb67275a5063aa2ebea93a044f3202c151d5d8d1aad89300d0bb7bbe8016b062058e19c161a6731b
 EBUILD waylandpp-9999.ebuild 838 BLAKE2B ff161112d3fdb95abaa1d7b1df081faf705dfd4f4e704af21ee4f724b551aa97ac5cf913800f6f1fde6d0615771cda497d668c4e4cd15b43278b79adb576a304 SHA512 8265df8c99fa23b48680a98cdf78c7702cfe48aaf93dd77feb67275a5063aa2ebea93a044f3202c151d5d8d1aad89300d0bb7bbe8016b062058e19c161a6731b
 MISC metadata.xml 401 BLAKE2B 3270a9fb51a7a5a0cede7e9bc863f1445db1eda5a3b132b8ed9d2eaaaddeb60b85720484a136e09d3e00b80240a637a9f8a9533311e2b6f17fb9798e2ed19ef6 SHA512 3501904a23158eeae58c78bcc7cc3549bd877cf13f6490a8d63a0586ed080c28e27a6d302a9170020b571460dd0ca64acde471d765c8880bb2427d6c8ed76ada
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.3.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.3.ebuild
new file mode 100644
index 000000000000..14c6fc58c138
--- /dev/null
+++ b/dev-cpp/waylandpp/waylandpp-0.2.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils versionator
+
+DESCRIPTION="Wayland C++ bindings"
+HOMEPAGE="https://github.com/NilsBrause/waylandpp"
+
+LICENSE="MIT"
+IUSE="doc"
+SLOT="0/$(get_version_component_range 1-2)"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+	>=dev-libs/wayland-1.11.0
+	media-libs/mesa[wayland]
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	cmake-utils_src_configure
+}