gentoo resync : 29.12.2022

4 files changed, 2 insertions, 208 deletions

diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 1bd178dd88d9..c2c66f288c69 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,15 +1,10 @@
 AUX tkimg-1.4-jpeg-9.patch 364 BLAKE2B bc9b3e4e404b49a9909d7198929033ebee4ab839f1f2ec71aea9435637bdcb6a3f0dd9c2ed379d9e0f7215853b0e693337876ac0842a37b32533151ef4d9b739 SHA512 4bb6cf0b7774700d607bccfb1590660344754749c40acefcba23046333b1029006acede784177473c629ab63247402bbbc4ab172946485af950c5e8ec6abb8c9
 AUX tkimg-1.4.13-test.patch 313 BLAKE2B eee0540a659b4ec7af738281e14847228cb596344792f7b8e2c9c690ac37212226b2cc5979649626b9729abc75571ca42ab96f41deed71075970b75eec5ca1e1 SHA512 189920d66119f08c8330e501b681717d5737a2c2bbc907294367d75cefadce0354c876135d788d44de5bf90ba199953e9a0a1b41b3c1aec13d45f1e1d74de796
 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 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 2046 BLAKE2B 9d1356c00f9b4ce4aa5db2ee1d0fe2c58f6d18e172a6476bb2a0d30bf075f1180dbd236be8ab9015374acf7ff41d160d060ab8bd4222beb1560ba89c2806d83b SHA512 961f5470074a0b3f7556bff1935de87e162424816a051316acb7c4e053686ae6bfec6e70b433d40bb68d40d9a8081c457756f6d001dfe8ee8069cd939a34cdfa
-EBUILD tkimg-1.4.12.ebuild 2095 BLAKE2B 64510985af5bb5e0977014f3dfb1e58c19a5a3b0971a5b03383a57c868c286e54d8e687e721d0bab82f66217a4f50e30f97d3451e79e7599378bb7192884d7a2 SHA512 a22bb599ca479c09e6fbc94ba4cec529bb04ade65092eb520b620ede9bf0e0ce690aa08aa0cff3c85e90c932bd4d4200823bf933a4828a8a42d03782aaf13e03
-EBUILD tkimg-1.4.13.ebuild 1980 BLAKE2B 81383edcc65bc3423fb192928f690ae206d4660b71565061648a3b7902bef0cf027611cec60c652ba02ef443db40172bda21956f2cd74b4c15650e0f2b3ac68f SHA512 85b6f66884227d9d0aeb1ee15a54d28e323c424c641e938f998045b1e8ff652e8675da2af073a4d5d331e0acf45775175ac477654ce2e701170c682618aae79e
+EBUILD tkimg-1.4.13-r1.ebuild 1992 BLAKE2B d4631bb0d43bddea68dc4cdc452633a2ca803b36f6e1fc020b72119925bcb7a4e7d6c45a1778c12b4aeee03ba8562787e3a6d72aae5df2ec0d1e6dcd65cec8b2 SHA512 83736752c7349d2ff120651f86e94b31870440ca36bf85d5d43faab9256946666a524bb945bc2df3cc5c8c90fc93e60027cb8e9030d18293987c15f73c978f40
 EBUILD tkimg-1.4.9.ebuild 2289 BLAKE2B 1a1dfcee3443ac6e22bf4bda087750bc4356a7d07d2cd95af4d501cdcc5c03d5b2523f4650caece002bbd18692cac6de954fc51801d282e009b2229d48b64fe7 SHA512 e8a89550f0564a32de16471d410b6d9601c67360b49b38dbe034a97115481be0101572996ebee3c0dc921909b923fc42b4e6d3beb7a46c5a48027fc57b3a72d6
 MISC metadata.xml 329 BLAKE2B 53d89f1f85a90a476918fde2904b7be67b22b1793f8d09655b2ca18525cd9f2c49ae2848fe54b4206a49da23a9d9ab54b0750ac5437d0591c306a8311a2c945e SHA512 3a12737d8033b88e6a418f2183c8013e75777f5a15774b11d4d93b4e27360d136ad0ecfc6ff0e5d4097d669542e52e6a1d71114e4c1d1bc63ba45e0f9a0caf7e
diff --git a/dev-tcltk/tkimg/tkimg-1.4.11.ebuild b/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
deleted file mode 100644
index aeaed13849ef..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 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}/1.4/${PN}%20${PV}/${MYP}.tar.gz
-	https://dev.gentoo.org/~tupone/distfiles/${P}-patchset-1.tar.gz"
-
-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: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}/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 . -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
-}
diff --git a/dev-tcltk/tkimg/tkimg-1.4.12.ebuild b/dev-tcltk/tkimg/tkimg-1.4.12.ebuild
deleted file mode 100644
index 68c860a32fa1..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4.12.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 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="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
-	https://dev.gentoo.org/~tupone/distfiles/${P}-patchset-1.tar.gz"
-
-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: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 || 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)
-	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.13.ebuild b/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
index 1c8ec49d4031..1c0e9a4c3422 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	media-libs/libpng:0=
 	sys-libs/zlib:=
 	x11-libs/libX11
-	virtual/jpeg:="
+	media-libs/libjpeg-turbo:="
 DEPEND="${RDEPEND}
 	test? (
 		x11-apps/xhost