| 1 |
floppym 12/02/27 03:57:35 |
| 2 |
|
| 3 |
Modified: ChangeLog python.eclass |
| 4 |
Log: |
| 5 |
Add a safety check to catch issues like bug 405299 earlier. Adapted from Progress overlay. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.146 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.146&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.146&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.145&r2=1.146 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.145 |
| 18 |
retrieving revision 1.146 |
| 19 |
diff -u -r1.145 -r1.146 |
| 20 |
--- ChangeLog 26 Feb 2012 16:13:38 -0000 1.145 |
| 21 |
+++ ChangeLog 27 Feb 2012 03:57:35 -0000 1.146 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.145 2012/02/26 16:13:38 pacho Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.146 2012/02/27 03:57:35 floppym Exp $ |
| 27 |
+ |
| 28 |
+ 27 Feb 2012; Mike Gilbert <floppym@g.o> python.eclass: |
| 29 |
+ Add a safety check to catch issues like bug 405299 earlier. Adapted from |
| 30 |
+ Progress overlay. |
| 31 |
|
| 32 |
26 Feb 2012; Pacho Ramos <pacho@g.o> tla.eclass: |
| 33 |
Convert to eshopts_{push,pop}, bug 328871 by Spanky. |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.151 eclass/python.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.151&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.151&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.150&r2=1.151 |
| 42 |
|
| 43 |
Index: python.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v |
| 46 |
retrieving revision 1.150 |
| 47 |
retrieving revision 1.151 |
| 48 |
diff -u -r1.150 -r1.151 |
| 49 |
--- python.eclass 13 Feb 2012 23:50:12 -0000 1.150 |
| 50 |
+++ python.eclass 27 Feb 2012 03:57:35 -0000 1.151 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2012 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.150 2012/02/13 23:50:12 zmedico Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.151 2012/02/27 03:57:35 floppym Exp $ |
| 56 |
|
| 57 |
# @ECLASS: python.eclass |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -846,6 +846,16 @@ |
| 60 |
fi |
| 61 |
fi |
| 62 |
|
| 63 |
+ if [[ -z "${python2_version}" && -z "${python3_version}" ]]; then |
| 64 |
+ eerror "${CATEGORY}/${PF} requires at least one of the following packages:" |
| 65 |
+ for PYTHON_ABI in "${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}" "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}"; do |
| 66 |
+ if ! _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${RESTRICT_PYTHON_ABIS}"; then |
| 67 |
+ eerror " dev-lang/python:${PYTHON_ABI}" |
| 68 |
+ fi |
| 69 |
+ done |
| 70 |
+ die "No supported version of CPython installed" |
| 71 |
+ fi |
| 72 |
+ |
| 73 |
if [[ -n "${python2_version}" && "${python_version}" == "2."* && "${python_version}" != "${python2_version}" ]]; then |
| 74 |
eerror "Python wrapper is configured incorrectly or '${EPREFIX}/usr/bin/python2' symlink" |
| 75 |
eerror "is set incorrectly. Use \`eselect python\` to fix configuration." |
Archives