gentoo resync : 12.05.2022

4 files changed, 91 insertions, 2 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 2198a2003895..5a48ed8324dd 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index fab0580c6889..ee38f3d735b9 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -3,8 +3,10 @@ DIST bullet-3.07.tar.gz 148413637 BLAKE2B 776cd7651d11d865095ea000d353860bea09c6
 DIST bullet-3.08.tar.gz 129282084 BLAKE2B daa5b6719575af28c6f6359ef51c7a9b8ca9cde2e5b4ea1b00c2991fc4d6b13175d034c7a694eaf36e8ff3ab343457027f57bb511639b3701341ad4551f1a6ca SHA512 4177c2b2f3b007691102973e7a3d4337b8de559d20058db75a2d25eab35b9be62fa14e3362435ef6f7ea2f6b8cf02a78770cc49c17e979adf3a2b41f19ee702a
 DIST bullet-3.17.tar.gz 131995187 BLAKE2B 38996c299eb900f867367966c90c7511d4f5c727671249665a073f86390a4514f7c8193577fd73502b49d467eaeb6e7b195426089065ce3bda3238ee76e237b3 SHA512 a5105bf5f1dd365a64a350755c7d2c97942f74897a18dcdb3651e6732fd55cc1030a096f5808cf50575281f05e3ac09aa50a48d271a47b94cd61f5167a72b7cc
 DIST bullet-3.21.tar.gz 133046747 BLAKE2B 7bbc51027f19502e4d72bb33ad698817d87d559b60a3eb1067aebc8e25dbf746fd99753cfe6839a2be649318ce7c7563f63409818dc1bdd210a5ed56fe38b5bd SHA512 dfe2e091d2ea42301e131b010769b5a3c5204693f40d46e4f2a8cba94117d19058b8c9873e6a1ce8dff11a249498e65540566ef1a2ff7866546289958965fda4
+DIST bullet-3.22b.tar.gz 139800935 BLAKE2B e7fb35d95b11164fd3184c110581bd73c0a4886087ccccd30b58756ffb97f79d1d2d1ae4a9f51b83c2eac94e5666b7529bf0dbfd7dd8a46ebcaed3f10edf76f5 SHA512 9e2f3eb78b94de6a11d605f4ab87868f19d5aa8df61b35030c3866d47ae9c3e5cfc56ab57b8752d697c17489599de55f4066125f3e1fcbcbc61eed8821ae3f24
 EBUILD bullet-3.07-r1.ebuild 1941 BLAKE2B 9c00b272c034d6fdcc17e4aa405c01f5f3b250730f5a1fd01032ef5b8e837383673e9febccdbad37fb8b6e262d3f851e8ab68c6f304c772d0363b6041c545c00 SHA512 6c4dbeed8a710fdb0b0e11bf70268a392fe0027a409c5070bdb3196b5d611fd217f205bb8590ea37ef9b7064744eb5c64b1df933e6957ae9e2340a9a19f800bb
 EBUILD bullet-3.08-r1.ebuild 1943 BLAKE2B 16c07ca3a3bfa16e2d1c99fceb4ea4f0386b7fe528752052fe178f9c3ac28e1867e104b93afcd824110900156758fc314c255c1166ec8543c43f61ef35fbc7b4 SHA512 82ea0f51a8d25ea2feaa208e96f88d86646beee7c50968feb616fdad58769714554cda5fceed3200e9c79e714ead4f73ced463c1d481797733a676e308dd2f5b
 EBUILD bullet-3.17-r1.ebuild 2050 BLAKE2B c1d92afbc4dcbbb8ab547f4e4f2d4ec897666ab7a717c71104658e845e041c5ab85a92f00245268a4a72049bee1667c3dc5ecc63cf72292fee4c24d4c6f36154 SHA512 339ac9eaa2fe976bcf7391a3f662dd8f2d5ed62cb7e8281cf58d66e8895a1105ba25f783e731e7572cd039ff661f5ec44d54b95bfba9e8755dae3f2227b4f29b
-EBUILD bullet-3.21.ebuild 2052 BLAKE2B cd8dede99e3108d2b0e817d065ef8b6ffe12f4e7e5864c2af91f6b4a4deb1f5efe1778b99b97d12061994e80a56a1a485c42a2f5f5323c2672e36676a0b919d2 SHA512 f3da97de638d01432bac1338aec34963c5b23744cec234b4494f029c639fa49593c63b271c734c84a8d1b4a106fa87cdd5c06ea1dcafd1f5f7e32e395e9d705e
+EBUILD bullet-3.21.ebuild 2050 BLAKE2B 91036460e81531717543e48e05e8d08b5cf7857061b181eaff1e5d4237c8ea26b9e246158576b85f259b7a2485c3850880ebfd14063512f269171815b6923d6e SHA512 e1059e59ef9a47555bd99f0cc5d59e290745e746c094015329395e7519c4fae011ffce5b64b711966161c958c16cdff94ff1eccc51cfd3d9b9d07b1a3364de22
+EBUILD bullet-3.22b.ebuild 2052 BLAKE2B e595345cf8964a6c5868570f38468254ec16fdde8ec744567706cff97b90523f083fd69066ed5a3b58c9b5defcaf68e4aa54b4f800db124d3d2800f610780c29 SHA512 f00875c2cc797a464cc233cecd1972e00c3918c0029469dc80b7b9dc3fa3676e967557c1653d5b3921440c248c22c7590d0e18132984a46cf52eb9dfe6d31a46
 MISC metadata.xml 1162 BLAKE2B 6d72e78aab8b03ee623c694c66876514496b5e8591d17e722771af51e7b7115bdc17c4920c21713bd272eee04da11212676f0092a70d58fc32fd373b77a788f3 SHA512 98348211222b5798b9312f86438cf404e1aeeab75ddd39605e41ee4301bc25111b59b8d0f14ef06df80ab4e88dbd0bc28556b281e58159efb2f945d57306cf22
diff --git a/sci-physics/bullet/bullet-3.21.ebuild b/sci-physics/bullet/bullet-3.21.ebuild
index 9c107c131d61..2dd6ebe42362 100644
--- a/sci-physics/bullet/bullet-3.21.ebuild
+++ b/sci-physics/bullet/bullet-3.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="doc double-precision examples extras openmp tbb test +threads"
 
 REQUIRED_USE="
diff --git a/sci-physics/bullet/bullet-3.22b.ebuild b/sci-physics/bullet/bullet-3.22b.ebuild
new file mode 100644
index 000000000000..236d0a1e53d8
--- /dev/null
+++ b/sci-physics/bullet/bullet-3.22b.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Continuous Collision Detection and Physics Library"
+HOMEPAGE="https://pybullet.org/wordpress/"
+SRC_URI="https://github.com/bulletphysics/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc double-precision examples extras openmp tbb test +threads"
+
+REQUIRED_USE="
+	openmp? ( threads )
+	tbb? ( threads )
+"
+
+RDEPEND="
+	virtual/opengl
+	media-libs/freeglut
+	tbb? ( <dev-cpp/tbb-2021.4.0:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.85-soversion.patch )
+
+DOCS=( AUTHORS.txt LICENSE.txt README.md )
+
+# Building / linking of third Party library BussIK does not work out of the box
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}3-${PV}"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# allow to generate docs
+	sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CPU_DEMOS=OFF
+		-DBUILD_OPENGL3_DEMOS=OFF
+		-DBUILD_BULLET2_DEMOS=OFF
+		-DUSE_GRAPHICAL_BENCHMARK=OFF
+		-DINSTALL_LIBS=ON
+		-DBUILD_BULLET3=ON
+		-DBUILD_BULLET_ROBOTICS_GUI_EXTRA=OFF	# This module depends on example libraries
+		-DBUILD_EXTRAS=$(usex extras)
+		-DUSE_DOUBLE_PRECISION=$(usex double-precision)
+		-DBUILD_UNIT_TESTS=$(usex test)
+		-DBULLET2_MULTITHREADING=$(usex threads)
+		-DBULLET2_USE_OPEN_MP_MULTITHREADING=$(usex openmp)
+		-DBULLET2_USE_TBB_MULTITHREADING=$(usex tbb)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		doxygen || die
+		HTML_DOCS+=( html/. )
+		DOCS+=( docs/*.pdf )
+	fi
+
+	if use examples; then
+		# throws QA warnings
+		rm examples/ThirdPartyLibs/openvr/*/linux*/libopenvr_api.so || die
+		DOCS+=( examples )
+	fi
+}