gentoo resync : 28.04.2021

5 files changed, 39 insertions, 26 deletions

diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index a00103335b09..848a26ca137b 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -7,8 +7,8 @@ DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 958956e786cea208f24a30532fa65914439
 DIST tkimg-1.4.11-patchset-1.tar.gz 9864 BLAKE2B bee2ddd4b0ada51f9aeffc1e4ddcb9ea2d3fec37eccdaf9a1d26551e7e2dd01a466cad91ea33635ce674261d92fc1dc1fa80f3d19dffd92bb5f9bb5425820318 SHA512 013a70826c5a7b083479e6a4cb56421384400dda9ca05b7216b877b9a79d009ee0f80db25c0b0e51b05904b7d74f4d0220cdb92e819404422743c06a1199245f
 DIST tkimg-1.4.12-patchset-1.tar.gz 3494 BLAKE2B 3b172f4a5cae4d9ee0668957a5991317e4ae882f450335412488fd408971717facb0c1e1760dc55c20b14e315246017975699d3c1ff9968c3f8182198d85c62a SHA512 a9b9d9b7d0a1faeb7da02a5c7f2ee363e4cb68914ec5c39867ab6ee35b6df988e36d653536b48512361d3a0130c38683f72bb6a76a251820d8689398de3e73ee
 DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5 SHA512 596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8
-EBUILD tkimg-1.4.11.ebuild 2040 BLAKE2B 0aa72930dddd9f8bb41490f9e633e6d20ea4f655ca86930e1d1200c517c179e3a3fac1476a6ed069be8588a41d996c28e5957f94ddd442a74b37eca51332c7c9 SHA512 9d095f694a63b675813170fa41a5fd3f7392d4284a5d08863220656e85254782f7285029a2df4e458c6c1f566fb2141f2496ed8ff03f2b1a04c6ac41f5668e97
-EBUILD tkimg-1.4.12.ebuild 2075 BLAKE2B 902cd22755c6fc14c05bdc1ce01a509ea3185a31391a620016a96b8b23794dd3c08acadcc2958f53acba0d7f43448c8f736f670271e154a249d243c8a1bb81bb SHA512 a4336e504dfdc922aad81d305a8fa41c1eec82caf1733996f3be640cf1dbf90124437c5caedae1e23914d2bc906e4ca9328d917dbc94104f33e295ce70d95ee5
-EBUILD tkimg-1.4.13.ebuild 1941 BLAKE2B ef194efb017783ac70b19a18c9ef30f0ebde7c9f542ccb258acdd85a69c84c16944f0710201a55a88be0fab88f2c14a2cd7f0a764d45e0ec3068e9e74ee863dc SHA512 66a0fc6321572ace5f2f19da9a0491b5306220f77506c3f15ab2eaa0df5160078257282fbfd615c4bd81b3493227a4c2638eaef8b331b07f5f09cf1b55d09413
-EBUILD tkimg-1.4.9.ebuild 2284 BLAKE2B afb3a90524a9e655b0fc2f11bc484745a1cf6209e135895d46241d085b01ab60b36a6e5e754c57f65d203b3b7f70ab4bc7861aeb17428e8c1c31a7f8834450f2 SHA512 4ac3f4de5890a65af0cbec4271dec9a71055d2d61e645e36437b0b24de492dee32b53b2c279f83a1829f67b20e6d22b424482a301542444542b0693db34ef915
+EBUILD tkimg-1.4.11.ebuild 2055 BLAKE2B eea4923baabc82848104c8af84e4dbd80ac2d508be41a6dc9af78a0304de4a2736ad41d7c389c41f0f91b598782c5abaf8ee0e99c1a3f610e93a407c1419934f SHA512 55c051e56561503282d3a3f4c5a49c25be7ead727b937c55e31395b83ac5dc33f7bde64b4566b9effc9be793b017041c4a207a7dd49f2fa0a5dd5ac0c32e1aff
+EBUILD tkimg-1.4.12.ebuild 2095 BLAKE2B 64510985af5bb5e0977014f3dfb1e58c19a5a3b0971a5b03383a57c868c286e54d8e687e721d0bab82f66217a4f50e30f97d3451e79e7599378bb7192884d7a2 SHA512 a22bb599ca479c09e6fbc94ba4cec529bb04ade65092eb520b620ede9bf0e0ce690aa08aa0cff3c85e90c932bd4d4200823bf933a4828a8a42d03782aaf13e03
+EBUILD tkimg-1.4.13.ebuild 1949 BLAKE2B 2ca89bc7b69a914a8735b4fed3a8c59a9d48293f58f84fcbfe4e9f9f2f5373964b581681d179179ed0a533db6878723baa4a0230b909773504cd919f3767f3b2 SHA512 853b1400a07b66d2c1580ca865ac53f0da6ada6b5614e66f962b0bd4a7f14ba1a10e86ca6cdebd70599837cd094cb27d84b78344ffb0bf77b20e987d273e5776
+EBUILD tkimg-1.4.9.ebuild 2298 BLAKE2B acc3214510eab844afb5d23362ff5996aa97701473171b11d0eb8637f62d8a840b5dfa7235b03629d63bb69227acb4c4d4f0b3072dd88032345acbf7bf04dbd0 SHA512 5256febc7a24ac5f3246c1453f892d567520d9b878ef1802c8fca0591dbef85c00d515e537dc3c0b809228c62fbbc71fa33a62fc867d6c301400479964515ecb
 MISC metadata.xml 328 BLAKE2B 1c2b4dff486d257a50839ff54238b77348694269a1ddd0e24f80a83ea1bbb7661dba26981d24fa299c9252ae4544c438fab85f28f13fe98a66b97d70c784c1e0 SHA512 8c91b67342dfb72a4e464e51213b04064cac7862f9d78283985096aa1a83135ce50647813599591a46b5ea79eecc52238af0d5d7f223bc61bb58b94e0da54089
diff --git a/dev-tcltk/tkimg/tkimg-1.4.11.ebuild b/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
index 674cef238a5d..8d8832a91336 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils multilib prefix toolchain-funcs virtualx
+inherit autotools edos2unix prefix toolchain-funcs virtualx
 
 MYP=Img-${PV}-Source
 
@@ -11,8 +11,9 @@ DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
 HOMEPAGE="http://tkimg.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
 	https://dev.gentoo.org/~tupone/distfiles/${P}-patchset-1.tar.gz"
-SLOT="0"
+
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
@@ -51,15 +52,17 @@ src_prepare() {
 		libtiff/tifftclStubInit.c \
 		tiff/tiff.c \
 		jpeg/jpeg.c
+
 	default
-	find . -name configure -delete
 
-	find compat/{libjpeg,libpng,zlib,libtiff} -delete
+	find . -name configure -delete || die
+	find compat/{libjpeg,libpng,zlib,libtiff} -delete || die
 
 	eautoreconf
+
 	for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
 		ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
-		(cd $dir; eautoreconf)
+		(cd ${dir}; eautoreconf)
 	done
 
 	eprefixify */*.h
@@ -80,7 +83,7 @@ src_install() {
 
 	# Make library links
 	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
-		bl=$(basename $l)
+		bl=$(basename ${l})
 		dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
 	done
 
diff --git a/dev-tcltk/tkimg/tkimg-1.4.12.ebuild b/dev-tcltk/tkimg/tkimg-1.4.12.ebuild
index 397231bc70a0..68c860a32fa1 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.12.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils multilib prefix toolchain-funcs virtualx
+inherit autotools edos2unix prefix toolchain-funcs virtualx
 
 MYP=Img-${PV}-Source
 
@@ -11,8 +11,9 @@ DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
 HOMEPAGE="http://tkimg.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
 	https://dev.gentoo.org/~tupone/distfiles/${P}-patchset-1.tar.gz"
-SLOT="0"
+
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
@@ -50,15 +51,19 @@ src_prepare() {
 		libtiff/tifftclStubInit.c \
 		tiff/tiff.c \
 		jpeg/jpeg.c
+
 	default
-	find compat/libtiff/config -name ltmain.sh -delete
+
+	find compat/libtiff/config -name ltmain.sh -delete || die
 
 	#rm -r compat/{libjpeg,libpng,zlib} || die
 
 	eautoreconf
+
+	local dir
 	for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
 		ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
-		(cd $dir; AT_NOELIBTOOLIZE=yes eautoreconf)
+		(cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf)
 	done
 
 	eprefixify */*.h
@@ -83,7 +88,7 @@ src_install() {
 
 	# Make library links
 	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
-		bl=$(basename $l)
+		bl=$(basename ${l})
 		dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
 	done
 
diff --git a/dev-tcltk/tkimg/tkimg-1.4.13.ebuild b/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
index 2ca0ab7549aa..feba8d5b635d 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils multilib prefix toolchain-funcs virtualx
+inherit autotools edos2unix prefix toolchain-funcs virtualx
 
 MYP=Img-${PV}-Source
 
@@ -11,8 +11,9 @@ DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
 HOMEPAGE="http://tkimg.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
 	https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.12-patchset-1.tar.gz"
-SLOT="0"
+
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
@@ -44,8 +45,10 @@ src_prepare() {
 		zlib/zlibtclDecls.h \
 		libpng/pngtclDecls.h \
 		libtiff/tifftclDecls.h
+
 	default
-	find compat/libtiff/config -name ltmain.sh -delete
+
+	find compat/libtiff/config -name ltmain.sh -delete || die
 	sed -i \
 		-e 's:"--with-CC=$TIFFCC"::' \
 		libtiff/configure.ac || die
@@ -53,7 +56,7 @@ src_prepare() {
 	eautoreconf
 	for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
 		ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
-		(cd $dir; AT_NOELIBTOOLIZE=yes eautoreconf)
+		(cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf)
 	done
 
 	eprefixify */*.h
@@ -78,7 +81,7 @@ src_install() {
 
 	# Make library links
 	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
-		bl=$(basename $l)
+		bl=$(basename ${l})
 		dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
 	done
 
diff --git a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
index 666a9ea98036..f4ada05bc3e3 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils multilib prefix toolchain-funcs virtualx
+inherit autotools edos2unix prefix toolchain-funcs virtualx
 
 MYP=Img-${PV}-Source
 
@@ -11,8 +11,9 @@ DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
 HOMEPAGE="http://tkimg.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
 	https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.7-patchset-1.tar.xz"
-SLOT="0"
+
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
@@ -59,15 +60,16 @@ src_prepare() {
 		libtiff/tifftclStubInit.c \
 		tiff/tiff.c \
 		jpeg/jpeg.c
+
 	default
-	find . -name configure -delete
 
-	find compat/{libjpeg,libpng,zlib,libtiff} -delete
+	find . -name configure -delete || die
+	find compat/{libjpeg,libpng,zlib,libtiff} -delete || die
 
 	eautoreconf
 	for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
 		ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
-		(cd $dir; eautoreconf)
+		(cd ${dir}; eautoreconf)
 	done
 
 	eprefixify */*.h
@@ -88,7 +90,7 @@ src_install() {
 
 	# Make library links
 	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
-		bl=$(basename $l)
+		bl=$(basename ${l})
 		dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
 	done