Diff tkimg-1.4.9-r1 with a tkimg-1.4.13-r3

/usr/portage/dev-tcltk/tkimg/tkimg-1.4.13-r3.ebuild 2023-10-09 14:52:30.904368386 +0300
3 3

  
4 4
EAPI=7
5 5

  
6
inherit autotools edos2unix prefix toolchain-funcs
6
inherit autotools edos2unix prefix toolchain-funcs virtualx
7 7

  
8 8
MYP=Img-${PV}-Source
9 9

  
10 10
DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
11 11
HOMEPAGE="http://tkimg.sourceforge.net/"
12 12
SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 1-2)/${PN}%20${PV}/${MYP}.tar.gz
13
	https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.7-patchset-1.tar.xz"
13
	https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.12-patchset-1.tar.gz"
14 14

  
15 15
LICENSE="BSD"
16 16
SLOT="0"
......
19 19

  
20 20
RDEPEND="
21 21
	dev-lang/tk:=
22
	>=dev-tcltk/tcllib-1.11
22
	dev-tcltk/tcllib
23 23
	media-libs/tiff:=
24
	>=media-libs/libpng-1.6:=
25
	media-libs/libjpeg-turbo:=
26
	>=sys-libs/zlib-1.2.7:=
27
	x11-libs/libX11"
24
	media-libs/libpng:0=
25
	sys-libs/zlib:=
26
	x11-libs/libX11
27
	media-libs/libjpeg-turbo:="
28 28
DEPEND="${RDEPEND}
29 29
	test? (
30 30
		x11-apps/xhost
31 31
		media-fonts/font-misc-misc
32 32
		media-fonts/font-cursor-misc )"
33 33

  
34
# Fails tests
35
RESTRICT="test"
34
RESTRICT="!test? ( test )"
36 35

  
37 36
S="${WORKDIR}/Img-${PV}"
38 37

  
39 38
PATCHES=(
40
	"${WORKDIR}"/${PN}-1.4.7-tclconfig.patch
41
	"${WORKDIR}"/${PN}-1.4.7-jpeg.patch
42
	"${WORKDIR}"/${PN}-1.4.7-zlib.patch
43
	"${WORKDIR}"/${PN}-1.4.7-png.patch
44
	"${WORKDIR}"/${PN}-1.4.7-tiff.patch
45
	"${FILESDIR}"/${PN}-1.4-jpeg-9.patch
46
	"${FILESDIR}"/${P}-fno-common.patch
39
	"${WORKDIR}"/patchset-1
40
	"${FILESDIR}"/${P}-test.patch
47 41
)
48 42

  
49 43
src_prepare() {
50 44
	edos2unix \
51 45
		libjpeg/jpegtclDecls.h \
52
		libjpeg/Makefile.in \
53
		zlib/Makefile.in \
54
		zlib/zlibtcl.decls \
55 46
		zlib/zlibtclDecls.h \
56
		libpng/Makefile.in \
57 47
		libpng/pngtclDecls.h \
58
		libtiff/Makefile.in \
59
		libtiff/tifftclDecls.h \
60
		libtiff/tifftclStubInit.c \
61
		tiff/tiff.c \
62
		jpeg/jpeg.c
48
		libtiff/tifftclDecls.h
63 49

  
64 50
	default
65 51

  
66
	find . -name configure -delete || die
67
	find compat/{libjpeg,libpng,zlib,libtiff} -delete || die
52
	find compat/libtiff/config -name ltmain.sh -delete || die
53
	sed -i \
54
		-e 's:"--with-CC=$TIFFCC"::' \
55
		libtiff/configure.ac || die
68 56

  
69 57
	eautoreconf
70 58
	for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
71 59
		ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
72
		(cd ${dir}; eautoreconf)
60
		(cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf)
73 61
	done
74 62

  
75 63
	eprefixify */*.h
76 64
	tc-export AR
77 65
}
78 66

  
67
src_test() {
68
	virtx default
69
}
70

  
79 71
src_install() {
80 72
	local l bl
81 73

  
Thank you!