gentoo resync : 25.04.2020

22 files changed, 118 insertions, 459 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 23b2fe5d1dec..b71ad7ac5a7b 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
new file mode 100644
index 000000000000..27ac89279223
--- /dev/null
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -0,0 +1,3 @@
+DIST abseil-cpp-20200225.2.tar.gz 1679650 BLAKE2B bbadb2b86fd390f51322e687526c72a3b13caff6391974462a1146cc563616ce479330336a489a71e27b143e7cbea6695fc12c91fb721185a5116b3a6c5506b1 SHA512 75a607dee825e83c10dcd5e509515461f1b12c4aca861e4739ac4d41357b8e893dbfbe33873aa5c05463dde0891dedd7535af2ec59f173de29488e1b1321b335
+EBUILD abseil-cpp-20200225.2.ebuild 904 BLAKE2B be0083e3ec09f676d1d9d77d52c2f55b2493111392bee24ab5015d1ca066ee059c832ae4740d3c5a59878786cd759c755867a9dba708f74a029f5772c90bbc4f SHA512 2bd2303a1c136108e8a257721e69aea7123378f814419c08304087cbe33f6cd389e74873cf8e6c88b58d3c085f3143de3af916ee76b66df58ef1c20eb0d0de75
+MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200225.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200225.2.ebuild
new file mode 100644
index 000000000000..5db378ff5361
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20200225.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
+HOMEPAGE="https://abseil.io"
+SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+# requires source of gtest and other libs
+RESTRICT=test
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode abseil compiler flags
+	sed -i \
+		-e '/"-maes",/d' \
+		-e '/"-msse4.1",/d' \
+		-e '/"-mfpu=neon"/d' \
+		-e '/"-march=armv8-a+crypto"/d' \
+		absl/copts/copts.py || die
+
+	# now generate cmake files
+	absl/copts/generate_copts.py || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DABSL_ENABLE_INSTALL=TRUE
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/abseil-cpp/metadata.xml b/dev-cpp/abseil-cpp/metadata.xml
new file mode 100644
index 000000000000..efcd58fe0b9b
--- /dev/null
+++ b/dev-cpp/abseil-cpp/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>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index f3a9ec62f85c..c3d37879fc1c 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 1648 BLAKE2B 4e2800b4483644eea1703ddf521b6d197242106bb154a1697f43acd5d8c07365511e1a96c78975a9c667abf5e124f0a5077e2da31e859a0ff83489f87ad62259 SHA512 e2512a80fbde0818d5bb2c0179f6190f7de7b37db9a5e5da8698f27fd16424a91fe171ebf93a980130e05d31b4798f9044fff79708711a6af268742d38bb2445
-EBUILD glibmm-2.62.0.ebuild 1655 BLAKE2B b14b839cbf42dc31bb0489a98fd55fabe68d8ab173b7e60c709274fd3c01a854903932c44af12e0c7cc9f3514cf5da390f83c1f715f8234ae20cf01dcabc8b6b SHA512 0742f97a3a64c0752dd03178860f0bfe0fefcd01698e9fdd63c6ed40d43f6df281259a3124ad57fd84babbe882a1a54d1b3672661ac5eddc9e48e313ae4b6934
+EBUILD glibmm-2.62.0.ebuild 1650 BLAKE2B 3ae3500cc518a8c3aac9728332025703116840ca1da4a4431e706a683a28b5768631966d75660958a6d5689345afeafcdf97e054ea3791ee0755cda32ebd8fd3 SHA512 14cd4e4180bc7dc75f6b50102d3483117cabd52bc8c87f202cfb1fecdb1212533d9dfd10b79adeedef83feee3e6d48eac6b4475eba3b54306f0542e165840d98
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.62.0.ebuild b/dev-cpp/glibmm/glibmm-2.62.0.ebuild
index 105f3c349b62..cbb63a70335a 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 ~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 4ed25a574318..55ba4169082c 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 1193 BLAKE2B 5edba9934d0be32947628a188abff72cf850890689b475b5aa44996250b9856b8c1252e0db3b743107c949841c3c5d971630dc06658b5eed7b7d980fa52f8908 SHA512 d6fff16d5644dfb01487206b294684873682e40626b7e15d3e49ccd99869ded57810f7f77f7d98bea86cc69d4654ca3b7fd5b9d69aaac083bc270bd14e0090c7
-EBUILD glog-0.4.0.ebuild 1099 BLAKE2B 075ab12778de2d485f93258e62794e4b9d3acab0f62ea924f420fd25a3b84dd0fd3a18d38774fadbd39e671b3f006595dcfa39a0dcc9d7cce2ca722f05ebf264 SHA512 784a820bd3955135c7498036b7ed7e7836e7d10570c5b65d9967bcceb7adaec918e84cf1c4c0e82568451678d68b57463235b0a2dfc635f43451edd3e65439e5
+EBUILD glog-0.3.4-r1.ebuild 1187 BLAKE2B c410ee60eca72d61b0552af0a18fb6c25fe8bf390369aa38a50f0df47b46beeb45fe0bb5a3746bf9d6375f10d9ced8e312b04164cc574d3d6bd97c6f01c29874 SHA512 67691682107f5ee3f7f15977a61db62b9d47f3b2e340c114f965762690a209c2207dfeea6a7c9c2906a6bf584ca1663f300cae0efc8398385f8628e73e5385b6
+EBUILD glog-0.4.0.ebuild 1093 BLAKE2B 576212e1f5734d72aa6aaabd90afb3a4fc896001cdece21f0e86a2d14b9de4ec53924bc6936442cd3b1ee3add3f318d9708009e04641fb946be74c584a681582 SHA512 cd6cc4ab3b3cbf6b39c4aea1ddb3789ab086c7e723cce27159b5d418eadc003008f964b57ea8f9e7b92e1ebf71f2c092ba065780ba916a9f747009f7d8e22417
 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 8691df884e67..956b6b8554d3 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 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~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 97fed7a245c2..ee01c40ca927 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 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="gflags static-libs test"
 RESTRICT="test"
 
diff --git a/dev-cpp/kokkos/Manifest b/dev-cpp/kokkos/Manifest
index 7be27615bb04..e034210370f5 100644
--- a/dev-cpp/kokkos/Manifest
+++ b/dev-cpp/kokkos/Manifest
@@ -1,3 +1,5 @@
 DIST kokkos-3.0.00.tar.gz 1923287 BLAKE2B 4a2935e9388b3d577d6ce8678cad37830970222e6ce8a9c3db67633cb521440f14fdb380f03d3c77cd5ade85abe94aef97e9cc4949cc3a140fae958e0c15fff8 SHA512 c9daf62a2c92462c815aa241934aca5720bac8f88195635ae5a3ff4111d289a48898d32358b91e120756d3412820050297a76f44828f4cbc0b2b837a736e84aa
+DIST kokkos-3.1.00.tar.gz 1972408 BLAKE2B 47c3eb83526dd13430a3b7049a98169d15ef73c6d2b3943c5600a153d28a9c6a0d6ee0b8eda1aac5f1b53556c5cee1680ce92a90f97b1b2741e1e7f0c9222486 SHA512 7933542c24e137052d630a503d707912295022863f2d47c89c4a35a9c8a70514763d89e321c66a3878575e661461ede45ac44d74cf45eca2470e7f57840d5c0c
 EBUILD kokkos-3.0.00.ebuild 1024 BLAKE2B 1fb461017af3ce32385a579a9551b49bf8b8d98962f158c316562e2c8123ea6b1237585ac11ae2104354a1580ca9bef66dbbbd0fbda83c00de1b75b874742f32 SHA512 eda4aad0df902b602e470469c7c1127c1467cbdd48dc5cc9184cc2636bd86f872dbfdd6dbb6b8f793797342fc8f1901dc32a4a87e364017a9e91cf075a41b118
+EBUILD kokkos-3.1.00.ebuild 1024 BLAKE2B 1fb461017af3ce32385a579a9551b49bf8b8d98962f158c316562e2c8123ea6b1237585ac11ae2104354a1580ca9bef66dbbbd0fbda83c00de1b75b874742f32 SHA512 eda4aad0df902b602e470469c7c1127c1467cbdd48dc5cc9184cc2636bd86f872dbfdd6dbb6b8f793797342fc8f1901dc32a4a87e364017a9e91cf075a41b118
 MISC metadata.xml 253 BLAKE2B 58dd329781b98af52e191fbc6b1de24c80612678e467d126dc77ff0559c12eb8fb48546ef7a240f64fadbe289039adfb87dd2b0c8ae01bd9210bac81b2b385bf SHA512 a931cf8d295191e246377a75882955524e9e3a86aeacf4a5067c0025b6a03d608cdfa6763cfc53ba4a00cd6ee4b7db42d1a042dda5e74e578047ad42ad92be50
diff --git a/dev-cpp/kokkos/kokkos-3.1.00.ebuild b/dev-cpp/kokkos/kokkos-3.1.00.ebuild
new file mode 100644
index 000000000000..1707ae8abba0
--- /dev/null
+++ b/dev-cpp/kokkos/kokkos-3.1.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/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index bcef60ae04d1..505f7f70e2ba 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -3,6 +3,6 @@ AUX ms-gsl-1.0.0-use_system_catch-636828.patch 559 BLAKE2B 899f98f0b3e9b0f04cf0d
 DIST ms-gsl-2.0.0.tar.gz 64726 BLAKE2B ab40725aa38af7c5651e22ebf32d4bd9c27a10be2e206fd4c3c0173ad21da262beddef022b7b158653b185cfc3269f2b6e80d99fe65f601ffc3e770b143b03f8 SHA512 7339527222c8a97a94c0bb4038b3d142045ec5d80995e628574ac96f4d9d13c41ad70fbe0d8390586dc0db8d9ea55107dbc95de80f7335eb78ef9d2e7047d726
 DIST ms-gsl-2.1.0.tar.gz 67289 BLAKE2B 5a247028b71521d7851a6aa5f24936dfb1c7f283854724d8d4bf2d9d9ac3a928c0e5b42a280d8a0a0254d9f6fa958bf1283dab674c649bdaaa7b38ef38f3b1ba SHA512 4382b8feadf4608b06b66a78ca51b0f60a6e8b41b183aec6ac8f8e2e9f0b39705dea513fd708012ed8390c1a4f88d7df454f05166b76bee24ae843835cd4a2ca
 EBUILD ms-gsl-2.0.0.ebuild 789 BLAKE2B fac20f1d690ebc855a4e499968241ddd3a718389956488a4ac8ebdd9af9e06bd1ed7b88a203ab9290ab919c663ce4600fadc93af6ef48e6e5b259ed7567bd913 SHA512 56a1f4f52cb439a109e7c41a59266b6c0282ed1345265de6368a4e2caa57b31c1e9eb8091ebcbd1df4cfe8fa8b480479ecac59f31ff6f98e966f0775f7446b03
-EBUILD ms-gsl-2.1.0.ebuild 791 BLAKE2B cd4792632a1985501141c0b7efbe5fa0bcaac46799842439088aa9b97101cbc9717eda6b7b937c0ca86cd5e360fd06e66d2ed28b175995b911b30cd39e85f1b3 SHA512 1aed7dd88f86cef16317369d77f4303c1539167b3660e9279edcedea4d2af871383429289743d7fb32f7a77eaf60eaf1d0d4a9a8e009a9a728a4c8cf0e275c89
+EBUILD ms-gsl-2.1.0.ebuild 790 BLAKE2B 410765af2d63169d15543f3ce9bc2685f01737cddb0ab19631f516e8556bed80f851104d504bd9f4513f3b56ed74d58a094887a97e02f2fd2694bfb1b6826772 SHA512 e2ea2e252a7eae5e31a60611198ef39cb576d047efe601d782e98386bb336b014b94f5f13f2c9cf2ede9f52d0a6eac946f0a559408e4573c9f6816957d771612
 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.1.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-2.1.0.ebuild
index 75b11654651b..a3c0c91b847f 100644
--- a/dev-cpp/ms-gsl/ms-gsl-2.1.0.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-2.1.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/GSL-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index 63e707f2b7b8..c2cbe05f26ec 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,5 +1,5 @@
 DIST pangomm-2.42.0.tar.xz 853064 BLAKE2B e0aac439565c4fc80c71cfdd430133373cca4c88c88484ab5b77a2a395154e3d381bc0158a9d312280f409ba325b547504016d8bc50830794dee13c199ee1e62 SHA512 2cebf76150414cde96b911eae947a6e1a073352927f01a44ddc276711151dffe0b9d8c54c3df16289d9002f982fa3e3386ddfe002be902f3086b44fff95fdb59
 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
+EBUILD pangomm-2.42.1.ebuild 946 BLAKE2B 5c70d595ce25d6c6f1e3a94ff319a2414448b09969dcdefd55d061546d70275f646cfc8939604abd7fd3e41f16f258b903f764158c8b76de1020e7cfb1630e9d SHA512 695ed8e4994f9328018d02230cb0b70f7e5c3a690a6e048514b55c8909c447e9f6c5cab0281a1ef3c381a571570030031d2f364e0cca4ff5bcbd7d88ed33c547
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/pangomm/pangomm-2.42.1.ebuild b/dev-cpp/pangomm/pangomm-2.42.1.ebuild
index d5782929da04..31f81d70190f 100644
--- a/dev-cpp/pangomm/pangomm-2.42.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.42.1.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 ~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/range-v3/Manifest b/dev-cpp/range-v3/Manifest
index 25bf8c758d65..b1dd1b9e9b7e 100644
--- a/dev-cpp/range-v3/Manifest
+++ b/dev-cpp/range-v3/Manifest
@@ -1,3 +1,3 @@
 DIST range-v3-0.10.0.tar.gz 525765 BLAKE2B 7dd3aed9b35920e058fe43bccd364831a52ad8d50179d1057ab7a37cdef82df021bb09a9913018ae78982fe136c855ba4101e31d35cfc21747af994d0103b95e SHA512 4db089dcbf638eb30fa20dcf6785dd460c5a074a8912984a484592753cfee9f5b9a0e2c56b5bc5921d1b6120877aa2c83ac0a6fe428088ef2854033a635e9723
-EBUILD range-v3-0.10.0-r1.ebuild 855 BLAKE2B be09add892aa7e4a51d5403e33b94048fbf179fde9efd714a5f50bb12c59b519c933108be4b6ff3ded0c89ad2748ebc456f135521c7ecec2a45742996818e8b4 SHA512 8548a651bba506089bcaec57ac90057cf67a93805220e504e0e555077dea187aef9e522d2961f9ea212eb10fb3e84f3421dd4a5a1144625f70bd7ce7f84ade21
+EBUILD range-v3-0.10.0-r1.ebuild 854 BLAKE2B 17533e47f71866b1b7be5b7323e7179513dad88287a61506bb1fb145004927a64a2809682b91c548cc89f544238ee3cbbc2ec42159a3686f5a5c8cc4d63a9f0c SHA512 9d326cb93b3bc3fd32adf43ee6229ea672d56be1c711afe0724cd012451d570ac4ea9404992bee1faa64c4cdffacfef78193192953626a771780bb17939cd5cc
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/dev-cpp/range-v3/range-v3-0.10.0-r1.ebuild b/dev-cpp/range-v3/range-v3-0.10.0-r1.ebuild
index 6386d15b5ee6..0c4a5694d936 100644
--- a/dev-cpp/range-v3/range-v3-0.10.0-r1.ebuild
+++ b/dev-cpp/range-v3/range-v3-0.10.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ericniebler/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 24810166db3c..4949f9ce165d 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,14 +1,8 @@
 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 3221 BLAKE2B 25be613f89f8bd8fcb5a355cd5f11e3e4fc32712d3718232cab19edaeb30d0c17b1cff4f8773e296f16669667c72bab1132ac81e6b33062f919323a501037c82 SHA512 b3ccb6c2341d85f8e277f561917285838c41c592002d213b4e24ef1abe8aeea3605a39d22566d3a90df81bbdd9ae225443c9d9d7ffd1157280f7563949827771
-EBUILD tbb-2020.1.ebuild 3389 BLAKE2B 4dfa1858e8846345aff78cc88e64e068b097b926c29dd2fd796a25665bbbe7f3ce2886609f62abf168bb244b3b3fcbd2317423a16caf96cf5b34ed54f0861125 SHA512 0d799a1013d10c725b98f41244913bb61ce66bb8297b8a9e5076d087cc667db204fb9f2dea042c4c781f7fd84d42357e5c572ce8dab4a176e80e06c65e58b770
+EBUILD tbb-2019.8.ebuild 3219 BLAKE2B da178b7f1be91e0cea538891f93d40842fa7fb72ee81b60fccc46d46c8f0ce8c36aa0a46910013bb78311ce05452d5d8594067f4526a74126341bae446ccd76a SHA512 00281dde79efa4e06a6b98eeb206d823e06a8b846808a58d43f324bb2053e2ac4f20a7b8a0b9d85416877a58efb03410855e10af073675ee85d0313bf87b42fb
 EBUILD tbb-2020.2.ebuild 3397 BLAKE2B b5824f331e87bdfa563c1bb430d8d599ad5d3415c3582d6c3d7deb036b0aef8009798d986af9e8f01f49c1fc77559f0de31a47f75044d13b20a9ca4a35f997c6 SHA512 c659086dd1beedbc05bb1570185d546970040714c2c4bbb3db595a20b04070397538ae79777e3ae01ce18fc5033709ed4e6a8ad535f5c9967e71db05893b846d
 MISC metadata.xml 687 BLAKE2B 34a74bdff790f94b7e32c295833aa986d0d72fc646af900be059d2c5cb55d91af0cf255ad76f0250edd6f6464227c28f19b412243c5f45cc2d3b34a95d5b87d8 SHA512 3db464f32be8e3d79b189da232ab3ce4f8e8694fd1044149b7fc608deb60742886ced2be6bac924bbcd9695cd88747d47297d55f180d87d3340cc589b1bc7f13
diff --git a/dev-cpp/tbb/tbb-2017.20161128.ebuild b/dev-cpp/tbb/tbb-2017.20161128.ebuild
deleted file mode 100644
index 0297838dbef9..000000000000
--- a/dev-cpp/tbb/tbb-2017.20161128.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib-minimal toolchain-funcs versionator
-
-PV1="$(get_version_component_range 1)"
-PV2="$(get_version_component_range 2)"
-MYP="${PN}${PV1}_${PV2}oss"
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="https://www.threadingbuildingblocks.org"
-SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.20160803-underlinking.patch
-	"${FILESDIR}"/${PN}-2017.20161128-build.patch
-)
-
-src_prepare() {
-	default
-
-	find include -name \*.html -delete || die
-
-	# Give it a soname on FreeBSD
-	echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >>	build/FreeBSD.gcc.inc
-	# Set proper versionning on FreeBSD
-	sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die
-
-	use debug || sed -i -e '/_debug/d' Makefile
-}
-
-multilib_src_configure() {
-	# pc files are for debian and fedora compatibility
-	# some deps use them
-	cat <<-EOF > ${PN}.pc.template
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Cflags: -I\${includedir}
-	EOF
-	cp ${PN}.pc.template ${PN}.pc || die
-	cat <<-EOF >> ${PN}.pc
-		Libs: -L\${libdir} -ltbb
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc.pc || die
-	cat <<-EOF >> ${PN}malloc.pc
-		Libs: -L\${libdir} -ltbbmalloc
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc_proxy.pc || die
-	cat <<-EOF >> ${PN}malloc_proxy.pc
-		Libs: -L\${libdir} -ltbbmalloc_proxy
-		Libs.private: -lrt
-		Requires: tbbmalloc
-	EOF
-}
-
-local_src_compile() {
-	cd "${S}"
-
-	local comp arch
-
-	case ${MULTILIB_ABI_FLAG} in
-		abi_x86_64) arch=x86_64 ;;
-		abi_x86_32) arch=ia32 ;;
-#		abi_ppc_64) arch=ppc64 ;;
-#		abi_ppc_32) arch=ppc32 ;;
-	esac
-
-	case "$(tc-getCXX)" in
-		*g++*) comp="gcc" ;;
-		*ic*c) comp="icc" ;;
-		*clang*) comp="clang" ;;
-		*) die "compiler $(tc-getCXX) not supported by build system" ;;
-	esac
-
-	CXX="$(tc-getCXX)" \
-	CC="$(tc-getCC)" \
-	AS="$(tc-getAS)" \
-	arch=${arch} \
-	CPLUS_FLAGS="${CXXFLAGS}" \
-	emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" $@
-}
-
-multilib_src_compile() {
-	local_src_compile tbb tbbmalloc
-}
-
-multilib_src_test() {
-	CXXFLAGS="${CXXFLAGS} -fabi-version=4" \
-	local_src_compile -j1 test
-}
-
-multilib_src_install() {
-	local bt
-	local buildtypes
-	if use debug ; then
-		buildtypes="release debug"
-	else
-		buildtypes="release"
-	fi
-	for bt in ${buildtypes}; do
-		cd "${BUILD_DIR}_${bt}" || die
-		local l
-		for l in $(find . -name lib\*.so.\*); do
-			dolib.so ${l}
-			local bl=$(basename ${l})
-			dosym ${bl} /usr/$(get_libdir)/${bl%.*}
-		done
-	done
-
-	cd "${BUILD_DIR}" || die
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins *.pc
-}
-
-multilib_src_install_all() {
-	doheader -r include/*
-
-	dodoc README CHANGES doc/Release_Notes.txt
-	use doc && dohtml -r doc/html/*
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples/build
-		doins build/*.inc
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples
-	fi
-}
diff --git a/dev-cpp/tbb/tbb-2018.20180312.ebuild b/dev-cpp/tbb/tbb-2018.20180312.ebuild
deleted file mode 100644
index 4a1386375cd6..000000000000
--- a/dev-cpp/tbb/tbb-2018.20180312.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib-minimal multilib toolchain-funcs versionator
-
-PV1="$(get_version_component_range 1)"
-PV2=3
-MY_PV="${PV1}_U${PV2}"
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="https://www.threadingbuildingblocks.org"
-SRC_URI="https://github.com/01org/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.20160803-underlinking.patch
-	"${FILESDIR}"/${PN}-2017.20161128-build.patch
-)
-
-src_prepare() {
-	default
-
-	find include -name \*.html -delete || die
-
-	# Give it a soname on FreeBSD
-	echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >>	build/FreeBSD.gcc.inc
-	# Set proper versionning on FreeBSD
-	sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die
-
-	use debug || sed -i -e '/_debug/d' Makefile
-}
-
-multilib_src_configure() {
-	# pc files are for debian and fedora compatibility
-	# some deps use them
-	cat <<-EOF > ${PN}.pc.template
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Cflags: -I\${includedir}
-	EOF
-	cp ${PN}.pc.template ${PN}.pc || die
-	cat <<-EOF >> ${PN}.pc
-		Libs: -L\${libdir} -ltbb
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc.pc || die
-	cat <<-EOF >> ${PN}malloc.pc
-		Libs: -L\${libdir} -ltbbmalloc
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc_proxy.pc || die
-	cat <<-EOF >> ${PN}malloc_proxy.pc
-		Libs: -L\${libdir} -ltbbmalloc_proxy
-		Libs.private: -lrt
-		Requires: tbbmalloc
-	EOF
-}
-
-local_src_compile() {
-	cd "${S}"
-
-	local comp arch
-
-	case ${MULTILIB_ABI_FLAG} in
-		abi_x86_64) arch=x86_64 ;;
-		abi_x86_32) arch=ia32 ;;
-#		abi_ppc_64) arch=ppc64 ;;
-#		abi_ppc_32) arch=ppc32 ;;
-	esac
-
-	case "$(tc-getCXX)" in
-		*g++*) comp="gcc" ;;
-		*ic*c) comp="icc" ;;
-		*clang*) comp="clang" ;;
-		*) die "compiler $(tc-getCXX) not supported by build system" ;;
-	esac
-
-	CXX="$(tc-getCXX)" \
-	CC="$(tc-getCC)" \
-	AS="$(tc-getAS)" \
-	arch=${arch} \
-	CPLUS_FLAGS="${CXXFLAGS}" \
-	emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" $@
-}
-
-multilib_src_compile() {
-	local_src_compile tbb tbbmalloc
-}
-
-multilib_src_test() {
-	CXXFLAGS="${CXXFLAGS} -fabi-version=4" \
-	local_src_compile -j1 test
-}
-
-multilib_src_install() {
-	local bt
-	local buildtypes
-	if use debug ; then
-		buildtypes="release debug"
-	else
-		buildtypes="release"
-	fi
-	for bt in ${buildtypes}; do
-		cd "${BUILD_DIR}_${bt}" || die
-		local l
-		for l in $(find . -name lib\*$(get_libname \*)); do
-			dolib.so ${l}
-			local bl=$(basename ${l})
-			dosym ${bl} /usr/$(get_libdir)/${bl%%.*}$(get_libname)
-		done
-	done
-
-	cd "${BUILD_DIR}" || die
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins *.pc
-}
-
-multilib_src_install_all() {
-	doheader -r include/*
-
-	dodoc README CHANGES doc/Release_Notes.txt
-	use doc && dohtml -r doc/html/*
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples/build
-		doins build/*.inc
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples
-	fi
-}
diff --git a/dev-cpp/tbb/tbb-2019.8.ebuild b/dev-cpp/tbb/tbb-2019.8.ebuild
index 95a53b4474b3..f8b27cedd94b 100644
--- a/dev-cpp/tbb/tbb-2019.8.ebuild
+++ b/dev-cpp/tbb/tbb-2019.8.ebuild
@@ -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
deleted file mode 100644
index 4ed58041f012..000000000000
--- a/dev-cpp/tbb/tbb-2020.1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# 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
-}