gentoo resync : 21.06.2020

21 files changed, 363 insertions, 154 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 80d05f820b17..6cae333ad2e6 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 96bd6d60eb1d..22bdd4ab0e3a 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -4,10 +4,8 @@ AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68
 AUX fsck_ext2fs.8 3802 BLAKE2B 379ef7974e29c654e4a69caa64c3703eecf375d63557915bdbfe23c8c0ca67cc9a13792988ba8c0b18bb4ae0819d220102f034499200fd20951e004d34273311 SHA512 639af16c7881bdfca55a9cd39623d3eeb9ae0ca93f8e65321c69ab1b2591cb17cdd0cfc21d27c20b8cc65bd295cccf23e47f740fffb91f4cf17e32959bb166d0
 AUX fsck_ext2fs.c 2793 BLAKE2B 65294fc9026bdb859a58d010f885fdbee2db4372a81b82ffa0722a0a3163885561bf06f0fdb73b4cf8c9cfc5bd0dc0c6ee0a7fb340a2416ce34555eff22f71a4 SHA512 1cac2963c0e85dd6a111bfe2a00f2b4f65c17a05bf0039cec073d4109ad4b0efee8905cff1a25098e0693f367db300054d92598a85dfbe8e5db7ff6419534af6
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
-DIST e2fsprogs-1.45.4.tar.xz 5567164 BLAKE2B ab7be15e504b674290a25572d09d1ca4bacebc14d23a0ae400636bdcf3bf117f3aaf82b806ca7fd25dcd6ef9fedff588de7c72134b095e27f7a363f7d70c94c7 SHA512 408f093a6674ef2316c451173481851041957617c550308d2969b983e11d988ddfc120626cd957c0759648bc357edf1d9971e6d46bed109c2af5f8a09bdc5bda
 DIST e2fsprogs-1.45.5.tar.xz 5569796 BLAKE2B cf9633caa6c00afa51408364d0c0a1515a9989ad1582fb485a300fd71bf61ec56b57dbb26f152609eaf2d63bfb04fe1e3f271085c26aa0c832c1f467960e6480 SHA512 d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce
 DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
-EBUILD e2fsprogs-1.45.4.ebuild 4031 BLAKE2B 771cb2472759c64693ad5018040fd6d7bab93f173c5f7f848c6a6c9fcc3b251cb0bea3010d4f4805e7d1c53b210b6eaeed278bb3b8b43bf4b81300e4961fa49c SHA512 0e9fc8b712d1d3cd5425d667399e9057200722157d160fe6d47cc430f46c774e1101894453ee53d1fc9ce3af3ddda624ef851f1461737b4c5de877f3ace16a5c
 EBUILD e2fsprogs-1.45.5.ebuild 4031 BLAKE2B 771cb2472759c64693ad5018040fd6d7bab93f173c5f7f848c6a6c9fcc3b251cb0bea3010d4f4805e7d1c53b210b6eaeed278bb3b8b43bf4b81300e4961fa49c SHA512 0e9fc8b712d1d3cd5425d667399e9057200722157d160fe6d47cc430f46c774e1101894453ee53d1fc9ce3af3ddda624ef851f1461737b4c5de877f3ace16a5c
 EBUILD e2fsprogs-1.45.6.ebuild 4040 BLAKE2B 48ba3717d78c88fcff4339b518f4c6be465a79cef62aecf0485adff9c79f2b243d5508fb9c37fcc81b6b68f22c053147aba41b09995b3ab716871d8f979d80a2 SHA512 0c463e4e15aa20b1ab62db37e5fac39abc4833fc24b7c60ec032f56fa3bc143aa80069bd8702a754e3a63f7e610b76620f06459f4de38650b48579f32f0f7024
 MISC metadata.xml 569 BLAKE2B 0a09eb03e2d5f07a24f33d71a16d0e4cb7e12e5a03356b44127e964c712addfb5bb9d5bc3b26dc66c608544639b6a92ebe0dcc18c03b8820f50b6fabcc9c231b SHA512 fa3e24f0db835a5fb475d42874d3197bd30f0c1f606b66b1b3f285e61dd32624ae56014b37ee0de0a9ebfaf51dd2f06cc2f73f91a011c5314809f5d495d65e67
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild
deleted file mode 100644
index c2d5f2b67c35..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
-	elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="cron fuse nls static-libs elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-	>=sys-apps/util-linux-2.16
-	cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
-	fuse? ( sys-fs/fuse:0 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	sys-apps/texinfo
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.40-fbsd.patch
-	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-
-	# Upstream patches (can usually removed with next version bump)
-)
-
-src_prepare() {
-	if [[ ${CHOST} == *-mint* ]] ; then
-		PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
-	fi
-
-	default
-
-	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
-
-	# Get rid of doc -- we don't use them. This also prevents a sandbox
-	# violation due to mktexfmt invocation
-	rm -r doc || die "Failed to remove doc dir"
-
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
-		-e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-		Makefile.in || die "remove subdirs"
-	ln -s $(which mk_cmds) lib/ss/ || die
-
-	# Avoid rebuild
-	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
-}
-
-src_configure() {
-	# Keep the package from doing silly things #261411
-	export VARTEXFONTS="${T}/fonts"
-
-	# needs open64() prototypes and friends
-	append-cppflags -D_GNU_SOURCE
-
-	local myeconfargs=(
-		--with-root-prefix="${EPREFIX}"
-		$(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
-		--enable-symlink-install
-		--enable-elf-shlibs
-		$(tc-has-tls || echo --disable-tls)
-		--without-included-gettext
-		$(use_enable fuse fuse2fs)
-		$(use_enable nls)
-		--disable-libblkid
-		--disable-libuuid
-		--disable-fsck
-		--disable-uuidd
-	)
-	ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
-
-	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
-		die "Preventing included intl cruft from building"
-	fi
-}
-
-src_compile() {
-	emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
-
-	# Build the FreeBSD helper
-	if use elibc_FreeBSD ; then
-		cp "${FILESDIR}"/fsck_ext2fs.c .
-		emake V=1 fsck_ext2fs
-	fi
-}
-
-src_install() {
-	# need to set root_libdir= manually as any --libdir options in the
-	# econf above (i.e. multilib) will screw up the default #276465
-	emake \
-		STRIP=: \
-		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install
-
-	einstalldocs
-
-	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	gen_usr_ldscript -a e2p ext2fs
-
-	# configure doesn't have an option to disable static libs :/
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs
-		doman "${FILESDIR}"/fsck_ext2fs.8
-
-		# filefrag is linux only
-		rm \
-			"${ED}"/usr/sbin/filefrag \
-			"${ED}"/usr/share/man/man8/filefrag.8 || die
-	fi
-}
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index c3be16c8729e..fd0909c50ae3 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,3 +1,3 @@
 DIST f2fs-tools-1.13.0.tar.gz 356028 BLAKE2B 170ddd5825b4f0f6a42a623f01d332092172a385e07dffccca46eb2545c12db23799fdeca7458c0cef17c95989e35db5e617a1458f0c7b41eeccd93eae807167 SHA512 fd920a19e8705a65395809aeef55791c5678ed31c026cdf41fc173e0dbcacdef1db7e0e184ec1aae8637b1784e2ad6e0207583e918255483fe43c73f89bd7f7f
-EBUILD f2fs-tools-1.13.0.ebuild 824 BLAKE2B 38f5fb1ddb65a2a22664eecae2825f226a9cab587604f7f4f9a9e43cf66b4f0131434ff3d50f347b939243943b87d3b5b9875f5704e60c567e50aeb74a72c4a7 SHA512 669a684b1a799b1509b37d86963b0e0d59f00b78e32b6e80d6bc37e7643fa3dd69b6b087f078f5b86fc92d2a649c18bb2b878773c27df416ed010f78427b3a37
+EBUILD f2fs-tools-1.13.0.ebuild 823 BLAKE2B 0a08128e3b780e6827a7481e4fdae825b9c0ed473ad7e165ff61c30086d5a89726f21f68248d4f6de015042437d49510e3a47945ed82e83e73f4ad3d1560b6a4 SHA512 e9aebf633cc1951e215f33c9c184d2acc8e17a526843b16d1978a810c5c6d4244be589b7a5d2d0f55ae32a2ded12f1d41162f767d8ffd0cef3d994048e9bb8ed
 MISC metadata.xml 438 BLAKE2B a3bb4e3293bcde65dc3b01fdf363738fc65f63f50756a390f5c0211ed7d252c305e386a913cfc9b016c198238ae0017c82d52d2ff20f79957de19d8db9f30b0a SHA512 d662e42e0da62d264cad5df63fd8f407798f8d396f74b17a2d5cdb20793753b450bb232b4320f9491126b71752a44a69ed11a22b0433786f9825e3941ab24578
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.13.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.13.0.ebuild
index 84cf365f110a..bc688ca09793 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-1.13.0.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.13.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
 IUSE="selinux"
 
 RDEPEND="
diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest
index b68ae1fa551e..54ba06816d6a 100644
--- a/sys-fs/fuse-overlayfs/Manifest
+++ b/sys-fs/fuse-overlayfs/Manifest
@@ -1,5 +1,7 @@
 DIST fuse-overlayfs-0.7.8.tar.gz 95759 BLAKE2B b2c8928bd309dabdd17d6248e6e07426ddd3922484a35dbc3ff1dfe74954e58872a0f472b0ddd84cc357af9dc5aaf6e401a5b385c3fe743092893ae822bc60b5 SHA512 0eb3ca179ff88ad4ba783646e51aaab147ae5fdffbc48b2121a481ff3030d35d1f3e32b838e1f41a275c08d345ef397b86ff2e4a6768ead98a1bb1d56922f689
 DIST fuse-overlayfs-1.0.0.tar.gz 95855 BLAKE2B f42fb77854a170a9a504167b3437525c560d48e172a2df77349e2874356aaf86ac86257f1700fa11687a7b2836f233f6726136745baeb09bb681f803440da45e SHA512 cb45306985e6f91424219dfa1706da9e987602c402df7d6ad4905a9ae2a92937e91d72663aec672904d69f588049f157fb361189c290840f2ae93d8d2c001d05
+DIST fuse-overlayfs-1.1.1.tar.gz 97965 BLAKE2B acb787e2d793a790a439e19d15bc5249c21449e7ec569e04ecac72ec59936c387e771abc05820b768b35d57775e7692c168b479ac73ea1c075da7b896ea4aa5d SHA512 71f331499920510b6e31984b09ee5feca94d427756323d39872b7f9b58d3312aada2addf2af79e4d263cb5b75fb134083dfa3cef4021a0a18a5230fcdd2ccdad
 EBUILD fuse-overlayfs-0.7.8.ebuild 557 BLAKE2B 3c520126b339c8666d0f4b4c1443bef31352a9c1e0d77044ad38984f33aac5a3998d57941e2896a87be27a058a795acf4d5940b31efa31f99c2e3c111e0149aa SHA512 c72c29f1f5d8b269e4a3cff1440b76e8d02e7aa38f9418c628de67fab768729da6ce8e898f251085d836122b08d432721cd83a7f85604fcfe4db24387eb1defa
 EBUILD fuse-overlayfs-1.0.0.ebuild 557 BLAKE2B 3c520126b339c8666d0f4b4c1443bef31352a9c1e0d77044ad38984f33aac5a3998d57941e2896a87be27a058a795acf4d5940b31efa31f99c2e3c111e0149aa SHA512 c72c29f1f5d8b269e4a3cff1440b76e8d02e7aa38f9418c628de67fab768729da6ce8e898f251085d836122b08d432721cd83a7f85604fcfe4db24387eb1defa
+EBUILD fuse-overlayfs-1.1.1.ebuild 557 BLAKE2B 3c520126b339c8666d0f4b4c1443bef31352a9c1e0d77044ad38984f33aac5a3998d57941e2896a87be27a058a795acf4d5940b31efa31f99c2e3c111e0149aa SHA512 c72c29f1f5d8b269e4a3cff1440b76e8d02e7aa38f9418c628de67fab768729da6ce8e898f251085d836122b08d432721cd83a7f85604fcfe4db24387eb1defa
 MISC metadata.xml 334 BLAKE2B d159a1336d5c016f97f854c7dc8267a7df63d9352fc81670d09fb436aa1267c842a466bbe026443a57c3e910c927f361d0ad25e9785ea785e522500c966beca0 SHA512 c91863d890e5145d3e05d247455ee2d0bda70525dfbc15632e11df75ccdd40bdb0dca17b41d3f8485ad1768cf401915ada074ee05f739d74df93d440785b6fd5
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.1.1.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.1.1.ebuild
new file mode 100644
index 000000000000..d594f97bb55f
--- /dev/null
+++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="FUSE implementation for overlayfs"
+HOMEPAGE="https://github.com/containers/fuse-overlayfs"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=sys-fs/fuse-3:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT#v}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index e4e90d09c617..bada3d9ef94a 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -4,6 +4,8 @@ AUX lxcfs-fusermount-path.patch 489 BLAKE2B 3b9aa2d1202dd6b306be6b7820315214fe3b
 AUX lxcfs.initd 536 BLAKE2B cc8906ec07679c2aafcfc92e038e0442622ade31a9e7b3745426cfce8e42db3f1c277d84802368f53f656fffdadca747a742b8874e5edb2724dfc74d6e97a628 SHA512 196e59cfc4b8fc06975ed24a38b710916b88a18477a0e6c7f63ff3ee8d9fb395d728bbcbf59c9dc97452262f6e2d74f3b2e6ef205bead907d989cd22bacb74ff
 DIST lxcfs-3.0.3.tar.gz 49824 BLAKE2B 02e3a0a6f4fd515924c5f038f00d664ef347c9b685e6561334b460e0ce0ce5580aca67f33df56b44b9cdafa4953f4f92843662f3516e1c923f9242388b17dbc6 SHA512 d994e1dd85f499eba2847d33870281a4bcaf4466e2c8f7acb065f4f3d5688b93b775c486bc6db571e64d09a3567710b0c816e12555ffb3e3e50f81bc7f5f6be6
 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
 MISC metadata.xml 808 BLAKE2B b8b8be1a8fd8a1a9614dbfeddd97cd322bcf0ed4d11a97bc6680bde28faa0bdaabbf8b5a92242e0da09845f6a08280dd0d6681e3932a7319117c186f167bf6fd SHA512 dfb81661c2feb5abb3397c93eabf26c12af51099f6676d8fec346c83ca3edea788745e4a59ea05035b16b1baf21edd16d9537f66fbd10d0c8da8a7933b35c528
diff --git a/sys-fs/lxcfs/lxcfs-4.0.4.ebuild b/sys-fs/lxcfs/lxcfs-4.0.4.ebuild
new file mode 100644
index 000000000000..f1d2fdcd767f
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-4.0.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
+SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/glib:2
+	sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/help2man"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Without the localstatedir the filesystem isn't mounted correctly
+	# Without with-distro ./configure will fail when cross-compiling
+	econf --localstatedir=/var --with-distro=gentoo
+}
+
+src_test() {
+	cd tests/ || die
+	emake tests
+	./main.sh || die "Tests failed"
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
+	newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
+	systemd_dounit config/init/systemd/lxcfs.service
+}
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index 757d2a462066..79b3d3891201 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,5 +1,7 @@
 DIST ncdu-1.14.2.tar.gz 145376 BLAKE2B f13f1286ae4e9f16f53a50b8e2ff5caa9cc0bb184a38e6e6025c2a8d396efc0fd453391813b712e358cf1607df29097b0330731b3dcc5688a72690352cee38e4 SHA512 d7398448e0e13354a0be1606c3e3f6f29e2dbb742fd56f7cd9c598e974c359429966527ef8fce6a0e3afb0ea3cad9a95169b880600e44d62273b937309fa0e59
+DIST ncdu-1.15.1.tar.gz 148242 BLAKE2B c49fc706c852f081256437bcb566d0dd4cc34682693186dd84321f4c6831ac982206d59b15f3afa7a2cb25d4affcce7ff84fcc0bf922558241df1ac13212ec7a SHA512 572379264b9bd0d782151bd2f79add0e7a6d092029a041ff8f9288e928a4b6a6733467bca7c1702cbb44c3861279da1bc3d4278df6fba1814fe1dc909f2d8087
 DIST ncdu-1.15.tar.gz 147989 BLAKE2B 7ea8f46c81e4a8ae5e99a14ef561b768097152c95fe8ca46afc1aa4b5d37186917655972a8092b4050f89885a246a9b839ea02337711c441b7d1a66fee9fb676 SHA512 02bea12e45c984db2a758ec97e60f510c365c51a417a340edced13a9ab9d237cd004ed37b940359ddc4bed81295e9748d3370ad209dacd7ff1f406e434d205f0
 EBUILD ncdu-1.14.2.ebuild 432 BLAKE2B 7dddb5c5355a94b104fe57099a13eb48762289b0c7772526d184311ae298c9b8a3f2cca061d93712ed2619e2581052bec8ca187cf5f99c587dd24aaacdae0a74 SHA512 2e43fbc0fa51a6eb2d638100861d90b51bb0583e563533564be32d507934ddb9a9849eb2134865fb00542c27a424f404e3187e9a5e8186cd90c7515f8ac13e59
+EBUILD ncdu-1.15.1.ebuild 438 BLAKE2B 35cdb26899ac23e441483cb622d33602f25e0859f3e482a052d9320eec115a1935f06f0aba4d7ae54708cc8ec9473a53f83e496cf52efd22f6172a1fd7251854 SHA512 18fe69788d5e83f01a227988742db112b56b6016d45c83fe2b1461399d364cc539a793c1ccd9526187004a97680dd7437eeab96c7a1d418b4c053ad3710a9422
 EBUILD ncdu-1.15.ebuild 438 BLAKE2B 35cdb26899ac23e441483cb622d33602f25e0859f3e482a052d9320eec115a1935f06f0aba4d7ae54708cc8ec9473a53f83e496cf52efd22f6172a1fd7251854 SHA512 18fe69788d5e83f01a227988742db112b56b6016d45c83fe2b1461399d364cc539a793c1ccd9526187004a97680dd7437eeab96c7a1d418b4c053ad3710a9422
 MISC metadata.xml 589 BLAKE2B 9915d839320066570a64eb949ce52f48af51689617cdb6cdbac0fb6094a3923900bb940ae84be99fcd52618db5ba8a2de698c5c0515f4e5f0a6a3dbf73a42165 SHA512 2c3cf9225fafe928e442ef61f3ec10b810051843c801f3901fe8cf97d0a22e6c2354c9b3517b0c9439fad6e5829fa223ec36c6c295f426aa8a8a89a06b637d21
diff --git a/sys-fs/ncdu/ncdu-1.15.1.ebuild b/sys-fs/ncdu/ncdu-1.15.1.ebuild
new file mode 100644
index 000000000000..a63123a3d82a
--- /dev/null
+++ b/sys-fs/ncdu/ncdu-1.15.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 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/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest
index c381c4bed1f0..d41cd8d69851 100644
--- a/sys-fs/squashfs-tools-ng/Manifest
+++ b/sys-fs/squashfs-tools-ng/Manifest
@@ -1,4 +1,7 @@
+AUX squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch 2014 BLAKE2B 2e48b1343a52439e894d2058c4b8bc8d0ca18b709217882e92828479b9886d06e612117c270659b399b35d46b81eb0ddcae4f55e9116be048f647da028b35377 SHA512 3684736818b807f433b0f69c2a4d6439e4f204563b8fc8667cfa0f95d13860eb42c1775adc0d4689f8bf26888e6da9d2ed5308794d2bc2deb0c27c2391cd548e
 DIST squashfs-tools-ng-0.9.1.tar.xz 1026036 BLAKE2B 3e0a0acf5b11ea42bad2149a9b97442739f1eceacfc0f5b009403d4616fcd02d69082e2e0721be3a1d6d9ba67ce6287b12ea13fba6409cb751e844f5d48ce7ea SHA512 eb550430917f267ec1ef1d11795167a6893031fc184f914170679cd24c16930a8f73a2b04a349ce1602e80a327957db7935369965a892fbe4904b6e01bb48b5c
+DIST squashfs-tools-ng-1.0.0.tar.xz 1079912 BLAKE2B b7a9e4cafc31c0058d73b1a8b69125f92d753214f6e9f0372558271bbd8df163d9b3bf3fea45b96da5044c86e75affc2bfd27826d3725a35fbb417e443cf6ccb SHA512 536f12aa53214f88739cea0d26c55e04434c284935ff1d59ee8f5108acd92fc11e800e42e3a112524d09dbd1fa50c4f15c3211ff5d02ae50b7fa137600d2ae15
 EBUILD squashfs-tools-ng-0.9.1.ebuild 1122 BLAKE2B d7dd3c7314464d58d15f6229a52ee3336d853fae9f3238459202f385dbf253906b6a94fd4ea4469ccfd756abe4c504a3a40ad6c1f4442dd41b7b0448d29fde9e SHA512 d4c951eeb931881b710cdddafb381492b1698ac9b86506a73a73b346ace42f4048420bd035fff53a5bfa08bbd7ffcd958f254a4eef24316326c86fb92ae5214a
+EBUILD squashfs-tools-ng-1.0.0.ebuild 1201 BLAKE2B cc3f5a6908e0681a1a69d7c5966a6c27b63670339c8b02d3aa082bd2b088e79ff544437dcd5f2a179e049e1c7ec63a9493159b5d7198c4409690c491c110da53 SHA512 2420d389f4359a9bf1c5b99ddbb3f81a4182052050544e44bdd28b1e51fcf47c4f605cca8362df568311085a21d8e08c9efd2ff0c5f25011017fbe6e5e0784bc
 EBUILD squashfs-tools-ng-9999.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
 MISC metadata.xml 556 BLAKE2B fcff50b7024c1743fb7d7e677c04865bba266c011305d701b4a27b1ce813eb492b6becb64b5f1d4d52a3efd5a80d3369ac88ac65c2665cb0121c6b59d592b966 SHA512 cd1de16571ec7651bf353e804c8f44cbe6a919c21577a832782d8213e7e956b5af1769889eb1631f1a97c44b89018d484122fee59bedef4409363901101df6e3
diff --git a/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch b/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch
new file mode 100644
index 000000000000..e61d881c74bf
--- /dev/null
+++ b/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch
@@ -0,0 +1,65 @@
+From 4c10a491a2ddfcdc3226431a71aefd6ca71135d4 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sat, 13 Jun 2020 11:05:49 -0700
+Subject: [PATCH] extras: Pass flags argument to fix build
+
+Missed in commit 259a98985b4f (Add flags to functions that might
+logically be expanded in the future)
+
+Signed-off-by: Matt Turner <mattst88@gmail.com>
+---
+ extras/browse.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/extras/browse.c b/extras/browse.c
+index ef4e223..86ce788 100644
+--- a/extras/browse.c
++++ b/extras/browse.c
+@@ -63,7 +63,7 @@ static void list_directory(const char *dirname)
+ 
+ 	/* Get the directory inode we want to dump and open the directory */
+ 	if (dirname == NULL) {
+-		ret = sqfs_dir_reader_open_dir(dr, working_dir);
++		ret = sqfs_dir_reader_open_dir(dr, working_dir, 0);
+ 		if (ret)
+ 			goto fail_open;
+ 	} else if (*dirname == '/') {
+@@ -74,7 +74,7 @@ static void list_directory(const char *dirname)
+ 		if (ret)
+ 			goto fail_resolve;
+ 
+-		ret = sqfs_dir_reader_open_dir(dr, inode);
++		ret = sqfs_dir_reader_open_dir(dr, inode, 0);
+ 		free(inode);
+ 		if (ret)
+ 			goto fail_open;
+@@ -84,7 +84,7 @@ static void list_directory(const char *dirname)
+ 		if (ret)
+ 			goto fail_resolve;
+ 
+-		ret = sqfs_dir_reader_open_dir(dr, inode);
++		ret = sqfs_dir_reader_open_dir(dr, inode, 0);
+ 		free(inode);
+ 		if (ret)
+ 			goto fail_open;
+@@ -526,7 +526,7 @@ int main(int argc, char **argv)
+ 	}
+ 
+ 	/* create a directory reader and get the root inode */
+-	dr = sqfs_dir_reader_create(&super, cmp, file);
++	dr = sqfs_dir_reader_create(&super, cmp, file, 0);
+ 	if (dr == NULL) {
+ 		fprintf(stderr, "%s: error creating directory reader.\n",
+ 			argv[1]);
+@@ -539,7 +539,7 @@ int main(int argc, char **argv)
+ 	}
+ 
+ 	/* create a data reader */
+-	data = sqfs_data_reader_create(file, super.block_size, cmp);
++	data = sqfs_data_reader_create(file, super.block_size, cmp, 0);
+ 
+ 	if (data == NULL) {
+ 		fprintf(stderr, "%s: error creating data reader.\n",
+-- 
+2.26.2
+
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.0.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.0.ebuild
new file mode 100644
index 000000000000..e9e3aff7cec4
--- /dev/null
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A new set of tools for working with SquashFS images"
+HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng"
+if [[ ${PV} = 9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
+fi
+
+LICENSE="LGPL-3+ tools? ( GPL-3+ )"
+SLOT="0"
+IUSE="lz4 lzo selinux +tools +xz zstd"
+
+DEPEND="
+	sys-libs/zlib:=
+	lz4?     ( app-arch/lz4:= )
+	lzo?     ( dev-libs/lzo:= )
+	xz?      ( app-arch/xz-utils:= )
+	selinux? ( sys-libs/libselinux:= )
+	zstd?    ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-extras-Pass-flags-argument-to-fix-build.patch
+)
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_with lz4)
+		$(use_with lzo)
+		$(use_with selinux)
+		$(use_with tools)
+		$(use_with xz)
+		$(use_with zstd)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 474a4f71f55d..3ba0bcefa5d9 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -6,7 +6,7 @@ DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b
 EBUILD udev-242.ebuild 9610 BLAKE2B 0dcc6a6952d3c8681ee17710b45366ab9d11e75f57173ed51160b148a038f27fe9def06257ccc070f25777c03eb569febc75bab5bf3b82517de93cea8f7003b6 SHA512 29fe9d4174b70d474e65c7ef67a799ef8a0b3918a3fd811318f119fadf6dc4637c7d24bf9acbe99e4674a461402479c4ca4312babe27beb01a114b79df019944
 EBUILD udev-243-r2.ebuild 9807 BLAKE2B afd9f20de9da69ae4479bfa2c19682555cdce783194ebef1ff56be2e43e6d4df6645653a2e554532a6cf86630f3f6e7dd100e1e98ff437ac2ac962ecd2264247 SHA512 4e6aafea5860f2d9f9b905b093dcdbf1f618dc51c00eca4557aa22ac5acbd765422a962e0d4b5fff14c76f6341df93199689d36477a08046591ab277399b7d6d
 EBUILD udev-243.ebuild 9566 BLAKE2B 3f5159a90dfb4be8a55c894820db190692f36542d01cc68120efb59201a1bb65299b91175f9ee4739836477aca71618dbc28407106de9049bf9db7deb0b89637 SHA512 923ae752ec75c8d5ff42fcf929932e04972dbcd529d2ac85decaa7998ace17e0bde3ef304e8097892f29f5ed0235388742f2668b06b7653b63e19bdd19934206
-EBUILD udev-245.5.ebuild 5851 BLAKE2B bfe759c1c69e2efa7138aec74a795f7c0d448097c1724b44707f8dbff2158e0d5db423e5a21f7c0be720c763e19c2d8c6d5bc4e3453444b89749eef0664809f3 SHA512 577e2b02531a584cffac132b12927874ad11e38393034913bb56a4265ab9dcddec9b548ed5692c8631612ba7b6ee7dea105dc90d44221bde02b808c779db3933
-EBUILD udev-245.ebuild 5771 BLAKE2B f240fde995db1e73ab8cd9ba79d5fadd2761dc376afe627cf3be28d4fdfb3e5be56df6b0f7be90637ce029163520026b11f682bf407b5bc4dc2bc61738a44dbb SHA512 c66b30ebf223fe98c7de56d693296e04061f269e6f59dd897f26b987a0a78026bfdd36c94489cec0d8b3eef42d1c4108d94f8bd65691743cbdb1ed00840c32e3
-EBUILD udev-9999.ebuild 5851 BLAKE2B bfe759c1c69e2efa7138aec74a795f7c0d448097c1724b44707f8dbff2158e0d5db423e5a21f7c0be720c763e19c2d8c6d5bc4e3453444b89749eef0664809f3 SHA512 577e2b02531a584cffac132b12927874ad11e38393034913bb56a4265ab9dcddec9b548ed5692c8631612ba7b6ee7dea105dc90d44221bde02b808c779db3933
+EBUILD udev-245.5.ebuild 5831 BLAKE2B 5c14d8b206de3c8c676c621784535556e4bdba5eacadffda1c9812992b93d88d91129da8c98598fe43c2b3f04d627a939879d4fb8a96ef71070cdf436f3e8b83 SHA512 3c6ca63e31cb5aacec6d223636723e485012a9ef6d36e604d367065ccc488a168b4d0f93d04a1091427a87339ad838b0ca41982cef5c0a30d3a81ea1a5180098
+EBUILD udev-245.ebuild 5751 BLAKE2B 89d14d90da8ac39fc27e2cd9399753daa3af91cdcc6ec55a24c46689ba838783065c185a3bb01cb9ecf35c52ca3e922c354ca43908e5e43bd80bdeebd050d22f SHA512 e11924682be87e73ea757947fae7997d72386265847c73941fb518d94de81f4f1169e87bcd954b25e06b0148016d419635010fc7d4e5adbbafb3b47c1437a19e
+EBUILD udev-9999.ebuild 5831 BLAKE2B 5c14d8b206de3c8c676c621784535556e4bdba5eacadffda1c9812992b93d88d91129da8c98598fe43c2b3f04d627a939879d4fb8a96ef71070cdf436f3e8b83 SHA512 3c6ca63e31cb5aacec6d223636723e485012a9ef6d36e604d367065ccc488a168b4d0f93d04a1091427a87339ad838b0ca41982cef5c0a30d3a81ea1a5180098
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/udev-245.5.ebuild b/sys-fs/udev/udev-245.5.ebuild
index f8ba208e8aef..4b884c8001b5 100644
--- a/sys-fs/udev/udev-245.5.ebuild
+++ b/sys-fs/udev/udev-245.5.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 	dev-util/gperf
 	>=dev-util/intltool-0.50
 	>=sys-apps/coreutils-8.16
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
diff --git a/sys-fs/udev/udev-245.ebuild b/sys-fs/udev/udev-245.ebuild
index 4cdaa936a654..d5fc3ed104d5 100644
--- a/sys-fs/udev/udev-245.ebuild
+++ b/sys-fs/udev/udev-245.ebuild
@@ -29,7 +29,7 @@ BDEPEND="
 	dev-util/gperf
 	>=dev-util/intltool-0.50
 	>=sys-apps/coreutils-8.16
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index f8ba208e8aef..4b884c8001b5 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 	dev-util/gperf
 	>=dev-util/intltool-0.50
 	>=sys-apps/coreutils-8.16
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 1eeed1ebe303..ef4be71c0999 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,3 +1,5 @@
 DIST udisks-2.8.4.tar.bz2 1619051 BLAKE2B 4fdf3d5ea8ae02eb74efd552afee2dbe94137767c343034dd68f1553b224871a51bb2382eda00de90d45bad18b4088b4812e1f3fbb004cd29e753e92afb34e05 SHA512 70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c
+DIST udisks-2.9.0.tar.bz2 1671841 BLAKE2B 5f0f26b203a4a54736875211d8299c1b81a4e2722561028f802200b3a0916fb70baa923b2f7f5474580ccf14581d4e3cf203bf9e864cf01613275d3f1b1935db SHA512 314355c9b0cc562b2359ea77137b3f2189c48e642c67cc9d9ed07048176967b67e78dfb3190dd160db2f92e8143a4f005bf2cc1aa814388a79201705e5297d0c
 EBUILD udisks-2.8.4.ebuild 3279 BLAKE2B d3a35670627a2cfa8f211efd0e38439ebb9b5aebf968d8dbdf3670f501d9ffac3a0665ffa85e894fb9eb31bf20240822d1650676ba2aef0a97fb873afa7bfa27 SHA512 bc3664b7a2e18c537ce33cbaf2931c113387bcf110b524b77f5ca2346c54e4d3e998accdb1cc075ae990becc09238ec7efd6543c5a2bff457710491ef2f150af
-MISC metadata.xml 562 BLAKE2B cb4420b855989175ed12f77be26d3e9c42375d64abf397ae7a5ec9da49383d6e45d43ead2057070c09d6849e16f0cbdaba6a863c2d3760ec39f251224371387c SHA512 bec0d8698846724ea9f8cec0a4745af6e0723265248ae1953c19dfd0df9904b37554fe8cd5c5dac554e03d6c822b1324bd6d787a56f92006e189f7940c98d54d
+EBUILD udisks-2.9.0.ebuild 3392 BLAKE2B 76ab015d09348290ef4e3456856e05147b7ba278eac4ddf6136f99d424226866d201ecba3fb880474f48e4fa082f33188969304a59a878a7d2094dde2dbde7dd SHA512 08c02d009d0614fc9907b55d9e065257c18a809fedab9823cffdd3b986046399d68178f94de8db0c2fac0185cde3545545a534bf42f15a753e9b25971f860705
+MISC metadata.xml 641 BLAKE2B 705b9b22bf911c442ba6529cc6481916d703bb43a741e731e65607be9d916be9db9b8bc75ca4b5e867ded9321f0fc2cd5d8c3c4f3c67908d639d6d6bb1416614 SHA512 b24f65a685c3d17b113467b274f2fe7acd46641e9afb9c87a6a23ff182d1b841c19540c57c92d7a346a80a077dfff9fb79ce98d564737d2af3001ed9c8f79013
diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
index b4357b2df5b0..83ff308110f9 100644
--- a/sys-fs/udisks/metadata.xml
+++ b/sys-fs/udisks/metadata.xml
@@ -5,6 +5,7 @@
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
 	<use>
+		<flag name="daemon">Build the system daemon, not just the client tool</flag>
 		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
 		<flag name="lvm">Add support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag>
 		<flag name="systemd">Support <pkg>sys-apps/systemd</pkg>'s logind</flag>
diff --git a/sys-fs/udisks/udisks-2.9.0.ebuild b/sys-fs/udisks/udisks-2.9.0.ebuild
new file mode 100644
index 000000000000..020910ffa396
--- /dev/null
+++ b/sys-fs/udisks/udisks-2.9.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 linux-info systemd udev xdg-utils
+
+DESCRIPTION="Daemon providing interfaces to work with storage devices"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
+SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	elogind? ( daemon )
+	systemd? ( daemon )
+"
+
+COMMON_DEPEND="
+	>=sys-auth/polkit-0.110
+	virtual/udev
+	acl? ( virtual/acl )
+	daemon? (
+		>=dev-libs/glib-2.50:2
+		>=dev-libs/libatasmart-0.19
+		>=dev-libs/libgudev-165:=
+		>=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?]
+	)
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	lvm? ( sys-fs/lvm2 )
+	systemd? ( >=sys-apps/systemd-209 )
+"
+# util-linux -> mount, umount, swapon, swapoff (see also #403073)
+RDEPEND="${COMMON_DEPEND}
+	>=sys-block/parted-3
+	virtual/eject
+	daemon? ( >=sys-apps/util-linux-2.30 )
+	selinux? ( sec-policy/selinux-devicekit )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.1
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	>=dev-util/gdbus-codegen-2.32
+	>=dev-util/gtk-doc-am-1.3
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.19.8 )
+"
+# If adding a eautoreconf, then these might be needed at buildtime:
+# dev-libs/gobject-introspection-common
+# sys-devel/autoconf-archive
+
+DOCS=( AUTHORS HACKING NEWS README.md )
+
+pkg_setup() {
+	# Listing only major arch's here to avoid tracking kernel's defconfig
+	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
+		CONFIG_CHECK="~!IDE" #319829
+		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
+		CONFIG_CHECK+=" ~NLS_UTF8" #425562
+		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+
+	if ! use systemd ; then
+		sed -i -e 's:libsystemd-login:&disable:' configure || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-btrfs
+		--disable-gtk-doc
+		--disable-static
+		--localstatedir="${EPREFIX}"/var
+		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+		--with-modprobedir="${EPREFIX}"/lib/modprobe.d
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
+		--with-udevdir="$(get_udevdir)"
+		$(use_enable acl)
+		$(use_enable daemon)
+		$(use_enable debug)
+		$(use_enable introspection)
+		$(use_enable lvm lvm2)
+		$(use_enable lvm lvmcache)
+		$(use_enable nls)
+		$(use_enable vdo)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+	keepdir /var/lib/udisks2 #383091
+
+	rm -rf "${ED}"/usr/share/bash-completion
+	dobashcomp data/completions/udisksctl
+}
+
+pkg_preinst() {
+	# Remove gtk-doc symlink, #597628
+	if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
+		rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
+	fi
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"/run #415987
+
+	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
+	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}