gentoo resync : 04.01.2022

4 files changed, 46 insertions, 4 deletions

diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 9f769d8fd783..203fc329483a 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,7 +1,9 @@
 AUX tbb-2020.1-makefile-debug.patch 2640 BLAKE2B 98e1d88f279452898be78fb53235427a5c45a0056429e07acd5bc273a48c7214dc8df29c72cba344688f650fce25bba06f6f9e4dfbf1091260544e95159cf33d SHA512 9a29ff67321b75efe10621bfe924e89a5c51d4e7327e20aa69018aaea590189ed297b9ab94bd3b48172d0b093e3d2aaebfc7088b480364f6f6c7802a27d3c1e4
-AUX tbb-2021.4.0-lto.patch 9663 BLAKE2B c05245283427d6a715e835492c099bf106f1d0c3213750b4370a2ef951d90f3be00361e0f2f4632e787dd4ee78294fce3a7c3292ceaa76eb41a8597e4ce9d67b SHA512 4b6fbdfe56a5b1ee890891f9154c7d231d21619bb3260cce0a64d56d6f2f3cf7843dc62d553f36360e702a88d49a20f8fd775488800c2a5308237183535bb247
+AUX tbb-2021.4.0-lto.patch 9710 BLAKE2B 801b7886af6ec02f118add4607c22b26cfafb14997162d5d4e72ec3b48d6ab5ea03995c6a02957331b65172b2d18d932b59bf655352dcbbc178aa508613681f1 SHA512 d65c84a3246dcf5a7c799fd87566834842adfd104bca2c0b0cbd9e2dcae0b900a189154ca9d9c95351c32ff9014cee15f0eb924228e486b58fdcfc624b12d46b
 DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
 DIST tbb-2021.4.0.tar.gz 2452533 BLAKE2B a635c6efa1894c33e2f75c1aa03b6c0f4a86ebef3b58fa42bd25b53d661ed7a9d21f49f121dd3679735f219fbfc35604600bcc72ba60d3602e6de77b0d62e37b SHA512 96da2bc351fd64dfa854f8e6cabc1c4e53af3d55760e99d6f83ad53779c727af333d13d6be0828ed70371cf796498d2063e9dd0e4b2f6451623bb5d28ccbf20b
+DIST tbb-2021.5.0.tar.gz 2463218 BLAKE2B 2d50d312b86318ba4923afe68753b3781f9646cbdb33861f3458301a3a19b7ca3aab6959dca085294dfc743d7f552635f80fb524ec5d780a46f58ffe02e3280d SHA512 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46
 EBUILD tbb-2020.3.ebuild 3391 BLAKE2B 518fa0a1a5ffc1b572b9366880f2e6a204e46f1751c923a76bd5cc96c69ad9bbc673bc89e23b9d46ef0c94e271d12001d0398d7e641d80a60d03fdaefa0789a5 SHA512 727e6797c6afc06f55359974add2b0578bcafa10b276bd603a8d6dc39adfe175cf89ee6c080d8543b4919bb9349adc812a4e3f39a5dcba68730acae30cc7be32
-EBUILD tbb-2021.4.0.ebuild 962 BLAKE2B cc32202a9668bde65cfd7df4ca8ea4d163c06f6beabb90c9b78a16701edab523ac30c86b26d12903efb4b7cab545c6e07ac5bfeafb95fc1b671f4acd96d0390b SHA512 920f4f0af51bbb40efb74b966fcccf9d9550d38f17533deecef6fce6d57a464b1a8b44071de5e4eeb9e4c83781179ed61d6a2c04487868e3568621ab0a324c12
+EBUILD tbb-2021.4.0.ebuild 933 BLAKE2B ab62b32a69703dcd5c6898b5b1c436ea02c7f6edec00c93612e933cde4fe4f851e6a06b7ed2d887b9f372f2ebc46474632536b948d101c2fd433be17c03bf897 SHA512 fd18c239eff4381968fb99db7bf6f01197a57489ffeeddd7352a7aa0e57300e1ca819093fa97802bf29334e6a6014737f20889d82ad81815af2485c454cf449d
+EBUILD tbb-2021.5.0.ebuild 973 BLAKE2B 211e3d1b57aee76396121d1987b3fb62166336a3876a5783a3d3d09ee6e4ac1b27642f2130e56067d0cbf558a04a305406bd3330719a01ab0a0d4da477dd41ad SHA512 585e108c6c097811f1ce46057d59cef9eb0bd1245f6d76ae860ff48c325192e508ea84a77db28693898ad83d78f83a4701ae680fbb5de1ac925124e7c2768d39
 MISC metadata.xml 688 BLAKE2B 5bd4c0fa3ce3f055bd8265a2133ad2b4ea6de984ccf295544f3013851b02a1f1d577070c2ecc1e2748fa8356d3d25278e9a8649a2523763eba6bc7e6ba830f79 SHA512 93b90fc74511f35e02dd7f7c7b3aeb08d2e4c88e2af852fcce40bdb780a3828975955b751542b8a9d3aa0561155858b91842f3cf98c713dcb08c9ce2152f0fe3
diff --git a/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch b/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch
index 5be97b90605d..1c9705576004 100644
--- a/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch
+++ b/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch
@@ -1,3 +1,5 @@
+https://github.com/oneapi-src/oneTBB/pull/608
+
 From 6feeba8035ea2bdf652d473a35730b19427752db Mon Sep 17 00:00:00 2001
 From: Ivan Kochin <kochin.ivan@intel.com>
 Date: Wed, 27 Oct 2021 17:23:32 +0300
diff --git a/dev-cpp/tbb/tbb-2021.4.0.ebuild b/dev-cpp/tbb/tbb-2021.4.0.ebuild
index 9a99edb24ae8..930bcd958708 100644
--- a/dev-cpp/tbb/tbb-2021.4.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake-multilib flag-o-matic toolchain-funcs
+inherit cmake-multilib
 
 DESCRIPTION="High level abstract threading library"
 HOMEPAGE="https://www.threadingbuildingblocks.org"
diff --git a/dev-cpp/tbb/tbb-2021.5.0.ebuild b/dev-cpp/tbb/tbb-2021.5.0.ebuild
new file mode 100644
index 000000000000..0a18fece5fd1
--- /dev/null
+++ b/dev-cpp/tbb/tbb-2021.5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="High level abstract threading library"
+HOMEPAGE="https://www.threadingbuildingblocks.org"
+SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oneTBB-${PV}"
+
+LICENSE="Apache-2.0"
+# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
+# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
+SLOT="0/12.5-2.5-3.5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-apps/hwloc:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	# should be in.. 2022?
+	"${FILESDIR}"/${PN}-2021.4.0-lto.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DTBB_TEST=$(usex test)
+		-DTBB_ENABLE_IPO=OFF
+		-DTBB_STRICT=OFF
+	)
+
+	cmake-multilib_src_configure
+}