gentoo resync : 22.05.2021

4 files changed, 9 insertions, 11 deletions

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 399a1708979c..ba5a1e7db82c 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -13,7 +13,7 @@ AUX netpbm-10.86.21-test.patch 331 BLAKE2B 59451b2f1632afdd8e84bcec0ef91e0589604
 DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
 DIST netpbm-10.86.21.tar.xz 3768736 BLAKE2B 19d641f3519f55d737aa6cd22f60847b2b241f71134bc7f9fa558e681cbffb1bff53f16e4d89e7a85b20b86e0bf0f4d9c341dde656ca07a7bc20adc94e811e36 SHA512 caa6c18039be72c47419b3ef60b64e0a04123752beb27bab178adcbb48e5311da05b422205f52c784149bb0636be1e3155e6bbf7703ec5c5775cb9981de1008e
-EBUILD netpbm-10.70.00.ebuild 5373 BLAKE2B bae61227e2fd3e65aa4005e4abb612cbf8e4ab749ff61921c9999eb4fa9203eea7efc9256df0149b47f3877aa2dad9c91a05df774801272e3c467e16ea578fb2 SHA512 b94aeeb1d9c1b7e721708711e1eb5d2bbdfd69692540edd1b79a102c191fb8bad1cc57e6ce18a0ba2e36a417416ddb7ec233381a0ca482cbad8757b90cde5e02
-EBUILD netpbm-10.76.00.ebuild 5261 BLAKE2B 56e5848b5c56ea78e54c7b2d09ef1bf942afe4aa8148ae3b534c8df9db9bae562753b0f1139e681bcc52e9758dedad4fa8ea2a6922260ae301e5607e168683ce SHA512 c75b3a3715371cd535c73811c667cc7c4d97f0e37089c017d769a572d7c716cb9b23a93f7f06f84760e0cd3d2203d6df61165c67533663f5a47f8607cca4d3e0
-EBUILD netpbm-10.86.21.ebuild 5547 BLAKE2B b692572c523bd7840f60e955b584166996bec57629ee1bbf0a8d8a719233d7f5ba65e62c3f8609dc06024a7543f2aacfc793a3742871bcdeda4ee58f086c1b56 SHA512 c00bc6a48866f4e105d40558ae6bcac12f0d9660f1cbbb52efe92cb3dc55fae0489ceb9cf554cdbd433faa634cd92f612c444f4ae9661b18b9d8c8c9c9edba2c
+EBUILD netpbm-10.70.00.ebuild 5382 BLAKE2B 8b5a70217742d7f87b59c16d777b040277cd582929a7ae5fdf3d7ca1287e598e5204d498a4b38cd3e54fd3411bfc2d2ead8cf2ee030ce34f0594d3894ff45f7d SHA512 bca0a73ebb20f6eb7543048c0e34eabf5c8a3652c8b43ab357ba3742b649bd1075ff97c522da910b80e9d9feb8125103eea4df5373b00cf7d44851bd9927c786
+EBUILD netpbm-10.76.00.ebuild 5269 BLAKE2B c94c55e373301f8506a9ee6275865f0702c0bcc5ceeccf2b8433dedf71f99834475dd27ef5328db4c9d9eda5b7a5ce3943cd59e3e19e8e6db22bc35741cbf911 SHA512 a79ddc4ab964ed64e29d644ca33fc0bed01e0c90e96a3aa38d6a6be30039b5cff2dd86f8c5a798982df9e353d286e461ae560e8be6c98e008cfdd345927c611f
+EBUILD netpbm-10.86.21.ebuild 5500 BLAKE2B f87ef16b8f85afce5d4afa89efd0fa3a9f53cc1c0ecc522676e6cd2e8d0428ca0411e7d924363be90c6b98655e480d60d421e22dd3e4a8a683f3190ee99ce2e0 SHA512 6470eab0092d68f273aff46b160d8443769e1d769244c6a8c96665b999ac208cd1dde2efa50de398974a66dc7167d2b1664fa787c0eac319e8fb10b2c0f03b94
 MISC metadata.xml 577 BLAKE2B c70497704f1a34aa7b8bcf905c05560e554957e6350b7c219ea2050815215aa926f4242ae233c9f6b11a1dd9900fcbef0956cb45d50044720769857c15808b4b SHA512 9813c0b3d04c040a54dadbcedb1e88f1d90cbff7001381f7136c84ae3909788423496c7c97242cb989c63bf5127df5196d62e75c503fb2475f14f14cfd3741f0
diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild
index 1824974a3eec..595ad00ef034 100644
--- a/media-libs/netpbm/netpbm-10.70.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.70.00.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit multilib toolchain-funcs
 
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
 HOMEPAGE="http://netpbm.sourceforge.net/"
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index ab3d9c130b38..b27af756a539 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit multilib toolchain-funcs
 
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
 HOMEPAGE="http://netpbm.sourceforge.net/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 BDEPEND="
diff --git a/media-libs/netpbm/netpbm-10.86.21.ebuild b/media-libs/netpbm/netpbm-10.86.21.ebuild
index 342952e16c90..c729f0b7f70f 100644
--- a/media-libs/netpbm/netpbm-10.86.21.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.21.ebuild
@@ -108,13 +108,11 @@ src_prepare() {
 			test/legacy-names.{ok,test} || die
 		sed -i -e '/^$/d' test/legacy-names.ok || die
 	fi
-
-	# avoid ugly depend.mk warnings
-	touch $(find . -name Makefile -exec sed "s:Makefile:depend.mk:g" {} + || die)
 }
 
 src_configure() {
-	cat config.mk.in - >> config.mk <<-EOF || die
+	# cannot chain the die with the heredoc, please check the comment below
+	cat config.mk.in - >> config.mk <<-EOF
 	# Misc crap
 	BUILD_FIASCO = N
 	SYMLINK = ln -sf