gentoo resync : 22.12.2021

6 files changed, 87 insertions, 75 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index c30c891865f9..660bcf174713 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index f8891e5fb965..b4fed9525826 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -3,7 +3,9 @@ AUX qwt.patch 555 BLAKE2B f959e84dc5e144fd3dd35e6e6c7714507e1a4815495d4161119838
 DIST gazebo-11.3.0.tar.bz2 56778002 BLAKE2B d466556c834935d8b3694461ddf6d7a7872b00d2f8f58d50d70cceb8bca3ab4ada1e72e7bb14b79404d45c48f95419e3dedd9019ecc3a8c1623afda077bcbeb2 SHA512 2e219655e45a787aeda50065dcec5d90954c18223f134d6da90b8cb43e119268262e515e527547d0b0b5ed1f73b5083d279551a01faa3d3c34ba7a580c077970
 DIST gazebo-11.5.1.tar.bz2 56486174 BLAKE2B c1bffc5067f2739a8eb2e178bb2209d9c7b5a58d0589710cc515c4bcbbca281fb94ddf16de977f3771bc4b64fb6afe8e86327dde00d19ef62754e4d7634bb65f SHA512 7c922963881cf079e926c239f510e722fc6cabd07ef5e846a4b78772364a3aecb0b68f2b690ff451d42ceb11e88e2f831c30515e5a228f12826516ecad10e53a
 DIST gazebo-11.7.0.tar.bz2 56394312 BLAKE2B 2da58a2702113c1954f0202bb779b723ad8e59cab678f9ca6fe64908785198b996ef71c845a1a85f00e2f4eddb9ed5683f815ada850917b2af4afad214eac77d SHA512 7de40908a021655b2a200a73cf979585f4bdb245064f7e9a853998f87df329223252c73882aa1e2b705bc7de5841e2a87d67f772dfef18e5735c1b06c2663192
+DIST gazebo-11.9.1.tar.bz2 56472954 BLAKE2B c7a1c3c4a03112a90e8a0cb35dde32f5bb478dafb0d8c582d8cbad15ff1f43699782df3d69a75c47efec44d8a15ad96730f1ae9c1b5b0b1ff2099fbc6b8f2e4e SHA512 51af82305ef0758950e2752624cd98bd31abe55469a1cad6432b1edde1a8f896798a554c672f8694c080f7076d13fe1aa91b182227e26f04cb99e9e0f3907694
 EBUILD gazebo-11.3.0-r3.ebuild 1881 BLAKE2B f9f7a612ca0d644a0d27de55f707ead14bbcc50913a641d5f030661ec9879097ef7bedd2bc039585c613c2e6bf4be8169aa0bfd6d51af1bec6eab3f77a0faf17 SHA512 6a3b5d447c84081b9f71a91996755919f2dc654546ba19b3daea6770b31baa989def79d14f17a7fa4a6b1876f7b5b602fd7efc692c5ad990dfb8c1343879c54d
 EBUILD gazebo-11.5.1-r3.ebuild 1881 BLAKE2B f9f7a612ca0d644a0d27de55f707ead14bbcc50913a641d5f030661ec9879097ef7bedd2bc039585c613c2e6bf4be8169aa0bfd6d51af1bec6eab3f77a0faf17 SHA512 6a3b5d447c84081b9f71a91996755919f2dc654546ba19b3daea6770b31baa989def79d14f17a7fa4a6b1876f7b5b602fd7efc692c5ad990dfb8c1343879c54d
 EBUILD gazebo-11.7.0-r2.ebuild 1881 BLAKE2B f9f7a612ca0d644a0d27de55f707ead14bbcc50913a641d5f030661ec9879097ef7bedd2bc039585c613c2e6bf4be8169aa0bfd6d51af1bec6eab3f77a0faf17 SHA512 6a3b5d447c84081b9f71a91996755919f2dc654546ba19b3daea6770b31baa989def79d14f17a7fa4a6b1876f7b5b602fd7efc692c5ad990dfb8c1343879c54d
+EBUILD gazebo-11.9.1.ebuild 1888 BLAKE2B 417685453d6c685f4e74059c379c0ac942b783c99369fa3e1e84a6c8db8c322b5b2068e29fd807ee696c5447cdfe83ed48dd8cbb308a627499e8a7b90be237d9 SHA512 dfe8255e2f9f50caaea354cfcf39cb2327d62e82ae8d173738d7ac6c607eee2e6c98cbd2654097b27840683bcf6122fd788d37fd7d3c5da18769639074bfaf1c
 MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af
diff --git a/sci-electronics/gazebo/gazebo-11.9.1.ebuild b/sci-electronics/gazebo/gazebo-11.9.1.ebuild
new file mode 100644
index 000000000000..c6602d9de1c3
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-11.9.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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-2021:=
+	>=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.2.0: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}/cmake.patch"
+)
+
+src_configure() {
+	# find OGRE properly
+	sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
+
+	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_src_configure
+}
diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index d5faf6bceec7..52767acc098f 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -3,10 +3,7 @@ AUX magic-7.5.202-install.patch 566 BLAKE2B db98035eea33960714f14825ce6c3512e657
 AUX magic-8.3.232-libdir.patch 525 BLAKE2B 5b85f02031d18299ae098b5ff45163d1c6d16f6bbd09996df6c669571ea82820175356c41b308f5055af874effa946f91baae90c43212e8e7adf40800799c8c3 SHA512 9b7018e05ab50db82996df57891642dfe4f00b74edd8f942912f750be91017a7d204fd0bf2271cee8082cfef9c903bdb4d8606979f6b2ef201b9d7ab1cdc523a
 AUX magic-8.3.232-verbose-build.patch 1041 BLAKE2B 80ab96d751ff2294e6d82f75e997ecc1ccc00588eae3a6c0d63d49a134567eae864f3a42c46c6a6e0f6b1a53473df30afefbc9a7e48385a4ea9b780523ee0ca0 SHA512 19f3b6c371efccebadb6fa85f479ec4fa32fb7a4e11af58630e7265f19f598fdfb6c0008cf500de601246a6316ccf173f96dafdcca28bbef4e09658989d67a3a
 AUX magic-ldflags.patch 1767 BLAKE2B 644e2cd816f1763103612376c095bd00b375a129136937842a0fec068d9651e001f31aa7f5575ae999087c7376b8d35cf3d224cb0ac34e124d8f308a6996f5e1 SHA512 ba61218111b7484bb6e60f37a3bbf5696afc887766d8de0ae0e33f9dc18023ee7eecf4b6c7012376afbfb2d3caa0e0421e03b0abee0ad1b2d9032ce80c65e355
-DIST 2002a.tar.gz 6601961 BLAKE2B e34bc281b3f1bc032ba14954b781c8b0055bb9125c57944a5b5f595f8b22feb455c60f3230cf04f06bc41aa807e909d900e3d3ab746076e2c99dcbbdf51a71df SHA512 cb8e30df77e58eb37f7ada775db8a8411612897b1cdbcb59b0c4bd814fa73c6cb10a5461e27e9eecb0fe452e194ee95fbb02b568b86848e501b9c37cc24de39e
-DIST magic-7.5.202.tgz 3692294 BLAKE2B 8c484e7771b388df8a5e9df574a522f81b5ae34bfaa0db28f444f31a0f5737094d73d2f5467796df74f9230fe684e9c96b08b11812b5627ee5a1bcc74893a021 SHA512 62be6e781ab51a4129a520b91a35ff5c280e7e9cb825e5d71e4012205dd0b777ca8c2355fb071d7d716977d477bddd44e45ca2810d3f97bb63dfe46c5ad1ba80
 DIST magic-8.3.232.tgz 4093446 BLAKE2B 6b4b49c2b1f566b0173bead0e95e381a6632b049545dc3b26572f415ba0df3958bc5c3931b686718136185cf105e437fe70dc1f71a11707ad33afac80ddf8f2f SHA512 755b27b8f263d990ca86b3f043e1b8f8a2de75d72f1baf9c4de3a1d7cde28feecf093d8bf1497f2632327d09ce0ce0b17ccea46bdba01c5b53c52ea0f5cf5fdc
 DIST magic-tech-mosis-2002a.tar.gz 6601961 BLAKE2B e34bc281b3f1bc032ba14954b781c8b0055bb9125c57944a5b5f595f8b22feb455c60f3230cf04f06bc41aa807e909d900e3d3ab746076e2c99dcbbdf51a71df SHA512 cb8e30df77e58eb37f7ada775db8a8411612897b1cdbcb59b0c4bd814fa73c6cb10a5461e27e9eecb0fe452e194ee95fbb02b568b86848e501b9c37cc24de39e
-EBUILD magic-7.5.202-r1.ebuild 1904 BLAKE2B ba6f98925316ffdf962dc7db364ca7afd0b676fcf42da1f7c48a9804bcc5fca456abfd5139c1560053da89046b61223dca630cb74cd62b80daf98c5eb3e08529 SHA512 57532b68f40e4f01d6c21b9ddfc51fa9241eac988d43caf65f75a63a0ca5686760e0e4291ee2150edc4f4dcb84cf0b7a7c922e8b825e8f0b219a099789bc4ffc
-EBUILD magic-8.3.232.ebuild 2255 BLAKE2B e3d5cc8df92a6f61decd1387717efbc3eeb67b4eb5265707fc03cfe84ce4163b52dbb8aa31097390dfda2cb355957ae932abc6b01b4b72b12559f09b7ba8b196 SHA512 22946269f2fe9b18850a95756a399f590b121b14179c04fb37f0d209009589e6087c6a7a04ca0748e1d848d68ec04acfda1e930fe373966b2d903ad4855973d7
+EBUILD magic-8.3.232.ebuild 2253 BLAKE2B c8bb1c559fc0e7eaf88dd5a7b7cca4cecf8d4f10e0c81390b9522eba17e17965ff6a3328554effcc80e4559ad6a9525f124a593a819b0277943301ac0b97c058 SHA512 bc078bf38985541a28aa0e9b229b9042eda5fad39d8091710541f26b8dc260a5ed0c7bc5a54b58ab6c30f6cf354233f0d872ba59d5a5fb2e4ffe182c6fb83dc1
 MISC metadata.xml 1381 BLAKE2B 7f9458b2f3e6c1f511b1f5a0f8f31e58114e29216eaf3927a6570f16bfab24fb357a82b432414a28a16fde8f02a00fafa5b5d915681a68c621b11202dbfc3d32 SHA512 b9cd12c6e4704bde2aa963880e9321fd64239b7f9333a7daa74be6707001ed18ac61bc48dc8f85cfeac9a427e07a3bcfe07607662d206d0f5d75753e333d2632
diff --git a/sci-electronics/magic/magic-7.5.202-r1.ebuild b/sci-electronics/magic/magic-7.5.202-r1.ebuild
deleted file mode 100644
index d0de7f316712..000000000000
--- a/sci-electronics/magic/magic-7.5.202-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib epatch autotools
-
-DESCRIPTION="The VLSI design CAD tool"
-HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"
-SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \
-	ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz"
-
-LICENSE="HPND GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	dev-lang/tcl:0=
-	dev-lang/tk:0=
-	dev-tcltk/blt"
-DEPEND="${RDEPEND}
-	app-shells/tcsh"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-ldflags.patch"
-	epatch "${FILESDIR}/${P}-install.patch" #422687
-	epatch "${FILESDIR}/${P}-include.patch"
-	cd scripts
-	eautoreconf
-	cd ..
-	sed -i -e "s: -pg : :" tcltk/Makefile || die
-
-	# required for >=autoconf-2.70 (bug #775422)
-	local ac_aux_file
-	for ac_aux_file in install-sh config.guess config.sub ; do
-		ln -s scripts/${ac_aux_file} ${ac_aux_file} || die
-	done
-}
-
-src_configure() {
-	# Short-circuit top-level configure script to retain CFLAGS
-	# fix tcl/tk detection #447868
-	cd scripts
-	CPP="cpp" econf --with-tcllibs="/usr/$(get_libdir)" --with-tklibs="/usr/$(get_libdir)"
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-
-	dodoc README README.Tcl TODO
-
-	# Move docs from libdir to docdir and add symlink.
-	mv "${D}/usr/$(get_libdir)/magic/doc"/* "${D}/usr/share/doc/${PF}/" || die
-	rmdir "${D}/usr/$(get_libdir)/magic/doc" || die
-	dosym "/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc"
-
-	# Move tutorial from libdir to datadir and add symlink.
-	dodir /usr/share/${PN}
-	mv "${D}/usr/$(get_libdir)/magic/tutorial" "${D}/usr/share/${PN}/" || die
-	dosym "/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial"
-
-	# Install latest MOSIS tech files
-	cp -pPR "${WORKDIR}"/2002a "${D}"/usr/$(get_libdir)/magic/sys/current || die
-}
diff --git a/sci-electronics/magic/magic-8.3.232.ebuild b/sci-electronics/magic/magic-8.3.232.ebuild
index c21980f211ab..a23b43b71b8d 100644
--- a/sci-electronics/magic/magic-8.3.232.ebuild
+++ b/sci-electronics/magic/magic-8.3.232.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.opencircuitdesign.com/${PN}/archive/${P}.tgz
 
 LICENSE="HPND GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="cairo debug opengl"
 
 RDEPEND="sys-libs/ncurses:0=