gentoo resync : 15.12.2019

52 files changed, 134 insertions, 92 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index db65fbcf3fbc..89794fa042af 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index ef240069f298..7dc7e506117b 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -2,8 +2,8 @@ DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd
 DIST asio-1.12.2.tar.bz2 1437221 BLAKE2B c4479b66cff7811aa7b7dbe65684d2a11fb675df53e9554c2871fd4e3a8e32d262ae701e98198d508f89463da48d4509f12e8db87d033a91d55e00609207a351 SHA512 7ce2c9e846059a2205eca6bde285eab81164fbe087d51d35a33a07be6208049fcf07fc1ac33934a758b6b5907e56f3377e20bff10ffc9268376f81c6fae4e34a
 DIST asio-1.13.0.tar.bz2 1472744 BLAKE2B 1fde414bfc782f25f8ad7d7caf9ac8971bea22ebd3b74846584a242d7df164895759b74777b2330aa98d34c5b8c34f266a2f85fcc27413990cc05420f7685398 SHA512 30b09c6656c9beaf091e72d518930bb5650f4bf66b286d11457a949a690a2b9ddcad0c95cb2098b41a2226f354741755ffbc92098f2844f3253e1921ff60cd5b
 DIST asio-1.14.0.tar.bz2 1473195 BLAKE2B e28960d585a1a84c6be7d6205be310bd2baab36e93630b9f5f4fba593377e57d6baf1c60e2503c46cd00ae73b20b622215358cae2068e86b62dac7e782210ecb SHA512 84855a06a3facc41e3c1c61be443d8b73a01afcb9bc3f1f444f0f3fd901ea1d5c932266ed94a031a0abd83171d5a6b83b6ab850e44aa31d175081a7e07b4793a
-EBUILD asio-1.10.8.ebuild 895 BLAKE2B 6f3de4ae224765cd3af5863fabb60f22a9ee060839c64cf6c2269f1cad57229914da5351cf90750522faa99fb362021ccc76fb8ea293859aef3e7465081df761 SHA512 648aa85f02271260fdc7c1ba7d6093c5dba3a172e4585d7d8f8e70dedc111d2bbd57093ebb3e8fc2a85008e5981b17a1861e356efd6102689bdc17f015e75e5a
-EBUILD asio-1.12.2.ebuild 958 BLAKE2B fb6ce9c6ef49a612ea07b54ba90cded71442ff09c0093424ff22a7d5a2f7660c32c4d4f104c00908b69c5775fd6f6b041d51cb6d1d03c3f3bc989b0b74c964bd SHA512 84cbfa3082d7931f631f4cf056669e1676c59c7e36090dca77adae9c164e2660da8f9f2e32e1f63e341cdce1f9f4cea8e1028621540c3b4ddbd5a900e02348ac
-EBUILD asio-1.13.0.ebuild 958 BLAKE2B fb6ce9c6ef49a612ea07b54ba90cded71442ff09c0093424ff22a7d5a2f7660c32c4d4f104c00908b69c5775fd6f6b041d51cb6d1d03c3f3bc989b0b74c964bd SHA512 84cbfa3082d7931f631f4cf056669e1676c59c7e36090dca77adae9c164e2660da8f9f2e32e1f63e341cdce1f9f4cea8e1028621540c3b4ddbd5a900e02348ac
-EBUILD asio-1.14.0.ebuild 952 BLAKE2B adf5074507cb470454f1dc1c1050eef85145a93b6721b6af532b3784e180c47c44c7fb61bbfbd7d46d6aa92ae7a0e949b7d04f5b3d99e6bcb7585c2a6a2d5342 SHA512 5d6c7e597e17b5dd31c3a81f5ae93fd4ef5c3f5d9348c4626c08e03c669cec12647efef1bd0193f91b5101d8310d05c3c8a85fbe0e31c0df9ab8394c4bca6fee
+EBUILD asio-1.10.8.ebuild 919 BLAKE2B e6f399eb07b0d429ee71644894eadc73697bb06880bd3123719698d56349badb99234c827db4a0c36fc9b4aa730dd7fabedac8470489f39b4aef9fb9900c46f2 SHA512 108e0788e9270fbc011dfc707048df15d580df6f7fd01dbf7f7cd142d3e33cf86227c9b29d7428b769d18aa88f976b866dc30cd3ef18ef4afc5b3a80e4b19302
+EBUILD asio-1.12.2.ebuild 985 BLAKE2B 4e7654ea993a07accba9dc4a180c704a4f8a9e45508627ddbb3192f5b5393961c76069d55e790c87d1ab59779d8da8a944c3ce067b1bc7de5f87e542240beceb SHA512 9e0fa2f4f7901efd5bdc16f8ac003c2f07182d1742de352c91877d45766f778119864bc4c2074fec3afbf48bd0fe568995a11a2cee8f5b240a7b8db973aff5c3
+EBUILD asio-1.13.0.ebuild 985 BLAKE2B 4e7654ea993a07accba9dc4a180c704a4f8a9e45508627ddbb3192f5b5393961c76069d55e790c87d1ab59779d8da8a944c3ce067b1bc7de5f87e542240beceb SHA512 9e0fa2f4f7901efd5bdc16f8ac003c2f07182d1742de352c91877d45766f778119864bc4c2074fec3afbf48bd0fe568995a11a2cee8f5b240a7b8db973aff5c3
+EBUILD asio-1.14.0.ebuild 978 BLAKE2B dce6ca527b7de8c935303ae5d7b585759951e72bcc98bef4d6db673dcb4aca59238c66a80ab79d8633ebbe563c8a77f050705978352b3112805ae5ef47bef07b SHA512 fec24acc065adc0098a0d4a2f06376578e4c141211d683f99adc7b319c07c06cdff9176718e8735233e101dddf94b9c5eec9bf885ad6d6cbff76ab59b436f7b1
 MISC metadata.xml 321 BLAKE2B e14808aaf0f0d648b8de65363250523777e9e4ae52a47f840af9c22321ea2f8329f6ac82ed5a05e7757d17e1c895428de69e46a60efc465dc2fd6657ebfc24c9 SHA512 a913fd91dff169b361b10efcbe51e2d55822319c06c9fd292d8fe4232ef9bed98541cb55caf37f56b27e9e135ce7ddc449d55f9159a57a8ac993f43f3ba1b751
diff --git a/dev-cpp/asio/asio-1.10.8.ebuild b/dev-cpp/asio/asio-1.10.8.ebuild
index 6510f168fcde..24b561fdb47f 100644
--- a/dev-cpp/asio/asio-1.10.8.ebuild
+++ b/dev-cpp/asio/asio-1.10.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc examples ssl test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/boost
 	ssl? ( dev-libs/openssl:0= )"
diff --git a/dev-cpp/asio/asio-1.12.2.ebuild b/dev-cpp/asio/asio-1.12.2.ebuild
index fe556e8cbee7..effe4bef8029 100644
--- a/dev-cpp/asio/asio-1.12.2.ebuild
+++ b/dev-cpp/asio/asio-1.12.2.ebuild
@@ -11,6 +11,7 @@ LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc examples libressl ssl test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/boost
 	ssl? (
diff --git a/dev-cpp/asio/asio-1.13.0.ebuild b/dev-cpp/asio/asio-1.13.0.ebuild
index fe556e8cbee7..effe4bef8029 100644
--- a/dev-cpp/asio/asio-1.13.0.ebuild
+++ b/dev-cpp/asio/asio-1.13.0.ebuild
@@ -11,6 +11,7 @@ LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc examples libressl ssl test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/boost
 	ssl? (
diff --git a/dev-cpp/asio/asio-1.14.0.ebuild b/dev-cpp/asio/asio-1.14.0.ebuild
index 7b38a8383ce6..3752e9422096 100644
--- a/dev-cpp/asio/asio-1.14.0.ebuild
+++ b/dev-cpp/asio/asio-1.14.0.ebuild
@@ -9,8 +9,9 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc examples libressl ssl test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/boost
 	ssl? (
diff --git a/dev-cpp/cpp-hocon/Manifest b/dev-cpp/cpp-hocon/Manifest
index 94e9ad7348d9..5f1365849bee 100644
--- a/dev-cpp/cpp-hocon/Manifest
+++ b/dev-cpp/cpp-hocon/Manifest
@@ -1,3 +1,3 @@
 DIST cpp-hocon-0.1.4.tar.gz 157988 BLAKE2B 3b9e3ec2c386446a2c1d078867b03fbfe2adc8160877288597c648eaf4af6e34f09b673780e6fb81ce9bd1724c1e3d6efc1102985d344a4d1d7bb48b15916190 SHA512 f5ee6c5e7eaa5139bb3c421fd8b7c0da337daec99dce7f426d567ced0036b7c49a396b1b9bdbaa8023cd776a5a942175082a4b30280d4211a0db51483324be42
-EBUILD cpp-hocon-0.1.4-r1.ebuild 988 BLAKE2B 01388398bec6dccdc03baa142d37a1a9c6a4e64a92be29d473fb777e2f08e93083becf197b0659cf4b574b9c257c745f12e62f09a876faba392d69d0145b7ae2 SHA512 0b90549cb383a0b1a6b330c73ac721a09d660d666172c88b8203b74dda468b874962ee13472db33b0de390b09f0c6ddc921cf9e0561625a1b9def9bd56c79f39
+EBUILD cpp-hocon-0.1.4-r1.ebuild 1012 BLAKE2B 4d57a1fb57ce39b31469ef5fb1298b07f485b3d2e74b6add0c83d11a0c5093c13e49cf9f6a350ad5917c9157d41b7181f790cd8d0d9f9d9906f881e35dd93252 SHA512 1cd0c36dd4a21e9a09ba5b1fd443108ebbc41851cb6ebf833c6768cadf992f32bdb1cea7df16626352d4fc6e50e4d3dadb3b7c340305d96f2e22943b3a465033
 MISC metadata.xml 433 BLAKE2B 5b3b4e23af7ff914d5b4a3ba6425f469273ef8fb513766a07b3d66110688df34dfd68b43812905bea98cc39c2b3df06b5614bf504a78f4c2ce0c6d56bfe483a3 SHA512 7f890317b6cdfc71563359d575446ccf489d6ffb79ba541566fa747e4a0c1e077ec7f7c5263d96035bbfe77f6631cfb9000f715c348ed543492b7dc4cc7cd305
diff --git a/dev-cpp/cpp-hocon/cpp-hocon-0.1.4-r1.ebuild b/dev-cpp/cpp-hocon/cpp-hocon-0.1.4-r1.ebuild
index 8861488d02b2..752c94b6d592 100644
--- a/dev-cpp/cpp-hocon/cpp-hocon-0.1.4-r1.ebuild
+++ b/dev-cpp/cpp-hocon/cpp-hocon-0.1.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
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86"
 IUSE="debug test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=sys-devel/gcc-4.9.3:*
diff --git a/dev-cpp/gflags/Manifest b/dev-cpp/gflags/Manifest
index 483835358b0d..7e23bef8debb 100644
--- a/dev-cpp/gflags/Manifest
+++ b/dev-cpp/gflags/Manifest
@@ -1,7 +1,7 @@
 DIST gflags-2.2.0.tar.gz 96408 BLAKE2B 571f07dd0972cec201eae8ce66d5e0592abb6ddb81bcf3c539f38861f0cd379de2db20ba99eab885ba030235938816d7a61e589b74a61743de7cdb2710646854 SHA512 e2106ca70ff539024f888bca12487b3bf7f4f51928acf5ae3e1022f6bbd5e3b7882196ec50b609fd52f739e1f7b13eec7d4b3535d8216ec019a3577de6b4228d
 DIST gflags-2.2.1.tar.gz 96985 BLAKE2B 065dac9cf5d878e4179cb6d56ddf240052a552b72036fd06cb83197d9772a9b97fa544f809c6e1efd6f9ad8cd0222872fc6292c44bc013c5f70e235bcc5b290c SHA512 e919cbdcff1f993ddbfa9c06d8e595566a4717c27ff62f388a64c0e6b4683a93211c24ce78485eae84c2c76053341574064e6c56af185fc2782e2816b26e1fc9
-EBUILD gflags-2.2.0.ebuild 1023 BLAKE2B e8fc99aa6658c936050a32d6ab69bd4855a59f88e4deed9a18c1772ce5665662f166e4098594389fd65d9d5befd6d47303361f72bb6f9c69bf1b1eba783eece7 SHA512 a6ba0ee030170d8ca78a21df9196c43a3dbd55c7154e68053ab03fb41f1d6c4404af31dc0840df592927bd13abf6d3580ca7ae9f3cb2861c6bd9646b0ce6e09b
-EBUILD gflags-2.2.1-r1.ebuild 1000 BLAKE2B dbeda2805d735612e11772bc1c3503387bb9c61cb2e500da1a9d8b04c464be878bcce8d3424647733b4e38bf215d6933ef2b625e5dcf5fae1e9c2826febfe429 SHA512 c493a1299143974e4258a110b39807f2d31adf4bbbd48d8c65b816272da7fcb7754055f2a23ba0fd557dd0a0849a10370af29e531df8a0f455a6b8fc7cf96fb2
-EBUILD gflags-2.2.1.ebuild 1030 BLAKE2B 03b755376e1339389264e50fe248801f8b5e280cc8069b45beda8bb8a9135373b047e3dee8e32bc2d9745b5639b6b95d065a0e747e1e06266c0945b6e5ae2e05 SHA512 e295339b15b1c234fa5f2c3b996eff23ab4aea666f06f970a8e66afcc0697ef8328e3334f672785488da462889003a71db87aa59be8f1b49a397d49fc1c99d3a
-EBUILD gflags-9999.ebuild 1000 BLAKE2B dbeda2805d735612e11772bc1c3503387bb9c61cb2e500da1a9d8b04c464be878bcce8d3424647733b4e38bf215d6933ef2b625e5dcf5fae1e9c2826febfe429 SHA512 c493a1299143974e4258a110b39807f2d31adf4bbbd48d8c65b816272da7fcb7754055f2a23ba0fd557dd0a0849a10370af29e531df8a0f455a6b8fc7cf96fb2
+EBUILD gflags-2.2.0.ebuild 1050 BLAKE2B 4181dd26bbc5f51517c10815b8d2b3c1ff8c3cf27cd65142ee3d0c3b54a1c26fcd0181563e734e3777fc27618c461dee1500744a7d17cdf032f0d6a7f0bd8b5e SHA512 93b58ea2bdfe242f29138592f1f61d278834be42fd9954a267f9c7abf59884b2ef40a4dd9dd72538668a27e9c20847e94888ba7018496421d02c2b2e4157b02c
+EBUILD gflags-2.2.1-r1.ebuild 1021 BLAKE2B 57b61274fcc1cd24c3eb2bf504f499159d4a71e5feac58b84134db735fe44d17a9b1128aabb644ed19c9ccbb4a218409402e361d36ad9fcbb935f06325701b33 SHA512 ca8955deff6949d6696c3d798dd18f8f1d390e6e2d4a51ebe77aaa653bc0975bf31b56d351d367bbdf4c796b36aa9a969953eaf82e5bccd9cb6669173eb7fb17
+EBUILD gflags-2.2.1.ebuild 1054 BLAKE2B d0b0e681888ec971279b1addc2eec48d7c1e95b6a8c52f9a09ef821d61ac0b88594baad16034ee5ba0a7bde957ab0cb7d29b28eaa1e1096b3d14cf2602f3363c SHA512 b571435960abe2f243048f2e324d4981faf5e8f6271ab325c873a97b835eb0fe65eb9ad70d4e29d4f5094e3ff9ddde5272172e750da942959de898f4baae32b7
+EBUILD gflags-9999.ebuild 1027 BLAKE2B 95e39fa619ed4f469cef615d578515c06ddfc5954d128fadec64464cd3cb2d58a375501caf450bcf77e275af577adfb3bb1b01dca735682150c7dcbe82e24c17 SHA512 70d38544ff463ef3902d3742c6231fb387c8a2a02829ca2b872e369c125f35f8b0053366759ad065ba8331f40f4a7520ad34d15088392607d54d6421a54f2f9c
 MISC metadata.xml 303 BLAKE2B ffe806891bf2b398e66676c5a17dbbcf2b53a1738a92d994828aecd33bf52dae92d9f2631d262f2c5c375b7f4c6918c9011f03ed94a0bc6a50f2475ee4620537 SHA512 80f049b850a5f55f33964fd8776aa4b510d9937022caac6d3817d583ae3089dd5cc73bd44b8ef48e867a706fd9223861001759281903ee1a1a467149ca7bf37e
diff --git a/dev-cpp/gflags/gflags-2.2.0.ebuild b/dev-cpp/gflags/gflags-2.2.0.ebuild
index 082603bc4fe7..f66d07061871 100644
--- a/dev-cpp/gflags/gflags-2.2.0.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.0.ebuild
@@ -19,6 +19,7 @@ HOMEPAGE="http://gflags.github.io/gflags/"
 LICENSE="BSD"
 SLOT="0/2.2"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 # AUTHORS.txt only links the google group
 DOCS=( ChangeLog.txt README.md )
diff --git a/dev-cpp/gflags/gflags-2.2.1-r1.ebuild b/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
index 95cd79c7ef3d..ba91e0c6d750 100644
--- a/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gflags/gflags"
 else
 	SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	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"
 fi
 
 DESCRIPTION="Google's C++ argument parsing library"
@@ -19,6 +19,7 @@ HOMEPAGE="http://gflags.github.io/gflags/"
 LICENSE="BSD"
 SLOT="0/2.2"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 # AUTHORS.txt only links the google group
 DOCS=( ChangeLog.txt README.md )
diff --git a/dev-cpp/gflags/gflags-2.2.1.ebuild b/dev-cpp/gflags/gflags-2.2.1.ebuild
index 91f405e1e9bf..5db328953269 100644
--- a/dev-cpp/gflags/gflags-2.2.1.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.1.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"
@@ -19,6 +19,7 @@ HOMEPAGE="http://gflags.github.io/gflags/"
 LICENSE="BSD"
 SLOT="0/2.2"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 # AUTHORS.txt only links the google group
 DOCS=( ChangeLog.txt README.md )
diff --git a/dev-cpp/gflags/gflags-9999.ebuild b/dev-cpp/gflags/gflags-9999.ebuild
index 95cd79c7ef3d..60c68630cba3 100644
--- a/dev-cpp/gflags/gflags-9999.ebuild
+++ b/dev-cpp/gflags/gflags-9999.ebuild
@@ -19,6 +19,7 @@ HOMEPAGE="http://gflags.github.io/gflags/"
 LICENSE="BSD"
 SLOT="0/2.2"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 # AUTHORS.txt only links the google group
 DOCS=( ChangeLog.txt README.md )
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 2f81828d4c39..f44fcb9db3db 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -2,8 +2,8 @@ DIST glibmm-2.56.1.tar.xz 6841240 BLAKE2B db0e1402f322fd31138cf4db2fc2fabb6fb989
 DIST glibmm-2.58.1.tar.xz 6778632 BLAKE2B e51e43cb9361147627c2ffc4c232bd8b15d935cc3a20a4fa8d98f5be9c45f7dd635aab69177d033cf65a6e39cee53bcc723be56cc8db966e88b00b5f9cb1f29a SHA512 c1a67412e6de3853557318cd921e6e73874a14ffd3cb51fc158b0d45fb1d5c2560e011b3b0be7f8cf8afee13952e824625d832e5237288b974c2ba20a6f042cb
 DIST glibmm-2.60.0.tar.xz 6874840 BLAKE2B 4d71bb394fe88d0a6b0286b1d9651e6063957f7d4adca6af16b2e5698d8f87984f37257c879fa4b655a03519d6adf6400695197d29e0dd14552ac3bf174f60e3 SHA512 ea0477d5cb6e59019e87f929630ff32ac38dd5e4fb53fe84ef64b5b41c1090c8e10a0a67b26c786ab4d9ebf64b993fa0044333b4aa8554c331a0a6d02039c5ad
 DIST glibmm-2.60.1.tar.xz 7132072 BLAKE2B 8d25287b7805d7196bffa909447db0e0fa0edd1c243b3ccdef91f1a6573ea0723cda8e88993e878e6c8440b23488b0ab8c9ed727bd4e2d4a46f56ba251510aa0 SHA512 89f1d10bd9b60232519e2e13c02b0b1010dacbe67a8bab06c3a5873649e5090ed3593d518bfd8e12933a08aaa5fc654b1475efc208e2256c7efd197274a28b79
-EBUILD glibmm-2.56.1.ebuild 1623 BLAKE2B af1eeca15abce1a9293fe8f9ced32f5e5bb503a51d48ff9c530a7e282ab5e8e7ed4122410e12f54a9377f93ff5ae1d4f9b3b5485954d004e054d828ce9b00ff4 SHA512 bf4e107bfa2ddced832dc10247ea99ed99559d454fd5cd3044be120463a3e707ae4c0c1da365f6e66dbb10633dc951e3dd1c0020b2caf50a2ce9c548fdb6a882
-EBUILD glibmm-2.58.1.ebuild 1625 BLAKE2B 9f04f57ab9578ec41bc26d2b27d3462c6ae72e0b4776d8d7f555c2813330ebcbb4d22d798e4080c576fcc0cd8faa08bfea7c62f61090a545fc0986dcab031470 SHA512 03f2af747fd4fc129436f506429d8f7c63742197b4fb2fd6827f6cd49014d75fb9e3e9feae76b404ab2b706b82ddbcfb76417f7385688e52db45d8fa20efe773
-EBUILD glibmm-2.60.0.ebuild 1632 BLAKE2B 2efdbfe3b7dc1b4775732f491ee47d3ffc831d67bdea2bfaadc66514a1c19115d068d2f9a918626249891ab093bbf20b6117601b80862407de80ca47c0489bd2 SHA512 6292cf64bc140045ee39a49ff53daa87112926d4117ea714692543105bc8cf9c66860df713a8f02f14b125cb07d07ba40d3f29cd09db781942738d7a26b6d109
-EBUILD glibmm-2.60.1.ebuild 1632 BLAKE2B 2efdbfe3b7dc1b4775732f491ee47d3ffc831d67bdea2bfaadc66514a1c19115d068d2f9a918626249891ab093bbf20b6117601b80862407de80ca47c0489bd2 SHA512 6292cf64bc140045ee39a49ff53daa87112926d4117ea714692543105bc8cf9c66860df713a8f02f14b125cb07d07ba40d3f29cd09db781942738d7a26b6d109
+EBUILD glibmm-2.56.1.ebuild 1650 BLAKE2B 52bc2daf7242907d02315fd25e2275b724b08ba2f48f17cf9e8b36976e85c17e73e0d5639cefb5fd836fb3f99caf17e07cbbd508fecfe8b161de344d31196662 SHA512 d304995405205e58bb1b38a231dc1e2cec7954d30d4d16d7f8939183f7a11a33fbb1743fe10efaaf6dfacf2510018cb34ec479d090b99ff45ad5fa3558e3c074
+EBUILD glibmm-2.58.1.ebuild 1652 BLAKE2B ea16e976985e194e1d95206a4af5037b08a7c89e617810521618d25fce5c8958fa002c04108d3c1ff80b17416efb7d001a6d7bc7b5560e5ca823542fabebea9b SHA512 f5af8b892ef2e56ce283c58da281a0e89dbb672a12d5f139cbbeb7489a6276298b9bb50ad596e74a3ddeca1ac523792bb6992b5e80ec70393133f188eed1bbc7
+EBUILD glibmm-2.60.0.ebuild 1659 BLAKE2B 1ae1d667fdf9bb500127639b93a7a9f54eb8a13b1c23d23c508f6fa2ec2ddc27ee43fc92dc5f7dfbe21dae8b0c4b070634c50e5b4a6e2cd8ff49d4801822c0e5 SHA512 499edc9caabc07c84072940430773540e696c827a049c39cf5ca3f9c6bbc221f2e67ad1122308169a4bed14d2427d47b2d2f20901b8e80efc40a5fa87f50282a
+EBUILD glibmm-2.60.1.ebuild 1653 BLAKE2B f334e9c04f9591aee8f4f4bea403c8d98dcbfdc0959fa6fbda231abc2065cd2077f76188c6161a98da4386c494e5a69388fa15264a20a52dc56ab190f1475aa7 SHA512 e488221fd89c326e3a2ad8f71ced00afac5fc031e0ecc00499264f2a4ae99a9f299e5dcf3ec81306f955c850f1e71dfd0ae32bb79e34fb17c83be15ec516af44
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.56.1.ebuild b/dev-cpp/glibmm/glibmm-2.56.1.ebuild
index 9aa4cc3775ee..a83a68fec04d 100644
--- a/dev-cpp/glibmm/glibmm-2.56.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.56.1.ebuild
@@ -11,6 +11,7 @@ LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
diff --git a/dev-cpp/glibmm/glibmm-2.58.1.ebuild b/dev-cpp/glibmm/glibmm-2.58.1.ebuild
index 98e37553fd8a..a9698a9ca848 100644
--- a/dev-cpp/glibmm/glibmm-2.58.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.58.1.ebuild
@@ -11,6 +11,7 @@ LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
 KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
diff --git a/dev-cpp/glibmm/glibmm-2.60.0.ebuild b/dev-cpp/glibmm/glibmm-2.60.0.ebuild
index d742fe267822..ce57fc6e0e53 100644
--- a/dev-cpp/glibmm/glibmm-2.60.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.60.0.ebuild
@@ -11,6 +11,7 @@ LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
diff --git a/dev-cpp/glibmm/glibmm-2.60.1.ebuild b/dev-cpp/glibmm/glibmm-2.60.1.ebuild
index d742fe267822..b119a2d526a0 100644
--- a/dev-cpp/glibmm/glibmm-2.60.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.60.1.ebuild
@@ -9,8 +9,9 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
diff --git a/dev-cpp/gstreamermm/Manifest b/dev-cpp/gstreamermm/Manifest
index 079f37f0b6a7..b239f1457553 100644
--- a/dev-cpp/gstreamermm/Manifest
+++ b/dev-cpp/gstreamermm/Manifest
@@ -1,3 +1,3 @@
 DIST gstreamermm-1.10.0.tar.xz 3529640 BLAKE2B 29b99928cd1b21fd295683b4a1ad0a1b0f8ae959237fcbfef7d5a9296a70a140a04fa390fbbcb8d3151d28239f281e72feb30a0466478e38dfb4e172beaf21f1 SHA512 34eeb9eec5958c96acf7c7791eef80138e5d55fea6ddf1bf9ace6b1ec7f052da2abf04d87089e4c9ead51c631ef7afceaf9fceb946ec3d105da522187c69e429
-EBUILD gstreamermm-1.10.0.ebuild 1435 BLAKE2B 4057bdcc90a1f32dea45e56bb738062f13349ee12f363f25855c0e25b80376377dde2b0364cc1587a67c31015fa7879e8476b55bfbba9772ece29d5dd64dbf4e SHA512 24d365d1ea5012c26f12330882cd7b766d5ab3ee7df4e62362724208f557cd95aa0e586f8b89c197fda99adcc21b705512189a8211026366608a00310a819ca3
-MISC metadata.xml 375 BLAKE2B 4471ccdfcd754d109f34248adb67c5e8e7d8d5f05d5bc7e7bed67106525e917a9ff1863a09b93ce81f550dc71f4662017e199e006ef24425eb30af7b3987c7b4 SHA512 3b44cf887272a8478662aeb995b97566cd109b3b134941c11f37ab38b648a58f91644f692440e8aafbc154e7acf85bf385771b008b17537848fa670d6fa1a62f
+EBUILD gstreamermm-1.10.0.ebuild 1459 BLAKE2B a3863c41352bac5560958f6077dcbf86824f5fd82c60f022598a05dcfcfd2042d74f37acfb8a0a827e47853a53b598dc94cc267f5122f7004293717d4d288f6f SHA512 2f6e6f1c1554d4d46358e35d3ed6ae69413c70d82212e4674f5c97e8b8464dfe0fb1ab23ea988f09cce485c2fbbe9f9d5df390d764c7036ce4c264cd85228c5e
+MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild b/dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild
index 42aeb6b51580..6fdef7109be2 100644
--- a/dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild
+++ b/dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="LGPL-2.1"
 SLOT="1.0/1"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=media-libs/gstreamer-${PV}:1.0
diff --git a/dev-cpp/gstreamermm/metadata.xml b/dev-cpp/gstreamermm/metadata.xml
index 9195662ffa23..4cbddcaa19ad 100644
--- a/dev-cpp/gstreamermm/metadata.xml
+++ b/dev-cpp/gstreamermm/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>eva@gentoo.org</email>
-    <name>Gilles Dartiguelongue</name>
-  </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 765887cd24f0..8b6fd25ae9e4 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -9,11 +9,11 @@ DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a143
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
 DIST gtest-1.9.0_pre20190607.tar.gz 958396 BLAKE2B 64ae2c86a320a6ed56d6f99383591f7a0176e3f1291144bddf6dc82733c78177963f95516bbaed494318d3d7451d164aeb0d4a192b415414bcc25b9875cf6e82 SHA512 6c17ba303ec1dc8a989075a6dc0eda9b023345d00f6b43e588676cc2cd291f8c508744e4aba86a6c6b651329ce47419ad04d5765ca5978eda507a1643e8a92c3
-EBUILD gtest-1.10.0.ebuild 1713 BLAKE2B 279db9f90e20817af62a02c6dfac88e4b666ef55715953777a457019be268cbf480774a1a7f7635e4da63848f576acc1980efa5566205ce28c943c9eed80ce30 SHA512 e515d2da5bcb4280e015fa21138c0edb85c16f9e271ff2c4a85b2767b763531325dbe6719779ea739d77619e750922525a27e376319e67e1b68fedd5cabe1f3f
-EBUILD gtest-1.8.0-r1.ebuild 1648 BLAKE2B 0e0553e051670fc88566c613ff60741472acab3c594b6de45ad683506be186ba4c8bf952f9bc380a4e1f89da56a6b3d494749ee94e769822719ff9763d76e889 SHA512 ec09cb3ffa83efdd031011a2f7d7b1e59f5e369adecab644ebd6a0d7ff219504fac3a805957f06a22c0d6062d44fd43634dbd9fe9fa49609f610dcc59e0fc439
-EBUILD gtest-1.8.0.ebuild 1611 BLAKE2B 6a3a18fb1db9ba0cde476062596a14a947a5685bfdc8411f3bacb6a2c19d3cf6b4061c9fa0db218c487e7856be2fe78427d92483b621f391664dd4d5cfaf5cdc SHA512 0c12ec3a58196d04a83d43a4e028396a28d5a5c89509e65a2fdefee23a2d6194625d91aa30a41686fe802cfab966657e163f7c507260c6a9b7a825552458ffb3
-EBUILD gtest-1.8.1-r1.ebuild 1640 BLAKE2B 8c982823ce5879d508c4e2b627f082b289ce9f4e195b4f60dfc7b0a73cca895f46729ffff9d2a1f34a7cbca358492defa6408d474043a66c5169992f7a311ce4 SHA512 b70481cf510f98d9155be45527e81f3def884cd115c4708ebe4dce6d606d642d55e5ec2d97c70fae753c83eb2848491186c1586fc7f7f130c027a4c4ab30e61e
-EBUILD gtest-1.8.1.ebuild 1664 BLAKE2B 6675a5bdc366257829f22a9f3568b720be3be11292d607fd6e0b411fd4ce4315f3bbb1bc55af0db32ab9a0630149d28fae6e1c678f326229be3cd04ff43eea18 SHA512 cdb2feb0679f487b7101b3c7e2e1c74275118bd24605feab8866d374e8a47b9765045cf1a5f5ae93ad92ab2cc9793ce035ec926f7892334e1ca6c888d8bcb396
-EBUILD gtest-1.9.0_pre20190607.ebuild 1732 BLAKE2B b25fc75b4ebfa125ce4d3709d12306658809679d64a891c1f40cced7753daeac3b564fbe7a177fbd33cb26885fb855a6481cb2001e5abbecc3d0156752a39406 SHA512 cfac623bdb481460f668410244ce11cb963969e11b413696ccfe7fdb8ab81df69407849a611b17548a5df01e3802734d74f4617f461aacbe66915f5a38760290
-EBUILD gtest-9999.ebuild 1699 BLAKE2B 702cd246de847d7dff35356ed0ce4c54d22d73c497cf4955d598d84a53b56208ec77b8e6f532214c644c769464cb708dd483740f9c989131e167e1b5b7eb95fd SHA512 9c36670a29113af76a511b945e0d57783c8089ade79c873ee253fcf9568bf15f5c856ff43fed76e08f5693167347a753121b0487c70e982cd1a9555ac3e22423
+EBUILD gtest-1.10.0.ebuild 1740 BLAKE2B f821d897e772e7da001f7033af7f163e600246a23292c17f2871589156f13683b4ede68fe1a9919c513609802cb3e2604fa86106cb80d23a626cb870dcf1462f SHA512 e14ad3011f99752b0f339d7870102bda2e04c94e57241de4fbe99bc57aba7f918808319507e9b7ae878b0c32bea86b7d2a7f49450ec3f90cdf25dfb0471ee8c1
+EBUILD gtest-1.8.0-r1.ebuild 1675 BLAKE2B f1e5db5a628ff72cc22ddb7013fda0776d9e4c7deeb6af4018385e36d8cb637a5493c5743a4315e4b6a7aa629822c6e33f3cfd81a7ee0480638a195555802f59 SHA512 5aa279833eaf29e2f4f305d0b5008cf96bedefb340037be6a53627d1f416ad3781c58f252de4802c69a4529360cc27cb7e71872fb931c4f1c326ff110d73dcbe
+EBUILD gtest-1.8.0.ebuild 1638 BLAKE2B 56cb9b08353605da49f8de22d2d8afee96a3d401c60e45dbde06eaba6380a7a9180fe510a18f82ad68c55063c430078b8aa0ae9315ae218e58f107a8df5c8eb7 SHA512 9fbb7b3777e76b8524fbb553e9eb2a8bcb304a7aa3c9bedf2214d3e8d7f66746468261478e2e6a06b8c3794a90111fab84a71004517b8c10cf9299ed5e28a253
+EBUILD gtest-1.8.1-r1.ebuild 1667 BLAKE2B 06664715e9b4c0008afaee56ba74110b6360308fa1f91f1694f012969303f4033d3b5ea94c7834a5d7cd1bee88f22a6eb5b679ef81862a83c6289174e0312b1c SHA512 9189c9ad9e548c2fd600c061e9c92e2300382b1e9566f0f86cb78521a8169b1679e5c3e4c15f41ea7bebc27cdae174dc69201e270a569de56a03ed838d6b4db2
+EBUILD gtest-1.8.1.ebuild 1691 BLAKE2B db4f57387285e84c017e4a92c99bf53aec9ad4eb81087c55c9fccdf5d22256b1716ff9fcf94b579296699203510b136f91fb24f381cf70fe4bbeb9c1bcc0c3fd SHA512 c485ff0148314a6cfac0bfdcf5e98447ed113f8876ed79c51c141cd116ebf8309b24d79499e99ee0d7bc89a75e3f053042947cc1a7ade2fbb8fb448f36cc9753
+EBUILD gtest-1.9.0_pre20190607.ebuild 1759 BLAKE2B 33fda1052749c49b8dacbdc54335d3d81898e923effa9a8b1a410904edd0b8916d2d9e9f6282bd9c33131fb5a163a00edffbdccaba7898bbce26eef8f48109ef SHA512 87cc7c081f8659068a9091d7be0aae3e27a1bd44190629651298fefd0719fcf20424470a469f51321116db3f103d173ba7064a2706a96af4f6c041cad1eec77a
+EBUILD gtest-9999.ebuild 1726 BLAKE2B dcc5632e948fb62f97891c3875dd11726261b8525abb7c6c60f587620f1ca8bed1ea95c8f1940c7be888f964128eb9d7e996acdd11ba3fd1ede4d84b2c91eace SHA512 6c8680ddfa5dc57177a2f8719f01f9cae03e9b4325026ee5e68161eb012d2da290337deab17fdc202188e76bad1349c7020c77165280c903e7257981d51ad6a5
 MISC metadata.xml 535 BLAKE2B 892f380ec413ae33de5821d911bf34fc9e3d0e76cdc833a38c66ed85dece1f6efeec56d8f78c655c9a083e7152f1d24c018184d1e679612de43690665d2c0518 SHA512 68daeade4eb4fec4a42ec039ff000a025c48708f2aed23ebf4495b653567611342893ce79d6163d5276638af9e9915abc2cc6c2d6d07db2e86681e4049b77f81
diff --git a/dev-cpp/gtest/gtest-1.10.0.ebuild b/dev-cpp/gtest/gtest-1.10.0.ebuild
index 2a75dd1da0e7..98d67d92032c 100644
--- a/dev-cpp/gtest/gtest-1.10.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.10.0.ebuild
@@ -30,6 +30,7 @@ HOMEPAGE="https://github.com/google/googletest"
 LICENSE="BSD"
 SLOT="0"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="!dev-cpp/gmock"
diff --git a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
index 7ab8e27afd9f..76673187e002 100644
--- a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="!dev-cpp/gmock"
diff --git a/dev-cpp/gtest/gtest-1.8.0.ebuild b/dev-cpp/gtest/gtest-1.8.0.ebuild
index dff3323368d5..9f7ffbdb9aea 100644
--- a/dev-cpp/gtest/gtest-1.8.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="!dev-cpp/gmock"
diff --git a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
index 32cb3eac1b66..771468eb8b67 100644
--- a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
@@ -23,6 +23,7 @@ HOMEPAGE="https://github.com/google/googletest"
 LICENSE="BSD"
 SLOT="0"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="!dev-cpp/gmock"
diff --git a/dev-cpp/gtest/gtest-1.8.1.ebuild b/dev-cpp/gtest/gtest-1.8.1.ebuild
index 38ae957597e6..a8cdd6890e66 100644
--- a/dev-cpp/gtest/gtest-1.8.1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.1.ebuild
@@ -23,6 +23,7 @@ HOMEPAGE="https://github.com/google/googletest"
 LICENSE="BSD"
 SLOT="0"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="!dev-cpp/gmock"
diff --git a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
index daa2e778fbe4..9a6cb10a49fd 100644
--- a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
+++ b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
@@ -30,6 +30,7 @@ HOMEPAGE="https://github.com/google/googletest"
 LICENSE="BSD"
 SLOT="0"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="!dev-cpp/gmock"
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index ccb2185df0ae..2fdd8d6bb364 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -28,6 +28,7 @@ HOMEPAGE="https://github.com/google/googletest"
 LICENSE="BSD"
 SLOT="0"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="!dev-cpp/gmock"
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 3a811180030e..005e055b14d0 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -2,8 +2,8 @@ DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b783
 DIST gtkmm-3.24.0.tar.xz 12515792 BLAKE2B d1150019b28ecffbf1e2f561e8b691d584dfc893dbc1ef46f1dd33e2c9050ea77e00a1cb7ce1f3832568fd9865c977dbc71a461923c285331372371a5f235369 SHA512 94658fbf7eebbac2a864d6c7d3cd0e6ffd4ac213fd1d9986d721d4906c7a43a45d8757df475879ee37ef54ec5e3fac7d9a8e4a194b97b2be72a10743bf2e13ac
 DIST gtkmm-3.24.1.tar.xz 12482756 BLAKE2B 238b9224a57b929cf75617de326f47ff15da07a4a68e6ae10903b29f5e1e29f4fbbaab82f7b483fcdb4c27aa25908bf9e80c4362ba3df298073c73530b79bcb0 SHA512 be7144edb0d5d68f761c9e92c197c3b84de045072443222694c1595faebf3390623a390dbec9f7232a70231aca138b1cb4343ab273333b2a6a418af7ec1586ed
 DIST gtkmm-3.24.2.tar.xz 13336236 BLAKE2B 93f3a04b8a2f02323bf6a1161c10eaae2ad9c26d0e235b1658fc7abbb8d48f67abc42739726c4b6657fa59b033b3708ad1428e629538ab5a6fd27590f5311f30 SHA512 c8f9f03d54006a729fdad7563d3be37aa180f9153c222314c1b8cfddc5ab417d184422a1d44f780574248ea52e679f1e360eac67e03f67d29ecf847c0ab19689
-EBUILD gtkmm-2.24.5.ebuild 1529 BLAKE2B 8dc90ebeb2b42386e1b9239a4ac51215c743ca5a6fe14f319c2cee03dbb91895de852c042d2919b355f969f1b9a2fd59652202fb9d1d5240c83a90f8be020c04 SHA512 e2c8dfbc483365e665b8125659b8b7ab9804d799066e2cf4845731c76f1c74fbe806f455029bc169c598a1c25427421b5c5fe0ef6631e38201a09ec39c24d0fb
-EBUILD gtkmm-3.24.0.ebuild 1817 BLAKE2B 625d62406d02940dfc9b8e65a2ac3d5e7818fc94ae5ecbba57010bdda24222290580206793430dc3b90efdd0924770046a4696a30eea693e0c0d6b60891285d9 SHA512 3df49cdea96b24b8541f99d92800b239498eb48d00e858d9fddd7b2224ac9f51a0a00faf33dd6483f7f038e439fc791e5d76c636fb757e79f33b7d022105ef10
-EBUILD gtkmm-3.24.1.ebuild 1818 BLAKE2B 6f8f76249ba5cef62761852b883dc4e501535d22382e3992f3d2602f29ad1156e588e86e80656ecf7bc0b48a04cec56f3c24c890cca7a90e9dffff0e92a33536 SHA512 0202f8265b0e0009d9456456d8bd172d84ce7f2b9b731a2b8e601d6497156d09a802b1ae1bdbbf9b4f573206f5214b8e678c80b2f60e36db91f5d0e06010325f
-EBUILD gtkmm-3.24.2.ebuild 1881 BLAKE2B e2bfa80c14874998b37b05befaf9deef83c1fa0a9b600a67b9ec04ea2eea8b2fc38f772d7f084ffbd80ec06972937b906921d722549ee68476b803265d80ce99 SHA512 1c2bf4e37649d319a9e327d228ef830daa99425a96e84fd1706a81ba4b91cac4e22cfc66fc5e3c963be10c16ee8972499a913210da069eb335856076fee82999
+EBUILD gtkmm-2.24.5.ebuild 1553 BLAKE2B 98f3166080fa78cc6e21dc291218f770673790c40ecde84ce32d673e1314426c1a2176a3370949546eb23801260e913af331a7db9e0b7e0709421dab9be0b7f5 SHA512 229dbf0c25ec0ebd8822e775ddd3b183e8e4270e8797eee7ec8d8cda4e57b43fb756314735aef84e7903e4cec20db7d731b7730ff0e558744fba25d48abc5647
+EBUILD gtkmm-3.24.0.ebuild 1844 BLAKE2B 0c8bdda21577752a199dee5a2859fcecda6f64e6a8e67a366f83347f261ee140ff165c3d9821d97140c2f62742764f00e69104df949c3a8b4748d02b2970c660 SHA512 14f854a8952d32b23c838c47443d4d743ab465547b42c0f3fa8908bcbf81355ac6244f24523e50262492a131fb2723631f21612ac37763ef8f490f390867baa8
+EBUILD gtkmm-3.24.1.ebuild 1845 BLAKE2B 644ce6004858cfd8ab5a658fb88258c0b42163c2ce065476784ec18dd38a06d2f88c7af10f99a939025519687ef7074b97f95fe0de7f2701982367f1b56c4783 SHA512 51afbb25770290b6e8d567b97def39d1aa00bd8d5881154eb3769e17adad0099edfc9c36384169870cb2ae9d917411d2b4fa8ca418dfcb731e6013bc77cd69ae
+EBUILD gtkmm-3.24.2.ebuild 1875 BLAKE2B 4d3f2f8511af2cfe992954350237b76bf376ce7ef4a4c7d715a2cff0de4df8de1c1d072da0526581c5974785d3f9ede647f0066bc84cd50c416802c5e4cbdd3e SHA512 808a57597693fe2ec654de6d3ba3a7692d6a0878f68815aa5ac8cc94bbec149b50a660e17b228134f4b9ce54df1cf4784bf549a2d777f0b7eacdf1c12b1f189b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
index 93b4807719ef..9393d4bdc7f9 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.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
@@ -12,6 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2.4"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.34.1:2[${MULTILIB_USEDEP}]
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.0.ebuild
index ce9bc8b7fbf5..9020381f2cc7 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.0.ebuild
@@ -12,6 +12,7 @@ SLOT="3.0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE="aqua doc test wayland X"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( aqua wayland X )"
 
 RDEPEND="
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild
index c4b1fe49fcf2..fc75f17ec2dd 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild
@@ -12,6 +12,7 @@ SLOT="3.0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE="aqua doc test wayland X"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( aqua wayland X )"
 
 RDEPEND="
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild
index 718df300c7f2..daf9e43b50ec 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE="aqua doc test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/libglademm/Manifest b/dev-cpp/libglademm/Manifest
index a449eccdec9a..f567a37c7e1f 100644
--- a/dev-cpp/libglademm/Manifest
+++ b/dev-cpp/libglademm/Manifest
@@ -1,3 +1,3 @@
 DIST libglademm-2.6.7.tar.bz2 326385 BLAKE2B b79bd099f7eba02585921cd88331cd3c2f0a362396efded2996b149689f1869146a81ef174e9f983f348fe231866e4dcc719eeef62f5f3a2b0ba5dbaf1375504 SHA512 d7042d0549df9322d3202d5c0733d65b153a8ff451bb9e401b9d93a915ec4c2c086428e4febcbae2ecec5936955b7afbc59beff93d492f23b7b8e2b19fe806b0
-EBUILD libglademm-2.6.7-r2.ebuild 1662 BLAKE2B c24ae86f8f13c363a25b151762434e57aca96253e51a6277891eba7deceb7be11e1404b00a442296329f84ae2bd3be082302a6c498043d235ebe84fbb8a4563c SHA512 c0e83c532d9c4952931d1da1ac7442c829a74e642ecc14d827d63580457bda6b75a16e87acb695150c63c57814c30008ce0222c2c771d2da74f4d0bf5233c9c7
+EBUILD libglademm-2.6.7-r2.ebuild 1580 BLAKE2B 9ef0d0b9690eb0059663be30c6b78abb2e36da32dd82d0f94b0d3421e1f6f3323f7970b5757b87e07ab0e9a5d28dcc25a898c24ab25e49b630d2fdcc10e79ca3 SHA512 c6e2644b8c986abe127652176f218f1cf767ef17252b9231b923a7a21ccfe885687f66db28d501407a192f97d022eb188ae8dc21ad56007fad03e5e1132bf3f6
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild b/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
index 924487e145d2..e1efe0c66b0d 100644
--- a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
+++ b/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
@@ -46,7 +46,7 @@ multilib_src_compile() {
 	gnome2_src_compile
 
 	if multilib_is_native_abi && use doc; then
-		emake -C "docs/reference" all || die "emake doc failed"
+		emake -C "docs/reference" all
 	fi
 }
 
@@ -54,7 +54,7 @@ multilib_src_install() {
 	gnome2_src_install
 
 	if use examples; then
-		emake -C "examples" distclean || die "examples clean up failed"
+		emake -C "examples" distclean
 	fi
 }
 
@@ -69,6 +69,6 @@ multilib_src_install_all() {
 		find "${S}/examples" -name "Makefile*" -delete \
 			|| die "examples cleanup failed"
 		insinto "/usr/share/doc/${PF}"
-		doins -r examples || die "doins failed"
+		doins -r examples
 	fi
 }
diff --git a/dev-cpp/libgnomecanvasmm/Manifest b/dev-cpp/libgnomecanvasmm/Manifest
index 62acf3270314..5cb870e1102c 100644
--- a/dev-cpp/libgnomecanvasmm/Manifest
+++ b/dev-cpp/libgnomecanvasmm/Manifest
@@ -1,3 +1,3 @@
 DIST libgnomecanvasmm-2.26.0.tar.bz2 327215 BLAKE2B 87cfc59d0825ad2b345bbeff7ba6ce74744228a359d61c8c6b86cef308827c78410b4633737ab9040f6dbdf7f37ed0ea376d28ab4194266f9c784b8b07d1f76d SHA512 23795c856674b79f82d2e5cffdfdbf67a387fe6a21081fef1d96d0f614a121710c7f1e175612a286f5946a60cea4e8506aef7833a7bdf73084d6266c09aad66b
-EBUILD libgnomecanvasmm-2.26.0-r1.ebuild 1065 BLAKE2B 9583aed1cc1f24955f06de1d8647f8343002bcf74c03976a6a325bc48de985fa8f772040c28cf38b9cd9eb63817f258a890feef7372a1c0f71bb0b3b65604b9d SHA512 2b4a72bc7798c6a52cee0f4a538860b05ab6a78e2c9f97c4c19e70cfe66a03f6c4429f7d8882b967379cac5c25958f99a2ffcfb37f6d34b87287fc98b94f2113
+EBUILD libgnomecanvasmm-2.26.0-r1.ebuild 1031 BLAKE2B cf89fdb49850b25268f27c36497951f36a833b9b2a88ac8a3edd59f18e5185399af264185a8b595989bec767299ece6192f988aa47970ea7bdb1f974ffbed5fb SHA512 b78c452b82287db2418878b813a17f281c30120d07602fb76c9e237a4a0dafbf2728c7ee9939b2a6f1a2e7c65d54bc5a9a9c75ccbd0ed4b607c07f2d5fb1b47d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
index 5fa5463f6bdc..8d23e443e853 100644
--- a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
+++ b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
@@ -39,7 +39,7 @@ src_compile() {
 
 	if use doc; then
 		cd "${S}/docs/reference"
-		emake all || die "failed to build API docs"
+		emake all
 	fi
 }
 
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index 5b0b4a51e4aa..72745d6f9b79 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -1,6 +1,6 @@
 AUX ms-gsl-1.0.0-disable_Werror-644042.patch 1110 BLAKE2B fd126ec96d9a378eb8489919c130a64da9548b712a6a01fea5256294dca39afce813013f78c1b43a251b5b7fbe8846493dd9860aea2b7578c39c2cf766247202 SHA512 eec47c7f4d28d7b14a3403d046dc111bb3ef9e02e9e797f74636f3f7d11bc865c94e246bd4f98d9f39540c66b751de0ca81d523be3d523017e94886ec474799b
 AUX ms-gsl-1.0.0-use_system_catch-636828.patch 559 BLAKE2B 899f98f0b3e9b0f04cf0db9e74931113ee1d5ef77d5e016df9969abc5ea02d6a90736fa3cb37b5f3cc6ec5b4092a2660f610f636386d5de3c6e6e9b61fce0501 SHA512 4bfd90b1567fa708d9c51c78edb51974aae9158f456077a305de5d7d279686d85e593bba5c2bae477eb50880f731626192765b6122db6afcd383596d1a1e00dc
 DIST ms-gsl-2.0.0.tar.gz 64726 BLAKE2B ab40725aa38af7c5651e22ebf32d4bd9c27a10be2e206fd4c3c0173ad21da262beddef022b7b158653b185cfc3269f2b6e80d99fe65f601ffc3e770b143b03f8 SHA512 7339527222c8a97a94c0bb4038b3d142045ec5d80995e628574ac96f4d9d13c41ad70fbe0d8390586dc0db8d9ea55107dbc95de80f7335eb78ef9d2e7047d726
-EBUILD ms-gsl-2.0.0.ebuild 755 BLAKE2B efe23fb1b9b5489c595b3699f81eb7ee33f7332ae2fc115893dd0a4420258bb61f0d7143640c2a111ccb691f40881b0bc3edb35c072974854cb60dd8267f1805 SHA512 ae17558fee9dc4cd20782bfe073eef32b5e5181726ef49c7723f8f4e39b6f1aa50a832ce621a5069b815cf48b0119eec2b84869f04eb13bf9abf8976bfb1440d
-EBUILD ms-gsl-9999.ebuild 711 BLAKE2B ff612a5f984d24926a7dbc401db50c817031d470c5bf994f9b5085c77851bc15d16439014931024c42daf75df3f9a3edf3b7e206b7d9197317211409692b8c32 SHA512 3bafae58327c7fe393e49a4cf2b29b8c717fa144df47613d9171d1175187e7c75642a1eb98f9a91087573024157963366facba1c7fd0b0b1924fbf98647e3f0a
+EBUILD ms-gsl-2.0.0.ebuild 782 BLAKE2B 077dc90a24e08b4adbeec5d491fc43eda8bae1e3014bcf2b847e714179a988dc9d98a06255b6959427a6ca1c044340c4a6d3be6ebe783f90af08264d6f96903f SHA512 af16c7e0851ff7ed233181b94f826fa385229b02a78a612f389fe89470775ad7888e4e3beb3704493cc5feffcc48375e51e0fa54d94ff978061044afc0194939
+EBUILD ms-gsl-9999.ebuild 738 BLAKE2B 6370f30e2e84fb7620399ea761ac22392bdb6d283a856e5f5c53b892ae9d4a2279eb6d59e388703a2b70878c987d4a26c5c073cb345dfb914b68f1b9f7849e1e SHA512 acd80384e09fe1cdb6b2c2c2e2b550df8c2a1d66b6ee5f1e92b6d76f9524f4ea36ef2af9b09f0ce277905c6fd425664f13b9df3c9a1c968e9895d98aa732290a
 MISC metadata.xml 533 BLAKE2B 997b40261c13283f190b7fe70b87e9d42b2b05c267afdbfc1de3a7b56bfb968736fd1a1163abc723985919fd201048fc69905cdaa6d6e4a8f938bac42495d13e SHA512 01522dee3ebdbe7e5f533a64859c8f215f8653ab6d7775f1488efa9aa813840ae7c2112cd4865b007feb1a296f74aeac123389881608e169f5d0f417dacd7719
diff --git a/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild
index 5eccf76caa0d..a9ddc632488d 100644
--- a/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # header only library
 RDEPEND=""
diff --git a/dev-cpp/ms-gsl/ms-gsl-9999.ebuild b/dev-cpp/ms-gsl/ms-gsl-9999.ebuild
index 3568adaea6b7..767d0523e267 100644
--- a/dev-cpp/ms-gsl/ms-gsl-9999.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-9999.ebuild
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # header only library
 RDEPEND=""
diff --git a/dev-cpp/muParser/Manifest b/dev-cpp/muParser/Manifest
index 88a31fd9c63c..79356383e1c0 100644
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -1,6 +1,6 @@
 AUX muParser-1.32-parallel-build.patch 680 BLAKE2B 7699b129186f0173bfbc7f742d51175ed67eddb9898b61f7d6a3a462e1a262112a2d4af445e12501caa88d4630308bb5f273ef2a704e2948db9cdb7649ee6bb7 SHA512 a39af330803786ebb86259dd86ecfac00ca04978b0e623b418d887f6b20a6eb6cee2b37da8164aa7038b3accf388b40b6a6d4eccd2f20afdfd6051cc3505ac90
 DIST muParser-2.2.5.tar.gz 761315 BLAKE2B ddb7a226cecd164929a2f45ca0c2a5d20f37cd6bba2fca919c9e534017fa087523311bade8a7be4a5a011ecd5dec0a2496ff08354d2010341bccf2e2a8276c1d SHA512 d89380ebdc0ce91d0ea38fe43419ab6ed06c47d352b9ee20e1edcce48337b464366153493e0241c373ba2880a8b419fb9541e56cda0d14915daf9b98136ee682
 DIST muParser-2.2.6.1.tar.gz 755653 BLAKE2B b3b6b8da57c0e8a0bda74038689d444ba8da00d6cce80030d8b35693209f0293874e4822c4941974be21fd4b7c09ba7df2c9cef861bc10b890aae4f641040faf SHA512 01bfc8cc48158c8413ae5e1da2ddbac1c9f0b9075470b1ab75853587d641dd195ebea268e1060a340098fd8015bc5f77d8e9cde5f81cffeade2f157c5f295496
-EBUILD muParser-2.2.5.ebuild 863 BLAKE2B eef6d0bc10f80248f632b7f7cfc08b6336c237a1e0f37cc229df4247850eea8fc5360a1fd2057f2452ba0113b630ec1e31ce90d2ac234ad179ea61c081d84b0d SHA512 6bbd9ff70d8cb11e75c282b52fc5fec0092a7bd57baed94cda099c2b18744101d78678f9cc9a29bd9be447e2d4fa41c03fb529292b6cc7b9b79f8009f47c9108
-EBUILD muParser-2.2.6.1.ebuild 860 BLAKE2B 1b00a2d9089fdbc4fe20319ba99fc8bd5af556363cd394f3b64c1d97c5c9d8dc12636f4a67fa4a9d2b39be8d24c979fa3c10b678bf25afc0cf0d05a2028c1be9 SHA512 e3e0935b729c1cbaa312d47b63b5afe36e3d37d9c20a023b94f17c50420f047b2e431dd312a407e51ddf2bb36b7851732c9345ed4a4c0ea30f04e7275e40c684
+EBUILD muParser-2.2.5.ebuild 887 BLAKE2B c9e5fab264cfdf2eaf24b0e5f7d029946a66dbdb16a4e347be871ab1399f173d9938061882c31a75fe8b11c8094dc27f439f7417a05e5b906d76b8e171f1c7da SHA512 0c6888411c54bf17437e0671df21813fdd7d0764dc878896dc42dfd1e1f5b21848a8b0ede6cd8c66792e97fae75a890ad18967f813e5269bb6a0fa72ca397e38
+EBUILD muParser-2.2.6.1.ebuild 887 BLAKE2B c9e5fab264cfdf2eaf24b0e5f7d029946a66dbdb16a4e347be871ab1399f173d9938061882c31a75fe8b11c8094dc27f439f7417a05e5b906d76b8e171f1c7da SHA512 0c6888411c54bf17437e0671df21813fdd7d0764dc878896dc42dfd1e1f5b21848a8b0ede6cd8c66792e97fae75a890ad18967f813e5269bb6a0fa72ca397e38
 MISC metadata.xml 624 BLAKE2B fc3684b1f97031e5d63bddbe28679529add1a931930a351cc56ae5bef8395f9a05020a00557a0b1bc421e20c09ce59b5332597043f96981405c1911407948d7a SHA512 fdf266f68b3463e7f22358efbba60055512d7f7fce7a98de6f572a0b4c191c0b0b50b29676a432fa7fd604207029314ad5e43f043831d064de8c5f232fb424a5
diff --git a/dev-cpp/muParser/muParser-2.2.5.ebuild b/dev-cpp/muParser/muParser-2.2.5.ebuild
index 3dffdc7b4749..6e70ecf5770c 100644
--- a/dev-cpp/muParser/muParser-2.2.5.ebuild
+++ b/dev-cpp/muParser/muParser-2.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 S=${WORKDIR}/muparser-${PV}
 
diff --git a/dev-cpp/muParser/muParser-2.2.6.1.ebuild b/dev-cpp/muParser/muParser-2.2.6.1.ebuild
index a19668ce09b1..6e70ecf5770c 100644
--- a/dev-cpp/muParser/muParser-2.2.6.1.ebuild
+++ b/dev-cpp/muParser/muParser-2.2.6.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 S=${WORKDIR}/muparser-${PV}
 
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 64ac4c5511f2..0c0b87bd6cbf 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,5 +1,5 @@
 DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B 257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280 SHA512 e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a
 DIST nlohmann_json-3.7.0.tar.gz 118868542 BLAKE2B 25191628b737ea5614de85d0fcb4425fcb2d37e6890626e6ba22949430a1c5f827ff17d1cd8245c8e98d0deda617d8268c55caff3017a6b4a2f730e524599311 SHA512 35510a0ee59d847ff9fcd4f4026ef936abb89675884fdd2db808f8349a55073206f764cd4f797deb1b6493ea0e04889505f49483e5b88798011dd5db87e7c87d
-EBUILD nlohmann_json-3.6.1-r1.ebuild 795 BLAKE2B 194e4405f85cf5af863ba508f208914cc377de742670f1c770922d2ad88bcd9db2be6717bee5645099bf15267fc868e25dba2eb68c97f9440d2577a73b8b681c SHA512 f2f49a7a3b4ba70aae958776c398c089dbc422e3d1d84341084a176fea83dc60c3aa9179f83c9e5208a2e02ac9e2936e700b1152888811a9b907804e503416c0
+EBUILD nlohmann_json-3.6.1-r1.ebuild 822 BLAKE2B 942b7b682266918a2f1b26485efb4c67a3a787bff15317b818f9c4ecfbe5170a1c7e752a1055e268acf063cef0e5428ec67ce7795e5e716365d5fc4b2bf353bc SHA512 acc741720993c181f7a57159ee8c590025a8163eac291ffb81e5f10458510e2070ec5936ab7b63b6363d8dba7a1b6c1f8500e947ca66e5e11874571d43bfb54b
 EBUILD nlohmann_json-3.7.0.ebuild 826 BLAKE2B ad11525844e3218cc5f8fdfd53ae1555485a69c0a09373116cfb76c2c0a128e21eac91cb4b6df7132247ec234705d38eafe4b510120c4c1b09a3a016b5c8d826 SHA512 3da1d5e5080d2e9747ef8054a0003fb651631b6af2d7a4374c2202407833137e15434751f5e513a8dd9b67bb16b49203c813915496aaf47f65f502d44e273097
 MISC metadata.xml 337 BLAKE2B a929f6f116c9b0bdf3415325cc710b4b2afa1bb2b6a74c8df9531ad0358d8141054cee8be2be7b380574a8c59359f1c9e9bd8b7fcb607b8da251b787d75dcf43 SHA512 d6ae8564e57c1062487634fb7d4e2c0fa4c79a38d89c06c3514d3459cfd08500634a5fc8add1e126f3181b711dae74931c906b67f6aac51d6400cd2800f293df
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
index 583d0ff52fc5..d7e7355ddcf4 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="doc? ( app-doc/doxygen )"
 
diff --git a/dev-cpp/tree/Manifest b/dev-cpp/tree/Manifest
index f62b8c1be1ae..8bbe9f1c7e3b 100644
--- a/dev-cpp/tree/Manifest
+++ b/dev-cpp/tree/Manifest
@@ -1,4 +1,4 @@
-AUX tree-2.62-test.patch 289 BLAKE2B 9074ea69e8c141b813e1854c5956eb016846196c9722ed3740a942caae7a0b086f37a4ab54e2faa81c73d310e1a2effdf8302f5703aa23a3052cc88e67638037 SHA512 7b63e0e60db5c636a13fe4cf8f8043fa4029a04b21eeb4cac08fcce4f433e0e6096927fffb7f345c319b46ea6043a9388a7419e8fa6c783f58b449f9ab1061db
+AUX tree-2.81-test.patch 550 BLAKE2B fe73799591f7f0c65d2f031792bc87b2d85bc143bf4adb35e04db712ef95a5ba0e15d8256aec28a0ac95d2306fa45de41d1a8dc5d53629d38ede35fe87cef256 SHA512 a859891662a1093f517f43a6ea14a4e1f7d81988d0fe83253554bea83bfdecde0b51ed05795d0d6f0b3494a7cde6db56a8304397ea5ad9fb2d446647f4301514
 DIST tree-2.81.tar.gz 1167128 BLAKE2B ea92724b16fc7ea8a5f0036f5a7a57d000d66b332b4ba46139463f707f95922f38b1d4d56a6d2fca0a3c4ece8f11e28bbf4aa6bec5c5a7bc59ccaa36a01413d6 SHA512 85e910fdb19ffd03ae79302a95ebffdb44725fd9f291a61d6912f743b54fe9b3d1c863e00c7e75d238f428946809e42c7ae6379b1051688fb06ee6c6d761d294
-EBUILD tree-2.81.ebuild 930 BLAKE2B e936c307f73b44080c3174f5fd659e7c23a488807cf6e1b88cc2e67264e5478939a03f798e736ed453343303225c287734da844c6039450876385d29f55595a9 SHA512 5c04375499ecbf2fbf635536949163824cae501a53618fd07855bb5cd257b32d3728a36c72516f0259d407a8d88966750025a8b59633fbc79a7fe318f99b520f
+EBUILD tree-2.81.ebuild 790 BLAKE2B b4bec87a24051da0d7139d28588cc97b1cc72b80321658df594d7fde2afba5e3b87148c60ba321363e4e51bd85ba0c409d175faf96ca747c60a1645bdba6e84e SHA512 42eb10e31ecb206b0470805fc66da44a4504e016d2aaf9315661997596373d4aad1b87762861e360a5df5b23a28410009ab1991c7253026da5f48c9c9788e501
 MISC metadata.xml 619 BLAKE2B ac5307e69727d5da71a21955619b8e322df63ebd877617c70b494ad541c470ef6df41a90ddf92b132452c293e2fbcbb85f2b72ee372f95491124ab50f7299ce2 SHA512 b2486910e891482643fc8464b11269ca6f83e87a8403edb78b2163e7fa37586b503597f0ea61332439322d257ad239d0c0a210707788043d555a96f3b712cc84
diff --git a/dev-cpp/tree/files/tree-2.62-test.patch b/dev-cpp/tree/files/tree-2.62-test.patch
deleted file mode 100644
index f7022426698b..000000000000
--- a/dev-cpp/tree/files/tree-2.62-test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- test_tree.output	2008-08-28 11:16:11.000000000 +0100
-+++ test_tree.output.new	2009-04-15 19:06:53.174832287 +0100
-@@ -1,3 +1,8 @@
-+-----
-+hi
-+  1
-+  0
-+-----
- empty tree to begin with:
- 0
-  'more text' is sibling 2 in its sibling range
-@@ -309,3 +314,5 @@
-     D
-       I
- -----
-+G
-+H
diff --git a/dev-cpp/tree/files/tree-2.81-test.patch b/dev-cpp/tree/files/tree-2.81-test.patch
new file mode 100644
index 000000000000..c9e675dc7953
--- /dev/null
+++ b/dev-cpp/tree/files/tree-2.81-test.patch
@@ -0,0 +1,36 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,13 +1,6 @@
+-
+-%.o: %.cc
+-	g++ -c -I. $^
+-
+-test1: test1.o
+-	g++ -o test1 test1.o
+-
+-run_tests: test1 test1.req
+-	./test1 > test1.res
+-	@diff test1.res test1.req
++check: test_tree
++	./test_tree > mytest.output && \
++	diff -Nu test_tree.output mytest.output
+ 	@echo "*** All tests OK ***"
+ 
+ clean:
+--- a/test_tree.output
++++ b/test_tree.output
+@@ -1,3 +1,8 @@
++-----
++hi
++  1
++  0
++-----
+ empty tree to begin with:
+ 0
+  'more text' is sibling 2 in its sibling range
+@@ -309,3 +314,5 @@
+     D
+       I
+ -----
++G
++H
diff --git a/dev-cpp/tree/tree-2.81.ebuild b/dev-cpp/tree/tree-2.81.ebuild
index db3b12d49646..cce24586ed8f 100644
--- a/dev-cpp/tree/tree-2.81.ebuild
+++ b/dev-cpp/tree/tree-2.81.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="An STL-like tree class"
 HOMEPAGE="http://www.aei.mpg.de/~peekas/tree/"
@@ -14,28 +14,25 @@ SLOT="0"
 KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc"
 
-S="${S}"/src
+S="${WORKDIR}/${P}/src"
 
-src_prepare() {
-	rm Makefile || die
-	epatch "${FILESDIR}"/${PN}-2.62-test.patch
-}
-
-src_test() {
-	local test
-	test="$(tc-getCXX) ${CXXFLAGS} ${LDAFLAGS} test_tree.cc -o test_tree"
+PATCHES=( "${FILESDIR}"/${P}-test.patch )
 
-	echo ${test}
-	eval ${test} || die "compile test failed"
-	./test_tree > mytest.output || die "running test failed"
-	diff -Nu test_tree.output mytest.output || die "test dist failed"
+src_configure() {
+	tc-export CXX
 }
 
 src_install() {
-	insinto /usr/include
-	doins tree.hh tree_util.hh
+	doheader tree.hh tree_util.hh
 	dodoc tree_example.cc
+
 	if use doc; then
-		dohtml "${S}"/../doc/*
+		dodoc ../doc/treefig.*
+		rm ../doc/treefig.* || die
+
+		docinto html
+		rm ../doc/{doxygen_tree.config,favicon.ico,tree.tex} || die
+		dodoc -r ../doc/.
 	fi
+	docompress -x /usr/share/doc/${PF}
 }
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index e8a162437f37..99d6ed389570 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -1,5 +1,5 @@
 AUX yaml-cpp-0.6.2-CVE-2017-5950.patch 1697 BLAKE2B 7b13c947e471aa08ec718cecfd43666689cbf0137ed6328ab550f722c409f19ec6437a5458180a3c334ebfe899ef67cbee04237fd230ac06fde863c3adc231f3 SHA512 0ba8bb8d81a98b77cde3dd386fe237dd11aae53011419042ff0b72b643ac2c1fdb7753ff524d0c5d319f7d601b417d1c6ab2419c728c4015197f83ce3eaa34b2
 AUX yaml-cpp-0.6.2-unbundle-gtest.patch 2204 BLAKE2B 733b6eed366ca33085251c3c6f3655060d3cc02a77f5f53a21c9163b894400c7418c3d9f032c8f6d460d58b35594f6ba1cd8eea0a667fbe1849a8eb866074ce5 SHA512 8cb227c2e156bd642be29b15ae7a7de9e4839d6f4b5e0132982659eaab442347d3ef3eedd1bfb8f936a5a1dc98b6d41be915f7da53fd6764f8b6becbaf6cff98
 DIST yaml-cpp-0.6.2.tar.gz 1396250 BLAKE2B be342c212c980cdb03349dbafbe1db0bb581123b4dd6909393d3cdc86145b997a9d2f9b57a5e9d7c8cc60cdfd03f1c37e9db610d8784f2d29fdeada5ab322894 SHA512 fea8ce0a20a00cbc75023d1db442edfcd32d0ac57a3c41b32ec8d56f87cc1d85d7dd7a923ce662f5d3a315f91a736d6be0d649997acd190915c1d68cc93795e4
-EBUILD yaml-cpp-0.6.2.ebuild 900 BLAKE2B 0051e10dc95f3e18e0f439e31f4b7a56993726c24ed0da078595f4345c87ddb8a2240003bf0e48c63434cc225446b0e3d60e8b94c71668ed1127e5be1039fdc5 SHA512 c6fdd868f34177c8cecd37d22c78202ec7fe866a4575bfcdb1dbaf6afd8f75e07442bead1afcddd2827bcba49fd3f53e5a24f2473d64c44f0febd5d7737331e8
+EBUILD yaml-cpp-0.6.2.ebuild 924 BLAKE2B 56f3450d20465d940472f09134c538dc5126665006f6342765b089c9535ba8848e5b08fdfe032f56f42e824cfb93803cf59f7818f5fca895714862fa027904ac SHA512 fc57193b84b8e68574ac917aa4248b2675570bb36ace2d4ce85d379f3c9f8a1520cb8e2305cc37a827b5ebf42ef94fadda0e2c8fcf64e3037d9fceda712771e7
 MISC metadata.xml 325 BLAKE2B 8e094a75d87d80e86efaf6ee191225ad0772dac343ae12ec84e73faffc17464c8431ee78018602127fd52441a6b18d09b58127b7d7ea1ee02163f58d327f0f3f SHA512 a4a5de1911c7bfeb37a3ca5aca8b3c044d51230164ac7d14566a9a4064e5202fac0e613089191ea959d0bb3df157049932d394d167e32fc8a432ab35e4cf24ae
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.6.2.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.6.2.ebuild
index 48edca1378e0..627ca917b845 100644
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.6.2.ebuild
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.6.2.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="MIT"
 SLOT="0/0.6"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-cpp/gtest )"