gentoo Easter resync : 12.04.2020

3 files changed, 7 insertions, 14 deletions

diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 26d87469dee7..550eb8ee07ad 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -2,9 +2,9 @@ AUX mtools-4.0.18-attr.patch 1804 BLAKE2B dee4d21870fd9f633ef8966513960b74a1fdaf
 AUX mtools-4.0.18-locking.patch 5744 BLAKE2B 509462f40e2a832d1a04358972d606d29d6a0b5d7d095438d1c17bb8b7636aac382f9bb0055e669aed661a89bd6e018f1d88a588f0bddf701e5c0eb88449f94e SHA512 0698b5c5f5d4c22f3439a835c3bb6f73a90c3030073f3497fa04a8e29241af867f664f253b37299d69ca043858b55e7290aaab1fa6f751084a52e7812cae4170
 AUX mtools-4.0.18-memset.patch 877 BLAKE2B 5a331eb50cca56c64c135974b56bcc651e6f7498740cad8dc4c5121efe23802a228bb73e5f18ee20b0e3ef81ea6ebd78cc19e037556f0294519b54a84697f993 SHA512 1e8d697c1cd98a7fedaed96e6019b6af96bf5ed6633f50f7c45649555a27727d93ba828e2852f23fb633832902bdb93c23afacd7022c72adf5c4a146f5b8a1a8
 DIST mtools-4.0.18.tar.bz2 420190 BLAKE2B 92fdf8b054287e3cb4eddb40c98f5ac4229a38473b633c25ab74a07a8a72d38c2767ae648a35cf0dac9dedfa2f7789afc4904a50e1328e2baa0a289d93b094fb SHA512 3981a4727aa4e2ec5c931201b236f52fcd1c9d55f888cb2fbdc5c4172402e2b229ede9a5005b972ffdad59bcb861e2fcc01404845e521116419079ae78239090
-DIST mtools-4.0.22.tar.bz2 431185 BLAKE2B 19b6ed58fd44e51eba11799347590f8c36fe2de7cbb2b612c0f16f4f35c916331abf19b8ca9a735fcc627db5180b1f8cbf355e25319af8587a0de033d50a6e79 SHA512 9a35a27c6de768e3e925d9163aeb8b021620de9016cf12666ee0259cbfc87fa7a8d0311fc0a77c04dbef8bd3e8d86c747069a9aca2f5df69e6391c3cf5a0b113
 DIST mtools-4.0.23.tar.bz2 418592 BLAKE2B 442f552087a5d53ef0ead6161cdad7997dc45a3e210c2cb442a8b2ba42866152f93e4a1f5b58df8d68316168374ea034b390bcf4c607ac3a1c477c4ec5e7842c SHA512 c8c48adedc3f3e4eeafead27ce80172c9cb9690b575618842001ed16aa0011dcd2bc517882ea4bf01a73810ba151aa4b86f8ce2f97d6e8a0177d09be71a6d1ed
+DIST mtools-4.0.24.tar.bz2 418178 BLAKE2B 96ccbde0e5ed5e304c73c7faaeb495751c43ae37970e5c2329299e0f7bf90f3a810f4ca95faea10a00e5af110be579a3b083043314e980bb0128226caffb5608 SHA512 b74becc4f696315cfabc016d1746e744b43e366de73bf1bffeec4fbab1e4815967594de8acb4af01f89d36a925f93672efbac205b89540161bd53ab7edebcf04
 EBUILD mtools-4.0.18-r2.ebuild 1440 BLAKE2B db5974fd44a2d94c73ff4a255f58b06daba7fd25479ed48357d06e5bf8592bebc6d7ab6add898b1537e500ef1b1531658525cf29d8a0cbe8f7476c0bed769faa SHA512 074e1aad4fba2b1533f8abf7bce994fb34004838f7be900abd81bf0574a278584ec3fc5e53357044a5f92a241eacd55d9b1b97b0efabde4b721a9b7f082387e2
-EBUILD mtools-4.0.22.ebuild 1176 BLAKE2B 42a45ea06a2bf5fe74c1d6fa47c86e8e91e73d346402af048a38db615a6c14db7ec653c75434b78005b846d34dc3e0abc1aa1aeda4aa9c9359a45ea4308679e3 SHA512 11bdc175dec70777e982f81663e078f1bd8af4db1d59ffa25635b54cf51a5872953f61155cfaca8e88e13653015bef36c1921e7d419ee7ff62a6021ae9053195
-EBUILD mtools-4.0.23.ebuild 1176 BLAKE2B 42a45ea06a2bf5fe74c1d6fa47c86e8e91e73d346402af048a38db615a6c14db7ec653c75434b78005b846d34dc3e0abc1aa1aeda4aa9c9359a45ea4308679e3 SHA512 11bdc175dec70777e982f81663e078f1bd8af4db1d59ffa25635b54cf51a5872953f61155cfaca8e88e13653015bef36c1921e7d419ee7ff62a6021ae9053195
+EBUILD mtools-4.0.23.ebuild 1171 BLAKE2B 7b5603db7542d25f187158aae1bc5cc798368ca25059e4bbf5a3dd7217b049f47bae48de397d4a675a2f2128ec311a582cccb8cff0596ded00a637cd5da4a9e7 SHA512 632df381993fc2622ac64ab296c6d0b5249ec3f1e02a4c2db91f5157524b74265f1f1254d88a6398c49d9eec8f2f597bb447d4e0a40f7d408a792ecdf4ab4354
+EBUILD mtools-4.0.24.ebuild 1051 BLAKE2B 8bace5704234712bffd3c88ffce51534a6a141caa283501cf6599a96d0e6b99ae7bc40543ea064bb8385900e4bb6623c0005b8bde0b9a3beec510bd9cbbd8f01 SHA512 4ed910c39dd8683b28a2238e46bf015329a36f516761c486f9dfc987c919e8e3780270de173885b97eb9455232639d5dc1d83da5a24bfcffdeedb2bc637700c4
 MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/mtools-4.0.23.ebuild b/sys-fs/mtools/mtools-4.0.23.ebuild
index 421b835ea123..03496c70b5bc 100644
--- a/sys-fs/mtools/mtools-4.0.23.ebuild
+++ b/sys-fs/mtools/mtools-4.0.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="X elibc_glibc"
 
 RDEPEND="
diff --git a/sys-fs/mtools/mtools-4.0.22.ebuild b/sys-fs/mtools/mtools-4.0.24.ebuild
index 421b835ea123..a10154dee9ba 100644
--- a/sys-fs/mtools/mtools-4.0.22.ebuild
+++ b/sys-fs/mtools/mtools-4.0.24.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="X elibc_glibc"
 
 RDEPEND="
@@ -25,13 +25,6 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	default
-
-	# Don't throw errors on existing directories
-	sed -i -e "s:mkdir:mkdir -p:" mkinstalldirs || die
-}
-
 src_configure() {
 	# 447688
 	use !elibc_glibc && use !elibc_musl && append-libs "-liconv"
@@ -50,5 +43,5 @@ src_install() {
 	doins mtools.conf
 
 	# default is fine
-	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED%/}"/etc/mtools/mtools.conf || die
+	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
 }