gentoo resync : 15.12.2019

19 files changed, 101 insertions, 310 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 8e78fb382fbd..a039c3d8009f 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index f494ec60b761..8ba0dc0edbab 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,10 +1,5 @@
+AUX oal.patch 653 BLAKE2B 22389b9ac60c471905140e5001f3a43bfeab878633d70e2476242112e55994bde8eea0fc58be39b331b5e9ebacf5f470cb0d1829cab49994bdbfcbf23daf79c3 SHA512 883f752c43b7bf05d23850184130a93667c1e4e98adbaa48da468abce4601cfc42f4c9d8f78a9ff6b1332c1bbdaf5655fa9fbfcc4586420f74097e7d6fd97016
 AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b
-DIST gazebo-10.0.0.tar.bz2 52987075 BLAKE2B 38d8954827e2aef1607b5e4841014d394644aa0d7cc8969c18d47dd4311701e70cde40ed8be1e28010c5472bac2787ebd619a72fcdf0c59391f890b53dac2b79 SHA512 ddb7d4514e90722c11de9f0187321d9a9b5eb778c047b432bc6104792f423275b996c76caa91fcc4a6e6cb578fb0d479c429db3e1da25c9ec5da51fb2520e29b
 DIST gazebo-10.1.0.tar.bz2 52723379 BLAKE2B c7902c1797efef80b3110e988e1c01d171f652803a2ac28b880d5a01e2f981655db2d9925263030948d351e95af39d435b8618bf703f56a29033db05f0b29e2f SHA512 8febea84240eeb2367d783b36e4c626145ccf13177837ccb73b6ed87f8b264a337c6f8dc53d8583ce5d903b6152eaa5234ec2015ee292a1681800af2800d9eb7
-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-10.1.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
+EBUILD gazebo-10.1.0.ebuild 1912 BLAKE2B 1d7a244b54c6ae71068773ad11139930b302cd6a04736eb8397d3e1f901b3be51b9c12b7e30d3c0ab8f3a7aee91f284f0e587a8cc2eb794a36569e5134667e2f SHA512 6affc338c6c5d5e635de9f7b1a47a5d728540ab349b1a03aa903656c9a3f14fa34a5e6759ed9fed5b8427468ef94597499dd5aba14b52a8217bb2c128e5f902a
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/files/oal.patch b/sci-electronics/gazebo/files/oal.patch
new file mode 100644
index 000000000000..4a09793aed00
--- /dev/null
+++ b/sci-electronics/gazebo/files/oal.patch
@@ -0,0 +1,19 @@
+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/gazebo-10.0.0.ebuild b/sci-electronics/gazebo/gazebo-10.0.0.ebuild
deleted file mode 100644
index 2ba6f5bb35d4..000000000000
--- a/sci-electronics/gazebo/gazebo-10.0.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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/gazebo/gazebo-10.1.0.ebuild b/sci-electronics/gazebo/gazebo-10.1.0.ebuild
index 2ba6f5bb35d4..80c4d00fc21e 100644
--- a/sci-electronics/gazebo/gazebo-10.1.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-10.1.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0/10"
 KEYWORDS="~amd64"
 IUSE="cpu_flags_x86_sse2 libav test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/protobuf-2:=
@@ -58,7 +59,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-libs/libxslt )
 "
 CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.patch" )
+PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/oal.patch" )
 
 src_configure() {
 	# doesnt build without it
diff --git a/sci-electronics/gazebo/gazebo-9.4.1.ebuild b/sci-electronics/gazebo/gazebo-9.4.1.ebuild
deleted file mode 100644
index d1bd0c594b06..000000000000
--- a/sci-electronics/gazebo/gazebo-9.4.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 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/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]
-	<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/gazebo/gazebo-9.6.0.ebuild b/sci-electronics/gazebo/gazebo-9.6.0.ebuild
deleted file mode 100644
index d1bd0c594b06..000000000000
--- a/sci-electronics/gazebo/gazebo-9.6.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 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/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]
-	<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 33abede613bf..064ee65a3c91 100644
--- a/sci-electronics/librepcb/Manifest
+++ b/sci-electronics/librepcb/Manifest
@@ -1,4 +1,6 @@
 DIST librepcb-0.1.0-source.zip 12390253 BLAKE2B a44cd0ae0b27961725b01b18eb4d31a1f5f81f9f88252c6d4a7d44280e7bc262c56e99d679598e9cab0eb99c1f30f4e2887a97d72034a691f93946fbe372d6ee SHA512 c87f71743385b44763187251afb6cfa08860e20b58a2d69e4f6a1bc71765e2c49cbc6b59348b4ea089624f3cbc401872ccac1e97a5c260e866665003710cf937
+DIST librepcb-0.1.3-source.zip 12148919 BLAKE2B 2be3455c9be3e60a7cb314292e2a6ffe10d98f0c647d9c79f223ee5c5ef50675685d914889f772448dba699742d3bcd5b6636d489e630c8033912f3c9f223715 SHA512 28d45800bbbbcee8d30973c1a1e1e561c0fe2c65339eda4f6170779d921a9f5b2f5fb8c1cda00477e59976b88a3c368bb4985f31331bb16f761823642138c78b
 EBUILD librepcb-0.1.0-r1.ebuild 660 BLAKE2B 8af1340be2628bb8712f2c67385990b3573f8d648760d015afdb25210a27048e5ffd0b0ecad7ded20ce9f65386eec70c9e7b37f87a0c485a9dca26c0bf80afcb SHA512 b723556ee3afd84d3f3f62ef7d8ebc4034c1b34e12f72da0ecd41d292a256a5e61b8af2e14086324ebe41726891d3036939a4ccedcb4bfa1a79034f6c313fd01
+EBUILD librepcb-0.1.3.ebuild 948 BLAKE2B 54ea0908b371f979cfa70ac2098f2d6870afb648a9b2d5cac4d0db4230e52684e7d131936960549471ec77360b8d4a7e996c55a53b87fd92ddfe0c61d14162e1 SHA512 586b81f4d3710cdd41432bb0cf61898e126cd639809ee25b4184d9df975f48537af607cd9e1535e03e7a7444c4e1b752e13091c66dce62d9c9755b2ab4ef847d
 EBUILD librepcb-9999.ebuild 647 BLAKE2B cab315c02cbc9fa17414e74665da557dcb3ba96da9a9f204430cc704c36b96a099cbf928ccdb3d4c8625fdb3c329f163c9ffa9aa9c017a29dcb104cf8e6221f3 SHA512 d26e48bb59e6f4310f5b5329181f1bac30dcda4cd79b2f7e538ef9db80f89a21c834977cccd41c52998ae94d11c3f5e88e48bb2166523b2561d4d227bc6c0d9d
 MISC metadata.xml 361 BLAKE2B 679b7e05175ee00d4293a2e6fcc3a0215cc154cfe1bb6436267a4c6e4b4d9bf096b2bd934ce1e3c95458c3f957cf8263fa3f8e09cd9bcce8061e28e868e59dc5 SHA512 63eeeed36b35609aba151c2dcbe1e501355b3e56c0febd52f394a20b5a27871c6d69164b854a05769d3cd0eadf245f23ef4153fd8a2e9208dfb079381bbc0a41
diff --git a/sci-electronics/librepcb/librepcb-0.1.3.ebuild b/sci-electronics/librepcb/librepcb-0.1.3.ebuild
new file mode 100644
index 000000000000..fe132f053703
--- /dev/null
+++ b/sci-electronics/librepcb/librepcb-0.1.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Free EDA software to develop printed circuit boards"
+HOMEPAGE="https://librepcb.org/"
+SRC_URI="https://download.librepcb.org/releases/${PV}/${P}-source.zip"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="
+	app-arch/unzip
+	dev-qt/linguist-tools:5"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	eqmake5 -r PREFIX="/usr"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/sci-electronics/linsmith/Manifest b/sci-electronics/linsmith/Manifest
index 161b67ac2c5e..39277228198d 100644
--- a/sci-electronics/linsmith/Manifest
+++ b/sci-electronics/linsmith/Manifest
@@ -1,6 +1,6 @@
 AUX linsmith-datafiles.patch 757 BLAKE2B 273a60d1b93046c015c178c6d037252c667016c3601c7830c9b4c0ff1c1b899c013660ee76034d143011d8c34b6077d137202f3398b9d7fbae3836105dcc69c9 SHA512 af6f38420a4adc8386c70c4837aee74ff5cf2994bc0edf230198cb41cd53dbee69aa08c497dccb5e20f6a89282b2f690995d7cd5f86b93c8ac0f6488f0c0d266
 DIST linsmith-0.99.30.tar.gz 1132438 BLAKE2B fda024052d0aa1af7254aa37975a62bcb1bd2dbeb020202853bc32c85e6859bda6153fb5e6af8f18a4bf29a11c5eb7bd5eaacc68ebbf20b7d2622cc0d04d77d1 SHA512 d1f6cd3895b7c217de49c214f8b86b1bb9ce97d540546f0004b7f320b7cf142652cf0ec51ce48cf32b89564bf408546bf10d5f4937544cf9e8a4d87d1db5bed5
 DIST linsmith-0.99.31.tar.gz 1138998 BLAKE2B c8b32bf2530b87a0bb9f2b7914e5ccdb6c8ad28b57b919b93c4ed0fb272a2e61f588adb3794b81565580a68413f3cb4e43ac861c4a70cce105d3e821d21eccf3 SHA512 0218992243ff5db6efa39e01d7eddf6d44d921fe4caf131d020416d320a542f19bd577a3bbd9fc8df5f1ccb62ba152d02f825bab8fae55dadd262c5dce47c076
-EBUILD linsmith-0.99.30-r1.ebuild 1526 BLAKE2B 0c720c439ffd249855c05770704749edb84762c80dcccc5bc9e5d95a49f79faccc17979a27d63bb0fd6dad23de118623d43ac6e27057b956de8d0ee0ebfcca1d SHA512 5eb2efd3f7332957e440e7b2fa057b6376577029634c53139aae465aa37b91a4cbb56ef01a1670e7033d46dd9d2deea9b7dc15f250028016ad930ecb1d438b86
-EBUILD linsmith-0.99.31.ebuild 1555 BLAKE2B 316229d9fb3727e0bf363cffe730fb24f8b31dea71347f7755f302023b18e710379f45c3a376b710c848a5f8e15180370f3be2dada70a55211dacbb054f0cbe3 SHA512 d676753fa33c34d75263736ce2e111032a09d04a0bea57fa2e57d2e08a7b83879324cbdb6577ba6e0c7dbf70c874dbe9f934f22bd37ab99d872a329a60f3a8b3
+EBUILD linsmith-0.99.30-r1.ebuild 1519 BLAKE2B cb4adba8667494bc1f7e833c9fac55f4133a67fccb262b0b2133ef8842ad7c69b5c2136fb20422c224fe4167fc4a790e3b18cd6fbd7b44b0d0201201db811047 SHA512 2fd8bd079eaa2cb6c793b80d062c13c47d5fa02df4922bad2669299aca8ec10737a4b5d2f5d83338b5dbf73812843cfa880ca41219b938020df390c527c7d9d7
+EBUILD linsmith-0.99.31.ebuild 1548 BLAKE2B 2307cdfd1a0b0d62cdfb093d577a39e74ff39ce8f2e0e8c00871f89fa5823996406cbc4c675d46a1bdf7d7ea6fe4c18239da17756f2fe7b0b6c497d4caec8a7b SHA512 0c4403310cfbf4a86884e5450b87af024d4cc5cdd79e4eb468a8594f9381d8ec76ca1755e26d2291b14c8b5a03718c9aa3e1ece3658a6afca73a0f05d9e271c6
 MISC metadata.xml 473 BLAKE2B 397250ec12397650b2695e1ff89d5dfc9a3c556b64f6fc02c42427757c9c2ca8d0af8630854b611602f6cbf7d2ea66b529c7e4ea50d4d9a5ad7bf94dc15b14a0 SHA512 46151b41b8bacae4dc89d8ef861195f3c6baed7854c1ab176b5ab54b99cad27d92418a58739e2266491e2b4ec003000c4f694ca94c1e0257465ce1eb1b5c8f2b
diff --git a/sci-electronics/linsmith/linsmith-0.99.30-r1.ebuild b/sci-electronics/linsmith/linsmith-0.99.30-r1.ebuild
index 1ae70e969a06..6ee6d95fdf63 100644
--- a/sci-electronics/linsmith/linsmith-0.99.30-r1.ebuild
+++ b/sci-electronics/linsmith/linsmith-0.99.30-r1.ebuild
@@ -62,6 +62,6 @@ src_install() {
 
 	if use examples; then
 		insinto "/usr/share/doc/${PF}/examples"
-		doins datafiles/*.circ datafiles/*.load || die
+		doins datafiles/*.circ datafiles/*.load
 	fi
 }
diff --git a/sci-electronics/linsmith/linsmith-0.99.31.ebuild b/sci-electronics/linsmith/linsmith-0.99.31.ebuild
index 540df23b8513..911fd0398417 100644
--- a/sci-electronics/linsmith/linsmith-0.99.31.ebuild
+++ b/sci-electronics/linsmith/linsmith-0.99.31.ebuild
@@ -65,6 +65,6 @@ src_install() {
 
 	if use examples; then
 		insinto "/usr/share/doc/${PF}/examples"
-		doins datafiles/*.circ datafiles/*.load || die
+		doins datafiles/*.circ datafiles/*.load
 	fi
 }
diff --git a/sci-electronics/netgen/Manifest b/sci-electronics/netgen/Manifest
index bf5b6324712e..a91f7cd10638 100644
--- a/sci-electronics/netgen/Manifest
+++ b/sci-electronics/netgen/Manifest
@@ -1,5 +1,5 @@
 AUX netgen-1.3.10-tcl-bin-name.patch 520 BLAKE2B 313fe29ce7f77c2af6a401a1953393e7baaa263ade4254645959b376f8c9663b3733d5bed201cb658c08635948e7bd1f3403632e4b45c5ae7cc94c58d76a84e7 SHA512 f7f89e1506806b37c9b54a12ca16d95a1f9bd6296c42bc813902151d048e5a58258941f454a0d73f12c146f2792bc972bc64dd503b899ca2ccc16bdf65ea86c0
 AUX netgen-1.4.40-tcl-bin-name.patch 520 BLAKE2B 313fe29ce7f77c2af6a401a1953393e7baaa263ade4254645959b376f8c9663b3733d5bed201cb658c08635948e7bd1f3403632e4b45c5ae7cc94c58d76a84e7 SHA512 f7f89e1506806b37c9b54a12ca16d95a1f9bd6296c42bc813902151d048e5a58258941f454a0d73f12c146f2792bc972bc64dd503b899ca2ccc16bdf65ea86c0
 DIST netgen-1.4.52.tgz 408225 BLAKE2B 49b19832a9f3fa22eca82846f4cca0774c8ba8f0a342a350ef5bc8ffa72f5ccfc6917876c9d8cad3c9b25ad2923ec24d7e8d88e099dda79c6139680ebb84b767 SHA512 ecee6243181e90fbd277c1315b28c34539ebdf254a03544819dbeffe8ddd22fb7ca76c783364bbf97bfbf269cbb446dd6e16f95621774a6cbaa83f0e0b6dd703
-EBUILD netgen-1.4.52.ebuild 1048 BLAKE2B 024c1024692ef196993ef8d3169d54d73a57fb9e8adb15bd5ba4dc0284d9ea77fa8542b0e6357c4fa1594dacd0b77c60bd32d400747ccbf5be178eb931d38f64 SHA512 4fa6fcd208294ae47c4da52c1de3cd2bd140ca62f03123ed2cb705308157aac4590e39a4356827cb90618b12b0775921eac149034ddd5a61dd8e4446f26659ec
+EBUILD netgen-1.4.52.ebuild 691 BLAKE2B c3137571535fd1ad3513c10233d8c167f775317890c96573ce0fa3670649c27f2f00c8a79111704d8df6aac406d26499aca21f3b1257b1831c4cf5d89380c294 SHA512 eba6b310c10aee3c115527c79976e261d69a23af27c8bebd7790de4bb255b98b8f7d03882a6b447589dd59f8168aa9f4cf1a4db8d759d7eaa5ea78653778be7c
 MISC metadata.xml 651 BLAKE2B 4b8a58aef65f71f42a2b42e14369cc225e4053459014f3c31f98d3911b257c17040cae3e30ad83b603dff4ea14aba679b6e192b28c0b87cf8ce57e2fe669589f SHA512 bbbc71b7341a278582f2ca5547018ba250007470f1e5f09e4202060ab8ea3e7404698deaba6863c6cc44ded5b8095ee743778544a654bda1cd8d57d087c17225
diff --git a/sci-electronics/netgen/netgen-1.4.52.ebuild b/sci-electronics/netgen/netgen-1.4.52.ebuild
index 0c90872fda8b..c07ac1310bcb 100644
--- a/sci-electronics/netgen/netgen-1.4.52.ebuild
+++ b/sci-electronics/netgen/netgen-1.4.52.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="LVS tool (layout versus schematic comparison)"
 HOMEPAGE="http://www.opencircuitdesign.com/netgen/index.html"
@@ -14,46 +12,23 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="X"
 
-DEPEND="X? (
+DEPEND="
+	X? (
 		dev-lang/tcl:0
 		dev-lang/tk:0
-		x11-libs/libX11 )"
+		x11-libs/libX11
+	)"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.40-tcl-bin-name.patch
-
-	if $(use X) ; then
-		cp -r "${S}" "${WORKDIR}"/with-x || die
-	fi
-}
+PATCHES=( "${FILESDIR}"/${PN}-1.4.40-tcl-bin-name.patch )
 
 src_configure() {
-	cd scripts
-	econf --without-x
-
-	if $(use X) ; then
-		cd "${WORKDIR}"/with-x/scripts || die
-		econf --with-x
-	fi
-}
-
-src_compile() {
-	emake
-
-	if $(use X) ; then
-		cd "${WORKDIR}"/with-x || die
-		emake
-	fi
+	cd scripts || die
+	econf $(use_with X x)
 }
 
 src_install() {
-	emake DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install
-
-	if $(use X) ; then
-		cd "${WORKDIR}"/with-x || die
-		emake DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install
-	fi
-
-	dodoc Changes README TO_DO
+	emake DESTDIR="${D}" DOCDIR="${EPREFIX}"/usr/share/doc/${PF} install
+	einstalldocs
+	dodoc Changes TO_DO
 }
diff --git a/sci-electronics/pcb/Manifest b/sci-electronics/pcb/Manifest
index 76b567460f5b..21f8d3e41f89 100644
--- a/sci-electronics/pcb/Manifest
+++ b/sci-electronics/pcb/Manifest
@@ -3,6 +3,6 @@ AUX pcb-4.0.2-doc.diff 368 BLAKE2B b45d661583ef68b3a40cc203fbfaf91f275a29a8374cc
 AUX pcb-4.0.2-tests.diff 386 BLAKE2B 12f6d3e190d49549569e99f6e421c9492b0fe1a55c02f206388dd6eb4208e481a7b865fa46e67e25cecb8bcc51a2b3070e17cf28f9f0e25d2484a9c9285b0db3 SHA512 a589c1f01b55d48a1fa2af4a764103a8dbb146c4dcb409ba88298ce011ecc26160a5275fd69e58b29b3dbc2773c80ef9ed86570ac53cc649bc969cb6a0262f55
 DIST pcb-20140316.tar.gz 4210077 BLAKE2B a0a676bc0eaedd269644d7f7e6d6d443c4ca1a66aba4db18a0aea33edef2dbd84d7a027a25c310bce9d309c46b63ac4f1b807587f5064ce81aadaea2f675521b SHA512 5b9a2704b4d3c95f03afad0fe8fb5414b2aa9d680e40bf77ad9b46a9d4e14ba740858092794a9ff6788f31ac19063b126d8ceed6316c0d9eaaaa574e6678c071
 DIST pcb-4.0.2.tar.gz 4762521 BLAKE2B 3bae7983c84a79edc882b822b91e94adc00ec4e9b329719a0a15599bb12a6771318844ffbd6163b3c646be8410af1964d59b523fffaebd690af2cce9b4f0f98e SHA512 8bca9bdbdd640174e82e9cf1a457f9ef3f9b7c3f1d957a21c3bb07e50134b83504d85f312e429bed90bfc58f786b4319ffb69c5637ed4fd69a0312e11c6ad30b
-EBUILD pcb-0_p20140316.ebuild 4126 BLAKE2B fb7b51b36ad06f15199be3b4be06dc2d726b1de38f92d09f92bd2a6db106ab3b794fafebda61d4a9ad506a13fee0f4fd00042abf48af728b934490073954cd5d SHA512 8bee092290370da41552b1f52c32cbf8fa095a003d72c61c009f0ee84ab43c3b25dbad967cf15d366201329a5773d350efb4e24f1746dcd69130f8d07014983e
-EBUILD pcb-4.0.2.ebuild 3957 BLAKE2B dab92e6112a75dd657789a9161643f719e55e0cc9cac8955ce01e4a2ff1c1182ae46e41a1dbca92665603940bb750be410057eeef535154ada43f0b6b0f3d8e1 SHA512 603075c054576873866629f40646bf2dd0c745ea47155ef589b0d8ea924204a6cd0d236752e87c053c4176f3d464b7dcc1da4e867356a5bfa8c33ca136a73fd1
+EBUILD pcb-0_p20140316.ebuild 4150 BLAKE2B 9bb721a281078b53a31ba4ac460092031f2aff7f010f62f02a2452ffb459ea6a83a0d3651dce7501a857c7be7fea55a68a55e3bd1d2a62eac703ab2915d8d755 SHA512 9f1fa2992155c46591f4ce31cff51ac1452c9420128fee0e3eaa0cae4dc48e5f03750b0a3388047cf595ed623d5925bb63983bf1d6d09b47e31fbfe28c762040
+EBUILD pcb-4.0.2.ebuild 3981 BLAKE2B 904c79d5cccec4d4e717ba1599d83750e3ec804e88472f4ceb67439ea5f95be8806539c2e0f5638b16338b11bf0c51e475ae9e2731e5d316ba3bb238aaef2b23 SHA512 8f4dca30a2931fcb080abb540c1da36c3f5e610f42730280eed6c5d02f2240ee9122b5a4663dfeaa0491bc33383b9a27a61f4f5db704b39fa53f05a0ed843a81
 MISC metadata.xml 1029 BLAKE2B 4c3792765c1ddb9daa35eea1a4e9eef977d083a360b216f0284c74148619a7b45c339ce305abbdabe4d5596ad206bb7eb7a3bb76197136170f175b7d3c09ff8e SHA512 14df20e3c253e65f444f67fd0a69facbd02027578c2ef9cbbd1ad10cef0e8c2b0eefd56889b871714410c116173fec815ec6bee1c84d541ed95970e4dabfbc3e
diff --git a/sci-electronics/pcb/pcb-0_p20140316.ebuild b/sci-electronics/pcb/pcb-0_p20140316.ebuild
index baeb85fd51e5..24b400cffc4b 100644
--- a/sci-electronics/pcb/pcb-0_p20140316.ebuild
+++ b/sci-electronics/pcb/pcb-0_p20140316.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,6 +15,7 @@ KEYWORDS="amd64 ppc x86 ~x86-macos"
 IUSE="dbus debug doc gcode gif gtk jpeg m4lib-png motif nelma opengl png
 test tk toporouter xrender"
 # toporouter-output USE flag removed, there seems to be no result
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-libs/glib:2
 	gif? ( >=media-libs/gd-2.0.23 )
diff --git a/sci-electronics/pcb/pcb-4.0.2.ebuild b/sci-electronics/pcb/pcb-4.0.2.ebuild
index bf927c4ad92e..fbed2457df40 100644
--- a/sci-electronics/pcb/pcb-4.0.2.ebuild
+++ b/sci-electronics/pcb/pcb-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,6 +15,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
 IUSE="dbus debug doc gcode gif gtk jpeg m4lib-png motif nelma opengl png
 test tk toporouter xrender"
 # toporouter-output USE flag removed, there seems to be no result
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-libs/glib:2
 	gif? ( media-libs/gd )
diff --git a/sci-electronics/systemc/Manifest b/sci-electronics/systemc/Manifest
index 52fc427c3925..d565da571605 100644
--- a/sci-electronics/systemc/Manifest
+++ b/sci-electronics/systemc/Manifest
@@ -1,4 +1,3 @@
-AUX systemc-2.3.0-config.patch 724 BLAKE2B b52b470ef2c6e2307aabafe2e1039101a0b09bd3c15ebac3985acef05d32780b084849e8a8ed4659fa39e74f2a177395fafc3ef37df9f47bd5df7710622c3f6a SHA512 aabe12c73103dd6393b00aed01b70a0d0c124fb0c521cce56f1412157085c07274f1fa41d27e15bfe5b1744342368d46b9290c4f40520b437714f09491cf26ec
 DIST systemc-2.3.1a.tar.gz 7050669 BLAKE2B eb080ba177ada7fcd816134e62e6461da59a186cd5d1a14627d69d425f72becd587ef7d31e9e48af76cf54f92ccf83f38a079e5598b4fe2e6b349dc4ec74f640 SHA512 cd52eb6e413c8b852e19c8387766eacbddf85e9b2f4d137f3d82d0d4025f13a44216a2e6cacf7b9e2b972584912a4a1c75cdb37a568330ce66a6bf909ca1b723
 EBUILD systemc-2.3.1-r1.ebuild 1332 BLAKE2B 89c5f6273b8218883201b076022ccf2b8a0863a854ed8b8fd17d4777504c229b171bdf036e1067c324d212e3121d74d38b49ce18b9a116ef3d348d5279d93125 SHA512 766d4e865078ff63b1c85185d6120ebaba75ae7cf2e9a7f8d5dd3747c5824caad0f8c9a2f5535f03aeb06da4328611bc632a44abeeb392ab09c8d6543d567c4f
 MISC metadata.xml 742 BLAKE2B 498b0bb60374137fcefdf08bb2c751d20fa7795777627a8b30bb7c4039274dc0d6f3bf88decb8ee49aa26fae32a53f4219c8ef73faedc2cde825961fe8999fa5 SHA512 a3d752c7f86e8d03dd62e0dd9c0e35ea38b654fa36db05925b7339d3a34e4bd97216948f10202f4a8efd7ef8ab15cc91d1437179b592816bd8bae63d3f5dffa3
diff --git a/sci-electronics/systemc/files/systemc-2.3.0-config.patch b/sci-electronics/systemc/files/systemc-2.3.0-config.patch
deleted file mode 100644
index 581e625c6113..000000000000
--- a/sci-electronics/systemc/files/systemc-2.3.0-config.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# drop compiler check to enable use of CXX
---- configure.in.old	2013-09-15 09:38:54.000000000 +0200
-+++ configure.in	2013-09-15 09:40:31.000000000 +0200
-@@ -134,15 +134,8 @@
-                 AC_MSG_ERROR("sorry...architecture not supported")
-             ;;
-         esac
--        case "$CXX_COMP" in
--            c++ | g++)
--                EXTRA_CXXFLAGS="${EXTRA_CXXFLAGS} -m${CPU_ARCH}"
--                EXTRA_ASFLAGS="-m${CPU_ARCH}"
--                ;;
--            *)
--                AC_MSG_ERROR("sorry...compiler not supported")
--            ;;
--        esac
-+        EXTRA_CXXFLAGS="${EXTRA_CXXFLAGS} -m${CPU_ARCH}"
-+        EXTRA_ASFLAGS="-m${CPU_ARCH}"
-         ;;
-     *freebsd*)
-         case "$target_cpu" in