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: Thu, 30 Apr 2020 09:45:34
Message-Id: 1588239917.d43ba1f04beccf30125d8999bddc53b874b4fe2d.mgorny@gentoo
1 commit: d43ba1f04beccf30125d8999bddc53b874b4fe2d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 30 07:19:34 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 30 09:45:17 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d43ba1f0
7
8 dev-lang/python: Bump to 3.9.0a6
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-lang/python/Manifest | 2 +
13 dev-lang/python/python-3.9.0_alpha6.ebuild | 327 +++++++++++++++++++++++++++++
14 2 files changed, 329 insertions(+)
15
16 diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
17 index 5da07d03ba2..33e24976464 100644
18 --- a/dev-lang/python/Manifest
19 +++ b/dev-lang/python/Manifest
20 @@ -5,6 +5,7 @@ DIST Python-3.7.7.tar.xz 17268888 BLAKE2B 5f16c9559249470a9e6c0aa686965e7d78ce0f
21 DIST Python-3.8.2.tar.xz 17869888 BLAKE2B f42b35bea5e65f1f0a3fa6f1fd3d749fba3fa46d958608a314c1a98d0e3ca890e856da4d40ee489fe546fc02ce0fc9fa2daaaba96a8928d92ae7eb3d2dda3fe4 SHA512 ca37ad0e7c5845f5f228566aa8ff654a8f428c7d4a5aaabff29baebb0ca3219b31ba8bb2607f89e37cf3fc564f023b8407e53a4f2c47bd99122c1cc222613e37
22 DIST Python-3.9.0a4.tar.xz 18032300 BLAKE2B 1c9ad55c7c055c3a704c4062e092d44b8d778e334e05589e7166777da328df54ef257aeb2e203416710bb9f9f1571d7700c2c12aed5b8e63adf7a1b3aedb08b5 SHA512 8f7ca0a891fb7e7868dfe5f040e9ceb7ce14d036bc5d9eae1493570c5a9631832e796a1972590c444d2347c585b0c8216345375dd1476b4da7bd47e187591afc
23 DIST Python-3.9.0a5.tar.xz 18039660 BLAKE2B 2d8e273ef577ea3f19cb3f64c89f2229d68bd647112fc61753487b53f8efd78a9797ceaf68fecbd9d13483e825f79f20a7b01be2e0aeca2ee2e978108467b77f SHA512 b2f884a492eeb9fa7347c664bb6fd1dc3c25f663ebb4f9455b66540e12ce8da845c2ad4960999d5475625bc64c834f3cff28f61cd37881bdf53efa349c44bff3
24 +DIST Python-3.9.0a6.tar.xz 18202376 BLAKE2B 32f04613a3b11341759eb98fd4b16edcb890a9ce19a4d5031aecdccd985a5462248fcd0e7bf478e2f23490ad85b36c760c14398f2b238e26038a476831f004d2 SHA512 edb71840347ab2b5e18b3a2b831a3d9a26e1af52de9b1c6c088ce2d20f8e96a22c87fc3677b62e49c91a00d8b531028bdc739f00fe220dbdeb343daf17829be4
25 DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8 SHA512 ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f
26 DIST python-gentoo-patches-2.7.18.tar.xz 15012 BLAKE2B f691e231c793bb8f11fb64c89b90e022af8e0fe0e28839822c2ae6214fdab6c6fd9c07466c4b5797d3964b7db09fd979597774fb7872dc674e8df59321b6bf95 SHA512 a2952b27bfc0a52f322b2f3e177cbe09fa288c9ca5967c13fb9c2d45d3e81033407e30e86bdaaaa258f0b3cfa2cef6eda5502bddb6390f9512a493d145d34e03
27 DIST python-gentoo-patches-3.6.10-r1.tar.xz 15556 BLAKE2B 3d4755a083172fc878d3454797a4a7fa809c7767b7f2ba0919b95076b8ecba62ac604a7db349d8dd71f83aa44d4580d0c433ae6cd2027078e7779cec79185ba2 SHA512 b361ff3fe9545bb59a7e85f179a094d58219be35d20cef83db02672d0a9a58fccfda62fbe8c2bf64250c4043b8517cbc2091380611c5f1e63bfac9ca7c4e47b0
28 @@ -15,3 +16,4 @@ DIST python-gentoo-patches-3.8.1-r2.tar.xz 10108 BLAKE2B 02d3e2ae95b5cfa67c0ba4f
29 DIST python-gentoo-patches-3.8.2-r1.tar.xz 16112 BLAKE2B 9ae197a56bbd96afa11c4312c68ac030138773df22dedc3a3e6fb9e81b366d6522fb2c147946eb604a87d749cbea7e5e5eed8ae0e737294c0949a8c2791dd327 SHA512 00f31c3b7227dd443f05234fbb7744338ce687e1ea4d236a6b1d386d76082acb34259f59442018c9ace54e0004dea9ac822ae2a4470159b83d00112e258baff0
30 DIST python-gentoo-patches-3.9.0_alpha2.tar.xz 8340 BLAKE2B b93edca01fa46c8eb4e18e0d92c72a3e4ef8dcebf26c0e1c0fab4c82201645ed4c358cf2311c9eb454f6a261ab514985302f81fc86284d3714d662037928963c SHA512 58b0a64d8747f187e6cc4749dc660a443c066e43f509ecc2976b6406bbfb3851a03f686adc36bd58c7c3142a707a387ac25431ca078980914d2219c49a0f2202
31 DIST python-gentoo-patches-3.9.0_alpha5.tar.xz 13452 BLAKE2B 58f1c0451ca511aeead1056bfb61f260041b2d73c022da56c970315233d9df66de4e8edc483a906953ae77a9797d556c7d2434c26b7830d984d9483af4d022e2 SHA512 8d148e136ad69685cb40f55d6b2a471cd5c79613cf0d490dfffabc44e8a29c598dc496f507310592b4018008f74a2aea6e3be797c30364010d088785f82c1a58
32 +DIST python-gentoo-patches-3.9.0_alpha6.tar.xz 8916 BLAKE2B ca611dd96e6fca625def6affeb35daa1c869ffa3b84bd13d5cc2dff7ffe4e0aaf4a76b3ed35d4520fe64f1905a644ecc2dcd80259f88264adeff926d728df76e SHA512 b3cd6619d998db8c828fc05eeba74d644ead60d34c279943725ea94ee9e5d45a07d481af62b8589336c55bb8baa23d6559aa57a73d11bf2364b6e9b839e0a4be
33
34 diff --git a/dev-lang/python/python-3.9.0_alpha6.ebuild b/dev-lang/python/python-3.9.0_alpha6.ebuild
35 new file mode 100644
36 index 00000000000..2e417caf95f
37 --- /dev/null
38 +++ b/dev-lang/python/python-3.9.0_alpha6.ebuild
39 @@ -0,0 +1,327 @@
40 +# Copyright 1999-2020 Gentoo Authors
41 +# Distributed under the terms of the GNU General Public License v2
42 +
43 +EAPI="7"
44 +WANT_LIBTOOL="none"
45 +
46 +inherit autotools check-reqs flag-o-matic pax-utils python-utils-r1 \
47 + toolchain-funcs
48 +
49 +MY_P="Python-${PV/_alpha/a}"
50 +PYVER=$(ver_cut 1-2)
51 +PATCHSET="python-gentoo-patches-3.9.0_alpha6"
52 +
53 +DESCRIPTION="An interpreted, interactive, object-oriented programming language"
54 +HOMEPAGE="https://www.python.org/"
55 +SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
56 + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
57 +S="${WORKDIR}/${MY_P}"
58 +
59 +LICENSE="PSF-2"
60 +SLOT="${PYVER}"
61 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
62 +IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
63 +RESTRICT="!test? ( test )"
64 +
65 +# Do not add a dependency on dev-lang/python to this ebuild.
66 +# If you need to apply a patch which requires python for bootstrapping, please
67 +# run the bootstrap code on your dev box and include the results in the
68 +# patchset. See bug 447752.
69 +
70 +RDEPEND="app-arch/bzip2:=
71 + app-arch/xz-utils:=
72 + dev-libs/libffi:=
73 + sys-apps/util-linux:=
74 + >=sys-libs/zlib-1.1.3:=
75 + virtual/libcrypt:=
76 + virtual/libintl
77 + gdbm? ( sys-libs/gdbm:=[berkdb] )
78 + ncurses? ( >=sys-libs/ncurses-5.2:= )
79 + readline? ( >=sys-libs/readline-4.1:= )
80 + sqlite? ( >=dev-db/sqlite-3.3.8:3= )
81 + ssl? (
82 + !libressl? ( dev-libs/openssl:= )
83 + libressl? ( dev-libs/libressl:= )
84 + )
85 + tk? (
86 + >=dev-lang/tcl-8.0:=
87 + >=dev-lang/tk-8.0:=
88 + dev-tcltk/blt:=
89 + dev-tcltk/tix
90 + )
91 + xml? ( >=dev-libs/expat-2.1:= )"
92 +# bluetooth requires headers from bluez
93 +DEPEND="${RDEPEND}
94 + bluetooth? ( net-wireless/bluez )
95 + test? ( app-arch/xz-utils[extra-filters(+)] )
96 + virtual/pkgconfig
97 + !sys-devel/gcc[libffi(-)]"
98 +RDEPEND+=" !build? ( app-misc/mime-types )"
99 +PDEPEND=">=app-eselect/eselect-python-20140125-r1"
100 +
101 +# large file tests involve a 2.5G file being copied (duplicated)
102 +CHECKREQS_DISK_BUILD=5500M
103 +
104 +pkg_pretend() {
105 + use test && check-reqs_pkg_pretend
106 +
107 + ewarn "This is an early developer preview of Python 3.9. New features"
108 + ewarn "can still be added up to 2020-05-18. It's not suitable for production"
109 + ewarn "use, and it is not supported for Gentoo packages."
110 +}
111 +
112 +pkg_setup() {
113 + use test && check-reqs_pkg_setup
114 +}
115 +
116 +src_prepare() {
117 + # Ensure that internal copies of expat, libffi and zlib are not used.
118 + rm -fr Modules/expat || die
119 + rm -fr Modules/_ctypes/libffi* || die
120 + rm -fr Modules/zlib || die
121 +
122 + local PATCHES=(
123 + "${WORKDIR}/${PATCHSET}"
124 + )
125 +
126 + default
127 +
128 + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
129 + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
130 +
131 + eautoreconf
132 +}
133 +
134 +src_configure() {
135 + local disable
136 + # disable automagic bluetooth headers detection
137 + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
138 + use gdbm || disable+=" gdbm"
139 + use ncurses || disable+=" _curses _curses_panel"
140 + use readline || disable+=" readline"
141 + use sqlite || disable+=" _sqlite3"
142 + use ssl || export PYTHON_DISABLE_SSL="1"
143 + use tk || disable+=" _tkinter"
144 + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
145 + export PYTHON_DISABLE_MODULES="${disable}"
146 +
147 + if ! use xml; then
148 + ewarn "You have configured Python without XML support."
149 + ewarn "This is NOT a recommended configuration as you"
150 + ewarn "may face problems parsing any XML documents."
151 + fi
152 +
153 + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
154 + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
155 + fi
156 +
157 + if [[ "$(gcc-major-version)" -ge 4 ]]; then
158 + append-flags -fwrapv
159 + fi
160 +
161 + filter-flags -malign-double
162 +
163 + # https://bugs.gentoo.org/show_bug.cgi?id=50309
164 + if is-flagq -O3; then
165 + is-flagq -fstack-protector-all && replace-flags -O3 -O2
166 + use hardened && replace-flags -O3 -O2
167 + fi
168 +
169 + # https://bugs.gentoo.org/700012
170 + if is-flagq -flto || is-flagq '-flto=*'; then
171 + append-cflags $(test-flags-CC -ffat-lto-objects)
172 + fi
173 +
174 + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
175 + tc-export CXX
176 +
177 + # Set LDFLAGS so we link modules with -lpython3.2 correctly.
178 + # Needed on FreeBSD unless Python 3.2 is already installed.
179 + # Please query BSD team before removing this!
180 + append-ldflags "-L."
181 +
182 + # Fix implicit declarations on cross and prefix builds. Bug #674070.
183 + use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
184 +
185 + local dbmliborder
186 + if use gdbm; then
187 + dbmliborder+="${dbmliborder:+:}gdbm"
188 + fi
189 +
190 + local myeconfargs=(
191 + # glibc-2.30 removes it; since we can't cleanly force-rebuild
192 + # Python on glibc upgrade, remove it proactively to give
193 + # a chance for users rebuilding python before glibc
194 + ac_cv_header_stropts_h=no
195 +
196 + --enable-shared
197 + $(use_enable ipv6)
198 + --infodir='${prefix}/share/info'
199 + --mandir='${prefix}/share/man'
200 + --with-computed-gotos
201 + --with-dbmliborder="${dbmliborder}"
202 + --with-libc=
203 + --enable-loadable-sqlite-extensions
204 + --without-ensurepip
205 + --with-system-expat
206 + --with-system-ffi
207 + )
208 +
209 + OPT="" econf "${myeconfargs[@]}"
210 +}
211 +
212 +src_compile() {
213 + # Ensure sed works as expected
214 + # https://bugs.gentoo.org/594768
215 + local -x LC_ALL=C
216 +
217 + emake CPPFLAGS= CFLAGS= LDFLAGS=
218 +
219 + # Work around bug 329499. See also bug 413751 and 457194.
220 + if has_version dev-libs/libffi[pax_kernel]; then
221 + pax-mark E python
222 + else
223 + pax-mark m python
224 + fi
225 +}
226 +
227 +src_test() {
228 + # Tests will not work when cross compiling.
229 + if tc-is-cross-compiler; then
230 + elog "Disabling tests due to crosscompiling."
231 + return
232 + fi
233 +
234 + # Skip failing tests.
235 + local skipped_tests="gdb"
236 +
237 + for test in ${skipped_tests}; do
238 + mv "${S}"/Lib/test/test_${test}.py "${T}"
239 + done
240 +
241 + # bug 660358
242 + local -x COLUMNS=80
243 +
244 + local -x PYTHONDONTWRITEBYTECODE=
245 +
246 + emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
247 + local result=$?
248 +
249 + for test in ${skipped_tests}; do
250 + mv "${T}/test_${test}.py" "${S}"/Lib/test
251 + done
252 +
253 + elog "The following tests have been skipped:"
254 + for test in ${skipped_tests}; do
255 + elog "test_${test}.py"
256 + done
257 +
258 + elog "If you would like to run them, you may:"
259 + elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
260 + elog "and run the tests separately."
261 +
262 + if [[ ${result} -ne 0 ]]; then
263 + die "emake test failed"
264 + fi
265 +}
266 +
267 +src_install() {
268 + local libdir=${ED}/usr/lib/python${PYVER}
269 +
270 + emake DESTDIR="${D}" altinstall
271 +
272 + # Remove static library
273 + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
274 +
275 + sed \
276 + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
277 + -e "s/\(PY_LDFLAGS=\).*/\1/" \
278 + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
279 +
280 + # Fix collisions between different slots of Python.
281 + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
282 +
283 + # Cheap hack to get version with ABIFLAGS
284 + local abiver=$(cd "${ED}/usr/include"; echo python*)
285 + if [[ ${abiver} != python${PYVER} ]]; then
286 + # Replace python3.X with a symlink to python3.Xm
287 + rm "${ED}/usr/bin/python${PYVER}" || die
288 + dosym "${abiver}" "/usr/bin/python${PYVER}"
289 + # Create python3.X-config symlink
290 + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
291 + # Create python-3.5m.pc symlink
292 + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
293 + fi
294 +
295 + # python seems to get rebuilt in src_install (bug 569908)
296 + # Work around it for now.
297 + if has_version dev-libs/libffi[pax_kernel]; then
298 + pax-mark E "${ED}/usr/bin/${abiver}"
299 + else
300 + pax-mark m "${ED}/usr/bin/${abiver}"
301 + fi
302 +
303 + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
304 + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
305 +
306 + dodoc Misc/{ACKS,HISTORY,NEWS}
307 +
308 + if use examples; then
309 + docinto examples
310 + find Tools -name __pycache__ -exec rm -fr {} + || die
311 + dodoc -r Tools
312 + fi
313 + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
314 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
315 + emake --no-print-directory -s -f - 2>/dev/null)
316 + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
317 +
318 + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
319 + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
320 + sed \
321 + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
322 + -e "s:@PYDOC@:pydoc${PYVER}:" \
323 + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
324 + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
325 +
326 + local -x EPYTHON=python${PYVER}
327 + # if not using a cross-compiler, use the fresh binary
328 + if ! tc-is-cross-compiler; then
329 + local -x PYTHON=./python
330 + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
331 + else
332 + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
333 + fi
334 +
335 + echo "EPYTHON='${EPYTHON}'" > epython.py || die
336 + python_domodule epython.py
337 +
338 + # python-exec wrapping support
339 + local pymajor=${PYVER%.*}
340 + local scriptdir=${D}$(python_get_scriptdir)
341 + mkdir -p "${scriptdir}" || die
342 + # python and pythonX
343 + ln -s "../../../bin/${abiver}" \
344 + "${scriptdir}/python${pymajor}" || die
345 + ln -s "python${pymajor}" "${scriptdir}/python" || die
346 + # python-config and pythonX-config
347 + # note: we need to create a wrapper rather than symlinking it due
348 + # to some random dirname(argv[0]) magic performed by python-config
349 + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
350 + #!/bin/sh
351 + exec "${abiver}-config" "\${@}"
352 + EOF
353 + chmod +x "${scriptdir}/python${pymajor}-config" || die
354 + ln -s "python${pymajor}-config" \
355 + "${scriptdir}/python-config" || die
356 + # 2to3, pydoc
357 + ln -s "../../../bin/2to3-${PYVER}" \
358 + "${scriptdir}/2to3" || die
359 + ln -s "../../../bin/pydoc${PYVER}" \
360 + "${scriptdir}/pydoc" || die
361 + # idle
362 + if use tk; then
363 + ln -s "../../../bin/idle${PYVER}" \
364 + "${scriptdir}/idle" || die
365 + fi
366 +}