gentoo resync : 29.06.2020

20 files changed, 65 insertions, 237 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 6cae333ad2e6..bb4f3ddc41f5 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/diskdev_cmds/Manifest b/sys-fs/diskdev_cmds/Manifest
index 03aee2a60c5e..91376c1c96ca 100644
--- a/sys-fs/diskdev_cmds/Manifest
+++ b/sys-fs/diskdev_cmds/Manifest
@@ -1,6 +1,7 @@
+AUX diskdev_cmds-332.14_p1-AR.patch 251 BLAKE2B 7bab604de5c1ff6ed2a78e2c7ef987bf85fc02b1a21c6996fef567086286cb1596cca61a5ddc246272570603cf0ef25050b2d6afcf8286c23f465b92e3bf096b SHA512 c81bd2bbeca3b76efb98142b9004011de923d5819d8f8bb65a9ec6afa9b1e5a594bcf69d3a733913bca614fca2ea0d456ee852beee897d7bb4799097640e8e9c
 AUX diskdev_cmds-respect-cflags.patch 388 BLAKE2B 8ecaa932e3a5841bc9ace0ffd2fea2f974a42ad33f0f65551bcc4c2a873b50a4413cf16542b74f277244f578142fcd5f1bfe63063c280062bf06aed20f601385 SHA512 21325ea43ea19a06962b7123ba418d5759d712d44b1ba7d35fa982613a95d2d91d1e7cde287b497d9e6de9483658f36378f7d3d03e5780d7dc468a82e5b0da69
 DIST diskdev_cmds-332.14.tar.gz 714035 BLAKE2B 8c66509366db8067b6b3057dc8dd8c6de5f25df86a88fec8beac78e4e14d91af5319bf61671ceea206508b6abac54231e82d527a2cc79ea467e7660e10997a7f SHA512 e1df91fb5330dc01a79de99dd8b1f389a337a19c2136994d59b7cbca9c2e1cb5f7d47101366dd01db4e23a5d3d7afab41758045bf7402d739fa22182dc922044
 DIST diskdev_cmds-332.14_p1.patch.bz2 21989 BLAKE2B f7e421c164ec242e6516a4638bc4c4706a11b03587fad0e7328a311d15f47b48b4e706f819cffa8e8539d7e4eaa8efa5f9a55a838f88586872e7fc8d67c9ac8e SHA512 aaef096aa6a3f2e09bcc8c1831172c3d68994589ade505153ade00e6f4d0c49263b63212f8616ece597b1ee218a87474bb1c3812d15f34c5bc5c51fd7b72a062
-EBUILD diskdev_cmds-332.14_p1-r1.ebuild 1232 BLAKE2B 9dcd240a0197878200d438b856d2eb6514a28597c6f8ad505a9aafcc8669e97373d92135c263dd43aad032886af52f694d0539f52d145be9a5a2d871e1dda7d6 SHA512 c243627cf30cc6ae1462ad8ed544ba933439ed14246f8fe23fbc0c1ea901f57107e7fc59284e5906384bab29d62eb994c27f6336b2e71a8517c450e0ed3c6f3b
-EBUILD diskdev_cmds-332.14_p1-r2.ebuild 1215 BLAKE2B 98df0d72eea1433a0e646ed4bcae9ca5977f495302b6e9c60274f18359b9ac132a39ab6af8bb9e9d09c1231debf70701b1edd3333ddf1a66cac063b30a1e7757 SHA512 3fd3c355740bd4cdfea1db5a390141d9f90396a9b8dd2f2049e2d54d5a658bac09ee50454fc7dcb58e1254e13cf479d73994864064cde8892d48cdfedf785c04
-MISC metadata.xml 390 BLAKE2B e64b93c1e1bc559fd8ee2b08df7760111f5e6a16ba5da382a8544fc30f619235b1faf36f3dc34af6db04d55a8e55b8898c5c11648d7f08a0aa2d084fe936a539 SHA512 713593a494fe0722fc1ea9984450a392585e57d2e317d99bbac73a2f713ff87950d52b11124ce2f3c7536755302c364d94ca38389b93789d3af5f5d19d8fc0fa
+EBUILD diskdev_cmds-332.14_p1-r2.ebuild 1211 BLAKE2B d78ec627dfbfdd755adebd7e046eda94dced4144c3993b291b119a2f6b5db13cf4a335c694b58b873a6ff2c4ed61c5de95aa5217ef88022f1daec14ae697a67b SHA512 ddccd84c7f12679b74924e2fa51fb28a385a54bac3d07ca1f3ab99a8b118657dc2155e6ced6f8b78b36e9f604d02adf795cede4c5741b6af0a4a68a42092f270
+EBUILD diskdev_cmds-332.14_p1-r3.ebuild 1299 BLAKE2B 75d5bfefeb0188160d5407cbc8dca554751787a1e498b635f43f3ddb668744bdc11331a102824246c896079a390a4c545babca9b766b6ecb1f877ca72894238a SHA512 0b5f64d71879324494675f85d336aa3d745d7966d30f994ebafba897d69f7314dfab82c579b4d00d4e5ffeac26a826b11da7971e0f80bad6ad20a6e2ebf40eb6
+MISC metadata.xml 375 BLAKE2B b5ab86c1adfdb8ad06c76fcff0378bc7d88bdb7510e0fa06cf3c32e5025d7bf7e151f4791e0b1bf9c76692408da5c979b7a9ea713cddf412e4c291eb2cbc31fb SHA512 4a9cb22aca89fe59e631d6a102977e8e3a6fe6f2599dddddcf7ca8eb043d2af50d23a43483cc23350d942cbbac52774571e57260820ea0448308858ed1fd45c5
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild
index b4a3180e1b42..7262c18fcab9 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.
 		 mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
 LICENSE="APSL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE=""
 DEPEND="dev-libs/openssl"
 RDEPEND="${DEPEND}"
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r1.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
index 8df958e56038..99913550e705 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r1.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,16 +13,20 @@ SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.
 		 mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
 LICENSE="APSL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE=""
-DEPEND="dev-libs/openssl"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="libressl"
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 PATCHES=(
 	"${WORKDIR}"/diskdev_cmds-${PV}.patch
-	"${FILESDIR}"/diskdev_cmds-respect-cflags.patch
+	"${FILESDIR}"/${PN}-respect-cflags.patch
+	"${FILESDIR}"/${P}-AR.patch
 )
 
 src_compile() {
@@ -33,10 +37,10 @@ src_install() {
 	into /
 	dosbin fsck_hfs.tproj/fsck_hfs
 	dosbin newfs_hfs.tproj/newfs_hfs
-	dosym /sbin/newfs_hfs /sbin/mkfs.hfs
-	dosym /sbin/newfs_hfs /sbin/mkfs.hfsplus
-	dosym /sbin/fsck_hfs /sbin/fsck.hfs
-	dosym /sbin/fsck_hfs /sbin/fsck.hfsplus
+	dosym newfs_hfs /sbin/mkfs.hfs
+	dosym newfs_hfs /sbin/mkfs.hfsplus
+	dosym fsck_hfs /sbin/fsck.hfs
+	dosym fsck_hfs /sbin/fsck.hfsplus
 	doman newfs_hfs.tproj/newfs_hfs.8
 	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfs.8
 	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfsplus.8
diff --git a/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-AR.patch b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-AR.patch
new file mode 100644
index 000000000000..d1b3c6129f26
--- /dev/null
+++ b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-AR.patch
@@ -0,0 +1,11 @@
+--- a/fsck_hfs.tproj/dfalib/Makefile.lnx
++++ b/fsck_hfs.tproj/dfalib/Makefile.lnx
+@@ -9,7 +9,7 @@ CFILES = hfs_endian.c BlockCache.c\
+ OFILES = $(CFILES:.c=.o)
+ 
+ libdfa.a: $(OFILES)
+-	ar rc $@ $?
++	$(AR) rc $@ $?
+ 
+ clean:
+ 	$(RM) $(OFILES) libdfa.a
diff --git a/sys-fs/diskdev_cmds/metadata.xml b/sys-fs/diskdev_cmds/metadata.xml
index 2b0a4b9725c3..9ee7b49bec49 100644
--- a/sys-fs/diskdev_cmds/metadata.xml
+++ b/sys-fs/diskdev_cmds/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>ppc@gentoo.org</email>
-<name>Gentoo Linux PowerPC Development</name>
-</maintainer>
-<longdescription lang="en">
-HFS+ Filesytstem tools (mkfs.hfsplus and fsck.hfsplus), ported from Apple's
-versions.
-</longdescription>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/hfsutils/Manifest b/sys-fs/hfsutils/Manifest
index d3d9f73a88e4..854fc2c9347a 100644
--- a/sys-fs/hfsutils/Manifest
+++ b/sys-fs/hfsutils/Manifest
@@ -1,9 +1,7 @@
 AUX hfsutils-3.2.6-errno.patch 223 BLAKE2B d6b42f5cb76fb57dc158bf9ae4ba43ad5518d1326048eb0e4cea7067ccd16925fd892a8a2df2d71a79f6042d4c33f3425f8be316b6f287c32b61278c588885e8 SHA512 0a6074d77690ac73513f7197b49c5309e6066104301aa53dd1c3d1b4b55abb542cef8a76f8c2f7b5aff47c1b3476446498cfe27e5763fe28bc08bba9e47dd8b1
 AUX hfsutils-3.2.6-fix-tcl-8.6.patch 158 BLAKE2B bb12d05629bede97e0d0eedcf42cbabd3d4e5c682253002b726db1d33a72f70f4cade4a2cbfbde810ac0481419c6a1561e4a3e29a81e0b0f48152e4b3b9830c1 SHA512 7b9cb4cb04fad7c092e2061568ba804f0c7035160c6213d3b069deefab8789d624e4b51b39c8bc77a2504279c641b72fad92ceff0a3e2049dad3c9b65e0163fa
 AUX largerthan2gb.patch 216 BLAKE2B d8f9edd367883df8ad1e88660f6f2e0d0d0654cfefe38da0b846ae136f141047b99c9251e9ef63e1fcb11bfc56f6ff739007a81d9cdf655e11270dfd7499db76 SHA512 f20e52f571995a0fc0b0e0a7b804717a1d501fbaecf80460cdbb69cbf2e956a2b8f33ec8c9fa637af2e857edc1d2565797d4a6f2c3ce2ace0359311ef8dc0882
-DIST hfsutils-3.2.6.tar.gz 207697 BLAKE2B 96c3d839e3c07e325e4e175a484b3c637d7cdebdc02ec11ee6810096162d155aa75d71a8e133b801b767a78d50115384460c4181359767f49e015524800885e8 SHA512 0db3050e5969c4e4e6c6ddb10cbc221a5837eb1e12f9331e7129511d31a4ec8d38420ed0b948dadc85ed990f3b1085e930eb7f0c37b3883866d963e47cbbb173
 DIST hfsutils_3.2.6-14.debian.tar.xz 6780 BLAKE2B 00474d328f5ec2614ec429052e6940b9eb10d04f433399f686ccc24d66ca1559e7ca45c4ab3ebe6386e02fc4de5ffd96242a7aa6f58d6032798d5536da912a61 SHA512 33d44f7b9094743031fc9315cf9380e158225ee2cd5af7a5ec7c55a2ae9af42e16f9cad3c667b153a1d3d9484d4ea773d34b88b78bfe9499df52a8b9d77defb2
 DIST hfsutils_3.2.6.orig.tar.gz 207697 BLAKE2B 96c3d839e3c07e325e4e175a484b3c637d7cdebdc02ec11ee6810096162d155aa75d71a8e133b801b767a78d50115384460c4181359767f49e015524800885e8 SHA512 0db3050e5969c4e4e6c6ddb10cbc221a5837eb1e12f9331e7129511d31a4ec8d38420ed0b948dadc85ed990f3b1085e930eb7f0c37b3883866d963e47cbbb173
-EBUILD hfsutils-3.2.6-r6.ebuild 1046 BLAKE2B b5d120855a6285b7cabb38b897eb942c9fd52241495a05fdeb04f7bed686e15581affa77c6fb2711865ee17342a9832f69e5ea2a2ffdf46d4963b36f58d697e4 SHA512 2cf1dbd3c3fe26e7e963b2f8530803033077236e6acd11628eba25997fdb50c50a7caf4c9abd7505b2e62b860fd146bbc853d148d18068ae0d22c9f846783283
-EBUILD hfsutils-3.2.6_p14.ebuild 1391 BLAKE2B d07394734bd278c859466965c8bad2344ac2326a61fa5576d5b6c02e59963a06e2cb92065d6cc5c90afa3809370d3933970c944254f7a6942f2802389a10bc06 SHA512 4e9165f8053907a6c4a348d37acf303e3d454daae2222cde6c9be7b9e0ea3d40983c74dff516619e9f8d63984d8d8fe66059521bc56d0b2c1ca58bbe1bf2a107
+EBUILD hfsutils-3.2.6_p14.ebuild 1386 BLAKE2B ea5b361576cc81de601b996c3138895ce1215a60befb1672bf40e93583e27b821c65a4d97e4449e6f36450b78cd7aae0fa8bd8e4cc39ee41d5aad0d007f6873b SHA512 72f6b34eeed6a85edab8e3ed2d5848c6e7bbbd1f539d39526d715b5b1b2d450dd3f302761f88fb2a97424f6cff88399c3edbba323517eb81b599c672a11b749b
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6-r6.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6-r6.ebuild
deleted file mode 100644
index 23076395fd73..000000000000
--- a/sys-fs/hfsutils/hfsutils-3.2.6-r6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="HFS FS Access utils"
-HOMEPAGE="https://www.mars.org/home/rob/proj/hfs/"
-SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 sparc x86"
-IUSE="tcl tk"
-
-DEPEND="
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )"
-RDEPEND="${DEPEND}"
-
-# use tk requires tcl - bug #150437
-REQUIRED_USE="tk? ( tcl )"
-PATCHES=(
-	"${FILESDIR}"/${P}-errno.patch
-	"${FILESDIR}"/largerthan2gb.patch
-	"${FILESDIR}"/${P}-fix-tcl-8.6.patch
-)
-
-src_configure() {
-	tc-export CC
-	econf $(use_with tcl) $(use_with tk)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR) rc" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)"
-	emake CC="$(tc-getCC)" -C hfsck
-}
-
-src_install() {
-	dodir /usr/bin /usr/lib /usr/share/man/man1
-	emake \
-		prefix="${ED}"/usr \
-		MANDEST="${ED}"/usr/share/man \
-		infodir="${ED}"/usr/share/info \
-		install
-	dobin hfsck/hfsck
-	dodoc BLURB CHANGES README TODO doc/*.txt
-}
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
index b25482a3b41e..7a5d15a78c71 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 sparc x86"
 IUSE="tcl tk"
 
 DEPEND="
diff --git a/sys-fs/lsscsi/Manifest b/sys-fs/lsscsi/Manifest
index 357163d5fc1c..21ef92cc5936 100644
--- a/sys-fs/lsscsi/Manifest
+++ b/sys-fs/lsscsi/Manifest
@@ -3,5 +3,5 @@ DIST lsscsi-0.30.tgz 190598 BLAKE2B e22000c4c03fe31f40e6e95dbb6875fdf9266cb10310
 DIST lsscsi-0.31.tgz 191650 BLAKE2B 0bd9b72356cc8f9a7f83bf5bdebdc7d3093efa09b1c72e79b45f6e6dacedb6c80e085fce8ce734e298d03c959bc4428f7a4faeeaace3cdeaa3b2d6bfc4b547cc SHA512 e76a011b79657fb138e88d37ff38d83b6bbe2e28330fb621ca5972ba4ffb0131a5e67c8afeb0292c002eaf91e1b69c8f051d48849e5ed822e8705365092a53ba
 EBUILD lsscsi-0.29.ebuild 337 BLAKE2B c7ffcb121cbeea715b411ffd9c69067cb01a8dcfc094f4efc920f2fdf787796a99f3548f9cb5870953cc626788545e5d5bbe48b50bac46093a7eed65469a42c6 SHA512 4cb73df4080ec0725b6c6682c0cd51210a12abb697c7e3eb5e3a0157acd70620c014bcb421b81889d22d9d2ecac10069a59e0265ede06579f4ab02319d1cc0a7
 EBUILD lsscsi-0.30.ebuild 377 BLAKE2B aac0c30fcbd3b83940dab241e9bae9b62a8e31c36bbb293aa09997ed2a7d4483e1c73e89519c79ef2b546be0726ec24b8a29a9a8b5ad50028031cd5ddc55d4ef SHA512 d437e2da55502b0dbfc524c66409a3a90c255df0b92a27fb63d49059d1b5b9e9deec473e5abd0646be8e468f9ef2183e9b9cc10494c9e8ce08dfc810b25408df
-EBUILD lsscsi-0.31.ebuild 344 BLAKE2B 1b6cec00af27182c88304d46adef1ad8bbcd16d2a9f6d61c4f57bedf134a304044658e963e0a6811476fa9438df50cd093cc4f57fcad3def5fa1c79d6ee16301 SHA512 e1d1d0c77b94d4120a2b437f187edb3c9fe83becf7b86ad9db9a4faf9450f83c1b89d36d3d155f62c3b12733b049349e377db85412130909e1fbe64af7e59253
+EBUILD lsscsi-0.31.ebuild 338 BLAKE2B 5798633db2c7095997ca658078e1cab0b8f1300d3b947f8e70761f7af765a2c68cfc54959c753ab2a3fd52cb888d3f86151851a9dcc881c8349dabb9c4e8b0e2 SHA512 a6753644f0244f0ba6a49215aa38364383aed93646155de5e84fa3348a7252587ddb79e7c5183e8062776c8044c6d26d0714904d5cd31ea838d26277bfa5df7a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/lsscsi/lsscsi-0.31.ebuild b/sys-fs/lsscsi/lsscsi-0.31.ebuild
index 95141f037da6..53056ca18693 100644
--- a/sys-fs/lsscsi/lsscsi-0.31.ebuild
+++ b/sys-fs/lsscsi/lsscsi-0.31.ebuild
@@ -9,4 +9,4 @@ SRC_URI="http://sg.danny.cz/scsi/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index bada3d9ef94a..292378eef3c9 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,11 +1,8 @@
 AUX lxcfs-4.0.0.confd 221 BLAKE2B 18924acc45506885e0f1795ffd4dd666d341abc2957c22a241909004ea988f1464b817939b450741bc77e413fb37d2e2dcd8f85405ab69f27d475567f48df2db SHA512 ebccfce0f865c8dbc1cff67712be4ac625b91ccc42aa78971c6619cf32553abe15ae82c6b3f320600cf3605f8b8c7ccbbcac3a399c6ae8261a08ea2793992e58
 AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061decfdf327a24cb1360dd08184d8cdc3936db26b6a50c47748f146414a1ae1ab61f963a9c7740c0ec3919 SHA512 755356e2a4f1e92803d8864c4edc223c183c81592562d6492d4b374174d4e5ca2d30fcdeb9861c46df795e6373ecf5f14c089c7ad22465d02516748c2c18aed7
-AUX lxcfs-fusermount-path.patch 489 BLAKE2B 3b9aa2d1202dd6b306be6b7820315214fe3b1cb07255a5723c92edf553536f3afb18849551a52a999941d7aeae90e2956e66d18d93d00fce20527a84e8d8e79e SHA512 560f06e7a996c4a2805b5a2c37d652631ad96e1f963f18fc73b72ee535ec333f7ad56a1a92806922dd673ffa512bab2b2c70c4b403b67dc2be02f2293b1221f6
-AUX lxcfs.initd 536 BLAKE2B cc8906ec07679c2aafcfc92e038e0442622ade31a9e7b3745426cfce8e42db3f1c277d84802368f53f656fffdadca747a742b8874e5edb2724dfc74d6e97a628 SHA512 196e59cfc4b8fc06975ed24a38b710916b88a18477a0e6c7f63ff3ee8d9fb395d728bbcbf59c9dc97452262f6e2d74f3b2e6ef205bead907d989cd22bacb74ff
-DIST lxcfs-3.0.3.tar.gz 49824 BLAKE2B 02e3a0a6f4fd515924c5f038f00d664ef347c9b685e6561334b460e0ce0ce5580aca67f33df56b44b9cdafa4953f4f92843662f3516e1c923f9242388b17dbc6 SHA512 d994e1dd85f499eba2847d33870281a4bcaf4466e2c8f7acb065f4f3d5688b93b775c486bc6db571e64d09a3567710b0c816e12555ffb3e3e50f81bc7f5f6be6
+AUX lxcfs.service 350 BLAKE2B 654b9053265ac16b28e0e5d04e0278070e8f6f2bc08be55f6a896c372f1b6c98c8872a0386c0dc71dee0a3afcf7cb3a7f5049d8f5a192dda983d7273eb2bdacf SHA512 3c8f44bdc2f9e5e23fa0a44b77ce3cb0cd5fd90fea6e82a46e7bac77d22a1d52a66c3d052ca9ea7319d1debe1a1808e01a34adb79fa4fd9f1024ab60139afc6c
 DIST lxcfs-4.0.3.tar.gz 100719 BLAKE2B 24371b921ad635f97c51ac8406c949e81330ae358b0166c2af295cb1f630594bb72da802aad41971c11303f393fd05bc9f1b109bd4da4953db2c3bb7e5189315 SHA512 0aaedfe826d982b9464dfb60fb57c58e34ea6022b8503bc858538b6634dc7d0845f65832d6f814043dbc0677f887e1b559549a8f3865c755970c6b47ba65eb2b
 DIST lxcfs-4.0.4.tar.gz 101546 BLAKE2B 1e84e3b75bfb39273539ea72f941442cc3c8574c0f55359a38edc04a98a45ea8680f9bf49c5974decf180a8ecf07cadccf4e732d1743c070a740c78b773a3ee8 SHA512 15bcebecc815310870aea58d995d605444b57583b7f1bb2d35b065256ea5f70b071d58887fbf1ca124ea84da99151bbd9dffcca37a2e151677d56229dc8961ce
-EBUILD lxcfs-3.0.3.ebuild 1735 BLAKE2B 51a331b3697b9e74a99de4bfaf1ba57aade89740d353fd0c2587bcb68d3a3a6089f161bc4c41a0f0f175364df9e4f0c829e9237d50460b85b7f3bd8342baf6f9 SHA512 e5bd8924ad6da0650f960ff18ef21f8607eee17e35198a3079a4758cceec5d971089b7118ee25a97a5374a7c9a7a26a4ef34ec3762ab161920d3bda7d5a53e83
-EBUILD lxcfs-4.0.3.ebuild 1249 BLAKE2B 497af2aa819e8142f41e5fca44c39d350428bdcd8fc16a1fceeaee6d182638c916900cdb240820141b682a9e9917dfeaf4260d227c0cd43db84561a5c07d6be6 SHA512 b65b38d4b7a096aad27004796328ee3d415fc1a4cf5264e66cb00e20fc4d2944dc5045ce4e54e29c9af43f29b779a8595eb918e294144cbac74b7577ef4bfde9
-EBUILD lxcfs-4.0.4.ebuild 1009 BLAKE2B 95defa67ff77de7b20821dff0c4901bc6700b97426c401099b77ab5b8f7ca7c9429cb85bbe74e13379d60072e84185b8913ec5a1b1f2d7281fe7686c8ce3259d SHA512 f0b42933e626a47c0ca3fae78407d1283c860c9e5be5366b3a8f0d9c01376ecf8a3a9542560eae22650cf87b22a5d61a9970684391f7f1e1b0cddbfefc525d0f
+EBUILD lxcfs-4.0.3.ebuild 1248 BLAKE2B 0e37ad8f8b904f2fa2aead5fc24e316bd8d9f0b9a67c8db8f2351750f8308a7688bc4e78d662a533d16aa58b871fccfd21b33624e295a36de4fd32e1277ab8de SHA512 ea98650d13885fe5d5217ea2486c4042636377e862b71509a5de74ca028a27c7fe89c05ba663397164bea8bbd1ab845a97cfd910327b61e11879ccce2102cdd2
+EBUILD lxcfs-4.0.4-r1.ebuild 1110 BLAKE2B cfbafcae2d47f5cacc066dccec779d526ed086e4d44f6e57652266bf73bda2ebe96013f42149c3ae40cdfebbc5e04877c8730ea490c911be01a843cb61c2ff81 SHA512 19bece2da21669ad24e74749152ef5ec6a1e8f570ea728d92e1b672151373a5194e14dcd2e8796727659032f4174eb2cde0e22237f8957dd475ee660b40d19e0
 MISC metadata.xml 808 BLAKE2B b8b8be1a8fd8a1a9614dbfeddd97cd322bcf0ed4d11a97bc6680bde28faa0bdaabbf8b5a92242e0da09845f6a08280dd0d6681e3932a7319117c186f167bf6fd SHA512 dfb81661c2feb5abb3397c93eabf26c12af51099f6676d8fec346c83ca3edea788745e4a59ea05035b16b1baf21edd16d9537f66fbd10d0c8da8a7933b35c528
diff --git a/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch
deleted file mode 100644
index 99a5addf1d10..000000000000
--- a/sys-fs/lxcfs/files/lxcfs-fusermount-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- /config/init/systemd/lxcfs.service.orig	2018-10-13 17:24:46.534035126 -0500
-+++ /config/init/systemd/lxcfs.service	2018-10-13 17:25:33.007034294 -0500
-@@ -5,10 +5,10 @@
- Documentation=man:lxcfs(1)
- 
- [Service]
--ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
-+ExecStart=/usr/bin/lxcfs -o allow_other,nonempty /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.initd b/sys-fs/lxcfs/files/lxcfs.initd
deleted file mode 100644
index 5997426fa8e8..000000000000
--- a/sys-fs/lxcfs/files/lxcfs.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# 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 \
-		      -- \
-		      -o allow_other,nonempty /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.service b/sys-fs/lxcfs/files/lxcfs.service
new file mode 100644
index 000000000000..aea0d6d920fc
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=FUSE filesystem for LXC
+ConditionVirtualization=!container
+Before=lxc.service
+Documentation=man:lxcfs(1)
+
+[Service]
+ExecStart=/usr/bin/lxcfs /var/lib/lxcfs
+KillMode=process
+Restart=on-failure
+ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
+Delegate=yes
+ExecReload=/bin/kill -USR1 $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-3.0.3.ebuild b/sys-fs/lxcfs/lxcfs-3.0.3.ebuild
deleted file mode 100644
index f9c354a881a3..000000000000
--- a/sys-fs/lxcfs/lxcfs-3.0.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd vcs-snapshot
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	KEYWORDS=""
-else
-	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
-# lxcfs makes no direct use of dbus.
-RDEPEND="
-	dev-libs/glib:2
-	sys-fs/fuse:0
-"
-DEPEND="
-	sys-apps/help2man
-	${RDEPEND}
-"
-PATCHES="${FILESDIR}/${PN}-fusermount-path.patch"
-
-src_prepare() {
-	default
-	./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
-	# Without the localstatedir the filesystem isn't mounted correctly
-	econf --localstatedir=/var
-}
-
-# Test suite fails for me
-# src_test() {
-# 	emake tests
-# 	tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
-	default
-	keepdir /var/lib/lxcfs
-	newinitd "${FILESDIR}"/${PN}.initd lxcfs
-	systemd_dounit config/init/systemd/lxcfs.service
-}
-
-pkg_preinst() {
-	# In an upgrade situation merging /var/lib/lxcfs (an empty dir)
-	# fails because that is a live mountpoint when the service is
-	# running.  It's unnecessary anyway so skip the action.
-	[[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Starting with version 3.0.0 the cgfs PAM module has moved, and"
-	einfo "will eventually be available in app-emulation/lxc.  See:"
-	einfo "https://brauner.github.io/2018/02/28/lxc-includes-cgroup-pam-module.html"
-	einfo "for more information."
-	einfo
-}
diff --git a/sys-fs/lxcfs/lxcfs-4.0.3.ebuild b/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
index 8d4d3457c618..de32fe294cb3 100644
--- a/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
+++ b/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # Omit all dbus.  Upstream appears to require it because systemd, but
 # lxcfs makes no direct use of dbus.
diff --git a/sys-fs/lxcfs/lxcfs-4.0.4.ebuild b/sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild
index f1d2fdcd767f..583ac4fcfa62 100644
--- a/sys-fs/lxcfs/lxcfs-4.0.4.ebuild
+++ b/sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild
@@ -44,5 +44,8 @@ src_install() {
 
 	newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
 	newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
-	systemd_dounit config/init/systemd/lxcfs.service
+
+	# Provide our own service file (copy of upstream) due to paths being different from upstream, 
+	# 728470
+	systemd_dounit "${FILESDIR}"/lxcfs.service
 }
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index d6f3b536f20e..1ea3a5d0adee 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -1,6 +1,5 @@
 AUX CVE-2019-9755.patch 2111 BLAKE2B 5655cbef5789dc0de3f461f97f41e3c1d87fd64047a80ae5e2b848920afeff6fb464cec70c73ab367bb28bf77e7e73bf699f2fe9f491f380194abf058e96ba3c SHA512 2b08f609cca17740e610dd90f39c6187f5c92f74e66458df784da0fbff8490294ee5a942cb403f101fa446310f43af9d5ad451a7939e0dc84347d07912967f9f
 AUX ntfs3g-2014.2.15-no-split-usr.patch 1322 BLAKE2B efc71e28913d649484c1cf0d51dc34d8515cfba484a6a36a7cf158b142346255d403457ce0418148bbaa9e3e6e2cd494a509aa0c205ae944609844f4b9a04bc1 SHA512 232a1a7b84339c86758365564fce2058c3e652f833c6908245aa5f6f0e91d5c09cedcb978a1ebe62897c7288df4fe8671ba7085af403056742d897181e479e05
-AUX ntfs3g-2016.2.22-CVE-2017-0358.patch 1169 BLAKE2B 47ee2ae7724f77d6c50e4eb816a4558fc296990c2f65e56d40f71db642e75e2bb35aeb2d6880e3faf21f61d9c51619de003903dba93cb742170bf4df56d6e744 SHA512 223f7b4fcd962d3c2499787f9a32c09f35705de98d3d1c96677cea18c67f77f5a086b7839892cb25b62c9145b2543c02d5abca89a82cda2345d5f993d6a60131
 AUX ntfs3g-2016.2.22-sysmacros.patch 911 BLAKE2B a53765dc5cd4ae8320584167fbf202b50827e07f4599ab8572d434cc61110bb190854b24e567b210843002b74245e5a7f271ea4548cc52a0d3d893eb622702b2 SHA512 34768ef1ebf42b125cdc4d86937042f21b7146c4c76c1ed37e66e59a4bfaa863b54f7dbcca14a9d842782113e6ac70b2a96e62022dc2c8f717ec43c9985bf79f
 AUX ntfs3g-2017.3.23-big-sectors.patch 11378 BLAKE2B 47e47a6c1370af864aa7e700e56c8db1c190ae80bd3ed1ceeeb6952a143c2c7d640580d3586a088c7307893f3509884401cf2b7c4395ce8e536246ae3ae923e5 SHA512 e23b1e3eeeb3397e42c1a09afe8b261d5193df3fd521434b64aad80fe0c6fbbf78199b92659cbd76b6c802d77e708a81e86f1d2d97b464a5c854ef821ac722a1
 AUX ntfs3g-2017.3.23-check-mftmirr.patch 554 BLAKE2B 9c7ab2b705df38089dc0413b8132ea08ccfec34001470dfc8fb926ccdaddece6f7047cef29a9073a59f7a63da8f86e01dde9f8c9e482ae932a1dd860b940bffd SHA512 b6b4eb4c6c71b944a8a30b5da69fed97eec3b3e404c180f2c3434c402d3cf5b68aa7a4deaf74b74c11230c02ffd0ce41c96fa49f9874a0105e3219821431647f
diff --git a/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-CVE-2017-0358.patch b/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-CVE-2017-0358.patch
deleted file mode 100644
index 1ce7e9cdae32..000000000000
--- a/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-CVE-2017-0358.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c
-index 0bb38f97..c6d1dad3 100644
---- a/src/lowntfs-3g.c
-+++ b/src/lowntfs-3g.c
-@@ -3827,13 +3827,14 @@ static fuse_fstype load_fuse_module(void)
- 	struct stat st;
- 	pid_t pid;
- 	const char *cmd = "/sbin/modprobe";
-+	char *env = (char*)NULL;
- 	struct timespec req = { 0, 100000000 };   /* 100 msec */
- 	fuse_fstype fstype;
-         
- 	if (!stat(cmd, &st) && !geteuid()) {
- 		pid = fork();
- 		if (!pid) {
--			execl(cmd, cmd, "fuse", NULL);
-+			execle(cmd, cmd, "fuse", NULL, &env);
- 			_exit(1);
- 		} else if (pid != -1)
- 			waitpid(pid, NULL, 0);
-diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c
-index 268b0569..945fc0be 100644
---- a/src/ntfs-3g.c
-+++ b/src/ntfs-3g.c
-@@ -3612,13 +3612,14 @@ static fuse_fstype load_fuse_module(void)
- 	struct stat st;
- 	pid_t pid;
- 	const char *cmd = "/sbin/modprobe";
-+	char *env = (char*)NULL;
- 	struct timespec req = { 0, 100000000 };   /* 100 msec */
- 	fuse_fstype fstype;
- 	
- 	if (!stat(cmd, &st) && !geteuid()) {
- 		pid = fork();
- 		if (!pid) {
--			execl(cmd, cmd, "fuse", NULL);
-+			execle(cmd, cmd, "fuse", NULL, &env);
- 			_exit(1);
- 		} else if (pid != -1)
- 			waitpid(pid, NULL, 0);