[gentoo-commits] repo/proj/guru:master commit in: sci-libs/dart/

["Haelwenn Monnier" <contact@hacktivis.me>]

commit:     c095b9684f8fe35cc92fff9a2fd3fc6d4b62a950
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue May  3 20:11:34 2022 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Tue May  3 20:21:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c095b968

sci-libs/dart: reduce number of useflags

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sci-libs/dart/Manifest                             |  1 -
 sci-libs/dart/dart-6.10.1-r2.ebuild                | 91 ----------------------
 ...dart-6.12.1-r1.ebuild => dart-6.12.1-r2.ebuild} | 50 ++++--------
 sci-libs/dart/metadata.xml                         |  9 +--
 4 files changed, 18 insertions(+), 133 deletions(-)

diff --git a/sci-libs/dart/Manifest b/sci-libs/dart/Manifest
index 46b234018..c5e174080 100644
--- a/sci-libs/dart/Manifest
+++ b/sci-libs/dart/Manifest
@@ -1,2 +1 @@
-DIST dart-6.10.1.tar.gz 15867405 BLAKE2B 64c42ce1d808a88df53f4292df30c0bc58b52f864342ac0b353ad0496d41bd4986ad231cb08869058a16591350acf0fc0c12ae15d574d919c1c27f102028f608 SHA512 8abbf883628442ed5166e436349de8caaaf72a0ecfa88e75b986a550d617bd9b5df8ff32e32395e941ba12b7ad359be15b2ab2f566d99aa6c603bd0ebade1df0
 DIST dart-6.12.1.tar.gz 15990308 BLAKE2B d361dfad70745aa3747ea09f9f80a0b52051cb3e5d9a961995d469ab33086bf8d4068f95dbd4af8d0e2b23d5fbb0fa49dc63d823ffa52bbe750745093a6b54eb SHA512 f386f646f13989dad66efbe126691553b280bf6441edad1c03059d6ae650384652da538edd3d27f3404ba76b9d6f9348e5b1c0998d7673e856cc488b91a677ff

diff --git a/sci-libs/dart/dart-6.10.1-r2.ebuild b/sci-libs/dart/dart-6.10.1-r2.ebuild
deleted file mode 100644
index d475a1738..000000000
--- a/sci-libs/dart/dart-6.10.1-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="Dynamic Animation and Robotics Toolkit"
-HOMEPAGE="https://dartsim.github.io"
-SRC_URI="https://github.com/dartsim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="bullet doc examples extras glut +ipopt +nlopt ode openscenegraph python test tests tutorials urdfdom"
-#TODO: pagmo
-#TODO: unbundle imgui
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}/${PN}-respect-ldflags.patch" )
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-
-	|| ( ipopt nlopt )
-"
-
-RDEPEND="
-	app-arch/lz4
-	>=dev-cpp/eigen-3.0.5
-	dev-libs/boost
-	dev-libs/tinyxml2
-	>=sci-libs/libccd-2.0
-	>=media-libs/assimp-3.0.0
-	>=sci-libs/fcl-0.2.9
-	sci-libs/flann
-	sci-libs/octomap
-	virtual/opengl
-	x11-libs/libXi
-	x11-libs/libXmu
-
-	bullet? ( sci-physics/bullet )
-	examples? ( dev-games/openscenegraph )
-	glut? ( media-libs/freeglut )
-	ipopt? ( sci-libs/ipopt )
-	nlopt? ( >=sci-libs/nlopt-2.4.1 )
-	ode? ( dev-games/ode )
-	openscenegraph? ( dev-games/openscenegraph )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	urdfdom? ( dev-libs/urdfdom )
-"
-DEPEND="
-	${RDEPEND}
-	urdfdom? ( dev-libs/urdfdom_headers )
-"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDART_VERBOSE=ON
-
-		-DDART_BUILD_DARTPY=$(usex python)
-		-DDART_BUILD_EXTRAS=$(usex extras)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use examples && cmake_build examples
-	use python && cmake_build dartpy # no work to do ...
-	use test && cmake_build tests
-	use tutorials && cmake_build tutorials
-}
-
-src_install() {
-	cmake_src_install
-	#TODO: python examples tests tutorials
-	mv "${ED}/usr/share/doc/dart" "${ED}/usr/share/doc/${PF}" || die
-	docompress -x "/usr/share/doc/${PF}"
-}

diff --git a/sci-libs/dart/dart-6.12.1-r1.ebuild b/sci-libs/dart/dart-6.12.1-r2.ebuild
similarity index 84%
rename from sci-libs/dart/dart-6.12.1-r1.ebuild
rename to sci-libs/dart/dart-6.12.1-r2.ebuild
index 9d972ee8f..9fbd064b4 100644
--- a/sci-libs/dart/dart-6.12.1-r1.ebuild
+++ b/sci-libs/dart/dart-6.12.1-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/dartsim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="bullet doc examples extras glut gui +ipopt +nlopt ode python test tests tutorials urdfdom
+IUSE="doc examples extras osg python test tutorials
 cpu_flags_x86_mmx cpu_flags_x86_mmxext	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3
 cpu_flags_x86_ssse3 cpu_flags_x86_sse4a cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx
 cpu_flags_x86_avx2 cpu_flags_x86_avx512dq cpu_flags_x86_avx512f cpu_flags_x86_avx512vl
@@ -30,47 +30,35 @@ cpu_flags_ppc_altivec cpu_flags_arm_neon cpu_flags_arm_iwmmxt cpu_flags_arm_iwmm
 RDEPEND="
 	app-arch/lz4
 	>=dev-cpp/eigen-3.0.5
+	dev-games/ode
 	dev-libs/boost
 	dev-libs/tinyxml2
-	>=sci-libs/libccd-2.0
+	dev-libs/urdfdom
 	>=media-libs/assimp-3.0.0
+	media-libs/freeglut
+	media-libs/imgui:=[glut(-),opengl(-)]
+	media-libs/lodepng:=
+	>=sci-libs/libccd-2.0
 	>=sci-libs/fcl-0.2.9
 	sci-libs/flann
+	sci-libs/ipopt
+	>=sci-libs/nlopt-2.4.1
 	sci-libs/octomap
+	sci-physics/bullet
+	virtual/opengl
 
-	bullet? ( sci-physics/bullet )
-	examples? (
-		dev-cpp/tiny-dnn
-		dev-libs/urdfdom
-	)
-	extras? ( dev-libs/urdfdom )
-	glut? ( media-libs/freeglut )
-	gui? (
-		dev-games/openscenegraph
-		media-libs/imgui:=[glut(-)?,opengl(-)]
-		media-libs/lodepng:=
-		virtual/opengl
-		x11-libs/libXi
-		x11-libs/libXmu
-	)
-	ipopt? ( sci-libs/ipopt )
-	nlopt? ( >=sci-libs/nlopt-2.4.1 )
-	ode? ( dev-games/ode )
+	examples? ( dev-cpp/tiny-dnn )
+	osg? ( dev-games/openscenegraph )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
 	)
-	urdfdom? ( dev-libs/urdfdom )
 "
 DEPEND="
 	${RDEPEND}
-	examples? ( dev-libs/urdfdom_headers )
-	extras? (
-		dev-cpp/gtest
-		dev-libs/urdfdom_headers
-	)
+	dev-libs/urdfdom_headers
+	extras? ( dev-cpp/gtest )
 	test? ( dev-cpp/gtest )
-	urdfdom? ( dev-libs/urdfdom_headers )
 "
 BDEPEND="
 	app-text/dos2unix
@@ -87,14 +75,10 @@ PATCHES=(
 	"${FILESDIR}/${P}-use-system-lodepng-imgui.patch"
 )
 REQUIRED_USE="
-	examples? ( gui )
-	gui? ( glut )
 	python? (
 		${PYTHON_REQUIRED_USE}
-		gui
+		osg
 	)
-
-	|| ( ipopt nlopt )
 "
 
 pkg_setup() {
@@ -147,7 +131,7 @@ src_configure() {
 		-DDART_TREAT_WARNINGS_AS_ERRORS=OFF
 
 		-DDART_BUILD_EXTRAS=$(usex extras)
-		-DDART_BUILD_GUI_OSG=$(usex gui)
+		-DDART_BUILD_GUI_OSG=$(usex osg)
 		-DDART_ENABLE_SIMD="${simd}"
 	)
 	cmake_src_configure

diff --git a/sci-libs/dart/metadata.xml b/sci-libs/dart/metadata.xml
index 2d537d0c1..4462fb9a0 100644
--- a/sci-libs/dart/metadata.xml
+++ b/sci-libs/dart/metadata.xml
@@ -10,16 +10,9 @@
 		<remote-id type="github">dartsim/dart</remote-id>
 	</upstream>
 	<use>
-		<flag name="bullet">Bullet Collision Detector Support</flag>
 		<flag name="examples">Build the examples</flag>
 		<flag name="extras">Build the experimental projects that are derived from the core DART project</flag>
-		<flag name="gui">OpenSceneGraph GUI</flag>
-		<flag name="ipopt">IPopt Optimization Support</flag>
-		<flag name="nlopt">NLopt Optimization Support</flag>
-		<flag name="ode">ODE Collision Detector Support</flag>
-		<flag name="openscenegraph">OpenSceneGraph GUI and examples</flag>
-		<flag name="tests">Build the tests</flag>
+		<flag name="osg">OpenSceneGraph GUI</flag>
 		<flag name="tutorials">Build the tutorials</flag>
-		<flag name="urdfdom">URDF parser</flag>
 	</use>
 </pkgmetadata>