1 |
commit: 1ddd9afd7f47975bb1923df4976055a37e9675a9 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 28 13:37:01 2018 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 28 13:37:50 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ddd9afd |
7 |
|
8 |
dev-lang/tk: Version bump (v8.6.9) |
9 |
|
10 |
Closes: https://bugs.gentoo.org/673758 |
11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
12 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
13 |
|
14 |
dev-lang/tk/Manifest | 1 + |
15 |
dev-lang/tk/files/tk-8.6.9-conf.patch | 11 +++ |
16 |
dev-lang/tk/tk-8.6.9.ebuild | 146 ++++++++++++++++++++++++++++++++++ |
17 |
3 files changed, 158 insertions(+) |
18 |
|
19 |
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest |
20 |
index ffa1de9db41..60e3de59ad9 100644 |
21 |
--- a/dev-lang/tk/Manifest |
22 |
+++ b/dev-lang/tk/Manifest |
23 |
@@ -1,3 +1,4 @@ |
24 |
DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568 |
25 |
DIST tk8.5.17-src.tar.gz 4095985 BLAKE2B 4cbb140c30ca717ee499b9ad9e1a3df27a470a78613edbaec425c39afaa41d59276bbe487933a4e77a9722fcafa9113b203cf5c828660bdeb38f667c3263c3cd SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f |
26 |
DIST tk8.6.8-src.tar.gz 4319854 BLAKE2B 167c5dc6c32e49653c04bc067c3d75df022ca230657be32797021b0e2f7748215d9ad0493c8020b8d1be1f005b9b2d561339a6a0b209721c0d05dd222d47d377 SHA512 d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9 |
27 |
+DIST tk8.6.9-src.tar.gz 4364606 BLAKE2B 9c96d977aa72dcc0c8d2a570d644284a1eef217ef082d8a78461bdcb4845e206ccad59cb5bc21ef80e32ea19951fa3a845e45059bb9eaf0756f128a95530260c SHA512 654d73aad006e628110057681477b958b7ec0a42287bc78259fb4b84635e7ebe757e69099d66c0c73479bc506ca66fa5baf13f13b0f403d60b2c54fd48a4a686 |
28 |
|
29 |
diff --git a/dev-lang/tk/files/tk-8.6.9-conf.patch b/dev-lang/tk/files/tk-8.6.9-conf.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..d5b690069c9 |
32 |
--- /dev/null |
33 |
+++ b/dev-lang/tk/files/tk-8.6.9-conf.patch |
34 |
@@ -0,0 +1,11 @@ |
35 |
+--- tk8.6.9/unix/tcl.m4 |
36 |
++++ tk8.6.9/unix/tcl.m4 |
37 |
+@@ -1407,7 +1407,7 @@ |
38 |
+ # get rid of the warnings. |
39 |
+ #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" |
40 |
+ |
41 |
+- SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared' |
42 |
++ SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared -Wl,-soname,${@}' |
43 |
+ DL_OBJS="tclLoadDl.o" |
44 |
+ DL_LIBS="-ldl" |
45 |
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic" |
46 |
|
47 |
diff --git a/dev-lang/tk/tk-8.6.9.ebuild b/dev-lang/tk/tk-8.6.9.ebuild |
48 |
new file mode 100644 |
49 |
index 00000000000..94b9ef311b1 |
50 |
--- /dev/null |
51 |
+++ b/dev-lang/tk/tk-8.6.9.ebuild |
52 |
@@ -0,0 +1,146 @@ |
53 |
+# Copyright 1999-2018 Gentoo Authors |
54 |
+# Distributed under the terms of the GNU General Public License v2 |
55 |
+ |
56 |
+EAPI=7 |
57 |
+ |
58 |
+inherit autotools multilib-minimal prefix toolchain-funcs virtualx |
59 |
+ |
60 |
+MY_P="${PN}${PV/_beta/b}" |
61 |
+ |
62 |
+DESCRIPTION="Tk Widget Set" |
63 |
+HOMEPAGE="http://www.tcl.tk/" |
64 |
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" |
65 |
+ |
66 |
+LICENSE="tcltk" |
67 |
+SLOT="0/8.6" |
68 |
+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" |
69 |
+IUSE="debug +threads truetype aqua xscreensaver" |
70 |
+ |
71 |
+RDEPEND=" |
72 |
+ !aqua? ( |
73 |
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] |
74 |
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
75 |
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] |
76 |
+ truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] ) |
77 |
+ xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) |
78 |
+ ) |
79 |
+ ~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]" |
80 |
+DEPEND="${RDEPEND} |
81 |
+ !aqua? ( x11-base/xorg-proto )" |
82 |
+ |
83 |
+# Not bumped to 8.6 |
84 |
+#RESTRICT=test |
85 |
+ |
86 |
+SPARENT="${WORKDIR}/${MY_P}" |
87 |
+S="${SPARENT}"/unix |
88 |
+ |
89 |
+PATCHES=( |
90 |
+ "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch |
91 |
+ "${FILESDIR}"/${PN}-8.5.13-multilib.patch |
92 |
+ "${FILESDIR}"/${PN}-8.4.15-aqua.patch |
93 |
+ "${FILESDIR}"/${P}-conf.patch # Bug 125971 |
94 |
+ "${FILESDIR}"/${PN}-8.6.8-libieee.patch |
95 |
+) |
96 |
+ |
97 |
+src_prepare() { |
98 |
+ find \ |
99 |
+ "${SPARENT}"/compat/* \ |
100 |
+ -delete || die |
101 |
+ |
102 |
+ pushd "${SPARENT}" &>/dev/null || die |
103 |
+ default |
104 |
+ popd &>/dev/null || die |
105 |
+ eprefixify Makefile.in |
106 |
+ |
107 |
+ # Make sure we use the right pkg-config, and link against fontconfig |
108 |
+ # (since the code base uses Fc* functions). |
109 |
+ sed \ |
110 |
+ -e 's/FT_New_Face/XftFontOpen/g' \ |
111 |
+ -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ |
112 |
+ -e 's:xft freetype2:xft freetype2 fontconfig:' \ |
113 |
+ -i configure.in || die |
114 |
+ rm configure || die |
115 |
+ |
116 |
+ tc-export CC |
117 |
+ |
118 |
+ sed \ |
119 |
+ -e '/chmod/s:555:755:g' \ |
120 |
+ -i Makefile.in || die |
121 |
+ |
122 |
+ sed \ |
123 |
+ -e 's:-O[2s]\?::g' \ |
124 |
+ -i tcl.m4 || die |
125 |
+ |
126 |
+ mv configure.{in,ac} || die |
127 |
+ |
128 |
+ eautoconf |
129 |
+ |
130 |
+ multilib_copy_sources |
131 |
+} |
132 |
+ |
133 |
+multilib_src_configure() { |
134 |
+ if tc-is-cross-compiler ; then |
135 |
+ export ac_cv_func_strtod=yes |
136 |
+ export tcl_cv_strtod_buggy=1 |
137 |
+ fi |
138 |
+ |
139 |
+ local mylibdir=$(get_libdir) |
140 |
+ |
141 |
+ econf \ |
142 |
+ --with-tcl="${EPREFIX}/usr/${mylibdir}" \ |
143 |
+ $(use_enable threads) \ |
144 |
+ $(use_enable aqua) \ |
145 |
+ $(use_enable truetype xft) \ |
146 |
+ $(use_enable xscreensaver xss) \ |
147 |
+ $(use_enable debug symbols) |
148 |
+} |
149 |
+ |
150 |
+multilib_src_test() { |
151 |
+ virtx emake test |
152 |
+} |
153 |
+ |
154 |
+multilib_src_install() { |
155 |
+ #short version number |
156 |
+ local v1=$(ver_cut 1-2) |
157 |
+ local mylibdir=$(get_libdir) |
158 |
+ |
159 |
+ S= default |
160 |
+ |
161 |
+ # normalize $S path, bug #280766 (pkgcore) |
162 |
+ local nS="$(cd "${S}"; pwd)" |
163 |
+ |
164 |
+ # fix the tkConfig.sh to eliminate refs to the build directory |
165 |
+ # and drop unnecessary -L inclusion to default system libdir |
166 |
+ |
167 |
+ sed \ |
168 |
+ -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \ |
169 |
+ -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ |
170 |
+ -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \ |
171 |
+ -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \ |
172 |
+ -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ |
173 |
+ -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \ |
174 |
+ -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \ |
175 |
+ -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die |
176 |
+ if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then |
177 |
+ sed \ |
178 |
+ -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ |
179 |
+ -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ |
180 |
+ -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die |
181 |
+ fi |
182 |
+ |
183 |
+ # install private headers |
184 |
+ insinto /usr/${mylibdir}/tk${v1}/include/unix |
185 |
+ doins "${S}"/*.h |
186 |
+ insinto /usr/${mylibdir}/tk${v1}/include/generic |
187 |
+ doins "${SPARENT}"/generic/*.h |
188 |
+ rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die |
189 |
+ |
190 |
+ # install symlink for libraries |
191 |
+ dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) |
192 |
+ dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a |
193 |
+ |
194 |
+ if multilib_is_native_abi; then |
195 |
+ dosym wish${v1} /usr/bin/wish |
196 |
+ dodoc "${SPARENT}"/{ChangeLog*,README,changes} |
197 |
+ fi |
198 |
+} |