gentoo resync : 30.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
commit: f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree: 8bfecb640b7b6403d7a3d662d923eed630033da7 /sci-libs
parent: 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
63 files changed, 1507 insertions, 256 deletions
diff --git a/sci-libs/Fiona/Fiona-1.7.6.ebuild b/sci-libs/Fiona/Fiona-1.7.6.ebuild
deleted file mode 100644
index 738754fc605a..000000000000
--- a/sci-libs/Fiona/Fiona-1.7.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="OGR's neat, nimble, no-nonsense API"
-HOMEPAGE="https://pypi.org/project/Fiona/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=sci-libs/gdal-1.8
-	dev-python/click[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/cligj[${PYTHON_USEDEP}]
-		dev-python/munch[${PYTHON_USEDEP}]
-		dev-python/click-plugins[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/scriptname-${PV}.patch )
-
-python_test() {
-	esetup.py test
-}
diff --git a/sci-libs/Fiona/Fiona-9999.ebuild b/sci-libs/Fiona/Fiona-9999.ebuild
deleted file mode 100644
index b8c6c34d180c..000000000000
--- a/sci-libs/Fiona/Fiona-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="OGR's neat, nimble, no-nonsense API"
-HOMEPAGE="https://pypi.org/project/Fiona/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=sci-libs/gdal-1.8
-	dev-python/click[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/scriptname.patch )
-
-python_test() {
-	esetup.py test
-}
diff --git a/sci-libs/Fiona/Manifest b/sci-libs/Fiona/Manifest
deleted file mode 100644
index 6690b604c54f..000000000000
--- a/sci-libs/Fiona/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX scriptname-1.7.6.patch 362 BLAKE2B ad8c36ebdc49654181dd2f70c468deaaf57ec5c9a36662d89e1b7e767f9e6ef20f61a3a5ef149ffb3674a1d78c210e552f38e041806df67eaec04c085856bb1c SHA512 2c5e5c6c08274f75fe5306c8318a375a81ec08a3c3978cd8412c2cbe16bd5790b821bb0fce85d37f9af6238cc0f8e96740e9e72c66c213a74ad43d0e9ef916b8
-AUX scriptname.patch 353 BLAKE2B 7b135a729d5a15362a9b7ad3b15617f1002da72932627856041c66be8b3556848e978e45d023e40e11a08ec44e267d5f6ababae2823e07b578680443a2ca3710 SHA512 f9a0c51fbdc5bf99eb9a2b94c0f27f7f6fef7ebab94d9e575f34594e31dcb624e4c327e147e5b4955b5434b54cd2179b985bc64a9410bdb792b93f45375838c9
-DIST Fiona-1.7.6.tar.gz 641013 BLAKE2B f8cadfaad300306f2d6c5f306d842366807c23db59e96309911f05608a956bb088700da88b9a22e27af0af3decc396b1fe66815007945a39aa193c31c4769155 SHA512 a988772cd8d9cf7ee6862b87c91d18d5caf78f81c35c018e815dfb0000502a0768d9ce6c580a8ef9a9a652c64c4b6027685d597766f851563a70db07db0de4f3
-EBUILD Fiona-1.7.6.ebuild 851 BLAKE2B a8e14399b02996b9959f3d51c5a0d74526b33049430c699bbffdf7210552f9fe3749358417854c0ddd22d5f5bc7290cee422544bcf0b5b39398c5ccfb9d18390 SHA512 20e701715fc9630f8819307ed54339e1a9e148d6d561fa9d0f6c19191b4130eb65ea7975a3e1a4315e373d8ebecf727e095ec7ac33e7de8e0b324c725ae2f334
-EBUILD Fiona-9999.ebuild 736 BLAKE2B c2997f636beb6cc686c1cbc4b43e5ee6d0e79da1073595eb3f53107a99ccc879b24af40a02f767e8d9fcc744ae24dd355048eac6ae96b08ea531d2891c96a0a9 SHA512 785cab04a06b2af87ea084788c32591efcd0e7b3e3d18b6788240b190d94320f32f14321c99a5d378d6e4a7deee50ec98c9702c8ce8a9ade5459fdfc0223041b
-MISC metadata.xml 240 BLAKE2B 010e6f1f4b61059c3ae02f9b2a777d806a527c907b6f50f2143f7e9468c8083e60e0b0c01b1008eace030563421825e894f8f479cb27bed072f8f6f3295bbe66 SHA512 a4cc37701e25a2f50b06a3609f98173bf00df77bbabcfe38c8c60c4a488c5971b34f26cdcbf03c34eca4aa3a567b6242f597742a6f5575b1e74978a6fc249a91
diff --git a/sci-libs/Fiona/files/scriptname-1.7.6.patch b/sci-libs/Fiona/files/scriptname-1.7.6.patch
deleted file mode 100644
index 410caf39da55..000000000000
--- a/sci-libs/Fiona/files/scriptname-1.7.6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2017-05-30 10:51:33.369935784 +0200
-+++ setup.py	2017-05-30 10:51:45.793269042 +0200
-@@ -251,7 +251,7 @@
-     packages=['fiona', 'fiona.fio'],
-     entry_points='''
-         [console_scripts]
--        fio=fiona.fio.main:main_group
-+        Fiona=fiona.fio.main:main_group
- 
-         [fiona.fio_commands]
-         bounds=fiona.fio.bounds:bounds
diff --git a/sci-libs/Fiona/files/scriptname.patch b/sci-libs/Fiona/files/scriptname.patch
deleted file mode 100644
index 227e644f0759..000000000000
--- a/sci-libs/Fiona/files/scriptname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2015-03-27 21:34:22.790592037 +0100
-+++ setup.py	2015-03-27 21:34:54.247259049 +0100
-@@ -150,7 +150,7 @@
-     packages=['fiona', 'fiona.fio'],
-     entry_points='''
-         [console_scripts]
--        fio=fiona.fio.fio:cli
-+        Fiona=fiona.fio.fio:cli
-         ''',
-     install_requires=requirements,
-     tests_require=['nose'],
diff --git a/sci-libs/Fiona/metadata.xml b/sci-libs/Fiona/metadata.xml
deleted file mode 100644
index 51838a08fe1f..000000000000
--- a/sci-libs/Fiona/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">Fiona</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index d1cf666121c2..56dfc79b3152 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest
index 1da545c35903..4bf2c1a60e63 100644
--- a/sci-libs/ViSP/Manifest
+++ b/sci-libs/ViSP/Manifest
@@ -1,5 +1,7 @@
 AUX ViSP-3.0.1-opencv.patch 403 BLAKE2B 0bc3da5cd6e73cdd47dac7b525f4f3fbe6e683aa79f9185a3e92cecaf36fdc30c018fe93d1e9f7ac69890b7807e16663e21e65025184b950a8f384c1ec2748d8 SHA512 3a6a84ac6ad2bce4fdf7228b4a296589239c2b4b019b3ad8e4654af71b00eca6102444f38c32604013ec62d60d067deb2902ea8cffffff6d97e0762602a013f4
 AUX ViSP-3.2.0-ocv.patch 1065 BLAKE2B 830cecf11df2d9c5c909ab5e2b5e7430e953355feeea77e40b77d53f24d2f1799a529c8dfda061ca6a276a1e150d10fee475f63e798511ce0296e8fde1fd75a8 SHA512 35fbb672da815fd404bd483800bf3f27b4f62d41b1173b10292a964d23129f4ec8afd530f8de913500214633a425a1a7567341b6da317b9e74720cf9414f3eff
 DIST visp-3.2.0.tar.gz 52737424 BLAKE2B 78b733183a62541f5d5af22a376ac52ba2377753fa53be62858611b27d961fad286923c11f624c4fe0f561d8dbc5367e2ac01e6bc11a2a19068167ef52198307 SHA512 b4ad21e5063327d91d4ebda268cf4a4dc2ceffbe39d6af0dd6bfeb94d1150884d37fc4ea4295f640135fc2ba758afd29b9090755561ef05249fe2cbc5680dcce
+DIST visp-3.3.0.tar.gz 60822186 BLAKE2B 559698af352b4eac227ab2cdb8d66be31c04d2e2ac2d30ce07cef5022501162211ff9bfc9ed4970ac8b825321b8fc34241a6ca7a29b3d78fb70fa79ac429f7ab SHA512 f96b017353240e63059ef1e514a64198b6a50b95b5a08405c16e99589fd2110071e2d558921a674e538f9cdea07fde8e653ca630e3c12c38bf91f7a83057afe2
 EBUILD ViSP-3.2.0-r2.ebuild 2881 BLAKE2B 2706c612162b35e58f66c1e00cd343c1fb528be29b196cc9a0477462294a5447bc8ae512f5776bd438b237057beda14bcdc244a2f14fefb54b268dc5724cf04a SHA512 c192fafa044c0910a1f338422acf8fa0cd1c8433c4899085503118621e617a014e206f57f01125e82ade34b95b7133e22c554de76b2cbcc9dfa621d242bacb2d
-MISC metadata.xml 1316 BLAKE2B 0ef658cebd419a44479f24feefd44103fca5a6538cd2f4ba82ac3a12f20fbe4d079551b35587d1616969d7908cb347cf94cc33d27a2a5e327e4b369be30dfaf3 SHA512 738ff67d41b80f336be750cc0e534196bd2055dac9e00a183c097bbe94febb686340db1fd683f3c17cf2dacb68d123e84d6730025d9a46153918aa5b316daf9b
+EBUILD ViSP-3.3.0.ebuild 2876 BLAKE2B 6b9fc1ae7a19ca7f8b656f983b0e32eb05511d467c896243caac1fb8360ed0b78c1f3d24b679e4e7a64fc9e8d7061eeb2c32d4c7c71ed19ba9f5933d68f18b98 SHA512 b69177ce259c6bab5ffd1e3433347f25d7eef866e77627a357e33e08cf9b20c0043947fe022e11e2166468934353f2eb58b6365d101a2be2ad416dfbf9f030a8
+MISC metadata.xml 1383 BLAKE2B 0bc8f34d0babc7ca62c664babe0422443b0819e9c63bc850705c1de9d81b428b650ae19ddc0ae50bae28344f23058ff08247c1a0504e73c3bc419d972d3dcb27 SHA512 f562e0b6d262bd5de4f6e6f3eb5496ad9e8b4b4089a209e3614c5f0c3c531b4076d7a2af7b1317fa4fe9473a8241db1b44d343e2ca051e798c6948a86036562a
diff --git a/sci-libs/ViSP/ViSP-3.3.0.ebuild b/sci-libs/ViSP/ViSP-3.3.0.ebuild
new file mode 100644
index 000000000000..35b2a248ef5d
--- /dev/null
+++ b/sci-libs/ViSP/ViSP-3.3.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Visual Servoing Platform: visual tracking and visual servoing library"
+HOMEPAGE="http://www.irisa.fr/lagadic/visp/visp.html"
+SRC_URI="http://gforge.inria.fr/frs/download.php/latestfile/475/visp-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3.3"
+KEYWORDS="~amd64 ~arm"
+IUSE="
+	+coin demos +dmtx doc examples gsl ieee1394 jpeg motif ogre
+	opencv pcl png test tutorials usb v4l X xml +zbar zlib
+	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	coin? ( >=media-libs/coin-4 virtual/opengl )
+	dmtx? ( media-libs/libdmtx )
+	gsl? ( sci-libs/gsl )
+	ieee1394? ( media-libs/libdc1394 )
+	jpeg? ( virtual/jpeg:0 )
+	motif? ( media-libs/SoXt )
+	ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] )
+	opencv? ( media-libs/opencv:=[contribdnn(+)] )
+	pcl? ( sci-libs/pcl:= )
+	png? ( media-libs/libpng:0= )
+	usb? ( virtual/libusb:1 )
+	v4l? ( media-libs/libv4l )
+	X? ( x11-libs/libX11 )
+	xml? ( dev-libs/libxml2 )
+	zbar? ( media-gfx/zbar )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	v4l? ( virtual/os-headers )"
+RDEPEND="${RDEPEND}
+	demos? ( sci-misc/ViSP-images )"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( sci-misc/ViSP-images )
+	doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )"
+REQUIRED_USE="motif? ( coin )"
+
+S="${WORKDIR}/visp-${PV}"
+PATCHES=( "${FILESDIR}/${PN}-3.2.0-ocv.patch" "${FILESDIR}/${PN}-3.0.1-opencv.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
+		"-DBUILD_TESTS=$(usex test ON OFF)"
+		"-DBUILD_DEMOS=$(usex demos ON OFF)"
+		"-DBUILD_TUTORIALS=$(usex tutorials ON OFF)"
+		"-DUSE_COIN3D=$(usex coin ON OFF)"
+		"-DUSE_DC1394=$(usex ieee1394 ON OFF)"
+		"-DUSE_DMTX=$(usex dmtx ON OFF)"
+		"-DUSE_GSL=$(usex gsl ON OFF)"
+		"-DUSE_JPEG=$(usex jpeg ON OFF)"
+		"-DUSE_PNG=$(usex png ON OFF)"
+		"-DUSE_LIBUSB_1=$(usex usb ON OFF)"
+		"-DUSE_OGRE=$(usex ogre ON OFF)"
+		"-DUSE_OIS=$(usex ogre ON OFF)"
+		"-DUSE_OPENCV=$(usex opencv ON OFF)"
+		"-DUSE_PCL=$(usex pcl ON OFF)"
+		"-DUSE_SOQT=OFF"
+		"-DUSE_SOXT=$(usex motif ON OFF)"
+		"-DUSE_V4L2=$(usex v4l ON OFF)"
+		"-DUSE_X11=$(usex X ON OFF)"
+		"-DUSE_XML2=$(usex xml ON OFF)"
+		"-DUSE_ZBAR=$(usex zbar ON OFF)"
+		"-DUSE_ZLIB=$(usex zlib ON OFF)"
+		"-DCOIN3D_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/Coin4"
+		"-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)"
+		"-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)"
+		"-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile visp_doc
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use tutorials ; then
+		dodoc -r tutorial
+		docompress -x /usr/share/doc/${PF}/tutorial
+	fi
+	cd "${BUILD_DIR}"
+	use doc && dodoc -r doc/html
+}
diff --git a/sci-libs/ViSP/metadata.xml b/sci-libs/ViSP/metadata.xml
index 95a2f3243339..15ed30656d81 100644
--- a/sci-libs/ViSP/metadata.xml
+++ b/sci-libs/ViSP/metadata.xml
@@ -11,6 +11,7 @@
 		<flag name="demos">Installs demo programs.</flag>
 		<flag name="ogre">Enables <pkg>dev-games/ogre</pkg> support.</flag>
 		<flag name="opencv">Enables <pkg>media-libs/opencv</pkg> support.</flag>
+		<flag name="pcl">Enables <pkg>sci-libs/pcl</pkg> support.</flag>
 		<flag name="tutorials">Installs tutorials.</flag>
 		<flag name="zbar">Enables barcodes reading.</flag>
 	</use>
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 725dff9b618b..e96e05f8d6ab 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,6 +1,9 @@
 AUX dealii-9.1.1-no-ld-flags.patch 1044 BLAKE2B fed995fbd5563bfee6b4dd232d5d9aaecd8f0d206f06679b5d79022420c83ac2752414417499ac9181c25ddc594e492bf8d6b6af19fdfd1f047e7e089193de5d SHA512 15346b31f4ac5df3b1a3a3dcb215d4bd49e3e67480c86d4c78dbd5d27ae33f6cfa8b03fdc561e38090a2c22ae8ba71d13cd9b1bbdda3eedefd498f5cedfd0a09
 DIST dealii-9.1.1-offline_documentation.tar.gz 211103151 BLAKE2B ef7cf48aa8019a2d42a38804744ff72cc7f744255fa27df852f8f93c86a02f2125458e0e525e57510bb98adc27aed933fefa27d556d8203c991dae9866c7d57a SHA512 5e2b71e9bdeb80875772356e2c873bc1f065f2a8c5c47923b74b471d464e4867c257e3a47b32341aa60af98e74e3ed2eceba8dedb4b157ab872681576ecbd5db
 DIST dealii-9.1.1.tar.gz 19911088 BLAKE2B e8488833f11339ccffd4791b9b46ab77f1982cbbdeb11fab7f6b74ca2e17c3d648a2940f4462d0ac9c68bd619b3c4f43b4d8052d2903cbb9cae2fece93d81987 SHA512 02dd91e2b0f395960f900f4cbe00bd307a4762ffbc5f3838dcc34828937e96727efbbcc66fc3d357d6b00b0dddcbc6cd7709c4c03f067d92a8f72d4631b88bf1
-EBUILD dealii-9.1.1.ebuild 5267 BLAKE2B b95577f351d9c090bb807ff36aeb72375f650bfc65b4fccb466e6973d102ac6f43ec397478f222b34832d0efb975789a7302aba4c2f0e892a3b36007a9910b9d SHA512 99bf9eac19dcbdbd03b5f3b9b56156e78f17f022c151404f7e215b1ae48bb09c6bc4ad931c50b5825e23222c80a9cb210958999df69a757b9ae0188cd4b9cb69
-EBUILD dealii-9999.ebuild 5300 BLAKE2B 55788567c9bb5496535d693fff48a6e8d9e246da4f43ecaf147b4d722d9a8eb863f1442a59e0092c71844ff1391d89bc81c5550a2d61194e7488052660755aef SHA512 dd500dff91b28285e5e1ad2cd8850a0243978adeccae260eda4d4da64b9c17be625afe1e16bc703ca1fcaf12ffdeb48e688ec92a911741b143ac2f1aa8de2009
-MISC metadata.xml 2569 BLAKE2B 55b26d8d83d1203492fd10737e5845259a4eb7db5aed5f5e310616c812bd56b2d03fe389541ad28a7547be9331a6a587b09b3847172d1a70a98ca7c006168bab SHA512 738e28a559017ac76fbf595eb134f91932ed94fb56831ee125dca7aa31eb46db2439f3594b5b104f6a417d0715db149d94cb263d30ba2d32f76fc8deb5195526
+DIST dealii-9.2.0-offline_documentation.tar.gz 277987911 BLAKE2B d14e15bc252f481707b04e9ca3fd05b5469035537a099466a8272fa1d56833c99d845871534df75bbb2efb29063e738700a5a2815b653cdd14b49b3a93add368 SHA512 9680731b4d837561c3682a65391b442cfb8d2a947b0e4e37cad1df83877b371997d084eac52e2bf34b190ea54996d41ddd89bee79fff24d710199417f3f345ab
+DIST dealii-9.2.0.tar.gz 24688964 BLAKE2B 60a8ede72a49cb2e658b3d6d53fb332a96f44a7fb9bb499ba54175138d49f38a9b75d9bea2eaddcaa3f50d97ce53961692b35f89578f535d32301680e6f1d68b SHA512 7c76435e45c9c302c4f95f588229f5a9b81f0450bd029729553c706a25dfd16f5c02c50fd2618d7e285d18927b63426110d2c6a074242b91cf789bd4bc77acc5
+EBUILD dealii-9.1.1.ebuild 5116 BLAKE2B ad49b4166826e292ba7efebf8533e938edf8073b62079134ebf6fea63f22cdc7621721ae4815ab6aff10d6247014a5f9cced41c61f4a4ff0c78dd3290aa39be2 SHA512 26cbd0e61fcd81a582c364cfaef4352ce9a9b8339d1680e84a27be67c0d406d4cebd77862eed187b752821ed6dfabd6766857e23d9a55ce989c5afbd2601bc1f
+EBUILD dealii-9.2.0.ebuild 5232 BLAKE2B f6578f1f2a2589ac417273e02d1c035a49cfb555756d07960ccd71405c1bfaa87c6587ef6d6727e4934c5835b958a1a97b3c2b26806cb1fc4e76938228a93761 SHA512 07d9ef7b9f3e6a12cf0309e6559ad39fb323be87c1efd70721f44348e0a8de67d57b33233cab21ec3892c823fd57159dd13ac5aa8f7d6dee74ee4879564a9a62
+EBUILD dealii-9999.ebuild 5232 BLAKE2B f6578f1f2a2589ac417273e02d1c035a49cfb555756d07960ccd71405c1bfaa87c6587ef6d6727e4934c5835b958a1a97b3c2b26806cb1fc4e76938228a93761 SHA512 07d9ef7b9f3e6a12cf0309e6559ad39fb323be87c1efd70721f44348e0a8de67d57b33233cab21ec3892c823fd57159dd13ac5aa8f7d6dee74ee4879564a9a62
+MISC metadata.xml 2636 BLAKE2B 904145ebd056a89ab5a376c38b2c132275303a575d987259f4b0de9bd016fa6194a31b995ed2c516a315367b40300875f769297451768e3f0c659fcd97a8fd9d SHA512 631e38056db1583ed6966110a9b6f6ae83dca41a573040d4f9e0d5fc56dea3052bcb6893b80419508f3d5adc3dad79eb95a5e3e15feed831e7a064c2f5dbaed6
diff --git a/sci-libs/dealii/dealii-9.1.1.ebuild b/sci-libs/dealii/dealii-9.1.1.ebuild
index 94009ead1838..d3dc212526bc 100644
--- a/sci-libs/dealii/dealii-9.1.1.ebuild
+++ b/sci-libs/dealii/dealii-9.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,15 +19,9 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	MY_PV="${PV//0_rc/rc}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz
-		doc? (
-			https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}-offline_documentation.tar.gz
-			-> ${P}-offline_documentation.tar.gz
-			)"
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
+		doc? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz )"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/sci-libs/dealii/dealii-9.2.0.ebuild b/sci-libs/dealii/dealii-9.2.0.ebuild
new file mode 100644
index 000000000000..14d898de7089
--- /dev/null
+++ b/sci-libs/dealii/dealii-9.2.0.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils eutils multilib
+
+# deal.II uses its own FindLAPACK.cmake file that calls into the system
+# FindLAPACK.cmake module and does additional internal setup. Do not remove
+# any of these modules:
+CMAKE_REMOVE_MODULES_LIST=""
+
+DESCRIPTION="Solving partial differential equations with the finite element method"
+HOMEPAGE="http://www.dealii.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dealii/dealii.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
+		doc? (
+			https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz
+			)"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="
+	adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f
+	cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5
+	+lapack metis mpi muparser nanoflann opencascade netcdf p4est petsc
+	scalapack slepc +sparse static-libs sundials symengine +tbb trilinos
+"
+
+# TODO: add slepc use flag once slepc is packaged for gentoo-science
+REQUIRED_USE="
+	p4est? ( mpi )
+	slepc? ( petsc )
+	trilinos? ( mpi )"
+
+RDEPEND="dev-libs/boost
+	app-arch/bzip2
+	sys-libs/zlib
+	adolc? ( sci-libs/adolc )
+	arpack? ( sci-libs/arpack[mpi=] )
+	assimp? ( media-libs/assimp )
+	cuda? ( dev-util/nvidia-cuda-sdk )
+	ginkgo? ( sci-libs/ginkgo )
+	gmsh? ( sci-libs/gmsh )
+	gsl? ( sci-libs/gsl )
+	hdf5? ( sci-libs/hdf5[mpi=] )
+	lapack? ( virtual/lapack )
+	metis? ( >=sci-libs/parmetis-4 )
+	mpi? ( virtual/mpi )
+	muparser? ( dev-cpp/muParser )
+	nanoflann? ( sci-libs/nanoflann )
+	netcdf? ( sci-libs/netcdf-cxx:0 )
+	opencascade? ( sci-libs/opencascade:* )
+	p4est? ( sci-libs/p4est[mpi] )
+	petsc? ( sci-mathematics/petsc[mpi=] )
+	scalapack? ( sci-libs/scalapack )
+	slepc? ( sci-mathematics/slepc[mpi=] )
+	sparse? ( sci-libs/umfpack )
+	sundials? ( <sci-libs/sundials-4:= )
+	symengine? ( >=sci-libs/symengine-0.4:= )
+	tbb? ( dev-cpp/tbb )
+	trilinos? ( sci-libs/trilinos )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] dev-lang/perl )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
+)
+
+src_configure() {
+	# deal.II needs a custom build type:
+	local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
+
+	local mycmakeargs=(
+		-DDEAL_II_PACKAGE_VERSION=9999
+		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
+		-DDEAL_II_ALLOW_AUTODETECTION=OFF
+		-DDEAL_II_ALLOW_BUNDLED=OFF
+		-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
+		-DDEAL_II_COMPILE_EXAMPLES=OFF
+		-DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html"
+		-DDEAL_II_DOCREADME_RELDIR="share/doc/${P}"
+		-DDEAL_II_COMPILE_EXAMPLES=OFF
+		-DDEAL_II_EXAMPLES_RELDIR="share/doc/${P}/examples"
+		-DDEAL_II_LIBRARY_RELDIR="$(get_libdir)"
+		-DDEAL_II_SHARE_RELDIR="share/${PN}"
+		-DDEAL_II_WITH_ZLIB=ON
+		-DDEAL_II_WITH_ADOLC="$(usex adolc)"
+		-DDEAL_II_WITH_ASSIMP="$(usex assimp)"
+		-DDEAL_II_WITH_ARPACK="$(usex arpack)"
+		-DDEAL_II_WITH_CUDA="$(usex cuda)"
+		-DDEAL_II_WITH_GINKGO="$(usex ginkgo)"
+		-DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)"
+		-DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)"
+		-DDEAL_II_WITH_GMSH="$(usex gmsh)"
+		-DDEAL_II_WITH_GSL="$(usex gsl)"
+		-DDEAL_II_WITH_HDF5="$(usex hdf5)"
+		-DDEAL_II_WITH_LAPACK="$(usex lapack)"
+		-DDEAL_II_WITH_METIS="$(usex metis)"
+		-DDEAL_II_WITH_MPI="$(usex mpi)"
+		-DDEAL_II_WITH_MUPARSER="$(usex muparser)"
+		-DDEAL_II_WITH_NANOFLANN="$(usex nanoflann)"
+		-DDEAL_II_WITH_NETCDF="$(usex netcdf)"
+		-DOPENCASCADE_DIR="${CASROOT}"
+		-DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)"
+		-DDEAL_II_WITH_P4EST="$(usex p4est)"
+		-DDEAL_II_WITH_PETSC="$(usex petsc)"
+		-DDEAL_II_WITH_SCALAPACK="$(usex scalapack)"
+		-DDEAL_II_WITH_SLEPC="$(usex slepc)"
+		-DDEAL_II_WITH_SUNDIALS="$(usex sundials)"
+		-DDEAL_II_WITH_SYMENGINE="$(usex symengine)"
+		-DDEAL_II_WITH_UMFPACK="$(usex sparse)"
+		-DBUILD_SHARED_LIBS="$(usex !static-libs)"
+		-DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)"
+		-DDEAL_II_WITH_THREADS="$(usex tbb)"
+		-DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
+	)
+
+	# Do a little dance for purely cosmetic "QA" reasons.
+	use opencascade && mycmakeargs+=( -DOPENCASCADE_DIR="${CASROOT}" )
+
+	# Do a little dance for purely cosmetic "QA" reasons. The build system
+	# does query for the highest instruction set first and skips the other
+	# variables if a "higher" variant is set
+	if use cpu_flags_x86_avx512f; then
+		mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes )
+	elif use cpu_flags_x86_avx; then
+		mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes )
+	elif use cpu_flags_x86_avx; then
+		mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	if use doc && [[ ${PV} != *9999* ]]; then
+		# copy missing images to the build directory:
+		cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \
+			"${BUILD_DIR}"/doc/doxygen/deal.II || die
+		# replace links:
+		sed -i \
+			's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
+			"${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
+	fi
+	cmake-utils_src_install
+
+	# decompress the installed example sources:
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 35dcbc94b523..14d898de7089 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,24 +19,20 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	MY_PV="${PV//0_rc/rc}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
 		doc? (
-			https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}-offline_documentation.tar.gz
-			-> ${P}-offline_documentation.tar.gz
+			https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz
 			)"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="
 	adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f
-	cpu_flags_x86_sse2 cuda +debug doc +examples gmsh +gsl hdf5 +lapack
-	metis mpi muparser nanoflann opencascade netcdf p4est petsc scalapack
-	slepc +sparse static-libs sundials symengine +tbb trilinos
+	cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5
+	+lapack metis mpi muparser nanoflann opencascade netcdf p4est petsc
+	scalapack slepc +sparse static-libs sundials symengine +tbb trilinos
 "
 
 # TODO: add slepc use flag once slepc is packaged for gentoo-science
@@ -52,6 +48,7 @@ RDEPEND="dev-libs/boost
 	arpack? ( sci-libs/arpack[mpi=] )
 	assimp? ( media-libs/assimp )
 	cuda? ( dev-util/nvidia-cuda-sdk )
+	ginkgo? ( sci-libs/ginkgo )
 	gmsh? ( sci-libs/gmsh )
 	gsl? ( sci-libs/gsl )
 	hdf5? ( sci-libs/hdf5[mpi=] )
@@ -102,6 +99,7 @@ src_configure() {
 		-DDEAL_II_WITH_ASSIMP="$(usex assimp)"
 		-DDEAL_II_WITH_ARPACK="$(usex arpack)"
 		-DDEAL_II_WITH_CUDA="$(usex cuda)"
+		-DDEAL_II_WITH_GINKGO="$(usex ginkgo)"
 		-DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)"
 		-DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)"
 		-DDEAL_II_WITH_GMSH="$(usex gmsh)"
diff --git a/sci-libs/dealii/metadata.xml b/sci-libs/dealii/metadata.xml
index 235d8ffe8218..90bacf01225a 100644
--- a/sci-libs/dealii/metadata.xml
+++ b/sci-libs/dealii/metadata.xml
@@ -36,8 +36,9 @@ and extra output. If you want to get meaningful backtraces see
 		<flag name="tbb">Add threading support with the help of the tbb library (<pkg>dev-cpp/tbb</pkg>)</flag>
 		<flag name="trilinos">Add support for trilinos (<pkg>sci-libs/trilinos</pkg>)</flag>
 		<flag name="assimp">Add support for assimp (<pkg>media-libs/assimp</pkg>)</flag>
-		<flag name="cuda">Add support for cuda assimp (<pkg>dev-util/nvidia-cuda-sdk</pkg>)</flag>
-		<flag name="sundials">Add support for sundials assimp (<pkg>sci-libs/sundials</pkg>)</flag>
+		<flag name="cuda">Add support for cuda (<pkg>dev-util/nvidia-cuda-sdk</pkg>)</flag>
+		<flag name="ginkgo">Add support for ginkgo (<pkg>sci-libs/ginkgo</pkg>)</flag>
+		<flag name="sundials">Add support for sundials (<pkg>sci-libs/sundials</pkg>)</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">dealii/dealii</remote-id>
diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index 23a5597c49c6..0a55d7d6c7ee 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -1,7 +1,8 @@
 AUX flann-1.9.1-cmake-3.11-1.patch 663 BLAKE2B 7162cb27a4ba6e13ac6f65752224e53be4988b3bb2ab5b8a9afbbed69a262a36c394d445fbb006afe7edbc5c9e90c339a88040eb7bee4c5c6c3209e1ba21b4ef SHA512 6d5032c30c0509951aaa5afc3f24a423d275224f67e14e0c4defbbda92ec659cef86fcfa65d72265d000f8010f0117ca2b8905f2c6f496aeef74a98dee9ffa08
 AUX flann-1.9.1-cmake-3.11.patch 2998 BLAKE2B 85c6b6feb800ab1a21af86a4001b0056fda416a6b61147f614670968cca13fa2b63d06673a11a2ef72b6f0d0876539ccb68134f4817975d4b796b66a716e606d SHA512 5cdffa2da3538965c0d20fb091a13124cdc301669b622ca35a131680db8abb58cf8e02f1366604a19a5cd10dd67f14861caa1c12da3154d82d576cb8052a4b87
 AUX flann-1.9.1-cuda-9.patch 850 BLAKE2B f193a6fd25a1d2cd45201d547fb444393cb82f344da6f5d1e2a012599170a412b261f6cf35d8943da7e96fd9f204991580d5ea045b43e2aa33ea5ad9fa9307d4 SHA512 0b5cad7b928319b922bdaa27d07fd38f1c359799ef9c217b6c1979f8ac9a86706e7ad1547f484aeb1db449a37693d18b2710b877483266915a869372c29ee1e4
+AUX flann-1.9.1-system-lz4.patch 4934 BLAKE2B eea32abae8b13d5d0e5149c58b2639c1b6f3bbbedfa8aa91f5fb83afca4726571eb4e01eb440eb913b54f8a03124bc0266c8b039b6448bcdc0bc5e87a9512c6f SHA512 acb67eb59b400b82722f064e529fc86f43c4e16ba097a3742b5717b33fcd35a619c73ec6ea6391b23f906d4bc40a5167b56cffd0267bc2c8259b7298ad414e65
 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
-EBUILD flann-1.9.1-r2.ebuild 2328 BLAKE2B 7561d9f02e10301add3c59c756c52380f2ecf66ced64cdfebd77852275275f2c1fd2f9899dde69ec5f72f024b09896d5dbd5afb0b644a1fbb3e4cc2fddaabb13 SHA512 8221d601cdc3a2899af889f74122a04f37e556f19bd52f743df234a644ee16b555cdd18927a37585800ed51a2b073609f8f3397b641f82df3b12d5c08e521c14
+EBUILD flann-1.9.1-r3.ebuild 2320 BLAKE2B e3a8d2a4014e5bad7c20712aec3aa52c1334525830a408811923e63a22934a936ce9408ae26101c61cdba54edbc76e8f83d49631398a96c090a945a9b72f157c SHA512 a9143b97f949c83ccffbacac4da2215058372197cca49149d562bf9a8709acbcfe658e24d2c0532f71727c68c75c51ce432ddebfcd0afe98d7f003c6a9cd0c94
 EBUILD flann-9999.ebuild 2215 BLAKE2B bb8f804a838a8c6b1702666a92cca7ce919523b7c8590a6f816ae3ec2d8b85c44ecc237f55bd498c8e6e296388c7b1cfcb6338b7a2361a5eaef869f2987b85f4 SHA512 9d2c22c2e45bc73cd982a7d75f77ec05b0533a60dc1125cd5127aec43d74f990b81690a1e47fd67cabc2ed5da500dded79c4dd8c79dc138db6c2a36d10bac0a0
 MISC metadata.xml 971 BLAKE2B 5cffd393d18c3719d8b61069dbc84f4ce4e16e6746637b1203dcba3719fb672d8db082afa93add6be9ebc4203df85391d20eb824a7a9ea3550b37295186538ff SHA512 b8416b149e26ede6d3f207d7e48316a8b880436c40c4ed5610953ceda0fee4e5b97f1b99f778678514dd115c257fb419b365ed46fdd90a19d444bca8e3e0fe03
diff --git a/sci-libs/flann/files/flann-1.9.1-system-lz4.patch b/sci-libs/flann/files/flann-1.9.1-system-lz4.patch
new file mode 100644
index 000000000000..dcc9fedd4a97
--- /dev/null
+++ b/sci-libs/flann/files/flann-1.9.1-system-lz4.patch
@@ -0,0 +1,125 @@
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Sun, 14 Oct 2018 00:25:05 +0200
+Subject: Use system version of liblz4
+
+Also make sure that flann_cpp is linked against LZ4.
+---
+ CMakeLists.txt                     | 3 +++
+ cmake/flann.pc.in                  | 2 +-
+ examples/CMakeLists.txt            | 3 +++
+ src/cpp/CMakeLists.txt             | 8 ++++++--
+ src/cpp/flann/util/serialization.h | 4 ++--
+ 5 files changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a01fb7a..995e54e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -142,6 +142,9 @@ if (BUILD_CUDA_LIB)
+     endif(CUDA_FOUND)
+ endif(BUILD_CUDA_LIB)
+ 
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(LZ4 REQUIRED liblz4)
++
+ #set the C/C++ include path to the "include" directory
+ include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src/cpp)
+ 
+diff --git a/cmake/flann.pc.in b/cmake/flann.pc.in
+index 82eee5e..07b8d64 100644
+--- a/cmake/flann.pc.in
++++ b/cmake/flann.pc.in
+@@ -8,6 +8,6 @@ Name: @PROJECT_NAME@
+ Description: @PKG_DESC@
+ Version: @FLANN_VERSION@
+ Requires: @PKG_EXTERNAL_DEPS@
+-Libs: -L${libdir} -lflann -lflann_cpp
++Libs: -L${libdir} @LZ4_STATIC_LDFLAGS@ -lflann -lflann_cpp
+ Cflags: -I${includedir}
+ 
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index e9fef04..2b2bb9d 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -3,6 +3,7 @@ add_custom_target(examples ALL)
+ 
+ if (BUILD_C_BINDINGS)
+     add_executable(flann_example_c flann_example.c)
++    target_link_libraries(flann_example_c -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state)
+     target_link_libraries(flann_example_c flann)
+     set_target_properties(flann_example_c PROPERTIES COMPILE_FLAGS -std=c99)
+ 
+@@ -14,6 +15,7 @@ if (HDF5_FOUND)
+     include_directories(${HDF5_INCLUDE_DIRS})
+ 
+     add_executable(flann_example_cpp flann_example.cpp)
++    target_link_libraries(flann_example_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state)
+     target_link_libraries(flann_example_cpp ${HDF5_LIBRARIES} flann_cpp)
+     if (HDF5_IS_PARALLEL)
+         target_link_libraries(flann_example_cpp ${MPI_LIBRARIES})
+@@ -25,6 +27,7 @@ if (HDF5_FOUND)
+ 
+     if (USE_MPI AND HDF5_IS_PARALLEL)
+         add_executable(flann_example_mpi flann_example_mpi.cpp)
++        target_link_libraries(flann_example_mpi -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state)
+         target_link_libraries(flann_example_mpi flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES})
+ 
+         add_dependencies(examples flann_example_mpi)
+diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
+index b453b27..5c4f693 100644
+--- a/src/cpp/CMakeLists.txt
++++ b/src/cpp/CMakeLists.txt
+@@ -4,11 +4,12 @@ add_definitions(-D_FLANN_VERSION=${FLANN_VERSION})
+ 
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h)
+ 
+-file(GLOB_RECURSE C_SOURCES flann.cpp lz4.c lz4hc.c)
+-file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp lz4.c lz4hc.c)
++file(GLOB_RECURSE C_SOURCES flann.cpp)
++file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp)
+ file(GLOB_RECURSE CU_SOURCES *.cu)
+ 
+ add_library(flann_cpp_s STATIC ${CPP_SOURCES})
++target_link_libraries(flann_cpp_s ${LZ4_LIBRARIES})
+ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
+     set_target_properties(flann_cpp_s PROPERTIES COMPILE_FLAGS -fPIC)
+ endif()
+@@ -42,6 +43,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
+     endif()
+ else()
+     add_library(flann_cpp SHARED ${CPP_SOURCES})
++    target_link_libraries(flann_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state)
+     if (BUILD_CUDA_LIB)
+ 		cuda_add_library(flann_cuda SHARED ${CPP_SOURCES})
+         set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA)
+@@ -77,6 +79,7 @@ endif()
+ 
+ if (BUILD_C_BINDINGS)
+     add_library(flann_s STATIC ${C_SOURCES})
++    target_link_libraries(flann_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state)
+     if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
+         set_target_properties(flann_s PROPERTIES COMPILE_FLAGS -fPIC)
+     endif()
+@@ -88,6 +91,7 @@ if (BUILD_C_BINDINGS)
+         target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive)
+     else()
+         add_library(flann SHARED ${C_SOURCES})
++        target_link_libraries(flann_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state)
+ 
+         if(MINGW AND OPENMP_FOUND)
+           target_link_libraries(flann gomp)
+diff --git a/src/cpp/flann/util/serialization.h b/src/cpp/flann/util/serialization.h
+index d731021..cdc2e5e 100644
+--- a/src/cpp/flann/util/serialization.h
++++ b/src/cpp/flann/util/serialization.h
+@@ -6,8 +6,8 @@
+ #include <cstdlib>
+ #include <cstring>
+ #include <stdio.h>
+-#include "flann/ext/lz4.h"
+-#include "flann/ext/lz4hc.h"
++#include <lz4.h>
++#include <lz4hc.h>
+ 
+ 
+ namespace flann
diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r3.ebuild
index f6ffdd259b22..e53d428ee73c 100644
--- a/sci-libs/flann/flann-1.9.1-r2.ebuild
+++ b/sci-libs/flann/flann-1.9.1-r3.ebuild
@@ -1,28 +1,29 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils cuda flag-o-matic toolchain-funcs
+inherit cmake cuda flag-o-matic toolchain-funcs
 
 DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces"
-HOMEPAGE="https://www.cs.ubc.ca/research/flann/"
+HOMEPAGE="https://github.com/mariusmuja/flann"
 SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc examples mpi openmp octave static-libs"
+IUSE="cuda doc examples mpi octave openmp"
 
 BDEPEND="
 	app-arch/unzip
 	doc? ( dev-tex/latex2html )
 "
 DEPEND="
+	app-arch/lz4:=
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
 	mpi? (
-		sci-libs/hdf5[mpi]
 		dev-libs/boost:=[mpi]
+		sci-libs/hdf5[mpi]
 	)
 	!mpi? ( !sci-libs/hdf5[mpi] )
 	octave? ( >=sci-mathematics/octave-3.6.4-r1 )
@@ -35,6 +36,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${P}-cmake-3.11{,-1}.patch # bug 678030
 	"${FILESDIR}"/${P}-cuda-9.patch
+	"${FILESDIR}"/${P}-system-lz4.patch # bug 681898
 )
 
 pkg_pretend() {
@@ -59,14 +61,13 @@ src_prepare() {
 		src/matlab/CMakeLists.txt || die
 	use cuda && cuda_src_prepare
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
 	append-cxxflags -std=c++11
 
-	# python bindings are split
-	# off into dev-python/pyflann
+	# python bindings are split off into dev-python/pyflann
 	local mycmakeargs=(
 		-DBUILD_C_BINDINGS=ON
 		-DBUILD_PYTHON_BINDINGS=OFF
@@ -84,12 +85,10 @@ src_configure() {
 	)
 	use doc && mycmakeargs+=( -DDOCDIR=share/doc/${PF} )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
-	if ! use static-libs; then
-		find "${D}" -name 'lib*.a' -delete || die
-	fi
+	cmake_src_install
+	find "${D}" -name 'lib*.a' -delete || die
 }
diff --git a/sci-libs/ignition-common/Manifest b/sci-libs/ignition-common/Manifest
new file mode 100644
index 000000000000..a5084845da21
--- /dev/null
+++ b/sci-libs/ignition-common/Manifest
@@ -0,0 +1,3 @@
+DIST ignition-common3_3.5.0.tar.gz 6984379 BLAKE2B decc26506544a58075583d302dbae30148bc22d750864bae3816722516a21d191dcdc5dc9376a026a103575d9489f038d3fc9e296c062c32ac076e9fea28d2ab SHA512 109161e55e51a6a37fb137f64e0cf3041c72bfc2030e3b8c09ecf9f81c57b3687a8a4d9e0142520fd9d0dfbf02cba2f123e01e9407ec046b0f134dbfdaf535f0
+EBUILD ignition-common-3.5.0.ebuild 897 BLAKE2B f0d432eb6533b2cc6e1240e0e2341bd66221cf969d7a964f1b9c8dde58c59fc1104fedabeb3d885df855af3131493b63db8b925c57d3751470b1f5ac0933f00f SHA512 d48c3ca95bfd843da3487e4c1ce4a4e94e13c1abd11e5d0a5c9d6cbf7a125a662524187d3facb03ee99622faaf577622a9a4dd5806672d5d97b567f7e4fea33e
+MISC metadata.xml 341 BLAKE2B a6b491b34a9e4da8c1bd10f5b3b6664285ed1b932794ea90bc64af8e3f9f33854bafadc9bd2e57ed5e2316f83955560db69a6f7563e2bb3ca779819e4bf0b787 SHA512 ca5f742e0946bc1186d91f90e723976cbf0b3fd23c1837b96d6dcc52420337dcb83529b311d7a21a22f2ac1593bd4f2e28d240f113bdafb5150e9c379156e0a8
diff --git a/sci-libs/ignition-common/ignition-common-3.5.0.ebuild b/sci-libs/ignition-common/ignition-common-3.5.0.ebuild
new file mode 100644
index 000000000000..c2bbe8a822a9
--- /dev/null
+++ b/sci-libs/ignition-common/ignition-common-3.5.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+inherit cmake-utils
+
+IGN_MAJOR=3
+
+DESCRIPTION="Set of libraries designed to rapidly develop robot applications"
+HOMEPAGE="https://ignitionrobotics.org/libs/common https://github.com/ignitionrobotics/ign-common"
+SRC_URI="https://github.com/ignitionrobotics/ign-common/archive/${PN}${IGN_MAJOR}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="${IGN_MAJOR}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-libs/tinyxml2:=
+	sci-libs/ignition-math:6=
+	sys-apps/util-linux
+	media-libs/freeimage:=
+	sci-libs/gts:=
+	media-video/ffmpeg:0=
+"
+DEPEND="${RDEPEND}
+	dev-util/ignition-cmake:2"
+BDEPEND="
+	dev-util/ignition-cmake:2"
+
+S="${WORKDIR}/ign-common-${PN}${IGN_MAJOR}_${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DBUILD_TESTING=OFF"
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-libs/ignition-common/metadata.xml b/sci-libs/ignition-common/metadata.xml
new file mode 100644
index 000000000000..c3e61fabcf50
--- /dev/null
+++ b/sci-libs/ignition-common/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ignitionrobotics/ign-common</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/ignition-fuel-tools/Manifest b/sci-libs/ignition-fuel-tools/Manifest
new file mode 100644
index 000000000000..f6f27dbed037
--- /dev/null
+++ b/sci-libs/ignition-fuel-tools/Manifest
@@ -0,0 +1,3 @@
+DIST ignition-fuel-tools4_4.1.0.tar.gz 451260 BLAKE2B aef6b1ca08e0d0c2099593c5d13842c5f73b6f041aea23aae57cc563ec624139331c45012f044212a53dfe82bfab6316caa51896785dd7e905c0950b3b91ca93 SHA512 7116460749870968508a0368435edfcc28f54128b2def0d93fa48e6f6ac961d27e0f0ff52ff70979ee4e626ee4cc0d5b421180487c1973ed844a1b16479466d3
+EBUILD ignition-fuel-tools-4.1.0.ebuild 939 BLAKE2B 5960c084392dfc7efa8e7b3c2f42c20a4092f4cb63a59857740b261bb5a4aee16a35d337bdb9cb6d42277486d4bf38fb0d4eaa98d8df421856070457aa712d8c SHA512 d5edf4ee691475cf5f33ae5d8ae3f0b17b1d9474b6582074c26e80556f7245eb261794ecd8b67ca370f87bcea6f0008f7279f359eb61e6cd85ee3270d0899a77
+MISC metadata.xml 345 BLAKE2B 4d36d3550c362906a0ac3c9c3a982af9225f67c9302d960ceec5f7e22ab7171759ca30f9316b3382ba0393a2ea815dbc55dbf1c2e6f088e24daa0b2e1d18c669 SHA512 24462ba3a87e46b012bf22476afc5f130ffa1c89394d905fa104a26d51f8f7cb7a7fd5ac065d5ad2207bc6d8e2a885d87ac5cfeb13a538018a43dcc5eefb608d
diff --git a/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0.ebuild b/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0.ebuild
new file mode 100644
index 000000000000..1a7dd11d3928
--- /dev/null
+++ b/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+inherit cmake-utils
+
+IGN_MAJOR=4
+
+DESCRIPTION="Classes and tools for interacting with Ignition Fuel"
+HOMEPAGE="https://ignitionrobotics.org/libs/fuel_tools https://ignitionrobotics.org/libs/fuel_tools"
+SRC_URI="https://github.com/ignitionrobotics/ign-fuel-tools/archive/${PN}${IGN_MAJOR}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="${IGN_MAJOR}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/tinyxml2:=
+	net-misc/curl:=
+	dev-libs/jsoncpp:=
+	dev-libs/libyaml:=
+	dev-libs/libzip:=
+	sci-libs/ignition-common:3=
+	net-libs/ignition-msgs:5=
+"
+#igncurl
+DEPEND="${RDEPEND}
+	dev-util/ignition-cmake:2"
+BDEPEND="
+	dev-util/ignition-cmake:2"
+
+S="${WORKDIR}/ign-fuel-tools-${PN}${IGN_MAJOR}_${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DBUILD_TESTING=$(usex test)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-libs/ignition-fuel-tools/metadata.xml b/sci-libs/ignition-fuel-tools/metadata.xml
new file mode 100644
index 000000000000..b0a55265c08d
--- /dev/null
+++ b/sci-libs/ignition-fuel-tools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ignitionrobotics/ign-fuel-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/ignition-math/Manifest b/sci-libs/ignition-math/Manifest
index 697ae3ec174a..9143d2ede7aa 100644
--- a/sci-libs/ignition-math/Manifest
+++ b/sci-libs/ignition-math/Manifest
@@ -1,3 +1,6 @@
+AUX includes.patch 361 BLAKE2B 08417f2e2e3a39f03d714952fc1a5aa7eb73e42783d5d2db631d6406e1644d74e99c3f42eb0424d96dfea808e25c3902b5fb5f31a5c3108860ead1434fe82de5 SHA512 497ca00f1250b4d8dcbf5031ddfdd3c82c8bb6e8ab8c2735c3f32233b8840cdc1195a41be1fc5c5dff4a5d2b385c01f6f31302b8c8edb44e9ef50f3c2a0ea566
 DIST ignition-math4_4.0.0.tar.bz2 387717 BLAKE2B 1b19bcd377eb18b616a300e022419ba2651795e04c0f0a3769f565e6febdc1a37f321c81730e1c13c9f9b17f35e6cf558d1129b278b2477ec8d5a5f46b927d66 SHA512 4815c6222945fd228b2d23c9da7ad8876f8ba1fea382312e1eb320819ec5d8bbf637095c18dbe2413184bbea77040bd1a5492ea9427355fc5e62f6169277530e
+DIST ignition-math6_6.4.0.tar.gz 515870 BLAKE2B d975edfa2e23560784adef1d66e7613c822a65bcc8b20d33aa030a570fdf3b19043eb6750e93728f2ff5e8ee14ab047a1420bf9991ea6519ec7399235e262ba1 SHA512 8a6e672ef6de591d25200f288deaaa16cc43e3c90804ee5ead0f06345036afbfa40acb531eb5b6a1fa80bd34c0c5964662cc0659d8bed2c811ad7c776d6f77cb
 EBUILD ignition-math-4.0.0-r1.ebuild 574 BLAKE2B 8c5a200993a7b60fca7b899c7df9986c91f4f378eccf710f123869bdca2c58ef78ade67e513b78c0fb2418cd802bab708392bfda8cb247e01e67241911880e50 SHA512 3b6bf6e3089ce46f58352ae80585235189494cc07dc3f4dfccca791d03de21e59e3594bd0be3b05e57555279435642d80569c98ce2804ea4e456f91de9a55cf2
+EBUILD ignition-math-6.4.0.ebuild 646 BLAKE2B bcaa0ba230e6eb06c3445e2e28322b9566ddb696928f0960a5a9099a8af53bb7f45b548cb52588a29354dc210b2d3017096be60adc11f5399571161aea1d4789 SHA512 253da2badb6af48281f51e3c077da259df7ce603833719d91e6f7e24849ea5102383003755f4db29a19f0bb1cc6a3072e31a38f940d10cc0a23737c8fc4ccb7e
 MISC metadata.xml 342 BLAKE2B 6b306ac4d7ec4a09c238f7b8c048589b7937b8a1e1e0573658ece2217054cb8a47da6e77d75439472dce378a4f4b1390ce8517352aa486db323a594f2a576131 SHA512 8969e6c2df55cfae7cc21640498871d7049499d146d06b13057701e742e9ef6f2c5124acd144b9e7f0974ea39032e89402252e32192242697555c64d90eb4b4a
diff --git a/sci-libs/ignition-math/files/includes.patch b/sci-libs/ignition-math/files/includes.patch
new file mode 100644
index 000000000000..5d7750bcec9a
--- /dev/null
+++ b/sci-libs/ignition-math/files/includes.patch
@@ -0,0 +1,12 @@
+Index: ignition-math6_6.4.0/src/RollingMean.cc
+===================================================================
+--- ignition-math6_6.4.0.orig/src/RollingMean.cc
++++ ignition-math6_6.4.0/src/RollingMean.cc
+@@ -17,6 +17,7 @@
+ 
+ #include <numeric>
+ #include <deque>
++#include <limits>
+ #include "ignition/math/RollingMean.hh"
+ 
+ using namespace ignition::math;
diff --git a/sci-libs/ignition-math/ignition-math-6.4.0.ebuild b/sci-libs/ignition-math/ignition-math-6.4.0.ebuild
new file mode 100644
index 000000000000..e4620e3360bb
--- /dev/null
+++ b/sci-libs/ignition-math/ignition-math-6.4.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+inherit cmake-utils vcs-snapshot
+
+DESCRIPTION="A small, fast, and high performance math library for robot applications"
+HOMEPAGE="https://ignitionrobotics.org/libraries/math"
+SRC_URI="https://github.com/ignitionrobotics/ign-math/archive/${PN}6_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="6/6"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+	dev-util/ignition-cmake:2"
+BDEPEND="
+	dev-util/ignition-cmake:2"
+
+S="${WORKDIR}/${PN}6_${PV}"
+PATCHES=( "${FILESDIR}/includes.patch" )
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index cc642b6718a9..901c89337803 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,7 +1,7 @@
 DIST indilib-1.7.5.tar.xz 1380436 BLAKE2B 092f4100894218bf749ee0d7c910c4ee20026cf471f4f65686b67dd37a924b448b6de3733e70d7047dca6a77fd8ae26b9a568f8249336be78d052984838a2ccf SHA512 57205ed9ea9d8e8215886b17d9f0307755bca571d599967dc607320fad5ec62096f31526280f3b184ffeb0434d9adb71e65a7d6f89d29edaa643d729765f47a8
 DIST indilib-1.8.3.tar.gz 2062250 BLAKE2B f46b557dfbbe16070605ad638111505577b801ac6abc2cf42df3a322eaec35a25e6f8efe3ea740b5758b3aeadd656efb4b98e284d531621ab34ca00f28e39a2e SHA512 09c23299659efea795ec430566a5b51181878c382c72f1e530ef3abe3b996b670506f6f5f1bca4eb88fbdc756854c3a36d8bd646a2cf13e397e09ace1f1af044
-DIST indilib-1.8.4.tar.gz 2097437 BLAKE2B d5c6d14032c073c24bc4357dad5bb88fe08b76554878cabc5afaae41ff58165e7f2b57cf972207b47b2003e53eafb73f15925548912e72f590c0647b4a960a9a SHA512 32b5b21e3a5e797fd203abccaca4ca259fb74dcc6b7695e67c55b1d614b562aa2ec735afeb9bfb0e159099def6fb8160023e0dbef45fa61a1a04bab86c99998d
+DIST indilib-1.8.5.tar.gz 2122866 BLAKE2B 203b6c78664aaf3f87b7f697b76544e6ed0fa6db8ac0fe43e6ebcf00de404e96a49b8cd7f8b0be2e4ff5c7f902b3e34177a244a4a49069887f11d28aea073620 SHA512 4c583f7ff0d96d787c7d035e23074f42db3f836ec74a0a7a1595574ae2d32d56234b16abddabacaf9bd5a10cb88c6c37994aafcef86d65a665b2bceae87446f9
 EBUILD indilib-1.7.5.ebuild 1120 BLAKE2B 70e19ee186e7b74d01430d4fafd2fb15d3850666b519051fa2ab97612fd01180b39e5c37d697d8d2508166ad769b41422f9d4e7e7f0789c1059641d5ee77e40d SHA512 f33e4268c4837c2df6b64bb79abd11479001e9fd9abde0c5357751a014522b37d48878a8f72628e56915487c72b7805ab7c5dd01f61a21c47407a4cda8a00a27
 EBUILD indilib-1.8.3.ebuild 1180 BLAKE2B 57212e677b51f57427debdaa8b1e0eea4f6fb26fba8368b7e2f1e5f4c8d2165406f5a11c17970bd6706782684da9456a4dfb9edf1fec4c8bcf6fbc48cc010a56 SHA512 0ea6c402a6ff57a589f4f3309746de7e1b69c3180d3a12265ffc20ff361f53638eedb0caedee8cec7b3fabc0aeaa573c2998444bb696eb8bc08862e91768cf3c
-EBUILD indilib-1.8.4.ebuild 1182 BLAKE2B 72992e4b51b92d044bb0d95ee05d5e9ee23c8cd5bc375df999b5166e5a6241150545cd6ed1de5281833a6218ed3ece509d9e907b1d439016d4d15f4d68578643 SHA512 a5a3f070a4cb27c38108b7adb2a58652d470e0d1880fd4a4381eca74ea0e4d08f8917604748cc5c7de37fd551a18f7bfec2904b58c6132c90b883678b6090a8d
+EBUILD indilib-1.8.5.ebuild 1182 BLAKE2B 72992e4b51b92d044bb0d95ee05d5e9ee23c8cd5bc375df999b5166e5a6241150545cd6ed1de5281833a6218ed3ece509d9e907b1d439016d4d15f4d68578643 SHA512 a5a3f070a4cb27c38108b7adb2a58652d470e0d1880fd4a4381eca74ea0e4d08f8917604748cc5c7de37fd551a18f7bfec2904b58c6132c90b883678b6090a8d
 MISC metadata.xml 460 BLAKE2B b6ebdd49fefcbbb015e5856f0ad42682b5eda153b38b3d64f949d2c41274df269f292f25d5eb3be37a7acb039bab2d3d3b7744cfe7959472fe03425b53bd4282 SHA512 ff04501f56765165645695dda25db6bff677a6f676d3fa1d005ec0bc6fae7413e0fdd87d800b321fdd7a98f1d0cc829daa5a3d4d3bff849b6e164a5768c79c84
diff --git a/sci-libs/indilib/indilib-1.8.4.ebuild b/sci-libs/indilib/indilib-1.8.5.ebuild
index c0ffca05006a..c0ffca05006a 100644
--- a/sci-libs/indilib/indilib-1.8.4.ebuild
+++ b/sci-libs/indilib/indilib-1.8.5.ebuild
diff --git a/sci-libs/klu/Manifest b/sci-libs/klu/Manifest
index e73ace0a33b4..35489902da5d 100644
--- a/sci-libs/klu/Manifest
+++ b/sci-libs/klu/Manifest
@@ -1,5 +1,5 @@
 DIST klu-1.2.1.tar.bz2 612428 BLAKE2B 807bfc56deb5c4cbefd2f6c118cd8e929ba9b02d9b88e8eee8b9443991f16a2a3e9b4e1fa888b2b6e450aeda9fc4d12d6a5480f9f25bf366312f57cd8f380af0 SHA512 2837ade61596b5e738d0dd16a5486fd2b0089ec9ddeae4fa3b2c3671de6637c7cf2d55e44c0103c9393caa3f046039a76d9abc5b8094d236523db0c58cc58b70
 DIST klu-1.3.9.tar.bz2 635596 BLAKE2B 6c6c84cf1b30e78cbaaee6bebed21c806d1672bee5f7ea061e7ef057ff56fd456e8517ca2ff1018a14ebcbc8f96b9e87989e22d8996817394666e6d8d2d727dd SHA512 b7fd862fe8443596758c27f9c918e367b3b3816340836e74cf8d97a2e755fbe07d133778eea3d054bc70243fa15c2bd71f4fd90c1179879661ba2d624b8f0706
 EBUILD klu-1.2.1.ebuild 656 BLAKE2B 53d38f9b4a6b80b98c50a0eecf85ce3e0eb6ffa65134ef68d7c7b67c1ea1f402f11f8870f1a1720b9583c79c952c7820eae652ecd3ebf9bb399fa7f2d20c27fa SHA512 2e0dbdfb47e311c4f537aa9e064e2a383b5aa783b67c3ece14023b88512167bc9f897f707129d6a57de207152804d80e181398b7ca17ebd7a7e20985672fd717
-EBUILD klu-1.3.9.ebuild 632 BLAKE2B c938185e332a7ad65903b2ec144ae8dd91c767b120cf3e99ac5ed2a3ba5ddc289bc648bcfd1c1d54f274ae94c63ec2fc756337102fe703d805d4184b37b82623 SHA512 fab7e0927e51b2d4fe24c7755a360683150edf3a5a7ae41dc225e32a716c6ace209a9144326d4cbc319c2ce3aedd2d4fabcf521ff6faeb9b23c822a814a9b516
+EBUILD klu-1.3.9.ebuild 645 BLAKE2B ce3bd69512dea6bc4afb5f0ea3bca390a2fbac4ac03bd76389fb33c1a8c69604752150a0c36d498db35f7bae2a812eaf93d2a8073c95d3f4454b53c00f47ad33 SHA512 47a63ca14063291a78a73688d29b9c7be4d9da51f4de705c1fb045e859db62ef5282fdf2140d397da224ffe3b228d4e57e391677aa413a67f71b3bda1016e4e9
 MISC metadata.xml 460 BLAKE2B f4d619f68a16bcbaaf2b44a9fd1156cc88dd02d38609da2e56f8b242df9744fbbe4b7befff2ae34f084b5895ab9a537e62182015008e596fddda33ea891698b5 SHA512 1e01a7e6576552beac665a8a0affe21809785f33316767ef6e0bcc59dd019e5100f1ed16ca1bd91ee1daf102de2122ed57ff0980dd6b4f21270f8c4c5f832db7
diff --git a/sci-libs/klu/klu-1.3.9.ebuild b/sci-libs/klu/klu-1.3.9.ebuild
index 4c02aca283bf..42c4aa31b6d3 100644
--- a/sci-libs/klu/klu-1.3.9.ebuild
+++ b/sci-libs/klu/klu-1.3.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index fdb64f5cd4ea..1846f5710017 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,4 +1,4 @@
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
 EBUILD lapack-3.8.0-r1.ebuild 3018 BLAKE2B 6db2da7db3213d7899b2becf2eebf348443d0730b5e3277545380aafdbc93bab9b75d5fa398e1daa7a4b4ed9740bb93138d3206c37ea6df89bc11b1e5d610cc4 SHA512 4e7762e8298aa856aeadb5496d578efcdef2b2ee3163b8ac8ad5423746a8a878475aa9629912bb2ddf00ebb81be68f4a0f2a67a098a052420dd1824a3d19fe6f
-EBUILD lapack-3.8.0.ebuild 2961 BLAKE2B 3dc6ec8426220f56b7d3df421bbfb9bb667121a8972b3b54ca6c299d45a78becd893d3d5567b09fc10f1846fce4842799624237c7194711c648c6d900afd49c5 SHA512 704b45f86f862c69ab68a6b6ec7f1ff610a64a662f6939dc18bbbb441b4b51e928a67a7b985bf835193e3add85f9d9a408ab86fdb47a4e3730be95156c02c77b
+EBUILD lapack-3.8.0.ebuild 2960 BLAKE2B 8e5bf248f8b35220f9c0f342cd346d13768903c085ac1cd0f50031c9c119aedf10be81c0dfafe3759b91dd7d4033728160c0b54ff108931426b7eeb5ad773464 SHA512 5e2d5833d072d1e66c9d36dbc0d3ad4f27a8032e8dd5ca2b9d535bdd1dac9d69d63968eb7b0654a21cb80ce72f0cf6c2ec61f09bbc9caeae732784f8e8619149
 MISC metadata.xml 1490 BLAKE2B bcb933b7cc3c3ae6f33e7c8ae9ef12475477ecd3351901cfba5dc955430def35df18e5ab41624cb99f2c1551fc38153138195e4e95ab40d3cf92e5685ce68fc5 SHA512 a99af3086d63488e7a2b8cda2f3727ce31eb0e62dd75a9cf64e44a203068866a06c7d6e119665e663c49a1afccb7a70982fd831735d958b73b6dcdf52c8ef5b1
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
index 00c22e49a877..3167f4c22b5e 100644
--- a/sci-libs/lapack/lapack-3.8.0.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lapacke doc eselect-ldso"
 # TODO: static-libs 64bit-index
 
diff --git a/sci-libs/liborigin/Manifest b/sci-libs/liborigin/Manifest
index eac5f8b29a66..11d8ea4e43a6 100644
--- a/sci-libs/liborigin/Manifest
+++ b/sci-libs/liborigin/Manifest
@@ -1,3 +1,7 @@
-DIST liborigin2-20110829.zip 158364 BLAKE2B fb6902142fe20bd29c8f3dd4c6d0c77b6f94e66f082c6950809367a4049adc1092a5e1abc2705670a15a32d1d680c14fc05061d34d422cd55689bb778ee47fde SHA512 d0e4013a686fbc61c58b1f39e98aace91978bcadffbb2ef9d32576a3b2f19cc2443d595da2d3ecc19298ec6e29c20717db94e1fda6a64d71f3763841228a01c0
-EBUILD liborigin-20110829-r1.ebuild 1181 BLAKE2B 4cfd8ff280f87fca3ce4e7694b53e68651350f91146a133378d12c93e3de134b18eb1039f92b1ec4bf7d674b427c358858e1498e7f69233d14018df66c8c7577 SHA512 aad74ef776c84779083810f0a897983409d67f3036e7d2e56f888c1a95ac4e75f02f2a0ff8c72165af57fb700513873114c86ad8b78316043be2cbfc5428f1ba
-MISC metadata.xml 344 BLAKE2B d186e3d34368240a8e4657f548d1c3e75b0d6efd7f6e185bd5dcabf2bbd42dbfdc6c65940cb9174eea3807b5e409018afc9dc4e2822ae880c0bfba70f53c01c8 SHA512 b673614f7818521f487094df5b41a804e9e3b8cce6bfe3166b64efed3230dbdf46ef8a0d3742ccef1039bf04e6ed76b20dfe168d29a620a270b6524b18735807
+AUX liborigin-3.0.0-buildsystem.patch 5563 BLAKE2B c9905687284e0a81b504d765ff237bc89c0023816c7ac1a8636971ff43db62d894b3add5d5d3427966ff627125fbd524240d2fa3f9da716c221d87dc83eb44d0 SHA512 2d63a85c22f86a30b11414712c0d7b4871332e83c81a1995cb8efb8cfd717ab15747ab70f178808b8191379bc49b1f0219f87f0112c97e51d044d1f454fd6e75
+AUX liborigin-3.0.0-missing-header.patch 978 BLAKE2B 717a5bc981d5695688a5ae588c87da7501fa97e76fc8df4a71da57021d75a8e33c8696ea9ef606854a8943431debc0fcb998913f4d09ddd7833e6c7029ad83b0 SHA512 d515977558b0938a0d0453a6c1e4c9c506a7cafeeac39cc881d748ca3d8ff0e6153f8552b2efd5f2c0e478bf8b2075fc225bfc1d0b9f4542c3b6848918e88203
+AUX liborigin-3.0.0-no-exit-calls.patch 2452 BLAKE2B d635890d02f2605d52b869e09522bbb2aae9062eee9403c0f6e9639620229f983dc1031301d926617b63dbfa8cb0c163988119cf17b82db1786425499efe56bf SHA512 db491659f27168c2a4ce27517abcf5464fdc75ca9356500dde7a22987f5a766015e843c1b0c0b4f3d9bbf74c53d7b840a9aab64090173c2433e1176eefc816ec
+AUX liborigin-3.0.0-no-standard-streams.patch 7649 BLAKE2B 2f9c933d2d6ee65477ac0e23ad317d3b569bfe4eb37876c954501b93cf17be67cd1f3070724762a30c9bc1f9687880a5f5da8513e3cce4e2ae365ec1401c9123 SHA512 31f64c5a9c7156d19f2109be2768e4bae24b0547416da372b4c7dac24fbe6a026c3767372f778823f053af1bd4a2b85160457ebb101f06c22e2add4e15bb1d04
+DIST liborigin-3.0.0.tar.gz 156736 BLAKE2B 1c1fda3fc3ad47394b65637a808eca1ecf4cff19eb49de0811e50d395c3b7759f8ec19c680ed83f7a8191022aa17b4ba1211baa6ea16a48a5153736d9138ed5c SHA512 1cf00ec33a90b4baede0cd3b2a3e6d78ca4810511c6be58c4d1cce12e7e1001752422fe2ddbca80cd9016b91c5321eca1ab43606ace3acc21955a034ebc4094c
+EBUILD liborigin-3.0.0.ebuild 1205 BLAKE2B 798155fe1038866179902f488192429ac9543bbc8504a3939a8e795fea8498f60157626f2b01748b4e0fcf3b843261004da7fba4695de618b3117fb1430ca7ab SHA512 8bf0e3b0801b6381b0fb50cc4923f357e88c8103f4003aa22c926f38a5c3abf37ecd366fbc1cf9001c45f96a140268dca438903b4bba822eb4e5c17e398ada34
+MISC metadata.xml 330 BLAKE2B 1327fe176e03cb3f671b64e5a20efbabb375773c4c3633367feef929feeca52c835fb313a7cb315fb96d29f38ec26c6144f41af43b83957a22ba9a3ddd420bb8 SHA512 1eabc021a57d8928ca58b415f906293576c225aedb9f5fc88f8ad247d2a08a9e16650b2693cee1636d011b3f03cdf1255f125feb8f8fb7f55413baf1d519a6be
diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch b/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch
new file mode 100644
index 000000000000..d8444dedafed
--- /dev/null
+++ b/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch
@@ -0,0 +1,166 @@
+From a751f00ebba9fa226860ed4e2c1ae5fa35622e89 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 20 May 2020 22:33:08 +0200
+Subject: [PATCH 1/4] Don't install bundled tree.hh
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 17c613b..a6b4b8a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,6 @@ set (devel-headers
+ 	OriginObj.h
+ 	OriginFile.h
+ 	OriginParser.h
+-	tree.hh
+ 	)
+ 
+ # LIB_SUFFIX can either be defined at cmake command line: cmake -DLIB_SUFFIX:STRING=64 ...
+-- 
+2.26.2
+
+
+From 0b4fa1ce0946bc293d798484c609c6a7ac5ab50a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 20 May 2020 22:35:02 +0200
+Subject: [PATCH 2/4] No static target, compile opj2dat against the shared lib
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a6b4b8a..6f2d87b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,22 +52,16 @@ set_target_properties(origin PROPERTIES
+ 	VERSION ${LIBORIGIN_VERSION_MAJOR}.${LIBORIGIN_VERSION_MINOR}.${LIBORIGIN_VERSION_BUGFIX}
+ 	SOVERSION ${LIBORIGIN_VERSION_MAJOR} )
+ 
+-# static library
+-add_library (origin-static STATIC ${sources})
+-set_target_properties(origin-static PROPERTIES OUTPUT_NAME "origin" POSITION_INDEPENDENT_CODE ON)
+-
+ # inform on log setting
+ if (DEFINED GENERATE_CODE_FOR_LOG)
+     message("File parsing will be logged.")
+     target_compile_definitions(origin PRIVATE GENERATE_CODE_FOR_LOG=${GENERATE_CODE_FOR_LOG})
+-    target_compile_definitions(origin-static PRIVATE GENERATE_CODE_FOR_LOG=${GENERATE_CODE_FOR_LOG})
+ else()
+     message("File parsing will NOT be logged. Define GENERATE_CODE_FOR_LOG to activate logging.")
+ endif ()
+ 
+ # install libraries
+ install(TARGETS origin DESTINATION lib${LIB_SUFFIX} OPTIONAL)
+-install(TARGETS origin-static DESTINATION lib${LIB_SUFFIX} OPTIONAL)
+ 
+ # install headers
+ install(FILES ${devel-headers} DESTINATION include/liborigin)
+@@ -77,7 +71,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION lib${LIB_SUFF
+ 
+ # command line util
+ add_executable(opj2dat opj2dat.cpp)
+-target_link_libraries (opj2dat origin-static)
++target_link_libraries (opj2dat origin)
+ 
+ install(TARGETS opj2dat DESTINATION bin OPTIONAL)
+ 
+-- 
+2.26.2
+
+
+From 5f4c497408a6f144e581dd17fb3e49963e8b6b2b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 20 May 2020 22:43:52 +0200
+Subject: [PATCH 3/4] Don't install README COPYING etc., distro package does
+ that
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6f2d87b..4fc16e0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,7 +76,6 @@ target_link_libraries (opj2dat origin)
+ install(TARGETS opj2dat DESTINATION bin OPTIONAL)
+ 
+ # documentation
+-install(FILES COPYING FORMAT README DESTINATION share/doc/liborigin OPTIONAL)
+ configure_file(doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+ find_package(Doxygen)
+ if(DOXYGEN_FOUND)
+-- 
+2.26.2
+
+
+From bb554d88b78e7575c04cf3e79098f35b776c3878 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 20 May 2020 22:47:22 +0200
+Subject: [PATCH 4/4] Drop 'OPTIONAL' from install targets, add ENABLE_TOOLS
+ option
+
+I've never seen an optional install of library.
+ENABLE_TOOLS takes care of the binary.
+Doxygen is already optional.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4fc16e0..1759eee 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,6 +9,8 @@ set(LIBORIGIN_VERSION_MAJOR 3)
+ set(LIBORIGIN_VERSION_MINOR 0)
+ set(LIBORIGIN_VERSION_BUGFIX 0)
+ 
++option(ENABLE_TOOLS "Install opj2dat command line util" ON)
++
+ # compile-time configuration variables to be linked in
+ configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+@@ -61,7 +63,7 @@ else()
+ endif ()
+ 
+ # install libraries
+-install(TARGETS origin DESTINATION lib${LIB_SUFFIX} OPTIONAL)
++install(TARGETS origin DESTINATION lib${LIB_SUFFIX})
+ 
+ # install headers
+ install(FILES ${devel-headers} DESTINATION include/liborigin)
+@@ -70,10 +72,12 @@ install(FILES ${devel-headers} DESTINATION include/liborigin)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ 
+ # command line util
+-add_executable(opj2dat opj2dat.cpp)
+-target_link_libraries (opj2dat origin)
++if(ENABLE_TOOLS)
++    add_executable(opj2dat opj2dat.cpp)
++    target_link_libraries (opj2dat origin)
+ 
+-install(TARGETS opj2dat DESTINATION bin OPTIONAL)
++    install(TARGETS opj2dat DESTINATION bin)
++endif()
+ 
+ # documentation
+ configure_file(doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+@@ -82,5 +86,5 @@ if(DOXYGEN_FOUND)
+ 	add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+ 		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ 	set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/html)
+-	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/liborigin OPTIONAL)
++	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/liborigin)
+ endif(DOXYGEN_FOUND)
+-- 
+2.26.2
+
diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-missing-header.patch b/sci-libs/liborigin/files/liborigin-3.0.0-missing-header.patch
new file mode 100644
index 000000000000..162dd93c3c5e
--- /dev/null
+++ b/sci-libs/liborigin/files/liborigin-3.0.0-missing-header.patch
@@ -0,0 +1,38 @@
+From 78da3c4456cef15c91b5e5fcc1e82ca2364ea654 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 20 May 2020 22:28:21 +0200
+Subject: [PATCH] Add missing header
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ OriginAnyParser.cpp | 1 +
+ opj2dat.cpp         | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
+index 07a619e..c90f6e4 100644
+--- a/OriginAnyParser.cpp
++++ b/OriginAnyParser.cpp
+@@ -22,6 +22,7 @@
+ #include "OriginAnyParser.h"
+ #include <sstream>
+ #include <cinttypes>
++#include <iostream>
+ 
+ /* define a macro to get an int (or uint) from a istringstream in binary mode */
+ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+diff --git a/opj2dat.cpp b/opj2dat.cpp
+index 230ac84..67b0815 100644
+--- a/opj2dat.cpp
++++ b/opj2dat.cpp
+@@ -31,6 +31,7 @@
+ #include <cmath>
+ #include <fstream>
+ #include <sstream>
++#include <iostream>
+ #include <string>
+ 
+ using namespace std;
+-- 
+2.26.2
+
diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-no-exit-calls.patch b/sci-libs/liborigin/files/liborigin-3.0.0-no-exit-calls.patch
new file mode 100644
index 000000000000..44b56a296fde
--- /dev/null
+++ b/sci-libs/liborigin/files/liborigin-3.0.0-no-exit-calls.patch
@@ -0,0 +1,89 @@
+From a8b25b489b48086e2616df98688969f89e63fa69 Mon Sep 17 00:00:00 2001
+From: Miquel Garriga <gbmiquel@gmail.com>
+Date: Fri, 23 Nov 2018 00:15:04 +0100
+Subject: [PATCH] Remove exit() calls
+
+---
+ OriginFile.cpp | 15 ++++++++++-----
+ OriginFile.h   |  2 +-
+ opj2dat.cpp    |  2 ++
+ 3 files changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/OriginFile.cpp b/OriginFile.cpp
+index f6c41b4..bcdcccb 100644
+--- a/OriginFile.cpp
++++ b/OriginFile.cpp
+@@ -33,14 +33,15 @@
+ #include <string>
+ 
+ OriginFile::OriginFile(const string& fileName)
+-:	fileVersion(0)
++:	fileVersion(0), ioError(0)
+ {
+ 	ifstream file(fileName.c_str(), ios_base::binary);
+ 
+ 	if (!file.is_open())
+ 	{
+-		cerr <<  "Could not open " << fileName.c_str() << "!" << endl;
+-		exit(EXIT_FAILURE);
++		cerr << endl << "liborigin: " << strerror(errno) << ": " << fileName.c_str() << endl;
++		ioError = errno;
++		return;
+ 	}
+ 
+ #ifdef GENERATE_CODE_FOR_LOG
+@@ -48,8 +49,9 @@ OriginFile::OriginFile(const string& fileName)
+ 	logfile = fopen("./opjfile.log", "w");
+ 	if (logfile == nullptr)
+ 	{
+-		cerr <<  "Could not open opjfile.log !" << endl;
+-		exit(EXIT_FAILURE);
++		cerr << endl <<  "liborigin: " << strerror(errno) << ": opjfile.log" << endl;
++		ioError = errno;
++		return;
+ 	}
+ #endif // GENERATE_CODE_FOR_LOG
+ 
+@@ -152,10 +154,13 @@ OriginFile::OriginFile(const string& fileName)
+ 	fclose(logfile);
+ #endif // GENERATE_CODE_FOR_LOG
+ 	parser.reset(createOriginAnyParser(fileName));
++	ioError=0;
+ }
+ 
+ bool OriginFile::parse()
+ {
++	if (ioError != 0)
++		return false;
+ 	parser->buildVersion = buildVersion;
+ 	parser->fileVersion = fileVersion;
+ 	return parser->parse();
+diff --git a/OriginFile.h b/OriginFile.h
+index 80b6ff2..3a49395 100644
+--- a/OriginFile.h
++++ b/OriginFile.h
+@@ -70,7 +70,7 @@ public:
+ 	string resultsLogString() const;													//!< get Results Log
+ 
+ private:
+-	unsigned int fileVersion, buildVersion;
++	unsigned int fileVersion, buildVersion, ioError;
+ 	unique_ptr<OriginParser> parser;
+ };
+ 
+diff --git a/opj2dat.cpp b/opj2dat.cpp
+index ff53309..230ac84 100644
+--- a/opj2dat.cpp
++++ b/opj2dat.cpp
+@@ -54,6 +54,8 @@ int main(int argc, char *argv[]) {
+ 	OriginFile opj(inputfile);
+ 	int status = opj.parse();
+ 	cout << "Parsing status = " << status << endl;
++	if (! status)
++		return -1;
+ 	cout << "OPJ PROJECT \"" << inputfile.c_str() << "\" VERSION = " <<  opj.version() << endl;
+ 
+ 	cout << "number of datasets     = " << opj.datasetCount() << endl;
+-- 
+2.26.2
+
diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-no-standard-streams.patch b/sci-libs/liborigin/files/liborigin-3.0.0-no-standard-streams.patch
new file mode 100644
index 000000000000..227ce7b14d5e
--- /dev/null
+++ b/sci-libs/liborigin/files/liborigin-3.0.0-no-standard-streams.patch
@@ -0,0 +1,210 @@
+From 6cb6d9b328195e11c1f168f6e4b915b522c7089f Mon Sep 17 00:00:00 2001
+From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
+Date: Wed, 15 May 2019 23:16:09 +0200
+Subject: [PATCH 1/3] do not output to standard streams (cout,
+ cerr) by default
+
+it might be better to hide all such usage behind #ifdefs,
+since the streams might not belong to the shared library
+
+provided by Ivan Krylov (Ropj)
+---
+ OriginAnyParser.cpp | 11 +++++------
+ OriginAnyParser.h   |  2 +-
+ OriginFile.cpp      |  2 --
+ 3 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
+index d45026b..ff7b8f7 100644
+--- a/OriginAnyParser.cpp
++++ b/OriginAnyParser.cpp
+@@ -756,7 +756,7 @@ void OriginAnyParser::readProjectTree() {
+ 
+ 	// log info on project tree
+ #ifdef GENERATE_CODE_FOR_LOG
+-	outputProjectTree();
++	outputProjectTree(cout);
+ #endif // GENERATE_CODE_FOR_LOG
+ 
+ 	return;
+@@ -2835,7 +2835,6 @@ void OriginAnyParser::getColorMap(ColorMap& cmap, const string& cmapdata, unsign
+ 	// check we have enough data to fill the map
+ 	unsigned int minDataSize = cmoffset + 0x114 + (colorMapSize+2)*0x38;
+ 	if (minDataSize > cmapdatasz) {
+-		cerr << "WARNING: Too few data while getting ColorMap. Needed: at least " << minDataSize << " bytes. Have: " << cmapdatasz << " bytes." << endl;
+ 		LOG_PRINT(logfile, "WARNING: Too few data while getting ColorMap. Needed: at least %d bytes. Have: %d bytes.\n", minDataSize, cmapdatasz)
+ 		return;
+ 	}
+@@ -2988,15 +2987,15 @@ void OriginAnyParser::getProjectFolderProperties(tree<ProjectNode>::iterator cur
+ 	(*current_folder).modificationDate = doubleToPosixTime(modificationDate);
+ }
+ 
+-void OriginAnyParser::outputProjectTree() {
++void OriginAnyParser::outputProjectTree(std::ostream & out) {
+ 	size_t windowsCount = spreadSheets.size()+matrixes.size()+excels.size()+graphs.size()+notes.size();
+ 
+-	cout << "Project has " << windowsCount << " windows." << endl;
+-	cout << "Origin project Tree" << endl;
++	out << "Project has " << windowsCount << " windows." << endl;
++	out << "Origin project Tree" << endl;
+ 
+ 	char cdsz[21];
+ 	for (tree<ProjectNode>::iterator it = projectTree.begin(projectTree.begin()); it != projectTree.end(projectTree.begin()); ++it) {
+ 		strftime(cdsz, sizeof(cdsz), "%F %T", gmtime(&(*it).creationDate));
+-		cout <<  string(projectTree.depth(it) - 1, ' ') <<  (*it).name.c_str() << "\t" << cdsz << endl;
++		out <<  string(projectTree.depth(it) - 1, ' ') <<  (*it).name.c_str() << "\t" << cdsz << endl;
+ 	}
+ }
+diff --git a/OriginAnyParser.h b/OriginAnyParser.h
+index ed62bbb..bd7c1ae 100644
+--- a/OriginAnyParser.h
++++ b/OriginAnyParser.h
+@@ -68,7 +68,7 @@ protected:
+ 	void getZcolorsMap(ColorMap&, const string&, unsigned int);
+ 	void getProjectLeafProperties(tree<ProjectNode>::iterator, const string&, unsigned int);
+ 	void getProjectFolderProperties(tree<ProjectNode>::iterator, const string&, unsigned int);
+-	void outputProjectTree();
++	void outputProjectTree(std::ostream &);
+ 
+ 	inline time_t doubleToPosixTime(double jdt)
+ 	{
+diff --git a/OriginFile.cpp b/OriginFile.cpp
+index 5ac8e22..dba050f 100644
+--- a/OriginFile.cpp
++++ b/OriginFile.cpp
+@@ -39,7 +39,6 @@ OriginFile::OriginFile(const string& fileName)
+ 
+ 	if (!file.is_open())
+ 	{
+-		cerr << endl << "liborigin: " << strerror(errno) << ": " << fileName.c_str() << endl;
+ 		ioError = errno;
+ 		return;
+ 	}
+@@ -49,7 +48,6 @@ OriginFile::OriginFile(const string& fileName)
+ 	logfile = fopen("./opjfile.log", "w");
+ 	if (logfile == nullptr)
+ 	{
+-		cerr << endl <<  "liborigin: " << strerror(errno) << ": opjfile.log" << endl;
+ 		ioError = errno;
+ 		return;
+ 	}
+-- 
+2.26.2
+
+
+From 588bbc357cd34b9d353470ed6c0632b6f00805f5 Mon Sep 17 00:00:00 2001
+From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
+Date: Wed, 15 May 2019 23:28:46 +0200
+Subject: [PATCH 2/3] fix bugs found by UBSan
+
+ - check values before casting to enum Attach
+ - default-initialize sensitive struct elements
+
+provided by Ivan Krylov (Ropj)
+---
+ OriginAnyParser.cpp | 1 +
+ OriginObj.h         | 5 ++++-
+ README              | 3 +++
+ 3 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
+index ff7b8f7..9f9731c 100644
+--- a/OriginAnyParser.cpp
++++ b/OriginAnyParser.cpp
+@@ -1543,6 +1543,7 @@ void OriginAnyParser::getAnnotationProperties(const string& anhd, unsigned int a
+ 		GET_SHORT(stmp, r.bottom)
+ 
+ 		unsigned char attach = anhd[0x28];
++		if (attach >= (unsigned char)Attach::End_) attach = Attach::Frame;
+ 		unsigned char border = anhd[0x29];
+ 
+ 		Color color = getColor(anhd.substr(0x33,4));
+diff --git a/OriginObj.h b/OriginObj.h
+index 3a9f719..aeeeb6b 100644
+--- a/OriginObj.h
++++ b/OriginObj.h
+@@ -67,7 +67,7 @@ namespace Origin
+ 	enum DayOfWeekFormat {DAY_DDD = 0, DAY_DDDD = 1, DAY_LETTER = 2};
+ 
+ 	enum NumericDisplayType {DefaultDecimalDigits = 0, DecimalPlaces = 1, SignificantDigits = 2};
+-	enum Attach {Frame = 0, Page = 1, Scale = 2};
++	enum Attach {Frame = 0, Page = 1, Scale = 2, End_};
+ 	enum BorderType {BlackLine = 0, Shadow = 1, DarkMarble = 2, WhiteOut = 3, BlackOut = 4, None = -1};
+ 	enum FillPattern {NoFill = 0, BDiagDense = 1, BDiagMedium = 2, BDiagSparse = 3, FDiagDense = 4, FDiagMedium = 5, FDiagSparse = 6,
+ 		DiagCrossDense = 7, DiagCrossMedium = 8, DiagCrossSparse = 9, HorizontalDense = 10, HorizontalMedium = 11, HorizontalSparse = 12,
+@@ -345,6 +345,7 @@ namespace Origin
+ 		,	width(8)
+ 		,	index(_index)
+ 		,	view(DataView)
++		,	colorMap()
+ 		{coordinates.push_back(10.0);coordinates.push_back(10.0);coordinates.push_back(1.0);coordinates.push_back(1.0);};
+ 	};
+ 
+@@ -895,9 +896,11 @@ namespace Origin
+ 		GraphLayer()
+ 		:	backgroundColor({Color::Regular, {Color::White}})
+ 		,	borderType(BlackLine)
++		,	xAxis(), yAxis(), zAxis()
+ 		,	histogramBin(0.5)
+ 		,	histogramBegin(0.0)
+ 		,	histogramEnd(10.0)
++		,	colorMap()
+ 		,	xAngle(0)
+ 		,	yAngle(0)
+ 		,	zAngle(0)
+diff --git a/README b/README
+index 1dd56ef..598eacc 100644
+--- a/README
++++ b/README
+@@ -7,6 +7,9 @@ It is based on the code at
+ 	http://sourceforge.net/projects/liborigin
+ 	http://soft.proindependent.com/liborigin2
+ 
++Additionally, some fixes were applied to silence UBSan warnings caused by
++uninitialised POD struct members.
++
+ AUTHORS:  Knut Franke, Miquel Garriga, Stefan Gerlach, Alex Kargovsky, Russell Standish, Ion Vasilief
+ 
+ DEPENDENCIES: tree.hh (included) http://tree.phi-sci.com/
+-- 
+2.26.2
+
+
+From 88b4de31e1860b8b5de6e3eea4a32e92f2e58c71 Mon Sep 17 00:00:00 2001
+From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
+Date: Wed, 15 May 2019 23:32:50 +0200
+Subject: [PATCH 3/3] readProjectTree: provide root node to append
+ to
+
+append_child() is not supposed to work on an empty tree,
+and I couldn't find any initialization before its use.
+All inserted nodes seemed to end up below tree_node::feet
+(or something) and were not cleaned up by the destructor.
+
+Using insert() to create a dummy node for others to be
+children of fixes the leak.
+
+provided by Ivan Krylov (Ropj)
+---
+ OriginAnyParser.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
+index 9f9731c..4a79423 100644
+--- a/OriginAnyParser.cpp
++++ b/OriginAnyParser.cpp
+@@ -743,7 +743,10 @@ void OriginAnyParser::readProjectTree() {
+ 	string pte_pre2 = readObjectAsString(pte_pre2_size);
+ 
+ 	// root element and children
+-	unsigned int rootfolder = readFolderTree(projectTree.begin(), pte_depth);
++	unsigned int rootfolder = readFolderTree(
++		projectTree.insert(projectTree.begin(), ProjectNode("", ProjectNode::Folder)),
++		pte_depth
++	);
+ 	if (rootfolder > 0) {
+ 		LOG_PRINT(logfile, "Number of files at root: %d\n", rootfolder)
+ 	}
+-- 
+2.26.2
+
diff --git a/sci-libs/liborigin/liborigin-20110829-r1.ebuild b/sci-libs/liborigin/liborigin-20110829-r1.ebuild
deleted file mode 100644
index 27e4ccbbe0f9..000000000000
--- a/sci-libs/liborigin/liborigin-20110829-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Library for reading OriginLab OPJ project files"
-HOMEPAGE="http://soft.proindependent.com/liborigin2/"
-SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${PN}2-${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	dev-libs/boost
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-cpp/tree
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=( readme FORMAT )
-
-S="${WORKDIR}"/${PN}${SLOT}
-
-src_prepare() {
-	default
-
-	cat >> liborigin2.pro <<-EOF
-		INCLUDEPATH += "${EPREFIX}/usr/include/tree"
-		headers.files = \$\$HEADERS
-		headers.path = "${EPREFIX}/usr/include/liborigin2"
-		target.path = "${EPREFIX}/usr/$(get_libdir)"
-		INSTALLS = target headers
-	EOF
-	# use system one
-	rm -f tree.hh || die
-}
-
-src_configure() {
-	eqmake5 liborigin2.pro
-}
-
-src_compile() {
-	default
-	if use doc; then
-		cd doc || die
-		doxygen Doxyfile || die "doc generation failed"
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	einstalldocs
-	emake install INSTALL_ROOT="${D}"
-}
diff --git a/sci-libs/liborigin/liborigin-3.0.0.ebuild b/sci-libs/liborigin/liborigin-3.0.0.ebuild
new file mode 100644
index 000000000000..aa4538748af9
--- /dev/null
+++ b/sci-libs/liborigin/liborigin-3.0.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Library for reading OriginLab OPJ project files"
+HOMEPAGE="https://sourceforge.net/projects/liborigin/"
+SRC_URI="http://downloads.sourceforge.net/liborigin/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc tools"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-cpp/tree
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${P}-no-exit-calls.patch"
+	"${FILESDIR}/${P}-no-standard-streams.patch"
+	# TODO upstream
+	"${FILESDIR}/${P}-missing-header.patch"
+	# downstream
+	"${FILESDIR}/${P}-buildsystem.patch" # ENABLE_TOOLS, shared link, doc paths
+)
+
+src_prepare() {
+	cmake_src_prepare
+	rm tree.hh || die "failed to remove bundled tree.hh"
+
+	sed -e "/install.*html/s/liborigin/${PF}/" \
+		-i CMakeLists.txt || die "failed to fix htmldoc install path"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGENERATE_CODE_FOR_LOG=$(usex debug)
+		$(cmake_use_find_package doc Doxygen)
+		-DENABLE_TOOLS=$(usex tools)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
diff --git a/sci-libs/liborigin/metadata.xml b/sci-libs/liborigin/metadata.xml
index c049cd0777bf..e7dc202da9b1 100644
--- a/sci-libs/liborigin/metadata.xml
+++ b/sci-libs/liborigin/metadata.xml
@@ -5,7 +5,7 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
-	<longdescription>
-		A library providing IO for Microcal Origin files.
-	</longdescription>
+	<use>
+		<flag name="tools">Install opj2dat command line util</flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest
index 16e428a2f644..29ff4811076e 100644
--- a/sci-libs/libxc/Manifest
+++ b/sci-libs/libxc/Manifest
@@ -1,7 +1,7 @@
 DIST libxc-2.1.3.tar.gz 750044 BLAKE2B 6d6bb348bd8f7e25d6a3857fc40f0d7d3a7fe22c0a0514ca9f0ca60aadd67fde65b6052bc04e076a6328841c7ebe154921937083b8e9e2b9e55a5bcf197d08d0 SHA512 6cc7e4cb9b6187d3f7be9bca0aa574a1e0807db47201bee271d651e23c34ff7f00590cbe2ab1a6c399735e55d088a27e5b3456af6df46817137b3e6857c1c221
 DIST libxc-2.2.3.tar.gz 734714 BLAKE2B c5c4c3aec3373b8b481de8ec1779366b6916899e0b77964cbde0e83904b351e009b14a3ff64e9f020640e6ebf68d78828615b8abf83a46fdf86ea16480083643 SHA512 bfcd88c1946e459227e9b1a32c513f0e68ae7a5497925ac6e692085542526ebad9fe2cd5722077c839c06dbaaceca601c7f615ee6936e638eb150a9d68278d5a
 DIST libxc-3.0.0.tar.gz 8388775 BLAKE2B e82a7310c583c39b6c2313668a5d3a3d5ae7bf71ad450e9ac6241d1601bf1bb429abf98787f7e0c3c252e881c381b895e277d18619b57c46f2f910d7e079941c SHA512 42173341f917c2aed6954f76885d2a9149d7212d2525becf77072b9878753c28d752b5cf6b2c79c90a88d8aa033f0aa94fa9753eb67108e9325cee6919cece52
-EBUILD libxc-2.1.3.ebuild 1400 BLAKE2B ccf6c433ccfb77c19b49ddef89b53db5eaee87f8204e66e94752be41e26940fce8e45c9af73374ea04ae8a27353366be778859dd6b8f2f4c8c7f39e83262b660 SHA512 ed74981ed5f5ab997e4bf34145be37aee881355a8dc60cae8e86561bb7b9f64b2926ba491e826d4d76fb11f51dfd01a63f9da7f50e73f2825d34a32360d2a14e
-EBUILD libxc-2.2.3.ebuild 1396 BLAKE2B e8f167d5c9dd82cc35c70a6dd857d995aeb6a46e02326b0e0470c3ff743728f9850823bb0714e3e7768a8872dbc34778ed54ce7cbd3cfb36f9dde63799f0af01 SHA512 1a483af5997d54e1137080a276f590119cae49098799dc2df82abf2b5635a2766d14d3f92cd685a9f40ffd82394d6623338457160a844cfbaed105a4727d3b34
-EBUILD libxc-3.0.0.ebuild 1400 BLAKE2B ccf6c433ccfb77c19b49ddef89b53db5eaee87f8204e66e94752be41e26940fce8e45c9af73374ea04ae8a27353366be778859dd6b8f2f4c8c7f39e83262b660 SHA512 ed74981ed5f5ab997e4bf34145be37aee881355a8dc60cae8e86561bb7b9f64b2926ba491e826d4d76fb11f51dfd01a63f9da7f50e73f2825d34a32360d2a14e
+EBUILD libxc-2.1.3.ebuild 1399 BLAKE2B 0f29fb75ce1f39d57b59ed7dd29d8ac35916ad33056e67e79d7b1a38e4f37edd059e9defe257772c55deef489664df99b38cba06c3f1a6cd6829893892d80aa2 SHA512 570f9ef713887b6f8dce2e9cd694d7b8026b30ed04ee7463b65ef5ee35227035ae3e413636095fc60097e436345d0bfddeca060e013933e43b024c6fd0671c24
+EBUILD libxc-2.2.3.ebuild 1398 BLAKE2B 245a0bdd3b8c224e65414780d098bc56c6cf008ae5071d3c1d58855f2cfe413f9ea32233ab4ac84815b14f6aecc670d5b9c37fb1029fcb3039167ae450d74849 SHA512 a012b81405faa47c0130a86cb472065c31606080158b06411b933e82c79a12388313760871109c7234ba13ba853b137192479ee3698ebb463bc539d4a9978682
+EBUILD libxc-3.0.0.ebuild 1399 BLAKE2B 0f29fb75ce1f39d57b59ed7dd29d8ac35916ad33056e67e79d7b1a38e4f37edd059e9defe257772c55deef489664df99b38cba06c3f1a6cd6829893892d80aa2 SHA512 570f9ef713887b6f8dce2e9cd694d7b8026b30ed04ee7463b65ef5ee35227035ae3e413636095fc60097e436345d0bfddeca060e013933e43b024c6fd0671c24
 MISC metadata.xml 1339 BLAKE2B 4c98e1fa7345593b8f160ba4ad84ea3a5eb321437715137e94a1926b92a53ce87c41b27e8fd0edb5c479293e24f9049956100f0070ae7a27550144ff697b63ac SHA512 95e03f10949c2a2350063cc1666bc232f166b10669f5b1d050da91b6119b8280d69aca0f35527ab938c71666bb78019640426ab0acab18bd335e6fff2345e128
diff --git a/sci-libs/libxc/libxc-2.1.3.ebuild b/sci-libs/libxc/libxc-2.1.3.ebuild
index 527f29e46918..a54c26ddfc3a 100644
--- a/sci-libs/libxc/libxc-2.1.3.ebuild
+++ b/sci-libs/libxc/libxc-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,8 +10,8 @@ inherit autotools-utils flag-o-matic fortran-2 multilib
 MY_P=${P//_/-}
 
 DESCRIPTION="A library of exchange-correlation functionals for use in DFT"
-HOMEPAGE="http://octopus-code.org/wiki/Libxc"
-SRC_URI="http://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
+HOMEPAGE="https://octopus-code.org/wiki/Libxc"
+SRC_URI="https://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/sci-libs/libxc/libxc-2.2.3.ebuild b/sci-libs/libxc/libxc-2.2.3.ebuild
index 819d15daee4d..a7776b7b1e8d 100644
--- a/sci-libs/libxc/libxc-2.2.3.ebuild
+++ b/sci-libs/libxc/libxc-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,8 +10,8 @@ inherit autotools-utils flag-o-matic fortran-2 multilib
 MY_P=${P//_/-}
 
 DESCRIPTION="A library of exchange-correlation functionals for use in DFT"
-HOMEPAGE="http://octopus-code.org/wiki/Libxc"
-SRC_URI="http://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
+HOMEPAGE="https://octopus-code.org/wiki/Libxc"
+SRC_URI="https://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/sci-libs/libxc/libxc-3.0.0.ebuild b/sci-libs/libxc/libxc-3.0.0.ebuild
index 527f29e46918..a54c26ddfc3a 100644
--- a/sci-libs/libxc/libxc-3.0.0.ebuild
+++ b/sci-libs/libxc/libxc-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,8 +10,8 @@ inherit autotools-utils flag-o-matic fortran-2 multilib
 MY_P=${P//_/-}
 
 DESCRIPTION="A library of exchange-correlation functionals for use in DFT"
-HOMEPAGE="http://octopus-code.org/wiki/Libxc"
-SRC_URI="http://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
+HOMEPAGE="https://octopus-code.org/wiki/Libxc"
+SRC_URI="https://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 9f7ad1eeaf20..5c0604fc2fcf 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,4 +1,6 @@
+DIST pcl-1.11.0.tar.gz 67091890 BLAKE2B 77dcaf99e19cd3042a01176e57441a38e7f5095d7bd9b08c9ad4464384eb6c603eab9734a6bcbb52eff9da55c3aaa69b3744a10137b8264e5729c2432a678f71 SHA512 1cde48349b2630d1bb89fa50b2844054802fe02d22c810516bc41a712823a26cd5fa1b14297718f517b88c371a637567b31fb8c4c9b4908e94fb3a7208095127
 DIST pcl-1.9.1.tar.gz 67158067 BLAKE2B 472422930e08feba11f42a2df49d68e0c55484744e0649164b113dc3b654188e598b1c0a55f1b75680150090749b00378ae0f70b35b1695a7914a16be7415bf7 SHA512 ca95028c23861ac2df0fa7e18fdd0202255cb2e49ab714325eb36c35289442c6eedbf489e6f9f232b30fa2a93eff4c9619f8a14d3fdfe58f353a4a6e26206bdf
+EBUILD pcl-1.11.0.ebuild 2173 BLAKE2B 5bf60542a71815e62d08dd31bc79146bee3a3bc9a3db90fa0f334ab6bf7d9430fb9441fe9dbba301567ff3d10185794449292c35c4cc54ce75f69179c072d78c SHA512 9635a58f08d3a1ec9c6053ec3ac24e913811ae02ca2b58bd91315680031b7122394718cdfe62be4619dfc49ef35531283d435fdc51b925b03d59545832eb5d2a
 EBUILD pcl-1.9.1.ebuild 2252 BLAKE2B 3a488488afb1d0d18da684f9fa35c490a8f70ebd3f08d0668cdd265f17384adfa89228ee7034573040e90a9b78301693256fefa6361ff8754fff84517007714c SHA512 b0d94f742f20576b2adc6277c05b53dd78463432b3892f2ebaf58332cb2726cf6d436903f85a8e69c5ac9c350a839d27dc1c521a13ecab05d1e6f6e176225232
-EBUILD pcl-9999.ebuild 2252 BLAKE2B 3a488488afb1d0d18da684f9fa35c490a8f70ebd3f08d0668cdd265f17384adfa89228ee7034573040e90a9b78301693256fefa6361ff8754fff84517007714c SHA512 b0d94f742f20576b2adc6277c05b53dd78463432b3892f2ebaf58332cb2726cf6d436903f85a8e69c5ac9c350a839d27dc1c521a13ecab05d1e6f6e176225232
+EBUILD pcl-9999.ebuild 2173 BLAKE2B 5bf60542a71815e62d08dd31bc79146bee3a3bc9a3db90fa0f334ab6bf7d9430fb9441fe9dbba301567ff3d10185794449292c35c4cc54ce75f69179c072d78c SHA512 9635a58f08d3a1ec9c6053ec3ac24e913811ae02ca2b58bd91315680031b7122394718cdfe62be4619dfc49ef35531283d435fdc51b925b03d59545832eb5d2a
 MISC metadata.xml 1125 BLAKE2B 27e8b272d41bf690e99b28e7b9af140412e3d5641f56131c1c8ece113262f3222444a487a3e6a050fcf7fb8c8c404f284bc731780fa557d56241e0e0ad18613f SHA512 d5676bf63401993065215538dd0725f13a99251117e7e61cf9614ea765eb0b9388a8866aa74fb6840dba4ead49f763070076cd328c60ab0830ff11bee827e7cf
diff --git a/sci-libs/pcl/pcl-1.11.0.ebuild b/sci-libs/pcl/pcl-1.11.0.ebuild
new file mode 100644
index 000000000000..340870c8b8e2
--- /dev/null
+++ b/sci-libs/pcl/pcl-1.11.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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.11"
+IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
+RESTRICT="!test? ( test )"
+
+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
+	test? ( >=dev-cpp/gtest-1.6.0 )
+"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink )
+	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)"
+		"-DWITH_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 19c912a12d8c..340870c8b8e2 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -23,7 +23,7 @@ fi
 HOMEPAGE="http://pointclouds.org/"
 DESCRIPTION="2D/3D image and point cloud processing"
 LICENSE="BSD"
-SLOT="0/1.9"
+SLOT="0/1.11"
 IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
 RESTRICT="!test? ( test )"
 
@@ -49,9 +49,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	!!dev-cpp/metslib
+	test? ( >=dev-cpp/gtest-1.6.0 )
+"
+BDEPEND="
 	doc? ( app-doc/doxygen )
 	tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink )
-	test? ( >=dev-cpp/gtest-1.6.0 )
 	virtual/pkgconfig"
 
 REQUIRED_USE="
@@ -72,9 +74,7 @@ src_configure() {
 		"-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)"
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 76eff00071ec..b00e0bb91474 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1,5 +1,10 @@
+AUX boost173.patch 738 BLAKE2B c4e21499dc6b279ac1216c1e076df5b902a57c36fa33325622af6da667a2c1f7298f07ab864a5cc9f498543b05d454fba9ad436383f4274bca295fd06565fb61 SHA512 e0d754d4adb636ad83445b98ba0b42b82ed77537cd7d3e84d7db8d540b83c13933667d31ae279caf4c5d2c5021719d777868771949d89bb2574e926038caacf6
+AUX ocv.patch 958 BLAKE2B 8614bf90f25363fea34374e2fb0294ecf7779aa795f91d4b0e9156c4c3413698344c458c1dc5895007b30affc3b2db2294c3cff8fbd22c7518c12282a28573bf SHA512 57bbffb34ad7f7d67c668c9a48cab21f826ce7ddbb719ae0815d6238a784d327ec7644c78a3b437e7d813181d201f60cfeba91f93067355cdb41a20770f95a13
 AUX ocv4.patch 698 BLAKE2B 4ec82ff9d08b3051181cd44b157b9097783e4128e5bb09debbd844ec574455c5f9a5e153d643f209f96bf0f2a92474d189d5b8449a17fbe171dc5cee395748b3 SHA512 83814e1fa862c1eb8f23d0865a4f36d2067512af57a12c3569697b12559d27027915b888d9c1cb845d08bd82bdabffd3a06594234b23a68f04a6c723d00265b4
+AUX pcl111.patch 1824 BLAKE2B 45bfbf7bb7a1459c126ebf13e47ed4519383a8e6088980bc83ff87ab66e7a2f8168ec02f39ecdef95bce3c83bc329c5dc698ab0d150acc08f43b7795615e3f29 SHA512 3342bf908ef9d4abf9fd49c2840d3498b26ec95e61b725a94049f3dc7958642c7a24bd41686191e57137f3e9166160c48cde53dfdadbb7a740d5d79dbbe70926
 DIST rtabmap-0.19.3.tar.gz 19818629 BLAKE2B f732a02db6ef8434b1457234211a128e3050236590e0f6a1e08e36bbb5899b9d3de9409d7d7329f346d29874d440bd86835c1501fb638e3802e2663907e7b04d SHA512 bda72596911b1c35d757322c7e5acd7e43ec1f4e984bfb0599cfb39597bee79e470d1bc11b492f244f39c35812ae570d023848cdcbd011eeb78e347727045509
+DIST rtabmap-0.19.7.tar.gz 19936131 BLAKE2B ec640bb8dddb2acac9eb70e828edc88e76d90b287dc5be0c99f0943dac3df448b0a06bde79b1288e0b84a1b2a022e5713346f87e68f11a6f25be486e3122b62a SHA512 d02fec1db427092867b32d464e4b2450a729923260088b75dd0a813fc6d3e2539b3694035cddffc33b8fcd5a56a2a5c3dedb7c7a998b72f2094e1916f2a99084
 EBUILD rtabmap-0.19.3-r1.ebuild 1473 BLAKE2B 2a8c64e81f3077cc3440294ccd1fe605a4dd4211b50639414913fb34671486b6cca15ad1483a9b3a63852295c06e108b9fe74358505c5a0e262844df15392fe4 SHA512 1d1c479c484c811b44e8f088add28daa00e7154c2e6db25960e263f2eede05b9e939dc2190d8d9cb337f3fddd82c35a471df17bb0f3a54bd1bebe963aa03b3ac
+EBUILD rtabmap-0.19.7.ebuild 1531 BLAKE2B e05cd3506738e0fc124e16607b1b6e43dd583cd10353e8e7ffa85e46ebffd28b3a02b9412a3286f1bf34ebb72e407fcaf5df07812b7cb99d2ccc66295b6c59ca SHA512 ca14572df16837ce1bab93e4f4911b7bbc6f276f0097613ee94ab022b09b94c7e3598dffb4223d5c9a7940336eabca4963c29f0159a744ab6cf89808d507b806
 EBUILD rtabmap-9999.ebuild 1436 BLAKE2B 058a4f207d6ff2c0f2b05a4126dbf7ebae67de82bdf956b0abdd5ba6f8285b3cd61f60ae086ca2036f9523f62b90ad61c462f98a983e05b7207643ba16f80a1e SHA512 139f504b42598b3c0c9894a87f32f7980873122a2959e3ca1b1764a77e7e0c3bc7c7af360494422b629ee01c0ee711b974312388d412007b47ed545b8e8928ed
 MISC metadata.xml 471 BLAKE2B d5e9287982f5e772ca5b3570010bc79b18e3d86424c64ed501765a9ca4285349f4fdc1428c92817b7fbdfd2000e5c43ff49dd44d37d512b227e4ee4bec98f3fc SHA512 41752dfbb60d49072337438d49c313eec8a13b51bf8d3e65ad26ca519d3d8f105966756495111f01c6b365d57acb4f7be0b4dd017f8b7bfa483c08c354b0ca81
diff --git a/sci-libs/rtabmap/files/boost173.patch b/sci-libs/rtabmap/files/boost173.patch
new file mode 100644
index 000000000000..4549e9bc8426
--- /dev/null
+++ b/sci-libs/rtabmap/files/boost173.patch
@@ -0,0 +1,13 @@
+Index: rtabmap-0.19.7/corelib/src/camera/CameraOpenni.cpp
+===================================================================
+--- rtabmap-0.19.7.orig/corelib/src/camera/CameraOpenni.cpp
++++ rtabmap-0.19.7/corelib/src/camera/CameraOpenni.cpp
+@@ -126,7 +126,7 @@ bool CameraOpenni::init(const std::strin
+ 		boost::function<void (
+ 				const boost::shared_ptr<openni_wrapper::Image>&,
+ 				const boost::shared_ptr<openni_wrapper::DepthImage>&,
+-				float)> f = boost::bind (&CameraOpenni::image_cb, this, _1, _2, _3);
++				float)> f = boost::bind (&CameraOpenni::image_cb, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3);
+ 		connection_ = interface_->registerCallback (f);
+ 
+ 		interface_->start ();
diff --git a/sci-libs/rtabmap/files/ocv.patch b/sci-libs/rtabmap/files/ocv.patch
new file mode 100644
index 000000000000..0802b7899a26
--- /dev/null
+++ b/sci-libs/rtabmap/files/ocv.patch
@@ -0,0 +1,24 @@
+From 7041d5fd34fb34851ad3287891aa5c383d73b5c2 Mon Sep 17 00:00:00 2001
+From: matlabbe <matlabbe@gmail.com>
+Date: Sun, 3 May 2020 22:59:35 -0400
+Subject: [PATCH] Fixed #541
+
+---
+ corelib/include/rtabmap/core/stereo/stereoRectifyFisheye.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+Index: rtabmap-0.19.7/corelib/include/rtabmap/core/stereo/stereoRectifyFisheye.h
+===================================================================
+--- rtabmap-0.19.7.orig/corelib/include/rtabmap/core/stereo/stereoRectifyFisheye.h
++++ rtabmap-0.19.7/corelib/include/rtabmap/core/stereo/stereoRectifyFisheye.h
+@@ -37,10 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ #include <opencv2/calib3d/calib3d_c.h>
+ 
+ #if CV_MAJOR_VERSION >= 4
+-
+-#if CV_MINOR_VERSION >= 3
+ #include <opencv2/core/core_c.h>
+-#endif
+ 
+ // Opencv4 doesn't expose those functions below anymore, we should recopy all of them!
+ int cvRodrigues2( const CvMat* src, CvMat* dst, CvMat* jacobian CV_DEFAULT(0))
diff --git a/sci-libs/rtabmap/files/pcl111.patch b/sci-libs/rtabmap/files/pcl111.patch
new file mode 100644
index 000000000000..3ff5d6be452d
--- /dev/null
+++ b/sci-libs/rtabmap/files/pcl111.patch
@@ -0,0 +1,49 @@
+Index: rtabmap-0.19.7/corelib/src/Graph.cpp
+===================================================================
+--- rtabmap-0.19.7.orig/corelib/src/Graph.cpp
++++ rtabmap-0.19.7/corelib/src/Graph.cpp
+@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ #include <pcl/search/kdtree.h>
+ #include <pcl/common/eigen.h>
+ #include <pcl/common/common.h>
++#include <pcl/common/point_tests.h>
+ #include <set>
+ #include <queue>
+ #include <fstream>
+Index: rtabmap-0.19.7/corelib/src/clams/frame_projector.cpp
+===================================================================
+--- rtabmap-0.19.7.orig/corelib/src/clams/frame_projector.cpp
++++ rtabmap-0.19.7/corelib/src/clams/frame_projector.cpp
+@@ -33,6 +33,7 @@ RTAB-Map integration: Mathieu Labbe
+ #include <rtabmap/core/util3d.h>
+ #include <opencv2/highgui/highgui.hpp>
+ #include <opencv2/imgproc/imgproc.hpp>
++#include <pcl/common/point_tests.h>
+ 
+ using namespace std;
+ using namespace Eigen;
+Index: rtabmap-0.19.7/corelib/src/util3d_correspondences.cpp
+===================================================================
+--- rtabmap-0.19.7.orig/corelib/src/util3d_correspondences.cpp
++++ rtabmap-0.19.7/corelib/src/util3d_correspondences.cpp
+@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ #include <rtabmap/core/EpipolarGeometry.h>
+ #include <opencv2/calib3d/calib3d.hpp>
+ #include <pcl/search/kdtree.h>
++#include <pcl/common/point_tests.h>
+ 
+ namespace rtabmap
+ {
+Index: rtabmap-0.19.7/corelib/src/util3d_features.cpp
+===================================================================
+--- rtabmap-0.19.7.orig/corelib/src/util3d_features.cpp
++++ rtabmap-0.19.7/corelib/src/util3d_features.cpp
+@@ -42,6 +42,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ 
+ #include <opencv2/video/tracking.hpp>
+ 
++#include <pcl/common/point_tests.h>
++
+ namespace rtabmap
+ {
+ 
diff --git a/sci-libs/rtabmap/rtabmap-0.19.7.ebuild b/sci-libs/rtabmap/rtabmap-0.19.7.ebuild
new file mode 100644
index 000000000000..4640d13e9cf0
--- /dev/null
+++ b/sci-libs/rtabmap/rtabmap-0.19.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}"
+BDEPEND="virtual/pkgconfig"
+PATCHES=(
+	"${FILESDIR}/pcl111.patch"
+	"${FILESDIR}/boost173.patch"
+	"${FILESDIR}/ocv.patch"
+)
+
+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/spqr/Manifest b/sci-libs/spqr/Manifest
index 4e52237ef4f1..06b7fc018af0 100644
--- a/sci-libs/spqr/Manifest
+++ b/sci-libs/spqr/Manifest
@@ -4,5 +4,5 @@ DIST spqr-1.3.1.tar.bz2 1115795 BLAKE2B 027509745cd336d3ccff27a4f36e51493fb9008f
 DIST spqr-2.0.9.tar.bz2 2161068 BLAKE2B a662983d2543a65ce36a367749db5585308acb56b016f69a35c46a84e9c12a678f57a3cfd459cc2e887fff2819b00f99981efaadb73831f1b4c54cbef5e1c367 SHA512 54b203e0d68b266473b8a2b7b3b3a55476df54a3ebd5748b70faa7bad1d0a5a7387197f0674ba5f9a5d45887daa736117f8d6ffbbc2eb02482b3374a3babf721
 EBUILD spqr-1.2.3-r1.ebuild 909 BLAKE2B bf187af15da7e38f9b79f089768236f04c8794373d043b1fc13562ce0c5466bd80777bc0299973003306b87db45a7a9f3b2a4fdf6161ee2e11df2f3219d5de58 SHA512 752f56b943603df13cdfa90c428eb379adf004f893b1fd966193b6a650c07c0af1a8236f6d015fd451b848bddc5a9f18b408adcbd521c76f0e90792ebb585cbc
 EBUILD spqr-1.3.1.ebuild 752 BLAKE2B a96d5e8a948366fef4cc7fa2ba7d618f19f1bd17998a162e7501fe75fead8c697efe96cb0f78ed7a9329aa6d73bffea3106bdae9aeba489df92634c21b5ec98e SHA512 b97e9f20ceae34ce31edeed18eeaf1d809fbdaf883e5496ebd277f6c11b46fc139375cfca13718661fa36b127909a6e61cd9ee62d3b2b728d2dd402eb3593c97
-EBUILD spqr-2.0.9.ebuild 1009 BLAKE2B 5ed65ca626a6d99698c233a4c6b51f407b3633cb0767f26ceeda068544e634fbdac2724af53f6f7fc91bc383d7db7c5fc9aa425b3e4fe88676ccb66c66af03bb SHA512 9d56736bfa422cf6e4b580ea03e34441ad5e8ffc42a26416990e851f3759f1b101942e5badf5eb2154e2915c67fc8f08e9d373c7422b94dd3ecc868ab8ce0650
+EBUILD spqr-2.0.9.ebuild 1016 BLAKE2B 68f3fda3615507c1318381e36bd626433f459c81df300ed6fe4ec046bfe64031d2df48185082484e7aed40db328883700e4a4e559d6d0380ec9e52aabbb66373 SHA512 b4d87d842d2a9af276c4ee00e43294021209c2dcad61ff6a11dec09fab471a64f918ee08b2dd127e82c81ae93c72c695d30c1a2f3ec9a6852cea4f1d3eaf279f
 MISC metadata.xml 962 BLAKE2B b7d87c2d66c17b1d3071b8b0a17e39fe77897a9af7e79caf784cd1c370c70467010718ad3ef60314dc6f0db5703b4a0035294fac5fc2552e9bb595132b7991ed SHA512 a8cbc5b0168b847b814c54b874d159fcfd349780d9b64907ffdb1d572babbee8b64f422328fa583ba9f7e0a60846249385acbccf5db2944f7c05bcd33f4ce757
diff --git a/sci-libs/spqr/spqr-2.0.9.ebuild b/sci-libs/spqr/spqr-2.0.9.ebuild
index 16aea9c33e72..342617b94340 100644
--- a/sci-libs/spqr/spqr-2.0.9.ebuild
+++ b/sci-libs/spqr/spqr-2.0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc partition static-libs tbb"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/suitesparse/Manifest b/sci-libs/suitesparse/Manifest
index 91070a3edd79..020a9d46280f 100644
--- a/sci-libs/suitesparse/Manifest
+++ b/sci-libs/suitesparse/Manifest
@@ -1,4 +1,4 @@
 EBUILD suitesparse-4.0.2.ebuild 762 BLAKE2B b2eb7df499c9ac1f8e27f0bf90fa8178303090ea3819fc3945603b94d3c3a4259823f7f46f2d824d9d69ec6d457cd1c03a9781e98e4b04706147fd0adc6e2083 SHA512 57ac75b2b86bd6f5476144db5561c0d3197ecdfedccdd7673952c928f6d0c85858c348d8e2821384e802a107870157a0fd7aade95ca7d30aea374642af7af3a2
 EBUILD suitesparse-4.2.1.ebuild 762 BLAKE2B 598b35b6165b24cc5e34f9df5ab3f695d79cee04f693c55d0d302ca5d7e2d52f193ba99fc459af97cfd2fd9badc293e6d814b578b17277a35255a0a16e94fb78 SHA512 7232069fb3d9f5ebc31424d1c88a930b27756a4a111993c8c607b7c5e1df59e089e5c5f578e331f77837c910ad81718166d7c922fe95a571722885c6ff1cc951
-EBUILD suitesparse-5.4.0.ebuild 766 BLAKE2B 3a0229401066367f1c6caaaf1256331552254e0c2bdce232881d458559000b82ee620a830108336809b6048b0a66c531b09460fb73a07639e3b6610d6bf573fc SHA512 7b643c0c433718695790f669a3916aa79b822deeb9b5afe3efd71238764a38db216c32a495d118b697525e010e26bd2657a84aa3e165d6bd502246468bbc71a1
+EBUILD suitesparse-5.4.0.ebuild 773 BLAKE2B 8d71d61679e73442355959a70431986ad38915a7489ed693a06dece32f39dde4a6888a76d68bd22b255486c095070f5aed61e0434b86aa50a8fc441b6be9f25c SHA512 520851e7268837838983b29c3ed740a80e8941fea40ebf397924e665b9e24c28421336a55f51ca0cc854bf1a67ae1eef6963fb6e32d04d197e0fe7e113840820
 MISC metadata.xml 1995 BLAKE2B 34721d419d77f93f3dac7d99cde6d41f8ea9ed7bdb87a8b88b02da1a151b9dce4b415da56176ba07ef83f55692b9520aea2dd2eaa0b90f5e6847585908e8c4be SHA512 855650d41560fa1a9ad9dd6d7136328f744eb07ea086a275485edb147da394787a92c56890bd8a8613ef2dbf94a32d9c94698c54916461150c5013504817aa03
diff --git a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
index 45a09d0f63b8..afae8da50f4c 100644
--- a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
+++ b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
 LICENSE="metapackage"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc lapack partition tbb"
 DEPEND=""
 RDEPEND="
diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest
index 12f7aa198000..1b542e7b95ec 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -4,7 +4,9 @@ DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLA
 DIST tensorflow-estimator-1.15.1.tar.gz 696316 BLAKE2B 7797ae13fa5f56920df912f7d0eaef214a381acb25632dc2d21c6bbf5744bcc36b32f21e30b18be16d37f7a1deb30b2139d58c2c0f97a1de7a5f767a8a5462d8 SHA512 ae42057870cfb0e19d45ee59bd99c110ecfb3ae43cd5a5536711c7d2528b429c433b0f594e462eae9c40b34dd7813f3b14b1282cbf2edc725e13c45e93da818d
 DIST tensorflow-estimator-2.0.1.tar.gz 618583 BLAKE2B d4ae6225cb8a56febc9ffa64d5f811fc41db462534361a183095f724ce6deb17fa22edbd13bacd2d556adcc023dff1daeb7bf7338360b3cb49b19dc3bc3e97d0 SHA512 d7aa35784aa2726c49039be50b73cc957e7f883414bb43101527918bacfa55632df89e6f54cfc58a096512fc49a6ea7524aea87af0579c2a52db2ca7f5ee4bc2
 DIST tensorflow-estimator-2.1.tar.gz 622792 BLAKE2B d1c8abb22d90c789ebfadaf78ca932f87428274afe6e1ac20670bf6d2b4c1c6ea8f367b1eb7ee64ff9f6e9b8ecdc2f64113924e7e2286e3f4e3d2c36cb101794 SHA512 4aaa21969299b02443e9396c238ef4c03af3bde1d0142a81c04d9706f18b02bfd125f3aaf8ffb47e0a3ffad949c3d3bca3909375f12a1c1e4c55ca1cc7930d51
+DIST tensorflow-estimator-2.2.0.tar.gz 627362 BLAKE2B 125792fc2167b8af837a99b08a9a26943bc5c1fda8ab3690b01c0d49a6dd39142ff4a063867dfe1bee3b99fb018981d0e4ee45d194caac2cd96a829ad22db0ad SHA512 aaf743835e2c606439fcccb56742997e930ba0e72c01d51633ce86824bbfaacd64607dc1fd7fb9604cc444feb65ebae60c2266be084e1b49ef2a1a9ca5a3d60d
 EBUILD tensorflow-estimator-1.15.1.ebuild 1328 BLAKE2B b629259c42c606f8620f3efb2b56c253dca488c59c5c4df52a241c1e279856484e8fc289cc011044fff2ad4d80138234a20782d9a396ce84716f453530cacdbe SHA512 722e5579e71df900c0702980197e1eb532ace50817769363b42d9ba413037c339eeae61e625b6fdf53efbd95d821fc83ea7ed12a62e77a1bcc945abcc8916148
 EBUILD tensorflow-estimator-2.0.1.ebuild 1853 BLAKE2B 13a0aa24ad860e69af5c8e180d939bd074c909bfcef47d5e9d16074cf010927f51bb64e6a48a7db00a5a817db70f4aa7071a32e89439b6864cc406a3cc13c59e SHA512 295825f9278094596f880fe69898791b00b68f71b4e7b6fd2efdb7357d2090ace62eb0d45b7b649f222544c789d8375bba73776a5428b587ba01367024af6615
 EBUILD tensorflow-estimator-2.1.ebuild 1853 BLAKE2B 13a0aa24ad860e69af5c8e180d939bd074c909bfcef47d5e9d16074cf010927f51bb64e6a48a7db00a5a817db70f4aa7071a32e89439b6864cc406a3cc13c59e SHA512 295825f9278094596f880fe69898791b00b68f71b4e7b6fd2efdb7357d2090ace62eb0d45b7b649f222544c789d8375bba73776a5428b587ba01367024af6615
+EBUILD tensorflow-estimator-2.2.0.ebuild 1853 BLAKE2B 13a0aa24ad860e69af5c8e180d939bd074c909bfcef47d5e9d16074cf010927f51bb64e6a48a7db00a5a817db70f4aa7071a32e89439b6864cc406a3cc13c59e SHA512 295825f9278094596f880fe69898791b00b68f71b4e7b6fd2efdb7357d2090ace62eb0d45b7b649f222544c789d8375bba73776a5428b587ba01367024af6615
 MISC metadata.xml 580 BLAKE2B fb81098968d0fdf34a3f28dabee76df16be5393cb9ea79ee4fa670af985ef3f70bb83f14be84a0cc0e564e6626007c2977851f8299460b483f88325be155f4cc SHA512 6aef6523502a3bcf0b2ca59cf7480b92032b53020cccfa715203e5a48c960ecc92c94fa75f98a234da2d51662d43e0c1a85a1537f3ab67287cdb8183476a0efa
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0.ebuild
new file mode 100644
index 000000000000..32a54df07f94
--- /dev/null
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+MY_PN="estimator"
+MY_PV=${PV/_rc/-rc}
+MY_P=${MY_PN}-${MY_PV}
+
+inherit bazel distutils-r1 flag-o-matic toolchain-funcs
+
+DESCRIPTION="A high-level TensorFlow API that greatly simplifies machine learning programming"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+bazel_external_uris="
+	https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip
+	https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip
+	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
+
+SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${bazel_external_uris}"
+
+RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-java/java-config"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
+src_prepare() {
+	bazel_setup_bazelrc
+	default
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home)
+
+	ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package
+	ebazel shutdown
+
+	local srcdir="${T}/src"
+	mkdir -p "${srcdir}" || die
+	bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die
+}
+
+src_install() {
+	do_install() {
+		cd "${T}/src" || die
+		esetup.py install
+		python_optimize
+	}
+	python_foreach_impl do_install
+
+	cd "${S}" || die
+	einstalldocs
+}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 692d27492db3..a79e689884bf 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -42,11 +42,11 @@ DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932
 DIST tensorflow-1.15.0.tar.gz 46183168 BLAKE2B 5ccd87d5b53d6c543728e9c7ef96f12149bd8729620838b07a28f752fd5c57ef88350c2b62e8c44ec3561469eda38d8a64cbfca5e1ac7850674e1dd2c4d605d6 SHA512 f8683a950be6a3fa234d42e0f46bd9e049280e0c1d203c5c00ad44cf4728d894f2c301939d6d71203f815130a1ead53127adcc7565009589ff5aafc878b4dba7
 DIST tensorflow-2.0.0.tar.gz 46176997 BLAKE2B 761e91a774f61b50459240a83fe52f723a76c2cc3eaf7c371684849cb7365b94fb3743ab8de9adffe64bef0f70da2bb0b7e6426a3f402e436eff841d3edefe8d SHA512 c3a2cb9673d2ade8e83961f7d944165123d0e4d94e6ca4d8fdee4f02f536893b879bbbf78d3ad5e557467b58f97f7194f2d9cfc64d7d05540969be732070eecc
 DIST tensorflow-2.1.0.tar.gz 41637803 BLAKE2B 63aac95cdb71097d2e7a257a691a2b51703fb22d2535395494adebfae0d3f97f8dd9e0deaadf1c2f3d3d26138066a7c6fb9b9728b5b0ac3d54360d7b5e4bebff SHA512 6d09ba3c097e4b3d712e7164d649841572c418d56c207eea6d31e3b1851b84ce57e82801d9887d84cfd8fcf990a3ea4c4b4b05265f8d625509986412c230c3c6
-DIST tensorflow-2.2.0_rc2.tar.gz 42090496 BLAKE2B 016a6dac71d59a4964a78daf0297cc037f104ddc5ace22a093780cb04312660861b50877bd996a92308d3bacb23bf8a25a0606954cd0b8a30943367bda8df4df SHA512 505f03a2e9c57638aaecbcc83fa5b292a038eab9c4777cb75a4ee2c9926cdc3ade565326abd0eb7bf1717972f4a2a20941227afe29b79f0519fd724fbc15d959
+DIST tensorflow-2.2.0.tar.gz 42100791 BLAKE2B 8b773ae9945ca267af33a34d86f6aef02310976bea1cdd98858d1405e8da845640b72a073b71fcfccb2b73f08600a5eada2c2332a8d9480bba71e9f25dbb2220 SHA512 94a2663497d333d543f363e9fea94fbcfdcdbbc0dfbaf009ba9181a808713aeb78f9b8805f56bea5fd3925a36f105427b3996795750589f378d8afbdadc2b86d
 DIST tensorflow-patches-2.1.0.tar.bz2 5737 BLAKE2B 67f5004312389ed19e810aad9f2d5d4839d806b5a7422963520e0dff06b91346683647db757ac463af13ca70861a7ed9c94be242910abacc6be350e162947225 SHA512 a20bfb619d59e0d2741a27ce36e3d38dbb7a5a706d6bc56f8aa94b5b72288139ad301fc06390b128ef1c3a88b758d09d0224351590dedcda9c5309cc55af6fed
-DIST tensorflow-patches-2.2.0_rc2.tar.bz2 8173 BLAKE2B 266eca0eea68e7ac643ae3f2df31fabf327dc84acca14965334875d0ec2eaca64c8b61e52386da6f7240fc58f910fff16eed4b7995f6b028fbef46890f9d8a63 SHA512 a989c7c3ee088c0dc0e6e98aff3e73da90b09dac2a518ec536d77e4e72e7c145a1c7af92ae08ef284251e985324e7b824db52ba1ddb4639cca4c21233f33582f
+DIST tensorflow-patches-2.2.0.tar.bz2 3197 BLAKE2B e88211e6eaed9818e63680aaa451cad1a0b53e6087e2d8a1c34126e539d509ed5180ce1bdd902f0a0acd357a4e334bb30638d18d15a585465881abf1ecfbb830 SHA512 5370700df4b3741e4f41629684c8bdba28182b5d488df241a8f4f55ba821797d38ef98676b30712c1716310054307fbec03db406d1cf17a7f3430697e8378d2c
 EBUILD tensorflow-1.15.0.ebuild 11856 BLAKE2B cfebe23380544388cca0d97bc9b8999deb335a936d8dc5fae86c303bcc1a62fadc024d43e5d60ea931d4cc54130806797252e40269521e7854e027c8c74a2bb2 SHA512 86a012782ea9cbb1af070d4e33497570e557e91c4693956a58e32808e384c5018f5580e45327abba16a5daa485193453cbd08b6c0608a0e0f0299875936470fe
 EBUILD tensorflow-2.0.0.ebuild 11912 BLAKE2B 513fb292684c12279384d6642dbde445d9bf01d5ff3086d9251b425a4b0bcd70cf7e80e5c37720528c212158bab1e5f3eb0b822b5a3d2fe8e2a555ff86ee1072 SHA512 dac4c3536e0fbb076395759d3f212fd235915949b5fe5274cfab3ec2597aa6781d279d321617845d697b97ffea64a32e118e4a10e97c97f1e0855166a7ffb20e
 EBUILD tensorflow-2.1.0.ebuild 12365 BLAKE2B d895256b37ee79be36d83745545e6515366b64121c0bd5ec79544827a4492a327ca26593d06ec0b42745ef9bfa213a251eef2bd7c9093d8b461b744035d18cf7 SHA512 d710ea279a2e0b73749a0b4a947a98753e11a6ac14799b9d5e45e3e63afd776aa8047d44d66b831d49df686fea65f0663133f8639080f722fbbd6254d6025b46
-EBUILD tensorflow-2.2.0_rc2.ebuild 12927 BLAKE2B 56d51c0bd3989ebd7483f686c0ec087d82edadb3a77c4db03b436866d3dafacad9b6004dd6c545d18b2dbbfbdcdb1b82bc87b9fe7992fa76d24621f4d64881e2 SHA512 783aaabdae37f5507a8bc412b1877e576c1eab560414f5e975b32db7e8b37b76f86e11f84f22ceb17e4ba18d4eb16b93992634a3e09d1023eaae67c35cf70bbd
+EBUILD tensorflow-2.2.0.ebuild 13469 BLAKE2B 3a94324d6e34b74072cb8df43d9f0f3576e6366ed9dab50436410ddaed2500d03708bb7be799a824798811ff03f384e6eb4a8e494b63e6afcf7a4cfce4e1c87c SHA512 198ee6bf9c0e96fb4b12edf0a703a937b8cc2bf636de5bed47c38658b597f3b5c30fdd3b293c07b57aee6c8b55cfb9e7ee7b453302ffd17cf21c70159a60f297
 MISC metadata.xml 606 BLAKE2B 910509df7310f05e34bbdd7223a9ad64e4f67c67174d3868629d594022aeab23fb9631fb17782b5787e7880cb2990ffed7d14c030ab86a25c23c8118330bc690 SHA512 ffc3f68be38618f77b7d31406292e3a4ead2819d19aa7c8b1eb779e03027b9220cc248645cad44e31a6f0c113f4aeeed2a45060617b1bb03695bd2c684262b30
diff --git a/sci-libs/tensorflow/tensorflow-2.2.0_rc2.ebuild b/sci-libs/tensorflow/tensorflow-2.2.0.ebuild
index c0ab709f7b9d..7abd3707e97f 100644
--- a/sci-libs/tensorflow/tensorflow-2.2.0_rc2.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.2.0.ebuild
@@ -74,7 +74,7 @@ RDEPEND="
 	media-libs/giflib
 	media-libs/libjpeg-turbo
 	media-libs/libpng:0
-	>=net-libs/grpc-1.22.0
+	>=net-libs/grpc-1.28
 	net-misc/curl
 	sys-libs/zlib
 	>=sys-apps/hwloc-2
@@ -91,12 +91,12 @@ RDEPEND="
 		dev-python/astunparse[${PYTHON_USEDEP}]
 		>=dev-python/gast-0.3.3[${PYTHON_USEDEP}]
 		>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
-		dev-python/google-pasta[${PYTHON_USEDEP}]
+		>=dev-python/google-pasta-0.1.8[${PYTHON_USEDEP}]
 		dev-python/opt-einsum[${PYTHON_USEDEP}]
 		>=dev-python/protobuf-python-3.8.0[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 		dev-python/termcolor[${PYTHON_USEDEP}]
-		>=dev-python/grpcio-1.22.0[${PYTHON_USEDEP}]
+		>=dev-python/grpcio-1.28[${PYTHON_USEDEP}]
 		>=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}]
 		>=net-libs/google-cloud-cpp-0.10.0
 		>=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}]
@@ -124,7 +124,7 @@ BDEPEND="
 	python? (
 		dev-python/cython
 		dev-python/mock
-		>=dev-python/grpcio-tools-1.22.0
+		>=dev-python/grpcio-tools-1.28
 	)"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -176,6 +176,9 @@ src_prepare() {
 
 	eapply "${WORKDIR}"/patches/*.patch
 
+	# Relax version checks in setup.py
+	sed -i "/^    '/s/==/>=/g" tensorflow/tools/pip_package/setup.py
+
 	default
 	use python && python_copy_sources
 
@@ -215,6 +218,14 @@ src_configure() {
 			einfo "Setting CUDA version: $TF_CUDA_VERSION"
 			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
 
+			if [[ *$(gcc-version)* != $(cuda-config -s) ]]; then
+				ewarn "TensorFlow is being built with Nvidia CUDA support. Your default compiler"
+				ewarn "version is not supported by the currently installed CUDA. TensorFlow will"
+				ewarn "instead be compiled using: ${GCC_HOST_COMPILER_PATH}."
+				ewarn "If the build fails with linker errors try rebuilding the relevant"
+				ewarn "dependencies using the same compiler version."
+			fi
+
 			if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then
 				ewarn "WARNING: Tensorflow is being built with its default CUDA compute capabilities: 3.5 and 7.0."
 				ewarn "These may not be optimal for your GPU."
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index b7ff3152171f..8eb4ecabb24c 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -9,7 +9,7 @@ EBUILD votca-tools-1.4.1.ebuild 1211 BLAKE2B d49fc0a98bfaf61cee9b1c38f058687591b
 EBUILD votca-tools-1.4.ebuild 1182 BLAKE2B 2077617efbf04198cf2a0f53bbf07f87897a8420ec6ad9e1774c821e7e3789421a253b79e9f09e85abfdf1523ebba02400233199cee5d7966a03b97db4477155 SHA512 48eb152df0bc0ad1481179977c0a8b6947180d9978961024a57674414326eb370182c02f5fda3a902a03a14fe3f0e60f666787eb16729412426ee83f1a074613
 EBUILD votca-tools-1.5.1.ebuild 1124 BLAKE2B d8bbb47af7f2b160f83719246b8c1c1e435970790aa1ec3922085959354347c61a845013a32da9edcbcad19c66e7dd25fd0fa8c2b908f795827c324452413183 SHA512 9219e23530a0f55cc4159f250e251c49ce61a8514b05d0d4eca7f224b340e0bcc313e82b57fb647141f683607be545044495da2eea956ea197cae029f52a5662
 EBUILD votca-tools-1.5.ebuild 1122 BLAKE2B e6ca1c6354b17eae1f1574de117b2fe421965e05376ac2d13cff50814e5b2987fbac645be133037cf31b08513e09f96fba94cb02a82bab06c60a667b9147d75c SHA512 2482328a8306a0126c7ab17250be2ab91e823a1ae248e3d4bf15b27bf1f313b3277a132ba4e52362c92f1d4096a00f7b5e657afaa6de464866b551c5976c4be5
-EBUILD votca-tools-1.6.ebuild 817 BLAKE2B 07c6d4667bf74c45a962fea7ad7af4d3e40910d7fb4c38713e30193c9d58d2553c693b28db361f7c0b7d16df2d05636fedc648a18934b77bd6f7faeefebb6b5c SHA512 4be6e932cb3a573465c907956d79f6f85c3f2d38bd867ce8488afdafdc4e005c3d953f5e8cfdc4a422ff16e39a8d844ed5e84e53e1155a800ab3844ffbd8a32c
+EBUILD votca-tools-1.6.ebuild 821 BLAKE2B 8ba8afa6b5b386d501b2025443d9a237d6949fc8762fed0572ecd61850b57960cf498120bb3e653bb746e53f17b4216bb6372d415e30bd0634f47e5f567f1ec1 SHA512 d67a3a3021a7d9acf8c485c0cafa5c04d1165905ccc3c84d74586ead84dcfe922000fb5666ac15372b3d0529cb9bf94026233b8f821a189099339be7b4a8e8b7
 EBUILD votca-tools-1.6_rc1.ebuild 854 BLAKE2B ee6c6234021d9a903a611fe75c64c612ea8c3c35c048c0663dfbff91d289410966d9aef8ca2533895b33d734d7333e7bb3dba9ae88db3b387dbee199bef2c2e5 SHA512 137867d077e0c84d49a76553f00e2182350643822c6961103aba45810b236e2333f3a9092b5572cb1588d658e0c1111aa2ffdc83e6b679d84af2d7c885fbb0da
 EBUILD votca-tools-9999.ebuild 817 BLAKE2B 07c6d4667bf74c45a962fea7ad7af4d3e40910d7fb4c38713e30193c9d58d2553c693b28db361f7c0b7d16df2d05636fedc648a18934b77bd6f7faeefebb6b5c SHA512 4be6e932cb3a573465c907956d79f6f85c3f2d38bd867ce8488afdafdc4e005c3d953f5e8cfdc4a422ff16e39a8d844ed5e84e53e1155a800ab3844ffbd8a32c
 MISC metadata.xml 455 BLAKE2B 8f698a0352731cfaa42f58ad669e7a509fbc95082c9accedef69d91628528e29b55a03256f035446f1d1da9a8ac569f17136a2e05e87bb4300cbd4f4af9639ea SHA512 db6cffcdbb0d1b791e8d96338ea9226161d14130d4e6760fdc3997751fbae20e2452529a6403c5ddd0b0a30274f51465fea7edae60fc9655291bd0497f316c8d
diff --git a/sci-libs/votca-tools/votca-tools-1.6.ebuild b/sci-libs/votca-tools/votca-tools-1.6.ebuild
index 6088d1e095d9..c6ae6196c3d7 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.ebuild
@@ -9,12 +9,12 @@ inherit cmake-utils eutils multilib
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-macos"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	KEYWORDS=""
+	KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Votca tools library"
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
commit	f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree	8bfecb640b7b6403d7a3d662d923eed630033da7 /sci-libs
parent	1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)