gentoo resync : 16.02.1018

5 files changed, 85 insertions, 13 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 853779f9800b..e2043f5b9602 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 6db252d8d373..d481f1210161 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,6 +1,8 @@
 AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b
+DIST gazebo-10.0.0.tar.bz2 52987075 BLAKE2B 38d8954827e2aef1607b5e4841014d394644aa0d7cc8969c18d47dd4311701e70cde40ed8be1e28010c5472bac2787ebd619a72fcdf0c59391f890b53dac2b79 SHA512 ddb7d4514e90722c11de9f0187321d9a9b5eb778c047b432bc6104792f423275b996c76caa91fcc4a6e6cb578fb0d479c429db3e1da25c9ec5da51fb2520e29b
 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-9.4.1.ebuild 1860 BLAKE2B 34803940ef219c1231d1a543b90eb6fe3fcbed2e857fff7c385ab2d5982607bcaeccb23506361665f772d7efeaf99f1409c815799725deea32aca57ce67c3c7e SHA512 e74178fdb49183973ceb33a1a86a4b12b409856afdf2ce71adc809379386a9665cb6b0bbb52480a10eb619b2edaad9cc3eb12396a07941124d8825b07035dfd5
 EBUILD gazebo-9.6.0.ebuild 1860 BLAKE2B 34803940ef219c1231d1a543b90eb6fe3fcbed2e857fff7c385ab2d5982607bcaeccb23506361665f772d7efeaf99f1409c815799725deea32aca57ce67c3c7e SHA512 e74178fdb49183973ceb33a1a86a4b12b409856afdf2ce71adc809379386a9665cb6b0bbb52480a10eb619b2edaad9cc3eb12396a07941124d8825b07035dfd5
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/gazebo-10.0.0.ebuild b/sci-electronics/gazebo/gazebo-10.0.0.ebuild
new file mode 100644
index 000000000000..2ba6f5bb35d4
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-10.0.0.ebuild
@@ -0,0 +1,78 @@
+# 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/librepcb/Manifest b/sci-electronics/librepcb/Manifest
index 5f724551c191..bcabfd41a827 100644
--- a/sci-electronics/librepcb/Manifest
+++ b/sci-electronics/librepcb/Manifest
@@ -1,4 +1,4 @@
-DIST LibrePCB-first_pcb.tar.gz 4661241 BLAKE2B c725b89e0ee67db2c68d806b5ed3eeda2326e05c10cc9fda37e9f3bf720b746a1ec6e3e31b130f08686e467cca737995a6a927a828b4d6390c9020d744b6b0e5 SHA512 04edb90aeb757e50dae66b5bf051455b4ea26b7ba4f953cfbc44a737c523f926834c6821de458f70842780790c94a5440313f3e1d58c2a91119a55898fb1d74b
-EBUILD librepcb-0.1.0_p201805.ebuild 836 BLAKE2B 0c4d45042c1f1ae44259d2ed37a78aadbb8f0a14d4497322fd6ee11bab8d0a2ca457688a38cf847f3656c63c05d0d7f79e5f56a9ea42055b050a9ba7f96c4c59 SHA512 aa96e5072795c2f9a0e7c152bd532a7bd3eaab430d217548cef141515a8249f591d7ab87d66335fa14a7d1e0494a8632cb067ca1ea8c51ba8cd576ba9050b879
+DIST librepcb-0.1.0-source.zip 12390253 BLAKE2B a44cd0ae0b27961725b01b18eb4d31a1f5f81f9f88252c6d4a7d44280e7bc262c56e99d679598e9cab0eb99c1f30f4e2887a97d72034a691f93946fbe372d6ee SHA512 c87f71743385b44763187251afb6cfa08860e20b58a2d69e4f6a1bc71765e2c49cbc6b59348b4ea089624f3cbc401872ccac1e97a5c260e866665003710cf937
+EBUILD librepcb-0.1.0.ebuild 679 BLAKE2B 4999adefcce388abda77ae9d4e81581bfe7e1113c552c0e2b25fff3a1a65bce25fce48ca5bf0f6cb9fd3e6c110bafb97a7d105f5716a1a08496aadc4613e08b9 SHA512 0f0d48604572a5e6ee88a2a0240e33ad4b97adbfa01692774750c63e3d004f72c3baad1c87dfdf9ac90efdc0c47c92d2125f43d52c2aa84b27bf8cac6596f0a2
 EBUILD librepcb-9999.ebuild 666 BLAKE2B 18c449488d850ae995fae6808b6a2f16db64334b53a32b4b327932484a3683e8c04d6d2df7c4221e795075d595e60027ad3fd9c87aa2e3a00f1f705b65b56847 SHA512 a9c5ac47f8d4ab2db1ef22b34d4db285420bcc9d7db774591aa52ed39aa0d7bf3b5a6e90c697ddba1455af3856c3a7f1da6b965b844cb08467a1e916768a379d
 MISC metadata.xml 361 BLAKE2B 679b7e05175ee00d4293a2e6fcc3a0215cc154cfe1bb6436267a4c6e4b4d9bf096b2bd934ce1e3c95458c3f957cf8263fa3f8e09cd9bcce8061e28e868e59dc5 SHA512 63eeeed36b35609aba151c2dcbe1e501355b3e56c0febd52f394a20b5a27871c6d69164b854a05769d3cd0eadf245f23ef4153fd8a2e9208dfb079381bbc0a41
diff --git a/sci-electronics/librepcb/librepcb-0.1.0_p201805.ebuild b/sci-electronics/librepcb/librepcb-0.1.0.ebuild
index c4b45e1d718d..5e3edf8dbefb 100644
--- a/sci-electronics/librepcb/librepcb-0.1.0_p201805.ebuild
+++ b/sci-electronics/librepcb/librepcb-0.1.0.ebuild
@@ -1,22 +1,19 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils
 
 DESCRIPTION="Free EDA software to develop printed circuit boards"
 HOMEPAGE="https://librepcb.org/"
-MY_P="LibrePCB-first_pcb"
-SRC_URI="https://github.com/LibrePCB/LibrePCB/archive/first_pcb.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://download.librepcb.org/releases/${PV}/${P}-source.zip"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-S="${WORKDIR}/${MY_P}"
-
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -24,18 +21,13 @@ RDEPEND="
 	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
 	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	sys-libs/zlib"
 
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	sed -i '/Version/d' packaging/unix/librepcb.desktop || die
-	default
-}
-
 src_configure() {
 	eqmake5 -r PREFIX="/usr"
 }