1 |
commit: 2633fd47e68a55cfa02af508f8cf49ec2adb0647 |
2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 26 10:22:13 2020 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 26 10:22:13 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2633fd47 |
7 |
|
8 |
dev-lang/tcl: version bump to 8.6.10 |
9 |
|
10 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
11 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
12 |
|
13 |
dev-lang/tcl/Manifest | 1 + |
14 |
dev-lang/tcl/files/tcl-8.6.10-multilib.patch | 11 +++ |
15 |
dev-lang/tcl/tcl-8.6.10.ebuild | 136 +++++++++++++++++++++++++++ |
16 |
3 files changed, 148 insertions(+) |
17 |
|
18 |
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest |
19 |
index f7132426671..bfb32e9cdaa 100644 |
20 |
--- a/dev-lang/tcl/Manifest |
21 |
+++ b/dev-lang/tcl/Manifest |
22 |
@@ -1,3 +1,4 @@ |
23 |
+DIST tcl-core8.6.10-src.tar.gz 6008840 BLAKE2B 592f708492e56da3577f190adc3da4f2979f32a570dfc29cb53fde58a83d804223dfe9527b76d094de3005a6e12dda73674573bab3af2e591b4573163b81b9c0 SHA512 de31ac8fc5226c831198af88befa05ccb1842dcfd209690e25b907f062033b3ae7a77bc12e85c4210ce85cfd7c598060e03fc81b0e624d422bfe4df655cc9068 |
24 |
DIST tcl-core8.6.8-src.tar.gz 5887483 BLAKE2B 2b8428652e451b817fe63a811f910001929cdcbc8a8361cdf4f7df8e13cbf9b18c94a91c22c0f09cc46dc0174a66c44774b485539a8f24c14faee6658547b6b8 SHA512 36e6079b582c205e8c89435b361ef96550541357f473aea2ca4e6f01bd84e50ebd1474a75a1ae90640b9a5b392fb01ddfa71f0fa28e409b3569d88c32b4ddb69 |
25 |
DIST tcl-core8.6.9-src.tar.gz 5932010 BLAKE2B ddc0cff12aeeebbf8d1c799db9e154a9ecbe2a2e2afce97c6f15c408301b7a40119bd1c861aa724c178bd9abfe0616c7bcafd9cf6714ed49cf882c9085222cf3 SHA512 306a38a27729b764bae2eae6c4cdd8cd6aee5de6bd924d6a487c8691ee874e4459abc1fa785183c2f6ff4d2d57be98093dd7460c5a668cf994e8f1c31516ae67 |
26 |
DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568 |
27 |
|
28 |
diff --git a/dev-lang/tcl/files/tcl-8.6.10-multilib.patch b/dev-lang/tcl/files/tcl-8.6.10-multilib.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..329d5614e78 |
31 |
--- /dev/null |
32 |
+++ b/dev-lang/tcl/files/tcl-8.6.10-multilib.patch |
33 |
@@ -0,0 +1,11 @@ |
34 |
+--- a/unix/configure.in 2020-12-26 10:39:12.107965844 +0100 |
35 |
++++ b/unix/configure.in 2020-12-26 10:39:44.821378776 +0100 |
36 |
+@@ -773,7 +773,7 @@ |
37 |
+ |
38 |
+ eval "TCL_LIB_FILE=${TCL_LIB_FILE}" |
39 |
+ |
40 |
+-test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' |
41 |
++test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' |
42 |
+ PRIVATE_INCLUDE_DIR='$(includedir)' |
43 |
+ HTML_DIR='$(DISTDIR)/html' |
44 |
+ |
45 |
|
46 |
diff --git a/dev-lang/tcl/tcl-8.6.10.ebuild b/dev-lang/tcl/tcl-8.6.10.ebuild |
47 |
new file mode 100644 |
48 |
index 00000000000..be6d50c6282 |
49 |
--- /dev/null |
50 |
+++ b/dev-lang/tcl/tcl-8.6.10.ebuild |
51 |
@@ -0,0 +1,136 @@ |
52 |
+# Copyright 1999-2020 Gentoo Authors |
53 |
+# Distributed under the terms of the GNU General Public License v2 |
54 |
+ |
55 |
+EAPI=7 |
56 |
+ |
57 |
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs |
58 |
+ |
59 |
+MY_P="${PN}${PV}" |
60 |
+ |
61 |
+DESCRIPTION="Tool Command Language" |
62 |
+HOMEPAGE="http://www.tcl.tk/" |
63 |
+SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz" |
64 |
+ |
65 |
+LICENSE="tcltk" |
66 |
+SLOT="0/8.6" |
67 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
68 |
+IUSE="debug +threads" |
69 |
+ |
70 |
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" |
71 |
+DEPEND="${RDEPEND}" |
72 |
+ |
73 |
+SPARENT="${WORKDIR}/${MY_P}" |
74 |
+S="${SPARENT}"/unix |
75 |
+ |
76 |
+PATCHES=( |
77 |
+ "${FILESDIR}"/${P}-multilib.patch |
78 |
+ "${FILESDIR}"/${PN}-8.6.8-conf.patch # Bug 125971 |
79 |
+ "${FILESDIR}"/${PN}-8.6.9-include-spec.patch # Bug 731120 |
80 |
+) |
81 |
+ |
82 |
+src_prepare() { |
83 |
+ find \ |
84 |
+ "${SPARENT}"/compat/* \ |
85 |
+ "${SPARENT}"/doc/try.n \ |
86 |
+ -delete || die |
87 |
+ |
88 |
+ pushd "${SPARENT}" &>/dev/null || die |
89 |
+ default |
90 |
+ popd &>/dev/null || die |
91 |
+ |
92 |
+ # httpold tests require netowk |
93 |
+ rm ../tests/httpold.test \ |
94 |
+ ../tests/env.test \ |
95 |
+ ../tests/http.test \ |
96 |
+ || die |
97 |
+ |
98 |
+ # workaround stack check issues, bug #280934 |
99 |
+ use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1" |
100 |
+ |
101 |
+ tc-export CC |
102 |
+ |
103 |
+ sed \ |
104 |
+ -e '/chmod/s:555:755:g' \ |
105 |
+ -i Makefile.in || die |
106 |
+ |
107 |
+ sed \ |
108 |
+ -e 's:-O[2s]\?::g' \ |
109 |
+ -i tcl.m4 || die |
110 |
+ |
111 |
+ mv configure.{in,ac} || die |
112 |
+ |
113 |
+ eautoconf |
114 |
+ |
115 |
+ multilib_copy_sources |
116 |
+} |
117 |
+ |
118 |
+multilib_src_configure() { |
119 |
+ # We went ahead and deleted the whole compat/ subdir which means |
120 |
+ # the configure tests to detect broken versions need to pass (else |
121 |
+ # we'll fail to build). This comes up when cross-compiling, but |
122 |
+ # might as well get a minor configure speed up normally. |
123 |
+ export ac_cv_func_memcmp_working="yes" |
124 |
+ export tcl_cv_str{str,toul,tod}_unbroken="ok" |
125 |
+ export tcl_cv_strtod_buggy="no" |
126 |
+ |
127 |
+ econf \ |
128 |
+ $(use_enable threads) \ |
129 |
+ $(use_enable debug symbols) |
130 |
+} |
131 |
+ |
132 |
+multilib_src_install() { |
133 |
+ #short version number |
134 |
+ local v1=$(ver_cut 1-2) |
135 |
+ local mylibdir=$(get_libdir) |
136 |
+ |
137 |
+ S= default |
138 |
+ # fix the tclConfig.sh to eliminate refs to the build directory |
139 |
+ # and drop unnecessary -L inclusion to default system libdir |
140 |
+ |
141 |
+ sed \ |
142 |
+ -e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \ |
143 |
+ -e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ |
144 |
+ -e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \ |
145 |
+ -e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \ |
146 |
+ -e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ |
147 |
+ -e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \ |
148 |
+ -e "/^TCL_LIBW_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \ |
149 |
+ -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die |
150 |
+ if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then |
151 |
+ sed \ |
152 |
+ -e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ |
153 |
+ -e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ |
154 |
+ -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die |
155 |
+ fi |
156 |
+ |
157 |
+ # install private headers |
158 |
+ insinto /usr/${mylibdir}/tcl${v1}/include/unix |
159 |
+ doins *.h |
160 |
+ insinto /usr/${mylibdir}/tcl${v1}/include/generic |
161 |
+ doins "${SPARENT}"/generic/*.h |
162 |
+ rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die |
163 |
+ |
164 |
+ # install symlink for libraries |
165 |
+ dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname) |
166 |
+ dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a |
167 |
+ |
168 |
+ if multilib_is_native_abi; then |
169 |
+ dosym tclsh${v1} /usr/bin/tclsh |
170 |
+ dodoc "${SPARENT}"/{ChangeLog*,README,changes} |
171 |
+ fi |
172 |
+} |
173 |
+ |
174 |
+pkg_postinst() { |
175 |
+ for version in ${REPLACING_VERSIONS}; do |
176 |
+ if ver_test 8.6 -lt ${version}; then |
177 |
+ echo |
178 |
+ ewarn "You're upgrading from <${P}, you must recompile the other" |
179 |
+ ewarn "packages on your system that link with tcl after the upgrade" |
180 |
+ ewarn "completes. To perform this action, please run revdep-rebuild" |
181 |
+ ewarn "in package app-portage/gentoolkit." |
182 |
+ ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should" |
183 |
+ ewarn "upgrade them before this recompilation, too," |
184 |
+ echo |
185 |
+ fi |
186 |
+ done |
187 |
+} |