gentoo resync : 10.02.2019

24 files changed, 74 insertions, 125 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 96c798a3697e..5a1ad20da16c 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/ext4magic/Manifest b/sys-fs/ext4magic/Manifest
index 2257b26f5ef8..04463b0ae16a 100644
--- a/sys-fs/ext4magic/Manifest
+++ b/sys-fs/ext4magic/Manifest
@@ -1,6 +1,5 @@
 AUX ext4magic-0.3.2-i_dir_acl.patch 1541 BLAKE2B 97a1fe34351bba96baaa963455561342a3fdbd7d0279bff9a544305f7d8d71d89f14c2f24d2246527a6eea9424e55b314ccc0c06f5edd367c7c4176f3509aa03 SHA512 d0df0f7275f6fa94d58658af9d96f059ae3bc29d47e767ee943a03b698550e52a5f9ff8ce491e617a47a2cf80ebcf20416dc54e3d0019713f387cffa2621904d
 AUX ext4magic-0.3.2-sysmacros.patch 291 BLAKE2B ef3e5d23d4438a72f090e776cf0a6019361c100f502b9ac23afb11446f82b720e5564095720acca7ba6816a8d5b08628bb4d2011736e0bad028d5d417a3b6936 SHA512 9914c9db3876194b08fe2f9752c0f49f72e88a5bbead72095dc186a3c60eef7a29326d51624381f177d31ee50ad4f9076dbef755936770fbfdf55fa7be82ab35
 DIST ext4magic-0.3.2.tar.gz 426941 BLAKE2B 7123af6a928e606980efba85e4c4b1f9284776176c4d5a2f978a4fb1639f68ebe3fccc07c972baeee661b2d26940b8dd252024b515e26bad7ed8635434288dfc SHA512 81bc9ba40dc2ea0bfb01bec160a1bbf0bf8a7983241aba34190d3571386f4d7dc63409866737b8d64516a3594eba11c819bbb721a1942c0a675d5675a7bba9a1
-EBUILD ext4magic-0.3.2-r1.ebuild 952 BLAKE2B 604d6f10995243824676cd41235892d5685ff331b7ccfc2e5be41f0f1b25542f5c7493c614f7c26ed9f19661e5558ea7b3c10e7ebf6deb861fcc5d190056d992 SHA512 1691fbcd56f71d49470f0d75e48fe28917b3cd71a4ed377930c5f9805267af99af0f9783f54077a920970446d678628dae05d26cf31ee4274a2779cfad923d71
-EBUILD ext4magic-0.3.2.ebuild 936 BLAKE2B 404e84d0c5b352d616baf45efe49790853e6e69eb6b5764c566efd11e4afb57811c392b6c8977e9b15ad9adfc40a9b1cd21f89ea423665ebaeff5c6d51595d85 SHA512 9abc859a05886a67890585fa8f5b68f3e086f0855bcd78fb9b0340c1917ba356e04d7a5d2175a29889a10fc2fd1dbad66283ab9f1012a07a02ef21a8d5e698a2
+EBUILD ext4magic-0.3.2-r1.ebuild 950 BLAKE2B c1f02adb1139c8356a4de8bbf285d82583e14aea50816482e557835ffe1e0f1dda628b94f45edaf21e1715202996bdaccbf95be3dda7d7338109cb1e0024e336 SHA512 110a0c9bad2438762a07a78412538bc3a3ba791f381b37ed17e724e63fbb2b492a518d482d739aebf7fbc65ea2d54cd4ac3930031c95afc56044f3cd81eed9b6
 MISC metadata.xml 578 BLAKE2B 013c3bf315840c8f0092fc3bf66386c4d346e9336a6aec25f61b484033f499d18c85b9709539bb59f191d8795b979652ccd5da7afaecd00eac3b4c21ce6c59a7 SHA512 dfa7d3d90ff9c68338e0c1ac72add7613e450317a60ea5db8776e8bc489a03e9cc1f1451ce67a1bf0fead31f401d3b7b93c76208012f3bae56e20516b36017f8
diff --git a/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild b/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild
index f26ce3b1d1d7..8873a8aac0c1 100644
--- a/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild
+++ b/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug +expert-mode file-attr"
 
 RDEPEND="app-arch/bzip2
diff --git a/sys-fs/ext4magic/ext4magic-0.3.2.ebuild b/sys-fs/ext4magic/ext4magic-0.3.2.ebuild
deleted file mode 100644
index 70ca6384478f..000000000000
--- a/sys-fs/ext4magic/ext4magic-0.3.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Tool for recovery of deleted or overwritten files on ext3/ext4 filesystems"
-HOMEPAGE="https://sourceforge.net/projects/ext4magic/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug expert-mode file-attr"
-
-RDEPEND="app-arch/bzip2
-	>=sys-apps/file-5.04
-	sys-apps/util-linux
-	>=sys-fs/e2fsprogs-1.41.9
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #580192
-}
-
-src_configure() {
-	# build-system incorrectly recognizes '--disable-feature' options as enabled!
-	econf \
-		$(usex debug '--enable-debug' '') \
-		$(usex debug '--enable-debug-magic' '') \
-		$(usex expert-mode '--enable-expert-mode' '') \
-		$(usex file-attr '--enable-file-attr' '')
-}
diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest
index 82d293828755..0a1bbfffef02 100644
--- a/sys-fs/fatsort/Manifest
+++ b/sys-fs/fatsort/Manifest
@@ -1,5 +1,5 @@
 DIST fatsort-1.4.2.439.tar.xz 41852 BLAKE2B 30ffc8575ca50a71c09c5f90e658a150ece34a9bed664696d8969ccbe4c3cb1b0130d830990e259889fab331ccf0c35e3f0aa3401628fdff3e04acbb7d0b53dd SHA512 c51b5316b34e1a74e2a8d1c625716fd022d32e40a92ef56b88fbc940b5e6dd6c978b733f180477e8b5b3235b46cd16eb74798c5aadd45de9ead1f1bafdf52fee
 DIST fatsort-1.5.0.456.tar.xz 56100 BLAKE2B 996f144c67a2311ef9962b06e776d0a0c8897814383e50c9f48f5af0bc800159ee34c10d9f8d51dae5160844dfe9fcbc4b56bb9883cbdb0402a0ea20198fc1d6 SHA512 fe9d8108494fd64da730ec40882582fc16a89e76a5ba4e8040d03a3dbbf12c525904abe24814337713f5f1d15c72e8321b27fad69db816c073a96fbfd15ea486
 EBUILD fatsort-1.4.2.ebuild 794 BLAKE2B c84ad6c26cf1ef2c014c02083cb133d6870189ff5b613c679663b9f41f0fc5d7c610b2f7c8453b442b078c06cee609acacb2b0f847f24dd8713ed2ecbe0b2722 SHA512 b5ccb6f60d1ed3aaebfc3eebefa6fc5169a7cded74dc4e4af76f907a2f4ba9080782d25802a282e2b77902c999be148edf2e210588e781e04706c86b21783c0d
-EBUILD fatsort-1.5.0.ebuild 792 BLAKE2B 158961d1949f85e3efbd8e12ed2b458cb2b3c468687c871cda49e5df9928bbfe266b76f957d84b6baa208457ca7fc026f40e5487c0ca93b1f22916e3ce94823b SHA512 2ff03c58b47bb79c5b65a4fa350b80b4fcb8bf63eeba296f0412b93c4b942b87fcaf1e9023862b82a8ec96519b7f90b43f84da398cbde5479525b209db124925
+EBUILD fatsort-1.5.0.ebuild 791 BLAKE2B 1a7977e9e5ccaa82997389e928ad9c0cfa20b52cb5b832ee10a2bb230a7df565eb2ab58701312a01c69a11ad80d6dc8371ae97b62a8da89b5d74eb3e286f7c15 SHA512 ab728f5bf316680d9443ce345819062132d802bcd38c451a8efb21a761f86ceb4d1f7e217242bcce44d7580750b38a919f97b4ca7847eb37c260d32db7e09537
 MISC metadata.xml 738 BLAKE2B b4ae8042af9b7a74705b42322ffcfba47aa18e3cb1bee693ff2db3fecb6555d516ec9a3f4746643ef37007e9d1b44ea79d5fa0e4bc12b6ca4ba813129d208dcd SHA512 42cb5be41b29129b17ea55591d352872ccd6078705068c6899d4f1f5a5b99ab5f6809e75ee6b49bd6b536f6b66632ce9e1859f4bbad764b966d5520a8aa5a228
diff --git a/sys-fs/fatsort/fatsort-1.5.0.ebuild b/sys-fs/fatsort/fatsort-1.5.0.ebuild
index 22a43954300a..73df445b94eb 100644
--- a/sys-fs/fatsort/fatsort-1.5.0.ebuild
+++ b/sys-fs/fatsort/fatsort-1.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 8c06e515b480..c3df2501f6ab 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,9 +1,7 @@
-AUX lxcfs-3.0.0-fusermount-path.patch 380 BLAKE2B b69b1d6e74cd434b18fb762aabd8db27f747eeceec7f137c13b0f42a9c445cb12019d21b551bedac815b1fd635d49c3f510b3adee72fb78dd6976ae1ed41a4bd SHA512 ce2f250cc6e8430dd928615d23a37edd136d559e42d2a695222372a2c4300d85753ddb6cc9d0b7a55d34f6f8a01bcf1951fdc815788cb5832bc59385cda43426
-AUX lxcfs-3.0.0.initd 533 BLAKE2B dc9bafd1256ba1e07d774d4629d489c8c073df7e3b57e18e809f97ddc4493cbda1a43594768184906f3f9fac6f9548b00be66d2eff2c2093e41375fe6a34ca5e SHA512 f2347bba95eea6b28f1e0e4bef7bd71ae2ee0283aae73efe57574dbbcd57839235190b460dc853924be84b58ba88e943dc222f538b75daa0fba788a1f1d74a27
-AUX lxcfs-3.0.2-fusermount-path.patch 489 BLAKE2B 3b9aa2d1202dd6b306be6b7820315214fe3b1cb07255a5723c92edf553536f3afb18849551a52a999941d7aeae90e2956e66d18d93d00fce20527a84e8d8e79e SHA512 560f06e7a996c4a2805b5a2c37d652631ad96e1f963f18fc73b72ee535ec333f7ad56a1a92806922dd673ffa512bab2b2c70c4b403b67dc2be02f2293b1221f6
-AUX lxcfs-3.0.2.initd 536 BLAKE2B 273704e8b23ca463d77515c7605f32d0fd9910e6875e28011714e80a9d94dcca5f82668cdd53e8bfa3a62ed2ec64184a99d5187f7cfad7b92e079d13eca3408c SHA512 0abb3d93e77571d3cf319ba5ac2b8e0b2ba3bda4571a8f11f6220310b595cc9f560acbaca941fb0bb25b0c2a3061981c58b9864fd1e135ffc83f8ae8d9008bcc
-DIST lxcfs-3.0.0.tar.gz 49219 BLAKE2B c21cd9983e9175bf3a31bafd8a29ddd6a6a549226bd432636dd4ea48bf6268c403f236ca39739a989cd89fa7b0b05043c179ca328fd739f5a9d56e27907a7a60 SHA512 99fe11e99c2e487d6ecd9a8484be6413563ddcb33740631ee6fe1b60d3d2d62cea1bb44d1ef6dc45283f5b3d20cd680d48ea3cb5ad17f0c3e7ba6ed56186c42f
+AUX lxcfs-fusermount-path.patch 489 BLAKE2B 3b9aa2d1202dd6b306be6b7820315214fe3b1cb07255a5723c92edf553536f3afb18849551a52a999941d7aeae90e2956e66d18d93d00fce20527a84e8d8e79e SHA512 560f06e7a996c4a2805b5a2c37d652631ad96e1f963f18fc73b72ee535ec333f7ad56a1a92806922dd673ffa512bab2b2c70c4b403b67dc2be02f2293b1221f6
+AUX lxcfs.initd 536 BLAKE2B cc8906ec07679c2aafcfc92e038e0442622ade31a9e7b3745426cfce8e42db3f1c277d84802368f53f656fffdadca747a742b8874e5edb2724dfc74d6e97a628 SHA512 196e59cfc4b8fc06975ed24a38b710916b88a18477a0e6c7f63ff3ee8d9fb395d728bbcbf59c9dc97452262f6e2d74f3b2e6ef205bead907d989cd22bacb74ff
 DIST lxcfs-3.0.2.tar.gz 49809 BLAKE2B dc73149b92ac040c56de5f4c11aafdf6e744ffd2b17e22ee9c784663ff102dedd74453581a77027037955238e081c596377c28b6066012fa32ee575e6a4c57fa SHA512 2065bbd68fd2974fe28c861b1e77c62a501da85e1bfc19eeafa49fd88c66e8e75ae007781c8bd05caf43fb3b80ad12c81c0f0f03d27ab1131e0cfe6d48443218
-EBUILD lxcfs-3.0.0.ebuild 1878 BLAKE2B 5fd90ffb93644ebf06bfd7f434effad86feb4b2773b8533af4575fde37e14a415abac7980b10f82d0368596bf7a07cd4a1af1d3574e125f7ffad1b9189d54680 SHA512 daa74fcc99c892df783b496eb0d2a38fa4a751610474f6a89c2e543d02f86c4fe7332766c9d686dcec8d4ee832a4a79207f26ded3ce525d2df06b735d4b23083
-EBUILD lxcfs-3.0.2.ebuild 1736 BLAKE2B 32ca0319b2a10bf6c352be5fe5c53e940a7f696d8a00777f6b29a1bd6e02e6bb38c8439e43f929837eb293d6363aad84a5383658228bf9aa8242018dae13fc97 SHA512 1aae443c01905892150204331ca79ed3312292195b64e76febe315c14ebb801833756cc8933c60b1bba1068d5e80e78a2e3741b8d4379345925609c74a35800d
+DIST lxcfs-3.0.3.tar.gz 49824 BLAKE2B 02e3a0a6f4fd515924c5f038f00d664ef347c9b685e6561334b460e0ce0ce5580aca67f33df56b44b9cdafa4953f4f92843662f3516e1c923f9242388b17dbc6 SHA512 d994e1dd85f499eba2847d33870281a4bcaf4466e2c8f7acb065f4f3d5688b93b775c486bc6db571e64d09a3567710b0c816e12555ffb3e3e50f81bc7f5f6be6
+EBUILD lxcfs-3.0.2.ebuild 1735 BLAKE2B 51a331b3697b9e74a99de4bfaf1ba57aade89740d353fd0c2587bcb68d3a3a6089f161bc4c41a0f0f175364df9e4f0c829e9237d50460b85b7f3bd8342baf6f9 SHA512 e5bd8924ad6da0650f960ff18ef21f8607eee17e35198a3079a4758cceec5d971089b7118ee25a97a5374a7c9a7a26a4ef34ec3762ab161920d3bda7d5a53e83
+EBUILD lxcfs-3.0.3.ebuild 1736 BLAKE2B c0a4b0fde3609ec039a1c3afc69d71f7afc7c05324f1226305952622f524e558cbb9e56dd61dfcb0aaa72ccf78a4de9491cc887ae8f9c80cc166679c67133ce0 SHA512 09007915f2d9d1343b0318337cbc6146ee750e301fc4c70c127283fd8f389fa64e90ddc09068225d53ea30193a5f9b74d3bdedc4cddaf8df9bddf3eac27c6179
 MISC metadata.xml 808 BLAKE2B b8b8be1a8fd8a1a9614dbfeddd97cd322bcf0ed4d11a97bc6680bde28faa0bdaabbf8b5a92242e0da09845f6a08280dd0d6681e3932a7319117c186f167bf6fd SHA512 dfb81661c2feb5abb3397c93eabf26c12af51099f6676d8fec346c83ca3edea788745e4a59ea05035b16b1baf21edd16d9537f66fbd10d0c8da8a7933b35c528
diff --git a/sys-fs/lxcfs/files/lxcfs-3.0.0-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-3.0.0-fusermount-path.patch
deleted file mode 100644
index 61d3494fb7f3..000000000000
--- a/sys-fs/lxcfs/files/lxcfs-3.0.0-fusermount-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /config/init/systemd/lxcfs.service.orig	2016-07-11 01:18:57.688074437 +0000
-+++ /config/init/systemd/lxcfs.service	2016-07-11 01:19:48.516477185 +0000
-@@ -7,7 +7,7 @@
- ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
- KillMode=process
- Restart=on-failure
--ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
-+ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
- Delegate=yes
- 
- [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs-3.0.0.initd b/sys-fs/lxcfs/files/lxcfs-3.0.0.initd
deleted file mode 100644
index a34e74af7b69..000000000000
--- a/sys-fs/lxcfs/files/lxcfs-3.0.0.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/bin/lxcfs
-PIDFILE=/run/lxcfs.pid
-
-start() {
-    ebegin "Starting lxcfs"
-
-    start-stop-daemon --start \
-		      --pidfile ${PIDFILE} \
-		      --exec ${DAEMON} \
-		      --background \
-		      --make-pidfile \
-		      -- \
-		      -f -o allow_other /var/lib/lxcfs
-
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping lxcfs"
-    start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
-    eend $?
-}
diff --git a/sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch
index 99a5addf1d10..99a5addf1d10 100644
--- a/sys-fs/lxcfs/files/lxcfs-3.0.2-fusermount-path.patch
+++ b/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch
diff --git a/sys-fs/lxcfs/files/lxcfs-3.0.2.initd b/sys-fs/lxcfs/files/lxcfs.initd
index 52d8202d7ac3..5997426fa8e8 100644
--- a/sys-fs/lxcfs/files/lxcfs-3.0.2.initd
+++ b/sys-fs/lxcfs/files/lxcfs.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 DAEMON=/usr/bin/lxcfs
diff --git a/sys-fs/lxcfs/lxcfs-3.0.2.ebuild b/sys-fs/lxcfs/lxcfs-3.0.2.ebuild
index ce923205a59a..f9c354a881a3 100644
--- a/sys-fs/lxcfs/lxcfs-3.0.2.ebuild
+++ b/sys-fs/lxcfs/lxcfs-3.0.2.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,13 +11,13 @@ SLOT="0"
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
-	EGIT_BRANCH="master"
+	EGIT_BRANCH="master"
 	inherit git-r3
-	SRC_URI=""
+	SRC_URI=""
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 # Omit all dbus.  Upstream appears to require it because systemd, but
@@ -30,7 +30,7 @@ DEPEND="
 	sys-apps/help2man
 	${RDEPEND}
 "
-PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
+PATCHES="${FILESDIR}/${PN}-fusermount-path.patch"
 
 src_prepare() {
 	default
@@ -51,7 +51,7 @@ src_configure() {
 src_install() {
 	default
 	keepdir /var/lib/lxcfs
-	newinitd "${FILESDIR}"/${P}.initd lxcfs
+	newinitd "${FILESDIR}"/${PN}.initd lxcfs
 	systemd_dounit config/init/systemd/lxcfs.service
 }
 
diff --git a/sys-fs/lxcfs/lxcfs-3.0.0.ebuild b/sys-fs/lxcfs/lxcfs-3.0.3.ebuild
index a16a47a4d9fb..4d89fb38cc5f 100644
--- a/sys-fs/lxcfs/lxcfs-3.0.0.ebuild
+++ b/sys-fs/lxcfs/lxcfs-3.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit systemd vcs-snapshot versionator
+inherit systemd vcs-snapshot
 DESCRIPTION="FUSE filesystem for LXC"
 HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
 LICENSE="Apache-2.0"
@@ -16,10 +16,8 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	# e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
-	UPSTREAM_PV=$(replace_version_separator 3 '.' )
-	SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64"
+	SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
 # Omit all dbus.  Upstream appears to require it because systemd, but
@@ -32,7 +30,7 @@ DEPEND="
 	sys-apps/help2man
 	${RDEPEND}
 "
-PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
+PATCHES="${FILESDIR}/${PN}-fusermount-path.patch"
 
 src_prepare() {
 	default
@@ -53,7 +51,7 @@ src_configure() {
 src_install() {
 	default
 	keepdir /var/lib/lxcfs
-	newinitd "${FILESDIR}"/${P}.initd lxcfs
+	newinitd "${FILESDIR}"/${PN}.initd lxcfs
 	systemd_dounit config/init/systemd/lxcfs.service
 }
 
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index 59ca2183fea1..f83e51f8ab28 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,3 +1,5 @@
 DIST ncdu-1.13.tar.gz 143819 BLAKE2B 8ba489dab1cbafec5b1d9b437b44aa7aa5d79ed7b6938f7904465c4d3803390307bfdfed531641fa186873005ce7f0c37db058855ffcd4ce45888bfbffd03c3b SHA512 f1f417caa9bd9e9d9aa6311962b461e48301cf9eab5d0f57073e25df01f96ded05dd093627b95b43afc659ad99aed869efd4a98d723f5835b100747b5525a60c
+DIST ncdu-1.14.tar.gz 145911 BLAKE2B 27b9350d5f12bb0c3a972b81e325e305fce2ffb73194e26a70a4fcac79805e5addfe18483e56dcfcb1e24bad4c3ef418ffba5a0c15d49199996db5aa0961aec6 SHA512 9583d86f66ae9ab19e5d373d90e0d85504807f726fe6656e593ab09f83ba4ff22c0bec6fcfec216c4d9ac0b3725899ff1d9fe6cca1e3d5fd1c76cd4636b65c1f
 EBUILD ncdu-1.13.ebuild 429 BLAKE2B b437604c81314a3aba39cc8e502e4c680aa09b153a8ad52006a0bec74deb03fbe73aaaa9efe2cdd4b2a84eb73e3b47dd8b851dc56483f36ace9290328d8023e3 SHA512 5e0208e5c53aa232f2a611e7784a6b18165156c71a7e2011186b4fa4f7d40a3b127452d531be8412ac8b193b464c8bd0adade8ca1f8bcd066417257e21ac5a38
+EBUILD ncdu-1.14.ebuild 438 BLAKE2B 96c9ddbecc06a9bb7b3692b6bfe2f1a6f145d8977f05daeb7f13bfdb83184ee568eb3feb7381654db5b98a11288946c3a27f450c430d68f5e81642cb4d644da7 SHA512 13c7b99e659c9ed88d996adf57c22f80d2d00f782a85e56599d4e41ab94ea78ba92c9b42ad630019d1cc1876c17269d444caced02731902d8881645916619f64
 MISC metadata.xml 589 BLAKE2B 9915d839320066570a64eb949ce52f48af51689617cdb6cdbac0fb6094a3923900bb940ae84be99fcd52618db5ba8a2de698c5c0515f4e5f0a6a3dbf73a42165 SHA512 2c3cf9225fafe928e442ef61f3ec10b810051843c801f3901fe8cf97d0a22e6c2354c9b3517b0c9439fad6e5829fa223ec36c6c295f426aa8a8a89a06b637d21
diff --git a/sys-fs/ncdu/ncdu-1.14.ebuild b/sys-fs/ncdu/ncdu-1.14.ebuild
new file mode 100644
index 000000000000..27a003fb9d22
--- /dev/null
+++ b/sys-fs/ncdu/ncdu-1.14.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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/rarfs/Manifest b/sys-fs/rarfs/Manifest
index 6f30c595ee08..102c97ebdecf 100644
--- a/sys-fs/rarfs/Manifest
+++ b/sys-fs/rarfs/Manifest
@@ -1,3 +1,3 @@
 DIST rarfs-0.1.1.tar.gz 349283 BLAKE2B 12a0919fee1a4dd86dc0161ba702c5a1817d23a0e3d804de5f8c945f6ebd89c02e9d9bb2279170aa7c7d3c982662cb61ac508a50c67435b962dca254913e9ee7 SHA512 a374dc2dcd83808296dc0b0b3109fd84771d47956cc30fa16ac53cc768ae5ff717cff2fa22ebcbacdd72b645b75986c5d44e47aa1a52a92f230f1944ceaa8b28
-EBUILD rarfs-0.1.1-r1.ebuild 638 BLAKE2B 7e46c36d9bdd1f23fc940f6ee407732a572b1894dae251487c2bff215dbfad26d73ac94b91caa51da81827d1616ed3d0cd0b547e2835cc0407171bb257de21b9 SHA512 227a240a0c1687be59be9414f45247655513531e835f29eb88c0fbbe5cfc8a23f9798bd0e7a83d534260cbed89218b8e4ab7d199411964e5433c65855df0de78
+EBUILD rarfs-0.1.1-r2.ebuild 632 BLAKE2B 1b2fc61c48e50f4b8f5d57c10e5878cfd0b6a100ad364ee281991f15092afa6177a41c29e29b98d2ed9dd1f945bf77c1079143490e87fbfb3a8f507a3a5d9690 SHA512 bd8c14a7b64143551152b6ec0ff418519765238234d3550cd34b3e91c16b4e9bd65da9cfb52e1e4fbc4bac394d34d19d628f3a8f68ea0b0007f771ae71291615
 MISC metadata.xml 322 BLAKE2B 3e6b2f76f09666f870beb8d1536ae621669c6e9e30d3ef8bed3f5eacd9c718e9de1e42f92beee5e61815104b09889bcfff5956cce2a454d0783cc5ab39f0b082 SHA512 b1e7a5d9c1e61a8b6ded9173e9cad6b7ab697740c77c26b53f60b24878eab5fb77c2d4738648a4fec83ddddc766da84c5224ee0f9e37f2a9b39892a68d15ffae
diff --git a/sys-fs/rarfs/rarfs-0.1.1-r1.ebuild b/sys-fs/rarfs/rarfs-0.1.1-r2.ebuild
index 2b9cc82b1b3e..3b6ab99a1ee8 100644
--- a/sys-fs/rarfs/rarfs-0.1.1-r1.ebuild
+++ b/sys-fs/rarfs/rarfs-0.1.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -14,12 +14,11 @@ SRC_URI="mirror://sourceforge/rarfs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	sys-fs/fuse"
+	sys-fs/fuse:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index c605900bc576..a7f892b5fcba 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -16,6 +16,6 @@ EBUILD squashfs-tools-3.2_p2.ebuild 953 BLAKE2B a4d1a831009bf68138e760847c6e9647
 EBUILD squashfs-tools-3.4.ebuild 937 BLAKE2B 77ce02b82aae8aae9a5e64b7c4e28e416d70bf92f1ce2d4b017eb3a3a9bd257e7355176c149668a85f757ddb66f017543b55f366782b2ad7c1bd8f01a0921689 SHA512 ea53dbc7607757087c89d6ce7e1396b0ffaa462534bfaadc13e4400172d242c5089c85d722f4b52e26c35cfeb328c9d2495f9d826e2fdcd24135934de55f924b
 EBUILD squashfs-tools-4.3-r2.ebuild 2129 BLAKE2B c5c6b8fb86ae83ddc1c4c22c528665123ab08b9d2fc212faea1f460d8be277ff26f7d9f58c4fd912d1b3a4d2a36d8a65028d922e9e50fbc2198859207ee44103 SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec
 EBUILD squashfs-tools-4.3_p6.ebuild 2102 BLAKE2B aff4d868da046f29a32d4a8c3b741bb4a6a443d1c8778e1ea3f0d2f35cd29f47d9f86060d51c8be1b0a34ef386338e958eeb9cd55328c7022559cb50539f755e SHA512 5bbe36316133880a5f4ef71f5edf6b0aa90a61e87f71f227de655a5c261996c6a9760e8672d3a39168a8b9e8f8f95b0fbd127ff30de43c7aad29ebb403fbc586
-EBUILD squashfs-tools-4.3_p7.ebuild 2099 BLAKE2B f98c290c15f2518b9abe9dfac1dec648cee73d3fa307115a3c77d843cbab4b54de73e462eee2bc53c6966d72bc9e904191ffac7630fb4d8b0ba23368822f7b2a SHA512 af8ac9742e7cec475c1b9ab6576785279798650864bfbd0e952efa44b6ebd02f8f6a61f8f5fdbd9782a7b03fbea87e2fe9795747426588a5a0a31e2fdf289ca1
-EBUILD squashfs-tools-9999.ebuild 1662 BLAKE2B 07e5705480853692733b18b433b5d08fa302cc24143c7ae4703efba82c8a563979e57528487e5326d2fb6d61bd864e6f8eccc978f62228124139d53103ccee38 SHA512 f5c9e3c4c4082bd6fbcb53c5ea7caccee5ebb3f86c393e883aa2d2fde1e1673b56e88b0e84781b298dcba9a58ff477d3cd50306cab968d2d456dd8102878d973
+EBUILD squashfs-tools-4.3_p7.ebuild 2094 BLAKE2B 284c6aff0004705ea2fb2bfd09f621a4eb842c717a27e3115cdb805060591dd4984e04d762b97b429438f1ab775e94d385c80b35fcb09fe15ce978e70a2e6917 SHA512 1609df86a2048663b4dc65d3bed09fe939c2f4f2b6bd6583f7ded002016d3c67f3410ac964f950333f67437a266b1c13ba9e2643c1bd7040edca00b7b572e7dc
+EBUILD squashfs-tools-9999.ebuild 1657 BLAKE2B ad5692c2f5cc0ab9a33b47cfcba96361a26fd07ea36d2f8ca23826deedc563978ae74aeb52884806db45b531f3b9b9c6691b2462ae7546e27be8188683c0b484 SHA512 2a90c73888a9f7295ba19a884eabf52d97b562741f015df5bf6a712ea7bbc18c39af6c03c57735a60462e3cca83d4ed1c8a5951eb87789d9d1c06bf708dc5257
 MISC metadata.xml 619 BLAKE2B d54bfccd3de76d4c236ad8514d966713f72b61b6306d9c443ef72565ebb90c08e424b94d99276c499e403aeb28ce15e93a7fd4df00140a2200e99ab9cfa12fe5 SHA512 8da433deb63f3665c0423570472415dcb6b901686ba2cebe6e0f2a72a61a3226ebb6845755eb82dbc80478ec0a521793473c82f42938ad779877de11238195a9
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
index 117cc4a8978d..8565685e580a 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit flag-o-matic toolchain-funcs
 
-DESCRIPTION="Tool for creating compressed filesystem type squashfs"
+DESCRIPTION="tools to create and extract Squashfs filesystems"
 HOMEPAGE="http://squashfs.sourceforge.net"
 SRC_URI="
 	mirror://sourceforge/squashfs/squashfs${PV/_p*}.tar.gz
diff --git a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
index 5668f68d5054..4a4833de6e17 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
@@ -1,10 +1,10 @@
-# 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 flag-o-matic git-r3 toolchain-funcs
 
-DESCRIPTION="Tool for creating compressed filesystem type squashfs"
+DESCRIPTION="tools to create and extract Squashfs filesystems"
 HOMEPAGE="
 	http://squashfs.sourceforge.net
 	https://github.com/plougher/squashfs-tools
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index e11c0f5ae041..3efacf412def 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -13,5 +13,5 @@ EBUILD udisks-2.1.8.ebuild 2920 BLAKE2B 66910a00b8b01456188ca325218b048c2634ee53
 EBUILD udisks-2.7.4-r1.ebuild 3328 BLAKE2B f97ca16814ccf01e774c7a44474c95d0876795024578985023031e42ac429377167718f6de01e093dc658db9e3855f6c5801993fb4870c39d7c1e2ea0a6e2897 SHA512 8b319ed1f9e9f76fe93e4a8ae4fdd5aad1610ad22f3fdc6f7d6f5f5c2a77db27ad8aedc18e15f8e8dc6cccb003c5e8221397142d14a75aaa693c2eac4184ebe5
 EBUILD udisks-2.7.7.ebuild 3193 BLAKE2B f466518a4373e7792eab39ccb21c669114715f0a47b1fdaef483aa7305747c5d869ea49914a02c9662a0570aa5fed54c7f7be2cca00718cd89fe7ae0978b60f3 SHA512 bd4ffc4d9b9b19c9527daa46757feacc553da660865a41fdbd670a0287cfc36ae8022e671a3b61dbf9eb471c7890b87852b263c4a5d4f560c0f89ea75574a163
 EBUILD udisks-2.8.0.ebuild 3262 BLAKE2B 788d71bdb2b9bf0bcbd8e6f3037a31606bc8d04fe7f47f8dadbfe95e47a8217d32e46cf22ff8688567d2efab3f7a9fe1ca2cdbb30da5943a41a02935a823d31d SHA512 036110299de03fa0a287df79b7a5dbe7cc1024191dacf67a0170497f6ca07a5028f6603db4f1e4eb165338bcce672eea1bbc92528a999d2a5c776feed309ee50
-EBUILD udisks-2.8.1.ebuild 3241 BLAKE2B cc15bde8bc12a2e1e08bd378e2a5f7017f1d082d2fa4a950feccbb1348a5b7802dc1fe0145449b4222088e379f796dac19b6874be6353d8867c6812685cdbf87 SHA512 ce03ee8ea8e1b5727c46537e105583f8d1434dbe565e086da8aec1af76083c5ae67814f54abb6b0228fd799b1a2415a5430766bcdfd1516ee21ec4b6fecdf0c8
+EBUILD udisks-2.8.1.ebuild 3235 BLAKE2B 450983867ccd499621d6e1c7091d01c7376d4b5d1e32d41352e637ba671b11776b0cb1c4c149e2a5efe4bfb8c0135605c45d9e95bbdd20ef16975d9e16baa8c1 SHA512 008750baf625da97b879aca8c7392376635b111a1b7ac54227fa02babad2118c83e18ee45fce6dbcdc802bdd39781268585ddb6ff1101319fb4b3ba0b53203e3
 MISC metadata.xml 868 BLAKE2B 8d4ef3d2fae9d22074a87c65ced87d1e523b8b935084845b4cdd11389648e5071852cde39b18afb34c33dd352f3b1acb6ffbed68a5dc6c999033c5567693967e SHA512 e5b0ccda409fe0b7c7be656f5834399f2819da68ee811e70c2cdf97370b860efa1ca58188543f9cc46f17cfa340c9d31c18b050b6e6f049928afe8d1ad7ffae5
diff --git a/sys-fs/udisks/udisks-2.8.1.ebuild b/sys-fs/udisks/udisks-2.8.1.ebuild
index e9bbf0a0b092..5b55c237eb74 100644
--- a/sys-fs/udisks/udisks-2.8.1.ebuild
+++ b/sys-fs/udisks/udisks-2.8.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=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl debug elogind +introspection lvm nls selinux systemd vdo"
 
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-fs/xwmfs/Manifest b/sys-fs/xwmfs/Manifest
index fb038beb989d..166f2919cacd 100644
--- a/sys-fs/xwmfs/Manifest
+++ b/sys-fs/xwmfs/Manifest
@@ -1,3 +1,3 @@
 DIST xwmfs-0.82.tar.gz 193014 BLAKE2B 2e12ceb4fa1340e05342fccd0cb8978caa38525c59d646633aa32965a4d32efb9fecc4ef0ab0ed72ad57eb07ea821048a629943cbc3bde8d46f32ee1357bcdf0 SHA512 bcf0994a9f1c8dd9d22a4d41b074e406c7ded1e8b179155c6cd7272ad9720e3837b6aad1c70fb732848ded6f8c48261f30b6674ee8584fd1cae9325e6c25379d
-EBUILD xwmfs-0.82.ebuild 474 BLAKE2B abafe9cc7396080858a2e24e9fca425105c89d555dc3aa15ccdb88a8a68fcd44208c563e862c2ea3ac0444a212b0446782c37b51aeb52af92fe7533b83a39492 SHA512 d0407b47a93f0fb89db0e444b1886a842a3c7e864e5af9c3c48ca6ab7216ec6cf7c9172e7b75ce8225dcc10c8fc7eb8889e68fedce03fb2d9226bac8ba76ea09
+EBUILD xwmfs-0.82-r1.ebuild 616 BLAKE2B b8f9c0892fff04af35eee88faa38bef4efd38d0c1f6dad0e4aaa5cbe58a7a31debd2c6bc57a42ec0c06cdab7a97fc967091596c1b6b152b517bf2b8164364eff SHA512 ffd312368d74a46462937d1f75540046bee94d9c19708ebbd46695fdaa1fd86265a57f457b39f9c0b544239fcd7fdc491891e61f5f995b4fa2aeda3f16979e36
 MISC metadata.xml 1393 BLAKE2B f9f7389edcc5535cddf0e0c34ebacc0272b57e65c42ad76c2930534913e12d90c3a06dae5dda49fef8e14935b5376576bf1bc2118c528535c289cf436573457c SHA512 143ed4a1f942d55be296a6b909d56d853e7b27a9710f9d4248bd7102a47a49b804f3687abc2d508209889b12cbfcfdd07f8bdba94883858f1605e59964675951
diff --git a/sys-fs/xwmfs/xwmfs-0.82.ebuild b/sys-fs/xwmfs/xwmfs-0.82-r1.ebuild
index aa134c2864b1..0a3213274d9f 100644
--- a/sys-fs/xwmfs/xwmfs-0.82.ebuild
+++ b/sys-fs/xwmfs/xwmfs-0.82-r1.ebuild
@@ -1,20 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="FUSE-based X11 Window-Manager file system"
 HOMEPAGE="https://github.com/gerstner-hub/xwmfs"
 SRC_URI="https://github.com/gerstner-hub/${PN}/releases/download/v${PV}/${P}-dist.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 SLOT="0"
 
 RDEPEND="
-	sys-fs/fuse:=
+	sys-fs/fuse:0=
 	>=x11-libs/libX11-1.6.5"
 
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_test() {
+	# unset display to avoid testing errors, tests rely on X11 and a window
+	# manager environment
+	unset DISPLAY
+
+	default
+}