* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2011-12-18 23:38 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 21+ messages in thread
From: Robin H. Johnson (robbat2) @ 2011-12-18 23:38 UTC (permalink / raw
To: gentoo-commits
robbat2 11/12/18 23:38:12
Modified: ChangeLog python.eclass
Log:
Bug #390691: Be careful about cp call to coreutils with --no-preserve option that might not be available until later in an upgrade.
Revision Changes Path
1.50 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.49&r2=1.50
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -p -w -b -B -u -u -r1.49 -r1.50
--- ChangeLog 18 Dec 2011 21:33:50 -0000 1.49
+++ ChangeLog 18 Dec 2011 23:38:11 -0000 1.50
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.49 2011/12/18 21:33:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.50 2011/12/18 23:38:11 robbat2 Exp $
+
+ 18 Dec 2011; Robin H. Johnson <robbat2@gentoo.org> python.eclass:
+ Bug #390691: Be careful about cp call to coreutils with --no-preserve option
+ that might not be available until later in an upgrade.
18 Dec 2011; Diego E. Pettenò <flameeyes@gentoo.org> ruby-ng.eclass:
Reorder setting of REQUIRED_USE to stay near IUSE setting; also use
1.142 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.142&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.142&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.141&r2=1.142
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.141
retrieving revision 1.142
diff -p -w -b -B -u -u -r1.141 -r1.142
--- python.eclass 30 Nov 2011 08:55:18 -0000 1.141
+++ python.eclass 18 Dec 2011 23:38:11 -0000 1.142
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.141 2011/11/30 08:55:18 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.142 2011/12/18 23:38:11 robbat2 Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -1592,8 +1592,14 @@ for file in sorted(files_set):
popd > /dev/null || die "popd failed"
- if ROOT="/" has_version sys-apps/coreutils; then
+ # This is per bug #390691, without the duplication refactor, and with
+ # the 3-way structure per comment #6. This enable users with old
+ # coreutils to upgrade a lot easier (you need to upgrade python+portage
+ # before coreutils can be upgraded).
+ if ROOT="/" has_version >=sys-apps/coreutils-6.9.90; then
cp -fr --preserve=all --no-preserve=context "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
+ elif ROOT="/" has_version sys-apps/coreutils; then
+ cp -fr --preserve=all "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
else
cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
fi
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2012-01-21 19:48 Mike Gilbert (floppym)
0 siblings, 0 replies; 21+ messages in thread
From: Mike Gilbert (floppym) @ 2012-01-21 19:48 UTC (permalink / raw
To: gentoo-commits
floppym 12/01/21 19:48:20
Modified: ChangeLog python.eclass
Log:
Copy python_clean_installation_image from Progress overlay. Thanks Arfrever. Bug 396586.
Revision Changes Path
1.100 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.99&r2=1.100
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- ChangeLog 20 Jan 2012 18:24:08 -0000 1.99
+++ ChangeLog 21 Jan 2012 19:48:20 -0000 1.100
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.99 2012/01/20 18:24:08 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.100 2012/01/21 19:48:20 floppym Exp $
+
+ 21 Jan 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
+ Copy python_clean_installation_image from Progress overlay. Thanks Arfrever.
+ Bug 396586.
20 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
Added stdout echoing of most executed phase commands. Added stub for
1.145 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.145&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.145&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.144&r2=1.145
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- python.eclass 1 Jan 2012 05:02:27 -0000 1.144
+++ python.eclass 21 Jan 2012 19:48:20 -0000 1.145
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.144 2012/01/01 05:02:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.145 2012/01/21 19:48:20 floppym Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -558,6 +558,42 @@
done
}
+# @FUNCTION: python_clean_py-compile_files
+# @USAGE: [-q|--quiet]
+# @DESCRIPTION:
+# Clean py-compile files to disable byte-compilation.
+python_clean_py-compile_files() {
+ _python_check_python_pkg_setup_execution
+
+ local file files=() quiet="0"
+
+ while (($#)); do
+ case "$1" in
+ -q|--quiet)
+ quiet="1"
+ ;;
+ -*)
+ die "${FUNCNAME}(): Unrecognized option '$1'"
+ ;;
+ *)
+ die "${FUNCNAME}(): Invalid usage"
+ ;;
+ esac
+ shift
+ done
+
+ while read -d $'\0' -r file; do
+ files+=("${file#./}")
+ done < <(find -name py-compile -type f -print0)
+
+ for file in "${files[@]}"; do
+ if [[ "${quiet}" == "0" ]]; then
+ einfo "Cleaning '${file}' file"
+ fi
+ echo "#!/bin/sh" > "${file}"
+ done
+}
+
# @FUNCTION: python_clean_installation_image
# @USAGE: [-q|--quiet]
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2012-01-30 20:18 Mike Gilbert (floppym)
0 siblings, 0 replies; 21+ messages in thread
From: Mike Gilbert (floppym) @ 2012-01-30 20:18 UTC (permalink / raw
To: gentoo-commits
floppym 12/01/30 20:18:38
Modified: ChangeLog python.eclass
Log:
Detect needless usage of python_convert_shebangs(). Patch by Arfrever.
Revision Changes Path
1.105 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.105&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.105&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.104&r2=1.105
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- ChangeLog 30 Jan 2012 13:11:27 -0000 1.104
+++ ChangeLog 30 Jan 2012 20:18:38 -0000 1.105
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.104 2012/01/30 13:11:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.105 2012/01/30 20:18:38 floppym Exp $
+
+ 30 Jan 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
+ Detect needless usage of python_convert_shebangs(). Patch by Arfrever.
30 Jan 2012; Justin Lecher <jlec@gentoo.org> autotools-utils.eclass:
Call glib-gettextize with --force in autotools-utils.eclass
1.146 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.146&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.146&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.145&r2=1.146
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- python.eclass 21 Jan 2012 19:48:20 -0000 1.145
+++ python.eclass 30 Jan 2012 20:18:38 -0000 1.146
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.145 2012/01/21 19:48:20 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.146 2012/01/30 20:18:38 floppym Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -11,7 +11,7 @@
# Must call inherit before EXPORT_FUNCTIONS to avoid QA warning.
if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
- inherit multilib
+ inherit eutils multilib
fi
# Export pkg_setup every time to avoid issues with eclass inheritance order.
@@ -484,7 +484,7 @@
python_convert_shebangs() {
_python_check_python_pkg_setup_execution
- local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0"
+ local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" shebangs_converted="0"
while (($#)); do
case "$1" in
@@ -549,6 +549,8 @@
if [[ "$(head -n1 "${file}")" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX} ]]; then
[[ "$(sed -ne "2p" "${file}")" =~ ^"# Gentoo '".*"' wrapper script generated by python_generate_wrapper_scripts()"$ ]] && continue
+ shebangs_converted="1"
+
if [[ "${quiet}" == "0" ]]; then
einfo "Converting shebang in '${file}'"
fi
@@ -556,6 +558,10 @@
sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?\(jython\|pypy-c\|python\)\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${python_interpreter}\6:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
fi
done
+
+ if [[ "${shebangs_converted}" == "0" ]]; then
+ eqawarn "${FUNCNAME}(): Python scripts not found"
+ fi
}
# @FUNCTION: python_clean_py-compile_files
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2012-01-30 22:04 Mike Gilbert (floppym)
0 siblings, 0 replies; 21+ messages in thread
From: Mike Gilbert (floppym) @ 2012-01-30 22:04 UTC (permalink / raw
To: gentoo-commits
floppym 12/01/30 22:04:32
Modified: ChangeLog python.eclass
Log:
Avoid inheriting eutils from python.eclass.
Revision Changes Path
1.106 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.106&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.106&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.105&r2=1.106
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- ChangeLog 30 Jan 2012 20:18:38 -0000 1.105
+++ ChangeLog 30 Jan 2012 22:04:32 -0000 1.106
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.105 2012/01/30 20:18:38 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.106 2012/01/30 22:04:32 floppym Exp $
+
+ 30 Jan 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
+ Avoid inheriting eutils from python.eclass.
30 Jan 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
Detect needless usage of python_convert_shebangs(). Patch by Arfrever.
1.147 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.147&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.147&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.146&r2=1.147
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- python.eclass 30 Jan 2012 20:18:38 -0000 1.146
+++ python.eclass 30 Jan 2012 22:04:32 -0000 1.147
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.146 2012/01/30 20:18:38 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.147 2012/01/30 22:04:32 floppym Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -11,7 +11,7 @@
# Must call inherit before EXPORT_FUNCTIONS to avoid QA warning.
if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
- inherit eutils multilib
+ inherit multilib
fi
# Export pkg_setup every time to avoid issues with eclass inheritance order.
@@ -560,7 +560,7 @@
done
if [[ "${shebangs_converted}" == "0" ]]; then
- eqawarn "${FUNCNAME}(): Python scripts not found"
+ ewarn "${FUNCNAME}(): Python scripts not found"
fi
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2012-02-10 22:54 Thomas Sachau (tommy)
0 siblings, 0 replies; 21+ messages in thread
From: Thomas Sachau (tommy) @ 2012-02-10 22:54 UTC (permalink / raw
To: gentoo-commits
tommy 12/02/10 22:54:33
Modified: ChangeLog python.eclass
Log:
Revert previous commit to python eclass, breaks any ebuild using PYTHON_DEPEND=2.4 without any need or prior warning
Revision Changes Path
1.125 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.125&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.125&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.124&r2=1.125
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- ChangeLog 10 Feb 2012 04:15:42 -0000 1.124
+++ ChangeLog 10 Feb 2012 22:54:33 -0000 1.125
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.124 2012/02/10 04:15:42 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.125 2012/02/10 22:54:33 tommy Exp $
+
+ 10 Feb 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> python.eclass:
+ Revert previous commit to python eclass, breaks any ebuild using
+ PYTHON_DEPEND=2.4 without any need or prior warning
10 Feb 2012; Patrick Lauer <patrick@gentoo.org> python.eclass:
Removing python 2.4 support from python eclass
1.149 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.149&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.149&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.148&r2=1.149
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- python.eclass 10 Feb 2012 04:15:42 -0000 1.148
+++ python.eclass 10 Feb 2012 22:54:33 -0000 1.149
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.148 2012/02/10 04:15:42 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.149 2012/02/10 22:54:33 tommy Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -27,7 +27,7 @@
die "API of python.eclass in EAPI=\"${EAPI}\" not established"
fi
-_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.5 2.6 2.7)
+_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2)
_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython)
_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7)
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2012-02-13 23:50 Zac Medico (zmedico)
0 siblings, 0 replies; 21+ messages in thread
From: Zac Medico (zmedico) @ 2012-02-13 23:50 UTC (permalink / raw
To: gentoo-commits
zmedico 12/02/13 23:50:13
Modified: ChangeLog python.eclass
Log:
Enable PyPy 1.8 support.
Merged from the progress overlay:
http://code.google.com/p/gentoo-progress/source/detail?r=1785
Revision Changes Path
1.135 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.135&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.135&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.134&r2=1.135
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- ChangeLog 13 Feb 2012 01:31:50 -0000 1.134
+++ ChangeLog 13 Feb 2012 23:50:12 -0000 1.135
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.134 2012/02/13 01:31:50 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.135 2012/02/13 23:50:12 zmedico Exp $
+
+ 13 Feb 2012; Zac Medico <zmedico@gentoo.org> python.eclass:
+ Enable PyPy 1.8 support. Merged from the progress overlay:
+ http://code.google.com/p/gentoo-progress/source/detail?r=1785
13 Feb 2012; Davide Pesavento <pesa@gentoo.org> qt4-r2.eclass:
Minor code style cleanup and quoting fixes.
1.150 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.150&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.150&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.149&r2=1.150
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- python.eclass 10 Feb 2012 22:54:33 -0000 1.149
+++ python.eclass 13 Feb 2012 23:50:12 -0000 1.150
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.149 2012/02/10 22:54:33 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.150 2012/02/13 23:50:12 zmedico Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -30,7 +30,7 @@
_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2)
_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython)
-_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7)
+_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7 2.7-pypy-1.8)
_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
# ================================================================================================
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2012-02-27 3:57 Mike Gilbert (floppym)
0 siblings, 0 replies; 21+ messages in thread
From: Mike Gilbert (floppym) @ 2012-02-27 3:57 UTC (permalink / raw
To: gentoo-commits
floppym 12/02/27 03:57:35
Modified: ChangeLog python.eclass
Log:
Add a safety check to catch issues like bug 405299 earlier. Adapted from Progress overlay.
Revision Changes Path
1.146 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.146&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.146&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.145&r2=1.146
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- ChangeLog 26 Feb 2012 16:13:38 -0000 1.145
+++ ChangeLog 27 Feb 2012 03:57:35 -0000 1.146
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.145 2012/02/26 16:13:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.146 2012/02/27 03:57:35 floppym Exp $
+
+ 27 Feb 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
+ Add a safety check to catch issues like bug 405299 earlier. Adapted from
+ Progress overlay.
26 Feb 2012; Pacho Ramos <pacho@gentoo.org> tla.eclass:
Convert to eshopts_{push,pop}, bug 328871 by Spanky.
1.151 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.151&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.151&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.150&r2=1.151
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- python.eclass 13 Feb 2012 23:50:12 -0000 1.150
+++ python.eclass 27 Feb 2012 03:57:35 -0000 1.151
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.150 2012/02/13 23:50:12 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.151 2012/02/27 03:57:35 floppym Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -846,6 +846,16 @@
fi
fi
+ if [[ -z "${python2_version}" && -z "${python3_version}" ]]; then
+ eerror "${CATEGORY}/${PF} requires at least one of the following packages:"
+ for PYTHON_ABI in "${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}" "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}"; do
+ if ! _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${RESTRICT_PYTHON_ABIS}"; then
+ eerror " dev-lang/python:${PYTHON_ABI}"
+ fi
+ done
+ die "No supported version of CPython installed"
+ fi
+
if [[ -n "${python2_version}" && "${python_version}" == "2."* && "${python_version}" != "${python2_version}" ]]; then
eerror "Python wrapper is configured incorrectly or '${EPREFIX}/usr/bin/python2' symlink"
eerror "is set incorrectly. Use \`eselect python\` to fix configuration."
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2012-03-07 4:13 Mike Gilbert (floppym)
0 siblings, 0 replies; 21+ messages in thread
From: Mike Gilbert (floppym) @ 2012-03-07 4:13 UTC (permalink / raw
To: gentoo-commits
floppym 12/03/07 04:13:27
Modified: ChangeLog python.eclass
Log:
Fix default src_test implementation in EAPI 4. Patch by pesa.
Revision Changes Path
1.156 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.155&r2=1.156
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- ChangeLog 6 Mar 2012 22:23:51 -0000 1.155
+++ ChangeLog 7 Mar 2012 04:13:27 -0000 1.156
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.155 2012/03/06 22:23:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.156 2012/03/07 04:13:27 floppym Exp $
+
+ 07 Mar 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
+ Fix default src_test implementation in EAPI 4. Patch by pesa.
06 Mar 2012; Andreas K. Huettel <dilfridge@gentoo.org> kde4-base.eclass,
kde4-meta.eclass:
1.152 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.152&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.152&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.151&r2=1.152
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- python.eclass 27 Feb 2012 03:57:35 -0000 1.151
+++ python.eclass 7 Mar 2012 04:13:27 -0000 1.152
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.151 2012/02/27 03:57:35 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.152 2012/03/07 04:13:27 floppym Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -1021,10 +1021,12 @@
}
elif [[ "${EBUILD_PHASE}" == "test" ]]; then
python_default_function() {
- if emake -j1 -n check &> /dev/null; then
- emake -j1 check "$@"
- elif emake -j1 -n test &> /dev/null; then
- emake -j1 test "$@"
+ # Stolen from portage's _eapi0_src_test()
+ local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
+ if ${emake_cmd} -j1 -n check &> /dev/null; then
+ ${emake_cmd} -j1 check "$@"
+ elif ${emake_cmd} -j1 -n test &> /dev/null; then
+ ${emake_cmd} -j1 test "$@"
fi
}
elif [[ "${EBUILD_PHASE}" == "install" ]]; then
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2012-03-20 20:37 Mike Gilbert (floppym)
0 siblings, 0 replies; 21+ messages in thread
From: Mike Gilbert (floppym) @ 2012-03-20 20:37 UTC (permalink / raw
To: gentoo-commits
floppym 12/03/20 20:37:21
Modified: ChangeLog python.eclass
Log:
Apply patch from Arfrever to adjust dependencies in python.eclass.
Revision Changes Path
1.176 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.176&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.176&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.175&r2=1.176
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- ChangeLog 20 Mar 2012 15:32:02 -0000 1.175
+++ ChangeLog 20 Mar 2012 20:37:21 -0000 1.176
@@ -1,6 +1,12 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.175 2012/03/20 15:32:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.176 2012/03/20 20:37:21 floppym Exp $
+
+ 20 Mar 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
+ Define _python_implementation() earlier.
+ Update handling of dependencies.
+ Patch by Arfrever. Backported from Progress Overlay.
+ http://code.google.com/p/gentoo-progress/source/detail?r=1705
19 Mar 2012; Michał Górny <mgorny@gentoo.org> vcs-snapshot.eclass:
Fix old eclass name in die-message.
1.153 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.153&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.153&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.152&r2=1.153
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- python.eclass 7 Mar 2012 04:13:27 -0000 1.152
+++ python.eclass 20 Mar 2012 20:37:21 -0000 1.153
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.152 2012/03/07 04:13:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.153 2012/03/20 20:37:21 floppym Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -100,6 +100,18 @@
fi
}
+_python_implementation() {
+ if [[ "${CATEGORY}/${PN}" == "dev-lang/python" ]]; then
+ return 0
+ elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then
+ return 0
+ elif [[ "${CATEGORY}/${PN}" == "dev-python/pypy" ]]; then
+ return 0
+ else
+ return 1
+ fi
+}
+
_python_package_supporting_installation_for_multiple_python_abis() {
if has "${EAPI:-0}" 0 1 2 3 4; then
if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
@@ -245,8 +257,11 @@
fi
}
-DEPEND=">=app-admin/eselect-python-20091230"
-RDEPEND="${DEPEND}"
+if _python_implementation; then
+ DEPEND=">=app-admin/eselect-python-20091230"
+ RDEPEND="${DEPEND}"
+ PDEPEND="app-admin/python-updater"
+fi
if [[ -n "${PYTHON_DEPEND}" ]]; then
_python_parse_PYTHON_DEPEND
@@ -295,8 +310,8 @@
if [[ -n "${PYTHON_USE_WITH_OPT}" ]]; then
_PYTHON_USE_WITH_ATOMS="${PYTHON_USE_WITH_OPT}? ( ${_PYTHON_USE_WITH_ATOMS} )"
fi
- DEPEND+=" ${_PYTHON_USE_WITH_ATOMS}"
- RDEPEND+=" ${_PYTHON_USE_WITH_ATOMS}"
+ DEPEND+="${DEPEND:+ }${_PYTHON_USE_WITH_ATOMS}"
+ RDEPEND+="${RDEPEND:+ }${_PYTHON_USE_WITH_ATOMS}"
unset _PYTHON_ATOM _PYTHON_USE_WITH_ATOMS _PYTHON_USE_WITH_ATOMS_ARRAY
fi
@@ -306,18 +321,6 @@
# =================================== MISCELLANEOUS FUNCTIONS ====================================
# ================================================================================================
-_python_implementation() {
- if [[ "${CATEGORY}/${PN}" == "dev-lang/python" ]]; then
- return 0
- elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then
- return 0
- elif [[ "${CATEGORY}/${PN}" == "dev-python/pypy" ]]; then
- return 0
- else
- return 1
- fi
-}
-
_python_abi-specific_local_scope() {
[[ " ${FUNCNAME[@]:2} " =~ " "(_python_final_sanity_checks|python_execute_function|python_mod_optimize|python_mod_cleanup)" " ]]
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2012-03-29 12:47 Marien Zwart (marienz)
0 siblings, 0 replies; 21+ messages in thread
From: Marien Zwart (marienz) @ 2012-03-29 12:47 UTC (permalink / raw
To: gentoo-commits
marienz 12/03/29 12:47:35
Modified: ChangeLog python.eclass
Log:
Add more versions of pypy to the hardcoded mapping in python.eclass.
Revision Changes Path
1.193 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.193&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.193&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.192&r2=1.193
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- ChangeLog 28 Mar 2012 14:21:55 -0000 1.192
+++ ChangeLog 29 Mar 2012 12:47:35 -0000 1.193
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.192 2012/03/28 14:21:55 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.193 2012/03/29 12:47:35 marienz Exp $
+
+ 29 Mar 2012; Marien Zwart <marienz@gentoo.org> python.eclass:
+ Add more versions of pypy to the hardcoded mapping in python.eclass.
28 Mar 2012; Marien Zwart <marienz@gentoo.org> python-distutils-ng.eclass:
Try to unbreak dependency generation.
1.154 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.154&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.154&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.153&r2=1.154
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- python.eclass 20 Mar 2012 20:37:21 -0000 1.153
+++ python.eclass 29 Mar 2012 12:47:35 -0000 1.154
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.153 2012/03/20 20:37:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.154 2012/03/29 12:47:35 marienz Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -1307,7 +1307,10 @@
python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$")
pypy_versions_mapping = {
- "1.5": "2.7"
+ "1.5": "2.7",
+ "1.6": "2.7",
+ "1.7": "2.7",
+ "1.8": "2.7",
}
def get_PYTHON_ABI(python_interpreter):
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2012-06-09 10:01 Marien Zwart (marienz)
0 siblings, 0 replies; 21+ messages in thread
From: Marien Zwart (marienz) @ 2012-06-09 10:01 UTC (permalink / raw
To: gentoo-commits
marienz 12/06/09 10:01:19
Modified: ChangeLog python.eclass
Log:
Add pypy-1.9 to the list of supported python ABIs.
Revision Changes Path
1.299 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.299&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.299&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.298&r2=1.299
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- ChangeLog 7 Jun 2012 22:06:04 -0000 1.298
+++ ChangeLog 9 Jun 2012 10:01:19 -0000 1.299
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.298 2012/06/07 22:06:04 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.299 2012/06/09 10:01:19 marienz Exp $
+
+ 09 Jun 2012; Marien Zwart <marienz@gentoo.org> python.eclass:
+ Add pypy-1.9 to the list of supported python ABIs.
07 Jun 2012; Zac Medico <zmedico@gentoo.org> kde4-base.eclass,
mysql-autotools.eclass, mysql-cmake.eclass:
1.155 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.155&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.155&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.154&r2=1.155
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- python.eclass 29 Mar 2012 12:47:35 -0000 1.154
+++ python.eclass 9 Jun 2012 10:01:19 -0000 1.155
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.154 2012/03/29 12:47:35 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.155 2012/06/09 10:01:19 marienz Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -30,7 +30,7 @@
_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2)
_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython)
-_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7 2.7-pypy-1.8)
+_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7 2.7-pypy-1.8 2.7-pypy-1.9)
_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
# ================================================================================================
@@ -1311,6 +1311,7 @@
"1.6": "2.7",
"1.7": "2.7",
"1.8": "2.7",
+ "1.9": "2.7",
}
def get_PYTHON_ABI(python_interpreter):
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2012-08-16 23:57 Mike Gilbert (floppym)
0 siblings, 0 replies; 21+ messages in thread
From: Mike Gilbert (floppym) @ 2012-08-16 23:57 UTC (permalink / raw
To: gentoo-commits
floppym 12/08/16 23:57:32
Modified: ChangeLog python.eclass
Log:
Hide the python.eclass unmerge noise behind PORTAGE_VERBOSE.
Revision Changes Path
1.373 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.373&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.373&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.372&r2=1.373
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- ChangeLog 16 Aug 2012 07:46:15 -0000 1.372
+++ ChangeLog 16 Aug 2012 23:57:32 -0000 1.373
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.372 2012/08/16 07:46:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.373 2012/08/16 23:57:32 floppym Exp $
+
+ 16 Aug 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
+ Hide the python.eclass unmerge noise behind PORTAGE_VERBOSE.
16 Aug 2012; Patrick Lauer <patrick@gentoo.org> python.eclas:
Fix noisy output on unmerge #423741
1.157 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.157&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.157&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.156&r2=1.157
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- python.eclass 16 Aug 2012 07:46:15 -0000 1.156
+++ python.eclass 16 Aug 2012 23:57:32 -0000 1.157
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.156 2012/08/16 07:46:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.157 2012/08/16 23:57:32 floppym Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -2713,6 +2713,10 @@
export PYTHONDONTWRITEBYTECODE="1"
}
+_python_vecho() {
+ [[ -z ${PORTAGE_VERBOSE} ]] || echo "$@"
+}
+
_python_clean_compiled_modules() {
_python_initialize_prefix_variables
_python_set_color_variables
@@ -2735,7 +2739,7 @@
# Delete empty child directories.
find "${path}" -type d | sort -r | while read -r dir; do
if rmdir "${dir}" 2> /dev/null; then
- echo "${_CYAN}<<< ${dir}${_NORMAL}"
+ _python_vecho "<<< ${dir}"
fi
done
fi
@@ -2768,6 +2772,7 @@
else
[[ -f "${py_file}" ]] && continue
fi
+ _python_vecho "<<< ${compiled_file%[co]}[co]"
rm -f "${compiled_file%[co]}"[co]
elif [[ "${compiled_file}" == *\$py.class ]]; then
if [[ "${dir}" == "__pycache__" ]]; then
@@ -2782,6 +2787,7 @@
else
[[ -f "${py_file}" ]] && continue
fi
+ _python_vecho "<<< ${compiled_file}"
rm -f "${compiled_file}"
else
die "${FUNCNAME}(): Unrecognized file type: '${compiled_file}'"
@@ -2790,7 +2796,9 @@
# Delete empty parent directories.
dir="${compiled_file%/*}"
while [[ "${dir}" != "${root}" ]]; do
- if ! rmdir "${dir}" 2> /dev/null; then
+ if rmdir "${dir}" 2> /dev/null; then
+ _python_vecho "<<< ${dir}"
+ else
break
fi
dir="${dir%/*}"
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2012-09-27 15:41 Mike Gilbert (floppym)
0 siblings, 0 replies; 21+ messages in thread
From: Mike Gilbert (floppym) @ 2012-09-27 15:41 UTC (permalink / raw
To: gentoo-commits
floppym 12/09/27 15:41:56
Modified: ChangeLog python.eclass
Log:
Allow usage of EAPI 5.
Revision Changes Path
1.413 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.413&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.413&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.412&r2=1.413
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- ChangeLog 27 Sep 2012 10:42:17 -0000 1.412
+++ ChangeLog 27 Sep 2012 15:41:56 -0000 1.413
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.412 2012/09/27 10:42:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.413 2012/09/27 15:41:56 floppym Exp $
+
+ 27 Sep 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
+ Allow usage of EAPI 5.
27 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> clutter.eclass:
Default clutter license is LGPL-2.1 or later.
1.158 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.158&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.158&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.157&r2=1.158
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- python.eclass 16 Aug 2012 23:57:32 -0000 1.157
+++ python.eclass 27 Sep 2012 15:41:56 -0000 1.158
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.157 2012/08/16 23:57:32 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.158 2012/09/27 15:41:56 floppym Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -23,7 +23,7 @@
if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
_PYTHON_ECLASS_INHERITED="1"
-if ! has "${EAPI:-0}" 0 1 2 3 4; then
+if ! has "${EAPI:-0}" 0 1 2 3 4 5; then
die "API of python.eclass in EAPI=\"${EAPI}\" not established"
fi
@@ -113,15 +113,7 @@
}
_python_package_supporting_installation_for_multiple_python_abis() {
- if has "${EAPI:-0}" 0 1 2 3 4; then
- if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
- return 0
- else
- return 1
- fi
- else
- die "${FUNCNAME}(): Support for EAPI=\"${EAPI}\" not implemented"
- fi
+ [[ -n "${SUPPORT_PYTHON_ABIS}" ]]
}
# @ECLASS-VARIABLE: PYTHON_DEPEND
@@ -752,9 +744,7 @@
fi
fi
-if has "${EAPI:-0}" 0 1 2 3 4; then
- unset PYTHON_ABIS
-fi
+unset PYTHON_ABIS
_python_calculate_PYTHON_ABIS() {
if ! _python_package_supporting_installation_for_multiple_python_abis; then
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2012-09-27 22:42 Mike Gilbert (floppym)
0 siblings, 0 replies; 21+ messages in thread
From: Mike Gilbert (floppym) @ 2012-09-27 22:42 UTC (permalink / raw
To: gentoo-commits
floppym 12/09/27 22:42:48
Modified: ChangeLog python.eclass
Log:
Remove a silly EAPI conditional.
Revision Changes Path
1.417 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.417&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.417&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.416&r2=1.417
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- ChangeLog 27 Sep 2012 19:34:28 -0000 1.416
+++ ChangeLog 27 Sep 2012 22:42:48 -0000 1.417
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.416 2012/09/27 19:34:28 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.417 2012/09/27 22:42:48 floppym Exp $
+
+ 27 Sep 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
+ Remove a silly EAPI conditional.
27 Sep 2012; Ian Stakenvicius <axs@gentoo.org> toolchain-funcs.eclass:
Fixed tc-ninja_magic_to_arch() to also use KV_FULL and fail if no kernel
1.159 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.159&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.159&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.158&r2=1.159
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- python.eclass 27 Sep 2012 15:41:56 -0000 1.158
+++ python.eclass 27 Sep 2012 22:42:48 -0000 1.159
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.158 2012/09/27 15:41:56 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.159 2012/09/27 22:42:48 floppym Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -753,7 +753,7 @@
_python_initial_sanity_checks
- if [[ "$(declare -p PYTHON_ABIS 2> /dev/null)" != "declare -x PYTHON_ABIS="* ]] && has "${EAPI:-0}" 0 1 2 3 4; then
+ if [[ "$(declare -p PYTHON_ABIS 2> /dev/null)" != "declare -x PYTHON_ABIS="* ]]; then
local PYTHON_ABI
if [[ "$(declare -p USE_PYTHON 2> /dev/null)" == "declare -x USE_PYTHON="* ]]; then
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2012-10-02 1:22 Mike Gilbert (floppym)
0 siblings, 0 replies; 21+ messages in thread
From: Mike Gilbert (floppym) @ 2012-10-02 1:22 UTC (permalink / raw
To: gentoo-commits
floppym 12/10/02 01:22:57
Modified: ChangeLog python.eclass
Log:
Add 3.3 as a supported python abi for testing.
Revision Changes Path
1.423 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.423&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.423&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.422&r2=1.423
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- ChangeLog 29 Sep 2012 20:48:58 -0000 1.422
+++ ChangeLog 2 Oct 2012 01:22:57 -0000 1.423
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.422 2012/09/29 20:48:58 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.423 2012/10/02 01:22:57 floppym Exp $
+
+ 02 Oct 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
+ Add 3.3 as a supported python abi for testing.
29 Sep 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
virtualx.eclass:
1.160 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.160&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.160&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.159&r2=1.160
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- python.eclass 27 Sep 2012 22:42:48 -0000 1.159
+++ python.eclass 2 Oct 2012 01:22:57 -0000 1.160
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.159 2012/09/27 22:42:48 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.160 2012/10/02 01:22:57 floppym Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -28,7 +28,7 @@
fi
_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
-_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2)
+_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2 3.3)
_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython)
_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7 2.7-pypy-1.8 2.7-pypy-1.9)
_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2012-12-20 6:07 Mike Gilbert (floppym)
0 siblings, 0 replies; 21+ messages in thread
From: Mike Gilbert (floppym) @ 2012-12-20 6:07 UTC (permalink / raw
To: gentoo-commits
floppym 12/12/20 06:07:05
Modified: ChangeLog python.eclass
Log:
Add 2.7-pypy-2.0.
Revision Changes Path
1.568 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.568&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.568&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.567&r2=1.568
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -r1.567 -r1.568
--- ChangeLog 20 Dec 2012 06:05:23 -0000 1.567
+++ ChangeLog 20 Dec 2012 06:07:05 -0000 1.568
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.567 2012/12/20 06:05:23 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.568 2012/12/20 06:07:05 floppym Exp $
+
+ 20 Dec 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
+ Add 2.7-pypy-2.0.
20 Dec 2012; Mike Gilbert <floppym@gentoo.org> python-utils-r1.eclass:
Add pypy2_0.
1.162 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.162&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.162&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.161&r2=1.162
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- python.eclass 24 Nov 2012 21:07:14 -0000 1.161
+++ python.eclass 20 Dec 2012 06:07:05 -0000 1.162
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.161 2012/11/24 21:07:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.162 2012/12/20 06:07:05 floppym Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -34,7 +34,7 @@
_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2 3.3)
_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython)
-_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7 2.7-pypy-1.8 2.7-pypy-1.9)
+_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7 2.7-pypy-1.8 2.7-pypy-1.9 2.7-pypy-2.0)
_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
# ================================================================================================
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2012-12-20 6:26 Mike Gilbert (floppym)
0 siblings, 0 replies; 21+ messages in thread
From: Mike Gilbert (floppym) @ 2012-12-20 6:26 UTC (permalink / raw
To: gentoo-commits
floppym 12/12/20 06:26:16
Modified: ChangeLog python.eclass
Log:
Add pypy version mapping for 2.0 => 2.7.
Revision Changes Path
1.569 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.569&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.569&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.568&r2=1.569
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.568
retrieving revision 1.569
diff -u -r1.568 -r1.569
--- ChangeLog 20 Dec 2012 06:07:05 -0000 1.568
+++ ChangeLog 20 Dec 2012 06:26:16 -0000 1.569
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.568 2012/12/20 06:07:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.569 2012/12/20 06:26:16 floppym Exp $
+
+ 20 Dec 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
+ Add pypy version mapping for 2.0 => 2.7.
20 Dec 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
Add 2.7-pypy-2.0.
1.163 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.163&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.163&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.162&r2=1.163
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- python.eclass 20 Dec 2012 06:07:05 -0000 1.162
+++ python.eclass 20 Dec 2012 06:26:16 -0000 1.163
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.162 2012/12/20 06:07:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.163 2012/12/20 06:26:16 floppym Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -1306,6 +1306,7 @@
"1.7": "2.7",
"1.8": "2.7",
"1.9": "2.7",
+ "2.0": "2.7",
}
def get_PYTHON_ABI(python_interpreter):
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2012-12-20 6:34 Mike Gilbert (floppym)
0 siblings, 0 replies; 21+ messages in thread
From: Mike Gilbert (floppym) @ 2012-12-20 6:34 UTC (permalink / raw
To: gentoo-commits
floppym 12/12/20 06:34:57
Modified: ChangeLog python.eclass
Log:
Remove pypy version mapping table from wrapper scripts. We can add it back if pypy is ever ported to py3k and we are still using this eclass.
Revision Changes Path
1.570 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.570&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.570&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.569&r2=1.570
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.569
retrieving revision 1.570
diff -u -r1.569 -r1.570
--- ChangeLog 20 Dec 2012 06:26:16 -0000 1.569
+++ ChangeLog 20 Dec 2012 06:34:57 -0000 1.570
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.569 2012/12/20 06:26:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.570 2012/12/20 06:34:57 floppym Exp $
+
+ 20 Dec 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
+ Remove pypy version mapping table from wrapper scripts. We can add it back if
+ pypy is ever ported to py3k and we are still using this eclass.
20 Dec 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
Add pypy version mapping for 2.0 => 2.7.
1.164 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.164&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.164&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.163&r2=1.164
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- python.eclass 20 Dec 2012 06:26:16 -0000 1.163
+++ python.eclass 20 Dec 2012 06:34:57 -0000 1.164
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.163 2012/12/20 06:26:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.164 2012/12/20 06:34:57 floppym Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -1300,14 +1300,14 @@
python_shebang_options_re = re.compile(r"^#![ \t]*${EPREFIX}/usr/bin/(?:jython|pypy-c|python)(?:\d+(?:\.\d+)?)?[ \t]+(-\S)")
python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$")
-pypy_versions_mapping = {
- "1.5": "2.7",
- "1.6": "2.7",
- "1.7": "2.7",
- "1.8": "2.7",
- "1.9": "2.7",
- "2.0": "2.7",
-}
+#pypy_versions_mapping = {
+# "1.5": "2.7",
+# "1.6": "2.7",
+# "1.7": "2.7",
+# "1.8": "2.7",
+# "1.9": "2.7",
+# "2.0": "2.7",
+#}
def get_PYTHON_ABI(python_interpreter):
cpython_matched = cpython_interpreter_re.match(python_interpreter)
@@ -1318,7 +1318,8 @@
elif jython_matched is not None:
PYTHON_ABI = jython_matched.group(1) + "-jython"
elif pypy_matched is not None:
- PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1)
+ #PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1)
+ PYTHON_ABI = "2.7-pypy-" + pypy_matched.group(1)
else:
PYTHON_ABI = None
return PYTHON_ABI
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2013-03-02 12:54 Michal Gorny (mgorny)
0 siblings, 0 replies; 21+ messages in thread
From: Michal Gorny (mgorny) @ 2013-03-02 12:54 UTC (permalink / raw
To: gentoo-commits
mgorny 13/03/02 12:54:32
Modified: ChangeLog python.eclass
Log:
Remove deprecation warnings wrt bug #452160. The code will not be removed anymore since the eclass will be deprecated at some point.
Revision Changes Path
1.699 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.699&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.699&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.698&r2=1.699
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.698
retrieving revision 1.699
diff -u -r1.698 -r1.699
--- ChangeLog 2 Mar 2013 07:17:50 -0000 1.698
+++ ChangeLog 2 Mar 2013 12:54:31 -0000 1.699
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.698 2013/03/02 07:17:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.699 2013/03/02 12:54:31 mgorny Exp $
+
+ 02 Mar 2013; Michał Górny <mgorny@gentoo.org> python.eclass:
+ Remove deprecation warnings wrt bug #452160. The code will not be removed
+ anymore since the eclass will be deprecated at some point.
02 Mar 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Run *_all() phases in best-impl sources, in an in-source build.
1.165 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.165&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.165&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.164&r2=1.165
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- python.eclass 20 Dec 2012 06:34:57 -0000 1.164
+++ python.eclass 2 Mar 2013 12:54:31 -0000 1.165
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.164 2012/12/20 06:34:57 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.165 2013/03/02 12:54:31 mgorny Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -3001,12 +3001,6 @@
fi
else
# Deprecated part of python_mod_optimize()
- ewarn
- ewarn "Deprecation Warning: Usage of ${FUNCNAME}() in packages not supporting installation"
- ewarn "for multiple Python ABIs in EAPI <=2 is deprecated and will be disallowed on 2011-08-01."
- ewarn "Use EAPI >=3 and call ${FUNCNAME}() with paths having appropriate syntax."
- ewarn "The ebuild needs to be fixed. Please report a bug, if it has not been already reported."
- ewarn
local myroot mydirs=() myfiles=() myopts=() return_code="0"
@@ -3166,12 +3160,6 @@
done
else
# Deprecated part of python_mod_cleanup()
- ewarn
- ewarn "Deprecation Warning: Usage of ${FUNCNAME}() in packages not supporting installation"
- ewarn "for multiple Python ABIs in EAPI <=2 is deprecated and will be disallowed on 2011-08-01."
- ewarn "Use EAPI >=3 and call ${FUNCNAME}() with paths having appropriate syntax."
- ewarn "The ebuild needs to be fixed. Please report a bug, if it has not been already reported."
- ewarn
search_paths=("${@#/}")
search_paths=("${search_paths[@]/#/${root}/}")
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2013-03-07 21:02 Tim Harder (radhermit)
0 siblings, 0 replies; 21+ messages in thread
From: Tim Harder (radhermit) @ 2013-03-07 21:02 UTC (permalink / raw
To: gentoo-commits
radhermit 13/03/07 21:02:06
Modified: ChangeLog python.eclass
Log:
Add 2.7-jython.
Revision Changes Path
1.718 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.718&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.718&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.717&r2=1.718
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.717
retrieving revision 1.718
diff -u -r1.717 -r1.718
--- ChangeLog 7 Mar 2013 20:58:51 -0000 1.717
+++ ChangeLog 7 Mar 2013 21:02:06 -0000 1.718
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.717 2013/03/07 20:58:51 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.718 2013/03/07 21:02:06 radhermit Exp $
+
+ 07 Mar 2013; Tim Harder <radhermit@gentoo.org> python.eclass:
+ Add 2.7-jython.
07 Mar 2013; Tim Harder <radhermit@gentoo.org> python-utils-r1.eclass:
Add jython2_7.
1.166 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.166&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.166&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.165&r2=1.166
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- python.eclass 2 Mar 2013 12:54:31 -0000 1.165
+++ python.eclass 7 Mar 2013 21:02:06 -0000 1.166
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.165 2013/03/02 12:54:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.166 2013/03/07 21:02:06 radhermit Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -33,7 +33,7 @@
_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2 3.3)
-_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython)
+_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython 2.7-jython)
_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7 2.7-pypy-1.8 2.7-pypy-1.9 2.7-pypy-2.0)
_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
@ 2013-09-18 18:47 Michal Gorny (mgorny)
0 siblings, 0 replies; 21+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-18 18:47 UTC (permalink / raw
To: gentoo-commits
mgorny 13/09/18 18:47:59
Modified: ChangeLog python.eclass
Log:
Add a note not to add new Python versions to python.eclass.
Revision Changes Path
1.977 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.977&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.977&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.976&r2=1.977
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.976
retrieving revision 1.977
diff -u -r1.976 -r1.977
--- ChangeLog 18 Sep 2013 13:39:36 -0000 1.976
+++ ChangeLog 18 Sep 2013 18:47:59 -0000 1.977
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.976 2013/09/18 13:39:36 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.977 2013/09/18 18:47:59 mgorny Exp $
+
+ 18 Sep 2013; Michał Górny <mgorny@gentoo.org> python.eclass:
+ Add a note not to add new Python versions to python.eclass.
18 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> leechcraft.eclass:
Add official mirror to LeechCraft SRC_URI, thanks to 0xd34df00d
1.168 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.168&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.168&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.167&r2=1.168
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- python.eclass 27 Jul 2013 11:17:44 -0000 1.167
+++ python.eclass 18 Sep 2013 18:47:59 -0000 1.168
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.167 2013/07/27 11:17:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.168 2013/09/18 18:47:59 mgorny Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -31,6 +31,9 @@
die "API of python.eclass in EAPI=\"${EAPI}\" not established"
fi
+# Please do not add any new versions of Python here! Instead, please
+# focus on converting packages to use the new eclasses.
+
_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2 3.3)
_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython 2.7-jython)
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2013-09-18 18:48 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-27 22:42 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass Mike Gilbert (floppym)
-- strict thread matches above, loose matches on Subject: below --
2013-09-18 18:47 Michal Gorny (mgorny)
2013-03-07 21:02 Tim Harder (radhermit)
2013-03-02 12:54 Michal Gorny (mgorny)
2012-12-20 6:34 Mike Gilbert (floppym)
2012-12-20 6:26 Mike Gilbert (floppym)
2012-12-20 6:07 Mike Gilbert (floppym)
2012-10-02 1:22 Mike Gilbert (floppym)
2012-09-27 15:41 Mike Gilbert (floppym)
2012-08-16 23:57 Mike Gilbert (floppym)
2012-06-09 10:01 Marien Zwart (marienz)
2012-03-29 12:47 Marien Zwart (marienz)
2012-03-20 20:37 Mike Gilbert (floppym)
2012-03-07 4:13 Mike Gilbert (floppym)
2012-02-27 3:57 Mike Gilbert (floppym)
2012-02-13 23:50 Zac Medico (zmedico)
2012-02-10 22:54 Thomas Sachau (tommy)
2012-01-30 22:04 Mike Gilbert (floppym)
2012-01-30 20:18 Mike Gilbert (floppym)
2012-01-21 19:48 Mike Gilbert (floppym)
2011-12-18 23:38 Robin H. Johnson (robbat2)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox