9 files changed, 254 insertions, 241 deletions
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index ce77ff44bca0..5f8bd763509d 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,4 +1,3 @@
-DIST Img-Source-1.4.7.tar.gz 7259144 BLAKE2B 48794a21564864c5b20953d1504acde5512be4aaa8db0834f63b15431af0bfa8bb2050f241e7b2d9b383480b59e17567f26f45c91e9f9a7fc58600cfe6ef6595 SHA512 6a395d6263e2f46151d0d3f5c6044d87a933617981200d2663328b8c7993b8a3aacba45568cee7aa2f5d8c8d020cb63956179aab5147d25d91b8834c0dfa4b9d
-DIST tkimg-1.4-patchset-1.tar.xz 17956 BLAKE2B f6d3e5e5f258434bd02e21271357f2e2013ce7c90f2d1862e8e7ac0f1cf235d39b1713434a00261ec442c1843a70194b4d14081a5d4cec07c8ad6bf45bbf1db3 SHA512 bd20e0beaa224c42e856e6d44d86c2a5f04c28d096c561f44c4afcf8c821bf859c602156a9be60f23f906e8da2f43c89ca358d32e8f9497296e7c5a5bf23ed69
-DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5 SHA512 596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8
-DIST tkimg1.4.tar.bz2 4912894 BLAKE2B 630ce6b95f42f0883373970ff919493d34cf4a61119af9520702079c6272f9b6ddbc6241197b39ac509d9b2c76c6f3d3bd29944acea4cdc1c82134cba473818a SHA512 b03aba6e21e35b8733dbc4fa66fae67284a05e68248e5afb2a85c1520c74d0c6c5091860a3ab682f4a662a318c562339e9b7b82f050e63bbf48d1b4757d379a1
+DIST Img-1.4.15-Source.tar.gz 12108837 BLAKE2B b423457f7edceeff38389644e206f2a96204d5f3202a5eb224d9f9a3e4fd2a031c6efb9b53ed72a53441b4d306f4bcdc3ece5d7a08b19e478ed2c74ad66d870e SHA512 f034f7b1cf8b02e0fb80f723927c8512ca67de661b21ee53ea4cf0ec8c09a151466fae0e90395f140834e46e4c231dbce8fefaf870fab41c9dd5a1995fe0d978
+DIST Img-1.4.16-Source.tar.gz 12129708 BLAKE2B 5da76a42a1643d759d765ade01a8a9e9782cba21d30f5ec95693364d80aca32fa54f610081833d44bf5723e6901d7577e93bd4d4285880e855e835ae6a901f4b SHA512 622549749d41c7c026053cf82b4c434602ff541b9ee7f6f15c2450fcf3cfb34eb8277432267c78adc3dcc60e53fa2d84b7cf98c5fd5a6c3cfbcf0f60746cd227
+DIST tkimg-1.4.14-patchset-1.tar.gz 3256 BLAKE2B 8f182365b70b4d7a3f4d9002618285b11293644755304600d302fbb8cf8945cd4bd4eb45e66ed0aec93d19e42556ef294508587f7d4e66821ad960ea5c26c7b6 SHA512 8c93e2b669b56ce5621a4d6d96e7412f623bd42dd777a99ec74741621a5be84f24f47149efae58baa874f49088b053b8466d16dffd79edf9594195ff41c38c0e
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch b/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch
deleted file mode 100644
index 23000ac7922c..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix build with jpeg-9, bug #520886
-
---- a/jpeg/jpeg.c	2010-06-17 15:40:24.000000000 +0200
-+++ b/jpeg/jpeg.c	2018-02-07 23:26:38.050073397 +0100
-@@ -53,6 +53,13 @@
-  */
- 
- #include "tkimg.h"
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+#define HAVE_BOOLEAN
- #include "jpegtcl.h"
- 
- static int SetupJPegLibrary(Tcl_Interp *interp);
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-png2.patch b/dev-tcltk/tkimg/files/tkimg-1.4-png2.patch
deleted file mode 100644
index 195e9be43fa7..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4-png2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- png/png.c.orig	2010-06-17 06:40:24.000000000 -0700
-+++ png/png.c	2013-04-23 20:57:32.000000000 -0700
-@@ -332,6 +332,16 @@
- 	png_set_expand(png_ptr);
-     }
- 
-+    if (png_get_sRGB && png_get_sRGB(png_ptr, info_ptr, &intent)) {
-+	png_set_sRGB(png_ptr, info_ptr, intent);
-+    } else if (png_get_gAMA) {
-+	double gamma;
-+	if (!png_get_gAMA(png_ptr, info_ptr, &gamma)) {
-+	    gamma = 0.45455;
-+	}
-+	png_set_gamma(png_ptr, 1.0, gamma);
-+    }
-+
-     png_read_update_info(png_ptr,info_ptr);
-     block.pixelSize = png_get_channels(png_ptr, info_ptr);
-     block.pitch = png_get_rowbytes(png_ptr, info_ptr);
-@@ -353,16 +363,6 @@
- 	block.offset[3] = 0;
-     }
- 
--    if (png_get_sRGB && png_get_sRGB(png_ptr, info_ptr, &intent)) {
--	png_set_sRGB(png_ptr, info_ptr, intent);
--    } else if (png_get_gAMA) {
--	double gamma;
--	if (!png_get_gAMA(png_ptr, info_ptr, &gamma)) {
--	    gamma = 0.45455;
--	}
--	png_set_gamma(png_ptr, 1.0, gamma);
--    }
--
-     png_data= (char **) ckalloc(sizeof(char *) * info_height +
- 	    info_height * block.pitch);
- 
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.15-gcc11.patch b/dev-tcltk/tkimg/files/tkimg-1.4.15-gcc11.patch
new file mode 100644
index 000000000000..72f529482709
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.15-gcc11.patch
@@ -0,0 +1,10 @@
+--- a/tiff/tiffZip.c	2023-03-14 19:04:42.869354563 +0100
++++ b/tiff/tiffZip.c	2023-03-14 19:05:14.768849607 +0100
+@@ -22,6 +22,7 @@
+  * OF THIS SOFTWARE.
+  */
+ 
++#include <stdint.h>
+ #include "tiffInt.h"
+ 
+ /*
diff --git a/dev-tcltk/tkimg/metadata.xml b/dev-tcltk/tkimg/metadata.xml
index b1e9347d617c..122ac3cdb818 100644
--- a/dev-tcltk/tkimg/metadata.xml
+++ b/dev-tcltk/tkimg/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>tcltk@gentoo.org</email>
 		<name>Gentoo Tcltk Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		The "Img" package adds a lot of image formats to Tcl/Tk.
-	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">tkimg</remote-id>
 	</upstream>
diff --git a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
deleted file mode 100644
index 155c4483e327..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib prefix toolchain-funcs virtualx
-
-MYP="${PN}${PV}"
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://tkimg.sourceforge.net/"
-SRC_URI="
-	https://dev.gentoo.org/~jlec/distfiles/${P}-patchset-1.tar.xz
-	mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2"
-
-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 )"
-
-# Fails with jpeg-turbo silently, #386253
-#RESTRICT="test"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${P}-jpeg.patch \
-		"${FILESDIR}"/${P}-jpeg-9.patch \
-		"${WORKDIR}"/${P}-tiff.patch \
-		"${WORKDIR}"/${P}-png.patch \
-		"${FILESDIR}"/${P}-png2.patch \
-		"${WORKDIR}"/${P}-zlib.patch
-
-	find compat/{libjpeg,libpng,zlib,libtiff} -delete
-
-	sed \
-		-e 's:-O2 -fomit-frame-pointer::g' \
-		-e 's: -pipe::g' \
-		-i */configure  || die
-
-	eprefixify */*.h
-	tc-export AR
-}
-
-src_test() {
-	Xemake test || die "Xmake failed"
-}
-
-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 Img1.4/${bl} /usr/$(get_libdir)/${bl}
-	done
-
-	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins demo.tcl
-		insinto /usr/share/doc/${PF}/html
-		doins -r doc/*
-	fi
-}
diff --git a/dev-tcltk/tkimg/tkimg-1.4.15.ebuild b/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
new file mode 100644
index 000000000000..e3a36d80e9df
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools edos2unix 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="https://downloads.sourceforge.net/${PN}/${PN}/$(ver_cut 1-2)/${PN}%20${PV}/${MYP}.tar.gz
+	https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.14-patchset-1.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="doc test static-libs"
+
+RDEPEND="
+	dev-lang/tk:=
+	dev-tcltk/tcllib
+	media-libs/tiff:=
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+	x11-libs/libX11
+	media-libs/libjpeg-turbo:="
+DEPEND="${RDEPEND}
+	test? (
+		x11-apps/xhost
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+	"${WORKDIR}"/patchset-1
+	"${FILESDIR}"/${P}-gcc11.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	stat64 # used to test for Large File Support
+	glBegin # used to test for openGL support
+	glutMainLoop # used to test for glut support
+)
+
+src_prepare() {
+	edos2unix \
+		libjpeg/jpegtclDecls.h \
+		zlib/zlibtclDecls.h \
+		libpng/pngtclDecls.h \
+		tiff/tiffZip.c \
+		tiff/tiffPixar.c \
+		libtiff/tifftclDecls.h
+
+	# libtiff/jpeg unbundle is problematic
+	rm ../patchset-1/tkimg-1.4.12-tiff.patch || die
+	rm ../patchset-1/tkimg-1.4.10-jpeg.patch || die
+
+	default
+
+	echo "unknown" > manifest.uuid || die
+
+	find compat/libtiff/config -name ltmain.sh -delete || die
+	sed -i \
+		-e 's:"--with-CC=$TIFFCC"::' \
+		libtiff/configure.ac || 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 compat/libtiff ; do
+		(cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf)
+	done
+
+	eprefixify */*.h
+	tc-export AR
+}
+
+src_configure() {
+	default
+
+	sed -i \
+		-e "/PACKAGE_/d" \
+		libtiff/libtiff/tif_config.h \
+		|| die
+}
+
+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.16.ebuild b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
new file mode 100644
index 000000000000..1b25010cff74
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edos2unix prefix toolchain-funcs virtualx
+
+MYP=Img-${PV}
+
+DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
+HOMEPAGE="http://tkimg.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/$(ver_cut 1-2)/${PN}%20${PV}/${MYP}-Source.tar.gz
+	https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.14-patchset-1.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test static-libs"
+
+RDEPEND="
+	dev-lang/tk:=
+	dev-tcltk/tcllib
+	media-libs/tiff:=
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+	x11-libs/libX11
+	media-libs/libjpeg-turbo:="
+DEPEND="${RDEPEND}
+	test? (
+		x11-apps/xhost
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+	"${WORKDIR}"/patchset-1
+	"${FILESDIR}"/${PN}-1.4.15-gcc11.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	opendir64 rewinddir64 closedir64 stat64 # used on AIX
+	glBegin # used to test for openGL support
+	glutMainLoop # used to test for glut support
+)
+
+src_prepare() {
+	edos2unix \
+		libjpeg/jpegtclDecls.h \
+		zlib/zlibtclDecls.h \
+		libpng/pngtclDecls.h \
+		tiff/tiffZip.c \
+		tiff/tiffPixar.c \
+		libtiff/tifftclDecls.h
+
+	# libtiff/jpeg unbundle is problematic
+	rm ../patchset-1/tkimg-1.4.12-tiff.patch || die
+	rm ../patchset-1/tkimg-1.4.10-jpeg.patch || die
+
+	default
+
+	echo "unknown" > manifest.uuid || die
+
+	find compat/libtiff/config -name ltmain.sh -delete || die
+	sed -i \
+		-e 's:"--with-CC=$TIFFCC"::' \
+		libtiff/configure.ac || 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 compat/libtiff ; do
+		(cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf)
+	done
+
+	eprefixify */*.h
+	tc-export AR
+}
+
+src_configure() {
+	default
+
+	sed -i \
+		-e "/PACKAGE_/d" \
+		libtiff/libtiff/tif_config.h \
+		|| die
+}
+
+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.7.ebuild
deleted file mode 100644
index 7166b8609063..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib prefix toolchain-funcs virtualx
-
-MYP=Img-Source-$PV
-
-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"
-
-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 )"
-
-# Fails tests
-RESTRICT="test"
-
-S="${WORKDIR}/${MYP}"
-
-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
-)
-
-src_prepare() {
-	default
-	find . -name configure -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)
-	done
-
-	find compat/{libjpeg,libpng,zlib,libtiff} -delete
-
-	eprefixify */*.h
-	tc-export AR
-}
-
-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 Img1.4/${bl} /usr/$(get_libdir)/${bl}
-	done
-
-	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins demo.tcl
-		insinto /usr/share/doc/${PF}/html
-		doins -r doc/*
-	fi
-}