dev-tcltk/tkimg: add 1.4.16, drop 1.4.9, 1.4.13

Signed-off-by: Alfredo Tupone <tupone@gentoo.org>

6 files changed, 33 insertions, 158 deletions

diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 855dd78a5a97..7391afe1f2f9 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,7 +1,4 @@
-DIST Img-1.4.13-Source.tar.gz 8366556 BLAKE2B 9e9ddeb5681300fdb320a7f428cf1c30bccee51c9b204690c82f37a72283e1f5300227463d878eb9aa3ea92ddab666d1e8aa4e51bf8fbf219058109b8c76432f SHA512 922d22a664a1cab06932361a25d26c23f282037eb342dcc96a60c5a40f40d7e546ce6154d56552a7722c071a004c12a45cc687fc8e139f3edd3a7c7443f3861b
 DIST Img-1.4.14-Source.tar.gz 9844859 BLAKE2B f373859104c7f1b2d2b5c10adf6b8d3349e22765936916b493589772d2b56e1717cbecf074034989e7e927df16d387ff6533170a1ae9f677ea358a96a86fe67d SHA512 41bfc6909a6836cbdce34f5e5672a02ac67e6d7263a97d48b564994462cc089905a0824444bd849b6d228750bf09f0cf617989dc9008705938a283fa4e5f1b45
 DIST Img-1.4.15-Source.tar.gz 12108837 BLAKE2B b423457f7edceeff38389644e206f2a96204d5f3202a5eb224d9f9a3e4fd2a031c6efb9b53ed72a53441b4d306f4bcdc3ece5d7a08b19e478ed2c74ad66d870e SHA512 f034f7b1cf8b02e0fb80f723927c8512ca67de661b21ee53ea4cf0ec8c09a151466fae0e90395f140834e46e4c231dbce8fefaf870fab41c9dd5a1995fe0d978
-DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b SHA512 c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
-DIST tkimg-1.4.12-patchset-1.tar.gz 3494 BLAKE2B 3b172f4a5cae4d9ee0668957a5991317e4ae882f450335412488fd408971717facb0c1e1760dc55c20b14e315246017975699d3c1ff9968c3f8182198d85c62a SHA512 a9b9d9b7d0a1faeb7da02a5c7f2ee363e4cb68914ec5c39867ab6ee35b6df988e36d653536b48512361d3a0130c38683f72bb6a76a251820d8689398de3e73ee
+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
-DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5 SHA512 596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8
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.13-test.patch b/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch
deleted file mode 100644
index 840e013b6915..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in	2022-02-17 20:34:02.134144390 +0100
-+++ b/Makefile.in	2022-02-17 20:32:31.957625786 +0100
-@@ -109,7 +109,7 @@
- 	do	\
- 		here=`pwd` && \
- 		cd $$sub && \
--		$(MAKE) top_builddir=$$here test || exit $$? && \
-+		$(MAKE) top_builddir=$$here libdir=.. test || exit $$? && \
- 		cd $$here ; \
- 	done
- 
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch b/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch
deleted file mode 100644
index 307dfe314375..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libpng/pngtclDecls.h	2020-04-13 20:16:18.542559383 +0200
-+++ b/libpng/pngtclDecls.h	2020-04-13 20:16:33.921314336 +0200
-@@ -1369,6 +1369,8 @@
- 
- #ifdef __cplusplus
- extern "C" {
-+#else
-+extern
- #endif
- PNG_IMPEXP const PngtclStubs *pngtclStubsPtr;
- #ifdef __cplusplus
diff --git a/dev-tcltk/tkimg/tkimg-1.4.13-r3.ebuild b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
index fea14e66d812..5c282a5cadad 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.13-r3.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools edos2unix prefix toolchain-funcs virtualx
 
-MYP=Img-${PV}-Source
+MYP=Img-${PV}
 
 DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
 HOMEPAGE="http://tkimg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 1-2)/${PN}%20${PV}/${MYP}.tar.gz
-	https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.12-patchset-1.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 1-2)/${P}/${MYP}-Source.tar.gz
+	https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.14-patchset-1.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="
@@ -33,11 +33,17 @@ DEPEND="${RDEPEND}
 
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/Img-${PV}"
+S="${WORKDIR}/${MYP}"
 
 PATCHES=(
 	"${WORKDIR}"/patchset-1
-	"${FILESDIR}"/${P}-test.patch
+	"${FILESDIR}"/${PN}-1.4.15-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() {
@@ -45,10 +51,18 @@ src_prepare() {
 		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"::' \
@@ -56,7 +70,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
+		ppm ps sgi sun tga tiff window xbm xpm dted raw flir compat/libtiff ; do
 		(cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf)
 	done
 
@@ -64,6 +78,15 @@ src_prepare() {
 	tc-export AR
 }
 
+src_configure() {
+	default
+
+	sed -i \
+		-e "/PACKAGE_/d" \
+		libtiff/libtiff/tif_config.h \
+		|| die
+}
+
 src_test() {
 	virtx default
 }
diff --git a/dev-tcltk/tkimg/tkimg-1.4.9-r1.ebuild b/dev-tcltk/tkimg/tkimg-1.4.9-r1.ebuild
deleted file mode 100644
index 6346f9299e7d..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4.9-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools edos2unix prefix toolchain-funcs
-
-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}/$(ver_cut 1-2)/${PN}%20${PV}/${MYP}.tar.gz
-	https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.7-patchset-1.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-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:=
-	>=media-libs/libpng-1.6:=
-	media-libs/libjpeg-turbo:=
-	>=sys-libs/zlib-1.2.7:=
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	test? (
-		x11-apps/xhost
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-
-# Fails tests
-RESTRICT="test"
-
-S="${WORKDIR}/Img-${PV}"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-1.4.7-tclconfig.patch
-	"${WORKDIR}"/${PN}-1.4.7-jpeg.patch
-	"${WORKDIR}"/${PN}-1.4.7-zlib.patch
-	"${WORKDIR}"/${PN}-1.4.7-png.patch
-	"${WORKDIR}"/${PN}-1.4.7-tiff.patch
-	"${FILESDIR}"/${PN}-1.4-jpeg-9.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-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 . -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)
-	done
-
-	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 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
-}