Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-lang/tk
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang/tk')
-rw-r--r--dev-lang/tk/Manifest9
-rw-r--r--dev-lang/tk/files/tk-8.5.11-fedora-xft.patch13
-rw-r--r--dev-lang/tk/files/tk-8.5.13-multilib.patch12
-rw-r--r--dev-lang/tk/files/tk-8.5.14-conf.patch16
-rw-r--r--dev-lang/tk/files/tk-8.6.10-multilib.patch11
-rw-r--r--dev-lang/tk/files/tk-8.6.11-test.patch72
-rw-r--r--dev-lang/tk/files/tk-8.6.12-test.patch31
-rw-r--r--dev-lang/tk/files/tk-8.6.13-test.patch50
-rw-r--r--dev-lang/tk/files/tk-8.6.14-test.patch49
-rw-r--r--dev-lang/tk/files/tk-8.6.8-libieee.patch15
-rw-r--r--dev-lang/tk/metadata.xml3
-rw-r--r--dev-lang/tk/tk-8.5.17-r100.ebuild93
-rw-r--r--dev-lang/tk/tk-8.5.17-r101.ebuild96
-rw-r--r--dev-lang/tk/tk-8.6.11.1.ebuild (renamed from dev-lang/tk/tk-8.6.9.1.ebuild)21
-rw-r--r--dev-lang/tk/tk-8.6.12.ebuild (renamed from dev-lang/tk/tk-8.6.9.ebuild)29
-rw-r--r--dev-lang/tk/tk-8.6.13.ebuild (renamed from dev-lang/tk/tk-8.5.17-r1.ebuild)105
-rw-r--r--dev-lang/tk/tk-8.6.14.ebuild (renamed from dev-lang/tk/tk-8.6.8.ebuild)39
17 files changed, 335 insertions, 329 deletions
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 0eba5281bb31..1bdce3e0a7bd 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -1,5 +1,4 @@
-DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568
-DIST tk8.5.17-src.tar.gz 4095985 BLAKE2B 4cbb140c30ca717ee499b9ad9e1a3df27a470a78613edbaec425c39afaa41d59276bbe487933a4e77a9722fcafa9113b203cf5c828660bdeb38f667c3263c3cd SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f
-DIST tk8.6.8-src.tar.gz 4319854 BLAKE2B 167c5dc6c32e49653c04bc067c3d75df022ca230657be32797021b0e2f7748215d9ad0493c8020b8d1be1f005b9b2d561339a6a0b209721c0d05dd222d47d377 SHA512 d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9
-DIST tk8.6.9-src.tar.gz 4364606 BLAKE2B 9c96d977aa72dcc0c8d2a570d644284a1eef217ef082d8a78461bdcb4845e206ccad59cb5bc21ef80e32ea19951fa3a845e45059bb9eaf0756f128a95530260c SHA512 654d73aad006e628110057681477b958b7ec0a42287bc78259fb4b84635e7ebe757e69099d66c0c73479bc506ca66fa5baf13f13b0f403d60b2c54fd48a4a686
-DIST tk8.6.9.1-src.tar.gz 4364603 BLAKE2B 3d96637ceadc28977f8b4532be071907d64f11bd22881baf02aa6fa2778b607437edce8f1ed02e7011bcf78468128f7bfe81ee6dac9bd73a796e7fefae130dcf SHA512 b9c811ffc8326331ae03c6fb25ea71f7a5eaeebd9d5a16a51a1671d0f0422268bd351b077e17ae925f0a7eddac9642aa640658615c52d4269c299373af031a92
+DIST tk8.6.11.1-src.tar.gz 4496008 BLAKE2B d7bae2fa535411ad8620ec81cdc0b34a1206fed82f50dbd98d3977af46ac43f794166cb7029f274f7903228c62ce83dfbd56cea06669ff1e382b185d733b0792 SHA512 e2a1d27ba63601731d43c4c4e2b658771a14afd97ef8231f8bc7854e762b83a42f23b8db600e4b4a4a14ae6fc97378d0b9a9a180ae09308b9d12436ec2b176c4
+DIST tk8.6.12-src.tar.gz 4515393 BLAKE2B 328522b7e1b4d291863db01ac93e18630f3984459d145a11d742f912a40d5634ffe4608760ce45f444903d45fb707bb48ecc3586913f0c2fde4664a402f6b862 SHA512 afe51eb3e2071640ebc57f9ee6979fe91ee7856df8d3c9d55ae70c470cdae2306d2feeb791f46258f529a5c4a07b53974a7574cf3594818cd4e99077b30c697b
+DIST tk8.6.13-src.tar.gz 4546848 BLAKE2B 5f00cf64feb7c7eb6739303c857dfabff4cbf4148c65462c2a5cc49cc8010fba950ffa7043101e98ded543a6c6e9b925dc1ee0e6e9031a240ae29b918f81060a SHA512 719aa6776bfdc814f817919a265d3f9d847782c9f0a5fc5c2ab139beeba921e6fde8c66e7e836d78f86f53c98a7df0e587f0b2f4b08cc5ce12eecbb7f1ab71a5
+DIST tk8.6.14-src.tar.gz 4510695 BLAKE2B 00b83a87b65317ca32228a11014bd9fe7cffb92089e152ca63a1e02ff23a5fc132b9336618f361692aa94ebf9e023cef492fafe39d51b9111feaec4934e8ae42 SHA512 756903dfa56cf77c7934bb3680c9bef6027f99196f4e6a2e823b85c342ca860cbb4b42154f576cc88f7f1265d28ce2d84ab5f52f848b16cca0cf9af4c770183f
diff --git a/dev-lang/tk/files/tk-8.5.11-fedora-xft.patch b/dev-lang/tk/files/tk-8.5.11-fedora-xft.patch
deleted file mode 100644
index 67640db085f1..000000000000
--- a/dev-lang/tk/files/tk-8.5.11-fedora-xft.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- tk8.5.9/unix/configure.in.old 2010-09-02 20:12:14.000000000 +0200
-+++ tk8.5.9/unix/configure.in 2011-02-17 13:32:22.719116636 +0100
-@@ -530,8 +530,8 @@
- XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
- if test "$found_xft" = "no" ; then
- found_xft=yes
-- XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
-- XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
-+ XFT_CFLAGS=`pkg-config --cflags xft freetype2 2>/dev/null` || found_xft="no"
-+ XFT_LIBS=`pkg-config --libs xft freetype2 2>/dev/null` || found_xft="no"
- fi
- AC_MSG_RESULT([$found_xft])
- dnl make sure that compiling against Xft header file doesn't bomb
diff --git a/dev-lang/tk/files/tk-8.5.13-multilib.patch b/dev-lang/tk/files/tk-8.5.13-multilib.patch
deleted file mode 100644
index db3d8cc00817..000000000000
--- a/dev-lang/tk/files/tk-8.5.13-multilib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur tk8.4.11.orig/unix/configure.in tk8.4.11/unix/configure.in
---- tk8.4.11.orig/unix/configure.in 2005-06-30 01:43:10.000000000 +0900
-+++ tk8.4.11/unix/configure.in 2005-07-02 23:22:16.000000000 +0900
-@@ -393,7 +393,7 @@
- TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
- fi
-
--TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
-+TK_LIBRARY='$(libdir)/tk$(VERSION)'
- PRIVATE_INCLUDE_DIR='$(includedir)'
- HTML_DIR='$(DISTDIR)/html'
- TK_PKG_DIR='tk$(VERSION)$(TK_DBGX)'
diff --git a/dev-lang/tk/files/tk-8.5.14-conf.patch b/dev-lang/tk/files/tk-8.5.14-conf.patch
deleted file mode 100644
index 553f93f9b7dc..000000000000
--- a/dev-lang/tk/files/tk-8.5.14-conf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- unix/tcl.m4 | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/unix/tcl.m4 b/unix/tcl.m4
-index 3974753..9c36eb5 100644
---- a/unix/tcl.m4
-+++ b/unix/tcl.m4
-@@ -1420,7 +1420,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
- # get rid of the warnings.
- #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
-
-- SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
-+ SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -Wl,-soname,${@}'
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
- LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
diff --git a/dev-lang/tk/files/tk-8.6.10-multilib.patch b/dev-lang/tk/files/tk-8.6.10-multilib.patch
new file mode 100644
index 000000000000..9b781362d65f
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.6.10-multilib.patch
@@ -0,0 +1,11 @@
+--- a/unix/configure.in 2020-12-26 11:26:32.952828258 +0100
++++ b/unix/configure.in 2020-12-26 11:26:45.027642732 +0100
+@@ -663,7 +663,7 @@
+ TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+ fi
+
+-test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
++test -z "$TK_LIBRARY" && TK_LIBRARY='$(libdir)/tk$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ TK_PKG_DIR='tk$(VERSION)'
diff --git a/dev-lang/tk/files/tk-8.6.11-test.patch b/dev-lang/tk/files/tk-8.6.11-test.patch
new file mode 100644
index 000000000000..96cd174be884
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.6.11-test.patch
@@ -0,0 +1,72 @@
+--- a/tests/ttk/entry.test 2020-12-26 18:46:45.262306641 +0100
++++ b/tests/ttk/entry.test 2020-12-26 18:47:00.246040124 +0100
+@@ -111,34 +111,34 @@
+ set result [.e xview]
+ } -result {0.0 0.5}
+
+-test entry-3.3 "xview" -body {
++test entry-3.3 "xview" -constraints knownBug -body {
+ .e delete 0 end;
+ .e insert end abcdefghijklmnopqrstuvwxyz
+ .e xview end
+ set result [.e index @0]
+ } -result 7
+
+-test entry-3.4 "xview" -body {
++test entry-3.4 "xview" -constraints knownBug -body {
+ .e delete 0 end;
+ .e insert end abcdefghijklmnopqrstuvwxyz
+ .e xview moveto 1.0
+ set result [.e index @0]
+ } -result 7
+
+-test entry-3.5 "xview" -body {
++test entry-3.5 "xview" -constraints knownBug -body {
+ .e delete 0 end;
+ .e insert end abcdefghijklmnopqrstuvwxyz
+ .e xview scroll 5 units
+ set result [.e index @0]
+ } -result 5
+
+-test entry-3.6 "xview" -body {
++test entry-3.6 "xview" -constraints knownBug -body {
+ .e delete 0 end;
+ .e insert end [string repeat abcdefghijklmnopqrstuvwxyz 5]
+ .e xview scroll 2 pages
+ set result [.e index @0]
+ } -result 40
+
+ test entry-3.last "Series 3 cleanup" -body {
+ destroy .e
+ }
+--- a/tests/ttk/spinbox.test 2020-12-26 18:49:19.967554727 +0100
++++ b/tests/ttk/spinbox.test 2020-12-26 18:49:58.015877788 +0100
+@@ -136,7 +136,7 @@
+ destroy .sb
+ } -returnCodes error -result {bad validate "bogus": must be all, key, focus, focusin, focusout, or none}
+
+-test spinbox-1.8.4 "-validate option: " -setup {
++test spinbox-1.8.4 "-validate option: " -constraints knownBug -setup {
+ set ::spinbox_test {}
+ ttk::spinbox .sb -from 0 -to 100
+ } -body {
+--- a/tests/font.test 2020-12-26 19:15:55.199228774 +0100
++++ b/tests/font.test 2020-12-26 19:18:05.414951407 +0100
+@@ -399,7 +399,7 @@
+ # (tkfont == NULL)
+ font measure "\{xyz" abc
+ } -returnCodes error -result "font \"{xyz\" doesn't exist"
+-test font-9.5 {font command: measure} -body {
++test font-9.5 {font command: measure} -constraints knownBug -body {
+ # Tk_TextWidth()
+ expr {[font measure $fixed "abcdefg"] == [font measure $fixed "a"]*7 }
+ } -result 1
+@@ -450,7 +450,7 @@
+ # (Tcl_GetIndexFromObj() != TCL_OK)
+ font metrics $fixed -xyz
+ } -returnCodes error -result {bad metric "-xyz": must be -ascent, -descent, -linespace, or -fixed}
+-test font-10.9 {font command: metrics: get individual metrics} -body {
++test font-10.9 {font command: metrics: get individual metrics} -constraints knownBug -body {
+ font metrics $fixed -ascent
+ font metrics $fixed -descent
+ font metrics $fixed -linespace
diff --git a/dev-lang/tk/files/tk-8.6.12-test.patch b/dev-lang/tk/files/tk-8.6.12-test.patch
new file mode 100644
index 000000000000..231265f464e4
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.6.12-test.patch
@@ -0,0 +1,31 @@
+--- a/tests/font.test 2020-12-26 19:15:55.199228774 +0100
++++ b/tests/font.test 2020-12-26 19:18:05.414951407 +0100
+@@ -399,7 +399,7 @@
+ # (tkfont == NULL)
+ font measure "\{xyz" abc
+ } -returnCodes error -result "font \"{xyz\" doesn't exist"
+-test font-9.5 {font command: measure} -body {
++test font-9.5 {font command: measure} -constraints knownBug -body {
+ # Tk_TextWidth()
+ expr {[font measure $fixed "abcdefg"] == [font measure $fixed "a"]*7 }
+ } -result 1
+@@ -450,7 +450,7 @@
+ # (Tcl_GetIndexFromObj() != TCL_OK)
+ font metrics $fixed -xyz
+ } -returnCodes error -result {bad metric "-xyz": must be -ascent, -descent, -linespace, or -fixed}
+-test font-10.9 {font command: metrics: get individual metrics} -body {
++test font-10.9 {font command: metrics: get individual metrics} -constraints knownBug -body {
+ font metrics $fixed -ascent
+ font metrics $fixed -descent
+ font metrics $fixed -linespace
+--- a/tests/scrollbar.test 2021-12-12 10:20:06.460611347 +0100
++++ b/tests/scrollbar.test 2021-12-12 10:21:12.204503285 +0100
+@@ -717,7 +717,7 @@
+ destroy .t .s
+ } -result {5.0}
+
+-test scrollbar-10.2.1 {<MouseWheel> event on scrollbar} -constraints {notAqua} -setup {
++test scrollbar-10.2.1 {<MouseWheel> event on scrollbar} -constraints knownBug -setup {
+ destroy .t .s
+ } -body {
+ pack [text .t -xscrollcommand {.s set} -wrap none] -side top
diff --git a/dev-lang/tk/files/tk-8.6.13-test.patch b/dev-lang/tk/files/tk-8.6.13-test.patch
new file mode 100644
index 000000000000..c239ba79ef2f
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.6.13-test.patch
@@ -0,0 +1,50 @@
+--- a/tests/textDisp.test 2022-11-23 08:26:53.070121316 +0100
++++ b/tests/textDisp.test 2022-11-23 08:35:58.527988892 +0100
+@@ -2303,10 +2303,10 @@
+ }
+ lequal [.t index @0,0] $expected
+ } {1}
+-test textDisp-16.17 {TkTextYviewCmd procedure, "moveto" option} {
++test textDisp-16.17 {TkTextYviewCmd procedure, "moveto" option} -constraints {knownBug} -body {
+ .t yview moveto .755
+ .t index @0,0
+-} {151.80}
++} -result {151.80}
+ test textDisp-16.18 {TkTextYviewCmd procedure, "moveto" roundoff} {
+ catch {destroy .top1}
+ toplevel .top1
+--- a/tests/ttk/entry.test 2022-11-23 08:44:49.647148945 +0100
++++ b/tests/ttk/entry.test 2022-11-23 08:51:48.524180822 +0100
+@@ -127,28 +127,28 @@
+ set result [.e xview]
+ } -result {0.0 0.5}
+
+-test entry-3.3 "xview" -body {
++test entry-3.3 "xview" -constraints knownBug -body {
+ .e delete 0 end;
+ .e insert end abcdefghijklmnopqrstuvwxyz
+ .e xview end
+ set result [.e index @0]
+ } -result 7
+
+-test entry-3.4 "xview" -body {
++test entry-3.4 "xview" -constraints knownBug -body {
+ .e delete 0 end;
+ .e insert end abcdefghijklmnopqrstuvwxyz
+ .e xview moveto 1.0
+ set result [.e index @0]
+ } -result 7
+
+-test entry-3.5 "xview" -body {
++test entry-3.5 "xview" -constraints knownBug -body {
+ .e delete 0 end;
+ .e insert end abcdefghijklmnopqrstuvwxyz
+ .e xview scroll 5 units
+ set result [.e index @0]
+ } -result 5
+
+-test entry-3.6 "xview" -body {
++test entry-3.6 "xview" -constraints knownBug -body {
+ .e delete 0 end;
+ .e insert end [string repeat abcdefghijklmnopqrstuvwxyz 5]
+ .e xview scroll 2 pages
diff --git a/dev-lang/tk/files/tk-8.6.14-test.patch b/dev-lang/tk/files/tk-8.6.14-test.patch
new file mode 100644
index 000000000000..a59f9d4e6861
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.6.14-test.patch
@@ -0,0 +1,49 @@
+--- a/tests/textDisp.test 2024-03-10 14:25:29.581307116 +0100
++++ b/tests/textDisp.test 2024-03-10 14:26:46.022318200 +0100
+@@ -2314,11 +2314,6 @@
+ }
+ lequal [.t index @0,0] $expected
+ } {1}
+-test textDisp-16.17 {TkTextYviewCmd procedure, "moveto" option} haveBigFontTwiceLargerThanTextFont {
+-# constrained because text tagged with the big font plays a role
+- .t yview moveto .755
+- .t index @0,0
+-} {151.80}
+ test textDisp-16.18 {TkTextYviewCmd procedure, "moveto" roundoff} {
+ catch {destroy .top1}
+ toplevel .top1
+--- a/tests/ttk/entry.test 2022-11-23 08:44:49.647148945 +0100
++++ b/tests/ttk/entry.test 2022-11-23 08:51:48.524180822 +0100
+@@ -127,28 +127,28 @@
+ set result [.e xview]
+ } -result {0.0 0.5}
+
+-test entry-3.3 "xview" -body {
++test entry-3.3 "xview" -constraints knownBug -body {
+ .e delete 0 end;
+ .e insert end abcdefghijklmnopqrstuvwxyz
+ .e xview end
+ set result [.e index @0]
+ } -result 7
+
+-test entry-3.4 "xview" -body {
++test entry-3.4 "xview" -constraints knownBug -body {
+ .e delete 0 end;
+ .e insert end abcdefghijklmnopqrstuvwxyz
+ .e xview moveto 1.0
+ set result [.e index @0]
+ } -result 7
+
+-test entry-3.5 "xview" -body {
++test entry-3.5 "xview" -constraints knownBug -body {
+ .e delete 0 end;
+ .e insert end abcdefghijklmnopqrstuvwxyz
+ .e xview scroll 5 units
+ set result [.e index @0]
+ } -result 5
+
+-test entry-3.6 "xview" -body {
++test entry-3.6 "xview" -constraints knownBug -body {
+ .e delete 0 end;
+ .e insert end [string repeat abcdefghijklmnopqrstuvwxyz 5]
+ .e xview scroll 2 pages
diff --git a/dev-lang/tk/files/tk-8.6.8-libieee.patch b/dev-lang/tk/files/tk-8.6.8-libieee.patch
deleted file mode 100644
index 942144e68c71..000000000000
--- a/dev-lang/tk/files/tk-8.6.8-libieee.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/unix/tcl.m4
-+++ b/unix/tcl.m4
-@@ -2470,12 +2470,9 @@
- #--------------------------------------------------------------------
- # On a few very rare systems, all of the libm.a stuff is
- # already in libc.a. Set compiler flags accordingly.
-- # Also, Linux requires the "ieee" library for math to work
-- # right (and it must appear before "-lm").
- #--------------------------------------------------------------------
-
- AC_CHECK_FUNC(sin, MATH_LIBS="", MATH_LIBS="-lm")
-- AC_CHECK_LIB(ieee, main, [MATH_LIBS="-lieee $MATH_LIBS"])
-
- #--------------------------------------------------------------------
- # Interactive UNIX requires -linet instead of -lsocket, plus it
diff --git a/dev-lang/tk/metadata.xml b/dev-lang/tk/metadata.xml
index ec2fb390faa4..911d255862a1 100644
--- a/dev-lang/tk/metadata.xml
+++ b/dev-lang/tk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tcltk@gentoo.org</email>
@@ -7,5 +7,6 @@
</maintainer>
<upstream>
<remote-id type="sourceforge">tcl</remote-id>
+ <remote-id type="github">tcltk/tk</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-lang/tk/tk-8.5.17-r100.ebuild b/dev-lang/tk/tk-8.5.17-r100.ebuild
deleted file mode 100644
index fbc3b1cb3191..000000000000
--- a/dev-lang/tk/tk-8.5.17-r100.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib prefix toolchain-funcs versionator virtualx
-
-MY_P="${PN}${PV/_beta/b}"
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="
- mirror://sourceforge/tcl/${MY_P}-src.tar.gz
- mirror://sourceforge/tcl/${MY_P//tk/tcl}-src.tar.gz
- "
-
-LICENSE="tcltk"
-SLOT="8.5"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug threads truetype aqua xscreensaver"
-
-RDEPEND="
- !aqua? (
- media-libs/fontconfig
- media-libs/freetype:2
- x11-libs/libX11
- x11-libs/libXt
- truetype? ( x11-libs/libXft )
- xscreensaver? ( x11-libs/libXScrnSaver )
- )
- ~dev-lang/tcl-${PV}:8.5=
- !=dev-lang/tk-8.5:0"
-DEPEND="${RDEPEND}
- !aqua? ( x11-base/xorg-proto )"
-
-SPARENT="${WORKDIR}/${MY_P}"
-S="${SPARENT}"/unix
-
-DOCS=()
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
- "${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
- epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
- eprefixify Makefile.in
-
- # Bug 125971
- epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
-
- # Make sure we use the right pkg-config, and link against fontconfig
- # (since the code base uses Fc* functions).
- sed \
- -e 's/FT_New_Face/XftFontOpen/g' \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e 's:xft freetype2:xft freetype2 fontconfig:' \
- -i configure.in || die
- rm -f configure || die
-
- append-cppflags \
- -I"${WORKDIR}/${MY_P//tk/tcl}/generic" \
- -I"${WORKDIR}/${MY_P//tk/tcl}/unix"
-
- sed \
- -e '/chmod/s:555:755:g' \
- -i Makefile.in || die
-
- tc-export CC
-
- eautoconf
-}
-
-src_configure() {
- local v1=$(get_version_component_range 1-2)
- local mylibdir=$(get_libdir)
-
- econf \
- --with-tcl="${EPREFIX}/usr/${mylibdir}/tcl${v1}" \
- $(use_enable threads) \
- $(use_enable aqua) \
- $(use_enable truetype xft) \
- $(use_enable xscreensaver xss) \
- $(use_enable debug symbols)
-}
-
-src_test() {
- Xemake test
-}
-
-src_install() {
- dolib.so libtk8.5.so
-}
diff --git a/dev-lang/tk/tk-8.5.17-r101.ebuild b/dev-lang/tk/tk-8.5.17-r101.ebuild
deleted file mode 100644
index 164b758d88c7..000000000000
--- a/dev-lang/tk/tk-8.5.17-r101.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib prefix toolchain-funcs versionator virtualx
-
-MY_P="${PN}${PV/_beta/b}"
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="
- mirror://sourceforge/tcl/${MY_P}-src.tar.gz
- mirror://sourceforge/tcl/${MY_P//tk/tcl}-src.tar.gz
- "
-
-LICENSE="tcltk"
-SLOT="8.5"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug threads truetype aqua xscreensaver"
-
-RDEPEND="
- !aqua? (
- media-libs/fontconfig
- media-libs/freetype:2
- x11-libs/libX11
- x11-libs/libXt
- truetype? ( x11-libs/libXft )
- xscreensaver? ( x11-libs/libXScrnSaver )
- )
- ~dev-lang/tcl-${PV}:8.5=
- !=dev-lang/tk-8.5:0"
-DEPEND="${RDEPEND}
- !aqua? ( x11-base/xorg-proto )"
-
-SPARENT="${WORKDIR}/${MY_P}"
-S="${SPARENT}"/unix
-
-DOCS=()
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
- "${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
- epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
- eprefixify Makefile.in
-
- # Bug 125971
- epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
-
- # Bug 648570
- epatch "${FILESDIR}"/${PN}-8.6.8-libieee.patch
-
- # Make sure we use the right pkg-config, and link against fontconfig
- # (since the code base uses Fc* functions).
- sed \
- -e 's/FT_New_Face/XftFontOpen/g' \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e 's:xft freetype2:xft freetype2 fontconfig:' \
- -i configure.in || die
- rm -f configure || die
-
- append-cppflags \
- -I"${WORKDIR}/${MY_P//tk/tcl}/generic" \
- -I"${WORKDIR}/${MY_P//tk/tcl}/unix"
-
- sed \
- -e '/chmod/s:555:755:g' \
- -i Makefile.in || die
-
- tc-export CC
-
- eautoconf
-}
-
-src_configure() {
- local v1=$(get_version_component_range 1-2)
- local mylibdir=$(get_libdir)
-
- econf \
- --with-tcl="${EPREFIX}/usr/${mylibdir}/tcl${v1}" \
- $(use_enable threads) \
- $(use_enable aqua) \
- $(use_enable truetype xft) \
- $(use_enable xscreensaver xss) \
- $(use_enable debug symbols)
-}
-
-src_test() {
- Xemake test
-}
-
-src_install() {
- dolib.so libtk8.5.so
-}
diff --git a/dev-lang/tk/tk-8.6.9.1.ebuild b/dev-lang/tk/tk-8.6.11.1.ebuild
index 4d843a30b3a4..c59293d5db70 100644
--- a/dev-lang/tk/tk-8.6.9.1.ebuild
+++ b/dev-lang/tk/tk-8.6.11.1.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools multilib-minimal prefix toolchain-funcs virtualx
+inherit autotools multilib-minimal multilib prefix toolchain-funcs virtualx
MY_P="${PN}${PV/_beta/b}"
DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
+HOMEPAGE="https://www.tcl.tk/"
SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
LICENSE="tcltk"
SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="debug +threads truetype aqua xscreensaver"
+RESTRICT="!test? ( test )"
RDEPEND="
!aqua? (
@@ -27,7 +28,7 @@ RDEPEND="
~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
!aqua? ( x11-base/xorg-proto )"
-
+BDEPEND="virtual/pkgconfig"
# Not bumped to 8.6
#RESTRICT=test
@@ -35,10 +36,10 @@ SPARENT="${WORKDIR}/${PN}$(ver_cut 1-3 ${PV})"
S="${SPARENT}"/unix
PATCHES=(
- "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch
- "${FILESDIR}"/${PN}-8.5.13-multilib.patch
+ "${FILESDIR}"/${PN}-8.6.10-multilib.patch
"${FILESDIR}"/${PN}-8.4.15-aqua.patch
"${FILESDIR}"/${PN}-8.6.9-conf.patch # Bug 125971
+ "${FILESDIR}"/${PN}-8.6.11-test.patch
)
src_prepare() {
@@ -95,7 +96,7 @@ multilib_src_configure() {
}
multilib_src_test() {
- virtx emake test
+ CI=1 virtx emake test
}
multilib_src_install() {
@@ -120,7 +121,7 @@ multilib_src_install() {
-e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
-e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
- if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+ if use prefix && [[ ${CHOST} != *-darwin* ]] ; then
sed \
-e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
@@ -140,6 +141,6 @@ multilib_src_install() {
if multilib_is_native_abi; then
dosym wish${v1} /usr/bin/wish
- dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+ dodoc "${SPARENT}"/{ChangeLog*,README.md,changes}
fi
}
diff --git a/dev-lang/tk/tk-8.6.9.ebuild b/dev-lang/tk/tk-8.6.12.ebuild
index ab5214dc330b..4aa954af060f 100644
--- a/dev-lang/tk/tk-8.6.9.ebuild
+++ b/dev-lang/tk/tk-8.6.12.ebuild
@@ -1,20 +1,23 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools multilib-minimal prefix toolchain-funcs virtualx
+# Please bump with dev-lang/tcl!
+
+inherit autotools multilib-minimal multilib prefix toolchain-funcs virtualx
MY_P="${PN}${PV/_beta/b}"
DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
+HOMEPAGE="https://www.tcl.tk/"
SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
LICENSE="tcltk"
SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="debug +threads truetype aqua xscreensaver"
+RESTRICT="!test? ( test )"
RDEPEND="
!aqua? (
@@ -24,21 +27,21 @@ RDEPEND="
truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
)
- ~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]"
+ ~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
!aqua? ( x11-base/xorg-proto )"
-
+BDEPEND="virtual/pkgconfig"
# Not bumped to 8.6
#RESTRICT=test
-SPARENT="${WORKDIR}/${MY_P}"
+SPARENT="${WORKDIR}/${PN}$(ver_cut 1-3 ${PV})"
S="${SPARENT}"/unix
PATCHES=(
- "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch
- "${FILESDIR}"/${PN}-8.5.13-multilib.patch
+ "${FILESDIR}"/${PN}-8.6.10-multilib.patch
"${FILESDIR}"/${PN}-8.4.15-aqua.patch
- "${FILESDIR}"/${P}-conf.patch # Bug 125971
+ "${FILESDIR}"/${PN}-8.6.9-conf.patch # Bug 125971
+ "${FILESDIR}"/${PN}-8.6.12-test.patch
)
src_prepare() {
@@ -95,7 +98,7 @@ multilib_src_configure() {
}
multilib_src_test() {
- virtx emake test
+ CI=1 virtx emake test
}
multilib_src_install() {
@@ -120,7 +123,7 @@ multilib_src_install() {
-e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
-e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
- if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+ if use prefix && [[ ${CHOST} != *-darwin* ]] ; then
sed \
-e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
@@ -140,6 +143,6 @@ multilib_src_install() {
if multilib_is_native_abi; then
dosym wish${v1} /usr/bin/wish
- dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+ dodoc "${SPARENT}"/{ChangeLog*,README.md,changes}
fi
}
diff --git a/dev-lang/tk/tk-8.5.17-r1.ebuild b/dev-lang/tk/tk-8.6.13.ebuild
index 6fbbccf04d82..37acc1b49d16 100644
--- a/dev-lang/tk/tk-8.5.17-r1.ebuild
+++ b/dev-lang/tk/tk-8.6.13.ebuild
@@ -1,50 +1,63 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit autotools eutils multilib prefix toolchain-funcs versionator virtualx
+# Please bump with dev-lang/tcl!
+
+inherit autotools multilib-minimal multilib prefix toolchain-funcs virtualx
MY_P="${PN}${PV/_beta/b}"
DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
+HOMEPAGE="https://www.tcl.tk/"
SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
LICENSE="tcltk"
-SLOT="0/8.5"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug threads truetype aqua xscreensaver"
+SLOT="0/8.6"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="debug +threads truetype aqua xscreensaver"
+RESTRICT="!test? ( test )"
RDEPEND="
!aqua? (
- media-libs/fontconfig
- media-libs/freetype:2
- x11-libs/libX11
- x11-libs/libXt
- truetype? ( x11-libs/libXft )
- xscreensaver? ( x11-libs/libXScrnSaver )
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+ truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
+ xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
)
- ~dev-lang/tcl-${PV}:0="
+ ~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
!aqua? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+# Not bumped to 8.6
+#RESTRICT=test
-SPARENT="${WORKDIR}/${MY_P}"
+SPARENT="${WORKDIR}/${PN}$(ver_cut 1-3 ${PV})"
S="${SPARENT}"/unix
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
- "${FILESDIR}"/${PN}-8.5.13-multilib.patch
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.6.10-multilib.patch
+ "${FILESDIR}"/${PN}-8.4.15-aqua.patch
+ "${FILESDIR}"/${PN}-8.6.9-conf.patch # Bug 125971
+ "${FILESDIR}"/${PN}-8.6.12-test.patch
+ "${FILESDIR}"/${PN}-8.6.13-test.patch
+)
- epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
- eprefixify Makefile.in
+QA_CONFIG_IMPL_DECL_SKIP=(
+ stat64 opendir64 rewinddir64 closedir64 # used to test for Large File Support
+)
- # Bug 125971
- epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
+src_prepare() {
+ find \
+ "${SPARENT}"/compat/* \
+ -delete || die
- # Bug 648570
- epatch "${FILESDIR}"/${PN}-8.6.8-libieee.patch
+ pushd "${SPARENT}" &>/dev/null || die
+ default
+ popd &>/dev/null || die
+ eprefixify Makefile.in
# Make sure we use the right pkg-config, and link against fontconfig
# (since the code base uses Fc* functions).
@@ -53,18 +66,31 @@ src_prepare() {
-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-e 's:xft freetype2:xft freetype2 fontconfig:' \
-i configure.in || die
- rm -f configure || die
+ rm configure || die
+
+ tc-export CC
sed \
-e '/chmod/s:555:755:g' \
-i Makefile.in || die
- tc-export CC
+ sed \
+ -e 's:-O[2s]\?::g' \
+ -i tcl.m4 || die
+
+ mv configure.{in,ac} || die
eautoconf
+
+ multilib_copy_sources
}
-src_configure() {
+multilib_src_configure() {
+ if tc-is-cross-compiler ; then
+ export ac_cv_func_strtod=yes
+ export tcl_cv_strtod_buggy=1
+ fi
+
local mylibdir=$(get_libdir)
econf \
@@ -76,13 +102,13 @@ src_configure() {
$(use_enable debug symbols)
}
-src_test() {
- Xemake test
+multilib_src_test() {
+ CI=1 virtx emake test
}
-src_install() {
+multilib_src_install() {
#short version number
- local v1=$(get_version_component_range 1-2)
+ local v1=$(ver_cut 1-2)
local mylibdir=$(get_libdir)
S= default
@@ -94,15 +120,15 @@ src_install() {
# and drop unnecessary -L inclusion to default system libdir
sed \
- -e "/^TK_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+ -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \
-e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
- -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+ -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \
-e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
- -e "/^TK_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
+ -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
-e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
- if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+ if use prefix && [[ ${CHOST} != *-darwin* ]] ; then
sed \
-e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
@@ -120,7 +146,8 @@ src_install() {
dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
- dosym wish${v1} /usr/bin/wish
-
- dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+ if multilib_is_native_abi; then
+ dosym wish${v1} /usr/bin/wish
+ dodoc "${SPARENT}"/{ChangeLog*,README.md,changes}
+ fi
}
diff --git a/dev-lang/tk/tk-8.6.8.ebuild b/dev-lang/tk/tk-8.6.14.ebuild
index 3e04acfe9c2d..10f9ee687045 100644
--- a/dev-lang/tk/tk-8.6.8.ebuild
+++ b/dev-lang/tk/tk-8.6.14.ebuild
@@ -1,20 +1,23 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx
+# Please bump with dev-lang/tcl!
+
+inherit autotools multilib-minimal multilib prefix toolchain-funcs virtualx
MY_P="${PN}${PV/_beta/b}"
DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
+HOMEPAGE="https://www.tcl.tk/"
SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
LICENSE="tcltk"
SLOT="0/8.6"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="debug +threads truetype aqua xscreensaver"
+RESTRICT="!test? ( test )"
RDEPEND="
!aqua? (
@@ -24,22 +27,26 @@ RDEPEND="
truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
)
- ~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]"
+ ~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
!aqua? ( x11-base/xorg-proto )"
-
+BDEPEND="virtual/pkgconfig"
# Not bumped to 8.6
#RESTRICT=test
-SPARENT="${WORKDIR}/${MY_P}"
+SPARENT="${WORKDIR}/${PN}$(ver_cut 1-3 ${PV})"
S="${SPARENT}"/unix
PATCHES=(
- "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch
- "${FILESDIR}"/${PN}-8.5.13-multilib.patch
+ "${FILESDIR}"/${PN}-8.6.10-multilib.patch
"${FILESDIR}"/${PN}-8.4.15-aqua.patch
- "${FILESDIR}"/${PN}-8.5.14-conf.patch # Bug 125971
- "${FILESDIR}"/${PN}-8.6.8-libieee.patch
+ "${FILESDIR}"/${PN}-8.6.9-conf.patch # Bug 125971
+ "${FILESDIR}"/${PN}-8.6.12-test.patch
+ "${FILESDIR}"/${P}-test.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ stat64 opendir64 readdir64 rewinddir64 closedir64 # used on AIX
)
src_prepare() {
@@ -96,12 +103,12 @@ multilib_src_configure() {
}
multilib_src_test() {
- virtx emake test
+ CI=1 virtx emake test
}
multilib_src_install() {
#short version number
- local v1=$(get_version_component_range 1-2)
+ local v1=$(ver_cut 1-2)
local mylibdir=$(get_libdir)
S= default
@@ -121,7 +128,7 @@ multilib_src_install() {
-e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
-e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
- if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+ if use prefix && [[ ${CHOST} != *-darwin* ]] ; then
sed \
-e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
@@ -141,6 +148,6 @@ multilib_src_install() {
if multilib_is_native_abi; then
dosym wish${v1} /usr/bin/wish
- dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+ dodoc "${SPARENT}"/{ChangeLog*,README.md,changes}
fi
}