gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /sci-libs
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
50 files changed, 1435 insertions, 592 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index cd90218996ba..b1f7b53a0dc1 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index dde33d299ead..969dbaa7c4be 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,3 +1,5 @@
 DIST armadillo-8.300.2.tar.xz 4593916 BLAKE2B 0cb9082d9452b43599dea810036a1cdcd8ef4ab6ce5b2bc7b9d9201f1f396666a2aecb81ffa62388e1ee3de9a8c7df083df594224af47e5df7ee4d3c2743d6cc SHA512 df069634db377e95e02dfca02312b082b34cab91bae0b1fd04a97339477074fc50c74f8adf92786ac6f0fc148044d527461617f382cc996523251b6d1287e41c
+DIST armadillo-9.200.5.tar.xz 4786264 BLAKE2B 3ac5e7e50c82927ba311860915d65426e5b71e6235a041b949166e02aa50dd50a6c32d34d44761052829471ce66df9a4a9a495e1da18deff2abfbd8d67b72d0f SHA512 31110ac0d9ef9e6cf6fcf97a846ad4bb7545aa2d16fc847d85d481d605942af62994562ba8b083d76b051002d6693c966ee4b4ad398711fe1d68d31bf12daea2
 EBUILD armadillo-8.300.2.ebuild 3376 BLAKE2B 3919b3ff29586060911230a35fa61aa590cec61f982c9b817ad468eea146ea142cc6fe021a4240ffc7bc3562e1349e59f76a868a2632f03bc9a626da0811f08e SHA512 4983eb6be844203df5ebb1cc15d2005ec953c05af300ddcba5d656f4cbf03207998a0c198afee9e43d81d7788799b31d4e13a929f74399dc55120ede0538652b
+EBUILD armadillo-9.200.5.ebuild 3375 BLAKE2B bb7354dcba7e6eed511764a0234595a9909289b62912c0f8da36471e82dd785262f9f0aebedcf217e7cd2efb234b9cea7b1e9b71d24e0deb9e53f3d056c9d01f SHA512 645cb2e9f5b282e6fad87c793bbfca12ed3a289bb3ee50632b875dddb12e8c36e15fbac49e4c33b61e3fb32971c2a0f253bd46bdc7dd19cffc3518e88fe8cbfa
 MISC metadata.xml 1537 BLAKE2B 5116cb259f8e27fb11430cc2b3ab3a351afcefa0734e7997c962596aab226cfdd052ba3186ea068d8d31d501520d063037185909bcf02de72f57b4c8dfd86e31 SHA512 206e3f8912bd753837b0e8301c1db0f94e3480d0f50ba83c1b9a4be44498507ccade8f0b317c3bf2baa8aa782a93c88806ddbe710eed9d8fecb135494c26bc71
diff --git a/sci-libs/armadillo/armadillo-9.200.5.ebuild b/sci-libs/armadillo/armadillo-9.200.5.ebuild
new file mode 100644
index 000000000000..9cd79ff39d6c
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-9.200.5.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake-utils toolchain-funcs multilib eutils
+
+DESCRIPTION="Streamlined C++ linear algebra library"
+HOMEPAGE="http://arma.sourceforge.net/"
+SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
+REQUIRED_USE="test? ( lapack )"
+
+#	atlas? ( sci-libs/atlas[lapack] )
+
+RDEPEND="
+	dev-libs/boost
+	arpack? ( sci-libs/arpack )
+	blas? ( virtual/blas )
+	lapack? ( virtual/lapack )
+	superlu? ( >=sci-libs/superlu-5.2 )
+"
+
+DEPEND="${RDEPEND}
+	arpack? ( virtual/pkgconfig )
+	blas? ( virtual/pkgconfig )
+	hdf5? ( sci-libs/hdf5 )
+	lapack? ( virtual/pkgconfig )
+	mkl? ( sci-libs/mkl )
+	tbb? ( dev-cpp/tbb )"
+PDEPEND="${RDEPEND}
+	hdf5? ( sci-libs/hdf5 )
+	mkl? ( sci-libs/mkl )
+	tbb? ( dev-cpp/tbb )"
+
+src_prepare() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DARMA_EXTRA_DEBUG="$(usex debug)"
+		-DARMA_USE_MKL_ALLOC="$(usex mkl)"
+		-DARMA_USE_TBB_ALLOC="$(usex tbb)"
+	)
+	if use arpack; then
+		mycmakeargs+=(
+			-DARPACK_FOUND=ON
+			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
+		)
+	else
+		mycmakeargs+=(
+			-DARPACK_FOUND=OFF
+		)
+	fi
+#	if use atlas; then
+#		local c=atlas-cblas l=atlas-clapack
+#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
+#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
+#		mycmakeargs+=(
+#			-DCBLAS_FOUND=ON
+#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
+#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
+#			-DCLAPACK_FOUND=ON
+#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
+#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
+#		)
+#	fi
+	if use blas; then
+		mycmakeargs+=(
+			-DBLAS_FOUND=ON
+			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+		)
+	else
+		mycmakeargs+=(
+			-DBLAS_FOUND=OFF
+		)
+	fi
+	if use hdf5; then
+		mycmakeargs+=(
+			-DHDF5_FOUND=ON
+			-DHDF5_LIBRARIES="-lhdf5"
+		)
+	else
+		mycmakeargs+=(
+			-DHDF5_FOUND=OFF
+		)
+	fi
+	if use lapack; then
+		mycmakeargs+=(
+			-DLAPACK_FOUND=ON
+			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
+		)
+	else
+		mycmakeargs+=(
+			-DLAPACK_FOUND=OFF
+		)
+	fi
+	if use superlu; then
+		mycmakeargs+=(
+			-DSuperLU_FOUND=ON
+			-DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
+			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
+		)
+	else
+		mycmakeargs+=(
+			-DSuperLU_FOUND=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	pushd examples > /dev/null
+	emake \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
+		LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
+	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
+	emake clean
+	popd > /dev/null
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README.md
+	use doc && dodoc *pdf *html
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/sci-libs/blas-reference/Manifest b/sci-libs/blas-reference/Manifest
index 7e15ad08e8c6..9736a0e8b48c 100644
--- a/sci-libs/blas-reference/Manifest
+++ b/sci-libs/blas-reference/Manifest
@@ -7,7 +7,7 @@ AUX lapack-reference-3.7.0-fix-build-system.patch 1598 BLAKE2B 9128036fc47dae239
 DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8
 DIST lapack-3.7.0.tgz 7359812 BLAKE2B 20aa42e22d8c920d1360afe41ceec7b36f6cd5fbe43ca9d7848ef7cc45a64a0314cb1321941c1a7c03654f41e28ec805445882ded0ca0ea07674e70b66cba6b5 SHA512 e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b
 DIST lapack-lite-3.1.1.tgz 5332509 BLAKE2B 5a8ea98e9956f2bc1fc8dbb1ede18178d43d1f418e324f2798daf2197a2f7f7a1841ea0a0d68f1affa3c9c0a37b024f82222bd2fd6072ca827c70c9c441191c7 SHA512 492b932ef313339ce6b4e63ac8f778489e6870b0eb85f7b086f3c844e75f98e7f85382c7556dfa368ab8320b6f02d1df8ccfcb40b5c0b7c2d74518b7c309e75c
-EBUILD blas-reference-20070226-r4.ebuild 1960 BLAKE2B 31a8ba7cc32d6db15b70e66dcb1e1ac753c622848d9fb532623a1a8e3e03fb84114ff1f5dcb28d6eec0c3cb9152f7eafdd1b209b39eafc309cc042b198df867e SHA512 00fa4c79ec1e3607f58a91ce9fea701a681e1a35258f59e437ea46daa7e72348eb7a3e84a49b9810a26f3b70eef4098f391e714fce1514ad5ed696ac709ce2ca
+EBUILD blas-reference-20070226-r4.ebuild 1956 BLAKE2B d979907812d17f61d0401f1c50ea4c758873f642e0cca1c22eee0a61002c95792e8972296576a858274fe42f9ed78aacf146bbbc666b65a600eac077e56cefdb SHA512 929dff29757fd2c5ed991e592725ad62bbd51a365d419c1c4a52a0bf9da0003f686494e5cfd807452cfbd462cd1622934a08f8792c55b1ab574cca9cec83ce03
 EBUILD blas-reference-20151113-r1.ebuild 2465 BLAKE2B 814bb3dd1750a8b24d89be02a6cc503064760b6d6b2b51c6a0781c3f74951aa3284caab9ed6c00f9a1959624c43d2dcd26625952208176be08fe98f75c514c95 SHA512 3ba5dc44282a82e42a5d337fa9cbde9f5a1c098ba2ec4179748f55dce9c0ad152f45bf20617af975e7bea0cd5c5d6a47f25b0a50fe239f2aa4642eb514b06821
 EBUILD blas-reference-20161223.ebuild 2701 BLAKE2B 0cf4f7b7a45f2ba3090f507091df05f0617370961e95bdd6e6d8c0957aa7a2d2f682631b147774e1d69f6e1587e417f387a171c7faf6608106f27356f2dfa7f8 SHA512 4bb9b8ec30db542d6fed0389de07fb4cdf3c0b79bfc79331fff501fa4d340d23ce1889b472c60b73743918c0da2e3c28f1aa23b879b6eb6fb5b37eba15ff01c9
 MISC metadata.xml 801 BLAKE2B 68ea5978073c01c861253ffd064179a25dc63771c9cabc0b3de200e5333c93a5d55caf8cde1234b643007b690b2a96fa207314117f790b367bd089c997722676 SHA512 78ca8d7459ba5bc81f5f821d9020023d01610d1fd55157bf566890a5c80ff8f83ca1139304319ee41b04f04b559c9e377037c04a1fbdd8dfde3e62f7ca6ff9fe
diff --git a/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
index 1baeff6e8e1f..ee6ad0323510 100644
--- a/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
+++ b/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://www.netlib.org/lapack/${LAPACKPN}-${LAPACKPV}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 DEPEND="app-eselect/eselect-blas"
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
new file mode 100644
index 000000000000..611bbf3be78b
--- /dev/null
+++ b/sci-libs/cantera/Manifest
@@ -0,0 +1,4 @@
+AUX cantera_2.4.0_libdirname_variable.patch 1252 BLAKE2B 324ff20163a45f7a23fce17b291f36278c3f4a1afbefc09a62b9570230f030c023e77a70dbc034a8006579c6bd4664bda25ff7c9b963a9289bc8d01a03f6edb4 SHA512 19f4909cd5a9edeafbf5bc6f1af7192b30196d59c1e154d6c7dd80c69ee71d15dc8f799e97940c1c0f29905177bb60405be2e8640fc29a215957a4de8f097fdc
+DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
+EBUILD cantera-2.4.0.ebuild 3309 BLAKE2B 2d3f1ae731f28131f9a8b002f5e875d768330177a36cc011cbbc8b4578cd18ed77626c3eee5ccd07fcdb23c456c27eca1a396f5f9a90c826c1cc637238fe401d SHA512 9404f1e3a761e2ca41b4b59d929207a295a9781c00753abbd7e674fe22a9b6c613e2692eae0d3716e842632a22f63d43ea8cbc66db80b294478e81f12247a05c
+MISC metadata.xml 792 BLAKE2B 8f5617f3f6d8047a15e0fcd14a2e11647fc2a7442759434fb98ce2492b962edf38ba662570bfa627c7db10ef00cf945d73029ade83a5c34d8e21adadaae26454 SHA512 0bc11e72add5ab1e31e0ac5ec7b2c85be2757c0cc4d56d0df16e9a7afdea89f5ec6fd2f46a730d4caf25eeba66de0405631acf64fe271272f2348f3fdeaf7515
diff --git a/sci-libs/cantera/cantera-2.4.0.ebuild b/sci-libs/cantera/cantera-2.4.0.ebuild
new file mode 100644
index 000000000000..3b43b50033f9
--- /dev/null
+++ b/sci-libs/cantera/cantera-2.4.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+
+inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
+HOMEPAGE="http://www.cantera.org"
+SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cti fortran pch +python test"
+
+REQUIRED_USE="
+	cti? ( ${PYTHON_REQUIRED_USE} )
+	python? ( cti )
+	${PYTHON_REQUIRED_USE}
+	"
+
+RDEPEND="
+	python? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	sci-libs/sundials:0=
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-cpp/eigen
+	dev-libs/boost
+	dev-libs/libfmt
+	python? (
+		dev-python/cython[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-cpp/gtest-1.8.0
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}_${PV}_libdirname_variable.patch" )
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# patch to work 'scons test' properly in case of set up 'renamed_shared_libraries="no"' option
+	sed -i "s/, libs=\['cantera_shared'\]//" "${S}"/test_problems/SConscript || die "failed to modify 'test_problems/SConscript'"
+	# patch env to pass CCACHE_DIR variable
+	sed -i "s/ENV={'PATH': os.environ\['PATH'\]}/ENV={'PATH': os.environ\['PATH'\], 'CCACHE_DIR': os.environ.get('CCACHE_DIR','')}/" "${S}"/SConstruct || die "failed to modify 'SConstruct'"
+}
+
+## Full list of configuration options of Cantera is presented here:
+## http://cantera.org/docs/sphinx/html/compiling/config-options.html
+
+src_configure() {
+	scons_vars=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		cc_flags="${CXXFLAGS}"
+		cxx_flags="-std=c++11"
+		debug="no"
+		FORTRAN="$(tc-getFC)"
+		FORTRANFLAGS="${CXXFLAGS}"
+		renamed_shared_libraries="no"
+		use_pch=$(usex pch)
+## In some cases other order can break the detection of right location of Boost: ##
+		system_fmt="y"
+		system_sundials="y"
+		system_eigen="y"
+		env_vars="all"
+		extra_inc_dirs="/usr/include/eigen3"
+	)
+	use test || scons_vars+=( googletest="none" )
+
+	scons_targets=(
+		f90_interface=$(usex fortran y n)
+		python2_package="none"
+	)
+
+	if use cti ; then
+		local scons_python=$(usex python full minimal)
+		scons_targets+=( python3_package="${scons_python}" python3_cmd="${EPYTHON}" )
+	else
+		scons_targets+=( python3_package="none" )
+	fi
+}
+
+src_compile() {
+	escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
+}
+
+src_test() {
+	escons test
+}
+
+src_install() {
+	escons install stage_dir="${D%/}" libdirname="$(get_libdir)"
+	if ! use cti ; then
+		rm -r "${D%/}/usr/share/man" || die "Can't remove man files."
+	else
+		# Run the byte-compile of modules
+		python_optimize "${D%/}/$(python_get_sitedir)/${PN}"
+	fi
+}
+
+pkg_postinst() {
+	if use cti && ! use python ; then
+		elog "Cantera was build without 'python' use-flag therefore the CTI tool 'ck2cti'"
+		elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
+	fi
+
+	local post_msg=$(usex fortran "and Fortran " "")
+	elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
+
+	if use python ; then
+		elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
+	fi
+}
diff --git a/sci-libs/cantera/files/cantera_2.4.0_libdirname_variable.patch b/sci-libs/cantera/files/cantera_2.4.0_libdirname_variable.patch
new file mode 100644
index 000000000000..a16f5670b550
--- /dev/null
+++ b/sci-libs/cantera/files/cantera_2.4.0_libdirname_variable.patch
@@ -0,0 +1,28 @@
+diff -Naur old/SConstruct new/SConstruct
+--- old/SConstruct	2018-08-24 16:24:45.000000000 +0300
++++ new/SConstruct	2018-11-05 03:07:07.000000000 +0300
+@@ -327,6 +327,10 @@
+         'prefix',
+         'Set this to the directory where Cantera should be installed.',
+         defaults.prefix, PathVariable.PathAccept),
++    PathVariable(
++        'libdirname',
++        'Set this to the directory where Cantera libraries should be installed.',
++        '', PathVariable.PathAccept),
+     EnumVariable(
+         'python_package',
+         """If you plan to work in Python, then you need the ``full`` Cantera Python
+@@ -1465,10 +1469,9 @@
+ # *** Set additional configuration variables ***
+ # **********************************************
+ 
+-# Some distributions (e.g. Fedora/RHEL) use 'lib64' instead of 'lib' on 64-bit systems
+-if any(name.startswith('/usr/lib64/python') for name in sys.path):
+-    env['libdirname'] = 'lib64'
+-else:
++# Some distributions use 'lib64' (e.g. Fedora/RHEL) or something else instead of 'lib' on 64-bit systems.
++# If user didn't set 'libdirname' configuration variable set it to default value 'lib'
++if not env['libdirname']:
+     env['libdirname'] = 'lib'
+ 
+ # On Debian-based systems, need to special-case installation to
diff --git a/sci-libs/cantera/metadata.xml b/sci-libs/cantera/metadata.xml
new file mode 100644
index 000000000000..a57df7829d2d
--- /dev/null
+++ b/sci-libs/cantera/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>torokhov_s_a@mail.ru</email>
+    <name>Sergey Torokhov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>
+    Cantera is an open-source suite of object-oriented software tools
+    for problems involving chemical kinetics, thermodynamics, and/or transport processes.
+  </longdescription>
+  <use>
+    <flag name="cti">Install CTI tools (ck2cti, ctml_writer) for conversion of Chemkin files to Cantera format</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">cantera</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/cblas-reference/Manifest b/sci-libs/cblas-reference/Manifest
index 9967f4937d09..a32c8c57c392 100644
--- a/sci-libs/cblas-reference/Manifest
+++ b/sci-libs/cblas-reference/Manifest
@@ -6,7 +6,7 @@ AUX lapack-reference-3.7.0-fix-build-system.patch 1598 BLAKE2B 9128036fc47dae239
 DIST cblas.tgz 197694 BLAKE2B a9a6feff0198cc62b2a9fd75740e9cebbecd36adff7a1fb3ea57942846d428dcbdb9b266d4510b67bc077b13fe833c063e4784278755513c3abddc66884f5e36 SHA512 8edc4f939d36e6bb9bcbc4ffe414b6c991192ef2e76ec4eda16d3578591185d31e46be5e747d74c740411db6bd2c2d414a18f73193d4a288e8c7e4b83cb0895d
 DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8
 DIST lapack-3.7.0.tgz 7359812 BLAKE2B 20aa42e22d8c920d1360afe41ceec7b36f6cd5fbe43ca9d7848ef7cc45a64a0314cb1321941c1a7c03654f41e28ec805445882ded0ca0ea07674e70b66cba6b5 SHA512 e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b
-EBUILD cblas-reference-20030223-r6.ebuild 1864 BLAKE2B 7d772393f7721a8a53d25fdf9de938273a35d38b204893f4d04173ee129c9adc2bcfccba117dcd961c97e5dfcac2bf2cc2858fb8b9eec5a10801ae25dadafec5 SHA512 bdcf2929e1965d470956a7a7ac63f06ed3e231b30f962db37e5208f03504ddf69e103c4aa014cd7dff0dd45801c0ee9f1c3a1c0491c275002220ce8031ca7e8b
+EBUILD cblas-reference-20030223-r6.ebuild 1860 BLAKE2B be57c4f43fe910fbe952bc25676a372ae9f0325e16cef0572ecf41609a8b63b5b78b776d89c4d174eb91711bfaf76b551a225060855c7b35b1eb5981eced4385 SHA512 28a22b7b883b5f9fc9986c5d027a286a23a2d9aaf7cc2d8c263e43ae46f11cd70c6b8e605efcb595ae8cebead6fed68337303c52f3e2b21cd892e55eb7923e26
 EBUILD cblas-reference-20151113-r2.ebuild 2656 BLAKE2B c1291e6fe03a538cb02ad556067c20be70f917586a7a2b481d5ec345fd2cb74850a2e11c2c2aa9a4e4bf7c45325f920f7ae679d3397874e6f24aaec725cb2be3 SHA512 e606382c6114cf3d72dee8b8aea12335fae062efe667d677100165fb561e60941c7425bc29bd2a71d317d3704c76ea019e82b372f10f5c333cde1bf9b69118a9
 EBUILD cblas-reference-20161223.ebuild 2663 BLAKE2B b44157a5861535fd0239a88d2651ec983502fc7edde0a2c0ffde3c82ade1112d60eedaa360e49907206eda00af758956815b88fb8dc0b971116eff16326cf782 SHA512 1449bafa47c0613964586f2d0652742346371a7f3a12eecf83cfeea7b94db85c7bfbd05fa34110ad19cc7a04b1532cea7e220a458e4933238a804c1ede15d9e0
 MISC metadata.xml 836 BLAKE2B b355702b31b2de0e8c98cbd84338da58a19821c32b2e9cc039e0ea2f6a416be88ba4b4480b1f769c1311b1902092b8cfbe218ad67d48863932961a99b1ef15d2 SHA512 5e3394b15042b221806f47a96bc5b1bb09a004f9dc30639595c6a3264c7c92af3fec769b87a1702eba2f8a7c06580e7c62cbe22577ce93e35886c9db1aa309b3
diff --git a/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild b/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild
index cf8b726cddc3..813f10be79ab 100644
--- a/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild
+++ b/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://www.netlib.org/blas/blast-forum/${MyPN}.tgz"
 SLOT="0"
 LICENSE="public-domain"
 IUSE=""
-KEYWORDS="alpha amd64 hppa ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 hppa ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	virtual/blas
diff --git a/sci-libs/coinhsl/Manifest b/sci-libs/coinhsl/Manifest
index 1436188b73eb..ffdceb48ffa2 100644
--- a/sci-libs/coinhsl/Manifest
+++ b/sci-libs/coinhsl/Manifest
@@ -1,3 +1,5 @@
 DIST coinhsl-2014.01.10.tar.gz 906586 BLAKE2B d58d200cd3402cdb694ff84bf4228bb548bd70e98a4aeaccad94544385fb241c68dad1ebb1c35a5549f852baa82f264864ee1db75f5a7019a252cf01ec10ba21 SHA512 fe71b07c4fc11a8a7a40a115457588b91aa4481726e523502d92d6604c5fda13cffcc4620ada64b9332cb3502f8bfbc4ee856125cd5fd987cccf49bae5d46711
+DIST coinhsl-2015.06.23.tar.gz 908522 BLAKE2B ccc64a7790b1f9105439f6690e87bed52ff48306132db5fa27a036b4ce87472dfc3ca92f3e9d94aefdf737ed292568f36831eb24ac94d77f4b9bab84bc3ea36e SHA512 ad831d6ffd3c1e46481da8e58c7075adc69cb02800002c2067053fd354c5971214025982b24a9b74c681c2c3d86fd5adac78820242209feb75898165cf38753f
 EBUILD coinhsl-2014.01.10.ebuild 673 BLAKE2B 9a4b286ffd8cc7529b3111d298cf538ca4eb1cd00e4f1b95b755c30078aaf4e61c754385cd706a420cb72543e71c9e9e1ad2de7792cee23935af3da12bb3104d SHA512 b3e8822b42aec6ce25a4ee245d58af417326d8fa2d9937eb30916241811aab75de8ca6ba32e4290659659698245114c55bf189f327fd11e641a5c48f75562f2f
+EBUILD coinhsl-2015.06.23.ebuild 583 BLAKE2B 6b1656b77221ab29f0cad17c6809522f3c7eef4a9f3f90e927dd172fb11d515c867429e572e707faf118a9a65cad1d6f630d97618e742662e6848f9a3afab01f SHA512 496d4ac65b6e2c86e70fb0ea7638fb3b77445cc3b8261a31affa9a632c0b7ebea46421cfccf6a3fee60d4ec19e91500890bb8ca7846599282757c56ad504ee7e
 MISC metadata.xml 581 BLAKE2B 293a87a49df189b9fccb186bf1b59c3a7e67d4ebb3933071c25c3aee520e3d7d0092ae1bbcbb08bb4ea817043b89f7320c60c6271e1dfd83a15273914f3032c8 SHA512 2af5a79721761b1421694f7bce121eb78b192f00088f9bd415e0a8bff81f829fa0c1ab0d429bf5d490ca45887098741f8c886955941d7418eb3c4db200fe8e92
diff --git a/sci-libs/coinhsl/coinhsl-2015.06.23.ebuild b/sci-libs/coinhsl/coinhsl-2015.06.23.ebuild
new file mode 100644
index 000000000000..9e1cac607992
--- /dev/null
+++ b/sci-libs/coinhsl/coinhsl-2015.06.23.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_STANDARD="77 90"
+
+inherit fortran-2 toolchain-funcs
+
+DESCRIPTION="HSL mathematical software library for IPOPT"
+HOMEPAGE="http://www.hsl.rl.ac.uk/ipopt"
+SRC_URI="${P}.tar.gz"
+
+LICENSE="HSL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	sci-libs/metis
+	virtual/blas"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+RESTRICT="mirror fetch"
+
+src_configure() {
+	export LIBS="$($(tc-getPKG_CONFIG) --libs metis blas lapack)"
+	default
+	MAKEOPTS+=" -j1"
+}
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index f032e4dbca33..5cd1ecfb7d97 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,3 +1,5 @@
 DIST indilib-1.6.0.tar.gz 1726681 BLAKE2B fc746fe74b41467930f50f4aabe63d485372dc3f7e551bf8b91ec92694efc5a73a29495ee4931f84215a90afdd1deb3c12f87aaedc32d33e408114674e6d79ad SHA512 a086a63e15f5f6fb05a0d1569578f5fbd4d6ba6ff5a0aaff7bd475925d3858840753f1aa04e7429a22576f52432a19e93b781e821ea908db6b7352af85f30422
+DIST indilib-1.7.5.tar.xz 1380436 BLAKE2B 092f4100894218bf749ee0d7c910c4ee20026cf471f4f65686b67dd37a924b448b6de3733e70d7047dca6a77fd8ae26b9a568f8249336be78d052984838a2ccf SHA512 57205ed9ea9d8e8215886b17d9f0307755bca571d599967dc607320fad5ec62096f31526280f3b184ffeb0434d9adb71e65a7d6f89d29edaa643d729765f47a8
 EBUILD indilib-1.6.0.ebuild 1105 BLAKE2B 8f5e21b13aea5f88309ea355abf526255c200a78b545e2992c774aefd28383bb5a14c07137f1370f820577c257e6304feed0e6be0912e69fe39fd7f2cf76b963 SHA512 42ca02a83d01913d99a786365166088a13bc0a41f49a99077f9d0acb58592f990124d753eaa21ff860deae33d438cacd591d7f6533cda7370b75f395e3e4750b
+EBUILD indilib-1.7.5.ebuild 1095 BLAKE2B 58bb77a65f538027bf2f045a0e994085e83e253a655471efbd7fcc7e6e0ec1fe8106844596d80924625ee2897e35e9bf4a35b5c9f545a64879c3dbcc0aa734a0 SHA512 36bf75020736571a57df25c7871c6ac9f207b8dee10045d4ed59d39e1ee41751db549c772e87fff118e75d984ad629959db9a42146b75bfe776b15e1a8c69bcd
 MISC metadata.xml 375 BLAKE2B 68a9fc46a21fd5e530412d36468b96bbf409de646206ec8e36bf35fd39ec9193464100f5cc3398c1bfac01a947a70970ecf2d505a1932070ff6ca12dc3a9db1e SHA512 b5dc385e3823484e4fdc5974ace09edb4c19272c159e086cdc6968cafda528b27623c3696dbe42e5a869c3b9b9060dcf99466d5ac9961363de2f05fdcc523448
diff --git a/sci-libs/indilib/indilib-1.7.5.ebuild b/sci-libs/indilib/indilib-1.7.5.ebuild
new file mode 100644
index 000000000000..ef516b5138a5
--- /dev/null
+++ b/sci-libs/indilib/indilib-1.7.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils udev
+
+DESCRIPTION="INDI Astronomical Control Protocol library"
+HOMEPAGE="https://www.indilib.org/"
+# SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+
+LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ogg test"
+
+RDEPEND="
+	net-misc/curl
+	sci-libs/cfitsio:=
+	sci-libs/gsl:=
+	sci-libs/libnova
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/libusb:0
+	ogg? (
+		media-libs/libogg
+		media-libs/libtheora
+	)
+"
+DEPEND="${RDEPEND}
+	kernel_linux? ( sys-kernel/linux-headers )
+	test? ( >=dev-cpp/gtest-1.8.0 )
+"
+
+S="${WORKDIR}/lib${PN/lib/}"
+
+src_test() {
+	BUILD_DIR="${BUILD_DIR}"/test cmake-utils_src_test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINDI_BUILD_QT5_CLIENT=OFF
+		-DINDI_BUILD_UNITTESTS=$(usex test)
+		-DUDEVRULES_INSTALL_DIR="$(get_udevdir)"
+		$(cmake-utils_use_find_package ogg OggTheora)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index 8a7e6fe82692..88119b674df4 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -7,6 +7,6 @@ DIST libsigrok-0.5.1.tar.gz 1664813 BLAKE2B b5765e1057ee4411ef2f83fa73473429bc8f
 EBUILD libsigrok-0.3.0.ebuild 1700 BLAKE2B 33dc1607eb3aaf38b7547fafe90940b3cf3b539fd257d394ee27225d3c40fea9d9d349a1ecaf8b7b4c99b6a57e590aae4c9b5225e6baf514d2bdfe47c4043107 SHA512 73f17a46ea7bfb003dc1ac6be3b32e43bffe2bbe135c6f5c667419ecae5ee0a57f77377d2eb69113e8e50cd25b73f123dffa2711a64837a1035841f3f4d7df43
 EBUILD libsigrok-0.4.0.ebuild 2115 BLAKE2B f15bc1e01ea4cc389148eb6b3ebc5bc6f1ef42d14662888562ca48a1e1f5a1afe639ebd7755e36994675a461f4c4ac85e962efb4467503d9926ce4f06b51b2c9 SHA512 c0106ee8b697b6932a1ea69721b51e43d84d145ba9050e79afc3dc2e97303f93e73f2e8717a3ea4e6f522ec68830382def004283d32807be5bac647e47f78c4d
 EBUILD libsigrok-0.5.0.ebuild 2285 BLAKE2B 7a0d70723315dcd5f1c012d3730e3e3c44b69f92f91fb02c2a3f5a3a4c85b90ca5c4694f020a27fa7ded5833de515c3679951520fcac0d07fcd76f12b2f832d8 SHA512 0f2ae431afbcdf3b4df3ff48a59d44406d70b8b75fc02129229643f8a5afb2ca31f82df7e6c192412416efb975ee270f699e13dca707246d5cf98fde1b59a11c
-EBUILD libsigrok-0.5.1.ebuild 2285 BLAKE2B 7a0d70723315dcd5f1c012d3730e3e3c44b69f92f91fb02c2a3f5a3a4c85b90ca5c4694f020a27fa7ded5833de515c3679951520fcac0d07fcd76f12b2f832d8 SHA512 0f2ae431afbcdf3b4df3ff48a59d44406d70b8b75fc02129229643f8a5afb2ca31f82df7e6c192412416efb975ee270f699e13dca707246d5cf98fde1b59a11c
-EBUILD libsigrok-9999.ebuild 2288 BLAKE2B d10e435f1b15d58980ddbc9d89c49b68502d2d95ba3fad33b08f2ff916bfae7c3cbf3ddf82b2e4d62e8d94ad09481f5d2c199e29823cf8ab6e40757357520307 SHA512 1c04d587e6adda41c877ea5d8f0a07a89f354b757d1f412d9b91c85a7c575825cce4ff56049eae82d019c7078f0da7644bfe8237358b2ce24f9927098bd34925
+EBUILD libsigrok-0.5.1.ebuild 2287 BLAKE2B 6f7fec5645abe0a513269dccbbe68acab0c43f2ade78a77da69f7567ac61d7a2639a0d56efe031694209fbf7e8a542f53b263fca941961c9d9c4026d912128c5 SHA512 4c1ab3863d334e542ae4b28fd8a9c1287c5bcd28ef11d4b30beb537f83a3268dcab12ab8b7752ec5970ede6369675b5911f3101fde71a87aa8c4f2df94e4ee29
+EBUILD libsigrok-9999.ebuild 2290 BLAKE2B d7cfeb002ba0c8218cb1047a99147344d8746c1889f73399f58fc42e78cf993ceae1c43a2ba9729b7898fbf640e33fdca9ef72ce055b7e38e4ac025fa686e779 SHA512 bbebea8ea4ea81dc826f29396a8bf8380dca155d4869421ae32616398c19a01db438dd92fb2da87741580e67126d160f31cca49c4aee4f076b1b4dbbee34887a
 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b
diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
index 8d56edf96992..8ebbf15dc3de 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils
 
diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild
index aeb0f3c4579d..694f44c3d603 100644
--- a/sci-libs/libsigrok/libsigrok-9999.ebuild
+++ b/sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils
 
diff --git a/sci-libs/libsigrokdecode/Manifest b/sci-libs/libsigrokdecode/Manifest
index 3629bd1f2dc2..67cbe1f0ef13 100644
--- a/sci-libs/libsigrokdecode/Manifest
+++ b/sci-libs/libsigrokdecode/Manifest
@@ -11,6 +11,6 @@ EBUILD libsigrokdecode-0.4.0.ebuild 1064 BLAKE2B 898c2fee7c0d0c7a39e7ce25bbbce8d
 EBUILD libsigrokdecode-0.4.1.ebuild 1070 BLAKE2B e057628b15f227858b25f4722d684dc66ea30e2d003d74b3d3034ed74f142baa49380c486cd48e3b580a3a9438f8fcf36c236ec40d33f77006ef7c9f1a7d43c4 SHA512 e2761ca53895c5384fc8d306ad2225a6d2a2ec28872016577d9a704df6175e982940dd259d14d21644b91cc43ebf63aee23f9d6e0b0b0442fb05cd83cb50014a
 EBUILD libsigrokdecode-0.5.0.ebuild 1070 BLAKE2B 765f93807990b87833264d1db1a37b7ef59f9093e55be30df3b562dcfa4958a278f0c1468e0ec16660b023eae9d89b54bbb5333704f0be7f2849fcdf0af5128e SHA512 8a299bcfbd66c1c11a50ac1cca8abe94ab4101915cb59942eae9cf1c79fcee73071cb7ab6b3b939821d3e28390c7609a101974cf76257d66f7d4c7d82b91a01e
 EBUILD libsigrokdecode-0.5.1.ebuild 1070 BLAKE2B cf752fbebc51fe06af6b350383a98daa1c1e30ed90fb32763c74f70d212b2ef27f2555d8e6010799238a181768776890e58473cc292f7840043aa77b0b84c995 SHA512 f0a6433678ebdc41da1715593d62b84ef2071bbc3559c61a11a1498ea46855c779ec278e40e64a19f9feb93dd31eae3b4c07e171e6b38b7a05107a2c49711cbd
-EBUILD libsigrokdecode-0.5.2.ebuild 1070 BLAKE2B cf752fbebc51fe06af6b350383a98daa1c1e30ed90fb32763c74f70d212b2ef27f2555d8e6010799238a181768776890e58473cc292f7840043aa77b0b84c995 SHA512 f0a6433678ebdc41da1715593d62b84ef2071bbc3559c61a11a1498ea46855c779ec278e40e64a19f9feb93dd31eae3b4c07e171e6b38b7a05107a2c49711cbd
-EBUILD libsigrokdecode-9999.ebuild 1073 BLAKE2B 947b61a0838eb856a600b9f0e2f4602377d51a9051b77150a3cfffc128a965e43168b3e496bc54705d6e6427c0820cf89f8ed1cde8e5398c672f39537a90f261 SHA512 17f7c43521edf3618da79bf4264849311ab7ddd42ec7b99ec2b7fac26b4c824535d407a3dbdfd7056bf30a66ba2ae46d7eefe9ede32d0883da5a2997d635e199
+EBUILD libsigrokdecode-0.5.2.ebuild 1069 BLAKE2B 5e0208e54b46c8366c85215be876a3ccf4520abce70631bea2917dfc456891ac31ce19eb65755e0e1408a350ed40df402f718a8472b6c87e19263153ce8f11e7 SHA512 dee8b251efc98393784851369bede9cb2ad6c6ae36bd7cfbd6568b5e8c756038ac1c81cfb20651476cb1cb0b00e8e9941731b8c24a024ad6d793291bdef8d9fa
+EBUILD libsigrokdecode-9999.ebuild 1072 BLAKE2B 70de08185e4d6e0d29c093a0775f81ed5fba33ab31e5ed0ca65e5b1d3a246aab814e8febaa5eb7d988595647c092d076ace60995d631f1354827fe553afeb529 SHA512 63d5db23a110eaaddd0e96e63850d865642290aaec3e03d2ab4c3cc794ccc55bb3a545159abc99a52267857329d596c58f9b5973caf77ed2d0fb8d4db3c1af99
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.2.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.2.ebuild
index 7c39504420c1..27391aa29232 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.2.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit eutils python-single-r1
 
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
index f16280982d7e..d05556cc64e6 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit eutils python-single-r1
 
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index 3877c6abcc6f..0720b75a2d23 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,5 +1,7 @@
 AUX linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch 387 BLAKE2B 38516ea8a9ca5dd3dc32cfd605bd68100726bbcc8d96fa457caabfb91cbc17ce37e61194ac32e573acc797d71c448454d03e6202ec331cb25c056f8ee7b78829 SHA512 6f6b25695ae81671a93e8b86978ea1ef9e71ba5a38d14ad95b9a6aa59704bb2d6a8064c1ac006b1e7c4740d059184d4d4cefef88a2fd0c2a09406f64f6597187
 AUX linux-gpib-modules-4.2.0_rc1-reallydie.patch 737 BLAKE2B 198c078a168071e04efcfdad11bf93c2682ab2f2160d7f93fc9c49fdcd2cbbe9174be53502fa5a2c0eedf448e0f438130646cfe902673383925156244a80bf5d SHA512 96b7e459da514f4a4f84e746a3121baa0076c479ad435fd182a90714aeec21d32dcdbb6871deacab532c722e89970aa7cbccbcbea494195dfa86c7ebb95142d9
+DIST linux-gpib-4.2.0.tar.gz 1431440 BLAKE2B 7b6adf562963e0785f960c072f3f3d67cb91df9090205d8fecb0dc3170d3a1ac3719732919bae112e06b47387499ffe49a0144e72caa27ba39c85c8b98e56786 SHA512 1505c2c04f16bf7e92b9dd474f09edd242520a96f9e4d8eea88ebd44d0a82d653055155c1bfcde69da5355d609d400e3cb682da8aae83f59f1e565307a3fc4a7
 DIST linux-gpib-kernel-4.2.0_rc1.tar.gz 332525 BLAKE2B e84f9da9902d139474cf68e49922f7b402c6d11113eab8c009683c1b4304a505eb6aba86a60b019e4d3ad0ef1d003c743f14f60b61b3d7f31e8aeca99a4a16c1 SHA512 8bf1a2b04d6128c513c5d13549fb95e563e719e43ffb3b303fc5aa2376f57a69774c1afdb901281933f6b253068461ce59bd9564146a0c5a6483e1ccc47d259f
+EBUILD linux-gpib-modules-4.2.0.ebuild 1666 BLAKE2B f3f5dedb737605af9b60879ce55ff4945727ffa2d4dc684b60dcb8dde4ce2cb5aa6a7d9a179ebe5469d0a8fa9844142d9eff36afc5405028538f48136d98304f SHA512 7a82cd2f829e162ff34e861cf4505bd996e78a37a7a5c33f969d7d437a67c551af7d725275b8a6d4433d4becd58586fcac2cb104dbfcebdaf757169fc6dff752
 EBUILD linux-gpib-modules-4.2.0_rc1.ebuild 1587 BLAKE2B 8e27c06ac44e9bbecf2925a9f93380fce2afcd110c37640ffb2ac8abf3c1471217ff601a0e0b831efce053de12ea10e03ef59dab561b0c2da56995f6b97d041f SHA512 d8d26687c404bada61b92a4935f3c7e0680488dc0f8cb8e3fdf1e71feebc95ec7279459009bc217080063e163b875d1e1a99570c6a9fd8db8fd2be6aba78eec6
 MISC metadata.xml 638 BLAKE2B 6367f8fe90e75e2a3593d5d79ae09e6c75fa990ae037b58cba80ecdc4f7023a5b116ee2d6eadcdd6960133cd08a5103ebd1870906e2136af064a048603bb2562 SHA512 0bce2e72363ccdec78efa46158bade5135cae3d2d7b97de6836c4708f5823f2c1539f7441f0382061c4e0c4c7b5b1498bc5a4be6949b7dea015c873381010744
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild
new file mode 100644
index 000000000000..4ac4407a9a83
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod autotools toolchain-funcs
+
+DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
+SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="isa pcmcia debug"
+
+COMMONDEPEND=""
+RDEPEND="${COMMONDEPEND}
+	!<sci-libs/linux-gpib-4.2.0_rc1
+"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.0_rc1-reallydie.patch
+)
+
+S=${WORKDIR}/linux-gpib-kernel-${PV}
+
+pkg_setup () {
+	linux-mod_pkg_setup
+
+	if kernel_is -lt 2 6 8; then
+		die "Kernel versions older than 2.6.8 are not supported."
+	fi
+
+	# https://sourceforge.net/p/linux-gpib/bugs/43/
+	if use pcmcia && kernel_is -ge 2 6 38; then
+		die "pcmcia support is broken on kernels newer 2.6.38"
+	fi
+}
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
+}
+
+src_prepare () {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	set_arch_to_kernel
+	econf \
+		$(use_enable isa) \
+		$(use_enable pcmcia) \
+		$(use_enable debug driver-debug) \
+		--with-linux-srcdir=${KV_DIR}
+}
+
+src_compile() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		docdir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		DEPMOD="/bin/true" \
+		docdir=/usr/share/doc/${PF}/html install
+
+	dodoc ChangeLog AUTHORS README* NEWS
+}
+
+pkg_preinst () {
+	linux-mod_pkg_preinst
+	enewgroup gpib
+}
+
+pkg_postinst () {
+	linux-mod_pkg_postinst
+}
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index 6db4b9ac95a9..bf044cb5b20c 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -4,7 +4,9 @@ AUX linux-gpib-4.0.3-reallydie.patch 621 BLAKE2B 367ea6a50513b86591e5dfe60df11a4
 AUX linux-gpib-4.0.4_rc2-kernel-4.11.0.patch 387 BLAKE2B 38516ea8a9ca5dd3dc32cfd605bd68100726bbcc8d96fa457caabfb91cbc17ce37e61194ac32e573acc797d71c448454d03e6202ec331cb25c056f8ee7b78829 SHA512 6f6b25695ae81671a93e8b86978ea1ef9e71ba5a38d14ad95b9a6aa59704bb2d6a8064c1ac006b1e7c4740d059184d4d4cefef88a2fd0c2a09406f64f6597187
 DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5dcac5a6715dfbb6df5c6fbe8b78900adf8ca7b1c28db350674ff1dd9c77e24507e98b536ca1af8b558c9a46ef8c25034c9769 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af
 DIST linux-gpib-4.1.0.tar.gz 1529480 BLAKE2B b49df07f15d0f91b9d475052993421979d6776ef15aaa9b7e49632db9018f0cbd9ff38d12e2afa9e8027202e450dfc487ac9e2e6ab719086646d983cc41b3482 SHA512 037ed9e484a83caccb15d2d142eef6f1eec356ae972480ca7a676a318d3e9f844fc1911c1b30869b4bb14ef0b4cd10587a803426df9145966bafe22ca7316bd8
+DIST linux-gpib-4.2.0.tar.gz 1431440 BLAKE2B 7b6adf562963e0785f960c072f3f3d67cb91df9090205d8fecb0dc3170d3a1ac3719732919bae112e06b47387499ffe49a0144e72caa27ba39c85c8b98e56786 SHA512 1505c2c04f16bf7e92b9dd474f09edd242520a96f9e4d8eea88ebd44d0a82d653055155c1bfcde69da5355d609d400e3cb682da8aae83f59f1e565307a3fc4a7
 DIST linux-gpib-user-4.2.0_rc1.tar.gz 1098181 BLAKE2B 3f35eacfcffe04598322af6faed921b20b49959433b6e3c3a4bb2c0b9e3f71a2c00a13d7dec6b4e0bc415f1f8635945419805d5c9dec4ddcddb18fc7e8c5e7b4 SHA512 69d8b3059eab8d1d09006b4da13dbf3479c9a9d45e464767a13a2b1d6d32705e91e2800ca79015d302ea05e4fcbddb433dd817d208d751b6af8ac3867b7cee78
 EBUILD linux-gpib-4.1.0.ebuild 6110 BLAKE2B 354731c55d29f49b1aaca808c45128f7826b322555d5340fa9fd11481a9ec171bfa8cd365c5329f033e46f49d677c1a2a9f56cb8bc02e911224025de51505563 SHA512 29592c5c05b72e8a4263781636aa9a68b3d4e38743f5c7228a9ed449ab1e877141c5f238789e2942dbaa8c883439086c87321e55a7f8be653b91056b9f677656
+EBUILD linux-gpib-4.2.0.ebuild 4617 BLAKE2B 8f7c2747e256e44a89beba79442ac822021da0c0692fae0fb9fb64110e1e68ddeb900748e8ddf1691c6d0c79e7b79c12edd51d63f0a02d32061707f49224ca23 SHA512 44b084f2058d1cc4577853c20b103c3f69d25a77067e47282602571dbdcac0f95ac99c1f61932283d49aa430076901ef72cf7fa2d1625a3561f74a954990a47d
 EBUILD linux-gpib-4.2.0_rc1.ebuild 4552 BLAKE2B 5093b74f8d80489aa357b994d23bd4dae39fc1f979674db0e6e5bca9a5e40899f066347d244581550153e9189bbca504ae806114014534cefe5c2bb841bad871 SHA512 7a48a2016ebafad6e9d5e45e95673ae536d814348447b0fb691e72bbf117940d388d7f8e5c33d736ee30c0bdea20d9f6dbee22e60ac5819b460a048567ba8e5a
 MISC metadata.xml 688 BLAKE2B 405c816eb10feec819da0e5994c2ebe1e73ae4882cecf9f619bf30674b9ff499ae044cca42bad687d97cf3aef2a70eb826d5b07695cbde0c164a00cbac576e0a SHA512 d5af868c802d6c01b8267038cc5bdffc61677403ecb88cdfaf97f31d6b80d1e9318bcd507199d6a850df221cda2baf2869a1de4d732cde75a4aea2ec54f944b8
diff --git a/sci-libs/linux-gpib/linux-gpib-4.2.0.ebuild b/sci-libs/linux-gpib/linux-gpib-4.2.0.ebuild
new file mode 100644
index 000000000000..7ac1727146f2
--- /dev/null
+++ b/sci-libs/linux-gpib/linux-gpib-4.2.0.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+
+inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev user
+
+DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
+SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
+	firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="pcmcia static guile perl php python tcl doc firmware"
+
+S="${WORKDIR}/${PN}-user-${PV}"
+
+COMMONDEPEND="
+	sys-libs/readline:=
+	tcl? ( dev-lang/tcl:0= )
+	guile? ( dev-scheme/guile:12 )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:= )
+	python? ( ${PYTHON_DEPS} )
+	firmware? ( sys-apps/fxload )"
+RDEPEND="${COMMONDEPEND}
+	~sci-libs/linux-gpib-modules-${PV}
+"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/docbook-sgml-utils )
+	perl? ( virtual/perl-ExtUtils-MakeMaker )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.16-perl.patch
+)
+
+pkg_setup () {
+	use perl && perl_set_version
+	use python && python_setup
+}
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz"
+}
+
+src_prepare () {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static) \
+		$(use_enable guile guile-binding) \
+		$(use_enable perl perl-binding) \
+		$(use_enable php php-binding) \
+		$(use_enable python python-binding) \
+		$(use_enable tcl tcl-binding) \
+		$(use_enable doc documentation)
+}
+
+src_compile() {
+	FIRM_DIR=/usr/share/usb
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
+		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
+		USB_FIRMWARE_DIR=${FIRM_DIR} \
+		docdir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	FIRM_DIR=/usr/share/usb
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
+		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
+		USB_FIRMWARE_DIR=${FIRM_DIR} \
+		docdir=/usr/share/doc/${PF}/html install
+
+	if use perl; then
+		einfo "Installing perl module"
+		cd "${S}"/language/perl || die
+		DESTDIR=${D} emake install
+		perl_fix_packlist
+		perl_delete_emptybsdir
+		cd "${S}" || die
+	fi
+
+	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
+	udev_dorules 99-gpib.rules
+
+	dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
+
+	insinto /etc
+	newins util/templates/gpib.conf gpib.conf
+	newins util/templates/gpib.conf gpib.conf.example
+
+	if use pcmcia; then
+		dodir /etc/pcmcia
+		insinto /etc/pcmcia
+		doins "${S}"/etc/pcmcia/*
+	fi
+
+	# fix rules files
+	local f
+	find "${D}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do
+		grep -q "${D}" "${f}" && einfo "File ${f} contains a temporary path, fixing."
+		sed -i -e "s:${D}:/:g" "${f}"
+	done
+
+	DOC_CONTENTS="
+You need to run the 'gpib_config' utility to setup the driver before
+you can use it. In order to do it automatically you can add to your
+start script something like this (supposing the appropriate driver
+is loaded on the startup):
+\n
+		gpib_config --minor 0
+\n
+To give a user access to the computer's gpib board you will have to add
+them to the group 'gpib' or, you could change the permissions on the device
+files /dev/gpib[0-15] to something you like better, using 'chmod'
+\n
+Edit /etc/gpib.conf to match your interface board, and any devices you wish
+to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for
+more information.
+\n
+"
+
+	if use pcmcia; then
+		DOC_CONTENTS+='
+For PCMCIA cards:\n
+All files needed for a PCMCIA board were copied to /etc/pcmcia.
+You may wish to edit the options passed to the gpib_config call in the
+/etc/pcmcia/linux-gpib-pcmcia script.
+You may need to send a SIGHUP signal to the cardmgr daemon to force it
+to reload the files in /etc/pcmcia \(alternatively you could use your
+pcmcia init.d script to restart the cardmgr, or you could just reboot\).
+The driver module will be loaded as needed by the cardmgr.
+
+'
+	fi
+
+	if use firmware; then
+		DOC_CONTENTS+='
+For Agilent \(HP\) 82341C and 82341D cards:
+The firmware for these boards is uploaded by passing the appropriate
+firmware file from /usr/share/linux-gpib/hp_82341 directory to
+gpib_config using the -I or --init-data command line option. Example:\n
+gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin
+'
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst () {
+	use perl && perl_set_version
+	enewgroup gpib
+}
+
+pkg_postinst () {
+	readme.gentoo_print_elog
+}
diff --git a/sci-libs/matio/Manifest b/sci-libs/matio/Manifest
index bd9da6789579..ad4f111a47ee 100644
--- a/sci-libs/matio/Manifest
+++ b/sci-libs/matio/Manifest
@@ -1,8 +1,10 @@
 AUX matio-1.5.0-asneeded.patch 484 BLAKE2B 443298a5b7a55914917ef80b2d34363c7b335e48cdc24066996ee1bb0d05edbb0078df1110491dfb1b5603c830b2e9973be7e84e908c1f97ddee5e148435e0f6 SHA512 4ad49023834a884c095924a179dca7bd90acdafa6d4fa00954d8d1132771349e63ad86bd0c027fc60b01960d7218970162bbf2eac4faa75e5124ccd607353152
 DIST matio-1.5.1.tar.gz 8160893 BLAKE2B 50b1d5204fb4717fedb341f0a69a53a770bb4c6d46c7721b9c455745716b1b3d3142155c26adb7d019ede5703ac5fac7196c2ca15ddc22fdb93c1b1172dcc10a SHA512 bd1e49bcbfe3e073d2339bc3dff803b222c007aad19759ee9b666438fa59ec2b2750b52ffb3b5e911145cf2977538447f5db977fc056a624c5878ddbcf564b26
 DIST matio-1.5.10.tar.gz 8630185 BLAKE2B 8bb5040c3863ca7eea3069d0ee71d79c588e19a1fde253f7305534a2239dfecae1d877082454b475c1d4d1a3a60f81710002cd14ed5def3c23b4d0aa8dc8531c SHA512 93c40d344fd8282e64cae6104bc6a485cd4ce65c948333c95127cfd54e57166c5e24d7a8d36a50dd896f11615a0274ddd303d8fdb4d3e41b34d4eacb7fc866af
+DIST matio-1.5.13.tar.gz 10037903 BLAKE2B 8817fa3a1c050a84951c706922b32c5ed082ec057a35cb7fa20cc4d977316208a61604fcb6c0e09c96f592294a65d57a8a95844d15821987bdd337564345e778 SHA512 2db430dd47b8ceed850aaadf36c0fd3b405ba32db3eb2d5be320d007754983e2538ab99338d3ae8d69e8a531818c3bde0807c1f4a505eff7dd25d4a77934b737
 DIST matio-1.5.2.tar.gz 8179926 BLAKE2B 6ac78b09a6874a505984fd75f5a4fd7223c0947d32588a8ca426117b945fbfb550d419b552b9a1d6c88b40d96c99d6c35b7ede780a29afe5f4485dec76f1df0d SHA512 47ee7457db3f2138ecb1db9d7a04bf91d8277024631694e5f5a49b77829d60ce9dd95a1db33cd8eeaa8271e942acf60b522f40e4d7f4cae90f0a7caee7eb6efc
 EBUILD matio-1.5.1.ebuild 1130 BLAKE2B 1e5a99a28ba524c8c9ae909233843c0479dbaa541402e17fc02caba3e1f58b6e16dfe7f4a41ca55e39dbab2329f2df40fef0a4aef964ce4356dce55e04d30234 SHA512 086e3bdd7af783b34ef8a0f56037fef28512281c61e678c9756734fe26c09739667d6eb2932f973795dc421d7b47a5e6abc72fa2ccdcd08e9bb29d78fc1031b7
 EBUILD matio-1.5.10.ebuild 979 BLAKE2B 798d3eb56a5c927b16ea02d2cf5cb0dfb2b8b22abf5ac249883e2f44412ab896ab3ca0397b623396295b2daea977919354ebf689021d362dc1bc2bf1ba0545c6 SHA512 03393c2a9dffef79588c8075208dd6184fcd32f3bbd82e787e00bb682dc90cf455960863b39a3372ee310fbc004dc7ee487cacb397c26e70e808cf25a9151e78
+EBUILD matio-1.5.13.ebuild 976 BLAKE2B 3ad88b53997bc9c025f37f2173258064263867f27f24f41fb6037ef6971647285083096a77fc32bb6fa4ee99f1708e5d0ea814208e7fea62690331a3fbecf995 SHA512 bb866a2f22dc160bbecae2d9a2168275203dd5c5abe5eaafef27c5f28ecdce11a30ecc3fb562160b43946e1ee1f5390e74c835a7bb7c2c08cb8a1fe76d40c314
 EBUILD matio-1.5.2.ebuild 1130 BLAKE2B 1e5a99a28ba524c8c9ae909233843c0479dbaa541402e17fc02caba3e1f58b6e16dfe7f4a41ca55e39dbab2329f2df40fef0a4aef964ce4356dce55e04d30234 SHA512 086e3bdd7af783b34ef8a0f56037fef28512281c61e678c9756734fe26c09739667d6eb2932f973795dc421d7b47a5e6abc72fa2ccdcd08e9bb29d78fc1031b7
 MISC metadata.xml 591 BLAKE2B f3e23baf2a3e7bd304987be8296034faf78988c95b4d9fbb9eedc7e8cc6efa0c1479a4ed48ecc10d9b0aee6c92603f4436e8d6b34811b227e86a5f822f47adf3 SHA512 d6f20bbc3bff29f3d163909acb1aa6f3cc6557c5717c3ee9771ef17fbd14fe17836f26c2b2dc4defb4223cdeb5b978ef13c4d4a294a1ac11f0559e2518d58009
diff --git a/sci-libs/matio/matio-1.5.13.ebuild b/sci-libs/matio/matio-1.5.13.ebuild
new file mode 100644
index 000000000000..d9f308de9508
--- /dev/null
+++ b/sci-libs/matio/matio-1.5.13.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library for reading and writing matlab files"
+HOMEPAGE="https://sourceforge.net/projects/matio/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0/4" # subslot = soname version
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples hdf5 sparse static-libs"
+
+RDEPEND="
+	sys-libs/zlib
+	hdf5? ( sci-libs/hdf5 )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	doc? ( virtual/latex-base )"
+
+src_configure() {
+	econf \
+		$(use_enable hdf5 mat73) \
+		$(use_enable sparse extended-sparse) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	use doc && emake -C documentation pdf
+}
+
+src_install() {
+	default
+
+	use doc && dodoc documentation/matio_user_guide.pdf
+	if use examples; then
+		docinto examples
+		dodoc test/test*
+		insinto /usr/share/${PN}
+		doins share/test*
+	fi
+
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/sci-libs/mumps/Manifest b/sci-libs/mumps/Manifest
index ae7b8d9d5389..e575f525b7ba 100644
--- a/sci-libs/mumps/Manifest
+++ b/sci-libs/mumps/Manifest
@@ -1,5 +1,3 @@
-DIST MUMPS_4.10.0.tar.gz 2481516 BLAKE2B ddd3f28bf9627806e9bb5597adc94e2b8f504adf220a8a64ea50630edbde75358bd97e91a53ebd341132a34db5d7248d32a892a060bdf8f205c8aac3b9c88722 SHA512 348df048618ea2086fbe805a90f2e31f57e0db4aa6f4843a0e3c7142bac80fe45e54768e65921657c970bc286b59c2bca91e5006ed8000678f26ba2efe2bfda8
 DIST MUMPS_5.1.2.tar.gz 3351215 BLAKE2B 1c77c2a217c101245a9a96a59be6b9bfd67ceffa603d807b5a7173026c5c33e2c4de78c14833d7b7f0a90130b9ebc0ac9c7d4ebfbf881d0bd2210a542887c239 SHA512 38a63b14a8df835be68b5fa310b39aa1815799220d56c176e4005797800959e9e08c9a6bf11d308ab82ea40b6f34d36072cebe7c1de39e0c314eb138b93f1b74
-EBUILD mumps-4.10.0-r1.ebuild 5585 BLAKE2B 6fa009a933a891b0b31284e0c3f206c21890d0379a502154526b3839cf5d2d67558a47790bcad641eabfef184d12cd09bf6eda8ff99b384fdef5ac65a99f768e SHA512 578f6584f115e6299bac629073701bd8534864693afa7c70f98ed6b0b4edc466e6f242733ec3baaec9b98c61f796a1d822ab10b2671fc90230fb2d73129310ea
-EBUILD mumps-5.1.2.ebuild 5592 BLAKE2B 59e2b9281ddbc2fc0d01eac5282ccbb67bec250899af1aac096ccb449091ee4120c5ca58e4d68906fc7c6759ea0b194ecf545447239fa6992ae96073eaf061e3 SHA512 1050b95e746486e6a3f302f396dd534e362c0baa1228456fcf31d80ac9330427b40f5b7aff281fc2489a73b6c27b16f1cd532e39a5fc6341086f3390b7195fb3
+EBUILD mumps-5.1.2.ebuild 5598 BLAKE2B b4e54e0a12c408aae80ae39ee0a3f05a2f438737a226820d4b05b99eb81b79ac17a424c8e125b67757968680071aa824d8dcb83093fbe79acce85d6abf354990 SHA512 c52956c06bd991e709edd121c689d2601f6702ea8ebeb6b67d2d889d7e0a4b9746cc851c80ab369f37c2bd0acd94894953ecb1c01f035ab4c5f92da70f7fa5c0
 MISC metadata.xml 864 BLAKE2B 78db103b861071cbad317a65db2bb1c7eafc6c3936728cf3854ea05e92210abbf552e01dcbc974dc5238fc1a432ad7ff48fab3d662ea6081ff70fd86263ac11b SHA512 c285d7ed4bd26bb603f40f9d5e4e7262aea8a2679d14f65a4f8959a9bf2c622310422790e6221708fa227cd2c3bb2f4ba140eb5f23acc71b3f1ca20c04c4711a
diff --git a/sci-libs/mumps/mumps-4.10.0-r1.ebuild b/sci-libs/mumps/mumps-4.10.0-r1.ebuild
deleted file mode 100644
index d57d19e1d13d..000000000000
--- a/sci-libs/mumps/mumps-4.10.0-r1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic versionator fortran-2 multilib
-
-MYP=MUMPS_${PV}
-
-DESCRIPTION="MUltifrontal Massively Parallel sparse direct matrix Solver"
-HOMEPAGE="http://mumps.enseeiht.fr/"
-SRC_URI="${HOMEPAGE}${MYP}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples metis mpi +scotch static-libs"
-
-RDEPEND="
-	virtual/blas
-	metis? ( || ( sci-libs/metis <sci-libs/parmetis-4 )
-		mpi? ( <sci-libs/parmetis-4 ) )
-	scotch? ( <sci-libs/scotch-6[mpi=] )
-	mpi? ( sci-libs/scalapack )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MYP}"
-
-static_to_shared() {
-	local libstatic=${1}; shift
-	local libname=$(basename ${libstatic%.a})
-	local soname=${libname}$(get_libname $(get_version_component_range 1-2))
-	local libdir=$(dirname ${libstatic})
-
-	einfo "Making ${soname} from ${libstatic}"
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
-			-Wl,-all_load -Wl,${libstatic} \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-	else
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-shared -Wl,-soname=${soname} \
-			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-		[[ $(get_version_component_count) -gt 1 ]] && \
-			ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version))
-		ln -s ${soname} ${libdir}/${libname}$(get_libname)
-	fi
-}
-
-src_prepare() {
-	sed -e "s:^\(CC\s*=\).*:\1$(tc-getCC):" \
-		-e "s:^\(FC\s*=\).*:\1$(tc-getFC):" \
-		-e "s:^\(FL\s*=\).*:\1$(tc-getFC):" \
-		-e "s:^\(AR\s*=\).*:\1$(tc-getAR) cr :" \
-		-e "s:^\(RANLIB\s*=\).*:\1$(tc-getRANLIB):" \
-		-e "s:^\(LIBBLAS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs blas):" \
-		-e "s:^\(INCPAR\s*=\).*:\1:" \
-		-e 's:^\(LIBPAR\s*=\).*:\1$(SCALAP):' \
-		-e "s:^\(OPTF\s*=\).*:\1${FFLAGS} -DALLOW_NON_INIT \$(PIC):" \
-		-e "s:^\(OPTC\s*=\).*:\1${CFLAGS} \$(PIC):" \
-		-e "s:^\(OPTL\s*=\).*:\1${LDFLAGS}:" \
-		Make.inc/Makefile.inc.generic > Makefile.inc || die
-	# fixed a missing copy of libseq to libdir
-}
-
-src_configure() {
-	LIBADD="$($(tc-getPKG_CONFIG) --libs blas) -Llib -lpord"
-	local ord="-Dpord"
-	if use metis && use mpi; then
-		sed -i \
-			-e "s:#\s*\(LMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs parmetis):" \
-			-e "s:#\s*\(IMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --cflags parmetis):" \
-			Makefile.inc || die
-		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs parmetis)"
-		ord="${ord} -Dparmetis"
-	elif use metis; then
-		sed -i \
-			-e "s:#\s*\(LMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs metis):" \
-			-e "s:#\s*\(IMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --cflags metis):" \
-			Makefile.inc || die
-		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs metis)"
-		ord="${ord} -Dmetis"
-	fi
-	if use scotch && use mpi; then
-		sed -i \
-			-e "s:#\s*\(LSCOTCH\s*=\).*:\1-lptesmumps -lptscotch -lptscotcherr:" \
-			-e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}usr/include/scotch:" \
-			Makefile.inc || die
-		LIBADD="${LIBADD} -lptesmumps -lptscotch -lptscotcherr"
-		ord="${ord} -Dptscotch"
-	elif use scotch; then
-		sed -i \
-			-e "s:#\s*\(LSCOTCH\s*=\).*:\1-lesmumps -lscotch -lscotcherr:" \
-			-e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}usr/include/scotch:" \
-			Makefile.inc || die
-		LIBADD="${LIBADD} -lesmumps -lscotch -lscotcherr"
-		ord="${ord} -Dscotch"
-	fi
-	if use mpi; then
-		sed -i \
-			-e "s:^\(CC\s*=\).*:\1mpicc:" \
-			-e "s:^\(FC\s*=\).*:\1mpif90:" \
-			-e "s:^\(FL\s*=\).*:\1mpif90:" \
-			-e "s:^\(SCALAP\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs scalapack):" \
-			Makefile.inc || die
-		export LINK=mpif90
-		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs scalapack)"
-	else
-		sed -i \
-			-e 's:-Llibseq:-L$(topdir)/libseq:' \
-			-e 's:PAR):SEQ):g' \
-			-e "s:^\(SCALAP\s*=\).*:\1:" \
-			-e 's:^LIBSEQNEEDED =:LIBSEQNEEDED = libseqneeded:g' \
-			Makefile.inc || die
-		export LINK="$(tc-getFC)"
-	fi
-	sed -i -e "s:^\s*\(ORDERINGSF\s*=\).*:\1 ${ord}:" Makefile.inc || die
-}
-
-src_compile() {
-	# Workaround #462602
-	export FAKEROOTKEY=1
-
-	# -j1 because of static archive race
-	emake -j1 alllib PIC="-fPIC"
-	if ! use mpi; then
-		#$(tc-getAR) crs lib/libmumps_common.a libseq/*.o || die
-		LIBADD+=" -Llibseq -lmpiseq"
-		static_to_shared libseq/libmpiseq.a
-	fi
-	static_to_shared lib/libpord.a ${LIBADD}
-	static_to_shared lib/libmumps_common.a ${LIBADD}
-
-	local i
-	for i in c d s z; do
-		static_to_shared lib/lib${i}mumps.a -Llib -lmumps_common ${LIBADD}
-	done
-	if use static-libs; then
-		emake clean
-		emake -j1 alllib
-	fi
-}
-
-src_test() {
-	emake all
-	local dotest
-	if use mpi; then
-		dotest="mpirun -np 2"
-	else
-		export LD_LIBRARY_PATH="${S}/libseq:${LD_LIBRARY_PATH}"
-	fi
-	cd examples
-	${dotest} ./ssimpletest < input_simpletest_real || die
-	${dotest} ./dsimpletest < input_simpletest_real || die
-	${dotest} ./csimpletest < input_simpletest_cmplx || die
-	${dotest} ./zsimpletest < input_simpletest_cmplx || die
-	einfo "The solutions should be close to (1,2,3,4,5)"
-	${dotest} ./c_example || die
-	einfo "The solution should be close to (1,2)"
-	make clean
-}
-
-src_install() {
-	dolib.so lib/lib*$(get_libname)*
-	use static-libs && dolib.a lib/lib*.a
-	insinto /usr
-	doins -r include
-	if ! use mpi; then
-		dolib.so libseq/lib*$(get_libname)*
-		insinto /usr/include/mpiseq
-		doins libseq/*.h
-		use static-libs && dolib.a libseq/libmpiseq.a
-	fi
-	dodoc README ChangeLog VERSION
-	use doc && dodoc doc/*.pdf
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/mumps/mumps-5.1.2.ebuild b/sci-libs/mumps/mumps-5.1.2.ebuild
index 725e1ab60e64..e5251550f248 100644
--- a/sci-libs/mumps/mumps-5.1.2.ebuild
+++ b/sci-libs/mumps/mumps-5.1.2.ebuild
@@ -18,8 +18,8 @@ IUSE="doc examples metis mpi +scotch static-libs"
 
 RDEPEND="
 	virtual/blas
-	metis? ( || ( sci-libs/metis <sci-libs/parmetis-4 )
-		mpi? ( <sci-libs/parmetis-4 ) )
+	metis? ( || ( >=sci-libs/metis-5 >=sci-libs/parmetis-4 )
+		mpi? ( >=sci-libs/parmetis-4 ) )
 	scotch? ( <sci-libs/scotch-6[mpi=] )
 	mpi? ( sci-libs/scalapack )"
 
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index b9dfdd42dc97..5a5fc9ae0ee4 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,11 +1,6 @@
-AUX opencascade-6.8.0-fixed-DESTDIR.patch 2344 BLAKE2B 6e98f59e0209213937648828e255d434f185f57cc9b681682f7e27c4ef167aa5f9e3ace620e5c18f77e0790aff66ee3daac05398413bbb61b2b5d79b8f2a5b3b SHA512 9460d0f59a7088f8dc3ea7aba47c7efa24e5e91dcb140d56ee54f0dc36fbbda142eb0fcc52cdc3ee17751cb8e9bede3aef8c0629e0bcf6d237e71113ba4e4304
-AUX opencascade-6.9.1-vtk-6.3.patch 3686 BLAKE2B b91ca85b21aa154e467570b698bc4136c2e8fa4978f2b6ae459d8b4d2f5133d67d0bb5b8cedd158ab2a9539e9122eb9e0e50b6f8dfd45a1921ff7a14ed566b6b SHA512 8793d1384b7183a0d60dfae8c267358567e4dd16d3fcf4ade310fb63a63a2b82504f921a9700ea7d7b171b6a2b3bbcc891ed4405ea5e16579557a85301f17bf7
-AUX opencascade-6.9.1-vtk-8.1.patch 2184 BLAKE2B eac2c546e909ccd5781a5f1230c0b8e2fd8c4bd857d3bb3108253d587975e31170adfa029b3087d325a1a6124ceda408c92b5579fa67c1b3ee311e2389d87c8a SHA512 6559060e4ffd8d409d9f939aa63f109343c8f60aac9e742505bbf7e68a728c68b61983a878ab4c008ffb5f09f1f359e523192dcba459e929bf202c0c15ee4e25
-AUX opencascade-6.9.1-vtk-configure.patch 834 BLAKE2B 00475895b462d0396c4ab96bd645ad81f1180d04aad26e673b77d2363824740b5a0efe3bf75a587bea06a65b37a4ae2e41ceadad471eb4eb232783e3836450c0 SHA512 dbd6d3d2e520137a378dc437c37045f652d2dcf257b44647f9bc99397fde3fdecb88feaa010e1a893a6acdbe60d0e0e3ab9982b9fcd75dab95210069587445f7
+AUX opencascade-7.3.0-ffmpeg4.patch 1392 BLAKE2B ce5f6c82b34ca00c758411102d15b12bc410f98156b6281a2c50609eee05e1655e93cbd918c509b2daa6e018fb7cd107a6a8a539f9d9f19438d3cf5a7e20e3cd SHA512 447ff4039ed6ad0f01d62a4d129ff0eed77427fff11dc6303decb5e15b41dd1be305a909838c296a926ddaa8c93211995f188f95c4a70a9f9ce896e7d286929f
 AUX opencascade-7.3.0-fixed-DESTDIR.patch 2272 BLAKE2B 30b0e045d872673ff65f00b471d9b7e5239f451329d8a0d3f0f367c811a387ef76c368eeddc3fe8d6684d7012190ae09aac66f2f91fdec7b2b4f4134b3a1463a SHA512 57e5195516d8f282c0ecd5de88e7e29f00a3748ae9ac82c74eca3b4f577dd4f4e6286e1deda424590a8c8b30cb1cd326d5c4f1634d0f7dba5bcb6ce88758a9f5
 AUX opencascade-7.3.0-vtk-compat.patch 431 BLAKE2B 468a804ed906555637110b0d7cb7a4ef994fae9130e7317e525d21598cc19b67e8c7bfaaaffea82ee8fb94a20c14b42e6ec02e2541ddfc54fc288c8d0f68fc7c SHA512 026ed3451c1c36e1f187be390773329ad011c9ebdb766b730ee04f9f9a844a307c4fefc6669c81187fd34d8264bea233680c7ee43afb566e695c3d64c37438a4
-DIST opencascade-6.9.1.tgz 209589289 BLAKE2B 266d68042dbbb8c9bc5f167b9aefaf84b3f1568c25530acb36271443429e67972aae913ebcea09c9ea27164e2e3f007eb287350d7ad69486755cdcb713fdb1af SHA512 92f0fffb110344feebaba9dd4a3427419ea9e6db7b09556b7dcdb1248f2a868e3337587abf9921392435031431f3876cea4d4709fd9926604dcebbd6d26f8963
 DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6 SHA512 17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da
-EBUILD opencascade-6.9.1-r2.ebuild 5774 BLAKE2B 4f2d3cdb9b50d3941fc4c1e4348571e048f056b80f6c9da8435069a5228b234470abcfc72193bf8b75e60bffbb8dd5473bfd640ac1a33ca6179364dd1bc3a434 SHA512 6016b22ea4b1255244d4f3b62ee886278e2ce8733c57488ed4192f4aee178ef50d32179a2e03ecd510aadba8d41f108f7ce56e00e3dd2715f262314900dfc49d
-EBUILD opencascade-7.3.0.ebuild 4365 BLAKE2B 23f295c3a85d8895da4d394de91a321ececece7bd3bd7d276c1170e3279b57059b88575395894b9b1ac920926efb951d8e5e66235df0915da9589ca16db729b0 SHA512 5f4cff9f0d304206aff60e4b682a8f1c9f0e0748cd10f300adda98375151f0cd28d2a3f33cb861471804d75fceef6bece50641f5f8bd961ac9f8ed53b19ff218
-MISC metadata.xml 628 BLAKE2B 890c96f583be59e59536e947e81e0c8161fafa25741dfcea265c4fa95248878b518684934c169a1c113b569b10ef9e0685e0747145f26ffaa8c045c83aa6923d SHA512 8aef8d8994a018f7351c7fb7c234dfbeccc0a46d76cd7ecd76687d42fa186d4e6b069c799584d1162b417d07ddb502bbd65349e71283927a4dea3504b79d85c3
+EBUILD opencascade-7.3.0.ebuild 4409 BLAKE2B d33465c90d3d909cef1eb03fecce63e3000aaadef3846a8229805232482a095441ab9d5c845c9b269ce1e47fcd7ce7f7ef7c532d4203846f7e6e6c192a397ed7 SHA512 3b0765d7f7a10224c9ccb13460c22d2f0bd22b44095344b0bd8c428aea802ee18698666060f8d7689b6f867c79a03f1dc1d252b83874eb2dd6f0fef36dea2fec
+MISC metadata.xml 547 BLAKE2B afe180fe9c0dc0aa357c84327220d543b919b18fde795512806e091a95cabb4a1e5db7dfe121ad6bcc728f41a794b97668fee8bece573defed9160391dc9d11d SHA512 b20c7221cc347b103440fad7098f48cdebd2f544c51e217671364380399f3d89b30f98ed323c457114640375c686b17abaa1d7193166cbb17cba0dfb916ae584
diff --git a/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch
deleted file mode 100644
index 1f37eace7602..000000000000
--- a/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- opencascade-6.8.0/Makefile.am
-+++ opencascade-6.8.0/Makefile.am
-@@ -82,27 +82,27 @@
- 	cd $(top_builddir)/adm/lin/amk && $(MAKE) $(AM_MAKEFLAGS) Draw
- 
- install-exec-local:
--	$(INSTALL) -d $(prefix)/$(platform)
--	if [ -e $(prefix)/bin -a ! -e $(prefix)/$(platform)/bin ]; then \
--		cd $(prefix)/$(platform) && ln -s ../bin bin; \
-+	$(INSTALL) -d $(DESTDIR)$(prefix)/$(platform)
-+	if [ -e $(DESTDIR)$(prefix)/bin -a ! -e $(DESTDIR)$(prefix)/$(platform)/bin ]; then \
-+		cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../bin bin; \
- 	fi
--	if [ -e $(prefix)/lib -a ! -e $(prefix)/$(platform)/lib ]; then \
--		cd $(prefix)/$(platform) && ln -s ../lib lib; \
-+	if [ -e $(DESTDIR)$(prefix)/lib -a ! -e $(DESTDIR)$(prefix)/$(platform)/lib ]; then \
-+		cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../lib lib; \
- 	fi
--	buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(prefix); installd=`pwd`; cd $$buildd; \
-+	buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(DESTDIR)$(prefix); installd=`pwd`; cd $$buildd; \
- 	if [ "$$installd" != "$$sourced" ]; then \
--		$(INSTALL) -d $(prefix)/inc; \
--		cp -frL $(top_srcdir)/inc $(prefix); \
--		cp -frL $$buildd/config.h $(prefix); \
-+		$(INSTALL) -d $(DESTDIR)$(prefix)/inc; \
-+		cp -frL $(top_srcdir)/inc $(DESTDIR)$(prefix); \
-+		cp -frL $$buildd/config.h $(DESTDIR)$(prefix); \
- 		for d in  $(FoundationClasses_DIRS) $(ModelingData_DIRS) $(ModelingAlgorithms_DIRS) $(Visualization_DIRS) $(ApplicationFramework_DIRS) $(DataExchange_DIRS) $(Draw_DIRS); do \
--			$(INSTALL) -d $(prefix)/src/$$d; \
--			cp -frL $(top_srcdir)/src/$$d $(prefix)/src; \
-+			$(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
-+			cp -frL $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
- 		done; \
- 	fi
--	if [ -e $(prefix)/inc/config.h ]; then \
--		rm -f $(prefix)/inc/config.h; \
-+	if [ -e $(DESTDIR)$(prefix)/inc/config.h ]; then \
-+		rm -f $(DESTDIR)$(prefix)/inc/config.h; \
- 	fi
--	cd $(prefix)/inc && ln -s ../config.h config.h
--	cd $(top_srcdir) && cp *.sh $(prefix)
-+	cd $(DESTDIR)$(prefix)/inc && ln -s ../config.h config.h
-+	cd $(top_srcdir) && cp *.sh $(DESTDIR)$(prefix)
- 
--.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw
-\ No newline at end of file
-+.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw
diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch
deleted file mode 100644
index 8e1d3361dde6..000000000000
--- a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- opencascade-6.9.1/configure.ac
-+++ opencascade-6.9.1/configure.ac
-@@ -1044,7 +1044,7 @@
-     fi
-     if test "x$vtk_lib" != "x"; then
-       CSF_VTK_LIB="-L$vtk_lib -lvtkCommonCore -lvtkCommonDataModel -lvtkCommonExecutionModel -lvtkCommonMath -lvtkCommonTransforms "
--      CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore -lvtkRenderingOpenGL  -lvtkFiltersGeneral -lvtkIOCore -lvtkIOImage -lvtkImagingCore -lvtkInteractionStyle "
-+      CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore -lvtkRenderingOpenGL2  -lvtkFiltersGeneral -lvtkIOCore -lvtkIOImage -lvtkImagingCore -lvtkInteractionStyle "
-     else
-       HAVE_VTK=no
-     fi
---- opencascade-6.9.1/src/IVtkVTK/IVtkVTK_View.cxx
-+++ opencascade-6.9.1/src/IVtkVTK/IVtkVTK_View.cxx
-@@ -151,7 +151,7 @@ bool IVtkVTK_View::DisplayToWorld (const gp_XY& theDisplayPnt, gp_XYZ& theWorldP
-   myRenderer->SetDisplayPoint (theDisplayPnt.X(), theDisplayPnt.Y(), 0.0);
-   myRenderer->DisplayToWorld();
- 
--  vtkFloatingPointType* const aCoords = myRenderer->GetWorldPoint();
-+  double* const aCoords = myRenderer->GetWorldPoint();
-   if (aCoords[3] == 0.0) // Point at infinity in homogeneous coordinates
-   {
-     return false;
---- opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.cxx
-+++ opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.cxx
-@@ -73,15 +73,15 @@ float IVtkTools_ShapePicker::GetTolerance( ) const
- //  Method: convertDisplayToWorld
- // Purpose: Convert display coordinates to world coordinates
- //============================================================================
--bool IVtkTools_ShapePicker::convertDisplayToWorld (vtkRenderer         *theRenderer,
--                                                   vtkFloatingPointType theDisplayCoord[3],
--                                                   vtkFloatingPointType theWorldCoord[3])
-+bool IVtkTools_ShapePicker::convertDisplayToWorld (vtkRenderer *theRenderer,
-+                                                   double theDisplayCoord[3],
-+                                                   double theWorldCoord[3])
- {
-   // Convert the selection point into world coordinates.
-   theRenderer->SetDisplayPoint (theDisplayCoord[0], theDisplayCoord[1], theDisplayCoord[2]);
-   theRenderer->DisplayToWorld();
- 
--  vtkFloatingPointType* const aCoords = theRenderer->GetWorldPoint();
-+  double* const aCoords = theRenderer->GetWorldPoint();
-   if (aCoords[3] == 0.0)
-   {
-     return false;
---- opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.hxx
-+++ opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.hxx
-@@ -124,8 +124,8 @@ protected:
- 
-   //! Convert display coordinates to world coordinates
-   static bool convertDisplayToWorld (vtkRenderer *theRenderer,
--                                     vtkFloatingPointType theDisplayCoord[3],
--                                     vtkFloatingPointType theWorldCoord[3] );
-+                                     double theDisplayCoord[3],
-+                                     double theWorldCoord[3] );
- 
- private: // not copyable
-   IVtkTools_ShapePicker (const IVtkTools_ShapePicker&);
---- opencascade-6.9.1/inc/IVtkTools_ShapePicker.hxx
-+++ opencascade-6.9.1/inc/IVtkTools_ShapePicker.hxx
-@@ -124,8 +124,8 @@
- 
-   //! Convert display coordinates to world coordinates
-   static bool convertDisplayToWorld (vtkRenderer *theRenderer,
--                                     vtkFloatingPointType theDisplayCoord[3],
--                                     vtkFloatingPointType theWorldCoord[3] );
-+                                     double theDisplayCoord[3],
-+                                     double theWorldCoord[3] );
- 
- private: // not copyable
-   IVtkTools_ShapePicker (const IVtkTools_ShapePicker&);
diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch
deleted file mode 100644
index d1f560320c6c..000000000000
--- a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/src/IVtkVTK/IVtkVTK_ShapeData.cxx
-+++ b/src/IVtkVTK/IVtkVTK_ShapeData.cxx
-@@ -80,9 +80,9 @@ void IVtkVTK_ShapeData::InsertVertex (const IVtk_IdType theShapeID,
-   vtkIdType aPointIdVTK = thePointId;
-   myPolyData->InsertNextCell (VTK_VERTEX, 1, &aPointIdVTK);
-   const vtkIdType aShapeIDVTK = theShapeID;
--  mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
-+  mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
-   const vtkIdType aType = theMeshType;
--  myMeshTypes->InsertNextTupleValue (&aType);
-+  myMeshTypes->InsertNextTypedTuple (&aType);
- }
- 
- //================================================================
-@@ -97,9 +97,9 @@ void IVtkVTK_ShapeData::InsertLine (const IVtk_IdType   theShapeID,
-   vtkIdType aPoints[2] = { thePointId1, thePointId2 };
-   myPolyData->InsertNextCell (VTK_LINE, 2, aPoints);
-   const vtkIdType aShapeIDVTK = theShapeID;
--  mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
-+  mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
-   const vtkIdType aType = theMeshType;
--  myMeshTypes->InsertNextTupleValue (&aType);
-+  myMeshTypes->InsertNextTypedTuple (&aType);
- }
- 
- //================================================================
-@@ -124,9 +124,9 @@ void IVtkVTK_ShapeData::InsertLine (const IVtk_IdType       theShapeID,
- 
-     myPolyData->InsertNextCell (VTK_POLY_LINE, anIdList);
-     const vtkIdType aShapeIDVTK = theShapeID;
--    mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
-+    mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
-     const vtkIdType aType = theMeshType;
--    myMeshTypes->InsertNextTupleValue (&aType);
-+    myMeshTypes->InsertNextTypedTuple (&aType);
-     anIdList->Delete();
-   }
- }
-@@ -144,7 +144,7 @@ void IVtkVTK_ShapeData::InsertTriangle (const IVtk_IdType   theShapeID,
-   vtkIdType aPoints[3] = { thePointId1, thePointId2, thePointId3 };
-   myPolyData->InsertNextCell (VTK_TRIANGLE, 3, aPoints);
-   const vtkIdType aShapeIDVTK = theShapeID;
--  mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
-+  mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
-   const vtkIdType aType = theMeshType;
--  myMeshTypes->InsertNextTupleValue (&aType);
-+  myMeshTypes->InsertNextTypedTuple (&aType);
- }
diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch
deleted file mode 100644
index 3c2711d3813e..000000000000
--- a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- opencascade-6.9.1/configure.ac
-+++ opencascade-6.9.1/configure.ac
-@@ -1043,8 +1043,8 @@
-       HAVE_VTK=no
-     fi
-     if test "x$vtk_lib" != "x"; then
--      CSF_VTK_LIB="-L$vtk_lib -lvtkCommonCore-6.1 -lvtkCommonDataModel-6.1 -lvtkCommonExecutionModel-6.1 -lvtkCommonMath-6.1 -lvtkCommonTransforms-6.1 "
--      CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore-6.1 -lvtkRenderingOpenGL-6.1  -lvtkFiltersGeneral-6.1 -lvtkIOCore-6.1 -lvtkIOImage-6.1 -lvtkImagingCore-6.1 -lvtkInteractionStyle-6.1 "
-+      CSF_VTK_LIB="-L$vtk_lib -lvtkCommonCore -lvtkCommonDataModel -lvtkCommonExecutionModel -lvtkCommonMath -lvtkCommonTransforms "
-+      CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore -lvtkRenderingOpenGL  -lvtkFiltersGeneral -lvtkIOCore -lvtkIOImage -lvtkImagingCore -lvtkInteractionStyle "
-     else
-       HAVE_VTK=no
-     fi
diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch b/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch
new file mode 100644
index 000000000000..fc572a4f5bca
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch
@@ -0,0 +1,38 @@
+Author: jbeich
+Date: Wed May  2 13:25:55 UTC 2018
+New revision: 468831
+
+src/Image/Image_VideoRecorder.cxx:279:25: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
+    aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+                        ^
+src/Image/Image_VideoRecorder.cxx:452:38: error: use of undeclared identifier 'AVFMT_RAWPICTURE'
+  if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0
+                                     ^
+
+--- a/src/Image/Image_VideoRecorder.cxx	2017-08-30 13:28:21 UTC
++++ b/src/Image/Image_VideoRecorder.cxx
+@@ -276,7 +276,7 @@ Standard_Boolean Image_VideoRecorder::addVideoStream (
+   // some formats want stream headers to be separate
+   if (myAVContext->oformat->flags & AVFMT_GLOBALHEADER)
+   {
+-    aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++    aCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+   }
+   return Standard_True;
+ #else
+@@ -449,6 +449,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame 
+   AVPacket aPacket;
+   memset (&aPacket, 0, sizeof(aPacket));
+   av_init_packet (&aPacket);
++#ifdef AVFMT_RAWPICTURE
+   if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0
+    && !theToFlush)
+   {
+@@ -461,6 +462,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame 
+     aResAv = av_interleaved_write_frame (myAVContext, &aPacket);
+   }
+   else
++#endif
+   {
+     // encode the image
+     myFrame->pts = myFrameCount;
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index 7a267cb2e3be..ac137460a1e7 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="freeimage">Enable support for image i/o via media-libs/freeimage</flag>
     <flag name="gl2ps">Use gl2ps PostScript printing library</flag>
diff --git a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
deleted file mode 100644
index b8abc59a41a3..000000000000
--- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic versionator
-
-DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
-HOMEPAGE="http://www.opencascade.org/"
-SRC_URI="http://www.opencascade.com/sites/default/files/private/occt/OCC_${PV}_release/opencascade-${PV}.tgz"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples freeimage gl2ps java +tbb +vtk"
-
-DEPEND="
-	app-eselect/eselect-opencascade
-	dev-lang/tcl:0=
-	dev-lang/tk:0=
-	dev-tcltk/itcl
-	dev-tcltk/itk
-	dev-tcltk/tix
-	media-libs/ftgl
-	virtual/glu
-	virtual/opengl
-	x11-libs/libXmu
-	freeimage? ( media-libs/freeimage )
-	gl2ps? ( x11-libs/gl2ps )
-	java? ( >=virtual/jdk-0:= )
-	tbb? ( dev-cpp/tbb )
-	vtk? ( || ( sci-libs/vtk[imaging] sci-libs/vtk[rendering] sci-libs/vtk[views] sci-libs/vtk[all-modules] ) )"
-RDEPEND="${DEPEND}"
-CHECKREQS_MEMORY="256M"
-CHECKREQS_DISK_BUILD="3584M"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch
-	"${FILESDIR}"/${PN}-6.9.1-vtk-configure.patch
-	"${FILESDIR}"/${PN}-6.9.1-vtk-8.1.patch
-)
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	MY_VTK_P=$(best_version sci-libs/vtk)
-	MY_VTK_PV=${MY_VTK_P/sci-libs\/vtk-}
-	MY_VTK_SUB=vtk-$(get_version_component_range 1-2 ${MY_VTK_PV})
-	if has_version ">=sci-libs/vtk-6.3" ; then #bug 605304
-		eapply "${FILESDIR}"/${PN}-6.9.1-vtk-6.3.patch
-	fi
-
-	java-pkg-opt-2_src_prepare
-
-	# Feed environment variables used by Opencascade compilation
-	my_install_dir=${EROOT}usr/$(get_libdir)/${P}/ros
-	local my_env_install="#!/bin/sh -f
-if [ -z \"\$PATH\" ]; then
-	export PATH=VAR_CASROOT/Linux/bin
-else
-	export PATH=VAR_CASROOT/Linux/bin:\$PATH
-fi
-if [ -z \"\$LD_LIBRARY_PATH\" ]; then
-	export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib
-else
-	export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib:\$LD_LIBRARY_PATH
-fi"
-	local my_sys_lib=${EROOT}usr/$(get_libdir)
-	local my_env="CASROOT=VAR_CASROOT
-CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT
-CSF_LANGUAGE=us
-MMGT_CLEAR=1
-CSF_EXCEPTION_PROMPT=1
-CSF_SHMessage=VAR_CASROOT/src/SHMessage
-CSF_MDTVTexturesDirectory=VAR_CASROOT/src/Textures
-CSF_XSMessage=VAR_CASROOT/src/XSMessage
-CSF_StandardDefaults=VAR_CASROOT/src/StdResource
-CSF_PluginDefaults=VAR_CASROOT/src/StdResource
-CSF_XCAFDefaults=VAR_CASROOT/src/StdResource
-CSF_StandardLiteDefaults=VAR_CASROOT/src/StdResource
-CSF_GraphicShr=VAR_CASROOT/Linux/lib/libTKOpenGl.so
-CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat
-CSF_UnitsDefinition=VAR_CASROOT/src/UnitsAPI/Units.dat
-CSF_IGESDefaults=VAR_CASROOT/src/XSTEPResource
-CSF_STEPDefaults=VAR_CASROOT/src/XSTEPResource
-CSF_XmlOcafResource=VAR_CASROOT/src/XmlOcafResource
-CSF_MIGRATION_TYPES=VAR_CASROOT/src/StdResource/MigrationSheet.txt
-TCLHOME=${EROOT}usr/bin
-TCLLIBPATH=${my_sys_lib}
-ITK_LIBRARY=${my_sys_lib}/itk$(grep ITK_VER /usr/include/itk.h | sed 's/^.*"\(.*\)".*/\1/')
-ITCL_LIBRARY=${my_sys_lib}/itcl$(grep ITCL_VER /usr/include/itcl.h | sed 's/^.*"\(.*\)".*/\1/')
-TIX_LIBRARY=${my_sys_lib}/tix$(grep TIX_VER /usr/include/tix.h | sed 's/^.*"\(.*\)".*/\1/')
-TK_LIBRARY=${my_sys_lib}/tk$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
-TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')"
-
-	( 	echo "${my_env_install}"
-		echo "${my_env}" | sed -e "s:^:export :" ) \
-	| sed -e "s:VAR_CASROOT:${S}:g" > env.sh || die
-	source env.sh
-
-	(	echo "PATH=${my_install_dir}/lin/bin"
-		echo "LDPATH=${my_install_dir}/lin/$(get_libdir)"
-		echo "${my_env}" | sed \
-			-e "s:VAR_CASROOT:${my_install_dir}/lin:g" \
-			-e "s:/Linux/lib/:/$(get_libdir)/:g" || die
-	) > 50${PN}
-
-	append-cxxflags "-fpermissive"
-
-	sed -e "/^AM_C_PROTOTYPES$/d" \
-		-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
-		-e "/\$qt directory is not exists/s/AC_MSG_ERROR/AC_MSG_NOTICE/" \
-		-i configure.ac || die
-
-	# no longer needed https://tracker.dev.opencascade.org/view.php?id=28971
-	if has_version ">=sys-libs/glibc-2.26" ; then
-		sed -e '/#include <xlocale.h>/d' \
-			-i inc/Standard_CLocaleSentry.hxx || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--prefix=${my_install_dir}/lin --exec-prefix=${my_install_dir}/lin \
-		--with-tcl="${EROOT}usr/$(get_libdir)" --with-tk="${EROOT}usr/$(get_libdir)" \
-		--with-freetype="${EROOT}usr" \
-		--with-ftgl="${EROOT}usr" \
-		--without-qt \
-		$(usex freeimage "--with-freeimage=${EROOT}usr" "") \
-		$(usex gl2ps "--with-gl2ps=${EROOT}usr" "") \
-		$(usex tbb "--with-tbb-include=${EROOT}usr" "") \
-		$(usex tbb "--with-tbb-library=${EROOT}usr" "") \
-		$(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \
-		$(usex vtk "--with-vtk-include=${EROOT}usr/include/${MY_VTK_SUB}" "") \
-		$(usex vtk "--with-vtk-library=${EROOT}usr/$(get_libdir)" "") \
-		$(use_enable debug) \
-		$(use_enable !debug production)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	prune_libtool_files
-
-	# Symlinks for keeping original OpenCascade folder structure and
-	# add a link lib to $(get_libdir)  if we are e.g. on amd64 multilib
-	if [ "$(get_libdir)" != "lib" ]; then
-		dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
-	fi
-
-	insinto /etc/env.d/${PN}
-	newins 50${PN} ${PV}
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r data
-		doins -r samples
-	fi
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/{overview,pdf,refman}
-	fi
-}
-
-pkg_postinst() {
-	eselect ${PN} set ${PV}
-	elog "After upgrading OpenCASCADE you may have to rebuild packages depending on it."
-	elog "You get a list by running \"equery depends sci-libs/opencascade\""
-	elog "revdep-rebuild does NOT suffice."
-}
diff --git a/sci-libs/opencascade/opencascade-7.3.0.ebuild b/sci-libs/opencascade/opencascade-7.3.0.ebuild
index 48f4c0775e4d..6d40cf35bba6 100644
--- a/sci-libs/opencascade/opencascade-7.3.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,6 +50,7 @@ S="${WORKDIR}/occt-V${MY_PV}"
 PATCHES=(
 	"${FILESDIR}/${P}-vtk-compat.patch"
 	"${FILESDIR}/${P}-fixed-DESTDIR.patch"
+	"${FILESDIR}/${P}-ffmpeg4.patch" # bug 672248
 )
 
 pkg_setup() {
diff --git a/sci-libs/parmetis/Manifest b/sci-libs/parmetis/Manifest
index 53b3b14e0f1c..6a53363f76a6 100644
--- a/sci-libs/parmetis/Manifest
+++ b/sci-libs/parmetis/Manifest
@@ -1,4 +1,7 @@
 AUX parmetis-3.1.1-autotools.patch 10971 BLAKE2B 52263cfef545a91590635d0d7e4b11766c38d2ffc77ccdc9358c3f1da84384adce155eed356e2bb66a11b92a25f5270a43b3846bca159e0a17c9ebc0258d1836 SHA512 4e0de7697391da0a49b7051f8f58d83ce4865a1cfc63dd0f6cb2085224385b2c951d0f9297f7e291a225b91ab7053a10a38f36ad369c81e2100d3298ed7b9a15
 DIST ParMetis-3.2.0.tar.gz 5291841 BLAKE2B f18b5144f2814a83c3a0b945b1bdbad812cce204e61e762498a98f380d33d79bdb6a4c58f25ebbd44401c7f76edbac602899d4fe8c05ca92f22a91d98f8f7607 SHA512 be7e5affa6ed687c7e8cbef51c5f4838e6302aa7632796f337ed079f15361569d77aa73fc61b876b5c9973e974575571fd1e3e6c73505480b1ecdb7cf801a0d0
+DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
+DIST parmetis-4.0.3.tar.gz 5567670 BLAKE2B 69a44ea8e50d8fd78046a342807b994220d03da3ab1695533d92772b1840302917a7d5d6f9eb020d9ff8ab7e5372bff0386d6354b662f58495b74f8f596c45f9 SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132
 EBUILD parmetis-3.2.0.ebuild 867 BLAKE2B 98b33fe947e2c2b596d698d6923c18c7a22c144261d1a1ac2132af047be7366a18932e4e40d2e2a513000e0b895127623be456eaaa4b40da8ef56d7e00643c8d SHA512 d7d4ba4be5f372187796ac6c6d9c80a342b54bb7a01034d84676eca9cff2e88f4cda9c4b6170560faa342038b94616a9444690fa13472372cca48c964feaa0ef
-MISC metadata.xml 672 BLAKE2B 134815ab6a1638bb9eeb903370124971cc3d79b91b2b9862b57d27976dfe3d22f6d7d02c4f266026fef3d4953e92bfeff589cfd05ed3aeb6a93b001ddce1f7b4 SHA512 1fe20c227ceb9ee6d52207ebc6eb3771f980204a4dcd5842ca3f1fc2accfdc24ccb9c6097bb1211b766ea24ff8a16c1bab09cf9f2f01d916d3688885eb5a9ff0
+EBUILD parmetis-4.0.3.ebuild 4025 BLAKE2B 5dc751ed37a54d10310642c30bcc6048b150bf965f5458b453ea2a622fe4c1994c69b625ee5540aec4b10d077c78595950eb812953da8e3ae7ada2c7aaba05f4 SHA512 9e613b42f111a8313528a0a293889f6c1a43e30261ce3ca1a53609831f00ba1677e8d66fcc97c487916e13ad9235589f68a458d2110dc5122c7136a526aaff61
+MISC metadata.xml 851 BLAKE2B 8c8fc30f50378b05ae59ca1f829da71f2a5cf66dfab03f645ceed4379bc8edc176fb9e5d1f1f83bbb695519a9e14bfd7855e040f56070a344791eb70eed12721 SHA512 6309c02babe871cd0bdaf509caab79dd8b81face5f6f5a39a1473284dbae6859223ae4f65d61fcf08370bac29dfd0e174cb722fbeeaeb5c80d53b749c265c73a
diff --git a/sci-libs/parmetis/metadata.xml b/sci-libs/parmetis/metadata.xml
index 744c4ff57d0c..cf1b66e81268 100644
--- a/sci-libs/parmetis/metadata.xml
+++ b/sci-libs/parmetis/metadata.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  ParMETIS is an MPI-based parallel library that implements a variety
-  of algorithms for partitioning unstructured graphs and for computing
-  fill-reducing orderings of sparse matrices. ParMETIS extends the
-  functionality provided by METIS and includes routines that are
-  especially suited for parallel AMR computations and large scale
-  numerical simulations.
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
+ParMETIS is an MPI-based parallel library that implements a variety
+of algorithms for partitioning unstructured graphs and for computing
+fill-reducing orderings of sparse matrices. ParMETIS extends the
+functionality provided by METIS and includes routines that are
+especially suited for parallel AMR computations and large scale
+numerical simulations.
 </longdescription>
+	<use>
+		<flag name="int64">Build the 64 bits integer library (needed for &gt; 2^31 vertices)</flag>
+		<flag name="double-precision">Floating-point operation done as double precision</flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-libs/parmetis/parmetis-4.0.3.ebuild b/sci-libs/parmetis/parmetis-4.0.3.ebuild
new file mode 100644
index 000000000000..71ee81fcbc9d
--- /dev/null
+++ b/sci-libs/parmetis/parmetis-4.0.3.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils cmake-utils toolchain-funcs
+
+# Check metis version bundled in parmetis tar ball
+# by diff of metis and parmetis tar ball
+METISPV=5.1.0
+METISP=metis-${METISPV}
+
+DESCRIPTION="Parallel (MPI) unstructured graph partitioning library"
+HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/parmetis/"
+SRC_URI="
+	http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz
+	doc? ( http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/${METISP}.tar.gz )
+	examples? ( http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/${METISP}.tar.gz )"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="free-noncomm"
+IUSE="doc double-precision examples int64 mpi openmp pcre static-libs"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}
+	!<sci-libs/metis-5"
+
+pkg_setup() {
+	if use openmp; then
+		if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+			ewarn "You are using gcc but openmp is not available"
+			die "Need an OpenMP capable compiler"
+		fi
+	fi
+}
+
+src_prepare() {
+	# libdir love
+	sed -i \
+		-e '/DESTINATION/s/lib/lib${LIB_SUFFIX}/g' \
+		libparmetis/CMakeLists.txt metis/libmetis/CMakeLists.txt || die
+	# set metis as separate shared lib
+	sed -i \
+		-e 's/METIS_LIB/ParMETIS_LIB/g' \
+		metis/libmetis/CMakeLists.txt || die
+	sed -i \
+		-e '/programs/d' \
+		CMakeLists.txt metis/CMakeLists.txt || die
+	use static-libs && mkdir "${WORKDIR}/${PN}_static"
+
+	if use mpi; then
+		export CC=mpicc CXX=mpicxx
+	else
+		sed -i \
+			-e '/add_subdirectory(include/d' \
+			-e '/add_subdirectory(libparmetis/d' \
+			CMakeLists.txt || die
+
+	fi
+
+	use int64 && \
+		sed -i -e '/IDXTYPEWIDTH/s/32/64/' metis/include/metis.h
+
+	use double-precision && \
+		sed -i -e '/REALTYPEWIDTH/s/32/64/' metis/include/metis.h
+}
+
+src_configure() {
+	parmetis_configure() {
+		local mycmakeargs=(
+			-DGKLIB_PATH="${S}/metis/GKlib"
+			-DMETIS_PATH="${S}/metis"
+			-DGKRAND=ON
+			-DMETIS_INSTALL=ON
+			$(cmake-utils_use openmp OPENMP)
+			$(cmake-utils_use pcre PCRE)
+			$@
+		)
+		cmake-utils_src_configure
+	}
+	parmetis_configure -DSHARED=ON
+	use static-libs && \
+		sed -i -e '/fPIC/d' metis/GKlib/GKlibSystem.cmake && \
+		BUILD_DIR="${WORKDIR}/${PN}_static" parmetis_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use static-libs && \
+		BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	use static-libs && \
+		BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
+	insinto /usr/include
+	doins metis/include/metis.h
+
+	newdoc metis/Changelog Changelog.metis}
+	use doc && dodoc "${WORKDIR}/${METISP}"/manual/manual.pdf
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples/metis
+		doins "${WORKDIR}/${METISP}"/{programs,graphs}/*
+	fi
+	# alternative stuff
+	cat > metis.pc <<-EOF
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: metis
+		Description: Unstructured graph partitioning library
+		Version: ${METISPV}
+		URL: ${HOMEPAGE/parmetis/metis}
+		Libs: -L\${libdir} -lmetis
+		Cflags: -I\${includedir}/metis
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins metis.pc
+	# change if scotch is actually an alternative to metis
+	#alternatives_for metis metis 0 \
+	#	/usr/$(get_libdir)/pkgconfig/metis.pc refmetis.pc
+
+	if use mpi; then
+		dodoc Changelog
+		use doc && dodoc manual/manual.pdf
+		if use examples; then
+			insinto /usr/share/doc/${PF}/examples/${PN}
+			doins {programs,Graphs}/*
+		fi
+		# alternative stuff
+		cat > ${PN}.pc <<-EOF
+			prefix=${EPREFIX}/usr
+			libdir=\${prefix}/$(get_libdir)
+			includedir=\${prefix}/include
+			Name: ${PN}
+			Description: ${DESCRIPTION}
+			Version: ${PV}
+			URL: ${HOMEPAGE}
+			Libs: -L\${libdir} -l${PN}
+			Cflags: -I\${includedir}/${PN}
+			Requires: metis
+		EOF
+		insinto /usr/$(get_libdir)/pkgconfig
+		doins ${PN}.pc
+		# change if scotch is actually an alternative to parmetis
+		#alternatives_for metis-mpi ${PN} 0 \
+		#	/usr/$(get_libdir)/pkgconfig/metis-mpi.pc ${PN}.pc
+	fi
+}
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index dbd4f76ac979..55251d55febd 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,4 +1,6 @@
 DIST pcl-1.8.1.tar.gz 66787596 BLAKE2B d02439bc0c0b9cf179f5840822dcad9b3cd128c53325d5f1a5b67e0153c8b4c5150cd65763e17d2c28f91325eb9ae33d9fa6e673a17681b05d19c46eaf0bdb9d SHA512 9e7c87fb750a176712f08d215a906012c9e8174b687bbc8c08fa65de083b4468951bd8017b10409015d5eff0fc343885d2aae5c340346118b1a251af7bdd5cd7
+DIST pcl-1.9.1.tar.gz 67158067 BLAKE2B 472422930e08feba11f42a2df49d68e0c55484744e0649164b113dc3b654188e598b1c0a55f1b75680150090749b00378ae0f70b35b1695a7914a16be7415bf7 SHA512 ca95028c23861ac2df0fa7e18fdd0202255cb2e49ab714325eb36c35289442c6eedbf489e6f9f232b30fa2a93eff4c9619f8a14d3fdfe58f353a4a6e26206bdf
 EBUILD pcl-1.8.1.ebuild 2228 BLAKE2B 916758207e3f8ea2f4b95dcb72986f3dff0d5587e671b2b30471ed548a7c8c7a25b1088957fdcbebb82bcf366042ed3079935233ec54382aaf4b22b20384cf99 SHA512 3a2fd249e12e1529476d9efb04ab3a2dffd6303fcb5825668238c04562eaba439f83ed0dbf08c04b81923e83a58f53a44132cf6d20466d1311366b3b6961cc80
-EBUILD pcl-9999.ebuild 2228 BLAKE2B 916758207e3f8ea2f4b95dcb72986f3dff0d5587e671b2b30471ed548a7c8c7a25b1088957fdcbebb82bcf366042ed3079935233ec54382aaf4b22b20384cf99 SHA512 3a2fd249e12e1529476d9efb04ab3a2dffd6303fcb5825668238c04562eaba439f83ed0dbf08c04b81923e83a58f53a44132cf6d20466d1311366b3b6961cc80
+EBUILD pcl-1.9.1.ebuild 2225 BLAKE2B 71b098a237d0993d68442220862510f8539cdceedd21dbe86a65724044f64f366fbb861455cceca2467744d951cd4cacc790482012b0ad80ee5a1310a4ae1ea6 SHA512 d7c512ff67957ba32fb241489f14693131c15b57d1c05d5c84b3fe8021101a5a42ab3502686d8a0b0b653198ef4023c63ddfb2bc9626a44c4f1b8c83b27aabcc
+EBUILD pcl-9999.ebuild 2225 BLAKE2B 71b098a237d0993d68442220862510f8539cdceedd21dbe86a65724044f64f366fbb861455cceca2467744d951cd4cacc790482012b0ad80ee5a1310a4ae1ea6 SHA512 d7c512ff67957ba32fb241489f14693131c15b57d1c05d5c84b3fe8021101a5a42ab3502686d8a0b0b653198ef4023c63ddfb2bc9626a44c4f1b8c83b27aabcc
 MISC metadata.xml 1125 BLAKE2B 27e8b272d41bf690e99b28e7b9af140412e3d5641f56131c1c8ece113262f3222444a487a3e6a050fcf7fb8c8c404f284bc731780fa557d56241e0e0ad18613f SHA512 d5676bf63401993065215538dd0725f13a99251117e7e61cf9614ea765eb0b9388a8866aa74fb6840dba4ead49f763070076cd328c60ab0830ff11bee827e7cf
diff --git a/sci-libs/pcl/pcl-1.9.1.ebuild b/sci-libs/pcl/pcl-1.9.1.ebuild
new file mode 100644
index 000000000000..737d110e2cfe
--- /dev/null
+++ b/sci-libs/pcl/pcl-1.9.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
+fi
+
+inherit ${SCM} cmake-utils multilib
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+HOMEPAGE="http://pointclouds.org/"
+DESCRIPTION="2D/3D image and point cloud processing"
+LICENSE="BSD"
+SLOT="0/1.9"
+IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
+
+RDEPEND="
+	>=sci-libs/flann-1.7.1
+	dev-libs/boost:=[threads]
+	dev-cpp/eigen:3
+	opengl? ( virtual/opengl media-libs/freeglut )
+	openni? ( dev-libs/OpenNI )
+	openni2? ( dev-libs/OpenNI2 )
+	pcap? ( net-libs/libpcap )
+	png? ( media-libs/libpng:0= )
+	qhull? ( media-libs/qhull )
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtcore:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtopengl:5
+	)
+	usb? ( virtual/libusb:1 )
+	vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
+"
+DEPEND="${RDEPEND}
+	!!dev-cpp/metslib
+	doc? ( app-doc/doxygen )
+	tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink )
+	test? ( >=dev-cpp/gtest-1.6.0 )
+	virtual/pkgconfig"
+
+REQUIRED_USE="
+	openni? ( usb )
+	openni2? ( usb )
+	tutorials? ( doc )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DLIB_INSTALL_DIR=$(get_libdir)"
+		"-DWITH_CUDA=$(usex cuda TRUE FALSE)"
+		"-DWITH_LIBUSB=$(usex usb TRUE FALSE)"
+		"-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
+		"-DWITH_PNG=$(usex png TRUE FALSE)"
+		"-DWITH_QHULL=$(usex qhull TRUE FALSE)"
+		"-DWITH_QT=$(usex qt5 TRUE FALSE)"
+		"-DWITH_VTK=$(usex vtk TRUE FALSE)"
+		"-DWITH_PCAP=$(usex pcap TRUE FALSE)"
+		"-DWITH_OPENNI=$(usex openni TRUE FALSE)"
+		"-DBUILD_OPENNI=$(usex openni TRUE FALSE)"
+		"-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)"
+		"-DBUILD_OPENNI2=$(usex openni2 TRUE FALSE)"
+		"-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
+		"-DWITH_DOCS=$(usex doc TRUE FALSE)"
+		"-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
+		"-DBUILD_TESTS=$(usex test TRUE FALSE)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild
index 9475d9da7036..737d110e2cfe 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,7 @@ fi
 HOMEPAGE="http://pointclouds.org/"
 DESCRIPTION="2D/3D image and point cloud processing"
 LICENSE="BSD"
-SLOT="0/1.8"
+SLOT="0/1.9"
 IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
 
 RDEPEND="
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 98b4a1887e34..08bf1dbcb961 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1,6 +1,8 @@
 DIST rtabmap-0.14.0.tar.gz 19515196 BLAKE2B 851017bd3114c4dfaf323ef7ba6c3e970480de4c227b06d625cec0363a144a220be587934b0d457eca587d39c0c0b609acebd71ce7a98f1193ab5723f6a47f9a SHA512 00e2996b11aef8e0f61dc59ac59626b5b695ac3b5281d7776d73b54edbd90473bfffa1daae148e090b601a4d56d7feff2190f362ea188640b93db06e3760042f
 DIST rtabmap-0.17.1.tar.gz 19632117 BLAKE2B 6e2bd929da4148856317f0b03197e541223d59810397fc5d282b04ace5af796028cd8cde850d89fb2f3f289ed11d155a5163132edd7e65e2bc8a1bad1d09c54a SHA512 6714d245b87012cb0432b677c87b17e3bc182df2025203f0bd63b1f4ab06d03d795de4792d3cc4fe6d1ca4db40852c15350fed3c3a6e27176ea5e764a9816cd2
+DIST rtabmap-0.18.1.tar.gz 19725948 BLAKE2B c43cf9c696a151b9f9117d13438122bf47fc66914249377b7c9519a2838c8512147d68f999744c1f1c5a298e1b7adb7b77db8df1c6100d1d9a7a0acbf8b24967 SHA512 37fc2e6445531875cb9b27684cd5ff7a651ca2a8a3c653a52813352579bd2f4a4ee4be7c690cf0b29ae7907d26fd8a1f4e9188071409611b845333e734714aca
 EBUILD rtabmap-0.14.0.ebuild 1401 BLAKE2B 877164ca7375c4d39f6598b72019b16664c853f3c1ee16753c490df0efbcc600b7a7e0ae57957f11f0469ffc8f09f6c4a50a644191d111b19cd7ecc95bda774c SHA512 b47443ccdf33d69e61c6912951f7c816cfaa13ca8076dc627c1814b7bbffc4a2c547296d2995726a6203b3317e568b6df7933918d660594729bf436ef80382b6
 EBUILD rtabmap-0.17.1.ebuild 1446 BLAKE2B 7f638d8f3b7e756a39122ec993b0471bbf1e72d8fa986679f796c9e5e415fabba12721e7139bc70cb881082f2c2927066f6de814fed35105b85f47f61d196094 SHA512 27178728cadf42f1e8cc9e47e52ef69d3ef9ee6bb1c71223ed80edfa9fe451a6020ddbc08f5f960c2dcb6df77535d0f72458c465213886788048b2b6493fba30
-EBUILD rtabmap-9999.ebuild 1446 BLAKE2B 7f638d8f3b7e756a39122ec993b0471bbf1e72d8fa986679f796c9e5e415fabba12721e7139bc70cb881082f2c2927066f6de814fed35105b85f47f61d196094 SHA512 27178728cadf42f1e8cc9e47e52ef69d3ef9ee6bb1c71223ed80edfa9fe451a6020ddbc08f5f960c2dcb6df77535d0f72458c465213886788048b2b6493fba30
+EBUILD rtabmap-0.18.1.ebuild 1427 BLAKE2B 8cd9e1dcbe91cd609815f9dadd9c252ef9145f2fa2a79e4f0fa627d276310d648cc53d81a4dce4e1b47fab5af19243f50643e2209e50920b2b373c83d1de7d0b SHA512 f380f1de720a19f8bcd5a4aec152b4776771c41794595151890fb47c63ef512a24cc3922d5e7b3ac5eb9671274fb1d26867dcb677eb1e5ee61a4e84461341afb
+EBUILD rtabmap-9999.ebuild 1427 BLAKE2B 8cd9e1dcbe91cd609815f9dadd9c252ef9145f2fa2a79e4f0fa627d276310d648cc53d81a4dce4e1b47fab5af19243f50643e2209e50920b2b373c83d1de7d0b SHA512 f380f1de720a19f8bcd5a4aec152b4776771c41794595151890fb47c63ef512a24cc3922d5e7b3ac5eb9671274fb1d26867dcb677eb1e5ee61a4e84461341afb
 MISC metadata.xml 471 BLAKE2B d5e9287982f5e772ca5b3570010bc79b18e3d86424c64ed501765a9ca4285349f4fdc1428c92817b7fbdfd2000e5c43ff49dd44d37d512b227e4ee4bec98f3fc SHA512 41752dfbb60d49072337438d49c313eec8a13b51bf8d3e65ad26ca519d3d8f105966756495111f01c6b365d57acb4f7be0b4dd017f8b7bfa483c08c354b0ca81
diff --git a/sci-libs/rtabmap/rtabmap-0.18.1.ebuild b/sci-libs/rtabmap/rtabmap-0.18.1.ebuild
new file mode 100644
index 000000000000..0a88ca05e482
--- /dev/null
+++ b/sci-libs/rtabmap/rtabmap-0.18.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
+fi
+
+inherit ${SCM} cmake-utils multilib
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P}"
+fi
+
+DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
+HOMEPAGE="http://introlab.github.io/rtabmap/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples ieee1394 openni2 qt5"
+
+RDEPEND="
+	media-libs/opencv:=[qt5(-)?]
+	sci-libs/pcl:=[openni,vtk,qt5(-)?]
+	sci-libs/vtk:=[qt5(-)?]
+	sys-libs/zlib
+	sci-libs/octomap:=
+	dev-libs/boost:=
+	ieee1394? ( media-libs/libdc1394 )
+	openni2? ( dev-libs/OpenNI2 )
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DWITH_QT=$(usex qt5 ON OFF)"
+		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
+		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
+		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	# Needed since we force ros crawling to be done only in
+	# /usr/share/ros_packages/
+	insinto /usr/share/ros_packages/${PN}
+	doins "${ED}/usr/share/${PN}/package.xml"
+}
diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild
index 9bbe6d06b163..0a88ca05e482 100644
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild
+++ b/sci-libs/rtabmap/rtabmap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,8 +16,8 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}-melodic.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P}-melodic"
+	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P}"
 fi
 
 DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 50a7d20ad733..bbec71c09454 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -1,4 +1,5 @@
 DIST ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz 99753 BLAKE2B 79b0c9e2f3a8de91bb042e55cbc9f589970add4c9bdccd96c9a0f38887418c97aa67fc433b4feffb92a1384039b0d68a7cc6cda141371427a310172422bd41d6 SHA512 a21df040a5b3f67d9be006ae414113fa1ca86d38fa446acfab18afcbbb89ee7c48776fac5565d0694c99f1ff6ead3b10a9915eac7aae4d2a532ef5ac126a0072
+DIST abseil-cpp-48cd2c3f351ff188bc85684b84a91b6e6d17d896.tar.gz 1181139 BLAKE2B 06b4f2ab1aa8847d7d885e62d0fdbcbb559e9b8b8d0d336a51d75db26354eb95649a684921afadf49cda021bb8d7c7efc3fc33a1bbc74e06267cb13727bb8833 SHA512 6ed7345f05b09da0b51616f2aaa578873002394519e037489f8b6621ff580bf5291cd2870f3fa7b5bcc4f9c4b79f0ebbddd52469abbb619f93c08ddf0fb84e15
 DIST abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz 875263 BLAKE2B f11af5582ef3e00155361de2185b703fc9edde1b6cbefce62224da7b13e1beae219076f144b7b8d4bf63d1b21a73beb77fbb437e6d91e6d59a233846d91c1a99 SHA512 a3694d4c74f542f7a55872707548469e1bdc6dcd05d40ffd62de41d7440dc1fb98d260f690a6799ad39142e35226b04aacc6122aa1edf104fc9d396997995a8c
 DIST abseil-cpp-f0f15c2778b0e4959244dd25e63f445a455870f5.tar.gz 1025885 BLAKE2B aa8c79912d94b67a23f42e1f2de387e8493fdff32b79ea5e958fd5b44bc2a8c804170a251d8166c4f01fd883f20962a437822b2bdd5ec614161491487833bdfc SHA512 54b664528f754f6c76888599d3a7069a7284b5dc17a31442a52faa9d3fdca23cbe3e4c1628d79c95c483f4ce6058e4d874e27ea4f859b9cafb8bb192e5093670
 DIST abseil-py-0.2.2.tar.gz 189357 BLAKE2B b53976b50f1738d671a32df2fabf197785cb4be1f68dbf7f0bdd5bbbb1a73439646f5b6a9ea42d5df40debdbb8e8c72c554f428a948f3117dba5d6a8e2b473f2 SHA512 d2a393e78acc9ac28fc9b1129c23de9c2ab6059a7527eaa29e4182356b16cbce1fede94af2a8b51af9d1c606b162d8ae84eb3036ced784a89d4f7547bfce73ed
@@ -24,9 +25,12 @@ DIST oourafft-20061228.tgz 72213 BLAKE2B 4a3ac2b4c0bc3275b5743df59241e1cdbd02003
 DIST protobuf-3.6.0.tar.gz 4483224 BLAKE2B b6716d33c14ab98a05676a3369b4762179df88ed3e8c34b93075c12edc10213bf1c427a59a8840bc64b53365264021b8075a02a44478c998062cf04da95c0075 SHA512 46df0187e5c9e7d213930d916f6c89e7a41eca1aaac228d8f56e3f784598a9f323d7cc2d3cf20668ceb776d3237c4eccf685ef8d7808f09107fa8e441f9899f4
 DIST tensorflow-1.10.0.tar.gz 24490786 BLAKE2B 2ecec19b2b2ebb2e292ec07fee458017aa3fcc4c1445e6c9419ea9bd37990a58607c8f3134c785be0e3ae098c332a734fb85717b2ecd781551a0c8f20ffca8f2 SHA512 a25257ad7e561c2040ba9dda699acb24b757e6d79c60324cab20d8d8a428fef79a06a3627a95a59e2c8408a094666b9aa6d8af1c5419fa8c238e1f5e10e9ec33
 DIST tensorflow-1.11.0.tar.gz 25024790 BLAKE2B 74129fb1e6db0317fd45266dae7aa4fab811e1ebf0d093f3153684fa4465f4319cbf8fd50c6667f9c4ddbce5c100ee00151ec2873eca93ef7d5ebbc04ab6b965 SHA512 26e9542c43e11a663cbc5cf42859ae7b6dc0e92cfa88775fd4d1badba7f08c59b60c05010fd9f3ec501313be5c042f39b17323bb4753babf365ba2a48af836c2
+DIST tensorflow-1.12.0.tar.gz 26341737 BLAKE2B 6b9e21a9367ec7454916af327ae21fc6c46e54885f30823784985a61193654fd1942cbd3b5688f55cbd63f890417eac812d0cdb576d0f0b8677df92c259837c0 SHA512 b145a9118856aa00a829ab6af89bff4e1e131371c96d77b07532544112803c4574d97ef224b28a64437a2af8db4286786dc0b4123efe110b2aa734b443a7e238
 DIST tensorflow-patches-1.10.0.tar.bz2 4032 BLAKE2B 8588deec74179d8044af631de8e651491cc713553ee15ece9dff5052bd95b10924bdbe4301453f00d0f2fccd5d595d496b48fe45b0259837653b2de9e1898ab9 SHA512 1f57995ca9b3278735636cc42c88dc45558fa6a1d656108293f8df3fd9961d75f5e979bf0a9909136134e1cdaab41a34f83e605b48b23dddf17a6b1be684117b
 DIST tensorflow-patches-1.11.0.tar.bz2 11013 BLAKE2B 929cb9fee5e6b63f00341351908d3050c676670d9cc2c1241bd2e3c86601704a7495ab598b992718f0b51fc369e33e7c646bc5db3ba3b86b18326b1c2d2974a8 SHA512 76a94c9444e1d984afaf080222d430032636204d05a5e3ff5530012dfa1eba78619dd2a2942343ccc2f7fc489eb8c6f51fddd0b84cb2c2db645b2b914cc61f80
+DIST tensorflow-patches-1.12.0.tar.bz2 10638 BLAKE2B fc2c30f6b425390f5791df8ec409165aa4cc242eb93885845cc34e8302f781b267efaebf9e996f0cbc7558d975d742fb2e5509df9f06d85a370ea73795f92c49 SHA512 2b734e206eda58c898ad7090b3fe371b08c06dcb52d07fc0991548cec7e45c2500e797dd7b98b8a3a4416b85c8886314bd75921d0cd6d942a7cd15688954dd5d
 DIST tensorflow-python-license.txt 45132 BLAKE2B 1f572a06eeb4a58a5563b87a2db381a6e9eb0195cf1d006bda0d3da158e62a1e67e889a7d3d0da83d8609c0d048887bcbbd0d7056fd8e4f56b654047f36936fa SHA512 1b8c2f9733fcf27d560879418c366b5c3e44420d42adb3b857ee741793ddc75ad18324b016909457e5311f2143593392ce4404d12962f076e62f6036afbb521e
 EBUILD tensorflow-1.10.0.ebuild 13829 BLAKE2B dd99f463536047e6b5acaa9aa6341d367b91d1a864f9b641bfab2b4522e73c669bc80641ad8feb5134926ac70eb8b3dee1e8551508ba25ae0c93fe59f713aba4 SHA512 29cf0984492d506aebfcab35e6c889e497c8771a8cf5974abf2b5752b2ea4d082491149f76beb3cc66eda7dd1d173322bab478df5fffe02494eac58a6154541f
 EBUILD tensorflow-1.11.0.ebuild 13608 BLAKE2B ad8462cc4bc779dadde6093912940b368ba1e4abcf3996c4b570aa599d4970a5fe709d53152b4a6d35326610ae09e128fd6b674fc1176677ba60c9d3849f896d SHA512 696fd969e06a4f2390ad420d6e713a5f7b025034630593b7f8644509622fda1d766af1737ae5174dcccdff80592b5a0ae6d9f5a3ea94383c4e947688b26e8daa
+EBUILD tensorflow-1.12.0.ebuild 9185 BLAKE2B a2a7089074ea57d13667c205623b512aa95223c9aec0108080aa26b5cba94ce327d38710e84b60e8727a92c450ccac545d230954f3dc93a5d43bf15ab007f944 SHA512 2fea55fdb5df02ef984423ec6b1f1c9708a61edc60e282c6ac704bd296cb8eb78d124988bc30ccb598fcff3c22ab8d1103c1834b8983ba8f6a5b5c75139375c1
 MISC metadata.xml 641 BLAKE2B 6e87fea81b3a1cdbd96bc190a2b39509549a6c3fe384597c394e142e20f0005329df309edf03d7c304e8adb62876a33c8d0c54161e5fb09fbda1df7e9d774fe3 SHA512 42fe38c07d34999da7cf47b780e69b4fa65245763761a915bd35af3d4441f583f477fd84952680d736be8514a049f49ab1dad9a7d4a6963baff00f94f5efa308
diff --git a/sci-libs/tensorflow/tensorflow-1.12.0.ebuild b/sci-libs/tensorflow/tensorflow-1.12.0.ebuild
new file mode 100644
index 000000000000..425d69f52adb
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-1.12.0.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2018 Jason Zaman
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit bazel check-reqs cuda distutils-r1 flag-o-matic toolchain-funcs
+
+DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda mpi +python"
+CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
+for i in $CPU_USE_FLAGS_X86; do
+	IUSE+=" cpu_flags_x86_$i"
+done
+
+# distfiles that bazel uses for the workspace, will be copied to basel-distdir
+bazel_external_uris="
+	http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
+	https://bitbucket.org/eigen/eigen/get/fd6845384b86.tar.gz -> eigen-fd6845384b86.tar.gz
+	https://github.com/abseil/abseil-cpp/archive/48cd2c3f351ff188bc85684b84a91b6e6d17d896.tar.gz -> abseil-cpp-48cd2c3f351ff188bc85684b84a91b6e6d17d896.tar.gz
+	https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz
+	https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip
+	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
+	https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip
+	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
+	cuda? (
+		https://github.com/nvidia/nccl/archive/03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz -> nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz
+		https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
+	)
+	python? (
+		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz
+		https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt
+		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
+	)"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PV}.tar.bz2
+		${bazel_external_uris}"
+
+RDEPEND="
+	app-arch/snappy
+	dev-db/lmdb
+	dev-db/sqlite
+	dev-libs/icu
+	>=dev-libs/jsoncpp-1.8.4
+	dev-libs/libpcre
+	dev-libs/nsync
+	dev-libs/openssl:0
+	>=dev-libs/protobuf-3.6.0
+	>=dev-libs/re2-0.2018.04.01
+	media-libs/giflib
+	media-libs/libjpeg-turbo
+	media-libs/libpng:0
+	>=net-libs/grpc-1.16.0
+	net-misc/curl
+	sys-libs/zlib
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-8.0[profiler]
+		>=dev-libs/cudnn-6.0
+	)
+	mpi? ( virtual/mpi )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/flatbuffers-1.8.0
+		dev-python/absl-py[${PYTHON_USEDEP}]
+		dev-python/astor[${PYTHON_USEDEP}]
+		dev-python/gast[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		net-libs/google-cloud-cpp
+		>=sci-libs/keras-applications-1.0.6[${PYTHON_USEDEP}]
+		>=sci-libs/keras-preprocessing-1.0.5[${PYTHON_USEDEP}]
+		>=sci-visualization/tensorboard-${PV}[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-python/mock"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.6.0
+	dev-java/java-config
+	dev-python/mock
+	dev-lang/swig
+	dev-python/cython
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-8.0[profiler]
+	)
+	!python? ( dev-lang/python )
+	python? (
+		dev-python/grpcio-tools
+	)"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
+CHECKREQS_MEMORY="5G"
+CHECKREQS_DISK_BUILD="5G"
+
+get-cpu-flags() {
+	local i f=()
+	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
+	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
+		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
+	done
+	use cpu_flags_x86_fma3 && f+=( -mfma )
+	echo "${f[*]}"
+}
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack "${P}.tar.gz"
+	unpack tensorflow-patches-${PVR}.tar.bz2
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
+src_prepare() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	# for bazel-0.19.0
+	echo 'import %workspace%/tools/bazel.rc' >> .bazelrc || die
+
+	append-flags $(get-cpu-flags)
+	bazel_setup_bazelrc
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	default
+	use python && python_copy_sources
+
+	use cuda && cuda_add_sandbox
+}
+
+src_configure() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	do_configure() {
+		export CC_OPT_FLAGS=" "
+		export TF_ENABLE_XLA=0
+		export TF_NEED_OPENCL_SYCL=0
+		export TF_NEED_OPENCL=0
+		export TF_NEED_COMPUTECPP=0
+		export TF_NEED_ROCM=0
+		export TF_NEED_MPI=$(usex mpi 1 0)
+		export TF_SET_ANDROID_WORKSPACE=0
+
+		if use python; then
+			python_export PYTHON_SITEDIR
+			export PYTHON_BIN_PATH="${PYTHON}"
+			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
+		else
+			export PYTHON_BIN_PATH="$(which python)"
+			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
+		fi
+
+		export TF_NEED_CUDA=$(usex cuda 1 0)
+		export TF_DOWNLOAD_CLANG=0
+		export TF_CUDA_CLANG=0
+		export TF_NEED_TENSORRT=0
+		if use cuda; then
+			export CUDA_TOOLKIT_PATH="${EPREFIX%/}/opt/cuda"
+			export CUDNN_INSTALL_PATH="${EPREFIX%/}/opt/cuda"
+			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
+			export TF_NCCL_VERSION="1"
+			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
+			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
+			einfo "Setting CUDA version: $TF_CUDA_VERSION"
+			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+		fi
+
+		local SYSLIBS=(
+			absl_py
+			astor_archive
+			boringssl
+			com_github_googleapis_googleapis
+			com_github_googlecloudplatform_google_cloud_cpp
+			com_google_protobuf
+			com_google_protobuf_cc
+			com_googlesource_code_re2
+			curl
+			cython
+			flatbuffers
+			gast_archive
+			gif_archive
+			grpc
+			icu
+			jpeg
+			jsoncpp_git
+			lmdb
+			nasm
+			nsync
+			org_sqlite
+			pcre
+			png_archive
+			protobuf_archive
+			six_archive
+			snappy
+			swig
+			termcolor_archive
+			zlib_archive
+		)
+
+		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
+
+		# This is not autoconf
+		./configure || die
+
+		echo 'build --config=noaws --config=nohdfs --config=noignite --config=nokafka' >> .bazelrc || die
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_configure
+	else
+		do_configure
+	fi
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	if use python; then
+		python_setup
+		BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}"
+	fi
+
+	# fail early if any deps are missing
+	ebazel build --nobuild \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so \
+		//tensorflow:libtensorflow_cc.so \
+		$(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
+
+	ebazel build \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so
+	ebazel build //tensorflow:libtensorflow_cc.so
+
+	do_compile() {
+		ebazel build //tensorflow/tools/pip_package:build_pip_package
+	}
+	BUILD_DIR="${S}"
+	cd "${BUILD_DIR}"
+	use python && python_foreach_impl run_in_build_dir do_compile
+	ebazel shutdown
+}
+
+src_install() {
+	local i j
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	do_install() {
+		einfo "Installing ${EPYTHON} files"
+		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
+		mkdir -p "${srcdir}" || die
+		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
+		cd "${srcdir}" || die
+		esetup.py install
+
+		# libtensorflow_framework.so is in /usr/lib already
+		python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR
+		rm -f "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
+		python_optimize
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir do_install
+
+		# Symlink to python-exec scripts
+		for i in "${ED}"/usr/lib/python-exec/*/*; do
+			n="${i##*/}"
+			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
+		done
+
+		python_setup
+		local BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}" || die
+	fi
+
+	einfo "Installing headers"
+	ebazel build //tensorflow:install_headers
+	ebazel shutdown
+	insinto /usr/include/${PN}/
+	doins -r bazel-genfiles/tensorflow/include/*
+
+	einfo "Installing libs"
+	# Generate pkg-config file
+	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	dolib.so bazel-bin/tensorflow/lib${PN}_framework.so
+	dolib.so bazel-bin/tensorflow/lib${PN}.so
+	dolib.so bazel-bin/tensorflow/lib${PN}_cc.so
+
+	einstalldocs
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /sci-libs
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)