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: Sun, 29 Dec 2019 10:11:12
Message-Id: 1577614262.deeae7cb77deaba0d68a08696383733ff485e4b7.mgorny@gentoo
1 commit: deeae7cb77deaba0d68a08696383733ff485e4b7
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 29 09:26:07 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 29 10:11:02 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deeae7cb
7
8 dev-lang/python: Remove 3.8.0
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.8.0.ebuild | 338 ------------------------------------
14 2 files changed, 340 deletions(-)
15
16 diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
17 index 13e8b814b57..be892a24b96 100644
18 --- a/dev-lang/python/Manifest
19 +++ b/dev-lang/python/Manifest
20 @@ -6,12 +6,10 @@ DIST Python-3.6.10.tar.xz 17212220 BLAKE2B 822e231cf2755e6477e49e9128a983185a4f1
21 DIST Python-3.6.9.tar.xz 17212164 BLAKE2B ef33dbc1ea3bbeaf92092de867279d759e3a204ca4e8bf0e5c6a1adbb17a9220d8829245fa9f067ec6497a5789a4f60b8db8c727bb2bd8126df470921d552a53 SHA512 05de9c6f44d96a52bfce10ede4312de892573edaf8bece65926d19973a3a800d65eed7a857af945f69efcfb25efa3788e7a54016b03d80b611eb51c3ea074819
22 DIST Python-3.7.5.tar.xz 17236432 BLAKE2B fb49a3bfd9b1944d567a45682f789ef840e63ed610e0dddb5695da7a84a0bcb50a6fa52097722f09b57d6fc15a5f89aeaa46a061125219e597897086f3dffe40 SHA512 f4f3879881f260f58dbb041fb0f2f210d4b70b02a739e41e50e6fea67d31855a7a29ce4ebef66bfde3d0edf54b946a48f78490f986da965357b835d4dbb3f414
23 DIST Python-3.7.6.tar.xz 17246360 BLAKE2B b83a440a1ad5b1a2210e03be0522d39f53778774ea725fa41aaaab28cccfcdf007996f1a1d3cb95f8040b71b692189e28db67ba6ec136af82158363a1aadbba6 SHA512 5be022c384728b0c6709d165486f66226d126c521b466ed24d0c4c3c5910ec786a734f4c2c916ac409213c54a492b9fb230fb721c41e3de281676a7e9d8f3171
24 -DIST Python-3.8.0.tar.xz 17829824 BLAKE2B fcef24b7f0db3b47f899810c77af1e2a84f8b4bf4098a2b417e22dcfb7a5444160e26e5995f73d1068cc7fdbe226d09a88bb5065ac765a4484f66cd327911eef SHA512 5f9bfcb3acdf592770a9d5abd2c32c68c55a49b92f958ded069e3ef31cf2d415e67112b4f6738fab237dc29e5c622298719946d2e9471e7e78e3a6bdf2fac1d1
25 DIST Python-3.8.1.tar.xz 17828408 BLAKE2B db1841625de89b812cadcd538a990401a4e49d43968dce733c289121e9de9749eaf39e1c772a32e10ed2b40bef215b19ae9c7d88e0ec9e99cd3d467406ea063c SHA512 d41381848cc1ec8009643b71875f395a9ac2c8e12a5b1efef33caf8a9e99a337c790d4354695c85352d11b62092ae372b5af62f78724363fcbf3504ff9a6ddca
26 DIST python-gentoo-patches-2.7.16.tar.xz 13904 BLAKE2B 218b46f8656f4a792dcd47eabca6d59a1558276b77676544991ee75914cd76dda84c36f43e72e477b850dd4cb52374d289f20dccd244a3b52ae5debaf3363432 SHA512 83f90545231c663a34c6925352a357a2b15997ac0362578a1893304c5070b5251922585ae8bc1bafb68d306bcddd4cdba4b6406648d473bd3e980eef65fe3ecd
27 DIST python-gentoo-patches-2.7.17.tar.xz 13476 BLAKE2B 788688e2941d2d6d4f768168881b2c3639213a97e214557b3a93f8db44d81e2b6d70be847b7462e54e3786660ebee4ee331402081d92167d74ad149279c3f389 SHA512 1641737635d33607a77ed2ee2462854cec603be39737de3f81abb188702aaf46f039d1616f9dcd413da1f4a8040175c66a2883e496132c2e4ebe8f860b36f9f1
28 DIST python-gentoo-patches-3.5.4-0.tar.xz 11704 BLAKE2B 4a7d71feff18c7c8c109bed10748348484d314183c3de3ec950d5ca5ce7048bb322c470f3f5bff2d63eb7f2ed99c0fe75c621df050273d9d118681b28926061d SHA512 d395a87695f700598026038d6929ea5038abd7d494294037a4dfa02d5262203dbbaa6ae258a5a7f35ff5542f6266dcf69cc0b9c3df2a047cd2f6699a87e182ec
29 DIST python-gentoo-patches-3.6.8.tar.xz 11224 BLAKE2B 5fe38282bcf28df18e0bd37756c880ae191ea738dc92f1cf83f682cfdc52525b9c44287dc99191a73d75c90672ab501b56adf49515b35ff1fdee88c8dc07b175 SHA512 89e700663db25d6d78eee1d4bfdab686c5341a794062f3a63df3485ac0b58deb4b4885d24701f3ae138d06ca783be92e310e1100c6d633910c33732f3cb0d7df
30 DIST python-gentoo-patches-3.7.4-1.tar.xz 10100 BLAKE2B 63e8fada89b64b59ba083745626a1e8a07bec0cf93b7b6ab405c33a0f2932cbe497a331c52895a07f10434b230c438f27c9582efecdd57f3bad15d9aa604d157 SHA512 11b0e811a9890a1235c85426061b35f9964eba64cac0536f4c9e0498b1cc66eb005f14aed34eead735b43e91c2b5babced60e3310f5329231a1706871b95b547
31 -DIST python-gentoo-patches-3.8.0.tar.xz 9788 BLAKE2B 9ca14fa49fbbd11412451dc6ce32f643cdffdc988c6b2b312593e2b87b85d09e95ada397aaafa548cdb5cf58be09d970d020ef6f20a3575108581fb4647b7bfa SHA512 946be0babc8c67586309b48bffb5ac0a2a354b3798fa7e23c641cc836ff310ab744d75308d1324e9ed54720bf9f4d0aba1f89fb454a98bf9b9fa9484210b6ca5
32 DIST python-gentoo-patches-3.8.1.tar.xz 10148 BLAKE2B d0674de768611405120bcd2e80a553d9a3325e5dc8360eee3223f89acc97a9aff6260d2610ae16a85777463f5987d93cf3428d42adcdd46867eeaa67471e9941 SHA512 bc38012821c9773cc0821d9ef7dcb8170e97fe87161c8c99b7500323e6f1c6c224d11152ff394bea5af42bb879ef18e1b89d6a16e9ab06a2c3512b5e2381cb08
33
34 diff --git a/dev-lang/python/python-3.8.0.ebuild b/dev-lang/python/python-3.8.0.ebuild
35 deleted file mode 100644
36 index 468cc76024f..00000000000
37 --- a/dev-lang/python/python-3.8.0.ebuild
38 +++ /dev/null
39 @@ -1,338 +0,0 @@
40 -# Copyright 1999-2019 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 flag-o-matic pax-utils python-utils-r1 toolchain-funcs
47 -
48 -MY_P="Python-${PV}"
49 -PYVER=$(ver_cut 1-2)
50 -PATCHSET_VERSION="3.8.0"
51 -
52 -DESCRIPTION="An interpreted, interactive, object-oriented programming language"
53 -HOMEPAGE="https://www.python.org/"
54 -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
55 - https://dev.gentoo.org/~mgorny/dist/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
56 -S="${WORKDIR}/${MY_P}"
57 -
58 -LICENSE="PSF-2"
59 -SLOT="${PYVER}"
60 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
61 -IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
62 -RESTRICT="!test? ( test )"
63 -
64 -# Do not add a dependency on dev-lang/python to this ebuild.
65 -# If you need to apply a patch which requires python for bootstrapping, please
66 -# run the bootstrap code on your dev box and include the results in the
67 -# patchset. See bug 447752.
68 -
69 -RDEPEND="app-arch/bzip2:=
70 - app-arch/xz-utils:=
71 - sys-apps/util-linux:=
72 - >=sys-libs/zlib-1.1.3:=
73 - virtual/libffi:=
74 - virtual/libintl
75 - gdbm? ( sys-libs/gdbm:0=[berkdb] )
76 - ncurses? ( >=sys-libs/ncurses-5.2:= )
77 - readline? ( >=sys-libs/readline-4.1:= )
78 - sqlite? ( >=dev-db/sqlite-3.3.8:3= )
79 - ssl? (
80 - !libressl? ( dev-libs/openssl:= )
81 - libressl? ( dev-libs/libressl:= )
82 - )
83 - tk? (
84 - >=dev-lang/tcl-8.0:=
85 - >=dev-lang/tk-8.0:=
86 - dev-tcltk/blt:=
87 - dev-tcltk/tix
88 - )
89 - xml? ( >=dev-libs/expat-2.1:= )"
90 -# bluetooth requires headers from bluez
91 -DEPEND="${RDEPEND}
92 - bluetooth? ( net-wireless/bluez )
93 - test? ( app-arch/xz-utils[extra-filters(+)] )
94 - virtual/pkgconfig
95 - !sys-devel/gcc[libffi(-)]"
96 -RDEPEND+=" !build? ( app-misc/mime-types )"
97 -PDEPEND=">=app-eselect/eselect-python-20140125-r1"
98 -
99 -src_prepare() {
100 - # Ensure that internal copies of expat, libffi and zlib are not used.
101 - rm -fr Modules/expat || die
102 - rm -fr Modules/_ctypes/libffi* || die
103 - rm -fr Modules/zlib || die
104 -
105 - local PATCHES=(
106 - "${FILESDIR}/python-3.7.5-hashlib.patch"
107 - "${WORKDIR}/patches"
108 - )
109 -
110 - default
111 -
112 - sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
113 - setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
114 -
115 - eautoreconf
116 -}
117 -
118 -src_configure() {
119 - local disable
120 - # disable automagic bluetooth headers detection
121 - use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
122 - use gdbm || disable+=" gdbm"
123 - use ncurses || disable+=" _curses _curses_panel"
124 - use readline || disable+=" readline"
125 - use sqlite || disable+=" _sqlite3"
126 - use ssl || export PYTHON_DISABLE_SSL="1"
127 - use tk || disable+=" _tkinter"
128 - use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
129 - export PYTHON_DISABLE_MODULES="${disable}"
130 -
131 - if ! use xml; then
132 - ewarn "You have configured Python without XML support."
133 - ewarn "This is NOT a recommended configuration as you"
134 - ewarn "may face problems parsing any XML documents."
135 - fi
136 -
137 - if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
138 - einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
139 - fi
140 -
141 - if [[ "$(gcc-major-version)" -ge 4 ]]; then
142 - append-flags -fwrapv
143 - fi
144 -
145 - filter-flags -malign-double
146 -
147 - # https://bugs.gentoo.org/show_bug.cgi?id=50309
148 - if is-flagq -O3; then
149 - is-flagq -fstack-protector-all && replace-flags -O3 -O2
150 - use hardened && replace-flags -O3 -O2
151 - fi
152 -
153 - # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
154 - tc-export CXX
155 -
156 - # Set LDFLAGS so we link modules with -lpython3.2 correctly.
157 - # Needed on FreeBSD unless Python 3.2 is already installed.
158 - # Please query BSD team before removing this!
159 - append-ldflags "-L."
160 -
161 - # Fix implicit declarations on cross and prefix builds. Bug #674070.
162 - use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
163 -
164 - local dbmliborder
165 - if use gdbm; then
166 - dbmliborder+="${dbmliborder:+:}gdbm"
167 - fi
168 -
169 - local myeconfargs=(
170 - --enable-shared
171 - $(use_enable ipv6)
172 - --infodir='${prefix}/share/info'
173 - --mandir='${prefix}/share/man'
174 - --with-computed-gotos
175 - --with-dbmliborder="${dbmliborder}"
176 - --with-libc=
177 - --enable-loadable-sqlite-extensions
178 - --without-ensurepip
179 - --with-system-expat
180 - --with-system-ffi
181 - )
182 -
183 - OPT="" econf "${myeconfargs[@]}"
184 -}
185 -
186 -src_compile() {
187 - # Ensure sed works as expected
188 - # https://bugs.gentoo.org/594768
189 - local -x LC_ALL=C
190 -
191 - emake CPPFLAGS= CFLAGS= LDFLAGS=
192 -
193 - # Work around bug 329499. See also bug 413751 and 457194.
194 - if has_version dev-libs/libffi[pax_kernel]; then
195 - pax-mark E python
196 - else
197 - pax-mark m python
198 - fi
199 -}
200 -
201 -src_test() {
202 - # Tests will not work when cross compiling.
203 - if tc-is-cross-compiler; then
204 - elog "Disabling tests due to crosscompiling."
205 - return
206 - fi
207 -
208 - # Skip failing tests.
209 - local skipped_tests="gdb"
210 -
211 - for test in ${skipped_tests}; do
212 - mv "${S}"/Lib/test/test_${test}.py "${T}"
213 - done
214 -
215 - # bug 660358
216 - local -x COLUMNS=80
217 -
218 - local -x PYTHONDONTWRITEBYTECODE=
219 -
220 - emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
221 - local result=$?
222 -
223 - for test in ${skipped_tests}; do
224 - mv "${T}/test_${test}.py" "${S}"/Lib/test
225 - done
226 -
227 - elog "The following tests have been skipped:"
228 - for test in ${skipped_tests}; do
229 - elog "test_${test}.py"
230 - done
231 -
232 - elog "If you would like to run them, you may:"
233 - elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
234 - elog "and run the tests separately."
235 -
236 - if [[ ${result} -ne 0 ]]; then
237 - die "emake test failed"
238 - fi
239 -}
240 -
241 -src_install() {
242 - local libdir=${ED}/usr/lib/python${PYVER}
243 -
244 - emake DESTDIR="${D}" altinstall
245 -
246 - # Remove static library
247 - rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
248 -
249 - sed \
250 - -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
251 - -e "s/\(PY_LDFLAGS=\).*/\1/" \
252 - -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
253 -
254 - # Fix collisions between different slots of Python.
255 - rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
256 -
257 - # Cheap hack to get version with ABIFLAGS
258 - local abiver=$(cd "${ED}/usr/include"; echo python*)
259 - if [[ ${abiver} != python${PYVER} ]]; then
260 - # Replace python3.X with a symlink to python3.Xm
261 - rm "${ED}/usr/bin/python${PYVER}" || die
262 - dosym "${abiver}" "/usr/bin/python${PYVER}"
263 - # Create python3.X-config symlink
264 - dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
265 - # Create python-3.5m.pc symlink
266 - dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
267 - fi
268 -
269 - # python seems to get rebuilt in src_install (bug 569908)
270 - # Work around it for now.
271 - if has_version dev-libs/libffi[pax_kernel]; then
272 - pax-mark E "${ED}/usr/bin/${abiver}"
273 - else
274 - pax-mark m "${ED}/usr/bin/${abiver}"
275 - fi
276 -
277 - use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
278 - use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
279 -
280 - use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
281 -
282 - dodoc Misc/{ACKS,HISTORY,NEWS}
283 -
284 - if use examples; then
285 - docinto examples
286 - find Tools -name __pycache__ -exec rm -fr {} + || die
287 - dodoc -r Tools
288 - fi
289 - insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
290 - local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
291 - emake --no-print-directory -s -f - 2>/dev/null)
292 - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
293 -
294 - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
295 - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
296 - sed \
297 - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
298 - -e "s:@PYDOC@:pydoc${PYVER}:" \
299 - -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
300 - "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
301 -
302 - # for python-exec
303 - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
304 -
305 - # if not using a cross-compiler, use the fresh binary
306 - if ! tc-is-cross-compiler; then
307 - local -x PYTHON=./python
308 - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
309 - else
310 - vars=( PYTHON "${vars[@]}" )
311 - fi
312 -
313 - python_export "python${PYVER}" "${vars[@]}"
314 - echo "EPYTHON='${EPYTHON}'" > epython.py || die
315 - python_domodule epython.py
316 -
317 - # python-exec wrapping support
318 - local pymajor=${PYVER%.*}
319 - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
320 - # python and pythonX
321 - ln -s "../../../bin/${abiver}" \
322 - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
323 - ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die
324 - # python-config and pythonX-config
325 - # note: we need to create a wrapper rather than symlinking it due
326 - # to some random dirname(argv[0]) magic performed by python-config
327 - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
328 - #!/bin/sh
329 - exec "${abiver}-config" "\${@}"
330 - EOF
331 - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
332 - ln -s "python${pymajor}-config" \
333 - "${D}${PYTHON_SCRIPTDIR}/python-config" || die
334 - # 2to3, pydoc
335 - ln -s "../../../bin/2to3-${PYVER}" \
336 - "${D}${PYTHON_SCRIPTDIR}/2to3" || die
337 - ln -s "../../../bin/pydoc${PYVER}" \
338 - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
339 - # idle
340 - if use tk; then
341 - ln -s "../../../bin/idle${PYVER}" \
342 - "${D}${PYTHON_SCRIPTDIR}/idle" || die
343 - fi
344 -}
345 -
346 -pkg_preinst() {
347 - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
348 - python_updater_warning="1"
349 - fi
350 -}
351 -
352 -eselect_python_update() {
353 - if [[ -z "$(eselect python show)" || \
354 - ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
355 - eselect python update
356 - fi
357 -
358 - if [[ -z "$(eselect python show --python${PV%%.*})" || \
359 - ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
360 - then
361 - eselect python update --python${PV%%.*}
362 - fi
363 -}
364 -
365 -pkg_postinst() {
366 - eselect_python_update
367 -
368 - if [[ "${python_updater_warning}" == "1" ]]; then
369 - ewarn "You have just upgraded from an older version of Python."
370 - ewarn
371 - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
372 - fi
373 -}
374 -
375 -pkg_postrm() {
376 - eselect_python_update
377 -}