gentoo resync : 15.06.2021

3 files changed, 93 insertions, 3 deletions

diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index 85527b3d1f0a..ffb2fc29d972 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -1,6 +1,8 @@
 AUX bullet-2.85-soversion.patch 1094 BLAKE2B 8dc035b80d812b3c2382067796f1626a932ce887246b34a8b5e08fddf45d330078a970eb6c2147259285a45974b8aaa26a2494ad4aa4824d89bf58aa7af3ac37 SHA512 f437d553c51c6cc6646a4a3bf0ffe02e2691a3b2109ea560c986f69c602055c409028a5a3711597aca757d3e3b33cab14d60e03fc120f0975f35c6e16be6362d
 DIST bullet-3.07.tar.gz 148413637 BLAKE2B 776cd7651d11d865095ea000d353860bea09c6ff4ec8dd8e43282a78373e2830f6ce1ce2b87ed25a67be7bded297b3a6320b2872a71dfd3849e7b197c6d2c936 SHA512 31fc7cb4ed8b939abc9eeb0a8f6fff3a454ea4ebcffd797fd35a2320fe3ab222fcd315569809ea148d0efff47267f5eec9f4bf7aaf07730a06aa9babd2abc9a6
 DIST bullet-3.08.tar.gz 129282084 BLAKE2B daa5b6719575af28c6f6359ef51c7a9b8ca9cde2e5b4ea1b00c2991fc4d6b13175d034c7a694eaf36e8ff3ab343457027f57bb511639b3701341ad4551f1a6ca SHA512 4177c2b2f3b007691102973e7a3d4337b8de559d20058db75a2d25eab35b9be62fa14e3362435ef6f7ea2f6b8cf02a78770cc49c17e979adf3a2b41f19ee702a
+DIST bullet-3.17.tar.gz 131995187 BLAKE2B 38996c299eb900f867367966c90c7511d4f5c727671249665a073f86390a4514f7c8193577fd73502b49d467eaeb6e7b195426089065ce3bda3238ee76e237b3 SHA512 a5105bf5f1dd365a64a350755c7d2c97942f74897a18dcdb3651e6732fd55cc1030a096f5808cf50575281f05e3ac09aa50a48d271a47b94cd61f5167a72b7cc
 EBUILD bullet-3.07.ebuild 1929 BLAKE2B c0a1c9c8c2f92c7e7493164eca8f4d27d83944eff2bd5dbffe6705b6c6bd69705b275eff2074de76ac6747702e792e6ff1110247d9fb18b4713efc8d07a7b2a4 SHA512 df6585dc25557f961177d89b340eed84c28a23e2bb8174540ad833e06bf1ec735e3135535348c79323eb2fafa504643eea9a8d386b56ede968344092321c7408
 EBUILD bullet-3.08.ebuild 1931 BLAKE2B 975648f912744474bf610c45ab06f786698b677a0633c7b71dfd514e7b0ec8f138048e13a04aa04c0aa0cfa1d21cccd020255aba23aa5b1dfcacb90be5f31b0b SHA512 3176b2563d9ee11de1d75ad0d51427d761df548699f98772c6337440ba3593a0e83fb19428acb9cf55a6160dd2de8491910bb9db04901698775bec24c93dcfa1
-MISC metadata.xml 1149 BLAKE2B bb8b9b5036dcb4375898afd34e5d6f65fcb82ee89f658f0e9b33e651499d06841cb663134ff17bcdba95e407499f80fc90146b26aea925a0817e413e5d294df6 SHA512 fbe4aec8e02a532751bc5283c5c7efbb795cffbe5edd2b65e3d8b564c049181534ddf197833f27f92947e99f13889c18f95ed307d9e8aaf569a47f65aa47e7a7
+EBUILD bullet-3.17.ebuild 2033 BLAKE2B 3c761d9108ca17304d3da731a27be50545f5325573499fa3199fddb02809eec91f3f04d45ee5ff435baf6c9b22e641a98464816e30f914c1d796f71633602395 SHA512 aa2001729bdf57df2d99627d6ae1a78431d6a8099ba10004f54fe456686f6f74f669fb4b7745b4867bfaaad150b597eb7b4e4e6561074e640545e97ff2cb579b
+MISC metadata.xml 1161 BLAKE2B 5e308d9e4bcd802e4dae22eaf07ed2fe622769e31da919929fdc483c55624a4bf856c2ceba66a4c5e107dae4030ab8a831ce687ad393f6fef569bcb6aa16e140 SHA512 7531dfb626d9a18e61a7ef538a4440ad38b43794d37325d4d1bab9422f7d14f3c4599453d418262b8ce27d7a7a51a8c1f3b82b40a9f3ffc348987b6e9b9fc94e
diff --git a/sci-physics/bullet/bullet-3.17.ebuild b/sci-physics/bullet/bullet-3.17.ebuild
new file mode 100644
index 000000000000..4e1e291757d7
--- /dev/null
+++ b/sci-physics/bullet/bullet-3.17.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Continuous Collision Detection and Physics Library"
+HOMEPAGE="https://www.bulletphysics.com/"
+SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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 )
+"
+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
+}
diff --git a/sci-physics/bullet/metadata.xml b/sci-physics/bullet/metadata.xml
index e05652c8f5a3..24b481850009 100644
--- a/sci-physics/bullet/metadata.xml
+++ b/sci-physics/bullet/metadata.xml
@@ -19,8 +19,9 @@
   for games and animation.
 </longdescription>
   <use>
-    <flag restrict="&lt;=sci-physics/bullet-2.89" name="double-precision">Build libraries in double precision</flag>
-    <flag restrict="=sci-physics/bullet-2.89" name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
+    <flag restrict="&lt;=sci-physics/bullet-3.17" name="extras">Build the extras</flag>
+    <flag name="double-precision">Build libraries in double precision</flag>
+    <flag name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
   </use>
   <upstream>
     <remote-id type="google-code">bullet</remote-id>