gentoo resync : 20.06.2021

10 files changed, 113 insertions, 8 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 00560ab3edc5..982f1f31d12e 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/compsize/Manifest b/sys-fs/compsize/Manifest
index 73bbe16ec243..c0386bd3b826 100644
--- a/sys-fs/compsize/Manifest
+++ b/sys-fs/compsize/Manifest
@@ -5,4 +5,4 @@ EBUILD compsize-1.3.ebuild 966 BLAKE2B 190fe583af11b73cebc53de403e6db93b227640d2
 EBUILD compsize-1.4.ebuild 878 BLAKE2B 3564d9e3bedc4bdd95294e1ec12baf423a6bde645a3d03e53f6bd6f547742459845265bff9d7570c050f7f52f80cc1e9e78d8054b0a265d817706ddb9cf33c31 SHA512 abd05d452e141457a48967404570dac752100ca835df1851370602402991246cbee58a73ef3e2c79b2ba4ba4cdf5202f70fdad27ef0d8e28a31c69404189d366
 EBUILD compsize-1.5.ebuild 919 BLAKE2B 6050947b62cc7c554bd70088330f35a536aca28a09311d70343d30bb69d83ce02b217217519a517360b6c96293ed0dc275ca1008d00103ac16eba69dec641b1a SHA512 6e9c29a79d7e2472b6f3805cbce271a1a8b7590d34944cb24c56fd7d01793ef1a2543b041183fc4621980a23b1d186fbed6f26cf2c8cb2b027854e544823efc0
 EBUILD compsize-9999.ebuild 921 BLAKE2B 71ec177637d558bf1b13682f61f0a842d711f523c7d762f9a2314d13e27daf9c686d83570799569d69e239add78719e7ebc3e43b3dbd678bc026b8f8333eed2b SHA512 1ff43f6b513bd42131810d6a8ec7b9cfcef922d9b88f76a39d8d0218036576cc8089ebfd3ee87aa64496eb91515b29b429c0655adafa8f63d03b2c4e107f42be
-MISC metadata.xml 474 BLAKE2B 93fb6451e4aea9bace615da2fc15b996aa88e286201f6b95d7e3029f55dc97d189291a64033b87fde42d61db60524244777fc280d2bc0e4225ac8a3dc3a80e55 SHA512 6faacdb272a6c0aa8c19c4970c6eb00d15ffab23a0c6c20178503f3fe0de77747d0b43d63f558e5063b03fc2456456dbb4471976fa4ef5c5ab942b649ac7c4b0
+MISC metadata.xml 473 BLAKE2B 4cabdd33bb2bb0d6750a5df18546133dda2da68e7d63a67686652968f28f8ed3b19dfae821e70cd78f726a7703ff36b6c7240738c769032c9ff3ee72a4f7a7ab SHA512 157f29b62b8ae336979d1dad926a2609d91d5627cf90b9fa7595896c2dab0cf35d486ae807556c0331a1eb92f75c72461c91095c66f05c12b0cddd9db5343dd7
diff --git a/sys-fs/compsize/metadata.xml b/sys-fs/compsize/metadata.xml
index 792e09786b52..f18144bc7d53 100644
--- a/sys-fs/compsize/metadata.xml
+++ b/sys-fs/compsize/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>telans@posteo.de</email>
-		<name>Theo Anderson</name>
+		<name>James Beddek</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<name>Proxy Maintainers</name>
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index b953fbe83cc5..bd5358baaace 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -4,7 +4,7 @@ DIST fuse-3.10.3.tar.xz 2558792 BLAKE2B 5b730321677e5080148c2ca5db35ed14b6f1919c
 DIST fuse-3.10.4.tar.xz 2787472 BLAKE2B 174b51bf55544bbc08e04089a4d8685b371d3f584e337ed0d8d82c62e10c14b6ef14a964d6627e8a121036db1ab4c6c1ccd413c08f8685d3d91893874427e46f SHA512 1cb7600dc04f148b15ec3183d0348320dd946cf15d4077798e7e34fe7e8202837718c8b8bd1f190b7dddda2453ee2b0433d77e18f142ecb7affec1cae29520f6
 DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26
 EBUILD fuse-2.9.9-r1.ebuild 2056 BLAKE2B a62986e92f4deb4993f4c0bd71996c1f2b4be435e396dc869f8fda9d6b0c3e74e397a6388fb66b076cc5bbc441d3122aa8ea7c788d5a96b82386621e1427b882 SHA512 0c65cac78140b2baf6ce8c3342c99cb52a1746b0a7d0a21d4e44955d56d7fd5b334b020ffd2cb1bb982f9652b422e7555d05ab2ff5746b664786e5c2f3c38bf8
-EBUILD fuse-3.10.3.ebuild 1695 BLAKE2B ddaf9bde9834b4ff02d8155a2ba77e055fb959430f1bf763de42517062d1642ca44a0288448e676b8f8eb289e972430d95dc37d9fc3ba17f0f917eace3de3ef7 SHA512 9485425a10811c4a2a41bfa448b71e1f4333eb85d34e551b85c8c19d1187c675907498e625b5ce9f8c7a5d553653f0e29af51fca6cd271075508268a196bf456
-EBUILD fuse-3.10.4.ebuild 1701 BLAKE2B e1cbb0c3638b0728802ce85204a3ef59584e31ea3d582f62ebee24b21c43d6e6ddf4278bbb1e0f7f2e5aed427419105db9a0e8f5b7c2f40f1cfb090e08a9096c SHA512 aec0d76ee17b84495df8de1a9e92ad2554f9b6d33500ba0c15b0ffc53e9bbe2cac4295e39f439f5df8fb43b4cb198961cd7a1f7c9c9280b2af41fc98b172a2e1
-EBUILD fuse-3.9.3.ebuild 1823 BLAKE2B d4d0cc3939d07ecfa08c4c10fd21c8969e73d588043af680961765e09482d4cb6d5b6453a6fba8af1ddfe08f88932247015bb8317e4fcfdff298e61271efb79b SHA512 68f13b2185461fef0f8a1f804df628c7c668c9e78cf3f06ba5d92eaf85f8ada69d15fbe07bb5d8dd802716d313fbaa02a889b9cefd8d3abcad2b03c9d2079ec6
+EBUILD fuse-3.10.3.ebuild 1781 BLAKE2B a39a1f1377f8f1aa2340717de2fb32bf6ac3b1ef7c9e40ce6e931b33c73fd256a8fe28cafeb03ef5f9ee2eaa15df9d1d9c4a8e01fdbfcde70df9e2940d3d6bfc SHA512 ac69077ce9f7609acb9a35803ee660708607352345ecf7662d059ea4e52cdfa11123d29a47a95fb0f9b5f62ab239f1b28b5ba44c690b93f774827b143622f76f
+EBUILD fuse-3.10.4.ebuild 1787 BLAKE2B 19b6886011b27cb4ecb6e8128d23833b78c6f97c349b1b65e290607c0ee24a186ff5945ac3f689905162cfba719aad02ebe2269cc6ca0ab33aeeb16eb2edf22a SHA512 b81a884161020b1d1e284e47b0857e0edb4543f3ae504409f2f2f1f2c798e137626a20f914cb1217d42e8273493bad61e9c2e5c12e5d18feb2da38dec2279d80
+EBUILD fuse-3.9.3.ebuild 1909 BLAKE2B 1782605f62d587f1677e140cd2dcf714c2420d642d164a1cfafdbd1270d8a79881ff3daefe168fd9b5fea7dfbf95c994878106493ca89a84cdcbeaf41362dabe SHA512 2dac127d407278184c69798fd84c2f1520a48a31122ef33988efeab878dd942fa82b2abf62098a0ae52b3ffcfe3a5cfc883690bd642238112069f36c0575034e
 MISC metadata.xml 460 BLAKE2B a8f51e9fc0148b7bcc163ea5e0f72291f9e36f3dad8c20076495fe32cb8d5fe992579ab069f840bca251164ff646c522ee0b7ad5ffa7b3115effa89d5acfe332 SHA512 e56ba815557e847487dbc76dbec4ae657c7c4ecebc9b3c02c39402daa699c5ff90923bcaf1843747c94d2025f339ca6521f35f48c6c4583d36e9de33e6f3a586
diff --git a/sys-fs/fuse/fuse-3.10.3.ebuild b/sys-fs/fuse/fuse-3.10.3.ebuild
index dd6b9a769ba5..fbe409e38853 100644
--- a/sys-fs/fuse/fuse-3.10.3.ebuild
+++ b/sys-fs/fuse/fuse-3.10.3.ebuild
@@ -58,7 +58,10 @@ multilib_src_test() {
 
 multilib_src_install_all() {
 	# installed via fuse-common
-	rm -r "${ED}"/{etc,$(get_udevdir)} || die
+	rm -r "${ED}"{/etc,$(get_udevdir)} || die
+
+	# init script location is hard-coded in install_helper.sh
+	rm -rf "${D}"/etc || die
 
 	# useroot=false prevents the build system from doing this.
 	use suid && fperms u+s /usr/bin/fusermount3
diff --git a/sys-fs/fuse/fuse-3.10.4.ebuild b/sys-fs/fuse/fuse-3.10.4.ebuild
index e3f0349a01b3..509527480655 100644
--- a/sys-fs/fuse/fuse-3.10.4.ebuild
+++ b/sys-fs/fuse/fuse-3.10.4.ebuild
@@ -58,7 +58,10 @@ multilib_src_test() {
 
 multilib_src_install_all() {
 	# installed via fuse-common
-	rm -r "${ED}"/{etc,$(get_udevdir)} || die
+	rm -r "${ED}"{/etc,$(get_udevdir)} || die
+
+	# init script location is hard-coded in install_helper.sh
+	rm -rf "${D}"/etc || die
 
 	# useroot=false prevents the build system from doing this.
 	use suid && fperms u+s /usr/bin/fusermount3
diff --git a/sys-fs/fuse/fuse-3.9.3.ebuild b/sys-fs/fuse/fuse-3.9.3.ebuild
index e5d07d2d9696..a2ef80840b85 100644
--- a/sys-fs/fuse/fuse-3.9.3.ebuild
+++ b/sys-fs/fuse/fuse-3.9.3.ebuild
@@ -65,7 +65,10 @@ multilib_src_test() {
 
 multilib_src_install_all() {
 	# installed via fuse-common
-	rm -r "${ED}"/{etc,$(get_udevdir)} || die
+	rm -r "${ED}"{/etc,$(get_udevdir)} || die
+
+	# init script location is hard-coded in install_helper.sh
+	rm -rf "${D}"/etc || die
 
 	# useroot=false prevents the build system from doing this.
 	use suid && fperms u+s /usr/bin/fusermount3
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 5ff9dd9dafda..fe730bafdc14 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,5 +1,9 @@
 DIST mtools-4.0.27.tar.bz2 420579 BLAKE2B 3044fff1896427227e4585df81c208f7580302155cf119db426cfc7a24b3d5195b560b8810613f571eed77584d47bb5125007cdcb8551b303db62ce264853776 SHA512 21072e1b6d22ea00913dbc856c5fbe1ecfbfc0207432c7632f0026ae2d9555743eb0710c86e8939a6b3183a03693b8d1297121df9d5702dd5bf6121ad240572c
 DIST mtools-4.0.29.tar.bz2 440446 BLAKE2B b448fad8f5669230dc4fe32442c3a8b0ee570e1b084ac6b99b3239fa16fa97ba0ac5263aee34fefcb8726999178829a9ad6ed0444f41361518e5d24cfb3de083 SHA512 3671fa835bf7b410b33acbe0e4694da1609f284a99268e7c64ebdbf3ce9fc9e78cc5594d06eae5487e380b983ead190098d01a9fc1bc88b4eda324046172e62e
+DIST mtools-4.0.30.tar.bz2 442886 BLAKE2B dd66897c814c2afd842d6cb2a0865b4559a38c0c99468f6d96f16c869ed088f4a136c4ce798af39ca3115076dff9f303bd79145f17d502bc25d4b5b0a81f11e2 SHA512 9871dd2237c595286334d162bf9f494bc389cfc2cf098012484994212eff2c522fce357567b3fa5a7b314cc7336f7329fd9d71a2e1a0be2fdb3293dcbc4d98f5
+DIST mtools-4.0.31.tar.bz2 446527 BLAKE2B 4b954362d0c177c5a2f7b098065f841ca075092b8c49230ca4098a1a34fe64bce32d31df1aae702f12b174a8176026687de9dea5344f3878c1acdba4a8a0c753 SHA512 6c50eadcd32563b593b58984fd6426faabab208283c0b81c7df194cc27fb7d6bf873916b152c74c4800374f0b70f7dd41c768d823d9efc78cab6efbb6ee37df5
 EBUILD mtools-4.0.27.ebuild 1052 BLAKE2B 6a345c0c1436f2bf591b32c55514ceaf7b415d413107d0d3c07c50bcf7bdcef742c729fc1ed83fe967e32e4a580ddf2feaa0be482481d6bbc429c409cf622929 SHA512 d28ef71fcfcd7db607521ffc4170f632209f9386ac49b9ab40338a6960c96b5b769a96abf5781c5a49f515ba1e154155afa34af9f49c642167e9bac80afd187a
 EBUILD mtools-4.0.29.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
+EBUILD mtools-4.0.30.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
+EBUILD mtools-4.0.31.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
 MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/mtools-4.0.30.ebuild b/sys-fs/mtools/mtools-4.0.30.ebuild
new file mode 100644
index 000000000000..3ebdd3b6df91
--- /dev/null
+++ b/sys-fs/mtools/mtools-4.0.30.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
+HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+IUSE="X elibc_glibc"
+
+RDEPEND="
+	!elibc_glibc? ( virtual/libiconv )
+	X? (
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXt
+	)"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	use !elibc_glibc && use !elibc_musl && append-libs "-liconv" #447688
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/mtools
+		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local -a DOCS=( README* Release.notes )
+	default
+
+	insinto /etc/mtools
+	doins mtools.conf
+
+	# default is fine
+	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
+}
diff --git a/sys-fs/mtools/mtools-4.0.31.ebuild b/sys-fs/mtools/mtools-4.0.31.ebuild
new file mode 100644
index 000000000000..3ebdd3b6df91
--- /dev/null
+++ b/sys-fs/mtools/mtools-4.0.31.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
+HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+IUSE="X elibc_glibc"
+
+RDEPEND="
+	!elibc_glibc? ( virtual/libiconv )
+	X? (
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXt
+	)"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	use !elibc_glibc && use !elibc_musl && append-libs "-liconv" #447688
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/mtools
+		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local -a DOCS=( README* Release.notes )
+	default
+
+	insinto /etc/mtools
+	doins mtools.conf
+
+	# default is fine
+	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
+}