Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/tk/
Date: Sat, 20 Oct 2018 16:11:13
Message-Id: 1540051850.42165e08fae435b4e4e97915d2f724e9e584d9e3.dilfridge@gentoo
1 commit: 42165e08fae435b4e4e97915d2f724e9e584d9e3
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 20 16:10:50 2018 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 20 16:10:50 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42165e08
7
8 dev-lang/tk: Remove old
9
10 Bug: https://bugs.gentoo.org/648570
11 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
12 Package-Manager: Portage-2.3.50, Repoman-2.3.11
13
14 dev-lang/tk/Manifest | 3 -
15 dev-lang/tk/tk-8.6.5-r1.ebuild | 148 -----------------------------------------
16 dev-lang/tk/tk-8.6.5.ebuild | 143 ---------------------------------------
17 dev-lang/tk/tk-8.6.6.ebuild | 148 -----------------------------------------
18 dev-lang/tk/tk-8.6.7.ebuild | 148 -----------------------------------------
19 5 files changed, 590 deletions(-)
20
21 diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
22 index 04b094fe969..ffa1de9db41 100644
23 --- a/dev-lang/tk/Manifest
24 +++ b/dev-lang/tk/Manifest
25 @@ -1,6 +1,3 @@
26 DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568
27 DIST tk8.5.17-src.tar.gz 4095985 BLAKE2B 4cbb140c30ca717ee499b9ad9e1a3df27a470a78613edbaec425c39afaa41d59276bbe487933a4e77a9722fcafa9113b203cf5c828660bdeb38f667c3263c3cd SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f
28 -DIST tk8.6.5-src.tar.gz 4417393 BLAKE2B bff37ac292928095063ebd3131ab8bf9e9d0b075c115c9e9a1f0fe75c2843cae6153b15fc9b964cd16a1251feca13258034d14dadd5fa8967bff6d5fee813f8f SHA512 9acf2ef993a566a7cdd1efe21dc896b09125c65d86df53ab5a78542b21d3f031e9f9d72b81738705636c268b5ce72934c483eb087d5c0114f913c9075db9a3b1
29 -DIST tk8.6.6-src.tar.gz 4273737 BLAKE2B 65b139fffe628439137a02a72af19be0f7c44956d18852f1ce8892349d0fa370281e475fbbe7451da524ab4e74a8c258ee5ee70b8a146bf1ec71e3bf420314a3 SHA512 223c72ab5a6f6040928c56843598b878efafab44ed4152a38e68aa2800f2c181adc50a8bf23279b7d446493eec43854920e8b649b6a34ecdf31ecc07ccc74044
30 -DIST tk8.6.7-src.tar.gz 4282972 BLAKE2B b07102365539ee98e2972a5d3bee2bdee89cb4d3873b05c764810b89f0152b71bd0d14d007434a003cd784868afadf6a2a50deffc0c4596b4551a0be7625fd13 SHA512 adf35991b20878d18a6940cb3d24d821586828537edf6d20f9223f2989d317adbcbb5360f3226014d96fe44e7ec06cfdf434309438c90a09878345b7106c7dd9
31 DIST tk8.6.8-src.tar.gz 4319854 BLAKE2B 167c5dc6c32e49653c04bc067c3d75df022ca230657be32797021b0e2f7748215d9ad0493c8020b8d1be1f005b9b2d561339a6a0b209721c0d05dd222d47d377 SHA512 d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9
32
33 diff --git a/dev-lang/tk/tk-8.6.5-r1.ebuild b/dev-lang/tk/tk-8.6.5-r1.ebuild
34 deleted file mode 100644
35 index aa3bd7ed729..00000000000
36 --- a/dev-lang/tk/tk-8.6.5-r1.ebuild
37 +++ /dev/null
38 @@ -1,148 +0,0 @@
39 -# Copyright 1999-2018 Gentoo Foundation
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=6
43 -
44 -inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx
45 -
46 -MY_P="${PN}${PV/_beta/b}"
47 -
48 -DESCRIPTION="Tk Widget Set"
49 -HOMEPAGE="http://www.tcl.tk/"
50 -SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
51 -
52 -LICENSE="tcltk"
53 -SLOT="0/8.6"
54 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
55 -IUSE="debug +threads truetype aqua xscreensaver"
56 -
57 -RDEPEND="
58 - !aqua? (
59 - >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
60 - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
61 - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
62 - truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
63 - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
64 - )
65 - ~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]"
66 -DEPEND="${RDEPEND}
67 - !aqua? ( x11-base/xorg-proto )"
68 -
69 -# Not bumped to 8.6
70 -#RESTRICT=test
71 -
72 -SPARENT="${WORKDIR}/${MY_P}"
73 -S="${SPARENT}"/unix
74 -
75 -PATCHES=(
76 - "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
77 - "${FILESDIR}"/${PN}-8.5.13-multilib.patch
78 -
79 - "${FILESDIR}"/${PN}-8.4.15-aqua.patch
80 -
81 - # Bug 125971
82 - "${FILESDIR}"/${PN}-8.5.14-conf.patch
83 -)
84 -
85 -src_prepare() {
86 - find \
87 - "${SPARENT}"/compat/* \
88 - -delete || die
89 -
90 - pushd "${SPARENT}" &>/dev/null || die
91 - default
92 - popd &>/dev/null || die
93 - eprefixify Makefile.in
94 -
95 - # Make sure we use the right pkg-config, and link against fontconfig
96 - # (since the code base uses Fc* functions).
97 - sed \
98 - -e 's/FT_New_Face/XftFontOpen/g' \
99 - -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
100 - -e 's:xft freetype2:xft freetype2 fontconfig:' \
101 - -i configure.in || die
102 - rm configure || die
103 -
104 - tc-export CC
105 -
106 - sed \
107 - -e '/chmod/s:555:755:g' \
108 - -i Makefile.in || die
109 -
110 - sed \
111 - -e 's:-O[2s]\?::g' \
112 - -i tcl.m4 || die
113 -
114 - mv configure.{in,ac} || die
115 -
116 - eautoconf
117 -
118 - multilib_copy_sources
119 -}
120 -
121 -multilib_src_configure() {
122 - if tc-is-cross-compiler ; then
123 - export ac_cv_func_strtod=yes
124 - export tcl_cv_strtod_buggy=1
125 - fi
126 -
127 - local mylibdir=$(get_libdir)
128 -
129 - econf \
130 - --with-tcl="${EPREFIX}/usr/${mylibdir}" \
131 - $(use_enable threads) \
132 - $(use_enable aqua) \
133 - $(use_enable truetype xft) \
134 - $(use_enable xscreensaver xss) \
135 - $(use_enable debug symbols)
136 -}
137 -
138 -multilib_src_test() {
139 - virtx emake test
140 -}
141 -
142 -multilib_src_install() {
143 - #short version number
144 - local v1=$(get_version_component_range 1-2)
145 - local mylibdir=$(get_libdir)
146 -
147 - S= default
148 -
149 - # normalize $S path, bug #280766 (pkgcore)
150 - local nS="$(cd "${S}"; pwd)"
151 -
152 - # fix the tkConfig.sh to eliminate refs to the build directory
153 - # and drop unnecessary -L inclusion to default system libdir
154 -
155 - sed \
156 - -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \
157 - -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
158 - -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
159 - -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \
160 - -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
161 - -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
162 - -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
163 - -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
164 - if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
165 - sed \
166 - -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
167 - -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
168 - -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
169 - fi
170 -
171 - # install private headers
172 - insinto /usr/${mylibdir}/tk${v1}/include/unix
173 - doins "${S}"/*.h
174 - insinto /usr/${mylibdir}/tk${v1}/include/generic
175 - doins "${SPARENT}"/generic/*.h
176 - rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
177 -
178 - # install symlink for libraries
179 - dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
180 - dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
181 -
182 - if multilib_is_native_abi; then
183 - dosym wish${v1} /usr/bin/wish
184 - dodoc "${SPARENT}"/{ChangeLog*,README,changes}
185 - fi
186 -}
187
188 diff --git a/dev-lang/tk/tk-8.6.5.ebuild b/dev-lang/tk/tk-8.6.5.ebuild
189 deleted file mode 100644
190 index 4d9bc73a856..00000000000
191 --- a/dev-lang/tk/tk-8.6.5.ebuild
192 +++ /dev/null
193 @@ -1,143 +0,0 @@
194 -# Copyright 1999-2018 Gentoo Foundation
195 -# Distributed under the terms of the GNU General Public License v2
196 -
197 -EAPI=6
198 -
199 -inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx
200 -
201 -MY_P="${PN}${PV/_beta/b}"
202 -
203 -DESCRIPTION="Tk Widget Set"
204 -HOMEPAGE="http://www.tcl.tk/"
205 -SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
206 -
207 -LICENSE="tcltk"
208 -SLOT="0/8.6"
209 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
210 -IUSE="debug +threads truetype aqua xscreensaver"
211 -
212 -RDEPEND="
213 - !aqua? (
214 - >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
215 - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
216 - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
217 - truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
218 - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
219 - )
220 - ~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]"
221 -DEPEND="${RDEPEND}
222 - !aqua? ( x11-base/xorg-proto )"
223 -
224 -# Not bumped to 8.6
225 -#RESTRICT=test
226 -
227 -SPARENT="${WORKDIR}/${MY_P}"
228 -S="${SPARENT}"/unix
229 -
230 -PATCHES=(
231 - "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
232 - "${FILESDIR}"/${PN}-8.5.13-multilib.patch
233 -
234 - "${FILESDIR}"/${PN}-8.4.15-aqua.patch
235 -
236 - # Bug 125971
237 - "${FILESDIR}"/${PN}-8.5.14-conf.patch
238 -)
239 -
240 -src_prepare() {
241 - find \
242 - "${SPARENT}"/compat/* \
243 - -delete || die
244 -
245 - pushd "${SPARENT}" &>/dev/null || die
246 - default
247 - popd &>/dev/null || die
248 - eprefixify Makefile.in
249 -
250 - # Make sure we use the right pkg-config, and link against fontconfig
251 - # (since the code base uses Fc* functions).
252 - sed \
253 - -e 's/FT_New_Face/XftFontOpen/g' \
254 - -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
255 - -e 's:xft freetype2:xft freetype2 fontconfig:' \
256 - -i configure.in || die
257 - rm configure || die
258 -
259 - tc-export CC
260 -
261 - sed \
262 - -e '/chmod/s:555:755:g' \
263 - -i Makefile.in || die
264 -
265 - sed \
266 - -e 's:-O[2s]\?::g' \
267 - -i tcl.m4 || die
268 -
269 - mv configure.{in,ac} || die
270 -
271 - eautoconf
272 -
273 - multilib_copy_sources
274 -}
275 -
276 -multilib_src_configure() {
277 - local mylibdir=$(get_libdir)
278 -
279 - econf \
280 - --with-tcl="${EPREFIX}/usr/${mylibdir}" \
281 - $(use_enable threads) \
282 - $(use_enable aqua) \
283 - $(use_enable truetype xft) \
284 - $(use_enable xscreensaver xss) \
285 - $(use_enable debug symbols)
286 -}
287 -
288 -multilib_src_test() {
289 - virtx emake test
290 -}
291 -
292 -multilib_src_install() {
293 - #short version number
294 - local v1=$(get_version_component_range 1-2)
295 - local mylibdir=$(get_libdir)
296 -
297 - S= default
298 -
299 - # normalize $S path, bug #280766 (pkgcore)
300 - local nS="$(cd "${S}"; pwd)"
301 -
302 - # fix the tkConfig.sh to eliminate refs to the build directory
303 - # and drop unnecessary -L inclusion to default system libdir
304 -
305 - sed \
306 - -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \
307 - -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
308 - -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
309 - -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \
310 - -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
311 - -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
312 - -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
313 - -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
314 - if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
315 - sed \
316 - -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
317 - -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
318 - -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
319 - fi
320 -
321 - # install private headers
322 - insinto /usr/${mylibdir}/tk${v1}/include/unix
323 - doins "${S}"/*.h
324 - insinto /usr/${mylibdir}/tk${v1}/include/generic
325 - doins "${SPARENT}"/generic/*.h
326 - rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
327 -
328 - # install symlink for libraries
329 - dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
330 - dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
331 -
332 - if multilib_is_native_abi; then
333 - dosym wish${v1} /usr/bin/wish
334 - dodoc "${SPARENT}"/{ChangeLog*,README,changes}
335 - fi
336 -}
337
338 diff --git a/dev-lang/tk/tk-8.6.6.ebuild b/dev-lang/tk/tk-8.6.6.ebuild
339 deleted file mode 100644
340 index e2326cd6d80..00000000000
341 --- a/dev-lang/tk/tk-8.6.6.ebuild
342 +++ /dev/null
343 @@ -1,148 +0,0 @@
344 -# Copyright 1999-2018 Gentoo Foundation
345 -# Distributed under the terms of the GNU General Public License v2
346 -
347 -EAPI=6
348 -
349 -inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx
350 -
351 -MY_P="${PN}${PV/_beta/b}"
352 -
353 -DESCRIPTION="Tk Widget Set"
354 -HOMEPAGE="http://www.tcl.tk/"
355 -SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
356 -
357 -LICENSE="tcltk"
358 -SLOT="0/8.6"
359 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
360 -IUSE="debug +threads truetype aqua xscreensaver"
361 -
362 -RDEPEND="
363 - !aqua? (
364 - >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
365 - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
366 - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
367 - truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
368 - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
369 - )
370 - ~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]"
371 -DEPEND="${RDEPEND}
372 - !aqua? ( x11-base/xorg-proto )"
373 -
374 -# Not bumped to 8.6
375 -#RESTRICT=test
376 -
377 -SPARENT="${WORKDIR}/${MY_P}"
378 -S="${SPARENT}"/unix
379 -
380 -PATCHES=(
381 - "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
382 - "${FILESDIR}"/${PN}-8.5.13-multilib.patch
383 -
384 - "${FILESDIR}"/${PN}-8.4.15-aqua.patch
385 -
386 - # Bug 125971
387 - "${FILESDIR}"/${PN}-8.5.14-conf.patch
388 -)
389 -
390 -src_prepare() {
391 - find \
392 - "${SPARENT}"/compat/* \
393 - -delete || die
394 -
395 - pushd "${SPARENT}" &>/dev/null || die
396 - default
397 - popd &>/dev/null || die
398 - eprefixify Makefile.in
399 -
400 - # Make sure we use the right pkg-config, and link against fontconfig
401 - # (since the code base uses Fc* functions).
402 - sed \
403 - -e 's/FT_New_Face/XftFontOpen/g' \
404 - -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
405 - -e 's:xft freetype2:xft freetype2 fontconfig:' \
406 - -i configure.in || die
407 - rm configure || die
408 -
409 - tc-export CC
410 -
411 - sed \
412 - -e '/chmod/s:555:755:g' \
413 - -i Makefile.in || die
414 -
415 - sed \
416 - -e 's:-O[2s]\?::g' \
417 - -i tcl.m4 || die
418 -
419 - mv configure.{in,ac} || die
420 -
421 - eautoconf
422 -
423 - multilib_copy_sources
424 -}
425 -
426 -multilib_src_configure() {
427 - if tc-is-cross-compiler ; then
428 - export ac_cv_func_strtod=yes
429 - export tcl_cv_strtod_buggy=1
430 - fi
431 -
432 - local mylibdir=$(get_libdir)
433 -
434 - econf \
435 - --with-tcl="${EPREFIX}/usr/${mylibdir}" \
436 - $(use_enable threads) \
437 - $(use_enable aqua) \
438 - $(use_enable truetype xft) \
439 - $(use_enable xscreensaver xss) \
440 - $(use_enable debug symbols)
441 -}
442 -
443 -multilib_src_test() {
444 - virtx emake test
445 -}
446 -
447 -multilib_src_install() {
448 - #short version number
449 - local v1=$(get_version_component_range 1-2)
450 - local mylibdir=$(get_libdir)
451 -
452 - S= default
453 -
454 - # normalize $S path, bug #280766 (pkgcore)
455 - local nS="$(cd "${S}"; pwd)"
456 -
457 - # fix the tkConfig.sh to eliminate refs to the build directory
458 - # and drop unnecessary -L inclusion to default system libdir
459 -
460 - sed \
461 - -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \
462 - -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
463 - -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
464 - -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \
465 - -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
466 - -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
467 - -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
468 - -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
469 - if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
470 - sed \
471 - -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
472 - -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
473 - -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
474 - fi
475 -
476 - # install private headers
477 - insinto /usr/${mylibdir}/tk${v1}/include/unix
478 - doins "${S}"/*.h
479 - insinto /usr/${mylibdir}/tk${v1}/include/generic
480 - doins "${SPARENT}"/generic/*.h
481 - rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
482 -
483 - # install symlink for libraries
484 - dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
485 - dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
486 -
487 - if multilib_is_native_abi; then
488 - dosym wish${v1} /usr/bin/wish
489 - dodoc "${SPARENT}"/{ChangeLog*,README,changes}
490 - fi
491 -}
492
493 diff --git a/dev-lang/tk/tk-8.6.7.ebuild b/dev-lang/tk/tk-8.6.7.ebuild
494 deleted file mode 100644
495 index 2fa86b88177..00000000000
496 --- a/dev-lang/tk/tk-8.6.7.ebuild
497 +++ /dev/null
498 @@ -1,148 +0,0 @@
499 -# Copyright 1999-2018 Gentoo Foundation
500 -# Distributed under the terms of the GNU General Public License v2
501 -
502 -EAPI=6
503 -
504 -inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx
505 -
506 -MY_P="${PN}${PV/_beta/b}"
507 -
508 -DESCRIPTION="Tk Widget Set"
509 -HOMEPAGE="http://www.tcl.tk/"
510 -SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
511 -
512 -LICENSE="tcltk"
513 -SLOT="0/8.6"
514 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
515 -IUSE="debug +threads truetype aqua xscreensaver"
516 -
517 -RDEPEND="
518 - !aqua? (
519 - >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
520 - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
521 - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
522 - truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
523 - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
524 - )
525 - ~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]"
526 -DEPEND="${RDEPEND}
527 - !aqua? ( x11-base/xorg-proto )"
528 -
529 -# Not bumped to 8.6
530 -#RESTRICT=test
531 -
532 -SPARENT="${WORKDIR}/${MY_P}"
533 -S="${SPARENT}"/unix
534 -
535 -PATCHES=(
536 - "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
537 - "${FILESDIR}"/${PN}-8.5.13-multilib.patch
538 -
539 - "${FILESDIR}"/${PN}-8.4.15-aqua.patch
540 -
541 - # Bug 125971
542 - "${FILESDIR}"/${PN}-8.5.14-conf.patch
543 -)
544 -
545 -src_prepare() {
546 - find \
547 - "${SPARENT}"/compat/* \
548 - -delete || die
549 -
550 - pushd "${SPARENT}" &>/dev/null || die
551 - default
552 - popd &>/dev/null || die
553 - eprefixify Makefile.in
554 -
555 - # Make sure we use the right pkg-config, and link against fontconfig
556 - # (since the code base uses Fc* functions).
557 - sed \
558 - -e 's/FT_New_Face/XftFontOpen/g' \
559 - -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
560 - -e 's:xft freetype2:xft freetype2 fontconfig:' \
561 - -i configure.in || die
562 - rm configure || die
563 -
564 - tc-export CC
565 -
566 - sed \
567 - -e '/chmod/s:555:755:g' \
568 - -i Makefile.in || die
569 -
570 - sed \
571 - -e 's:-O[2s]\?::g' \
572 - -i tcl.m4 || die
573 -
574 - mv configure.{in,ac} || die
575 -
576 - eautoconf
577 -
578 - multilib_copy_sources
579 -}
580 -
581 -multilib_src_configure() {
582 - if tc-is-cross-compiler ; then
583 - export ac_cv_func_strtod=yes
584 - export tcl_cv_strtod_buggy=1
585 - fi
586 -
587 - local mylibdir=$(get_libdir)
588 -
589 - econf \
590 - --with-tcl="${EPREFIX}/usr/${mylibdir}" \
591 - $(use_enable threads) \
592 - $(use_enable aqua) \
593 - $(use_enable truetype xft) \
594 - $(use_enable xscreensaver xss) \
595 - $(use_enable debug symbols)
596 -}
597 -
598 -multilib_src_test() {
599 - virtx emake test
600 -}
601 -
602 -multilib_src_install() {
603 - #short version number
604 - local v1=$(get_version_component_range 1-2)
605 - local mylibdir=$(get_libdir)
606 -
607 - S= default
608 -
609 - # normalize $S path, bug #280766 (pkgcore)
610 - local nS="$(cd "${S}"; pwd)"
611 -
612 - # fix the tkConfig.sh to eliminate refs to the build directory
613 - # and drop unnecessary -L inclusion to default system libdir
614 -
615 - sed \
616 - -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \
617 - -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
618 - -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
619 - -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \
620 - -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
621 - -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
622 - -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
623 - -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
624 - if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
625 - sed \
626 - -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
627 - -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
628 - -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
629 - fi
630 -
631 - # install private headers
632 - insinto /usr/${mylibdir}/tk${v1}/include/unix
633 - doins "${S}"/*.h
634 - insinto /usr/${mylibdir}/tk${v1}/include/generic
635 - doins "${SPARENT}"/generic/*.h
636 - rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
637 -
638 - # install symlink for libraries
639 - dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
640 - dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
641 -
642 - if multilib_is_native_abi; then
643 - dosym wish${v1} /usr/bin/wish
644 - dodoc "${SPARENT}"/{ChangeLog*,README,changes}
645 - fi
646 -}