gentoo resync : 29.01.2021

14 files changed, 110 insertions, 171 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index bbe4e80b26f4..1c40488c7416 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 611420128b4b..80e2d9d68f0c 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -4,8 +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.5.tar.xz 5569796 BLAKE2B cf9633caa6c00afa51408364d0c0a1515a9989ad1582fb485a300fd71bf61ec56b57dbb26f152609eaf2d63bfb04fe1e3f271085c26aa0c832c1f467960e6480 SHA512 d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce
 DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
-EBUILD e2fsprogs-1.45.5.ebuild 3976 BLAKE2B b58d289b7f8549d80492551f99223e01817edee7e42b1eedad53912c7c67a9f746347208bea7e535e8aa3951e89c5741362b3117cea76d507e68b245285003b4 SHA512 24078e17691c1ab62f0ab798abb4b9ee32b70f60dc06ecaeaf12de7579bb42b480a0f10e9b66a660b6be0f5c54613d589e529482d5c96856b9706c05cff6c1bf
+DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341 SHA512 fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763
 EBUILD e2fsprogs-1.45.6.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04
+EBUILD e2fsprogs-1.45.7.ebuild 3985 BLAKE2B d7aed9912b3b1debc59c09ed47283fefb5dac60d23c5ce609b0a9ebeba7792a168c56c465c31cf6632c2fcb4c9aaf09816517ede38431a246cc93363021553f6 SHA512 95db486d2735f237c708748e7067beb4793f46b9191f24662797ca78298deda1cd8eb9580191523fc4f013fbb71f7331d3dcfa92b8eb05794157d544a323c944
 MISC metadata.xml 569 BLAKE2B 0a09eb03e2d5f07a24f33d71a16d0e4cb7e12e5a03356b44127e964c712addfb5bb9d5bc3b26dc66c608544639b6a92ebe0dcc18c03b8820f50b6fabcc9c231b SHA512 fa3e24f0db835a5fb475d42874d3197bd30f0c1f606b66b1b3f285e61dd32624ae56014b37ee0de0a9ebfaf51dd2f06cc2f73f91a011c5314809f5d495d65e67
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.7.ebuild
index 03c5ed1ace21..301a34b1b5a1 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index ca7fddbd7481..d8417ae87f4a 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -29,6 +29,6 @@ AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c9725
 AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
 DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91
 DIST LVM2.2.03.11.tgz 2528527 BLAKE2B 4c02e630e033f9bfed44468b5b8dff4af52c943cb9d6385bfe568ba50463dfc97cd968d79c34eb2528d66930d6c2895de17fe546a34d80fd17a5892560bcb670 SHA512 50f21337e397fc5b4692bb08e5d48409b907b96b39168343bab2d40bb74fd84ff466e15f3d664305bc044f3f6be4369fa7378399d5a838793632e74706f17653
-EBUILD lvm2-2.02.187-r2.ebuild 10065 BLAKE2B 1c218be6a3234cf8da1990991417dc429acc8ce5fc9cee06c0edfc89b1af894a1b2abe6d42ad9341608f39b70fe2e7bc97b4caf5afcb64a4de9baef7cd0b7890 SHA512 bf357c4cfd8eb8e75d20e2157b4f5203b2cfb8b2b16dad298796c4ce8dde8c6da07f6760bda85972bec5cb77fe08b94133a8bef7e793ab9c4c31ac30b7ce7e11
-EBUILD lvm2-2.03.11.ebuild 9519 BLAKE2B 85da508150b02eb5eda4fd27ed7dbd0feade48653e0ffb1856586bf8eec163f8ce65239963c81bbaa3f9aa24be4b837ea2d110de4475cb1cbc7bdf7977184248 SHA512 69f3f20c0ea7601fc787b218f7655a56234a01a5823e428872f0b72248a3404cbea7b439524ecf42c27805e56ead76e1d17514fa8de53616c3eefb1a8a9db5a8
+EBUILD lvm2-2.02.187-r2.ebuild 10033 BLAKE2B e7a5fb4f7ba05f65f3136e9417e5a5dee962840c946977468fbd85dc40cb983086cb8be0acd7bb04ce13afa745252805c26603c4b33147776bd97bd4186cca49 SHA512 3b818a61f92ec92aa17e89d1cd78dfde543cc02dea717743c11c85f63da1e3e76fa1696a312014988c509cb99eb1686065e10cd78f36e4d8fa73f2474b7891b4
+EBUILD lvm2-2.03.11.ebuild 9487 BLAKE2B bf73d0d3a535485c35172217fefb2d0a3649bc53cec8d45e8efe170227c615993bca04f0b11d49d7f23243b9ab15a8309b92f245b2c3265313a04cbc15af75bd SHA512 42e8bd43676ccf4962f201f09fdbcf4edab82a1324c00326b07ed10aec95e872288dacc0b68346e01629bf936b3481aeeb1f7b257a9e5f96cb96fc11aeb15a1b
 MISC metadata.xml 1020 BLAKE2B 6427d15f63ac775b03758cef58620c77fb2dd6f92de8ac23a87b51d76ae3882acf5f555c3aada81235afa0f52290e35d142083004e53443902a710721228e213 SHA512 834e3798b590e693d6a26c708985ee6c3eea27b958924827d9325fbe7bd00711bdfbfabfd21d408752393f99131588116b3d2b841107afadf67e09cae3289ed9
diff --git a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
index 54f28eab2cbe..413eaae8b611 100644
--- a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,7 +37,6 @@ RDEPEND="${DEPEND_COMMON}
 	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
 # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
 DEPEND="${DEPEND_COMMON}
-	>=sys-devel/binutils-2.20.1-r1
 	static? (
 		selinux? ( sys-libs/libselinux[static-libs] )
 		>=sys-apps/util-linux-2.16[static-libs]
diff --git a/sys-fs/lvm2/lvm2-2.03.11.ebuild b/sys-fs/lvm2/lvm2-2.03.11.ebuild
index 47f9c06d38dd..d8d945f5a7d3 100644
--- a/sys-fs/lvm2/lvm2-2.03.11.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.11.ebuild
@@ -37,7 +37,6 @@ RDEPEND="${DEPEND_COMMON}
 	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
 # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
 DEPEND="${DEPEND_COMMON}
-	>=sys-devel/binutils-2.20.1-r1
 	static? (
 		selinux? ( sys-libs/libselinux[static-libs] )
 		>=sys-apps/util-linux-2.16[static-libs]
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index 9592d6ab81d4..6b74b47fa1e4 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -1,8 +1,3 @@
-AUX mtd-utils-1.5.2-sysmacros.patch 927 BLAKE2B 5ff3cba6a47443b747c272f535c983ccc4483fad4421044a988a212d8a4366c224279f3b0214725dfcef3b1d8d6a3f85d72b6461b91bce6303d55e9caa8a7cfd SHA512 e7334556ecfe57edc703a9b6c37535460774eb1990be497544101a77e7c1ff75ec9872b1d4dc3d9ffb94f4488371e0c800c3b2e15e75d2881588611018417ff8
-DIST mtd-utils-1.5.2.tar.gz 343843 BLAKE2B 7f6612c4b9185583e9bbc785f7f96b08b7897c4af0c442a6206a446dc25f3c2aae9670c9344fba09606f73b87c73a96150f77bd974c96abe475d204ba5c28068 SHA512 81eb5cf27814234af65409fe93798ec50d9f733978dc606bd33e63d98eb99afb3f988df47dc66a9368a11baee0a35fa1d0d6677af8c23428919e34bd11a25697
-DIST mtd-utils-2.0.2.tar.gz 355964 BLAKE2B 9a795ddac1287c7c44f52215faa4b6295cf5ac3917392a407c7824f8715f4a180feab95621e6b1aa738fba38950c8e12b722b7c518c3362227e6da25deecd3fb SHA512 e61f4bb24d3b96d39fe262f73e01b7bf3e15a9258fd5766657ef0d807d7b5bb0b489ade9dc45068b2a25bcf378ca2877177df3915398b367f50ff1ef9bc5be7a
 DIST mtd-utils-2.1.2.tar.gz 380333 BLAKE2B 46cccf9cbe870f3415237deaa00a3ff57fbaacc019d4adc69e1ed516e752e58776ed5f53be0d46baef69dff8a0d90e1df5ca32a80ecbb620dd4bb0231f8c94dd SHA512 bd2d61d81f367a1d9f5345fa3985f5403e37fad1c1f811e2ab291b64339170514aa1fbceb89b78ba7a357f8cc3d7ade99796e9318c9624a40e2266fa0b3a9921
-EBUILD mtd-utils-1.5.2.ebuild 1577 BLAKE2B b180c7b895a621d8ee4078b5ab94ed92d3d41b0c88f47898fa8f0ecc42b85b446e7c92537d9417e03675f45925344c37af0cbc1be98e5116cda0ed7076e4bd5e SHA512 19af1ceda473ad24fc128c2f6704d9d33b630dc63aa4975b03cd5139978d55669210617597f2128d4fd192908428dcddadde2900749bf8db76408e4239ba5216
-EBUILD mtd-utils-2.0.2.ebuild 1334 BLAKE2B 5ba40d20c85da672c1c066bbae5b9ab2396aec08c97dd6688a08886c70f393c7004ca879860d3d9ce499db9835ae8305e38e75427a7bfc3d0c24451c2387241c SHA512 7d8e5bafe51f74121c167261c43023bc889baab53ba60e8c69cac792a0b9ca5011e8082d4d2bb59d0ef8b803fd9154e706301e05586b4760a1f730f34bcaef21
 EBUILD mtd-utils-2.1.2.ebuild 933 BLAKE2B 245fd61df8a47518240c74599b7a1685df48f57cf6fc3f4a77768d95dc5a7199486260be4d92ce3573a500456a4b9a898ed23c3cc0280c93b80809b23bbb00ac SHA512 fafb5d790b20eefd5948a479e1926b768be4e148080530043d2c0fd3619f864101c7db8b4c20c0add9d47d237a9b33d15ef463587c5c717b4e9c9fdee384731d
 MISC metadata.xml 416 BLAKE2B 88cdc71a56448e05d3d8bba7b5bb031b043d7b798ad40a04d7ab416b5148fc9c27501366991d26a51f44186953fa6eb3a1214cc8d0872f6e3cd39861c532a672 SHA512 e75a4504c7558e19937f8f608a852905853f8efc2aef32ca3c383517fce86673aa3647a6ed5305d105f16be2c6a0f9667bb8326a9453050810b29b8f72fdc7ac
diff --git a/sys-fs/mtd-utils/files/mtd-utils-1.5.2-sysmacros.patch b/sys-fs/mtd-utils/files/mtd-utils-1.5.2-sysmacros.patch
deleted file mode 100644
index 5fc055d07da9..000000000000
--- a/sys-fs/mtd-utils/files/mtd-utils-1.5.2-sysmacros.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/580206
-
-From 9a06f45ec71116d76ee4b268ebe1b33d45b06fc0 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 16 Apr 2016 22:10:43 -0400
-Subject: [PATCH mtd-utils] include sys/sysmacros.h for major/minor/makedev
-
-These functions have always been defined in sys/sysmacros.h under
-Linux C libraries.  For some, including sys/types.h implicitly
-includes that as well, but glibc wants to deprecate that, and some
-others already have.  Include the header explicitly for the funcs.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- include/common.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/common.h b/include/common.h
-index fb0ca83..8cb3142 100644
---- a/include/common.h
-+++ b/include/common.h
-@@ -28,6 +28,7 @@
- #include <errno.h>
- #include <features.h>
- #include <inttypes.h>
-+#include <sys/sysmacros.h>
- #include "version.h"
- 
- #ifndef PROGRAM_NAME
--- 
-2.7.4
-
diff --git a/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild b/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild
deleted file mode 100644
index d319387dee4d..000000000000
--- a/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils vcs-snapshot toolchain-funcs
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://git.infradead.org/mtd-utils.git"
-
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	if [[ ${PV} == *.*.* ]] ; then
-		MY_PV="${PV}-*"
-		SRC_URI="http://git.infradead.org/mtd-utils.git/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
-	else
-		MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b"
-		SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz"
-	fi
-	KEYWORDS="amd64 arm ~mips ppc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
-HOMEPAGE="http://git.infradead.org/?p=mtd-utils.git;a=summary"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="xattr"
-
-# We need libuuid
-RDEPEND="!sys-fs/mtd
-	dev-libs/lzo
-	sys-libs/zlib
-	>=sys-apps/util-linux-2.16"
-# ACL is only required for the <sys/acl.h> header file to build mkfs.jffs2
-# And ACL brings in Attr as well.
-DEPEND="${RDEPEND}
-	xattr? ( sys-apps/acl )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #580206
-}
-
-makeopts() {
-	# These affect build output, so keep it common between compile & install.
-	echo CROSS=${CHOST}- V=1
-	use xattr || echo WITHOUT_XATTR=1
-}
-
-src_compile() {
-	tc-export AR CC RANLIB
-	local compileopts=(
-		AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
-	)
-	emake $(makeopts) "${compileopts[@]}"
-}
-
-src_install() {
-	emake $(makeopts) install DESTDIR="${ED}"
-	dodoc *.txt
-	newdoc mkfs.ubifs/README README.mkfs.ubifs
-	# TODO: check ubi-utils for docs+scripts
-}
diff --git a/sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild b/sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild
deleted file mode 100644
index 0fe8a0ccf747..000000000000
--- a/sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils vcs-snapshot
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://git.infradead.org/mtd-utils.git"
-
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	if [[ ${PV} == *.*.* ]] ; then
-		MY_PV="${PV}-*"
-		SRC_URI="http://git.infradead.org/mtd-utils.git/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
-	else
-		MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b"
-		SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz"
-	fi
-	KEYWORDS="amd64 arm ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
-HOMEPAGE="http://git.infradead.org/?p=mtd-utils.git;a=summary"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="xattr"
-
-# We need libuuid
-RDEPEND="!sys-fs/mtd
-	dev-libs/lzo
-	sys-libs/zlib
-	>=sys-apps/util-linux-2.16"
-# ACL is only required for the <sys/acl.h> header file to build mkfs.jffs2
-# And ACL brings in Attr as well.
-DEPEND="${RDEPEND}
-	xattr? ( sys-apps/acl )
-	sys-devel/libtool"
-
-src_prepare() {
-	default
-	./autogen.sh || die
-}
-
-src_configure() {
-	econf \
-		$(use_with xattr)
-}
-
-src_install() {
-	default
-	dodoc jffsX-utils/device_table.txt
-	newdoc ubifs-utils/mkfs.ubifs/README README.mkfs.ubifs
-	doman \
-		jffsX-utils/mkfs.jffs2.1 \
-		ubi-utils/ubinize.8
-}
diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest
index f8f42c03d16a..e7561ca250fb 100644
--- a/sys-fs/squashfs-tools-ng/Manifest
+++ b/sys-fs/squashfs-tools-ng/Manifest
@@ -1,4 +1,6 @@
 DIST squashfs-tools-ng-1.0.3.tar.xz 1101820 BLAKE2B f21cef44d5dc3cae01733bb720ba472d02777d2b69a3e428dbf4d0f64ad46a18131dae807a9ef719e29698b06ff04a82de1906876c40aef336aa57a75eb3fde3 SHA512 32e0084b1343de07b450e5337398618475a57c91c6f351c73bb7aa3dd6b5dc83aeca924f3d624ce802c9e1d600389a76cbca7b841104259d32f3ef2c7f13db67
+DIST squashfs-tools-ng-1.0.4.tar.xz 1103996 BLAKE2B c56b02932cdb4116fcec582f674771f27f67cbec51ca8d31beb1fbccef72fd06a82ee5981fb2dd5f6e7297180d1774d856c24ae447e95687f6f7b970357b807c SHA512 c0a24be6b07739713213fc5936506ea7c1f62fa461f60955986ac4dda6958203e74336418abe615ecc85c62deb085039ca375891538ae01c21672d4911091614
 EBUILD squashfs-tools-ng-1.0.3.ebuild 1122 BLAKE2B d7dd3c7314464d58d15f6229a52ee3336d853fae9f3238459202f385dbf253906b6a94fd4ea4469ccfd756abe4c504a3a40ad6c1f4442dd41b7b0448d29fde9e SHA512 d4c951eeb931881b710cdddafb381492b1698ac9b86506a73a73b346ace42f4048420bd035fff53a5bfa08bbd7ffcd958f254a4eef24316326c86fb92ae5214a
+EBUILD squashfs-tools-ng-1.0.4.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
 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/squashfs-tools-ng-1.0.4.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.4.ebuild
new file mode 100644
index 000000000000..22a2dbc93b62
--- /dev/null
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2019 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}"
+
+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/udiskie/Manifest b/sys-fs/udiskie/Manifest
index 008e369ea8b6..4da476449ca6 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -1,5 +1,7 @@
 DIST udiskie-2.2.0.tar.gz 88232 BLAKE2B ba037b0828b7bf42b00be481ecec807bc9ed591ad3990cb6b6f0db21b4894c184ff2fcb5410272a55f3f78caae999458cb159cd450ede540606138e5e9dab1af SHA512 7c6c096eeb52458a2e30415c1489a640ca679489a34729f5502ae35f178f810476111a17f082a092d61d6d08022cfd208cb1f71ab34d6b88ea7f1f4e4a1ae49c
 DIST udiskie-2.3.0.tar.gz 89954 BLAKE2B ece40590aee684325a8df4b793a5407a0f15ba07c3d8a0df72d72afe5af2f1d3bb6c072fa33fbe61b647a3ed3b0d5b9f6881be4db3943fdc0208e14ced4acec2 SHA512 4b2d97ac458a70bbb6458fdf2386b5847c1ab590d4f8ae420d4c799871be732f793d31c3c6a51558caea266797da10647de437790237f01cc313e08f74524148
+DIST udiskie-2.3.2.tar.gz 92377 BLAKE2B 9351aa4d4b5becce1cf99c49d6906f3b84f5ae559ea0d8d456ad035cdcd85bd752fb02aebe3ef74287b14c668e192d0cd7b9b5a348daba379eabcad32cbe3408 SHA512 f4baa3d48cc9480d0d6c7a24090d6661a36bf9eaf0d2e7797c65318358a593fd88f9d289a89f9f5e14a4b5a67407ae8dc739184359bf533882ad24189c1756fe
 EBUILD udiskie-2.2.0.ebuild 1003 BLAKE2B 20fdd6665401685ff2c97f82b989e916f08060e0085a87a1c327c3fef469a00f8c085456b8d5f5a9cf3a098fb752143fea68b98a99038fe20a1098f29d76555e SHA512 b6283de8d33f593580a566572912750f294544a960ea810c5003aedc2cdb8747848f9893047d91c8ac335efeda5aaf84b0586f500e422abff26e00a90713d39b
 EBUILD udiskie-2.3.0.ebuild 1005 BLAKE2B 7f2e1c0083cdb534db439f7f981d0571163802c42482c30c1ac875f66ab472801cc82714cb3ceef819bd3149ef337b9c42aa23570cc5d6ba7b747be84af08f9e SHA512 032997d18db21a3ea5e9badbfebecb00c480adf7289e19f49a785eb41dba216c77bff7556b6d05f1646cb9930bc33e520e569a1ad636d1fe5146dc459e6c282e
+EBUILD udiskie-2.3.2.ebuild 1005 BLAKE2B 7f2e1c0083cdb534db439f7f981d0571163802c42482c30c1ac875f66ab472801cc82714cb3ceef819bd3149ef337b9c42aa23570cc5d6ba7b747be84af08f9e SHA512 032997d18db21a3ea5e9badbfebecb00c480adf7289e19f49a785eb41dba216c77bff7556b6d05f1646cb9930bc33e520e569a1ad636d1fe5146dc459e6c282e
 MISC metadata.xml 369 BLAKE2B 0241a847b1eb2f650f66bc3fd631ccdf1927562d510e08c7bcd3db850752b665894838d0c705b7d03690aeea0aa93372d1faae5b313c9136d46e4913c177b0a4 SHA512 0772b0fa065a42292268b9e6a6b99b7198f5923bcc4697913b6c432db4e206a28b0fb1bd6c14b6363591cca02108a8a91029233824c3ec5bd7fbc592a941137e
diff --git a/sys-fs/udiskie/udiskie-2.3.2.ebuild b/sys-fs/udiskie/udiskie-2.3.2.ebuild
new file mode 100644
index 000000000000..55fa66a15c5a
--- /dev/null
+++ b/sys-fs/udiskie/udiskie-2.3.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="An automatic disk mounting service using udisks"
+HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	sys-fs/udisks:2"
+DEPEND="app-text/asciidoc
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i -e 's:gtk-update-icon-cache:true:' setup.py || die
+	default
+
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	emake -C doc
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/${PN}.8
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}