summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2017-09-20 10:22:21 +0200
committerAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2017-09-29 10:05:57 +0200
commit35af4c0857c6a202fecbb8aa839a4d43160c4435 (patch)
tree055786f4825bf9403218e1cdd2286a11d20dd3e5
parenta363e0a5ef875d3d2254e91891b770a3caf26ce1 (diff)
downloadarbor-35af4c0857c6a202fecbb8aa839a4d43160c4435.tar.gz
arbor-35af4c0857c6a202fecbb8aa839a4d43160c4435.tar.xz
python: drop 3.3
Signed-off-by: Marc-Antoine Perennou <keruspe@exherbo.org>
-rw-r--r--exlibs/python.exlib8
-rw-r--r--metadata/options/descriptions/python_abis.conf2
-rw-r--r--metadata/repository_mask.conf8
-rw-r--r--packages/dev-lang/python/files/3.3/Respect-PYTHON_DISABLE_MODULES-in-setup.py.patch31
-rw-r--r--packages/dev-lang/python/files/3.3/Support-LibreSSL.patch162
-rw-r--r--packages/dev-lang/python/files/3.3/add-library-build-dir-for-python-extension-cross-builds.patch24
-rw-r--r--packages/dev-lang/python/files/3.3/distutils-compiler-name.patch16
-rw-r--r--packages/dev-lang/python/files/3.3/use-localhost-for-tests.patch53
-rw-r--r--packages/dev-lang/python/python-3.3.6-r8.exheres-037
-rw-r--r--packages/dev-lang/python/python-build.exlib19
-rw-r--r--profiles/make.defaults5
11 files changed, 15 insertions, 350 deletions
diff --git a/exlibs/python.exlib b/exlibs/python.exlib
index 36d689f..ae84df2 100644
--- a/exlibs/python.exlib
+++ b/exlibs/python.exlib
@@ -58,7 +58,7 @@
# example:
# require python [ python_opts="[readline]" min_versions="3.1.1" \
-# blacklist="2 3.3" with_opt=true ]
+# blacklist="2 3.4" with_opt=true ]
#
# generates:
# OPTIONS="
@@ -148,7 +148,7 @@ case ${PYTHON_EXLIB_API} in
# x.y['','d','m','dm'] (for >=3.3) and have them depend on python[+-pymalloc][+-debug]
# would need to multibuild python n! times though, depending on options.
local abi=$(python_get_abi)
- ever at_least 3.2 ${abi} && abi+=m
+ ever at_least 3 ${abi} && abi+=m
echo -n "/usr/$(exhost --target)/include/python${abi}"
}
@@ -225,7 +225,7 @@ case ${PYTHON_EXLIB_API} in
# PYTHON_AVAILABLE_ABIS below need to be in sync with
# MULTIBUILD_PYTHON_ABIS_TARGETS in profiles/make.defaults.
- PYTHON_AVAILABLE_ABIS="2.7 3.3 3.4 3.5 3.6"
+ PYTHON_AVAILABLE_ABIS="2.7 3.4 3.5 3.6"
if [[ ${PYTHON_BLACKLIST} == none ]]; then
PYTHON_FILTERED_ABIS="${PYTHON_AVAILABLE_ABIS}"
@@ -366,7 +366,7 @@ case ${PYTHON_EXLIB_API} in
# x.y['','d','m','dm'] (for >=3.3) and have them depend on python[+-pymalloc][+-debug]
# would need to multibuild python n! times though, depending on options.
local abi=$(python_get_abi)
- ever at_least 3.2 ${abi} && abi+=m
+ ever at_least 3 ${abi} && abi+=m
echo -n "/usr/$(exhost --target)/include/python${abi}"
}
diff --git a/metadata/options/descriptions/python_abis.conf b/metadata/options/descriptions/python_abis.conf
index 8edbcb9..ba998cb 100644
--- a/metadata/options/descriptions/python_abis.conf
+++ b/metadata/options/descriptions/python_abis.conf
@@ -1,6 +1,4 @@
-2.6 - UNSUPPORTED, PLEASE FIX THE EXHERES BY DROPPING 2.6 SUPPORT
2.7 - Use Python ABI 2.7
-3.3 - Use Python ABI 3.3
3.4 - Use Python ABI 3.4
3.5 - Use Python ABI 3.5
3.6 - Use Python ABI 3.6
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index fe0c0ea..5b8c525 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -885,14 +885,6 @@ sys-apps/coreutils[<8.28] [[
description = [ CVE-2017-7476 ]
]]
-dev-lang/python:3.3 [[
- author = [ Rasmus Thomsen <Rasmus.thomsen@protonmail.com> ]
- date = [ 19 Sep 2017 ]
- token = pending-removal
- description = [ Soon to be removed version, affected by CVEs such
- as CVE-2016-5636, CVE-2016-0772 and CVE-2016-5699 ]
-]]
-
dev-libs/boost[~>1.65.0] [[
author = [ Marvin Schmidt <marv@exherbo.org> ]
date = [ 24 Sep 2017 ]
diff --git a/packages/dev-lang/python/files/3.3/Respect-PYTHON_DISABLE_MODULES-in-setup.py.patch b/packages/dev-lang/python/files/3.3/Respect-PYTHON_DISABLE_MODULES-in-setup.py.patch
deleted file mode 100644
index 2452cf5..0000000
--- a/packages/dev-lang/python/files/3.3/Respect-PYTHON_DISABLE_MODULES-in-setup.py.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f0638ac3e2685ec3317ed811ab18819a48bd33cf Mon Sep 17 00:00:00 2001
-From: Paul Seidler <sepek@exherbo.org>
-Date: Tue, 29 Nov 2011 21:59:28 +0100
-Subject: [PATCH] Respect PYTHON_DISABLE_MODULES in setup.py
-
-Based on patch by Ali Polatel, from Gentoo
-Upstream: no
----
- setup.py | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 1318bc2..d5e8126 100644
---- a/setup.py
-+++ b/setup.py
-@@ -31,7 +31,11 @@
- COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
-
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+pdm_env = "PYTHON_DISABLE_MODULES"
-+if pdm_env in os.environ:
-+ disabled_module_list = os.environ[pdm_env].split()
-+else:
-+ disabled_module_list = []
-
- def add_dir_to_list(dirlist, dir):
- """Add the directory 'dir' to the list 'dirlist' (after any relative
---
-1.7.7.4
-
diff --git a/packages/dev-lang/python/files/3.3/Support-LibreSSL.patch b/packages/dev-lang/python/files/3.3/Support-LibreSSL.patch
deleted file mode 100644
index df90e0d..0000000
--- a/packages/dev-lang/python/files/3.3/Support-LibreSSL.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-Upstream: Backport from https://hg.python.org/cpython/rev/7f82f50fdad0
- landed in 2.7, 3.4, and 3.5 ( http://bugs.python.org/issue21356 )
-Source: FreeBSD
-Reason: Actually support libressl
-
---- a/configure.ac.orig 2014-11-29 22:32:54.691247309 +0100
-+++ b/configure.ac 2014-11-29 22:37:50.663356194 +0100
-@@ -2185,6 +2185,13 @@
- AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV
- AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX
-
-+### Fix build with LibreSSL (does not have RAND_egd)
-+### PR195511, http://bugs.python.org/issue21356
-+AC_CHECK_LIB(crypto, RAND_egd,
-+ AC_DEFINE(HAVE_RAND_EGD, 1,
-+ [Define if the libcrypto has RAND_egd]))
-+### PR195511
-+
- # only check for sem_init if thread support is requested
- if test "$with_threads" = "yes" -o -z "$with_threads"; then
- AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris
---- a/configure.orig 2014-11-29 22:33:01.712152689 +0100
-+++ b/configure 2014-11-29 22:38:00.520934671 +0100
-@@ -8827,6 +8827,52 @@
- fi
- # Dynamic linking for HP-UX
-
-+### Fix build with LibreSSL (does not have RAND_egd)
-+### PR195511, http://bugs.python.org/issue21356
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAND_egd in -lcrypto" >&5
-+$as_echo_n "checking for RAND_egd in -lcrypto... " >&6; }
-+if ${ac_cv_lib_crypto_RAND_egd+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcrypto $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char RAND_egd ();
-+int
-+main ()
-+{
-+return RAND_egd ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_crypto_RAND_egd=yes
-+else
-+ ac_cv_lib_crypto_RAND_egd=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RAND_egd" >&5
-+$as_echo "$ac_cv_lib_crypto_RAND_egd" >&6; }
-+if test "x$ac_cv_lib_crypto_RAND_egd" = xyes; then :
-+
-+$as_echo "#define HAVE_RAND_EGD 1" >>confdefs.h
-+
-+fi
-+
-+### PR195511
-+
- # only check for sem_init if thread support is requested
- if test "$with_threads" = "yes" -o -z "$with_threads"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_init" >&5
---- a/Lib/ssl.py.orig 2014-03-09 09:40:13.000000000 +0100
-+++ b/Lib/ssl.py 2014-11-29 22:42:24.820894513 +0100
-@@ -78,7 +78,15 @@
- from _ssl import OP_SINGLE_ECDH_USE
- except ImportError:
- pass
--from _ssl import RAND_status, RAND_egd, RAND_add, RAND_bytes, RAND_pseudo_bytes
-+### Fix build with LibreSSL (does not have RAND_egd)
-+### PR195511, http://bugs.python.org/issue21356
-+from _ssl import RAND_status, RAND_add, RAND_bytes, RAND_pseudo_bytes
-+try:
-+ from _ssl import RAND_egd
-+except ImportError:
-+ # LibreSSL does not provide RAND_egd
-+ pass
-+### End PR195511
- from _ssl import (
- SSL_ERROR_ZERO_RETURN,
- SSL_ERROR_WANT_READ,
---- a/Lib/test/test_ssl.py.orig 2014-03-09 09:40:19.000000000 +0100
-+++ b/Lib/test/test_ssl.py 2014-11-29 22:44:07.630157771 +0100
-@@ -130,8 +130,12 @@
- self.assertRaises(ValueError, ssl.RAND_bytes, -5)
- self.assertRaises(ValueError, ssl.RAND_pseudo_bytes, -5)
-
-- self.assertRaises(TypeError, ssl.RAND_egd, 1)
-- self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1)
-+### Fix build with LibreSSL (does not have RAND_egd)
-+### PR195511, http://bugs.python.org/issue21356
-+ if hasattr(ssl, 'RAND_egd'):
-+ self.assertRaises(TypeError, ssl.RAND_egd, 1)
-+ self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1)
-+### End PR195511
- ssl.RAND_add("this is a random string", 75.0)
-
- @unittest.skipUnless(os.name == 'posix', 'requires posix')
---- a/pyconfig.h.in.orig 2014-03-09 09:40:34.000000000 +0100
-+++ b/pyconfig.h.in 2014-11-29 22:46:09.503928390 +0100
-@@ -660,6 +660,12 @@
- /* Define to 1 if you have the `pwrite' function. */
- #undef HAVE_PWRITE
-
-+/* ### Fix build with LibreSSL (does not have RAND_egd)
-+ ### PR195511, http://bugs.python.org/issue21356 */
-+/* Define if the libcrypto has RAND_egd */
-+#undef HAVE_RAND_EGD
-+/* ### PR195511 */
-+
- /* Define to 1 if you have the `readlink' function. */
- #undef HAVE_READLINK
-
---- a/Modules/_ssl.c.orig 2014-03-09 09:40:26.000000000 +0100
-+++ b/Modules/_ssl.c 2014-11-29 23:04:07.340262966 +0100
-@@ -2559,6 +2559,9 @@
- It is necessary to seed the PRNG with RAND_add() on some platforms before\n\
- using the ssl() function.");
-
-+/* ### Fix build with LibreSSL (does not have RAND_egd)
-+ ### PR195511, http://bugs.python.org/issue21356 */
-+#ifdef HAVE_RAND_EGD
- static PyObject *
- PySSL_RAND_egd(PyObject *self, PyObject *args)
- {
-@@ -2586,6 +2589,8 @@
- Queries the entropy gather daemon (EGD) on the socket named by 'path'.\n\
- Returns number of bytes read. Raises SSLError if connection to EGD\n\
- fails or if it does not provide enough data to seed PRNG.");
-+#endif /* HAVE_RAND_EGD */
-+/* ### End PR195511 */
-
- #endif /* HAVE_OPENSSL_RAND */
-
-@@ -2604,8 +2609,13 @@
- PySSL_RAND_bytes_doc},
- {"RAND_pseudo_bytes", PySSL_RAND_pseudo_bytes, METH_VARARGS,
- PySSL_RAND_pseudo_bytes_doc},
-+/* ### Fix build with LibreSSL (does not have RAND_egd)
-+ ### PR195511, http://bugs.python.org/issue21356 */
-+#ifdef HAVE_RAND_EGD
- {"RAND_egd", PySSL_RAND_egd, METH_VARARGS,
- PySSL_RAND_egd_doc},
-+#endif /* HAVE_RAND_EGD */
-+/* ### End PR195511 */
- {"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS,
- PySSL_RAND_status_doc},
- #endif
diff --git a/packages/dev-lang/python/files/3.3/add-library-build-dir-for-python-extension-cross-builds.patch b/packages/dev-lang/python/files/3.3/add-library-build-dir-for-python-extension-cross-builds.patch
deleted file mode 100644
index 62b1946..0000000
--- a/packages/dev-lang/python/files/3.3/add-library-build-dir-for-python-extension-cross-builds.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Upstream: yes, https://hg.python.org/cpython/rev/c5f908c56fbd/
-Reason: fix building .so modules for cross-builds
-Release Status: in 2.7.9+, 3.4.3+ and 3.5+
-
-# HG changeset patch
-# User doko@ubuntu.com
-# Date 1412208647 -7200
-# Node ID c5f908c56fbdedbae623536c50a9f567903558f4
-# Parent b826ba76d1ce19a4cf7e9a31ab2dbd602755a4fc
-- Issue #17219: Add library build dir for Python extension cross-builds.
-
-diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
---- a/Lib/distutils/command/build_ext.py
-+++ b/Lib/distutils/command/build_ext.py
-@@ -237,7 +237,7 @@ class build_ext(Command):
- # Python's library directory must be appended to library_dirs
- # See Issues: #1600860, #4366
- if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
-- if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
-+ if not sysconfig.python_build:
- # building third party extensions
- self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
- else:
-
diff --git a/packages/dev-lang/python/files/3.3/distutils-compiler-name.patch b/packages/dev-lang/python/files/3.3/distutils-compiler-name.patch
deleted file mode 100644
index 5a61426..0000000
--- a/packages/dev-lang/python/files/3.3/distutils-compiler-name.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: written by Calvin Walton <calvin.walton@kepstin.ca>
-Upstream: http://bugs.python.org/issue25229
-Reason: distutils checks for 'gcc' in compiler name, but Exherbo uses 'cc'
-
-diff -ru Python-3.4.3.orig/Lib/distutils/unixccompiler.py Python-3.4.3/Lib/distutils/unixccompiler.py
---- Python-3.4.3.orig/Lib/distutils/unixccompiler.py 2015-09-24 17:47:51.326840548 -0400
-+++ Python-3.4.3/Lib/distutils/unixccompiler.py 2015-09-24 17:48:44.777604734 -0400
-@@ -232,7 +232,7 @@
- elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
- return ["-rpath", dir]
- else:
-- if self._is_gcc(compiler):
-+ if sys.platform[:5] == "linux" or self._is_gcc(compiler):
- # gcc on non-GNU systems does not need -Wl, but can
- # use it anyway. Since distutils has always passed in
- # -Wl whenever gcc was used in the past it is probably
diff --git a/packages/dev-lang/python/files/3.3/use-localhost-for-tests.patch b/packages/dev-lang/python/files/3.3/use-localhost-for-tests.patch
deleted file mode 100644
index c72f8fd..0000000
--- a/packages/dev-lang/python/files/3.3/use-localhost-for-tests.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Upstream: no, Exherbo specific
-
-From 50b376c5dc643c3afb6cff44a7f5cb16644e8b67 Mon Sep 17 00:00:00 2001
-From: Paul Seidler <sepek@exherbo.org>
-Date: Sun, 27 Nov 2011 14:09:36 +0100
-Subject: [PATCH] use localhost for tests
-
----
- Lib/test/test_httplib.py | 2 +-
- Lib/test/test_ssl.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
-index ce9e346..e3b9db5 100644
---- a/Lib/test/test_httplib.py
-+++ b/Lib/test/test_httplib.py
-@@ -635,7 +635,7 @@ class SourceAddressTest(TestCase):
-
- def testHTTPConnectionSourceAddress(self):
- self.conn = client.HTTPConnection(HOST, self.port,
-- source_address=('', self.source_port))
-+ source_address=('localhost', self.source_port))
- self.conn.connect()
- self.assertEqual(self.conn.sock.getsockname()[1], self.source_port)
-
-diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
-index 869381a..0b41e93 100644
---- a/Lib/test/test_ssl.py
-+++ b/Lib/test/test_ssl.py
-@@ -222,7 +222,7 @@
- self.assertRaises(socket.error, ss.recvfrom, 1)
- self.assertRaises(socket.error, ss.recvfrom_into, bytearray(b'x'), 1)
- self.assertRaises(socket.error, ss.send, b'x')
-- self.assertRaises(socket.error, ss.sendto, b'x', ('0.0.0.0', 0))
-+ self.assertRaises(socket.error, ss.sendto, b'x', ('localhost', 0))
-
- def test_timeout(self):
- # Issue #8524: when creating an SSL socket, the timeout of the
---
-1.7.7.4
-
-diff -udr a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
---- a/Lib/test/test_ssl.py 2013-04-06 09:41:44.000000000 +0200
-+++ b/Lib/test/test_ssl.py 2013-07-14 14:23:30.497423584 +0200
-@@ -1175,7 +1175,7 @@
- def __init__(self, certfile):
- self.certfile = certfile
- sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-- self.port = support.bind_port(sock, '')
-+ self.port = support.bind_port(sock)
- asyncore.dispatcher.__init__(self, sock)
- self.listen(5)
-
diff --git a/packages/dev-lang/python/python-3.3.6-r8.exheres-0 b/packages/dev-lang/python/python-3.3.6-r8.exheres-0
deleted file mode 100644
index 2fff20a..0000000
--- a/packages/dev-lang/python/python-3.3.6-r8.exheres-0
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2009, 2010 Ingmar Vanhassel
-# Distributed under the terms of the GNU General Public License v2
-
-require python-build
-
-PLATFORMS="~amd64 ~arm ~armv7 ~x86"
-
-DEPENDENCIES+="
- build+run:
- app-arch/xz
- !dev-lang/python:3.2[=3.2.5] [[
- description = [ Man file collision ]
- ]]
-"
-
-src_test() {
- local DISABLE_TESTS
- # test_install_lib (test_distuils) has problems with path resolution
- # test_gdb: never-ending threads running under gdb
- # test_socket: seems to hang
- # the rest want to bind to 0.0.0.0/::
- # test_ssl test_timeout test_urllibnet test_urllib2net: wants access to DNS
- DISABLE_TESTS=( test_distutils test_faulthandler test_ftplib test_gdb test_pydoc test_socket
- test_ssl test_timeout test_urllibnet test_urllib2net test_uuid )
-
- # for test_socketserver
- esandbox allow_net "unix:${TEMP%/}"'/unix_socket.*'
-
- # for test_asyncore
- esandbox allow_net "unix:${PWD%/}"'/build/test_python_*/@test_*_tmp'
-
- python-build_src_test
-
- esandbox disallow_net "unix:${PWD%/}"'/build/test_python_*/@test_*_tmp'
- esandbox disallow_net "unix:${TEMP%/}"'/unix_socket.*'
-}
-
diff --git a/packages/dev-lang/python/python-build.exlib b/packages/dev-lang/python/python-build.exlib
index 4f5c0f7..cd44ada 100644
--- a/packages/dev-lang/python/python-build.exlib
+++ b/packages/dev-lang/python/python-build.exlib
@@ -62,7 +62,7 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
ac_cv_file__dev_ptmx=yes
)
-if ever at_least 3.4; then
+if ever at_least 3; then
DEFAULT_SRC_CONFIGURE_PARAMS+=( --without-ensurepip )
fi
@@ -89,7 +89,7 @@ python-build_pkg_pretend() {
python-build_src_prepare() {
# linux-3 support, applied upstream, python-3.3+ only has `plat-linux`
- ever at_least 3.3 || edo cp -r Lib/plat-linux2 Lib/plat-linux3
+ ever at_least 3 || edo cp -r Lib/plat-linux2 Lib/plat-linux3
expatch "${FILES}/${SLOT}/"
@@ -190,17 +190,16 @@ python-build_src_install() {
edo mv "${IMAGE}"/usr/${target}/lib/{python${SLOT}/config,}/libpython${SLOT}.a
else
edo rm "${IMAGE}"/usr/${target}/bin/python${SLOT}-config
- edo rm "${IMAGE}"/usr/${target}/bin/{2to3,idle3,pydoc3,python${SLOT}m}
+ edo rm "${IMAGE}"/usr/${target}/bin/{2to3,idle3,pydoc3,python${SLOT}m,pyvenv}
edo mv "${IMAGE}"/usr/${target}/bin/python${SLOT}{m,}-config
edo mv "${IMAGE}"/usr/${target}/lib/libpython$(ever major){,-${SLOT}}.so
edo mv "${IMAGE}"/usr/${target}/lib/{python${SLOT}/config-${SLOT}m*,}/libpython${SLOT}m.a
- alternatives+=( /usr/${target}/lib/libpython$(ever major).so libpython$(ever major)-${SLOT}.so )
- fi
-
- if ever at_least 3.3; then
- edo rm "${IMAGE}"/usr/${target}/bin/pyvenv
+ alternatives+=(
+ /usr/${target}/lib/libpython$(ever major).so libpython$(ever major)-${SLOT}.so
+ /usr/${target}/bin/pyvenv-$(ever major) pyvenv-${SLOT}
+ )
fi
alternatives+=(
@@ -213,11 +212,9 @@ python-build_src_install() {
/usr/share/man/man1/python$(ever major).1 python${SLOT}.1
)
- ever at_least 3.3 && alternatives+=( /usr/${target}/bin/pyvenv-$(ever major) pyvenv-${SLOT} )
-
alternatives_for "${alternatives[@]}"
- if ever at_least 3.2; then
+ if ever at_least 3; then
edo pushd "${IMAGE}"/usr/${target}/bin
edo ln -s python${SLOT} python${SLOT}m
edo ln -s python${SLOT}-config python${SLOT}m-config
diff --git a/profiles/make.defaults b/profiles/make.defaults
index 4f9c127..6eba64c 100644
--- a/profiles/make.defaults
+++ b/profiles/make.defaults
@@ -25,16 +25,17 @@ MULTIBUILD_LUA_ABIS_5_1_PROFILE_LUA="lua5.1"
# MULTIBUILD_PYTHON_ABIS_TARGETS below need to be in sync with
# PYTHON_AVAILABLE_ABIS in exlibs/python.exlib.
-MULTIBUILD_PYTHON_ABIS_TARGETS="2.7 3.3 3.4 3.5 3.6"
+MULTIBUILD_PYTHON_ABIS_TARGETS="2.7 3.4 3.5 3.6"
MULTIBUILD_PYTHON_ABIS_LOCKED_VARS="PYTHON"
MULTIBUILD_PYTHON_ABIS_REQUIRED_VARS="PYTHON"
MULTIBUILD_PYTHON_ABIS_3_6_PROFILE_PYTHON="python3.6"
MULTIBUILD_PYTHON_ABIS_3_5_PROFILE_PYTHON="python3.5"
MULTIBUILD_PYTHON_ABIS_3_4_PROFILE_PYTHON="python3.4"
-MULTIBUILD_PYTHON_ABIS_3_3_PROFILE_PYTHON="python3.3"
MULTIBUILD_PYTHON_ABIS_2_7_PROFILE_PYTHON="python2.7"
# this is kept around to ensure old env can be sourced when replacing packages
+MULTIBUILD_PYTHON_ABIS_3_3_PROFILE_PYTHON="python3.3"
+MULTIBUILD_PYTHON_ABIS_3_2_PROFILE_PYTHON="python3.2"
MULTIBUILD_PYTHON_ABIS_3_1_PROFILE_PYTHON="python3.1"
# MULTIBUILD_RUBY_ABIS_TARGETS below need to be in sync with