gentoo resync : 08.06.2019

20 files changed, 395 insertions, 164 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index dffb734116c0..d95db316810a 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/fatcat/Manifest b/sys-fs/fatcat/Manifest
new file mode 100644
index 000000000000..40472749a6af
--- /dev/null
+++ b/sys-fs/fatcat/Manifest
@@ -0,0 +1,3 @@
+DIST fatcat-1.0.6.tar.gz 50447 BLAKE2B f33c479ec9482a7cf7113d1fa0d02c8bde0c58c5162e392867c18ec157f23d9891e90c9571892fe48b22b5c6d713404bdbd822ac07f4bba9243fcb1ead6932c3 SHA512 5a0eedad9c3d3f8dc6d7230c74669082a33850bd0a91310dccb080f4a2351ca75be6af7bbb6610c71030d5f97cf63f98f43891084171a82e07ef70064a8bce7b
+EBUILD fatcat-1.0.6.ebuild 468 BLAKE2B f99c0b10c95dd3c3cbda988286e3bdad2152c4c95962b780f2d9cdcb00031b12acb69d6450ec25c737faabd1711a419a6e546b2340956b4815faf4cf0d3a7dd6 SHA512 5571b2b8d9dd87e16f0e9abee2b9f5524c5c47ab9cb9be661abec684387df16d96cedbb1b22d68476d749caefe88ef8026675419b9032012e61bacebe4427d13
+MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/sys-fs/fatcat/fatcat-1.0.6.ebuild b/sys-fs/fatcat/fatcat-1.0.6.ebuild
new file mode 100644
index 000000000000..38030a4cb902
--- /dev/null
+++ b/sys-fs/fatcat/fatcat-1.0.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="FAT filesystems explore, extract, repair, and forensic tool"
+HOMEPAGE="https://github.com/Gregwar/fatcat"
+SRC_URI="https://github.com/Gregwar/fatcat/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	cmake-utils_src_install
+	doman man/${PN}.1
+	dodoc docs/*.md
+}
diff --git a/sys-fs/fatcat/metadata.xml b/sys-fs/fatcat/metadata.xml
new file mode 100644
index 000000000000..435234188908
--- /dev/null
+++ b/sys-fs/fatcat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>bkohler@gentoo.org</email>
+	<name>Ben Kohler</name>
+</maintainer>
+</pkgmetadata>
diff --git a/sys-fs/iprutils/Manifest b/sys-fs/iprutils/Manifest
index 3200671df9bf..d43447e7abc2 100644
--- a/sys-fs/iprutils/Manifest
+++ b/sys-fs/iprutils/Manifest
@@ -5,15 +5,12 @@ AUX iprinit-r1 350 BLAKE2B 6f8bc65a7daf0969c7b98cb3f8aa522a3b5e0f2a5db45ff4965da
 AUX iprupdate 193 BLAKE2B 9fb60ebf6a62bac469c693b0d5d2386b7364d8afebfeae6f6f8c21005a9aaa4e84f23415ddd7945ca78be5430a932524df76936797a4c2eb5ebad909cc0e2fcc SHA512 1b793065cf39cccdf8937546ee4becdc9e202733786ca77768955cc7936fdd41f73622e2019b5a81ec500d97dff019470585030f145955f37e012b2cee20181b
 AUX iprupdate-r1 197 BLAKE2B 4989e933a4d182583640fbd4977a7a43402de66437355d2b889745758ac04c1e8afaff299ac21fbceca2e8cbf7a2c88f4ac69eef3c92667c8064f6b87004e07e SHA512 2398ff3b8c4331f959f3740f003cb119b95357ffa15b9c4c9bb44ab191d2e863ef0b00e90d54ea012a66f309d2e3dc7fbd87c9e8817606523d0805a02153f29c
 AUX iprutils-2.4.11.1-basename.patch 172 BLAKE2B 8075c38277fe0290b47e1a107ba721d02d9d453e9bdb60197e815b0967cc5db4530754c037dc0873483057f93b3b30de0faa4fdd41906ee3c92b0be6a70ee7b7 SHA512 3c0d027d720970028588a241a2399ed5cd658b69b0d4f6ff1645b0ce3eb58eb1af7e485cb674972f11033261f4d9ec9a0c42f583f319123cbab48ce6481caa7d
-AUX iprutils-2.4.11.1-migrate_cand.patch 271 BLAKE2B 9f5c55b9bb470892865f57b2bfcab8e6978c3f1e1cd4bae0674f60cc2e4349971c25d72a5833c08728bb705ff30a78a9ce7ac2f77e2dee359115e41c26ef86fb SHA512 064b3c89cca536054cf05804c462997124d006cedad6db5a16c7e1a0b46a32a5ce3c2aa57080f5a6b3d7076eb54d14609223a0bcf69e06c882595eacf706df4e
 AUX iprutils-2.4.7-tinfo.patch 569 BLAKE2B 8188fe255a04685e1240b6e99c8ae63e1993e9942bd25cd526d40f6f7dab568f27816a22360fad60d10418b4455a764fa1484b71a284276019a260adf64b42f1 SHA512 2d489b2a5107fe16c0cbdbcaeb589249d27b7bf40633d9c830d7384053e0659690d2db974a2447a3383bf5af04cc94d64d0fcadc5b18432f57dbc69e338aa0fc
 AUX iprutils-2.4.8-tinfo.patch 551 BLAKE2B 8638750e930e7fe265e75fead2a9c111f0a7304676c4f48c8789be1cf42a76b5ac4a21e0b9fc3ad5536771ce543541c1f032c64f6f264929e6197ba09f76e31d SHA512 c03595b85e17edee22191c49bf8a3361b0c81a9f4dc50bf6d2393dc2be5a0a7c0c77c61de9d17c2e262d150fb0a896274c89442b4df29742532595448171fd5a
-DIST iprutils-2.4.13.1.tar.gz 523921 BLAKE2B 8266477d7fba2493349f7abce283d4d0f640be0aaa367756d6972009da778be913e6996064932c66d84cfd1a98f73c3284ed34719237705b6d3cd5a1a1312a24 SHA512 1ae4b9370ab20c49d035e05dd3571b3e20595c160a3d173ffa2c2bbd2709f67c12ef08b3498ce5e9e6e0c8bf128ebc7d851f0b3c761b6293b3d475ad060148d8
-DIST iprutils-2.4.14.1.tar.gz 524534 BLAKE2B 43d62499f2d4dc5f800747e2ea243b31014eaa5fa0c339a84b0c9af6157b65116082080b80e89ff8a3aa70d8ec87846eccc46fefbceb996199e19f77ea8b78e6 SHA512 74ef79332134746f6b9b6890dc04bb42573f154aecbc4314198847342a909a21c0d2982cc3c849b0d1ca191d08c3b1eb5d59a334f75140830cdf91d55438e8a8
 DIST iprutils-2.4.17.1.tar.gz 524770 BLAKE2B eb3864a431193ce342810449bde2ac6a4e7a9c352611077b70f93fd3b3ca69c47cbaf7a55ef45b38f99135acc27ebba34b7fbeb8d7f704587ce96e0a8e1f29bb SHA512 d9b257a1e86350ef26e6491d5030ac864a244283697a4ca588af7ee21c2518c631a2bcfc9913783f973025d186feab8ed045b1d4674621a08b401823e9c52d3d
+DIST iprutils-2.4.18.1.tar.gz 524809 BLAKE2B c32b01ada70e67748653b8e346cdecae35f3ac240a7eaa8be0ff70590bc68b8be770bffe2f3131cbd6cbbe75812f12524c0817aa02674cd4643e846724be2891 SHA512 42da77c0fde0a2650368b2f0605d63762389ab394f755f4e4144704e155333a2ad8133731244b8383e9a334517aca45f62487229a27a2e90cf22a10c760aab3d
 DIST iprutils-2.4.7.tar.gz 467671 BLAKE2B 8ca3e77f927dcb3cd45b78e1b5e15d7edc67b3fbc8762383e0e9e84ebd42ce74927909aae926762d6bf0378d3b8d8f77cece65bb3ace746f889fbebb7fdcbf43 SHA512 9e6fd37cb72ce1d092b02f1cdfeb9e97962007327f92f4d9dd2a755489dab3a5d51a459d2f256d8453de74935a5cee8f25f71a820d82347ae67aa72a89043a91
-EBUILD iprutils-2.4.13.1.ebuild 1092 BLAKE2B 0bdc54f7a61a1fd1ddef07a7e2e4f2553ec9f7974a3a634c29507db8e6d4d1d8f45ef5fe11e1e1dbaa933f1d078f84e5496f7c0e204b38bdba362b8377683647 SHA512 437b31450bb48c43296f71034885fc33f0d0a94c8ed9386246df688a9085128f205b749e0f2d83b0b4a033e5e012a18d2f7566b5ee4e48722af088c052b3b8ec
-EBUILD iprutils-2.4.14.1.ebuild 1042 BLAKE2B 939fc7b567a365e23b1e8216922709a3c6fb8cb1b313b3f49731af52302605da68d92795b679a64c1316c886165eedaa60878b3d2d2f0899921deab968a88c60 SHA512 04546e13ebf9cbc927fb152bce0193126220aa9ff64f4397a1d776885c245a9b8f3301191dcc9cbfc8d7a38d74d3c680e572e26315d2df47d6710be3fb90a541
 EBUILD iprutils-2.4.17.1.ebuild 1039 BLAKE2B ec398fd35ed502ba946db803afed90fdc9cd3b8c28afc60fa5aa66abc217496ef921fb1fa02b1ab8a149e8580d031dc2acb193b09128995de58a76e85d6103bd SHA512 498ea8d005400e7cb63d990ec88bf3d132ab341800d7bcf14589fee231f7e1926c6d023debcc5bc687c9c87a285c15858c916aaf83ebb75e2e788407b6c7836f
+EBUILD iprutils-2.4.18.1.ebuild 1117 BLAKE2B ff482d968da9f38969628c3a0dc6d3b78e53b3c8b1a59557c1657af91f67e074b41b9ce4445f04b30ceb837300c40311efab973118fd5e747b12bd7b0b57891d SHA512 3802817f92b477b27b746c1a3fc857f21c26641913ee2ae2cbc51e16a3b0b2497bb84d6f5e03828f9b7e795cb37dfe4acaed8fbc09b0d8544a93b20361e3b750
 EBUILD iprutils-2.4.7.ebuild 835 BLAKE2B 2c35dc04a713315d0fab9e76e48795bf0d8b3a6f272b7ba2633dbc7fa1401bf71bf8251a38f778b7c008dc7763d22596337f32978c166481ce56e7a8133443af SHA512 5c9fad08625fabbd520aa02efd689fca7b1739e545fbca2d059ca4d0322b03009cb82df32bb09d118104b779bc8a1f9b43b76122eedb857e4d58d3871200ea1f
 MISC metadata.xml 338 BLAKE2B f1a657a6c8fc11e853f0530c94e8376b8b424818873d909ed8a54c0bef0e47bea40733eea3e8f8e8340562c58dd29c2d3b072023dce9edb6ba803f2774fe1076 SHA512 6323616f564434719f3466d45a7d0a41969ac75a8e6efb5b0225a915061f9a5e8698aa296633ec54f3708903b39ac2d8fe5275686a2bd76bd1ae8662b8dc7600
diff --git a/sys-fs/iprutils/files/iprutils-2.4.11.1-migrate_cand.patch b/sys-fs/iprutils/files/iprutils-2.4.11.1-migrate_cand.patch
deleted file mode 100644
index 86ae3af6af4e..000000000000
--- a/sys-fs/iprutils/files/iprutils-2.4.11.1-migrate_cand.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/iprconfig.c
-+++ b/iprconfig.c
-@@ -16827,7 +16828,7 @@
- 	}
- 
- 	if (!dev->array_rcd->migrate_cand) {
--		scsi_err(dev, "%s is not a candidate for array migration.\n");
-+		scsi_err(dev, "%s is not a candidate for array migration.\n", args[0]);
- 		return -EINVAL;
- 	}
- 
diff --git a/sys-fs/iprutils/iprutils-2.4.14.1.ebuild b/sys-fs/iprutils/iprutils-2.4.14.1.ebuild
deleted file mode 100644
index 778b5d7ea8d1..000000000000
--- a/sys-fs/iprutils/iprutils-2.4.14.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1 eutils toolchain-funcs
-
-DESCRIPTION="IBM's tools for support of the ipr SCSI controller"
-SRC_URI="mirror://sourceforge/iprdd/${P}.tar.gz"
-HOMEPAGE="https://sourceforge.net/projects/iprdd/"
-
-SLOT="0"
-LICENSE="IBM"
-KEYWORDS="~ppc ~ppc64"
-IUSE="static-libs"
-
-IPRUTILS_DEPEND="
-	>=sys-libs/ncurses-5.4-r5:=
-	>=sys-apps/pciutils-2.1.11-r1
-"
-RDEPEND="
-	${IPRUTILS_DEPEND}
-	virtual/logger
-	virtual/udev
-"
-DEPEND="
-	${IPRUTILS_DEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-		"${FILESDIR}"/${PN}-2.4.8-tinfo.patch
-		"${FILESDIR}"/${PN}-2.4.11.1-basename.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install () {
-	emake DESTDIR="${D}" \
-		bashcompdir=$(get_bashcompdir) install
-
-	newinitd "${FILESDIR}"/iprinit-r1 iprinit
-	newinitd "${FILESDIR}"/iprupdate-r1 iprupdate
-	newinitd "${FILESDIR}"/iprdump-r1 iprdump
-
-	prune_libtool_files
-}
diff --git a/sys-fs/iprutils/iprutils-2.4.13.1.ebuild b/sys-fs/iprutils/iprutils-2.4.18.1.ebuild
index f6bbf2a45ed9..72914aac6c3f 100644
--- a/sys-fs/iprutils/iprutils-2.4.13.1.ebuild
+++ b/sys-fs/iprutils/iprutils-2.4.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,6 @@ DEPEND="
 PATCHES=(
 		"${FILESDIR}"/${PN}-2.4.8-tinfo.patch
 		"${FILESDIR}"/${PN}-2.4.11.1-basename.patch
-		"${FILESDIR}"/${PN}-2.4.11.1-migrate_cand.patch
 )
 
 src_prepare() {
@@ -43,8 +42,12 @@ src_configure() {
 }
 
 src_install () {
-	emake DESTDIR="${D}" \
-		bashcompdir=$(get_bashcompdir) install
+	emake \
+		DESTDIR="${D}" \
+		bashcompdir=$(get_bashcompdir) \
+		install
+
+	mv "${D}"/$(get_bashcompdir)/iprconfig{-bash-completion.sh,} || die
 
 	newinitd "${FILESDIR}"/iprinit-r1 iprinit
 	newinitd "${FILESDIR}"/iprupdate-r1 iprupdate
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 3b11a5d3232f..a0e72a452680 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -26,6 +26,7 @@ AUX lvm2-2.02.178-asneeded.patch 452 BLAKE2B 6d7013e7a0e1aae933e22b2c30b85cf744f
 AUX lvm2-2.02.178-dynamic-static-ldflags.patch 2279 BLAKE2B 526104c96dbef36568a11898193c5d0a7d69a63df2011e1f1a778a4317248a683470e331ddbf8b07fe8654abca5a96e9a53d0b13715c860f8c1e8b33b8e95384 SHA512 83f253ca629e90380164edc74f3900f6e40fcd0002d357dbcaecf4a75c2a2213c55cce1291a27afd2e07c72838e46fe7438217f8a103c20233ffa2621cf02cb1
 AUX lvm2-2.02.178-example.conf.in.patch 1650 BLAKE2B f5e04bb7524cffb5ee3f6f819541eba0681e8a32f884be4c78537a38848fdbe03d3028b90568e03810df86012cfb497c9050fb949c6c8b1d4460174a6794205b SHA512 fe30018b3f0ebd6f99e63a5d8b423365b8f2c5d5b17b19810ca1bea52f49a5c07e059cfcb1851be752024ba5acad6fbb736f20264b83bdf385f845c3b68d5b5b
 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.56-lvm2create_initrd.patch 2032 BLAKE2B 5533ceb7a601d58995e7a90b1355508907edb30d14704b397a8c8ba0d66dbcd3d6b02ace1cadef1dfbb1d927449403f76f0f38e5d034344b3232deb512507cb6 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de
 AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 BLAKE2B baf7010b5965f5c2b9a32ec812cb259cb3ceccea0d56e48d75e9f8e872634913f160fcfff0c2c77854ddfeaafb3b48bbca16d569041ab6f45aecb950f8e5bf4a SHA512 67735af9e51369d5b3b400cab4f9ffa25f8dea1c1ec3d01855cb3c5aeade5c39a35eeed43f3a665204fe6bbba4ca43baecd845330bf26d023064b94ca3d1317c
@@ -47,5 +48,6 @@ EBUILD lvm2-2.02.183.ebuild 8761 BLAKE2B cdc1958b9af3fae4f19813a18316ce6166a17f1
 EBUILD lvm2-2.02.184-r1.ebuild 8955 BLAKE2B caa7021e7703bf50529b42425a36c1662943504dff7fe8d857996f226a02119db2f6bad377a80f1fb7fb808f82962fadbd52a5b561f571c5592ceb4524efa825 SHA512 4b337fac136367fe009993e65b84f66e26c3fc6c5517ef6415734843b793ece2dd8411c639771e11a680a092965dc30b589fb26350b490fff28b190559b7e836
 EBUILD lvm2-2.02.184-r2.ebuild 9014 BLAKE2B e016e38f56610bff72529ea22e7ad9de1c71cef034c028efe0d8641255d802c504c756899a1c319050cf780656f87e509fb50614adca39c3e14468d3ce503e55 SHA512 15567897f0448bb34980833b107b2e93d416b67df33c57d77269fa52b8fc0d2d6ffbeb19f7c9dccaa2845857dc8a9778d733f22792112fca74720df3f42e5f03
 EBUILD lvm2-2.02.184-r3.ebuild 9217 BLAKE2B 214b1fd2f96fb14910dcc9ef709f20127433a18d6b0e109ba35b5ae6f3474787d6d0b95dd59fe25ab63459c576678aadbaddcabe1fb022b86ed27d4cecba2451 SHA512 76fb52a849217d733a98eed8ab3e71071b5bb237c2886e3929fda2492973bc9f20999bbf830269a67a0db12d9eb9b996d723cb1af2104ec22b43032bf4b2de3f
+EBUILD lvm2-2.02.184-r4.ebuild 9304 BLAKE2B 08f16e3da527fca5a3269bd2be03b54709a1b84554e4f3044d214677051adbb7490411d150b84aa312c68633caae31147ed283e1bba61ee155db8c5d51c84e40 SHA512 4178d38a7e852107ee43206c9a39a9cde4465a0e1cd91a96f541cac32d3053e85446f95750cb2e3f812635e5f9cc95e7ab2cc9c820234950f4bf2d13b9f58b7f
 EBUILD lvm2-2.02.184.ebuild 8769 BLAKE2B 8ff55443aee773e87a78842021820822e8ba2283b61b510dee16423b1e3eb6f48a7ca0badd7776a266c14a8e3a458da889bd548685cc9adcc72a31bbbc25ddd1 SHA512 8fb5b8587580b59869b784434662d771e78378158233633c650e0a445f7c808fa06ab37f744182a25c1fd293f6e9fcf24653a160f59f56b6696249c22d8f2ea0
 MISC metadata.xml 1146 BLAKE2B 7a4bbf38d2e752523c2909c240a2c90ada04aee8efe96c62c5989887f4997e00a4ed7312dd9803d8ddcae02e8bbc3ba8f0fa9e5da0f484bc9768e0ed99ab8be3 SHA512 24240ba35d93d9f9171f2b164d949846a5ea2126eceed4b4454dd0b4efb9b1132f9f6717d2c7364f20820b792bbaf26dc274f7c10767993b35a565a76e042f4f
diff --git a/sys-fs/lvm2/files/lvm2-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch b/sys-fs/lvm2/files/lvm2-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch
new file mode 100644
index 000000000000..34968c7c2eb7
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch
@@ -0,0 +1,72 @@
+From a397b69ce33d811aba7d64d54b5c8e0efb86fd15 Mon Sep 17 00:00:00 2001
+From: Zdenek Kabelac <zkabelac@redhat.com>
+Date: Fri, 10 May 2019 14:40:11 +0200
+Subject: [PATCH] metadata: allow reading metadata with invalid creation_time
+
+lvm2 till version 2.02.169 (commit 78d004efa8a1809cea68283e6204edfa9d7c1091)
+was printing invalid creation_time argument into metadata on 32bit arch.
+
+However with commit ba9820b14223b731125c83dbc9709aa44fdcdbf1 we started
+to properly validate all input numbers and thus we refused to accept
+invalid metadata with 'garbage' string - but this results in the
+situation where metadata produced on older lvm2 on 32 bit architecture
+will become unreadable after upgrade.
+
+To fix this case - extend libdm parser in a way, that whenever we
+find error integer value, we also check if the parsed value is not for
+creation_time node and in this case we let the metadata pass through
+with made-up date 2018-05-24 (release date of 2.02.169).
+---
+ libdm/libdm-config.c | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/libdm/libdm-config.c b/libdm/libdm-config.c
+index 3f0d2510e..382f86bbf 100644
+--- a/libdm/libdm-config.c
++++ b/libdm/libdm-config.c
+@@ -51,6 +51,8 @@ struct parser {
+ 
+ 	struct dm_pool *mem;
+ 	int no_dup_node_check;	/* whether to disable dup node checking */
++	const char *key;        /* last obtained key */
++	unsigned ignored_creation_time;
+ };
+ 
+ struct config_output {
+@@ -176,7 +178,7 @@ static int _do_dm_config_parse(struct dm_config_tree *cft, const char *start, co
+ 	/* TODO? if (start == end) return 1; */
+ 
+ 	struct parser *p;
+-	if (!(p = dm_pool_alloc(cft->mem, sizeof(*p))))
++	if (!(p = dm_pool_zalloc(cft->mem, sizeof(*p))))
+ 		return_0;
+ 
+ 	p->mem = cft->mem;
+@@ -615,6 +617,7 @@ static struct dm_config_node *_section(struct parser *p, struct dm_config_node *
+ 		match(TOK_SECTION_E);
+ 	} else {
+ 		match(TOK_EQ);
++		p->key = root->key;
+ 		if (!(value = _value(p)))
+ 			return_NULL;
+ 		if (root->v)
+@@ -682,8 +685,17 @@ static struct dm_config_value *_type(struct parser *p)
+ 		errno = 0;
+ 		v->v.i = strtoll(p->tb, NULL, 0);	/* FIXME: check error */
+ 		if (errno) {
+-			log_error("Failed to read int token.");
+-			return NULL;
++			if (errno == ERANGE && p->key &&
++			    strcmp("creation_time", p->key) == 0) {
++				/* Due to a bug in some older 32bit builds (<2.02.169),
++				 * lvm was able to produce invalid creation_time string */
++				v->v.i = 1527120000; /* Pick 2018-05-24 day instead */
++				if (!p->ignored_creation_time++)
++					log_warn("WARNING: Invalid creation_time found in metadata (repaired with next metadata update).");
++			} else {
++				log_error("Failed to read int token.");
++				return NULL;
++			}
+ 		}
+ 		match(TOK_INT);
+ 		break;
diff --git a/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild b/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild
new file mode 100644
index 000000000000..c08bc9768448
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
+HOMEPAGE="https://sourceware.org/lvm2/"
+SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
+	ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
+	systemd? ( udev )"
+
+DEPEND_COMMON="
+	dev-libs/libaio[static-libs?]
+	static? ( dev-libs/libaio[static-libs] )
+	!static? ( dev-libs/libaio[static-libs?] )
+	readline? ( sys-libs/readline:0= )
+	sanlock? ( sys-cluster/sanlock )
+	systemd? ( >=sys-apps/systemd-205:0= )
+	udev? ( >=virtual/libudev-208:=[static-libs?] )"
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available -- thus, pull in recent enough baselayout for /run.
+# This version of LVM is incompatible with cryptsetup <1.1.2.
+RDEPEND="${DEPEND_COMMON}
+	>=sys-apps/baselayout-2.2
+	!<sys-apps/openrc-0.11
+	!<sys-fs/cryptsetup-1.1.2
+	!!sys-fs/lvm-user
+	>=sys-apps/util-linux-2.16
+	lvm2create_initrd? ( sys-apps/makedev )
+	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
+# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
+# USE 'static' currently only works with eudev, bug 520450
+DEPEND="${DEPEND_COMMON}
+	virtual/pkgconfig
+	>=sys-devel/binutils-2.20.1-r1
+	sys-devel/autoconf-archive
+	static? (
+		selinux? ( sys-libs/libselinux[static-libs] )
+		udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
+		>=sys-apps/util-linux-2.16[static-libs]
+	)"
+
+S=${WORKDIR}/${PN/lvm/LVM}.${PV}
+
+PATCHES=(
+	# Gentoo specific modification(s):
+	"${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch
+
+	# For upstream -- review and forward:
+	"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+	"${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
+	"${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
+	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
+	"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
+	"${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905
+	"${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid
+	"${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450
+	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
+	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
+	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
+	"${FILESDIR}"/${PN}-2.02.184-dmeventd-no-idle-exit.patch
+	"${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+
+	if use udev; then
+		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+		fi
+	fi
+
+	check_extra_config
+
+	# 1. Genkernel no longer copies /sbin/lvm blindly.
+	if use static; then
+		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+		elog "their static versions. If you need the static binaries,"
+		elog "you must append .static to the filename!"
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "1iAR = $(tc-getAR)" \
+		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
+		make.tmpl.in || die #444082
+
+	sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212
+
+	if use udev && ! use device-mapper-only; then
+		sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
+		elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
+		elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
+		elog "if it was previously disabled."
+	fi
+
+	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
+
+	# Without thin-privision-tools, there is nothing to install for target install_man7:
+	if ! use thin ; then
+		sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -flto
+	local myeconfargs=()
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	myeconfargs+=(
+		$(use_enable !device-mapper-only dmfilemapd)
+		$(use_enable !device-mapper-only dmeventd)
+		$(use_enable !device-mapper-only cmdlib)
+		$(use_enable !device-mapper-only applib)
+		$(use_enable !device-mapper-only fsadm)
+		$(use_enable !device-mapper-only lvmetad)
+		$(use_enable !device-mapper-only lvmpolld)
+		$(usex device-mapper-only --disable-udev-systemd-background-jobs '')
+
+		# This only causes the .static versions to become available
+		$(usex static --enable-static_link '')
+
+		# dmeventd requires mirrors to be internal, and snapshot available
+		# so we cannot disable them
+		--with-mirrors="$(usex device-mapper-only none internal)"
+		--with-snapshots="$(usex device-mapper-only none internal)"
+
+		# disable O_DIRECT support on hppa, breaks pv detection (#99532)
+		$(usex hppa --disable-o_direct '')
+	)
+
+	if use thin; then
+		myeconfargs+=( --with-thin=internal --with-cache=internal )
+		local texec
+		for texec in check dump repair restore; do
+			myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
+			myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
+		done
+	else
+		myeconfargs+=( --with-thin=none --with-cache=none )
+	fi
+
+	myeconfargs+=( --with-clvmd=none --with-cluster=none )
+
+	myeconfargs+=(
+		$(use_enable readline)
+		$(use_enable selinux)
+		--enable-pkgconfig
+		--with-confdir="${EPREFIX}"/etc
+		--exec-prefix="${EPREFIX}"
+		--sbindir="${EPREFIX}/sbin"
+		--with-staticdir="${EPREFIX}"/sbin
+		--libdir="${EPREFIX}/$(get_libdir)"
+		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
+		--with-default-dm-run-dir=/run
+		--with-default-run-dir=/run/lvm
+		--with-default-locking-dir=/run/lock/lvm
+		--with-default-pid-dir=/run
+		$(use_enable udev udev_rules)
+		$(use_enable udev udev_sync)
+		$(use_with udev udevdir "$(get_udevdir)"/rules.d)
+		$(use_enable sanlock lvmlockd-sanlock)
+		$(use_enable systemd udev-systemd-background-jobs)
+		$(use_enable systemd notify-dbus)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		CLDFLAGS="${LDFLAGS}"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	pushd include >/dev/null
+	emake
+	popd >/dev/null
+
+	if use device-mapper-only ; then
+		emake device-mapper
+	else
+		emake
+		emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
+	fi
+}
+
+src_install() {
+	local inst INSTALL_TARGETS
+	INSTALL_TARGETS=( install install_tmpfiles_configuration )
+	# install systemd related files only when requested, bug #522430
+	use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators )
+	use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
+	for inst in ${INSTALL_TARGETS[@]}; do
+		emake DESTDIR="${D}" ${inst}
+	done
+
+	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
+
+	if use !device-mapper-only ; then
+		newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
+		newinitd "${FILESDIR}"/lvm.rc-2.02.184-r3 lvm
+		newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm
+		if ! use udev ; then
+			# We keep the variable but remove udev from it.
+			sed -r -i \
+				-e '/^rc_need=/s/\<udev\>//g' \
+				"${ED}/etc/conf.d/lvm" || die "Could not drop udev from rc_need"
+		fi
+
+		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
+		newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad
+		newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld
+	fi
+
+	if use sanlock; then
+		newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
+	fi
+
+	if use static-libs; then
+		dolib.a libdm/ioctl/libdevmapper.a
+		dolib.a libdaemon/client/libdaemonclient.a #462908
+		#gen_usr_ldscript libdevmapper.so
+		dolib.a daemons/dmeventd/libdevmapper-event.a
+		#gen_usr_ldscript libdevmapper-event.so
+	else
+		rm -f "${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+	fi
+
+	if use lvm2create_initrd; then
+		dosbin scripts/lvm2create_initrd/lvm2create_initrd
+		doman scripts/lvm2create_initrd/lvm2create_initrd.8
+		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+
+	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
+}
+
+pkg_postinst() {
+	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
+	ewarn "# rc-update add lvm boot"
+	ewarn
+	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
+	ewarn "to enable lvm autoactivation and metadata caching."
+}
+
+src_test() {
+	einfo "Tests are disabled because of device-node mucking, if you want to"
+	einfo "run tests, compile the package and see ${S}/tests"
+}
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index d41697933221..fba003d4ef88 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -2,6 +2,6 @@ AUX mtd-utils-1.5.2-sysmacros.patch 927 BLAKE2B 5ff3cba6a47443b747c272f535c983cc
 DIST mtd-utils-1.5.2.tar.gz 343843 BLAKE2B 7f6612c4b9185583e9bbc785f7f96b08b7897c4af0c442a6206a446dc25f3c2aae9670c9344fba09606f73b87c73a96150f77bd974c96abe475d204ba5c28068 SHA512 81eb5cf27814234af65409fe93798ec50d9f733978dc606bd33e63d98eb99afb3f988df47dc66a9368a11baee0a35fa1d0d6677af8c23428919e34bd11a25697
 DIST mtd-utils-2.0.2.tar.gz 355964 BLAKE2B 9a795ddac1287c7c44f52215faa4b6295cf5ac3917392a407c7824f8715f4a180feab95621e6b1aa738fba38950c8e12b722b7c518c3362227e6da25deecd3fb SHA512 e61f4bb24d3b96d39fe262f73e01b7bf3e15a9258fd5766657ef0d807d7b5bb0b489ade9dc45068b2a25bcf378ca2877177df3915398b367f50ff1ef9bc5be7a
 EBUILD mtd-utils-1.5.2.ebuild 1564 BLAKE2B de9628c6cff455da5ed55f2f5822cd561ac9a487e6b9510d3b7ece0ae26edece2d02045cbadae63c4e6e48421c0babb4b77bb2ebf076f3fb86c7170bc671c301 SHA512 934327b7a547dff08509bbf956a00eb22188d0a0bf1275bcf2c2b07b7a2a5faaefe64ce6665de31c8dfd74c835a10e7d9de9b9404630109e4dbaad51e8780410
-EBUILD mtd-utils-2.0.2.ebuild 1334 BLAKE2B 2325e1405701d550c948fff9baa933220febb42fa9438b5f76afa768f37a74e62ab1f09eaa95279aad1e9a0c53ed7b3d1bd7c1a15513843ac4ecb5fb7194b7e3 SHA512 e83bef19fbf6d27d9a00a6588c7433365d51dde546db939757787554d00fe7b5dbb3b146c73d5c2a464605f77299e99336adee6bcd50653ef474368b142d9f2b
+EBUILD mtd-utils-2.0.2.ebuild 1328 BLAKE2B eacb6ee18df1e42eb997fb8764a973034cd8dcd4ac9b881520004f159d30ce749431b8965e65036d08642a5eeffeeb7e68955197ce1dc7f71ed0ef4f698b10e4 SHA512 1388b8fd2804bc041f5dcc628f4c43ff8fbfc24a596ff27742aa031863729fcc0438b0cc2d584f7e44f66df080b19986c5cf7e85f0604e4ad7888d618fd4122a
 EBUILD mtd-utils-99999999.ebuild 1510 BLAKE2B 6b49689495715cb470e1c386dd0ab7006610aaed89935a2d9c75eae5b7c08a8566a89060bc9ab1d8da73ce18a5e8826b6bf7f2e724531d93103a298ad894f241 SHA512 8fd85aaed72cf2a59f783a366a01ba93f3929c15eb098500be0025a6a2e388db397c385a9d97293cba1b14913ae6a2d93f90be082d129312e9fc49601f95a5f8
 MISC metadata.xml 323 BLAKE2B d1d9d3f24dc9d2fe5790f0999f787a331b5b0f261b2bf73946841c8a7f40a3b7c1a8e7bd7e516eaae87f82210f4d558c11f3ff1a3f302b71bb98e993a59c421c SHA512 191d5a9dbe4c6a0a72815092a0668070ff39bc121b30a3e55abd894ca62fd3641a205662a23a6a87aeeedd8ab000e4d2d40bbba278acbc0f7d74c97d0571d0c1
diff --git a/sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild b/sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild
index 260052fe1720..0a208914e003 100644
--- a/sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -19,7 +19,7 @@ else
 		MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b"
 		SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~mips ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 7ed5251f824b..469d1e9258d1 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -9,5 +9,5 @@ DIST udisks-2.8.2.tar.bz2 1589149 BLAKE2B eaa9d95e175bbdd4255c627a0dcd93ff6f0a36
 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 3240 BLAKE2B a887061b0302b102597b146f6597b365b4964f372ec829f8178c419a3e3bcb2b3ed00e11157b75ef0ff8766e2d851391a1ae6a76c4d4a5119966ff4b4e441ea5 SHA512 99278667326d8ae9e4e316eae3eca0628b89cb04c8750a6f822b6f9a024c8d26bfb8d2399988e6f8b9ded8aff4691dd382df68a7aa99b423fcba71cefa67d97f
+EBUILD udisks-2.8.2.ebuild 3238 BLAKE2B 54750d2e708e2a1e4375028e5d95e1438c6dc9c861b190d6061d5b627bc5dc379c4a45b1842042b485ae774cf459910a1292026bc4c382fd8df1ec9a7655a903 SHA512 38a0665f0941517a3267bf21dd35b239b94286544d236aac91cbf9b41cd25126cb933e42492f5d19aa32062581d5489ec6702ef21ad4e2cee93bde82ac8d6c50
 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 50ffc5f311e2..6cd6df956194 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 )"
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index 2d703f818c6f..f14fe3ecc090 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,5 +1,3 @@
-DIST vhba-module-20190302.tar.bz2 15708 BLAKE2B 4a6f1f22e893597e50e78fa06e1296079b600ad6b2cf7b319267ef44d1ff07795f2aca22541993a7fc57d15550297e71046ce4147226d0731aa2b4d691dd5299 SHA512 6df59112b9b0597ce98de85744acd8158dbc015841740649fa3538fec32f1d7cbf4e489062998cc13dc85a1b3558bcffc2ea65285e17ee5b3f1c0a7d49cd6a38
 DIST vhba-module-20190410.tar.bz2 15741 BLAKE2B 6d513877c771b1c4c5805231cf8bb13333d29dd3c6de7d91879ef1898fdc424df026b0835a772f398dcdc7d8900db462164a40e46c9b66b38ed70f5b5f6a0e7e SHA512 e4b30bea8464d8ac24fd2fddca9d41052af2f5b3dc9e054ead47991bff41366be377600075627c40261722c88c20ed2eaf65fa7afb34690ef09a6f4ea6f9351f
-EBUILD vhba-20190302.ebuild 2146 BLAKE2B 7b02077e20c319d2d9197719c00e115119b3e825c706fbfbc64de6a018b374605a5d06e4ac7d830c365b3ee1cae7299a207a49eb8d55385d775a73a0bc3f8c8f SHA512 ab5fc77641921817989917b9b47e0f4766db4e02238c8826d2eeb90d6a23c7ef7a1fc21d4ed99ddd1ea002f06d4ff7f63c7df660923cd71db5ab34d9a8b0dc5c
-EBUILD vhba-20190410.ebuild 2147 BLAKE2B a066190d6867675253e387a2d6d03356f6c601c049b0d8cf797736c208e0302ce2e84bfc71c8cae293cb53eec29107e34fce7ecc942c7d8a680cf794bfcecc2b SHA512 ccf087347d20f672e458b5413c49161f72a43984b1ecaf8d78586a88251f5d59ba385d7af588908bd9db3fcfd9ae3c43939518e314e167df67556f1e45ed8b37
+EBUILD vhba-20190410.ebuild 2146 BLAKE2B 7b02077e20c319d2d9197719c00e115119b3e825c706fbfbc64de6a018b374605a5d06e4ac7d830c365b3ee1cae7299a207a49eb8d55385d775a73a0bc3f8c8f SHA512 ab5fc77641921817989917b9b47e0f4766db4e02238c8826d2eeb90d6a23c7ef7a1fc21d4ed99ddd1ea002f06d4ff7f63c7df660923cd71db5ab34d9a8b0dc5c
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/sys-fs/vhba/vhba-20190302.ebuild b/sys-fs/vhba/vhba-20190302.ebuild
deleted file mode 100644
index 157ae2ff9f9d..000000000000
--- a/sys-fs/vhba/vhba-20190302.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils linux-mod udev
-
-MY_P=vhba-module-${PV}
-DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-MODULE_NAMES="vhba(block:${S})"
-BUILD_TARGETS=modules
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG"
-	check_extra_config
-	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	# Avoid "make jobserver unavailable" warning and -Werror problems
-	sed -e '/ccflags/s/-Werror$/-Wall/' \
-		-i Makefile || die "sed failed"
-
-	eapply_user
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README
-	linux-mod_src_install
-
-	einfo "Generating udev rules ..."
-	dodir "$(get_udevdir)"/rules.d
-	cat > "${D}/$(get_udevdir)"/rules.d/69-vhba.rules <<-EOF || die
-	# do not edit this file, it will be overwritten on update
-	#
-	KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess"
-	EOF
-}
-
-pkg_postinst() {
-	# Older versions of vhba installed their rule file in /etc/udev/rules.d,
-	# which overrides rules in /lib/udev/rules.d. We remove the old file
-	# automatically if it is identical to the default one installed by
-	# vhba-1.2.1 or 20101015-r1. Note that the comment at the top of the rules
-	# file states that it can be automatically overwritten by the system.
-	old_rules="${ROOT}etc/udev/rules.d/70-vhba.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  2959b3cf61cfe6e466cc3516a7bc19de* | 1e7a7e5d6d28c811eeec98ec26ed5d28* )
-		  	elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" ||
-				eerror "Failed, please remove ${old_rules} manually."
-			;;
-		  * )
-			ewarn
-			ewarn "The ${old_rules} file from a previous"
-			ewarn "installation of ${PN} is overriding ${P}'s"
-			ewarn "udev rules. Unless you had deliberately customized it,"
-			ewarn "you should remove it."
-			ewarn
-			;;
-		esac
-	fi
-
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/vhba/vhba-20190410.ebuild b/sys-fs/vhba/vhba-20190410.ebuild
index cb0c86737164..157ae2ff9f9d 100644
--- a/sys-fs/vhba/vhba-20190410.ebuild
+++ b/sys-fs/vhba/vhba-20190410.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="virtual/udev"
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 587a484cb1c9..56259700aef9 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -9,5 +9,5 @@ EBUILD zfs-kmod-0.7.12.ebuild 4072 BLAKE2B bd174bbce39a1634c40ba20c26066e15c660b
 EBUILD zfs-kmod-0.7.13.ebuild 4119 BLAKE2B f8d921251bc94644a7331762054935518bb9fb68425b404572876466bff118b9ae20cf297f34d9267c933d7ea28840c84fe8e4a867e9a9f191b627f29207798b SHA512 8e4eb43e5b4edd7dcb8b0ecb13a809340ee20247017e7cb141b8489dc4c9988b84b40e866028e8d3b73aea69981a923e4fc4b237389115fb8e72d8b6ed450340
 EBUILD zfs-kmod-0.7.9999.ebuild 4131 BLAKE2B 10f0553102967537d42f5b2da8ede7c8894ca9134a1421efadd1db538b3381d588fe6729dc37c84ab025212ca01a74c2e60768fe8f7808acbd21f0179b2a9abb SHA512 ad59815b9e2ce844e6caa5232d1e4f17c70b930b8295a28e44f37b8293c602fb8b98f939bb1ea22cef68c8e724de6a581b09073d41fd7a14aa181a0cadb6250c
 EBUILD zfs-kmod-0.8.0-r1.ebuild 4455 BLAKE2B a46c12e4547b5ad0564cd43fd63af6f646ab21f4cb7ec581a09c3c91bef6901321f10b92c4048de072ed6a3bdfcb36827c2189a04e63f86a4e9243adddb457ee SHA512 9ad94fff5362229432c5d817dfea53a9e17311d7caa7e6b6966de906b1020e393d841ffc277ec4a40d7e9b4a961c80bcfd8a5467557a6a5f69db61d9b2952421
-EBUILD zfs-kmod-9999.ebuild 4328 BLAKE2B b7304dd03f2a189b434837b337a8ae7a46b4b3b823880542bd4751496bd2f63e0976652402266552e822b073a8ea262b8bbbf03ef79a15c0b56da8e840aab63e SHA512 30c91bb159521bfa37b7bed7cf4c25c0415b9f302fbf0aaad6494a1039d1928fd6e8c154ab461ffbe911d53b8f2c60da13bbdba8656cae691149a1f84354d56e
+EBUILD zfs-kmod-9999.ebuild 4383 BLAKE2B 0647118185faaf5a17423e8a24811fbdf7cc3eb01a412632e7ab9610fea23c9a7c85f7cb21b6187b651d895ac4d00c4a6e795c38fd7d49bbee7784b514355191 SHA512 a87e77f261462f720f5c8e64fd04a8f6ea4cec1fe71c242aa06c9da88272e95c4509645a1f4afd518889624815e203cd07a441454d190109ec3ce6eabe0ca357
 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index b8773e1d020e..0d936563c24f 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -63,6 +63,8 @@ pkg_setup() {
 			DEVTMPFS
 	"
 
+	use arm64 && CONFIG_CHECK="${CONFIG_CHECK} !PREEMPT"
+
 	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
 
 	kernel_is -ge 2 6 32 || die "Linux 2.6.32 or newer required"