gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /sys-fs
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
129 files changed, 1240 insertions, 1825 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 86e1ee772a87..e9128e8f91c1 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bindfs/Manifest b/sys-fs/bindfs/Manifest
index 0ac8482539e3..f6e366b71168 100644
--- a/sys-fs/bindfs/Manifest
+++ b/sys-fs/bindfs/Manifest
@@ -1,5 +1,7 @@
+DIST bindfs-1.13.10.tar.gz 404078 BLAKE2B e4b5e4c6fea8463eaf3b612b7e3b67c0f64f8ebf430825c056c090d2f089c47a4fc8038c50744b43732f01529c082433a0920fc2257463810a6e2f5e69b89496 SHA512 0fcd07e412ce2a355310cc2eda4e005d045ac2c1744353eca118c921f647d4fc16d98269fd1e9d8bdc225602a915b2893746da77ae28c9cd07fa4eab0e03f4c7
 DIST bindfs-1.13.8.tar.gz 403296 BLAKE2B 38d5b298af6bd399c9b315fad8a0897ae785f8d4f963aad7d08024cf22eedc90c55e94d54fd7033a3343bb1ed3ab14b76b96ca6ce35b8799be4329ecee12ce44 SHA512 b0755ad5b91cd047942094d824c6a12a684b1c8bc990f4a28170a09283c0b11ab4d8c86ca65160802610e72f1c649d7249ed87e3e29410b210271c45b6846c11
 DIST bindfs-1.13.9.tar.gz 403698 BLAKE2B 71667e8f50320ac64c11fd1ddf2b5f59e9e2cdce0913ffdbf3d23b32368255ddd2650f6d5efeccdb9a03dc0f93710540d88a28a4ecb5f2e89dd83f59e86214de SHA512 7584577b289816a1ee514c4967893dcca69683b68b357d370c3a7accd39f96034f34d29751b66ef98ba35bb869498af4df813b0bdea805a42a38b47340f3d654
+EBUILD bindfs-1.13.10.ebuild 478 BLAKE2B e918f5d8b816f4db54fe9218273e13a9f3856199329ae40cad25b48788b649a973d36783b60b61a45f27df329c4cf0c0a45b6e05c492c609faa24b471b5ae9d0 SHA512 a589ef3276f74a2cfd5cb1aff409d3d5f608fdafc70846b9ee1590e6f8c8cd3f53d1710f5cc1fabdbcb7ef575afb7917373a19d73391a8fbe466af33673e911f
 EBUILD bindfs-1.13.8.ebuild 481 BLAKE2B 27a222315c1808348bb97ca4c363390308d7169952657894847b233593303bb6172f59b054a4967822ce36d75795d06b607d84d30d7697f6d9d02f2cafb037d6 SHA512 40782f3a98fb73bb97eb93700e9cb0442180d2f093040d9fcc0e0b579bf7066d472612b07cc70ee8ba680ae08cc0c49dad2da56935b292957a1502c3b5c05dc3
 EBUILD bindfs-1.13.9.ebuild 481 BLAKE2B 27a222315c1808348bb97ca4c363390308d7169952657894847b233593303bb6172f59b054a4967822ce36d75795d06b607d84d30d7697f6d9d02f2cafb037d6 SHA512 40782f3a98fb73bb97eb93700e9cb0442180d2f093040d9fcc0e0b579bf7066d472612b07cc70ee8ba680ae08cc0c49dad2da56935b292957a1502c3b5c05dc3
 MISC metadata.xml 432 BLAKE2B 8d4cfae65a05e718922b04a0e70d5dc9b22bea0339d6640015341b45b6a8c6d7c7d48a98290fcb2d0b039aab14a9feae1e6c527a7f483b421069174525d4e619 SHA512 1d22b2bad552a622edcebc9b52823a812f483588257c379077e1cc323bfffea67ed2802a3f62c9264cadf355ae3f96ab4705d005286c598f25447efe813fb06c
diff --git a/sys-fs/bindfs/bindfs-1.13.10.ebuild b/sys-fs/bindfs/bindfs-1.13.10.ebuild
new file mode 100644
index 000000000000..fc8ae04fd9a9
--- /dev/null
+++ b/sys-fs/bindfs/bindfs-1.13.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="FUSE filesystem for bind mounting with altered permissions"
+HOMEPAGE="https://bindfs.org/"
+SRC_URI="https://bindfs.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=sys-fs/fuse-2.9:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+RESTRICT="test"
+
+src_configure() {
+	econf $(use_enable debug debug-output)
+}
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index d45692d4603d..0992909dbfa8 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -9,6 +9,7 @@ DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 35575946c1de9cb81f1aed2a5be24331
 DIST btrfs-progs-v4.15.1.tar.xz 1931820 BLAKE2B 00c4b9f6ec2039ad680cd625e5ece1cd306b8eaa4572f262cd2272c9d1e03923834ec7af7e59afc9e931cf95d224aea883cc544ba8e26de03119d85c67f19b64 SHA512 6e6a9799f6716bbf772d5f0c8069579815060db20d30807e12948e7274448bca09a12c385ea05a95afc23722d12067a8d99623ea0091dca8ae75ea646aa84b88
 DIST btrfs-progs-v4.16.1.tar.xz 1980696 BLAKE2B 85854fd025c92bd31c957623b78ad72efd536fc8c9d72cc7ad65b9a435b3d57405208e355a86d95ea46ed0179a04e34c3693c4e465e7d6a8edfacdbd185e1421 SHA512 9f0e8c593a10c1c09749ccc00f470ba44d4357fabca8d89ce5891ab0d9cd70f1356f1c6677288019387a6b3b3746431537da205627791a35955bb8bed33d807e
 DIST btrfs-progs-v4.17.1.tar.xz 2045192 BLAKE2B cfc696f32ae8f02865206ff0b1f749a5af072b147537e2c6389a4fb7e93e437754b6af23f122722837612a08d86485bcf110e069facb6c5b76f193dc89a6d433 SHA512 90f291e362b640a22b41036351619e7b8a793a3b57d0537e7865edf4b830d6dc57b3051c0aed9e1ff38b602441a20fea7f974ccff789a3b4a622a0ea57756538
+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.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
 DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5
@@ -20,7 +21,8 @@ EBUILD btrfs-progs-4.14.1.ebuild 2481 BLAKE2B 3e4db698cb95fdcdb982b424364cced1aa
 EBUILD btrfs-progs-4.15.1.ebuild 2586 BLAKE2B a4f784458b56797d6018ed5bcc84d5270419c3507cc861af002ee7756420e864889414deb713f5f78154d7e0c84bf2ec63e2509ae62cc1b00560f85b37a4a9f8 SHA512 94662ed43680e269ad10be9209b59e5e882839d30ff28e6311420f6298d4e37aeff328ec889b66f661f61bae0b21d0541c79733521dec0b4b8cc0d0c8ab652dc
 EBUILD btrfs-progs-4.16.1.ebuild 2861 BLAKE2B cd4e072ef8183ff769336767957e2b9528b4c9811170f91758cfc296fde24d23077d72cb6fe44af4b75e6ce8510e5f8db2b54545b461a6d358d75fc1705a93af SHA512 edb7fbdc799d29430afb45d6249ff533079d7fe8b60be61e9601fe285a3b332ddce80cd36e50d1a92cfd12be683e57c2ddacffd0b3c52a716903429af3967f2c
 EBUILD btrfs-progs-4.17.1.ebuild 2912 BLAKE2B cd9161dd0c7fa433d03020dc951e1bd0a6974fc02bbbf48353f6fea4d2724ced5c5187e6ab050d46dae41027338a9a55a8f97d65eb9899c282c0dcaf488bb426 SHA512 4b27b69c325883fd5728a6efd4fd9110dfa6e013dfd6ad56a447049097108247e62adcceae768980afd15f3a433eed5c041f70331d55495fd52875281019bbd5
-EBUILD btrfs-progs-4.19.ebuild 2903 BLAKE2B 1dbbe5f5a97d874327d34c5ef9a20e681db40ab6ead357ee3ac312c06300041282524ba5c2499fa226a58f39b46eea8f670ee33b7a527e00f89e85ecb5452e2e SHA512 6b6d2bcb4126d535a636afffeb1bd031c49bd59985c69a3b06d56a98455774d8b4d1cd6db27be2b72867a8f7ba15dcf5382d4ed34db81c6043b1169758cccd06
+EBUILD btrfs-progs-4.19.1.ebuild 2855 BLAKE2B 94e2d31c4d5f8ef45c076cd736f246d35c46b7a768dfee3e17bd7ac2a92a391b4817f188c6e84dc44a4bf94b107d452bd7376cd4dbf47dedcfda1215ae57c357 SHA512 040c58607f706224ee439f46bdb82123b3abf83ea75f8bce6c47ba7f8c3ad971b717c1c4895caafdc49fdadd6ef646470177eb377a17fd8009d666b7afd627eb
+EBUILD btrfs-progs-4.19.ebuild 2898 BLAKE2B 8c37fac4c31cd51d719e5e910918f7d0109e7ca81867073c87093939e35a81dba469c036600179953e8fbee44c6de9b9639bf661fdcfe831f4f6fcbea34e20a1 SHA512 328918da11cd28a89383f16929407b0ce5c43e2be9950594ccf73befff78aa6ee24e13517664dd6823f7ef02c237bcf91116e2dc9416efc4f049300a4851ab50
 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd
 EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4
 EBUILD btrfs-progs-9999.ebuild 2855 BLAKE2B 94e2d31c4d5f8ef45c076cd736f246d35c46b7a768dfee3e17bd7ac2a92a391b4817f188c6e84dc44a4bf94b107d452bd7376cd4dbf47dedcfda1215ae57c357 SHA512 040c58607f706224ee439f46bdb82123b3abf83ea75f8bce6c47ba7f8c3ad971b717c1c4895caafdc49fdadd6ef646470177eb377a17fd8009d666b7afd627eb
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.19.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.19.1.ebuild
new file mode 100644
index 000000000000..04d538396094
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.19.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 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/btrfs-progs/btrfs-progs-4.19.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
index c0e82c0a114e..5e47a83e3f3a 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
@@ -12,7 +12,7 @@ libbtrfs_soname=0
 if [[ ${PV} != 9999 ]]; then
 	MY_PV="v${PV/_/-}"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	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
diff --git a/sys-fs/clamfs/Manifest b/sys-fs/clamfs/Manifest
index 177ebf4180fc..8f6b6cb65ba6 100644
--- a/sys-fs/clamfs/Manifest
+++ b/sys-fs/clamfs/Manifest
@@ -3,5 +3,5 @@ AUX clamfs-1.0.1-gentoo.patch 675 BLAKE2B 4e0e8658444f706aed06b69c9c0d110dc7ea81
 AUX clamfs.confd 41 BLAKE2B bfca4ec45eab1c94f54e9f470797be54c2bcb363bccf2565e391803189ae614f8d17d0eee6bcd83bfac5b7829dbd5a1ccbbebbf34a4f5033ed87d632f0f9358a SHA512 a49afb1e2684732581c4b6274744be71193e48137d71abf4d12b943d1b91502b52fd077a6124c33182e6796cbdb609c000e0f3c1baa05b9349ab4a38b247280d
 AUX clamfs.initd 441 BLAKE2B d14da6b7120e4ab864be2faa1c8387044be9ee8d666eff0a57e45ad0ffc0ea2609a36a5ab97e8255aeb9d68f615ddcb40199eb8bb68626aae3e24f25f59faf38 SHA512 5a3b2de57733893df42d307ac299ec785f9e7a9d52bbd4139c166b607c5e803d3052afaee5dcc95b430fdb76a0da05c198c419dd8f3885e7d2d1b5d5e3c6e8b6
 DIST clamfs-1.0.1.tar.gz 142386 BLAKE2B d4333ddebae3aec1ffa36cd5db361b07daa4007c75e6f6e7e3c296f99573bde5ac77722b7af95fe194fd2ba0d56550a608911235da6cc7e9c25359af6554fcbd SHA512 8a9912c068c178049e8538da729635af1372e8ad1f7bc0e14cc7506208d15a4c1fdab7cf229dd683a3245168c627a3d994ec5b24bca5f12efc9ff638040e3258
-EBUILD clamfs-1.0.1-r2.ebuild 880 BLAKE2B 01b28ab27d657584ef0ee4e77c5f09d8343e898efb89099e81be9e18e7726929c7f0b0e084c610092acc6db8557d5c786ba49e57b84074e23f6e6ccb65cc1994 SHA512 2f2e279660e3d02ed2005f98c9db6d57c56fe5dc46ccf8105d2ae7cc19240ea66efd47599cc33f7cb566a31b505d91e56f1499005e416221cdeb51cb5ce23b2a
+EBUILD clamfs-1.0.1-r3.ebuild 879 BLAKE2B 2d5134ccafa339a451c8bed3b5e88f76a4027417f6d8fc6c9618be1ba732a7c17cc466b45a918211176977f1a9f47a563c7aead84e404a460e25cf41f14bdd33 SHA512 d997aad74ff871769af91dc4fc46a013077970405384da336cd7c7c1cccb12e55f2b817d2562147c587f12fcf71271906892caf7b8dd510ec0878e57f8b54fd6
 MISC metadata.xml 475 BLAKE2B 6f62f5c3c67b45ea22c1075f4698e51d00e64da546d62ba7f6bd3f1e65e2f29eafc9d14e577c543fb25a0d76e95f32f37a97d696d2c32653658de917b42958a7 SHA512 b6df75e41f257bd6d420906c1aadbdab5efac2e6910ffcdf41f6353d3745f17f1f7df7733e816944c87f8f7503082bcdc422430c601ab06701408663fc150011
diff --git a/sys-fs/clamfs/clamfs-1.0.1-r2.ebuild b/sys-fs/clamfs/clamfs-1.0.1-r3.ebuild
index 0fbd8b5055af..8a8bf827a5ba 100644
--- a/sys-fs/clamfs/clamfs-1.0.1-r2.ebuild
+++ b/sys-fs/clamfs/clamfs-1.0.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=dev-libs/boost-1.33
-	sys-fs/fuse
+	sys-fs/fuse:0
 	dev-cpp/commoncpp2
 	dev-libs/rlog
 	dev-libs/poco"
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 996f80daab70..5101b63cf44f 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -5,10 +5,10 @@ AUX 2.0.5-dmcrypt.rc 8827 BLAKE2B d4604b8f78d6ab6b4b64b6be64f8706b01aec320ef0c61
 AUX cryptsetup-2.0.4-fix-static-pwquality-build.patch 427 BLAKE2B dfdc56c6627084732973254cd52c48f0869aa7b4c58e466840a87f77c1d4fb09ae37295fb54e980abccfdfe51dc63161e188a0be9bb4bf3c69d7731120f84bac SHA512 23b5f9b21ec86c92787bfc8744682ce0777dfa87e1de97afbb8db33c4587f1e2c8e5f8c9d0fa56ca801d7795739f9a66f14633d8a3904ea68ddd58ddc3863adf
 AUX setup-1.7.0.py 788 BLAKE2B dc7a2dbc2187f233f4fae9d85bbec9e2152259a45094f10ab043b36e31d80d40772795cb5f9911b0e9a3aa41d8f1773c0e60aa6da1a530165a26384c65532117 SHA512 823fe8a90a76de9f259a5b69425601b78a0b6c1204cda613e224cc21e4eebc2b22b4be9f53efe843156c45a20a099385bc4dad6d653a26749336023d3ae5de89
 DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456 SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439
-DIST cryptsetup-2.0.4.tar.xz 10444544 BLAKE2B 95c18eefe99c27d05e347440d77e4ff53dcc110822dc706e2284e3203da9069acbd8afedb8d596a0f832bdadea0597b75af58a22af712818a3e0aae2824e51b7 SHA512 74d442c7c7837da719a14aefa8bf0b5dffbb050acd6fbd140c50d43470c828f79fdcf7cd6acf1c149a4e1129a100059df6216b7d8ca04eb0b070cb8d4ca33e61
 DIST cryptsetup-2.0.5.tar.xz 10476304 BLAKE2B cf1e335fce48a7bf835b2008dfc0a96ef35d344e2c9f6a0a5a2ff45644f9015311e99b8f9e05b0b23cad69d74f91dd1b7cdd766560fb6504e7453d6e46bea186 SHA512 bac3f5fde1be02d325c097f85e77aef44ce764c1bca7f0554cedd69b9444e5a5529f11b9ae74d36dc1977e88e11422a58dfa17e48559eac7f5e6c4ce332409ae
+DIST cryptsetup-2.0.6.tar.xz 10621424 BLAKE2B ecda2cb3c0a8a46b69519ab9ea9a1ece44fb21602cbce0751e52a16e5e493c7772fdc62c1151b95a783a847d9afd5a64f64bcac6673acba4bb90a417047c93cb SHA512 1fdb9068fe2b5825cef65323a9b788b5e043c1000e614e47e2b21ab3969e416653580aba639755ba936718ad612b986768029df5e07f3fa191db2bf29d2501ef
 EBUILD cryptsetup-1.7.5-r1.ebuild 4041 BLAKE2B 3f8868734f9ed2d1a635762348632b00520b243738c9f907866225e981bd7534d38f746c2eda2292cfaa395f77e431cd4b479ba97294d187c9d7de3b3f6047c5 SHA512 d41b3eb764e68fe72d1e4d2ee725a66030f03cfe7ea7d9046cc0dfaf673062229e9ade2a356b81112e8955cc8536916caae949716aebf3b0d4bfb8ce8f2190c7
-EBUILD cryptsetup-2.0.4-r1.ebuild 4136 BLAKE2B 1eaddb9cda051ec1047e8746aaabfa0446fa6a426eaabae091e2bb99d9748f869b4092611fb436655ce20fa85ae5150be672387db684a273cf9697d91453ed0c SHA512 977769e4fa394fd70c5f67cfdb270f76c8aa483f841f87948ee1c72097f105a5ed0f177cb2c73ba5b33a24026e3183b2dacf84c08edcd8a2f4d7981898f2d8fb
-EBUILD cryptsetup-2.0.5-r1.ebuild 4140 BLAKE2B 411e5b149c8946261c57a25005fa15a572ae187461fdb8dad847abb9e24605036aed42f499aec94bc31008f346cad9633d9af6ef85231c57bab1b4ebb0793dc7 SHA512 20184bdfbc797d3a86dc655b2e096f85f52c461fb3b6bee061a2b96013f13731137b4d6aeea8cd027fd838b22c84329b0b3ad198c448d5bab1ccca4037bb0d3d
-EBUILD cryptsetup-2.0.5.ebuild 4140 BLAKE2B 7cb64bd81f835aea5ae764a3f4008cd29c51d9075da702af038c5d1df96c46a4808930bf30a3832627e3892d595ee04429c3e11d35acfe1d830c128333cfcc9f SHA512 64e4ce816fc022eb32e0cf56b392d46076fee297a0061084c7c358899500b3eaac88754ebed852e7b1db3d14a7db6cf18c31ea986a14262386bd0521fa13c20a
+EBUILD cryptsetup-2.0.5-r1.ebuild 4147 BLAKE2B 945b8e95155e0eb30c010d72857884d57f1d6cdbbd9b71b7ffa800e85a731ef7f3d1d9ac752d45e187a0db18ebedecf3275f6b5361bd831477ddf5bbf5bedbd8 SHA512 01e57a21c5e8114ffca4a4ca620568662479784a4f5d29e34e6d730a41e047612f4e0b96bf8b7950a06f48360a22dbfef78cf81f1c8c96170291bc9551048a8b
+EBUILD cryptsetup-2.0.5.ebuild 4147 BLAKE2B 650cea2aedb6469ef9b41603c52c85ee69b2dd6fb997c8aaff9c898f7e1d590a0d88ad53afe047025fec71772f0da78af3cb9809359ccf4de5ee8af591013d71 SHA512 157f9e71044219b3efe2396299fbfc4d6741ab36fd7490ffff8b034272b6d8c0a8e976e9d51400e27abe42a58a54baa478e3cc370894f02e7d1fe9a76d506766
+EBUILD cryptsetup-2.0.6.ebuild 4147 BLAKE2B 650cea2aedb6469ef9b41603c52c85ee69b2dd6fb997c8aaff9c898f7e1d590a0d88ad53afe047025fec71772f0da78af3cb9809359ccf4de5ee8af591013d71 SHA512 157f9e71044219b3efe2396299fbfc4d6741ab36fd7490ffff8b034272b6d8c0a8e976e9d51400e27abe42a58a54baa478e3cc370894f02e7d1fe9a76d506766
 MISC metadata.xml 974 BLAKE2B 7dc6d2696e918f5a5c195194f70ec053bac4bfc84510234ae63a4bebb8363b72e9b1fcc331312c938839a633c95dae1e88dc24bf8ca0602cefc8bb8ab1c822c0 SHA512 a5c9ab70c75af24d3ffdd076f1eb61c6eec3b388a417f611f8988bf3f2da5daaffaab461b50c995e572d2d800c726ca960e78c3c17dd2a40788fcf48e4158f41
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild
index 5f5526582fe8..da5c949c138f 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~amd64 ~arm64 ~mips ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~s390 ~sh ~sparc ~x86"
 CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild
index 1441e14c0072..29d5fcff6450 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~amd64 ~arm64 ~mips ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~s390 ~sh ~sparc ~x86"
 CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.4-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild
index 40bb64ed350c..29d5fcff6450 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.4-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~amd64 ~arm64 ~mips ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~s390 ~sh ~sparc ~x86"
 CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P/_/-}"
 
-PATCHES=( "${FILESDIR}"/${P}-fix-static-pwquality-build.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
 
 pkg_setup() {
 	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
diff --git a/sys-fs/ddrescue/Manifest b/sys-fs/ddrescue/Manifest
index 5de096dbcac6..3423c41523df 100644
--- a/sys-fs/ddrescue/Manifest
+++ b/sys-fs/ddrescue/Manifest
@@ -3,5 +3,5 @@ DIST ddrescue-1.22.tar.lz 80050 BLAKE2B c455bf847749dc29565d02efef8b24f1a322e806
 DIST ddrescue-1.23.tar.lz 82451 BLAKE2B ed9d71894d4c8466e3ca56d853ae5a6c4f7cf1955bea4468c158674e7bf6386343ab8289714be7ebb6b326f462e53fc7e9d8122a26079267ab4324f60c8fc4b8 SHA512 4f0b27067966b71efaae809d4f38714863cf3663f3b8c3f26055d482debb15c0fab77752411a9d242f18dbb8e4edc68494f866721dae9c95cfc5354439eaa656
 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 875 BLAKE2B b07e20b2c15e11aaf88184c5ddcb7e4e1e645aa6ba0f41120c7eec90a32a2ea110800c896661dc0a6334c7a948c4bb3eef10e721a74ef16ac757dfd180000771 SHA512 ab3140e73fd3f0ebfe8e3b5a47e7a60cfd7eba68ee47d92135ff86dc3708338c9f471772f804155463baf30a5fb68bdd252b27b622470f76425b1d2d5156fdf7
+EBUILD ddrescue-1.23.ebuild 879 BLAKE2B fa277364e7e9772dc9e69e0802e890e4e931bbb4851aaa0b1e66c76771831bb8b2540fa5387e61f9c063583919c07e3226cc66c96fc5e35d03e6e9cdcb076fe2 SHA512 ae858b2e1c831119ab7a3a779a6d02225f361fd6ea9ae246dda424af299c8174b77869f1319e7a4766fe7bf9a53b0ff7276e80d38d91d76b70a3242346cc4c40
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/sys-fs/ddrescue/ddrescue-1.23.ebuild b/sys-fs/ddrescue/ddrescue-1.23.ebuild
index 7d08213d812f..60a4cfb5a088 100644
--- a/sys-fs/ddrescue/ddrescue-1.23.ebuild
+++ b/sys-fs/ddrescue/ddrescue-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 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/devfsd/Manifest b/sys-fs/devfsd/Manifest
deleted file mode 100644
index 9b2fab987985..000000000000
--- a/sys-fs/devfsd/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX devfs-start.sh 622 BLAKE2B 1a632f27f0f105e5b4530d68d47504dd83ee23c6ecc851a9fef17f5020a323e5450a4331036b7f7cae2d69ac4a337aff11cf960a76741b33f46cfeab5d708f08 SHA512 9087c774a3fdabae1216c6a96e522d09efcc19c6739554d9ae4d7e14b231577bdad0904a3a9a177321c288ea572e252621b0be4bc4cd61962ff6a692531f8003
-AUX devfs-stop.sh 326 BLAKE2B d467e3346fe0d83ab53373e1a9a1a5caa5d1668368af3c4d7157c8e1d254d9aa82619fa74e1e196e0fe309bad60588e461a7f3cacd413ed8f11ff232ef85e70e SHA512 0f2784a83e49c39b574a8db137b9ab95947f2946c0f6d2a0d64b4ff6d6bd28fefc7a8049b58a7bf672bdaeea616d32dd3a0eff829f7fa67f715db97b06a2aa19
-AUX devfsd-1.3.25-kernel-2.5.patch 3929 BLAKE2B 2971ae81465e682c5842700efae7cd1e86d20cf0b2e1de43d93842877241f6ac5ccd2a455f27229225d068da37ff67f8613b10f3712f97468d8b7c5b4ba4894d SHA512 fce2254b23be6bc85592874ad3c80582dcbc03b114a16eea86d1c087571c34db366c09fb04d0e1565ac4fd52fbcea411bad7965474f84e8b1df194db9cdff082
-AUX devfsd-1.3.25-no-nis.patch 2142 BLAKE2B f4a9614524869835d5cd81b0127b8457ff75f6fc4350d8b46389a6e24e671a3e61b089be6655c5528f6aba838a1ff164a78dc7241a68233b48bebedb9c201a1f SHA512 17cce86a687e03abc310c8aa886758b26d5a9ddc183f07375d5d9282c303f9a1472af11c441345e49cd7341a2dbad4d87a1b032b340d8ea9d922a7b389513d42
-AUX devfsd-1.3.25-pic.patch 529 BLAKE2B d6884825c21e2a65def8ac1e23a1dd09748e4eb2bc6543a32ba7cd7640d545206ab6cc5dd8032c0b0ae3e996421b170a6a3553b3fc12b7148d20d88b1f1b7c3f SHA512 1f40e3f043cd96a1055b96088cb523fcabb67ab4e9ceca3ea4c9f963964003c3fa67fa050b9189d295a7ffdecc68d2161c49d2e78fe38b51c9faeff94681cd39
-AUX devfsd.conf 5886 BLAKE2B ee4765b3374ba6bb3fd1dc165e0164e999d24683d737a610977212b267071e7696db48b1742c1cc17c38abbffdaa7981bcc5d9ecdbcd86d3432db3cc2c9a413f SHA512 95717275ffe39d9c99fbdf8b562278ec8756aba572aac1d789aa3a089f44138158c882399443ef42a97fd1a7a0500d2ab6e271323b52e4e25e83d2ac96408d15
-DIST devfsd-v1.3.25.tar.gz 42645 BLAKE2B 9c004dc01ab1d8c1b14091e33216c4603bf0752c9cea610ea639a285eda7ba2b2e9b030de16b277bf53bf1021d88044ed3ff557cd66619709e3bc0c7637292b3 SHA512 3bf18edb0fc823b96b938b22fc0f978823acfd37708d24d9fec8a25dfdaced165be6162fd5a20bdf30bfc615699faea8239fc77b99c30f035fd7c6b40e7c8c2c
-EBUILD devfsd-1.3.25-r9.ebuild 1447 BLAKE2B c30630492480a673a90e0be653390bfae5b13909dde4d783071abd9ae83e6590b0dd47891f0de044897a14938bd3f15c34211a2f879593e564876d87709a4210 SHA512 874f858953089cea254a24c566437db5e6397d5cddd069752aa9552a17d0e55d4ca6e52a59c7d5b3a4dfc9c9a86e39c319b1f32f34bf8aa1ba273a72f6c1c7a5
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/devfsd/devfsd-1.3.25-r9.ebuild b/sys-fs/devfsd/devfsd-1.3.25-r9.ebuild
deleted file mode 100644
index 16647cbdbf8b..000000000000
--- a/sys-fs/devfsd/devfsd-1.3.25-r9.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Daemon for the Linux Device Filesystem"
-HOMEPAGE="http://www.atnf.csiro.au/~rgooch/linux/"
-SRC_URI="ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/daemons/devfsd/devfsd-v${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="<sys-kernel/linux-headers-2.6.18"
-RDEPEND=""
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-kernel-2.5.patch
-	epatch "${FILESDIR}"/${P}-pic.patch
-	epatch "${FILESDIR}"/${P}-no-nis.patch
-
-	use elibc_uclibc || append-cppflags -DHAVE_NIS
-	sed -i \
-		-e "s:-O2:${CFLAGS}:g" \
-		-e 's:/usr/man:/usr/share/man:' \
-		-e 's:/usr/src/linux:.:' \
-		-e '32,34d;11,16d' -e '6c\' \
-		-e 'DEFINES	:= -DLIBNSL="\\"/lib/libnsl.so.1\\""' \
-		-e 's:install -s:install:' \
-		GNUmakefile
-	use elibc_uclibc && sed -e 's|libnsl.so.1|libnsl.so.0|' -i GNUmakefile
-	tc-export CC
-}
-
-src_install() {
-	dodir /sbin /usr/share/man /etc
-	emake PREFIX="${D}" install
-	dodoc devfsd.conf INSTALL
-
-	keepdir /etc/devfs.d
-	insinto /etc
-	doins "${FILESDIR}"/devfsd.conf
-
-	insinto /lib/rcscripts/addons
-	doins "${FILESDIR}"/devfs-{start,stop}.sh
-}
-
-pkg_postinst() {
-	echo
-	einfo "You may wish to read the Gentoo Linux Device Filesystem Guide,"
-	einfo "which can be found online at:"
-	einfo "    https://wwwold.gentoo.org/doc/en/devfs-guide.xml"
-	echo
-}
diff --git a/sys-fs/devfsd/files/devfs-start.sh b/sys-fs/devfsd/files/devfs-start.sh
deleted file mode 100644
index b8d832494e95..000000000000
--- a/sys-fs/devfsd/files/devfs-start.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-main() {
-	local mymounts=$(awk '($2 == "devfs") { print "yes"; exit 0 }' /proc/filesystems)
-	
-	# Is devfs support compiled in?
-	if [[ ${mymounts} == "yes" ]] ; then
-		if [[ ${devfs_automounted} == "no" ]] ; then
-			ebegin "Mounting devfs at /dev"
-			try mount -n -t devfs devfs /dev
-			eend $?
-		else
-			ebegin "Kernel automatically mounted devfs at /dev"
-			eend 0
-		fi
-		ebegin "Starting devfsd"
-		/sbin/devfsd /dev >/dev/null
-		eend $? "Could not start /sbin/devfsd"
-	else
-		devfs="no"
-	fi
-}
-
-main
-
-
-# vim:ts=4
diff --git a/sys-fs/devfsd/files/devfs-stop.sh b/sys-fs/devfsd/files/devfs-stop.sh
deleted file mode 100644
index 0b4856bc82c7..000000000000
--- a/sys-fs/devfsd/files/devfs-stop.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-main() {
-	# We need to properly terminate devfsd to save the permissions
-	if [[ -n $(ps --no-heading -C 'devfsd') ]]; then
-		ebegin "Stopping devfsd"
-		killall -15 devfsd &>/dev/null
-		eend $?
-	fi
-}
-
-main
-
-
-# vim:ts=4
diff --git a/sys-fs/devfsd/files/devfsd-1.3.25-kernel-2.5.patch b/sys-fs/devfsd/files/devfsd-1.3.25-kernel-2.5.patch
deleted file mode 100644
index bafa600c31ce..000000000000
--- a/sys-fs/devfsd/files/devfsd-1.3.25-kernel-2.5.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -urpN devfsd/GNUmakefile devfsd.kernel25/GNUmakefile
---- devfsd/GNUmakefile	2003-09-21 02:09:45.082973960 +0200
-+++ devfsd.kernel25/GNUmakefile	2003-09-21 02:10:23.317161480 +0200
-@@ -12,13 +12,16 @@ endif
- all:	devfsd rpm.spec
- 
- 
--OBJECTS = devfsd.o expression.o compat_name.o
-+OBJECTS = devfsd.o expression.o compat_name.o check_kernel.o
- 
- CFLAGS = -O2 -I. -I$(KERNEL_DIR)/include -Wall $(CEXTRAS) $(DEFINES)
- 
- devfsd:	$(OBJECTS)
- 	$(CC) -O2 -o devfsd $(OBJECTS) $(LDFLAGS) -export-dynamic -ldl
- 
-+check_kernel.o: check_kernel.c
-+	$(CC) -fomit-frame-pointer -O2 -c $<
-+
- install: devfsd
- 	if [ ! -e $(SBINDIR) ]; then mkdir -p $(SBINDIR); fi
- 	rm -f $(SBINDIR)/devfsd
-diff -urpN devfsd/check_kernel.c devfsd.kernel25/check_kernel.c
---- devfsd/check_kernel.c	1970-01-01 02:00:00.000000000 +0200
-+++ devfsd.kernel25/check_kernel.c	2003-09-21 01:59:56.645430064 +0200
-@@ -0,0 +1,44 @@
-+#include <sys/types.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#include <asm/unistd.h>
-+
-+extern char *modules_devfs;
-+
-+/* copied over from module-init-tools backward_compat.c */
-+#ifndef __ia64 /* breaks ia64. */
-+static _syscall2(long, create_module, const char *, name, size_t, size);
-+#else
-+#define create_module(name, size) \
-+        syscall(__NR_create_module, (name), (size))
-+#endif
-+
-+/* returns true if we have a 2.5.48+ kernel */
-+int check_kernel_version (int verbose)
-+{
-+	int k25 = 1;
-+
-+	errno = 0;
-+	if (create_module(NULL, 0) >= 0 /* Uh oh, what have I just done? */
-+	    || errno != ENOSYS)
-+		k25 = 0;
-+
-+	if (verbose)
-+		fprintf (stderr, "devfsd: kernel %s detected\n",
-+				k25 ? "2.5.48+" : "2.4");
-+
-+	return k25;
-+}
-+
-+void update_config_file (int verbose)
-+{
-+	int k25 = check_kernel_version (verbose);
-+	
-+	if (k25)
-+		modules_devfs = "/etc/modules.devfs";
-+
-+	if (verbose)
-+		fprintf (stderr, "devfsd: using %s for MODLOAD\n", modules_devfs);
-+}
-+
-diff -urpN devfsd/devfsd.c devfsd.kernel25/devfsd.c
---- devfsd/devfsd.c	2003-09-21 02:06:10.763555464 +0200
-+++ devfsd.kernel25/devfsd.c	2003-09-21 02:12:17.482805664 +0200
-@@ -396,10 +396,16 @@ EXTERN_FUNCTION (flag st_expr_expand,
- EXTERN_FUNCTION (const char *get_old_name,
- 		 (const char *devname, unsigned int namelen,
- 		  char *buffer, unsigned int major, unsigned int minor) );
--
-+EXTERN_FUNCTION (int check_kernel_version,
-+		 (int) );
-+EXTERN_FUNCTION (void update_config_file,
-+		 (int) );
- 
- /*  Public data  */
- flag syslog_is_open = FALSE;
-+/* set to new style, runtime test will override it later */
-+char *modules_devfs = "/etc/modules.devfs";
-+
- 
- 
- /*  Public functions  */
-@@ -507,7 +513,6 @@ static struct event_type
-     {0xffffffff,                 NULL,         NULL}
- };
- 
--
- /*  Public functions follow  */
- 
- int main (int argc, char **argv)
-@@ -651,6 +656,7 @@ int main (int argc, char **argv)
-     /*  Set umask so that mknod(2), open(2) and mkdir(2) have complete control
- 	over permissions  */
-     umask (0);
-+    update_config_file (trace_level);
-     read_config (CONFIG_FILE, FALSE, &event_mask);
-     /*  Do the scan before forking, so that boot scripts see the finished
- 	product  */
-@@ -1217,7 +1223,7 @@ static void action_modload (const struct
-     [RETURNS] Nothing.
- */
- {
--    char *argv[6];
-+    char *argv[7];
-     char device[STRING_LENGTH];
-     char *env[4] = {"HOME=/", "TERM=linux",  /*  Safe mode environment  */
- 		    "PATH=/sbin:/usr/sbin:/bin:/usr/bin", NULL};
-@@ -1240,9 +1246,13 @@ static void action_modload (const struct
-     argv[0] = "/sbin/modprobe";
-     argv[1] = "-k";
-     argv[2] = "-C";
--    argv[3] = "/etc/modules.devfs";
-+    argv[3] = modules_devfs;
-     argv[4] = device;
--    argv[5] = NULL;
-+    if (check_kernel_version (trace_level))
-+      argv[5] = "-q";
-+    else
-+      argv[5] = NULL;
-+    argv[6] = NULL;
-     snprintf (device, sizeof (device), "/dev/%s", info->devname);
-     if (trace_level > 1)
- 	fprintf (stderr, "%s modprobe with name: \"%s\"\n",
diff --git a/sys-fs/devfsd/files/devfsd-1.3.25-no-nis.patch b/sys-fs/devfsd/files/devfsd-1.3.25-no-nis.patch
deleted file mode 100644
index c676b7e980c9..000000000000
--- a/sys-fs/devfsd/files/devfsd-1.3.25-no-nis.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- devfsd/devfsd.c.mps	2003-12-04 15:54:03.000000000 +0100
-+++ devfsd/devfsd.c	2003-12-04 16:05:32.000000000 +0100
-@@ -283,8 +283,10 @@
- #include <regex.h>
- #include <errno.h>
- #include <dlfcn.h>
-+#ifdef HAVE_NIS
- #include <rpcsvc/ypclnt.h>
- #include <rpcsvc/yp_prot.h>
-+#endif
- #include <karma.h>
- #include "devfsd.h"
- #include "version.h"
-@@ -414,9 +416,11 @@
- 			      unsigned long *event_mask);
- static void process_config_line (CONST char *line, unsigned long *event_mask);
- static void *dlsym_nofail (const char *file, void *handle, char *symbol);
-+#ifdef HAVE_NIS
- static int process_yp_line (int instatus, char *inkey, int inkeylen,
- 			    char *inval, int invallen, char *indata);
- static void load_libnsl (void);
-+#endif
- static flag do_servicing (int fd, unsigned long event_mask);
- static void service_name (const struct devfsd_notify_struct *info);
- static void action_permissions (const struct devfsd_notify_struct *info,
-@@ -486,9 +490,11 @@
-     {"fd/2", "stderr"},
-     {NULL, NULL},
- };
-+#ifdef HAVE_NIS
- static int (*my_yp_all) (char *domain, char *map,
- 			 struct ypall_callback *callback); /* = NULL */
- static int (*my_yp_get_default_domain) (char **domainptr); /* = NULL */
-+#endif
- static struct event_type
- {
-     unsigned int type;        /*  The DEVFSD_NOTIFY_* value                  */
-@@ -714,6 +720,7 @@
-     [RETURNS] Nothing.
- */
- {
-+#ifdef HAVE_NIS
-     if (location[0] == '+')
-     {
- 	/*  It's a YP map  */
-@@ -736,6 +743,7 @@
- 	SYSLOG (LOG_ERR, "error reading map: \"%s\"\n", location + 1);
- 	exit (1);
-     }
-+#endif
-     read_config_file (location, optional, event_mask);
- }   /*  End Function read_config   */
- 
-@@ -1006,6 +1014,7 @@
-     return (result);
- }   /*  End Function dlsym_nofail  */
- 
-+#ifdef HAVE_NIS
- static void load_libnsl (void)
- {
- #ifdef LIBNSL  /*  It comes from a shared object  */
-@@ -1034,6 +1043,7 @@
-     if (invallen > 0) process_config_line (inval, (unsigned long *) indata);
-     return (0);
- }   /*  End Function process_yp_line  */
-+#endif
- 
- static flag do_servicing (int fd, unsigned long event_mask)
- /*  [SUMMARY] Service devfs changes until a signal is received.
diff --git a/sys-fs/devfsd/files/devfsd-1.3.25-pic.patch b/sys-fs/devfsd/files/devfsd-1.3.25-pic.patch
deleted file mode 100644
index 67e325333c07..000000000000
--- a/sys-fs/devfsd/files/devfsd-1.3.25-pic.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- check_kernel.c.orig	2004-02-06 16:41:32.000000000 -0500
-+++ check_kernel.c	2004-02-06 16:41:55.000000000 -0500
-@@ -6,13 +6,8 @@
- 
- extern char *modules_devfs;
- 
--/* copied over from module-init-tools backward_compat.c */
--#ifndef __ia64 /* breaks ia64. */
--static _syscall2(long, create_module, const char *, name, size_t, size);
--#else
- #define create_module(name, size) \
-         syscall(__NR_create_module, (name), (size))
--#endif
- 
- /* returns true if we have a 2.5.48+ kernel */
- int check_kernel_version (int verbose)
diff --git a/sys-fs/devfsd/files/devfsd.conf b/sys-fs/devfsd/files/devfsd.conf
deleted file mode 100644
index e3b7ee473d86..000000000000
--- a/sys-fs/devfsd/files/devfsd.conf
+++ /dev/null
@@ -1,138 +0,0 @@
-# Sample /etc/devfsd.conf configuration file.
-# Richard Gooch  <rgooch@atnf.csiro.au>		17-FEB-2002
-#
-# The Gentoo Linux Team - http://www.gentoo.org/
-#     - Many fixes, etc
-#
-
-# Enable full compatibility mode for old device names. You may comment these
-# out if you don't use the old device names. Make sure you know what you're
-# doing!
-REGISTER        .*           MKOLDCOMPAT
-UNREGISTER      .*           RMOLDCOMPAT
-
-# You may comment out the above and uncomment the following if you've
-# configured your system to use the original "new" devfs names or the really
-# new names
-#REGISTER       ^vc/.*       MKOLDCOMPAT
-#UNREGISTER     ^vc/.*       RMOLDCOMPAT
-#REGISTER       ^pty/.*      MKOLDCOMPAT
-#UNREGISTER     ^pty/.*      RMOLDCOMPAT
-#REGISTER       ^misc        MKOLDCOMPAT
-#UNREGISTER     ^misc        RMOLDCOMPAT
-
-# You may comment these out if you don't use the original "new" names
-REGISTER        .*           MKNEWCOMPAT
-UNREGISTER      .*           RMNEWCOMPAT
-
-# Enable module autoloading. You may comment this out if you don't use
-# autoloading
-LOOKUP          .*           MODLOAD
-
-# Uncomment the following if you want to set the group to "tty" for the
-# pseudo-tty devices. This is necessary so that mesg(1) can later be used to
-# enable/disable talk requests and wall(1) messages.
-REGISTER        ^pty/s.*     PERMISSIONS -1.tty  0600
-REGISTER        ^pts/.*      PERMISSIONS -1.tty  0600
-
-# Uncomment this if you want permissions to be saved and restored
-# NB: Do NOT change the following!
-# Do not do this for pseudo-terminal devices
-REGISTER        ^pt[sy]/.*   IGNORE
-CHANGE          ^pt[sy]/.*   IGNORE
-CREATE          ^pt[sy]/.*   IGNORE
-DELETE          ^pt[sy]      IGNORE
-REGISTER        ^log         IGNORE
-CHANGE          ^log         IGNORE
-CREATE          ^log         IGNORE
-DELETE          ^log         IGNORE
-REGISTER        .*           COPY    /lib/dev-state/$devname $devpath
-CHANGE          .*           COPY    $devpath /lib/dev-state/$devname
-CREATE          .*           COPY    $devpath /lib/dev-state/$devname
-DELETE          .*           CFUNCTION GLOBAL unlink /lib/dev-state/$devname
-RESTORE         /lib/dev-state
-
-# You can force default like this :
-# PERMISSIONS owner_and_group access_mode
-
-# ALSA/OSS stuff
-# Comment/change these if you want to change the permissions on
-# the audio devices
-LOOKUP          snd          MODLOAD ACTION snd
-LOOKUP          dsp          MODLOAD
-LOOKUP          mixer        MODLOAD
-LOOKUP          midi         MODLOAD
-REGISTER        sound/.*     PERMISSIONS root.audio 660
-REGISTER        snd/.*       PERMISSIONS root.audio 660
-
-# Uncomment this to let PAM manage devfs
-#REGISTER        .*           CFUNCTION /lib/security/pam_console_apply_devfsd.so pam_console_apply_single $devpath
-
-# Autoload the sg module if generic scsi driver compiled as module.
-#LOOKUP          ^sg$      MODLOAD ACTION sg
-
-# Give the cdrom group access to /dev/sg0
-REGISTER        ^scsi/host.*/bus.*/target.*/lun.*/generic    PERMISSIONS root.cdrom 660
-
-# Give the cdrom group access to the cdrom devices
-REGISTER        ^scsi/host.*/bus.*/target.*/lun.*/cd    PERMISSIONS root.cdrom 660
-REGISTER        ^ide/host.*/bus.*/target.*/lun.*/cd    PERMISSIONS root.cdrom 660
-
-# Give the floppy group access to the floppy devices
-REGISTER        ^floppy/.*    PERMISSIONS root.floppy 660
-
-# Give the usb group access to the usb devices
-REGISTER        ^usb/.*    PERMISSIONS root.usb 660
-REGISTER        ^tts/USB.*    PERMISSIONS root.usb 660
-REGISTER        ^usb/tts/(.*)$  CFUNCTION GLOBAL mksymlink $devname ttyUSB\1
-UNREGISTER      ^usb/tts/(.*)$  CFUNCTION GLOBAL unlink ttyUSB\1 
-
-# Video devices
-REGISTER        ^v4l/.*    PERMISSIONS root.video 660
-REGISTER        ^dri/.*    PERMISSIONS root.video 660
-REGISTER        ^nvidia.*    PERMISSIONS root.video 660
-
-# General note for the following auto creation of symlinks:
-#
-#    If you change the device that the symlink points to,
-#    you should also remove the symlink before restarting
-#    devfsd
-
-# Create /dev/cdrom for the first cdrom drive
-LOOKUP          ^cdrom$          CFUNCTION GLOBAL mksymlink cdroms/cdrom0 cdrom
-REGISTER        ^cdroms/cdrom0$   CFUNCTION GLOBAL mksymlink $devname cdrom
-UNREGISTER      ^cdroms/cdrom0$   CFUNCTION GLOBAL unlink cdrom
-
-# Create /dev/dvd for the second cdrom drive
-# (change 'cdroms/cdrom1' to suite your setup)
-# NOTE: We add the fully qualified path here, else some apps
-#       have problems to resolve the true device (drip comes to mind)
-#LOOKUP          ^dvd$           CFUNCTION GLOBAL mksymlink ${mntpnt}/cdroms/cdrom1 dvd
-#REGISTER        ^cdroms/cdrom1$  CFUNCTION GLOBAL mksymlink ${devpath} dvd
-#UNREGISTER      ^cdroms/cdrom1$  CFUNCTION GLOBAL unlink dvd
-
-# Create /dev/cdrw for the first cdrom on the scsi bus
-# (change 'sr0' to suite your setup)
-#LOOKUP          ^cdrw$          CFUNCTION GLOBAL mksymlink sr0 cdrw
-#REGISTER        ^sr0$           CFUNCTION GLOBAL mksymlink $devname cdrw
-#UNREGISTER      ^sr0$           CFUNCTION GLOBAL unlink cdrw
-
-# Create /dev/mouse
-LOOKUP          ^mouse$          CFUNCTION GLOBAL mksymlink misc/psaux mouse
-REGISTER        ^misc/psaux$     CFUNCTION GLOBAL mksymlink $devname mouse
-UNREGISTER      ^misc/psaux$     CFUNCTION GLOBAL unlink mouse
-
-# Manage USB mouse
-REGISTER        ^input/mouse0$   CFUNCTION GLOBAL mksymlink $devname usbmouse
-UNREGISTER      ^input/mouse0$   CFUNCTION GLOBAL unlink usbmouse
-REGISTER        ^input/mice$     CFUNCTION GLOBAL mksymlink $devname usbmouse
-UNREGISTER      ^input/mice$     CFUNCTION GLOBAL unlink usbmouse
-
-# Create compatibility link for broken misc/net/tun driver
-REGISTER        ^misc/net/tun$   CFUNCTION GLOBAL unlink net/tun
-REGISTER        ^misc/net/tun$   CFUNCTION GLOBAL symlink /dev/$devname net/tun
-
-# Support additional config installed by packages ...
-INCLUDE /etc/devfs.d
-
-# devfsd.conf ends here
diff --git a/sys-fs/devfsd/metadata.xml b/sys-fs/devfsd/metadata.xml
deleted file mode 100644
index 56c124413057..000000000000
--- a/sys-fs/devfsd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index 8d49a542328b..a021735267e6 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1,6 +1,3 @@
-AUX dosfstools-4.0-udevlibs.patch 1132 BLAKE2B f6d5d052a56a8d997e12cf293bfa7e482b728aa98e8135aa14d34367f045b3c494a0ff1b3ce0242f5645c99e885e8fd66eb76f46eb6ba589d2eebd69ec8f439a SHA512 0ae6fac866f4f634ed733279859c039f789d8420401217c039c06c995cd0be1fc697b24353135ee5c7abf04e4638c810726f0a310979251dd126e70c76739928
-DIST dosfstools-4.0.tar.xz 157564 BLAKE2B 13dd374eb6824b2c5d5ae849dd802a4bb1b85729f4654e3d23ee8c3698a72a45a73e1a7d7cb95ae7cba13ea9737e80e253eb4603b342e49743a8402d7f7ceeba SHA512 81acf54dc87e1a8b436848b0c8c596c8b9a2f334c5b3e5496547feb243b70ef320a621a9b5afaa8b054f45a5c2184fae9ae167019f2f83aba417a10954a23a58
 DIST dosfstools-4.1.tar.xz 172936 BLAKE2B d8ef617d9dbdc21318c4f43e2fd6dca1d3452ab46253b055d8fef09aa693bcf63ef58076a49f305bb21de87298bae5be6b626065dfcbd90935af68709e2c3c6a SHA512 e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78
-EBUILD dosfstools-4.0-r1.ebuild 1117 BLAKE2B a973db2963f44141e73cd3fe8e680ae4ec10564bf3eb2397254d5070a7ad395a4905484d1d61bdc91c89464c02bcb494efa9195cb76608966966101e013a8816 SHA512 f00d35306a1a95d7b3b23fb8e23f5587e16cb8f4e02244f53fc4ddda3b07a704727a7d463bda724015f1e08273102f2aa1f165e4b9bf5be468bc7f9363fda597
-EBUILD dosfstools-4.1.ebuild 994 BLAKE2B 8203419c4de24b235d76e59853cd494948bae42e9a2de715865c1d66040b06387c0f5a84c110ad097692ba748f8c37f0910515baafa5ffe6cd762becd1bec22c SHA512 a5ec100924c99ab2b9af1e10e1c20f5f37a0105e97e674c630c14b35ee01f2cc9e916b653f98dbd9179f0c64709467dc9fcaad1f2621a37a60f5e03867ec2650
+EBUILD dosfstools-4.1.ebuild 993 BLAKE2B 8737bd209b6caf6586a430f84a39a060478a8dfcf079121745a16e0a6901829813e6efd55a0e14a1cc48bec986839fb05dab37d844660dcae2bb16bb3d137348 SHA512 7067f3e6ac9d39dcdbf394abdd2a49f97377d2b17e7e60ef37e34edd0bc2b082bf105119ea0fd566bf2146e0f2900e670ba402864dc05517238d6e8b25c38ff9
 MISC metadata.xml 424 BLAKE2B 01d65645ef9a1e617bf40a2d401a5fd3f1444c68f41a3c64e746e445b100ebd7c8af05b48c250f4bd9c679842906dd2e9b679edc298b1001f7dfe5b183f5f77a SHA512 d82795b70fc583b8154a2c3b14b6565cff36924b91fb3888cd2b6c36d8036614be6d67a0ea0fc96f2fa4bfa5516675b8aa74571e578ad8d42c06cb9f503c565d
diff --git a/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild b/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild
deleted file mode 100644
index e7201e863037..000000000000
--- a/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools toolchain-funcs flag-o-matic
-
-DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
-HOMEPAGE="https://github.com/dosfstools/dosfstools"
-SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="compat +udev"
-
-CDEPEND="udev? ( virtual/libudev )"
-DEPEND="${CDEPEND}
-	udev? ( virtual/pkgconfig )"
-RDEPEND="${CDEPEND}"
-
-RESTRICT="test" # there is no test target #239071
-
-PATCHES=(
-	"${FILESDIR}/${P}-udevlibs.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable compat compat-symlinks) \
-		$(use_with udev)
-}
-
-src_install() {
-	default
-	if ! use compat; then
-		# Keep fsck -t vfat and mkfs -t vfat working, bug 584980.
-		dosym fsck.fat /usr/sbin/fsck.vfat
-		dosym mkfs.fat /usr/sbin/mkfs.vfat
-	fi
-}
diff --git a/sys-fs/dosfstools/dosfstools-4.1.ebuild b/sys-fs/dosfstools/dosfstools-4.1.ebuild
index 5ad335273a1f..a245d461ea34 100644
--- a/sys-fs/dosfstools/dosfstools-4.1.ebuild
+++ b/sys-fs/dosfstools/dosfstools-4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="compat test +udev"
 
 CDEPEND="udev? ( virtual/libudev )"
diff --git a/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch b/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch
deleted file mode 100644
index 23204770f770..000000000000
--- a/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7538785afd751de509cd00740adf57fc6d730e33 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 10 May 2016 09:47:57 +0200
-Subject: [PATCH] Don't link to udev via LDFLAGS. There's LDADD for such a
- task.
-
-See also:
-https://www.gnu.org/software/automake/manual/html_node/Linking.html
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 3d22ba7..a15e6e7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -34,12 +34,12 @@ mkfs_common_sources = device_info.c device_info.h \
- mkfs_fat_SOURCES  = mkfs.fat.c msdos_fs.h $(mkfs_common_sources)
- mkfs_fat_CPPFLAGS = -I$(srcdir)/blkdev
- mkfs_fat_CFLAGS   = $(AM_CFLAGS) $(UDEV_CFLAGS)
--mkfs_fat_LDFLAGS  = $(UDEV_LIBS)
-+mkfs_fat_LDADD    = $(UDEV_LIBS)
- 
- testdevinfo_SOURCES  = testdevinfo.c $(mkfs_common_sources)
- testdevinfo_CPPFLAGS = -I$(srcdir)/blkdev
- testdevinfo_CFLAGS   = $(AM_CFLAGS) $(UDEV_CFLAGS)
--testdevinfo_LDFLAGS  = $(UDEV_LIBS)
-+testdevinfo_LDADD    = $(UDEV_LIBS)
- 
- 
- if COMPAT_SYMLINKS
--- 
-2.8.2
-
diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest
index fb21511b3218..3069b0030472 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -1,3 +1,5 @@
+DIST duperemove-0.11.1.tar.gz 115740 BLAKE2B 7804f1c98cdeb349ae12425636575c9b2468613dfe908d8c9f1d9fb74aefb412142002a0fc899b8448ed1b255257569555264b9d9c172899f856a919d02dd1a8 SHA512 3c344b00b8fb58a259840aea977ba2e5123b651bb58ec84177bdfd8337a377361984b85c6325271b7d3e4ea216017fa6fda793136c83e9837a13ec041df326b9
 DIST duperemove-0.11.tar.gz 115307 BLAKE2B 39fa9f80c017583c8943a5cddd1c69f38216adad26548c248e1877548717995d7b80f03f0e1c1515648aaad90996c80c224bb36fa27f13fe14fb22a123facf48 SHA512 b1bc2beb92223f9b46f8838e2f983ec763a9dff302f4202a34cc5e10591b985519f0464b6eba566c56872e671ba80583c7fdf4a232325086141d011384a286cf
+EBUILD duperemove-0.11.1.ebuild 618 BLAKE2B 535e716bb9e65ec80e6885bbfd682f3a221a9d774eebb32f87d4aa7263ba8ac62809d7c3d19053cec5cbd034c518aaaf83c77b593b3211287a50a4b2bd58b440 SHA512 edb4c12573dad9add1adcd15ba1757ca3872da08bfa31298359f59bc630848873bdc7af634656b01778befc30d15c371ae4c0bbb842d0af57b5bb919c79aa5dc
 EBUILD duperemove-0.11.ebuild 718 BLAKE2B 86957fdec43344c42f89ec0e9090cf14186143579a313c29d6afa19720dc6d886740f561c83ec12f05f06429cfe56a7dea56cde7a3edba26b830201c99360189 SHA512 ed8056e44214443449ccf1381e599e1d62b21dc8958464840564692a99ef5a800c76b442752b9c394e71bf44c9368176110cb5b693cd5e486f6c7b84bbf53693
 MISC metadata.xml 475 BLAKE2B 53dbd2deecde55b464cd06ba45fdc917e4a1b17232cb312400192be505a0ff870be87503857c513bfeaccf4c256748ad91af42d3e7a1cd1268f3e1c01ad9d86f SHA512 dc74d3d2be21f9cc6ac03cd6812d6e90bccd26bdcaf0a4e22f16ec7bae30e8cd252ac4b191aee2d4d94d45401ac680b9ee9ce8c7adad7a92afac908c9ab24de1
diff --git a/sys-fs/duperemove/duperemove-0.11.1.ebuild b/sys-fs/duperemove/duperemove-0.11.1.ebuild
new file mode 100644
index 000000000000..995cb2060b38
--- /dev/null
+++ b/sys-fs/duperemove/duperemove-0.11.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Btrfs deduplication utility"
+HOMEPAGE="https://github.com/markfasheh/duperemove"
+SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV/_/.}.tar.gz -> ${P/_/.}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/glib:2"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P/_/.}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index b89763ce9843..0332a20f31a8 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -2,17 +2,16 @@ AUX e2fsck.conf 138 BLAKE2B b97a754b6aebf1f7fcd4001b720eead61d183eaf5a2c9eb86e83
 AUX e2fsprogs-1.40-fbsd.patch 352 BLAKE2B efef09c11bdf6ebeb89819dfefec241919afa17ddee65610332bcd3edbacad4fa501def1d224de39fd6a9979a35e63699b0a2d5e9a2242517122339b68edf6af SHA512 86374e641f958d7c4b53eb44abf7933af064b55a38fef6ca26f848bb63f0c6bf2966852c7cf0770337aef95ff965de95ef282205771e86be36e7ad74e8f81146
 AUX e2fsprogs-1.41.8-makefile.patch 317 BLAKE2B 89f393fd0b09e853158707aa6ec7f803c8938138666459df6a2bbc1cc5e86ac107db67b40ffbd7b12694de8eb22863b6c910b6e192f42e07939c0206b248e627 SHA512 dbd738affe910d3812ca4d969a6d4295b09abc413cab23f29dcbd0c1e82eefa095a61a377c494dd9b7e1d189d4edadc469dbf2d1a1068c11dd5fc8311bd83f8f
 AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68dda5cc9defb5e2bc54e0061778e5bea4886820829605cb092bb40a7f65cd0626d8ffe689bd1c8aad7d29f7c67e5166dd578925ddb SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507
+AUX e2fsprogs-1.44.4-fix_make_install_for_subset.patch 2168 BLAKE2B 041a3ce097186d8cbad480157c2bcf686d83218cf90bf7dc419e6f709e1557955b26dfc18a30586644497364289f3266626efcb2e7765d8d53fd639ff0a9785a SHA512 f6fa19fbe5dc1ed9adae421bd371d4cad7f52b250eedad1c47883a00ac6aa7061530df3d5928d0f4cfbcd2af0d9c457c4ab1fa460c9e43df323d1db052934724
 AUX fsck_ext2fs.8 3802 BLAKE2B 379ef7974e29c654e4a69caa64c3703eecf375d63557915bdbfe23c8c0ca67cc9a13792988ba8c0b18bb4ae0819d220102f034499200fd20951e004d34273311 SHA512 639af16c7881bdfca55a9cd39623d3eeb9ae0ca93f8e65321c69ab1b2591cb17cdd0cfc21d27c20b8cc65bd295cccf23e47f740fffb91f4cf17e32959bb166d0
 AUX fsck_ext2fs.c 2793 BLAKE2B 65294fc9026bdb859a58d010f885fdbee2db4372a81b82ffa0722a0a3163885561bf06f0fdb73b4cf8c9cfc5bd0dc0c6ee0a7fb340a2416ce34555eff22f71a4 SHA512 1cac2963c0e85dd6a111bfe2a00f2b4f65c17a05bf0039cec073d4109ad4b0efee8905cff1a25098e0693f367db300054d92598a85dfbe8e5db7ff6419534af6
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
 DIST e2fsprogs-1.43.6.tar.gz 7466907 BLAKE2B 6c19c686432b7990900b239c4a1b3b6675b085ca7adfdb4323d1253ee8c83f22f87f67b0b4a843e48cb71322b1a7454b3ceab669f875b71b967e96054a55f1ac SHA512 95e3e7def177de921d3204aeace4cb8243d79872468d3289cace0547798c84e92af253022deb803cd8c045411283b01431728a86b14b9e8b45cdd5dca739db66
 DIST e2fsprogs-1.43.9.tar.gz 7470878 BLAKE2B dcc1a6fda87884a0b3b1d49f4116be060bf39c4820246ba6aa7ce61c6735415542f852b36d3c809b2b52782de2ca9ea9a87086a0d4ff71ee217845939aae00f1 SHA512 7bdc5da165b14e6779aedd9243175018ca8cb2bb0f5aad9c3d04f7e0619da2107f37929e6d8027b682145801106f97d1376345c4c30ce64f2b02b716b0c4ba3b
-DIST e2fsprogs-1.44.2.tar.gz 7562398 BLAKE2B a828cb9f5f3ee1579a2c5b29ef0eaf0e5696e2bf27a639cf1bf27b8d334bbbd1d142588e53e359934338f2ec95d06343a42b7c2fbd44dd6e01b348958aae3189 SHA512 d416e14a69f3e2e4ea2f4563764c422cc63400bcd514ddb12ebda6456ef04cff523da215664ede1329183acc22246111016e1abd92ff604a23e015e066dd379a
-DIST e2fsprogs-1.44.3.tar.gz 7570472 BLAKE2B be713a388e3de73c0f21c85ababcf0a63aa654c988106bd38b21db6d4566915afb201ce1a3c6d55c9a300880e2b39b1702e8463c478bad51749482f379e4d844 SHA512 6203a24e5149de5b6d44cc158f9ed1d87c3083a2b41c5249ceb09fb3cdf795ab3839d7d8ce73d4b0e11d4c505b961ff8cbf0de45b9aab0a03d504750fc7da885
 DIST e2fsprogs-1.44.4.tar.xz 5363496 BLAKE2B 8c7216bd63dbba0660c7383d6ed068be0a7016b50235d22f855283bb57d3355a3ea5bfa47294b71b67fcc5d4af28219abeb9cf4a6429595a43680d3d787bdf1a SHA512 52e39565dee30997b9c245b5d8791844067a903a570082f3a5ff9d9ef96624535322617bb21029056c88259fef46416eb1181bd7aec419e64fc021830887ec8f
+DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024edf098205012446677c76ed206f18e71a0f241527ac33ee35eebdfa8fe87a81dde5228694186fc4e1e55e5b7bc87862 SHA512 c0faec90b2be81460d374c150be917cd6beb1d10dc7cd0c6c4747de19de9af1763e90d48aec5b3c0fbff1b59bf79a35f93536cd52e68d1e45d4db610e158bb2e
 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.2.ebuild 3816 BLAKE2B 9ee2fc47f8df9398b3eb53230ec49d48e92d3c9a76bdff5a84cc0680ad807276f054af8a2d18e123ed5939ce6fb6c82a2d67968748576c74a12c86f9bacabbbd SHA512 a953470afe52b7dc3ec3c49f8baf329aa48e81402ead32b9c2ddba997c536f4b3453f7e983866ef9147702f873402b69267ccb93d04a7c1add20a63c86c74353
-EBUILD e2fsprogs-1.44.3.ebuild 3809 BLAKE2B 60c64418b2dd15a46d54c194e165fa415e519e48e2cf11b9d4f5eaec50238203285e577af6d2e44ea9388ca89314f4e725ca3d142f7f10bdfd14181da9c56db8 SHA512 f6fed38e7b06f60480dc10c7df6184c9c72ac66f923ade50e06e1ac3e8ad45514124904121ae49a095b8c87a2da316dd59127e0f081ec158c95ffacfa9369f0c
 EBUILD e2fsprogs-1.44.4.ebuild 3857 BLAKE2B 3e9e55635efdb8a463a760bb0eac8c602b3d474e936d8b8aee6c56a950d33a14d30bb3f47b1ef1ef9762ff1db019a9495e7d970f72ccde2dda89c9429ad9f3af SHA512 a7f0441b1cd0fbb2f3c0a06b9b4ea831c97eaa36516bf5b205d65e7212d6e1b0312c64b89d2f72076bc580a5cfe9775bb0b237e6b76bc6de5d54de03ecae8fe1
+EBUILD e2fsprogs-1.44.5.ebuild 3927 BLAKE2B 89d43844efe30e0e2f5183594ac090850e8f8d86a466df42aaaff18c6040b92d37262d768886924732312aca4dcc5db88c0444c313d5938cb28f6f0bfc4d4187 SHA512 f31bd5974018803163698ed4e08886b7a4f3686f497b24e1c8d966ca5b67a97e449f61143acdda09844aac8bc7f2d882f4c5de4ffa623ce4d623351dfc6a694f
 MISC metadata.xml 520 BLAKE2B 3e908938de1132b5cde97c6b51b40f72c03e91301b54c14339379d2e2380414dd33096a87d64ff2fc7d886cd65fb16b9c16a376b7338c826f44917860f380be2 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.2.ebuild
deleted file mode 100644
index 0b2c33912d9a..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.44.2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*)      UP_PV=${PV} ;;
-esac
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
-	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz
-	elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.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"
-IUSE="fuse nls static-libs elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-	>=sys-apps/util-linux-2.16
-	fuse? ( sys-fs/fuse:0 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	sys-apps/texinfo"
-
-S="${WORKDIR}/${P%_pre*}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.41.8-makefile.patch
-	"${FILESDIR}"/${PN}-1.40-fbsd.patch
-	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-
-	# Upstream patches (can usually removed with next version bump)
-)
-
-src_prepare() {
-	if [[ ${CHOST} == *-mint* ]] ; then
-		PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
-	fi
-
-	default
-
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
-		-e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-		Makefile.in || die "remove subdirs"
-	ln -s $(which mk_cmds) lib/ss/ || die
-
-	# Avoid rebuild
-	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
-}
-
-src_configure() {
-	# Keep the package from doing silly things #261411
-	export VARTEXFONTS="${T}/fonts"
-
-	# needs open64() prototypes and friends
-	append-cppflags -D_GNU_SOURCE
-
-	local myeconfargs=(
-		--with-root-prefix="${EPREFIX}/"
-		--enable-symlink-install
-		$(tc-is-static-only || echo --enable-elf-shlibs)
-		$(tc-has-tls || echo --disable-tls)
-		--without-included-gettext
-		$(use_enable fuse fuse2fs)
-		$(use_enable nls)
-		--disable-libblkid
-		--disable-libuuid
-		--disable-fsck
-		--disable-uuidd
-	)
-	ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
-	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
-		die "Preventing included intl cruft from building"
-	fi
-}
-
-src_compile() {
-	emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
-
-	# Build the FreeBSD helper
-	if use elibc_FreeBSD ; then
-		cp "${FILESDIR}"/fsck_ext2fs.c .
-		emake V=1 fsck_ext2fs
-	fi
-}
-
-src_install() {
-	# need to set root_libdir= manually as any --libdir options in the
-	# econf above (i.e. multilib) will screw up the default #276465
-	emake \
-		STRIP=: \
-		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install install-libs
-	dodoc README RELEASE-NOTES
-
-	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	gen_usr_ldscript -a e2p ext2fs
-	# configure doesn't have an option to disable static libs :/
-	if ! use static-libs ; then
-		find "${D}" -name '*.a' -delete || die
-	fi
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs
-		doman "${FILESDIR}"/fsck_ext2fs.8
-
-		# filefrag is linux only
-		rm \
-			"${ED%/}"/usr/sbin/filefrag \
-			"${ED%/}"/usr/share/man/man8/filefrag.8 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild
index 793a8dc1ea16..1c0a1c872675 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.44.3.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild
@@ -1,19 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*)      UP_PV=${PV} ;;
-esac
+EAPI="6"
 
 inherit flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
-	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz
+SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
+	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
 	elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
 
 LICENSE="GPL-2 BSD"
@@ -30,8 +25,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-apps/texinfo"
 
-S="${WORKDIR}/${P%_pre*}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.41.8-makefile.patch
 	"${FILESDIR}"/${PN}-1.40-fbsd.patch
@@ -47,8 +40,15 @@ src_prepare() {
 
 	default
 
+	eapply -R "${FILESDIR}"/${PN}-1.44.4-fix_make_install_for_subset.patch
+
+	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
+
+	# Get rid of doc -- we don't use them. This also prevents a sandbox
+	# violation due to mktexfmt invocation
+	rm -r doc || die "Failed to remove doc dir"
+
 	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
 	sed -i -r \
 		-e 's:@LIBINTL@:@LTLIBINTL@:' \
 		-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
@@ -71,9 +71,9 @@ src_configure() {
 	append-cppflags -D_GNU_SOURCE
 
 	local myeconfargs=(
-		--with-root-prefix="${EPREFIX}/"
+		--with-root-prefix="${EPREFIX%/}/"
 		--enable-symlink-install
-		$(tc-is-static-only || echo --enable-elf-shlibs)
+		--enable-elf-shlibs
 		$(tc-has-tls || echo --disable-tls)
 		--without-included-gettext
 		$(use_enable fuse fuse2fs)
@@ -84,6 +84,7 @@ src_configure() {
 		--disable-uuidd
 	)
 	ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
+
 	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
 		eerror "INTL sanity check failed, aborting build."
 		eerror "Please post your ${S}/config.log file as an"
@@ -107,10 +108,11 @@ src_install() {
 	# econf above (i.e. multilib) will screw up the default #276465
 	emake \
 		STRIP=: \
-		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
+		root_libdir="${EPREFIX%/}/usr/$(get_libdir)" \
+		DESTDIR="${D%/}" \
 		install install-libs
-	dodoc README RELEASE-NOTES
+
+	einstalldocs
 
 	insinto /etc
 	doins "${FILESDIR}"/e2fsck.conf
@@ -118,6 +120,7 @@ src_install() {
 	# Move shared libraries to /lib/, install static libraries to
 	# /usr/lib/, and install linker scripts to /usr/lib/.
 	gen_usr_ldscript -a e2p ext2fs
+
 	# configure doesn't have an option to disable static libs :/
 	if ! use static-libs ; then
 		find "${D}" -name '*.a' -delete || die
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.44.4-fix_make_install_for_subset.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.44.4-fix_make_install_for_subset.patch
new file mode 100644
index 000000000000..222366f6c015
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.44.4-fix_make_install_for_subset.patch
@@ -0,0 +1,59 @@
+From ed07fd93056a2d2c03affe3255d3d5747deaab21 Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Wed, 22 Aug 2018 13:42:23 -0400
+Subject: Fix "make install" for configure --enable-subset
+
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+---
+ Makefile.in | 24 ++++++++++++++----------
+ 1 file changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 745e8590..80ab2994 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -42,7 +42,7 @@ subs: $(DEP_SUBSTITUTE)
+ 
+ progs: all-progs-recursive
+ libs: all-libs-recursive
+-all-progs-recursive all-libs-recursive: subs
++all-progs-recursive all-libs-recursive:: subs
+ 
+ rpm:
+ 	sh contrib/build-rpm
+@@ -91,19 +91,23 @@ TAGS clean-recursive distclean-recursive depend-recursive fullcheck-recursive \
+ 	done
+ 
+ all-progs-recursive install-progs-recursive install-strip-progs-recursive \
+-  uninstall-progs-recursive coverage.txt-progs-recursive: all-libs-recursive
+-	@for subdir in $(PROG_SUBDIRS); do \
+-	  if test -d $$subdir ; then \
+-	    target=`echo $@|$(SED) 's/-progs-recursive//'`; \
+-	    echo making $$target in $$subdir; \
+-	    (cd $$subdir && $(MAKE) $$target) || exit 1; \
+-	  fi ; \
+-	done
++  uninstall-progs-recursive coverage.txt-progs-recursive:: all-libs-recursive
++
++
++@ALL_CMT@all-progs-recursive install-progs-recursive install-strip-progs-recursive \
++@ALL_CMT@  uninstall-progs-recursive coverage.txt-progs-recursive:: all-libs-recursive
++@ALL_CMT@	@for subdir in $(PROG_SUBDIRS); do \
++@ALL_CMT@	  if test -d $$subdir ; then \
++@ALL_CMT@	    target=`echo $@|$(SED) 's/-progs-recursive//'`; \
++@ALL_CMT@	    echo making $$target in $$subdir; \
++@ALL_CMT@	    (cd $$subdir && $(MAKE) $$target) || exit 1; \
++@ALL_CMT@	  fi ; \
++@ALL_CMT@	done
+ 
+ all-libs-recursive install-libs-recursive install-strip-libs-recursive \
+   uninstall-libs-recursive install-shlibs-libs-recursive \
+   install-shlibs-strip-libs-recursive uninstall-shlibs-libs-recursive \
+-  coverage.txt-libs-recursive:
++  coverage.txt-libs-recursive::
+ 	@for subdir in $(LIB_SUBDIRS); do \
+ 	  if test -d $$subdir ; then \
+ 	    target=`echo $@|$(SED) 's/-libs-recursive//'`; \
+-- 
+cgit 1.2-0.3.lf.el7
+
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index a33d962a5afa..d305ebb2a199 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,3 +1,4 @@
 DIST ecryptfs-utils_108.orig.tar.gz 659465 BLAKE2B a4497470e1aeb3122da1c612a4bb9a32bbae960fad165b5d30543ccaf5682d877927b881956e109c2910eb46e456470ffc0f8fc1f3766f6767741d28d05dc802 SHA512 856d8fac587921f1b5cd0b4ff269c7db8941b6b183506c5bc2e640a77994293f3e09ecfaef94f12c00f2378e756ecec252d3f59eebbabb4229105f8be87653ba
 EBUILD ecryptfs-utils-108-r1.ebuild 1993 BLAKE2B e7ea0bc62ed23edce0712e788ca0f7946e83ba627c0129caf0beca7421437834ef7da24f163175c9ba090d69344ee01e0d0f66ffab87a4abb10308dbc1f498d0 SHA512 97a3e55a90b6853f50f91abdf7c74fc044109d5cf1901a6e37445c4fab9cede404f7eb52e24830e8a023f468312992f8dc1a02b6a1410eb200acfa6c0d19db48
+EBUILD ecryptfs-utils-108-r2.ebuild 2026 BLAKE2B ba2261645849b3dd993473e1cc6d3b0d5e4b8f3cf65d805c1591e0fc17cc91709c54d925f6318ee436a3ab010f3f88f83c3b79faaa60e77670f6f888a24d6735 SHA512 fb8ede2b2b95219963de607af73d07146e2004960822c1e23344d046d61a77c6e3d1aa09c57761e7587d7935505b5ac04b86b3033016022de1b6e82750c8aad4
 MISC metadata.xml 727 BLAKE2B f84dadf31a97d3f4e30ba3ede03ace3ed2a327c94b8a30e25dd1e391c197a231924361d2c31fec85bd893e64540925d6ca943fde1c26b95d9db077a7615b768b SHA512 87eaf8fc34e2f5ca0a2c60aa0d051901f6353e65eb6f63e29e26594588c69dd5f14039a6153bd5bc295a06674d8bb625fa43ccfd7f334188d8333f307405ab5a
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-108-r2.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-108-r2.ebuild
new file mode 100644
index 000000000000..8ffcfa24ccca
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-108-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic pam python-single-r1 linux-info autotools
+
+DESCRIPTION="eCryptfs userspace utilities"
+HOMEPAGE="https://launchpad.net/ecryptfs"
+SRC_URI="https://launchpad.net/ecryptfs/trunk/${PV}/+download/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc gpg gtk nls openssl pam pkcs11 python suid tpm"
+
+RDEPEND=">=sys-apps/keyutils-1.0
+	>=dev-libs/libgcrypt-1.2.0:0
+	dev-libs/nss
+	gpg? ( app-crypt/gpgme )
+	gtk? ( x11-libs/gtk+:2 )
+	openssl? ( >=dev-libs/openssl-0.9.7:= )
+	pam? ( sys-libs/pam )
+	pkcs11? (
+		>=dev-libs/openssl-0.9.7:=
+		>=dev-libs/pkcs11-helper-1.04
+	)
+	python? ( ${PYTHON_DEPS} )
+	tpm? ( app-crypt/trousers )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+	>=dev-util/intltool-0.41.0
+	python? ( dev-lang/swig )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+
+	CONFIG_CHECK="~ECRYPT_FS"
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	append-cppflags -D_FILE_OFFSET_BITS=64
+
+	econf \
+		--enable-nss \
+		--with-pamdir=$(getpam_mod_dir) \
+		$(use_enable doc docs) \
+		$(use_enable gpg) \
+		$(use_enable gtk gui) \
+		$(use_enable nls) \
+		$(use_enable openssl) \
+		$(use_enable pam) \
+		$(use_enable pkcs11 pkcs11-helper) \
+		$(use_enable python pywrap) \
+		$(use_enable tpm tspi)
+}
+
+src_install(){
+	emake DESTDIR="${D}" install
+
+	if use python; then
+		echo "ecryptfs-utils" > "${D}$(python_get_sitedir)/ecryptfs-utils.pth" || die
+	fi
+
+	use suid && fperms u+s /sbin/mount.ecryptfs_private
+
+	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
+}
+
+pkg_postinst() {
+	if use suid; then
+		ewarn
+		ewarn "You have chosen to install ${PN} with the binary setuid root. This"
+		ewarn "means that if there are any undetected vulnerabilities in the binary,"
+		ewarn "then local users may be able to gain root access on your machine."
+		ewarn
+	fi
+}
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index e7bedef8ed96..a5d611042822 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -4,7 +4,7 @@ AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a
 DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d18103a6568bcf82d0664a20f8e38b58b67a74798f9f0c10a5adc99a7524318055b79dc2e360aee684c2a2a5983a4 SHA512 f73efde0d2dafcf79be4ebe9f6e6abb44329ea4ae45ccc4d9662c1d5ca6f4d45c27ca0b3135d7fa85f305bf7c5825dc1000079eb93fe7179c36a229fe63e372c
 DIST eudev-3.2.7.tar.gz 1892931 BLAKE2B 9ae903d624e8fb1b334735527329e6074a194dd6e22073c54acc58010d0f8f2d29bdc42d3e6d72dd388c1012be273ca27626ffe1173382d7dde9ad3aee942cd0 SHA512 e6c8ec86ae434c967f6a568fa0b281229bb87be7e3fec025dc3e0225de7843ffaa5dd65bdeffefbc91e9e2911aa3de9df84c76148fe8863ff60fba4c88653c40
 EBUILD eudev-3.2.5.ebuild 7019 BLAKE2B 39a12a772b0f543cf6c76a988d3c485423da493a695200d6e18a38916e3c1ce0442979549191683c5aee04efa0bbcbbb32e15d1f92381cffe41658438496d634 SHA512 271017380e0713c76126a8a34d53b974cbf657da1b0e31a4fe869cddc6327c992f722acc5f08bf9cc1f49f9d053867a9978cc42b4d481db0021dc8c12715d7fa
-EBUILD eudev-3.2.7.ebuild 7021 BLAKE2B bfaed6b28a532857a680d0b9eb8643272d75cbf60f25ca3893e8cb06d219e2be03ac3cd8e7cbd41cbf508ff06fff9016bdc39fd4b5a00c00cd5d386530034129 SHA512 fa4168d2d8cb24121377ee9e8a2fee21a8a2b2c653d6ff30f530ff522839c4c7a2eb7234cb1a5e289e9bc928560c0787f8a40070d672ee97fcad9886b525d1f2
+EBUILD eudev-3.2.7-r1.ebuild 7089 BLAKE2B 8db47834c459c15cb14497a53ed5b5bca8dc388b8ec3b07a17d150ec45872f68a513e188b0075fb6d824a9d4c6532c9b85027a290aa024aff2bdf73933bfd1fd SHA512 7d835d5ac85a206c09d9b07cb7c5044b6f2cf70257dfef1c1e3fdab711356585e288e4804fb17008ee98dc97d992d895e820d569c37390f5d3f6b3d7bc125327
 EBUILD eudev-4.9999.ebuild 6314 BLAKE2B cb761cf1b967faf8d5ea170beafd0218a8be85d7f599107ee1977f77bae167d86840e7842da4bc6435a984df25470bd6fd10f263df1a326ec97f47799e38d6f5 SHA512 300f700e4ee4e117af85609d64847007b422b9a0ea7a75cb4cfb08882b4da38687d8a498cfdd36d4b1cd0f44e5eda773d24eb1085281fe302a30f978987dd0a2
-EBUILD eudev-9999.ebuild 7024 BLAKE2B 133a13098ed4b315f96c921d83032a1843d6b9e28d942bfe3aaf209c7795286590522501cd4113d5862d68860b8c63bfac71c1facc4f586779a910bed3010bd6 SHA512 5c0071d81018fe7c1fdca5e4ef4e0085752ad92eb1045f88cb01282a46c823a29884f2fae479a5445ff83836bec7c7af741abbb4bfa7eaf22cadcf2789938679
+EBUILD eudev-9999.ebuild 7089 BLAKE2B 8db47834c459c15cb14497a53ed5b5bca8dc388b8ec3b07a17d150ec45872f68a513e188b0075fb6d824a9d4c6532c9b85027a290aa024aff2bdf73933bfd1fd SHA512 7d835d5ac85a206c09d9b07cb7c5044b6f2cf70257dfef1c1e3fdab711356585e288e4804fb17008ee98dc97d992d895e820d569c37390f5d3f6b3d7bc125327
 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79
diff --git a/sys-fs/eudev/eudev-3.2.7.ebuild b/sys-fs/eudev/eudev-3.2.7-r1.ebuild
index 80465b29893e..63a4096b3f0d 100644
--- a/sys-fs/eudev/eudev-3.2.7.ebuild
+++ b/sys-fs/eudev/eudev-3.2.7-r1.ebuild
@@ -102,12 +102,14 @@ multilib_src_configure() {
 		DBUS_LIBS=' '
 		--with-rootprefix=
 		--with-rootrundir=/run
+		--exec-prefix="${EPREFIX}"
+		--bindir="${EPREFIX}"/bin
+		--includedir="${EPREFIX}"/usr/include
 		--libdir="${EPREFIX}"/usr/$(get_libdir)
 		--with-rootlibexecdir="${EPREFIX}"/lib/udev
 		--enable-split-usr
 		--enable-manpages
 		--disable-hwdb
-		--exec-prefix="${EPREFIX}"
 	)
 
 	# Only build libudev for non-native_abi, and only install it to libdir,
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 9cd4b44b46cc..63a4096b3f0d 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -102,12 +102,14 @@ multilib_src_configure() {
 		DBUS_LIBS=' '
 		--with-rootprefix=
 		--with-rootrundir=/run
+		--exec-prefix="${EPREFIX}"
+		--bindir="${EPREFIX}"/bin
+		--includedir="${EPREFIX}"/usr/include
 		--libdir="${EPREFIX}"/usr/$(get_libdir)
 		--with-rootlibexecdir="${EPREFIX}"/lib/udev
 		--enable-split-usr
 		--enable-manpages
 		--disable-hwdb
-		--exec-prefix="${EPREFIX}"
 	)
 
 	# Only build libudev for non-native_abi, and only install it to libdir,
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index 11d06e4fb5df..72d047b6f29e 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,9 +1,10 @@
 AUX f2fs-tools-1.10.0-fibmap-include-config_h.patch 401 BLAKE2B 83b0888b5892111165134b858e79bd7b68d3f1f2f66e67745b75e2ab5510f003969a60e8e8d148aba23c2e1b2167d184e20f8acdbbf5dd40cfacc773e9a4f1fc SHA512 d1ccb17c15267a42e64b1760410f1ff5ffeca8bc1545afacd7723e0a86ef7172df63dfbe85c9395f6c2d1b0651dc40bea991b9c30445badde4a1256fa58e6627
+AUX f2fs-tools-1.12.0-fsck.patch 1504 BLAKE2B 8e8cdda64e093faa17a1b9c8757c1013a49222b6d48306f5088f217c9e252b2bbca098bb77d34eeb9bb36fa37d7751c26c274625bc034506ed7b66d9ee353869 SHA512 ff4304561e03086094116e67d8e71d6f1388b89b203b7a852f3b02f31f892735ee96551e8fa3577babb1062eb3e50bff4b957085879ac59e94efaa0f2e4d4a95
 AUX f2fs-tools-1.6.1-sysmacros.patch 1555 BLAKE2B a7cf99912c969492ae6d7d6f2db6bda30caf2fa750530b52543d7b4f5d38acb349d87ac2ec839d86fc32afe172ff989450593e5ce55b3c3eea54f69a32c7e23e SHA512 10e3f473f21d00126fc570ad82f9f6218ed1fba7eb0fe24947c4e67186f82db09fa7563c10ccb74398652f41cda4753afa31d8140cdcb003ce0da0f71bc64415
 DIST f2fs-tools-1.10.0.tar.xz 342904 BLAKE2B ba4dec55e11959b2dd9461b1b02d173c7766908bfdbca9f6da7aa134b4a3b5cf2bda3c2e380b3fab46afdda0be9181ae5fe85ed9d085f816a1ff96e847e2a836 SHA512 e6e9fc10bd8051db86880c415ceb50900bf0cc919f1d9fe39026b5320de7c93cbcc1d817fab73130817042ed551fc5fd55ef9b589caeca9fca63fd3098f7a853
 DIST f2fs-tools-1.11.0.tar.gz 278795 BLAKE2B 8faefb1554283291ad2dc2b66800b88bbdcf07dcb1896a206fd56d52eaa19761c6b008a4961bcec12843a96d2df1744bb5394b4f7bf3830315f4bd3180850e8d SHA512 a69fbd01826909576634f40343293addae3a9c3be09bf8210e2abc1ae12f385fe24dd71c623d14a0a15a81d12f404f193981caaadacbd663bc1502de9a8f7fb7
-DIST f2fs-tools-1.6.1.tar.xz 282152 BLAKE2B f8535a5415e012834b749bba2123151d8a39c8fa757905c45be20478d6a795ff64dfbcf0cf9679f2bd70cb1d92717d8df70efb4beb4d749677a6c8758ebdde0e SHA512 108327042079d9e864899a20f2dd94019be1b957fd7ffa295af097c5b93a5065ea9c36de9bae83f84a6412ac496340849fc44de041e24461a2919073eed15cf2
+DIST f2fs-tools-1.12.0.tar.gz 286528 BLAKE2B ca2e17fa6c48905fc1905fdec865143a003260bd60f659cd9f6c427b371c39f4c869f7265dc198888adf7ef7d4d8ba7ed2a3733c52aab18277f5371cb2cb3be3 SHA512 3f1a914540f57f94bbdc33ad66ee0b02b26fe380b05f9209f226cb3df8e84e29aa4e8e91d77f52bf737915b2785d4b9723becf5a95d75e8821b2e107e991cbad
 EBUILD f2fs-tools-1.10.0.ebuild 789 BLAKE2B 0680b935d90f332dc60206b041008379cd9b16afcd6c8abb69ad2b66cd715ad4cc72e72fbdf8a19e570aa1851a5ca69338f38de7ae51eea0d6becc6a4b2e5b77 SHA512 8c5f8da38251d75da53783dd47b904c53e5dd0fd054089c7338859e71ebacba47894b2d597ed171a000e33675975e1b23bac20a78f8c88de40fbe5904f24ecd4
 EBUILD f2fs-tools-1.11.0-r1.ebuild 779 BLAKE2B 98b962936657814d59a229304d966362efde637a62e879adecf35acdce778d22fe0eb6059985cc31db9087d8e879e72d4ac33a7d1e3daf6a8ee83eb714ae4d64 SHA512 09849f743eb3db3eb1bc8ffa8cee82708d44a5d78ca1845c59b88a9bbd8ef8c3c20ee0beb91b4be498088d82b80dba9cd98f296eeca383b5ca8fc8259e6b8b6b
-EBUILD f2fs-tools-1.6.1.ebuild 737 BLAKE2B fd513f95c8c154cf24f3cf74483a7c0c9fb6094780234c6eda83af63ae66c9c7d059bf0aec26e902aff8c782ae44fdcbc9989852450d07b0b99d21b9fda12225 SHA512 a303cc13d4fee5657d93008d9d189dfcfed920bc80e6f4e383d751e29f83745659ee23d8917abddc733a1f2ed66d991c8b9a10aa93ac2134e7e164899a789d22
+EBUILD f2fs-tools-1.12.0-r1.ebuild 822 BLAKE2B 7aa72f84312b51fad9a24930ebbc11ed8b7873948b9df97a83d5335620ed562f7f14627d84a58293ca304a0901966ad1522f0e74f9705692818ae057f9823345 SHA512 325afb1c2b4af9782e04a76e586e96b04fc6113e91f31084ad7924bd6c8f0cd607a88b32a2c77274d8ab7b24aafb265ac660e7554556c3bac9dea42a878109f8
 MISC metadata.xml 438 BLAKE2B a3bb4e3293bcde65dc3b01fdf363738fc65f63f50756a390f5c0211ed7d252c305e386a913cfc9b016c198238ae0017c82d52d2ff20f79957de19d8db9f30b0a SHA512 d662e42e0da62d264cad5df63fd8f407798f8d396f74b17a2d5cdb20793753b450bb232b4320f9491126b71752a44a69ed11a22b0433786f9825e3941ab24578
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild
new file mode 100644
index 000000000000..523fddda1779
--- /dev/null
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/6"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-fsck.patch
+	default
+	eautoreconf
+}
+
+src_configure() {
+	#This is required to install to /sbin, bug #481110
+	econf \
+		--bindir="${EPREFIX}"/sbin \
+		--disable-static \
+		$(use_with selinux)
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.6.1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.6.1.ebuild
deleted file mode 100644
index 0b088d41d9a5..000000000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.6.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib eutils
-
-DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/jaegeuk/f2fs-tools.git;a=summary"
-SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #580338
-}
-
-src_configure() {
-	#This is required to install to /sbin, bug #481110
-	econf --prefix=/ --includedir=/usr/include
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/$(get_libdir)/libf2fs.{,l}a
-	rm -f "${ED}"/$(get_libdir)/libf2fs_format.{,l}a
-}
diff --git a/sys-fs/f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch b/sys-fs/f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch
new file mode 100644
index 000000000000..72d86fec465c
--- /dev/null
+++ b/sys-fs/f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch
@@ -0,0 +1,56 @@
+From a6160c3e21f43b89b49802cc4a956d1c4b65ae44 Mon Sep 17 00:00:00 2001
+From: Chao Yu <yuchao0@huawei.com>
+Date: Mon, 26 Nov 2018 18:53:37 +0800
+Subject: fsck.f2fs: allow to fsck readonly image w/ -f option
+
+To keep line with e2fsprogs, let's allow to fsck mounted image as
+readonly w/ -f option.
+
+Reported-by: Perfect Gentleman <perfect007gentleman@gmail.com>
+Signed-off-by: Chao Yu <yuchao0@huawei.com>
+---
+ fsck/main.c       | 1 +
+ include/f2fs_fs.h | 1 +
+ lib/libf2fs.c     | 2 +-
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/fsck/main.c b/fsck/main.c
+index 675c603..bb79f6e 100644
+--- a/fsck/main.c
++++ b/fsck/main.c
+@@ -249,6 +249,7 @@ void f2fs_parse_options(int argc, char *argv[])
+ 			case 'f':
+ 			case 'y':
+ 				c.fix_on = 1;
++				c.force = 1;
+ 				MSG(0, "Info: Force to fix corruption\n");
+ 				break;
+ 			case 'q':
+diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h
+index 65cc8fd..6eebb3a 100644
+--- a/include/f2fs_fs.h
++++ b/include/f2fs_fs.h
+@@ -369,6 +369,7 @@ struct f2fs_configuration {
+ 	void *private;
+ 	int dry_run;
+ 	int fix_on;
++	int force;
+ 	int defset;
+ 	int bug_on;
+ 	int alloc_failed;
+diff --git a/lib/libf2fs.c b/lib/libf2fs.c
+index cc335db..498f6c0 100644
+--- a/lib/libf2fs.c
++++ b/lib/libf2fs.c
+@@ -821,7 +821,7 @@ int get_device_info(int i)
+ 			return -1;
+ 		}
+ 
+-		if (S_ISBLK(stat_buf->st_mode))
++		if (S_ISBLK(stat_buf->st_mode) && !c.force)
+ 			fd = open(dev->path, O_RDWR | O_EXCL);
+ 		else
+ 			fd = open(dev->path, O_RDWR);
+-- 
+cgit 1.2-0.3.lf.el7
+
diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest
index 9f702f023791..487020bc4141 100644
--- a/sys-fs/fuse-common/Manifest
+++ b/sys-fs/fuse-common/Manifest
@@ -1,9 +1,9 @@
 AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c031586ec6da49f8f13c0593754ce6f6a92fc35ed4ce2f0f6d9c53089e08bf3ee960df577543bba49 SHA512 c8ae0e1932e34e2078bb8a1ab47c6d2d489f832f7adb118668624d3f0695ebf8b3ac2468a8db98579ef30078eac6989421aae7d7893e30a50e5c35d0a00ad6a9
 AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1
-DIST fuse-3.2.1.tar.xz 1042772 BLAKE2B fe7dccc3b791a3b549815f5015a993c29d9481742a88b0291a03b39b95c0acb709969bdc0f6fbea5a48d0bb97bc362ad351b719d77a4f9f630825308f3fb1913 SHA512 edf08711fa02c40b9d3507c99e0b1bfd7208edc1494888c4e2bad92b621eb5c43c4cb31474d2d3bb1edaaf9cd876f3407cdb00a1bdcf61a0b74c876d3707518e
-DIST fuse-3.2.2.tar.xz 1187816 BLAKE2B 4cda342ded747a92f31417c32006e202398555d2112134f403addd1f2ef896ed46e1082a13437e657795ae93b67fb2692746b759b9efb3bd8c70857623ca1af6 SHA512 234256ed8e9e277557775d34b0aa77f3b0a3c40a715e52db1437f2ffd2a7d8eda2e12ef35963a918b3310f7244bba9b3755003a25b98ea6d29b6d4b322cddec7
 DIST fuse-3.2.6.tar.xz 1456220 BLAKE2B 9b09504ed04abd0134188c28f3908e69e3416c345a96aefbca0f64447f3c3a8907550874f5fec9cd8f65fbaa892be6cc0213a7f61d7ad51c955ce3acf955ee17 SHA512 3a1ef77ab4c79a24aad0b259e17f568a30a5faf53ac17eb25d05f30dc7423f0081583f5b3c284ca9196a01885843e97c323a84231272b7e2b55c8e73848a61b8
-EBUILD fuse-common-3.2.1.ebuild 1398 BLAKE2B 6948cf83261c2e47891b0990ecd6dc080d1a6a50a57c3fead02edfd68b54f260b458821be37beacf64d72d8fa318713c14bfbaeb580699d17e447e37f8895e72 SHA512 769b9ab430a4a62b25991c5f4cdf4facbdf974530a830d926405695fe7e8ca030f13347e98d46fc45d7795d6a3896befad55dd391719d5d4a9357dfeb3b4f109
-EBUILD fuse-common-3.2.2.ebuild 1149 BLAKE2B 386f4a10b3ed57cbb0c1ec9a3bfe773892491241edf131baaa4665a029994b4c409b2a44e2f814d728f463b7edd78b9603ed5181389893dd085122bbe7c7aa2c SHA512 d223b27843e28f4fe3a45d6b8d7d4cdb8c689427a0d0b2c695a599fc2bbf8da43cd0ae0b4f9e0748de676712c62b411fab274770f5a25547a0ec735b823d664f
-EBUILD fuse-common-3.2.6.ebuild 1164 BLAKE2B 8f5686e1877c953e35ae079337e9c505427ea6f5768336d697c8ab58b2b97d8cb58c30fe64d0767628dd9c1c78996f90b48e36ea5c28049db5a71157773972ff SHA512 42adba32f9c0742934b1044a742fadc30f76b2c912cd595b3edf66636f8c0b142aa6d659363567d2d34dc2c459b61266333a7d8197cf8de1a6ac9f8570222073
+DIST fuse-3.3.0.tar.xz 1010840 BLAKE2B 56422879c7a87351deb731b3e5f950c1d7f584f730e5d595f5b3f1b5dea960cd26c875d8921ae6495c7fd99b3525b76a65b9c866c5f19e653c04f9ae4bd98b13 SHA512 fa6ee83c4ccdea797e37c9413d504ebe3cbc2bfef9526d485519144714f7b7163bbae9be26ec8a471aa76e98958779bd9d702083be272abaa3b6f1694816e913
+DIST fuse-3.4.1.tar.xz 1016436 BLAKE2B 50a35039d7302741239736f2e62f4603c147d49947580fb92f7ac6b46aa8dbcd1cbb16ba35719e198dc3b693b11c215ee8123d02a0c96154d6c905541eb35936 SHA512 45e56346b6d4c90055168254cd8508339d5b428ec58f1d9e287439e3d48fce344498826f099de89051e6529e45a45e0990a0e07fc8a9acbae1f76f4d6c72dd0d
+EBUILD fuse-common-3.2.6.ebuild 1257 BLAKE2B 61cb98b666b240c60dabdbbe06bae98831401d6c7fde13bfba9b458ea7740c433ee30ad4a9ffcb054c47c5323c885f30c42a34e1fc576efed880cde99052b353 SHA512 0638f3bafc3c4cc974df6ef2b1a5ca072901d8f5fd73e4ffae5437fabd71396da67beed2bd6d2ae313782cd196f1c264da607d7824b931ed4de3cd987bbac3e1
+EBUILD fuse-common-3.3.0-r1.ebuild 882 BLAKE2B 1c160f4ee9fe4855263ec009d1a14fc8a27d47de6951515bcaf71493a51231afd03bcc0afbe9c426fc912d056fc7fac88e6ffe6545d84601b0822a13926e42b0 SHA512 886597787d42d27b204e5786c0aa70c46b70bdbcd1cfaaa75fab9be0ff57179948235976f552ac3b443974e62f4df0922970a078d0ae6a5bdfc4cd655f8031ef
+EBUILD fuse-common-3.4.1.ebuild 882 BLAKE2B c160fa9e872d8a705b52a935324cc80f1147f8b23221fb819ead793a742bd3d01c4b71a57bffd6aa7096714a43e433343efff327a295b264b19e9af8223d8283 SHA512 ceec795c2ac2800132fa875997534e29eece406acb30c50733a5baba33dcc35d31761caf489536c6b19d199b6b3af7760aca0114d2cb7f273ee2619879850180
 MISC metadata.xml 326 BLAKE2B e3a863aeff43218beaba67d6ca4692dad0b3854a706213db47880058af990e02655a30a55eb16dc3cbe546382f6e55989d0d8321eb115b8270a016d2c1c62ab8 SHA512 fcb872557acd0b8478fd8afe48c408a6dc08fda8eeba46f6db89470b6b3aa5d1287d4be9c5ec2aee80137901d4a1d943b61b22117849d283eafd3bd587c05eae
diff --git a/sys-fs/fuse-common/fuse-common-3.2.6.ebuild b/sys-fs/fuse-common/fuse-common-3.2.6.ebuild
index d377ddf09b1e..d5c5ba2c48b0 100644
--- a/sys-fs/fuse-common/fuse-common-3.2.6.ebuild
+++ b/sys-fs/fuse-common/fuse-common-3.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-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"
 
 DEPEND="virtual/pkgconfig"
 RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
@@ -28,6 +28,11 @@ src_prepare() {
 	filter-flags -flto*
 }
 
+src_configure() {
+	local emesonargs=( -Dudevrulesdir="$(get_udevdir)"/rules.d )
+	meson_src_configure
+}
+
 src_install() {
 	newsbin "${BUILD_DIR}"/util/mount.fuse3 mount.fuse
 	newman doc/mount.fuse3.8 mount.fuse.8
diff --git a/sys-fs/fuse-common/fuse-common-3.2.2.ebuild b/sys-fs/fuse-common/fuse-common-3.3.0-r1.ebuild
index 574c6ffdefaa..5bfc1b515372 100644
--- a/sys-fs/fuse-common/fuse-common-3.2.2.ebuild
+++ b/sys-fs/fuse-common/fuse-common-3.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit meson udev flag-o-matic
+inherit udev
 
 DESCRIPTION="Common files for multiple slots of sys-fs/fuse"
 HOMEPAGE="https://github.com/libfuse/libfuse"
@@ -18,20 +18,7 @@ RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
 
 S=${WORKDIR}/fuse-${PV}
 
-# tests run in sys-fs/fuse
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
-	filter-flags -flto*
-}
-
 src_install() {
-	newsbin "${BUILD_DIR}"/util/mount.fuse3 mount.fuse
-	doman doc/mount.fuse.8
-
 	udev_newrules util/udev.rules 99-fuse.rules
 
 	if use kernel_linux ; then
diff --git a/sys-fs/fuse-common/fuse-common-3.2.1.ebuild b/sys-fs/fuse-common/fuse-common-3.4.1.ebuild
index 15d8bd5e11fc..1bee8df8257a 100644
--- a/sys-fs/fuse-common/fuse-common-3.2.1.ebuild
+++ b/sys-fs/fuse-common/fuse-common-3.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit meson udev flag-o-matic
+inherit udev
 
 DESCRIPTION="Common files for multiple slots of sys-fs/fuse"
 HOMEPAGE="https://github.com/libfuse/libfuse"
@@ -18,20 +18,7 @@ RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
 
 S=${WORKDIR}/fuse-${PV}
 
-# tests run in sys-fs/fuse
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
-	filter-flags -flto*
-}
-
 src_install() {
-	newsbin "${BUILD_DIR}"/util/mount.fuse3 mount.fuse
-	doman doc/mount.fuse.8
-
 	udev_newrules util/udev.rules 99-fuse.rules
 
 	if use kernel_linux ; then
@@ -42,16 +29,6 @@ src_install() {
 		die "We don't know what init code install for your kernel, please file a bug."
 	fi
 
-	dodir /etc
-	cat > "${ED}"/etc/fuse.conf <<-EOF
-		# Set the maximum number of FUSE mounts allowed to non-root users.
-		# The default is 1000.
-		#
-		#mount_max = 1000
-
-		# Allow non-root users to specify the 'allow_other' or 'allow_root'
-		# mount options.
-		#
-		#user_allow_other
-	EOF
+	insinto /etc
+	doins util/fuse.conf
 }
diff --git a/sys-fs/fuse-convmvfs/Manifest b/sys-fs/fuse-convmvfs/Manifest
index 7ab4a8f3a63c..87bd789bf0ba 100644
--- a/sys-fs/fuse-convmvfs/Manifest
+++ b/sys-fs/fuse-convmvfs/Manifest
@@ -1,4 +1,4 @@
 AUX mount.convmvfs 170 BLAKE2B 5fef5a6237afc8b8d10f33c26c6afc8a0f8b6a6d758487bb21e788e705d3733089e2583e29943dce492695e81c84a435145a66de7d05c3d4294f71ffc4bedefe SHA512 5419088466cf3e0a1a97da25d574569230279e0b6b2555ce073ca5a0f0e819dc4a267f830d540d550a68cf8ba74b3ba25c2066f9a40bb357be750159e86a521c
 DIST fuse-convmvfs-0.2.6.tar.gz 94252 BLAKE2B 0f7383e7cba72b6d4ecd8200c180321015102fa393efe1f633275b50521890c1aba6f7d9c21d60b76f5dd373188c51d59415ab41d170961537dd25745a2f3ab0 SHA512 5cea997822067f01dc1cd7b11356be7dc33a805ad142fb8612bce34deb4771879af9922c3a76f989e6d63d3464f4fffb22bfafa3eaa82e21a6e506f73df97aab
-EBUILD fuse-convmvfs-0.2.6.ebuild 487 BLAKE2B a851c4ff40b9f401f53a69b4f87419dc931d5826759e9581d077d6225c8fff71a1a88f2113a28fa28c8d837fbb29e29e2164e322d5e2522bd23d50ede115edb1 SHA512 f984161220463acadd4897ba7e1c2f1b859501a48720f09e6fa7df91887fc60c70c0f9c90592aa56b5993247148d5e19edf532b22e68919810f134e9d832312e
+EBUILD fuse-convmvfs-0.2.6-r1.ebuild 490 BLAKE2B 802f57d6407972fa5c75e1c8dc22cc874be9ed5ab0695bc42b1353baa1560d9c63d288762ed9523bbfb061aec7cadca28b9caf73164ebea78609f148aee45327 SHA512 df8388caefde0563295e21931dbe7988c444b8ba3cf3dfe0db7713d54cb98ff297a6d61b864a1e64bbcd6c1d5179e5be158a674337dfc2f773cc9c52e2e5f7ca
 MISC metadata.xml 250 BLAKE2B 91ef6b7f73c7426f4e9fc7c8d42aba6a597483f567fddf3ed29dc9ce4c5184f4931295b706815d0c31c3690f356242a9d8f9a9768841dcc9a87fed91d2325de8 SHA512 89a3e975aa260abddb192ab8adaf41c4fa8ea3a88dcf5a4323aa42a2181b4dd6fce3e397627f48d2015c0cbb42f658fca06e6fe096ec6ddc150bb80f48db322f
diff --git a/sys-fs/fuse-convmvfs/fuse-convmvfs-0.2.6.ebuild b/sys-fs/fuse-convmvfs/fuse-convmvfs-0.2.6-r1.ebuild
index 0d66eb3f3fdf..9c7794b8a8ff 100644
--- a/sys-fs/fuse-convmvfs/fuse-convmvfs-0.2.6.ebuild
+++ b/sys-fs/fuse-convmvfs/fuse-convmvfs-0.2.6-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="FUSE file system to convert filename charset"
 HOMEPAGE="http://fuse-convmvfs.sourceforge.net/"
@@ -14,8 +12,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="sys-fs/fuse"
-RDEPEND="${DEPEND}"
+RDEPEND="sys-fs/fuse:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 src_install() {
 	default
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index fa4ae17ec6d6..d6a69cd280c3 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -3,15 +3,13 @@ AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c0
 AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1
 DIST fuse-2.9.7.tar.gz 661138 BLAKE2B 8e56cfa8634e919bfc4f9fa589074763bd8c272d5166a2a6fd7d416477ca07a374611639283593df4b06f8d5820b8cf5a375463d4b85fa3644868b2a62611003 SHA512 f47304d9c7a1815f7a2905b7bdb7785d4c10292a80c8dc1ec45d895af96bc6ffd6d84ff2617bd976a1d0867ab8ec1a404a5a05ace85a69ecca830f371d08f8e2
 DIST fuse-2.9.8.tar.gz 4610904 BLAKE2B 803eebea510834676379df8c9514050efcf47d83c06ba1f5b5756d27f5c32d3a0cc199d826b0c041118c5d2260ff023f58432a0d7b623807c0a4af4da7c34eff SHA512 0a9b14d96c6f98f5c903baf00114bfff72f9aeb97224702bbed370516b2b582401d5b436fcef979918ffd85d69ba4a82c8f722c0b35ebd50f7aa5f4ddfdcf8ad
-DIST fuse-3.2.1.tar.xz 1042772 BLAKE2B fe7dccc3b791a3b549815f5015a993c29d9481742a88b0291a03b39b95c0acb709969bdc0f6fbea5a48d0bb97bc362ad351b719d77a4f9f630825308f3fb1913 SHA512 edf08711fa02c40b9d3507c99e0b1bfd7208edc1494888c4e2bad92b621eb5c43c4cb31474d2d3bb1edaaf9cd876f3407cdb00a1bdcf61a0b74c876d3707518e
-DIST fuse-3.2.2.tar.xz 1187816 BLAKE2B 4cda342ded747a92f31417c32006e202398555d2112134f403addd1f2ef896ed46e1082a13437e657795ae93b67fb2692746b759b9efb3bd8c70857623ca1af6 SHA512 234256ed8e9e277557775d34b0aa77f3b0a3c40a715e52db1437f2ffd2a7d8eda2e12ef35963a918b3310f7244bba9b3755003a25b98ea6d29b6d4b322cddec7
-DIST fuse-3.2.3.tar.xz 1238628 BLAKE2B 07b073d0af9d8db3b8799d872225f0637351b99bafb5db11b45dab1173101669731de66215a31e2141cfe5aa6d467e87d469f432194ddf7b8d5eb8e10825d679 SHA512 f91ee4b24df64e62d0c50db0bc3807229cfde06da118c87826bc3ee01b41689ec93a96b026226e948e6d7904bb506dc1d8ffa83d29aa12ea7f17009f6060263e
 DIST fuse-3.2.6.tar.xz 1456220 BLAKE2B 9b09504ed04abd0134188c28f3908e69e3416c345a96aefbca0f64447f3c3a8907550874f5fec9cd8f65fbaa892be6cc0213a7f61d7ad51c955ce3acf955ee17 SHA512 3a1ef77ab4c79a24aad0b259e17f568a30a5faf53ac17eb25d05f30dc7423f0081583f5b3c284ca9196a01885843e97c323a84231272b7e2b55c8e73848a61b8
-EBUILD fuse-2.9.7-r1.ebuild 1955 BLAKE2B a5c2d8696efd1c19223710c9a92bdb1c8a94e0e6fd6c7c928a458c6cfebb8e82b06ecd7a5ced2167f733f1f7b2f0aef0389873120278823ab39ce206eafdb073 SHA512 550ea0d9c917e2ffb770eabf93e0df0284728b7f6719d54ab8cd0082ff8586d604253591eee6460759c480cbd80e9b85ff3f26d8851a3b4e03b5d7fc3c86c0d2
+DIST fuse-3.3.0.tar.xz 1010840 BLAKE2B 56422879c7a87351deb731b3e5f950c1d7f584f730e5d595f5b3f1b5dea960cd26c875d8921ae6495c7fd99b3525b76a65b9c866c5f19e653c04f9ae4bd98b13 SHA512 fa6ee83c4ccdea797e37c9413d504ebe3cbc2bfef9526d485519144714f7b7163bbae9be26ec8a471aa76e98958779bd9d702083be272abaa3b6f1694816e913
+DIST fuse-3.4.1.tar.xz 1016436 BLAKE2B 50a35039d7302741239736f2e62f4603c147d49947580fb92f7ac6b46aa8dbcd1cbb16ba35719e198dc3b693b11c215ee8123d02a0c96154d6c905541eb35936 SHA512 45e56346b6d4c90055168254cd8508339d5b428ec58f1d9e287439e3d48fce344498826f099de89051e6529e45a45e0990a0e07fc8a9acbae1f76f4d6c72dd0d
 EBUILD fuse-2.9.7.ebuild 2206 BLAKE2B eb1f3ee67657e03d572bea6895655ab43f39cf41e6eef422baf6643184080a224f72e773afe496784d0e60d12ce63d9e678b3f1c43a867042f93fea2fc350cfa SHA512 5b44ada149cf1cc4028307ee6e11657e7e1de98f9893a5061aada592037ca54b16644354f970d222687b3f07d3673c1352c02e8ddf5fe60d031244a617d13d23
-EBUILD fuse-2.9.8.ebuild 1955 BLAKE2B a5c2d8696efd1c19223710c9a92bdb1c8a94e0e6fd6c7c928a458c6cfebb8e82b06ecd7a5ced2167f733f1f7b2f0aef0389873120278823ab39ce206eafdb073 SHA512 550ea0d9c917e2ffb770eabf93e0df0284728b7f6719d54ab8cd0082ff8586d604253591eee6460759c480cbd80e9b85ff3f26d8851a3b4e03b5d7fc3c86c0d2
-EBUILD fuse-3.2.1.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
-EBUILD fuse-3.2.2.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
-EBUILD fuse-3.2.3.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
+EBUILD fuse-2.9.8-r1.ebuild 1886 BLAKE2B 09439bdee18c81239dd9f4a5c5d78f23e96d1f76780b5c9cb94a08e00f93287a8a689f936823cce2d53b7a18c7335f26763a73944c37c8c748f4d05a93ab99e6 SHA512 6a34428fa159d41398aea868695c5900c92a765db9df74a99757d167a6052af04124881a8f43a999cf31bf87ea59cda412d52c753229eada10945b01ef45b1d2
+EBUILD fuse-2.9.8.ebuild 1944 BLAKE2B 829ce122f4fff4be530130dc06bc33cbd67fc9e800b9691e4789b7942bc5dabf408e341e4041507946fafb79a441dbe76886753e8442452ccd40987f9305c26f SHA512 7c9f2c90a21662ed4d8e16d11468107a80a8b8a71a9d4a890bbf9d440cd76f881c7a7c77676dedd7d0dddf05eb3251d6e9448393a7d2412a5cbf6850b918fac1
 EBUILD fuse-3.2.6.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
+EBUILD fuse-3.3.0-r1.ebuild 1662 BLAKE2B d304faa93635f4c2edb4a787b994daede961bd77615290ab0d8648adb8d0548fdae6aa9a1eca177c6ef5b62a6a71329f9798b0992bfb15b2cb887963f685dc43 SHA512 104936339eb8b45aeb738d2e06f6811ea049dfca1fcc804e57ac267ac48162bdfba44419122fb221bebe38194cfb6f6b576f2884b016681be00d17d2f827b252
+EBUILD fuse-3.4.1.ebuild 1659 BLAKE2B fb830f40d7c535864111a02277aef8d51da505be9d497e09bf1d7e60c44831d13421261f24e4be82785aa275f78e3b7ba20f21d27fbe9edaed2fc33c5512c2b2 SHA512 d92104cda402f7497d2417012298558fcd532fdac41cdf8897c70a061c093a26aab04ac774f652c25e6d10e00ebd913bd8140502c8517c1a9df7d5b424407609
 MISC metadata.xml 391 BLAKE2B 69aa72b5ba983496e0b682bcde7d61b33d982031e1c5ca1f4b0181384daeff3a47482fc23e68ae9097321dfa5a0203abc60de4fae5aa99c7e32542e9b8e59f0a SHA512 181d574140e8459c76d7392cf63eec85e1b40142b31b9ac1a19bf657c8482b581c1ea23fdae6a523bbad4943e3245409dfc14eea38243b78ef541e3cad49a180
diff --git a/sys-fs/fuse/fuse-2.9.7-r1.ebuild b/sys-fs/fuse/fuse-2.9.8-r1.ebuild
index 179face680f2..0e17eaa9a114 100644
--- a/sys-fs/fuse/fuse-2.9.7-r1.ebuild
+++ b/sys-fs/fuse/fuse-2.9.8-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit ltprune libtool linux-info udev toolchain-funcs
+inherit libtool linux-info udev toolchain-funcs
 
 DESCRIPTION="An interface for filesystems implemented in userspace"
 HOMEPAGE="https://github.com/libfuse/libfuse"
@@ -15,7 +15,7 @@ IUSE="examples kernel_linux kernel_FreeBSD static-libs"
 
 PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
 DEPEND="virtual/pkgconfig"
-RDEPEND="sys-fs/fuse-common"
+RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
 
 pkg_setup() {
 	if use kernel_linux ; then
@@ -23,7 +23,7 @@ pkg_setup() {
 			die "Your kernel is too old."
 		fi
 		CONFIG_CHECK="~FUSE_FS"
-		FUSE_FS_WARNING="You need to have FUSE module built to use user-mode utils"
+		WARNING_FUSE_FS="You need to have FUSE module built to use user-mode utils"
 		linux-info_pkg_setup
 	fi
 }
@@ -61,12 +61,10 @@ src_install() {
 		doins include/fuse_kernel.h
 	fi
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	# installed via fuse-common
 	rm -r "${ED%/}"/{etc,$(get_udevdir)} || die
-	rm "${ED%/}"/usr/share/man/man8/mount.fuse.* || die
-	rm "${ED%/}"/sbin/mount.fuse || die
 
 	# handled by the device manager
 	rm -r "${D%/}"/dev || die
diff --git a/sys-fs/fuse/fuse-2.9.8.ebuild b/sys-fs/fuse/fuse-2.9.8.ebuild
index 179face680f2..6730afe7ac5e 100644
--- a/sys-fs/fuse/fuse-2.9.8.ebuild
+++ b/sys-fs/fuse/fuse-2.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples kernel_linux kernel_FreeBSD static-libs"
 
 PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
diff --git a/sys-fs/fuse/fuse-3.2.1.ebuild b/sys-fs/fuse/fuse-3.2.1.ebuild
deleted file mode 100644
index 4012fc673b62..000000000000
--- a/sys-fs/fuse/fuse-3.2.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit meson multilib-minimal flag-o-matic udev python-any-r1
-
-DESCRIPTION="An interface for filesystems implemented in userspace"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-
-DEPEND="virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-	)"
-RDEPEND="sys-fs/fuse-common"
-
-DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
-
-python_check_deps() {
-	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
-	filter-flags -flto*
-
-	# passthough_ll is broken on systems with 32-bit pointers
-	cat /dev/null > example/meson.build || die
-}
-
-multilib_src_configure() {
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	${EPYTHON} -m pytest test || die
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# installed via fuse-common
-	rm -r "${ED%/}"/{etc,$(get_udevdir)} || die
-	rm "${ED%/}"/usr/sbin/mount.fuse3 || die
-
-	# handled by the device manager
-	rm -r "${ED%/}"/dev || die
-
-	# manually install man pages
-	rm -r "${ED%/}"/usr/share/man || die
-	doman doc/fusermount3.1
-}
diff --git a/sys-fs/fuse/fuse-3.2.2.ebuild b/sys-fs/fuse/fuse-3.3.0-r1.ebuild
index 4012fc673b62..3b4821add777 100644
--- a/sys-fs/fuse/fuse-3.2.2.ebuild
+++ b/sys-fs/fuse/fuse-3.3.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit meson multilib-minimal flag-o-matic udev python-any-r1
 
@@ -20,7 +20,7 @@ DEPEND="virtual/pkgconfig
 		${PYTHON_DEPS}
 		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
 	)"
-RDEPEND="sys-fs/fuse-common"
+RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
 
 DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
 
@@ -63,12 +63,11 @@ multilib_src_install_all() {
 
 	# installed via fuse-common
 	rm -r "${ED%/}"/{etc,$(get_udevdir)} || die
-	rm "${ED%/}"/usr/sbin/mount.fuse3 || die
 
 	# handled by the device manager
 	rm -r "${ED%/}"/dev || die
 
-	# manually install man pages
+	# manually install man pages to respect compression
 	rm -r "${ED%/}"/usr/share/man || die
-	doman doc/fusermount3.1
+	doman doc/{fusermount3.1,mount.fuse3.8}
 }
diff --git a/sys-fs/fuse/fuse-3.2.3.ebuild b/sys-fs/fuse/fuse-3.4.1.ebuild
index 4012fc673b62..9910cea42b18 100644
--- a/sys-fs/fuse/fuse-3.2.3.ebuild
+++ b/sys-fs/fuse/fuse-3.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+EAPI=7
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit meson multilib-minimal flag-o-matic udev python-any-r1
 
@@ -20,7 +20,7 @@ DEPEND="virtual/pkgconfig
 		${PYTHON_DEPS}
 		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
 	)"
-RDEPEND="sys-fs/fuse-common"
+RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
 
 DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
 
@@ -63,12 +63,11 @@ multilib_src_install_all() {
 
 	# installed via fuse-common
 	rm -r "${ED%/}"/{etc,$(get_udevdir)} || die
-	rm "${ED%/}"/usr/sbin/mount.fuse3 || die
 
 	# handled by the device manager
 	rm -r "${ED%/}"/dev || die
 
-	# manually install man pages
+	# manually install man pages to respect compression
 	rm -r "${ED%/}"/usr/share/man || die
-	doman doc/fusermount3.1
+	doman doc/{fusermount3.1,mount.fuse3.8}
 }
diff --git a/sys-fs/fuseiso/Manifest b/sys-fs/fuseiso/Manifest
index 3fbf43a44696..e78ce0e65987 100644
--- a/sys-fs/fuseiso/Manifest
+++ b/sys-fs/fuseiso/Manifest
@@ -1,5 +1,5 @@
 AUX fuseiso-20070708-fix-typo.patch 683 BLAKE2B a6467bc243f7dcf37e843ccbdc044b05b94458fd3324a359793267008f144cc2514e379b713c4d0571afafe621f1455c321b94083d760e49cdbeb0eed79e8091 SHA512 ccfbcdba2c81d834d658f399f378feb6fec9d920c0fcc5cce3cd744f26cb94708a739c34e9e7cc374d31920a84bc6fbcc5b3ff841ee0d352de96a90cdc7c266e
 AUX fuseiso-20070708-largeiso.patch 2583 BLAKE2B 90374aca589c81aa760301c1fbd98bc1199c8d69d20d26f42d343ca80e17f3656b5c1b5dd5c7088d4e2f242e536db6726f6d3a44f712f78fa7472c114af63f56 SHA512 f3268473d771de520f80d6ccdc6147fdc0c250f4b28070b7cb7b75734b893431ee3e20c46acb54f51f177c2e60f554c5ae8c2e3a514aa97a4208f514512be9cf
 DIST fuseiso-20070708.tar.bz2 239960 BLAKE2B b794d7381d707c42ad8082c999ba2702d76b4b37971e9cad37ccf80657a68e0d4aa5a6b8628c324e81b7fe0c031d91398c82c3d5f40ee0ed12711ef5d7cad1f6 SHA512 d9d8153101494434fe4ec9c684cec46a1eee46fd3ce06e97fa27f4746990f866e1f23f256b2659e60296d2362cea05d259a0a2ef669ecddf7a0a7e44110c4ae0
-EBUILD fuseiso-20070708-r2.ebuild 576 BLAKE2B ff634b9402781baad2f55c42ef36eea8f6e59cc7d8a54fcb1290d6c249683cf5e43671317e9f9e7dc4a9cecfccdcac0637fd7c8c88f0a100f7555b3386c5fff2 SHA512 b605743df9655d69e515d5d5b9a2ae3f8c2bf91bf30213805db8a0fd99366feca3fb0b5f57a2833022c72119789ca35e0abea379773ef2ea7f31f1a674c03a7b
+EBUILD fuseiso-20070708-r2.ebuild 580 BLAKE2B a54195fe4d6603b22d169f9f336d2e138ff3433c9612f117e34d784ee9ad54d8ee0422e506439079209c453ac47a73c23e04ba2130436c1b9f04637e4d3f3ebe SHA512 b1f2002fe4c53ddb3807dbb235b666ce089ab605d00ee1e95ff39a193d1bd60dd47dce6d27c7560d70593f6805ce888e823c358a9fb1f9b94f5653294e0ceded
 MISC metadata.xml 420 BLAKE2B ab7884f79bd4e597cb7cd131ffa708353fbebc814578bcfedeb1d16bfd9b28163e1b66455b325ee7c2e811febca207568a376166d6d91b46e7aabf43ae3344ef SHA512 03659deebcb170d3144010e020528bf2ab8fc946f324a70da5b68db30d0ce89864b355abc358287ee01b3758d3495c246bc102e2a0d61fc54e8c549dad9228e6
diff --git a/sys-fs/fuseiso/fuseiso-20070708-r2.ebuild b/sys-fs/fuseiso/fuseiso-20070708-r2.ebuild
index 988e0c3fc111..5fa6fb5780df 100644
--- a/sys-fs/fuseiso/fuseiso-20070708-r2.ebuild
+++ b/sys-fs/fuseiso/fuseiso-20070708-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://superb-dca2.dl.sourceforge.net/project/fuseiso/fuseiso/20070708/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND="sys-fs/fuse:=
 	sys-libs/zlib
diff --git a/sys-fs/iprutils/Manifest b/sys-fs/iprutils/Manifest
index 59f52618e16b..3200671df9bf 100644
--- a/sys-fs/iprutils/Manifest
+++ b/sys-fs/iprutils/Manifest
@@ -10,8 +10,10 @@ AUX iprutils-2.4.7-tinfo.patch 569 BLAKE2B 8188fe255a04685e1240b6e99c8ae63e1993e
 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.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.7.ebuild 835 BLAKE2B 2c35dc04a713315d0fab9e76e48795bf0d8b3a6f272b7ba2633dbc7fa1401bf71bf8251a38f778b7c008dc7763d22596337f32978c166481ce56e7a8133443af SHA512 5c9fad08625fabbd520aa02efd689fca7b1739e545fbca2d059ca4d0322b03009cb82df32bb09d118104b779bc8a1f9b43b76122eedb857e4d58d3871200ea1f
 MISC metadata.xml 338 BLAKE2B f1a657a6c8fc11e853f0530c94e8376b8b424818873d909ed8a54c0bef0e47bea40733eea3e8f8e8340562c58dd29c2d3b072023dce9edb6ba803f2774fe1076 SHA512 6323616f564434719f3466d45a7d0a41969ac75a8e6efb5b0225a915061f9a5e8698aa296633ec54f3708903b39ac2d8fe5275686a2bd76bd1ae8662b8dc7600
diff --git a/sys-fs/iprutils/iprutils-2.4.17.1.ebuild b/sys-fs/iprutils/iprutils-2.4.17.1.ebuild
new file mode 100644
index 000000000000..f599670695f9
--- /dev/null
+++ b/sys-fs/iprutils/iprutils-2.4.17.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/ldapfuse/Manifest b/sys-fs/ldapfuse/Manifest
index b33f8db66a32..6ac17ecefca5 100644
--- a/sys-fs/ldapfuse/Manifest
+++ b/sys-fs/ldapfuse/Manifest
@@ -1,3 +1,3 @@
 DIST ldapfuse-1.0.tar.xz 76024 BLAKE2B fa7bb67637e069e013c5a0d849f196803466cdec82b538ccaa7852e589c8c1ec5e68d73e88c3d3c69237dce89fd62e10d949ddc8b84e3c72d4e0c9b43ec90c66 SHA512 ea9af757d69fe9931ac745039d75a52d3e590c16737a71e6d9a6a8654b5514a1c86e26925f5cbe117c5bedcef8888ce69bec3bec2c02fe4dd233fee7f3118e7f
-EBUILD ldapfuse-1.0-r1.ebuild 520 BLAKE2B d40fb9e9a88811fb5f1fe38baaabd2bd9950039c37007a2fe55524e02c58803e98e949ee52149ec2b471bbe7f1ac40b4cf6916795f19f00b1ef229ac72068052 SHA512 2ea0f9f19bd85992212df57f17e1680ca56705154697267907cc4e5f42e4a86ccd3416ae2ccdb04b45eb94502644ab610ca27c95d21a905eac817e14a772fd34
+EBUILD ldapfuse-1.0-r2.ebuild 519 BLAKE2B a6287e6643af783f9fd6041f688750eb41ba7189c20f0a10213c2053ac9cf2e4bef340e4c8ea094424f1914e9c95452cea403ec49562ddb6e8d60401d5333392 SHA512 52bfa8e030d6065b641e363fe289285b80c955feb18653f6afe739e5dc7c7d1ad81f3d6d636ad7357694b71f5f99b07a543ea67bb66556b173505a7c713b731c
 MISC metadata.xml 245 BLAKE2B 387a8dc81084ffd6d2142e4736475f60137a133e899450ebb4fbae27dcbbe1db68bc530af14d2f1e266d83d2b0bc65e36c8f35b5c2338e6cf3d90a1305eda9d0 SHA512 6b8638887d57ae5e5377f3d1db187607bb64ede9f633367aa9ba9548638630ef738c420f67aa97989611e1ff5885062fbd4246ad3fb59c9021ec770b822de0ca
diff --git a/sys-fs/ldapfuse/ldapfuse-1.0-r1.ebuild b/sys-fs/ldapfuse/ldapfuse-1.0-r2.ebuild
index c6a326959d2a..22f15a54b35f 100644
--- a/sys-fs/ldapfuse/ldapfuse-1.0-r1.ebuild
+++ b/sys-fs/ldapfuse/ldapfuse-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	net-nds/openldap
-	sys-fs/fuse
+	sys-fs/fuse:0
 	>=sys-libs/libhx-3.12"
 
 DEPEND="
diff --git a/sys-fs/libfat/Manifest b/sys-fs/libfat/Manifest
index 5e76e045fa48..6340c0257d0f 100644
--- a/sys-fs/libfat/Manifest
+++ b/sys-fs/libfat/Manifest
@@ -1,3 +1,3 @@
 DIST libfat-0.3a.tar.gz 384923 BLAKE2B 696ccf1f707a703bc20a3e58c33648832435ec83733e90cb66736f2146e2940d3e104f7fdeedd1cfcb604722ecd97f48abb17d84c4fb0b809c98d36ff0028d98 SHA512 c9257df5f9dab7ed99e83d6ca7cd6df4dca658a33062d69be8c48a6e38a39d3f7fec592a7c6c86b22816d681942647578566fbf457a5ebe08e029689d38099cc
-EBUILD libfat-0.3a.ebuild 474 BLAKE2B 9a6d84cf08b1087917554460f1c59666ceb331d3f7d30a59e3a9b994d53bf67d3808655e2a4d697294bfcc16421605e2095270ebbba52dd2c2b4b1a46b8e8d13 SHA512 5f2f282529706679cd75c1a61b7817fc52ced2417e244b8a52bcd40e112c86fb1cff2558bd6145af2ce28fda1531eeebf4f5951390365de58bd5b03c98217a00
+EBUILD libfat-0.3a-r1.ebuild 473 BLAKE2B aebc79f5888626cfc4d46047b754cd8e35e56967408359d4b0da9b6bec223b2d182487eceb5933b5439ee6f63a5b670e3cad9f91202155ea23016fdab783b19f SHA512 a9bb076f1ec89c2572eaf15b4129662132673c563c1012c5df4c59d578128fc6835a91a0b8dfb06044a010d6695cceefad1b798b078240238561473a6677b305
 MISC metadata.xml 243 BLAKE2B 4d04d2bb351f18d336df06f7670427aadce7de6c2a5c01d6fe487176d2e327eaff5dd6c483c582ca4cb1cc22abe7a761770f6459aceb687c2a28edf8040eeb93 SHA512 03e7276ee469048cc39c7fd0fb4e46303f818e79f0e571aa2a6e7bca36faa5203fcfa9445db10f9936220eeaf5748f56a82fb2e1fb9325b651ec0b03e0953a85
diff --git a/sys-fs/libfat/libfat-0.3a.ebuild b/sys-fs/libfat/libfat-0.3a-r1.ebuild
index 7cbf73e62388..f31b047fa7bc 100644
--- a/sys-fs/libfat/libfat-0.3a.ebuild
+++ b/sys-fs/libfat/libfat-0.3a-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI="7"
 
 DESCRIPTION="Support library to access and manipulate FAT12 / FAT16 / FAT32 file systems"
 HOMEPAGE="http://libfat.sourceforge.net"
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
-	sys-fs/fuse"
+	sys-fs/fuse:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 994e246890da..1729ccb4e9a3 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -36,8 +36,8 @@ AUX lvmetad.initd-2.02.116-r3 348 BLAKE2B 6ad8f51dc6498703840a0917cdbcb5d1f179e2
 AUX lvmlockd.initd-2.02.166-r1 393 BLAKE2B 83eb337aa1069e66d7746b23141da24717303552016497d29d4df304bb174b2c380cc7c09df7b3529e355cf172150c7cf254afb984a6561e1fa3459aeed43421 SHA512 11d6f186799d8628220eccb4823e5bd251bc3c447e6c3f8a63c025dc4e08e0a7638a8439967ea2ee8a717264887597be4992afca59571ebaa651441782288081
 DIST LVM2.2.02.116.tgz 1538340 BLAKE2B 718261b60626f2eca5ba13011646bf551523ed8e59aaceceb9097221c000268b7533ac43151ff1d9229911d87e764fbdb29ffa1d305f2aae99220a68e301559a SHA512 992541339637d597257850b4ff7f5348fb7cdcccf806ac8d986a3be1ad1edc5f6bfaedeed5128690c541d1a485cdc75742e90a766363c39867901003518fb84d
 DIST LVM2.2.02.145.tgz 1986370 BLAKE2B 0c9e5efae17f26ff86152cecbf0b11a74e85007b2fa9491f44dec03ac8c11375bacf6685213b4be19037c8fbf70e13549516716ecf8fa262919a44625e6aab34 SHA512 84e28b3efc940837ea9da70fce620744aea0945ba29383b76ad7bcd4b5259b897c714162a8e8b7cfe26ae736a3ad2eca633a3e0df4d6280a32b28bd4cf472d27
-DIST LVM2.2.02.181.tgz 2375093 BLAKE2B 4e4e7c65511af5902e765254a4316a9f887a6ec5c079333d78f19bff71ed3ed9d0e2e2367b0bb5e619ec6778adc9ddf944156921cec67af4d73aafc08196b73e SHA512 599d992823510e27f3ec3ceaf0d2332402b731afc0d2df88096ab55ed98dba8c3bdc5408d51b9f5b0ffbbb9ac3760ee37b878a0f36ab379449dc076c58e59511
-EBUILD lvm2-2.02.116.ebuild 9206 BLAKE2B 57b75864d65327f5b4b6b69cf48bd22e03d7e71757a19767f3bed0a5c0d1b0622c074ebf43f4794a2eb4d934d2dad6b5db004c1f51cdef4916bf88233ac1f481 SHA512 b687bc4adbe48a19a26581596cec343cc0d99affd8d2d1b035a4fc4ddfa0fb5557315515c13adbac7daeee70156b3bd9a4586c97a7b34fc00f2a367c3e7b447d
-EBUILD lvm2-2.02.145-r2.ebuild 9619 BLAKE2B 4461e5fee86d087e94fa8d64bbfe73f746ebe24839323a0048d413a8b1263cd0a39c477677f4903a4643f9395c06a9db2c8801e119ec896055840398600d4159 SHA512 77df933073cba908620b4237550cd20294f8ece45aed17da7ccf4c2f2f431136db7ec820d923781ac9249da62680924c985811e0733932598244d1837474a6d0
-EBUILD lvm2-2.02.181.ebuild 9776 BLAKE2B 576cfc1ec1c80a3924e54b902fb19c2e5e00e3a273f1e04025e82898106dae18b24152405d469ffdf87cc3d80f09562f0f84ec49944b94708bb35d811ff9822a SHA512 927332abc99c545815974f40b063b9412dc0c9fc97ddc647092baf4ebf1783121fea1d1568ea53e9ef192dcdb87e58b261409cc13d2321ee762a3ba5e3d9b40c
-MISC metadata.xml 1397 BLAKE2B fb780193c777b248648d09cc4c0f287f07b64df79912a4c1c37b5c456f8fc8ea98470c03501619432bddb5df1e3f877178a0c7e630b295a01a3bfc27fa63520e SHA512 1ed97dbef323b6703097c20de99e9003c88663a887bcf87c9489baddfa180aa3d8645e4e60cd3eb3b9505603997ac3ab98a7ee96a813b77b9dc25862dd332d35
+DIST LVM2.2.02.183.tgz 2380574 BLAKE2B b1fe71b6cdb8ee20dd53d0ad3399c553487baafa12657ec81a794c84ad161988afdb8693ac247877a2645d693a0740c74c8b991047ed2ba4adc9ec75f1c261a9 SHA512 3947523c6b0862ada40677ed171ed0cf95e070119e377296fc5ccb153e9c4212d34c0b16a887dbd68ccf265525345dabfed2aa59fb3604555429a7e2ecfff4d7
+EBUILD lvm2-2.02.116.ebuild 8431 BLAKE2B 5b17d1ff4ee12c1e8ed040711eb2501a42ff72c371901ca4b9e4ec24a7eab71c8b71bcf52b27e5aeb2548d4aa6cfcab4278d92f5259e22c98190038b019948f6 SHA512 5e8655e7d70566a2b06ef50baa62339b1f26d20385b8a9fc261188bc0012af8d4ed4ab451305e4df5289a44bafe3e2a1252f6264439d6539ab1ae54cda1373f7
+EBUILD lvm2-2.02.145-r2.ebuild 8627 BLAKE2B 63c09b396d802d131aaaa94442a26c4be8b75fc12f1bf097f07a0e52aeba28e4f3b406706ca0ef62a77d0557fc88d3f9d60963dc816026910ff6e90f2bd6439f SHA512 c4553842441409458c5bb339f5e22fa05f9b4bd34c865b907ed6b2396ff8c6fddbb78be1f480f7e189662e87141d7385a933e8f33850a7c6dcae7d611a7f37e9
+EBUILD lvm2-2.02.183.ebuild 8759 BLAKE2B bc6a24de341e747ea6bf3508c6b9e1103d4f0fb630192cb21b252ceb24ade0df83ed7ab991f52c41516451ec434708b33878ac0871628673b4985f6f3ed0b39f SHA512 a116666ec4396e6810cd0b72b5fdd03a38a794a0988afc317c49f73c4087451ac6466d8142d5080531101ec06a7232e2be2ed436752a0a9469b351d11b5e2c81
+MISC metadata.xml 1146 BLAKE2B 7a4bbf38d2e752523c2909c240a2c90ada04aee8efe96c62c5989887f4997e00a4ed7312dd9803d8ddcae02e8bbc3ba8f0fa9e5da0f484bc9768e0ed99ab8be3 SHA512 24240ba35d93d9f9171f2b164d949846a5ea2126eceed4b4454dd0b4efb9b1132f9f6717d2c7364f20820b792bbaf26dc274f7c10767993b35a565a76e042f4f
diff --git a/sys-fs/lvm2/lvm2-2.02.116.ebuild b/sys-fs/lvm2/lvm2-2.02.116.ebuild
index 474f90a6f309..60b6cfda5775 100644
--- a/sys-fs/lvm2/lvm2-2.02.116.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.116.ebuild
@@ -12,12 +12,12 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${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 clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
+IUSE="readline static static-libs systemd lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !lvm1 !lvm2create_initrd !thin )
 	systemd? ( udev )
 	static? ( !udev )" #520450
 
-DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
+DEPEND_COMMON="
 	readline? ( sys-libs/readline:0= )
 	udev? ( >=virtual/libudev-208:=[static-libs?] )"
 # /run is now required for locking during early boot. /var cannot be assumed to
@@ -27,7 +27,6 @@ RDEPEND="${DEPEND_COMMON}
 	>=sys-apps/baselayout-2.2
 	!<sys-apps/openrc-0.11
 	!<sys-fs/cryptsetup-1.1.2
-	!!sys-fs/clvm
 	!!sys-fs/lvm-user
 	>=sys-apps/util-linux-2.16
 	lvm2create_initrd? ( sys-apps/makedev )
@@ -152,27 +151,7 @@ src_configure() {
 	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
 	use hppa && myconf="${myconf} --disable-o_direct"
 
-	if use clvm; then
-		myconf="${myconf} --with-cluster=${buildmode}"
-		# 4-state! Make sure we get it right, per bug 210879
-		# Valid options are: none, cman, gulm, all
-		#
-		# 2009/02:
-		# gulm is removed now, now dual-state:
-		# cman, none
-		# all still exists, but is not needed
-		#
-		# 2009/07:
-		# TODO: add corosync and re-enable ALL
-		local clvmd=""
-		use cman && clvmd="cman"
-		#clvmd="${clvmd/cmangulm/all}"
-		[ -z "${clvmd}" ] && clvmd="none"
-		myconf="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${myconf} --with-clvmd=none --with-cluster=none"
-	fi
+	myconf="${myconf} --with-clvmd=none --with-cluster=none"
 
 	econf \
 		$(use_enable readline) \
@@ -230,11 +209,6 @@ src_install() {
 		newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad
 	fi
 
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
-		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
-	fi
-
 	if use static-libs; then
 		dolib.a libdm/ioctl/libdevmapper.a
 		dolib.a libdaemon/client/libdaemonclient.a #462908
diff --git a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
index ca67d8edf577..2890ca59239e 100644
--- a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
@@ -12,19 +12,11 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${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 clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin )
-	systemd? ( udev )
-	clvm? ( !systemd )"
+IUSE="readline static static-libs systemd lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !lvm1 !lvm2create_initrd !thin )
+	systemd? ( udev )"
 
 DEPEND_COMMON="
-	clvm? (
-		cman? ( =sys-cluster/cman-3* )
-		corosync? ( sys-cluster/corosync )
-		openais? ( sys-cluster/openais )
-		=sys-cluster/libdlm-3*
-	)
-
 	readline? ( sys-libs/readline:0= )
 	systemd? ( >=sys-apps/systemd-205:0= )
 	udev? ( >=virtual/libudev-208:=[static-libs?] )"
@@ -35,7 +27,6 @@ RDEPEND="${DEPEND_COMMON}
 	>=sys-apps/baselayout-2.2
 	!<sys-apps/openrc-0.11
 	!<sys-fs/cryptsetup-1.1.2
-	!!sys-fs/clvm
 	!!sys-fs/lvm-user
 	>=sys-apps/util-linux-2.16
 	lvm2create_initrd? ( sys-apps/makedev )
@@ -167,29 +158,7 @@ src_configure() {
 	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
 	use hppa && myconf+=( --disable-o_direct )
 
-	if use clvm; then
-		myconf+=( --with-cluster=${buildmode} )
-		# 4-state! Make sure we get it right, per bug 210879
-		# Valid options are: none, cman, gulm, all
-		#
-		# 2009/02:
-		# gulm is removed now, now dual-state:
-		# cman, none
-		# all still exists, but is not needed
-		#
-		# 2009/07:
-		# TODO: add corosync and re-enable ALL
-		local clvmd=""
-		use cman && clvmd="cman"
-		#clvmd="${clvmd/cmangulm/all}"
-		use corosync && clvmd="${clvmd:+$clvmd,}corosync"
-		use openais && clvmd="${clvmd:+$clvmd,}openais"
-		[ -z "${clvmd}" ] && clvmd="none"
-		myconf+=( --with-clvmd=${clvmd} )
-		myconf+=( --with-pool=${buildmode} )
-	else
-		myconf+=( --with-clvmd=none --with-cluster=none )
-	fi
+	myconf+=( --with-clvmd=none --with-cluster=none )
 
 	econf \
 		$(use_enable readline) \
@@ -249,11 +218,6 @@ src_install() {
 		newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad
 	fi
 
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
-		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
-	fi
-
 	if use static-libs; then
 		dolib.a libdm/ioctl/libdevmapper.a
 		if use !device-mapper-only ; then
diff --git a/sys-fs/lvm2/lvm2-2.02.181.ebuild b/sys-fs/lvm2/lvm2-2.02.183.ebuild
index 749cef8bdd56..6ea92b0ac768 100644
--- a/sys-fs/lvm2/lvm2-2.02.181.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.183.ebuild
@@ -12,19 +12,11 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman corosync lvm2create_initrd openais sanlock selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm2create_initrd !openais !sanlock !thin )
-	systemd? ( udev )
-	clvm? ( !systemd )"
+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="
-	clvm? (
-		cman? ( =sys-cluster/cman-3* )
-		corosync? ( sys-cluster/corosync )
-		openais? ( sys-cluster/openais )
-		=sys-cluster/libdlm-3*
-	)
-
 	dev-libs/libaio[static-libs?]
 	static? ( dev-libs/libaio[static-libs] )
 	!static? ( dev-libs/libaio[static-libs?] )
@@ -39,7 +31,6 @@ RDEPEND="${DEPEND_COMMON}
 	>=sys-apps/baselayout-2.2
 	!<sys-apps/openrc-0.11
 	!<sys-fs/cryptsetup-1.1.2
-	!!sys-fs/clvm
 	!!sys-fs/lvm-user
 	>=sys-apps/util-linux-2.16
 	lvm2create_initrd? ( sys-apps/makedev )
@@ -165,29 +156,7 @@ src_configure() {
 		myeconfargs+=( --with-thin=none --with-cache=none )
 	fi
 
-	if use clvm; then
-		myeconfargs+=( --with-cluster="$(usex static internal shared)" )
-		# 4-state! Make sure we get it right, per bug 210879
-		# Valid options are: none, cman, gulm, all
-		#
-		# 2009/02:
-		# gulm is removed now, now dual-state:
-		# cman, none
-		# all still exists, but is not needed
-		#
-		# 2009/07:
-		# TODO: add corosync and re-enable ALL
-		local clvmd=""
-		use cman && clvmd="cman"
-		#clvmd="${clvmd/cmangulm/all}"
-		use corosync && clvmd="${clvmd:+$clvmd,}corosync"
-		use openais && clvmd="${clvmd:+$clvmd,}openais"
-		[ -z "${clvmd}" ] && clvmd="none"
-		myeconfargs+=( --with-clvmd=${clvmd} )
-		myeconfargs+=( --enable-lvmlockd-dlm )
-	else
-		myeconfargs+=( --with-clvmd=none --with-cluster=none )
-	fi
+	myeconfargs+=( --with-clvmd=none --with-cluster=none )
 
 	myeconfargs+=(
 		$(use_enable readline)
@@ -228,12 +197,12 @@ src_compile() {
 }
 
 src_install() {
-	local inst
-	INSTALL_TARGETS="install install_tmpfiles_configuration"
+	local inst INSTALL_TARGETS
+	INSTALL_TARGETS=( install install_tmpfiles_configuration )
 	# install systemd related files only when requested, bug #522430
-	use systemd && INSTALL_TARGETS="${INSTALL_TARGETS} install_systemd_units install_systemd_generators"
-	use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
-	for inst in ${INSTALL_TARGETS}; do
+	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
 
@@ -253,11 +222,6 @@ src_install() {
 		newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
 	fi
 
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
-		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
-	fi
-
 	if use static-libs; then
 		dolib.a libdm/ioctl/libdevmapper.a
 		dolib.a libdaemon/client/libdaemonclient.a #462908
diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml
index cca547ca5c2c..c1a65d74e23d 100644
--- a/sys-fs/lvm2/metadata.xml
+++ b/sys-fs/lvm2/metadata.xml
@@ -16,12 +16,8 @@
 		<description>Backup to Robin. Please CC on bugs.</description>
 	</maintainer>
 	<use>
-		<flag name="clvm">Allow users to build clustered lvm2</flag>
-		<flag name="cman">Cman support for clustered lvm</flag>
-		<flag name="corosync">Corosync support for clustered lvm</flag>
 		<flag name="lvm1">Allow users to build lvm2 with lvm1 support</flag>
 		<flag name="lvm2create_initrd">Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</flag>
-		<flag name="openais">Openais support for clustered lvm</flag>
 		<flag name="thin">Support for thin volumes</flag>
 		<flag name="device-mapper-only">Build only device-mapper and not the rest of LVM2 (UNSUPPORTED)</flag>
 		<flag name="sanlock">Enable lvmlockd with support for sanlock</flag>
diff --git a/sys-fs/mac-fdisk/Manifest b/sys-fs/mac-fdisk/Manifest
index e186dd163d7a..c31c536e02c9 100644
--- a/sys-fs/mac-fdisk/Manifest
+++ b/sys-fs/mac-fdisk/Manifest
@@ -4,10 +4,13 @@ AUX mac-fdisk-0.1-headers.patch 2050 BLAKE2B d375f6e4eb9ec940957771047413de4e8b3
 AUX mac-fdisk-0.1-r6-ppc64.patch 13664 BLAKE2B f0dcdb916fb9f6d07f8696613fbac8953e407dfb4bdc5f218d0a67c4b6dfc67fc0049add4a59806ed0ce513412c4b9d8b2a06ba1c4a305f533fa04c5a715d96b SHA512 8ad99f6f205d7f4ced33c1da93a76b4329c24c85e85ea5f0fda579002d1e7282c5764cdec37c7a7c99e4f198d34259a382ed37cead60b8307a7779806142d49b
 AUX mac-fdisk-0.1_p16-ppc-inline.patch 863 BLAKE2B 3af665308ee82c2854047a5a80749122e02a3ab75370ff03e1f0322f54977ac9722f81a1a53cf918e0400bf9bc9bd03e9f31732574a22533e9f956eecbe54420 SHA512 40e213b1f0234195eb14450fe9fb326de2401552747af15eb743c0fbedd5f94aebe41245ad6f892a0aa34b6041cad2728530b7c6290731375b4dfe06c0e0102c
 AUX mac-fdisk-0.1_p16-ppc64.patch 12912 BLAKE2B 39b808d7e69e1ce705e6b8e231a1f0db559863fb2f80cd15bf9a3971c87e4a6c0a06e85dc3726489a4f82493aa7e85da1597c101ea1eed174bd58d3615167d9d SHA512 e521009d628934fe3925085c941d2bb3fba9c3322ccaaa6dd650ecbc6b990056f9bf186adb3a645dc8593efdb44611b69a7b6bf4e87d262870bbb515581e0ef3
+AUX mac-fdisk-0.1_p18-lseek64.patch 754 BLAKE2B b78d43edba6cf7c1f08eae6e55749c5abe0aedd35dfe8a445e3400235801d0e7d383e954dd3596b3eacfc5672227e7e76e6c1d527019b0c9b1b5a052a7b0e040 SHA512 15eccaa1fe60e7478c6636cdac8bc9f064847b52536c9bb38a9417ef1f1bdedd617f6f9f67bbb9377429c24797595f610da7128ae7dade216936786374e098ec
 AUX mac-fdisk-amd64.patch 5154 BLAKE2B c8bbc117df448bc4c1181d9c172bc78dd5b1fd021184be73ecdc41568fcaf73e1daec8183d43f355b4bba876a0399f3dfd2c05173d7c9fee6d8d95068f141633 SHA512 241576f64dd334f98e8c9cb9e0b17b6366e208f2d0af47ddb4659cf2d8e25ca8f44a84d1f7fa2e5f6215f4be42668f43f034074ac981a0d87ca8483505a3623c
 DIST mac-fdisk_0.1-13.diff.gz 19615 BLAKE2B 75f81f5adcac44803e581b0959a13e27cb588fb7220c19e2ea07f8784af4eae2b1f39c3e268a0bbed8765fc3d430805b2ef13f87cb7810d1e0a758b1d9c751a3 SHA512 adc34f20e73ae91c39acb073f70f0041a4a0726985fc5e5de34ae433996b3f719ca4193cce51efc6599ba1773ad63fee045a8d72b6bd8a036c188d762626fe57
 DIST mac-fdisk_0.1-16.diff.gz 19896 BLAKE2B 9383a22fb02f44d23802dd57acdf3e956c68aad17927030395f03c0422237fb6420430277b3bd512b8267ce0e36dee7b19355820fb5005db646bc21748221ced SHA512 deb44217afae097594e14dea6cd128f6cb1e8ed6e62e646d2aa311508ea27d164c94187e8eb1f1d018ee6044346f6785770981a655b6ad536dbbce550df13359
+DIST mac-fdisk_0.1-18.diff.gz 20267 BLAKE2B 111e5b18c1485b33cfb2f653846e901a528e65207d705f024bb4ba1e181881913fc79cc2bf94c536e0bd2f88f9169d25f2a64c0d1464844a2ebb8e24f1554a61 SHA512 5774e86e1770873cbccb80a79941c6bf917ac1df62f722805b1c4eae0a76b318b3df36ed39ac16d8b051e771603cc42a13feeaadd451343f6a21703e07e58c11
 DIST mac-fdisk_0.1.orig.tar.gz 55817 BLAKE2B d193be6b06be562bcb3297300dc009ac28adba41ea5d7c1a5bc0d16b8f9ec8275e1ad015c9bc529c3aafd12cbd9012e1af7baef7259ce0c8cef4d6dc62986dec SHA512 1263e60a18111162f5ef439b5f9615cef9de94e7836cb998782a6e6d3bcf92a69e49566b33c7330bdea05de5e6ca83f7920c6707f342ce515440160695f07120
 EBUILD mac-fdisk-0.1-r7.ebuild 1348 BLAKE2B a0b4d9462e7c45a0cf57c1cd8652a5f3ca42a1d9e50f3c601bcb93e99caa666c34a6567bc34b68b4d0c3395934b34394eb70dff13f7d66efac8d40fd8b7ec83e SHA512 4ef48d9a3ef95d08ac60313c40fd7cfbbb41d42940065cebf1961d7705e4510a25ac5eca7732f948692d6bd861ffd019dd436aa55a7dcdf353c0d5dbc2164988
 EBUILD mac-fdisk-0.1_p16.ebuild 1293 BLAKE2B 61dec1a06762c62770735430b474d39007c9832ffa566e43e9f7771ebb7be67d28b53b87954884345acb0f541fa917db8ea652eaf623cc316dc3cd986bf97419 SHA512 e0b81a76399e70dce7ba67490fe5767d7e98f1417fcbad9593710a7dbd77850fdeee9efdcf67c0b01322003a882eb1af10cc38cf343e87e6e0765243d4115330
+EBUILD mac-fdisk-0.1_p18.ebuild 1274 BLAKE2B 0768956f8c19d15b0d7cf92a888088af68c2ebd730320aa2732090c5064a9b14a83df3739920aa25514fd3940316659c3f178d62059a8c0ef732fad8675d40ec SHA512 b6635ee4b5107d275d34d723d1cf08d5e3bdb6d2e77d6fde3aba3ee346c0c00647aa6b2ec91f630dceb86f8462ef29796103029daa04ca86eb00351c3aaa15fb
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p18-lseek64.patch b/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p18-lseek64.patch
new file mode 100644
index 000000000000..d075d4760b81
--- /dev/null
+++ b/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p18-lseek64.patch
@@ -0,0 +1,43 @@
+--- a/fdisk.c
++++ b/fdisk.c
+@@ -59,6 +59,10 @@
+  */
+ 
+ 
++#ifndef _LARGEFILE64_SOURCE
++#define _LARGEFILE64_SOURCE
++#endif
++#include <sys/types.h>
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+--- a/fdisklabel.c
++++ b/fdisklabel.c
+@@ -35,6 +35,9 @@
+    SUCH DAMAGE.
+ */
+ 
++#ifndef _LARGEFILE64_SOURCE
++#define _LARGEFILE64_SOURCE
++#endif
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <stdio.h>
+--- a/io.c
++++ b/io.c
+@@ -25,6 +25,7 @@
+  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
+  */
+ 
++#define _LARGEFILE64_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <fcntl.h>
+@@ -37,6 +38,7 @@
+ #endif
+ #endif
+ #include <linux/unistd.h>
++#include <sys/types.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <stdarg.h>
diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild
new file mode 100644
index 000000000000..195bc8335867
--- /dev/null
+++ b/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Mac/PowerMac disk partitioning utility"
+HOMEPAGE="ftp://ftp.mklinux.apple.com/pub/Other_Tools/"
+SRC_URI="
+	mirror://debian/pool/main/m/mac-fdisk/${PN}_${PV/_p*}.orig.tar.gz
+	mirror://debian/pool/main/m/mac-fdisk/${PN}_${PV/_p*}-${PV/*_p}.diff.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S=${WORKDIR}/${P/_p*}.orig
+PATCHES=(
+	"${WORKDIR}"/${PN}_${PV/_p*}-${PV/*_p}.diff
+	"${FILESDIR}"/largerthan2gb.patch
+	"${FILESDIR}"/${PN}-0.1-headers.patch
+	# Patch for bug #142737
+	"${FILESDIR}"/${PN}-0.1_p16-ppc64.patch
+	### Patch for building on amd64
+	"${FILESDIR}"/${PN}-amd64.patch
+	# Patch for large (>550GB disks)
+	# Note that >=2TB disks may not work due to limitations of the Mac
+	# Partition Table structure, this needs to be investigated
+	"${FILESDIR}"/big_pt.patch
+	"${FILESDIR}"/${PN}-0.1_p16-ppc-inline.patch
+	"${FILESDIR}"/${PN}-0.1_p18-lseek64.patch
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	into /
+	newsbin pdisk mac-fdisk
+	newsbin fdisk pmac-fdisk
+
+	into /usr
+	newman mac-fdisk.8.in mac-fdisk.8
+	newman pmac-fdisk.8.in pmac-fdisk.8
+
+	dodoc debian/changelog README HISTORY
+}
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 21d6ca075cfd..3d3e72a591e8 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -5,13 +5,7 @@ AUX mdadm.rc 465 BLAKE2B fef5cc1cc68d7d5e11250b6196cfd1fa45bd39e14d90c723d44d7b6
 AUX mdadm.weekly 187 BLAKE2B 50048d84cd57b384b98fcdb6b2a4a18380aab6e76877ee9edd460e65ef9f35981c05b12f32e96dc0b6a8247e628ff162b0a1171fe00fa55aa3f4dfb47e2fc91a SHA512 3bc7bf8c9593f06e42ae657e2bce416758090d1f999a447986df17b97e1494b261f02155b83932295f2f3bbab7d8933cf647c834bfb1d7def879cbedfaa6d7c2
 AUX mdraid.confd 383 BLAKE2B c61fd2c072a0d12ca21ad4f8a60a55101b4e452f9acc8cdcdf9a6069060b11bf90387830f516b69d266fef061112ba41f903b9371fff91c94c9332b12e436145 SHA512 37fe70f5df0fb2b68be01ee774e3a943cfb280322f2db0c5d6892e701fb58be26a225b78448814294bf68f154cca697278fcf9572a47b6201920d95ad05189d6
 AUX mdraid.rc 759 BLAKE2B 41f1b4cb9dd29411d56bea656dddc2cb2fd3cc14b183d05c502fb5e29407d1d816de9595e13349ef7e03240308cf4395578be31149f59d1960d1feee0165506d SHA512 d76190646b393d1480607b0d89d08ce4196738295fbb7790fa1035c53a041b5cb88fe857bb2070920a9c3ae21b9fb8f7838dde240fa0e275e5915add9c113021
-DIST mdadm-3.4.tar.xz 422704 BLAKE2B 0e8251fefb2db853a921215a07f1f7e70dfcd6650c20493cb487d4ce32cb609fe8191297046161e62f802c75150e6628b52192bb466d72c4cabfb1bcfae09839 SHA512 5de06f3a2b83333e5346a1e858b15e76f75a13a1d5c5f2032fecc6eb167454b282e12ee111ac2abec778e058ec9554708ac317a476778328546603618e6f70f7
-DIST mdadm-4.0.tar.xz 430780 BLAKE2B f08a67452398c864d73c78e2a7258d89c5c81b83dd136d4cd7e31e46b22d75ff67ecf553dc22f55dca418409daded51a399728dfdbd36039e828cad3233774e6 SHA512 12fb26e6b9c1912698defa406e5e47a7ca8d68d4a9aa7acdc9b463ee2d4a37fc6ecef6beb5395ff619018c3f6bdb6d8c573060d027707540f645ad2265170e8b
 DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd51783288594bf746832311c64b8cf82004af4af5f246c5f9753f1de324ff7d49b5ee752d6a00ec03864f7885389706e SHA512 0859c5d3e786345d93ff2c3b291ca8866ba60f1375479e5b4d343124f6824140a8268d42b8ae603b069edba761aa30aaf20d49e9ec54dfcbad34bad3bea0e433
-DIST mdadm_3.3.4-1.1.debian.tar.xz 86312 BLAKE2B 367a9ed4b16b73a63b613e8029934ee8fbb056e33ca621e92964408ac9a3b3d107af03b657dbfe572f63150e5438879f6dd29a7e7cca1599b213ba135249e78d SHA512 ea9b34a9952e1ff836cb931c7eef0ae0c44e3f4d46162c7a7eca24936d6f7168e99d67749b3100bc68ebadc8f256e4833d42da48c531cf71e6e8f3100911828f
-DIST mdadm_3.4-4.debian.tar.xz 81200 BLAKE2B 393bac2310139788935ced77b736d60d11f58e86349990034367af5460483e97239eef5a6622405b68a7aa6f65059bc5692518172e422c3596ab879527619952 SHA512 86a9edb8f29931fdfa40037d535ca80f0bf59539fe1ef16f2639e666a5ac1bd90ec617ec1635080ae62a02f7986a6e10c97dce5389555ab7d417885f216c0f93
 DIST mdadm_4.1~rc1-4.debian.tar.xz 104716 BLAKE2B d3f5def44de4e83ba302c25438b0f4b2cba0ea1d65964482d6ad1fe1c9e7847e04ef5068859fbefba7125b0931a6473746eef18f1152d02ca604a6fe01e39c99 SHA512 25f60d6bb789ecc8db64dd1fdc750f0cf875f52e28fe82b10bf870e39f751b7e819d45e85c13252ce1b4b728e957216fb28ccd41d04dc8d7386cbd8cdd113fac
-EBUILD mdadm-3.4.ebuild 2312 BLAKE2B 41ef408ace17b030f2df95ccadccf30e27d9e8f352407882dee3d2b9716f0c9102fa59d61d1242cb7b6f6cb729400f3734df4826f4747180949e32da6b0d9bad SHA512 a9db6b4547e842873cda2a6ab5adf9d3c9cc3a32fcb6f119479f3ad3b204a61ec7f70008fd90facfbb4b0acfc34d39c39b123aef6feceebee62fc4a37671e507
-EBUILD mdadm-4.0.ebuild 2317 BLAKE2B f0b6868f68dac70629cd334394edf4bfa354fc8c9d954b0abd1c79cc01db4d56d901c5fed0e4cd03a9b99f066c502b11ca5bd24f282fb39ee35e3cf0f78b695c SHA512 44784eab4666f253615afc8fa362e7d445639bb2d8e9922526fa01dd76143886b5a6dd69baac7a1534df22fa1dcb0d95c4c1ab9589c22641c80ff1faaaffbd9a
-EBUILD mdadm-4.1.ebuild 2291 BLAKE2B 2672eba9227ba577838f17e3c63eec81be869c88166df1324ff94328b4f1cf41addfa35e8baf72bafa4587782f992b3094893c5f32f635a2d1e9c4a413c689df SHA512 7ee57f202f9b9210014640d8fd8b7b295ffca8dcfadb2e030de330d01567108336aa455f282fa8b512c5ec980db7d4a52fa1935e6b60b18c169aa66bd2bd9184
+EBUILD mdadm-4.1.ebuild 2289 BLAKE2B 40a056e951eeea1f82888f77a30dd6135cac8ef2ed540978e2aba7e033de9d39531f1a66b3a814db2c1daec7c0b139c1599039e9ab648fd5c6d7076172bb08e4 SHA512 6ca0581a0ff88ce66e5fee54fffd727c96e1a732ebfa53b3ab43435c987831b6540d1936a8c12f3b500adb1a356f1137f215aa020444c5943c0c06920993487a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/mdadm/mdadm-3.4.ebuild b/sys-fs/mdadm/mdadm-3.4.ebuild
deleted file mode 100644
index 14b87d2989a2..000000000000
--- a/sys-fs/mdadm/mdadm-3.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib systemd toolchain-funcs udev
-
-DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
-HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/"
-DEB_PR=1.1
-SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.xz
-		mirror://debian/pool/main/m/mdadm/${PN}_3.3.4-${DEB_PR}.debian.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="static"
-
-DEPEND="virtual/pkgconfig
-	app-arch/xz-utils"
-RDEPEND=">=sys-apps/util-linux-2.16"
-
-# The tests edit values in /proc and run tests on software raid devices.
-# Thus, they shouldn't be run on systems with active software RAID devices.
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.4-sysmacros.patch #580188
-}
-
-mdadm_emake() {
-	# We should probably make corosync & libdlm into USE flags. #573782
-	emake \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CC="$(tc-getCC)" \
-		CWFLAGS="-Wall" \
-		CXFLAGS="${CFLAGS}" \
-		UDEVDIR="$(get_udevdir)" \
-		SYSTEMD_DIR="$(systemd_get_unitdir)" \
-		COROSYNC="-DNO_COROSYNC" \
-		DLM="-DNO_DLM" \
-		"$@"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	mdadm_emake all mdassemble
-}
-
-src_test() {
-	mdadm_emake test
-
-	sh ./test || die
-}
-
-src_install() {
-	mdadm_emake DESTDIR="${D}" install install-systemd
-	into /
-	dosbin mdassemble
-	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
-
-	insinto /etc
-	newins mdadm.conf-example mdadm.conf
-	newinitd "${FILESDIR}"/mdadm.rc mdadm
-	newconfd "${FILESDIR}"/mdadm.confd mdadm
-	newinitd "${FILESDIR}"/mdraid.rc mdraid
-	newconfd "${FILESDIR}"/mdraid.confd mdraid
-
-	# From the Debian patchset
-	into /usr
-	dodoc "${WORKDIR}"/debian/README.checkarray
-	dosbin "${WORKDIR}"/debian/checkarray
-	insinto /etc/default
-	newins "${FILESDIR}"/etc-default-mdadm mdadm
-
-	exeinto /etc/cron.weekly
-	newexe "${FILESDIR}"/mdadm.weekly mdadm
-}
-
-pkg_postinst() {
-	if ! systemd_is_booted; then
-		if [[ -z ${REPLACING_VERSIONS} ]] ; then
-			# Only inform people the first time they install.
-			elog "If you're not relying on kernel auto-detect of your RAID"
-			elog "devices, you need to add 'mdraid' to your 'boot' runlevel:"
-			elog "	rc-update add mdraid boot"
-		fi
-	fi
-}
diff --git a/sys-fs/mdadm/mdadm-4.0.ebuild b/sys-fs/mdadm/mdadm-4.0.ebuild
deleted file mode 100644
index 4532b9e2202a..000000000000
--- a/sys-fs/mdadm/mdadm-4.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib systemd toolchain-funcs udev
-
-DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
-HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/"
-DEB_PR=4
-SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.xz
-		mirror://debian/pool/main/m/mdadm/${PN}_3.4-${DEB_PR}.debian.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static"
-
-DEPEND="virtual/pkgconfig
-	app-arch/xz-utils"
-RDEPEND=">=sys-apps/util-linux-2.16"
-
-# The tests edit values in /proc and run tests on software raid devices.
-# Thus, they shouldn't be run on systems with active software RAID devices.
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.4-sysmacros.patch #580188
-}
-
-mdadm_emake() {
-	# We should probably make corosync & libdlm into USE flags. #573782
-	emake \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CC="$(tc-getCC)" \
-		CWFLAGS="-Wall" \
-		CXFLAGS="${CFLAGS}" \
-		UDEVDIR="$(get_udevdir)" \
-		SYSTEMD_DIR="$(systemd_get_unitdir)" \
-		COROSYNC="-DNO_COROSYNC" \
-		DLM="-DNO_DLM" \
-		"$@"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	mdadm_emake all mdassemble
-}
-
-src_test() {
-	mdadm_emake test
-
-	sh ./test || die
-}
-
-src_install() {
-	mdadm_emake DESTDIR="${D}" install install-systemd
-	into /
-	dosbin mdassemble
-	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
-
-	insinto /etc
-	newins mdadm.conf-example mdadm.conf
-	newinitd "${FILESDIR}"/mdadm.rc mdadm
-	newconfd "${FILESDIR}"/mdadm.confd mdadm
-	newinitd "${FILESDIR}"/mdraid.rc mdraid
-	newconfd "${FILESDIR}"/mdraid.confd mdraid
-
-	# From the Debian patchset
-	into /usr
-	dodoc "${WORKDIR}"/debian/README.checkarray
-	dosbin "${WORKDIR}"/debian/checkarray
-	insinto /etc/default
-	newins "${FILESDIR}"/etc-default-mdadm mdadm
-
-	exeinto /etc/cron.weekly
-	newexe "${FILESDIR}"/mdadm.weekly mdadm
-}
-
-pkg_postinst() {
-	if ! systemd_is_booted; then
-		if [[ -z ${REPLACING_VERSIONS} ]] ; then
-			# Only inform people the first time they install.
-			elog "If you're not relying on kernel auto-detect of your RAID"
-			elog "devices, you need to add 'mdraid' to your 'boot' runlevel:"
-			elog "	rc-update add mdraid boot"
-		fi
-	fi
-}
diff --git a/sys-fs/mdadm/mdadm-4.1.ebuild b/sys-fs/mdadm/mdadm-4.1.ebuild
index e3943f1d3d3d..2247f704d965 100644
--- a/sys-fs/mdadm/mdadm-4.1.ebuild
+++ b/sys-fs/mdadm/mdadm-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P/_/-}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static"
 
 DEPEND="virtual/pkgconfig
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 1d047220df16..e62579a4659a 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -2,9 +2,9 @@ AUX mtools-4.0.18-attr.patch 1804 BLAKE2B dee4d21870fd9f633ef8966513960b74a1fdaf
 AUX mtools-4.0.18-locking.patch 5744 BLAKE2B 509462f40e2a832d1a04358972d606d29d6a0b5d7d095438d1c17bb8b7636aac382f9bb0055e669aed661a89bd6e018f1d88a588f0bddf701e5c0eb88449f94e SHA512 0698b5c5f5d4c22f3439a835c3bb6f73a90c3030073f3497fa04a8e29241af867f664f253b37299d69ca043858b55e7290aaab1fa6f751084a52e7812cae4170
 AUX mtools-4.0.18-memset.patch 877 BLAKE2B 5a331eb50cca56c64c135974b56bcc651e6f7498740cad8dc4c5121efe23802a228bb73e5f18ee20b0e3ef81ea6ebd78cc19e037556f0294519b54a84697f993 SHA512 1e8d697c1cd98a7fedaed96e6019b6af96bf5ed6633f50f7c45649555a27727d93ba828e2852f23fb633832902bdb93c23afacd7022c72adf5c4a146f5b8a1a8
 DIST mtools-4.0.18.tar.bz2 420190 BLAKE2B 92fdf8b054287e3cb4eddb40c98f5ac4229a38473b633c25ab74a07a8a72d38c2767ae648a35cf0dac9dedfa2f7789afc4904a50e1328e2baa0a289d93b094fb SHA512 3981a4727aa4e2ec5c931201b236f52fcd1c9d55f888cb2fbdc5c4172402e2b229ede9a5005b972ffdad59bcb861e2fcc01404845e521116419079ae78239090
-DIST mtools-4.0.19.tar.bz2 445566 BLAKE2B 2f35eaccb65ba39cb365ecaf1de95cff038370503bcb9dad4dc1bb654d00d1559c7183f8a30538f0fb6ce12332521083eefaa34f4eda9bdc9698cd54a0689fa9 SHA512 8928baa197bb3ad0f5e5b6852bfb1b4220bc50d19527e703025cec98bf9988faba496d91df71b14d936a095cc89ce92ce533abe9adf5fff2602f139cb3c6085a
-DIST mtools-4.0.20.tar.bz2 449835 BLAKE2B 51ee105e57c2cf56acf46d1ea9e0c1a5b89f85916cbd160421ebb992cdfdc7722d257b81cc794cc6d2dbc18728edb6e24c51d460adcb95291021e189a5c0c3e6 SHA512 2b99d2cd86deaa38a47b377ba47c2b88ccb99159085b59db9c2b4f1f9adcfd011f92934419e7b33a634a1ffddf336c8f11229071847ef082fe56b9b91b5f3a36
+DIST mtools-4.0.22.tar.bz2 431185 BLAKE2B 19b6ed58fd44e51eba11799347590f8c36fe2de7cbb2b612c0f16f4f35c916331abf19b8ca9a735fcc627db5180b1f8cbf355e25319af8587a0de033d50a6e79 SHA512 9a35a27c6de768e3e925d9163aeb8b021620de9016cf12666ee0259cbfc87fa7a8d0311fc0a77c04dbef8bd3e8d86c747069a9aca2f5df69e6391c3cf5a0b113
+DIST mtools-4.0.23.tar.bz2 418592 BLAKE2B 442f552087a5d53ef0ead6161cdad7997dc45a3e210c2cb442a8b2ba42866152f93e4a1f5b58df8d68316168374ea034b390bcf4c607ac3a1c477c4ec5e7842c SHA512 c8c48adedc3f3e4eeafead27ce80172c9cb9690b575618842001ed16aa0011dcd2bc517882ea4bf01a73810ba151aa4b86f8ce2f97d6e8a0177d09be71a6d1ed
 EBUILD mtools-4.0.18-r2.ebuild 1442 BLAKE2B 7aaa093e1f1bbc4df2201b1c66044141914cbf49479cbac748026604ead012f986dc5228340448d60aa169023f6f5b7a2d5d826e19bf5e2618059ab8bacdc4af SHA512 32a807769bebeffad14f2a366e5536cb9b055f24cfa3a15508267eb88e4015f33713e8fa338078834942fcfc0d44ac22e15bb3265f45ab96420466ed4c1b77d5
-EBUILD mtools-4.0.19.ebuild 1460 BLAKE2B d4dbeeb9a245221fd74e478a026bd35a618bbcf1a4d33ab9f1ad9dee0264fc77dbc1bbdcd3b9ea78128cfa54fa83c0611f2a3d266853dceb93b987bb7b2dd8bf SHA512 0601d64c3b944d8ee6727a934038addd6a4a24e3710ab4d7c0499541a7944506f35650c74188dc932b848e4c05e124b96f31afab702a1d0726bba94775f37941
-EBUILD mtools-4.0.20.ebuild 1232 BLAKE2B 8e09a9a483a6eaa3028839de1b6f7cb86ffa5aacbe5936828b9551f56dc2d62a9b6868e08bc111768ca1087a405b6acb1278da522303f809998453ef5ce1ee1d SHA512 2510d093f7bcfc8b8545cd1220c840e7d30d976bebc631cec4ac9986085ad7e35e143ef9a469e302206f0bfa15c262db0a00a9650a622f18bd168c823d58cd36
+EBUILD mtools-4.0.22.ebuild 1178 BLAKE2B 3fa2b089538673259b7e6600a841f94b96a116213aa76d31be62951537ce662c8b1d78720c55a6f0c40f8ae4e83261abe2a35cb25d3f76a5160cb23bb7054bef SHA512 ac4561a82fb5d0c6658d9173585dd173f631bd374793ea2c53038b40a7f789e4bc48ae097187303010a5e6cdbd49ab59fa1f1848f342a75d5148a5324a103762
+EBUILD mtools-4.0.23.ebuild 1178 BLAKE2B 3fa2b089538673259b7e6600a841f94b96a116213aa76d31be62951537ce662c8b1d78720c55a6f0c40f8ae4e83261abe2a35cb25d3f76a5160cb23bb7054bef SHA512 ac4561a82fb5d0c6658d9173585dd173f631bd374793ea2c53038b40a7f789e4bc48ae097187303010a5e6cdbd49ab59fa1f1848f342a75d5148a5324a103762
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/mtools/mtools-4.0.20.ebuild b/sys-fs/mtools/mtools-4.0.22.ebuild
index 3dd3d67269f5..651e08e2c962 100644
--- a/sys-fs/mtools/mtools-4.0.20.ebuild
+++ b/sys-fs/mtools/mtools-4.0.22.ebuild
@@ -25,10 +25,6 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.18-memset.patch
-)
-
 src_prepare() {
 	default
 
diff --git a/sys-fs/mtools/mtools-4.0.19.ebuild b/sys-fs/mtools/mtools-4.0.23.ebuild
index 241e6ded35ab..651e08e2c962 100644
--- a/sys-fs/mtools/mtools-4.0.19.ebuild
+++ b/sys-fs/mtools/mtools-4.0.23.ebuild
@@ -23,16 +23,7 @@ RDEPEND="
 		x11-libs/libX11
 		x11-libs/libXt
 	)"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-# texinfo is required because we patch mtools.texi
-# drop it when mtools-4.0.18-locking.patch is no longer applied
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.18-locking.patch # https://crbug.com/508713
-	"${FILESDIR}"/${PN}-4.0.18-attr.patch # https://crbug.com/644387
-	"${FILESDIR}"/${PN}-4.0.18-memset.patch
-)
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
@@ -44,9 +35,11 @@ src_prepare() {
 src_configure() {
 	# 447688
 	use !elibc_glibc && use !elibc_musl && append-libs "-liconv"
-	econf \
-		--sysconfdir="${EPREFIX%/}"/etc/mtools \
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX%/}"/etc/mtools
 		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index d75ceb27788b..30a1e8211c0f 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,16 +1,12 @@
-AUX multipath-tools-0.5.0-makefile.patch 6790 BLAKE2B 519417d6cf3aa8fefc181b95d62b8be32d5b6dd7de27fbe85b1928a0d2981be3d7ab97e176c8ecaedc5431c2acb0256aa840c52fb06b925c057934baf7527dcd SHA512 bed96f4cdb40df1e4c126a218c67c2a48a9c9a5df8248848ff69d928f07f1cf6ffd97e02dc0aa086171d4d65f56144c918267874b6b551e689243364908b5cf1
-AUX multipath-tools-0.5.0-systemd-pkgconfig.patch 1192 BLAKE2B 7d640f27a8b736abfa33aa50d9e73c6cb27c48189df45f88c9915e683d114f9cab6d447b1decff7dae0bb4d2051d9803d7b02679b007a84ae1e65ce4eb60a00f SHA512 60b5717b0e3fd9a3d422b756359ce6bb5018346c104bd45543135257b1c4efb3c586d188e35176bbcfa2c81ed9d4824e3c96cc395e52605934e9cc4935f17fec
 AUX multipath-tools-0.6.2-ignore-modprobe-failures.patch 831 BLAKE2B e30f06a67f8e5f00156f35abf4c60dec71f5b3f8487b8a6822a0a5eae32f6b034fd2be98da34aad085db933a0cef592d0056075819a9e8985a8aab7b3743cfd4 SHA512 62e40c6577bc7cd24f3283de94692cc7550d39a9caa255ca5d77c2d3c324a85c0364fca73b154f17197cf38b82b171eae759f9eb1ecf8ab5801afafd42b1b156
 AUX multipath-tools-0.6.4-sysmacros.patch 1554 BLAKE2B d293a6a72fbf0480c711af66b8bbb78da3584270c766cbcdd096bbd46b2f34170a68c459c5cc9b4d472359a80aeb108498209ac926623eb09277af18a5ff1170 SHA512 1f6c862e0fc73859b670d2917b2e0d63731714edb07098929dbd46e7cc61f9d354f30558034993c8e719de103d4b37c16a34483236a040db28a983416772634e
 AUX multipath-tools-0.7.5-respect-flags.patch 660 BLAKE2B 1efc793d9741b1a732895cbd7cfb4fbf04026db24f834a5bec25c33413132b39e0afe46f8851a6dfd6bd05fe88bfc15fd8cc24f03df435f75c209c401bd68b6a SHA512 58a44988a5c9a82affa3fdc969eaac87b5672a743434f2c8cab269b0b526f1c150bc10655bccccc1e8a26e3237350d4824b0497bb29c925cd42a084f84268fcf
 AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe
 AUX rc-multipathd 402 BLAKE2B c44befc14ff361d27278bd7850aada4fb8e309c0459d9d1bdb3ca1a670929b2d8b40275c73cd937ab3245b95460b3e9e12ecf199532ec916e1cf5f3e634d3bbb SHA512 466296ff69c0f56c312a8b88445ca0719c8c6b794511f7e228812d63b859bd120b965301c8923e3411a3e1b196e7fb9c48dd7dbe004efe4c65ee7f9798cc3e11
-DIST multipath-tools-0.5.0.tar.bz2 184024 BLAKE2B 1e1b0fdd52bf0aaea3ed281e0cd89d04aed58c03b9b42ac094173bebdf3b81e368d0c7efb23a8748d4598c99d1502fdf5f8b2c9b64a2be4ce7d6b30fa607984a SHA512 dfad21c45d0f69e39041d30d203a582c8ee8329bf390c51cde10155b3de379e7ad8fead2ac4beb268a924fd7e7dc8e1cf538ea3c70d41479fd8786fa30ba22a9
 DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 1b63c4e712e682965c595ed988a6590e181abd4d37779b72b52f4e415d4caba33df518a1ea1e3b460d15b5a78f4db5a75c1066439eb40c503023007c1f70752a SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea
-DIST multipath-tools-0.7.7.tar.gz 398460 BLAKE2B 39ffa02d782858d1200080d11aafc341793b83e421a40207eaaf5084cffe5ef5e9e860d60cd03c828c1eb941be2f762b9ad9c2ea21e29b5f129fb26bd6090d22 SHA512 87458f3eb0aaac09b22972c4ff26e332d64841a3d19fefce69cae662f1e2ce2df778e1795d5b4089b1110ec5081c6021aadbb902eeaeb764f989031cbe7da825
 DIST multipath-tools-0.7.8.tar.gz 415900 BLAKE2B 04c237e91f8e56484603d5b5ec7504da6be1caf9564d21a9fa4be7268fbb88089b8446c959b57f859eb9696f39cbb82bffdcd3d0a6716da6487bedd5c18c0d8b SHA512 500a51f9e8c5cc0ad04cc69c39f657e8058a08750d506b447c4a1131ad7308d43de19d79e98fa8254c56cd7eb1e832c8ccbc439ce94054db7eeebcdf2bf225cb
-EBUILD multipath-tools-0.5.0-r1.ebuild 1728 BLAKE2B dd525f001463684fe5cb6ccbb112a658bcf02fcf94d672c44b3a9330bd275809486bbd3bd10e35a19185837b1bff349cfe037054e8e4d9fab5f87e7677e1a98c SHA512 e1de58801f4e2b71b44a4d60d385bd2067aa172841a90c078a5f6dc608999bfcd23059cbc730e18c910a7606bc44bfd9524a2e466b49ff38b90cfaac143def86
-EBUILD multipath-tools-0.6.4-r1.ebuild 2538 BLAKE2B 8b98d6457b56e933ae18291e32d40fb146ac6a63119ebade70275bcd7b16f76131da9ba238846ba5e3c7e1c7e83bb65aefdd8118a348233548a34e1a7f4870e7 SHA512 29af1b6a72776c14ff3d0099294e9c8d7e453e2547c4dffff0b28e17f2dc75680a1df804bb9f316a72c87a2d830923cbbd506772cf059da76d80a4dbca77f0cb
-EBUILD multipath-tools-0.7.7.ebuild 2061 BLAKE2B ca67cdf219fa6e71d2ff409489377c9a30bf3b8a6e7d8cab1b4d8a250aa4f87bf07add5b17d197fca82d34fe88fde20e45fb812bfd2bcf3043b232db75ac8404 SHA512 47acd1b937fc749b24dadc89763b891ed2c75bd13887e1abce5008b27ba3e525a5493d29ba8d74bc4e72bae209dcf1ddc69506e6f3da8777a158d38fe07f2ef2
-EBUILD multipath-tools-0.7.8.ebuild 2061 BLAKE2B ca67cdf219fa6e71d2ff409489377c9a30bf3b8a6e7d8cab1b4d8a250aa4f87bf07add5b17d197fca82d34fe88fde20e45fb812bfd2bcf3043b232db75ac8404 SHA512 47acd1b937fc749b24dadc89763b891ed2c75bd13887e1abce5008b27ba3e525a5493d29ba8d74bc4e72bae209dcf1ddc69506e6f3da8777a158d38fe07f2ef2
+DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379 SHA512 6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c
+EBUILD multipath-tools-0.6.4-r1.ebuild 2545 BLAKE2B f22afaabe21080d64175063c82e5a731d9e789968d1502b3771ade1eeb3ba3bf539d9cd1d100b75875a5f86fe85ef1ed77b8fee5178829ae301df23eadb0765c SHA512 21c5474be753c3762af2e1b73aab89d666d6f477d04b612360925ff10d994b1fd1152204a5254a39d87438cce274c0d57cb7003e37679b49d22b159fe5c0cfce
+EBUILD multipath-tools-0.7.8.ebuild 2068 BLAKE2B ec54d156a55c25a9c7cc9c6c3854a48c8bb1d404119398bfdb9defcb5c011e1824ce82f53cd5cc4d8e81a63bb412d11cb79ac276406e140f2808b911f7912947 SHA512 8e1fff8d8c71b2cac948e5501edef63acb7e0ba760e7b56a22644e0e08ce3cb9b70c29e69550f6a356113154f740a4e95199ac14e44b3d2db338605954d19be4
+EBUILD multipath-tools-0.7.9.ebuild 2068 BLAKE2B ec54d156a55c25a9c7cc9c6c3854a48c8bb1d404119398bfdb9defcb5c011e1824ce82f53cd5cc4d8e81a63bb412d11cb79ac276406e140f2808b911f7912947 SHA512 8e1fff8d8c71b2cac948e5501edef63acb7e0ba760e7b56a22644e0e08ce3cb9b70c29e69550f6a356113154f740a4e95199ac14e44b3d2db338605954d19be4
 MISC metadata.xml 364 BLAKE2B d1d285f68ff773055f374ad7f6790708b7fed62a0d9787aff638c6ced762ff34d62a94a90d79426dbf4a81d86cf2447f41947d7650d3f1bc366a9d3338af94ce SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.5.0-makefile.patch b/sys-fs/multipath-tools/files/multipath-tools-0.5.0-makefile.patch
deleted file mode 100644
index 691b138731f6..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.5.0-makefile.patch
+++ /dev/null
@@ -1,200 +0,0 @@
---- multipath-tools-0.5.0/kpartx/Makefile
-+++ multipath-tools-0.5.0/kpartx/Makefile
-@@ -12,7 +12,7 @@
- 	CFLAGS += -DLIBDM_API_COOKIE
- endif
- 
--LDFLAGS = -ldevmapper
-+LIBS = -ldevmapper
- OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \
-        gpt.o mac.o ps3.o crc32.o lopart.o xstrncpy.o devmapper.o
- EXEC = kpartx
-@@ -20,8 +20,7 @@
- all: $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 
- install: $(EXEC) $(EXEC).8
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -29,14 +28,15 @@
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
- 	$(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
--	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/
-+	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 
- uninstall:
- 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
--	rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
- 	rm -f $(DESTDIR)$(libudevdir)/kpartx_id
-+	rm -f $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
---- multipath-tools-0.5.0/libmpathpersist/Makefile
-+++ multipath-tools-0.5.0/libmpathpersist/Makefile
-@@ -22,8 +22,6 @@
- 	$(CC) -Wall -fPIC -c $(CFLAGS) *.c 
- 	$(CC)  -shared $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS)
- 	ln -s $(LIBS) $(DEVLIB)
--	$(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz	
--	$(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz	
- 
- install: $(LIBS)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
-@@ -31,19 +29,17 @@
- 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(syslibdir)
- 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir)
- 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)/usr/include/
--	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)/usr/share/doc/mpathpersist/
--	ln -sf $(DESTDIR)$(syslibdir)/$(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
--	install -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir)	
--	install -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir)	
--	install -m 644 mpath_persist.h $(DESTDIR)/usr/include/
-+	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3 $(DESTDIR)$(man3dir)
-+	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3 $(DESTDIR)$(man3dir)
-+	$(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)/usr/include/
- 
- uninstall:
- 	rm -f $(DESTDIR)$(syslibdir)/$(LIBS)
--	rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_in.3.gz	
--	rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_out.3.gz	
-+	rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_in.3	
-+	rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_out.3	
- 
- clean:
- 	rm -f core *.a *.o 
- 	rm -f libmpathpersist.so.0
- 	rm -f libmpathpersist.so
--	rm -f mpath_persistent_reserve_in.3.gz mpath_persistent_reserve_out.3.gz
-+	rm -f mpath_persistent_reserve_in.3 mpath_persistent_reserve_out.3
---- multipath-tools-0.5.0/Makefile.inc
-+++ multipath-tools-0.5.0/Makefile.inc
-@@ -48,8 +48,8 @@
- 	RPM_OPT_FLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4
- endif
- 
--OPTFLAGS     = $(RPM_OPT_FLAGS) -Wunused -Wstrict-prototypes
--CFLAGS	     = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
-+OPTFLAGS     = -Wall -Wunused -Wstrict-prototypes
-+CFLAGS	    += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
- SHARED_FLAGS = -shared
- 
- %.o:	%.c
---- multipath-tools-0.5.0/mpathpersist/Makefile
-+++ multipath-tools-0.5.0/mpathpersist/Makefile
-@@ -13,18 +13,17 @@
- 
- $(EXEC): $(OBJS)
- 	$(CC) -g $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
- 	
- install:
- 	install -d $(DESTDIR)$(bindir)
- 	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/
- 	install -d $(DESTDIR)$(mandir)
--	install -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	install -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 	
- clean:
- 	rm -f *.o $(EXEC)
--	rm -f mpathpersist.8.gz
-+	rm -f mpathpersist.8
- 
- uninstall:
- 	rm $(DESTDIR)$(bindir)/$(EXEC)
--	rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+	rm $(DESTDIR)$(mandir)/$(EXEC).8
---- multipath-tools-0.5.0/multipath/Makefile
-+++ multipath-tools-0.5.0/multipath/Makefile
-@@ -7,29 +7,27 @@
- OBJS = main.o
- 
- CFLAGS += -I$(multipathdir)
--LDFLAGS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath -ludev
-+LIBS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath -ludev
- 
- EXEC = multipath
- 
- all: $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
--	$(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
- 
- uninstall:
- 	rm $(DESTDIR)$(bindir)/$(EXEC)
--	rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
--	rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
-+	rm $(DESTDIR)$(mandir)/$(EXEC).8
-+	rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
---- multipath-tools-0.5.0/multipathd/Makefile
-+++ multipath-tools-0.5.0/multipathd/Makefile
-@@ -9,11 +9,11 @@
- ifdef SYSTEMD
- 	CFLAGS += -DUSE_SYSTEMD=$(SYSTEMD)
- endif
--LDFLAGS += -lpthread -ldevmapper -lreadline
-+LIBS += -lpthread -ldevmapper -lreadline
- ifdef SYSTEMD
--	LDFLAGS += -lsystemd-daemon
-+	LIBS += -lsystemd-daemon
- endif
--LDFLAGS += -ludev -ldl \
-+LIBS += -ludev -ldl \
- 	-L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist
- 
- #
-@@ -35,8 +35,7 @@
- all : $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -48,15 +47,15 @@
- 	$(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir)
- endif
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 
- uninstall:
- 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
- 	rm -f $(DESTDIR)$(rcdir)/$(EXEC)
--	rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
- 	rm -f $(DESTDIR)$(unitdir)/$(EXEC).service
- 	rm -f $(DESTDIR)$(unitdir)/$(EXEC).socket
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
- 
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.5.0-systemd-pkgconfig.patch b/sys-fs/multipath-tools/files/multipath-tools-0.5.0-systemd-pkgconfig.patch
deleted file mode 100644
index d75f841361a6..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.5.0-systemd-pkgconfig.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru multipath-tools-0.5.0/libmultipath/Makefile multipath-tools-0.5.0-modified/libmultipath/Makefile
---- multipath-tools-0.5.0/libmultipath/Makefile	2013-12-17 22:40:41.000000000 +0100
-+++ multipath-tools-0.5.0-modified/libmultipath/Makefile	2014-03-07 04:03:45.963309627 +0100
-@@ -9,7 +9,7 @@
- LIBS = $(DEVLIB).$(SONAME)
- LIBDEPS = -lpthread -ldl -ldevmapper -ludev
- ifdef SYSTEMD
--	LIBDEPS += -lsystemd-daemon
-+	LIBDEPS += $(shell pkg-config --libs libsystemd 2>/dev/null || pkg-config --libs libsystemd-daemon 2>/dev/null)
- endif
- 
- OBJS = memory.o parser.o vector.o devmapper.o callout.o \
-diff -ru multipath-tools-0.5.0/multipathd/Makefile multipath-tools-0.5.0-modified/multipathd/Makefile
---- multipath-tools-0.5.0/multipathd/Makefile	2014-03-07 04:05:09.340307633 +0100
-+++ multipath-tools-0.5.0-modified/multipathd/Makefile	2014-03-07 04:04:03.555309206 +0100
-@@ -11,7 +11,7 @@
- endif
- LIBS += -lpthread -ldevmapper -lreadline
- ifdef SYSTEMD
--	LIBS += -lsystemd-daemon
-+	LIBS += $(shell pkg-config --libs libsystemd 2>/dev/null || pkg-config --libs libsystemd-daemon 2>/dev/null)
- endif
- LIBS += -ludev -ldl \
- 	-L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist
diff --git a/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild
deleted file mode 100644
index 0edaad0c2843..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils systemd toolchain-funcs udev
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="http://christophe.varoqui.free.fr/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE="systemd"
-
-RDEPEND=">=sys-fs/lvm2-2.02.45
-	>=virtual/udev-171
-	dev-libs/libaio
-	sys-libs/readline
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-systemd-pkgconfig.patch
-	epatch_user
-}
-
-src_compile() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake LIBDM_API_FLUSH=1 CC="$(tc-getCC)" SYSTEMD=$(usex systemd 1 "")
-}
-
-src_install() {
-	local udevdir="$(get_udevdir)"
-
-	dodir /sbin /usr/share/man/man8
-	emake \
-		DESTDIR="${D}" \
-		SYSTEMD=$(usex systemd 1 "") \
-		unitdir="$(systemd_get_unitdir)" \
-		libudevdir='${prefix}'/"${udevdir}" \
-		install
-
-	insinto /etc
-	newins "${S}"/multipath.conf.annotated multipath.conf
-	# /etc/udev is reserved for user modified rules!
-	mv "${D}"/etc/udev/rules.d "${D}/${udevdir}"/ || die
-	fperms 644 "${udevdir}"/rules.d/66-kpartx.rules
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-	newinitd "${FILESDIR}"/multipath.rc multipath
-
-	dodoc multipath.conf.* AUTHOR ChangeLog FAQ
-	docinto kpartx
-	dodoc kpartx/ChangeLog kpartx/README
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "If you need multipath on your system, you must"
-		elog "add 'multipath' into your boot runlevel!"
-	fi
-}
diff --git a/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild
index 89238dd765fc..59c081dc6d95 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tg
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
 IUSE="systemd rbd"
 
 RDEPEND=">=sys-fs/lvm2-2.02.45
diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.8.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.8.ebuild
index 6d0be1d4eb2e..c4898d34da40 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.7.8.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.7.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="systemd rbd"
 
 RDEPEND="
diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.7.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.9.ebuild
index 6d0be1d4eb2e..c4898d34da40 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.7.7.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.7.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="systemd rbd"
 
 RDEPEND="
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index 0b080fd1f60b..59ca2183fea1 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,5 +1,3 @@
-DIST ncdu-1.12.tar.gz 140596 BLAKE2B 5594d2d1e0b96eb7a1aa4a8461592e0298f0cd95a6ecb1cf18e09dc62fa1af9b7c8ac7f7ce4f7e5ec76ae1fe4702d9e47fc6d5e8410ac9bac86f444b02053792 SHA512 20620dd79d2af878442769e097f13806f64f23875dcb85ebccd573a3de43aba5663d496049b64015d13f9a79d624298032c008ef61dfb6f61d8b12902b8dca12
 DIST ncdu-1.13.tar.gz 143819 BLAKE2B 8ba489dab1cbafec5b1d9b437b44aa7aa5d79ed7b6938f7904465c4d3803390307bfdfed531641fa186873005ce7f0c37db058855ffcd4ce45888bfbffd03c3b SHA512 f1f417caa9bd9e9d9aa6311962b461e48301cf9eab5d0f57073e25df01f96ded05dd093627b95b43afc659ad99aed869efd4a98d723f5835b100747b5525a60c
-EBUILD ncdu-1.12.ebuild 432 BLAKE2B 188c880232163301bb308b4080f32b7b249c2f13c144dda7786d30bd4deca2cf332d3c72863f5cd2b11cee5a724bca4524db0db62aa371b70b8396707f09122f SHA512 3450a2c99c636046913074afc646e79292de567533c8c31fdb59f58d3dff179c4b3581d16dd45147113c25de63d6666071bd597356ea5593a351c3a7a711c476
 EBUILD ncdu-1.13.ebuild 429 BLAKE2B b437604c81314a3aba39cc8e502e4c680aa09b153a8ad52006a0bec74deb03fbe73aaaa9efe2cdd4b2a84eb73e3b47dd8b851dc56483f36ace9290328d8023e3 SHA512 5e0208e5c53aa232f2a611e7784a6b18165156c71a7e2011186b4fa4f7d40a3b127452d531be8412ac8b193b464c8bd0adade8ca1f8bcd066417257e21ac5a38
-MISC metadata.xml 580 BLAKE2B 02c4868a6afb6f72a6e8ce6b2f6310dc05f895f08783d1163601c79f0ffc913f7e8f92cdf4eb53156ab4afba573eb17d0bb5763b0bf6409632b10d948e9e2a1f SHA512 71aa0fba8e2f364b9f4a7da7d50ab86e5534518d84f8a26f08a5738655eb5f335de1da5b373dae93b21610881023b6197ca06cedb3c12f4b7f1a02850bf1729f
+MISC metadata.xml 589 BLAKE2B 9915d839320066570a64eb949ce52f48af51689617cdb6cdbac0fb6094a3923900bb940ae84be99fcd52618db5ba8a2de698c5c0515f4e5f0a6a3dbf73a42165 SHA512 2c3cf9225fafe928e442ef61f3ec10b810051843c801f3901fe8cf97d0a22e6c2354c9b3517b0c9439fad6e5829fa223ec36c6c295f426aa8a8a89a06b637d21
diff --git a/sys-fs/ncdu/metadata.xml b/sys-fs/ncdu/metadata.xml
index 1dc620f7b66d..a257e66514e6 100644
--- a/sys-fs/ncdu/metadata.xml
+++ b/sys-fs/ncdu/metadata.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
-  <longdescription>
-As the name already suggests, ncdu is an NCurses version of the famous old 'du'
-unix command. It provides a fast and easy interface to your harddrive. Where is
-your disk space going? Why is your home directory that large? ncdu can answer
-those questions for you in just a matter of seconds!
-</longdescription>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<longdescription>
+		As the name already suggests, ncdu is an NCurses version of the famous old 'du'
+		unix command. It provides a fast and easy interface to your harddrive. Where is
+		your disk space going? Why is your home directory that large? ncdu can answer
+		those questions for you in just a matter of seconds!
+	</longdescription>
 </pkgmetadata>
-
diff --git a/sys-fs/ncdu/ncdu-1.12.ebuild b/sys-fs/ncdu/ncdu-1.12.ebuild
deleted file mode 100644
index 43abe04d5aef..000000000000
--- a/sys-fs/ncdu/ncdu-1.12.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu/"
-SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/sys-fs/rar2fs/Manifest b/sys-fs/rar2fs/Manifest
index c9d9655d5841..af7ec7501e64 100644
--- a/sys-fs/rar2fs/Manifest
+++ b/sys-fs/rar2fs/Manifest
@@ -1,5 +1,7 @@
 DIST rar2fs-1.26.0.tar.gz 258987 BLAKE2B ff1fbac1f6792f0423fffdfac789c9f7b7e56721f231590b85896e59e712628162e5c31ee6798b8e92001fe34157bb476811efd38f965897e02596d7740634b9 SHA512 f67ba9826eb3de9f6a82088a25c20393cec32fff3c51c1e6bec6b95dd9707fdbb56388639c160a487de687cfda18d7b4985462d22722fd7cc581066a24845d1f
 DIST rar2fs-1.27.0.tar.gz 259706 BLAKE2B 45f0fb1ccde4fe301bb7b648c2c5c5912a24d7451dbf45820fa6b0552882b9be47b35e8abf96fcf358334934d6629c834ab3acc5a8398d68e026878185e78492 SHA512 4ae9705c85a0da64b2329883df53bd27be545dbbb960b7e4cb8fda628baa4130192ceb2e06ec40c87b1aa7dd004956d4b9798350cee1f5b50590f7077f7abf90
+DIST rar2fs-1.27.1.tar.gz 260012 BLAKE2B 71f308827e33a32b5cda7d30d92147fe435eb09f914f50a7d7917ace18131a8d6b2568f50eaeedcaf2e19c66559666f67665f8ef7f475f57bb17032845c87159 SHA512 c31bc00e532192baa1faeaffa484306e13c1c4110677ae6235048087637a8af2f604ded9cfdec9889d9c5cb099e0433a50cbbce0fb034442d0201e19ff0abfbe
 EBUILD rar2fs-1.26.0.ebuild 639 BLAKE2B 13f95a4c16febae0c97fe42528495c2451e51245c0477e473db95386ca356ba33a78540101c249f14952ad122b3a2db4e7981cdca581508d42ed279cefdb9ab3 SHA512 f3e58c2db1b63331eaaf2f4f155e149c78a1f09941f201217da3dd69c2cdfae4c5bbc4274abd263ed8b3d3f1571311ef61ed217df98dbaf857b7a1522716a220
 EBUILD rar2fs-1.27.0.ebuild 639 BLAKE2B 3a2ad998531dffc3a5444316acce648bcb08134581a471b1381a84b4e79f1d1ede4894a1dd8d07ecba212d52705b91861c00376619379ec697a60b1526751cd3 SHA512 321cf80d4652412323fa8194ac7ed15675f62e14a3a84685e3deca6240ea270f4a8214c63812168158d79f4a79a5dc912122a9209f02ea63e633f1c78c0c1150
+EBUILD rar2fs-1.27.1.ebuild 636 BLAKE2B 201f135bb2623ea5df33cbadd03d40546bd18d4ef2e59f3d855b537b7e2ea62eb976d04480b667c870226f6b04d4272d6bfdb8c438683dfbbc46d3cacb7e326d SHA512 1b63ffc6610e2ffd0fa714ae357032a23990219dde3619a6f36b2e5f56fe0f6de49d515fffd65a655e256bc4aa96e2ebbd9492494c91fba88464ad6a519e9fc9
 MISC metadata.xml 325 BLAKE2B 64c8c579024bf3c2468fb6499f749f291d09eb3a2d408ce41520025df21e7f014e5ecc8b16a8225bd8b38f070c5d71f733292279eec426aa9c8ec2809bb2f9e6 SHA512 506c5eada02c3ecb80b891fe5c256eebd85e57d83a515eca336a82e362b0a1c9c6f96c15dc05eb88141ca3a445953ed1c2486fc924868071c50087ec3876cf26
diff --git a/sys-fs/rar2fs/rar2fs-1.27.1.ebuild b/sys-fs/rar2fs/rar2fs-1.27.1.ebuild
new file mode 100644
index 000000000000..6bf7bd3f3ad1
--- /dev/null
+++ b/sys-fs/rar2fs/rar2fs-1.27.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A FUSE based filesystem that can mount one or multiple RAR archive(s)"
+HOMEPAGE="https://hasse69.github.io/rar2fs/ https://github.com/hasse69/rar2fs"
+SRC_URI="https://github.com/hasse69/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=app-arch/unrar-5:=
+	sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	export USER_CFLAGS="${CFLAGS}"
+
+	econf \
+		--with-unrar=/usr/include/libunrar \
+		--disable-static-unrar \
+		$(use_enable debug)
+}
diff --git a/sys-fs/reiserfsprogs/Manifest b/sys-fs/reiserfsprogs/Manifest
index 9c0086b8de92..2afb1f55fb0a 100644
--- a/sys-fs/reiserfsprogs/Manifest
+++ b/sys-fs/reiserfsprogs/Manifest
@@ -1,9 +1,7 @@
 AUX reiserfsprogs-3.6.25-no_acl.patch 274 BLAKE2B 1b49c0c98d935c1bfcb0191882a7e8e21aecd042dc8a8ba5d3a807dc59534b9b47e727ca668741fd8a82c811a744706348c3ea88c39837af891a2c711437f5c3 SHA512 29419b64f7749612ab2883da91ac97831a2ba8aee819b6e0e8b781b34594541e59b6b7a3841e9967e4623fb9772e4be81b13970c86d61497222789ffa8b4e20e
 AUX reiserfsprogs-3.6.27-loff_t.patch 504 BLAKE2B 6c38ac24d9d8e0bc665557303b5cc299fdd3a4529bc29370ffa8129499ac9d6e1f0a7ed66c93fefa1a647a304ae77309dc87deeeb8b29961398e509f30d0cb27 SHA512 74332f8acd84a3d0374d6ff9803e63bc78ceb18ec130fef213bf326a6b146b8e4951ac8aee5b7349239716627889febd1c832862ae058a822cc71b0a75333d2f
 DIST reiserfsprogs-3.6.25.tar.xz 448984 BLAKE2B d9f032e51f70497cf84f5877172b68e8acacf8fecb3fee7d7c3d82c98cbd5c70f870baa96471b02f092345a86bb02501bd53156cc8e7e3230660a7a6865c2421 SHA512 247ca392d227680fb24e94cd490319e77e82d00d7d357516690d2cab6f0bbe8b35879f8a25ed5046bd3a7a3e1f2b140a8a82404043aa0e7f6f60f57d069857ae
-DIST reiserfsprogs-3.6.26.tar.xz 357276 BLAKE2B 820ec1733c96c9f63a52622424856b5030eba3878d00fbd389781eeea824ef128789168c84e46b8242c1bd96cf3e68e61bc91010b16789c499a44e451c8c261b SHA512 366f326d25fc5940ebc37b2b340607d2234296dfa42795e584cda670597e8dd859633499e6ab87ae8d53cd31b293ddbb15113944a17bfd601baa494abb02a9fa
 DIST reiserfsprogs-3.6.27.tar.xz 449176 BLAKE2B cd22120faa4d6d11ab545349fde5304f41cf3ca88b2c988255b7ca0e87961c9ccaa3095cad086e479a2b50627ad9bf3e90b2af46ddda64abc119e2a6755b8341 SHA512 bc524aa1ad7f8502238761fd185bfb8473048947bd579e2803c73371928c6b245e0d90bd9d458f4bebcbf163892dbc9f4bae65aec68ebbaa436be7451c13f50c
 EBUILD reiserfsprogs-3.6.25.ebuild 1161 BLAKE2B 10e8fc09d0f8892e29d135438dbbe0e75ba6410e3d534c543ec6eb3f2d7536bca47089d443ed4f989a187742ebe5d34ed8c4f781c1d97b7b08aa4b52a2974942 SHA512 0f119c895f87c32d09d722dfbe1a8dd27fbece3ff6991ea83d01ac039a1450b981e017fe66225f7b545764d7fc2d69915079528ec6ac6d61dcfebeaf35a4a492
-EBUILD reiserfsprogs-3.6.26.ebuild 1190 BLAKE2B 550e1f3fd16a54c5853df647f69c38bfaf82972de06c57474c07b198f349a2ae1f56a3313af0c8b3c9179e535e36dc40020f0f7eb8876b5f12a99f43a535f29b SHA512 c3f2f7642d89b8b95a4ac6baaad9a6a5d6a5c40f5f1f662c21c08ab90f9d3976cb4f39f2e5675565603b76d41c958d3d60250dc28648df499abd4f8d0696c936
-EBUILD reiserfsprogs-3.6.27.ebuild 1211 BLAKE2B d90fb8c6cb47aed64387617120db1b4829c0f5df9721bbf7670cf5f5d0bc18fc1d70cb30c84ef15220413cacb4b87cbf33963db7fd4be4da67f101dab3167f46 SHA512 94a99dad70da403ecf4dd5ab49ae384a99b9195624ab4f72cc33d6085e91baf4af0c2d86c2ecd451171cc0bfba25e048e6e7f38d836e158793367f8f7c64f581
+EBUILD reiserfsprogs-3.6.27.ebuild 1206 BLAKE2B f64548827d731d264ba1d6fc90bec864428c5ad188b51132864d6ce1a71486dc61b036439e55111c9ca19e88a652e9fe7a6bbf8dcaed146b4749878a1621d8cf SHA512 a99b0f6149aa38a22941a64aa6d5ed391381a38c4e33a19372fa2974ba7a89ad0f337eed80173349818b3ac1202453c83a017806b9728d4dd43ba21b41c6fd92
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild
deleted file mode 100644
index d6725dee34ee..000000000000
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Reiserfs Utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/fs/reiserfs/"
-SRC_URI="mirror://kernel/linux/utils/fs/reiserfs/${P}.tar.xz
-	mirror://kernel/linux/kernel/people/jeffm/${PN}/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.6.25-no_acl.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -std=gnu89 #427300
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--libdir="${EPREFIX}/$(get_libdir)"
-		--sbindir="${EPREFIX}/sbin"
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodir /usr/$(get_libdir)
-	mv "${D}"/$(get_libdir)/pkgconfig "${D}"/usr/$(get_libdir) || die
-
-	if use static-libs ; then
-		mv "${D}"/$(get_libdir)/*a "${D}"/usr/$(get_libdir) || die
-		gen_usr_ldscript libreiserfscore.so
-	else
-		find "${D}" -type f \( -name "*.a" -o -name "*.la" \) -delete
-	fi
-}
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
index 04b0f4bf7daf..a5d28011df58 100644
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/utils/fs/reiserfs/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/sys-fs/shake/Manifest b/sys-fs/shake/Manifest
index 782e0a1b5860..9e380662ed7d 100644
--- a/sys-fs/shake/Manifest
+++ b/sys-fs/shake/Manifest
@@ -1,7 +1,4 @@
-AUX shake-0.999-fix_stat_include.patch 827 BLAKE2B 1378aa730f27f9a0201cc7f43fb09b7b930a7b59a9e9c7e492f3e68776146d67c2656e4f0ad9f1098a9dd10a0fb60057e0ffad14e955fc0f5ff36fdd8c21de15 SHA512 92918957fe5af4024e0d4600fc601a8c8aae26edc5b353caea8879582c06908b42184f4d5bb7f388c071816ca1f70bdb4b9768b18e8ec3669481ca486b705fc8
 AUX shake-0.999-uclibc.patch 1180 BLAKE2B 158d92a4320e3db600f85b7fdcaef1b2c6a72693ee2c7925aa743773cbaeff9dfe5252aa03a481c7bba1e144368bdb122a99cf6937358d344e788480e5221439 SHA512 f37a4fbcc1ae932c0c8c9af090cb93481f3c6eb3de1994cc1585903e3ddaccf4c1c8a4e121b720119378fdd0f1d74235f197ba1a5c984aa416107bec6eb39a1e
-DIST shake-0.999.tar.bz2 37225 BLAKE2B a3330f66c43d47ae117918c507e8097225f074dd221d88d277624064ac51ba2bc23c9e261bed5cd34f473f63511131f532c7f26f7d57b38a722b1d944cabe5fd SHA512 7dbd61cb35f771ffae6ec90bcdbf0cc467166661a78379191c7cf888d5f32ad27ea56da739f8f39344a209003747de2be1b57f2335ddc5641f55605c15c84b78
 DIST shake-1.0.tar.gz 42885 BLAKE2B 999a4846a47a124c9f66f674e54ee1c89039b9598b7a3d0c5b5690abe5b90bcec5248e8f516f10681543bdba666ef4129172e4d05759b997016ca1071e33e4b0 SHA512 f73601ebf37ac934b2cfb5bcedd530e38bd6873615e80eae01c690bf935ed3924abb1d06fb31c46397b5804d47a36584ac5e11b4c7142b46e570ddbf3abe1775
-EBUILD shake-0.999.ebuild 539 BLAKE2B bfc86efeb61179fb79c96d184c2ef93be02b9760627b93aadc87a356bdde3baa3768a631072572af542191d3f07c5a6a9580f694e7bd81f6fb018d0b90979335 SHA512 911a1ad7694b2579e8012799db50e4f33dba8471b615f7a3f5669b01faeb58a774b52e5ec40f74bc237e3ee4c00fac1aac284939cc09ff732b6f8854b1bfcee2
 EBUILD shake-1.0.ebuild 498 BLAKE2B 2280b17b8d5694a072da97089757a61175a5db8a649b7522ae3c18e09ebb612a276b1e4e13e037bd90c45a9da89ceedc7dd11b2fe8f0c2d6ee766185a3d554a7 SHA512 50672a07c46e8e93a20e310c18f0a2ec07492811d5d2153d0f75c59a12f5c54c8d74c73cde7862f40e6ad89da96d0107d91976aadb32390b174afb1f057c3c78
 MISC metadata.xml 452 BLAKE2B 1a0a9c4e8df41600c72136c4df4182658d1aa1852ebca1c5d0ea3dc8d3ea81a533c8bfa4931955a565d084dbe3a70a8173f0a2995ad95f9ed47c2786f1de1186 SHA512 95fab203ab540b445036639bcc24ae4f7d18cd51a4f1a693c14a69ba5c1b561c77ab1e0585f2baf389a3f660c19a8a06f6b0cd5d748a52fc72fd842df99b2a3e
diff --git a/sys-fs/shake/files/shake-0.999-fix_stat_include.patch b/sys-fs/shake/files/shake-0.999-fix_stat_include.patch
deleted file mode 100644
index b55776397288..000000000000
--- a/sys-fs/shake/files/shake-0.999-fix_stat_include.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur shake-fs-0.999.orig/judge.c shake-fs-0.999/judge.c
---- shake-fs-0.999.orig/judge.c	2013-01-21 13:21:17.171974754 +0100
-+++ shake-fs-0.999/judge.c	2013-01-21 13:21:31.346958593 +0100
-@@ -26,7 +26,6 @@
- #include <fcntl.h>		// open()
- #include <sys/types.h>		// open(), umask()
- #include <dirent.h>		// scandir()
--#include <sys/stat.h>		// stat(), umask()
- #include <unistd.h>		// stat()
- #include <stdio.h>		// printf(), tmpfile()
- #include <error.h>		// error()
-diff -Naur shake-fs-0.999.orig/judge.h shake-fs-0.999/judge.h
---- shake-fs-0.999.orig/judge.h	2013-01-21 13:21:17.171974754 +0100
-+++ shake-fs-0.999/judge.h	2013-01-21 13:21:47.630940034 +0100
-@@ -22,6 +22,7 @@
- #include <stdbool.h>
- #include <fcntl.h>
- #include <time.h>
-+#include <sys/stat.h>
- typedef unsigned int uint;
- typedef long long int llint;
- 
diff --git a/sys-fs/shake/shake-0.999.ebuild b/sys-fs/shake/shake-0.999.ebuild
deleted file mode 100644
index 775e275db2b0..000000000000
--- a/sys-fs/shake/shake-0.999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils
-
-DESCRIPTION="defragmenter that runs in userspace while the system is used"
-HOMEPAGE="http://vleu.net/shake/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="sys-apps/attr"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-S=${WORKDIR}/${PN}-fs-${PV}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix_stat_include.patch
-	"${FILESDIR}"/${P}-uclibc.patch
-	)
diff --git a/sys-fs/squashfuse/Manifest b/sys-fs/squashfuse/Manifest
index 0ad6bfa58883..86fe6a1503e4 100644
--- a/sys-fs/squashfuse/Manifest
+++ b/sys-fs/squashfuse/Manifest
@@ -1,5 +1,3 @@
 DIST squashfuse-0.1.100.tar.gz 393548 BLAKE2B 642f0b00023f1914e6f4efd0e03c77d61c549eed0bff8f3128f415ece7c52d3f917e8856a1dccc3d1be06147ad0b80bdde79397c4f307bc316adb2224260b402 SHA512 e6a56354e71991ccbcbd2f9e6967f1f5a1056edbee286e6a6d6c35f777ed6e6494243633d070da700cf43a8bf7b56269087a0db1d4b2d45ed49f4830caad7927
-DIST squashfuse-0.1_p20130530.zip 70224 BLAKE2B 88fd88ced569793b82767b4cfb6d71c7039b262957362287648be47b86f5803abbef862595ec1dcf1bc7bb154dd4b1a65d49aa5c29eacfe9ade545d7a88da600 SHA512 1e2ba5a61cdc5eac3fcf13d5d2a55d0656ac247b057f7cff9ef5365eb59f52fa6159cd2ea73475627e62f53fab72c5d12819161e794c683d53059f7667a774f0
-EBUILD squashfuse-0.1.100.ebuild 921 BLAKE2B 81114f951588d6258e2193c7aa796b61fba21e23820c06f45695666e548f4e89514cd60fbc5ab3057486426962a2992dd7d34c29ffc6b0732da8c87142f7ce9a SHA512 55eb5d77c7adaad8a79b4866439b22c438f2bb7954d38a523b6c8969c88b9ab6501eaac7f1643db3b19a784fa0e79c6c29047443a52d0dae49f0704b80f46933
-EBUILD squashfuse-0.1_p20130530.ebuild 1052 BLAKE2B ec2a3ff3438522e1e2a1217ca0225be17a0bc7de63e2034eecd0a662fa7d33a9a8d67cd9a81356a6eeea78a01685ab1eb39773ad46f2473fd83f64ab33aad72a SHA512 93dc9dcac042fc8effce1fda3d04abba617cdba05c216217afd73559c6548afa624507a7425b0d62e2397310595da68ec79eb3776d1492c0f44bfd22d3a7a49d
+EBUILD squashfuse-0.1.100.ebuild 924 BLAKE2B 99357eef0d573291d34becd2b9cc92050ba78975f537966175fd2dcfd997e91192af9ced64e6938a4b3e3da59fc091f19d6f1944cef2f8f327aabe76beb92ea3 SHA512 7f0f52f26553938d77e829f6220d5b3b6b47ae5e9716e1547e56f70a409935b88cacb289d11b67ef852bd7ad115a35edd2cdbae2c597c0a3e073d6e5fd3e1896
 MISC metadata.xml 588 BLAKE2B 89e02c1b93c1a834c81fc6ffd3e6f859e8a37651b3d3f2b68995eb3ceb035b4c49ff66b160e35829dee4416f4bfb16dcea6fedaf21e6b305f5674e8e52ecd1d3 SHA512 359590ef302a574ac485f43cf78d3e618ce2562983fc21941961dc7624919ae8c88ae53be3ec19ed6e36f777d3665b133b2972c94d9b9b7829fdaeecc0b3710a
diff --git a/sys-fs/squashfuse/squashfuse-0.1.100.ebuild b/sys-fs/squashfuse/squashfuse-0.1.100.ebuild
index 6e3a40b2e5df..5f269a48d15d 100644
--- a/sys-fs/squashfuse/squashfuse-0.1.100.ebuild
+++ b/sys-fs/squashfuse/squashfuse-0.1.100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016 Gentoo Foundation
+# Copyright 2016-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ IUSE="lz4 lzma lzo +zlib"
 REQUIRED_USE="|| ( lz4 lzma lzo zlib )"
 
 COMMON_DEPEND="
-	>=sys-fs/fuse-2.8.6:=
+	>=sys-fs/fuse-2.8.6:0=
 	lzma? ( >=app-arch/xz-utils-5.0.4:= )
 	zlib? ( >=sys-libs/zlib-1.2.5-r2:= )
 	lzo? ( >=dev-libs/lzo-2.06:= )
diff --git a/sys-fs/squashfuse/squashfuse-0.1_p20130530.ebuild b/sys-fs/squashfuse/squashfuse-0.1_p20130530.ebuild
deleted file mode 100644
index 4c8d7fac4761..000000000000
--- a/sys-fs/squashfuse/squashfuse-0.1_p20130530.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools
-
-DESCRIPTION="FUSE filesystem to mount squashfs archives"
-HOMEPAGE="https://github.com/vasi/squashfuse"
-EGIT_COMMIT="f03158f49cb4adbb6459cb2a1898e586b488cb10"
-SRC_URI="https://github.com/vasi/squashfuse/archive/${EGIT_COMMIT}.zip -> ${P}.zip"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="lzma lzo +zlib"
-REQUIRED_USE="|| ( lzma zlib lzo )"
-
-COMMON_DEPEND="
-	>=sys-fs/fuse-2.8.6:=
-	lzma? ( >=app-arch/xz-utils-5.0.4:= )
-	zlib? ( >=sys-libs/zlib-1.2.5-r2:= )
-	lzo? ( >=dev-libs/lzo-2.06:= )
-"
-DEPEND="app-arch/unzip
-	${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	mv ${PN}-${EGIT_COMMIT}/* ./ || die
-}
-
-src_prepare() {
-	sed -i -e "1s:\\[0\\.1\\]:[${PV}]:" configure.ac || die
-	AT_M4DIR=${S}/m4 eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use lzma || echo  --without-xz) \
-		$(use lzo || echo --without-lzo) \
-		$(use zlib || echo --without-zlib)
-}
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 78b9126c85cc..6a3fa66326ae 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -8,6 +8,6 @@ DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b
 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
 EBUILD udev-236-r1.ebuild 10048 BLAKE2B cd7b1f1b4edaf2dec245c9b00e1f19af56e3f4b21f6de1535f062d9deaa16107efc9f873dc50928604562da3c8877cdfff70c5489bec15cbcfa952b9bf4ff8ca SHA512 e6dca2f55c992a025cefc67b06df09d402fdd8438cfd819419a70de6ea2b26e58e380781aa66f0d63bf682b4500ab94f6b552117969851ddd892bb8a6415f4ee
 EBUILD udev-238.ebuild 9594 BLAKE2B cc2f3ede4a7e22c0f035d9b67882b72a51daea6d0ce4a234cfa5e44e7b1a30f30c0b8ba5090eec07fa0755bc600bc26398b20e39b3b64042b17150dcfb260723 SHA512 432f5768573c64546347eaa1885a6cbaecc486ef6cbbb697e8e8fa8dad2a186289834db127073f35e79ac63c2157e4942e27caf22c5989367c44aae6ff662f93
-EBUILD udev-239.ebuild 9775 BLAKE2B 8f95ea3241e3c25384c2928fed853c8faf82c69a6298e4e8fa0efc6e7f68d5c1fba6b99a84abb66eb47249c5c7f9179f30562a0a2233b0c54f64372eb899cc14 SHA512 0504977941154c9b1d5e325cc667bfedf38b110e10a999a80634b1e5143e2ba416b8b636cc629f176542a4046302bab87980a0b4e6cb1a7dae3a7180edd3bb10
+EBUILD udev-239.ebuild 9771 BLAKE2B 490c267c2c60be3f9d46b07cc51b0e89954302aa216538a7895bbb5cbb827afc1993f7307bce18adb884e8b8f77611878def839915500beca52176813205935b SHA512 7778f4a224de81737bc9b1d4457c97a10edf1a6eb8d9eb17907033dfdf2d736cbcc60a809f8509f46c8e64922de8909bafe33d362d13e41d21485ce1c5eb80a1
 EBUILD udev-9999.ebuild 9592 BLAKE2B 71faa738512525219644d2fa238abe5630c0bfc236369d5fdd7d8a83f1a7faf01a3e26cf78b8ac30681fe9591d1545ffc7f173d43e91f9823c588d1c3300bd72 SHA512 17db537471bc3befd55f5cd6a70c7279cfe46634cf59ea3dfc4e44aac38c14465a59e1550a590959c0cabed976fc6b74aa33b2237aac9c1e753eea14884e50f0
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/udev-239.ebuild b/sys-fs/udev/udev-239.ebuild
index 5dbe6b7d4497..cef4501124b7 100644
--- a/sys-fs/udev/udev-239.ebuild
+++ b/sys-fs/udev/udev-239.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.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="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index 87a22d48e711..5308fba7eeae 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -3,7 +3,7 @@ AUX udftools-2.0-sysmacros.patch 1203 BLAKE2B 87e9d5ce829584ff0dae366bc3c2b52bcc
 DIST udftools-1.1.tar.gz 656865 BLAKE2B 6e76251368c121ab07e02071bfddde5c4f4523cc858a7ffcc86063b48adbc03233fab18a3ff50b840fc603e7f48f386e15b4ca556046116d4b42f43c06927dc5 SHA512 9c415d1cae1d79d49b4f9e3e6881f0b44b31d59f6d722571badd78ee68c422899ee8b95caed0ac50e76c13d8ed118f58f79efe5cbf775438a163d68160a30742
 DIST udftools-1.3.tar.gz 447063 BLAKE2B ff23f23dd5b9753d9e4cba6e326d302346233ed0a836ccf35372e61ca1d7a5c14ff8f1d1505f2f9fba779f4379adf472b64ce60aa4ca0d3e51679ea863db2f0f SHA512 d67f74640cc600fbdf3d7a67caee1342c15507357e155c5e1066aa6f6b3e2667483107edd663eaed5ebb690c13337598a75c1955e69cbc782bd481af783837e7
 DIST udftools-2.0.tar.gz 541231 BLAKE2B 8e43f4b1ab0940d607987e972dc0244ad086e088441bf462e6ce75a668af62041b1c4d8bac5da6046d2943ace753498aeb721d9524b4442a84f1901fd92066e6 SHA512 178a20405de6cd48e5f58b0ed61565e2a463479cf6d40fd7d5895d7af768b814bf1d5849873740aa409eb8cb3e7cd480c07198f6b340c612a271241c737f76e5
-EBUILD udftools-1.1-r1.ebuild 653 BLAKE2B ed68769069dc6a293e3147a63189140aabf8bb390a043ecc765d037aa7333e7ac69cba4be2e11165994c2f1912f7330bcbc797ad22e54908709f9611c6e19a88 SHA512 4f61144a6d9cfe29da9a47651563091c512a61c2bd5d32765b2bfdc63db7f295fdc875a31142f93f93f48b024eb9577d241c802a1096496f969df3fe40f223a0
-EBUILD udftools-1.3-r1.ebuild 657 BLAKE2B c2b01c4850795634c69bf7441751499407a2c7e78e45586e336cedca182a9592002edd4539c72f4e8cbb14afe889a5eacda6508c182f1090fe7c879193489ca5 SHA512 98cf296af5d84b780c1c27b853cb17536233b2fdff65a211d675bdf0d58c85ef79a1f7ba964b24830f1c9cbf2c2a0ce173f4e7b9ab8f5e33a93f6c0305ba3d80
-EBUILD udftools-2.0-r2.ebuild 582 BLAKE2B 924dd09c20c835818b8a0ff17b27c7045e8cd733049fd6a7b1c72a330fa49e617b4977ed5aec783d3de611c802d5c84a81c0f6dae65906b7fcac45b37c5a2a46 SHA512 4cbf6c46dfb723b3d9ebb2107d361166aa03aa927e2d541614380d8f8c5f051c087cebac26529051599951cdf5c64e574b2918e2885e275842b3c7cf2d07158e
+EBUILD udftools-1.1-r1.ebuild 655 BLAKE2B e3b1da90e431f8fde13bd0c87cb4dc7300ddccfb8b0e4f5720931116a6881fbbda1a754b39a6a39f75ce923f42c59275997b315380d4200959a7c265200e017f SHA512 c2a4bfdc4345fdc5ffb2d6518a0ab102283ffefb6c32d7d9947ca635b63bc50fa23f8365cdd7c2bc0d94512f8f370f99ebea0f757f0cfe8062a81e1934385b88
+EBUILD udftools-1.3-r1.ebuild 659 BLAKE2B b7ac25243acc868613c66f6b20071fb982221f809ee6a3c4e8ab43bf2b4d2c7d24d5249f2953ca7f71c1d04cbcf7efd7e0ff2e68b71ea6cb06cc35e391a9699e SHA512 c9f33ab798e8b72a67a4515de13489c5bb1d273886beeab3838c16fc2fe3eeaaed6a8b7d42a7916fcf4171561d329dc0d2adbf81b46bf8935fe7265e5ecf7183
+EBUILD udftools-2.0-r2.ebuild 584 BLAKE2B 97fd76c5655a4d162cc47c5a120f2ad0023d986b3de46d1cbc2f0d78999d5adff00b68286f529c0a65a6aed1c74f15ff73158c92f12a0df03346738c6444a5a7 SHA512 7ad4667af7fcba3b52fca36242c06a3397f4f912f8aa7a306d3154f1025722e9c5583dca149ff2db3375a3d95d48613c9cb9a7f361cda941a07e161aa2fcf472
 MISC metadata.xml 389 BLAKE2B 9ce42e5303df1f4d7fc293387617a2b6335377b7a3943e768cd7f8e58e9dd456c568f9b72c1fe3d12f2876d364edfc184b3644aa76569e04bee22fbb3673d8b9 SHA512 049fe016aafa25e50396b166ac9931ea7c293aa581467fb587e0d79c0bc4e79621bc3d5bf295c2e9e589a517a4c1fcfbb863fb71175fe5061f99e45a26c7c61f
diff --git a/sys-fs/udftools/udftools-1.1-r1.ebuild b/sys-fs/udftools/udftools-1.1-r1.ebuild
index 47360a01354e..fd50ff49d801 100644
--- a/sys-fs/udftools/udftools-1.1-r1.ebuild
+++ b/sys-fs/udftools/udftools-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-libs/readline:0="
diff --git a/sys-fs/udftools/udftools-1.3-r1.ebuild b/sys-fs/udftools/udftools-1.3-r1.ebuild
index 514258b8870e..63fe2ced38fb 100644
--- a/sys-fs/udftools/udftools-1.3-r1.ebuild
+++ b/sys-fs/udftools/udftools-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-libs/readline:0="
diff --git a/sys-fs/udftools/udftools-2.0-r2.ebuild b/sys-fs/udftools/udftools-2.0-r2.ebuild
index 2e2f3c8b3eb4..61a0e51bb57f 100644
--- a/sys-fs/udftools/udftools-2.0-r2.ebuild
+++ b/sys-fs/udftools/udftools-2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-libs/readline:0="
diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index df38bd397345..ce2ce6186d30 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -1,3 +1,5 @@
 DIST udiskie-1.1.1.tar.gz 62207 BLAKE2B 47dea106580fbd037970b274205b896fa95e1f41cd8593bc9a14c8d19f40c3c44281e7334d4b0aaab0aa5e37146b8fa702afc4b82a2ed0e00549d2f9eb475533 SHA512 0524aeafb4777039a35be8854a0cf3bdbefd43eccb758da9aa2fa71fc4041816ff009dbbff20b4906c9bac281995c9923fcf542107a83c76ecb8c45d6b20b1ba
+DIST udiskie-1.7.5.tar.gz 92103 BLAKE2B 9996ea150c0052809825479f500c6bc44fa514a1b9433521b2a5d1d1de62546e16cd77fd94c61e73164af2bad34a8e9b0d5a681db99a66011950b435423456b3 SHA512 d6178b582bfe855cbf7710bc9699d10f1e06fbc303b9c5a352a7261734be18178b3fd7f44fece7d2a05e7fe85d1337c93fa11c3e6011abee44b62aafd1c7c656
 EBUILD udiskie-1.1.1.ebuild 1078 BLAKE2B 4b3f90ca67699ada2a3959cb91b0b68e11e17a597eca9a8f4c30da46a60b1635d93421ba891a0609ea70d4b946640411d0c678cef076bd4805db4e4d8ac2b82d SHA512 956d0c074d9d5dd414db188360d96182be8c799094d35ea16e94f42781b7db653471a80eab9b644cb94b088f0de3033d3ec3250a3df15118153477b54e945cff
-MISC metadata.xml 270 BLAKE2B 5189aebfdd1b9a7cad5cef37c93c06aeae088156a4938b69b66aeb622ffd9d98235c9a2bf4441d69eba42fe19c46236c83527cd45b660c23c31e0883809c4b01 SHA512 88b1a34217420c25625124b4730a6a9c13ab0022b64c8905a5235b87ac8e2dc0aa44af1204bc96b022ad408b40658276c44897176348f4c43244fbeba3d3d306
+EBUILD udiskie-1.7.5.ebuild 1007 BLAKE2B ea45c955fa8aadc891eb60e396ff3dfbee9609fc56e7ae7dd23b15016ab5db70b13d9345f4a34e9df80d6c9670bdd6f6c5f62cee2ad5682564513c8725615eb8 SHA512 9ee8745ceae7d145d71e1807ab750cf087fdc013348cf352d9cbc52496843f834e6c96a6ee4f1df136c73c937e8062e104cfe4d5546e1d069526016be77c5d58
+MISC metadata.xml 369 BLAKE2B 0241a847b1eb2f650f66bc3fd631ccdf1927562d510e08c7bcd3db850752b665894838d0c705b7d03690aeea0aa93372d1faae5b313c9136d46e4913c177b0a4 SHA512 0772b0fa065a42292268b9e6a6b99b7198f5923bcc4697913b6c432db4e206a28b0fb1bd6c14b6363591cca02108a8a91029233824c3ec5bd7fbc592a941137e
diff --git a/sys-fs/udiskie/metadata.xml b/sys-fs/udiskie/metadata.xml
index 52197ea17508..4edf040a09c6 100644
--- a/sys-fs/udiskie/metadata.xml
+++ b/sys-fs/udiskie/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <upstream>
-    <remote-id type="pypi">udiskie</remote-id>
-    <remote-id type="github">coldfix/udiskie</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">udiskie</remote-id>
+		<remote-id type="github">coldfix/udiskie</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/udiskie/udiskie-1.7.5.ebuild b/sys-fs/udiskie/udiskie-1.7.5.ebuild
new file mode 100644
index 000000000000..22152090e9d0
--- /dev/null
+++ b/sys-fs/udiskie/udiskie-1.7.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="An automatic disk mounting service using udisks"
+HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	sys-fs/udisks:2"
+DEPEND="app-text/asciidoc
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i -e 's:gtk-update-icon-cache:true:' setup.py || die
+	default
+
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	emake -C doc
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/${PN}.8
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest
index 130be0532217..527b03fe94a2 100644
--- a/sys-fs/unionfs-fuse/Manifest
+++ b/sys-fs/unionfs-fuse/Manifest
@@ -1,6 +1,6 @@
 DIST unionfs-fuse-1.0.tar.gz 48149 BLAKE2B d1ef74980158f4710f5b545c3e98abd27eb4eb610cbe141fa1befaa2a0efc3cce3cead1a405ecdea7dd0f02fab2d2f030d96a7b1d5068a1cd5de4e2f5bfe3aec SHA512 805151acaeae8526fba430701a1690f6eb0ad8331a9e730095ee538dc2b148d02fe996a63e8a7f6471d1ef622cc5c03d82bd2b2faad1ebe3b614ec343c2f55de
 DIST unionfs-fuse-2.0.tar.gz 46537 BLAKE2B 2f5a0da5adb15c408e7b9d0c3658e389a1aea4a9a5f2f3809fc724af43cf2a4b309e4220e46647e3f3fc9b19d48c8d62692e190cf8536182abfe551bfacfcc24 SHA512 5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758
-EBUILD unionfs-fuse-1.0.ebuild 531 BLAKE2B 35d17c5271cbad1c0f8f1de41172585a1f27b9a49075a54e9ecbefa94a4089f210ee350121e8a2ded29fe0c78600b26d6eb76bc4175c22bbd3fbc28838e82aef SHA512 e8d9381262272bbda52be4a5331646595fd99e200b85fd69ad400bfcb614bde307d090136b2305515a1a01480b6d8b235a47d7f333dd13df3d364ae46c04c36f
-EBUILD unionfs-fuse-2.0.ebuild 531 BLAKE2B 7ce0521e83acd63008e6ecbbc3691411a0c607b40be5c996bb0bbbb6819c0fda804686e78bce28e836034a9cec279479c23f0a16d1cba0288147a8df9defd48b SHA512 4f0d8e4be9ad43ee7a841d99b30ad7b81ba522dcd0b6f8269035125f313f26cb5e82e7f3e6bac352b75ab02a70785c90ba6b2d01c8e3b4ca6fee981ddc347d99
-EBUILD unionfs-fuse-9999.ebuild 505 BLAKE2B fb6535c8bf19a72d5838dbf497d3628ad72f25678ce06a54845e15ca114613ae02f89429a1c82bc1aefeb5b46be8de104bd8bec3ca5583e3c33530948d19f8b7 SHA512 257c37a2c230b716bd2818e898d0c59ab831b7e21ff3753cfffb12821dc8a0e2979992a0f40fa232d89298f427338543a9ab3f0f7b6d499c4d2f907bbb272a7d
+EBUILD unionfs-fuse-1.0.ebuild 530 BLAKE2B 39d1c542f294201174c14f799a8b08582fc11daab33b76081fd339b0ae44a7581e409375632d49d2125c54598c3006ac6192d42a6fc2d6c9830224e5724e4261 SHA512 453dfab62acc5d559a5b384212157fd4f8826489bcf69a259af9be41f6edfb6ef43d66d43d4d8a828d14a2f2dd1fee376c46d550ddecdf90ad5e107ecd31476c
+EBUILD unionfs-fuse-2.0.ebuild 530 BLAKE2B 2e4bfa320ee23a868b0071d26c9f5952c33ad409cf09c039dbaefd8a1b0fff051223a07ffc8d7f2fc30e9b45c82ebdbf7156276bee09a89d23f4281daf7975a2 SHA512 9691be4e73be4436c437b4d2db5b05b1d16e8bea0505a742a9600663bf65fe53b1d378f22b4824e3179c2ba34068014b2f12cbadaa2bc38cf2eedeae8c1b2d28
+EBUILD unionfs-fuse-9999.ebuild 504 BLAKE2B 28185ae5a22246fe002ae0cd44e0783786741b91e3e1f939e6d169dc593eb3f10cad0d1e56e55696c848bc6f2a2edec69da82d41f20a9f72524e139e8b0c8500 SHA512 8538c150241cf9a6c974422f16982de7245eb7c4571dcd8225369368786e2a16008734f8ef90c4ed1a68daa61d8f9b08ce295872fc46e0736e4a2e9986787426
 MISC metadata.xml 336 BLAKE2B f9d55c17815e8d3179029c92fd758b0811b455b4d375aa31c44d7643f9d792a70dae915ae25d069e9967fbac2954c197b1ebcd85828b744a9924dc719eeb6f40 SHA512 54597ecd53cfe8d92d717481a533df32cb5fa7272cd64a42a0cd4b4803024b10e3451845569e3d7b199ed63f4070023468dd7528cb438f155539e5e752144197
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-1.0.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-1.0.ebuild
index 4403163fc006..e9658f33fb12 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-1.0.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-linux"
 IUSE=""
 
-DEPEND="sys-fs/fuse"
+DEPEND="sys-fs/fuse:0"
 RDEPEND="${DEPEND}"
 
 src_install() {
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-2.0.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-2.0.ebuild
index 16259309343f..fe5a7ef6d178 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-2.0.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-linux"
 IUSE=""
 
-DEPEND="sys-fs/fuse"
+DEPEND="sys-fs/fuse:0"
 RDEPEND="${DEPEND}"
 
 src_install() {
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
index 24a0355898f4..bf42f96d4078 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="sys-fs/fuse"
+DEPEND="sys-fs/fuse:0"
 RDEPEND="${DEPEND}"
 
 src_install() {
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index eac981d4698d..31c650ebfe5a 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,13 +1,15 @@
 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
 DIST zfs-0.7.11.tar.gz 6561125 BLAKE2B ee579aa01272d5565fe78ae6074dc1acdd34c8e9a26838462aea937132c322b0fb915c4dadec230560d586db2b2af129735ed6b5e41def4183c9c7ed456ca7aa SHA512 b53c92de2c2542a1b0189368e4b298e93bea13aec8ba415559e86bfc01a9c7deaf436e694aa047ef8a302c79224f96edd150ea93a57eb88c9e26d054cf7ccd2b
+DIST zfs-0.7.12.tar.gz 6565017 BLAKE2B 493df30ecce1f169e02d6c8262ba71cc9e7b01d5b17ce188004f522f0c93943b858434067cba8173ccb3e08cde24a1d3e8a3996b2e852f8bc35251f8c4ab3809 SHA512 278e411eac5fb2a91108671b64521c2bd5c08024d5829e1679d8f243dfc3c6317363ed9c79dabfddecf425acb6b3003eeaf4e7d991513cbcae4d2644f5d30bf2
 DIST zfs-0.7.8.tar.gz 6514969 BLAKE2B 689d96ad7afeb422cbeca724f248ac56b6fcdc0a7ef215f735180406a7fc0d4d3c9700a41e855186d8044b304c9f0c142c2bdca387299c499974e424965970a4 SHA512 cdeabe10acd2feeeff8a6362987c757b716bfea6ebad42ce022a081106661f774150c113bdaa9e1ac441efdd6da4cf11e6119323ad60ae15ab445a872d952e35
 DIST zfs-0.7.9-r1-patches.tar.xz 10920 BLAKE2B 50a0b8533061b5eecc103179e6fd51499d87f1c3b331b0629efa29a5a7d405c03448db2245fed9389d149cc83021a2c263bc2f02133a5fdd11b088516c353fff SHA512 a9e8c04bf7449b0a63420202b2f6dd8a6aea96ac57e5925c2ca0223f662210f42316ada25aa6113103909de8c9976945828cdb91a6ff9932f282c01316d7b3ec
 DIST zfs-0.7.9.tar.gz 6548649 BLAKE2B aa2f1b9d0ba0eda1af7d420c43d65d5d4183169cfe97c693356e1e0b15967ea512c25454f2d77285600f2209d778e4299f420754932e403a390b87b4f488dc94 SHA512 af5d9c320885ee84019fb04250c4b12c7ac3bb3d1037b1961ec4584701a737558374dc22521743e197356efb1d1f0ced9beff675ae9cfcccf3cd8407467f18fa
-EBUILD zfs-kmod-0.6.5.11.ebuild 4067 BLAKE2B 9ef7ef08382771987aa2c71ffe917c9321744f935f74da1553ed88a4732399c16522c70b069fd51082ee3c6c540d71038cd888a690530aa5b554958460a74c80 SHA512 eca5ec333c7dcf5a4815e6eeb8ef9c9f4449ccc1746b3100aee9042b824c0175c491a4d34726864eb80fb3be55c3bc8e8c2d860948ffb7cfd5417857d7723384
-EBUILD zfs-kmod-0.7.11.ebuild 4054 BLAKE2B ec46bbca877ab416e1f76be19e1d7079e8b4b9c56be99a9764ae8f0954bb4d9d211125b4ce8fbba5cf99f9c28c970cb08ff1a5e2bcac9d00624e5f38b4193f7e SHA512 4fd54989c70143e8f418e592c18dd0396d1bc61eed1bdcd7329a0a17c1647839f44593f07c460b3439baf99dd965a501bc3305c7efb7ebfeae4f46a9df6ad8c8
-EBUILD zfs-kmod-0.7.8.ebuild 4053 BLAKE2B f678c78a5e4c13c2e6339c8b859ae396d62a1403a895b3a53677f5999f63ff08c608e382c51b7bde0e7a4e092eddbca90d84ab808a105a7923a81cd6d18815d0 SHA512 863030a139ca6f7cb0e4a8dbe870fe6123782b74b8ec0e4353ee3020512922663b11fc3b374206a52fcbcf114ccfb9002ba5a895398981e562ef09f4f5b87db6
-EBUILD zfs-kmod-0.7.9-r1.ebuild 4260 BLAKE2B f7645d67c23d7911832553b11e18c48a24a3db7011ef3a57fa4e3f81ac09fe4dce82ba898c350f936bc36f4ee964f95a8123f73096af2f375b2707cb6612976f SHA512 729413f563f6cdc3e8986ea58a5ebe17fa3a0e66a801b1bffff5da72732d52341e15b5f469010cbbd37c48cc835333b872ad569fb03f6113a6f4b498a4b37c5a
-EBUILD zfs-kmod-0.7.9.ebuild 4053 BLAKE2B 3fd50c6fd61ea5074d30dc614d96e3536842b1d91e3d9857482e0f4e0c5e38d4b838c04008a8b2f160c2e89c8ea8938e02bb6fc8f8f67c1e98a89d19085eec89 SHA512 a8384a821aee26b7daae6548bfd60d64ce5d7bff00a963818c35cfefbf3215c559de402e6892964486252453f9cb60ace6131e798c556288b8c476b1f5808841
-EBUILD zfs-kmod-0.7.9999.ebuild 4112 BLAKE2B a5876296e76423f8d12f7ad5eb095c58b2147f92cdad8a69b476f8950e7c463502f145e4d5c2ca3d91fc905a5aed36a3d713e6f1b35ee34bf6d143cbe557b1d7 SHA512 7d3166cb609cea9432e4124f2848c736fee562ac7a1fd3ecb87af9915b458be17b7d6cf36b86d28c5ed8fdb62a021e8c0dcc018c1dc254fcc5e6a0ee5f78d51e
-EBUILD zfs-kmod-9999.ebuild 2754 BLAKE2B d52f0ccea482eed0d40aabba47a221a3b495f5526813fd82c69e25853d86784c89bc627cde0ab44dc752310abf01fd43f166eaca7319fa414e7f87bfcb5583f3 SHA512 2ebdf596169ba9b74f8fe9b7e759f951bad26b8fbb323fdc13847ec307be5df4816582dc18612a2a4ebf168cfa3c6c2548b9b79b66a789cc9a26e8ef94c9b413
+EBUILD zfs-kmod-0.6.5.11.ebuild 4065 BLAKE2B 15ba31f70e1c0c884752bc56893b576791028b78e61ad0b2be83ac8f609385568a9b311ddd04698d430186f3b44f4641774d2102f758c2b4f2934bcbeb11560d SHA512 dbab278cb0311e3c3737a5805d5cf8ecdba75508353ae8f25985b345dca62e895353d5deb43417c5159bb0ef4f64fe5f6e1e0476cc5deed92fb5f1ef3eef05ee
+EBUILD zfs-kmod-0.7.11.ebuild 4052 BLAKE2B f9ec807898302d8a699849c54b2b5db8c994c47a781c0fb9216b10929ca78df5705f4fa2a646dc4b3012641b3a70f814c6a38b0f33b943f23f9f3e2a6044438b SHA512 dd064db96ee9cd02fa87ced7553aced371d39e40e268b933679dd081da11d64c9abc13fc6a2e7cf5fa7c165faa4ccabefeeeea3bf96a4dd203cb3f6398aaf39d
+EBUILD zfs-kmod-0.7.12.ebuild 4073 BLAKE2B 47d6fba29a8937a2fd529798f247b497a32612dda1cb8d8654b6b86f70570bb491fc6da48486e55fa08b8ed94dd2ba3586f458d99161a5872af90f84d81e515e SHA512 1dce4eadb5c374581b399006fba146b3b53a0a960a1b5bb1dcfa4b27156b35376f22ddcfbd3c9a89347e33f47d87eff4250a7eb985f63785fcbb264e6654ecbc
+EBUILD zfs-kmod-0.7.8.ebuild 4051 BLAKE2B 209b79790d9f60bcf6c6275f7786b48fc336075d7409b34909a3df3f2860c1d755472eb885ea7b5907321eeafcfbf89959f5a14071af08fd01a7982f535ed0d1 SHA512 c99b33de8ff155db0472dbcc7174753efa9b2ad24d9676c0515ae8fe8415d9829d1aa37c73f6065d349bad9faaeeeefc5b32bb2098845444a15fda2702adab17
+EBUILD zfs-kmod-0.7.9-r1.ebuild 4258 BLAKE2B e6860043ae564501a2c5aa64f11096d00416e78d703753057d923de15ea4e3e031f246ddc69d43700dc89b694dad92261baf93e717bbc80b800bcd75a825590f SHA512 b3f1aaeb53c717b0b5a1ae8e43a04bf13c53258ad2d54b6011ffd1b8118e2d8da61f4e097737800e281c657c615188cbd973fb7caca42c44b24ee60a955e96f2
+EBUILD zfs-kmod-0.7.9.ebuild 4051 BLAKE2B 77bb513d87ec78412df41e830c5998721026dfec7b8af8580e48606ea2e6dae9f24be9ca956ca2ff2d982044a306d57dc846dc36754e6c422db4954e865a4c96 SHA512 cff343885b1054917eee86dbdcd18fd0080d7f660349e4d5b42ddf903b06d174c59e63f14d75b1cb224932fbe8cd32eded78a8eb0d1911a41445bf3258dfa74b
+EBUILD zfs-kmod-0.7.9999.ebuild 4110 BLAKE2B 7219fd1317a0cd04a9dfc2304fb8bf4d454c81954e8f0daf653a6f623d4cea88159b8735136ee7625c12d9ff48b986de0e3d4a730a5a6574b74f045226d15c75 SHA512 6f3c927248d39db3f99f71bb1ab3722d5a1cb3038365c7f76d58b34a098c4f2232776f0194ee930ea261e828a821ba8320c3cfeca5ca95f93f0da51cd5c81261
+EBUILD zfs-kmod-9999.ebuild 2752 BLAKE2B bf56d21ab3fed5449a6bc4355148a06ee016b0db8587671cf29b6bc27bc903ee30a1bc2d3fe10f71043a657ec9cc61798b3048bff907ddcf489c07ce92e059e3 SHA512 bc24990beafb3442700e4277d32d27da57139ef5fae3cd64b213fd330b2eca4caf38cf3c203a38c2a22e2f98d4a054478d5f06d0237feb086f487f7814251bdc
 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.11.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.11.ebuild
index 1c08101e1cac..98ae6555adbf 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.11.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ fi
 inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
 
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.11.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.11.ebuild
index 55ffb4104560..0c5bf1ea2fe3 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.11.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ fi
 inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
 
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.12.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.12.ebuild
new file mode 100644
index 000000000000..b4be7d17035d
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.12.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+if [ ${PV} == "9999" ]; then
+	AUTOTOOLS_AUTORECONF="1"
+	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
+	S="${WORKDIR}/zfs-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://zfsonlinux.org/"
+
+LICENSE="CDDL debug? ( GPL-2+ )"
+SLOT="0"
+IUSE="custom-cflags debug +rootfs"
+RESTRICT="debug? ( strip ) test"
+
+DEPEND="
+	=sys-kernel/spl-${PV}*
+	dev-lang/perl
+	virtual/awk
+"
+
+RDEPEND="${DEPEND}
+	!sys-fs/zfs-fuse
+"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="
+		!DEBUG_LOCK_ALLOC
+		EFI_PARTITION
+		IOSCHED_NOOP
+		MODULES
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		!TRIM_UNUSED_KSYMS
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
+	"
+
+	use rootfs && \
+		CONFIG_CHECK="${CONFIG_CHECK}
+			BLK_DEV_INITRD
+			DEVTMPFS
+	"
+
+	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+
+	[ ${PV} != "9999" ] && \
+		{ kernel_is le 4 19 || die "Linux 4.19 is the latest supported version."; }
+
+	check_extra_config
+}
+
+src_prepare() {
+	# Remove GPLv2-licensed ZPIOS unless we are debugging
+	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
+
+	# Set module revision number
+	[ ${PV} != "9999" ] && \
+		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
+	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
+	set_arch_to_kernel
+	local myeconfargs=(${myeconfargs}
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=kernel
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-spl="${EROOT}usr/src/${SPL_PATH}"
+		--with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
+		$(use_enable debug)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	# Remove old modules
+	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
+	then
+		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
+		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
+		ewarn "Automatically removing old modules to avoid problems."
+		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
+		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
+	fi
+
+	if use x86 || use arm
+	then
+		ewarn "32-bit kernels will likely require increasing vmalloc to"
+		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+	fi
+
+	ewarn "This version of ZFSOnLinux includes support for new feature flags"
+	ewarn "that are incompatible with previous versions. GRUB2 support for"
+	ewarn "/boot with the new feature flags is not yet available."
+	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+	ewarn "Any new pools will be created with the new feature flags by default"
+	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
+	ewarn "create a newpool that is backward compatible wih GRUB2, use "
+	ewarn
+	ewarn "zpool create -d -o feature@async_destroy=enabled "
+	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
+	ewarn "	-o feature@spacemap_histogram=enabled"
+	ewarn "	-o feature@enabled_txg=enabled "
+	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
+	ewarn "	..."
+	ewarn
+	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
+	ewarn "developers do a tag or the Gentoo developers find time to backport"
+	ewarn "support from GRUB2 HEAD."
+}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.8.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.8.ebuild
index c8153afff87b..e46bdb2f909e 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.8.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ fi
 inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
 
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.9-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.9-r1.ebuild
index 8cee9a327e7c..e2c7ba257023 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.9-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,7 @@ fi
 inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
 
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild
index eb47997ccea6..6b2ac901806f 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ fi
 inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
 
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.9999.ebuild
index b16a30dc7d69..6fb9bc4d5977 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,7 @@ fi
 inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
 
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 08cf1e872b2a..1ed3a7db1d90 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ fi
 inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
 
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="CDDL GPL-2+"
 SLOT="0"
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 56939af3bee6..75027fcd6d4c 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -3,14 +3,16 @@ AUX zfs-init.sh.in 582 BLAKE2B 27e5c1aff398c42178b3d7c005e91a1f8f3afa303a22e49c9
 AUX zfs.service.in 335 BLAKE2B a18ad1d70975df98cfb7b5196ad17b7197d5eb59cac2ccb3b9243f111c6c882c3480eb6396e347eac91670e3a67d7f122953d6fa82ec61a6467163b788b31858 SHA512 7a167b389723e5f55fea6956e5546e46c89ebf3e2d1c25f6b56c357e6d3ffc765226549d78cdeb79b4dc90c798ec6326a13996215b40eb49179376e32c3c3287
 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
 DIST zfs-0.7.11.tar.gz 6561125 BLAKE2B ee579aa01272d5565fe78ae6074dc1acdd34c8e9a26838462aea937132c322b0fb915c4dadec230560d586db2b2af129735ed6b5e41def4183c9c7ed456ca7aa SHA512 b53c92de2c2542a1b0189368e4b298e93bea13aec8ba415559e86bfc01a9c7deaf436e694aa047ef8a302c79224f96edd150ea93a57eb88c9e26d054cf7ccd2b
+DIST zfs-0.7.12.tar.gz 6565017 BLAKE2B 493df30ecce1f169e02d6c8262ba71cc9e7b01d5b17ce188004f522f0c93943b858434067cba8173ccb3e08cde24a1d3e8a3996b2e852f8bc35251f8c4ab3809 SHA512 278e411eac5fb2a91108671b64521c2bd5c08024d5829e1679d8f243dfc3c6317363ed9c79dabfddecf425acb6b3003eeaf4e7d991513cbcae4d2644f5d30bf2
 DIST zfs-0.7.8.tar.gz 6514969 BLAKE2B 689d96ad7afeb422cbeca724f248ac56b6fcdc0a7ef215f735180406a7fc0d4d3c9700a41e855186d8044b304c9f0c142c2bdca387299c499974e424965970a4 SHA512 cdeabe10acd2feeeff8a6362987c757b716bfea6ebad42ce022a081106661f774150c113bdaa9e1ac441efdd6da4cf11e6119323ad60ae15ab445a872d952e35
 DIST zfs-0.7.9-r1-patches.tar.xz 10920 BLAKE2B 50a0b8533061b5eecc103179e6fd51499d87f1c3b331b0629efa29a5a7d405c03448db2245fed9389d149cc83021a2c263bc2f02133a5fdd11b088516c353fff SHA512 a9e8c04bf7449b0a63420202b2f6dd8a6aea96ac57e5925c2ca0223f662210f42316ada25aa6113103909de8c9976945828cdb91a6ff9932f282c01316d7b3ec
 DIST zfs-0.7.9.tar.gz 6548649 BLAKE2B aa2f1b9d0ba0eda1af7d420c43d65d5d4183169cfe97c693356e1e0b15967ea512c25454f2d77285600f2209d778e4299f420754932e403a390b87b4f488dc94 SHA512 af5d9c320885ee84019fb04250c4b12c7ac3bb3d1037b1961ec4584701a737558374dc22521743e197356efb1d1f0ced9beff675ae9cfcccf3cd8407467f18fa
-EBUILD zfs-0.6.5.11-r2.ebuild 6069 BLAKE2B ab5867191417827b34a1350c62d76ad51cb47fe4a7a5acb58d559a0556bc4e1b324439a0c5746afe1bd1260e152f451d63b941f29f8f3562df24eb0bf57dc454 SHA512 97f819fb3f48a31b70f4a0b85f7856eb9ad5edbd72f2aa59e6d6d77c625a5207c9d75c7c063257fe52861f83e92d7e0f5abc6ba3935172c0f5517f8c5daa20e3
-EBUILD zfs-0.7.11.ebuild 6076 BLAKE2B 009692da11e3e401e9e99c7019e9b85ca1b198e71628f01448546677c7a1fb9912beea017bfa394b69c53528e72d552295674d8886a80eac7ae677daaff25982 SHA512 b082ee5b2dfb0bfe8ed44221866a5d1e3ba0ce551a1cd5cffd9d9b338852dd35a7167bf7002dbc605cd023cc82ad0943dc4c95723a99484c2e610d7f4ba7f74f
-EBUILD zfs-0.7.8.ebuild 6077 BLAKE2B ad6ee3799f34bc32a9d9fc888e4fef0f07a7e154a4ad606e8c686cba21a0cf24d0c7052dfc37ffa7d682be0f6c8f821b9f31c5587e3ea3f77395fa126cd1cede SHA512 b81ca8c889d00bd881aade2cebf999f3a09f7482ffa8eebaf63156c890bdeff796a20794605e4d3a0b615da84281393dacc855cb409aee293d00091e3d938430
-EBUILD zfs-0.7.9-r1.ebuild 6272 BLAKE2B b6251a2b733340bcb9b178532b7f8d15855b8bff2cd0e649433baca199beef7e9741b756f28ae5cf0c6e5c2e5c568bcaef5c7aa1ee2c69793683880f5db66b90 SHA512 ff8a1ff75c7f03f49b77677bc73a8578fb9a1fc62b2ab4a4791e00c745bba954b4e27c3d663b61c39cf43103d7052834b16fc057ed9639174a3c1a0218ef7a8a
-EBUILD zfs-0.7.9.ebuild 6075 BLAKE2B 2633bfdc2232aa66b23e968d91ece57f5deb1f169ca0c1bd6d6d08974eb34e20d0bffa7796587a4e35e3ae0d8888afc7d92d9cc43bc8788d47f02b35506a430f SHA512 bf07decf7af67adf64ea0f29e542bd3c747bd5f10a18b89e5534a53ad6506040bdbed4fcc8966946dd1398deb641a1551f83b41c8068ce12fd644487f7ec535c
-EBUILD zfs-0.7.9999.ebuild 5979 BLAKE2B abe028d1724141c23e6586c33513348fee0950a9a4b96700e0463fb57233b9bd1d51a4f7b70e8b7a04eb01b4d55f44cd520772170f82dcea622af71558015999 SHA512 9e1e26177d26a13ba5bd3ce07ad174798fa896502fbe0d5bf543508cc3fbeb4bc39358898f1c4f50fcc800d47326c158a22f557e79ee91d8d8b95d9f9e3fbc42
-EBUILD zfs-9999.ebuild 6220 BLAKE2B 57b8bdd353fd5c7c33b1000dd3f6bb34b148352bfb443621269c5120dcd991ecadecac6bfb775712006922d59eb00a47e555f612bdff540211f45eee46fa7fae SHA512 be0ed659bb8702bb6fa2aaaf37222c4e9a609fd926d5276b6dca4d46a4b4d0ed310778a3f169c1299e946e5ad9bbc5059016d564b3475acfd9b4ef8f9b500336
+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.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
+EBUILD zfs-0.7.9999.ebuild 5977 BLAKE2B ac507d39effe8be9bdca30a0c158b109e00d471958643770c567a7000efb996417398f6e9bc8a9e4d597cc1af3a91486b46d9ba2af292cca57b684f05db6dcde SHA512 62bf3008f373b44652a91c191f72d167946d26202da51ffef0d15fa57a1705f2d0c9b11afbe7c409d657a1a08efc8f69dc95efaeec0b63f28eaa3f2b7ce47e89
+EBUILD zfs-9999.ebuild 6218 BLAKE2B b291a7514613b2ad54aa3c415f10adc0e7d92b6cc63a09ccbd660e282e625d2159ddaed9cef320ec48022abf846ab3d952277f7341578309f51cd4c237f449e5 SHA512 8e39289a2ac8a76a2f0cd50f0daa1c9a9835f7e68be1838750c41e4eb72d2226b6ca43447a23f8fcb3b12f6d5e990d8adae2d4d3f45575d41a31735e43cfb9c4
 MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
diff --git a/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild b/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild
index fa4dd8f7b61e..c47bc1f430b4 100644
--- a/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ fi
 inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="BSD-2 CDDL MIT"
 SLOT="0"
diff --git a/sys-fs/zfs/zfs-0.7.11.ebuild b/sys-fs/zfs/zfs-0.7.11.ebuild
index 50e655774144..10d61e3bfeb4 100644
--- a/sys-fs/zfs/zfs-0.7.11.ebuild
+++ b/sys-fs/zfs/zfs-0.7.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ fi
 inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="BSD-2 CDDL MIT"
 SLOT="0"
diff --git a/sys-fs/zfs/zfs-0.7.12.ebuild b/sys-fs/zfs/zfs-0.7.12.ebuild
new file mode 100644
index 000000000000..c79361210b4a
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.7.12.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3 linux-mod
+	AUTOTOOLS_AUTORECONF="1"
+	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"
+fi
+
+inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://zfsonlinux.org/"
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	net-libs/libtirpc
+	sys-apps/util-linux[static-libs?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!=sys-apps/grep-2.13*
+	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
+	!sys-fs/zfs-fuse
+	!prefix? ( virtual/udev )
+	test-suite? (
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+		virtual/modutils
+		)
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-boot/grub-2.00-r2:2
+		!<sys-kernel/genkernel-3.5.1.1
+		!<sys-kernel/genkernel-next-67
+		!<sys-kernel/bliss-initramfs-7.1.0
+		!<sys-kernel/dracut-044-r1
+		)
+	sys-fs/udev-init-scripts
+"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+pkg_setup() {
+	if use kernel_linux && use test-suite; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			# recheck that we don't have usblp to collide with libusb
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [ ] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	# Update paths
+	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+		-e "s|/sbin/parted|/usr/sbin/parted|" \
+		-i scripts/common.sh.in || die
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+
+	# prepare systemd unit and helper script
+	cat "${FILESDIR}/zfs.service.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs.service" || die
+	cat "${FILESDIR}/zfs-init.sh.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs-init.sh" || die
+}
+
+src_install() {
+	autotools-utils_src_install
+	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
+	use test-suite || rm -rf "${ED}usr/share/zfs"
+
+	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
+	bashcomp_alias zfs zpool
+
+	exeinto /usr/libexec
+	doexe "${T}/zfs-init.sh"
+	systemd_dounit "${T}/zfs.service"
+}
+
+pkg_postinst() {
+	if ! use kernel-builtin && [ ${PV} = "9999" ]
+	then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
+	then
+		einfo 'The zfs boot script has been split into the zfs-import,'
+		einfo 'zfs-mount and zfs-share scripts.'
+		einfo
+		einfo 'You had the zfs script in your boot runlevel. For your'
+		einfo 'convenience, it has been automatically removed and the three'
+		einfo 'scripts that replace it have been configured to start.'
+		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
+		einfo 'runlevel while the zfs-share script is in the default runlevel.'
+
+		rm "${EROOT}etc/runlevels/boot/zfs"
+		ln -snf "${EROOT}etc/init.d/zfs-import" \
+			"${EROOT}etc/runlevels/boot/zfs-import"
+		ln -snf "${EROOT}etc/init.d/zfs-mount" \
+			"${EROOT}etc/runlevels/boot/zfs-mount"
+		ln -snf "${EROOT}etc/init.d/zfs-share" \
+			"${EROOT}etc/runlevels/default/zfs-share"
+	else
+		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
+			einfo "You should add zfs-share to the default runlevel."
+	fi
+
+	if [ -e "${EROOT}etc/runlevels/default/zed" ]
+	then
+		einfo 'The downstream OpenRC zed script has replaced by the upstream'
+		einfo 'OpenRC zfs-zed script.'
+		einfo
+		einfo 'You had the zed script in your default runlevel. For your'
+		einfo 'convenience, it has been automatically removed and the zfs-zed'
+		einfo 'script that replaced it has been configured to start.'
+
+		rm "${EROOT}etc/runlevels/boot/zed"
+		ln -snf "${EROOT}etc/init.d/zfs-sed" \
+			"${EROOT}etc/runlevels/default/zfs-zed"
+	else
+		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+
+	if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
+	then
+		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+		rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
+	fi
+
+	systemd_reenable zfs-zed.service
+	systemd_reenable zfs-import-cache.service
+	systemd_reenable zfs-import-scan.service
+	systemd_reenable zfs-mount.service
+	systemd_reenable zfs-share.service
+	systemd_reenable zfs-import.target
+	systemd_reenable zfs.target
+	systemd_reenable zfs.service
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [ ${PV} = "9999" ]
+	then
+		remove_moduledb
+	fi
+}
diff --git a/sys-fs/zfs/zfs-0.7.8.ebuild b/sys-fs/zfs/zfs-0.7.8.ebuild
index fab094f8675d..06ecc91c23c3 100644
--- a/sys-fs/zfs/zfs-0.7.8.ebuild
+++ b/sys-fs/zfs/zfs-0.7.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ fi
 inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="BSD-2 CDDL MIT"
 SLOT="0"
diff --git a/sys-fs/zfs/zfs-0.7.9-r1.ebuild b/sys-fs/zfs/zfs-0.7.9-r1.ebuild
index ecf05f4ebd0f..50d9bb9bdc75 100644
--- a/sys-fs/zfs/zfs-0.7.9-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.7.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,7 @@ fi
 inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="BSD-2 CDDL MIT"
 SLOT="0"
diff --git a/sys-fs/zfs/zfs-0.7.9.ebuild b/sys-fs/zfs/zfs-0.7.9.ebuild
index e8cc8f1940dd..6a84b40cba73 100644
--- a/sys-fs/zfs/zfs-0.7.9.ebuild
+++ b/sys-fs/zfs/zfs-0.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ fi
 inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="BSD-2 CDDL MIT"
 SLOT="0"
diff --git a/sys-fs/zfs/zfs-0.7.9999.ebuild b/sys-fs/zfs/zfs-0.7.9999.ebuild
index 40620a10cb39..0adc1213090e 100644
--- a/sys-fs/zfs/zfs-0.7.9999.ebuild
+++ b/sys-fs/zfs/zfs-0.7.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,7 @@ fi
 inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="BSD-2 CDDL MIT"
 SLOT="0"
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index a2f27c13f982..0d0c1cf5b262 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ fi
 inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="BSD-2 CDDL MIT"
 SLOT="0"
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /sys-fs
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)