gentoo resync : 23.09.2020

6 files changed, 4 insertions, 231 deletions

diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 22a323e0edcd..4389cbf9f2b0 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,13 +1,7 @@
 AUX boost173.patch 7177 BLAKE2B 45b8b5bda4274727bf9e55ab5a7d3eb1ccc403a91f1a6988fb2f6cc3c02a13c1d7cb921a483d793d2f6cb78a23724407a33dc40a6bcadd77c0b9e1b7f104bef9 SHA512 a7caa36a35087db455e06bf745d4b4e2ba20ddc4396a6e6998b609a6c9f0d0806630d1c38bae6da6ef264a9a4cfa8219d39e8f54fb88f6a1cb8d7d0927e649fb
 AUX boost174.patch 554 BLAKE2B 71b9e37079cde717a26d3ea36e4551adac3f3017c05e95fc488b9d51e0ef6cf79780dc5a622dad2f209ce862e4fa56ddf40ee198002184bb80add36370918576 SHA512 38854c65ca67924a10add9164659d28ca84bc1f8f5e50e6bfe98231103330d4d74596fd9de1b4d2cc23658fedaafd171acec87d552f48609c9a62265a8eb4912
 AUX cmake.patch 699 BLAKE2B 64edc9a3e51952ca5e15488a4fa148028d77bbb3a294937d9df263e8f0d78c59e6d2a40574534aa12911d79b8871901ff5fd16af236f32f0e580b7e86a3f8198 SHA512 95693482c14ddbc759af20c7ef30d1660e8630b21cf52d15ca14e8ef08d3631483c736e67423e2cabf1a8c8b834e8e25ece8a7bd15f71b38853b71d2fdcbce8f
-AUX oal.patch 653 BLAKE2B 22389b9ac60c471905140e5001f3a43bfeab878633d70e2476242112e55994bde8eea0fc58be39b331b5e9ebacf5f470cb0d1829cab49994bdbfcbf23daf79c3 SHA512 883f752c43b7bf05d23850184130a93667c1e4e98adbaa48da468abce4601cfc42f4c9d8f78a9ff6b1332c1bbdaf5655fa9fbfcc4586420f74097e7d6fd97016
-AUX qtmoc.patch 1176 BLAKE2B d1397e9cd3787c933b43f86d5638971a0806f24496063950fccaad268593eec213e81051cbc035993ac973f3a236941821b2b88e97d6d5d2f366abb3caf8c10d SHA512 35077f09d2e138cfaeec0805a0c6c88b0fb28b863af61283b88002930cf6b26b351d9911d48e9bff253f6e5fce4255fb0cf4426e8a7b459d530dd10c934e9772
 AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b
-DIST gazebo-10.1.0.tar.bz2 52723379 BLAKE2B c7902c1797efef80b3110e988e1c01d171f652803a2ac28b880d5a01e2f981655db2d9925263030948d351e95af39d435b8618bf703f56a29033db05f0b29e2f SHA512 8febea84240eeb2367d783b36e4c626145ccf13177837ccb73b6ed87f8b264a337c6f8dc53d8583ce5d903b6152eaa5234ec2015ee292a1681800af2800d9eb7
-DIST gazebo-11.0.0.tar.bz2 53806265 BLAKE2B 0658bdfd7d1f130767bd38cc2b33379f66f8cd92a9e6496581cd660638fb0307f87af19bcd5bd9ec2edb2be980e964297241ab4c1cec855751fdd7b394c717e9 SHA512 7c6cbb17c52829bb553f57a4bc2d515211aefa105d97cd5e71ff239244e49312562af1c901dac6c88b982986dd1318c0bb780c0a68f10ce78f25e12f031ba934
 DIST gazebo-11.1.0.tar.bz2 53856366 BLAKE2B 6e3df164e40c44265da68eae260012d873121631e56e9ae4ca3d8355e9c22ac80811549103e83d5f20d40f92c80f7a7a313c2395209b1c5177f518d0c0b2117c SHA512 39866991d8b996656a9f927a70e215175ecef671a1e317bfe9221df38bdc08be9825d36018da90cc6843480643a7716586ce8d61f36ffc8b4558ef7096ef6f76
-EBUILD gazebo-10.1.0.ebuild 1883 BLAKE2B 9b883c5acad6ddf919dc90e62033b5765c44ada1baf2895cd88eabe27fed50bfcf01215bd6864c90064cbe445eabd03f9b0f1872c8c39f7546e1c5a28d086de6 SHA512 7fb81bb5907891630607cc5f1132ad0ba57edaf3dd988cd0eadc42de79901f8dc780d8a8b27ba0c218272593988f66a690cf3f60d6b1843c8d635f346fc9bd17
-EBUILD gazebo-11.0.0.ebuild 1874 BLAKE2B 73dc639ada965f845ef175f1f0d4b47ba822656fafcb75ee74d9438b1a3fbe76fb629291e06f51ece553da22153aafb5f59d3a1ec8c8f71d5b2c111862635e4c SHA512 afaea2b8c4b95cd2d05cf2ae0723b2aee602fedcd554d98b0ca7cbf6bf7a23062f4345ef78fc244060b372dece3efc84bb14a430d1838f1cb12dd89fd3cf8663
-EBUILD gazebo-11.1.0.ebuild 1907 BLAKE2B 85f38933c5ba76311d881edc28b3890b0785e261e4301eecccfb951295942cab30ea0f2c6040175a35689539a5df05e34b3f1f16964f2ef5a32e69d2599a7f3a SHA512 03881672fa4ff9304ec43341e1958802c34d42f07a07447b7d919928f45f41ea91ada25974855d396c40fe37b2f25426d1317bc1f56046ec3049f9511ee1e0a8
+EBUILD gazebo-11.1.0-r1.ebuild 1897 BLAKE2B bd698c48be3d530f667b3e9ccbd10e8b83dd1666e2278a4723e5680ce17a26e7cc2ba5e6cf524a36dca2ab8219625199ec06309d53c88ea31be20a8afe4d26dd SHA512 12e26a463d9a7210e4e6a5b8497c48b8be5d97e3a9a2db7e8d82495cda9450a714fa20ba325ddec4f0c5da5ad371e17b9ad6b9c971fdd21648f60288be31b43d
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/files/oal.patch b/sci-electronics/gazebo/files/oal.patch
deleted file mode 100644
index 4a09793aed00..000000000000
--- a/sci-electronics/gazebo/files/oal.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fixes build with openal 1.20
-
-Index: gazebo-10.1.0/gazebo/util/OpenALPrivate.hh
-===================================================================
---- gazebo-10.1.0.orig/gazebo/util/OpenALPrivate.hh
-+++ gazebo-10.1.0/gazebo/util/OpenALPrivate.hh
-@@ -37,10 +37,10 @@ namespace gazebo
-     class OpenALPrivate
-     {
-       /// \brief OpenAL audio context pointer.
--      public: ALCcontext_struct *context;
-+      public: ALCcontext *context;
- 
-       /// \brief OpenAL audio device pointer.
--      public: ALCdevice_struct *audioDevice;
-+      public: ALCdevice *audioDevice;
- 
-       /// \brief OpenAL sink pointer.
-       public: OpenALSinkPtr sink;
diff --git a/sci-electronics/gazebo/files/qtmoc.patch b/sci-electronics/gazebo/files/qtmoc.patch
deleted file mode 100644
index 47841eb26e0d..000000000000
--- a/sci-electronics/gazebo/files/qtmoc.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 66dcba0375357d294d4769a6eb542de29b78a519 Mon Sep 17 00:00:00 2001
-From: Steve Peters <scpeters@openrobotics.org>
-Date: Thu, 26 Dec 2019 05:12:08 -0800
-Subject: [PATCH] use ifndef Q_MOC_RUN to fix compilation of plugins with tbb
- and qt 5.14 (issue #2681)
-
----
- plugins/CessnaGUIPlugin.hh  | 3 +++
- plugins/LookAtDemoPlugin.hh | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/plugins/CessnaGUIPlugin.hh b/plugins/CessnaGUIPlugin.hh
-index 7556d89982..091b8ffd00 100644
---- a/plugins/CessnaGUIPlugin.hh
-+++ b/plugins/CessnaGUIPlugin.hh
-@@ -23,7 +23,10 @@
- 
- #include <gazebo/common/Plugin.hh>
- #include <gazebo/gui/GuiPlugin.hh>
-+// moc parsing error of tbb headers
-+#ifndef Q_MOC_RUN
- #include <gazebo/transport/transport.hh>
-+#endif
- 
- namespace gazebo
- {
-diff --git a/plugins/LookAtDemoPlugin.hh b/plugins/LookAtDemoPlugin.hh
-index 5659394892..2a22b222f5 100644
---- a/plugins/LookAtDemoPlugin.hh
-+++ b/plugins/LookAtDemoPlugin.hh
-@@ -21,7 +21,10 @@
- 
- #include <gazebo/common/Plugin.hh>
- #include <gazebo/gui/GuiPlugin.hh>
-+// moc parsing error of tbb headers
-+#ifndef Q_MOC_RUN
- #include <gazebo/transport/transport.hh>
-+#endif
- 
- namespace gazebo
- {
--- 
-2.24.1
-
diff --git a/sci-electronics/gazebo/gazebo-10.1.0.ebuild b/sci-electronics/gazebo/gazebo-10.1.0.ebuild
deleted file mode 100644
index d9ee47335440..000000000000
--- a/sci-electronics/gazebo/gazebo-10.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils versionator vcs-snapshot flag-o-matic
-
-DESCRIPTION="A 3D multiple robot simulator with dynamics"
-HOMEPAGE="http://gazebosim.org/"
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# Subslot = major version = soname of libs
-SLOT="0/10"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/protobuf-2:=
-	virtual/opengl
-	media-libs/openal
-	net-misc/curl
-	dev-libs/tinyxml
-	>=dev-libs/tinyxml2-6:=
-	dev-libs/libtar
-	dev-cpp/tbb
-	>=dev-games/ogre-1.7.4:=[freeimage]
-	<dev-games/ogre-1.10
-	>=media-libs/freeimage-3.15.4[png]
-	sci-libs/libccd
-	>=media-video/ffmpeg-2.6:0=
-	sci-libs/gts
-	>=sci-physics/bullet-2.82
-	>=dev-libs/sdformat-6.0:=
-	dev-qt/qtwidgets:5
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	dev-libs/boost:=[threads]
-	sci-libs/gdal:=
-	virtual/libusb:1
-	dev-libs/libspnav
-	media-libs/freeimage
-	sci-libs/hdf5:=[cxx]
-	sys-apps/util-linux
-	media-gfx/graphviz
-	net-libs/ignition-msgs:1=
-	sci-libs/ignition-math:4=
-	net-libs/ignition-transport:4=
-	x11-libs/qwt:6=[qt5(+)]
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-	app-text/ronn
-	app-arch/gzip
-	virtual/pkgconfig
-	x11-apps/mesa-progs
-	test? ( dev-libs/libxslt )
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/oal.patch" "${FILESDIR}/qtmoc.patch" )
-
-src_configure() {
-	# doesnt build without it
-	append-cxxflags "-std=c++11"
-	# doesnt build with as-needed either
-	append-ldflags "-Wl,--no-as-needed"
-
-	local mycmakeargs=(
-		"-DUSE_UPSTREAM_CFLAGS=OFF"
-		"-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
-		"-DUSE_HOST_CFLAGS=FALSE"
-		"-DBUILD_TESTING=$(usex test TRUE FALSE)"
-		"-DENABLE_SCREEN_TESTS=FALSE"
-		"-DUSE_EXTERNAL_TINYXML2=TRUE"
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-electronics/gazebo/gazebo-11.0.0.ebuild b/sci-electronics/gazebo/gazebo-11.0.0.ebuild
deleted file mode 100644
index d0014afc5573..000000000000
--- a/sci-electronics/gazebo/gazebo-11.0.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="A 3D multiple robot simulator with dynamics"
-HOMEPAGE="http://gazebosim.org/"
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# Subslot = major version = soname of libs
-SLOT="0/11"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/protobuf-2:=
-	virtual/opengl
-	media-libs/openal
-	net-misc/curl
-	dev-libs/tinyxml
-	>=dev-libs/tinyxml2-6:=
-	dev-libs/libtar
-	dev-cpp/tbb
-	>=dev-games/ogre-1.7.4:=[freeimage]
-	<dev-games/ogre-1.10
-	>=media-libs/freeimage-3.15.4[png]
-	sci-libs/libccd
-	>=media-video/ffmpeg-2.6:0=
-	sci-libs/gts
-	>=sci-physics/bullet-2.82
-	>=dev-libs/sdformat-9.1:=
-	dev-qt/qtwidgets:5
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	dev-libs/boost:=[threads]
-	sci-libs/gdal:=
-	virtual/libusb:1
-	dev-libs/libspnav
-	media-libs/freeimage
-	sci-libs/hdf5:=[cxx]
-	sys-apps/util-linux
-	media-gfx/graphviz
-	net-libs/ignition-msgs:5=
-	sci-libs/ignition-math:6=
-	net-libs/ignition-transport:8=
-	sci-libs/ignition-common:3=
-	sci-libs/ignition-fuel-tools:4=
-	x11-libs/qwt:6=[qt5(+)]
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-	x11-apps/mesa-progs
-	test? ( dev-libs/libxslt )
-"
-BDEPEND="
-	app-text/ronn
-	app-arch/gzip
-	virtual/pkgconfig
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/boost173.patch" "${FILESDIR}/cmake.patch" )
-
-src_configure() {
-	# doesnt build with as-needed
-	#append-ldflags "-Wl,--no-as-needed"
-
-	local mycmakeargs=(
-		"-DUSE_UPSTREAM_CFLAGS=OFF"
-		"-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
-		"-DUSE_HOST_CFLAGS=FALSE"
-		"-DBUILD_TESTING=$(usex test TRUE FALSE)"
-		"-DENABLE_SCREEN_TESTS=FALSE"
-		"-DUSE_EXTERNAL_TINYXML2=TRUE"
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-electronics/gazebo/gazebo-11.1.0.ebuild b/sci-electronics/gazebo/gazebo-11.1.0-r1.ebuild
index ee7b5f268a7d..2bb213d040a5 100644
--- a/sci-electronics/gazebo/gazebo-11.1.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils flag-o-matic
+inherit cmake flag-o-matic
 
 DESCRIPTION="A 3D multiple robot simulator with dynamics"
 HOMEPAGE="http://gazebosim.org/"
@@ -31,7 +31,7 @@ RDEPEND="
 	sci-libs/libccd
 	>=media-video/ffmpeg-2.6:0=
 	sci-libs/gts
-	>=sci-physics/bullet-2.82
+	>=sci-physics/bullet-2.82:=
 	>=dev-libs/sdformat-9.1:=
 	dev-qt/qtwidgets:5
 	dev-qt/qtcore:5
@@ -81,5 +81,5 @@ src_configure() {
 		"-DENABLE_SCREEN_TESTS=FALSE"
 		"-DUSE_EXTERNAL_TINYXML2=TRUE"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }