gentoo resync : 24.12.2018

3 files changed, 9 insertions, 20 deletions

diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 1d047220df16..e62579a4659a 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.19.tar.bz2 445566 BLAKE2B 2f35eaccb65ba39cb365ecaf1de95cff038370503bcb9dad4dc1bb654d00d1559c7183f8a30538f0fb6ce12332521083eefaa34f4eda9bdc9698cd54a0689fa9 SHA512 8928baa197bb3ad0f5e5b6852bfb1b4220bc50d19527e703025cec98bf9988faba496d91df71b14d936a095cc89ce92ce533abe9adf5fff2602f139cb3c6085a
-DIST mtools-4.0.20.tar.bz2 449835 BLAKE2B 51ee105e57c2cf56acf46d1ea9e0c1a5b89f85916cbd160421ebb992cdfdc7722d257b81cc794cc6d2dbc18728edb6e24c51d460adcb95291021e189a5c0c3e6 SHA512 2b99d2cd86deaa38a47b377ba47c2b88ccb99159085b59db9c2b4f1f9adcfd011f92934419e7b33a634a1ffddf336c8f11229071847ef082fe56b9b91b5f3a36
+DIST mtools-4.0.22.tar.bz2 431185 BLAKE2B 19b6ed58fd44e51eba11799347590f8c36fe2de7cbb2b612c0f16f4f35c916331abf19b8ca9a735fcc627db5180b1f8cbf355e25319af8587a0de033d50a6e79 SHA512 9a35a27c6de768e3e925d9163aeb8b021620de9016cf12666ee0259cbfc87fa7a8d0311fc0a77c04dbef8bd3e8d86c747069a9aca2f5df69e6391c3cf5a0b113
+DIST mtools-4.0.23.tar.bz2 418592 BLAKE2B 442f552087a5d53ef0ead6161cdad7997dc45a3e210c2cb442a8b2ba42866152f93e4a1f5b58df8d68316168374ea034b390bcf4c607ac3a1c477c4ec5e7842c SHA512 c8c48adedc3f3e4eeafead27ce80172c9cb9690b575618842001ed16aa0011dcd2bc517882ea4bf01a73810ba151aa4b86f8ce2f97d6e8a0177d09be71a6d1ed
 EBUILD mtools-4.0.18-r2.ebuild 1442 BLAKE2B 7aaa093e1f1bbc4df2201b1c66044141914cbf49479cbac748026604ead012f986dc5228340448d60aa169023f6f5b7a2d5d826e19bf5e2618059ab8bacdc4af SHA512 32a807769bebeffad14f2a366e5536cb9b055f24cfa3a15508267eb88e4015f33713e8fa338078834942fcfc0d44ac22e15bb3265f45ab96420466ed4c1b77d5
-EBUILD mtools-4.0.19.ebuild 1460 BLAKE2B d4dbeeb9a245221fd74e478a026bd35a618bbcf1a4d33ab9f1ad9dee0264fc77dbc1bbdcd3b9ea78128cfa54fa83c0611f2a3d266853dceb93b987bb7b2dd8bf SHA512 0601d64c3b944d8ee6727a934038addd6a4a24e3710ab4d7c0499541a7944506f35650c74188dc932b848e4c05e124b96f31afab702a1d0726bba94775f37941
-EBUILD mtools-4.0.20.ebuild 1232 BLAKE2B 8e09a9a483a6eaa3028839de1b6f7cb86ffa5aacbe5936828b9551f56dc2d62a9b6868e08bc111768ca1087a405b6acb1278da522303f809998453ef5ce1ee1d SHA512 2510d093f7bcfc8b8545cd1220c840e7d30d976bebc631cec4ac9986085ad7e35e143ef9a469e302206f0bfa15c262db0a00a9650a622f18bd168c823d58cd36
+EBUILD mtools-4.0.22.ebuild 1178 BLAKE2B 3fa2b089538673259b7e6600a841f94b96a116213aa76d31be62951537ce662c8b1d78720c55a6f0c40f8ae4e83261abe2a35cb25d3f76a5160cb23bb7054bef SHA512 ac4561a82fb5d0c6658d9173585dd173f631bd374793ea2c53038b40a7f789e4bc48ae097187303010a5e6cdbd49ab59fa1f1848f342a75d5148a5324a103762
+EBUILD mtools-4.0.23.ebuild 1178 BLAKE2B 3fa2b089538673259b7e6600a841f94b96a116213aa76d31be62951537ce662c8b1d78720c55a6f0c40f8ae4e83261abe2a35cb25d3f76a5160cb23bb7054bef SHA512 ac4561a82fb5d0c6658d9173585dd173f631bd374793ea2c53038b40a7f789e4bc48ae097187303010a5e6cdbd49ab59fa1f1848f342a75d5148a5324a103762
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/mtools/mtools-4.0.20.ebuild b/sys-fs/mtools/mtools-4.0.22.ebuild
index 3dd3d67269f5..651e08e2c962 100644
--- a/sys-fs/mtools/mtools-4.0.20.ebuild
+++ b/sys-fs/mtools/mtools-4.0.22.ebuild
@@ -25,10 +25,6 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.18-memset.patch
-)
-
 src_prepare() {
 	default
 
diff --git a/sys-fs/mtools/mtools-4.0.19.ebuild b/sys-fs/mtools/mtools-4.0.23.ebuild
index 241e6ded35ab..651e08e2c962 100644
--- a/sys-fs/mtools/mtools-4.0.19.ebuild
+++ b/sys-fs/mtools/mtools-4.0.23.ebuild
@@ -23,16 +23,7 @@ RDEPEND="
 		x11-libs/libX11
 		x11-libs/libXt
 	)"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-# texinfo is required because we patch mtools.texi
-# drop it when mtools-4.0.18-locking.patch is no longer applied
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.18-locking.patch # https://crbug.com/508713
-	"${FILESDIR}"/${PN}-4.0.18-attr.patch # https://crbug.com/644387
-	"${FILESDIR}"/${PN}-4.0.18-memset.patch
-)
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
@@ -44,9 +35,11 @@ src_prepare() {
 src_configure() {
 	# 447688
 	use !elibc_glibc && use !elibc_musl && append-libs "-liconv"
-	econf \
-		--sysconfdir="${EPREFIX%/}"/etc/mtools \
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX%/}"/etc/mtools
 		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {