commit: 44e8c7e2605d77d478241ea6050b24c0028f4a09
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 13:20:52 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 13:47:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44e8c7e2
sci-electronics/gazebo: Remove old
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-electronics/gazebo/Manifest | 2 -
sci-electronics/gazebo/files/oal.patch | 19 -------
sci-electronics/gazebo/files/qtmoc.patch | 44 ----------------
sci-electronics/gazebo/gazebo-10.1.0.ebuild | 78 ----------------------------
sci-electronics/gazebo/gazebo-11.0.0.ebuild | 80 -----------------------------
5 files changed, 223 deletions(-)
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 48c83055e43..5e66a9b6169 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,3 +1 @@
-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
diff --git a/sci-electronics/gazebo/files/oal.patch
b/sci-electronics/gazebo/files/oal.patch
deleted file mode 100644
index 4a09793aed0..00000000000
--- 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 47841eb26e0..00000000000
--- 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 <[email protected]>
-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 d9ee4733544..00000000000
--- 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 d0014afc557..00000000000
--- 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
-}
