mgorny 15/02/20 17:57:22
Modified: ChangeLog distutils-r1.eclass python-r1.eclass
python-single-r1.eclass python-utils-r1.eclass
Log:
Re-apply python-exec:0 removal, now with typos fixed.
Revision Changes Path
1.1545 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1545&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1545&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1544&r2=1.1545
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1544
retrieving revision 1.1545
diff -u -r1.1544 -r1.1545
--- ChangeLog 20 Feb 2015 17:02:56 -0000 1.1544
+++ ChangeLog 20 Feb 2015 17:57:22 -0000 1.1545
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1544 2015/02/20
17:02:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1545 2015/02/20
17:57:22 mgorny Exp $
+
+ 20 Feb 2015; Michał Górny <[email protected]> distutils-r1.eclass,
+ python-r1.eclass, python-single-r1.eclass, python-utils-r1.eclass:
+ Re-apply python-exec:0 removal, now with typos fixed.
20 Feb 2015; Michał Górny <[email protected]> python-r1.eclass,
python-single-r1.eclass, python-utils-r1.eclass:
1.113 eclass/distutils-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.113&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.113&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.112&r2=1.113
Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- distutils-r1.eclass 20 Feb 2015 08:18:05 -0000 1.112
+++ distutils-r1.eclass 20 Feb 2015 17:57:22 -0000 1.113
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.112
2015/02/20 08:18:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.113
2015/02/20 17:57:22 mgorny Exp $
# @ECLASS: distutils-r1
# @MAINTAINER:
@@ -393,7 +393,7 @@
root = ${D}
_EOF_
- if [[ ! ${DISTUTILS_SINGLE_IMPL} ]] &&
_python_want_python_exec2; then
+ if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
cat >> "${HOME}"/.pydistutils.cfg <<-_EOF_ || die
install-scripts = $(python_get_scriptdir)
_EOF_
@@ -444,11 +444,7 @@
local bindir=${2}
local PYTHON_SCRIPTDIR
- if _python_want_python_exec2; then
- python_export PYTHON_SCRIPTDIR
- else
- PYTHON_SCRIPTDIR=${bindir}
- fi
+ python_export PYTHON_SCRIPTDIR
local f python_files=() non_python_files=()
@@ -462,7 +458,7 @@
if [[ ${shebang} == '#!'*${EPYTHON}* ]]; then
debug-print "${FUNCNAME}: matching shebang:
${shebang}"
python_files+=( "${f}" )
- elif _python_want_python_exec2; then
+ else
debug-print "${FUNCNAME}: non-matching shebang:
${shebang}"
non_python_files+=( "${f}" )
fi
@@ -473,18 +469,11 @@
for f in "${python_files[@]}"; do
local basename=${f##*/}
- if ! _python_want_python_exec2; then
- local newf=${f%/*}/${basename}-${EPYTHON}
- debug-print "${FUNCNAME}: renaming
${f#${path}/} to ${newf#${path}/}"
- mv "${f}" "${newf}" || die
- fi
-
debug-print "${FUNCNAME}: installing wrapper at
${bindir}/${basename}"
- _python_ln_rel
"${path}${EPREFIX}"$(_python_get_wrapper_path) \
+ _python_ln_rel
"${path}${EPREFIX}"/usr/lib/python-exec/python-exec2 \
"${path}${bindir}/${basename}" || die
done
- # (non-empty only with python-exec:2)
for f in "${non_python_files[@]}"; do
local basename=${f##*/}
@@ -544,15 +533,11 @@
case "${a}" in
--install-scripts=*)
scriptdir=${a#--install-scripts=}
- if _python_want_python_exec2; then
- unset "${arg_var}"
- fi
+ unset "${arg_var}"
;;
--install-scripts)
scriptdir=${!1}
- if _python_want_python_exec2; then
- unset "${arg_var}" "${1}"
- fi
+ unset "${arg_var}" "${1}"
shift
;;
esac
1.89 eclass/python-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.89&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.89&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.88&r2=1.89
Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- python-r1.eclass 20 Feb 2015 17:02:56 -0000 1.88
+++ python-r1.eclass 20 Feb 2015 17:57:22 -0000 1.89
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.88 2015/02/20
17:02:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.89 2015/02/20
17:57:22 mgorny Exp $
# @ECLASS: python-r1
# @MAINTAINER:
1.36 eclass/python-single-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.36&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.36&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?r1=1.35&r2=1.36
Index: python-single-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- python-single-r1.eclass 20 Feb 2015 17:02:56 -0000 1.35
+++ python-single-r1.eclass 20 Feb 2015 17:57:22 -0000 1.36
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.35
2015/02/20 17:02:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.36
2015/02/20 17:57:22 mgorny Exp $
# @ECLASS: python-single-r1
# @MAINTAINER:
1.80 eclass/python-utils-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.80&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.80&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.79&r2=1.80
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- python-utils-r1.eclass 20 Feb 2015 17:02:56 -0000 1.79
+++ python-utils-r1.eclass 20 Feb 2015 17:57:22 -0000 1.80
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.79
2015/02/20 17:02:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.80
2015/02/20 17:57:22 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -635,21 +635,14 @@
[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is
null).'
[[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>"
- local d=${python_scriptroot:-${DESTTREE}/bin}
- local wrapd=${d}
+ local wrapd=${python_scriptroot:-${DESTTREE}/bin}
local f=${1}
- local barefn=${2}
- local newfn
+ local newfn=${2}
- if _python_want_python_exec2; then
- local PYTHON_SCRIPTDIR
- python_export PYTHON_SCRIPTDIR
- d=${PYTHON_SCRIPTDIR#${EPREFIX}}
- newfn=${barefn}
- else
- newfn=${barefn}-${EPYTHON}
- fi
+ local PYTHON_SCRIPTDIR d
+ python_export PYTHON_SCRIPTDIR
+ d=${PYTHON_SCRIPTDIR#${EPREFIX}}
(
dodir "${wrapd}"
@@ -658,8 +651,8 @@
)
# install the wrapper
- _python_ln_rel "${ED%/}"$(_python_get_wrapper_path) \
- "${ED%/}/${wrapd}/${barefn}" || die
+ _python_ln_rel "${ED%/}"/usr/lib/python-exec/python-exec2 \
+ "${ED%/}/${wrapd}/${newfn}" || die
# don't use this at home, just call python_doscript() instead
if [[ ${_PYTHON_REWRITE_SHEBANG} ]]; then
@@ -1099,40 +1092,6 @@
done
}
-# @FUNCTION: _python_want_python_exec2
-# @INTERNAL
-# @DESCRIPTION:
-# Check whether we should be using python-exec:2.
-_python_want_python_exec2() {
- debug-print-function ${FUNCNAME} "${@}"
-
- # EAPI 4 lacks slot operators, so just fix it on python-exec:2.
- [[ ${EAPI} == 4 ]] && return 0
-
- # Check if we cached the result, or someone put an override.
- if [[ ! ${_PYTHON_WANT_PYTHON_EXEC2+1} ]]; then
- has_version 'dev-lang/python-exec:2'
- _PYTHON_WANT_PYTHON_EXEC2=$(( ! ${?} ))
- fi
-
- # Non-zero means 'yes', zero means 'no'.
- [[ ${_PYTHON_WANT_PYTHON_EXEC2} != 0 ]]
-}
-
-# @FUNCTION: _python_get_wrapper_path
-# @INTERNAL
-# @DESCRIPTION:
-# Output path to proper python-exec slot.
-_python_get_wrapper_path() {
- debug-print-function ${FUNCNAME} "${@}"
-
- if _python_want_python_exec2; then
- echo /usr/lib/python-exec/python-exec2
- else
- echo /usr/bin/python-exec
- fi
-}
-
# @FUNCTION: python_export_utf8_locale
# @RETURN: 0 on success, 1 on failure.
# @DESCRIPTION:
