gentoo resync : 22.06.2019

29 files changed, 88 insertions, 432 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index c1131dbd6543..19eac2018d83 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index f0a3b555bf09..67aed4358fc7 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -1,4 +1,4 @@
-DIST bees-0.6.tar.gz 124049 BLAKE2B 7a2d77366758325cebbc51767781a3eff4fa52180b53ebf5eb982433bfc1c80acd4f3befa5968c888be443815e6231625e9ecc2763c35e33e5ed55c13bd702bc SHA512 bb288da8d2e0fad100dc40e3f9060055220e0ec948bc571a1cb06a7d78d0d0e6db30164e7dbde040c264c496cb59d50bb0694dd9432a8229e04f2cdc33bab31d
-EBUILD bees-0.6.ebuild 2099 BLAKE2B ca8f34586b0005dff546cc251be3696a3415c120847026e1d719f7e463ea82f5069730402d609c3447f3902eae494b4ec3d85fad783160fba01fdf893af45db2 SHA512 5a0a8a7b5a11f2bd5e2695e595c5688793ac314f1e5bd96b4a69783e696ac40172a8cd6447474bbbd8c6cc6836863e5e8ed5c3f5a0dab09ee41b6c48cc51bd0a
+DIST bees-0.6.1.tar.gz 124411 BLAKE2B fd6c875334cb610da94a4633351b7edc5a4ecf4ff467bb93c8559a1698fd29667d43955e0031498401ceeb3d8db13b5aeb80d2f16cd61e4d5a6607e432082c79 SHA512 cd44d21959d3ab4dda255f0a4a57bd3aeecfb9fee6ea26d68a1b5f84d407f75bd0b442ecf4fefc5ac856dcd9af035f44ceeff77a8926b164f97a15350efcee33
+EBUILD bees-0.6.1.ebuild 2163 BLAKE2B ff19324ee3197e256b0d51a2665daed49f0daaaf5c6fee8949535d8d7a1b4cc898bd6e0c431484c5417cbb46c8ace4b0c422d170aad937a66cb3f85acee6dd1a SHA512 d138eac94780292ee369468d03c71d122f531e8a2a26b7e70ad1e82bbe3b10e5ab72f8752f9b97d81e0cfd924f0a9d68c024173e220ae988f5bf2dc0a8fad5c0
 EBUILD bees-9999.ebuild 2099 BLAKE2B 88a9e370419db85e8f459626489a4dd06fbc55abd59ad367229d0aa4eb360bbbca0d4f46e4feada0d01d434a360bdac4015c3bfc063af3eb1940c3ada6a34665 SHA512 65745b2e09d1b7231a9ea29d78479f68f2d3a628353032ccaaf43245376e526721fae5f0a22a3586462634271a9798feb4608bc2349a48d2c5e7df7052bf5970
 MISC metadata.xml 591 BLAKE2B 8744c233c9718ce545165c6c8deaa455efe283cfe186aeee9876ad31195891b1255ae20851e5d5f52c19f4bb038558dffd7c2f3bd091af1b0b5c3d6e7a717975 SHA512 333a091d0869955cc3fce76c1d462b44715f8f1b89017c1b240cd5398e53ee1b370f7fc2d76407efa8a045c1088a195786da072d4d6ec30c1f09f42977839b20
diff --git a/sys-fs/bees/bees-0.6.ebuild b/sys-fs/bees/bees-0.6.ebuild
deleted file mode 100644
index dfda78fae30b..000000000000
--- a/sys-fs/bees/bees-0.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
-HOMEPAGE="https://github.com/Zygo/bees"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="tools"
-
-DEPEND="
-	>=sys-apps/util-linux-2.30.2
-	>=sys-fs/btrfs-progs-4.1
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~BTRFS_FS"
-ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if kernel_is -lt 4 4 3; then
-			ewarn "Kernel versions below 4.4.3 lack critical features needed for bees to"
-			ewarn "properly operate, so it won't work. It's recommended to run at least"
-			ewarn "kernel version 4.11 for best performance and reliability."
-			ewarn
-		elif kernel_is -lt 4 11; then
-			ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
-			ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
-			ewarn "running, it's recommended to run at least kernel 4.11."
-			ewarn
-		elif kernel_is -lt 4 14 29; then
-			ewarn "With kernel versions below 4.14.29, bees may generate a lot of bogus WARN_ON()"
-			ewarn "messages in the kernel log. These messages can be ignored and this is fixed"
-			ewarn "with more recent kernels:"
-			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
-			ewarn
-		fi
-		elog "Bees recommends to run the latest current kernel for performance and"
-		elog "reliability reasons, see README.md."
-	fi
-}
-
-src_configure() {
-	cat >localconf <<-EOF || die
-		LIBEXEC_PREFIX=/usr/libexec
-		PREFIX=/usr
-		LIBDIR=$(get_libdir)
-		DEFAULT_MAKE_TARGET=all
-	EOF
-	if use tools; then
-		echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
-	fi
-
-	# quickfix, will be removed when fixed upstream
-	sed -i "s/UNKNOWN/v${PV}/" src/Makefile || die
-}
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 9d8d7d1c870a..f0f9e765f913 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -1,7 +1,8 @@
-DIST cryfs-0.9.7-spdlog.patch.xz 28204 BLAKE2B 0905971713b2d709aa34bfd11333a0aaea21ba08bbed12eee20e668fae4c19b17fe25d2fecf17dfff67abadd896b5e3eda2344655e2fb32ea1f28961d850d158 SHA512 a09adf3d9ce47bd38bfc9e3b35f23df8ce971e6d115d7e6eaa907c7eab71e73d495bda9d1ab96e25b4a9a9d551fa07a71f37d17c9779679b3a95dfff1d311a86
-DIST cryfs-0.9.7.tar.xz 970588 BLAKE2B b3d79ed44c2280ef34bafa5613f51918093686da9a4637987745bd9601817033049115754e235b9a9a0f2045401182bc9cb48291173df6571887e9dec3f73636 SHA512 962c7e5e7ea153ed41cb47094b71bc41457e26203b94cc5e349c4d21e86630e32113c0193a248eee8ead41bede1c712d4c006150f84a6e1c2a0a0a7c02a1911b
+AUX cryfs-0.10.2-install-targets.patch 1296 BLAKE2B d43ada858124c67242fdf537ae3dd7e6b7bf3566ee564dae47aaa0b0ee3ae20c2beada683d8cda12518f89bda2919ec296c26d004c48a5bbc953aa6c23bc9dc8 SHA512 c097dcc9893dbe7f6098ab80d9937810856de16e6c34ede558dc30edf76571a2e1ef2fdd91fd8d14b2e40d5e32246d08d198cd3ba28f33d19442cd8c2332b4e7
+AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1ae5747ad01b796a6b7d8fd81b03be9bcde456591f94d2839c3be3a39dc2a9975ba503d8ad369bf838232157cf1385ef43d6 SHA512 815956b160f5f117a5c4f89babe088e6f485d89a58feb12d514ff0fd3d39752db6695f7a9a2e279d88eb3ef490394dd03ee8b0ca2d04f66793096fac742ae45c
+DIST cryfs-0.10.2.tar.xz 7902252 BLAKE2B 704d124ed32a8a958f400188af99498cedb706ccfc004131b677a113b6ab2733942becb1ab64fd06d0b9d5b39f7abe832b3b0669caaf2b6feb7c6577c8c7fbfd SHA512 e49dd6d1e402d968cc4df0e8ca0460a01a27e4e73482041dca0fa9cde905a91d12e2bda18d257a044335e32e316b9363cecf374eb2ca621924b394dd2fabcb8f
 DIST cryfs-0.9.9.tar.xz 977928 BLAKE2B 927d5f61be99a6400cfd53de6291e14ae32f446d281485901e758341f138a2efdfb7385b6c205db6f865dc83f6fbd9ede8fd1bb5a7957fb242624d78d2523eaf SHA512 18f0ce954dc9958b52a77aac85d4d30d03409e4f88c27ec3e904a6014f5257e12fe47a4f3bb628f6ebf3b5aa8cb9d3a59e0aee76d83a3f6bdd4ef864b66898aa
-EBUILD cryfs-0.9.7.ebuild 2195 BLAKE2B 59279b53ecd9acd372f6aeed6996ec5d33a20beb5599fbd7119f8f68c5445630e5bd39b5bf736dfb4f69766510897438ebbdf51b64697e26015dffc181f21179 SHA512 27c020e374be8e31072be14de1ce2f27e03466fb46e72e79b621d07ebeff834a729b0d7b1f2d626933ccf42e33dd874902d6b23bd100e5d8ea326429e50ff561
-EBUILD cryfs-0.9.9.ebuild 2417 BLAKE2B 12f97673529667e8896b28f0cb2eb2955566252d1c363dc96a8de5e1a07b99ed79f10f3695fd82afc3894f945397a8fd8c4f8dbd02b5d910987dc6c40e6d309a SHA512 67d73e33975be8d8afe588d9c91da6ac025576c6fb92f08b86b5ae2a55e131c49af6e826de2d453ce77fa6494c232be731cffad2c9050837d04669c62101d41c
-EBUILD cryfs-9999.ebuild 2416 BLAKE2B 0492c25b60c3c563691fcc6085d3c8e82454c366f900c58be6a776bb337c232f145a3a74e28a8db185a06136ed1bba8cbb1ff2e8f9aa0c213d406219622a5c07 SHA512 ca4e83f9adb1377997dca058ef897a8e574a14c877b5744755904b489f9bb767a58a1f6c9c01b5512d22fcd92db5dc18ffdf26228689c78116df49cc1faecc4d
+EBUILD cryfs-0.10.2.ebuild 2176 BLAKE2B 0d5d52ad79243859d2cd741db459d79d3ac9f5c69c8a77c3b5c0b60f5ea7e53e05f40075d9c45167e62c59667cbdc93439d3b82eee46c9cda1f361bccf328b8c SHA512 2fb435ce767b2844185fecc504adc2af1037c9048bfc64e2feb906c1312c36a98d1a09c12480deb810273ec6f34325597daf44e324fbe90fbb1763ef17b22757
+EBUILD cryfs-0.9.9.ebuild 2416 BLAKE2B 3ae72de8b7e913cbda42205d4eb60038e63b036cccf8924bb40c182c2bf89e18c672ce128d536aa61209b7c87c7de32c8a01daca968040ff2b8b8ea9cfc5692b SHA512 2c46dac9921a85eaf5a848a6a8cc84972f94713dc7af73fdc61f17f65b6adbdc07d698d2123bd9b0d00da479821981eabf3313d094af0cc2c61b9e5f3e590fd7
+EBUILD cryfs-9999.ebuild 2226 BLAKE2B 944388cd9bd2679567c2ee1b986a24b6b2b9781daa887329d4a2f9a457cf71dfe93bcbcdc66fc0d75a0e061c5b5440bfdb2bae13b5e58845ae54ccd1f97c5d09 SHA512 9d2397a6a4ef1cfc684fb751d891f725cba405509088805a4da1f8c5c32e6d00496b722140ecafca36ebf123dc116d89ec58df1625a0ffdc84bb697c3461c5b7
 MISC metadata.xml 605 BLAKE2B cfbabba2fc835d75ab64ff6ea27f87639d27b0d8591d5d318e2c1768f68cb48a50995b7a96b045ba6da3491c4a50219a8a69de6a2efc28325b3bc852b4abf213 SHA512 e7b1aba09cebc2786c664b1f9dbbfeb7baff97536af721953c4eb2dc10d84c97e02277fa5c4532f8bb022a344731d6ea65be81cb3cc88c25d4dea70dcd6ce250
diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild
deleted file mode 100644
index fa5832c7cd9f..000000000000
--- a/sys-fs/cryfs/cryfs-0.9.7.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR=emake
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
-HOMEPAGE="https://www.cryfs.org/"
-
-SLOT=0
-IUSE="libressl test update-check"
-
-LICENSE="LGPL-3 BSD-2 MIT"
-# cryfs - LGPL-3
-# scrypt - BSD-2
-# spdlog - MIT
-
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cryfs/cryfs"
-else
-	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz
-	https://dev.gentoo.org/~johu/distfiles/${P}-spdlog.patch.xz"
-	KEYWORDS="amd64 ~arm x86"
-	S="${WORKDIR}"
-fi
-
-RDEPEND=">=dev-libs/boost-1.56:=
-	>=dev-libs/crypto++-5.6.3:=
-	net-misc/curl:=
-	>=sys-fs/fuse-2.8.6:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=( "${WORKDIR}/${P}-spdlog.patch" )
-
-# tests work, but let install fail
-# revisit with 0.9.8 version bump.
-RESTRICT="test"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove tests that require internet access to comply with Gentoo policy
-	sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die
-
-	# remove non-applicable warning
-	sed -i -e '/WARNING! This is a debug build. Performance might be slow./d' src/cryfs-cli/Cli.cpp || die
-}
-
-src_configure() {
-	# upstream restricts installing files to Release configuration
-	# (CMAKE_BUILD_TYPE does not affect anything else)
-	local CMAKE_BUILD_TYPE=Release
-	local mycmakeargs=(
-		"-DBoost_USE_STATIC_LIBS=off"
-		"-DCRYFS_UPDATE_CHECKS=$(usex update-check)"
-		"-DBUILD_TESTING=$(usex test)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local TMPDIR="${T}"
-	addread /dev/fuse
-	addwrite /dev/fuse
-	local tests_failed=()
-
-	for i in gitversion cpp-utils parallelaccessstore blockstore blobstore fspp cryfs cryfs-cli ; do
-		"${BUILD_DIR}"/test/${i}/${i}-test || tests_failed+=( "${i}" )
-	done
-
-	adddeny /dev/fuse
-
-	if [[ -n ${tests_failed[@]} ]] ; then
-		eerror "The following tests failed:"
-		eerror "$tests_failed[@]"
-		die "At least one test failed"
-	fi
-}
diff --git a/sys-fs/cryfs/cryfs-0.9.9.ebuild b/sys-fs/cryfs/cryfs-0.9.9.ebuild
index 61780cc28cc6..6410d2cde5d7 100644
--- a/sys-fs/cryfs/cryfs-0.9.9.ebuild
+++ b/sys-fs/cryfs/cryfs-0.9.9.ebuild
@@ -27,7 +27,7 @@ else
 	S="${WORKDIR}"
 fi
 
-RDEPEND=">=dev-libs/boost-1.56:=
+RDEPEND="<dev-libs/boost-1.70:=
 	>=dev-libs/crypto++-5.6.3:=
 	net-misc/curl:=
 	>=sys-fs/fuse-2.8.6:=
diff --git a/sys-fs/cryfs/cryfs-9999.ebuild b/sys-fs/cryfs/cryfs-9999.ebuild
index 12a15789f0d6..d401918aecc4 100644
--- a/sys-fs/cryfs/cryfs-9999.ebuild
+++ b/sys-fs/cryfs/cryfs-9999.ebuild
@@ -1,61 +1,66 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR=emake
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+EAPI=7
 
-inherit cmake-utils python-any-r1 flag-o-matic
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit cmake-utils flag-o-matic linux-info python-any-r1
 
-DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
-HOMEPAGE="https://www.cryfs.org/"
-
-SLOT=0
-IUSE="custom-optimization libressl test update-check"
-
-LICENSE="LGPL-3 BSD-2 MIT"
-# cryfs - LGPL-3
-# scrypt - BSD-2
-# spdlog - MIT
-
-if [[ "${PV}" == 9999 ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cryfs/cryfs"
 else
 	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S="${WORKDIR}"
 fi
 
-RDEPEND=">=dev-libs/boost-1.56:=
-	>=dev-libs/crypto++-5.6.3:=
+DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
+HOMEPAGE="https://www.cryfs.org/"
+
+# cryfs - LGPL-3
+# spdlog - MIT
+# crypto++ - Boost-1.0
+LICENSE="LGPL-3 MIT Boost-1.0"
+SLOT="0"
+IUSE="custom-optimization debug libressl test"
+
+RDEPEND="
+	>=dev-libs/boost-1.65.1:=
 	net-misc/curl:=
-	>=sys-fs/fuse-2.8.6:=
+	>=sys-fs/fuse-2.8.6:0
 	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )"
+	libressl? ( dev-libs/libressl:= )
+"
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
+	${PYTHON_DEPS}
+"
+
+pkg_setup() {
+	local CONFIG_CHECK="~FUSE_FS"
+	local WARNING_FUSE_FS="CONFIG_FUSE_FS is required for cryfs support."
+
+	check_extra_config
+}
 
 src_prepare() {
 	cmake-utils_src_prepare
 
-	# remove tests that require internet access to comply with Gentoo policy
-	sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die
+	# don't install compressed manpage
+	cmake_comment_add_subdirectory doc
 
-	# remove non-applicable warning
-	sed -i -e '/WARNING! This is a debug build. Performance might be slow./d' src/cryfs-cli/Cli.cpp || die
+	# remove tests that require internet access to comply with Gentoo policy
+	sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \
+		-i test/cpp-utils/CMakeLists.txt || die
 }
 
 src_configure() {
-	# upstream restricts installing files to Release configuration
-	# (CMAKE_BUILD_TYPE does not affect anything else)
-	local CMAKE_BUILD_TYPE
-	local -a mycmakeargs
-	CMAKE_BUILD_TYPE=Release
-	mycmakeargs=(
-		"-DBoost_USE_STATIC_LIBS=off"
-		"-DCRYFS_UPDATE_CHECKS=$(usex update-check)"
-		"-DBUILD_TESTING=$(usex test)"
+	local mycmakeargs=(
+		-DBoost_USE_STATIC_LIBS=OFF
+		-DCRYFS_UPDATE_CHECKS=OFF
+		-DBUILD_SHARED_LIBS=OFF
+		-DBUILD_TESTING=$(usex test)
 	)
 	use custom-optimization || append-flags -O3
 
@@ -63,12 +68,10 @@ src_configure() {
 }
 
 src_test() {
-	local TMPDIR
-	TMPDIR="${T}"
+	local TMPDIR="${T}"
 	addread /dev/fuse
 	addwrite /dev/fuse
-	local -a tests_failed
-	tests_failed=()
+	local tests_failed=()
 
 	for i in gitversion cpp-utils parallelaccessstore blockstore blobstore fspp cryfs cryfs-cli ; do
 		"${BUILD_DIR}"/test/${i}/${i}-test || tests_failed+=( "${i}" )
@@ -87,7 +90,6 @@ src_install() {
 	# work around upstream issue with cmake not creating install target
 	# in Makefile if we enable BUILD_TESTING
 	dobin "${BUILD_DIR}/src/cryfs-cli/cryfs"
-	gzip -cd "${BUILD_DIR}/doc/cryfs.1.gz" > "${T}/cryfs.1" || die
-	doman "${T}/cryfs.1"
+	doman doc/man/cryfs.1
 	einstalldocs
 }
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index dc8b21d3a6dc..6364db5cc239 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -8,10 +8,10 @@ DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2
 DIST cryptsetup-2.0.5.tar.xz 10476304 BLAKE2B cf1e335fce48a7bf835b2008dfc0a96ef35d344e2c9f6a0a5a2ff45644f9015311e99b8f9e05b0b23cad69d74f91dd1b7cdd766560fb6504e7453d6e46bea186 SHA512 bac3f5fde1be02d325c097f85e77aef44ce764c1bca7f0554cedd69b9444e5a5529f11b9ae74d36dc1977e88e11422a58dfa17e48559eac7f5e6c4ce332409ae
 DIST cryptsetup-2.0.6.tar.xz 10621424 BLAKE2B ecda2cb3c0a8a46b69519ab9ea9a1ece44fb21602cbce0751e52a16e5e493c7772fdc62c1151b95a783a847d9afd5a64f64bcac6673acba4bb90a417047c93cb SHA512 1fdb9068fe2b5825cef65323a9b788b5e043c1000e614e47e2b21ab3969e416653580aba639755ba936718ad612b986768029df5e07f3fa191db2bf29d2501ef
 DIST cryptsetup-2.1.0.tar.xz 10662576 BLAKE2B c79b24c986d5925aed31eddf8f271c3d0f12c89b3f99f953cfa39fe0d9dca2ab3dd2f6ea22141aca0148d6d533d197378b011561075ca26a14ca2e90500a1689 SHA512 f1b68e4d9d0ca2361fe9bdd51c60630dd4ab7a689b7be7756edf4dee12929d2356dd0658c9b940ffe27c033ef289efaf49daf21d250d37fdfa15394b5d821928
-DIST cryptsetup-2.2.0-rc0.tar.xz 10710468 BLAKE2B a65da89995c548af6de116b300dfde120f84e5e08e037f9b7d0b34d024ce4d1f1ab7599cedd45975a100fca90967ccc9a085023e2d453951816ce51cad0ca8e7 SHA512 ef168ee8757b7f9f6e7ffd5c310f2699ad4461c9886583b9a610f06c67996d688db060913c053da2f1f17090caaa07425ea735b7fcae50b2e1f32aa62f48e1a1
+DIST cryptsetup-2.2.0-rc1.tar.xz 10720888 BLAKE2B 6a8ee7d3ffa8d536627ba1be19e013ecfcdab793492ec59db676f0d017450be6cad8686337a7e341dac69ffd5f8f686e1262ff5b6e4b54f18d9c2e1e816b171b SHA512 a9875d3e20a99377ed3065ac9a4079968766b7774b2ea67226591f992932168278752dc762ef9843077e75da004f58e362327deb0981efbb0ce0928216aea2da
 EBUILD cryptsetup-1.7.5-r1.ebuild 4033 BLAKE2B 77146c613eefaf677f4a0f77cb773b48829f520f988fb37c7ebc2b1df2e8d6269a02562a2e2f959029f563e9c89e0591160bbc5e22ec35875e4775bf20ba1da0 SHA512 0397db7c62308400767776b3caa614b8fe2dec4545ee1416eafb9116f9e458a6e26008ece4df870f40bc6270cd1b4340746b8fabb5f90418c7d9f18de852cf78
 EBUILD cryptsetup-2.0.5-r1.ebuild 4151 BLAKE2B eb67cb9e3424b5444bf298fafeb3cbf050e5420b4a2137c75e437a13b2b8a1ff642b40186d37f10ee92785074833f833cad44eca3bc3e9c0f91fd710ac9fcc50 SHA512 71c6948ff51c919ac6052ad65355ffb620049049ef21fe6545d39bb6d56adb843d5de25b722911d979becca9945f7d05d7cf1b240bb0d5448513a4fa7baad8cd
 EBUILD cryptsetup-2.0.6.ebuild 4167 BLAKE2B 0aaa413b365a5b3986e3908709e54af38af8191c2086168076d380321c8577cc686826b7f57fb1671bdf45adf141630f65e815842f0cf4703636a8caf7cee46b SHA512 c707d533fcfc71e5adcd3eacd9556ae0d87c65b9e283008daafe5aaa29056ed175bf5354c08638454677b75e99f0f77d51a0ea76a0006bb8812d721a46e8cef7
 EBUILD cryptsetup-2.1.0.ebuild 4414 BLAKE2B 604a658160a0575b23d391a0f54f304010e90b55ce0157b8af08c92846aeccd50cbce157d34a3836c5fb1d8ecd19e87de99d2a0192a8005f24d7a47960fb8eb0 SHA512 c3f2af42843a159002a45ffa75aaa9ca5b42af310841db63679621b33378362a4a98ef15082f720fae4f529a7a006c16dc2e5911f0127aa0cdd0a92bc401b0ab
-EBUILD cryptsetup-2.2.0_rc0.ebuild 4420 BLAKE2B dbe506b39f4bf619ba67273c5e39dcffcadfb87bafadcca89f7c57b16d09e9c36b27681ed18523a2d14289d2d37bf00cf5f9207d8bf711ac11b86c8cbbc462bf SHA512 71deb108361f6bd7c716b3ed1398dff73308f03a1c574a8457e2a04ad3df4241dc95726f48fa7ac652d67702b0ab2b6f5bd06e55a333c7e349e79c18ff9bfecc
+EBUILD cryptsetup-2.2.0_rc1.ebuild 4420 BLAKE2B dbe506b39f4bf619ba67273c5e39dcffcadfb87bafadcca89f7c57b16d09e9c36b27681ed18523a2d14289d2d37bf00cf5f9207d8bf711ac11b86c8cbbc462bf SHA512 71deb108361f6bd7c716b3ed1398dff73308f03a1c574a8457e2a04ad3df4241dc95726f48fa7ac652d67702b0ab2b6f5bd06e55a333c7e349e79c18ff9bfecc
 MISC metadata.xml 1074 BLAKE2B b1a6789b42307eb919717d35dabb48fc060490e561a1b5d4b0a25a2ba4dfe1399a7bf564c5477be61a68b7b5248153843f6892f95893e36257b9d790f8501779 SHA512 d070c22187874175ae93078fc80f4d150da102557cc680c8dd324ffe21de533ad67b4478f0d83e385ef5d4e75541bb04fd8308697db0ebf6ecd9f1e11382847b
diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.0_rc0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.0_rc0.ebuild
deleted file mode 100644
index e0142bdc5218..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.2.0_rc0.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info libtool eapi7-ver
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
-SRC_URI="mirror://kernel/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-# cryptsetup does _not_ have a libressl backend. We only have this for REQUIRED_USE
-# and change "libressl" to "openssl" in our econf call.
-CRYPTO_BACKENDS="gcrypt kernel libressl nettle +openssl"
-# we don't support nss since it doesn't allow cryptsetup to be built statically
-# and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl +luks1_default nls pwquality reencrypt static static-libs +udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	static? ( !gcrypt )" #496612
-
-LIB_DEPEND="
-	dev-libs/json-c:=[static-libs(+)]
-	dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
-	argon2? ( app-crypt/argon2:=[static-libs(+)] )
-	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? (
-		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:=[static-libs(+)] )
-	)
-	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(+)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\(+\)\]}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
-
-pkg_pretend() {
-	if ! use luks1_default ; then
-		ewarn "WARNING! WARNING! WARNING!"
-		ewarn "You have chosen LUKS2 as your default format."
-		ewarn "This can break LUKS1 backwards compatibility."
-		ewarn "Enable \"luks1_default\" USE flag if you need backwards compatibility."
-	fi
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	local x cryptobackend
-	for x in ${CRYPTO_BACKENDS//+/} ; do
-		use ${x} && cryptobackend="${x/libressl/openssl}"
-	done
-
-	local myeconfargs=(
-		--disable-internal-argon2
-		--enable-shared
-		--sbindir=/sbin
-		# for later use
-		--with-default-luks-format=LUKS$(usex luks1_default 1 2)
-		--with-tmpfilesdir="${EPREFIX%/}/usr/lib/tmpfiles.d"
-		--with-crypto_backend=${cryptobackend}
-		$(use_enable argon2 libargon2)
-		$(use_enable nls)
-		$(use_enable pwquality)
-		$(use_enable reencrypt cryptsetup-reencrypt)
-		$(use_enable static static-cryptsetup)
-		$(use_enable static-libs static)
-		$(use_enable udev)
-		$(use_enable !urandom dev-random)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-
-	default
-}
-
-src_install() {
-	default
-
-	if use static ; then
-		mv "${ED%}"/sbin/cryptsetup{.static,} || die
-		mv "${ED%}"/sbin/veritysetup{.static,} || die
-		use reencrypt && { mv "${ED%}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
-	fi
-	find "${ED}" -name "*.la" -delete || die
-
-	dodoc docs/v*ReleaseNotes
-
-	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
-}
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 56b3a518bc0c..ccee0ccbe758 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,6 +1,4 @@
 AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f977308c429858817fce81520291fd49fb58e6c863474a45a2e3a674da33b5678fcd784a7d1e8bc9472bbe0995ae3dc SHA512 909d43fbe190400d4beabd9801bf554e38a5bb5a3545930883976f42a2090c8768e485183949269639ddeae5bae5490b37dc23f031c48d6c4fd4c9facf08b66b
-AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c031586ec6da49f8f13c0593754ce6f6a92fc35ed4ce2f0f6d9c53089e08bf3ee960df577543bba49 SHA512 c8ae0e1932e34e2078bb8a1ab47c6d2d489f832f7adb118668624d3f0695ebf8b3ac2468a8db98579ef30078eac6989421aae7d7893e30a50e5c35d0a00ad6a9
-AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1
 DIST fuse-2.9.8.tar.gz 4610904 BLAKE2B 803eebea510834676379df8c9514050efcf47d83c06ba1f5b5756d27f5c32d3a0cc199d826b0c041118c5d2260ff023f58432a0d7b623807c0a4af4da7c34eff SHA512 0a9b14d96c6f98f5c903baf00114bfff72f9aeb97224702bbed370516b2b582401d5b436fcef979918ffd85d69ba4a82c8f722c0b35ebd50f7aa5f4ddfdcf8ad
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST fuse-3.5.0.tar.xz 1021676 BLAKE2B 9e2ec6b5df75c3427ad99ca30f5c88cb1e2291ac05d005280f6a9b121abf978990e7ee84df83b8d866cc996b8fda7e99fdc626d1a24347472aacbfa2531182fe SHA512 953066a25ab2f67fd5a1f15e97f8d739271c42a6260aa29ccc7b9ffddb9c972d2797d93d9ff0d34c6b51a20f3254ef6f748c14f852603280b318b36899867a27
diff --git a/sys-fs/fuse/files/fuse-fbsd.init b/sys-fs/fuse/files/fuse-fbsd.init
deleted file mode 100644
index 27d90cc867f3..000000000000
--- a/sys-fs/fuse/files/fuse-fbsd.init
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-}
-
-start() {
-	ebegin "Starting fuse"
-	if ! kldstat -q -m fuse; then
-		kldload fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module"
-	fi
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping fuse"
-	if kldstat -q -m fuse; then
-		kldunload fuse >/dev/null 2>&1 || eerror $? "Error unloading fuse module"
-	fi
-	eend ${?}
-}
diff --git a/sys-fs/fuse/files/fuse.init b/sys-fs/fuse/files/fuse.init
deleted file mode 100644
index 6c99929c2266..000000000000
--- a/sys-fs/fuse/files/fuse.init
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-MOUNTPOINT=/sys/fs/fuse/connections
-
-depend() {
-	need localmount
-}
-
-start() {
-
-	ebegin "Starting fuse"
-	if ! grep -qw fuse /proc/filesystems; then
-		modprobe fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module"
-	fi
-	if grep -qw fusectl /proc/filesystems && \
-	   ! grep -qw $MOUNTPOINT /proc/mounts; then
-		mount -t fusectl none $MOUNTPOINT >/dev/null 2>&1 || \
-			eerror $? "Error mounting control filesystem"
-	fi
-	eend ${?}
-	
-}
-
-stop() {
-
-	ebegin "Stopping fuse"
-	if grep -qw $MOUNTPOINT /proc/mounts; then
-		umount $MOUNTPOINT >/dev/null 2>&1 || \
-			eerror $? "Error unmounting control filesystem"
-	fi
-	eend ${?}
-	
-}
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 93c26c253191..4616f864d154 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,14 +1,14 @@
 AUX device-mapper.conf-1.02.22-r3 15 BLAKE2B c8954f4cad3090e95c8ab985f7f93b65add66b9014351aab82d270c371c3b7571a73b37b2002664b50c21bb7dd494c7196857de75b41ca534cb15e0127f080ae SHA512 1846e0ca1be7170d4c0beb694a23aea4d19b24b99a248bb0f4e034286a6beede0a8efc474b0c237e33ee72c86c93b6238f2d5ea23e224765acba99c90633261e
-AUX device-mapper.rc-2.02.105-r2 3707 BLAKE2B 1f1f38fd377e77e082985146de8a32fb88f794e4db28d6790cccbc6a87b63b0d28617e5fa7eb4974e2dcf8a80265accf8b69ff0719fa3de1c6788e7d5a1bd705 SHA512 9940b1154a8c07cf2f2c975e209bfb1e78913d3ea77ac6334684a9b38c4f4bd34b349b71c078c9ad5700f554046771ee05e17f07b75dc4e7d839f1df2305cc4f
+AUX device-mapper.rc-2.02.105-r2 3704 BLAKE2B 7113396a7b7da28a82de68142504e3f2aefd53ab3e8c91a231fc47b1ad58925f6a6a68085ecc676d4d6ca277d7f456da1143e9dcca631a68e93c83b975085e46 SHA512 e3ddbfa3c273646f22b0f8d1ebeb8632c6c5bd165b0d990d7b3c6468da7e229f66f532eaf0ca4b73018d64781a21f2d2769c5307ca40c5981af2a935c31daed2
 AUX dmeventd.initd-2.02.184-r2 595 BLAKE2B fe87c9a034f9a9924c4c6e31365619cf5809a9756112925ca50233198ab052139f8151a81ee8db69fa6a7eda8e3aacaa128faa30e5d99a52d15f5a07a9da4179 SHA512 f46fa3d0a0a0047801c0d3a3817f9d7c5dbe0daa2237c2537f5a3faef3dd2d7030780471bb1ba19746c26ce6035092477c06806156718a7526e5222339fa01ec
-AUX dmeventd.initd-2.02.67-r1 565 BLAKE2B ca1f5d205191076114d4a89717b304df04a520a22630ed84e78550e83b9364e049457bacfcadcc8ca1328a78c97412a445fcf153871266355379eab423c38138 SHA512 c0f5317ab0cba700eab3b643fd134d8a23fe4b332c47fd94728e43dfdf97250561f60ecb47808d2c65e55cdec65cccbd51f264540c0d973b2df7ded4ec129c34
+AUX dmeventd.initd-2.02.67-r1 562 BLAKE2B 2c06d197a15cf2b59bdc31cea0381891739d549e91957ee1654a7286c28853ec31db19b88d08e38b7e7029ff575c409170ce0d26173df835ed97decfdfd21315 SHA512 a31cbf3d4b4c348e437a9373fc4b3584a36e5c39d75b3526b5192c91ab8856d9dd4d48ec263f8370fda6e7a343bac8ba4e4a1d57aa8029df6a468fc9a60f1410
 AUX dmtab 319 BLAKE2B 5753b72e44325e467c0e4ea1bbce8faafe1c5e2509d2e02a5ad428b39e531c655014a3b151f7bc57513aae74983a60cfe3034432ffd21d39716fc6893ec7da8f SHA512 a8cc69ff832eafd64d7e45854df3380a9c5f9648297e2606c5b9b47e0015c93c7da6ef3dfd35800f36a3371635fa1906605c524be82d6740fd435c7f6bf2807b
-AUX lvm-monitoring.initd-2.02.105-r2 963 BLAKE2B 2a193578c642e05a2a492fb025bdacd2594953405a58517bf6a93a04db29be03e16a33b2c5cd57c463f55f30fd47a4fb7766f52b149a298db4dcefed4ed30012 SHA512 dc13304e8d644a55f0490c84acc36b95f43fc0e86c4b44f85f54f6ed3213ad665454e7432b3621f307b3468af0c33525c24705f4a2783e35a26e02ff1c828779
+AUX lvm-monitoring.initd-2.02.105-r2 960 BLAKE2B 82e1d55032827b7b330bbdb09c74ffbd46503c6631c3eada7130f7bac540561c9dec0acffe331fef83315a47d006843de3bd2ff4ffb4c8be81a2d61cd47222d2 SHA512 75f24ce947335eb9726e73c19fc3bd6e60b3ed1253c483a8ce69f5dce26ca61756bb49fcaf75d1634263faf52a0bf10451a2717913c79594636dffaa4d4e336b
 AUX lvm.confd-2.02.184-r3 282 BLAKE2B dcc65a1e9634becb8a79d74fbadc5fa9880a1e497546817418f0df7668454d8cad1f52c9516f251833874ca5bac1a530970b8a94860057b05361c736935047ce SHA512 05818e09fc6d8fe8287283b832fa73b4d3ef539837f956b9bfa394d206c1e379a3227148040934ac690d77524f3f7b16ba0d262a11de268914b1d11afe3a3c97
 AUX lvm.confd-2.02.28-r2 173 BLAKE2B 4b9d115ed31b3777bd3c925b75bd0ebb186bace92b6d294e6a1ff7cdb7c206374a06738a73edc401a5547016a08721013fe3ad66b52d8cf08de75d030813ab2d SHA512 67b153cbc5c2327c15f042b3b5590c1d8fdf9823efb19c80192ac4dcf98e530efea8ecae0aaaa4a54b0e3e4907565aa21455b364df1dbe8f2e7dffa1c5d355d0
-AUX lvm.rc-2.02.105-r2 2960 BLAKE2B 40cdd0e6c3a717367fe6854524b5f355e952f2640823242e5fd18374e3a161e97fff6ce9ec7c052d25ea04f60e75cc2d89e2c48b0e218b62d917916e110c0461 SHA512 8d8ccac694110e3538aeb246244b1b129d960f35d54eb583d77e9d54bed243248b121262557fc0c69bc734a04ca35c0485428e65b1a4d06c438828a239053fae
-AUX lvm.rc-2.02.116-r6 3783 BLAKE2B 5150d5c15db03d65b43fd29a23043c2dbb16805a00f79fbec398980f93f9c490474a03b6b7d0d2748ac9a39619b81ac04f6aaa14e700322b09c3e1372f843cd2 SHA512 f819faf7844c3b946b437aee8eb5dd52bfdbb9b820a2024ad42166895e72e194898b16a34c44c69786539d19e5458c12a333f99db02c26589567bb6aabb23639
-AUX lvm.rc-2.02.172 4269 BLAKE2B a53fb5302293f7afb800400a0bb1e4f60ad8c3f7951c0872ecc3940016613faa1d141ab040beb66b3bb0b89ffe0db6be69d9924be071f57263b1c9a54eeaaa85 SHA512 1c2a246959420ab0e05e537a29b3c99c6be4a92c329cfc1c2955f0025333c2a1a48abaf864fde5b552e9c03aa31ca204c3ea49b69112f66f4df5fea7148f1953
+AUX lvm.rc-2.02.105-r2 2957 BLAKE2B 14496c663accdaada8d921c4e1d65fdcddd2208c5be6acc150794da72d21175663e358a3412eb0a74b0c64d0ebe3d443cc49ed06cac1696ad0edeab0ec9f1e04 SHA512 4237e3f9e748742d1bff7c3fb6e1fb1d6f2d21dce58e4aa74f0202d0aa7fd11d51ece61ba37a72142b4349506ab45067d20e181f7a20220f9203ba3a823ec606
+AUX lvm.rc-2.02.116-r6 3780 BLAKE2B e5a293e9f493a49776b539e30e6a8452e93ea3723e365042efd37480b07ded9ed818fb025ab44cce51cb8717513a9df170127025609f5e52e1dfae9c305100f5 SHA512 822213a67a1b326ffcd5f67d57f3eea87e5ee6b4c81836ab72ce79a56f5a2e7c80d47a61808cfda56e9ff77699d0da0324b931f0236609e8623f7613681baa32
+AUX lvm.rc-2.02.172 4266 BLAKE2B 50d2bee47ee2fd6f4a56eaed7df4fc736c5a2158353af113bd8ee6915055f2a196b9feb37678d928d7e73a71783f6918219e9e6143ae53bd09839cd1560ff35f SHA512 718ac4495623c495c6697c992d07f618459748d03a960566896cea981639c655ecb3ddcb876150f9129d0b6bc1bd90ef1092a3326ac7234519702675bdb1db6a
 AUX lvm.rc-2.02.183 4363 BLAKE2B b80351d20a87937f331b34c2007b2ccd27543273b672d002607b02f56d5a15fb142111c5f0939fcc40c52b3123b3b3fc15aa39424139bd00692158f20784489b SHA512 7cd6aa621d022190cd45c44e39ac48445f244643e5c537adbe61e4fbc2d688ce450bfddece92853cc324b0bb2c52c32c4169fc251914eda429de418a0ffe8aba
 AUX lvm.rc-2.02.184-r3 4474 BLAKE2B c08e1c338b8b788927d05f87eb83b2f3a95d35dad9b86e5f9be8809b2883bac56c973c9c2dc8f7775c6e05c3c2ea66dd5268699af3dba47e9a842262e659a121 SHA512 ca7fef98fd074018223be65f6aa20a0abfbb78afbf3d8ff50e1f2656a1cbb7a54570381c9a5328f3766774dce819c1f48e4433c0e7bec69f6bf70747a3375699
 AUX lvm2-2.02.106-pthread-pkgconfig.patch 860 BLAKE2B 73c23ba460787dccc1412a8fdba9cdf60172fecab9a732b154af7e7bc4c927a751fbd1107c86cd997221b963748644885a4f525eae351aa2857c4d7e1498f755 SHA512 ae073936ee15fdeabde4d3948a65f6a435b82e62aa0ddadbad399b69bd5c9bfc181d5e0be1beae9f6e899a6e8b9d7c21add13f7a1606cb5ed4762ed5aa5aa223
@@ -28,22 +28,25 @@ AUX lvm2-2.02.178-example.conf.in.patch 1650 BLAKE2B f5e04bb7524cffb5ee3f6f81954
 AUX lvm2-2.02.178-static-pkgconfig-libs.patch 3495 BLAKE2B 85869e4f46b001c4a8d43692ae7e3d73731deb9bc6094b4cdb3059058dfb819ecf507f5c5a5b47d4be4db18e6d0765c652f5b0e18ea17ecb55112fc70f7033bd SHA512 9a8b3d2296e4966d7209bdef3cd4c40f65a81ab5c2220d6b8ea06fd35ebad272a09a39b7f4e352eff32ad82babfbbec6c4f108d200193b3f84b225f739e0afc6
 AUX lvm2-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch 2748 BLAKE2B 40b64eb5937ba162b6084f1cf8cdd977146593573127eea6635d389777d5620db1daa7133299445b56b7dba0444b5958d1107f097ec94e5d17014fbb17419d8e SHA512 632080b067a68f65b20d3e96f36616a494d1aabbbc1465a83058574bb0ec49b72f9413e60175d599137a85674f6bb3a9c0e89296101314fe0e127a843b5578c0
 AUX lvm2-2.02.184-dmeventd-no-idle-exit.patch 2468 BLAKE2B e59873c7da99a8e62f71c78b1e93d54c342258949719fabdf2b08b0fcbf00ddcd3c8eb2a937416c646a948dda91474d2ad2187fcb880152986c7f6936bbee1ee SHA512 02a82cde3affd8e84b9800ad06c0c2ec9562f9412157e4f9ba96ef502a22d7870ece3d867684cf90c32ebc77bad8ae3beef5a3fe606ef7c30ad1b2b73e81de1a
+AUX lvm2-2.02.184-mksh_build.patch 505 BLAKE2B c54a78589a409488a3356a3e0c3de251a1315e5e9497bed3480781cd0bf40ffbd05c97c9025fab0b43014c501771b8db4358aaff2a12a07a881fb87573b1e5c0 SHA512 20bd0cc039d113ad63608a0eb56bb9000d38c29a5ed64b88ca89aa20411d2ba77e6f5f34b99815ed3cc1ea8cf90b2d9bfb82c4d80a5944f2fc9a631a781bc0d3
 AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 BLAKE2B 5533ceb7a601d58995e7a90b1355508907edb30d14704b397a8c8ba0d66dbcd3d6b02ace1cadef1dfbb1d927449403f76f0f38e5d034344b3232deb512507cb6 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de
 AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 BLAKE2B baf7010b5965f5c2b9a32ec812cb259cb3ceccea0d56e48d75e9f8e872634913f160fcfff0c2c77854ddfeaafb3b48bbca16d569041ab6f45aecb950f8e5bf4a SHA512 67735af9e51369d5b3b400cab4f9ffa25f8dea1c1ec3d01855cb3c5aeade5c39a35eeed43f3a665204fe6bbba4ca43baecd845330bf26d023064b94ca3d1317c
 AUX lvm2-2.02.67-createinitrd.patch 660 BLAKE2B 23e784e6769bc1f47fa57d690e6bebdf16d784d775a06af1c8eb7c54dd63a12abb0edd8331c8d033d7a0dda058252453a46dd35bd820fd47ba1407e9568b3858 SHA512 17fbba5d34ece5c1c25ef35fa3bbc3d6fcd20b44bd766c049bbc120853a8d60c9544db5790645a7814db5c272fd12d383699a8a9be6f4e9c56a7c0a1bb29ade2
 AUX lvm2-2.02.70-asneeded.patch 336 BLAKE2B 4d5b59f62107bce7a8bc6bacddd84b4f3bc8a53c5b5552b32d4bf058a83fe0eb79380ce6fe0dd7e8dd596ef783f02c50d3080d852a051e825f46eba0c286b9c5 SHA512 c4aa5b7120c5b28a3d646b50b561060553dedba766348260e5db6d56776f1474cec09daeab50e1aca2e1d2d166b9ed57e83673b92bc1c305669c13a719696600
 AUX lvm2-2.02.92-dynamic-static-ldflags.patch 3031 BLAKE2B 4e0e8bf8335420087470ca2b5ba01d1fbc1164a53f768415f2a6e4208ba9f65865719eececdbf1b8bbfd021813fb9cf5505a4066529e019fc25b9695feb29bff SHA512 edb78081d12bebaccd31c2474cb531563b729f1ad966afaff7892556177ee7a68217cc699c65383318066139ba62183adc8334f46f8f8933d62b6b5dcd11a023
 AUX lvm2-2.02.99-locale-muck.patch 405 BLAKE2B 07ac7c7f54d06dbdeae1c6bf0959fd0c223b30cbd67c08f853e02f520d212f7b6dcf7c3b6c3d3b7370bb004adbb23b226bf0d0792b5799ddbaff5ab655124ca2 SHA512 1c898693f71d165d55458ab87886a25206930c202b5aea95eba394ad06162cc710c1435e598acb9bcd3fbf46abf5409be972f6ce73bd02b2e177e1af780ae7ad
-AUX lvmetad.initd-2.02.105-r2 287 BLAKE2B 613baa6c794a971257ea25061d51ce2923475e919c6753e99e8fd2f7e8542ac48b1207f851c3c200b7a4113a62ef5bc2dc5507bcd5ad6c47bec8c9a3abc1ad63 SHA512 5fe1a47a1c54546af70c64fc001db3111e519cb81d8672761b64f50b4c552d0fa79bd0770fb4f4f3e0e0ac584b1e13ea91ac1a33cea1cc1f484cff0dde1a3b0b
-AUX lvmetad.initd-2.02.116-r3 348 BLAKE2B 6ad8f51dc6498703840a0917cdbcb5d1f179e2f8f0b2bc06f08e1c65e0dce2e63da3ca7295a8fcfc01019724bc9468d9d1338f3c2d879b4446980b5aa3e10441 SHA512 19aafd07aa6ebe3f05e321048480f746a9aafd1ad4e0323486db5c54035430f607e171d2246e91bbbf8a2a7e15278d793ad13d84e824df7af65345070483a696
-AUX lvmlockd.initd-2.02.166-r1 393 BLAKE2B 83eb337aa1069e66d7746b23141da24717303552016497d29d4df304bb174b2c380cc7c09df7b3529e355cf172150c7cf254afb984a6561e1fa3459aeed43421 SHA512 11d6f186799d8628220eccb4823e5bd251bc3c447e6c3f8a63c025dc4e08e0a7638a8439967ea2ee8a717264887597be4992afca59571ebaa651441782288081
+AUX lvmetad.initd-2.02.105-r2 284 BLAKE2B 6be707673353492efd5030958b42e6d4f388d2edc367e6c4964d5d88c9d1dd43e3e69e00f755bd801d7e39ea6c99d8717552c6d3d96f9cb3d4f3f9f0d8c5df18 SHA512 af87eb77cc3091b55fcac51398ad3a489c0a4e34d4d5274596b8504bfb69b37e10d432fe314e3d65de5e6de23df95d0476855cb85dabfa2ac8a61a25aef68226
+AUX lvmetad.initd-2.02.116-r3 345 BLAKE2B d458efd01fa08debe0857072c880adf951477445dd619a052f50cab9da39d8a38c9d480fc2d20fe899e01dcbcdaea0696d5c3e65af128652feea3186857d206e SHA512 f3143c6e1d00893009c68141f5ffd7e1e6bcf5b7ef0ff8505bc6c7049d83b2f9ddd2dc5a3cfdc2641a20603830b5dba07d73740cc5ce82e6b1b602a9b737a241
+AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc
 AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
 DIST LVM2.2.02.116.tgz 1538340 BLAKE2B 718261b60626f2eca5ba13011646bf551523ed8e59aaceceb9097221c000268b7533ac43151ff1d9229911d87e764fbdb29ffa1d305f2aae99220a68e301559a SHA512 992541339637d597257850b4ff7f5348fb7cdcccf806ac8d986a3be1ad1edc5f6bfaedeed5128690c541d1a485cdc75742e90a766363c39867901003518fb84d
 DIST LVM2.2.02.145.tgz 1986370 BLAKE2B 0c9e5efae17f26ff86152cecbf0b11a74e85007b2fa9491f44dec03ac8c11375bacf6685213b4be19037c8fbf70e13549516716ecf8fa262919a44625e6aab34 SHA512 84e28b3efc940837ea9da70fce620744aea0945ba29383b76ad7bcd4b5259b897c714162a8e8b7cfe26ae736a3ad2eca633a3e0df4d6280a32b28bd4cf472d27
 DIST LVM2.2.02.183.tgz 2380574 BLAKE2B b1fe71b6cdb8ee20dd53d0ad3399c553487baafa12657ec81a794c84ad161988afdb8693ac247877a2645d693a0740c74c8b991047ed2ba4adc9ec75f1c261a9 SHA512 3947523c6b0862ada40677ed171ed0cf95e070119e377296fc5ccb153e9c4212d34c0b16a887dbd68ccf265525345dabfed2aa59fb3604555429a7e2ecfff4d7
 DIST LVM2.2.02.184.tgz 2383698 BLAKE2B b6e308d76d541b9461dfcc6e82db256a175ccdabfae9c9d57d84eabd0d5ea50e3e09954b34741903e027412c2c26f72a5005fe934261576337a810738139deb8 SHA512 9db74f675e7c58f663a39afb79b6f33a33ad2cfbda63e9783ef5027f33977b4a1262a2e6754aa67c586eed083ee119a2e837c32a7746dcc53f13877c9d65c390
+DIST LVM2.2.02.185.tgz 2386328 BLAKE2B d2e31de3eedd7518ea2d239cb9b36b38e351d7fc070097a1fc4e7934e3636195da3247fba57d684bb0b31b7f3dbdfe29161bd121b2962b2c35c8c9d7914b4506 SHA512 f421505551aec2a09bc862f2fcc1ee825bc4d94c53a01d13265631e99308d60fbca40112be5bc7824cce3ef223c0775d2f6c345f6a3f227229a0566c903841bf
 EBUILD lvm2-2.02.116.ebuild 8437 BLAKE2B 2d1c58c95a9d3c3aa1ec5b13d23c04be0b6c194fc4e8767fedecf2ef6edeb0e85b36447ab00afb03d5f243eb73e19453cad203e1e6a72537750eca6a3b7c0fa3 SHA512 7eccc5d981cafe6d2c8a97fd0eb96983f044ecd7ee6be84f61b76c755ed0b1aaeb8dc3a653c5b7e5cb152e84b53cd88bbf3978e8de02cd96703282f0c985ff89
-EBUILD lvm2-2.02.145-r2.ebuild 8627 BLAKE2B 63c09b396d802d131aaaa94442a26c4be8b75fc12f1bf097f07a0e52aeba28e4f3b406706ca0ef62a77d0557fc88d3f9d60963dc816026910ff6e90f2bd6439f SHA512 c4553842441409458c5bb339f5e22fa05f9b4bd34c865b907ed6b2396ff8c6fddbb78be1f480f7e189662e87141d7385a933e8f33850a7c6dcae7d611a7f37e9
+EBUILD lvm2-2.02.145-r2.ebuild 8624 BLAKE2B b2f818584b405aa83a039d0f77151544884dfc087e7a142858f08bda642d7349b123d27d5b197347d92305d74d5269f949c8a44bbf361709f034ba33f30e2996 SHA512 ce3c50a89109017ac600bbb2acb32c0ba17205b7f96c93d4ab759007a4436fb6a309771cd1adbdb8ceab8ea833d31fbbfb914bb385f94a1a84e37f01f4879563
 EBUILD lvm2-2.02.183.ebuild 8761 BLAKE2B cdc1958b9af3fae4f19813a18316ce6166a17f1bca1442a926d672ef38c281c470354574609723290d1d28dc800763b2a8d760a5e9b43d13464195e56c05c38a SHA512 2ee5704d440ab63721dc2c330181f36b7e17303dea829415e9465d6bd4ed4c24e0c6c4dc5c1deb639f65c15b0413238e1d10eeb604b723abfb88dd0177f52ee8
 EBUILD lvm2-2.02.184-r4.ebuild 9302 BLAKE2B f5e6d80e305fd4fa5c5de90148e239f080620873cf2e24103371cba51a84dadd8eff5db64ca9f61c6f750dd43260a206f6299b0289d189d557024b928a6d288a SHA512 f00ac20c318b777cd8f43a02cf5853f94def7610b0c74cd36a7936c18334dd9236b3afb775ee1a033c0f2054006c6e8d310b45d27a120d9c2438ed6b3edc95d2
+EBUILD lvm2-2.02.185.ebuild 9421 BLAKE2B 8e7b4f637deb24fdd3a325a2f2c72d4b46b0b65fe668bdf188c14852432f140af89c2e6f211f98ae1cee809913b566e39eb301088ce50d07a0d6ed8ec49d1af8 SHA512 1744da5493752e34f2290ccffec2cb31c0c831499459d0f36da9e3ef263e43813a51b8b7640f096df3438eee3b05be1f943b5f7c45551866fab7e0e33e25ef34
 MISC metadata.xml 1146 BLAKE2B 7a4bbf38d2e752523c2909c240a2c90ada04aee8efe96c62c5989887f4997e00a4ed7312dd9803d8ddcae02e8bbc3ba8f0fa9e5da0f484bc9768e0ed99ab8be3 SHA512 24240ba35d93d9f9171f2b164d949846a5ea2126eceed4b4454dd0b4efb9b1132f9f6717d2c7364f20820b792bbaf26dc274f7c10767993b35a565a76e042f4f
diff --git a/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 b/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2
index 7dbacce0d94f..79fdff246fb7 100644
--- a/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2
+++ b/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
diff --git a/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 b/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1
index 930e84baa866..f77996caa577 100644
--- a/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1
+++ b/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 PIDFILE=/run/dmeventd.pid
diff --git a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 b/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2
index d603718cc226..914d6637c7a6 100644
--- a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2
+++ b/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This script is based on upstream file
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.105-r2 b/sys-fs/lvm2/files/lvm.rc-2.02.105-r2
index c59f9c3c8788..937db047d198 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.105-r2
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.105-r2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.116-r6 b/sys-fs/lvm2/files/lvm.rc-2.02.116-r6
index 1bf075fae3ef..cf430c6654db 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.116-r6
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.116-r6
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 _get_lvm_path() {
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.172 b/sys-fs/lvm2/files/lvm.rc-2.02.172
index c3f1f08f399c..82037b28adf9 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.172
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.172
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 _get_lvm_path() {
diff --git a/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 b/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2
index c95a47d5be51..565f49c7c426 100644
--- a/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2
+++ b/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 pidfile="/run/lvmetad.pid"
diff --git a/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3 b/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3
index 2efce4223e55..55bbf9c4b63b 100644
--- a/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3
+++ b/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 pidfile="/run/lvmetad.pid"
diff --git a/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1 b/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1
index 16e2cc3f12bf..8b5986fae242 100644
--- a/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1
+++ b/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 pidfile="/run/lvmlockd.pid"
diff --git a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
index 2890ca59239e..31435ff9d055 100644
--- a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-fs/mac-fdisk/Manifest b/sys-fs/mac-fdisk/Manifest
index c31c536e02c9..41a8552d55cd 100644
--- a/sys-fs/mac-fdisk/Manifest
+++ b/sys-fs/mac-fdisk/Manifest
@@ -12,5 +12,5 @@ DIST mac-fdisk_0.1-18.diff.gz 20267 BLAKE2B 111e5b18c1485b33cfb2f653846e901a528e
 DIST mac-fdisk_0.1.orig.tar.gz 55817 BLAKE2B d193be6b06be562bcb3297300dc009ac28adba41ea5d7c1a5bc0d16b8f9ec8275e1ad015c9bc529c3aafd12cbd9012e1af7baef7259ce0c8cef4d6dc62986dec SHA512 1263e60a18111162f5ef439b5f9615cef9de94e7836cb998782a6e6d3bcf92a69e49566b33c7330bdea05de5e6ca83f7920c6707f342ce515440160695f07120
 EBUILD mac-fdisk-0.1-r7.ebuild 1348 BLAKE2B a0b4d9462e7c45a0cf57c1cd8652a5f3ca42a1d9e50f3c601bcb93e99caa666c34a6567bc34b68b4d0c3395934b34394eb70dff13f7d66efac8d40fd8b7ec83e SHA512 4ef48d9a3ef95d08ac60313c40fd7cfbbb41d42940065cebf1961d7705e4510a25ac5eca7732f948692d6bd861ffd019dd436aa55a7dcdf353c0d5dbc2164988
 EBUILD mac-fdisk-0.1_p16.ebuild 1293 BLAKE2B 61dec1a06762c62770735430b474d39007c9832ffa566e43e9f7771ebb7be67d28b53b87954884345acb0f541fa917db8ea652eaf623cc316dc3cd986bf97419 SHA512 e0b81a76399e70dce7ba67490fe5767d7e98f1417fcbad9593710a7dbd77850fdeee9efdcf67c0b01322003a882eb1af10cc38cf343e87e6e0765243d4115330
-EBUILD mac-fdisk-0.1_p18.ebuild 1274 BLAKE2B 0768956f8c19d15b0d7cf92a888088af68c2ebd730320aa2732090c5064a9b14a83df3739920aa25514fd3940316659c3f178d62059a8c0ef732fad8675d40ec SHA512 b6635ee4b5107d275d34d723d1cf08d5e3bdb6d2e77d6fde3aba3ee346c0c00647aa6b2ec91f630dceb86f8462ef29796103029daa04ca86eb00351c3aaa15fb
+EBUILD mac-fdisk-0.1_p18.ebuild 1271 BLAKE2B 948b3961d18a888f1322ae9d2d452199e7d8551468afce530e9981e2fa54a34fcc1d8b98ef7f12e37bca23a60121cd9ab317c1d64ae0208f4c449caa7ba13f22 SHA512 82452c687eaad55c0d1015dec355e245b16f7d769a5fb34c74f5c250644a8c67e23540ec5ba6798c1a239622dd1b58299f626356844ead9ccdd8f66dfb26e852
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild
index 195bc8335867..908926aa9b73 100644
--- a/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild
+++ b/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 
 S=${WORKDIR}/${P/_p*}.orig
 PATCHES=(
diff --git a/sys-fs/sysfsutils/Manifest b/sys-fs/sysfsutils/Manifest
index dae1a7924c48..d1cb5a21cd98 100644
--- a/sys-fs/sysfsutils/Manifest
+++ b/sys-fs/sysfsutils/Manifest
@@ -1,3 +1,3 @@
 DIST sysfsutils-2.1.0.tar.gz 788885 BLAKE2B faaeba9d156e48b98ecc50c28711205dd7b99da4966206493f2b63d8a7a3e730b6564a1dac9304c8af56c516e5a13d6d9cf1ebd8773563617c3acc2387059a09 SHA512 485902d98b41a69343cb037883d0c0a1de8a1a4aed657cd4528fe10bc845ac51629657dff01deef042e57c9bd9243095e23fc931d06d74db31b03c5f0a18cf07
-EBUILD sysfsutils-2.1.0.ebuild 947 BLAKE2B d8dc17c045a2ccbc3596a643befffccf7d69606b971973aeac71ac8f4b246323a78fdb4024a0d4ef9b30793d5509071b15fb1be178be19137b01b921a24c9dfe SHA512 d873ccee57d535be5e47b26a12ef9db216dd84db277b3fd908e3a3428f92cf65b46d91d2ae7b5967a4a71b8339bf61f75a5d1f5bb43c25161f96c4cc33097bef
+EBUILD sysfsutils-2.1.0.ebuild 951 BLAKE2B 750e54b173992da1d320bb69a55aad03fa78fd4f268ed21bd853d2ebfdff0e18a88a80c7db18d791f1d6a3d48be894f65639abc8959d79428173499a0ec93d47 SHA512 c36a6a0a85d43c2ac137f81d282ea217faf99ad3cc94ffedd8d5ee2c02ed8727d275fa55e14aee410f067fbd255a2d6463fb9cc7af0363b209b0940c64438cc2
 MISC metadata.xml 330 BLAKE2B 704f504eef71b56802b1d24554ea1e4887cbaa3bc859021c9decede47242997906e1e87cf18a9a0a7668000a629c5a48699d09b7ebc4532cb304899d61a5091e SHA512 16dbfcfa75389172827d78272e473ea69b20ac564ae8c17de031599ccbb5166ffdb7e42208b52e6ba53cc5bda75075c980c7954516646cc0fce4fb56e431070c
diff --git a/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild b/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
index 91ee388ee99f..b4194627134d 100644
--- a/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
+++ b/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/linux-diag/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 80df121fb116..56e5db2c9612 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -6,8 +6,10 @@ DIST udisks-1.0.5.tar.gz 736221 BLAKE2B 9a709c5d4fcd390d9a52ac764d0e3c678983a146
 DIST udisks-2.7.4.tar.gz 1286465 BLAKE2B 8c52199215bc4ee3840ded2ccf9e3d61bc99bf0f505abb55a5ce18aa2676a60f788bc235e0f6be308c8bb50ec653a559010970e827d3bb4c1212afea291e7a8d SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849
 DIST udisks-2.8.1.tar.bz2 1354879 BLAKE2B c2e5fc11dc29d43c6ff2cfb048c8f5540e72ea9c966e75b70754ed9491e3d4bfa9693718ab735c61ec110c480037064d610d238df92a839b4b4222dd624397bf SHA512 a3c7d26cd1bbd9cce59b25d118076c34482a698d7dca9e0468b6f9c928f40c8dbdd0b1cb61cf288ae77151643dc4a3eacf31e22af2c7b35a2828e49ee335e70b
 DIST udisks-2.8.2.tar.bz2 1589149 BLAKE2B eaa9d95e175bbdd4255c627a0dcd93ff6f0a3660134d2117551c2d61298733570409481393ceeafc92ff26b74277b3a754b70d9359ed402c19d73fea2f39ec04 SHA512 dc0087ed2d3ab71dc66f63f868a6e2cd0e4e7578c40b2240739cecaffd6f50f5a2cecfc7ef7df9304e291d84ab12f59a940b9fb42b34a5a60d12061e6aaffc1a
+DIST udisks-2.8.3.tar.bz2 1613373 BLAKE2B d2f5e145ee0fefaafab71ff2cfec40962d835c7df22fee47702bc8406760b2463cbe334404e8d27b21e0c05134c67d336d24a6de7b19c0dc5d16ea78553a2738 SHA512 6d1d9ed18cb1742de13aad48709356f3dd9b8324967fd47107bd0f1e16b697d0928bd722397062495bdea51190774a25309834d27a5160feb7915becb474468f
 EBUILD udisks-1.0.5-r3.ebuild 2795 BLAKE2B 45da28dd3571bad3921197cb8aa68487067a58e905a6802581924d54a64bc39b4a203129c2bdb7a69bbfa63da6259ab48aeb21e039799bce547f6c4c58ff31d6 SHA512 d795d5a8c564afccb2f41c1062ad5485074db7daa4416e2c4babd8665633a21038107e8e8c5356c9d49edb7108a7126a905b57420741239de41b9925a320e80d
 EBUILD udisks-2.7.4-r1.ebuild 3328 BLAKE2B f97ca16814ccf01e774c7a44474c95d0876795024578985023031e42ac429377167718f6de01e093dc658db9e3855f6c5801993fb4870c39d7c1e2ea0a6e2897 SHA512 8b319ed1f9e9f76fe93e4a8ae4fdd5aad1610ad22f3fdc6f7d6f5f5c2a77db27ad8aedc18e15f8e8dc6cccb003c5e8221397142d14a75aaa693c2eac4184ebe5
 EBUILD udisks-2.8.1.ebuild 3233 BLAKE2B 2e6032785c926aec9cd36a2e12e7984825a44190b72d0c76edf60abf9903d04f005a94b258eaac299fa310ba7f801de45ca1cd194e5cf194cf7752cfdbd21f02 SHA512 00a2ad198df800bcc4e2faa99d98d80a3cbccd8d9b63071ec07d49dcf0e85d5e5bc14a36de73ac20ff20cddab21c82f38ee4f422f0d0f6e500d6bc51f4e9aee6
-EBUILD udisks-2.8.2.ebuild 3236 BLAKE2B 6c1d231f5e21a03380d24561e26e29fb72558159963a18733b0dd91db59422046be237db00f8090e283137fc654fd128e435cec4b60f64b048f004f5c2bf8ec9 SHA512 eb590824af5eeb4d8f7ab7e91e5dc33e33438212072f63724ea4226f4a4e070493fb3a51d3896d4fd54f20301eb253660208e897bfa948ef055dd2a8104f41c3
+EBUILD udisks-2.8.2.ebuild 3235 BLAKE2B fa8624bc87962f3bf2ed0da9ebecb01dc680fdaf97aaba7eee752d0e482ac90ed8913528da88aa765c88c364b7c1213f6e99a9ff6df23561a76cba770e25c581 SHA512 2d2dc6333efa601fa8348763dd347e1f41950233d5fb037bafeb8e70ad1cbe9968bd276eaf15fc1574bcac75d9745a3f1af492eb687fa7c377a04fab62681148
+EBUILD udisks-2.8.3.ebuild 3291 BLAKE2B 1ab8b3a8da16d0dc5a1b6ab9367ed6eaf5403248febf05e9625b06dadb1745ac751f893e3318642323716388c6d5c1f807e7a1f31ed8a02a48c6c8f0a5af0655 SHA512 701e97a14015902892c2ea414bbcd61b0d579b53048839a79304fe9d874f5939ba996cd0680fee4fbfb74dfb69d4ad08763fb22ae37e5bcc30226780ed8dbccd
 MISC metadata.xml 868 BLAKE2B 8d4ef3d2fae9d22074a87c65ced87d1e523b8b935084845b4cdd11389648e5071852cde39b18afb34c33dd352f3b1acb6ffbed68a5dc6c999033c5567693967e SHA512 e5b0ccda409fe0b7c7be656f5834399f2819da68ee811e70c2cdf97370b860efa1ca58188543f9cc46f17cfa340c9d31c18b050b6e6f049928afe8d1ad7ffae5
diff --git a/sys-fs/udisks/udisks-2.8.2.ebuild b/sys-fs/udisks/udisks-2.8.2.ebuild
index 0dba3f768646..a68c0e67661f 100644
--- a/sys-fs/udisks/udisks-2.8.2.ebuild
+++ b/sys-fs/udisks/udisks-2.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl debug elogind +introspection lvm nls selinux systemd vdo"
 
 REQUIRED_USE="?? ( elogind systemd )"