gentoo resync : 03.03.2019

29 files changed, 493 insertions, 769 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 5bf6c077d625..265f6df2836a 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 789a355978d6..4b648390bd55 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -7,6 +7,7 @@ DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 35575946c1de9cb81f1aed2a5be24331
 DIST btrfs-progs-v4.19.1.tar.xz 2007160 BLAKE2B fda89842f5117e77a00794054b1a11a7233d33c2135492b4a382cfdbcbbe58624447178cbeba7c44fabd5a5848fb4d47665dffbd838ff1b88432e1d98deb0666 SHA512 834b0a16216437301637d44561fd265db167b7084de7d43d36802907645627d955421c1f5c46f0eb72d85f8b8d70905e5f6c0d539a34693704aa188085dfeec4
 DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b098108f7363fc3c015d73bf9afcda9d579831fe0e324125893cdb2510873d052522b15843c461e640a546900e535ce76 SHA512 e5abf637a9c811973422ca05a5530f6cd18263013d141277e2a70099cf8ab7e0eb8781df56368da4321c90f21d1022ad852b661adc4877e9a9ba5c60ccbefdee
 DIST btrfs-progs-v4.20.1.tar.xz 2029056 BLAKE2B 849e85886a292ef6b2d3eb5d47a80b1ece5ba51ee74d202f8e0a8cdf00877f76cbab00e01a7a97374f1b2b6c3b1cb8d6e7ffad383cb2f76e8a87618bece8096e SHA512 66f9abdc65bd97ef4a4c6eb9aac252604b7250216c8d9fcf54e9657aff74a2b2b1af465ac7cc68de71bfe1fd86219259cacd27ec2eb96f044ba0c8af2b72e8a2
+DIST btrfs-progs-v4.20.2.tar.xz 2028668 BLAKE2B 51ee331d39a2cb1f383cac311bbc4d51bb961ab118649c2100d3b4450206363aa361e83f16e4c7492454a344c5037d1895aaf7d900b15077460d99d3d98c6262 SHA512 a542423589e7ee35b9a1791ef13e4c8ea4be56b33d6119a18d046233cfc04678c525cad545387aeb48e0dbd8249c5a501100fdee8f6d6882c906e0a737a1778a
 DIST btrfs-progs-v4.20.tar.xz 2028328 BLAKE2B f7038a6b454d44ce3899b6607fa5554150f5801a158e8296750acd1275d3ebffeb6284f2ff609a68b2df55b15479d3039ca94e1ecef0515bbc1b87281f536d2c SHA512 a8339f73079d74d61b8bc17cac57ae560746baa4104e496080bde5329b1bb70712f033cdd306f8c06db6b364f0087b424e7e33511cad5bfeed5c214518e16a27
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
 DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5
@@ -18,6 +19,7 @@ EBUILD btrfs-progs-4.14.1.ebuild 2481 BLAKE2B 3e4db698cb95fdcdb982b424364cced1aa
 EBUILD btrfs-progs-4.19.1.ebuild 2855 BLAKE2B 94e2d31c4d5f8ef45c076cd736f246d35c46b7a768dfee3e17bd7ac2a92a391b4817f188c6e84dc44a4bf94b107d452bd7376cd4dbf47dedcfda1215ae57c357 SHA512 040c58607f706224ee439f46bdb82123b3abf83ea75f8bce6c47ba7f8c3ad971b717c1c4895caafdc49fdadd6ef646470177eb377a17fd8009d666b7afd627eb
 EBUILD btrfs-progs-4.19.ebuild 2897 BLAKE2B 98a269aee1b1781b2dcd9be3dc4d6da8c82d2b5474e08f79937498d055766b738acc0e349321d6899c9ed2c5ad42c3db8126fa48041deec695cc2e78f7dfe801 SHA512 9dcd83e8f22b19b44a974ec809c8e1847f44dd33e85dc4adc3d47b26f90464f08247b195efa4ce3bb6effd5f68544f1cb1a08699220d658235ea73858be81ad2
 EBUILD btrfs-progs-4.20.1.ebuild 2855 BLAKE2B 091b43bbf8beae8e05e97b26f8f200aeaed6e5061bd6b945b42c9dcadb27d45ffbe69f47ec9c6cf2d7bcd820b123d686fba2fdd10e5762266adc63ec0d83c375 SHA512 7eff670c6e93f5f43cccb98b8cae3e41d3087f876bd94bde340f8a9b4690fef262237a39b205e4536f441685f5759b2b7c3b834c63d78e295d5feb96a7557d1e
+EBUILD btrfs-progs-4.20.2.ebuild 2855 BLAKE2B 091b43bbf8beae8e05e97b26f8f200aeaed6e5061bd6b945b42c9dcadb27d45ffbe69f47ec9c6cf2d7bcd820b123d686fba2fdd10e5762266adc63ec0d83c375 SHA512 7eff670c6e93f5f43cccb98b8cae3e41d3087f876bd94bde340f8a9b4690fef262237a39b205e4536f441685f5759b2b7c3b834c63d78e295d5feb96a7557d1e
 EBUILD btrfs-progs-4.20.ebuild 2855 BLAKE2B 091b43bbf8beae8e05e97b26f8f200aeaed6e5061bd6b945b42c9dcadb27d45ffbe69f47ec9c6cf2d7bcd820b123d686fba2fdd10e5762266adc63ec0d83c375 SHA512 7eff670c6e93f5f43cccb98b8cae3e41d3087f876bd94bde340f8a9b4690fef262237a39b205e4536f441685f5759b2b7c3b834c63d78e295d5feb96a7557d1e
 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd
 EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.20.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.20.2.ebuild
new file mode 100644
index 000000000000..13b960406d19
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.20.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit bash-completion-r1 python-single-r1
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV="v${PV/_/-}"
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+else
+	WANT_LIBTOOL=none
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+	EGIT_BRANCH="devel"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert python reiserfs static static-libs +zstd"
+
+RESTRICT=test # tries to mount repared filesystems
+
+RDEPEND="
+	dev-libs/lzo:2=
+	sys-apps/util-linux:0=[static-libs(+)?]
+	sys-libs/zlib:0=
+	convert? (
+		sys-fs/e2fsprogs:0=
+		sys-libs/e2fsprogs-libs:0=
+		reiserfs? (
+			>=sys-fs/reiserfsprogs-3.6.27
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	zstd? ( app-arch/zstd:0= )
+"
+DEPEND="${RDEPEND}
+	convert? ( sys-apps/acl )
+	>=app-text/asciidoc-8.6.0
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+	static? (
+		dev-libs/lzo:2[static-libs(+)]
+		sys-apps/util-linux:0[static-libs(+)]
+		sys-libs/zlib:0[static-libs(+)]
+		convert? (
+			sys-fs/e2fsprogs:0[static-libs(+)]
+			sys-libs/e2fsprogs-libs:0[static-libs(+)]
+			reiserfs? (
+				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
+			)
+		)
+		zstd? ( app-arch/zstd:0[static-libs(+)] )
+	)
+"
+
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" sys-devel/gnuconfig"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		AT_M4DIR=m4 eautoreconf
+		mkdir config || die
+		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
+		ln -s "${automakedir}"/install-sh config/install-sh || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+		$(use_enable convert)
+		$(use_enable elibc_glibc backtrace)
+		$(use_enable python)
+		$(use_enable static-libs static)
+		$(use_enable zstd)
+		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 all $(usev static)
+}
+
+src_install() {
+	local makeargs=(
+		$(usex python install_python '')
+		$(usex static install-static '')
+	)
+	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+	newbashcomp btrfs-completion btrfs
+	use python && python_optimize
+}
diff --git a/sys-fs/ddrescue/Manifest b/sys-fs/ddrescue/Manifest
index 3423c41523df..571e0215570c 100644
--- a/sys-fs/ddrescue/Manifest
+++ b/sys-fs/ddrescue/Manifest
@@ -1,7 +1,7 @@
 DIST ddrescue-1.21.tar.lz 74716 BLAKE2B 0f50c05d20ad74dc7b3d1db5038f6707b0d2a569d880af24a8623712dc89e207faac096031a43de10acec66a1e862049b726de3c05f30c51232817a56fc5643d SHA512 6b8fddc621af90acc90e54c8688ea5d18721ea922b4433f2ed76f44bbaf5bd90b560b380c02a133fa7f67da85436d058861820eeeb46bbb7d3ef53821c0de079
-DIST ddrescue-1.22.tar.lz 80050 BLAKE2B c455bf847749dc29565d02efef8b24f1a322e8069b51821ef9ebf7f6bbc650241ad76dadaf60e7daf92c55c2ae9e7d27b107e734404538e78678e1f2ac147e97 SHA512 3e5236374e2c1baae40026f59cf7040414d798a48d4edd6c6bde919e658ca958a795421301439ab2b8aa9f1d8fc60a2fff84b26e22a350e4150850b9830ce754
 DIST ddrescue-1.23.tar.lz 82451 BLAKE2B ed9d71894d4c8466e3ca56d853ae5a6c4f7cf1955bea4468c158674e7bf6386343ab8289714be7ebb6b326f462e53fc7e9d8122a26079267ab4324f60c8fc4b8 SHA512 4f0b27067966b71efaae809d4f38714863cf3663f3b8c3f26055d482debb15c0fab77752411a9d242f18dbb8e4edc68494f866721dae9c95cfc5354439eaa656
+DIST ddrescue-1.24.tar.lz 85244 BLAKE2B e8b5ca5c89a65bed6126737125d78b2af9cdd7fe9b20f1f03636d58249d33dc08cb1907eca35c35d3ff81dd031290177084ae5dcc1cac20e79cb6c182cb894e4 SHA512 2c6a86c80bad122e0c44d6f8da49239e10362fbfbdb70acf39055ce02637daa05cce4f24adac732a1bb3a6fc97cf6985dd20827e99ab3bf6bad4db015a00fbaa
 EBUILD ddrescue-1.21-r1.ebuild 895 BLAKE2B 3b0a7ed0bb4c1b0e9a58bf4acb3aacd62ecb08787a156dd647c1893cfa99b16011e6665034e0c21dba772f248b99efa31c1f075b4e4d4b6a6e7b557de866e66f SHA512 64b7d0cf4ca44de210739cc83952b22bd3767200cea0f9e3f24d66517746eef5dc7b531befab9ea61604afb85b262633687037368aedff493e3b821ef3414208
-EBUILD ddrescue-1.22-r1.ebuild 875 BLAKE2B 327dca894854f600e0c13b85724c4e490934e156d29631a3007364e5c3c95802ba1e7047f82b82c1a18ade6f200350a408428e3a2fe6730a976c0eb83cb7bc06 SHA512 85ce9dc6917d5c1d04dab0dd42fd6d77f02698a0634200e1daa5d2159ab0d088f9d5c703ee7cd57b76e5437d2411efaf8e340f78b73a6f53264356ccfcb70cc1
 EBUILD ddrescue-1.23.ebuild 879 BLAKE2B fa277364e7e9772dc9e69e0802e890e4e931bbb4851aaa0b1e66c76771831bb8b2540fa5387e61f9c063583919c07e3226cc66c96fc5e35d03e6e9cdcb076fe2 SHA512 ae858b2e1c831119ab7a3a779a6d02225f361fd6ea9ae246dda424af299c8174b77869f1319e7a4766fe7bf9a53b0ff7276e80d38d91d76b70a3242346cc4c40
+EBUILD ddrescue-1.24.ebuild 879 BLAKE2B fb2c553ec947a590dea017fbec3745780525bdd5a0a634f36aa3704a1d7ac2e4166073c1b5180e6d2643e4d5a5dc8a9d376ae99db3ba61fae3417c51f45dcbda SHA512 be26d3c6b73f8af70d08340affbfb72ae81031f38ab576c14fc4c2167b70c9a8eaee3e591b3e01349904ffca49196626314f5afb90dccc9cf7333d8cbd9b1dc8
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/sys-fs/ddrescue/ddrescue-1.22-r1.ebuild b/sys-fs/ddrescue/ddrescue-1.24.ebuild
index 74ecc8b944dc..692566cd46ed 100644
--- a/sys-fs/ddrescue/ddrescue-1.22-r1.ebuild
+++ b/sys-fs/ddrescue/ddrescue-1.24.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="static"
 
 DEPEND="$(unpacker_src_uri_depends)"
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 0fa35f6b4a40..a825d85c19b9 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -13,5 +13,5 @@ DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024ed
 EBUILD e2fsprogs-1.43.6.ebuild 3781 BLAKE2B b68206959b716f2f7018da95f2e7872bdab4dd1ba554d83fc089ad5dead7e2e51b5c7a3d67669083bbe7f8d67c5b45919439a2560d95a4de3dcc217dd4bdbe1a SHA512 71ce74750ec162caac3d07602cc011ac0ed429723f8aca43d4f4918184cb3ea9a4ae770e834ab46ba2dacf351cf5288463b05b36c66f90d127cbe50452c7a727
 EBUILD e2fsprogs-1.43.9.ebuild 3804 BLAKE2B a110adfe131292172510d7133d8c4266742c54cc3a3aad3959375d966672d462d2761561b79a2f952c6f4ed2b3004bc7abbc0ef90a6d44e8b89203a0df96cd09 SHA512 143bdfe5f8dd353782e84e3c0b9955127eab10aa7fa07e6c024656282225ec5ba30880d1fab61e249010d5192b2d546278694f0b951138500fb1a6ac3ee70a6d
 EBUILD e2fsprogs-1.44.4.ebuild 3857 BLAKE2B 3e9e55635efdb8a463a760bb0eac8c602b3d474e936d8b8aee6c56a950d33a14d30bb3f47b1ef1ef9762ff1db019a9495e7d970f72ccde2dda89c9429ad9f3af SHA512 a7f0441b1cd0fbb2f3c0a06b9b4ea831c97eaa36516bf5b205d65e7212d6e1b0312c64b89d2f72076bc580a5cfe9775bb0b237e6b76bc6de5d54de03ecae8fe1
-EBUILD e2fsprogs-1.44.5.ebuild 3918 BLAKE2B d94d9e1f0546b8430b4b45e98db9e4987a9e7ef7776de5595b1e504a6cf4771b558078225e916b1c92abe2cf79aa38b639728d51c2a67cccc5cc457d7649e122 SHA512 6508248dd3f3fe3dd65ce752ce56926a8c659c96184a4fecd05a070d9af875b82ff9f2af1fb24f70293ca414cadd823e9a283fc9333cc2e73793ba13ba2a4738
+EBUILD e2fsprogs-1.44.5.ebuild 3917 BLAKE2B 249b8d037c3cb4c841333bde3ad135aef7cc1c6c527d2c3dbdd7d43a74c3b5ca5935ad4763520e32e9d066b27a0492d461eef6756af7d6276f7a60c24f173ee2 SHA512 59a8782f172933fa21c0edf85d84cf52e39e2c624c384774d8739fc843023bb642063d3b1c10b8188b2d0385815104f48a22417bfd4fbc053916eb3697b70d49
 MISC metadata.xml 520 BLAKE2B 3e908938de1132b5cde97c6b51b40f72c03e91301b54c14339379d2e2380414dd33096a87d64ff2fc7d886cd65fb16b9c16a376b7338c826f44917860f380be2 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild
index 79632229b52c..354b504f090a 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 67709bb22893..e33390ab267b 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,5 +1,3 @@
-AUX clvmd.confd-2.02.39 213 BLAKE2B bfca5c33cbff432427291c162f8e1c5172957c4d1dbabae8605bf1aab7aaf0c8d9b1b67f81219b3a3ae0822e0a9e17c8bde2b59c27a0fafd8495b67e0c7708c5 SHA512 9614c4188c9a5bcf398d1f521b52d7e2281fcdf76265fdaca4acda22be282d8468e82b54a2661d5753f4b9a442ebe93a60daf87c846db4e275a283f71c9fd8e2
-AUX clvmd.rc-2.02.39 3590 BLAKE2B 6ea7d9a112a98baed0c8d96e19804cadc82cc326fd6db00947631f3ef10791f0cf7888a250aeb8e37b6149302b26310c305c4a46cb8eef2dee00f0d0238c9943 SHA512 2a16b700f475a65477d548b4cb5fb26129c86d2244b7b5716ffdb4e9b13cf2e37bc1fc986c080c5c4d1c0e2b5436b0cc6fcb0527c9b98c1b29b85ca512551532
 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 dmeventd.initd-2.02.67-r1 565 BLAKE2B ca1f5d205191076114d4a89717b304df04a520a22630ed84e78550e83b9364e049457bacfcadcc8ca1328a78c97412a445fcf153871266355379eab423c38138 SHA512 c0f5317ab0cba700eab3b643fd134d8a23fe4b332c47fd94728e43dfdf97250561f60ecb47808d2c65e55cdec65cccbd51f264540c0d973b2df7ded4ec129c34
@@ -12,7 +10,6 @@ AUX lvm.rc-2.02.172 4269 BLAKE2B a53fb5302293f7afb800400a0bb1e4f60ad8c3f7951c087
 AUX lvm2-2.02.106-pthread-pkgconfig.patch 860 BLAKE2B 73c23ba460787dccc1412a8fdba9cdf60172fecab9a732b154af7e7bc4c927a751fbd1107c86cd997221b963748644885a4f525eae351aa2857c4d7e1498f755 SHA512 ae073936ee15fdeabde4d3948a65f6a435b82e62aa0ddadbad399b69bd5c9bfc181d5e0be1beae9f6e899a6e8b9d7c21add13f7a1606cb5ed4762ed5aa5aa223
 AUX lvm2-2.02.108-example.conf.in.patch 1681 BLAKE2B 3b7f1fcd005687aa3b4469d88a6fea71c6d5745df0b8ec76dbc6e4e6ad11828785f705503a992a25bae9fc77772fca03f023dbf515bc34e498dd718ed97aaa63 SHA512 b4e983892b7ff47e5e7617376197daa62cfd063cf398235dc4a436fd9025ec4b1e263d7418e2c2943d53be494cba4209e9d4230d54a78762b0ca526f92e9746c
 AUX lvm2-2.02.108-static-pkgconfig-libs.patch 3302 BLAKE2B c44b0602e010c7e774d87de808d739987b0bed6e1c963b6a6005b42933edbcaf43dabfbcb26a668c6ba4f0b1e3ddcb2f727f7b57d1c5b8e0c41b201d974a15ac SHA512 246f1029f9346d6bc57c2062c8a223535d0b832fa6bd86947b8b91b094dbc388706a9914f9ca0531666f77e73544612e2819335435b7576b4e91cdb1b0e4f041
-AUX lvm2-2.02.129-dynamic-static-ldflags.patch 2250 BLAKE2B f790e053f650b56fcc4c06765f88a27ef71290f8106eff2361da312309b684f5116dc03e53a9ce0a4071757bcffc8d57d93133758ecc5a32cea88835296368ff SHA512 43884e69dab82d417d9e834b528034b985d6e7cd2d7bdd3a2e30a03fe114670d56bf3b9e6c2d670275261f1eebb97125eb2f2abe53904866c220e16f9d6effa7
 AUX lvm2-2.02.129-example.conf.in.patch 1844 BLAKE2B 60e717f172557800c9a797309188b88bd601f3491d54d7dc0320e40b4b4825c20b70e07f9737d3e109746523c16ec29519f18fae10e9c56b3a936e082b8e308d SHA512 a2bceec0d051fd2f7749e702d6bbabbc0edf98b11b3211256d2a49d781b1fe89071f36052045726b11b0e0bdd98242b88fc57128a048a7d6d6448c298a6233ed
 AUX lvm2-2.02.129-static-pkgconfig-libs.patch 3299 BLAKE2B a4495bfca4892036a03bce05bcdc060f54c53b697348f46b29d8c814a1646eac8b0aa0702b9a97954c1ac8ea9d1223a6d74b59fb95bacf8e08d672de35345226 SHA512 28906793a51737679e51bf83298388ea3ca081f513d34b4c38f3fa09f574c9957f4eedfde0179e31be90631e12d41c78b3bb4bb74c069a99a69ae703f3a2f2f7
 AUX lvm2-2.02.130-pthread-pkgconfig.patch 915 BLAKE2B a82e3283e633fbe0e47f4ea94f3c1e975dcf1c2e6cd1f93d16e4d08516d1f0f49f63227e42cac5bcf5ccec473c679098cdb114be22fb9432c38325fa96db4c43 SHA512 1e45ccb3bf824fd2f8276b4ca103e95960e401e793944af68a16929040015b42d601b09adbb8f01e833071d501440a20381fe263fd1884d8fb2e7d7f5463da6d
diff --git a/sys-fs/lvm2/files/clvmd.confd-2.02.39 b/sys-fs/lvm2/files/clvmd.confd-2.02.39
deleted file mode 100644
index 57821709f5f8..000000000000
--- a/sys-fs/lvm2/files/clvmd.confd-2.02.39
+++ /dev/null
@@ -1,9 +0,0 @@
-# CLVMD_CLUSTER_TIMEOUT -- amount of time to wait for cluster quorum.
-
-CLVMD_CLUSTER_TIMEOUT=30
-
-
-# CLVMD_NODES_TIMEOUT -- amount of time to wait for the other nodes to
-# join the cluster.
-
-CLVMD_NODES_TIMEOUT=60
diff --git a/sys-fs/lvm2/files/clvmd.rc-2.02.39 b/sys-fs/lvm2/files/clvmd.rc-2.02.39
deleted file mode 100644
index efadd892ee94..000000000000
--- a/sys-fs/lvm2/files/clvmd.rc-2.02.39
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-[ -x /usr/sbin/clvmd ] && CLVMD_BIN="/usr/sbin/clvmd" || CLVMD_BIN="/sbin/clvmd"
-
-[ -z "$CLVMD_CLUSTER_TIMEOUT" ] && CLVMD_CLUSTER_TIMEOUT=30
-[ -n "$CLVMD_NODES_TIMEOUT" ] || CLVMD_NODES_TIMEOUT=60
-
-VGCHANGE="/sbin/vgchange"
-VGSCAN="/sbin/vgscan"
-VGDISPLAY="/sbin/vgdisplay"
-CLVMD_PIDFILE="/var/run/clvmd.pid"
-
-depend() {
-	use net dns logger dmeventd
-	want cman corosync openais
-}
-
-load_modules() {
-	local module modules
-	modules=$1
-	
-	for module in ${modules}; do
-		ebegin "Loading ${module} kernel module"
-		modprobe ${module}
-		eend $? "Failed to load ${module} kernel module"
-	done
-}
-
-unload_modules() {
-	local module modules
-	modules=$1
-	
-	for module in ${modules}; do
-		ebegin "Unloading ${module} kernel module"
-		modprobe -r ${module}
-		eend $? "Failed to unload ${module} kernel module"
-	done
-}
-
-umount_gfs_filesystems() {
-	local sig retry
-	local remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)"
-
-	if [ -n "${remaining}" ]
-	then
-	        sig=
-	        retry=3
-	        while [ -n "${remaining}" -a "${retry}" -gt 0 ]
-	        do
-	                if [ "${retry}" -lt 3 ]
-			then
-	                        ebegin "Unmounting GFS filesystems (retry)"
-	                        umount ${remaining} &>/dev/null
-	                        eend $? "Failed to unmount GFS filesystems this retry"
-	                else
-	                        ebegin "Unmounting GFS filesystems"
-	                        umount ${remaining} &>/dev/null
-	                        eend $? "Failed to unmount GFS filesystems"
-	                fi
-	                remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)"
-	                [ -z "${remaining}" ] && break
-	                /bin/fuser -k -m ${sig} ${remaining} &>/dev/null
-	                sleep 5
-	                retry=$((${retry} -1))
-	                sig=-9
-	        done
-	fi
-}
-
-
-start_volumes() {
-	ebegin "Scanning LVM volumes"
-	$VGSCAN > /dev/null 2>&1
-	eend $?
-
-	ret=$?
-	if [ "$ret" -eq 5 ]
-	then
-		einfo "  Waiting for other nodes to join the cluster ($CLVMD_NODES_TIMEOUT seconds)"
-	fi
-
-	clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'`
-	for vg in $clustervgs; do
-		ebegin "  Activating Clustered VG: ${vg} "
-
-		wait=0
-		while [ -n "$($VGCHANGE -a y ${vg} 2>&1 |grep "clvmd not running")" ]; do
-			if [ $wait -lt $CLVMD_NODES_TIMEOUT ]; then
-				sleep 3
-				wait=$(($wait + 3))
-			else
-				eend 1
-			fi
-		done
-		eend 0
-	done
-}
-
-stop_volumes() {
-	# Deactivate only clustered volumes
-	clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'`
-	for vg in $clustervgs; do
-		ebegin "  Shutting Down Clustered VG: ${vg} "
-		$VGCHANGE -anl ${vg} >/dev/null
-		eend $?
-	done
-}
-
-
-start() {
-	local module=$(awk '$1 == "dm_mod" { print $1 }' /proc/{modules,devices})
-
-	if [ -z "${module}" ]; then
-		load_modules "dm-mod"
-		sleep 1s
-	fi
-
-	ebegin "Starting clvmd ($CLVMD_CLUSTER_TIMEOUT seconds)"
-
-	start-stop-daemon --start --quiet --exec ${CLVMD_BIN} -- -T ${CLVMD_CLUSTER_TIMEOUT}
-	eend $?
-
-	start_volumes
-}
-
-stop() {
-
-	# umount GFS filesystems
-	umount_gfs_filesystems
-
-	#stop_volumes
-
-	ebegin "Stopping clvmd"
-	#start-stop-daemon --stop -s TERM --quiet --exec ${CLVMD_BIN} --name clvmd
-	killall -TERM ${CLVMD_BIN} >/dev/null
-	eend $?
-
-        #local module=$(awk '$1 == "dm_mod" { print $1 }' /proc/modules)
-
-	#if [[ "$?" -eq 0 && ! -z "${module}" ]]; then
-        #        unload_modules "dm-mod"
-        #fi
-}
diff --git a/sys-fs/lvm2/files/lvm2-2.02.129-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.02.129-dynamic-static-ldflags.patch
deleted file mode 100644
index efdfb81a8d1a..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.129-dynamic-static-ldflags.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- LVM2.2.02.129/configure.in
-+++ LVM2.2.02.129/configure.in
-@@ -31,6 +31,7 @@
- 	linux*)
- 		CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
- 		ELDFLAGS="-Wl,--export-dynamic"
-+		STATIC_LDFLAGS="-Wl,--no-export-dynamic"
- 		# FIXME Generate list and use --dynamic-list=.dlopen.sym
- 		CLDWHOLEARCHIVE="-Wl,-whole-archive"
- 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
-@@ -2008,6 +2009,7 @@
- AC_SUBST(SELINUX_PC)
- AC_SUBST(SNAPSHOTS)
- AC_SUBST(STATICDIR)
-+AC_SUBST(STATIC_LDFLAGS)
- AC_SUBST(STATIC_LINK)
- AC_SUBST(TESTING)
- AC_SUBST(TESTSUITE_DATA)
---- LVM2.2.02.129/daemons/dmeventd/Makefile.in
-+++ LVM2.2.02.129/daemons/dmeventd/Makefile.in
-@@ -66,7 +66,7 @@
- 	$(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
- 
- dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
--	$(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
- 	dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)
- 
- ifeq ("@PKGCONFIG@", "yes")
---- LVM2.2.02.129/make.tmpl.in
-+++ LVM2.2.02.129/make.tmpl.in
-@@ -48,6 +48,7 @@
- # FIXME set this only where it's needed, not globally?
- CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
- LDFLAGS ?= @COPTIMISE_FLAG@ @LDFLAGS@
-+STATIC_LDFLAGS += @STATIC_LDFLAGS@
- CLDFLAGS += @CLDFLAGS@
- ELDFLAGS += @ELDFLAGS@
- LDDEPS += @LDDEPS@
---- LVM2.2.02.129/tools/Makefile.in
-+++ LVM2.2.02.129/tools/Makefile.in
-@@ -129,7 +129,7 @@
- 	      -o $@ dmsetup.o -ldevmapper $(LIBS)
- 
- dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
--	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \
- 	      -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
- 
- all: device-mapper
-@@ -146,7 +146,7 @@
- endif
- 
- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
--	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
- 	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
- 
- liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
diff --git a/sys-fs/owfs/Manifest b/sys-fs/owfs/Manifest
index abe2da959e2e..8ac6c9a4c644 100644
--- a/sys-fs/owfs/Manifest
+++ b/sys-fs/owfs/Manifest
@@ -8,9 +8,6 @@ AUX owhttpd.confd 89 BLAKE2B 72a355cd1418b7d3c34fe765ff82d298a18c517404e61bfb0a5
 AUX owhttpd.initd-r1 820 BLAKE2B 4122ce01036f63083286162f33d576e2a953e7bff7e215093959d126f04d7d0e3c8a422f2b28d0dabcc160ba992e2f787d049e17860c0bc821894aaf8a5b5859 SHA512 79c0307bcb4913f563ca69e4a699b91a4e7a2133882d150694f6738eb8000175a7f840b5de9f07496c166c95fe71bb94c31ea167f6389dc9c37e0d08e2943bc9
 AUX owserver.confd 108 BLAKE2B 3279ee61b42a9573472657e4297a7988668c081cd66d0f64d53cbd2eb27248abfebd6c368d77a5a3eb84ccd95b41ce65c2f03e3cb8ee1f095e4b776b60e3283a SHA512 c10fb23a60d89348c82f6f5ee6b0ba1c5d59e506dcdf484fa0c9c8c6ae07064cafc39517670b5edb474bcc1921efddfce2e5dd879f59f3bb3a1f80d6df3c0411
 AUX owserver.initd-r1 802 BLAKE2B 8273790945eb4df7b8aadf7d19ac3397152d225495dba7e5e8a472ad7420f2e9e97ba35ec5e7655e0e5b3c37ed97ac740dbda8d1ae030dc9b75ba2bbf1dbf391 SHA512 3c2d186df7c3d4549333f90a87c80a44dd8ed67b10bacdc08edce2b45db35bd0bc7f0956bdee8f03a388ae8a5bab039f7bb19e3bad007632608f945c7e54c649
-DIST owfs-3.1p4.tar.gz 1455420 BLAKE2B 58a0356d0abffd1bda3585a8e05faed0cf80c3818f33ea9ac32c7930ba37c06addb42c3326eadfd662016d6a15a0c5238a4e7bbf0fe6580d35e10f15bf44efad SHA512 9d04b466fc64761f53dc5fb11b4eb71d10154be5eb335174e8a9002a944bb3f2fbfe1cea3cf5962aa794486830e78d7ba5a7a87c68e3a4d32ab1a95e7ca59cdb
 DIST owfs-3.2p2.tar.gz 1491195 BLAKE2B 3e56b954fc61e097d6e39345d689d3ba5386f2ed4383bb7755da6a867d802fe56b9e920fe9b4f24cdd639543bad79a6d13bd549e7ce81afb8eab52372864565a SHA512 d64078639ce4c1c5c42735c720cfa6741a34b91297500d6a7cff6e48a0a87b6391e43fc0c5f6bf44cec27feffb9a2f9b5510e085c602666a5adf803bb8ba3338
-EBUILD owfs-3.1_p4-r1.ebuild 4757 BLAKE2B 7b0bdec4f19c2abada54f6ed210895ca426a61d4aa8b994f1cf17b69f14521fb484a36d99b70868efc49828f4d7ec0187796cb6757448f94fddc48a9ca6ecab4 SHA512 6ad887858e45a066e277f49f4ff2a48244f702a965bf0d5862a9a7a54d3bf9614f705efe005627862a84aae8d139a6d0ad1b1e42e8ba61bddc426f81db6b5f47
-EBUILD owfs-3.2_p2-r1.ebuild 4761 BLAKE2B 89dd1f022fabdcb7a87d16b3bc9b296006f1d24f1f44623b46b20c2ecf6206a3fdf12339d7476a919611837323fd02c89353cc7e4f04b6276baf2cf9ebe9854f SHA512 0deff6a1cb75beb10f7c987fc0cfce7d662b28c209f121f96e4e6dd84c4f414f10c996f31f86078fd33ec133bbfeab35bee7129e637c7c40350d4c1a20904465
-EBUILD owfs-3.2_p2-r2.ebuild 4783 BLAKE2B 5c308bd846ea309062de19626fad870f38329aa50b8600eca4da9f00e00cf79a4c203a58b1db601520966d5663dfb729b73d84df93e4f2db5d0d4fdf31b0a012 SHA512 326ebebac9882250c7f4d2faf19a9b923161d2171f5f4a0ecb724e59bc9d059a91231bdc9b1af7fff1ce448a0ebe69d18fac61493dec40acdedddc0ce1a97986
+EBUILD owfs-3.2_p2-r2.ebuild 4781 BLAKE2B ddbb63d06a3c6475f7b1febfe1b8e0f5bad216d2db2d5337ba0e94e4f96ceadd5872906f8962d905cb11b09e8b7d1f6a431f2c040db1a243477d4583013a5215 SHA512 f77002cd587881b99943c01268ce2ba218ec55e46e79e5c6384fc67b7dd89a94d35bee93a9a9dfde043f34ff85f4c456adfa27601726bfee99e805ff9e3207ef
 MISC metadata.xml 1159 BLAKE2B 6a55584f7bf0ae7b11441169d59f53138a2e82a3ac38a53b9ab77c8a4e6baf5c268864e7f6897eb2fd9b35888f8373a6756b8760d894c5f4aeaae394f8cb3706 SHA512 4cff718d367711e5a99891caa7c19db9f50d885200841096f17ec3ee64cd01d3938fa34d1f2c5e6de575dd3cb36c5ea4f3625fa604b11cfdebe13362ea37cefe
diff --git a/sys-fs/owfs/owfs-3.1_p4-r1.ebuild b/sys-fs/owfs/owfs-3.1_p4-r1.ebuild
deleted file mode 100644
index 51598eaeb803..000000000000
--- a/sys-fs/owfs/owfs-3.1_p4-r1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 eutils linux-info perl-functions systemd user
-
-MY_P=${P/_/}
-
-DESCRIPTION="Access 1-Wire devices like a filesystem"
-SRC_URI="mirror://sourceforge/owfs/${MY_P}.tar.gz"
-HOMEPAGE="http://owfs.org/ https://sourceforge.net/projects/owfs/"
-
-KEYWORDS="amd64 arm x86"
-# Upstream uses crazy SONAME, https://github.com/owfs/owfs/commit/c696fa9b9b44f49c96b9f1c2b3159d277e0c1273
-SLOT="0/${PV}"
-LICENSE="GPL-2"
-
-RDEPEND="
-	ftdi? ( dev-embedded/libftdi:0 )
-	fuse? ( sys-fs/fuse:0= )
-	perl? ( dev-lang/perl:= )
-	parport? ( sys-kernel/linux-headers )
-	php? ( dev-lang/php:=[cli] )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )
-	usb? ( virtual/libusb:0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	php? ( dev-lang/swig )
-	python? ( dev-lang/swig )"
-
-IUSE="debug ftdi ftpd fuse httpd parport perl php python tcl usb zeroconf"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-vendordir.patch
-	"${FILESDIR}"/${PN}-3.1p4-sysmacros.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-OWUID=${OWUID:-owfs}
-OWGID=${OWGID:-owfs}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-info_pkg_setup
-
-		if linux_config_exists; then
-			if ! linux_chkconfig_present W1; then
-				ewarn "CONFIG_W1 isn't set. You will not be able to use 1-wire bus on this system!"
-			fi
-		else
-			elog "Cannot find a linux kernel configuration. Continuing anyway."
-		fi
-	fi
-
-	use perl && perl_set_version
-
-	enewgroup ${OWGID} 150
-	enewuser  ${OWUID} 150 -1 -1 ${OWGID}
-}
-
-src_prepare() {
-	default
-
-	# Support user's CFLAGS and LDFLAGS.
-	sed -i "s/@CPPFLAGS@/@CPPFLAGS@ ${CFLAGS}/" \
-		module/swig/perl5/OW/Makefile.linux.in || die
-	sed -i "s/@LIBS@/@LIBS@ ${LDFLAGS}/" \
-		module/swig/perl5/OW/Makefile.linux.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# disable owpython since we can build python anyway
-	# and without it, we don't have to fix the build ;)
-	local myeconf=(
-		$(use_enable debug)
-		$(use_enable fuse owfs)
-		$(use_enable ftdi)
-		$(use_enable ftpd owftpd)
-		$(use_enable httpd owhttpd)
-		$(use_enable parport)
-		$(use_enable perl owperl)
-		$(use_enable php owphp)
-		--disable-owpython
-		$(use_enable tcl owtcl)
-		$(use_enable zeroconf avahi)
-		$(use_enable zeroconf zero)
-		$(use_enable usb)
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-	)
-
-	if use httpd || use ftpd || use fuse; then
-		myeconf+=( --enable-owserver )
-	else
-		myeconf+=( --disable-owserver )
-	fi
-
-	econf ${myeconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-
-		pushd module/ownet/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-
-		pushd module/swig/python > /dev/null || die
-		emake ow_wrap.c
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	default
-
-	if use httpd || use ftpd || use fuse; then
-		newinitd "${FILESDIR}"/owserver.initd-r1 owserver
-		newconfd "${FILESDIR}"/owserver.confd owserver
-
-		for i in httpd ftpd; do
-			if use ${i}; then
-				newinitd "${FILESDIR}"/ow${i}.initd-r1 ow${i}
-				newconfd "${FILESDIR}"/ow${i}.confd ow${i}
-			fi
-		done
-
-		if use fuse; then
-			dodir /var/lib/owfs
-			dodir /var/lib/owfs/mnt
-			newinitd "${FILESDIR}"/owfs.initd-r1 owfs
-			newconfd "${FILESDIR}"/owfs.confd owfs
-		fi
-	fi
-
-	use perl && perl_delete_localpod
-
-	if use python; then
-		pushd module/ownet/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		pushd module/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	if use httpd || use ftpd || use fuse; then
-		echo
-		if [[ ${OWUID} != root ]]; then
-			ewarn
-			ewarn "In order to allow the OWFS daemon user '${OWUID}' to read"
-			ewarn "from and/or write to a 1 wire bus controller device, make"
-			ewarn "sure the user has appropriate permission to access the"
-			ewarn "corresponding device node/path (e.g. /dev/ttyS0), for example"
-			ewarn "by adding the user to the group 'uucp' (for serial devices)"
-			ewarn "or 'usb' (for USB devices accessed via usbfs on /proc/bus/usb),"
-			ewarn "or install an appropriate UDEV rules (see http://owfs.org/index.php?page=udev-and-usb"
-			ewarn "for more information)."
-			ewarn
-			if use fuse; then
-				ewarn "In order to allow regular users to read from and/or write to"
-				ewarn "1 wire bus devices accessible via the owfs FUSE filesystem"
-				ewarn "client and its filesystem mountpoint, make sure the user is"
-				ewarn "a member of the group '${OWGID}'."
-				ewarn
-			fi
-			echo
-		fi
-	fi
-}
diff --git a/sys-fs/owfs/owfs-3.2_p2-r1.ebuild b/sys-fs/owfs/owfs-3.2_p2-r1.ebuild
deleted file mode 100644
index c795ca7df493..000000000000
--- a/sys-fs/owfs/owfs-3.2_p2-r1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 ltprune linux-info perl-functions systemd user
-
-MY_P=${P/_/}
-
-DESCRIPTION="Access 1-Wire devices like a filesystem"
-SRC_URI="mirror://sourceforge/owfs/${MY_P}.tar.gz"
-HOMEPAGE="http://owfs.org/ https://sourceforge.net/projects/owfs/"
-
-KEYWORDS="~amd64 ~arm ~x86"
-# Upstream uses crazy SONAME, https://github.com/owfs/owfs/commit/c696fa9b9b44f49c96b9f1c2b3159d277e0c1273
-SLOT="0/${PV}"
-LICENSE="GPL-2"
-
-RDEPEND="
-	ftdi? ( dev-embedded/libftdi:0 )
-	fuse? ( sys-fs/fuse:0= )
-	perl? ( dev-lang/perl:= )
-	parport? ( sys-kernel/linux-headers )
-	php? ( dev-lang/php:=[cli] )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )
-	usb? ( virtual/libusb:0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	php? ( dev-lang/swig )
-	python? ( dev-lang/swig )"
-
-IUSE="debug ftdi ftpd fuse httpd parport perl php python tcl usb zeroconf"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-vendordir.patch
-	"${FILESDIR}"/${PN}-3.1p4-sysmacros.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-OWUID=${OWUID:-owfs}
-OWGID=${OWGID:-owfs}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-info_pkg_setup
-
-		if linux_config_exists; then
-			if ! linux_chkconfig_present W1; then
-				ewarn "CONFIG_W1 isn't set. You will not be able to use 1-wire bus on this system!"
-			fi
-		else
-			elog "Cannot find a linux kernel configuration. Continuing anyway."
-		fi
-	fi
-
-	use perl && perl_set_version
-
-	enewgroup ${OWGID} 150
-	enewuser  ${OWUID} 150 -1 -1 ${OWGID}
-}
-
-src_prepare() {
-	default
-
-	# Support user's CFLAGS and LDFLAGS.
-	sed -i "s/@CPPFLAGS@/@CPPFLAGS@ ${CFLAGS}/" \
-		module/swig/perl5/OW/Makefile.linux.in || die
-	sed -i "s/@LIBS@/@LIBS@ ${LDFLAGS}/" \
-		module/swig/perl5/OW/Makefile.linux.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# disable owpython since we can build python anyway
-	# and without it, we don't have to fix the build ;)
-	local myeconf=(
-		$(use_enable debug)
-		$(use_enable fuse owfs)
-		$(use_enable ftdi)
-		$(use_enable ftpd owftpd)
-		$(use_enable httpd owhttpd)
-		$(use_enable parport)
-		$(use_enable perl owperl)
-		$(use_enable php owphp)
-		--disable-owpython
-		$(use_enable tcl owtcl)
-		$(use_enable zeroconf avahi)
-		$(use_enable zeroconf zero)
-		$(use_enable usb)
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-	)
-
-	if use httpd || use ftpd || use fuse; then
-		myeconf+=( --enable-owserver )
-	else
-		myeconf+=( --disable-owserver )
-	fi
-
-	econf ${myeconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-
-		pushd module/ownet/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-
-		pushd module/swig/python > /dev/null || die
-		emake ow_wrap.c
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	default
-
-	if use httpd || use ftpd || use fuse; then
-		newinitd "${FILESDIR}"/owserver.initd-r1 owserver
-		newconfd "${FILESDIR}"/owserver.confd owserver
-
-		for i in httpd ftpd; do
-			if use ${i}; then
-				newinitd "${FILESDIR}"/ow${i}.initd-r1 ow${i}
-				newconfd "${FILESDIR}"/ow${i}.confd ow${i}
-			fi
-		done
-
-		if use fuse; then
-			dodir /var/lib/owfs
-			dodir /var/lib/owfs/mnt
-			newinitd "${FILESDIR}"/owfs.initd-r1 owfs
-			newconfd "${FILESDIR}"/owfs.confd owfs
-		fi
-	fi
-
-	use perl && perl_delete_localpod
-
-	if use python; then
-		pushd module/ownet/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		pushd module/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	if use httpd || use ftpd || use fuse; then
-		echo
-		if [[ ${OWUID} != root ]]; then
-			ewarn
-			ewarn "In order to allow the OWFS daemon user '${OWUID}' to read"
-			ewarn "from and/or write to a 1 wire bus controller device, make"
-			ewarn "sure the user has appropriate permission to access the"
-			ewarn "corresponding device node/path (e.g. /dev/ttyS0), for example"
-			ewarn "by adding the user to the group 'uucp' (for serial devices)"
-			ewarn "or 'usb' (for USB devices accessed via usbfs on /proc/bus/usb),"
-			ewarn "or install an appropriate UDEV rules (see http://owfs.org/index.php?page=udev-and-usb"
-			ewarn "for more information)."
-			ewarn
-			if use fuse; then
-				ewarn "In order to allow regular users to read from and/or write to"
-				ewarn "1 wire bus devices accessible via the owfs FUSE filesystem"
-				ewarn "client and its filesystem mountpoint, make sure the user is"
-				ewarn "a member of the group '${OWGID}'."
-				ewarn
-			fi
-			echo
-		fi
-	fi
-}
diff --git a/sys-fs/owfs/owfs-3.2_p2-r2.ebuild b/sys-fs/owfs/owfs-3.2_p2-r2.ebuild
index 3ed9161338ad..8bc833ad7ff9 100644
--- a/sys-fs/owfs/owfs-3.2_p2-r2.ebuild
+++ b/sys-fs/owfs/owfs-3.2_p2-r2.ebuild
@@ -13,7 +13,7 @@ MY_P="${P/_/}"
 DESCRIPTION="Access 1-Wire devices like a filesystem"
 SRC_URI="mirror://sourceforge/owfs/${MY_P}.tar.gz"
 HOMEPAGE="http://owfs.org/ https://sourceforge.net/projects/owfs/"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 
 # Upstream uses crazy SONAME, https://github.com/owfs/owfs/commit/c696fa9b9b44f49c96b9f1c2b3159d277e0c1273
 SLOT="0/${PV}"
diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index fdfdbd7cc815..a89d20379703 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -1,10 +1,6 @@
-DIST udev-init-scripts-27.tar.bz2 3456 BLAKE2B e41f1c79971550a6547316ab4f44fae7cff4a1fd093632a98354960f8e401b76750e0bb32b9463b5ca1782f83f7a1c41cc09fb64b566505ab01912e075708a43 SHA512 8a526d5252d54c724ad99250141d3ffddfbe6044ff9c9b9c02a4984f03ab6492a8b6a36022b93c7c06b0869b61a3c4dfa82fc47f560e927684fad636f56e4ba8
-DIST udev-init-scripts-30.tar.gz 3668 BLAKE2B 23b4514560246b37f21bfb4059a6872a9d046bcee9e3d624eb51fd041c33c419383d091a4d39a56259e4216e47f4b6c08968f8e64ced9139ed44df7deb95e6fb SHA512 bf9ec69d9fb9edbe37f3dec8e1d5c828ea63591382de33818297ec5e37490c2dd709a8e32251fba36a816952c98af49172c7c09f3252712ddc51820205c4efdd
-DIST udev-init-scripts-31.tar.gz 3661 BLAKE2B cc3948172166ce6303f6eb1efcbd5137fd5df64d91cc1590c25491393a3f7da771fda6d238dbf6cc8bca9e71b5d1ccfdbba2e3dce6aadb8d292579184892d950 SHA512 9b0322940ca6d78c2753cba801958fbe354431a46c8db3193cce714bf68cb05233ff01bd9fe7b62de29b5d9481828a30990f7e5e079360c823fa102e83b600f5
 DIST udev-init-scripts-32.tar.gz 3661 BLAKE2B 11736f1e6c44bf032571008e907f97d5c64afafa7fe7fcd4fa5f398fce1fa6698adc66c933a0a451adde31c44fc09339129d6352cc2fd0389fecee8d34c095f6 SHA512 da6291ae5c2aa1e8e41656fbe2ed6700e46360809119c0f8a26bf6c3f23f05c861b2c2943b55e47140462049474725e96105e68b204f3d931050409f34d19699
-EBUILD udev-init-scripts-27.ebuild 1793 BLAKE2B cdeeca6e3dfb209017893156eb39c55ad79ab6877740e1860f73a0bd0510abb47cae094387b91bd02fe8e19acdd1ed8667d5f72d041f6950197bb5a819bcb7e6 SHA512 02d4382dda3f2358c981e810a0c45eb79ef834791a1fb72aa77af8e21797127f3fb9f7db3b56c474212d64f3e71774efb610325616501d06cfaa3c12375323b9
-EBUILD udev-init-scripts-30.ebuild 1374 BLAKE2B a6eb3f2cccbda38c0852942f7ac9397c0f66393312f7a4772fbf70aa04d2e56166f3f675f155e16be9a7e6d31eee0a2e8eddfbd9fcf90d5fdd57b044eddb209c SHA512 93094db7aad88a02bbabe1ef553cd2b05b2c7736b1ac34fa3eeaddd142cfcc33d96cb50e34a7fd7ab21b5ddecc2c5760d12857f2c041237ec74e984c7bb866e2
-EBUILD udev-init-scripts-31.ebuild 1374 BLAKE2B a6eb3f2cccbda38c0852942f7ac9397c0f66393312f7a4772fbf70aa04d2e56166f3f675f155e16be9a7e6d31eee0a2e8eddfbd9fcf90d5fdd57b044eddb209c SHA512 93094db7aad88a02bbabe1ef553cd2b05b2c7736b1ac34fa3eeaddd142cfcc33d96cb50e34a7fd7ab21b5ddecc2c5760d12857f2c041237ec74e984c7bb866e2
-EBUILD udev-init-scripts-32.ebuild 1316 BLAKE2B ae71611057fce496e6d16a487a2ca1a1644b374819fbca47a6a81286c7cabcb4923d76d95e2fa1ec4b054e16b70afcd3c0cd73c87cd64f2886fdb459dc8845c6 SHA512 3a906d78fb8ea25b8c4fe752e33a3b3b05017f9e70872ad523ebdb2ea379acb7f0306dcf228d54a02e088729a18b39544580e80be6d894e3ae70bb7e2df43945
-EBUILD udev-init-scripts-9999.ebuild 1374 BLAKE2B a6eb3f2cccbda38c0852942f7ac9397c0f66393312f7a4772fbf70aa04d2e56166f3f675f155e16be9a7e6d31eee0a2e8eddfbd9fcf90d5fdd57b044eddb209c SHA512 93094db7aad88a02bbabe1ef553cd2b05b2c7736b1ac34fa3eeaddd142cfcc33d96cb50e34a7fd7ab21b5ddecc2c5760d12857f2c041237ec74e984c7bb866e2
+DIST udev-init-scripts-33.tar.gz 3698 BLAKE2B fc79b3f6984131180324919f7be4309715976309ee582147662634bb020b8162b293e7fd0e675a9cc7a3b1630ce0fc49b29c899e393c7748d47cf924b1ca2809 SHA512 2119aace937da02f47a5adc9af720587d25c2852cf70a9bcb04138e3ee511308c8f30cf0301fbec58cf0432b7fd6672ae6a02d1740c774703959197b3511fbcc
+EBUILD udev-init-scripts-32.ebuild 1312 BLAKE2B 6ee1cd14dacb4401e13def376869418219823a4302eb5c6c55a5c426626209d708bff30cf7bd5fc816a778dbed836ccbf4faf7430ea83a5d1ca97ca77a043d1d SHA512 e17028b8d8ea22f44e595835bfe882d59a7314098eb33203b23e555bd886f282aa183356cbb6a1aca925cd1b7267f290f15b8a1f98198db0ed29237ef33f745a
+EBUILD udev-init-scripts-33.ebuild 1393 BLAKE2B 0ab83a21d106a6143898c4719010e620a30f629a12bbbc46306a13775db59a5965517b97c83e7fff51d3c095b9bf86624f174005c133e30cfecfd1852611ebf3 SHA512 50b57cbcfebf260eea29e1122e2ba1e5ac0b3a83f8aff81339c3b873699e43fcb6414a7f1ef0c519c9a2512e6d3764eb11bd47be692de3f1cc1a31fe4297fbc7
+EBUILD udev-init-scripts-9999.ebuild 1403 BLAKE2B e219bd5748a7df36b0e42039c98d58eb41ed2b2323ef90b4c46fb10114a1fb340270735825e5bc40d44a56a7e95fd2acc769c3ef3b714e15e0509fdc7613a71a SHA512 e35c7ff42506d06310b01670f898e0bf2dffdd23f0b3dc27269484b53e86a6ab09c5b17d70c93c164f1c737283c51ae58bb2625e7877b7644789363cd9b2708a
 MISC metadata.xml 221 BLAKE2B 9e0d24573ec598eccd3ad7e41a38ead4192d9e757ff4b870b51b02a96f04a13596b15c5c05ee2a4d888c4b9b0b9b30aafe5ba96d39ff9faa157b58e30e91ba55 SHA512 accbe81ec1cf4c8d7c6eb99b7ceb7a8119eb1f2f55dcaf6d368610c255e7a21ff222e7c613ca4be37083ce9527ca325f3ee91515dadad7c5929f60f4fda334df
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-27.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-27.ebuild
deleted file mode 100644
index 41d24a9a1b05..000000000000
--- a/sys-fs/udev-init-scripts/udev-init-scripts-27.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/udev-gentoo-scripts.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-fi
-
-inherit eutils
-
-DESCRIPTION="udev startup scripts for openrc"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND=">=virtual/udev-180
-	!<sys-fs/udev-186
-	!<sys-apps/openrc-0.13"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch_user
-}
-
-pkg_postinst() {
-	# Add udev to the sysinit runlevel automatically if this is
-	# the first install of this package.
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${ROOT%/}"/etc/runlevels/sysinit
-		fi
-		if [[ -x ${ROOT%/}/etc/init.d/udev ]]; then
-			ln -s /etc/init.d/udev "${ROOT%/}"/etc/runlevels/sysinit/udev
-		fi
-	fi
-
-	# Warn the user about adding udev to their sysinit runlevel
-	if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/udev ]]; then
-			ewarn
-			ewarn "You need to add udev to the sysinit runlevel."
-			ewarn "If you do not do this,"
-			ewarn "your system will not be able to boot!"
-			ewarn "Run this command:"
-			ewarn "\trc-update add udev sysinit"
-		fi
-	fi
-
-	if ! has_version "sys-fs/eudev[rule-generator]" && \
-	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
-		ewarn "The udev-postmount service has been removed because the reasons for"
-		ewarn "its existance have been removed upstream."
-		ewarn "Please remove it from your runlevels."
-	fi
-}
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-31.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-31.ebuild
deleted file mode 100644
index 68e64e0899da..000000000000
--- a/sys-fs/udev-init-scripts/udev-init-scripts-31.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/udev-gentoo-scripts.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-inherit eutils
-
-DESCRIPTION="udev startup scripts for openrc"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=">=virtual/udev-217
-	!<sys-apps/openrc-0.14"
-
-src_prepare() {
-	epatch_user
-}
-
-pkg_postinst() {
-	# Add udev and udev-trigger to the sysinit runlevel automatically.
-	for f in udev udev-trigger; do
-		if [[ -x ${ROOT%/}/etc/init.d/${f} &&
-			-d ${ROOT%/}/etc/runlevels/sysinit &&
-			! -L "${ROOT%/}/etc/runlevels/sysinit/${f}" ]]; then
-			ln -snf /etc/init.d/${f} "${ROOT%/}"/etc/runlevels/sysinit/${f}
-			ewarn "Adding ${f} to the sysinit runlevel"
-		fi
-	done
-
-	if ! has_version "sys-fs/eudev[rule-generator]" && \
-	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
-		ewarn "The udev-postmount service has been removed because the reasons for"
-		ewarn "its existance have been removed upstream."
-		ewarn "Please remove it from your runlevels."
-	fi
-}
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild
index 7de09707ad50..400159dfab88 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-32.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
@@ -8,7 +8,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="udev startup scripts for openrc"
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-30.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
index 68e64e0899da..6564afe19d7b 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-30.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
@@ -1,35 +1,30 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+OLD_PN=udev-gentoo-scripts
+OLD_P=${OLD_PN}-${PV}
 
 if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/udev-gentoo-scripts.git"
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${OLD_PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	SRC_URI="https://gitweb.gentoo.org/proj/${OLD_PN}.git/snapshot/${OLD_P}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${OLD_P}"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 
-inherit eutils
-
 DESCRIPTION="udev startup scripts for openrc"
 HOMEPAGE="https://www.gentoo.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 
 RESTRICT="test"
 
-DEPEND=""
 RDEPEND=">=virtual/udev-217
 	!<sys-apps/openrc-0.14"
 
-src_prepare() {
-	epatch_user
-}
-
 pkg_postinst() {
 	# Add udev and udev-trigger to the sysinit runlevel automatically.
 	for f in udev udev-trigger; do
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
index 68e64e0899da..a4b758273222 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@@ -1,35 +1,30 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+OLD_PN=udev-gentoo-scripts
+OLD_P=${OLD_PN}-${PV}
 
 if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/udev-gentoo-scripts.git"
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${OLD_PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	SRC_URI="https://gitweb.gentoo.org/proj/${OLD_PN}.git/snapshot/${OLD_P}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${OLD_P}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86"
 fi
 
-inherit eutils
-
 DESCRIPTION="udev startup scripts for openrc"
 HOMEPAGE="https://www.gentoo.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 
 RESTRICT="test"
 
-DEPEND=""
 RDEPEND=">=virtual/udev-217
 	!<sys-apps/openrc-0.14"
 
-src_prepare() {
-	epatch_user
-}
-
 pkg_postinst() {
 	# Add udev and udev-trigger to the sysinit runlevel automatically.
 	for f in udev udev-trigger; do
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index bcfe5cc6b426..732f2e0f0ad9 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -11,11 +11,13 @@ DIST systemd-240-patches-3.tar.gz 31952 BLAKE2B 0677d24c4f4e1575dbd4953eb75734f0
 DIST systemd-240.tar.gz 7582001 BLAKE2B cf53595a83424984dd9f533f7cd0c9905366c5a52ab946fc45ff7fd1bcc85978ff654720113641534e40c0f9a1ad1c9628255778616770762950426789f659c3 SHA512 da7467781b16f65d868931ae88fd07554db61542aec7f11dbec9f7279b529f900301edfea2d3813ddb64eeb3fdcfb7be86e540c65212dd7cfdcdebbc80de2ff5
 DIST systemd-241-rc1.tar.gz 7617965 BLAKE2B 6c491297b71ad3c473d644de04bb334f902ee4110d647b654c5452f34401cfc11c7564b290022072555f3fbd46674ce009f587622f412f8a66330a7089db34c5 SHA512 168ba80d6e8abadbf1ed84270f2b02e257f1490b61021bb6fb704d9b5fad2670b63e0fc0cb26071e8d56c993faa30274e80d53cf49154cce2b609f47c73b30e0
 DIST systemd-241-rc2.tar.gz 7619504 BLAKE2B 610940b3141d36a0534cf477d303eb681f418f8c04d7e9ff1d28832d02c05d68195aec108b15392662b134020c28df5b35f6c1c85f8eea8e7090cdc210ce5e26 SHA512 69932b1e5d48fbf6fd650a91354763b1e7e8d490def98a011d6377ee8623abc21244f2c8ddd97a500c4d3e6ab11bae2a6148ddc84e325d75a0273b3d456d8f41
+DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
 EBUILD udev-236-r1.ebuild 10048 BLAKE2B 8813b56cbd71890b974be9597f75d864eeaccfed35e474d3278069e7c1c362100e7790409768e1d5dfe786313cff8cc9f5ba996798c1a1119a11f7de468ea201 SHA512 f740b9d26efe64e42a7e8b64f0d4222aca3606e8f98471d934674213874ceab76afe2a8ed9c0a677aac9a3246fb0eb6cc97f5c662e9d33dc0591e1ad4ba230a2
 EBUILD udev-238.ebuild 9594 BLAKE2B 8f708567f1629fda0e96f72c53ced2618f9201f6ca996f74d972795597adca12f89fff6852b6624fe461aa810d13d821dad15be68c24973d2a8d09f67ae5e0bc SHA512 145d3adb943a29c75e8b97b01a154fc5d0b21973696bc86c034d997bfda060ade5d72e255d3752539cdfa160c4d2cce7b8ab0ab928b34cd7c510d65e53decd0d
 EBUILD udev-239.ebuild 9764 BLAKE2B 00d1cf0c670919c7ae76ef0c522f9dcd972d2c5a9dcb28b27b0740e7b087b77e1080297732101412b146bf31c05887a81ec191649e70b86f8662e23b8fbb054e SHA512 1aa80b0d44d1107f17e8907141b51340ec02366ffd49e4c3c444359484391448c8404b6823fc670c6a7ca8b6b256b928ba8ad7e64c1c4fadee8213a71de3c7ab
 EBUILD udev-240-r2.ebuild 9664 BLAKE2B adf21d3fba8960bb90328ff19db2186c8a89aae584ac9745affe637eda0263c6db0dc2b920a1ccae12661cddc5ff010b10c3e30d6310fd03ef499b9116cf3f53 SHA512 f44c4240c85f9bd0e070ae9bd529fe06c79f5bc229703477107ea9937037b130e48e576a092b217ff73bd25e1b72ab592edc7f09553a69f8488eceeeac368ba1
 EBUILD udev-240-r3.ebuild 9664 BLAKE2B 2daaa3124df1ce0ea5b3247200a55020d75b92383c81d4c687ee8cd33bc4fc00f8792a8d862fe1d966880b59d89560748ceba562c8b8bfa04ea02ba4c5c7332a SHA512 07c752f8f4a12777b909748a729d88b521ad4c720703244265af5120cb3846d9289d125f02e9aa6b8bd2275111e8fa329561f20df388d89b0560de4367b00a32
+EBUILD udev-241.ebuild 9673 BLAKE2B 33c6d4cf7c1d58645481dcb957f1a3e28587911dc5a2ead16d1a91d2b0eca5ad0765203661a8088fac4699e501162759cc927f2692bfb170c98394b8e03e7978 SHA512 f1d6f1aa6d131605b6a63aea994bd7c7c2354714a41f0de85fe884389d0893d737ebbacea2a34d9a15f7173cf10f0d225125aacef33725684565044c6d1edcd8
 EBUILD udev-241_rc1.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
 EBUILD udev-241_rc2.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
 EBUILD udev-9999.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
diff --git a/sys-fs/udev/udev-241.ebuild b/sys-fs/udev/udev-241.ebuild
new file mode 100644
index 000000000000..e3c9cbfb5d88
--- /dev/null
+++ b/sys-fs/udev/udev-241.ebuild
@@ -0,0 +1,328 @@
+# Copyright 2003-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_/-}
+	MY_P=systemd-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl +kmod selinux"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl )
+	kmod? ( >=sys-apps/kmod-16 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+	!<sys-libs/glibc-2.11
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=dev-util/meson-0.40.0
+	dev-util/ninja
+	>=sys-apps/coreutils-8.16
+	virtual/os-headers
+	virtual/pkgconfig
+	>=sys-kernel/linux-headers-3.9
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt"
+RDEPEND="${COMMON_DEPEND}
+	!<sys-fs/lvm2-2.02.103
+	!<sec-policy/selinux-base-2.20120725-r10"
+PDEPEND=">=sys-apps/hwids-20140304[udev]
+	>=sys-fs/udev-init-scripts-26"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
+		linux-info_pkg_setup
+
+		# CONFIG_FHANDLE was introduced by 2.6.39
+		local MINKV=2.6.39
+
+		if kernel_is -lt ${MINKV//./ }; then
+			eerror "Your running kernel is too old to run this version of ${P}"
+			eerror "You need to upgrade kernel at least to ${MINKV}"
+		fi
+
+		if kernel_is -lt 3 7; then
+			ewarn "Your running kernel is too old to have firmware loader and"
+			ewarn "this version of ${P} doesn't have userspace firmware loader"
+			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
+		fi
+	fi
+}
+
+src_prepare() {
+	cat <<-EOF > "${T}"/40-gentoo.rules
+	# Gentoo specific floppy and usb groups
+	ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+	ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+	EOF
+
+	if [[ -d "${WORKDIR}/patches" ]]; then
+		eapply "${WORKDIR}/patches"
+	fi
+
+	local PATCHES=(
+		"${FILESDIR}/236-uucp-group.patch"
+	)
+
+	default
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dacl=$(meson_multilib_native_use acl)
+		-Defi=false
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Dlink-udev-shared=false
+		-Dsplit-usr=true
+
+		# Prevent automagic deps
+		-Dgcrypt=false
+		-Dlibcryptsetup=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dseccomp=false
+		-Dlz4=false
+		-Dxz=false
+	)
+	meson_src_configure
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	# meson creates this link
+	local libudev=$(readlink src/udev/libudev.so.1)
+
+	local targets=(
+		src/udev/${libudev}
+	)
+	if multilib_is_native_abi; then
+		targets+=(
+			systemd-udevd
+			udevadm
+			src/udev/ata_id
+			src/udev/cdrom_id
+			src/udev/mtd_probe
+			src/udev/scsi_id
+			src/udev/v4l_id
+			man/udev.conf.5
+			man/systemd.link.5
+			man/hwdb.7
+			man/udev.7
+			man/systemd-udevd.service.8
+			man/udevadm.8
+		)
+	fi
+	eninja "${targets[@]}"
+}
+
+multilib_src_install() {
+	local libudev=$(readlink src/udev/libudev.so.1)
+
+	into /
+	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins src/libudev/libudev.pc
+
+	if multilib_is_native_abi; then
+		into /
+		dobin udevadm
+
+		exeinto /lib/systemd
+		doexe systemd-udevd
+
+		exeinto /lib/udev
+		doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id}
+
+		rm rules/99-systemd.rules || die
+		insinto /lib/udev/rules.d
+		doins rules/*.rules
+
+		insinto /usr/share/pkgconfig
+		doins src/udev/udev.pc
+
+		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
+		rm man/systemd-udevd-{control,kernel}.socket.8 || die
+		doman man/*.[0-9]
+	fi
+}
+
+multilib_src_install_all() {
+	doheader src/libudev/libudev.h
+
+	insinto /etc/udev
+	doins src/udev/udev.conf
+	keepdir /etc/udev/{hwdb.d,rules.d}
+
+	insinto /lib/systemd/network
+	doins network/99-default.link
+
+	# see src_prepare() for content of 40-gentoo.rules
+	insinto /lib/udev/rules.d
+	doins "${T}"/40-gentoo.rules
+	doins "${S}"/rules/*.rules
+
+	dobashcomp shell-completion/bash/udevadm
+
+	insinto /usr/share/zsh/site-functions
+	doins shell-completion/zsh/_udevadm
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	mkdir -p "${ROOT%/}"/run
+
+	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+	# So try to remove it here (will only work if empty).
+	rmdir "${ROOT%/}"/dev/loop 2>/dev/null
+	if [[ -d ${ROOT%/}/dev/loop ]]; then
+		ewarn "Please make sure your remove /dev/loop,"
+		ewarn "else losetup may be confused when looking for unused devices."
+	fi
+
+	local fstab="${ROOT%/}"/etc/fstab dev path fstype rest
+	while read -r dev path fstype rest; do
+		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
+			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
+			ewarn "filesystem. Otherwise udev won't be able to boot."
+			ewarn "See, https://bugs.gentoo.org/453186"
+		fi
+	done < "${fstab}"
+
+	if [[ -d ${ROOT%/}/usr/lib/udev ]]; then
+		ewarn
+		ewarn "Please re-emerge all packages on your system which install"
+		ewarn "rules and helpers in /usr/lib/udev. They should now be in"
+		ewarn "/lib/udev."
+		ewarn
+		ewarn "One way to do this is to run the following command:"
+		ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
+		ewarn "Note that qfile can be found in app-portage/portage-utils"
+	fi
+
+	local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules
+	local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules
+	for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
+		if [[ -f ${old_rules} ]]; then
+			ewarn
+			ewarn "File ${old_rules} is from old udev installation but if you still use it,"
+			ewarn "rename it to something else starting with 70- to silence this deprecation"
+			ewarn "warning."
+		fi
+	done
+
+	elog
+	elog "Starting from version >= 197 the new predictable network interface names are"
+	elog "used by default, see:"
+	elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+	elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
+	elog
+	elog "Example command to get the information for the new interface name before booting"
+	elog "(replace <ifname> with, for example, eth0):"
+	elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
+	elog
+	elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
+	elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null"
+	elog "to disable the feature."
+
+	if has_version 'sys-apps/biosdevname'; then
+		ewarn
+		ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
+		ewarn "detected to be installed with the new predictable network interface names."
+	fi
+
+	ewarn
+	ewarn "You need to restart udev as soon as possible to make the upgrade go"
+	ewarn "into effect."
+	ewarn "The method you use to do this depends on your init system."
+	if has_version 'sys-apps/openrc'; then
+		ewarn "For sys-apps/openrc users it is:"
+		ewarn "# /etc/init.d/udev --nodeps restart"
+	fi
+
+	elog
+	elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
+	elog "fixing known issues visit:"
+	elog "https://wiki.gentoo.org/wiki/Udev"
+	elog "https://wiki.gentoo.org/wiki/Udev/upgrade"
+
+	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+	# do the same for 80-net-setup-link.rules to keep the old behavior
+	local net_move=no
+	local net_name_slot_sym=no
+	local net_rules_path="${ROOT%/}"/etc/udev/rules.d
+	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+	if [[ ! -e ${net_setup_link} ]]; then
+		[[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
+		if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+			net_move=yes
+			net_name_slot_sym=yes
+		fi
+	fi
+	if [[ ${net_move} == yes ]]; then
+		ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+		if [[ ${net_name_slot_sym} == yes ]]; then
+			ln -nfs /dev/null "${net_setup_link}"
+		else
+			cp "${net_name_slot}" "${net_setup_link}"
+		fi
+		eend $?
+	fi
+
+	# https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
+	# https://bugs.gentoo.org/246847
+	# https://bugs.gentoo.org/514174
+	enewgroup input
+	enewgroup kvm 78
+	enewgroup render
+
+	# Update hwdb database in case the format is changed by udev version.
+	if has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT%/}"
+		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
+	fi
+}
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 07a1afd30d79..7a0c5ad5325b 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -2,9 +2,9 @@ AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b
 AUX xfsprogs-4.15.0-sharedlibs.patch 3022 BLAKE2B cfa23520a55750af375ada8c35fb9f4b3ea2f401ddebd95aef6d46f9195ac6ab3fb38f5f9d08529d3c2658623a49eadc7db0be68159753025310605fdfc35a6b SHA512 5a6e62f2914e372f2bf679b10c32fe65f60677b4bf0e58f60c40a297ed8974d5ec0af3bcba5801ba19cadbb689a6dad62c1e2cd88587f6f3d30f21f1472f3ac0
 AUX xfsprogs-4.9.0-underlinking.patch 731 BLAKE2B 501b3967487d89c56c986f0c03e13fe3d217a6c4c8dd21fce1986793cefaa4777e827945adb3807f2d644665fbf66e7fbd5318d6f5c58d37c49260c24ca46181 SHA512 2fcbaab48ca33cd2e8724cdc55d814a970beb5127c861f4b829ede9f501516733c6dabbfe0bfb1d23df01bb69538af5ca31eb403030e3d2ad9efd8643c509ac7
 DIST xfsprogs-4.17.0.tar.xz 1205508 BLAKE2B 46168792c1e4c335b7ed9e7489afc20d7df4b4e554eb86043b2c19303879491cc4746b18d23fdff3e2f92ca3887ac27957ae57e85ba784476d8891ea6909d67e SHA512 996de920c76de596b6175e4ae4ba9de208c16fbcf9362bbb44d25ee1c12b249d0178fc5cc93dc5a434ab20e6d515d64a3f51b8e89905b5b033b28a3638f4d400
-DIST xfsprogs-4.18.0.tar.xz 1214480 BLAKE2B 78db41319e53be1f03b66f85ecc7c50e0c6658fa3fd8ddd8539bac04e656614a5cb54dc930a324d9df6afe4024c2be10259b903e1ca0ccd0ffb340e7410692c2 SHA512 0629400f8824620138928a7d72908b7a852408814238a55e11d6eb3b2da42cd56273960430d3ea729a9bce95f605d225607940d4728b68c468c39eb5a9a590be
 DIST xfsprogs-4.19.0.tar.xz 1212852 BLAKE2B 2d04390765c5e0dd7d51366f0310c9e680651d49bdd1ecd220b4eec50540a66c97bf6e54f976414351bc77381ffd463803836b27ca25b53960a278a34bc09775 SHA512 a96d0ce406534e70b0a531dfab296de420ec710cd0682dffaf5211602adf82dd59f84b9eb7793c54eabb782a9e0229acf7b247ab644d531ee9e5b51fe9dc0f58
+DIST xfsprogs-4.20.0.tar.xz 1215968 BLAKE2B 40aefb8fb899ae96c256f5fdb1c6e841bb450c3fad0487a6097c7f17c40a96a340e073538932d746f04f078afb960f16a34f5d15f500ce804fc842b91a0787e9 SHA512 6adf93fbe20d6b3250c4690237bda041a6dd0cfdc2387f5c88704fc06e6f095bf047964d701ccd65efef7607c15fb8e97b6046f3d631ef327aa8f4c118a36e22
 EBUILD xfsprogs-4.17.0-r1.ebuild 2302 BLAKE2B e63276181002c8484a7c5deedb6ec9da508cb20e1bf54e1f38301ef7c8125e74ee668be57b79af8f715713bea65bae97c49e074063236ca29dd4a2a0dec4a4ca SHA512 698cd6d21e9bf0c05c7d6c7d372e7ccc3f4f924f90f97baa668dc458c3576ac49efe78ed6e1298a3ccca8b6b53b35979e93f646b11608c2d138e213597452e21
-EBUILD xfsprogs-4.18.0.ebuild 2314 BLAKE2B b2a8dd0f0a36b5461bdc34b5ec061e261f24040c29b49989977927e05bd66a3716cf275f5ae7d2d3ce54e64f78b919f3fc9e939539482294ce7d17067c03824d SHA512 01ccc49541ff057324b706fb2a8474492422e5b32ada74844494ca53a010920eeafde7e321e2a94c9c2b9c25823bae86db5b50597c87407202147f94ef92e4ad
 EBUILD xfsprogs-4.19.0.ebuild 2433 BLAKE2B d9ed6c1ecb450423971ec6e144098860ac835c81dede1dc6d1933941460ecb7e3167a979c26e33a468d5a786352d7d57af27af98e746f40cbe6e172144fa8d3d SHA512 0f18de87e5db27e269a247c60939f67c7583f3349acae954eede1a5ad54d7f96d6077f45dd4091c8bffa286e822a25f023d11401342c27ce745d0911ef87369d
+EBUILD xfsprogs-4.20.0.ebuild 2433 BLAKE2B 9e149073289bf393e2a40a0f83a0a96142cbbc106cb8d3d45bfb351bd3baa7ff8a021d1c39b4d5efa21d01d219ea4a4451e6b08c0aa16f88d1795d659837cf28 SHA512 e39b2086e41db825dfd0f4d25011bac7e9d5efc8f9e055edf97751acdc9c3803bfda9e611bb87fe1cdd4ef6b728a2384343d9e54046d3890b166d7313e581b37
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-fs/xfsprogs/xfsprogs-4.18.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.20.0.ebuild
index ac490a41e289..d676076b7dc9 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.18.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.20.0.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=6
@@ -43,6 +43,8 @@ src_prepare() {
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
 		include/builddefs.in || die
+	# Don't install compressed docs
+	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
 	find -name Makefile -exec \
 		sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
 }
@@ -77,5 +79,7 @@ src_install() {
 	# handle is for xfsdump, the rest for xfsprogs
 	gen_usr_ldscript -a handle xcmd xfs xlog frog
 	# removing unnecessary .la files if not needed
-	use static-libs || find "${ED}" -name '*.la' -delete
+	if ! use static-libs ; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
 }
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 606f2a279852..644d4d870224 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -8,7 +8,7 @@ DIST zfs-0.7.9.tar.gz 6548649 BLAKE2B aa2f1b9d0ba0eda1af7d420c43d65d5d4183169cfe
 EBUILD zfs-kmod-0.6.5.11.ebuild 4086 BLAKE2B 77042a670913df7a0fbb47e594028d56f6733827192b68ae13b0c52598bf728550b59ef0c850d1498e265765552ba3e6f1e4ea6dd8d8608af3fb994de375135b SHA512 efbc887b8f613a94af230916dd0c6ddbf9fcf29a73d4bfeda19680eb514ad12f75cc75d45f8d01fa56cf909e34e518ec5a91bf70310370dd3cc7db7ab7aa72ef
 EBUILD zfs-kmod-0.7.11.ebuild 4073 BLAKE2B 85d1ae2a9292914fe768f59d753a57be220005fcbeaff709dd3587f0cdcbfbb39ad3d2da40478b52aff8787c4e4a55e6dbfc8cb63d4350cab3f917c35c3d4664 SHA512 7ffaee7a4ef75bdca727786dae9cc5cc4441d274c568210b654a6f150e6efcdc61c1a35f48db98a4bb52ee1f68b4c209e8855aaead9da9fb17053db0ca4a9ca1
 EBUILD zfs-kmod-0.7.12-r1.ebuild 4130 BLAKE2B 4881bbcc95739423581845787a08ec4ea4928133e18e40c91d7e775aedf64742d413caebac4063b7ff75e75e439293e2d0accbbc06b3f095ef3165fb63bb50ec SHA512 7da379848280164cbde951978bd43c6fc4734b174fafc7f0336fdf938017532fd3bedd416fefa5369187eab530b78888dfcb5b983302476bf47f5e5df8982cba
-EBUILD zfs-kmod-0.7.12.ebuild 4073 BLAKE2B 47d6fba29a8937a2fd529798f247b497a32612dda1cb8d8654b6b86f70570bb491fc6da48486e55fa08b8ed94dd2ba3586f458d99161a5872af90f84d81e515e SHA512 1dce4eadb5c374581b399006fba146b3b53a0a960a1b5bb1dcfa4b27156b35376f22ddcfbd3c9a89347e33f47d87eff4250a7eb985f63785fcbb264e6654ecbc
+EBUILD zfs-kmod-0.7.12.ebuild 4072 BLAKE2B bd174bbce39a1634c40ba20c26066e15c660b18382f6c2c7ada46759fa19339e39e2490e209f319cf80041151c074aaeb86c456441fdf814e46a6a3a37c2316f SHA512 1a52bec71a66de3cb79ab32e68b95ae6a0590a8acb715e4a025516840d8a21252e524a25044897661c2977217a6ec7bbc6da1e60846dcf414f97324bbc564ee2
 EBUILD zfs-kmod-0.7.8.ebuild 4072 BLAKE2B d148372b05ac609549329f337792e8087841b51e5c5097d9a1d24f6c6b07756ec8ff416359774272f7d0a79ad61e79fd6c4679826558b1416b34ae4acdb3be5f SHA512 17b077dc8d0007e1d1be419c98a00184494835e17d5ddf31928c1bd20a0882898e3701ceea7b33195d3afbecac93eb30d511a82d4a58af52366a792416dfef6e
 EBUILD zfs-kmod-0.7.9-r1.ebuild 4279 BLAKE2B 793f8e6257e52f67b2a6aeae8da3e6f86e3ac76798e3afcbc253b3b56d203548e883740031f4a973730c50da8c4309ae4804e5b9b95ec91af5489e82faa9765c SHA512 e5a6c17c6fb4f6ab37cbcc5fc4fbdace31585a41292ced5eda922a19178c8e3d85c0b7a1e52eaea94490416111922e5b85a5f7abd7c5aa3f4b815eebae17e7ca
 EBUILD zfs-kmod-0.7.9.ebuild 4072 BLAKE2B 301b09e71e36e279d2fb8532884bbf7599ae7c1bdc81188b008420039a227ea2efa251b00ebf8b434d5d0e6c3fe41fe0b4dfb27fe599ceb414045a64848f8914 SHA512 d22123433d5cf24e385737076743a515ab2280b5a4e851ab657f78225aed2315c05edf13e15156be172218fcce2d049a1d2f5a353bca39e2061fb61504b0675f
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.12.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.12.ebuild
index b4be7d17035d..852906e68ad6 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.12.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.12.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="5"
@@ -10,7 +10,7 @@ if [ ${PV} == "9999" ]; then
 else
 	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
 	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 75027fcd6d4c..43062453346e 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -9,7 +9,7 @@ DIST zfs-0.7.9-r1-patches.tar.xz 10920 BLAKE2B 50a0b8533061b5eecc103179e6fd51499
 DIST zfs-0.7.9.tar.gz 6548649 BLAKE2B aa2f1b9d0ba0eda1af7d420c43d65d5d4183169cfe97c693356e1e0b15967ea512c25454f2d77285600f2209d778e4299f420754932e403a390b87b4f488dc94 SHA512 af5d9c320885ee84019fb04250c4b12c7ac3bb3d1037b1961ec4584701a737558374dc22521743e197356efb1d1f0ced9beff675ae9cfcccf3cd8407467f18fa
 EBUILD zfs-0.6.5.11-r2.ebuild 6067 BLAKE2B bc73c185a2988241145db2f5bee2e569dd67729b6e0b2bef27a22023a11134f9d4406350fc5fc8a658deb988607172ef4bd9fa0880af86a5fac80fd0800ada74 SHA512 d3ea86b9364e92349c1535437f49bf29e81a787bd929abf31c18fbd59fce8ec32c8ab414a4456ff56e2cc1ec3f0b2931f98320650ff5c84c555fa9366e3dc2be
 EBUILD zfs-0.7.11.ebuild 6074 BLAKE2B 33b02df834ab770e8e46d69c8b34d1cd22b75a4f916ddbdbf5341779fdfaab6792c7ad8a05692c4d838dc868d81fd0c8fa407a7acc46aa0660a3ce7466210be8 SHA512 94bac4ab1d74f733ea24fb2dd3f7772c78d1ea49a91b333b8b739e2df053e953b2f81593144b26cf451c095b4580e04a3229298af47fd402053ef6d8598bd55f
-EBUILD zfs-0.7.12.ebuild 6081 BLAKE2B 820d3388425d9c8c41124d2a56339b0a4a89770cfec03767d55aa5ec572e5980ecf7de4eccf52a18da22ce02ba7c7436734246436f1269b931d8ed0a8b39ce5b SHA512 138528883911b9505d47a5789cae3d9da37dfd9bd399be6cf1c42f4fd861ea2af9b96aba06a15dc48417ea46ac36338228ab935b5f1d5f73bfbc9c35cb30813e
+EBUILD zfs-0.7.12.ebuild 6080 BLAKE2B 677e2e7c534e6c4e986fbd275b8404bf6162820cccd0df338b5429f9a10d09c9a3413afe913902b6284c7065cfcb143ea2154678ee399eb34d28e855e8333275 SHA512 73003efe6f803063c96c33e39b81480784b43915790a85c0b3fff5fdd5b7dbaa9789cce3c6c2a5bef0b4a01081570a51230134a4654bdd09b003c5ac3b8cef09
 EBUILD zfs-0.7.8.ebuild 6075 BLAKE2B a64e55ee89c210962c3b40fa08b233a57a473f317f12fb1230367559d27975fe66a5b84e463a4dff194229ba4b1bd576f076151da4e1948a70702e85f0bacf99 SHA512 1a6064b0a61025c5b068a9adec8d4982cac8ef3da30ee83960bf3f1fabf3b9b4170419265a418f8d77b37f84a31b1989ecd23d57a13971a8fd43f26a55a50c19
 EBUILD zfs-0.7.9-r1.ebuild 6270 BLAKE2B 65a3f5776ab6b8f35e273120d76241be3e65ef7cfa4541263f1175fe1865a2ed08048cb5fde7289323394e52831409bce63aa9dce7140d44f14a3cfa6a1ba7c2 SHA512 76ef51ba6bf80ec63b26613eb528049aa1bfbb741ca58458d6c8635fbbab4c8a0e2a85b523b98912037402a33a3e75764850997457204d3146453a274cebe0ef
 EBUILD zfs-0.7.9.ebuild 6073 BLAKE2B 380d85c5fc958d461781bdf8326c723a52800406cbbeaec4414453397d4a4f4fea9100d8a8096608b7025eac4e424072fe62b4bb1cd9dae36268e42ad1c04106 SHA512 b2dca9e72c53447030e6605a2a0a8469e9676da88e038f66afe784f70668c719bc9e5ad02092a40dc20c1345a2c74126256a42dcf0f979401fe84858cffc8b44
diff --git a/sys-fs/zfs/zfs-0.7.12.ebuild b/sys-fs/zfs/zfs-0.7.12.ebuild
index c79361210b4a..286e747e870a 100644
--- a/sys-fs/zfs/zfs-0.7.12.ebuild
+++ b/sys-fs/zfs/zfs-0.7.12.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="5"
@@ -10,7 +10,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
 else
 	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev