4 files changed, 127 insertions, 25 deletions
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 7448f28723d0..ae022d949a47 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 618547838139..b9a9b3d35891 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,11 +1,14 @@
 AUX tkimg-1.4-jpeg-9.patch 364 BLAKE2B bc9b3e4e404b49a9909d7198929033ebee4ab839f1f2ec71aea9435637bdcb6a3f0dd9c2ed379d9e0f7215853b0e693337876ac0842a37b32533151ef4d9b739 SHA512 4bb6cf0b7774700d607bccfb1590660344754749c40acefcba23046333b1029006acede784177473c629ab63247402bbbc4ab172946485af950c5e8ec6abb8c9
 AUX tkimg-1.4.9-fno-common.patch 274 BLAKE2B b3b3ac5c7e849195fe7dbd6a86ad085825799144ddd05b445abe96577e41a52b50665aaf04fc08cf43a3b5d3d3b1a3a5494a59f8297f68036df4c7948d83dc90 SHA512 8599751f097914fa2757fed9599f3df08f6941c3693d4216f5dcb60a4be8bf603c4869b3f55cf12bea2752d77114c7c1cd2890de1b5635a0665a12053117712f
 DIST Img-1.4.11-Source.tar.gz 7610956 BLAKE2B f461ddb07681c15ca68f8a023808c1c9aec63eefe434c46e09b22f48025b3ec4b095fa44092e30799af3a0435562fd1917613a7ed3f9612d166014cd34834142 SHA512 792223fdb310370937669ef537662947f087131a001281e8923095892b585354690612a339d03f3939b91870016256c37e41aa6305db70e8db1b5ab590610751
+DIST Img-1.4.12-Source.tar.gz 8363871 BLAKE2B ba33908be9d44979e6f97c9194dde6ba30fe15593d80fe47cfad22d1d9e81a9e2ca3f2f19adf2c851fb89ad543f28be7e519ed822d3497b073ec93525272e60b SHA512 40602443657c7c0c7196cfad73ca83e3e473c9d08a1f378a6371a61a8eb98dd90ad8cf9aaf4c54fe6388d4abd969b2643029453871dee6dbcf909fa85b039a1a
+DIST Img-1.4.13-Source.tar.gz 8366556 BLAKE2B 9e9ddeb5681300fdb320a7f428cf1c30bccee51c9b204690c82f37a72283e1f5300227463d878eb9aa3ea92ddab666d1e8aa4e51bf8fbf219058109b8c76432f SHA512 922d22a664a1cab06932361a25d26c23f282037eb342dcc96a60c5a40f40d7e546ce6154d56552a7722c071a004c12a45cc687fc8e139f3edd3a7c7443f3861b
 DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b SHA512 c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
-DIST Img-Source-1.4.7.tar.gz 7259144 BLAKE2B 48794a21564864c5b20953d1504acde5512be4aaa8db0834f63b15431af0bfa8bb2050f241e7b2d9b383480b59e17567f26f45c91e9f9a7fc58600cfe6ef6595 SHA512 6a395d6263e2f46151d0d3f5c6044d87a933617981200d2663328b8c7993b8a3aacba45568cee7aa2f5d8c8d020cb63956179aab5147d25d91b8834c0dfa4b9d
 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.7.ebuild 1904 BLAKE2B faba72f6a1b921eb47c64bb6d630838a2a23e7c615ae6dd28860307382fa9dd91c65b580132765534d501a6ecee3b10975ba7a683c0eec62c73dc36b21635dbc SHA512 c6ca2c1dc26c7c986d4126521c52aa0ed8ec6129fb11ec723e6b2c982270c410e4e019ea313bcd7565d096acd97dbfcee93b27de2b8614048511811d5f78366d
+EBUILD tkimg-1.4.12.ebuild 2075 BLAKE2B 902cd22755c6fc14c05bdc1ce01a509ea3185a31391a620016a96b8b23794dd3c08acadcc2958f53acba0d7f43448c8f736f670271e154a249d243c8a1bb81bb SHA512 a4336e504dfdc922aad81d305a8fa41c1eec82caf1733996f3be640cf1dbf90124437c5caedae1e23914d2bc906e4ca9328d917dbc94104f33e295ce70d95ee5
+EBUILD tkimg-1.4.13.ebuild 1868 BLAKE2B 3deac6ac71c835c02f59c076a83465ba6fa21d89af385311d4413f92a14d9838c0cabd7b208ac06e97321f81d966c802e3a6e06a8ab73fecf32b0404e8aa798a SHA512 cb3605baf82f21fa476933581c527a7fb9e75a9ebd48790335d1dd93515acba8eb6bd67ead872a7141004cce1f29fcdb2f60777246d754e082ce5727dd6306cd
 EBUILD tkimg-1.4.9.ebuild 2284 BLAKE2B afb3a90524a9e655b0fc2f11bc484745a1cf6209e135895d46241d085b01ab60b36a6e5e754c57f65d203b3b7f70ab4bc7861aeb17428e8c1c31a7f8834450f2 SHA512 4ac3f4de5890a65af0cbec4271dec9a71055d2d61e645e36437b0b24de492dee32b53b2c279f83a1829f67b20e6d22b424482a301542444542b0693db34ef915
 MISC metadata.xml 328 BLAKE2B 1c2b4dff486d257a50839ff54238b77348694269a1ddd0e24f80a83ea1bbb7661dba26981d24fa299c9252ae4544c438fab85f28f13fe98a66b97d70c784c1e0 SHA512 8c91b67342dfb72a4e464e51213b04064cac7862f9d78283985096aa1a83135ce50647813599591a46b5ea79eecc52238af0d5d7f223bc61bb58b94e0da54089
diff --git a/dev-tcltk/tkimg/tkimg-1.4.12.ebuild b/dev-tcltk/tkimg/tkimg-1.4.12.ebuild
new file mode 100644
index 000000000000..397231bc70a0
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4.12.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils multilib prefix toolchain-funcs virtualx
+
+MYP=Img-${PV}-Source
+
+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"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test static-libs"
+
+RDEPEND="
+	dev-lang/tk:=
+	>=dev-tcltk/tcllib-1.11
+	media-libs/tiff:0=
+	>=media-libs/libpng-1.6:0=
+	>=sys-libs/zlib-1.2.7:=
+	x11-libs/libX11
+	virtual/jpeg:="
+DEPEND="${RDEPEND}
+	test? (
+		x11-apps/xhost
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
+
+S="${WORKDIR}/Img-${PV}"
+
+PATCHES=(
+	"${WORKDIR}"/patchset-1
+)
+
+src_prepare() {
+	edos2unix \
+		libjpeg/jpegtclDecls.h \
+		libjpeg/Makefile.in \
+		zlib/Makefile.in \
+		zlib/zlibtcl.decls \
+		zlib/zlibtclDecls.h \
+		libpng/Makefile.in \
+		libpng/pngtclDecls.h \
+		libtiff/Makefile.in \
+		libtiff/tifftclDecls.h \
+		libtiff/tifftclStubInit.c \
+		tiff/tiff.c \
+		jpeg/jpeg.c
+	default
+	find compat/libtiff/config -name ltmain.sh -delete
+
+	#rm -r compat/{libjpeg,libpng,zlib} || 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; AT_NOELIBTOOLIZE=yes eautoreconf)
+	done
+
+	eprefixify */*.h
+	tc-export AR
+}
+
+src_test() {
+	virtx default
+}
+
+src_install() {
+	local l bl
+
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_ROOT="${D}" \
+		install
+
+	if ! use static-libs; then
+		find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || die
+	fi
+
+	# Make library links
+	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
+		bl=$(basename $l)
+		dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
+	done
+
+	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
+
+	if use doc; then
+		docompress -x usr/share/doc/${PF}/demo.tcl
+		dodoc demo.tcl
+		docinto html
+		dodoc -r doc/*
+	fi
+}
diff --git a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild b/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
index 77643a72c844..bf3fb5a99dfd 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
@@ -1,28 +1,27 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools eutils multilib prefix toolchain-funcs virtualx
 
-MYP=Img-Source-$PV
+MYP=Img-${PV}-Source
 
 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.xz"
-
+	https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.12-patchset-1.tar.gz"
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="
 	dev-lang/tk:=
-	>=dev-tcltk/tcllib-1.11
+	dev-tcltk/tcllib
 	media-libs/tiff:0=
-	>=media-libs/libpng-1.6:0=
-	>=sys-libs/zlib-1.2.7:=
+	media-libs/libpng:0=
+	sys-libs/zlib:=
 	x11-libs/libX11
 	virtual/jpeg:="
 DEPEND="${RDEPEND}
@@ -31,35 +30,37 @@ DEPEND="${RDEPEND}
 		media-fonts/font-misc-misc
 		media-fonts/font-cursor-misc )"
 
-# Fails tests
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/${MYP}"
+S="${WORKDIR}/Img-${PV}"
 
 PATCHES=(
-	"${WORKDIR}"/${P}-tclconfig.patch
-	"${WORKDIR}"/${P}-jpeg.patch
-	"${WORKDIR}"/${P}-zlib.patch
-	"${WORKDIR}"/${P}-png.patch
-	"${WORKDIR}"/${P}-tiff.patch
-	"${FILESDIR}"/${PN}-1.4-jpeg-9.patch
+	"${WORKDIR}"/patchset-1
 )
 
 src_prepare() {
+	edos2unix \
+		libjpeg/jpegtclDecls.h \
+		zlib/zlibtclDecls.h \
+		libpng/pngtclDecls.h \
+		libtiff/tifftclDecls.h
 	default
-	find . -name configure -delete
+	find compat/libtiff/config -name ltmain.sh -delete
+
 	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 ; do
-		(cd $dir; eautoreconf)
+		ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
+		(cd $dir; AT_NOELIBTOOLIZE=yes eautoreconf)
 	done
 
-	find compat/{libjpeg,libpng,zlib,libtiff} -delete
-
 	eprefixify */*.h
 	tc-export AR
 }
 
+src_test() {
+	virtx default
+}
+
 src_install() {
 	local l bl