gentoo resync : 25.08.2020

4 files changed, 32 insertions, 36 deletions

diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index df11f50e1222..e7f27f575947 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -1,4 +1,4 @@
-AUX bullet-2.85-soversion.patch 1480 BLAKE2B 101b86e112b3966e850e80030a7b1290bedf639eb1ac303b3171b70d94f67c6697a560ecb50175063e7b35b136a19073d8308f7aac9453bddc204d37310c9b2c SHA512 7679a0e91c06c664c8677f5947d523999eaa496444045c652356f5b49c4f0023488673988a3d8ff84dda4cdbe172d80e95b635773bf74b18b0a1524153f8e6bf
+AUX bullet-2.85-soversion.patch 1094 BLAKE2B 8dc035b80d812b3c2382067796f1626a932ce887246b34a8b5e08fddf45d330078a970eb6c2147259285a45974b8aaa26a2494ad4aa4824d89bf58aa7af3ac37 SHA512 f437d553c51c6cc6646a4a3bf0ffe02e2691a3b2109ea560c986f69c602055c409028a5a3711597aca757d3e3b33cab14d60e03fc120f0975f35c6e16be6362d
 DIST bullet-2.86.tar.gz 25806558 BLAKE2B a8576d8dacd67b9789d32d7b1acc6c4025df3c15427c60d66f98b1906eee8b2b94e5b0108b9a8c00ca6261510ccaf57ba5c02c72fee8f528d4f723b304166731 SHA512 af8a6b282ab606437d7975a59cd8a9c2bf273c83b0e79f0c4c1de6fa51695ba6d5f3c853dce2fdba9cb55e7572214e15089e54db51afc465ca26f502cbd5a4f9
-EBUILD bullet-2.86.ebuild 1563 BLAKE2B 5a0b9af54f968d61f47d98604f6a5ec9a36f3fae61cc1d68674f489ec49bafbb9375b914ad3f23decb97c1667a5d38261c864734fb8af68481818456c2d49a64 SHA512 fc8e5d85fb6a82ecbf8842396f60a8e5aa40188899f3c516ad4f32ce901fdf1e834749fae5ebec6258429822e0ecd1a86764fb274464557a0ae542b7fe472fe3
-MISC metadata.xml 797 BLAKE2B 93cd685b55738775206eb8cf47c0c5d76152faf6c3e535f60d2f38251cbc33c9657ef39f1c9276384d569ab4bba393070f6c52c00ed83cbea5ebc4b7708ef674 SHA512 812a02f3145a9a4b7f73f4549b358af86e698efb9fe17c11aafcdb2fa066171d95cf0eb2992150cf0d1a6b919d8ddba22f483623d3dfb5fbd23d42e8ec39f689
+EBUILD bullet-2.86.ebuild 1565 BLAKE2B 2bcb10a03caa592484f69870e951796f56b8a771e39fe023ec3fa1b517cb6e381e1a35cc4c951ded82aa9d5b5c8fea2cab3c034c26fddff62a962f5b2db512ad SHA512 41f68eaf06d5d300f8f6fb6b2a89cb0d3273c27dc9c7b397aaafd7cef9fd6a6f39a4bbef67ef42f0cf89754c1aa8006ce9e542f2c624e2ae7c9d0b570023817e
+MISC metadata.xml 1048 BLAKE2B 1f807672df77ab19e1b31e4d01424d9741f4b53705f33f1647e73e72c0a056bb7a7dee700b4e11b490a1d78f9b6a5b790759ab1950ac10ce10cdd2c7df23d9da SHA512 e214b323a3242b169e2332660f07bf9b7a7b5298c0831037b3d541c6b16c0ae104291a588619e0757f5136b5977c1f053ca07bb09d1f75d2d022d934e43175fe
diff --git a/sci-physics/bullet/bullet-2.86.ebuild b/sci-physics/bullet/bullet-2.86.ebuild
index b0238f5c9d49..f983c772bb62 100644
--- a/sci-physics/bullet/bullet-2.86.ebuild
+++ b/sci-physics/bullet/bullet-2.86.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Continuous Collision Detection and Physics Library"
 HOMEPAGE="http://www.bulletphysics.com/"
@@ -17,10 +17,8 @@ IUSE="+bullet3 doc double-precision examples extras test"
 RDEPEND="
 	virtual/opengl
 	media-libs/freeglut"
-
-DEPEND="
-	${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.85-soversion.patch )
 
@@ -32,7 +30,7 @@ RESTRICT="test"
 S="${WORKDIR}/${PN}3-${PV}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# allow to generate docs
 	sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die
@@ -40,7 +38,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
 		-DBUILD_CPU_DEMOS=OFF
 		-DBUILD_OPENGL3_DEMOS=OFF
 		-DBUILD_BULLET2_DEMOS=OFF
@@ -52,21 +49,21 @@ src_configure() {
 		-DUSE_DOUBLE_PRECISION=$(usex double-precision)
 		-DBUILD_UNIT_TESTS=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use doc; then
 		doxygen || die
 		HTML_DOCS+=( html/. )
 		DOCS+=( docs/*.pdf )
 	fi
-}
 
-src_install() {
-	cmake-utils_src_install
-	use examples && DOCS+=( examples )
-	einstalldocs
+	if use examples; then
+		# throws QA warnings
+		rm examples/ThirdPartyLibs/openvr/*/linux64/libopenvr_api.so || die
+		DOCS+=( examples )
+	fi
 }
diff --git a/sci-physics/bullet/files/bullet-2.85-soversion.patch b/sci-physics/bullet/files/bullet-2.85-soversion.patch
index 74cfe4e8f8aa..342569355d87 100644
--- a/sci-physics/bullet/files/bullet-2.85-soversion.patch
+++ b/sci-physics/bullet/files/bullet-2.85-soversion.patch
@@ -1,31 +1,22 @@
- Extras/Serialize/BulletFileLoader/CMakeLists.txt   |    2 ++
- .../Serialize/BulletWorldImporter/CMakeLists.txt   |    2 ++
- Extras/glui/CMakeLists.txt                         |    2 ++
- 3 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/Extras/Serialize/BulletFileLoader/CMakeLists.txt b/Extras/Serialize/BulletFileLoader/CMakeLists.txt
-index 486cfdc..f1e0884 100644
 --- a/Extras/Serialize/BulletFileLoader/CMakeLists.txt
 +++ b/Extras/Serialize/BulletFileLoader/CMakeLists.txt
-@@ -16,6 +16,8 @@ btBulletFile.cpp
- btBulletFile.h 
- )
+@@ -20,6 +20,8 @@
+ 
+ ADD_LIBRARY(BulletFileLoader ${BulletFileLoader_SRCS} ${BulletFileLoader_HDRS})
  
 +SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES VERSION ${BULLET_VERSION})
 +SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES SOVERSION ${BULLET_VERSION})
  IF (BUILD_SHARED_LIBS)
-         TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath)
+ 	TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath)
  ENDIF (BUILD_SHARED_LIBS)
-diff --git a/Extras/Serialize/BulletWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletWorldImporter/CMakeLists.txt
-index e620315..e04e8e9 100644
 --- a/Extras/Serialize/BulletWorldImporter/CMakeLists.txt
 +++ b/Extras/Serialize/BulletWorldImporter/CMakeLists.txt
-@@ -9,6 +9,8 @@ btBulletWorldImporter.cpp
- btBulletWorldImporter.h 
- )
+@@ -14,6 +14,8 @@
+ SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION})
+ SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
  
 +SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION})
 +SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
  IF (BUILD_SHARED_LIBS)
-         TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
+ 	TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
  ENDIF (BUILD_SHARED_LIBS)
diff --git a/sci-physics/bullet/metadata.xml b/sci-physics/bullet/metadata.xml
index 884f06af0bae..3304e14d402a 100644
--- a/sci-physics/bullet/metadata.xml
+++ b/sci-physics/bullet/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>rossbridger.cc@gmail.com</email>
+    <name>Ross Charles Campbell</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <maintainer type="project">
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>