gentoo resync : 15.12.2019

6 files changed, 23 insertions, 242 deletions

diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index f494ec60b761..8ba0dc0edbab 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,10 +1,5 @@
+AUX oal.patch 653 BLAKE2B 22389b9ac60c471905140e5001f3a43bfeab878633d70e2476242112e55994bde8eea0fc58be39b331b5e9ebacf5f470cb0d1829cab49994bdbfcbf23daf79c3 SHA512 883f752c43b7bf05d23850184130a93667c1e4e98adbaa48da468abce4601cfc42f4c9d8f78a9ff6b1332c1bbdaf5655fa9fbfcc4586420f74097e7d6fd97016
 AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b
-DIST gazebo-10.0.0.tar.bz2 52987075 BLAKE2B 38d8954827e2aef1607b5e4841014d394644aa0d7cc8969c18d47dd4311701e70cde40ed8be1e28010c5472bac2787ebd619a72fcdf0c59391f890b53dac2b79 SHA512 ddb7d4514e90722c11de9f0187321d9a9b5eb778c047b432bc6104792f423275b996c76caa91fcc4a6e6cb578fb0d479c429db3e1da25c9ec5da51fb2520e29b
 DIST gazebo-10.1.0.tar.bz2 52723379 BLAKE2B c7902c1797efef80b3110e988e1c01d171f652803a2ac28b880d5a01e2f981655db2d9925263030948d351e95af39d435b8618bf703f56a29033db05f0b29e2f SHA512 8febea84240eeb2367d783b36e4c626145ccf13177837ccb73b6ed87f8b264a337c6f8dc53d8583ce5d903b6152eaa5234ec2015ee292a1681800af2800d9eb7
-DIST gazebo-9.4.1.tar.bz2 53014386 BLAKE2B c3e450f869f3e5f88bd9b5f5924a6b003880fff492849d6570222c7c37e98f1b89df4dca1af16c9a766b049067bbcc9d86334882041c6420b6b5221dfd643bb0 SHA512 76fb217c396f4d70fa4617df3aa5a672b5ddd4680df22eb3fbe67182ef8b3e05affda2e61f71d03e31f9c47b2f7d56aac162b63dec2f122cef1e47fd65d25f02
-DIST gazebo-9.6.0.tar.bz2 52899944 BLAKE2B a1ae213cb81cbfbb62fb8a229f12c0c95c4325a8f2a1aae0d07dfaa3bdf17f4d4c3043f37efb5d407fb34073b354d83e7114e166225b8c90e87329abe1618059 SHA512 ef0cc95897322304e0117947e4b45dfb2c4ef3a24f3fa8c798397b3c6cf68b8193b7013efcf15a01f45b15caeae02ed7dacc53ae3b5dc8fcd393018b33bd3d14
-EBUILD gazebo-10.0.0.ebuild 1861 BLAKE2B b9ff4e39e6872e5c1eb4f5e0c6d80b831233aa30afbd7ea85d6b9674a37215d22c0e22d3741903c2852c778218f71090ee2dc8c877d52527b64e27e968e59eeb SHA512 def5c98c5239f51dd4513e988a87e5ee6de0c2fba4cdc0ea74ffaa0333c0958812c4ec126f12ba568042c393ff53dd266da8c393efe7b0ec525b1f3f54ab9534
-EBUILD gazebo-10.1.0.ebuild 1861 BLAKE2B b9ff4e39e6872e5c1eb4f5e0c6d80b831233aa30afbd7ea85d6b9674a37215d22c0e22d3741903c2852c778218f71090ee2dc8c877d52527b64e27e968e59eeb SHA512 def5c98c5239f51dd4513e988a87e5ee6de0c2fba4cdc0ea74ffaa0333c0958812c4ec126f12ba568042c393ff53dd266da8c393efe7b0ec525b1f3f54ab9534
-EBUILD gazebo-9.4.1.ebuild 1860 BLAKE2B 34803940ef219c1231d1a543b90eb6fe3fcbed2e857fff7c385ab2d5982607bcaeccb23506361665f772d7efeaf99f1409c815799725deea32aca57ce67c3c7e SHA512 e74178fdb49183973ceb33a1a86a4b12b409856afdf2ce71adc809379386a9665cb6b0bbb52480a10eb619b2edaad9cc3eb12396a07941124d8825b07035dfd5
-EBUILD gazebo-9.6.0.ebuild 1860 BLAKE2B 34803940ef219c1231d1a543b90eb6fe3fcbed2e857fff7c385ab2d5982607bcaeccb23506361665f772d7efeaf99f1409c815799725deea32aca57ce67c3c7e SHA512 e74178fdb49183973ceb33a1a86a4b12b409856afdf2ce71adc809379386a9665cb6b0bbb52480a10eb619b2edaad9cc3eb12396a07941124d8825b07035dfd5
+EBUILD gazebo-10.1.0.ebuild 1912 BLAKE2B 1d7a244b54c6ae71068773ad11139930b302cd6a04736eb8397d3e1f901b3be51b9c12b7e30d3c0ab8f3a7aee91f284f0e587a8cc2eb794a36569e5134667e2f SHA512 6affc338c6c5d5e635de9f7b1a47a5d728540ab349b1a03aa903656c9a3f14fa34a5e6759ed9fed5b8427468ef94597499dd5aba14b52a8217bb2c128e5f902a
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/files/oal.patch b/sci-electronics/gazebo/files/oal.patch
new file mode 100644
index 000000000000..4a09793aed00
--- /dev/null
+++ b/sci-electronics/gazebo/files/oal.patch
@@ -0,0 +1,19 @@
+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/gazebo-10.0.0.ebuild b/sci-electronics/gazebo/gazebo-10.0.0.ebuild
deleted file mode 100644
index 2ba6f5bb35d4..000000000000
--- a/sci-electronics/gazebo/gazebo-10.0.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 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 libav 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
-	libav? ( >=media-video/libav-9:0= )
-	!libav? ( >=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" )
-
-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-10.1.0.ebuild b/sci-electronics/gazebo/gazebo-10.1.0.ebuild
index 2ba6f5bb35d4..80c4d00fc21e 100644
--- a/sci-electronics/gazebo/gazebo-10.1.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-10.1.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0/10"
 KEYWORDS="~amd64"
 IUSE="cpu_flags_x86_sse2 libav test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/protobuf-2:=
@@ -58,7 +59,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-libs/libxslt )
 "
 CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.patch" )
+PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/oal.patch" )
 
 src_configure() {
 	# doesnt build without it
diff --git a/sci-electronics/gazebo/gazebo-9.4.1.ebuild b/sci-electronics/gazebo/gazebo-9.4.1.ebuild
deleted file mode 100644
index d1bd0c594b06..000000000000
--- a/sci-electronics/gazebo/gazebo-9.4.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 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/9"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 libav 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
-	libav? ( >=media-video/libav-9:0= )
-	!libav? ( >=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" )
-
-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-9.6.0.ebuild b/sci-electronics/gazebo/gazebo-9.6.0.ebuild
deleted file mode 100644
index d1bd0c594b06..000000000000
--- a/sci-electronics/gazebo/gazebo-9.6.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 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/9"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 libav 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
-	libav? ( >=media-video/libav-9:0= )
-	!libav? ( >=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" )
-
-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
-}