From 25cf3201c31249fcb4b2641e6df087aae1632bcd Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Fri, 8 Jun 2018 13:16:53 +0200 Subject: sci-electronics/gazebo: Remove old Package-Manager: Portage-2.3.40, Repoman-2.3.9 --- sci-electronics/gazebo/Manifest | 1 - sci-electronics/gazebo/files/tinyxml6.patch | 20 ------- sci-electronics/gazebo/gazebo-8.2.0-r1.ebuild | 77 --------------------------- 3 files changed, 98 deletions(-) delete mode 100644 sci-electronics/gazebo/files/tinyxml6.patch delete mode 100644 sci-electronics/gazebo/gazebo-8.2.0-r1.ebuild diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest index 2599468bfd5c..5a61ca67a978 100644 --- a/sci-electronics/gazebo/Manifest +++ b/sci-electronics/gazebo/Manifest @@ -1,2 +1 @@ -DIST gazebo-8.2.0.tar.bz2 52513092 BLAKE2B d44c4ac837163331f50e266bb4880f42fff82037ccc9a7e1ac7ccea0a37415a2fc217c62b449358510308fc741e0c569e2613c70c328e323f6f018c5bc6f0b31 SHA512 d2561a6e5460ea068d9c84945e5955d986bc1f6f0d1ba16100aae53015c6e11da3a152ac6ecb906147d37261d4c680025bcc5f5587c6c09f127319dc184cf843 DIST gazebo-9.0.0.tar.bz2 52779811 BLAKE2B a85c9fd0e4b805e28ea8fb71c068ad53f18db91a474631b5da73a2a565181c8c22270742c9fabf1656d322fd63ba1caac3286b992d7dc7b197a0582ed724d06e SHA512 52394445d34ce24b2036102be08b6b626fb7021dd0ebaab8e588b68e1e0790d2e26ed2af8ead8f37b0c2e2d37c3d7fc22f95b0b2a8bd95e8dcd77e7fb296dd50 diff --git a/sci-electronics/gazebo/files/tinyxml6.patch b/sci-electronics/gazebo/files/tinyxml6.patch deleted file mode 100644 index 16a3862fc78f..000000000000 --- a/sci-electronics/gazebo/files/tinyxml6.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: gazebo-8.2.0/gazebo/util/LogPlay.cc -=================================================================== ---- gazebo-8.2.0.orig/gazebo/util/LogPlay.cc -+++ gazebo-8.2.0/gazebo/util/LogPlay.cc -@@ -125,12 +125,9 @@ void LogPlay::Open(const std::string &_l - { - gzerr << "Unable to load file[" << _logFile << "]. " - << "Check the Gazebo server log file for more information.\n"; -- const char *errorStr1 = this->dataPtr->xmlDoc.GetErrorStr1(); -- const char *errorStr2 = this->dataPtr->xmlDoc.GetErrorStr2(); -- if (errorStr1) -- gzlog << "Log Error 1:\n" << errorStr1 << std::endl; -- if (errorStr2) -- gzlog << "Log Error 2:\n" << errorStr2 << std::endl; -+ const char *errorStr = this->dataPtr->xmlDoc.ErrorStr(); -+ if (errorStr) -+ gzlog << "Log Error:\n" << errorStr << std::endl; - gzthrow("Error parsing log file"); - } - diff --git a/sci-electronics/gazebo/gazebo-8.2.0-r1.ebuild b/sci-electronics/gazebo/gazebo-8.2.0-r1.ebuild deleted file mode 100644 index 2c1546415b0b..000000000000 --- a/sci-electronics/gazebo/gazebo-8.2.0-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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/8" -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] - >=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-5.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:0= - >=sci-libs/ignition-math-2.3:3= - net-libs/ignition-transport:3= - 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}/tinyxml6.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 -} -- cgit v1.2.3-65-gdbad