gentoo resync : 03.07.2021

17 files changed, 79 insertions, 254 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index ec897f8ebcc2..e1b1ebbb6114 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest
index e7489356cd7f..388464c35836 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -1,6 +1,6 @@
 DIST arpack-3.8.0.tar.gz 1014494 BLAKE2B 6daf8a237fdfce527935d777292df150b2f78892d9975f8696a37024fcb78174b29afd300e7abca2684c1907eeda658eb4478f09f580835896c0e10d106cdbbd SHA512 8969c74c4c0459ea2d29ea49d5260f668fd33f73886df0da78a42a94aea93c9f5fb70f5df035266db68807ab09a92c13487a7a4e6ca64922145aade8a148a2de
 DIST tutorial.ps.gz 105599 BLAKE2B 99570e6a0cc1c020b9c271e8ce1cc224f69ff5333cc818c10b063dc8ffbaf66a9f5c6ede99541b4212286d422146b1c4e332eba7e1635c99efa0e4c2620f0630 SHA512 a7b8fefd1a572ed477ae208d49094c1c65c9368990d12de9b3528e33fed546c947659f74e54a810d04154b4a1b0f9a94bcba4db0cf59d379e20786a261066aa4
 DIST ug.ps.gz 248543 BLAKE2B ac010aef470060636fa00360636ba093f0d24d219fa927c79fb1726b798160eda74fa8b4be6c7dff94f5759efcf30afa99ad310e7959115e028738beb8aa125d SHA512 3349117fb10b07207ffbab2ffa31b406d026855ea4c16e8649b14c7d70bc94e11b5730672e34acd654817799136d4bd76569ac50ec78d787df5582d18ed61328
-EBUILD arpack-3.8.0.ebuild 1371 BLAKE2B 1f08fa2ecd79c6cd3ab90d89a99e7fffcefef0f9e936e216fafc94329efa7731858bf85d2f81869f7a26581bb6d3573f34835fb94a4a078a690b61e8ae4b61d2 SHA512 cd5f4eceb41a956bef0339def569bf103a1cae9b7d5379e4e4996ab3e08219d197b7495f8d7639b91762128e2a62f1152463c4677c71c7ea8841b7cb41982fe9
-EBUILD arpack-9999.ebuild 1312 BLAKE2B a0d2b9895489d5072ff6127d4df0cefb9ea9ede42d826edda67c1bf46aafc443fa5fb640dafb213e10eab3acde4d13e5d1ba6f86434df2541263fdbf3303fc32 SHA512 3ea7dc8d88cd389fdea1096fbd34a4961f29460b7d5ab6a5b11bde3653652e3296af5ee6b0f4dabba9c21b80c9bccefd98c1fa3b37ca9a17154f95b63fbdc890
+EBUILD arpack-3.8.0.ebuild 1378 BLAKE2B 31466ee8692025c93ac21531d21e3bbdde31734eeac8ab79c4d4102f79c370851419dc3777e4cfb0593102bca4c9c0947d616212e6777632568058e9ccb5ae97 SHA512 d048bf148107fc98356a6efcfcb0284e0ea126d2e6f69234586f8cea6c313e1f869d050bc80364c594d5fba00ac194cfb3763c77a8eb316a69678d1681b0172c
+EBUILD arpack-9999.ebuild 1319 BLAKE2B 49fbaa5570e5e8003088dd85a0997500de6a234cb56fcfde963f96819d4dbdeee287c4775ce91fc2b2762b169414db21e638cf16c20b854d06dff452805e95aa SHA512 8c621efbf4fcce03e4d79b8faccf89731e16771f5f2ef244560aeb692b2c29285ae80d92852e0e8a4d437efffedeb039b98aa8afbfcff3fa8cd1654dd265eafe
 MISC metadata.xml 974 BLAKE2B bacece5871d9ce2a71f9a3a41ed89813f1be8b2a6633a8a0fdee407b8f2dcc6761381baeeba013544311d4707d57031ec28cd21757e57c2446a1d534d0340bde SHA512 105367be7e8ae203d3dac02f20d87c3d142cf8e0fec249828530a43bd1b3ea4bdb0b651b4b54fffa09bf89ee6b5bb9566a897ca4bf90ddf47c93d99e3eb5fb5c
diff --git a/sci-libs/arpack/arpack-3.8.0.ebuild b/sci-libs/arpack/arpack-3.8.0.ebuild
index 44b5bce59959..6782aa9cdbfa 100644
--- a/sci-libs/arpack/arpack-3.8.0.ebuild
+++ b/sci-libs/arpack/arpack-3.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples mpi"
 
 RDEPEND="
diff --git a/sci-libs/arpack/arpack-9999.ebuild b/sci-libs/arpack/arpack-9999.ebuild
index 2cab409d95ab..763e76faf7ec 100644
--- a/sci-libs/arpack/arpack-9999.ebuild
+++ b/sci-libs/arpack/arpack-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/opencollab/arpack-ng"
 else
 	SRC_URI="https://github.com/opencollab/${PN}-ng/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}/${PN}-ng-${PV}"
 fi
 
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 94a65f8252bb..9b31d94d1c60 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,4 +1,4 @@
 DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf
-EBUILD fftw-3.3.9.ebuild 4136 BLAKE2B aa00e8fc60c612cc764ee31628c07217ae099c52162e408bd12b6a44d9640545490c136b47819db591a44e14bbaadecb290effce0fd5ed495dbe458d2e6cab3a SHA512 0a66d6d31fe30607f9102625b5b5b8866a1c89eed7946114996eb1bd18ed44ce65ae269c5e8b7651e448d10de8f3ac235475229cef848d7169fba6a226996aa4
+EBUILD fftw-3.3.9.ebuild 4143 BLAKE2B 5ad7571dc1863e48762379899615f96cd81317ce8f79e37117c47b099ab1f38bc62a74f0bf8fb4834ddbf8866d8ef6fcb06f0764e974d55b90d73d11d401b44f SHA512 6aa8926f33b7246cbef3ac579ab893def414e79d0e8fd519e1f26df8d7e07d9c64e8f083961191cc1b6e171dbb3c9d97be6cdcc597d73d282434c7597ee5e29f
 EBUILD fftw-9999.ebuild 4062 BLAKE2B 2cdb80fdc4d24ea3af6ec1ffc2b73450c76e735130d22e8e01cb479d3c24b5f2bd4926a947a937340988447863bf7d1b222702a337139f5fc1e437556f7f5137 SHA512 0e44b6d0f2262ec0978ab00b909f0b2d6b4c92e0a6a5cc10e9e3317d2b9c7e1d4654315f618ed18f46aa68eeaaadfff29a7a38ef8a71c52435a1012307bbbe47
 MISC metadata.xml 959 BLAKE2B 91fa1956cbe25068165585a0e09bdf8e6c75c30a80ea27df46b99c9336ecdf1db13c49b62ea111a70eb2b5a456386ae745a77f28cf616858c8dbb4015f26735a SHA512 b3e3b65573de896dc2a5e3481a885dd172e3422858d9f967758dc9663d84e5809116aa41371e704d65173c400c03240798cea892e7ce5d211547d6db0a7f493e
diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index cb50c0ff6875..cbd8e2451a7e 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 5085afe3c978..50bebc23fafe 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,7 +1,9 @@
 DIST indilib-1.8.8.tar.gz 2234987 BLAKE2B 542c77e1826002e6268be82048014cdd7db2e58d6860bf21e058775acccbca49091218c24d5910f91705aebcf592e21f9008d780f39bb0458115b073319e3949 SHA512 0598b117fa582daaaf7c71524fd40866a37fcdc47b523b2ee1ed3301701c7351b027a3aab794e2e1405aec7293ecc6705d5f7852bb472cd21f40d7e3d7733d1d
 DIST indilib-1.8.9.tar.gz 2253721 BLAKE2B 477880606867ef58e334efeb8d891996187833cdb2f6344018a47c36ad51cfe983e645d92be3e868246bc8dd730d51927834ad73efb2db5edb2ce238ae6d32f6 SHA512 7d561e3619a1ff9e4ec96c54d339f5a85b6d2f4adde57630044fa7f2a8d70c74488ab22eb6221de62c0738bb9c9d187b86b67c4e47f4f98a237d4f69731fe906
 DIST indilib-1.9.0.tar.gz 2291283 BLAKE2B 1ef715cfb388a686ad2121e1fcf2589a5d88e68e5cbdb11d72797dead63032782c32e9ae16a88304e59bb0cbb53aaefb6b919125b566958884cc252607c876d5 SHA512 7b02afb24bb2b71a7384c045af6654bb1e19f9b0fe525b31ad0ff3ecc5f1c4b9d53e4f9af225ae3845bd17d44cb7cb2274a72e331498828a2098a9984488b28e
+DIST indilib-1.9.1.tar.gz 2322783 BLAKE2B 801071bf9190e4c27b4f3bf9fa2d9a44c4e297f7ee879061636f041d138a02db23525ee411782f3303a0d82bb2fc4d9d6489e2bda18f8e011bfa0d1b33595343 SHA512 d87c341efdaa8109059741738c69b9d6fb4b5dc68c774453eab378aa3784af29e8ed8469dba968a41c584fec1556fdbf0bd65cbb8aa65c2d9e1784d82e7bcc67
 EBUILD indilib-1.8.8.ebuild 1188 BLAKE2B 5afef4724dc43ac28d5f3d0c3449dd48c2caec78a1dfdda6dc1e27f32b014a542d965a17c0cd872fc3bb01b5baf3df41665a8a356f923cf50de608c052dddec7 SHA512 744705826bf3d864f6e847fe80839e0c5aba5ec075c64d5a0995f0e6241c88bb0b37131df0ec4272a3a0ee50bef2cb6fe771fc1e802e778d1dca1ec39becfa38
 EBUILD indilib-1.8.9.ebuild 1189 BLAKE2B 60b9a949b599b8a1a9772355a68d9257501a85eb1d6155e95afc0c7766ad13564e77e669f6341377674c0b5cd5886649e402944dedee06fe975642132a48add3 SHA512 96428f3be5dafea90c4ce14da7dae749c6124bd3824500928f3f25c89c4c26dd054b07e3536f9db30140d7a539775148f7fa9da739b0ff4c2da5fa22651cdc68
 EBUILD indilib-1.9.0.ebuild 1191 BLAKE2B 1047b62c8a546e70dd5fe645eebaf6f5c5615d9beed2d9d406197f731ebd13d72b1047ace29f3988d3ea097e561b1b52d718f33b33dde4ecf97c49c07ba3faf1 SHA512 388fb2ff99e874e029fa999f934459c156d821738f3d3c4327429b7604121d50a06276dc768bc0c2d1e770132cf665f35003d2923f6adb828f2e821ff2332e05
-MISC metadata.xml 460 BLAKE2B 4162b7e9639a47a1e701c92680c6eaaf1a112c4bda3a2e5313d50a788a7150cf8d6a9348cbed8fff941a75af9065959894dd0cce861a16946ed975a734e5386c SHA512 c626e10b7ce367dcdbe278ac7dcc32ece8e7de11fb3003da1c7fb6a58105d377f1ec2593ab8d1f7a06ce00dfb16e06a7fab66b9ebcc65250f1910ffc778ea6a6
+EBUILD indilib-1.9.1.ebuild 1262 BLAKE2B f64f108f2f1fc68ebd4055b997dc0550577d726224354f3d48d752e0487f473c7f912c04f8da43fcf08a92addb1a57c24574420b94a98fe38b4bf4a4b8b5dbb7 SHA512 9a10fe92cd75719051d1e179dcac41635cdaab9a0a7e7b5d245a86e27ff29dbc7d9a0a7485c92b4b07d788eff8c23483ff17bdf79b120ca6cd5cc4b2b40e6518
+MISC metadata.xml 561 BLAKE2B 08059ed028ee0f961a58fe6e8ba141160437cee5e944bc72ad82a5731b0f187cd412ea2669a2d726d7c602a0dc8c659a79672f0e3786f502db22754076498854 SHA512 c0f2d64008a0ea23319101a2ca7e928940c81a6959544410476f80482cc560e42c991228ec96a1f8eab7d333f22a8853a40162228953a6dad6e5cdb67e8f3d7b
diff --git a/sci-libs/indilib/indilib-1.9.1.ebuild b/sci-libs/indilib/indilib-1.9.1.ebuild
new file mode 100644
index 000000000000..10abb64d7eb3
--- /dev/null
+++ b/sci-libs/indilib/indilib-1.9.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev
+
+DESCRIPTION="INDI Astronomical Control Protocol library"
+HOMEPAGE="https://www.indilib.org/"
+SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/lib/}"
+
+LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+IUSE="ogg rtlsdr test websocket"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-misc/curl
+	sci-libs/cfitsio:=
+	sci-libs/fftw:3.0=
+	sci-libs/gsl:=
+	sci-libs/libnova:=
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/libusb:0
+	ogg? (
+		media-libs/libogg
+		media-libs/libtheora
+	)
+	rtlsdr? ( net-wireless/rtl-sdr )
+	websocket? ( dev-libs/boost:= )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? ( sys-kernel/linux-headers )
+	test? ( >=dev-cpp/gtest-1.8.0 )
+	websocket? ( dev-cpp/websocketpp )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DINDI_BUILD_QT5_CLIENT=OFF
+		-DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
+		$(cmake_use_find_package ogg OggTheora)
+		$(cmake_use_find_package rtlsdr RTLSDR)
+		-DINDI_BUILD_UNITTESTS=$(usex test)
+		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
+}
diff --git a/sci-libs/indilib/metadata.xml b/sci-libs/indilib/metadata.xml
index 6ceac2d83b89..b761949cc946 100644
--- a/sci-libs/indilib/metadata.xml
+++ b/sci-libs/indilib/metadata.xml
@@ -10,6 +10,7 @@
 		<remote-id type="sourceforge">indi</remote-id>
 	</upstream>
 	<use>
+		<flag name="rtlsdr">Enable support for devices supported by <pkg>net-wireless/rtl-sdr</pkg></flag>
 		<flag name="websocket">Enable support for WebSocket protocol</flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index 693002578ed6..be0a183e5668 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -3,7 +3,7 @@ AUX lapack-3.9.0-deprecated-headers.patch 7489 BLAKE2B c60377475eb9db34f9da14563
 DIST lapack-3.10.0.tar.gz 7630775 BLAKE2B fd2f920dd3f69eab471aa8c20d1b8178fb5c6e80337a2ed6948aba3ec639a816f8d368bb59ff6fb513b2f5cda9e61c2a547182f22fbc84a8c34191acefc3406a SHA512 56055000c241bab8f318ebd79249ea012c33be0c4c3eca6a78e247f35ad9e8088f46605a0ba52fd5ad3e7898be3b7bc6c50ceb3af327c4986a266b06fe768cbf
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
 DIST lapack-3.9.0.tar.gz 7534567 BLAKE2B 408013a11a72e0262d144adfdf6db28a6efa3bb5446f9ff959bb88fe10459dfa621149ed0144630a55e73e3b5be3c704269a716eb195f6db7b39d345b4db8270 SHA512 424956ad941a60a4b71e0d451ad48db12a692f8a71a90f3ca7f71d6ecc1922f392746ea84df1c47a46577ed2db32e9e47ec44ad248207c5ac7da179becb712ef
-EBUILD lapack-3.10.0.ebuild 3064 BLAKE2B 6505b36b4c85807bbc2661297375d2088c23f58f0721e067e8f5d8860c26c2e5e5701030f3832e92667ecbb062af220ad06743abe0c468bf2620007d43ddcebf SHA512 5eb93a0f2d35f82e513f74afa1b7d92404e79c9ac4ee75c1c2a5f651d638dca45872f94fa4fdfa8342c77cbf53e04e1a602fc664e46d6f0f903318f0b1082b03
+EBUILD lapack-3.10.0.ebuild 3071 BLAKE2B 2fff7ae38387a78711c96d5b2226dd74b4373405bce143e9f41c12293c9de8f817b718d19ffb765d6953c648f42701f8db1d739fe00c508b2c9ab4dbe06fd662 SHA512 e9ad5b847516501ce0800681977df05f8d2d0067b8f8ea2f52a0d8f7484561371e4ffa45f8b3b232254db91695da058efb015c5315f80fa75b6f4671073bfb6e
 EBUILD lapack-3.8.0-r1.ebuild 2892 BLAKE2B 8aa139fdb09e219c539ade5c873dcc2f3d8e919daa4cefef4984484b0288799dbfddea33b74f2d5c88dbc7bab95109e4ad421aa32dde82059571cafb600fbbb0 SHA512 e8c1721460ed64ea9e1366c47fc36782f717d7bf87b3ab2ece988fe79373ec956f9c76cfcc729ddf5c984c3150ba4183ab5220da19f0fd3818a501b3f72c4aa1
 EBUILD lapack-3.8.0.ebuild 2840 BLAKE2B de601370663d749b99a65b28611ac24c73704c6ffa4998a5b430eba3ce70140de0a4ef3350cc564841fefd4d6fd0015602c481bfedc9165ab7e0fd894d46d72c SHA512 899e9d9e8687228ae8bb3f33badb7f2c102a3d1ec618d6236b35ffeaa2fcd6173e0b69bc2b60405cc319b5cf854738aaa6b28258442e7e242ff3ee697d70b1e1
 EBUILD lapack-3.9.0-r1.ebuild 3120 BLAKE2B ecafcba61f6320601aa3891f49f9a9a65eb5a029228d8d46cc0c44e06906f49922f94507c8d44751b701877b19ab42fc48047c6f49b8f827aa6b27cf8749d806 SHA512 49b6125480abf08914ebb1f8df85a1641edfa1d43e6f62a6c8e77ef9a38c40810692c7e02db1066d80611c11c85b7326613f88c1352bc8849846b7ef1d5431ed
diff --git a/sci-libs/lapack/lapack-3.10.0.ebuild b/sci-libs/lapack/lapack-3.10.0.ebuild
index baa91f484123..549450e21345 100644
--- a/sci-libs/lapack/lapack-3.10.0.ebuild
+++ b/sci-libs/lapack/lapack-3.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 # TODO: static-libs 64bit-index
 IUSE="lapacke deprecated doc eselect-ldso test"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index a307dd6d3383..86d815bdf190 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -2,6 +2,6 @@ AUX libsigrok-0.5.2-check-0.15.patch 917 BLAKE2B 39d042e99dc5a71fa79def033f7a306
 AUX libsigrok-0.5.2-ruby-swig-docs.patch 3085 BLAKE2B 865f38a8230762f58620c06b91dda8bfda405057c6733ef8dc27dbc7094817709ce03a3db1904e4c4ce3ecbdc82da6d16c5719a3f93410a84f07cd4c4018a9ea SHA512 aa3fd492f736c0fe7af1c2ba4e41307731589cef78c480426113dcbae8abbf0ecc07bdc5e1b251103d5aa813f120c5ff7f76dd6d5e577ca8f2b9f29eac008025
 AUX libsigrok-0.5.2-swig-4.patch 1484 BLAKE2B 94c9bbde14f3175252677dedd50a7f3ff17bcc734382d93fbe3c65c71989dc72d0568535343bcb7764053075a2bac9c9f2d4e480d582a5371ac0d4a12bcab4a2 SHA512 34e568351624aeada4c3894be8a60cc0111be7c20ebe8e5395a1f81b2fc453a6a8228f575b95faad5140162a9d4fc5fc570546f42673f7275cb3910c73ffc8de
 DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092
-EBUILD libsigrok-0.5.2-r1.ebuild 3908 BLAKE2B a2e0b8cc23c4a9163b1ff42767a6ead7963189303933ddcf080b412a5ecdc8491a97ca68c4d29130bd0368a804deea7a0ba02835dffbf8bb4132f0f93d82a65f SHA512 6520270af9805d35688716911e2f6efa25c882d1059cf4b61fa94d3d8ca4ae011a915e21db08f71e74fd1842bfd9517def4b4b0c432161fa887db50540eb95bb
-EBUILD libsigrok-9999.ebuild 3672 BLAKE2B 4a1bcd64fd6263dc72ad8b7910e339ea89d88961aef4155f03cbded8ab5825df07b13273de207bf79fe255a12224b57875e2631b8588a2059a7ed627d6436a91 SHA512 992c54ae4a331ea971966b68cd25451b07ead5b7a4534de2b05bc7f2774904a66f0e3fbb6cf2c81cbab50a50c2284f2cbdfda1e7c6ea49dbe66cac3ac01aa0bf
+EBUILD libsigrok-0.5.2-r2.ebuild 3912 BLAKE2B 402bef147d2b91b20934d43fdee761f07ae73c6973f06f6c37097beacc172cdc236bab38f7647fd25424a96364a7f8cdd0f847929bb70929e8724769cc1b15b1 SHA512 a80e0d58c2262204f879f38cdaa97e4cb862bbe1b3801f31bb675e69376f871cfafee3720ec56457c5340bd7f6b7c06e1e7511acfda4f970d52eeac305d3ae99
+EBUILD libsigrok-9999.ebuild 3676 BLAKE2B 66dc520e44e8315956b11fd188f636fe5f3d7a0396fac2b806d2272e518db52356e70a1584accecea29a015c93aaf68cd44bfdb8df660a98431b21a9ff0a5ade SHA512 fd11ed14b08f4e1f584c7bc56c1c256409d687d2c4a730b2715f31823028b7a33d24cbe6b2857bfa0f4a98a4fa3e5efa1140b68c719f04d8b13a56a3dee580a8
 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
index 23601315e40f..441a3bc48621 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
@@ -45,7 +45,7 @@ LIB_DEPEND="
 	usb? ( virtual/libusb:1[static-libs(+)] )
 "
 RDEPEND="
-	java? ( >=virtual/jre-1.4 )
+	java? ( >=virtual/jre-1.8:* )
 	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	static-libs? ( ${LIB_DEPEND} )
 "
@@ -53,7 +53,7 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
 	cxx? ( app-doc/doxygen )
 	java? (
 		>=dev-lang/swig-3.0.6
-		>=virtual/jdk-1.4
+		>=virtual/jdk-1.8:*
 	)
 	python? (
 		>=dev-lang/swig-3.0.6
diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild
index 3ca48b69c906..02994b07b73a 100644
--- a/sci-libs/libsigrok/libsigrok-9999.ebuild
+++ b/sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -45,7 +45,7 @@ LIB_DEPEND="
 	usb? ( virtual/libusb:1[static-libs(+)] )
 "
 RDEPEND="
-	java? ( >=virtual/jre-1.4 )
+	java? ( >=virtual/jre-1.8:* )
 	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	static-libs? ( ${LIB_DEPEND} )
 "
@@ -53,7 +53,7 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
 	cxx? ( app-doc/doxygen )
 	java? (
 		>=dev-lang/swig-3.0.6
-		>=virtual/jdk-1.4
+		>=virtual/jdk-1.8:*
 	)
 	python? (
 		>=dev-lang/swig-3.0.6
diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest
index fec4b880e257..ac088ebd6401 100644
--- a/sci-libs/octomap/Manifest
+++ b/sci-libs/octomap/Manifest
@@ -1,4 +1,3 @@
-AUX qglqt5.patch 8456 BLAKE2B babaed86e83e1403668b9c3c8cc693775f87783ab11f1f2bd1e3304dce7087186bad406909718244e1c7fa99101e95401c663022e23156a56230d4f5efac67de SHA512 7a9cbcfd49a84ac79b18c183c8d6f6244a76fa0acefdf4adff5f3952e2ad33c1ff1b8227a906d58f40bdff3d83c168e8af2c812e90837b1f98893afd060227ea
-DIST octomap-1.9.5.tar.gz 1682781 BLAKE2B 1ced023160d10c424d4bff76a0481ffe6c87c5bf8133480afe6c47ee0ee116304a811293cc0af0b303ebcad370b7ce433e85212f070ac921a9c5be41905a94ea SHA512 e58c6d33c351b14e9596e18a8702715d167c136fd029b1078ddd13a5926fe451d3b619231b5a8ccfb64b6e5fc6db8b57e6ef329099828d2f5195c0988700b581
-EBUILD octomap-1.9.5.ebuild 1689 BLAKE2B 169c1a5e542e61cf5a3c9dc0774cac2afd4dab5052d49058da0c6c8bc70be0a5a4d0165a2dc74d798b71d4eec60288cf884cb4df8e0585a973f335297e246d4f SHA512 9c6ed3429728027d951c4298aba8f6762a35efeba50575ab4dff6c5c49e752842f84ec71f66d1febbd506531c1f4ec96abe74bc17c58dad7f4066ea61b8f68e0
+DIST octomap-1.9.7.tar.gz 1684088 BLAKE2B 357b574f770d553a51c936c84772c729754a822e1c1e840a179a2cb3d3ef1b15f1c7173a4333b1262b10aa5d2f64d1b1c063ad90d4cc0edfcbaee9799ceb24a8 SHA512 639ff65cf020865d5302ba9785089782aec1e46496982c11bbf86919b6938c01c7921d84e60880091b89a949dd05f4d1151871f63503d19342462b74e6791ddd
+EBUILD octomap-1.9.7.ebuild 1601 BLAKE2B b3e8132cf65668da2937c6d3d593a2249bb9b97eaef797bc92d52748595dfe2bf3d5fdacf0bdcfc47c5ef453016d246d0f71000487701443b3f384730abeaad1 SHA512 13bdaee3002f14d2467ed5a6a15f50c5183caee0c9e7bc5c31eb4683d416f076a47b30d63da4274db721054c0992c7db9c8e9d40ff6ccce8eb83621098ae53ea
 MISC metadata.xml 703 BLAKE2B 52e5edafca7a58ff0efddeea0eb60894c9bd26c5360fb77c41982edf0b27dec9517bb0470049d92dee05cc242effc7bb2e253a275f6e5d422e7e214676f7ffe8 SHA512 66b3c9143aea83a044a719031b4eb0d140e599048885ca6bb02e74ebebbbd2e9abccf11dc0af32e6ce94d3849dcf639ebaf34ff2c8d6e34f32767e08e465c6b0
diff --git a/sci-libs/octomap/files/qglqt5.patch b/sci-libs/octomap/files/qglqt5.patch
deleted file mode 100644
index 3fad0a0fc63f..000000000000
--- a/sci-libs/octomap/files/qglqt5.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-Index: octomap-1.9.0/octovis/src/ViewerGui.cpp
-===================================================================
---- octomap-1.9.0.orig/octovis/src/ViewerGui.cpp
-+++ octomap-1.9.0/octovis/src/ViewerGui.cpp
-@@ -286,7 +286,7 @@ void ViewerGui::showOcTree() {
-   m_mapSizeStatus->setText(size);
-   //}
- 
--  m_glwidget->updateGL();
-+  m_glwidget->update();
- 
-   // generate cubes -> display
-   // timeval start;
-@@ -299,7 +299,7 @@ void ViewerGui::showOcTree() {
-   //    gettimeofday(&stop, NULL);  // stop timer
-   //    double time_to_generate = (stop.tv_sec - start.tv_sec) + 1.0e-6 *(stop.tv_usec - start.tv_usec);
-   //    fprintf(stderr, "setOcTree took %f sec\n", time_to_generate);
--  m_glwidget->updateGL();
-+  m_glwidget->update();
- }
- 
- 
-@@ -983,7 +983,7 @@ void ViewerGui::on_actionSelection_box_t
-   m_glwidget->enableSelectionBox(checked);
- 
- 
--  m_glwidget->updateGL();
-+  m_glwidget->update();
- }
- 
- void ViewerGui::on_actionHeight_map_toggled(bool checked){
-@@ -1040,7 +1040,7 @@ void ViewerGui::on_actionAxes_toggled(bo
-       it != m_octrees.end(); ++it) {
-     it->second.octree_drawer->enableAxes(checked);
-   }
--  m_glwidget->updateGL();
-+  m_glwidget->update();
- }
- 
- void ViewerGui::on_actionHideBackground_toggled(bool checked) {
-@@ -1048,7 +1048,7 @@ void ViewerGui::on_actionHideBackground_
-   if (getOctreeRecord(DEFAULT_OCTREE_ID, r)) {
-     if (checked) m_glwidget->removeSceneObject(r->octree_drawer);
-     else         m_glwidget->addSceneObject(r->octree_drawer);
--    m_glwidget->updateGL();
-+    m_glwidget->update();
-   }
- }
- 
-@@ -1142,7 +1142,7 @@ void ViewerGui::on_actionOctree_cells_to
-       it != m_octrees.end(); ++it) {
-     it->second.octree_drawer->enableOcTreeCells(enabled);
-   }
--  m_glwidget->updateGL();
-+  m_glwidget->update();
- }
- 
- void ViewerGui::on_actionOctree_structure_toggled(bool enabled) {
-@@ -1150,7 +1150,7 @@ void ViewerGui::on_actionOctree_structur
-       it != m_octrees.end(); ++it) {
-     it->second.octree_drawer->enableOcTree(enabled);
-   }
--  m_glwidget->updateGL();
-+  m_glwidget->update();
- }
- 
- void ViewerGui::on_actionFree_toggled(bool enabled) {
-@@ -1158,7 +1158,7 @@ void ViewerGui::on_actionFree_toggled(bo
-       it != m_octrees.end(); ++it) {
-     it->second.octree_drawer->enableFreespace(enabled);
-   }
--  m_glwidget->updateGL();
-+  m_glwidget->update();
- 
- }
- 
-@@ -1176,24 +1176,21 @@ void ViewerGui::on_actionSelected_toggle
-   //   } else{
-   //     m_octreeDrawer->clearOcTreeSelection();
-   //   }
--  //   m_glwidget->updateGL();
-+  //   m_glwidget->update();
-   // }
- }
- 
- 
- void ViewerGui::on_action_bg_black_triggered() {
-   m_glwidget->setBackgroundColor( QColor(0,0,0) );
--  m_glwidget->qglClearColor( m_glwidget->backgroundColor() );
- }
- 
- void ViewerGui::on_action_bg_white_triggered() {
-   m_glwidget->setBackgroundColor( QColor(255,255,255) );
--  m_glwidget->qglClearColor( m_glwidget->backgroundColor() );
- }
- 
- void ViewerGui::on_action_bg_gray_triggered() {
-   m_glwidget->setBackgroundColor( QColor(117,117,117) );
--  m_glwidget->qglClearColor( m_glwidget->backgroundColor() );
- }
- 
- void ViewerGui::on_savecampose_triggered() {
-Index: octomap-1.9.0/octovis/src/ViewerWidget.cpp
-===================================================================
---- octomap-1.9.0.orig/octovis/src/ViewerWidget.cpp
-+++ octomap-1.9.0/octovis/src/ViewerWidget.cpp
-@@ -67,13 +67,12 @@ void ViewerWidget::init() {
- 
-   // background color defaults to white
-   this->setBackgroundColor( QColor(255,255,255) );
--  this->qglClearColor( this->backgroundColor() );
- }
- 
- void ViewerWidget::resetView(){
-   this->camera()->setOrientation((float) -M_PI_2, (float) M_PI_2);
-   this->showEntireScene();
--  updateGL();
-+  update();
- }
- 
- 
-@@ -98,7 +97,7 @@ void ViewerWidget::enableHeightColorMode
-   for(std::vector<SceneObject*>::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) {
-     (*it)->enableHeightColorMode(enabled);
-   }
--  updateGL();
-+  update();
- }
- 
- void ViewerWidget::enablePrintoutMode(bool enabled) {
-@@ -106,7 +105,7 @@ void ViewerWidget::enablePrintoutMode(bo
-   for(std::vector<SceneObject*>::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) {
-     (*it)->enablePrintoutMode(enabled);
-   }
--  updateGL();
-+  update();
- }
- 
- void ViewerWidget::enableSemanticColoring (bool enabled) {
-@@ -114,12 +113,12 @@ void ViewerWidget::enableSemanticColorin
-   for(std::vector<SceneObject*>::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) {
-     (*it)->enableSemanticColoring(enabled);
-   }
--  updateGL();
-+  update();
- }
- 
- void ViewerWidget::enableSelectionBox(bool enabled) {
-   m_drawSelectionBox = enabled;
--  updateGL();
-+  update();
- }
- 
- 
-@@ -145,7 +144,7 @@ void ViewerWidget::setCamPosition(double
-   camera()->setPosition(qglviewer::Vec(x, y, z));
-   camera()->lookAt(qglviewer::Vec(lookX, lookY, lookZ));
-   camera()->setUpVector(qglviewer::Vec(0.0, 0.0, 1.0));
--  updateGL();
-+  update();
- }
- 
- void ViewerWidget::setCamPose(const octomath::Pose6D& pose){
-@@ -161,12 +160,12 @@ void ViewerWidget::jumpToCamFrame(int id
-   } else {
-     std::cerr << "Error: Could not jump to frame " << frame << " of " << kfi->numberOfKeyFrames() << std::endl;
-   }
--  updateGL();
-+  update();
- }
- 
- void ViewerWidget::deleteCameraPath(int id) {
-   if(camera()->keyFrameInterpolator(id)) {
--    disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(updateGL()));
-+    disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(update()));
-     disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated()));
-     disconnect(camera()->keyFrameInterpolator(id), SIGNAL(endReached()), this, SLOT(cameraPathFinished()));
-     camera()->deletePath(id);
-@@ -243,7 +242,7 @@ void ViewerWidget::playCameraPath(int id
-     m_current_camera_frame = start_frame;
-     kfi->setInterpolationTime(kfi->keyFrameTime(start_frame));
-     std::cout << "Playing path of length " << kfi->numberOfKeyFrames() << ", start time " << kfi->keyFrameTime(start_frame) << std::endl;
--    connect(kfi, SIGNAL(interpolated()), this, SLOT(updateGL()));
-+    connect(kfi, SIGNAL(interpolated()), this, SLOT(update()));
-     connect(kfi, SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated()));
-     connect(kfi, SIGNAL(endReached()), this, SLOT(cameraPathFinished()));
-     kfi->startInterpolation();
-@@ -252,7 +251,7 @@ void ViewerWidget::playCameraPath(int id
- 
- void ViewerWidget::stopCameraPath(int id) {
-   if(camera()->keyFrameInterpolator(id) && camera()->keyFrameInterpolator(id)->interpolationIsStarted()) {
--    disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(updateGL()));
-+    disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(update()));
-     disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated()));
-     disconnect(camera()->keyFrameInterpolator(id), SIGNAL(endReached()), this, SLOT(cameraPathFinished()));
-     camera()->keyFrameInterpolator(id)->stopInterpolation();
-@@ -261,7 +260,7 @@ void ViewerWidget::stopCameraPath(int id
- 
- void ViewerWidget::cameraPathFinished() {
-   if(camera()->keyFrameInterpolator(m_current_camera_path)) {
--    disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(updateGL()));
-+    disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(update()));
-     disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated()));
-     disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(endReached()), this, SLOT(cameraPathFinished()));
-     emit cameraPathStopped(m_current_camera_path);
-@@ -292,7 +291,7 @@ void ViewerWidget::setSceneBoundingBox(c
- void ViewerWidget::addSceneObject(SceneObject* obj){
-   assert (obj);
-   m_sceneObjects.push_back(obj);
--  updateGL();
-+  update();
- }
- 
- void ViewerWidget::removeSceneObject(SceneObject* obj){
-@@ -304,7 +303,7 @@ void ViewerWidget::removeSceneObject(Sce
-     else
-       ++it;
-   }
--  updateGL();
-+  update();
- }
- 
- void ViewerWidget::clearAll(){
-@@ -364,7 +363,6 @@ void ViewerWidget::postDraw(){
-   glPushAttrib(GL_ALL_ATTRIB_BITS);
- 
-   glDisable(GL_COLOR_MATERIAL);
--  qglColor(foregroundColor());
- 
-   if (gridIsDrawn()){
-     glLineWidth(1.0);
diff --git a/sci-libs/octomap/octomap-1.9.5.ebuild b/sci-libs/octomap/octomap-1.9.7.ebuild
index b38b3ab44bfe..9d9bd32c85f7 100644
--- a/sci-libs/octomap/octomap-1.9.5.ebuild
+++ b/sci-libs/octomap/octomap-1.9.7.ebuild
@@ -30,9 +30,6 @@ BDEPEND="${RDEPEND}
 	)
 "
 
-# https://github.com/OctoMap/octomap/issues/194
-PATCHES=( "${FILESDIR}/qglqt5.patch" )
-
 src_prepare() {
 	rm -r octovis/src/extern