1 |
commit: 6dd4816907f428ff7396288388ffa4cc12308c59 |
2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 13 07:58:53 2017 +0000 |
4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 13 08:00:08 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dd48169 |
7 |
|
8 |
dev-lang/tk: version bump 8.6.7 |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
dev-lang/tk/Manifest | 1 + |
13 |
dev-lang/tk/tk-8.6.7.ebuild | 148 ++++++++++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 149 insertions(+) |
15 |
|
16 |
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest |
17 |
index 07e414091d4..113b478bf34 100644 |
18 |
--- a/dev-lang/tk/Manifest |
19 |
+++ b/dev-lang/tk/Manifest |
20 |
@@ -2,3 +2,4 @@ DIST tcl8.5.17-src.tar.gz 4546317 SHA256 4c7cd8f2e0900cb36dde899b3f9f4d5c471ee3c |
21 |
DIST tk8.5.17-src.tar.gz 4095985 SHA256 b517914d076fba047c4bbc02f7dd7f0b0b06d1931826ae440129162d8bba92d3 SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f WHIRLPOOL 431ad2d190755b997b07c8a59046c7f15a7be39cb8b162daccae8eca4c4b6e97a52d5823e7e566380935abefad347d18a28fc3a7e78892b6186ebcefce726fd3 |
22 |
DIST tk8.6.5-src.tar.gz 4417393 SHA256 fbbd93541b4cd467841208643b4014c4543a54c3597586727f0ab128220d7946 SHA512 9acf2ef993a566a7cdd1efe21dc896b09125c65d86df53ab5a78542b21d3f031e9f9d72b81738705636c268b5ce72934c483eb087d5c0114f913c9075db9a3b1 WHIRLPOOL 8f0e789d05f05778f0f383a6cbabd6e2225401ab0ce68bd408ab747408b7f83e4f47ef7041ee23231dbfd5dafa74d8f498922104b3e38283dcf1ab83e7cb2dfd |
23 |
DIST tk8.6.6-src.tar.gz 4273737 SHA256 d62c371a71b4744ed830e3c21d27968c31dba74dd2c45f36b9b071e6d88eb19d SHA512 223c72ab5a6f6040928c56843598b878efafab44ed4152a38e68aa2800f2c181adc50a8bf23279b7d446493eec43854920e8b649b6a34ecdf31ecc07ccc74044 WHIRLPOOL 65b8395fdefad62ff6d9323fa7857fadad49867e34e3f641909c2e71d883f34f7b1491f9b3abbaf66409bc195bebda8f1e8caee5f002e4e25026fcc8315cd9d6 |
24 |
+DIST tk8.6.7-src.tar.gz 4282972 SHA256 061de2a354f9b7c7d04de3984c90c9bc6dd3a1b8377bb45509f1ad8a8d6337aa SHA512 adf35991b20878d18a6940cb3d24d821586828537edf6d20f9223f2989d317adbcbb5360f3226014d96fe44e7ec06cfdf434309438c90a09878345b7106c7dd9 WHIRLPOOL 912f530f37813d016cedfbda79ae05fb329e67263f26825a3912965c7579fbe5882ec3311589819489a3d6716f658732540419cac10843d4db46ca4c3f193aa1 |
25 |
|
26 |
diff --git a/dev-lang/tk/tk-8.6.7.ebuild b/dev-lang/tk/tk-8.6.7.ebuild |
27 |
new file mode 100644 |
28 |
index 00000000000..fa1e159eccd |
29 |
--- /dev/null |
30 |
+++ b/dev-lang/tk/tk-8.6.7.ebuild |
31 |
@@ -0,0 +1,148 @@ |
32 |
+# Copyright 1999-2017 Gentoo Foundation |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+ |
35 |
+EAPI=6 |
36 |
+ |
37 |
+inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx |
38 |
+ |
39 |
+MY_P="${PN}${PV/_beta/b}" |
40 |
+ |
41 |
+DESCRIPTION="Tk Widget Set" |
42 |
+HOMEPAGE="http://www.tcl.tk/" |
43 |
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" |
44 |
+ |
45 |
+LICENSE="tcltk" |
46 |
+SLOT="0/8.6" |
47 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
48 |
+IUSE="debug +threads truetype aqua xscreensaver" |
49 |
+ |
50 |
+RDEPEND=" |
51 |
+ !aqua? ( |
52 |
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] |
53 |
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
54 |
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] |
55 |
+ truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] ) |
56 |
+ xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) |
57 |
+ ) |
58 |
+ ~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]" |
59 |
+DEPEND="${RDEPEND} |
60 |
+ !aqua? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )" |
61 |
+ |
62 |
+# Not bumped to 8.6 |
63 |
+#RESTRICT=test |
64 |
+ |
65 |
+SPARENT="${WORKDIR}/${MY_P}" |
66 |
+S="${SPARENT}"/unix |
67 |
+ |
68 |
+PATCHES=( |
69 |
+ "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \ |
70 |
+ "${FILESDIR}"/${PN}-8.5.13-multilib.patch |
71 |
+ |
72 |
+ "${FILESDIR}"/${PN}-8.4.15-aqua.patch |
73 |
+ |
74 |
+ # Bug 125971 |
75 |
+ "${FILESDIR}"/${PN}-8.5.14-conf.patch |
76 |
+) |
77 |
+ |
78 |
+src_prepare() { |
79 |
+ find \ |
80 |
+ "${SPARENT}"/compat/* \ |
81 |
+ -delete || die |
82 |
+ |
83 |
+ pushd "${SPARENT}" &>/dev/null || die |
84 |
+ default |
85 |
+ popd &>/dev/null || die |
86 |
+ eprefixify Makefile.in |
87 |
+ |
88 |
+ # Make sure we use the right pkg-config, and link against fontconfig |
89 |
+ # (since the code base uses Fc* functions). |
90 |
+ sed \ |
91 |
+ -e 's/FT_New_Face/XftFontOpen/g' \ |
92 |
+ -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ |
93 |
+ -e 's:xft freetype2:xft freetype2 fontconfig:' \ |
94 |
+ -i configure.in || die |
95 |
+ rm configure || die |
96 |
+ |
97 |
+ tc-export CC |
98 |
+ |
99 |
+ sed \ |
100 |
+ -e '/chmod/s:555:755:g' \ |
101 |
+ -i Makefile.in || die |
102 |
+ |
103 |
+ sed \ |
104 |
+ -e 's:-O[2s]\?::g' \ |
105 |
+ -i tcl.m4 || die |
106 |
+ |
107 |
+ mv configure.{in,ac} || die |
108 |
+ |
109 |
+ eautoconf |
110 |
+ |
111 |
+ multilib_copy_sources |
112 |
+} |
113 |
+ |
114 |
+multilib_src_configure() { |
115 |
+ if tc-is-cross-compiler ; then |
116 |
+ export ac_cv_func_strtod=yes |
117 |
+ export tcl_cv_strtod_buggy=1 |
118 |
+ fi |
119 |
+ |
120 |
+ local mylibdir=$(get_libdir) |
121 |
+ |
122 |
+ econf \ |
123 |
+ --with-tcl="${EPREFIX}/usr/${mylibdir}" \ |
124 |
+ $(use_enable threads) \ |
125 |
+ $(use_enable aqua) \ |
126 |
+ $(use_enable truetype xft) \ |
127 |
+ $(use_enable xscreensaver xss) \ |
128 |
+ $(use_enable debug symbols) |
129 |
+} |
130 |
+ |
131 |
+multilib_src_test() { |
132 |
+ virtx emake test |
133 |
+} |
134 |
+ |
135 |
+multilib_src_install() { |
136 |
+ #short version number |
137 |
+ local v1=$(get_version_component_range 1-2) |
138 |
+ local mylibdir=$(get_libdir) |
139 |
+ |
140 |
+ S= default |
141 |
+ |
142 |
+ # normalize $S path, bug #280766 (pkgcore) |
143 |
+ local nS="$(cd "${S}"; pwd)" |
144 |
+ |
145 |
+ # fix the tkConfig.sh to eliminate refs to the build directory |
146 |
+ # and drop unnecessary -L inclusion to default system libdir |
147 |
+ |
148 |
+ sed \ |
149 |
+ -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \ |
150 |
+ -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ |
151 |
+ -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \ |
152 |
+ -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \ |
153 |
+ -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ |
154 |
+ -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \ |
155 |
+ -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \ |
156 |
+ -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die |
157 |
+ if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then |
158 |
+ sed \ |
159 |
+ -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ |
160 |
+ -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ |
161 |
+ -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die |
162 |
+ fi |
163 |
+ |
164 |
+ # install private headers |
165 |
+ insinto /usr/${mylibdir}/tk${v1}/include/unix |
166 |
+ doins "${S}"/*.h |
167 |
+ insinto /usr/${mylibdir}/tk${v1}/include/generic |
168 |
+ doins "${SPARENT}"/generic/*.h |
169 |
+ rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die |
170 |
+ |
171 |
+ # install symlink for libraries |
172 |
+ dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) |
173 |
+ dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a |
174 |
+ |
175 |
+ if multilib_is_native_abi; then |
176 |
+ dosym wish${v1} /usr/bin/wish |
177 |
+ dodoc "${SPARENT}"/{ChangeLog*,README,changes} |
178 |
+ fi |
179 |
+} |