gentoo resync : 30.06.2018

4 files changed, 4 insertions, 83 deletions

diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 576b3ff4e411..286105729758 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,9 +1,7 @@
 AUX ffmpeg4.patch 1301 BLAKE2B 7ce55736e3a6fd4b9e0ebc8515305a666cc042c8063eb86aa7efc87c5bad290e15c9778f1be383fbd1bc6e1ed49f537671d522966523ccccba4f7644f1c24447 SHA512 6500270c1d5c9d165a70ec44f30bb6fc3d921461554af0d92d79ff9f659993cfbb87459cb0e78d49d507cd27b39354c53d93fd9839068fa28bcd0c8eaf03245c
 AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b
 DIST gazebo-9.0.0.tar.bz2 52779811 BLAKE2B a85c9fd0e4b805e28ea8fb71c068ad53f18db91a474631b5da73a2a565181c8c22270742c9fabf1656d322fd63ba1caac3286b992d7dc7b197a0582ed724d06e SHA512 52394445d34ce24b2036102be08b6b626fb7021dd0ebaab8e588b68e1e0790d2e26ed2af8ead8f37b0c2e2d37c3d7fc22f95b0b2a8bd95e8dcd77e7fb296dd50
-DIST gazebo-9.1.0.tar.bz2 52928923 BLAKE2B 2b152964d649a3eb572b96bbb27e8f6795bddd5347f893f200d97a80f4c0d8128d548d87dfa3e5051b9aa3af6a4a6be56e79f05252cc6f17278ef2c1592cfb0e SHA512 9ea27cf802e6ce657fe98c886f9d4582303abcec83f6be5e27980969564ec69f42c9589586baa19ea4fd514c3385b9b263f7205a0510b42414c90c1de7cbfd29
 DIST gazebo-9.1.1.tar.bz2 52978923 BLAKE2B 46ddcc0928b3f591356379e20fa5478e385046f8ef2295730b5cb69e07636928226e423db654697a32bcab14846cd13dfe6248017fe1f410d4060f372154ae69 SHA512 1892a3f09d98b75cfdd30b020eb335b4e267db161850eba58153c5be4beb1c2053843f336d63fe638e3ba6466a9d746210a8e7cf3e2d577cc380ce4904576b3c
-EBUILD gazebo-9.0.0.ebuild 1864 BLAKE2B eb60f9ede47bcf3d12a23472e59291d612d9528992f0f4ee9ff1a45911a305e9e2d38ef8b17090da9b61fafc16cf30c9147f8dae034c38a13f933cd767e4b909 SHA512 1b4b025892208067cd7276bebec5235f6708ef7e0d4ca9f2588c1a076dafcfa1d8b23489a5afbb32e49ce4cdc0778d5480b1d41641a629071d2bce92a675782b
-EBUILD gazebo-9.1.0.ebuild 1836 BLAKE2B 01ef8b3926fb57be24d79c8c84d018ef9f382007c29e73fa597c22b1958c52fa4fa75f17c9f82de6dd4d0a8fd193e30d6a59121995e1e06b8cc3aea88966cd8e SHA512 286428641b606469bdc2887d3b0a0d8a5bbf9eb356daf08b5cb1810469dc1fcea52553b86d9eb2ec74d021360e369a5820ab7f839cb4eb1f61824e7512ac6dd2
-EBUILD gazebo-9.1.1.ebuild 1860 BLAKE2B f71a8b53b7f4f86f2b381f3a54afb51673773591b6e153d5e8ebc61065bb620e329aa3f48c53465cd8f7034ba5a10803195237163ac11417e6fe13a7d9404dd8 SHA512 bd5e8f200c2a662a7c89ef02bcda19eb43d611b14ef8f667842697fcbdb96062678f95cf277f047eecf19bacd9173da98660e4d826b0178dd10f12f556cd13b4
+EBUILD gazebo-9.0.0-r1.ebuild 1867 BLAKE2B 9f6e396063a4a72e5938ff0ad400fe03e4690906da37b6c1531908e8deddcd1809ea3a17e3e37c9f08243e4b3f70b50ebd6a3f9291bd0b8afc4cc515803145ec SHA512 a637fcb10a4f193c8fdb724e73b93d5de549e9fa6651d3ded7a59a6e99f2ca39528a1521e315e290b4129f0bd3cec7a061e36a68a113554b6a5e5566bcb99217
+EBUILD gazebo-9.1.1-r1.ebuild 1863 BLAKE2B fdc678548a0cfc8af2959b043562dabdc1b55bb1b38d68c10bed909977a66c03acb95c5ba403db3f2025c5abcf1abc772ef2efb3d0434bc461b2f2419207d604 SHA512 a66748b7ead2b075e0e4dc5b24ac1cb27413eaa75e47920cedae3e658286d45a8bd8a3507efce4bb0b16a3aa40fd2d6ea23cf03f70942cf2d92a968a5c77ba19
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/gazebo-9.0.0.ebuild b/sci-electronics/gazebo/gazebo-9.0.0-r1.ebuild
index 77f42540c99b..082cdd6c8e6f 100644
--- a/sci-electronics/gazebo/gazebo-9.0.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-9.0.0-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 	net-libs/ignition-msgs:1=
 	sci-libs/ignition-math:4=
 	net-libs/ignition-transport:4=
-	x11-libs/qwt:6=[qt5]
+	x11-libs/qwt:6=[qt5(+)]
 "
 DEPEND="${RDEPEND}
 	dev-qt/qttest:5
diff --git a/sci-electronics/gazebo/gazebo-9.1.0.ebuild b/sci-electronics/gazebo/gazebo-9.1.0.ebuild
deleted file mode 100644
index 76ad65771aa8..000000000000
--- a/sci-electronics/gazebo/gazebo-9.1.0.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/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]
-	>=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.1.1.ebuild b/sci-electronics/gazebo/gazebo-9.1.1-r1.ebuild
index ceedacc19dc8..a1bfd2b1d31f 100644
--- a/sci-electronics/gazebo/gazebo-9.1.1.ebuild
+++ b/sci-electronics/gazebo/gazebo-9.1.1-r1.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	net-libs/ignition-msgs:1=
 	sci-libs/ignition-math:4=
 	net-libs/ignition-transport:4=
-	x11-libs/qwt:6=[qt5]
+	x11-libs/qwt:6=[qt5(+)]
 "
 DEPEND="${RDEPEND}
 	dev-qt/qttest:5