mgorny 15/02/19 17:22:25
Modified: ChangeLog distutils-r1.eclass python-r1.eclass
python-single-r1.eclass python-utils-r1.eclass
Log:
Remove support for python-exec:0.
Revision Changes Path
1.1540 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1540&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1540&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1539&r2=1.1540
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1539
retrieving revision 1.1540
diff -u -r1.1539 -r1.1540
--- ChangeLog 18 Feb 2015 14:15:37 -0000 1.1539
+++ ChangeLog 19 Feb 2015 17:22:25 -0000 1.1540
@@ -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.1539 2015/02/18
14:15:37 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1540 2015/02/19
17:22:25 mgorny Exp $
+
+ 19 Feb 2015; Michał Górny <[email protected]> distutils-r1.eclass,
+ python-r1.eclass, python-single-r1.eclass, python-utils-r1.eclass:
+ Remove support for python-exec:0.
18 Feb 2015; Davide Pesavento <[email protected]> qt5-build.eclass:
Drop support for Qt 5.3 and earlier.
1.111 eclass/distutils-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.111&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.111&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.110&r2=1.111
Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- distutils-r1.eclass 31 Jan 2015 02:49:39 -0000 1.110
+++ distutils-r1.eclass 19 Feb 2015 17:22:25 -0000 1.111
@@ -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.110
2015/01/31 02:49:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.111
2015/02/19 17:22:25 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.85 eclass/python-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.85&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.85&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.84&r2=1.85
Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- python-r1.eclass 13 Jan 2015 21:35:29 -0000 1.84
+++ python-r1.eclass 19 Feb 2015 17:22:25 -0000 1.85
@@ -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.84 2015/01/13
21:35:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.85 2015/02/19
17:22:25 mgorny Exp $
# @ECLASS: python-r1
# @MAINTAINER:
@@ -208,9 +208,9 @@
# 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4,
# just fix :2 since := deps are not supported.
if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then
- PYTHON_DEPS+="dev-lang/python-exec:0[${PYTHON_USEDEP}]"
+ die "python-exec:0 is no longer supported, please fix your
ebuild to work with python-exec:2"
elif [[ ${EAPI} != 4 ]]; then
- PYTHON_DEPS+="dev-lang/python-exec:=[${PYTHON_USEDEP}]"
+ PYTHON_DEPS+=">=dev-lang/python-exec-2:=[${PYTHON_USEDEP}]"
else
PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]"
fi
@@ -831,26 +831,16 @@
_python_replicate_script() {
local _PYTHON_FIX_SHEBANG_QUIET=1
- if _python_want_python_exec2; then
- local PYTHON_SCRIPTDIR
- python_export PYTHON_SCRIPTDIR
-
- (
- exeinto "${PYTHON_SCRIPTDIR#${EPREFIX}}"
- doexe "${files[@]}"
- )
-
- python_fix_shebang -q \
- "${files[@]/*\//${D%/}/${PYTHON_SCRIPTDIR}/}"
- else
- local f
- for f in "${files[@]}"; do
- cp -p "${f}" "${f}-${EPYTHON}" || die
- done
+ local PYTHON_SCRIPTDIR
+ python_export PYTHON_SCRIPTDIR
- python_fix_shebang -q \
- "${files[@]/%/-${EPYTHON}}"
- fi
+ (
+ exeinto "${PYTHON_SCRIPTDIR#${EPREFIX}}"
+ doexe "${files[@]}"
+ )
+
+ python_fix_shebang -q \
+ "${files[@]/*\//${D%/}/${PYTHON_SCRIPTDIR}/}"
}
local files=( "${@}" )
@@ -859,7 +849,7 @@
# install the wrappers
local f
for f; do
- _python_ln_rel "${ED%/}$(_python_get_wrapper_path)" "${f}" ||
die
+ _python_ln_rel "${ED%/}/usr/lib/python-exec/python-exec2"
"${f}" || die
done
}
1.32 eclass/python-single-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.32&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.32&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?r1=1.31&r2=1.32
Index: python-single-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- python-single-r1.eclass 4 Jan 2015 22:18:12 -0000 1.31
+++ python-single-r1.eclass 19 Feb 2015 17:22:25 -0000 1.32
@@ -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.31
2015/01/04 22:18:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.32
2015/02/19 17:22:25 mgorny Exp $
# @ECLASS: python-single-r1
# @MAINTAINER:
@@ -219,9 +219,9 @@
# 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4,
# just fix :2 since := deps are not supported.
if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then
- PYTHON_DEPS+="dev-lang/python-exec:0[${PYTHON_USEDEP}]"
+ die "python-exec:0 is no longer supported, please fix your
ebuild to work with python-exec:2"
elif [[ ${EAPI} != 4 ]]; then
- PYTHON_DEPS+="dev-lang/python-exec:=[${PYTHON_USEDEP}]"
+ PYTHON_DEPS+=">=dev-lang/python-exec-2:=[${PYTHON_USEDEP}]"
else
PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]"
fi
1.76 eclass/python-utils-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.76&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.76&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.75&r2=1.76
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- python-utils-r1.eclass 2 Jan 2015 00:15:15 -0000 1.75
+++ python-utils-r1.eclass 19 Feb 2015 17:22:25 -0000 1.76
@@ -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.75
2015/01/02 00:15:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.76
2015/02/19 17:22:25 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,7 +651,7 @@
)
# install the wrapper
- _python_ln_rel "${ED%/}"$(_python_get_wrapper_path) \
+ _python_ln_rel "${ED%/}"/usr/lib/python-exec/python-exec2 \
"${ED%/}/${wrapd}/${barefn}" || die
# don't use this at home, just call python_doscript() instead
@@ -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:
