Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/python/
Date: Sat, 30 Oct 2021 06:43:54
Message-Id: 1635576227.65efb7a0d7a77538c298afc57792f18a2049a10b.mgorny@gentoo
1 commit: 65efb7a0d7a77538c298afc57792f18a2049a10b
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 30 06:35:59 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 30 06:43:47 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65efb7a0
7
8 dev-lang/python: Bump to 3.11.0a1
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-lang/python/Manifest | 3 +
13 dev-lang/python/python-3.11.0_alpha1.ebuild | 347 ++++++++++++++++++++++++++++
14 2 files changed, 350 insertions(+)
15
16 diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
17 index d528909e638..8a649ef211d 100644
18 --- a/dev-lang/python/Manifest
19 +++ b/dev-lang/python/Manifest
20 @@ -2,6 +2,8 @@ DIST Python-2.7.18.tar.xz 12854736 BLAKE2B 060a621c91dd8e3d321aec99d44c17aa67381
21 DIST Python-2.7.18.tar.xz.asc 833 BLAKE2B 1d98770e46171971fb99994508d238c01d2755281d2f94353314014d9e83e0ec5f0b3e3950ea1fdf5fce9ba6b8f55312355845c2a3fc4291c27ee56fe6215448 SHA512 c2a5f5a52f47dec52460ad3275758d4e5de6e7075c3def4353c988d74d563a39b42cae2d5eb24e2a23a6247cef69100f91620b11a49c2359fbf99b203c9cbda8
22 DIST Python-3.10.0.tar.xz 18726176 BLAKE2B 77143edf733cadf7e52327a58782f0617b1dd0d132cf58e0f26d37a454bb97f82e7931118a6a71f22779d9b6ec4efca974c43c19a6338b4b24a9fd616b60cc89 SHA512 82b2729afc7d72a80882f199970667dce7d971a2e5ecfe6cf84f7b68612ab2caf6ed6d7a8cb81f24ea85cb0816464bb2e8b2e6884eda62fa40742edc674193bd
23 DIST Python-3.10.0.tar.xz.asc 833 BLAKE2B 295df19932ea076bb1a50acb38782055ff34fb235df0380fa361727eedb3ca68aeca2a31419de5b05ce128c2e21ad04605c226e7a61d508a17607f615e46e570 SHA512 67236e02bc49da1423717cb54216b745f613ba2fc4b372a4aa15a36ab15fe69d9b9087070382957d480df7576d13056caedcd979fb56531799a1190b822f673d
24 +DIST Python-3.11.0a1.tar.xz 18678136 BLAKE2B 1a28fdc2bbbb60896240b4a7bc361f060205dae51fa2d0e4f981752d81c14f1a28ebef09960ea82d5158e874d0e335ee45f69d968f7433ce4c0d02978ad39c95 SHA512 3705fa3d05fccd491fba981c9495d5b36793f284a39b267a5ff7b25c7f08de84bbd5afe200296cedd1cc55f495fd3efc55d7b34910e1be1a785ce5772b857d7a
25 +DIST Python-3.11.0a1.tar.xz.asc 833 BLAKE2B f5c6064e8b9de17bc22d60b0ae52a9aa887823a9a52fc8fff1e9d29e05c4c1392841a7c492fe69b426be4ee945f0cbfed7ec0d31604e488458d6c61583a051dd SHA512 b9d1542f215b5633835d21de0311d324c62e53b7afc525c00d26c863740fd01cc8c18a6ecb0a8ce8d38bf543cebdb64f0930f9201a8968dbbedf58fe9ad4c05c
26 DIST Python-3.6.14.tar.xz 17218148 BLAKE2B efe655cb907ffa678ca135f88ba9d867e523969ad82dbc09ffb6d8d383824a4b43c525e156a3c35484a526b4b3ea755109e5ef15d17852d44e3351c307fc5e91 SHA512 15b82b7285db97cb27a6fcd57ce9e258fdf8dbdb2f00e22e4331161b8557c8244342546c4143e84c72730759e0276770396b6ca5bb7cf87310cca8e175423006
27 DIST Python-3.6.14.tar.xz.asc 833 BLAKE2B 81c79dca5728b21b8c2badcaa1242836f1cf13984bb755463cfe9e4fd96a02ebf31f1a9239759a937c6d6a04c18bfc682a82cb0ab2e5a473de153423a7248c9c SHA512 600bf504f2c0d3ce7d1e8e953b4f27a7a7c996b7b9cd70efb876178fa5424130bff5414d5ac7deb8b45103ed417fd40d830613db39750d35a0c967c8fdfea50d
28 DIST Python-3.6.15.tar.xz 17223796 BLAKE2B c139c6f93ea70ad898d5626dfa964280a14de9676f0d9d55668ad91618b1ba330874cbba8d6526a87e53b585ff34e3bf242613ca3fb17ee60f362a9676306c7d SHA512 f1894d704c91669d94ec83b5631288bf1e0c73ddcf33cea0977575f262eb672caebc8ac00e34e9b99c321c19cc9a71d6081fa957bb8e23cf5bfba50f345145ef
29 @@ -14,6 +16,7 @@ DIST Python-3.9.7.tar.xz 19123232 BLAKE2B 69dfba6974c8c74de1b71977d28cad4d7c2661
30 DIST Python-3.9.7.tar.xz.asc 833 BLAKE2B 2d9c47e47d9a625e393a8b456dd5b10dd485fc13ca7c236b5fd304c373879bea8ab3c67ff99c3a81350443f6ccba20718466a221a05faada6b82cfe92943fdbf SHA512 7ff9f845f520efab3b4a0e95da3ffe055ee5777a4173a5b2cc1fd2419dc2b4faf30d1e711e372df36e34bc971ecfcde88a7cd815cfe2d8080ccb575a1ae8e101
31 DIST python-gentoo-patches-2.7.18_p13.tar.xz 33296 BLAKE2B 91b711458aff4f6337ee1b34aff58d7edda6725644a64c9320076a1e04c816729ed163d82333cfe4dfef379a9ad5ef50ba00abdbbfed4503b0f92c8f0b7ca683 SHA512 97f3657a4a95e8492aa710801b974a56e6dd4636e475aea45cbbe76e7ae32d00f07b05769887f05e49cb0df8584ac9499a7ce842bad77f837a7c869f9b769b07
32 DIST python-gentoo-patches-3.10.0_p1.tar.xz 10068 BLAKE2B 1c9817b449831559f0a0b722c02a5f55d94b3dfde98e5882c1403fe24a4addf7074ab39c09b91cff6fd7ace2e4b6e8ed899d9a0b9ffd6612ce315c4c192bd309 SHA512 39aa41dbf17b6dc5255491c75031a3dae6962b44125e426dbfdce365a6533c5dae9856b1fff8016a189124b7cff72d2665ce99da344c2f9dff005ba685e8c2c4
33 +DIST python-gentoo-patches-3.11.0a1.tar.xz 9468 BLAKE2B 9bbc0c41d366752d2481c19070d71c27f88fd605e35e62f6b86498cb537051e92972f3c3f7b234485fd07e2a6ac4e4d6701e03e7893897531da58fbaaa609e76 SHA512 a06274c8c1d772121ac9570125eea12a4e53bcac030b8f4f3c5c76d68fc475df3f073a4dffe55614ced9cf031c7581e428b1cee67078c63d4f41e0a51e372e41
34 DIST python-gentoo-patches-3.6.14_p1.tar.xz 16576 BLAKE2B 902a9073e6d3e40cfba105680d9947b64a4bfa1632381bc71afbd2691350dccb36f498bf17ac7dfc8ce331dfc3fb7e3cdd539cea3f5e9db1c49210ad4d124182 SHA512 4aa354f1ca8d9bb3c30b666ef61cac8380741342102aeb9ea77cc06ae62179f595acc1c2e6321e9c2395abbc3fbc649ecc93b80443d139859924524989539992
35 DIST python-gentoo-patches-3.6.15.tar.xz 15300 BLAKE2B f49fd96f6ad1a1c94fea6b83acd229a81754b86061e243044ead4b9a9d5122a2e43b270b68722c359c084c05a566a3ad70aa46588ab7a005ee560ee118b92b8b SHA512 cc33491a33f3f1d990cf494d53b91b74db761142e8aebe1bd4b128ef10a268ff945e5ba08daad39cee095612a8e52265d6988873ecf9c073377cbbc10735aa39
36 DIST python-gentoo-patches-3.7.12_p1.tar.xz 19112 BLAKE2B e9964244af3db544dd6e96d85ca4bc24d7131b48eda85df5bafa3fb36474a024cecbbf4b27324e1f35f76ae6a1aed31dd7896e831b79b574b45a4371afcc7e5b SHA512 9ec996c2904f99bd6651ed1b700eabd91f2b82b1e9e0f3d9572243886a9c7139bf8ac2af04169485d3ca6339e1a87044cba203f6f0aee9609d2a1d53c812548d
37
38 diff --git a/dev-lang/python/python-3.11.0_alpha1.ebuild b/dev-lang/python/python-3.11.0_alpha1.ebuild
39 new file mode 100644
40 index 00000000000..c69b8cd0966
41 --- /dev/null
42 +++ b/dev-lang/python/python-3.11.0_alpha1.ebuild
43 @@ -0,0 +1,347 @@
44 +# Copyright 1999-2021 Gentoo Authors
45 +# Distributed under the terms of the GNU General Public License v2
46 +
47 +EAPI="7"
48 +WANT_LIBTOOL="none"
49 +
50 +inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
51 + python-utils-r1 toolchain-funcs verify-sig
52 +
53 +MY_PV=${PV/_alpha/a}
54 +MY_P="Python-${MY_PV%_p*}"
55 +PYVER=$(ver_cut 1-2)
56 +PATCHSET="python-gentoo-patches-${MY_PV}"
57 +
58 +DESCRIPTION="An interpreted, interactive, object-oriented programming language"
59 +HOMEPAGE="https://www.python.org/"
60 +SRC_URI="https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
61 + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
62 + verify-sig? (
63 + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
64 + )"
65 +S="${WORKDIR}/${MY_P}"
66 +
67 +LICENSE="PSF-2"
68 +SLOT="${PYVER}"
69 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
70 +IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml"
71 +RESTRICT="!test? ( test )"
72 +
73 +# Do not add a dependency on dev-lang/python to this ebuild.
74 +# If you need to apply a patch which requires python for bootstrapping, please
75 +# run the bootstrap code on your dev box and include the results in the
76 +# patchset. See bug 447752.
77 +
78 +RDEPEND="app-arch/bzip2:=
79 + app-arch/xz-utils:=
80 + dev-libs/libffi:=
81 + sys-apps/util-linux:=
82 + >=sys-libs/zlib-1.1.3:=
83 + virtual/libcrypt:=
84 + virtual/libintl
85 + gdbm? ( sys-libs/gdbm:=[berkdb] )
86 + ncurses? ( >=sys-libs/ncurses-5.2:= )
87 + readline? ( >=sys-libs/readline-4.1:= )
88 + sqlite? ( >=dev-db/sqlite-3.3.8:3= )
89 + ssl? ( >=dev-libs/openssl-1.1.1:= )
90 + tk? (
91 + >=dev-lang/tcl-8.0:=
92 + >=dev-lang/tk-8.0:=
93 + dev-tcltk/blt:=
94 + dev-tcltk/tix
95 + )
96 + xml? ( >=dev-libs/expat-2.1:= )
97 + !!<sys-apps/sandbox-2.21"
98 +# bluetooth requires headers from bluez
99 +DEPEND="${RDEPEND}
100 + bluetooth? ( net-wireless/bluez )
101 + test? ( app-arch/xz-utils[extra-filters(+)] )"
102 +# autoconf-archive needed to eautoreconf
103 +BDEPEND="
104 + sys-devel/autoconf-archive
105 + virtual/awk
106 + virtual/pkgconfig
107 + verify-sig? ( app-crypt/openpgp-keys-python )
108 + !sys-devel/gcc[libffi(-)]"
109 +RDEPEND+=" !build? ( app-misc/mime-types )"
110 +
111 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
112 +
113 +# large file tests involve a 2.5G file being copied (duplicated)
114 +CHECKREQS_DISK_BUILD=5500M
115 +
116 +pkg_pretend() {
117 + use test && check-reqs_pkg_pretend
118 +}
119 +
120 +pkg_setup() {
121 + use test && check-reqs_pkg_setup
122 +}
123 +
124 +src_unpack() {
125 + if use verify-sig; then
126 + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
127 + fi
128 + default
129 +}
130 +
131 +src_prepare() {
132 + # Ensure that internal copies of expat, libffi and zlib are not used.
133 + rm -fr Modules/expat || die
134 + rm -fr Modules/_ctypes/libffi* || die
135 + rm -fr Modules/zlib || die
136 +
137 + local PATCHES=(
138 + "${WORKDIR}/${PATCHSET}"
139 + )
140 +
141 + default
142 +
143 + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
144 + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
145 +
146 + # force correct number of jobs
147 + # https://bugs.gentoo.org/737660
148 + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
149 + sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
150 + sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
151 +
152 + eautoreconf
153 +}
154 +
155 +src_configure() {
156 + local disable
157 + # disable automagic bluetooth headers detection
158 + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
159 + use gdbm || disable+=" gdbm"
160 + use ncurses || disable+=" _curses _curses_panel"
161 + use readline || disable+=" readline"
162 + use sqlite || disable+=" _sqlite3"
163 + use ssl || export PYTHON_DISABLE_SSL="1"
164 + use tk || disable+=" _tkinter"
165 + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
166 + export PYTHON_DISABLE_MODULES="${disable}"
167 +
168 + if ! use xml; then
169 + ewarn "You have configured Python without XML support."
170 + ewarn "This is NOT a recommended configuration as you"
171 + ewarn "may face problems parsing any XML documents."
172 + fi
173 +
174 + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
175 + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
176 + fi
177 +
178 + if [[ "$(gcc-major-version)" -ge 4 ]]; then
179 + append-flags -fwrapv
180 + fi
181 +
182 + filter-flags -malign-double
183 +
184 + # https://bugs.gentoo.org/show_bug.cgi?id=50309
185 + if is-flagq -O3; then
186 + is-flagq -fstack-protector-all && replace-flags -O3 -O2
187 + use hardened && replace-flags -O3 -O2
188 + fi
189 +
190 + # https://bugs.gentoo.org/700012
191 + if is-flagq -flto || is-flagq '-flto=*'; then
192 + append-cflags $(test-flags-CC -ffat-lto-objects)
193 + fi
194 +
195 + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
196 + tc-export CXX
197 +
198 + # Fix implicit declarations on cross and prefix builds. Bug #674070.
199 + use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
200 +
201 + local dbmliborder
202 + if use gdbm; then
203 + dbmliborder+="${dbmliborder:+:}gdbm"
204 + fi
205 +
206 + local myeconfargs=(
207 + # glibc-2.30 removes it; since we can't cleanly force-rebuild
208 + # Python on glibc upgrade, remove it proactively to give
209 + # a chance for users rebuilding python before glibc
210 + ac_cv_header_stropts_h=no
211 +
212 + --enable-shared
213 + --without-static-libpython
214 + --enable-ipv6
215 + --infodir='${prefix}/share/info'
216 + --mandir='${prefix}/share/man'
217 + --with-computed-gotos
218 + --with-dbmliborder="${dbmliborder}"
219 + --with-libc=
220 + --enable-loadable-sqlite-extensions
221 + --without-ensurepip
222 + --with-system-expat
223 + --with-system-ffi
224 + )
225 +
226 + OPT="" econf "${myeconfargs[@]}"
227 +
228 + if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
229 + eerror "configure has detected that the sem_open function is broken."
230 + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
231 + die "Broken sem_open function (bug 496328)"
232 + fi
233 +}
234 +
235 +src_compile() {
236 + # Ensure sed works as expected
237 + # https://bugs.gentoo.org/594768
238 + local -x LC_ALL=C
239 +
240 + emake CPPFLAGS= CFLAGS= LDFLAGS=
241 +
242 + # Work around bug 329499. See also bug 413751 and 457194.
243 + if has_version dev-libs/libffi[pax-kernel]; then
244 + pax-mark E python
245 + else
246 + pax-mark m python
247 + fi
248 +}
249 +
250 +src_test() {
251 + # Tests will not work when cross compiling.
252 + if tc-is-cross-compiler; then
253 + elog "Disabling tests due to crosscompiling."
254 + return
255 + fi
256 +
257 + # Skip failing tests.
258 + local skipped_tests="gdb"
259 +
260 + for test in ${skipped_tests}; do
261 + mv "${S}"/Lib/test/test_${test}.py "${T}"
262 + done
263 +
264 + # bug 660358
265 + local -x COLUMNS=80
266 + local -x PYTHONDONTWRITEBYTECODE=
267 + # workaround https://bugs.gentoo.org/775416
268 + addwrite /usr/lib/python3.10/site-packages
269 +
270 + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
271 +
272 + emake test EXTRATESTOPTS="-u-network -j${jobs}" \
273 + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
274 + local result=$?
275 +
276 + for test in ${skipped_tests}; do
277 + mv "${T}/test_${test}.py" "${S}"/Lib/test
278 + done
279 +
280 + elog "The following tests have been skipped:"
281 + for test in ${skipped_tests}; do
282 + elog "test_${test}.py"
283 + done
284 +
285 + elog "If you would like to run them, you may:"
286 + elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
287 + elog "and run the tests separately."
288 +
289 + if [[ ${result} -ne 0 ]]; then
290 + die "emake test failed"
291 + fi
292 +}
293 +
294 +src_install() {
295 + local libdir=${ED}/usr/lib/python${PYVER}
296 +
297 + emake DESTDIR="${D}" altinstall
298 +
299 + sed \
300 + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
301 + -e "s/\(PY_LDFLAGS=\).*/\1/" \
302 + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
303 +
304 + # Fix collisions between different slots of Python.
305 + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
306 +
307 + # Cheap hack to get version with ABIFLAGS
308 + local abiver=$(cd "${ED}/usr/include"; echo python*)
309 + if [[ ${abiver} != python${PYVER} ]]; then
310 + # Replace python3.X with a symlink to python3.Xm
311 + rm "${ED}/usr/bin/python${PYVER}" || die
312 + dosym "${abiver}" "/usr/bin/python${PYVER}"
313 + # Create python3.X-config symlink
314 + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
315 + # Create python-3.5m.pc symlink
316 + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
317 + fi
318 +
319 + # python seems to get rebuilt in src_install (bug 569908)
320 + # Work around it for now.
321 + if has_version dev-libs/libffi[pax-kernel]; then
322 + pax-mark E "${ED}/usr/bin/${abiver}"
323 + else
324 + pax-mark m "${ED}/usr/bin/${abiver}"
325 + fi
326 +
327 + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
328 + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
329 +
330 + dodoc Misc/{ACKS,HISTORY,NEWS}
331 +
332 + if use examples; then
333 + docinto examples
334 + find Tools -name __pycache__ -exec rm -fr {} + || die
335 + dodoc -r Tools
336 + fi
337 + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
338 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
339 + emake --no-print-directory -s -f - 2>/dev/null)
340 + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
341 +
342 + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
343 + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
344 + sed \
345 + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
346 + -e "s:@PYDOC@:pydoc${PYVER}:" \
347 + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
348 + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
349 +
350 + local -x EPYTHON=python${PYVER}
351 + # if not using a cross-compiler, use the fresh binary
352 + if ! tc-is-cross-compiler; then
353 + local -x PYTHON=./python
354 + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
355 + else
356 + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
357 + fi
358 +
359 + echo "EPYTHON='${EPYTHON}'" > epython.py || die
360 + python_domodule epython.py
361 +
362 + # python-exec wrapping support
363 + local pymajor=${PYVER%.*}
364 + local scriptdir=${D}$(python_get_scriptdir)
365 + mkdir -p "${scriptdir}" || die
366 + # python and pythonX
367 + ln -s "../../../bin/${abiver}" \
368 + "${scriptdir}/python${pymajor}" || die
369 + ln -s "python${pymajor}" "${scriptdir}/python" || die
370 + # python-config and pythonX-config
371 + # note: we need to create a wrapper rather than symlinking it due
372 + # to some random dirname(argv[0]) magic performed by python-config
373 + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
374 + #!/bin/sh
375 + exec "${abiver}-config" "\${@}"
376 + EOF
377 + chmod +x "${scriptdir}/python${pymajor}-config" || die
378 + ln -s "python${pymajor}-config" \
379 + "${scriptdir}/python-config" || die
380 + # 2to3, pydoc
381 + ln -s "../../../bin/2to3-${PYVER}" \
382 + "${scriptdir}/2to3" || die
383 + ln -s "../../../bin/pydoc${PYVER}" \
384 + "${scriptdir}/pydoc" || die
385 + # idle
386 + if use tk; then
387 + ln -s "../../../bin/idle${PYVER}" \
388 + "${scriptdir}/idle" || die
389 + fi
390 +}