gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /dev-cpp
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
59 files changed, 647 insertions, 135 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index c62c7ba72cd4..23b2fe5d1dec 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index 561a2f5ee6f1..6b33c21627de 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 920 BLAKE2B df5ab3b1362be7c917301615a97a932b867e5edc5f20fdeff93a52c729865e061e94a571f82efd0a80619211d8501aab9eadac609874cac6c3b7d8c072db961a SHA512 12faa8267448b44704c9c227294d937a75ead5cb157c2d512f24b69d3cb15fdfd469e24d5e63ff720636ce57f1e02af86110fec93c12ce14b074a0162cec7a2a
+EBUILD asio-1.10.8.ebuild 921 BLAKE2B b71d193effac85b1774bf187f61b92d40d23fca104a210d18471dfb1b5c7e0d9d9615ba740627013493428ed355156bc927e4502eaf21d2c83c3340ff8ce865f SHA512 022d5a995aa8b5aedcc864fe903c8c4611dc7d5bd0f6e5e3492444d4d5ca374093cf74c08b5a2119f851894bfbe9bfb760f2c3ed2e2945a09ae0df3cb7626849
 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 979 BLAKE2B 379988910a5962ec70151b6418a26d3aed3a18385e9de7d199a4f0bc47211d34864bbe90a3965a479f8c4efc0f1580ac71464e73ef55106beac6b5ddb52320d8 SHA512 349aacaec315eb5cf38b14fc7adfeb420d9d05f9524d1c626faa688b1f5a49fff41cbda561840e6b438204bcc57d1c662b7ab39eb35b3d8d39dbc52112bd81f5
+EBUILD asio-1.14.0.ebuild 980 BLAKE2B 93c1570ab4c7d9a7ebe0eab38c7e59cbe8f0f253f893ee61fce4687b58a180249e196e16131d94d4eb609dc691f3bb2471f938ffc397c0ef6297851096601022 SHA512 e0d83ec9c30147dadad5cf11c151efe4bfde83980c655067639943d19a6d6ab94cd8ca0b8d80d560d348341c9e83fd9d569425e8ecb7b5e9b4a364a80e9cc25f
 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 67032b26f601..dcdcee8f9c29 100644
--- a/dev-cpp/asio/asio-1.10.8.ebuild
+++ b/dev-cpp/asio/asio-1.10.8.ebuild
@@ -9,7 +9,7 @@ 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 ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/asio/asio-1.14.0.ebuild b/dev-cpp/asio/asio-1.14.0.ebuild
index 85d8ca8e29ce..9af756e04a9c 100644
--- a/dev-cpp/asio/asio-1.14.0.ebuild
+++ b/dev-cpp/asio/asio-1.14.0.ebuild
@@ -9,7 +9,7 @@ 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 )"
 
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index dc582917fa84..793aa2e43328 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -1,3 +1,3 @@
 DIST atkmm-2.28.0.tar.xz 891904 BLAKE2B 8172effa5f4dc542020b58d7e3d3bea66b0affa98db977e94249dfd8fa6c4fdea88cabb385dcfdb2d79874017c4e648a737413bae021121d1423d62e335d2737 SHA512 8457cff58648c3d3944d6a9fb400062985c70a714856a5d84d4553cb6b1202bdc47aa48c612851fea1cc1b7ab59381116c65d2a22212907e3c4b7090601946bc
-EBUILD atkmm-2.28.0.ebuild 823 BLAKE2B 937e519ab6f1f2facea07f378ba9ccc7a5c9a6b2f917afa18eb5c4f1153654bf10a87c1f6c9b102baf8593bc7dddd13978034cc0997c7eb72a8433493239775d SHA512 ffd582b818b4dc2f27e7c6017ebc1f0d4453e13e8a5d09f0c23c441b58489cd05fe173ca2b6590746993de75fefd10a0cc1d12cfaa52bad1341ba6f6dec3499c
+EBUILD atkmm-2.28.0.ebuild 820 BLAKE2B 7c1f0b1df7be64edeee9f602ee8ac2403614b4122b4a7f2e46b158c840702f08f252c399873f1ce5e6f5f0782cab4d14afd7de122b1815f8895ce5bca701999b SHA512 9ace55c82803a6d45277168da4b2e6c8af8058f0db1753cae978d22082425f01df371573353be4e3325edc490fb8556615dcfc2f949e185340979ad0ae79afcc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/atkmm/atkmm-2.28.0.ebuild b/dev-cpp/atkmm/atkmm-2.28.0.ebuild
index 7aa82f9f4e76..ab767bba974a 100644
--- a/dev-cpp/atkmm/atkmm-2.28.0.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 COMMON_DEPEND="
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index 16914face898..4d75d7dc63db 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -1,3 +1,3 @@
 DIST cairomm-1.12.0.tar.xz 789588 BLAKE2B 4c864705ce4b232a3dcaf7251cf22f7f9ac2f964253552cdac5a115bc7e085f38a58375e33f99ea03105b59d056a53e91ea9234c4c6b49d8701c01c8a1e12dc2 SHA512 750e05f079c2ee9786d1a1ddb66ff90405549a82aeb542d585f904f7147994a451950a77ecb563f290cf2358f7010360ab03d9aa3a319651615c48bd25aeb7e8
-EBUILD cairomm-1.12.0-r1.ebuild 1236 BLAKE2B 583102411d0f4f530fda6c675a98c5c3e539de312405cb69aed4b7ece538b9a49e3328f0c43010fcd6b644b7a3d876647a6e16580b9f8a1bb50b20ce18b61178 SHA512 ed8ae820ecd118da50ddac4d507a8f1c1c0dfec139ed11199ff9a6c81b83f8cd32b7bcbfd2f49e56a29d66d187fb46282d400e3fe2303070b05dda79dff79a03
+EBUILD cairomm-1.12.0-r1.ebuild 1233 BLAKE2B 0f37547d741116ad12f83b6f868e7bd0ae3f34662e3be7eda3bdda0925dbb76a58ad87947d09dd9e22a569293754c4b6b1ee5f85c15f903415f567a1694d3e0f SHA512 47c2d9e2be0ca10bfcf8611f9fb1bc23fc0b59011aa3855330256186d6b732fe5c7c67a3d58fd55e282f4a1b2e500f4fafa6b81fe5b36ae9b709675173ea6e92
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild b/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
index 327a515e90d3..98407388284e 100644
--- a/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://cairographics.org/cairomm/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="aqua doc +svg X"
 
 RDEPEND="
diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest
index adfb93385a5a..f5b2cd13e8a7 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -1,6 +1,7 @@
 AUX clucene-2.3.3.4-contrib.patch 1697 BLAKE2B 2aebc143ff0dafb2765cb3bd5d8e5183bdcfa7cb51a6109e957650412394796c7825c38dab9f1f9637c436b10714624dcbcfd3b6ab88dbfef9c5de9582e65ccc SHA512 0aa92635949089196e4e7c579e78761e8751987ef5036320a161a4aaa67da3c63756398c903419c76ea0fbdc8a949e871fcb65be98179a9853a24a5a4cacfde3
 AUX clucene-2.3.3.4-gcc6.patch 1102 BLAKE2B c7a264585532237d38ad5d06d1e1b96559e47145dc9ecbfe73ec6b8a493fd9c0eef73611305de213e432dd94736dc49dbc140b47d0c65081228989aa21a3fe62 SHA512 367e97d9b5d59bca880d8ec70b37078406f581267a896ff6b35cd3ab21f983f4b21152482bb34fb813e426b4cae14a6d319ccdb08e3bf968de8ece3c28a18722
+AUX clucene-2.3.3.4-gmtime.patch 477 BLAKE2B 0c453684f6850ad7eb2eeff2624a9d23c7ea5f78321447b75acea625add44b7cae8c8c220c8848ed8ac39c66f8329f20e9c60005a1e2d237097771ecb0c2370f SHA512 1c23c08edf5512c29a061e4a8515dfa209151af83e46680842f0aeee1269d529a14fd4a89aab7c25312fd7dbb9daf80912a265d21fcf08ac892a467be4a59a60
 AUX clucene-2.3.3.4-pkgconfig.patch 871 BLAKE2B a108d0c4427159a09d2575b351bedfd38c6305219e01a7927b66aacfcab3587d3c08315f0a7e58a123e6779d2d8fec17fb06127de32dfd5782408cbc5c916ed5 SHA512 afcdf00537c8eb9c75ed569356520551ea194c8edc636f6e82bd0b1ef60e33396c1e2722b895aced2b58358950b3c5c1df2a914295074e9e99485ca6cee21c18
 DIST clucene-core-2.3.3.4.tar.gz 2241498 BLAKE2B e7c02d3976fd8d722a81ad4c6d43363b9af0073aa68edb8303cada495f8b8514cb8c86a85f398f8c9ffc1f78a49c0718cde5af4145c32869572d21e8af633846 SHA512 1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4
-EBUILD clucene-2.3.3.4-r6.ebuild 1476 BLAKE2B 79cc71cf6c2ece056fb094c96c28716292934a9f4ac96a83afbc73910bb3b725f99ebc35dd05fc3f632ed3ec70a01cc8c659e02143fd8e674def73eea3b8caf4 SHA512 ad10892d454297fd70b67b3b659936e1312c337df041ac4d379f2a869d065840cb3fd8f0a575cc741d33cbb2d07f51fa4c536b1cdd80cea130918fce008ebf63
+EBUILD clucene-2.3.3.4-r6.ebuild 1510 BLAKE2B 36fed5853662e37fd13c289a9e3befd4ce967b0c2556df8a2da50bca625c3c6a71c782b92f2bd6457e3c89113a228c6bfef1a1c1d354a4934b09402193a99758 SHA512 8ca35d6f73ceda51eef1f4a45df4a962566ddcbd7070d6a6bc065e9cecd0cd94512674e481170fc641df26256c3bee35120a6d024bcecb4357933571d19cb002
 MISC metadata.xml 242 BLAKE2B 42f16f7a7f490260e103b34652b1751b3163c9fa9654b5f8eb155b209d6c57b93634afcb3203b4fdfe45fc8ac2c3e13182750a2ccfd9c8e726bb5d2ea26c69aa SHA512 8408d869c113d8c878e461e3c796233d353df9869af2424361aae629888ee96876cd2a6a00ee8a39ae2069477821c1c9150ca8169723e46167165c39fbc4ba19
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
index 31b96850ad9e..e0954ce94fb4 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/clucene/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 IUSE="debug doc static-libs"
 
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-contrib.patch"
 	"${FILESDIR}/${P}-pkgconfig.patch"
 	"${FILESDIR}/${P}-gcc6.patch"
+	"${FILESDIR}/${P}-gmtime.patch"
 )
 
 src_prepare() {
diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-gmtime.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-gmtime.patch
new file mode 100644
index 000000000000..d4c702bf217b
--- /dev/null
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-gmtime.patch
@@ -0,0 +1,12 @@
+diff -Naur clucene-core-2.3.3.4/src/core/CLucene/document/DateTools.cpp clucene-core-2.3.3.4.new/src/core/CLucene/document/DateTools.cpp
+--- clucene-core-2.3.3.4/src/core/CLucene/document/DateTools.cpp	2011-03-17 03:21:07.000000000 +0300
++++ clucene-core-2.3.3.4.new/src/core/CLucene/document/DateTools.cpp	2020-02-21 15:20:17.382575302 +0300
+@@ -9,6 +9,8 @@
+ #include "DateTools.h"
+ #include "CLucene/util/Misc.h"
+ 
++#include <ctime>
++
+ CL_NS_USE(util)
+ CL_NS_DEF(document)
+ 
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 6e4b33f33c43..d254b5aa7808 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,3 +1,3 @@
 DIST eigen-3.3.7.tar.bz2 1665168 BLAKE2B 544d35d1c7a4125affa094c6aa372c2aeca4e99bc60c496ff393d538c1c467b454491a772121450e3a1a43a582d073b4b7584918354d0b9175121fde88947c4b SHA512 c12bfd034d0a1112bf2df3f773ad98f36b2b53fbbfceac5f143ee1793322746fb8a6546d7db7da2a1000da6a535bd8cea0c4125b549afc90a6570743b02dcf3d
-EBUILD eigen-3.3.7.ebuild 2206 BLAKE2B d7dc78764dff2453005c3f69357444c5f16c2ed661ea9fa1d500430182cd0f41028c6eb8d843a507c9e206539a1eb2a59241d581ce3e82799526b66fdf807843 SHA512 9d3b60bcbc0ecadf82e08ed7f771364caa206d81d43f92075e6a15c6718c8e36bf00d6411974472cab2dc0dc8adb1b0894ba34d3c030de8ae9c5b00de8fc55a2
+EBUILD eigen-3.3.7.ebuild 2356 BLAKE2B b3a5f8f30908af24cd5360079b95d27310741cf4aa222835370528c122b06b56a02f53aeee64be985474d41382d17c6ce6eee74bb64fff0a58924ab1af124da8 SHA512 5cdfb466e2e4745e470a89c0ba58369f20c3b7bced00187cd302d3b73d5ecb6cf16593dbe8224e193708ad73d5cfba0019269676e6321744456ed0b18cde4f37
 MISC metadata.xml 945 BLAKE2B 1e9f416b0c69bc66b08934efc902a21f557bcf5b910439dee978b46a11b0b6767681d6bb298402b050b3e994b56ad9163b91c2d526f8fd04eeb5b9ac3c74f451 SHA512 c5401b0251bf5668117951522b019e6fcce6b5ed41ec933a6edec7869ed5505040d8f75fea7c4c17eeb691f331412bc3d2a7103b7f706cd582496feb6e7a3e57
diff --git a/dev-cpp/eigen/eigen-3.3.7.ebuild b/dev-cpp/eigen/eigen-3.3.7.ebuild
index 2a09fbdee111..25453c922e94 100644
--- a/dev-cpp/eigen/eigen-3.3.7.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,14 +12,21 @@ SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="MPL-2.0"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="altivec c++11 cpu_flags_arm_neon cuda debug doc openmp test" #zvector vsx
 RESTRICT="!test? ( test )"
 
 RDEPEND="!dev-cpp/eigen:0"
 DEPEND="
 	cuda? ( dev-util/nvidia-cuda-toolkit )
-	doc? ( app-doc/doxygen[dot,latex] )
+	doc? (
+		app-doc/doxygen[dot]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
 	test? (
 		dev-libs/gmp:0
 		dev-libs/mpfr:0
diff --git a/dev-cpp/gconfmm/Manifest b/dev-cpp/gconfmm/Manifest
index a893ddd36334..e4238468c636 100644
--- a/dev-cpp/gconfmm/Manifest
+++ b/dev-cpp/gconfmm/Manifest
@@ -1,3 +1,3 @@
 DIST gconfmm-2.28.3.tar.bz2 471125 BLAKE2B 834d63ee91ee6849970ce612c387957607bb3e723afb06b0ee8dad0336ae81c3a4c40a81846d6abbb425b5f3f0cbad026189d563a814d8acd1010f3b1dbdfa93 SHA512 0fd3a43373dfdf514eca61537c19dafd4ad582d2ec6bb325652766fba90ed723feff6daf93effcdf20f917c573131d58c16f1a826194f653864a701bb8a57097
-EBUILD gconfmm-2.28.3-r1.ebuild 723 BLAKE2B a1710c212e55614af1b5a084173d028773728fc95f39774b16afe0e6287c4914935364ba1946f824b1100a58c7016784560160f71d19011c42a4901e26e9d9d2 SHA512 d0305c37c6f979b6565d14d15237024c579f6e60558cbf31e68a39555c03a838304d6957396677e44772734fd0c0fd17a727d54b144673d0a46be6d26d71c2af
+EBUILD gconfmm-2.28.3-r1.ebuild 720 BLAKE2B bcd3ed3d4f219bc5e886b3e2afd38b0f1cf6e25daf42e00111f15bb7d9e3d45382c3134c667820c7b31df3d8aa3612079da313968138757e8fb99b5029219845 SHA512 67eae5c969a0ae1536779269b31717cd641101b0cb1bf078a70ab928c8178d708c1264e607112c6ab37c16d4ac547359b87284b4962c910f39d5269fd27aaf2e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild b/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
index f26eea03b286..5fc75bb2c584 100644
--- a/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
+++ b/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-cpp/gflags/Manifest b/dev-cpp/gflags/Manifest
index 7e23bef8debb..84d4c36d1068 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 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
+EBUILD gflags-2.2.0.ebuild 1046 BLAKE2B 16e0ff6295c8470e74f27ed0f098a540feaf450ba16f4e6da0fe23b956e242597ca375ba0e72b4e7e244dd79b05c499156a68b1da48ca7d1400d1af5604ee6f7 SHA512 2d98a05a69d1705b71dfe1c3d6cf7e584716e4178ae75ed327c110e81e35f69c709cd2914c6d7d9dc91a1246e397a0c7f7f307294878f5ce278224657f5ef71b
+EBUILD gflags-2.2.1-r1.ebuild 1017 BLAKE2B 226bc239a301b8524db2dca90550cf6cd273241b9939b98dcbd5a910e5119917cb1df6155516b43943e8694501f1b17a00e5df88fd9c5803aeeb8c82f6907519 SHA512 cef639c5c60e1d914edf537a90579f0762b96ed7c2f733fb366b87853d6c8bc29fdcf8719ccc7e20ae1dd8f2fda1c649b14028e9be9df713d51acc9c2af726de
+EBUILD gflags-2.2.1.ebuild 1050 BLAKE2B 341cd184b635ed67f52eb2b7b09ef7acc38af32af11c448419d143bd09768b6eb857c5c5f40b4776511842e503a861c2793937a8650ebfe29264202bc79d4b0a SHA512 39cbc290c2c51a2419eabb02d754363111fe5e2866fd3f0e8c0e8bfb814d31dece550658d45a203269bf71aae1be3bdb6bfffdde67838de700b709e53d7116fb
+EBUILD gflags-9999.ebuild 1023 BLAKE2B fcbc98b3905b1217437dfbca41ea80895561a95dcac2cce72ba44b1d5cfa47a8748f080e7d17dbd309ea828384fa2626049f49d74a19839be6cd56677a3b8458 SHA512 689641092ec7d8809e8dd259b23747ead84c21a250f3fd1b3ade473dfed72a1d9bc92b9f7c02838efd456184a3d7ee9b86edf6d0a5147ebfe538fe4bf238a02d
 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 f66d07061871..6bf713cbeaea 100644
--- a/dev-cpp/gflags/gflags-2.2.0.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gflags/gflags.git"
 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 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Google's C++ argument parsing library"
diff --git a/dev-cpp/gflags/gflags-2.2.1-r1.ebuild b/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
index ba91e0c6d750..3a7f4b44bc0e 100644
--- a/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Google's C++ argument parsing library"
diff --git a/dev-cpp/gflags/gflags-2.2.1.ebuild b/dev-cpp/gflags/gflags-2.2.1.ebuild
index 5db328953269..5425bbe89abf 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Google's C++ argument parsing library"
diff --git a/dev-cpp/gflags/gflags-9999.ebuild b/dev-cpp/gflags/gflags-9999.ebuild
index 60c68630cba3..e8121a0281aa 100644
--- a/dev-cpp/gflags/gflags-9999.ebuild
+++ b/dev-cpp/gflags/gflags-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Google's C++ argument parsing library"
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index cfb7df6e3dcb..f3a9ec62f85c 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,5 +1,5 @@
 DIST glibmm-2.60.1.tar.xz 7132072 BLAKE2B 8d25287b7805d7196bffa909447db0e0fa0edd1c243b3ccdef91f1a6573ea0723cda8e88993e878e6c8440b23488b0ab8c9ed727bd4e2d4a46f56ba251510aa0 SHA512 89f1d10bd9b60232519e2e13c02b0b1010dacbe67a8bab06c3a5873649e5090ed3593d518bfd8e12933a08aaa5fc654b1475efc208e2256c7efd197274a28b79
 DIST glibmm-2.62.0.tar.xz 7398144 BLAKE2B a289c2e6a5737d9fa3d507e4741c1d19e949244db5a6eaec2329bda92e7e0a78e33acf9668ced19a52507fa88531da63fa35cf59dfb44ad2a7a8fa0839c7dae4 SHA512 f26fca5724c17d915480556b6918ae6e4999c14a25e7623cda3d37a59d6965310fc2b2d8a8500a849f1d0f00fd2d326eeddc690207846d38a13ae695ad0805de
-EBUILD glibmm-2.60.1.ebuild 1651 BLAKE2B 6672498e704e2aab7071ca19f86f51fe86e289c1b1ca9fed72cf8c14e0762f07aa70876988cc97e6e984c053ab451879c4d2150d9010418255ecd8ecb2c402a9 SHA512 55310697006ba95633883f8312975393f344de06a0563330633383b9e706e88efdf0ae21cbc9f352650d9ff6ad022943599b1f44f0ac1da17cd91040092b59ba
-EBUILD glibmm-2.62.0.ebuild 1659 BLAKE2B a47334e031916dca17e78c13f9dad6043426932dc3846097e56f7cd714e59c6e6b15ac3583d179e86e315665ab7de0b7190187176d96499dbf94e4ed9dc9ddbe SHA512 021393113c2eafd26487ba1a7e3114c05c5761bd9f4a1d485e0d194f4b936ee4dc0f4c0ed22d305b06af57564b8a516222072a342900d246213c907041540da0
+EBUILD glibmm-2.60.1.ebuild 1648 BLAKE2B 4e2800b4483644eea1703ddf521b6d197242106bb154a1697f43acd5d8c07365511e1a96c78975a9c667abf5e124f0a5077e2da31e859a0ff83489f87ad62259 SHA512 e2512a80fbde0818d5bb2c0179f6190f7de7b37db9a5e5da8698f27fd16424a91fe171ebf93a980130e05d31b4798f9044fff79708711a6af268742d38bb2445
+EBUILD glibmm-2.62.0.ebuild 1655 BLAKE2B b14b839cbf42dc31bb0489a98fd55fabe68d8ab173b7e60c709274fd3c01a854903932c44af12e0c7cc9f3514cf5da390f83c1f715f8234ae20cf01dcabc8b6b SHA512 0742f97a3a64c0752dd03178860f0bfe0fefcd01698e9fdd63c6ed40d43f6df281259a3124ad57fd84babbe882a1a54d1b3672661ac5eddc9e48e313ae4b6934
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.60.1.ebuild b/dev-cpp/glibmm/glibmm-2.60.1.ebuild
index 8647553c6a74..669f7e082008 100644
--- a/dev-cpp/glibmm/glibmm-2.60.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.60.1.ebuild
@@ -9,7 +9,7 @@ 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/glibmm/glibmm-2.62.0.ebuild b/dev-cpp/glibmm/glibmm-2.62.0.ebuild
index e960ee6c6188..105f3c349b62 100644
--- a/dev-cpp/glibmm/glibmm-2.62.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.62.0.ebuild
@@ -9,7 +9,7 @@ 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index ad87dea29b5b..4ed25a574318 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -6,6 +6,6 @@ AUX glog-0.4.0-fix-test-on-ports.patch 804 BLAKE2B a06a45c977ab55f086e707ad2ea11
 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.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
-EBUILD glog-0.3.4-r1.ebuild 1197 BLAKE2B 305619d9f73639f5b3584e8e2642f87ca902262f188a2dad9658e1c619a470c188c8ac54861a65393297d3bab0f6626a3ee2edc7e42ab389bb2e65fb94a49688 SHA512 d6e2f1c5c77b0176703420daa28154d57fa2f2b14ad7f130c7d0c03fe315e1947cacfaa1ce21d93c11133fdd7327c5567cc24161fb3ac53806261b9ad033a03b
-EBUILD glog-0.4.0.ebuild 1110 BLAKE2B 0804274d73a4a3f101292d5801b7ff024a0d51994239cd037d1465811b2fb50bb5f16149335fc4501a2cc13b65cee728dbfc2f54fac09f996da179b864bf25b3 SHA512 5459d778aab7e1dd4525d17398b557bb4bf64c51ea87f18b36ea133a992e4007062e9b41c219a8403053f4923b518166924b14f44d363513fb0be4cfeb67775b
+EBUILD glog-0.3.4-r1.ebuild 1193 BLAKE2B 5edba9934d0be32947628a188abff72cf850890689b475b5aa44996250b9856b8c1252e0db3b743107c949841c3c5d971630dc06658b5eed7b7d980fa52f8908 SHA512 d6fff16d5644dfb01487206b294684873682e40626b7e15d3e49ccd99869ded57810f7f77f7d98bea86cc69d4654ca3b7fd5b9d69aaac083bc270bd14e0090c7
+EBUILD glog-0.4.0.ebuild 1099 BLAKE2B 075ab12778de2d485f93258e62794e4b9d3acab0f62ea924f420fd25a3b84dd0fd3a18d38774fadbd39e671b3f006595dcfa39a0dcc9d7cce2ca722f05ebf264 SHA512 784a820bd3955135c7498036b7ed7e7836e7d10570c5b65d9967bcceb7adaec918e84cf1c4c0e82568451678d68b57463235b0a2dfc635f43451edd3e65439e5
 MISC metadata.xml 719 BLAKE2B 37aafa6b3ad08d9e26bcefd30d0f86b2d8339feec2b07818141e5b5b643287e7972e1f6328aa1f1a3c8dc6d2b9eb9692a5afb3064a690e69807da95c96d575d8 SHA512 6d67b0656b906fa51d657f00d8e801ae11a1db2ebee5c99e53278cc88c63e828f8a0770dae9e06a4bbf3947eba19d08380da849fa588c3fd061f66955eb452de
diff --git a/dev-cpp/glog/glog-0.3.4-r1.ebuild b/dev-cpp/glog/glog-0.3.4-r1.ebuild
index a824fdc5f5f6..8691df884e67 100644
--- a/dev-cpp/glog/glog-0.3.4-r1.ebuild
+++ b/dev-cpp/glog/glog-0.3.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gflags static-libs test unwind"
 RESTRICT="test"
 
diff --git a/dev-cpp/glog/glog-0.4.0.ebuild b/dev-cpp/glog/glog-0.4.0.ebuild
index 197e80a74913..97fed7a245c2 100644
--- a/dev-cpp/glog/glog-0.4.0.ebuild
+++ b/dev-cpp/glog/glog-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="gflags static-libs test"
 RESTRICT="test"
 
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index b2ad12ffaa2c..31c6433a03ac 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 1741 BLAKE2B 0c7aa86a1f1c7383083e7b9984ac42637271a82de50d2885c4da1bc70d960e155dd9396414ec0a59f46cba21db7e9d87ad2d44f57ad0352e60bb4df36191b4a6 SHA512 37b781ec3ab381d4fc2d4de0317044c82306fdec8b5bb9bd31f16ab277a3ecbd288ce95c79723d906a3df54fc34115ea528003c2effe430048c6217e3a44ed01
-EBUILD gtest-1.8.0-r1.ebuild 1657 BLAKE2B 047a1a6f5f268097a07d9247bcb21ef4376b8a57a33f5124d0c352bc4d8b69cabf602b1a1d7b4df0820794da0506ea695f13719578ee586af1a5da91531fd965 SHA512 53e5796ed9e5fd83eb613ee7502270a309ee3e29f7d0b56f1ca505b2ad53a36b5dc3b7736f4638e754b81093d4ea0117480606873131890ab5e09f54bb06f3ba
-EBUILD gtest-1.8.0.ebuild 1619 BLAKE2B af6333caaf4ceb69c2da395de298c1b4143590f93c4772e08babf818d8355caaf479e7e6049a728c45d6f4900486b49b5d830dd817c9ffbaf6d6545091b61ad0 SHA512 9d4a437b4f44889bee07c188322801428384e17850ed59fa8c0249fe608a74291f80707c89b69969667a3e00b2998dc3181f1f8319adce8f25dbff144ecfb593
-EBUILD gtest-1.8.1-r1.ebuild 1668 BLAKE2B a63eea44c8d7757ffd095878f9e0231721348b7a393ec22460d5a16fbcc13b547ff64c763afa23c5f149ea403d7d7cda1c8c289252c4bb55b2bdad506cde1490 SHA512 2b8b2052cdf95a0bb3cc34f994241fab2aaa2025047e7bd28abc3935909678f04f6bebbd0fc8bc53fa0d49e26d2d61c2de2728c1e3bdb3e9215dcd1341afe0d0
-EBUILD gtest-1.8.1.ebuild 1686 BLAKE2B 725aeb5f466117fcff146ce21a8b24c217e3b93a0d29ec818ce33e8be86d5cde49e496e2f89ff8d5be9727493c784d05c1fe62676eb109cbb47c7e8923e5bd88 SHA512 de9df7378257daf7230b3ca2dde490f12558182c8b11f338ddfd3686a11532f5e5f1a5a37c607ac39bc08c33642e5e355d115aa0d771342f3ce0f8adc88fbafd
-EBUILD gtest-1.9.0_pre20190607.ebuild 1761 BLAKE2B 166da65b61beed61e4b0e0a9f75a140a51d8efb615ed5a9e600116ada3aeeec0490ea157f1d351cf20e78f188145b68e8c8351bbbd07c497bfef10bd4b5c0c04 SHA512 e491a1ba99580ded0fb029085bae44515a1012848608b29a1c74996c7ea91d76e04ba97cbe07f9b9e2c238c5ffbdf65cb06219bdefe27ff578de880be8e11fd8
-EBUILD gtest-9999.ebuild 1728 BLAKE2B 30adf75fda012ad988d1d164681c2934261912ec2ac10e46b7e426dd20c141fd2e3e3438a111945b30600b87c61a3d8d959830ae00e1d931aea69b0f4533b8b2 SHA512 ca8cb3485bd24e53d84da167ab9302674af422a90a2c1572328bdf75d99c00c18ff70eadd5ec7f4f692bcd0e69473ad3cc2bf20fed34786a0d8412d5935ed00c
+EBUILD gtest-1.10.0.ebuild 1737 BLAKE2B 1fd5e2da577f2cef04221fdfb3067271315dc9fb1f26faa7c4cd089c3e6fc16371ae8653478f41f11a5a6d19872e96942a91e31a2c0c7e0b1abedf2ddbdffa16 SHA512 907824429dbd2ad887d95bea35bbf4b0ca0f40ef88701f21d458d1c74fb120d340083d7bc2deec6488e59ff130a485797e512020a4d47ee074dc8e5b5e29ac5f
+EBUILD gtest-1.8.0-r1.ebuild 1654 BLAKE2B 9381e1615e94c729584b22ffc3f7df0b214b2dc98fc9cfd726840d09f1362a01158db13a511fb3d81864496fdf6aef08bef95f14940b11bc95073aaf60290f93 SHA512 41c059641a5fc682670b8c6a44bde761d37d839a0bfc39eedc0cf6ea796e6eb967f6c71c6f6e9522b24e9d255f9290cdee3d813d365ce0bef412dd741806642b
+EBUILD gtest-1.8.0.ebuild 1615 BLAKE2B 93c85ff5d8e37dc39bb3140f4895a4363f03f0e9f3ee0ad7906dc77a5bd07661a70713476aec8bbf9997155c072c68c1262e25f757c1f436927139f871068363 SHA512 8318f473552901bd2b93855aac9cfd5329361e800600422fe3f8a3aafb6a10ef65fc052e66f90c8a05b04da227dced540a9f9b4828defda5ef950d48b639a9c1
+EBUILD gtest-1.8.1-r1.ebuild 1664 BLAKE2B a49c61695009bf8ef7baf7d6a12d2192ffe5cb624fcf400c8b50ab432a3074abdba5e60a83dc9455658f38c1755b1f36c743745e408ba419d4c3d54b603e1964 SHA512 0eb3d7912331b19df27f1b24628cc1cfff1a1d0a40d4f4f944f0150c9e1300b4b74ffc7dfea5d7e72103974ae29c25cfa3a9f6c803b32505566b03b340287a55
+EBUILD gtest-1.8.1.ebuild 1682 BLAKE2B e9600cc6895b4358600037718074a50e2a9314d32d4e8a6e9c56eb72b57efa3d8854303c394213e5983485e3a8367ae05691ae6f2acbd191c08a8c736d254dc7 SHA512 436c68370dbba677494920b4ec1ebbd5430552b47e4f2ad4d4d8b3def4d6b5de2ac42b4867506379da023c6ade7aa2b4f2ad1ea2e4f243d3b8830f0c8b8f2be2
+EBUILD gtest-1.9.0_pre20190607.ebuild 1758 BLAKE2B ade6b31a300fdcdc0cc43524640fc82740595b2b8be848848c77c9395dd609068192faf910d5dfb85e951f83847bacb1837c05d5e4b081595f6c3c2a1da18fdb SHA512 11a96924838187431e8e5a9713dc4885932edbfd912bc1d7291f6f55aae591d803526a20aa43d94b626920a4592bacdb7fb98ff54469f16b990f38edfc89cdf3
+EBUILD gtest-9999.ebuild 1724 BLAKE2B a3848289a32906b5f7c6b295d0560de87e1f17305fe028c7f21a0fcc9ef775f7e843c4a0bf7355703fe4956d97ed4a05b8be8ab17fc8baabdc8a668a4a05c8c1 SHA512 328e111ad8f48970b330a647b545470ac54bf5cbca1a6f18e9b68def364769021999721043798e133a157e6fa37a0cefa678ea8bb13542d07cca8743f13fea54
 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 0b947a853db7..12d496c44be4 100644
--- a/dev-cpp/gtest/gtest-1.10.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.10.0.ebuild
@@ -20,7 +20,7 @@ else
 		URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}}
 	fi
 	SRC_URI="https://github.com/google/googletest/archive/${URI_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 ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}"/googletest-${MY_PV}
 fi
 
diff --git a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
index 9944f7eff03f..bf4d578fa31f 100644
--- a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/google/googletest/archive/release-${PV}.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 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/gtest/gtest-1.8.0.ebuild b/dev-cpp/gtest/gtest-1.8.0.ebuild
index 1c2aa8c95760..2d1d2af328f7 100644
--- a/dev-cpp/gtest/gtest-1.8.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/google/googletest/archive/release-${PV}.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 ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
index 5d8eb1931893..030ed3477e90 100644
--- a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/google/googletest"
 else
 	SRC_URI="https://github.com/google/googletest/archive/release-${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 ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}"/googletest-release-${PV}
 fi
 
diff --git a/dev-cpp/gtest/gtest-1.8.1.ebuild b/dev-cpp/gtest/gtest-1.8.1.ebuild
index 586c7e0c69d7..4c66697b04aa 100644
--- a/dev-cpp/gtest/gtest-1.8.1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/google/googletest"
 else
 	SRC_URI="https://github.com/google/googletest/archive/release-${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 ~ppc-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}"/googletest-release-${PV}
 fi
 
diff --git a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
index 444f70e25348..9aa2139201bd 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-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}"/googletest-${MY_PV}
 fi
 
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index 8efe9ee65163..753803041fce 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -19,7 +19,7 @@ else
 		URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}}
 	fi
 	SRC_URI="https://github.com/google/googletest/archive/${URI_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 ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}"/googletest-${MY_PV}
 fi
 
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index f4358d306ccc..a3e2b7d8e477 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,5 +1,5 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
 DIST gtkmm-3.24.2.tar.xz 13336236 BLAKE2B 93f3a04b8a2f02323bf6a1161c10eaae2ad9c26d0e235b1658fc7abbb8d48f67abc42739726c4b6657fa59b033b3708ad1428e629538ab5a6fd27590f5311f30 SHA512 c8f9f03d54006a729fdad7563d3be37aa180f9153c222314c1b8cfddc5ab417d184422a1d44f780574248ea52e679f1e360eac67e03f67d29ecf847c0ab19689
-EBUILD gtkmm-2.24.5.ebuild 1555 BLAKE2B 17ad219b34da1a9188765f58cb8152f7f3136f01d45a2ee26f98ce66bcb2394a9512c85f692b78f44ba302ae56d80ce16b4ca94258cb227ce5cb73ac5618dfe0 SHA512 4de8d15de0fcd94fa3e8b9c98e641b215f28de3281013999c0694437240fa961036ba5320a21fc563b9c2b87695b627892785bf4881bec3631f1b9b167c90dbe
-EBUILD gtkmm-3.24.2.ebuild 1874 BLAKE2B be05332c336138b7834bfad9ab96db7c19851bbd1b480ff3d3c3450de13ac536861d68f793ea351fa1070186b26d069e99efc5ca852c222d1436eb90d7151282 SHA512 919abc6ef78a577830ac50f4fb929ab489c9fd52e3f3b080be40ba557f75a65ccb4ca941d5d4264054da17f78efa4f49e855d4a4a92d7e128482321e95660cec
+EBUILD gtkmm-2.24.5.ebuild 1552 BLAKE2B 6a5463f40eaf99f01745680e9487f5dc2d0de1cb2e56090b2b55b12921bd9afd73281fc4892c8d79be13d01325ce5f3296a7096f07e0b5057c20690595863016 SHA512 0e6ea19b1c6cf24e202ea3e25b49eca8e5246cef2a43002942029067fa60a622dcf9fdbaeeef63cc9990b66190d166321b6e81f20b901399b50061dfd7e399c1
+EBUILD gtkmm-3.24.2.ebuild 1871 BLAKE2B 0f48e3659c01a22dd6beb9b08ffa0a163d2e0505f15ed50e976beb8c9c92f139e73666b3df20231772e7a66c46a93d8ed53700167011355c4db4539956992c47 SHA512 464f07a4306d8e26c3d6ae7a41fa080037af938546efae8a66dd6dc95fe259c4b73a6d981b44bee1b414986150a5cb26976164fb8ec9730ead8910e2c458e58e
 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 719b4a6451a2..c24a8be726c9 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild
index dd0b86179285..c3fddd7e3b3e 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 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE="aqua doc test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/kokkos/Manifest b/dev-cpp/kokkos/Manifest
new file mode 100644
index 000000000000..7be27615bb04
--- /dev/null
+++ b/dev-cpp/kokkos/Manifest
@@ -0,0 +1,3 @@
+DIST kokkos-3.0.00.tar.gz 1923287 BLAKE2B 4a2935e9388b3d577d6ce8678cad37830970222e6ce8a9c3db67633cb521440f14fdb380f03d3c77cd5ade85abe94aef97e9cc4949cc3a140fae958e0c15fff8 SHA512 c9daf62a2c92462c815aa241934aca5720bac8f88195635ae5a3ff4111d289a48898d32358b91e120756d3412820050297a76f44828f4cbc0b2b837a736e84aa
+EBUILD kokkos-3.0.00.ebuild 1024 BLAKE2B 1fb461017af3ce32385a579a9551b49bf8b8d98962f158c316562e2c8123ea6b1237585ac11ae2104354a1580ca9bef66dbbbd0fbda83c00de1b75b874742f32 SHA512 eda4aad0df902b602e470469c7c1127c1467cbdd48dc5cc9184cc2636bd86f872dbfdd6dbb6b8f793797342fc8f1901dc32a4a87e364017a9e91cf075a41b118
+MISC metadata.xml 253 BLAKE2B 58dd329781b98af52e191fbc6b1de24c80612678e467d126dc77ff0559c12eb8fb48546ef7a240f64fadbe289039adfb87dd2b0c8ae01bd9210bac81b2b385bf SHA512 a931cf8d295191e246377a75882955524e9e3a86aeacf4a5067c0025b6a03d608cdfa6763cfc53ba4a00cd6ee4b7db42d1a042dda5e74e578047ad42ad92be50
diff --git a/dev-cpp/kokkos/kokkos-3.0.00.ebuild b/dev-cpp/kokkos/kokkos-3.0.00.ebuild
new file mode 100644
index 000000000000..1707ae8abba0
--- /dev/null
+++ b/dev-cpp/kokkos/kokkos-3.0.00.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="Kokkos C++ Performance Portability Programming EcoSystem"
+HOMEPAGE="https://github.com/kokkos"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+openmp test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-apps/hwloc
+	"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && \
+		use openmp && ! tc-has-openmp ; then
+			die "Need an OpenMP capable compiler"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_INCLUDEDIR=include/kokkos
+		-DKokkos_ENABLE_TESTS=$(usex test)
+		-DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON
+		-DKokkos_ENABLE_DEPRECATED_CODE=ON
+		-DKokkos_ENABLE_SERIAL=ON
+		-DKokkos_ENABLE_HWLOC=ON
+		-DKokkos_HWLOC_DIR="${EPREFIX}/usr"
+		-DKokkos_ENABLE_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=ON
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-cpp/kokkos/metadata.xml b/dev-cpp/kokkos/metadata.xml
new file mode 100644
index 000000000000..ef6b5dcd53aa
--- /dev/null
+++ b/dev-cpp/kokkos/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>junghans@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-cpp/libglademm/Manifest b/dev-cpp/libglademm/Manifest
index 085f6c67429f..fcd6e7417585 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 1586 BLAKE2B 6adc1a1cb24236997f37e6695621a428457bc7f432d8f249c242e0c869a7b849d9f9242d99cf69412d55fbb980b50e12d350a83d47a65e6d9bfeb1b19971c039 SHA512 fab73ef310c9c948fd07a813de52c4647a0851dbac2efa1df0fe79aaaab2e33c7da4b08189d2db105a3f57bc52ccf685ba8cd39b42a514f11a5772624f6e4bda
+EBUILD libglademm-2.6.7-r2.ebuild 1583 BLAKE2B 3b8bb071e02c37d4f28a6ed6c74fca2ac900d73c00316a858f07e4f8a6b378eb8b6bd00664a1f7bc1565b9585de50742a04501e4df241140df8649fad70de2fb SHA512 f7ad196feaa0154ec34a9beb971db282e65308307d521909b6c74e7e308934b8689e84673c41456b92e34f1f918cd9f29ecbf30714ff8ad30752dc52abde11ca
 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 b08904124e7d..4b75e756ca7e 100644
--- a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
+++ b/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.4"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-cpp/libgnomecanvasmm/Manifest b/dev-cpp/libgnomecanvasmm/Manifest
index c5413d518cce..c898924fb567 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 1029 BLAKE2B 4ef9d20ed039d4e3e7ff2a16a3949a398c03f5e2eef9daa77ff10f3732f128d1119b01d9639a5bf1c351fb3c31279d76f577e8e900bbaebbb2cbda43a70fe0a5 SHA512 41b191b646de1122c04d52401cd8954e5ef64ee4307cd61e04244236e2cc342bce23c71c59ff85541187bdeccc22f1417808bf66bd777b734f9c6851c1d2e1c2
+EBUILD libgnomecanvasmm-2.26.0-r1.ebuild 1026 BLAKE2B 6f13cb2f7474989ee9a7cbf1c94cdaf8d3fcac23ded3ae2d8a3a02da8c4f6e1d7249d268065dafe48524549d25454e18b4f32544b1c3fa677fdc6aa505f8b0dd SHA512 0c62e7d3ac6b791ec6082db0d8b179f06f1b1603fa5726ddc8e12d02b7badcdfcaf879935cdad74d136bf609c7d18fbf44243e710c13b4e9a6e5e7023a1ec7a1
 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 9ff86f5e4b21..d18b3c0b1342 100644
--- a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
+++ b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1"
 SLOT="2.6"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-cpp/libjson-rpc-cpp/Manifest b/dev-cpp/libjson-rpc-cpp/Manifest
index 9605e06856ac..e3b9f1192658 100644
--- a/dev-cpp/libjson-rpc-cpp/Manifest
+++ b/dev-cpp/libjson-rpc-cpp/Manifest
@@ -1,5 +1,3 @@
-DIST libjson-rpc-cpp-1.2.0.tar.gz 180074 BLAKE2B e44f4ada4430db178949d89c3db8db18b716347d88c4f41fe558a88053ca3e2e4085fee28a87d32f710f76d57e0de9510383bc04e17adec36b754e3db2466d94 SHA512 b03507c9e9dc370d0efe94c3a69b25cbc06b99907a6c145034a283d38d7dd2188a1af89d0ce05837fde28ff96b5bd7bb0903f5865f3eae01d275929a68ea5f99
 DIST libjson-rpc-cpp-1.3.0.tar.gz 182354 BLAKE2B 512392c37e61833a98c1f682bdbb3ed0e3c72ff56f17407d49e5a0f134795daf5ff4c2702dd5222bfc8962b2c9a56c0c7856cc8fe1b923ea68c369a24d334b5c SHA512 4eb53c7b77845a0e845e42413c491dcfa1d6f72411276e8614dae6612edde8905013588465437ea39c5cc5700c2d48df07d15c83222924fc24e015fb9f7a02ea
-EBUILD libjson-rpc-cpp-1.2.0.ebuild 1578 BLAKE2B 3c8940a09c2e38ce6be94e3585e1d2ccf65a84cc3115f9eb29e5da9bdb057626032991f352bc93f7c730916a27487e04c1a5eb398593da9481adf61109b4424c SHA512 6ddad0199299a5fbfb5c5a9b6b1e953734509d405a1d5d3d41c29bb62224a8641cd922ea0af0b2824f622583ba6a843bc96383f5655fbbe21b08ef5887dab533
 EBUILD libjson-rpc-cpp-1.3.0.ebuild 1599 BLAKE2B 6522db61c865f0321e2a31ee328c71e83bdf82279392301e58a501130b5da84f6f0204d7893eed9ba80906dc6b90ef9e742e47c71cbacc2c8a390d66a1972dc5 SHA512 a24983c48e39fea8ecdc4bb0075f02b9be6adeb314e46a6ba7affa5915f73a8ec69b0d9823bc9679110c4b6a31670fb604586cf4b8f1f8255521b2e0f133c750
 MISC metadata.xml 906 BLAKE2B fe2f020896cc35c9c27fe082bf7a844086445b8943690c35de3de091041473b0a211370e335908470faf1bfdf0fb64b4b6aee75dfd527683d173c3e9fc8d9cf9 SHA512 037b5942cdde13abab5f527cdb8fced709b88bbebb754497279b1d60e7c90789115ecc2f579c38111c2acf32a3baf2643b470e55deb9de36bc498e9665091a83
diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.2.0.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.2.0.ebuild
deleted file mode 100644
index 2ab94282c0a9..000000000000
--- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.2.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="JSON-RPC (1.0 & 2.0) framework for C++"
-HOMEPAGE="https://github.com/cinemast/libjson-rpc-cpp"
-SRC_URI="https://github.com/cinemast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +http-client +http-server redis-client redis-server +stubgen test"
-
-RDEPEND="
-	dev-libs/jsoncpp:=
-	http-client? ( net-misc/curl:= )
-	http-server? ( net-libs/libmicrohttpd:= )
-	redis-client? ( dev-libs/hiredis:= )
-	redis-server? ( dev-libs/hiredis:= )
-	stubgen? ( dev-libs/argtable:= )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-cpp/catch:0 )"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHTTP_CLIENT=$(usex http-client)
-		-DHTTP_SERVER=$(usex http-server)
-		-DREDIS_CLIENT=$(usex redis-client)
-		-DREDIS_SERVER=$(usex redis-server)
-		# they have no deps
-		-DTCP_SOCKET_CLIENT=ON
-		-DTCP_SOCKET_SERVER=ON
-		-DUNIX_DOMAIN_SOCKET_CLIENT=ON
-		-DUNIX_DOMAIN_SOCKET_SERVER=ON
-		# they are not installed
-		-DCOMPILE_EXAMPLES=OFF
-		-DCOMPILE_STUBGEN=$(usex stubgen)
-		-DCOMPILE_TESTS=$(usex test)
-		-DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch2"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	use doc && emake -C "${BUILD_DIR}" doc
-}
-
-src_test() {
-	# Tests fail randomly when run in parallel
-	local MAKEOPTS=-j1
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dodoc -r "${BUILD_DIR}"/doc/html
-}
diff --git a/dev-cpp/mm-common/Manifest b/dev-cpp/mm-common/Manifest
index 8a8ff69b1bdd..2cb83a6fc7b3 100644
--- a/dev-cpp/mm-common/Manifest
+++ b/dev-cpp/mm-common/Manifest
@@ -1,3 +1,3 @@
 DIST mm-common-0.9.12.tar.xz 304588 BLAKE2B 8fd443b4077d803bb1513c897aa44965e50591cf36518469f1f2f74c40ff2b4f687152f9fc31e2d543ac97ae7a5a0a58efdc8c362959e015eee54b8bd518809e SHA512 99701d91994ca2783fe5b8bfd44cdea9f14e16dbbc116f894d9f3df746912cdbcdbdb0d5fdf6e235c9d22621a314de7aaac9b87a18f3ab742a0ad2ebbaad8ec7
-EBUILD mm-common-0.9.12.ebuild 381 BLAKE2B 1c169a4822b5c726b0590e9d90b7474bfc93d41e7d4da7666afd6474fdd47f1c802a2bfab8b33da62b5582a3dd9e857564ee492943b42e4604cd9a580d387c15 SHA512 eb0659657896dde63eb9de28858f8208ff1afc6db71382f301c7d277c5fda7b995d5330d322961e164b67aacc2c569f7b283fc3793dd298893797f0fb4fa87e2
+EBUILD mm-common-0.9.12.ebuild 374 BLAKE2B 761688952a2c2f907224e80564df215b25e30a9b2d831ffc3d57c51c6295dd9b2968ebde20b7a7625f9181417020cbac4e764e400830552005d3430025df95aa SHA512 f2cfe433cd4affb0c4d687f575b0eb90783272ddbc0ada8fc8fa295c82211e49df3e9ca9051733cfd57efe30a94ace4671f00fbad632444287ae04c2d4fc35ac
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/mm-common/mm-common-0.9.12.ebuild b/dev-cpp/mm-common/mm-common-0.9.12.ebuild
index 5000f18771c2..74506878137c 100644
--- a/dev-cpp/mm-common/mm-common-0.9.12.ebuild
+++ b/dev-cpp/mm-common/mm-common-0.9.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index d4756ccbfaf4..63e707f2b7b8 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,3 +1,5 @@
 DIST pangomm-2.42.0.tar.xz 853064 BLAKE2B e0aac439565c4fc80c71cfdd430133373cca4c88c88484ab5b77a2a395154e3d381bc0158a9d312280f409ba325b547504016d8bc50830794dee13c199ee1e62 SHA512 2cebf76150414cde96b911eae947a6e1a073352927f01a44ddc276711151dffe0b9d8c54c3df16289d9002f982fa3e3386ddfe002be902f3086b44fff95fdb59
-EBUILD pangomm-2.42.0.ebuild 947 BLAKE2B eea9e87e88443660226d47776dbabf82b229795ef3406dffbc1f848cec3e87f7aa3a798807a494a8494ec285e2c0a7456d84e4e2afbc3b838dd00a61f2a94769 SHA512 20f72259692e637866e78c5a93961c027efb99b9044b28e62ca9ae16ce204f9f0dc4b06565d382db0a7ef7d6382a0c3110ba59f61e51eb28db882019a47d705e
+DIST pangomm-2.42.1.tar.xz 882508 BLAKE2B 34b6a93d931e1a27c7859e3cc407c714588890122639a61d30d9886bc3d861f11e1fcb97a08b6be8bddcde776d86f8b6c4cdc4a53da245ea1dc81f50d402303c SHA512 46ba375e61dd32e268397ecb8e69364b642ea3d9a6c4d9e3e52500e1e1c9fa0c6aa822c6d5046f49a2fe4d9a872c6c2b354134d39c17370abcfc6a1d752223b0
+EBUILD pangomm-2.42.0.ebuild 944 BLAKE2B 43a685ef7c321c69f09c3273d447b12dd587683fc741e43599b8bcd524d3b22a991a48c8762592db699af50c506a789ebdf26b67721b8bd613f535062732a75e SHA512 c0b7d445edb0c0cdd5b4cd6f3abee7cf2e1c4348b2d0b542fbe2ced937726aeaea14f2393e8c79b79748883623dd24b57b37f79098f808c38521e453ad7df924
+EBUILD pangomm-2.42.1.ebuild 951 BLAKE2B 9b80d9df4cdf81dcac5dea456c29bf53dad1b51b808b4190543c5a924b85865bbeae92d4da6e7026b96c59b60df6cc693d98b20c229defeaf9812dc6dc321b83 SHA512 fa849b7f2c7948af65fbc87779c812503acf405ee88f6aca1d940de8dffeb77ac036d9c126936731fde988d028c21581f4551c8fdb6daf831ddd4a9684c494cb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/pangomm/pangomm-2.42.0.ebuild b/dev-cpp/pangomm/pangomm-2.42.0.ebuild
index 39d269187143..a26725fccced 100644
--- a/dev-cpp/pangomm/pangomm-2.42.0.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.42.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.4"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 COMMON_DEPEND="
diff --git a/dev-cpp/pangomm/pangomm-2.42.1.ebuild b/dev-cpp/pangomm/pangomm-2.42.1.ebuild
new file mode 100644
index 000000000000..d5782929da04
--- /dev/null
+++ b/dev-cpp/pangomm/pangomm-2.42.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="C++ interface for pango"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="1.4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+COMMON_DEPEND="
+	>=x11-libs/pango-1.41.0[${MULTILIB_USEDEP}]
+	>=dev-cpp/glibmm-2.48.0:2[${MULTILIB_USEDEP}]
+	>=dev-cpp/cairomm-1.12.0[${MULTILIB_USEDEP}]
+	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	doc? (
+		media-gfx/graphviz
+		dev-libs/libxslt
+		app-doc/doxygen )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<dev-cpp/gtkmm-2.13:2.4
+"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		$(multilib_native_use_enable doc documentation)
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index fb3971d774a4..24810166db3c 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,9 +1,14 @@
 AUX tbb-2017.20161128-build.patch 4840 BLAKE2B eec4a437f0a609c8f39b76950aae76c9e357cd0705ad521a3304aceb8361c10cdf0d28078370c840ad315cbe06f3b134ca5d58036b2718a136f3958c3942e9c1 SHA512 40ca5bdfe05eecbc47a9af062e6ede3e14200048cdebd796af71cd5f27b350c65e5aa569cc8a6e2f3cfbd90fec167d4f053abc36310b07113910ba25061c56a4
+AUX tbb-2020.1-makefile-debug.patch 2640 BLAKE2B 98e1d88f279452898be78fb53235427a5c45a0056429e07acd5bc273a48c7214dc8df29c72cba344688f650fce25bba06f6f9e4dfbf1091260544e95159cf33d SHA512 9a29ff67321b75efe10621bfe924e89a5c51d4e7327e20aa69018aaea590189ed297b9ab94bd3b48172d0b093e3d2aaebfc7088b480364f6f6c7802a27d3c1e4
 AUX tbb-4.4.20160803-underlinking.patch 389 BLAKE2B 88b85cf0a2c8706dff908d4c4e73e1399aa8ac85f7c2df1bd5daebc564e4007c4bf0df27647e53764c6dd437422ed48885e798a6e4fc6b5900810c7855c9ceeb SHA512 bfd3b9d5221a89a120e115447a9aa653e93a208422c68c8cc74a672f42037fd1af3dc755480d746570f2c5dbeb173650d9b4acfb38aaec5d3c3feea6c2232af1
 DIST tbb-2018.20180312.tar.gz 2911740 BLAKE2B 5c6dab4a892f3b61ed0b02ea36dc41bebd5b33a22bcc3d5f2960f21e134f2eb9bccf1466193a573489e12638c0bb0bccc2da83f699968ffd62417f2d0f093289 SHA512 7ac74e714122e25f7704630d3d52992dbea54d1e761b5e487251a771f401aa864f78b8ddf11d78f38758088df387abb6987f6a2db562c86cbb28ba8f33a25680
 DIST tbb-2019.8.tar.gz 2580540 BLAKE2B 1cddb0c8ade6f6363811b7f9b323a2bb7739a18114acd56e1b4a13f33904ddff8cb6aec9b4b0add995cd307ff7815f0b55ce33fa64b7dd92c0062fbaa13d0833 SHA512 924a8dde011452a2c46c5152942a9835e76fe5610e08b69eb0e985de3fb46bdb49f0f628d10fa7704428f6e61ec63f7002da5399d47da6ee6004fa236d346dc8
+DIST tbb-2020.1.tar.gz 2639115 BLAKE2B 058438351738eeab01c230ec10ff0a1dde77e5cc4fd77f292c31ee0320f41d079c8f90fc06f4640ffa375d5f0c0b5fbed13ac5a64a9cb9f1737cb66bc80442ea SHA512 79810c27c84bd3b3432bef471fa1c782f1f162a0d1038e88c03a77499cc7aeaa10d57317729fd23472e2d0f358395955f7570e8c679685a552a833eb45cf5f1d
+DIST tbb-2020.2.tar.gz 2637172 BLAKE2B 6b6e65732d3971f7374058513004ca3cfc3855b83c0a2dde59d50e08c26ff220470e31db86f4ab9f009c7e02e454a00a348730e63c829aa8d217320f7879cfc9 SHA512 6d7412fa6ce12d27736af3c8942c5ab5ea6945dd3ca93f309535c0dba3ff757d6507a5ffc3bcd73e6fdcda043cdedfa657631b25ae86fbf221d0f1d66a85b48f
 DIST tbb2017_20161128oss_src.tgz 2965854 BLAKE2B 8c5aed6d8477297922767803617346feebb712d1f4b2df6d71a86f039b5563afc666454985e68a528a812aaad40b5fd0562bb91d357c45156fec46e5389ec542 SHA512 3c48ce196d2d3557e86cea7ede9dea456bbaeb29dbed34210f99c6f380406403a6056ccfa3d5befe6b29c4f8a9ee58ca6da545249cf4ec4ec85b463e04e4518c
 EBUILD tbb-2017.20161128.ebuild 3321 BLAKE2B 26df534fbac469b7259d3f345ec7913732ce0d1aa8a6fa8cf8e98d4269cc5a8196b5daa7daeddb84e59aefa83775f130389a7f3e16de3da54bb964f34c817e1c SHA512 56beab0190012f060a9dd0ea3fd87d4461dd0839b3b052e54e7e864adbef972f96b7178c915da8bfc7efcedc8db3f409ec134fa47d66636cf6fae96cda337e3f
 EBUILD tbb-2018.20180312.ebuild 3322 BLAKE2B ff7304a9a6b702eac73f41ec9e61c8332ed24473e264cfa52a38c1954b61829140be4855f9fbab9f9715f393e6eae185e0b53e3051bdf4f9e858bc2682712328 SHA512 d5006b479abdea75d3d6e22311629eb70d9b78c19c8cf687a1ce16f91303d46d8cc04e779f24f3bab67e556756a8c1f3e4f4143cd6dad36613902109596f522d
-EBUILD tbb-2019.8.ebuild 3225 BLAKE2B 830ed96fa96032847b7543ceaa5f23d8e5dc767519f7dcd1a294582a967a801dfaad3251b3f1c91cb5a2b0ad9b8ea57c3adb5685131608257ca515f053fba2db SHA512 da5b02cee27b4b67a1857061202abacd20eeed8887b540f71f75ffd161feeeb8901803439d6af667584df0a9bf5e9090d7768f314ad77779a06cda04a255b60b
+EBUILD tbb-2019.8.ebuild 3221 BLAKE2B 25be613f89f8bd8fcb5a355cd5f11e3e4fc32712d3718232cab19edaeb30d0c17b1cff4f8773e296f16669667c72bab1132ac81e6b33062f919323a501037c82 SHA512 b3ccb6c2341d85f8e277f561917285838c41c592002d213b4e24ef1abe8aeea3605a39d22566d3a90df81bbdd9ae225443c9d9d7ffd1157280f7563949827771
+EBUILD tbb-2020.1.ebuild 3389 BLAKE2B 4dfa1858e8846345aff78cc88e64e068b097b926c29dd2fd796a25665bbbe7f3ce2886609f62abf168bb244b3b3fcbd2317423a16caf96cf5b34ed54f0861125 SHA512 0d799a1013d10c725b98f41244913bb61ce66bb8297b8a9e5076d087cc667db204fb9f2dea042c4c781f7fd84d42357e5c572ce8dab4a176e80e06c65e58b770
+EBUILD tbb-2020.2.ebuild 3397 BLAKE2B b5824f331e87bdfa563c1bb430d8d599ad5d3415c3582d6c3d7deb036b0aef8009798d986af9e8f01f49c1fc77559f0de31a47f75044d13b20a9ca4a35f997c6 SHA512 c659086dd1beedbc05bb1570185d546970040714c2c4bbb3db595a20b04070397538ae79777e3ae01ce18fc5033709ed4e6a8ad535f5c9967e71db05893b846d
 MISC metadata.xml 687 BLAKE2B 34a74bdff790f94b7e32c295833aa986d0d72fc646af900be059d2c5cb55d91af0cf255ad76f0250edd6f6464227c28f19b412243c5f45cc2d3b34a95d5b87d8 SHA512 3db464f32be8e3d79b189da232ab3ce4f8e8694fd1044149b7fc608deb60742886ced2be6bac924bbcd9695cd88747d47297d55f180d87d3340cc589b1bc7f13
diff --git a/dev-cpp/tbb/files/tbb-2020.1-makefile-debug.patch b/dev-cpp/tbb/files/tbb-2020.1-makefile-debug.patch
new file mode 100644
index 000000000000..b4313b375f59
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2020.1-makefile-debug.patch
@@ -0,0 +1,62 @@
+--- a/Makefile	2020-01-21 12:26:46.000000000 +0100
++++ b/Makefile	2020-03-18 16:21:37.589262099 +0100
+@@ -26,29 +26,29 @@
+ all: tbb tbbmalloc tbbproxy test examples
+ 
+ tbb: mkdir
+-	$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.tbb cfg=release
++	$(MAKE) -C "$(work_dir)_$(cfg)"  -r -f $(tbb_root)/build/Makefile.tbb cfg=$(cfg)
+ 
+ tbbmalloc: mkdir
+-	$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc
++	$(MAKE) -C "$(work_dir)_$(cfg)"  -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=$(cfg) malloc
+ 
+ tbbproxy: mkdir
+-	$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.tbbproxy cfg=release tbbproxy
++	$(MAKE) -C "$(work_dir)_$(cfg)"  -r -f $(tbb_root)/build/Makefile.tbbproxy cfg=$(cfg) tbbproxy
+ 
+ tbbbind: mkdir
+-	$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.tbbbind cfg=release tbbbind
++	$(MAKE) -C "$(work_dir)_$(cfg)"  -r -f $(tbb_root)/build/Makefile.tbbbind cfg=$(cfg) tbbbind
+ 
+ test: tbb tbbmalloc $(if $(use_proxy),tbbproxy)
+-	-$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc_test
+-	-$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.test cfg=release
++	-$(MAKE) -C "$(work_dir)_$(cfg)"  -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=$(cfg) malloc_test
++	-$(MAKE) -C "$(work_dir)_$(cfg)"  -r -f $(tbb_root)/build/Makefile.test cfg=$(cfg)
+ 
+ rml: mkdir
+-	$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.rml cfg=release
++	$(MAKE) -C "$(work_dir)_$(cfg)"  -r -f $(tbb_root)/build/Makefile.rml cfg=$(cfg)
+ 
+ examples: tbb tbbmalloc
+-	$(MAKE) -C examples -r -f Makefile tbb_root=.. release test
++	$(MAKE) -C examples -r -f Makefile tbb_root=.. $(cfg) test
+ 
+ python: tbb
+-	$(MAKE) -C "$(work_dir)_release" -rf $(tbb_root)/python/Makefile install
++	$(MAKE) -C "$(work_dir)_$(cfg)" -rf $(tbb_root)/python/Makefile install
+ 
+ doxygen:
+ 	doxygen Doxyfile
+@@ -56,16 +56,16 @@
+ .PHONY: clean clean_examples mkdir info
+ 
+ clean: clean_examples
+-	$(shell $(RM) $(work_dir)_release$(SLASH)*.* >$(NUL) 2>$(NUL))
+-	$(shell $(RD) $(work_dir)_release >$(NUL) 2>$(NUL))
++	$(shell $(RM) $(work_dir)_$(cfg)$(SLASH)*.* >$(NUL) 2>$(NUL))
++	$(shell $(RD) $(work_dir)_$(cfg) >$(NUL) 2>$(NUL))
+ 	@echo clean done
+ 
+ clean_examples:
+ 	$(shell $(MAKE) -s -i -r -C examples -f Makefile tbb_root=.. clean >$(NUL) 2>$(NUL))
+ 
+ mkdir:
+-	$(shell $(MD) "$(work_dir)_release" >$(NUL) 2>$(NUL))
+-	@echo Created the $(work_dir)_release directory
++	$(shell $(MD) "$(work_dir)_$(cfg)" >$(NUL) 2>$(NUL))
++	@echo Created the $(work_dir)_$(cfg) directory
+ 
+ info:
+ 	@echo OS: $(tbb_os)
diff --git a/dev-cpp/tbb/tbb-2019.8.ebuild b/dev-cpp/tbb/tbb-2019.8.ebuild
index d123fda91ce8..95a53b4474b3 100644
--- a/dev-cpp/tbb/tbb-2019.8.ebuild
+++ b/dev-cpp/tbb/tbb-2019.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.threadingbuildingblocks.org"
 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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples"
 
 DEPEND=""
diff --git a/dev-cpp/tbb/tbb-2020.1.ebuild b/dev-cpp/tbb/tbb-2020.1.ebuild
new file mode 100644
index 000000000000..4ed58041f012
--- /dev/null
+++ b/dev-cpp/tbb/tbb-2020.1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic multilib-minimal multilib toolchain-funcs
+
+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/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-linux ~x86-linux"
+IUSE="debug examples"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/oneTBB-${MY_PV}"
+
+DOCS=( CHANGES README README.md doc/Release_Notes.txt )
+
+PATCHES=( "${FILESDIR}"/${P}-makefile-debug.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
+	local bt buildtypes
+
+	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
+		*clang*) comp="clang" ;;
+		*g++*) comp="gcc" ;;
+		*ic*c) comp="icc" ;;
+		*) die "compiler $(tc-getCXX) not supported by build system" ;;
+	esac
+
+	if use debug ; then
+		buildtypes="release debug"
+	else
+		buildtypes="release"
+	fi
+
+	for bt in ${buildtypes}; do
+		CXX="$(tc-getCXX)" \
+		CC="$(tc-getCC)" \
+		AS="$(tc-getAS)" \
+		arch=${arch} \
+		CPLUS_FLAGS="${CXXFLAGS}" \
+		emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" cfg=${bt} $@
+	done
+}
+
+multilib_src_compile() {
+	local_src_compile tbb tbbmalloc
+}
+
+multilib_src_test() {
+	local_src_compile test
+}
+
+multilib_src_install() {
+	local bt
+	local buildtypes
+	if use debug ; then
+		buildtypes="release debug"
+	else
+		buildtypes="release"
+	fi
+	for bt in ${buildtypes}; do
+		cd "${BUILD_DIR}_${bt}" || die
+		local l
+		for l in $(find . -name lib\*$(get_libname \*)); do
+			dolib.so ${l}
+			local bl=$(basename ${l})
+			dosym ${bl} /usr/$(get_libdir)/${bl%%.*}$(get_libname)
+		done
+	done
+
+	cd "${BUILD_DIR}" || die
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins *.pc
+}
+
+multilib_src_install_all() {
+	doheader -r include/*
+
+	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-2020.2.ebuild b/dev-cpp/tbb/tbb-2020.2.ebuild
new file mode 100644
index 000000000000..25976f821bad
--- /dev/null
+++ b/dev-cpp/tbb/tbb-2020.2.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic multilib-minimal multilib toolchain-funcs
+
+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/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-linux ~x86-linux"
+IUSE="debug examples"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/oneTBB-${MY_PV}"
+
+DOCS=( CHANGES README README.md doc/Release_Notes.txt )
+
+PATCHES=( "${FILESDIR}"/${PN}-2020.1-makefile-debug.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
+	local bt buildtypes
+
+	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
+		*clang*) comp="clang" ;;
+		*g++*) comp="gcc" ;;
+		*ic*c) comp="icc" ;;
+		*) die "compiler $(tc-getCXX) not supported by build system" ;;
+	esac
+
+	if use debug ; then
+		buildtypes="release debug"
+	else
+		buildtypes="release"
+	fi
+
+	for bt in ${buildtypes}; do
+		CXX="$(tc-getCXX)" \
+		CC="$(tc-getCC)" \
+		AS="$(tc-getAS)" \
+		arch=${arch} \
+		CPLUS_FLAGS="${CXXFLAGS}" \
+		emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" cfg=${bt} $@
+	done
+}
+
+multilib_src_compile() {
+	local_src_compile tbb tbbmalloc
+}
+
+multilib_src_test() {
+	local_src_compile test
+}
+
+multilib_src_install() {
+	local bt
+	local buildtypes
+	if use debug ; then
+		buildtypes="release debug"
+	else
+		buildtypes="release"
+	fi
+	for bt in ${buildtypes}; do
+		cd "${BUILD_DIR}_${bt}" || die
+		local l
+		for l in $(find . -name lib\*$(get_libname \*)); do
+			dolib.so ${l}
+			local bl=$(basename ${l})
+			dosym ${bl} /usr/$(get_libdir)/${bl%%.*}$(get_libname)
+		done
+	done
+
+	cd "${BUILD_DIR}" || die
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins *.pc
+}
+
+multilib_src_install_all() {
+	doheader -r include/*
+
+	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/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index e818ed025e8a..d84f0699d03b 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -1,8 +1,10 @@
 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
+AUX yaml-cpp-0.6.3-CVE-2017-11692.patch 1433 BLAKE2B 9218756605cf721c86e9ab01b0d8cb7a13371cc32282395dd96a82d184222afb18bf780e1d224ea1ea6d1e4c3e796cb822fb12a4705d54bc6b244007c5b612b1 SHA512 a95e40f6718b099567a37731a09db6679920bb91046632dbc0671b0d99c4c1e706954b39ca7b798732289b4a0d129dba9fa75f198e99db53152ceaf3a259a160
 AUX yaml-cpp-0.6.3-abi-breakage.patch 1911 BLAKE2B e595bdf3dff91624aa75a233a6a95db3862a7bbe645a6219704fa25c0887321dc5c461d13b6694ebca31d0da795bb750701ad0c6b9f79be0eecd85b07a71a256 SHA512 0a3c0655a1319eda09796a7ddbcef8a27884cdcbc95d34d82b6202652da3b15d7afa6e22563af39f6c6c87b7a70bdee3c1216a5523604d309345d556ada702b9
 DIST yaml-cpp-0.6.2.tar.gz 1396250 BLAKE2B be342c212c980cdb03349dbafbe1db0bb581123b4dd6909393d3cdc86145b997a9d2f9b57a5e9d7c8cc60cdfd03f1c37e9db610d8784f2d29fdeada5ab322894 SHA512 fea8ce0a20a00cbc75023d1db442edfcd32d0ac57a3c41b32ec8d56f87cc1d85d7dd7a923ce662f5d3a315f91a736d6be0d649997acd190915c1d68cc93795e4
 DIST yaml-cpp-0.6.3.tar.gz 1398768 BLAKE2B 07abe1c56740105a0af2335bb1cd48086cb614d9d04c61342e53788bfb043fd7eb2629e441a0a5be50898b288f3526f1707c5fdf1d734395b6450c3103773b14 SHA512 68b9ce987cabc1dec79382f922de20cc2c222cb9c090ecb93dc686b048da5c917facf4fce6d8f72feea44b61e5a6770ed3b0c199c4cd4e6bde5b6245c09f8e49
 EBUILD yaml-cpp-0.6.2.ebuild 923 BLAKE2B 56c096aaa6f7be157e5d83594968e2e65bfee0ea152a95f6a8d0d3b7aeff202a97ef8b70739b8430120978ecb416ddd94c15b9c20e25580fb12c4f011bf8251b SHA512 41a527eec285e4ce2122cedbcc6aed7ae38eb6b5ab21ae5d691205d7990a7fb6bebb9d8b93d4253939b96cd3b232e7b3ec596d5d3fc8ddaa2df35b13f0396af1
 EBUILD yaml-cpp-0.6.3-r1.ebuild 972 BLAKE2B ce630cbf1b1f58728cda0a79f8d922f8fa57eb1dbd11e64efe3983bf1fbe52412c59d651ca9bd7d53006670238953e67ecea4e9b224590020635d6431cf3fd29 SHA512 8796a6ce430f75762a7b3689a2c5a85922ee6329aefe1d998d9b4b99f0b1dbbad6ca5dc492a8104dd99c392606073cc02ef14d656db766647b5177227efcead7
+EBUILD yaml-cpp-0.6.3-r2.ebuild 1014 BLAKE2B fbfad3a7dc92675e548f3c2ebe356a356b118d52bd153bb95b16f5fdd0f1be6e5c19f399b6d601749ee9fdaad9d15792c381736681e60fc2a4b56dac4ef243ce SHA512 09a659ac3b5d0735b6240b6b977692fbad235d347024e2f4a075886a91d33348fa69a4190febeef6cbe05fe3a40f7dd6d5aceb8e14c17031452380244110c3fb
 MISC metadata.xml 325 BLAKE2B 8e094a75d87d80e86efaf6ee191225ad0772dac343ae12ec84e73faffc17464c8431ee78018602127fd52441a6b18d09b58127b7d7ea1ee02163f58d327f0f3f SHA512 a4a5de1911c7bfeb37a3ca5aca8b3c044d51230164ac7d14566a9a4064e5202fac0e613089191ea959d0bb3df157049932d394d167e32fc8a432ab35e4cf24ae
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-CVE-2017-11692.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-CVE-2017-11692.patch
new file mode 100644
index 000000000000..fd7a7198c1c6
--- /dev/null
+++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-CVE-2017-11692.patch
@@ -0,0 +1,44 @@
+From c9460110e072df84b7dee3eb651f2ec5df75fb18 Mon Sep 17 00:00:00 2001
+From: Jesse Beder <jbeder@gmail.com>
+Date: Mon, 20 Jan 2020 18:05:15 -0600
+Subject: [PATCH] Fix reading empty token stack with a node with properties but
+ no scalar.
+
+E.g. `!2`.
+---
+ src/singledocparser.cpp             | 6 ++++++
+ test/integration/load_node_test.cpp | 5 +++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp
+index 52544dd6..47e9e047 100644
+--- a/src/singledocparser.cpp
++++ b/src/singledocparser.cpp
+@@ -79,6 +79,12 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) {
+   if (!anchor_name.empty())
+     eventHandler.OnAnchor(mark, anchor_name);
+ 
++  // after parsing properties, an empty node is again a possibility
++  if (m_scanner.empty()) {
++    eventHandler.OnNull(mark, anchor);
++    return;
++  }
++
+   const Token& token = m_scanner.peek();
+ 
+   if (token.type == Token::PLAIN_SCALAR && IsNullString(token.value)) {
+diff --git a/test/integration/load_node_test.cpp b/test/integration/load_node_test.cpp
+index 4f4f28e8..0e0dd6bc 100644
+--- a/test/integration/load_node_test.cpp
++++ b/test/integration/load_node_test.cpp
+@@ -257,5 +257,10 @@ TEST(NodeTest, LoadTagWithParenthesis) {
+     EXPECT_EQ(node.as<std::string>(), "foo");
+ }
+ 
++TEST(NodeTest, LoadTagWithNullScalar) {
++  Node node = Load("!2");
++  EXPECT_TRUE(node.IsNull());
++}
++
+ }  // namespace
+ }  // namespace YAML
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r2.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r2.ebuild
new file mode 100644
index 000000000000..db3c4f6dd2db
--- /dev/null
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+inherit cmake-multilib
+
+DESCRIPTION="YAML parser and emitter in C++"
+HOMEPAGE="https://github.com/jbeder/yaml-cpp"
+SRC_URI="https://github.com/jbeder/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/0.6"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# test breaks build
+# RESTRICT="!test? ( test )"
+RESTRICT+="test"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-abi-breakage.patch"
+	"${FILESDIR}/${P}-CVE-2017-11692.patch"
+)
+
+src_prepare() {
+	sed -i \
+		-e 's:INCLUDE_INSTALL_ROOT_DIR:INCLUDE_INSTALL_DIR:g' \
+		yaml-cpp.pc.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DYAML_BUILD_SHARED_LIBS=ON
+		-DYAML_CPP_BUILD_TOOLS=OFF # Don't have install rule
+		-DYAML_CPP_BUILD_TESTS=$(usex test)
+	)
+
+	cmake-multilib_src_configure
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /dev-cpp
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)