gentoo resync : 12.01.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-01-12 16:58:08 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-01-12 16:58:08 +0000
commit: c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch)
tree: 9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /sys-fs
parent: 2891d29af8907ce881662f4a02844926d7a293c7 (diff)
51 files changed, 381 insertions, 771 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 19e11a9e0fa2..26abefacf3a8 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/android-file-transfer-linux/Manifest b/sys-fs/android-file-transfer-linux/Manifest
index 7634d98c5bc9..5d0b152e6a6e 100644
--- a/sys-fs/android-file-transfer-linux/Manifest
+++ b/sys-fs/android-file-transfer-linux/Manifest
@@ -1,6 +1,4 @@
-DIST android-file-transfer-linux-3.5.tar.gz 779997 BLAKE2B af8f1025ae09f2e5a99116a1feb2449d2dcdf64887cd46e712c88f7911aea891ea5ff1705220b68ef9f6ab349a8c1d1955a843a47dcb53383a64a28f8830c7a8 SHA512 2a87a0a2c17b1f51cdce445291ccb99ee15ab24531e2cf41b1648702c66916d55ec8cdc1bd344bdbda5e4a1132daf0cc623862028f2d781812c24f8cf89a1367
 DIST android-file-transfer-linux-3.6.tar.gz 779459 BLAKE2B f71e7f3313a60cf12179908ed539e6b728e64c0b4e3b6b39dafd9926b27b96b54d31abac9da704111b2ab42867b1c58aac51ff547553cd5ad96dd8c00a5f670a SHA512 bcbc2f8bd39d093677b1c2dcb3d981293a8e79487884fcbe3450864dad9beff381fe966a2a42faf0af75a96753e4f139c95de7ed9175d7cb350055a35f7be4bc
-EBUILD android-file-transfer-linux-3.5.ebuild 1249 BLAKE2B 291048a184b70cffb2dd671b162404b3a11cf1e64d1b0ea4fb8ee7ac43295fd79d33113f3ec100ed1518c2898553e608c5051ac0874a317656fb163d98f97469 SHA512 8fe4e868db2e65d2415b67ef861f1d22c1fdbffcd68dc76ec7718ce8a447c4690351801dedad647e416240138d04f360672b984c460bb8017f651ce4b348f6cb
 EBUILD android-file-transfer-linux-3.6.ebuild 1218 BLAKE2B e1207bee155fc6b426865073d6bb7dc025e7b98f2089040e71154c423cc6358fc8f059f1a89829666c533ea3124337d41413a509ad084212f2085c0c9152e6cc SHA512 27ae2789f024e12375018920e80672dee47a402a65f8804b36da34b23ee53092fc64f4dac460509a75facb833a7f9b7185b5d0a9f280a7cac8791fb1b0adc94e
 EBUILD android-file-transfer-linux-9999.ebuild 1218 BLAKE2B e1207bee155fc6b426865073d6bb7dc025e7b98f2089040e71154c423cc6358fc8f059f1a89829666c533ea3124337d41413a509ad084212f2085c0c9152e6cc SHA512 27ae2789f024e12375018920e80672dee47a402a65f8804b36da34b23ee53092fc64f4dac460509a75facb833a7f9b7185b5d0a9f280a7cac8791fb1b0adc94e
 MISC metadata.xml 429 BLAKE2B 8d4f35c4537ff2fbe3f410e1d07a5e973b13f644d8a22b2f0dbddefc360ba851802ea8c0af29383dd791f4df26f0d235acfc35e3051e295512d0c9fbef19e9e1 SHA512 65bc09b634fa9f7d501ca82d4b64ed6ab524d226dc2e47c8b52db340cb5614280ace108fdf1bcd37b6ba80ea48e7c5a249c43da5053fadb7d5993950b5448874
diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.5.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.5.ebuild
deleted file mode 100644
index 753c4b81006b..000000000000
--- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="Android File Transfer for Linux"
-HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux"
-
-if [[ "${PV}" = *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/whoozle/android-file-transfer-linux.git"
-else
-	SRC_URI="https://github.com/whoozle/android-file-transfer-linux/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="fuse qt5"
-
-RDEPEND="
-	sys-apps/file
-	sys-libs/readline:0=
-	fuse? ( sys-fs/fuse:0 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_FUSE="$(usex fuse)"
-		-DBUILD_QT_UI="$(usex qt5)"
-		-DBUILD_SHARED_LIB="ON"
-		# Upstream recommends to keep this off as libusb is broken
-		-DUSB_BACKEND_LIBUSB="OFF"
-	)
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DDESIRED_QT_VERSION=5
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-pkg_preinst() { gnome2_icon_savelist ; }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/sys-fs/aufs-headers/Manifest b/sys-fs/aufs-headers/Manifest
index 5a09a8049e04..e80bae1c0aa3 100644
--- a/sys-fs/aufs-headers/Manifest
+++ b/sys-fs/aufs-headers/Manifest
@@ -1,13 +1,5 @@
-DIST aufs-headers-3.19_p20150323.tar.xz 3136 BLAKE2B 84c90f1068ceb070bc6ccda22dd423d32f09bb594196c767e65b4131f04565ce6f56861b1b536e5b4158e799cf531347aeb60801e6fddf0f651e3e93e0e6e573 SHA512 a137003b8b09ac3b929914dba27a13a9c2d803733ab7e073388b2a34f329f0b1ffcbe9646787738565ef28d3be77ca4a9bc520d759db4ca799cb2aa3643ee06f
-DIST aufs-headers-3.19_p20150420.tar.xz 3140 BLAKE2B fa41cffdea53264416a53dc6573f302c332df48b87c1a2c05e1cc85b07415685997f3226bb24af55df2ceb867a22396e75b65d1bb2371b674cb27ef82595d516 SHA512 257acbdd2439d7250e1903dbd7098d5a71749110caec6f6eecbc2e93b07859b5a751138a8000204ab735e3082ad15fdf249b132a7bac0ad6fbb0994213ab601d
-DIST aufs-headers-4.0_p20150420.tar.xz 3140 BLAKE2B 9afbbdfa276fdd361481ee3588ef73e267fede346da7ddbb80ab521c25ee5f8aafbbf67e195d1bcf141daf91a308630dc9ab4fe82d5f7dd2f7629ea31ba32655 SHA512 fe1d42c66721cf78125070f29fc40dc3f88d84f8a59a35333a427f1d6e0353207ad595a8bd3e12591fcb73a54b76db122d2f2519c7db4dee0557f38dfdc0fe03
-DIST aufs-headers-4.0_p20151116.tar.xz 3136 BLAKE2B c5c08b5d160a717853da63f2cc4d0d3248fa250d6913aae44c14136915005df1882d4bedf41606bb5629922f6bd027d8165a62fd1dbebd59f0d9cdfbd7b4ee3a SHA512 58205696948354f8d31230e6b709a136c720de2125bd00fe5929aaa1a70456bccf9c05cbca34412e0092cfd623aedefc8876ece3a7f6b02741a7b1e608aa0f65
-DIST aufs-headers-4.1_p20161010.tar.xz 3140 BLAKE2B bff9b39380a29d5a2f6c385dc69b882549190a63870c78643cc160919dbda8079bf8785ae22fde6c522591cb1343367b645712c6ec44f2ac760d0f3dfd653a6d SHA512 d47fe0666c4a1d6d9a78cbd94f790d46fee08bf88a17035ab59b7bb488dc1d8239c612bde06c580edd6227d82993ddbe84a5d576f3daae4d83dd51800fe26b03
+DIST aufs-headers-4.14_p20180709.tar.xz 3352 BLAKE2B 31b1573de9305518ef7935d7166d720f055c4b70de48943910d9041f976f483759af1998e6aa1dccff89fad0ff391686c4e18c867e700fcd4bb1211cc0004cc6 SHA512 e2c4e90c555edc072ebcb348de50e5ec9ba6e2785758d10f14e43c8a03980dfadd58bc9cd37c811648bfabda37e6ed7d0bf36d7099edd26f40672b0ca0f2f226
 DIST aufs-headers-4.1_p20170130.tar.xz 3136 BLAKE2B cda05eed3429c84dae70a5c88600e4369d4997cca5d0b8f21c82dcb3449b0b88ac27b3e3216034272a6f2ff53aa455b3eb9dc23fc7cc77473aa53943340df9c7 SHA512 d8099a59784739b76eac74de7113754981b6d2d4155eaf42f9d36ea4b6c84f6f49cd96ce0b9e19b2507674cd9b91667fe8520f1cfb7ff0e1d5c58596e784c6d0
-EBUILD aufs-headers-3.19_p20150323.ebuild 640 BLAKE2B 05d7c28b8ac9548b181b4f07731ad1bb77601046b1fea1ef7e8835d1d340737258cdda0c8a6844f270a6a51f323cc5e698996dd7ad712da148eee10c51494183 SHA512 451a6309d90b0eeddb0b98dd84e64bf3af22d1755bf38934884c6d82c4cd896475e7fdd0cdfcf24fbf423fc8af54377cf231a3548ba9bf7d11bf605dbba5315e
-EBUILD aufs-headers-3.19_p20150420.ebuild 640 BLAKE2B 05d7c28b8ac9548b181b4f07731ad1bb77601046b1fea1ef7e8835d1d340737258cdda0c8a6844f270a6a51f323cc5e698996dd7ad712da148eee10c51494183 SHA512 451a6309d90b0eeddb0b98dd84e64bf3af22d1755bf38934884c6d82c4cd896475e7fdd0cdfcf24fbf423fc8af54377cf231a3548ba9bf7d11bf605dbba5315e
-EBUILD aufs-headers-4.0_p20150420.ebuild 638 BLAKE2B 6d14dee13042cffcfee580bdfe077f7071e5f03ba8f42f30a161e080c682070ef7835ab0f4c6d69fbc552cbc84992b89b35fbdc971a337a5cf3053c93b3c1bd8 SHA512 71dc711b426ef279932705fe164492e43af91d5daebeebf21c151ec0ed6304cb0c7935f5c80d7cc75a9f426507d5c10517680197b539593318718a542c019579
-EBUILD aufs-headers-4.0_p20151116.ebuild 640 BLAKE2B 05d7c28b8ac9548b181b4f07731ad1bb77601046b1fea1ef7e8835d1d340737258cdda0c8a6844f270a6a51f323cc5e698996dd7ad712da148eee10c51494183 SHA512 451a6309d90b0eeddb0b98dd84e64bf3af22d1755bf38934884c6d82c4cd896475e7fdd0cdfcf24fbf423fc8af54377cf231a3548ba9bf7d11bf605dbba5315e
-EBUILD aufs-headers-4.1_p20161010.ebuild 640 BLAKE2B f16df748643dbf84d0025d4815bb2a500400dbad86533d443f3a2808ff4ae3250a8c3648995e5e65da214928eee5e8c69d527b191d111bd4877a120f057252f6 SHA512 30b4c711f2ff535150dacc60442c66073ce28ddd38f0ca39275e7fd682284c06936e85230e2934ba32d2663bd3a91e699d925e9bee11c3727a63864c49cfb92a
-EBUILD aufs-headers-4.1_p20170130.ebuild 640 BLAKE2B 61d84e7adebf8cd88445fae3f5093c8608bea2b37b92d38f3c331e7a952cd79af742f0f3d6f19ece71769e4e5507673dd80bc6de953e5fbd0ff645f964794ea0 SHA512 cd147fad8c2c1b38c6ee40c528d64cef282dbd2898250548bf94b4c930c4e55ddcc13a88a8dce76aec13c9013d661d3bc5778dd28f037b6c9387b79a9aa2255f
+EBUILD aufs-headers-4.14_p20180709.ebuild 616 BLAKE2B a8db7ed67120d808ce9a17e813c9aa1c3bc644746a7f1ca2d3f0b56add1e3e5e3479e75ce49dd0d735536fe7ea5292063abdb09c57c9805929b7de16f41bd43c SHA512 811e1645d18bbfb22ea70136441c121f79a8b491625538fb81e4c096be24bee3f4dd4f426a4eb361123f17e62226d6bcb725ab3bae08590c7e5b17e22433325b
+EBUILD aufs-headers-4.1_p20170130.ebuild 637 BLAKE2B 4b7e239c911ef0a8b0641d1f3643f9e7860d492e142245d014b6767b14f11bcc0f8ffb3f1bd98651d68cc73314ef5d268fcb84e86d45977dc4f36f70271c4f74 SHA512 fa44465b5d9c5c4964268289fbb0b378b64f0d340ba4037b34d702e97344f9ea5cdf600319ddd44af6c4f6ef8e598dd3744f8acb5c7ff222ed1a279b6212b3cb
 MISC metadata.xml 297 BLAKE2B a731cab2c80385c087edc64d31769ae6344ee80a5aee2cd5d8693c398da639f6a79cc124b11b79795e096519a70155ad4b2d3af22d92f8fc3b0f7611eb1c763e SHA512 fdf9bf9558a618fd070f65d91b96b9037498503a4df0d06f1b595a9157c34ddaf3c13de9922f32663fb9499394d8c669fe7957dd213ec8e0ed4e66e3638d837f
diff --git a/sys-fs/aufs-headers/aufs-headers-3.19_p20150323.ebuild b/sys-fs/aufs-headers/aufs-headers-3.19_p20150323.ebuild
deleted file mode 100644
index 96d6c06c1dae..000000000000
--- a/sys-fs/aufs-headers/aufs-headers-3.19_p20150323.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="User space headers for aufs3"
-HOMEPAGE="http://aufs.sourceforge.net/"
-# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-linux.git
-# Check aufs release Branch
-# Create .config
-# make headers_install INSTALL_HDR_PATH=${T}
-# find ${T} -type f \( ! -name "*aufs*" \) -delete
-# find ${T} -type d -empty -delete
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_install() {
-	doheader -r include/*
-}
diff --git a/sys-fs/aufs-headers/aufs-headers-3.19_p20150420.ebuild b/sys-fs/aufs-headers/aufs-headers-3.19_p20150420.ebuild
deleted file mode 100644
index 96d6c06c1dae..000000000000
--- a/sys-fs/aufs-headers/aufs-headers-3.19_p20150420.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="User space headers for aufs3"
-HOMEPAGE="http://aufs.sourceforge.net/"
-# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-linux.git
-# Check aufs release Branch
-# Create .config
-# make headers_install INSTALL_HDR_PATH=${T}
-# find ${T} -type f \( ! -name "*aufs*" \) -delete
-# find ${T} -type d -empty -delete
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_install() {
-	doheader -r include/*
-}
diff --git a/sys-fs/aufs-headers/aufs-headers-4.0_p20150420.ebuild b/sys-fs/aufs-headers/aufs-headers-4.0_p20150420.ebuild
deleted file mode 100644
index 69ae941dbdc8..000000000000
--- a/sys-fs/aufs-headers/aufs-headers-4.0_p20150420.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="User space headers for aufs3"
-HOMEPAGE="http://aufs.sourceforge.net/"
-# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-linux.git
-# Check aufs release Branch
-# Create .config
-# make headers_install INSTALL_HDR_PATH=${T}
-# find ${T} -type f \( ! -name "*aufs*" \) -delete
-# find ${T} -type d -empty -delete
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_install() {
-	doheader -r include/*
-}
diff --git a/sys-fs/aufs-headers/aufs-headers-4.0_p20151116.ebuild b/sys-fs/aufs-headers/aufs-headers-4.14_p20180709.ebuild
index 96d6c06c1dae..1a3ae3719eb1 100644
--- a/sys-fs/aufs-headers/aufs-headers-4.0_p20151116.ebuild
+++ b/sys-fs/aufs-headers/aufs-headers-4.14_p20180709.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit versionator
+EAPI=7
 
 DESCRIPTION="User space headers for aufs3"
 HOMEPAGE="http://aufs.sourceforge.net/"
-# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-linux.git
+# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs4-linux.git
 # Check aufs release Branch
 # Create .config
 # make headers_install INSTALL_HDR_PATH=${T}
diff --git a/sys-fs/aufs-headers/aufs-headers-4.1_p20161010.ebuild b/sys-fs/aufs-headers/aufs-headers-4.1_p20161010.ebuild
deleted file mode 100644
index 237b5d1a9e20..000000000000
--- a/sys-fs/aufs-headers/aufs-headers-4.1_p20161010.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="User space headers for aufs3"
-HOMEPAGE="http://aufs.sourceforge.net/"
-# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-linux.git
-# Check aufs release Branch
-# Create .config
-# make headers_install INSTALL_HDR_PATH=${T}
-# find ${T} -type f \( ! -name "*aufs*" \) -delete
-# find ${T} -type d -empty -delete
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_install() {
-	doheader -r include/*
-}
diff --git a/sys-fs/aufs-headers/aufs-headers-4.1_p20170130.ebuild b/sys-fs/aufs-headers/aufs-headers-4.1_p20170130.ebuild
index be408d85c1cd..9cdf2fc061a1 100644
--- a/sys-fs/aufs-headers/aufs-headers-4.1_p20170130.ebuild
+++ b/sys-fs/aufs-headers/aufs-headers-4.1_p20170130.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
diff --git a/sys-fs/aufs-util/Manifest b/sys-fs/aufs-util/Manifest
index 5c3565708f60..d088e32cb4ea 100644
--- a/sys-fs/aufs-util/Manifest
+++ b/sys-fs/aufs-util/Manifest
@@ -1,14 +1,5 @@
-AUX aufs-util-4.0_p20150420-version.patch 369 BLAKE2B c0c919484169a9c869f4eb3a923f8d63ba10c041062edd301350ff0cc958ffcfa66ab5030eb1b2fa998e9788986b6490e75c3680ec0c41784e7ec589db126e30 SHA512 0ef48129bee4a72372f82e3c3c73379f0f4e55849b3ce2c4ebd930d688bc3878c64582765b5e1dff868d460e5069b9263b3ac998e6cd00fce2b3cdbeef79ffe2
-DIST aufs-util-3.19_p20150323.tar.xz 97980 BLAKE2B ac826545100936b670640e0a277fb1355329c869f887bffeca400d774fb627c0ce44126e2dcf85b65976302fbcb7b356c8bb734814c44f6259d62437da2ad633 SHA512 49f138538ea8997ddb6bedf368815f16a5d42a49b5f72c1548cd9c3718bb00831224e80e9b4dd8c984a6fb40b11223e317757020076d432117541f7d361b892b
-DIST aufs-util-3.19_p20150420.tar.xz 97980 BLAKE2B ade3ed060ab0fa0c37aebcfd52dfe7df3e7aa6b4936277952d128b096fc1c36699e0b7129873afcbeedaea019f12ac461812177bff82362a1a7ee6d261178b9f SHA512 fe329e9efdbd7b585664b81c2bcd2d63ce5344d013eb2d76c6247e042c1cbe44a4a3ab6e8317734c06c24c1eeffe438d8f91a8e57d95b34e238b21a8b9389e8a
-DIST aufs-util-4.0_p20150420.tar.xz 97924 BLAKE2B e5daaf71e4f107f63b481dc5b8ba949a230b4b412cfac6744eb991589947743d2eaa2dc22c04684042292d472578471be3e71322a3cac15070616b36319dfd29 SHA512 9a988dcd3640e4797c731ab921161bccbd125fc23475e39681b3a398a238715cb85ac8fe8dfc64053af7478c8c33fe28b7e8cc3a2f97eb31e3c4049305043085
-DIST aufs-util-4.0_p20151116.tar.xz 98116 BLAKE2B fb1216879439d6972892f45e1401708172c94376e57eeb2eabb43512ea4e664c6d71af42c55a0ecff7d43a6c6a5d35b01f2de40dada5cf9f0070858b3826aed9 SHA512 35da6ccff82d7c74f1f9d680ddf17fc438811565b010ead274febac79b4352ee461d66e48b36123f0091d75a5d1c15ea078038a849ded11a20fd6859015abadc
-DIST aufs-util-4.1_p20161010.tar.xz 100124 BLAKE2B 21055f22fae04097f0ee67375a1f779a912f503c9ce343890e05338f09603c2a188109c5bdd8dee522385fe154e31528528ea76f6b644f4a03246364c231521b SHA512 2b9eacdafe7f81d84c4d0404e62988222365c00f4fe17abc9038ee6330695445fc49b3b5e5d531afbbbcf690d695297379ca15dedeb3729983d145a751714379
+DIST aufs-util-4.14_p20180709.tar.xz 103724 BLAKE2B 50df13812b090e5d8aa9a07009822f9a324091471243a76c9432ea22698a6167273e661f5ebf176fb3cc419fbe560e82ff73d6e3b37ed0a85a01e6315b06c8ac SHA512 f6330dfc0ddc36102473d9931c62a7f9a5549a3ad2b78ababedf68d335ef02b155a90327dd0c7d446182530db755b9ff756533f90c540bf8aacca5eb117555df
 DIST aufs-util-4.1_p20170130.tar.xz 100144 BLAKE2B d3032feeb787e3864247890c2b77468cb39ac1936cebc7e2044a2a58bd84817401b0cf7ab42413ca2c6307430552b49fb642d45e04c42f2729c0a5f1ccfb1589 SHA512 bf47829bdd93472a318e3eb1fd76332a95a42b3ec39b4d3392baac419ca70bd47b7b0c6209592ad70c284ee997a71e3448e79fa0ad6b4a6db16ffa0c47ed11ca
-EBUILD aufs-util-3.19_p20150323.ebuild 1005 BLAKE2B 8f23cf9fd80fb8669b7b3d5eb547a317136bbb4743f07f8c8eded0f1168c341abb8a81badabc52fb8d9ffc67bfc782d1da926b2e183d6eb2c476f58a9b5f4125 SHA512 0116b36a54f8d97229f5c31a88811a631e2e20c2b281b49cffe295f1008b51da3c7015599548c30c9dbf37e73360a0b16a091717eb85d4c87a129fe4c7939f24
-EBUILD aufs-util-3.19_p20150420.ebuild 1005 BLAKE2B 8f23cf9fd80fb8669b7b3d5eb547a317136bbb4743f07f8c8eded0f1168c341abb8a81badabc52fb8d9ffc67bfc782d1da926b2e183d6eb2c476f58a9b5f4125 SHA512 0116b36a54f8d97229f5c31a88811a631e2e20c2b281b49cffe295f1008b51da3c7015599548c30c9dbf37e73360a0b16a091717eb85d4c87a129fe4c7939f24
-EBUILD aufs-util-4.0_p20150420.ebuild 1050 BLAKE2B db50068a42da74d616e1c8ab528fabc9370f192ad1272152b5a49adabb26c3a3df4ce2eeab7eef0b7e20c7410a0866697c00b0b0524dd7c948402bde983a9d27 SHA512 d31189a425dd920d039920aa482274eb00af24f44a50ff549d36aba06c6d5a87a90b60bda3f2fb3057cb32afee30fbe2870004010f62312a8f8f788eefc078a6
-EBUILD aufs-util-4.0_p20151116.ebuild 1011 BLAKE2B e8920ffa7d42abb2caabf413140ad08ede1d9047891857032aed58ba809450fb3dbb6d51753680c81ea138aef4deef44611c30b2dc7318c0b9f08aa8e33e6a3d SHA512 e9aae683088ed63823f1c0586456ac7f1b3bd3bbf837ff2e8abb71a1e33acf005a0e1ff7c500b364820cb172444980822692250b582a838b76e6ea74e3fb6474
-EBUILD aufs-util-4.1_p20161010.ebuild 1020 BLAKE2B b1f55b9e3d92c440352a6604ec597cd2dab94fc22479f1590282e495ee9063a6ed7f68b34b3f6f786a4f05c965274002ff84721387b8bb015749cb6293e00f99 SHA512 10fa15fac1bf6d226030a9511ff93ec95f3b7edf2c7f38cac44b148326857c162d8bedbb9dbeea1fba88e9e93ed0f9d022db05104b1e9a8500f5c309c9df9fe1
+EBUILD aufs-util-4.14_p20180709.ebuild 1037 BLAKE2B 81e6529bf6bcdaf2a835e3320f0fe9a066eefe27621686029a8554be9f0597b4d2c2d2fd61dfae34bdd5dddc43ed29707f9fe7dda729bebeecb98928a5be0653 SHA512 e4570de61254349baaa8472987e51548e86631a5443e370869061637017292855e2ae56657f2b04f9d672469f8376717b0eabc09300d155df742288eaf6e9473
 EBUILD aufs-util-4.1_p20170130.ebuild 1020 BLAKE2B e111c9619c4045c0c01d594429cbc0ba048607b0ad1724890c0e3576cf51dbf183837e9fe8f80b2e1388353a5a3d3d108e0e43cacddf9be457e7cbf92e9fc34c SHA512 e568606dcd2d50839433cb5acaa1e41be730f7feadec891541fc1ab7b8fd6a1d59a5b00fe6140a2b8d5604a55bdd8054a98de907109ff1f5992e7e785fff6f33
 MISC metadata.xml 297 BLAKE2B a731cab2c80385c087edc64d31769ae6344ee80a5aee2cd5d8693c398da639f6a79cc124b11b79795e096519a70155ad4b2d3af22d92f8fc3b0f7611eb1c763e SHA512 fdf9bf9558a618fd070f65d91b96b9037498503a4df0d06f1b595a9157c34ddaf3c13de9922f32663fb9499394d8c669fe7957dd213ec8e0ed4e66e3638d837f
diff --git a/sys-fs/aufs-util/aufs-util-3.19_p20150323.ebuild b/sys-fs/aufs-util/aufs-util-3.19_p20150323.ebuild
deleted file mode 100644
index 00e8f53be185..000000000000
--- a/sys-fs/aufs-util/aufs-util-3.19_p20150323.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic linux-info multilib toolchain-funcs
-
-DESCRIPTION="Utilities are always necessary for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs3.14 -o ${P}.tar
-# xz -ve9 *.tar
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	!sys-fs/aufs2
-	!<sys-fs/aufs3-3_p20130318"
-DEPEND="${RDEPEND}
-	~sys-fs/aufs-headers-${PV}"
-
-src_prepare() {
-	sed \
-		-e "/LDFLAGS += -static -s/d" \
-		-e "/CFLAGS/s:-O::g" \
-		-i Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e "s:m 644 -s:m 644:g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i libau/Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e '/LDLIBS/s:-lrt::g' \
-		-e '/LDLIBS/s:$: -lrt:g' \
-		-i fhsm/Makefile || die
-
-	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
-}
diff --git a/sys-fs/aufs-util/aufs-util-3.19_p20150420.ebuild b/sys-fs/aufs-util/aufs-util-3.19_p20150420.ebuild
deleted file mode 100644
index 00e8f53be185..000000000000
--- a/sys-fs/aufs-util/aufs-util-3.19_p20150420.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic linux-info multilib toolchain-funcs
-
-DESCRIPTION="Utilities are always necessary for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs3.14 -o ${P}.tar
-# xz -ve9 *.tar
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	!sys-fs/aufs2
-	!<sys-fs/aufs3-3_p20130318"
-DEPEND="${RDEPEND}
-	~sys-fs/aufs-headers-${PV}"
-
-src_prepare() {
-	sed \
-		-e "/LDFLAGS += -static -s/d" \
-		-e "/CFLAGS/s:-O::g" \
-		-i Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e "s:m 644 -s:m 644:g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i libau/Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e '/LDLIBS/s:-lrt::g' \
-		-e '/LDLIBS/s:$: -lrt:g' \
-		-i fhsm/Makefile || die
-
-	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
-}
diff --git a/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild b/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild
deleted file mode 100644
index 5d9dae2940a9..000000000000
--- a/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild
+++ /dev/null
@@ -1,46 +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 linux-info multilib toolchain-funcs
-
-DESCRIPTION="Utilities are always necessary for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs4.0 -o ${P}.tar
-# xz -ve9 *.tar
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	!sys-fs/aufs2
-	!<sys-fs/aufs3-3_p20130318"
-DEPEND="${RDEPEND}
-	~sys-fs/aufs-headers-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-version.patch
-	sed \
-		-e "/LDFLAGS += -static -s/d" \
-		-e "/CFLAGS/s:-O::g" \
-		-i Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e "s:m 644 -s:m 644:g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i libau/Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e '/LDLIBS/s:-lrt::g' \
-		-e '/LDLIBS/s:$: -lrt:g' \
-		-i fhsm/Makefile || die
-
-	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
-}
diff --git a/sys-fs/aufs-util/aufs-util-4.0_p20151116.ebuild b/sys-fs/aufs-util/aufs-util-4.0_p20151116.ebuild
deleted file mode 100644
index ef0ac24fc292..000000000000
--- a/sys-fs/aufs-util/aufs-util-4.0_p20151116.ebuild
+++ /dev/null
@@ -1,45 +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 linux-info multilib toolchain-funcs
-
-DESCRIPTION="Utilities are always necessary for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs4.0 -o ${P}.tar
-# xz -ve9 *.tar
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	!sys-fs/aufs2
-	!<sys-fs/aufs3-3_p20130318"
-DEPEND="${RDEPEND}
-	~sys-fs/aufs-headers-${PV}"
-
-src_prepare() {
-	sed \
-		-e "/LDFLAGS += -static -s/d" \
-		-e "/CFLAGS/s:-O::g" \
-		-i Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e "s:m 644 -s:m 644:g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i libau/Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e '/LDLIBS/s:-lrt::g' \
-		-e '/LDLIBS/s:$: -lrt:g' \
-		-i fhsm/Makefile || die
-
-	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
-}
diff --git a/sys-fs/aufs-util/aufs-util-4.1_p20161010.ebuild b/sys-fs/aufs-util/aufs-util-4.14_p20180709.ebuild
index 6ccd17ef6704..d68a80251fa5 100644
--- a/sys-fs/aufs-util/aufs-util-4.1_p20161010.ebuild
+++ b/sys-fs/aufs-util/aufs-util-4.14_p20180709.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils flag-o-matic linux-info multilib toolchain-funcs
 
 DESCRIPTION="Utilities are always necessary for aufs"
 HOMEPAGE="http://aufs.sourceforge.net/"
 SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs4.0 -o ${P}.tar
+# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs4.14 -o ${P}.tar
 # xz -ve9 *.tar
 
 SLOT="0"
@@ -42,5 +42,6 @@ src_prepare() {
 
 	tc-export CC AR
 	export HOSTCC=$(tc-getCC)
+	export STRIP=true
 	default
 }
diff --git a/sys-fs/aufs-util/files/aufs-util-4.0_p20150420-version.patch b/sys-fs/aufs-util/files/aufs-util-4.0_p20150420-version.patch
deleted file mode 100644
index b861bb2bb0b7..000000000000
--- a/sys-fs/aufs-util/files/aufs-util-4.0_p20150420-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- ver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ver.c b/ver.c
-index 200b119..38abdd5 100644
---- a/ver.c
-+++ b/ver.c
-@@ -25,7 +25,7 @@
- int main(int argc, char *argv[])
- {
- 	regex_t preg;
--	const char *pat = "^4\\.[0-9][0-9]";
-+	const char *pat = "^4\\.[0-9][0-9]?";
- 
- 	if (regcomp(&preg, pat, REG_EXTENDED | REG_NOSUB))
- 		AuFin("regcomp");
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 5101b63cf44f..b717db856822 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -8,7 +8,7 @@ DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2
 DIST cryptsetup-2.0.5.tar.xz 10476304 BLAKE2B cf1e335fce48a7bf835b2008dfc0a96ef35d344e2c9f6a0a5a2ff45644f9015311e99b8f9e05b0b23cad69d74f91dd1b7cdd766560fb6504e7453d6e46bea186 SHA512 bac3f5fde1be02d325c097f85e77aef44ce764c1bca7f0554cedd69b9444e5a5529f11b9ae74d36dc1977e88e11422a58dfa17e48559eac7f5e6c4ce332409ae
 DIST cryptsetup-2.0.6.tar.xz 10621424 BLAKE2B ecda2cb3c0a8a46b69519ab9ea9a1ece44fb21602cbce0751e52a16e5e493c7772fdc62c1151b95a783a847d9afd5a64f64bcac6673acba4bb90a417047c93cb SHA512 1fdb9068fe2b5825cef65323a9b788b5e043c1000e614e47e2b21ab3969e416653580aba639755ba936718ad612b986768029df5e07f3fa191db2bf29d2501ef
 EBUILD cryptsetup-1.7.5-r1.ebuild 4041 BLAKE2B 3f8868734f9ed2d1a635762348632b00520b243738c9f907866225e981bd7534d38f746c2eda2292cfaa395f77e431cd4b479ba97294d187c9d7de3b3f6047c5 SHA512 d41b3eb764e68fe72d1e4d2ee725a66030f03cfe7ea7d9046cc0dfaf673062229e9ade2a356b81112e8955cc8536916caae949716aebf3b0d4bfb8ce8f2190c7
-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
+EBUILD cryptsetup-2.0.5-r1.ebuild 4153 BLAKE2B cbca146d7e3fa93ca5e7848a6e6f6e81b6db999059be22ab4e23b96267f13d106a7ac4d34f771cfc566ec0d0968aabcb36a2985d799f9f5a3eff11c2975e6342 SHA512 dbb00e9b80e479eea14dc97a4ec44963eb1d8e251e0f17616197c30c2c55c2c4d7c62c446bcc4d0574e3968ed0a696cf8d8b04c88bbf367c55567b9cec4db713
+EBUILD cryptsetup-2.0.5.ebuild 4153 BLAKE2B fef3bc471620ccf1b2721fe48708a83a2df51ab1ffcc1b4671303152c9c0ef352e5f7d773bab43e389e6fb75ec7df42b34b2182951fab7e720804122af0fe3cc SHA512 83db793b38c609812008ecbb8edb1163ba7f32635606be2dfdec34a5ba8292ddbaf8fbafa7624d66c757f35566a2ef6b9f6b9ea56ab797779a54aa7cdd8026e4
+EBUILD cryptsetup-2.0.6.ebuild 4153 BLAKE2B fef3bc471620ccf1b2721fe48708a83a2df51ab1ffcc1b4671303152c9c0ef352e5f7d773bab43e389e6fb75ec7df42b34b2182951fab7e720804122af0fe3cc SHA512 83db793b38c609812008ecbb8edb1163ba7f32635606be2dfdec34a5ba8292ddbaf8fbafa7624d66c757f35566a2ef6b9f6b9ea56ab797779a54aa7cdd8026e4
 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 da5c949c138f..29d4e9c8fee8 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~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 29d5fcff6450..95b79852b4de 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~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.6.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild
index 29d5fcff6450..95b79852b4de 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~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/dfc/Manifest b/sys-fs/dfc/Manifest
index eb426ed89c4d..26142f7dc3c3 100644
--- a/sys-fs/dfc/Manifest
+++ b/sys-fs/dfc/Manifest
@@ -1,5 +1,3 @@
-DIST dfc-3.0.5.tar.gz 43310 BLAKE2B 4698c5f5caf249695598b01dab471c978e9a5b83b2c1610af466588bbac182ea7f51a7017d6be0b0f753f1abf41b7aa054e67049ff74344271c2dc5c01a8ef02 SHA512 f828ede8aee0a496518d1ee9583ba71495cdd01ee0d22833e3b46aeb5f5f870ce7de629923d129a7bf795b458feec10f9a16882134dae34dd2ace7ea9eebb134
 DIST dfc-3.1.1.tar.gz 52709 BLAKE2B 543795af9c0f3309ee497bc0bdfe144bec3cac69b4772803204d794acb9513e7f7b2726ea16640492a6c477f5c3c7fa872284efd5b7c690bf1bfde4608f7281d SHA512 eac2c8d464d57626efe939f515889cf91510f7e6eb50382d045204d4f1d6b9b9f0af4b1d8974c9cbcff1eb5b8802157e421ec06e5a1e38dac74eba72f43f9701
-EBUILD dfc-3.0.5-r1.ebuild 836 BLAKE2B e1fee8e45a8dfc7ab923a79bcaaf2483f1ad4dc0331a107952392c0c6add71bdb6c6494ac04d8315140687d46bcc38bf35a2f5a8f36d57a2d4ec8045d945c343 SHA512 d86e384267c8e9c34b45302199064dd694404815c5bd71cd4b7dae1a45fe8e92a7a4a1dcf823508b2a51b51c70660b37e49e48ade0758791b66558da8f0b81bf
 EBUILD dfc-3.1.1.ebuild 813 BLAKE2B c60976a10d96459ca833a2d954256da7fc0e551b9860568aa9ea72b0dc2082dd44f1ede810c513d557c9a8e388b49ecbfddc378396732e87d3b9b28aec4b1241 SHA512 20f5d489b6da24db6b03399cf7d619fbda0902b2f55bed63d5f80d8bc3dad59c8d51172bbdd0e3946a3822daa597ad2fa10e3b6b16e00d37ba32cf7dfa76fc81
 MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8
diff --git a/sys-fs/dfc/dfc-3.0.5-r1.ebuild b/sys-fs/dfc/dfc-3.0.5-r1.ebuild
deleted file mode 100644
index 83460b87e300..000000000000
--- a/sys-fs/dfc/dfc-3.0.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="A simple CLI tool that display file system usage, with colors"
-HOMEPAGE="http://projects.gw-computing.net/projects/dfc"
-SRC_URI="http://projects.gw-computing.net/attachments/download/467/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="nls"
-
-DEPEND="nls? (
-	virtual/libintl
-	sys-devel/gettext
-)"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_configure() {
-	mycmakeargs=(
-		# avoid installing xdg config in /usr
-		-DXDG_CONFIG_DIR="${EPREFIX}"/etc/xdg
-		# use the standard Gentoo doc path
-		-DDFC_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
-		# disable automagic dependency
-		$(cmake-utils_use nls NLS_ENABLED)
-		-DLFS_ENABLED=ON
-		-DGRIM=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index a021735267e6..6405ad42fe0c 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1,3 +1,3 @@
 DIST dosfstools-4.1.tar.xz 172936 BLAKE2B d8ef617d9dbdc21318c4f43e2fd6dca1d3452ab46253b055d8fef09aa693bcf63ef58076a49f305bb21de87298bae5be6b626065dfcbd90935af68709e2c3c6a SHA512 e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78
-EBUILD dosfstools-4.1.ebuild 993 BLAKE2B 8737bd209b6caf6586a430f84a39a060478a8dfcf079121745a16e0a6901829813e6efd55a0e14a1cc48bec986839fb05dab37d844660dcae2bb16bb3d137348 SHA512 7067f3e6ac9d39dcdbf394abdd2a49f97377d2b17e7e60ef37e34edd0bc2b082bf105119ea0fd566bf2146e0f2900e670ba402864dc05517238d6e8b25c38ff9
+EBUILD dosfstools-4.1.ebuild 992 BLAKE2B bbeb67afa4c6d27d993eebb450593b82944a8f645fee30ac06ca61376e0e960bc32c90b9e1c985e2fcf2f62a4c1e5fe99822ef422e0c2e95e23da2a28bb1903d SHA512 c22940dceabba552670420ad0768dbde8bc416178dfdf5f975bbd3827f77deafe45f58443d1067421e068444fe899eebd6bc8bf1fd6748160593e169569d5734
 MISC metadata.xml 424 BLAKE2B 01d65645ef9a1e617bf40a2d401a5fd3f1444c68f41a3c64e746e445b100ebd7c8af05b48c250f4bd9c679842906dd2e9b679edc298b1001f7dfe5b183f5f77a SHA512 d82795b70fc583b8154a2c3b14b6565cff36924b91fb3888cd2b6c36d8036614be6d67a0ea0fc96f2fa4bfa5516675b8aa74571e578ad8d42c06cb9f503c565d
diff --git a/sys-fs/dosfstools/dosfstools-4.1.ebuild b/sys-fs/dosfstools/dosfstools-4.1.ebuild
index a245d461ea34..255edccac57d 100644
--- a/sys-fs/dosfstools/dosfstools-4.1.ebuild
+++ b/sys-fs/dosfstools/dosfstools-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -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/fuse/Manifest b/sys-fs/fuse/Manifest
index d6a69cd280c3..7145f8062baf 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -3,13 +3,10 @@ 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.6.tar.xz 1456220 BLAKE2B 9b09504ed04abd0134188c28f3908e69e3416c345a96aefbca0f64447f3c3a8907550874f5fec9cd8f65fbaa892be6cc0213a7f61d7ad51c955ce3acf955ee17 SHA512 3a1ef77ab4c79a24aad0b259e17f568a30a5faf53ac17eb25d05f30dc7423f0081583f5b3c284ca9196a01885843e97c323a84231272b7e2b55c8e73848a61b8
-DIST fuse-3.3.0.tar.xz 1010840 BLAKE2B 56422879c7a87351deb731b3e5f950c1d7f584f730e5d595f5b3f1b5dea960cd26c875d8921ae6495c7fd99b3525b76a65b9c866c5f19e653c04f9ae4bd98b13 SHA512 fa6ee83c4ccdea797e37c9413d504ebe3cbc2bfef9526d485519144714f7b7163bbae9be26ec8a471aa76e98958779bd9d702083be272abaa3b6f1694816e913
+DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 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-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-2.9.9.ebuild 1883 BLAKE2B 7cbd50df85e6eaea2e89b3e36bf819bba20cc1589dc2607bff8e2fe97155a7f1f6ae34b9589c3965e29dffd311682a259cbbd06bd9cce215121837b2c29022c0 SHA512 876c5d8760383847d59db3ceed3dcb074fe48e87ef4192cbb8bd586eac9e5e2becfd7a0a49a76cb213426e961ac2e353d9421865fb5801507e59a584a89da5e0
 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.8-r1.ebuild b/sys-fs/fuse/fuse-2.9.9.ebuild
index 0e17eaa9a114..e36b63cd9381 100644
--- a/sys-fs/fuse/fuse-2.9.8-r1.ebuild
+++ b/sys-fs/fuse/fuse-2.9.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit libtool linux-info udev toolchain-funcs
 
 DESCRIPTION="An interface for filesystems implemented in userspace"
@@ -64,8 +64,8 @@ src_install() {
 	find "${ED}" -name '*.la' -delete || die
 
 	# installed via fuse-common
-	rm -r "${ED%/}"/{etc,$(get_udevdir)} || die
+	rm -r "${ED}"/{etc,$(get_udevdir)} || die
 
 	# handled by the device manager
-	rm -r "${D%/}"/dev || die
+	rm -r "${ED}"/dev || die
 }
diff --git a/sys-fs/fuse/fuse-3.2.6.ebuild b/sys-fs/fuse/fuse-3.2.6.ebuild
deleted file mode 100644
index 4012fc673b62..000000000000
--- a/sys-fs/fuse/fuse-3.2.6.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.3.0-r1.ebuild b/sys-fs/fuse/fuse-3.3.0-r1.ebuild
deleted file mode 100644
index 3b4821add777..000000000000
--- a/sys-fs/fuse/fuse-3.3.0-r1.ebuild
+++ /dev/null
@@ -1,73 +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,7} )
-
-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-3.3.0-r1"
-
-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
-
-	# handled by the device manager
-	rm -r "${ED%/}"/dev || die
-
-	# manually install man pages to respect compression
-	rm -r "${ED%/}"/usr/share/man || die
-	doman doc/{fusermount3.1,mount.fuse3.8}
-}
diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest
index ef46e6b275ea..41cba3872970 100644
--- a/sys-fs/inotify-tools/Manifest
+++ b/sys-fs/inotify-tools/Manifest
@@ -1,5 +1,5 @@
 DIST inotify-tools-3.14.tar.gz 358772 BLAKE2B 99a0b82942d227e3c237edd6ca07bea68a7bbc07fd97bc5d44cb3c07e5e3bfee9513255fe675667872b027f93edd1137c30b61da7c0ef3986994aa812ca74d15 SHA512 6074d510e89bba5da0d7c4d86f2562c662868666ba0a7ea5d73e53c010a0050dd1fc01959b22cffdb9b8a35bd1b0b43c04d02d6f19927520f05889e8a9297dfb
 DIST inotify-tools-3.20.1.tar.gz 79564 BLAKE2B 4b1235951f55ecb7c6c92b06b68dedebad8677c2265616dddd275bf627034b66b5756cf17a2f68f4201a78b043ec8a0800f115f3952c19875ae7f524b9b21382 SHA512 a97d27e6033036f0db5c0737bee3510206db9f4c843f0d18f1b2e179e838624ea33316c34fd9917c158dbb3580367908e90042fb1bfb146f150c32833b0b2ff2
 EBUILD inotify-tools-3.14.ebuild 793 BLAKE2B aa7e944757801932fdacee27abd3026f6eef864048183dc6b6727a33de40c14b1bdf39464f77f41cde7bc0189d08b589f535f0616f6be6ef7eaa67ddafdec62e SHA512 316279c93f1277e74547a4e728847353e11068bcc0fd2fc26b988d9b9c2c0029ac1c7d5e14a0c64eb526312c7e70c1364c2763835402863838987533a39b7044
-EBUILD inotify-tools-3.20.1.ebuild 829 BLAKE2B 913274935f081ad2393c078720058991e42c6db77bbb4e16754b47c8ef454cbfaaa518180e84a1fd289f9d19ff2dc7ec82dbbaa3aa37b3ca72d1a6e62ff47544 SHA512 fe357e872331a2906c5cc2b4afb3758affd4428e918a72733372bba6c2a1c4a66f6002aeec1e8ab971f497b7cdbff9e2623165c27ca8e47c605c68b8360be271
+EBUILD inotify-tools-3.20.1.ebuild 822 BLAKE2B 15d40a486e322ab7fcf0e65bfb23cfb2f5d5ed3526b58694fcecf8dad7102195df5ff716ae00e0eca841ba9dbafe1e11d946b7440a3575f9b59312f7fdcface3 SHA512 03e2e8564a2db047c27feafe28522595be99d129610f0b3f87732ec354de83fb45ba90ff8ef250d7b4d7205173ad4a84766a16142b4e725f3cb300dfaffd9857
 MISC metadata.xml 649 BLAKE2B 414281eb4ef1da7d9b3cbaf61603043a64c6b748b6d21f7693b1bc4e6fdb1c811fc59490c3246cdf0526de0658ada36251493ea9c5f00f5e700d8d4e68f99868 SHA512 62eaab525f91d97a37b526fb07b7ee4b5c7abcfdd9f785655d3252de2a4f545649da51341c5c0ff4201e0ea097bb7206d2dbe5285c9008a392c55e4802c229e7
diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
index e2c706306876..8ee06ae1f7b9 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rvoicilas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~mips sparc x86"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/sys-fs/lessfs/Manifest b/sys-fs/lessfs/Manifest
index 462807da1cd0..757ff1482e3a 100644
--- a/sys-fs/lessfs/Manifest
+++ b/sys-fs/lessfs/Manifest
@@ -1,5 +1,6 @@
 DIST lessfs-1.5.13.tar.gz 506221 BLAKE2B 30d960b97120c7e819af2357358050720d01c226f6855334ec7511d854f82a683112682389353b20d80b5bda82d0ab89464830036da3e1aadc3ea64285ed93b0 SHA512 7143b7e1df8e059184d003be6519cac323fa035a6d9005b4e007504328d58624232ff9a494ecf11d445977f9138e7c41492d7fd30721065e5293927f85585604
 DIST lessfs-1.7.0.tar.gz 514667 BLAKE2B 249e240dbeb95ed9412495d00fe7fdc708a931c65d724f2f16019213f62a9c6333ad6be849337399243a99e3d31d692cdec9a8e0347957087a6f7a36daf11586 SHA512 a868b28159fbcd2e7672607d46e3007c7b959bd8c8880b6c98cdab6c61fd104ac222e156f543c2b3e9f9d9fe2f1879c2988ee80605946f03b646481e7c6f15d1
 EBUILD lessfs-1.5.13.ebuild 1218 BLAKE2B 518b144a352a20fb2501f69f21e591514876c37628fc6aac3615e205a190e5bdbaa00c5d2f758bba9c5ded2be75547ff1536d330f455f2a3ae3b0b02347f36f3 SHA512 ef9ff6d16f0397fded5f6eeb21039e760485f73f61579f7a1345228ae6a94ebdad1c4a98a92d008585ceb16cab54999bfd8b40eb06476c9049542dfc4e1e7d52
+EBUILD lessfs-1.7.0-r1.ebuild 1307 BLAKE2B 83e477101187681d4d1c597c663bd0d6dc1f1dceac5391700e34f4ead1806b658c4024e3f41bc6accbe855e6283a4241ed0935a521c66b395f5d9758787d1619 SHA512 2bcb82fbddb2c4585b364bcb61694ac8ad4aee5555d08ce0e7fbdb352d3bf0a9f2bf11c6bc1afcd3c21e3993619b9cb6ed5e524cb6012a282877268f839dba6d
 EBUILD lessfs-1.7.0.ebuild 1281 BLAKE2B 6080ac5f1c1a57321306a292728bd297b4687754274c7d10adf25298405937d3cf7bcbdf2ccb4d595e4141d0b7483de5b9982e814d716d4cfc0dd417ca5c55b7 SHA512 e930c0ebb872b82702a495dd62fb3782dc64b10afce925f34311d80e00ebecfde203da2f171102ad39035849da1043ac69c0480c2c43461b7803c18e340c1100
 MISC metadata.xml 1422 BLAKE2B faa04d5dc2bb7b18102a3bd2a4386590050599cbfd1124b632d78cae75692f0395f9675b9226c2c7a45de81359737b43f488ddffc67ec04aec829f256cd0fd92 SHA512 d841f92f53749f39637801b2f4f5129083f07df540cc13c5c2e2bdd1c7e16aefa66e120ca9b0b78e38d85a9186a7c208dfb44a3600f1ba7d76e70d6e7bfb95d9
diff --git a/sys-fs/lessfs/lessfs-1.7.0-r1.ebuild b/sys-fs/lessfs/lessfs-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..f0b3e0a95f0a
--- /dev/null
+++ b/sys-fs/lessfs/lessfs-1.7.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit readme.gentoo-r1
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A high performance inline data deduplicating filesystem"
+HOMEPAGE="https://sourceforge.net/projects/lessfs/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="berkdb crypt debug filelog memtrace lzo snappy"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:* )
+	crypt? ( dev-libs/openssl:0= )
+	lzo? ( dev-libs/lzo )
+	snappy? ( app-arch/snappy )
+	>=dev-db/tokyocabinet-1.4.42
+	app-crypt/mhash
+	>=sys-fs/fuse-2.8.0:0=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOC_CONTENTS="Default configuration file: /etc/${PN}.cfg.
+	If your host is a client consult the following configuration
+	file: /usr/share/doc/${PF}/${PN}.cfg-slave.*"
+
+src_configure() {
+	econf \
+		$(use_enable debug) $(use_enable debug lckdebug) \
+		$(use_enable filelog) $(use_with crypt crypto) \
+		$(use_with lzo) $(use_enable memtrace) \
+		$(use_with berkdb berkeleydb) \
+		$(use_with snappy)
+}
+
+src_install () {
+	default
+	insinto /etc
+	newins examples/lessfs.cfg-master ${PN}.cfg
+	dodoc examples/lessfs.* etc/lessfs.*
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-fs/lufis/Manifest b/sys-fs/lufis/Manifest
index 8182b0355b5d..4e69e5b409e0 100644
--- a/sys-fs/lufis/Manifest
+++ b/sys-fs/lufis/Manifest
@@ -1,4 +1,5 @@
 AUX lufis-allow-uid-and-gid-addon.patch 1090 BLAKE2B 49bd9cbec1b101174b0aab1a11723104a858ff68652f960e14ab1b05e24a70fac014e8fbf6bf8c611671783579bafa93a4cd983c2fc43b34556de0af9466d534 SHA512 7e5680560b624e033530dea158684d92c134bd8b73ab0d9030eb2c73416785c546915aeb8e13dd815730dca65925659394b86c0a8ad1b94acac04e8e787762e4
 DIST lufis-0.3.tar.gz 18158 BLAKE2B cad5154f244232262ae3fef7f792bea58b18019e29df8c0763cf39a6d61bd84abc030bcb3e20eb47a557a8edcde8f7ff1ea6c9873da885bea5184845f15e54bd SHA512 86f0c77e748ab7ba3f92ed9563011e8262b435a8878bf3629c8fa4a8e1bec058249a288e2aafd395f524748b419a599c6533900348b4e23239f47930a874e14e
+EBUILD lufis-0.3-r1.ebuild 635 BLAKE2B c18d3a14093862628908d35c605f66754ac2ce1d51a70ada29abf3bdc09bb254f511c28e5cb3939c1286d6baf75f08859634abee3c588c5584642f22bf864c03 SHA512 096b4132956092042f269eeb833e4d6d907d78e1fd29755f78581ca0b9c340dc491a1bb038449fff54cd3eaf4bf3d6306b40344b09e1328f911193c530438003
 EBUILD lufis-0.3.ebuild 622 BLAKE2B c06f03c41e5f1b10b023c6ee6eb2a0db6ab8f378c3d4c4e5c8555209428d0678d0a1ddae79b501d04972f74e7e1a7fc4ff94a8360f978b3daad3adbbd93bf6c2 SHA512 b951e7334dffb752df47920e1482dbd57590ad02df59f9e9278395f33f8e20c82edd22330b5251d68f013c60719289321ad6e5aa17707067dda813db2dcd032a
 MISC metadata.xml 246 BLAKE2B fd5580dee18582c2dcb849e4f5f46b7f430a240ddf6b50d7ecd3b096a72f55cf7e16206474766dd4688fb3d43c31fc85523a897f15e613e8ed013f91950241dc SHA512 41ea0697fbdeac910a35652ecb4de0a35d7a531956c7c0ace6364c9cef6e1348ecd427a1c5b9301b779d2f189ffbdcd04c7c9f59fb429ef73b75af9d140a92af
diff --git a/sys-fs/lufis/lufis-0.3-r1.ebuild b/sys-fs/lufis/lufis-0.3-r1.ebuild
new file mode 100644
index 000000000000..5f2f2645949e
--- /dev/null
+++ b/sys-fs/lufis/lufis-0.3-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Wrapper to use lufs modules with fuse kernel support"
+HOMEPAGE="http://fuse.sourceforge.net/"
+SRC_URI="mirror://sourceforge/fuse/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	!<sys-fs/lufs-0.9.7-r3
+	>=sys-fs/fuse-1.3:0=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/lufis-allow-uid-and-gid-addon.patch
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin lufis
+	einstalldocs
+
+	insinto /usr/include/lufs/
+	doins fs.h proto.h
+}
diff --git a/sys-fs/mtpfs/Manifest b/sys-fs/mtpfs/Manifest
index 6ce9dd588d37..10e507e5715e 100644
--- a/sys-fs/mtpfs/Manifest
+++ b/sys-fs/mtpfs/Manifest
@@ -8,9 +8,7 @@ AUX mtpfs-1.1-wking-patches/0004-Use-storageid-to-access-storageArea.patch 1889
 AUX mtpfs-1.1-wking-patches/0005-Use-O_ACCMODE-to-pull-out-the-access-portion-of-the-.patch 1264 BLAKE2B c2974cb2c369c26ed5e46f0dbaa917c92d2e843ee202819c80530ba040718a548b28194b44eb7490608a874fa22184984c716ccf2bfe8ff971302d9fdf9d08d9 SHA512 547c4d1d48832cf9f4735ec194350cf45786dd259788f498edd02d6801718376ca47b96a83ed72b5f660b70638a37edae1778aa99d763d6d969659c519f9c2b3
 AUX mtpfs-1.1-wking-patches/0006-Check-for-find_storage-failures.patch 3484 BLAKE2B c6cff901a12db5254517776abef8ec58b756bcb2a10b26bcf6fefe7340bb7003a6e2d043f1c87fa586025ab71d0c692e910b3e545858c560b7e9d21193892b70 SHA512 c43ab62c8d63d6e9c2b42de74a4a25fbb6edf87d0f46128796c7e4e61704a5ee7753fafffbcfbbbc116e180cc1a8d8a3aa8a9b4cb9d3a031ffd8d3d67e201da3
 AUX mtpfs-1.1-wking-patches/0007-Use-path-instead-of-fields-0-for-find_storage.patch 987 BLAKE2B dcf215b4ad2fd16e2cef84becdc530d4faed1cbab59531be095ea000546d14623a3a3ad370f9005e3b7b42016fcc21092ecb16ccd8ea7b892e63c0fb1429fe6d SHA512 b358816389cbde3679bd1e50505f9e68de9ffe68041dfdc48af9ae64d1453d1ce7c3ab4ee4b6260a6d42d520225ad91c6cf6cd8d05cd561e3b72d102fd6dcbdb
-DIST mtpfs-1.0.tar.gz 104242 BLAKE2B b29e0cd88a726affbe0810ceac38378c60b97de99eaf0ca4f5b249f87ca982cc7c83faa0bbfc87b4ffb351c10573ce4778de1f9911842707279c4fb08b157d33 SHA512 af3bd067410f51bf76619a5d98a23c2a5755d2f5e2764221af145a463ab1b819332b00e358887488f2e26e29c91dcabceedf5f8637d97a9b2ba06b91281a6a4d
 DIST mtpfs-1.1.tar.gz 108329 BLAKE2B 7172c1ca0b31a532d0ba1068874c0fd4012dd80da4684d69fa36355126be0c56d79570d5fe5f42876d1a98f49bbc21b0f446c08e28b62e20583bbfd4d7054f62 SHA512 627f1a5efa024276f58857e0cb2a2b3057ab9ba6c26d8dcba9de066f4c0efc56a5c991e000e67763b874ee9feb1d9a1e176872b56dd13b146823e8724f2052c8
-EBUILD mtpfs-1.0.ebuild 986 BLAKE2B 4fc769add8ee8c1c12cc8cec6c69ae9c00fc543fdbf63095296ded1a4a0127fe204f711522ca58c2c95a480f71cba184a27571b0006df085f485cc18fa575f1a SHA512 9069b27f5d76131502438c1bbc9d329efa5c295a4a36403e14119c887eeb5d0e5523cbfa15ed3d63b4f2af8651d15aa7cd5e435c42d765f3c80b62f2109f6c4d
-EBUILD mtpfs-1.1-r3.ebuild 1269 BLAKE2B c3da55f5770aa13f8cfec7f5e00c61c4a057fdc6de780ff066e4972579d7fe3368e64f8231c8c677444cdb863a1560c04fa7e7ebd685788969c04433eefafd48 SHA512 c12f11172555e927eb4335bebfe05105c6346db378a8e838fc4186947f9bf8dec66e07126401219cfdefc68d9683a108f0ca450cd4d0bb31c35d20099c159f79
 EBUILD mtpfs-1.1-r4.ebuild 1242 BLAKE2B ba8f15fb0b62c6ab0b4a5063d7263782ae00b3bce04baac5c091fa642eb774fd0e78203737b381fd5523b0d7bdbcd8cba0e41c5904bcb8a35d041cbd237dba90 SHA512 94c5de07d7d90de0ebac9ebb5f2f0a72b442fe8d47215c27a9bb4b815c6236e2f2f1103717e17e2021b725645cdbaca869f1847ed63f0118c8fd960be590a804
+EBUILD mtpfs-1.1-r5.ebuild 1250 BLAKE2B d927c05104108a374f687669e9e61b8b0945652ba3d3b4ae0c46bcdfdcaf2906ebef70d0bc93ad7e64d7b6ec8036b89b2146e5f948034a26c0743d06b6ab7636 SHA512 1c036b9c225b403bb0c4abda72e68e20fbbba03d0880f7738b14b17e57cad73d50323a5856e184c5f6aedb3ab7d20a652fdbb9c45a37bc3e9b9c4610ce8f2bdd
 MISC metadata.xml 684 BLAKE2B e83930dc207e798257d2e2a2cdb065ce462e232a20c33514034852099cb3e6683fbd2905b90e328cee8b50b84e6c9f887698a1c920d164f5f910174531ab7ad4 SHA512 725d050ed87be3de8beff0e97178452e806261e704aaaaf523982deb2fc803c771949bee9ac0651747323b3294d584470e49e4877a3cf5e8f2301f477a543955
diff --git a/sys-fs/mtpfs/mtpfs-1.0.ebuild b/sys-fs/mtpfs/mtpfs-1.0.ebuild
deleted file mode 100644
index 0968c88c8653..000000000000
--- a/sys-fs/mtpfs/mtpfs-1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A FUSE filesystem providing access to MTP devices"
-HOMEPAGE="https://www.adebenham.com/mtpfs/"
-SRC_URI="https://www.adebenham.com/debian/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="dev-libs/glib:2
-	media-libs/libid3tag
-	media-libs/libmad
-	media-libs/libmtp
-	sys-fs/fuse"
-RDEPEND="${DEPEND}"
-
-DOCS=(AUTHORS NEWS README)
-
-src_prepare() {
-	sed -e "/#include <string.h>/ a\
-		#include <stdlib.h>" -i mtpfs.h id3read.c || die #implicit
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-pkg_postinst() {
-	einfo "To mount your MTP device, issue:"
-	einfo "    /usr/bin/mtpfs <mountpoint>"
-	echo
-	einfo "To unmount your MTP device, issue:"
-	einfo "    /usr/bin/fusermount -u <mountpoint>"
-
-	if use debug; then
-		echo
-		einfo "You have enabled debugging output."
-		einfo "Please make sure you run mtpfs with the -d flag."
-	fi
-}
diff --git a/sys-fs/mtpfs/mtpfs-1.1-r3.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
index 5fb9a655bf96..8cc52ebc9b74 100644
--- a/sys-fs/mtpfs/mtpfs-1.1-r3.ebuild
+++ b/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A FUSE filesystem providing access to MTP devices"
 HOMEPAGE="https://www.adebenham.com/mtpfs/"
@@ -16,24 +14,25 @@ IUSE="debug mad"
 
 RDEPEND="dev-libs/glib:2
 	>=media-libs/libmtp-1.1.2
-	sys-fs/fuse
+	<sys-fs/fuse-3:0=
 	mad? (
 		media-libs/libid3tag
 		media-libs/libmad
 	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=(AUTHORS NEWS README)
 
+PATCHES=( "${FILESDIR}"/${P}-fix-mutex-crash.patch
+	"${FILESDIR}"/${P}-unitialized-variable.patch
+	"${FILESDIR}"/${P}-wking-patches/
+	"${FILESDIR}"/${P}-g_printf.patch )
+
 src_prepare() {
+	default
 	sed -e "/#include <string.h>/ a\
 		#include <stdlib.h>" -i mtpfs.h id3read.c || die #implicit
-
-	epatch "${FILESDIR}"/${P}-fix-mutex-crash.patch
-	epatch "${FILESDIR}"/${P}-unitialized-variable.patch
-	epatch "${FILESDIR}"/${P}-wking-patches/*.patch
-	epatch "${FILESDIR}"/${P}-g_printf.patch
 }
 
 src_configure() {
diff --git a/sys-fs/squashfuse/Manifest b/sys-fs/squashfuse/Manifest
index 86fe6a1503e4..cb73d189f3b4 100644
--- a/sys-fs/squashfuse/Manifest
+++ b/sys-fs/squashfuse/Manifest
@@ -1,3 +1,5 @@
 DIST squashfuse-0.1.100.tar.gz 393548 BLAKE2B 642f0b00023f1914e6f4efd0e03c77d61c549eed0bff8f3128f415ece7c52d3f917e8856a1dccc3d1be06147ad0b80bdde79397c4f307bc316adb2224260b402 SHA512 e6a56354e71991ccbcbd2f9e6967f1f5a1056edbee286e6a6d6c35f777ed6e6494243633d070da700cf43a8bf7b56269087a0db1d4b2d45ed49f4830caad7927
+DIST squashfuse-0.1.103.tar.gz 399524 BLAKE2B 985ce64052c55a03d4889674682cf8b3bf6fab96de18d38b5b6125a6b2bdf0ec40e9f18a13bb77ea1a963fd0e7debf08d5f4819c543a62a818389b5fa7884815 SHA512 bc640898a5756ceed3260d9dea61dcb54588381b787a50c0fbfce35658fdf7d2788babf4882c369d1981ff853a91f043de8c68727aedc33646c26db4fb0ab2c0
 EBUILD squashfuse-0.1.100.ebuild 924 BLAKE2B 99357eef0d573291d34becd2b9cc92050ba78975f537966175fd2dcfd997e91192af9ced64e6938a4b3e3da59fc091f19d6f1944cef2f8f327aabe76beb92ea3 SHA512 7f0f52f26553938d77e829f6220d5b3b6b47ae5e9716e1547e56f70a409935b88cacb289d11b67ef852bd7ad115a35edd2cdbae2c597c0a3e073d6e5fd3e1896
-MISC metadata.xml 588 BLAKE2B 89e02c1b93c1a834c81fc6ffd3e6f859e8a37651b3d3f2b68995eb3ceb035b4c49ff66b160e35829dee4416f4bfb16dcea6fedaf21e6b305f5674e8e52ecd1d3 SHA512 359590ef302a574ac485f43cf78d3e618ce2562983fc21941961dc7624919ae8c88ae53be3ec19ed6e36f777d3665b133b2972c94d9b9b7829fdaeecc0b3710a
+EBUILD squashfuse-0.1.103.ebuild 1168 BLAKE2B e03ee8f22545f0fcf123803857c6f0912d304c801ba16f0bbaaf20fecc1863a66d4889c3634781a808a0d335226143add282403bf048879108da2c94c45cc028 SHA512 ec825ccd56dd1479562154cb3452f9a132a1bd1b8cef4924c23bc4bde154f49353753907c55bb50d359615e18f3106316d547ad8abb70f98bcebecdf55420652
+MISC metadata.xml 651 BLAKE2B d8db9c1df606853d465c231478f66829333019c41064e928d7922ba54058739c4d8130a43f23b7d2eb6c0e18c239ee0ceaee51cde0012ebbae977a6f4cdf6784 SHA512 18d13b243667404511e34d85b6b6530313dbc02d28e409f243486b050282556f398dabbe04dcbde8dcb43c15182d693e89ab168a4e9525f0a0b6f5f9ed3da23c
diff --git a/sys-fs/squashfuse/metadata.xml b/sys-fs/squashfuse/metadata.xml
index 4b36f192fd0d..c8a507a9926c 100644
--- a/sys-fs/squashfuse/metadata.xml
+++ b/sys-fs/squashfuse/metadata.xml
@@ -13,5 +13,6 @@
 	</maintainer>
 	<use>
 		<flag name="lz4">Enable support for lz4 compression</flag>
+		<flag name="zstd">Enable support for zstd compression</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-fs/squashfuse/squashfuse-0.1.103.ebuild b/sys-fs/squashfuse/squashfuse-0.1.103.ebuild
new file mode 100644
index 000000000000..f4654076461b
--- /dev/null
+++ b/sys-fs/squashfuse/squashfuse-0.1.103.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2016-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="FUSE filesystem to mount squashfs archives"
+HOMEPAGE="https://github.com/vasi/squashfuse"
+SRC_URI="https://github.com/vasi/squashfuse/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="lz4 lzma lzo static-libs +zlib zstd"
+REQUIRED_USE="|| ( lz4 lzma lzo zlib zstd )"
+
+COMMON_DEPEND="
+	>=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:= )
+	lz4? ( >=app-arch/lz4-0_p106:= )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	filter-flags -flto* -fwhole-program -fno-common
+
+	local econfargs=(
+		$(use_enable static-libs static)
+		$(use lz4 || echo --without-lz4)
+		$(use lzma || echo  --without-xz)
+		$(use lzo || echo --without-lzo)
+		$(use zlib || echo --without-zlib)
+		$(use zstd || echo --without-zstd)
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index b2babfa1a057..8f49206e2d04 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -6,11 +6,11 @@ AUX 239-stat-1.patch 2553 BLAKE2B 123a9488f7e2c9c2b70cb87ecc45be54b19b18660a2b23
 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
 DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8
 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
-DIST systemd-240-patches-0.tar.gz 2925 BLAKE2B 167ddaddfbe0726b9a64a95ec601495599d7aff052cbad96b80ac16ddfed72f320ba3c5c602e2f79b0cd9aea1d58ea256249a080e0999787a2c183e0bcc0869d SHA512 6b948d17f3a037ef1a291f5df766dc095c4498d5742374e08daa9b534b9b979a07876e41bb7db2ce257ff12b3b97fe1927a11d0f1a79c57f96300a5a8413d2eb
+DIST systemd-240-patches-1.tar.gz 15364 BLAKE2B e5cf4c2b8666a5c03e658f46674422d2566a748d3dc088f3cda0f5c5e7b51aec00a531ef7e9d047fd59504299d2e8a44faa353da1183260ae72156bb486d51f7 SHA512 1541810dbcfcc75c4323015c056c963ef69d633761293dea7f27aa6106e3ccc59a84263c703fc5542cf2fb3410c846e97ffb11ecc7d56a98ca658b43b73b6313
 DIST systemd-240.tar.gz 7582001 BLAKE2B cf53595a83424984dd9f533f7cd0c9905366c5a52ab946fc45ff7fd1bcc85978ff654720113641534e40c0f9a1ad1c9628255778616770762950426789f659c3 SHA512 da7467781b16f65d868931ae88fd07554db61542aec7f11dbec9f7279b529f900301edfea2d3813ddb64eeb3fdcfb7be86e540c65212dd7cfdcdebbc80de2ff5
 EBUILD udev-236-r1.ebuild 10048 BLAKE2B cd7b1f1b4edaf2dec245c9b00e1f19af56e3f4b21f6de1535f062d9deaa16107efc9f873dc50928604562da3c8877cdfff70c5489bec15cbcfa952b9bf4ff8ca SHA512 e6dca2f55c992a025cefc67b06df09d402fdd8438cfd819419a70de6ea2b26e58e380781aa66f0d63bf682b4500ab94f6b552117969851ddd892bb8a6415f4ee
 EBUILD udev-238.ebuild 9594 BLAKE2B cc2f3ede4a7e22c0f035d9b67882b72a51daea6d0ce4a234cfa5e44e7b1a30f30c0b8ba5090eec07fa0755bc600bc26398b20e39b3b64042b17150dcfb260723 SHA512 432f5768573c64546347eaa1885a6cbaecc486ef6cbbb697e8e8fa8dad2a186289834db127073f35e79ac63c2157e4942e27caf22c5989367c44aae6ff662f93
-EBUILD udev-239.ebuild 9770 BLAKE2B 7c58f0fefb4a7dd307021b2ead41c904ea71d5ed4726501cf70a41344314a3386ef77c61b4872dd4d56db403b929e8f45cf5c11091ec90584994d761e5f971cf SHA512 6822cdb23d07180f62f5b11968ef4a7f994efa423471ead978d4a64606bebd94685df63e1c26b6c865960cd7da2575d505893c94e824e753507fb6c11fffab7e
-EBUILD udev-240-r1.ebuild 9664 BLAKE2B a934f7c0ffb8c21414655bf86d2c98a9387a767abdca09fb813580e2347bd2db890d51ba887a41ed6b84df28dbba37131559c06a1de6b2fd62ef1cf2e6b7d695 SHA512 44e79d8941eecea8cf3ff1f1c2b4ae742f87a23cfc3906ebeca99ccd40e7e965076f41b451b3a2126df5d6e91dab2ed49742d9f93511332a2446d3f70203bd5d
+EBUILD udev-239.ebuild 9767 BLAKE2B eee0abc970f13436f924e43cb1c44e41b3b5313b0b92adb4d68defaea90d56c47957a77803eb0d374d30c29b860c243d5d68a9ee0f1442530e1e96b5d57a8cc3 SHA512 acd07fcc1a3e5a376c21c59563ff4f89f92be701a4ec1e7ca79ce98241e5185b0fd802115f0fa8a2573c01235be7f6a3ede67b02b7d107327459a8246dafa696
+EBUILD udev-240-r2.ebuild 9664 BLAKE2B 2816f914917b91221545e7bb77ba18a5158873d581c973e812e943472884ac4794a71a3a21ab4ce95d7bbd16d525cf3c9472ed41500fc88322f3418685b99be2 SHA512 618b7b0cd646409b9ea73576c60685e94f0769330745dc2db0a1edc9281d45405adaef645c00187570a0c5d8ef283c7585689f782d80817b6296fe84dae7f51c
 EBUILD udev-9999.ebuild 9564 BLAKE2B e372c292973ac0b83f1fef60199d7ab31ef80cb0208f3ef34c52b3357fc684d9afd3fdf5e1cc69a3296ef65781a90e55f4e9fbba579d55cef7be2db8058288a0 SHA512 9e02e243bdd6bf01349bc21619cd4033be65c9c2bb22449cee83cfb0966c930df1a6f5dcc74a610e27006f81eb0483a976cd6d1e9cdb21174cc02e3beb3f2436
 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 18da534c0daf..93974b6486ba 100644
--- a/sys-fs/udev/udev-239.ebuild
+++ b/sys-fs/udev/udev-239.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/udev/udev-240-r1.ebuild b/sys-fs/udev/udev-240-r2.ebuild
index 3cf58bff5dee..05b9ea36bd9b 100644
--- a/sys-fs/udev/udev-240-r1.ebuild
+++ b/sys-fs/udev/udev-240-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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
-		https://dev.gentoo.org/~floppym/dist/systemd-${PV}-patches-0.tar.gz"
+		https://dev.gentoo.org/~floppym/dist/systemd-${PV}-patches-1.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index 6913a56afda1..92f10c566ad8 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -1,9 +1,6 @@
-AUX pktcdvd.init 1360 BLAKE2B 16d01b722b98340a8a858c4f5e80881d41b010b9c6af6e4fdd489e1d000129b2d2793f6be6cfd4673851c26919bb310a6a8cf9f495360d0f24624bd5784f0116 SHA512 22522ff6bf19b08ef928ff87e0e3ffdf476f08c0c8b318770e522ad5187f323b94b26a3153bb56488618e8adff66b5585401e63ddae34068c4b2de472b1f5755
 AUX udftools-2.0-sysmacros.patch 1203 BLAKE2B 87e9d5ce829584ff0dae366bc3c2b52bcce7115668cc0ed9387a49744a2f558103e58980f038da141ae250135278a89578d4c7b3295a73ba7d3cd7a8ebd37aa5 SHA512 2108fb8e6d2e35922a47a6c7d82d218770ac1294cf0d2c88f9e3794ff2d91112eca850f8cda14ce019cc4c7e1653c173c9a6b3fffdf117ac58bfebb351c3b880
-DIST udftools-1.1.tar.gz 656865 BLAKE2B 6e76251368c121ab07e02071bfddde5c4f4523cc858a7ffcc86063b48adbc03233fab18a3ff50b840fc603e7f48f386e15b4ca556046116d4b42f43c06927dc5 SHA512 9c415d1cae1d79d49b4f9e3e6881f0b44b31d59f6d722571badd78ee68c422899ee8b95caed0ac50e76c13d8ed118f58f79efe5cbf775438a163d68160a30742
 DIST udftools-2.0.tar.gz 541231 BLAKE2B 8e43f4b1ab0940d607987e972dc0244ad086e088441bf462e6ce75a668af62041b1c4d8bac5da6046d2943ace753498aeb721d9524b4442a84f1901fd92066e6 SHA512 178a20405de6cd48e5f58b0ed61565e2a463479cf6d40fd7d5895d7af768b814bf1d5849873740aa409eb8cb3e7cd480c07198f6b340c612a271241c737f76e5
 DIST udftools-2.1.tar.gz 555440 BLAKE2B 09ed67d67a5194aff1611ca40907465cf5d9b83a6a9c1771118c80599be29e8d68fc48c10b38d33a4aed4fa6e7e6dbf0399b5d04bd103153f42a705e17edcf6c SHA512 0bdb3f2e0595200dadb771af4f31ba513d0bf6a0fbd30bc3a1f8aba4ab5f487f61635e65dc155926d2f566cb6e2b2f3a57938071616058cf703692d529971a64
-EBUILD udftools-1.1-r1.ebuild 655 BLAKE2B e3b1da90e431f8fde13bd0c87cb4dc7300ddccfb8b0e4f5720931116a6881fbbda1a754b39a6a39f75ce923f42c59275997b315380d4200959a7c265200e017f SHA512 c2a4bfdc4345fdc5ffb2d6518a0ab102283ffefb6c32d7d9947ca635b63bc50fa23f8365cdd7c2bc0d94512f8f370f99ebea0f757f0cfe8062a81e1934385b88
-EBUILD udftools-2.0-r2.ebuild 583 BLAKE2B d941efdc325a8fd42121cd1bf0fd3b76f874d61cc193bdf1c288a9a8f6e2dba4182953da897b5dd280fc78125adf311a276a70531cfae5caf439b4dcd915c7d2 SHA512 c36fb61b17ed862af721d4d52c35dfc73a32675435e5af41589f652c113b238e4a68dea924a1c03bbfd44e0e820a5a6551bdef3ff6638dce8aebbd43d4a5a990
+EBUILD udftools-2.0-r2.ebuild 580 BLAKE2B daa7d7fbca6685da0cc0d0690a9e8f3739ce44e27d463e97a532c7e7d6af73ec8f6799f734e0a374ad8e6cec6bee5fe4c2da5566c537c270ccdaf4484614c558 SHA512 1c86fdf192726f58a3b61514c1f8f88de7d15e2f7736e97c949b8c47d18a5f6a04471ee5b94c10e5e340b5283372ab386de793370425b8b60c1988b073b37f42
 EBUILD udftools-2.1.ebuild 555 BLAKE2B ba79acd831ea5ce3be33f46b877c62ce91f529fcfe937fb00a7f8445929b2a9241ec12a478184caeb1e55d137367bd6886e2664b8ab35f7f4987ccfe90a6bb17 SHA512 3152fc94416e6be5076f031a1ef61f41c3d1c7e4b02041eb506722b01cc64c4cd84be73009405ba4ff9d9c1acc3604a525ecda363242e1c6c616120150e23fca
 MISC metadata.xml 389 BLAKE2B 9ce42e5303df1f4d7fc293387617a2b6335377b7a3943e768cd7f8e58e9dd456c568f9b72c1fe3d12f2876d364edfc184b3644aa76569e04bee22fbb3673d8b9 SHA512 049fe016aafa25e50396b166ac9931ea7c293aa581467fb587e0d79c0bc4e79621bc3d5bf295c2e9e589a517a4c1fcfbb863fb71175fe5061f99e45a26c7c61f
diff --git a/sys-fs/udftools/files/pktcdvd.init b/sys-fs/udftools/files/pktcdvd.init
deleted file mode 100644
index 97bd34368240..000000000000
--- a/sys-fs/udftools/files/pktcdvd.init
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-
-command="/usr/sbin/pktsetup"
-devdir="/dev/pktcdvd"
-
-depend() {
-	need localmount modules
-}
-
-checkconfig() {
-	if ! [ -e "${devdir}/control" ] ; then
-		eerror "Could not find packet-writing control device at /dev/pktcdvd/control"
-		eerror "Please ensure that your kernel includes packet writing support,"
-		eerror "and if modular, ensure that the module is loaded."
-		return 1
-	fi
-}
-
-get_rw_devices() {
-	local sys_file="/proc/sys/dev/cdrom/info"
-	devices_raw=$(sed -re '/^drive name:/I!d; s/.*:\s+//' ${sys_file})
-	count=0
-	for i in ${devices_raw} ; do
-		eval "devices_$count=\"\$i\""
-		count=$(( $count + 1 ))
-	done
-	devs=""
-
-	cdrw_caps=$(sed -re '/^Can write CD-RW:/I!d; s/.*:\s+//' ${sys_file})
-
-	count=0
-	for i in ${cdrw_caps} ; do
-		[ "$i" -eq 1 ] && eval "devs=\"\$devs \$devices_$count\""
-		count=$(( ${count} + 1 ))
-	done
-
-	echo ${devs}
-}
-
-start() {
-	checkconfig || return 1
-
-	for i in $(get_rw_devices)
-	do
-		devnode="/dev/${i}"
-		[ -e "${devnode}" ] || continue
-
-		${command} "${i}" "${devnode}" > /dev/null
-		[ -e "${devdir}/${i}" ] || continue
-		chmod 660 "${devdir}/${i}"
-		chgrp cdrw "${devdir}/${i}"
-	done
-}
-
-stop() {
-	checkconfig || return 1
-	
-	for i in $(get_rw_devices)
-	do
-		${command} -d "${i}" > /dev/null
-	done
-}
diff --git a/sys-fs/udftools/udftools-1.1-r1.ebuild b/sys-fs/udftools/udftools-1.1-r1.ebuild
deleted file mode 100644
index fd50ff49d801..000000000000
--- a/sys-fs/udftools/udftools-1.1-r1.ebuild
+++ /dev/null
@@ -1,24 +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
-
-DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem"
-HOMEPAGE="https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/"
-SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/pktcdvd.init pktcdvd
-	dosym mkudffs.8 /usr/share/man/man8/mkfs.udf.8
-}
diff --git a/sys-fs/udftools/udftools-2.0-r2.ebuild b/sys-fs/udftools/udftools-2.0-r2.ebuild
index e9f92a56d2be..ac92ff6d84fd 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 Authors
+# Copyright 1999-2019 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 ~arm ~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/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 31c650ebfe5a..61324aee453d 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,3 +1,4 @@
+AUX zfs-kmod-0.7.12-kernel-4.20-compat.patch 1213 BLAKE2B 037d0979fe16d3693f3ae60176f737bfaa9e4df2fcd36d785469f0aa548f50a5014b0806bc83070e07c82ef8353ff4093776b4b624bb78a7f56e14182c671309 SHA512 48d7e08951f6f91831636b89d6031394641eb0a021ce5c944b5e7f69aae71d1b48ee81dc9ac3cd7c95b037afc2a83cd243b17fb98bb7308234e38f557fcadc35
 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
@@ -6,6 +7,7 @@ DIST zfs-0.7.9-r1-patches.tar.xz 10920 BLAKE2B 50a0b8533061b5eecc103179e6fd51499
 DIST zfs-0.7.9.tar.gz 6548649 BLAKE2B aa2f1b9d0ba0eda1af7d420c43d65d5d4183169cfe97c693356e1e0b15967ea512c25454f2d77285600f2209d778e4299f420754932e403a390b87b4f488dc94 SHA512 af5d9c320885ee84019fb04250c4b12c7ac3bb3d1037b1961ec4584701a737558374dc22521743e197356efb1d1f0ced9beff675ae9cfcccf3cd8407467f18fa
 EBUILD zfs-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-r1.ebuild 4130 BLAKE2B 4881bbcc95739423581845787a08ec4ea4928133e18e40c91d7e775aedf64742d413caebac4063b7ff75e75e439293e2d0accbbc06b3f095ef3165fb63bb50ec SHA512 7da379848280164cbde951978bd43c6fc4734b174fafc7f0336fdf938017532fd3bedd416fefa5369187eab530b78888dfcb5b983302476bf47f5e5df8982cba
 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
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.7.12-kernel-4.20-compat.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.7.12-kernel-4.20-compat.patch
new file mode 100644
index 000000000000..75ed3c579920
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/zfs-kmod-0.7.12-kernel-4.20-compat.patch
@@ -0,0 +1,31 @@
+From 4f981f6ab614a908f912f7dc147b248f96b498a2 Mon Sep 17 00:00:00 2001
+From: satmandu <satadru@umich.edu>
+Date: Wed, 26 Dec 2018 12:36:28 -0500
+Subject: [PATCH] Additional fixes for current_kernel_time in 4.20 on 0.7.x
+
+While https://github.com/zfsonlinux/spl/commit/cd1b28e0cfa923db988611df28958f7b84b53530 fixed the 4.20 current_kernel_time issues in spl as per https://github.com/zfsonlinux/zfs/pull/8074 in .07.x, current_kernel_time is still being used inside zpios-ctl.h in 0.7.x.
+
+I believe this may fix this issue in 0.7.x to allow it to compile successfully for kernel 4.2.0.
+---
+ include/zpios-ctl.h | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/include/zpios-ctl.h b/include/zpios-ctl.h
+index f17f1153260..068c9eaf173 100644
+--- a/include/zpios-ctl.h
++++ b/include/zpios-ctl.h
+@@ -181,9 +181,12 @@ zpios_timespec_t
+ zpios_timespec_now(void)
+ {
+ 	zpios_timespec_t zts_now;
+-	struct timespec ts_now;
++	#if defined(HAVE_INODE_TIMESPEC64_TIMES)
++		inode_timespec_t ts_now = current_kernel_time64();
++	#else
++		inode_timespec_t ts_now = current_kernel_time();
++	#endif
+ 
+-	ts_now = current_kernel_time();
+ 	zts_now.ts_sec  = ts_now.tv_sec;
+ 	zts_now.ts_nsec = ts_now.tv_nsec;
+ 
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.12-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.12-r1.ebuild
new file mode 100644
index 000000000000..ad9bf31d87c5
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.12-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2019 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 )
+
+PATCHES=( "${FILESDIR}/${P}-kernel-4.20-compat.patch" )
+
+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 20 || die "Linux 4.20 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."
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-01-12 16:58:08 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-01-12 16:58:08 +0000
commit	c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch)
tree	9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /sys-fs
parent	2891d29af8907ce881662f4a02844926d7a293c7 (diff)