1 |
commit: b18643fc6c64a8731d43b173915521d53958b102 |
2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 16 18:57:38 2022 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 16 18:57:38 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b18643fc |
7 |
|
8 |
dev-tcltk/tkimg: deprecated virtual/jpeg |
9 |
|
10 |
remove olds |
11 |
|
12 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
13 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
14 |
|
15 |
dev-tcltk/tkimg/Manifest | 3 - |
16 |
dev-tcltk/tkimg/tkimg-1.4.11.ebuild | 98 -------------------- |
17 |
dev-tcltk/tkimg/tkimg-1.4.12.ebuild | 103 --------------------- |
18 |
...{tkimg-1.4.13.ebuild => tkimg-1.4.13-r1.ebuild} | 2 +- |
19 |
4 files changed, 1 insertion(+), 205 deletions(-) |
20 |
|
21 |
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest |
22 |
index 333af997c684..e526bed615b5 100644 |
23 |
--- a/dev-tcltk/tkimg/Manifest |
24 |
+++ b/dev-tcltk/tkimg/Manifest |
25 |
@@ -1,7 +1,4 @@ |
26 |
-DIST Img-1.4.11-Source.tar.gz 7610956 BLAKE2B f461ddb07681c15ca68f8a023808c1c9aec63eefe434c46e09b22f48025b3ec4b095fa44092e30799af3a0435562fd1917613a7ed3f9612d166014cd34834142 SHA512 792223fdb310370937669ef537662947f087131a001281e8923095892b585354690612a339d03f3939b91870016256c37e41aa6305db70e8db1b5ab590610751 |
27 |
-DIST Img-1.4.12-Source.tar.gz 8363871 BLAKE2B ba33908be9d44979e6f97c9194dde6ba30fe15593d80fe47cfad22d1d9e81a9e2ca3f2f19adf2c851fb89ad543f28be7e519ed822d3497b073ec93525272e60b SHA512 40602443657c7c0c7196cfad73ca83e3e473c9d08a1f378a6371a61a8eb98dd90ad8cf9aaf4c54fe6388d4abd969b2643029453871dee6dbcf909fa85b039a1a |
28 |
DIST Img-1.4.13-Source.tar.gz 8366556 BLAKE2B 9e9ddeb5681300fdb320a7f428cf1c30bccee51c9b204690c82f37a72283e1f5300227463d878eb9aa3ea92ddab666d1e8aa4e51bf8fbf219058109b8c76432f SHA512 922d22a664a1cab06932361a25d26c23f282037eb342dcc96a60c5a40f40d7e546ce6154d56552a7722c071a004c12a45cc687fc8e139f3edd3a7c7443f3861b |
29 |
DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b SHA512 c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9 |
30 |
-DIST tkimg-1.4.11-patchset-1.tar.gz 9864 BLAKE2B bee2ddd4b0ada51f9aeffc1e4ddcb9ea2d3fec37eccdaf9a1d26551e7e2dd01a466cad91ea33635ce674261d92fc1dc1fa80f3d19dffd92bb5f9bb5425820318 SHA512 013a70826c5a7b083479e6a4cb56421384400dda9ca05b7216b877b9a79d009ee0f80db25c0b0e51b05904b7d74f4d0220cdb92e819404422743c06a1199245f |
31 |
DIST tkimg-1.4.12-patchset-1.tar.gz 3494 BLAKE2B 3b172f4a5cae4d9ee0668957a5991317e4ae882f450335412488fd408971717facb0c1e1760dc55c20b14e315246017975699d3c1ff9968c3f8182198d85c62a SHA512 a9b9d9b7d0a1faeb7da02a5c7f2ee363e4cb68914ec5c39867ab6ee35b6df988e36d653536b48512361d3a0130c38683f72bb6a76a251820d8689398de3e73ee |
32 |
DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5 SHA512 596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8 |
33 |
|
34 |
diff --git a/dev-tcltk/tkimg/tkimg-1.4.11.ebuild b/dev-tcltk/tkimg/tkimg-1.4.11.ebuild |
35 |
deleted file mode 100644 |
36 |
index aeaed13849ef..000000000000 |
37 |
--- a/dev-tcltk/tkimg/tkimg-1.4.11.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,98 +0,0 @@ |
40 |
-# Copyright 1999-2021 Gentoo Authors |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
- |
43 |
-EAPI=7 |
44 |
- |
45 |
-inherit autotools edos2unix prefix toolchain-funcs |
46 |
- |
47 |
-MYP=Img-${PV}-Source |
48 |
- |
49 |
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk" |
50 |
-HOMEPAGE="http://tkimg.sourceforge.net/" |
51 |
-SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz |
52 |
- https://dev.gentoo.org/~tupone/distfiles/${P}-patchset-1.tar.gz" |
53 |
- |
54 |
-LICENSE="BSD" |
55 |
-SLOT="0" |
56 |
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
57 |
-IUSE="doc test static-libs" |
58 |
- |
59 |
-RDEPEND=" |
60 |
- dev-lang/tk:= |
61 |
- >=dev-tcltk/tcllib-1.11 |
62 |
- media-libs/tiff:0= |
63 |
- >=media-libs/libpng-1.6:0= |
64 |
- >=sys-libs/zlib-1.2.7:= |
65 |
- x11-libs/libX11 |
66 |
- virtual/jpeg:=" |
67 |
-DEPEND="${RDEPEND} |
68 |
- test? ( |
69 |
- x11-apps/xhost |
70 |
- media-fonts/font-misc-misc |
71 |
- media-fonts/font-cursor-misc )" |
72 |
- |
73 |
-# Fails tests |
74 |
-RESTRICT="test" |
75 |
- |
76 |
-S="${WORKDIR}/Img-${PV}" |
77 |
- |
78 |
-PATCHES=( "${WORKDIR}"/patchset-1 ) |
79 |
- |
80 |
-src_prepare() { |
81 |
- edos2unix \ |
82 |
- libjpeg/jpegtclDecls.h \ |
83 |
- libjpeg/Makefile.in \ |
84 |
- zlib/Makefile.in \ |
85 |
- zlib/zlibtcl.decls \ |
86 |
- zlib/zlibtclDecls.h \ |
87 |
- libpng/Makefile.in \ |
88 |
- libpng/pngtclDecls.h \ |
89 |
- libtiff/Makefile.in \ |
90 |
- libtiff/tifftclDecls.h \ |
91 |
- libtiff/tifftclStubInit.c \ |
92 |
- tiff/tiff.c \ |
93 |
- jpeg/jpeg.c |
94 |
- |
95 |
- default |
96 |
- |
97 |
- find . -name configure -delete || die |
98 |
- find compat/{libjpeg,libpng,zlib,libtiff} -delete || die |
99 |
- |
100 |
- eautoreconf |
101 |
- |
102 |
- for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\ |
103 |
- ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do |
104 |
- (cd ${dir}; eautoreconf) |
105 |
- done |
106 |
- |
107 |
- eprefixify */*.h |
108 |
- tc-export AR |
109 |
-} |
110 |
- |
111 |
-src_install() { |
112 |
- local l bl |
113 |
- |
114 |
- emake \ |
115 |
- DESTDIR="${D}" \ |
116 |
- INSTALL_ROOT="${D}" \ |
117 |
- install |
118 |
- |
119 |
- if ! use static-libs; then |
120 |
- find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || die |
121 |
- fi |
122 |
- |
123 |
- # Make library links |
124 |
- for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do |
125 |
- bl=$(basename ${l}) |
126 |
- dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl} |
127 |
- done |
128 |
- |
129 |
- dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE |
130 |
- |
131 |
- if use doc; then |
132 |
- docompress -x usr/share/doc/${PF}/demo.tcl |
133 |
- dodoc demo.tcl |
134 |
- docinto html |
135 |
- dodoc -r doc/* |
136 |
- fi |
137 |
-} |
138 |
|
139 |
diff --git a/dev-tcltk/tkimg/tkimg-1.4.12.ebuild b/dev-tcltk/tkimg/tkimg-1.4.12.ebuild |
140 |
deleted file mode 100644 |
141 |
index 68c860a32fa1..000000000000 |
142 |
--- a/dev-tcltk/tkimg/tkimg-1.4.12.ebuild |
143 |
+++ /dev/null |
144 |
@@ -1,103 +0,0 @@ |
145 |
-# Copyright 1999-2021 Gentoo Authors |
146 |
-# Distributed under the terms of the GNU General Public License v2 |
147 |
- |
148 |
-EAPI=7 |
149 |
- |
150 |
-inherit autotools edos2unix prefix toolchain-funcs virtualx |
151 |
- |
152 |
-MYP=Img-${PV}-Source |
153 |
- |
154 |
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk" |
155 |
-HOMEPAGE="http://tkimg.sourceforge.net/" |
156 |
-SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz |
157 |
- https://dev.gentoo.org/~tupone/distfiles/${P}-patchset-1.tar.gz" |
158 |
- |
159 |
-LICENSE="BSD" |
160 |
-SLOT="0" |
161 |
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
162 |
-IUSE="doc test static-libs" |
163 |
- |
164 |
-RDEPEND=" |
165 |
- dev-lang/tk:= |
166 |
- >=dev-tcltk/tcllib-1.11 |
167 |
- media-libs/tiff:0= |
168 |
- >=media-libs/libpng-1.6:0= |
169 |
- >=sys-libs/zlib-1.2.7:= |
170 |
- x11-libs/libX11 |
171 |
- virtual/jpeg:=" |
172 |
-DEPEND="${RDEPEND} |
173 |
- test? ( |
174 |
- x11-apps/xhost |
175 |
- media-fonts/font-misc-misc |
176 |
- media-fonts/font-cursor-misc )" |
177 |
- |
178 |
-S="${WORKDIR}/Img-${PV}" |
179 |
- |
180 |
-PATCHES=( |
181 |
- "${WORKDIR}"/patchset-1 |
182 |
-) |
183 |
- |
184 |
-src_prepare() { |
185 |
- edos2unix \ |
186 |
- libjpeg/jpegtclDecls.h \ |
187 |
- libjpeg/Makefile.in \ |
188 |
- zlib/Makefile.in \ |
189 |
- zlib/zlibtcl.decls \ |
190 |
- zlib/zlibtclDecls.h \ |
191 |
- libpng/Makefile.in \ |
192 |
- libpng/pngtclDecls.h \ |
193 |
- libtiff/Makefile.in \ |
194 |
- libtiff/tifftclDecls.h \ |
195 |
- libtiff/tifftclStubInit.c \ |
196 |
- tiff/tiff.c \ |
197 |
- jpeg/jpeg.c |
198 |
- |
199 |
- default |
200 |
- |
201 |
- find compat/libtiff/config -name ltmain.sh -delete || die |
202 |
- |
203 |
- #rm -r compat/{libjpeg,libpng,zlib} || die |
204 |
- |
205 |
- eautoreconf |
206 |
- |
207 |
- local dir |
208 |
- for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\ |
209 |
- ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do |
210 |
- (cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf) |
211 |
- done |
212 |
- |
213 |
- eprefixify */*.h |
214 |
- tc-export AR |
215 |
-} |
216 |
- |
217 |
-src_test() { |
218 |
- virtx default |
219 |
-} |
220 |
- |
221 |
-src_install() { |
222 |
- local l bl |
223 |
- |
224 |
- emake \ |
225 |
- DESTDIR="${D}" \ |
226 |
- INSTALL_ROOT="${D}" \ |
227 |
- install |
228 |
- |
229 |
- if ! use static-libs; then |
230 |
- find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || die |
231 |
- fi |
232 |
- |
233 |
- # Make library links |
234 |
- for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do |
235 |
- bl=$(basename ${l}) |
236 |
- dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl} |
237 |
- done |
238 |
- |
239 |
- dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE |
240 |
- |
241 |
- if use doc; then |
242 |
- docompress -x usr/share/doc/${PF}/demo.tcl |
243 |
- dodoc demo.tcl |
244 |
- docinto html |
245 |
- dodoc -r doc/* |
246 |
- fi |
247 |
-} |
248 |
|
249 |
diff --git a/dev-tcltk/tkimg/tkimg-1.4.13.ebuild b/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild |
250 |
similarity index 98% |
251 |
rename from dev-tcltk/tkimg/tkimg-1.4.13.ebuild |
252 |
rename to dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild |
253 |
index 1c8ec49d4031..1c0e9a4c3422 100644 |
254 |
--- a/dev-tcltk/tkimg/tkimg-1.4.13.ebuild |
255 |
+++ b/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild |
256 |
@@ -24,7 +24,7 @@ RDEPEND=" |
257 |
media-libs/libpng:0= |
258 |
sys-libs/zlib:= |
259 |
x11-libs/libX11 |
260 |
- virtual/jpeg:=" |
261 |
+ media-libs/libjpeg-turbo:=" |
262 |
DEPEND="${RDEPEND} |
263 |
test? ( |
264 |
x11-apps/xhost |