gentoo resync : 12.07.2021

4 files changed, 4 insertions, 52 deletions

diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index fe730bafdc14..03b9a747708d 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,9 +1,7 @@
 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
+DIST mtools-4.0.32.tar.bz2 436537 BLAKE2B 6b057be3d053ecf1ebee72b6b73324ec2cdbd7daf87c927f6ec2f6ef203345ddb869d6d7cb645e21054304ae68fc7a33e77e7a0f0cb606d3b755da36e66ca69a SHA512 a66e7483c422abdaddbe9e6b2cd0ecc2f87b0bc4f40929ac2e4db8b8d88cfacf118b126cba3207307bff376d5572170a1ee5803618de0544f68d420ed06bcab9
 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
+EBUILD mtools-4.0.31.ebuild 1053 BLAKE2B e2f1e01bc4e7ca2ec6780695dcc1ea308bd546c331486810267d494761f1cc728dd1994d531643537d603fddae96bc100a4c71082542344aabeb16bfc0803bf3 SHA512 c6d35dffd8ed5b889b44aed6518cd8aef7e647d9b03c2db36a906e87469d04cbae976b991e2cdc5b7703738d0178c08042ac380c617bff1ef30e5f8e73a77a58
+EBUILD mtools-4.0.32.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
deleted file mode 100644
index 3ebdd3b6df91..000000000000
--- a/sys-fs/mtools/mtools-4.0.30.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
index 3ebdd3b6df91..87146d25de94 100644
--- a/sys-fs/mtools/mtools-4.0.31.ebuild
+++ b/sys-fs/mtools/mtools-4.0.31.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
 IUSE="X elibc_glibc"
 
 RDEPEND="
diff --git a/sys-fs/mtools/mtools-4.0.29.ebuild b/sys-fs/mtools/mtools-4.0.32.ebuild
index 3ebdd3b6df91..3ebdd3b6df91 100644
--- a/sys-fs/mtools/mtools-4.0.29.ebuild
+++ b/sys-fs/mtools/mtools-4.0.32.ebuild