gentoo resync : 18.08.2019

23 files changed, 457 insertions, 480 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index a58c91659ef1..bba0cae8a133 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index 07d828453521..5707a960f503 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -1,11 +1,13 @@
 AUX glog-0.3.2-avoid-inline-asm.patch 1837 BLAKE2B 2cd93d0be42a9cf18e610dbccc3859cf7347d25b9205c6bb69c795e3df63c2fdd31972312afaa835cbf1d5eae8b1b6b274d41093bf35d32db7cba2df8833f8c3 SHA512 d45e6e1ef311a8eaccbbcf802c609c19509b74d0647a6ff4e2f0886ecd52d7f107c76d06cba88036870a4c34c62c19df661c59ea5011dff931ad14a3f5d8ab58
 AUX glog-0.3.4-fix-build-system.patch 4861 BLAKE2B d1c10a8c4b264003e0718da28e1df5a24045a61987dae2412a1c72abcc3ec8d8f01d3f5a4e14a97ebb3b482effe8bafa0fe44710a94d16c5db97d44891ca3a68 SHA512 ba162ebb8395044b2bb7b1982a463be01155772acf898614cc13f73c523f63094621f887b8a67e6f810d98914177a1a4a82a45ba7ff7415101f70a8915ae42f0
 AUX glog-0.3.4-fix-gcc5-demangling.patch 1992 BLAKE2B 086661e687a98e34777fd0baf97dec3730acad2ff8fd2184bb0a25d3c516125ca97d92bd799f33fabce4aabfeb1fba6dd865c89aef1659095988c34166285f69 SHA512 6f0b6f74dd039672f80dce55526ae784ff56add01ffc0dc0f5adf4c0ebbf9af15cfd054b370a0631fb7044abb20edf6dc79cb0dd2ac49fda7131ec152f54f054
-DIST glog-0.3.3.tar.gz 509676 BLAKE2B 21d8893ff535c0e8c1de27214f535aaea99727128d80f421da096969c19504da6a296054db2931232b4fd372446f96189464e4000f44c5720152085aa9976978 SHA512 95418ff0857415a0fbc15caeb22a13f3b6736618adcc3c30e054626f1397bc58399c45f68784c70b1f5dc594ebc6ea66e386896beab5c20be72dd53b25f5a4ac
+AUX glog-0.4.0-errnos.patch 4580 BLAKE2B 9a7f86fb2dbcab68948914dcef74e1e08750462e58f56b3f337ad845e1ff4bcdf831e7e231e274bce7db9a4228c307b6bb3baa85ce6cb3eee8625414da6273c9 SHA512 8be72be6d6c27bdbe74dbb95cc2534dcfcd7adc1d85fc5f7022a2b7599ae6b148431623140141ed9863d54febaa414673d18b8fbc8c5aea7f0e43b0f92a54432
+AUX glog-0.4.0-fix-test-on-ports.patch 804 BLAKE2B a06a45c977ab55f086e707ad2ea113d93dedb2710fc1cf12fafc700702eb8be5812b73ea4b941355ec948d4659963e1bc7829df12a4da9ba7b80caa3d6ca20e7 SHA512 dd787c363a08810abec89f64b5aa0f77206a0963af1a0fcf5b91549528df875e83cf736cfc2d9eff63007c2d25d0ba71092368272bb5588525cf9af6300ea9a0
+AUX glog-0.4.0-fix-x32-build.patch 913 BLAKE2B fc7d4e452580b8ca073439782204da8d04fd36dfc6f06e19426d980127b505a68fc8044b62b04fee5a9b218167a2e119307ea4ec1915807ee6a3ebf89aea83a9 SHA512 2c0bd65824e0ed9923c328554a6dad25d9a02b776e465044a8197416a14da5d986ea9b9394e2da2e6981a1d4149ad67d22b753566177da8c13c0e481432f4e54
 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 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
+DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
+EBUILD glog-0.3.4-r1.ebuild 1204 BLAKE2B 9d42deb4393209103cfe12326f38ed5b43fb5ba7237716b92b011846686512ba83c6e703993dee40307ea6a66406467d90eaf199ac8d271c83ea775c0e2ded30 SHA512 184fb374d97f3b0ce68fd2eac0c39fc60e35b774f200eb38f91be810ccf7b4adc2bc2f33e3fc77949ed1134f32648dcdd52f49602976a9e80ea6edeb39e8f232
+EBUILD glog-0.3.5.ebuild 1211 BLAKE2B c76e952b0489c8bfc94312add2d7ba4bed10f88417113cad09584da561cc3bf64d19af57f56a586fc839f9df92704bf0fe0d65d629d2ccc3a8b434f21bdad42d SHA512 696272905be2648db792d8b74d43b6a36e2a5ba2b1848f301b78a45dc1e3c2921687fc748a7704ae23b7b8962c7ce9b50a81fdf37711f00dafa9ef10321cf1ca
+EBUILD glog-0.4.0.ebuild 1026 BLAKE2B fa3e86848379b11f6e5b150546eca725117e8f1aa831612c9ec8a04fbb6c77df47c78eefe570d8e19c4cb1831e87065adbbc81a9600f50a5146f340bd302309f SHA512 a5daf1580a22396713804053736893290fa0fc5784074719ebd1b4b1fd270253427f59e3e00120c33706a9142d8530b8bf67a7e815b6321628c9e605d1aa748c
 MISC metadata.xml 527 BLAKE2B a0ed7bafa31a61313d12431237947a4a1871df9bd13a6c95eee61d638d79a0ac5695a3fd4cdf22b696ccf632c1fa1d25c64b834649747fdd0b869cb2ba836b8d SHA512 37ba0ce628370098503c572a1af684a262872f4af72418ea7f8d3311fc46ce5a81940c762a1cc81ed779e2919b32d10d1c0eaaccb8025fdbb171f0e6c5300d53
diff --git a/dev-cpp/glog/files/glog-0.4.0-errnos.patch b/dev-cpp/glog/files/glog-0.4.0-errnos.patch
new file mode 100644
index 000000000000..c55716db1ba2
--- /dev/null
+++ b/dev-cpp/glog/files/glog-0.4.0-errnos.patch
@@ -0,0 +1,99 @@
+Index: b/src/googletest.h
+===================================================================
+--- a/src/googletest.h
++++ b/src/googletest.h
+@@ -437,6 +437,18 @@ static inline void StringReplace(string*
+   }
+ }
+ 
++static inline void IntReplace(string* str,
++                          const string& oldsub,
++                          int newsub) {
++  size_t pos = str->find(oldsub);
++  if (pos != string::npos) {
++    std::ostringstream ss;
++    ss << newsub;
++    const std::string x = ss.str();
++    str->replace(pos, oldsub.size(), x.c_str());
++  }
++}
++
+ static inline string Munge(const string& filename) {
+   FILE* fp = fopen(filename.c_str(), "rb");
+   CHECK(fp != NULL) << filename << ": couldn't open";
+@@ -452,9 +464,13 @@ static inline string Munge(const string&
+ 
+     StringReplace(&line, "__SUCCESS__", StrError(0));
+     StringReplace(&line, "__ENOENT__", StrError(ENOENT));
++    IntReplace(&line, "__ENOENT_NUM__", ENOENT);
+     StringReplace(&line, "__EINTR__", StrError(EINTR));
++    IntReplace(&line, "__EINTR_NUM__", EINTR);
+     StringReplace(&line, "__ENXIO__", StrError(ENXIO));
++    IntReplace(&line, "__ENXIO_NUM__", ENXIO);
+     StringReplace(&line, "__ENOEXEC__", StrError(ENOEXEC));
++    IntReplace(&line, "__ENOEXEC_NUM__", ENOEXEC);
+     result += line + "\n";
+   }
+   fclose(fp);
+Index: b/src/logging_unittest.cc
+===================================================================
+--- a/src/logging_unittest.cc
++++ b/src/logging_unittest.cc
+@@ -238,6 +238,17 @@ int main(int argc, char **argv) {
+   return 0;
+ }
+ 
++static int errnoForIteration(int i) {
++  switch (i) {
++    case 0: return 0;
++    case 2: return ENOENT;
++    case 4: return EINTR;
++    case 6: return ENXIO;
++    case 8: return ENOEXEC;
++  }
++  return -1;
++}
++
+ void TestLogging(bool check_counts) {
+   int64 base_num_infos   = LogMessage::num_messages(GLOG_INFO);
+   int64 base_num_warning = LogMessage::num_messages(GLOG_WARNING);
+@@ -246,7 +257,7 @@ void TestLogging(bool check_counts) {
+   LOG(INFO) << string("foo ") << "bar " << 10 << ' ' << 3.4;
+   for ( int i = 0; i < 10; ++i ) {
+     int old_errno = errno;
+-    errno = i;
++    errno = errnoForIteration(i);
+     PLOG_EVERY_N(ERROR, 2) << "Plog every 2, iteration " << COUNTER;
+     errno = old_errno;
+ 
+Index: b/src/logging_unittest.err
+===================================================================
+--- a/src/logging_unittest.err
++++ b/src/logging_unittest.err
+@@ -51,21 +51,21 @@ WDATE TIME__ THREADID logging_unittest.c
+ IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 1
+ EDATE TIME__ THREADID logging_unittest.cc:LINE] Log if less than 3 every 2, iteration 1
+ IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 2
+-EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 3: __ENOENT__ [2]
++EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 3: __ENOENT__ [__ENOENT_NUM__]
+ IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 3
+ EDATE TIME__ THREADID logging_unittest.cc:LINE] Log if less than 3 every 2, iteration 3
+ EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 3, iteration 4
+ IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 4
+-EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 5: __EINTR__ [4]
++EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 5: __EINTR__ [__EINTR_NUM__]
+ EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 4, iteration 5
+ IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 5
+ WDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 5, iteration 6
+ IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 6
+-EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 7: __ENXIO__ [6]
++EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 7: __ENXIO__ [__ENXIO_NUM__]
+ EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 3, iteration 7
+ IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 7
+ IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 8
+-EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 9: __ENOEXEC__ [8]
++EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 9: __ENOEXEC__ [__ENOEXEC_NUM__]
+ EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 4, iteration 9
+ IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 9
+ EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 3, iteration 10
+
diff --git a/dev-cpp/glog/files/glog-0.4.0-fix-test-on-ports.patch b/dev-cpp/glog/files/glog-0.4.0-fix-test-on-ports.patch
new file mode 100644
index 000000000000..392ae8ca7819
--- /dev/null
+++ b/dev-cpp/glog/files/glog-0.4.0-fix-test-on-ports.patch
@@ -0,0 +1,19 @@
+Index: google-glog-0.3.2/src/signalhandler_unittest.sh
+===================================================================
+--- google-glog-0.3.2.orig/src/signalhandler_unittest.sh	2013-03-13 13:49:37.820188111 -0400
++++ google-glog-0.3.2/src/signalhandler_unittest.sh	2013-03-13 14:07:11.980204520 -0400
+@@ -65,10 +65,10 @@
+   exit 0
+ fi
+ 
+-# The PC cannot be obtained in signal handlers on PowerPC correctly.
+-# We just skip the test for PowerPC.
+-if [ x`uname -p` = x"powerpc" ]; then
+-  echo "PASS (We don't test the signal handler on PowerPC.)"
++# This test only works correctly on i386 and amd64.
++# We just skip the test when not on those platforms.
++if [ x`uname -m` != x"x86_64" -a x`uname -m` != x"i686" ]; then
++  echo "PASS (We only test the signal handler on i386 or amd64.)"
+   exit 0
+ fi
+ 
diff --git a/dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch b/dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch
new file mode 100644
index 000000000000..e53318ac66ff
--- /dev/null
+++ b/dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch
@@ -0,0 +1,35 @@
+Description: fix FTBFS on x32
+Author: Guillaume Morin <guillaume@morinfr.org>
+Forwarded: no
+Last-Update: 2019-08-05
+
+---
+
+--- google-glog-0.3.4.orig/src/symbolize_unittest.cc
++++ google-glog-0.3.4/src/symbolize_unittest.cc
+@@ -313,8 +313,12 @@ extern "C" {
+ inline void* always_inline inline_func() {
+   void *pc = NULL;
+ #ifdef TEST_X86_32_AND_64
++#if __x86_64__ || (__x86_64__ && __ILP32__)
++  __asm__ __volatile__("call 1f; 1: popq %q0" : "=r"(pc));
++#else
+   __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc));
+ #endif
++#endif
+   return pc;
+ }
+ 
+@@ -322,8 +326,12 @@ void* ATTRIBUTE_NOINLINE non_inline_func
+ void* ATTRIBUTE_NOINLINE non_inline_func() {
+   void *pc = NULL;
+ #ifdef TEST_X86_32_AND_64
++#if __x86_64__ || (__x86_64__ && __ILP32__)
++  __asm__ __volatile__("call 1f; 1: popq %q0" : "=r"(pc));
++#else
+   __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc));
+ #endif
++#endif
+   return pc;
+ }
+ 
diff --git a/dev-cpp/glog/glog-0.3.3-r1.ebuild b/dev-cpp/glog/glog-0.3.3-r1.ebuild
deleted file mode 100644
index 667d65726491..000000000000
--- a/dev-cpp/glog/glog-0.3.3-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit eutils multilib-minimal
-
-DESCRIPTION="Google's C++ logging library"
-HOMEPAGE="https://github.com/google/glog"
-SRC_URI="https://google-glog.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
-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/gtest-1.8.0[${MULTILIB_USEDEP}] )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch
-	# Fix the --dodcdir flag:
-	# https://code.google.com/p/google-glog/issues/detail?id=193
-	sed -i \
-		-e '/^docdir =/s:=.*:= @docdir@:' \
-		Makefile.in || die
-}
-
-multilib_src_configure() {
-	use test || export ac_cv_prog_GTEST_CONFIG=no
-	ECONF_SOURCE=${S} \
-	ac_cv_lib_gflags_main=$(usex gflags) \
-	ac_cv_lib_unwind_backtrace=$(usex unwind) \
-	econf \
-		--docdir="\$(datarootdir)/doc/${PF}" \
-		--htmldir='$(docdir)/html' \
-		$(use_enable static-libs static)
-}
-
-_emake() {
-	# The tests always get built ... disable them when unused.
-	emake $(usex test '' noinst_PROGRAMS=) "$@"
-}
-
-multilib_src_compile() {
-	_emake
-}
-
-multilib_src_install() {
-	_emake install DESTDIR="${D}"
-}
-
-multilib_src_install_all() {
-	# Punt docs we don't care about (NEWS is 0 bytes).
-	rm "${ED}"/usr/share/doc/${PF}/{COPYING,NEWS,README.windows} || die
-
-	# --htmldir doesn't work (yet):
-	# https://code.google.com/p/google-glog/issues/detail?id=144
-	dohtml "${ED}"/usr/share/doc/${PF}/*
-	rm "${ED}"/usr/share/doc/${PF}/*.{html,css}
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-cpp/glog/glog-0.3.4-r1.ebuild b/dev-cpp/glog/glog-0.3.4-r1.ebuild
index ad7b6587ddb3..29ab1c3229e0 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,8 +11,9 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gflags static-libs test unwind"
+RESTRICT="test"
 
 RDEPEND="
 	gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] )
diff --git a/dev-cpp/glog/glog-0.3.4.ebuild b/dev-cpp/glog/glog-0.3.4.ebuild
deleted file mode 100644
index a6b6ee4e3fb4..000000000000
--- a/dev-cpp/glog/glog-0.3.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="Google's C++ logging library"
-HOMEPAGE="https://github.com/google/glog"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-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/gtest-1.8.0[${MULTILIB_USEDEP}] )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch
-	# Fix the --dodcdir flag:
-	# https://code.google.com/p/google-glog/issues/detail?id=193
-	sed -i \
-		-e '/^docdir =/s:=.*:= @docdir@:' \
-		Makefile.in || die
-}
-
-multilib_src_configure() {
-	use test || export ac_cv_prog_GTEST_CONFIG=no
-	ECONF_SOURCE=${S} \
-	ac_cv_lib_gflags_main=$(usex gflags) \
-	ac_cv_lib_unwind_backtrace=$(usex unwind) \
-	econf \
-		--docdir="\$(datarootdir)/doc/${PF}" \
-		--htmldir='$(docdir)/html' \
-		$(use_enable static-libs static)
-}
-
-_emake() {
-	# The tests always get built ... disable them when unused.
-	emake $(usex test '' noinst_PROGRAMS=) "$@"
-}
-
-multilib_src_compile() {
-	_emake
-}
-
-multilib_src_install() {
-	_emake install DESTDIR="${D}"
-}
-
-multilib_src_install_all() {
-	# Punt docs we don't care about (NEWS is 0 bytes).
-	rm "${ED}"/usr/share/doc/${PF}/{COPYING,NEWS,README.windows} || die
-
-	# --htmldir doesn't work (yet):
-	# https://code.google.com/p/google-glog/issues/detail?id=144
-	dohtml "${ED}"/usr/share/doc/${PF}/*
-	rm "${ED}"/usr/share/doc/${PF}/*.{html,css}
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-cpp/glog/glog-0.3.5.ebuild b/dev-cpp/glog/glog-0.3.5.ebuild
index 1f4064c66394..945371f45537 100644
--- a/dev-cpp/glog/glog-0.3.5.ebuild
+++ b/dev-cpp/glog/glog-0.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="gflags static-libs test unwind"
+RESTRICT="test"
 
 RDEPEND="
 	gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] )
diff --git a/dev-cpp/glog/glog-0.4.0.ebuild b/dev-cpp/glog/glog-0.4.0.ebuild
new file mode 100644
index 000000000000..c5097b33e782
--- /dev/null
+++ b/dev-cpp/glog/glog-0.4.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Google's C++ logging library"
+HOMEPAGE="https://github.com/google/glog"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs test"
+RESTRICT="test"
+
+RDEPENDS="sys-libs/libunwind[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.0-fix-x32-build.patch
+	"${FILESDIR}"/${PN}-0.4.0-errnos.patch
+	"${FILESDIR}"/${PN}-0.4.0-fix-test-on-ports.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index c90fcdbbd75d..0554b1344220 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -15,6 +15,6 @@ EBUILD gtest-1.8.0-r1.ebuild 1670 BLAKE2B bd45cb2ffe973a6a856e858b5087177dc4d6d5
 EBUILD gtest-1.8.0.ebuild 1633 BLAKE2B 7d3c582e4b941c9990ba6a3cc56ae3e7305e89ecf86b8ddbecffa901047afd2783ec98db90cec9fc3f2d53349faaa992db4f3699a07529adc8f1f9319a2def68 SHA512 7335e0f5a0783c242468ab0fc8741dff517d72eb3523518aa5276483096fedce221c8f9f0933692410525ed9a24d709545e89ab8a8d6c9d8e55d8478322fd82e
 EBUILD gtest-1.8.1-r1.ebuild 1662 BLAKE2B 824a4ac0704705b3685c6f6b3b334b191537991454c68876443057fea0c2c74ad546f11b6214627994caa3a6c8cc10b2bb1139a559175bd2deb903697eda27be SHA512 ce9bf485877cbfdff5ce449af52e2939807205ec5c7348a0f56938796ae84d1778807c33300ab6d61c1babedea3095954398d12d44233065c853babd733c8bdb
 EBUILD gtest-1.8.1.ebuild 1686 BLAKE2B 7c6053a0f3d8d5f97199dd8a36b14739bc3db47a103ef5476bf46924c984e6e60745c073bd3fdf75d5a45ddcbacb226dafbc9dad2f373d13322a643a2238253b SHA512 edeb30abe53c77ec4797d9a15188b988c1981a2ceba3779c3014685c6c4a03e760f117b92264117562b504694aacfb3a9c42a9c934ae3c6c0f503edeafa7e510
-EBUILD gtest-1.9.0_pre20190607.ebuild 1759 BLAKE2B 3faa4d0cc5d303d310b092fcbdc68a30ba2533178433f5945889746b229aca4131dbaa97b5d42a777bede91c88d5f179f5936eca182158415eaa2975fa638835 SHA512 9f9a6e20d40ab835d20e2bb3a0086ab3520c9ebddaf4b6b41e9b414dd1a9cd00a14771112562ddddf0f30fef73d0a6e034f77d966d63a579b4c4488964dd6c89
+EBUILD gtest-1.9.0_pre20190607.ebuild 1753 BLAKE2B 5512cc85a06eaa11835f64dbb1cdccf090626c271e3c85390d425c13afd54d7d5b4fdbfbbc3b435157330f2f1dd57d7ba9f8f85046e364a273f7f01d3bbc18c7 SHA512 e462cfb849e05c8105a8e8b9048d7a2154823238dd9f1bd19d788bd740bedb0ef78b0bce6e670f9608128103fa7c9b4a4bd03ebd73229fa56ed6ab079b3e7186
 EBUILD gtest-9999.ebuild 1699 BLAKE2B 3eaff17f8bbaed2cd99966f2d445ed75faafabbd504bb9bac4c7e7b431d16b721cf1371d8006a373c61fdf29778e867a4f389be2f2155f70c3fc68f224287808 SHA512 de76a42373a1fd0a70c6a3b2d05dec3d681f7c10e03ab979c3e109b51f9a9ba2bbf126835877cf5086d2e078f0515fd25c84ff3e861cfb0f71f7a403d0bc20da
 MISC metadata.xml 535 BLAKE2B 892f380ec413ae33de5821d911bf34fc9e3d0e76cdc833a38c66ed85dece1f6efeec56d8f78c655c9a083e7152f1d24c018184d1e679612de43690665d2c0518 SHA512 68daeade4eb4fec4a42ec039ff000a025c48708f2aed23ebf4495b653567611342893ce79d6163d5276638af9e9915abc2cc6c2d6d07db2e86681e4049b77f81
diff --git a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
index 9fc545d7fd83..be0b3f49f666 100644
--- a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
+++ b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
@@ -20,7 +20,7 @@ else
 		MY_PV=${GOOGLETEST_COMMIT}
 	fi
 	SRC_URI="https://github.com/google/googletest/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}"/googletest-${MY_PV}
 fi
 
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 324478a9b56f..247c75d1f41f 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -3,14 +3,10 @@ AUX tbb-4.0.297-underlinking.patch 479 BLAKE2B c4e0410c4651bb7db99494c6746eb43cd
 AUX tbb-4.3.20150611-build.patch 4806 BLAKE2B dd5f785a8c3d6d715c1573a14aaa3dda1216dc4c4a124b24b217e4e919675f2eb64488f8423acf3bd5d568d30bd011c8d107db0b5de2774e7439561da947f758 SHA512 82c8121e2214a02f0bbf647eb03486e5c7db3e180f834001c5ad7ac53791e876ddd63bef1af6ba2590d9673af6beb6b725138bbad8c3b61271b29b7eb72f41c0
 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 tbb-2019.8.tar.gz 2580540 BLAKE2B 1cddb0c8ade6f6363811b7f9b323a2bb7739a18114acd56e1b4a13f33904ddff8cb6aec9b4b0add995cd307ff7815f0b55ce33fa64b7dd92c0062fbaa13d0833 SHA512 924a8dde011452a2c46c5152942a9835e76fe5610e08b69eb0e985de3fb46bdb49f0f628d10fa7704428f6e61ec63f7002da5399d47da6ee6004fa236d346dc8
 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 3333 BLAKE2B d3e32b2301f40af1e7b4476561a4dc4503b707327fa95caab7e68f031edd916dba23a8aec6f3b1fd357a62b3b9497c6f283c273b8436541a706f6a598464f05b SHA512 217f88d3fe819e1d04cb56826b6a9a3318b705a8612a5511f038dc0e350a370d9b4be7bafaa1e67725e23a035637a12f75598988e774668a53a67bd32dbab791
-EBUILD tbb-2017.20170226.ebuild 3334 BLAKE2B f97e0e3e14e046584402a8d9fd57c7bb096c90a45e4e98f3e6707c9da1606e9e35fe02f9edfae1b8a10e865ef1c58ffb04200f69288b0ca6ce69209980a8380b SHA512 2c5a763a58b62fba4b747f545569687ef933dc6621e9592277f9372079f1250cea5a36a479ba344652c5538caf19d0f0b9433fd0c62498eef612a199dda5d6d9
 EBUILD tbb-2018.20180312.ebuild 3334 BLAKE2B 5374ec095170838a99b8ed31b4611e4952433a74c6849788b22355e6b3aff817768422a16454a2d946991256a2da943f121b64aca91027d1350d0c332716968a SHA512 b2f132cb7ddf47207c41cb636fd3b174e49227a1d17dd9098774e447f36571b16161a582e958da6bab4f4d8f4b75c20a8ae0f294d684793b4a630e69fce144c4
-EBUILD tbb-4.3.20150611.ebuild 3142 BLAKE2B 638aad3506c71cd234972b5e1eb49a28e9240cdf63a7bac7f1131c84ab8188c95dbe24aa57df36d5dcb365817baf72a7b5092eb51610d055f1ea1eef8573cdfe SHA512 e78b598c1560212db0bb4f5c4c2962f1e42efcad30f1c90af05327c3d6dfd53781c8efd2237bf3012349a9d550d3f28399bbb548d341d6dd8a9a2b9f670c2c1c
-EBUILD tbb-4.4.20160803.ebuild 3389 BLAKE2B ca12e1447cd2c6c680bc47ed590a4fa3a35c48447cb2a41ead76746f2a68ded582c481ab44be084b81a5d6e880b57d57c5c5847090b401d7277818f6cf91beb9 SHA512 913335b0777eb11ff6038bf63088e45cf15947ed84a7651504c1e364ec2eb1bee631a46f95f0c94a0a46aedc8a5a329d242914b2ba118e3d877268f1b195e0a6
-MISC metadata.xml 687 BLAKE2B c094e0e1a7f9939540292663dceefcacf0468b91563cf051ce487edbdf27b7c07392102fedf6df18aa2852465eb1e6b6f72bbe93c0ca1669c1fba2bbc5840c48 SHA512 bfdebc9e52c9c46424854b519e8ff60f7b473e33189235a50e1110af1f8264c2ad2b4f71110be1147387491fc078ec6c9e451347b47f69d0f2b15e60ad2e9a0b
+EBUILD tbb-2019.8.ebuild 3237 BLAKE2B 3b42204dd4dd1285c4a97e97509bf19adbca1f4cb83615a2e6a35f6d67e5907f94ac36a19b3157470e39bbee8028abdd0d5152a7b1bbfa4501b35b8036884833 SHA512 0a1c30af9bec420aad49e4bc11541b1fb52fa485febeefff73f688b534f93a4e92f9035147c5e9b443caeef6f266dfc05c3a5ac41cdc08c7b178c479a320ac9a
+MISC metadata.xml 687 BLAKE2B 34a74bdff790f94b7e32c295833aa986d0d72fc646af900be059d2c5cb55d91af0cf255ad76f0250edd6f6464227c28f19b412243c5f45cc2d3b34a95d5b87d8 SHA512 3db464f32be8e3d79b189da232ab3ce4f8e8694fd1044149b7fc608deb60742886ced2be6bac924bbcd9695cd88747d47297d55f180d87d3340cc589b1bc7f13
diff --git a/dev-cpp/tbb/metadata.xml b/dev-cpp/tbb/metadata.xml
index 1d44ed7098fc..1e4e905a8844 100644
--- a/dev-cpp/tbb/metadata.xml
+++ b/dev-cpp/tbb/metadata.xml
@@ -13,6 +13,6 @@
   for performance and scalability.
   </longdescription>
   <upstream>
-    <remote-id type="github">01org/tbb</remote-id>
+    <remote-id type="github">intel/tbb</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-cpp/tbb/tbb-2017.20170226.ebuild b/dev-cpp/tbb/tbb-2019.8.ebuild
index 34be8b2f6e90..fd77782aba4e 100644
--- a/dev-cpp/tbb/tbb-2017.20170226.ebuild
+++ b/dev-cpp/tbb/tbb-2019.8.ebuild
@@ -1,30 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic multilib-minimal multilib toolchain-funcs versionator
+inherit eutils flag-o-matic multilib-minimal multilib toolchain-funcs
 
-PV1="$(get_version_component_range 1)"
-PV2=5
+PV1="$(ver_cut 1)"
+PV2="$(ver_cut 2)"
 MY_PV="${PV1}_U${PV2}"
 
 DESCRIPTION="High level abstract threading library"
 HOMEPAGE="https://www.threadingbuildingblocks.org"
-SRC_URI="https://github.com/01org/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/intel/${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"
+IUSE="debug examples"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.20160803-underlinking.patch
-	"${FILESDIR}"/${PN}-2017.20161128-build.patch
-)
+DOCS=( CHANGES README README.md doc/Release_Notes.txt )
 
 src_prepare() {
 	default
@@ -132,13 +129,13 @@ multilib_src_install() {
 multilib_src_install_all() {
 	doheader -r include/*
 
-	dodoc README CHANGES doc/Release_Notes.txt
-	use doc && dohtml -r doc/html/*
+	einstalldocs
 
 	if use examples ; then
 		insinto /usr/share/doc/${PF}/examples/build
 		doins build/*.inc
 		insinto /usr/share/doc/${PF}/examples
 		doins -r examples
+		docompress -x "/usr/share/doc/${PF}/examples"
 	fi
 }
diff --git a/dev-cpp/tbb/tbb-4.3.20150611.ebuild b/dev-cpp/tbb/tbb-4.3.20150611.ebuild
deleted file mode 100644
index d5efb48803d2..000000000000
--- a/dev-cpp/tbb/tbb-4.3.20150611.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib-minimal toolchain-funcs versionator
-
-PV1="$(get_version_component_range 1)"
-PV2="$(get_version_component_range 2)"
-PV3="$(get_version_component_range 3)"
-MYP="${PN}${PV1}${PV2}_${PV3}oss"
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="https://www.threadingbuildingblocks.org"
-SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz"
-LICENSE="GPL-2-with-exceptions"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug doc examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.0.297-underlinking.patch \
-		"${FILESDIR}"/${P}-build.patch
-
-	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 ;;
-	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() {
-	cd "${BUILD_DIR}_release" || die
-	local l
-	for l in $(find . -name lib\*.so.\*); do
-		dolib.so ${l}
-		local bl=$(basename ${l})
-		dosym ${bl} /usr/$(get_libdir)/${bl%.*}
-	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/tbb/tbb-4.4.20160803.ebuild b/dev-cpp/tbb/tbb-4.4.20160803.ebuild
deleted file mode 100644
index d1d21c561ce0..000000000000
--- a/dev-cpp/tbb/tbb-4.4.20160803.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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 toolchain-funcs versionator
-
-PV1="$(get_version_component_range 1)"
-PV2="$(get_version_component_range 2)"
-PV3="$(get_version_component_range 3)"
-MYP="${PN}${PV1}${PV2}_${PV3}oss"
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="https://www.threadingbuildingblocks.org"
-SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz"
-LICENSE="GPL-2-with-exceptions"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug doc examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.20160803-underlinking.patch
-	"${FILESDIR}"/${PN}-4.4.20160803-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\*.so.\*); do
-			dolib.so ${l}
-			local bl=$(basename ${l})
-			dosym ${bl} /usr/$(get_libdir)/${bl%.*}
-		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/websocketpp/Manifest b/dev-cpp/websocketpp/Manifest
index 460f4acb489c..0c9f7d7517e2 100644
--- a/dev-cpp/websocketpp/Manifest
+++ b/dev-cpp/websocketpp/Manifest
@@ -1,4 +1,6 @@
 AUX websocketpp-0.7.0-cmake-install.patch 970 BLAKE2B 2099c37b65d3f685f8b9745d92b481bb6a0434e6305e974c6f613ae44e70e1fa9d7bd577f875ef12228e506361409666099ce024578c5c524cc8fc5fbdef4b70 SHA512 c8b34b80890d8dc828d64e391e9541f7ebd6a18c79d3a5b91c72835745a11bafff110d04e8d75a2df2dba8b65ca1856050009a4eab3871cc2470066f9ad82f44
+AUX websocketpp-0.8.1-boost-1.70.patch 5976 BLAKE2B f3bccde47637c8938b1a0acf95d855692256434be130fafc34311bbbb337c655022b77a301f4524029dc2841e2a47d9975f7fbed3ed004b9bd1ba65d87c6bf30 SHA512 34df3fc78415e0fac8d73a2afb2faa2e1e2bfd6e2ae6458e48a89354dfaeb7f3a8d95c5e5e0ffa2f8d096508e5a9636184b403def95501d027f2c68f5e096052
+AUX websocketpp-0.8.1-disable-test_transport-test_transport_asio_timers.patch 1227 BLAKE2B 26ac496842e4e23d254ba908679399ff8907253434430c887290cbd3b3beb14aaf69834cfc0b8f326f13c0f63ec7da535f0c8b438d20d7c1d2d4b5d5d2afb5cc SHA512 1ef7f2b71dcbeb386cd27bbf97f599f0c056b014423090ceb28e336c0f1527c6f8d6b04931144823c1d1deb14781508a0a6e869f69a9a232978851634f35fa0c
 DIST websocketpp-0.8.1.tar.gz 699468 BLAKE2B e5769229b400d2f42e69541b07cfba17dcc82cdad20685a52ac1130c2fc4e94764a38d2e4f7c36101b11705e10c67eb149ba2c30750e7a6f63696d52c272fed2 SHA512 35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c
-EBUILD websocketpp-0.8.1.ebuild 797 BLAKE2B e5df1ba0fea119712fa276409913d80c36414ff7a00614c5dff2f9339adebd5c7e447198851d22ce70d5c1d2053b034462f436f597d3b36868bbb0b8b5015132 SHA512 a9db3a6d6beee0a93c4ad6fda92f73729b1f861da7f3b1573d9ea327407f01217c2ab377a0566ed6c21fe24fc56ad5228663d540b123608850926f03f8cdc130
-MISC metadata.xml 419 BLAKE2B 11f113ce200752e1982b6f246f267e8029901c9dd6fa4dcdb131a28f62c3041792dc25b0ff449b20f755d9e9e9f1f4cfa23077f7648d8bfd17619b1887f44316 SHA512 92d8c85006a8857390b3bb83a9fcaa6e8a74a68eadc63018f6e70e2d4259332caaf549611a69baf44689557f05f1f7f7824d24bb9a5b582913b6580cc21608c0
+EBUILD websocketpp-0.8.1-r1.ebuild 1058 BLAKE2B 1347e3d7bd8e6597633ed8f85e9e2a967857ae41b95fdf0ecb4097754c37d80cb6a02f132871900c02066e5eab98f6ff5e0f3629fd2d6a024b536ec491c5212c SHA512 32d9ca46e3821c3beb458d02f3d67e96e8ddea061389e2b191c02b83faa9066aa09ad619ac3a9dfe2b49ae3a42568e9a5f3cacaae49dd5ab7503324af9f63259
+MISC metadata.xml 329 BLAKE2B bec1c49134f4f6cfd9c8487c0e607d609ed376853bd4022c3dbbee3f3932fb1925af6ec89c9ced2bafba9e3c2db67d3659e12e072e831ea0d3c95c5ae4ae621d SHA512 1cf8076fec3d5f414bc22c1eb74a1ebdb1f5c1711fd0b103c9da5cc8fc8f8fa30367c737d4b97bf22419cda1e327858817ef4b7109d703264ff6df3dd30a843c
diff --git a/dev-cpp/websocketpp/files/websocketpp-0.8.1-boost-1.70.patch b/dev-cpp/websocketpp/files/websocketpp-0.8.1-boost-1.70.patch
new file mode 100644
index 000000000000..40ae155307d2
--- /dev/null
+++ b/dev-cpp/websocketpp/files/websocketpp-0.8.1-boost-1.70.patch
@@ -0,0 +1,139 @@
+From c769c9238ad62178f506038178714a1c35aa2769 Mon Sep 17 00:00:00 2001
+From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com>
+Date: Tue, 16 Apr 2019 08:38:01 +0200
+Subject: [PATCH 1/2] Replace make_shared with new in some cases
+
+Replace make_shared for asio types that take a lib::ref as a parameter.
+This should fix the ASIO change (boostorg/asio@59066d8) for 1.70,
+while keeping it backwards compatible to older boost versions.
+---
+ websocketpp/transport/asio/connection.hpp    | 7 ++++---
+ websocketpp/transport/asio/endpoint.hpp      | 3 +--
+ websocketpp/transport/asio/security/none.hpp | 3 +--
+ websocketpp/transport/asio/security/tls.hpp  | 3 +--
+ 4 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp
+index 60f88a79..1ccda8f3 100644
+--- a/websocketpp/transport/asio/connection.hpp
++++ b/websocketpp/transport/asio/connection.hpp
+@@ -311,9 +311,10 @@ class connection : public config::socket_type::socket_con_type {
+      * needed.
+      */
+     timer_ptr set_timer(long duration, timer_handler callback) {
+-        timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
+-            lib::ref(*m_io_service),
+-            lib::asio::milliseconds(duration)
++        timer_ptr new_timer(
++            new lib::asio::steady_timer(
++                *m_io_service,
++                lib::asio::milliseconds(duration))
+         );
+ 
+         if (config::enable_multithreading) {
+diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp
+index ddab2c74..4b719a97 100644
+--- a/websocketpp/transport/asio/endpoint.hpp
++++ b/websocketpp/transport/asio/endpoint.hpp
+@@ -195,8 +195,7 @@ class endpoint : public config::socket_type {
+ 
+         m_io_service = ptr;
+         m_external_io_service = true;
+-        m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>(
+-            lib::ref(*m_io_service));
++        m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service));
+ 
+         m_state = READY;
+         ec = lib::error_code();
+diff --git a/websocketpp/transport/asio/security/none.hpp b/websocketpp/transport/asio/security/none.hpp
+index 5c8293db..6c7d3524 100644
+--- a/websocketpp/transport/asio/security/none.hpp
++++ b/websocketpp/transport/asio/security/none.hpp
+@@ -168,8 +168,7 @@ class connection : public lib::enable_shared_from_this<connection> {
+             return socket::make_error_code(socket::error::invalid_state);
+         }
+ 
+-        m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
+-            lib::ref(*service));
++        m_socket.reset(new lib::asio::ip::tcp::socket(*service));
+ 
+         if (m_socket_init_handler) {
+             m_socket_init_handler(m_hdl, *m_socket);
+diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp
+index c76fd9aa..04ac3790 100644
+--- a/websocketpp/transport/asio/security/tls.hpp
++++ b/websocketpp/transport/asio/security/tls.hpp
+@@ -193,8 +193,7 @@ class connection : public lib::enable_shared_from_this<connection> {
+         if (!m_context) {
+             return socket::make_error_code(socket::error::invalid_tls_context);
+         }
+-        m_socket = lib::make_shared<socket_type>(
+-            _WEBSOCKETPP_REF(*service),lib::ref(*m_context));
++        m_socket.reset(new socket_type(*service, *m_context));
+ 
+         if (m_socket_init_handler) {
+             m_socket_init_handler(m_hdl, get_socket());
+
+From f810ca2e800e9b55be41c5911cf1d1185fcd516b Mon Sep 17 00:00:00 2001
+From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com>
+Date: Wed, 17 Apr 2019 10:06:18 +0000
+Subject: [PATCH 2/2] Fix missed entries; fix testing
+
+---
+ CMakeLists.txt                            | 2 +-
+ websocketpp/transport/asio/connection.hpp | 3 +--
+ websocketpp/transport/asio/endpoint.hpp   | 7 ++-----
+ 3 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2786aba9..951de975 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -202,7 +202,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
+ 	endif ()
+ 
+     if (NOT Boost_USE_STATIC_LIBS)
+-        add_definitions (/DBOOST_TEST_DYN_LINK)
++        add_definitions (-DBOOST_TEST_DYN_LINK)
+     endif ()
+ 
+     set (Boost_FIND_REQUIRED TRUE)
+diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp
+index 1ccda8f3..57dda74a 100644
+--- a/websocketpp/transport/asio/connection.hpp
++++ b/websocketpp/transport/asio/connection.hpp
+@@ -462,8 +462,7 @@ class connection : public config::socket_type::socket_con_type {
+         m_io_service = io_service;
+ 
+         if (config::enable_multithreading) {
+-            m_strand = lib::make_shared<lib::asio::io_service::strand>(
+-                lib::ref(*io_service));
++            m_strand.reset(new lib::asio::io_service::strand(*io_service));
+         }
+ 
+         lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
+diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp
+index 4b719a97..94509adb 100644
+--- a/websocketpp/transport/asio/endpoint.hpp
++++ b/websocketpp/transport/asio/endpoint.hpp
+@@ -687,9 +687,7 @@ class endpoint : public config::socket_type {
+      * @since 0.3.0
+      */
+     void start_perpetual() {
+-        m_work = lib::make_shared<lib::asio::io_service::work>(
+-            lib::ref(*m_io_service)
+-        );
++        m_work.reset(new lib::asio::io_service::work(*m_io_service));
+     }
+ 
+     /// Clears the endpoint's perpetual flag, allowing it to exit when empty
+@@ -853,8 +851,7 @@ class endpoint : public config::socket_type {
+ 
+         // Create a resolver
+         if (!m_resolver) {
+-            m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(
+-                lib::ref(*m_io_service));
++            m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service));
+         }
+ 
+         tcon->set_uri(u);
diff --git a/dev-cpp/websocketpp/files/websocketpp-0.8.1-disable-test_transport-test_transport_asio_timers.patch b/dev-cpp/websocketpp/files/websocketpp-0.8.1-disable-test_transport-test_transport_asio_timers.patch
new file mode 100644
index 000000000000..8d6c93fcec30
--- /dev/null
+++ b/dev-cpp/websocketpp/files/websocketpp-0.8.1-disable-test_transport-test_transport_asio_timers.patch
@@ -0,0 +1,46 @@
+--- a/test/transport/CMakeLists.txt
++++ b/test/transport/CMakeLists.txt
+@@ -1,24 +1,24 @@
+ if (OPENSSL_FOUND)
+ 
+-# Test transport integration
+-file (GLOB SOURCE integration.cpp)
+-
+-init_target (test_transport)
+-build_test (${TARGET_NAME} ${SOURCE})
+-link_boost ()
+-link_openssl()
+-final_target ()
+-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+-
+-# Test transport asio timers
+-file (GLOB SOURCE asio/timers.cpp)
+-
+-init_target (test_transport_asio_timers)
+-build_test (${TARGET_NAME} ${SOURCE})
+-link_boost ()
+-link_openssl()
+-final_target ()
+-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
++## Test transport integration
++#file (GLOB SOURCE integration.cpp)
++#
++#init_target (test_transport)
++#build_test (${TARGET_NAME} ${SOURCE})
++#link_boost ()
++#link_openssl()
++#final_target ()
++#set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
++#
++## Test transport asio timers
++#file (GLOB SOURCE asio/timers.cpp)
++#
++#init_target (test_transport_asio_timers)
++#build_test (${TARGET_NAME} ${SOURCE})
++#link_boost ()
++#link_openssl()
++#final_target ()
++#set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+ 
+ # Test transport asio security
+ file (GLOB SOURCE asio/security.cpp)
diff --git a/dev-cpp/websocketpp/metadata.xml b/dev-cpp/websocketpp/metadata.xml
index 66fe497e1c38..d930eea34f05 100644
--- a/dev-cpp/websocketpp/metadata.xml
+++ b/dev-cpp/websocketpp/metadata.xml
@@ -5,9 +5,6 @@
 		<email>johu@gentoo.org</email>
 		<name>Johannes Huber</name>
 	</maintainer>
-	<use>
-		<flag name="boost">Use <pkg>dev-libs/boost</pkg> instead of C++11</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">zaphoyd/websocketpp</remote-id>
 	</upstream>
diff --git a/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild b/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..4578afc07baa
--- /dev/null
+++ b/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="C++/Boost Asio based websocket client/server library"
+HOMEPAGE="https://www.zaphoyd.com/websocketpp"
+SRC_URI="https://github.com/zaphoyd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/boost )"
+RDEPEND="dev-libs/boost"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.0-cmake-install.patch
+	"${FILESDIR}"/${PN}-0.8.1-boost-1.70.patch
+	# disable tests that are timing sensitive
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1461069
+	"${FILESDIR}"/${PN}-0.8.1-disable-test_transport-test_transport_asio_timers.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CPP11=ON
+		-DBUILD_TESTS="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-cpp/websocketpp/websocketpp-0.8.1.ebuild b/dev-cpp/websocketpp/websocketpp-0.8.1.ebuild
deleted file mode 100644
index 6bf27e854c14..000000000000
--- a/dev-cpp/websocketpp/websocketpp-0.8.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="C++/Boost Asio based websocket client/server library"
-HOMEPAGE="https://www.zaphoyd.com/websocketpp"
-SRC_URI="https://github.com/zaphoyd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-LICENSE="BSD"
-SLOT="0"
-IUSE="boost examples test"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	boost? ( dev-libs/boost )
-"
-
-# bug 630450
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-0.7.0-cmake-install.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CPP11="$(usex !boost)"
-		-DBUILD_TESTS="$(usex test)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use examples && DOCS=( examples/ )
-	cmake-utils_src_install
-}