* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2012-11-26 10:16 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2012-11-26 10:16 UTC (permalink / raw
To: gentoo-commits
mgorny 12/11/26 10:16:43
Modified: ChangeLog python-utils-r1.eclass
Log:
Add python_optimize() to compile Python modules.
Revision Changes Path
1.522 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.522&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.522&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.521&r2=1.522
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -r1.521 -r1.522
--- ChangeLog 26 Nov 2012 10:05:11 -0000 1.521
+++ ChangeLog 26 Nov 2012 10:16:43 -0000 1.522
@@ -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.521 2012/11/26 10:05:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.522 2012/11/26 10:16:43 mgorny Exp $
+
+ 26 Nov 2012; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Add python_optimize() to compile Python modules.
26 Nov 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass,
python-single-r1.eclass:
1.3 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.2&r2=1.3
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-utils-r1.eclass 24 Nov 2012 21:07:14 -0000 1.2
+++ python-utils-r1.eclass 26 Nov 2012 10:16:43 -0000 1.3
@@ -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-utils-r1.eclass,v 1.2 2012/11/24 21:07:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.3 2012/11/26 10:16:43 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -285,6 +285,55 @@
ln -fs "${rel_path}" "${to}"
}
+# @FUNCTION: python_optimize
+# @USAGE: [<directory>...]
+# @DESCRIPTION:
+# Compile and optimize Python modules in specified directories (absolute
+# paths). If no directories are provided, the default system paths
+# are used (prepended with ${D}).
+python_optimize() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+
+ local PYTHON=${PYTHON}
+ [[ ${PYTHON} ]] || python_export PYTHON
+
+ # Note: python2.6 can't handle passing files to compileall...
+
+ # default to sys.path
+ if [[ ${#} -eq 0 ]]; then
+ local f
+ while IFS= read -r -d '' f; do
+ # 1) accept only absolute paths
+ # (i.e. skip '', '.' or anything like that)
+ # 2) skip paths which do not exist
+ # (python2.6 complains about them verbosely)
+
+ if [[ ${f} == /* && -d ${D}${f} ]]; then
+ set -- "${D}${f}" "${@}"
+ fi
+ done < <("${PYTHON}" -c 'import sys; print("\0".join(sys.path))')
+ fi
+
+ local d
+ for d; do
+ # make sure to get a nice path without //
+ local instpath=${d#${D}}
+ instpath=/${instpath##/}
+
+ case "${EPYTHON}" in
+ python*)
+ "${PYTHON}" -m compileall -q -f -d "${instpath}" "${d}"
+ "${PYTHON}" -OO -m compileall -q -f -d "${instpath}" "${d}"
+ ;;
+ *)
+ "${PYTHON}" -m compileall -q -f -d "${instpath}" "${@}"
+ ;;
+ esac
+ done
+}
+
# @ECLASS-VARIABLE: python_scriptroot
# @DEFAULT_UNSET
# @DESCRIPTION:
@@ -430,19 +479,7 @@
insinto "${d}"
doins -r "${@}"
- local PYTHON=${PYTHON}
- [[ ${PYTHON} ]] || python_export PYTHON
-
- # erm, python2.6 can't handle passing files to compileall...
- case "${EPYTHON}" in
- python*)
- "${PYTHON}" -m compileall -q "${D}/${d}"
- "${PYTHON}" -OO -m compileall -q -f "${D}/${d}"
- ;;
- *)
- "${PYTHON}" -m compileall -q "${D}/${d}"
- ;;
- esac
+ python_optimize "${D}/${d}"
}
_PYTHON_UTILS_R1=1
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2012-12-15 21:30 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2012-12-15 21:30 UTC (permalink / raw
To: gentoo-commits
mgorny 12/12/15 21:30:03
Modified: ChangeLog python-utils-r1.eclass
Log:
Fix the relative linking algo to handle /// in path.
Revision Changes Path
1.561 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.561&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.561&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.560&r2=1.561
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.560
retrieving revision 1.561
diff -u -r1.560 -r1.561
--- ChangeLog 14 Dec 2012 08:41:59 -0000 1.560
+++ ChangeLog 15 Dec 2012 21:30:03 -0000 1.561
@@ -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.560 2012/12/14 08:41:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.561 2012/12/15 21:30:03 mgorny Exp $
+
+ 15 Dec 2012; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Fix the relative linking algo to handle /// in path.
14 Dec 2012; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
Prevent python-r1 packages from depending on python-single-r1 packages.
1.7 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.6&r2=1.7
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-utils-r1.eclass 1 Dec 2012 22:10:34 -0000 1.6
+++ python-utils-r1.eclass 15 Dec 2012 21:30:03 -0000 1.7
@@ -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-utils-r1.eclass,v 1.6 2012/12/01 22:10:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.7 2012/12/15 21:30:03 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -270,20 +270,22 @@
local topath=${to%/*}/
local rel_path=
- # remove double slashes
- frpath=${frpath/\/\///}
- topath=${topath/\/\///}
-
while [[ ${topath} ]]; do
- local frseg=${frpath%%/*}
- local toseg=${topath%%/*}
+ local frseg= toseg=
+
+ while [[ ! ${frseg} && ${frpath} ]]; do
+ frseg=${frpath%%/*}
+ frpath=${frpath#${frseg}/}
+ done
+
+ while [[ ! ${toseg} && ${topath} ]]; do
+ toseg=${topath%%/*}
+ topath=${topath#${toseg}/}
+ done
if [[ ${frseg} != ${toseg} ]]; then
rel_path=../${rel_path}${frseg:+${frseg}/}
fi
-
- frpath=${frpath#${frseg}/}
- topath=${topath#${toseg}/}
done
rel_path+=${frpath}${1##*/}
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2012-12-20 6:05 Mike Gilbert (floppym)
0 siblings, 0 replies; 57+ messages in thread
From: Mike Gilbert (floppym) @ 2012-12-20 6:05 UTC (permalink / raw
To: gentoo-commits
floppym 12/12/20 06:05:23
Modified: ChangeLog python-utils-r1.eclass
Log:
Add pypy2_0.
Revision Changes Path
1.567 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.567&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.567&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.566&r2=1.567
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.566
retrieving revision 1.567
diff -u -r1.566 -r1.567
--- ChangeLog 19 Dec 2012 09:22:17 -0000 1.566
+++ ChangeLog 20 Dec 2012 06:05:23 -0000 1.567
@@ -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.566 2012/12/19 09:22:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.567 2012/12/20 06:05:23 floppym Exp $
+
+ 20 Dec 2012; Mike Gilbert <floppym@gentoo.org> python-utils-r1.eclass:
+ Add pypy2_0.
19 Dec 2012; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
Re-enable python-r1 -> python-single-r1 dep prevention.
1.8 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.7&r2=1.8
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-utils-r1.eclass 15 Dec 2012 21:30:03 -0000 1.7
+++ python-utils-r1.eclass 20 Dec 2012 06:05:23 -0000 1.8
@@ -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-utils-r1.eclass,v 1.7 2012/12/15 21:30:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.8 2012/12/20 06:05:23 floppym Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -43,7 +43,7 @@
# All supported Python implementations, most preferred last.
_PYTHON_ALL_IMPLS=(
jython2_5
- pypy1_8 pypy1_9
+ pypy1_8 pypy1_9 pypy2_0
python3_1 python3_2 python3_3
python2_5 python2_6 python2_7
)
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2012-12-27 22:56 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2012-12-27 22:56 UTC (permalink / raw
To: gentoo-commits
mgorny 12/12/27 22:56:53
Modified: ChangeLog python-utils-r1.eclass
Log:
Introduce functions to get the includedir for Python.
Revision Changes Path
1.578 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.578&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.578&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.577&r2=1.578
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.577
retrieving revision 1.578
diff -u -r1.577 -r1.578
--- ChangeLog 27 Dec 2012 22:56:21 -0000 1.577
+++ ChangeLog 27 Dec 2012 22:56:53 -0000 1.578
@@ -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.577 2012/12/27 22:56:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.578 2012/12/27 22:56:53 mgorny Exp $
+
+ 27 Dec 2012; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Introduce functions to get the includedir for Python.
27 Dec 2012; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
Introduce python_gen_usedep() and python_gen_flags() to make writing complex
1.10 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.9&r2=1.10
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-utils-r1.eclass 20 Dec 2012 23:35:17 -0000 1.9
+++ python-utils-r1.eclass 27 Dec 2012 22:56:53 -0000 1.10
@@ -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-utils-r1.eclass,v 1.9 2012/12/20 23:35:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.10 2012/12/27 22:56:53 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -83,6 +83,17 @@
# /usr/lib64/python2.6/site-packages
# @CODE
+# @ECLASS-VARIABLE: PYTHON_INCLUDEDIR
+# @DESCRIPTION:
+# The path to Python include directory.
+#
+# Set and exported on request using python_export().
+#
+# Example value:
+# @CODE
+# /usr/include/python2.6
+# @CODE
+
# @ECLASS-VARIABLE: PYTHON_PKG_DEP
# @DESCRIPTION:
# The complete dependency on a particular Python package as a string.
@@ -161,6 +172,23 @@
export PYTHON_SITEDIR=${EPREFIX}${dir}/site-packages
debug-print "${FUNCNAME}: PYTHON_SITEDIR = ${PYTHON_SITEDIR}"
;;
+ PYTHON_INCLUDEDIR)
+ local dir
+ case "${impl}" in
+ python*)
+ dir=/usr/include/${impl}
+ ;;
+ jython*)
+ dir=/usr/share/${impl}/Include
+ ;;
+ pypy*)
+ dir=/usr/$(get_libdir)/${impl/-c/}/include
+ ;;
+ esac
+
+ export PYTHON_INCLUDEDIR=${EPREFIX}${dir}
+ debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR = ${PYTHON_INCLUDEDIR}"
+ ;;
PYTHON_PKG_DEP)
local d
case ${impl} in
@@ -237,6 +265,21 @@
echo "${PYTHON_SITEDIR}"
}
+# @FUNCTION: python_get_includedir
+# @USAGE: [<impl>]
+# @DESCRIPTION:
+# Obtain and print the include path for the given implementation. If no
+# implementation is provided, ${EPYTHON} will be used.
+#
+# If you just need to have PYTHON_INCLUDEDIR set (and exported), then it
+# is better to use python_export() directly instead.
+python_get_includedir() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ python_export "${@}" PYTHON_INCLUDEDIR
+ echo "${PYTHON_INCLUDEDIR}"
+}
+
# @FUNCTION: _python_rewrite_shebang
# @INTERNAL
# @USAGE: [<EPYTHON>] <path>...
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2012-12-30 14:17 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2012-12-30 14:17 UTC (permalink / raw
To: gentoo-commits
mgorny 12/12/30 14:17:29
Modified: ChangeLog python-utils-r1.eclass
Log:
Fix installing scripts & modules for Prefix, bug #448786.
Revision Changes Path
1.581 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.581&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.581&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.580&r2=1.581
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -r1.580 -r1.581
--- ChangeLog 29 Dec 2012 17:47:53 -0000 1.580
+++ ChangeLog 30 Dec 2012 14:17:29 -0000 1.581
@@ -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.580 2012/12/29 17:47:53 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.581 2012/12/30 14:17:29 mgorny Exp $
+
+ 30 Dec 2012; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Fix installing scripts & modules for Prefix, bug #448786.
29 Dec 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
some adaption for new makefile handling, >=vdr-1.7.34
1.11 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.10&r2=1.11
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-utils-r1.eclass 27 Dec 2012 22:56:53 -0000 1.10
+++ python-utils-r1.eclass 30 Dec 2012 14:17:29 -0000 1.11
@@ -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-utils-r1.eclass,v 1.10 2012/12/27 22:56:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.11 2012/12/30 14:17:29 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -490,10 +490,10 @@
debug-print "${FUNCNAME}: ${oldfn} -> ${newfn}"
newins "${f}" "${newfn}" || die
- _python_rewrite_shebang "${D}/${d}/${newfn}"
+ _python_rewrite_shebang "${ED}/${d}/${newfn}"
# install the wrapper
- _python_ln_rel "${ED}"/usr/bin/python-exec "${D}/${d}/${oldfn}" || die
+ _python_ln_rel "${ED}"/usr/bin/python-exec "${ED}/${d}/${oldfn}" || die
done
}
@@ -501,7 +501,7 @@
# @DEFAULT_UNSET
# @DESCRIPTION:
# The current module root for python_domodule(). The path can be either
-# an absolute system path (it must start with a slash, and ${D} will be
+# an absolute system path (it must start with a slash, and ${ED} will be
# prepended to it) or relative to the implementation's site-packages directory
# (then it must start with a non-slash character).
#
@@ -561,7 +561,7 @@
local PYTHON_SITEDIR=${PYTHON_SITEDIR}
[[ ${PYTHON_SITEDIR} ]] || python_export PYTHON_SITEDIR
- d=${PYTHON_SITEDIR}/${python_moduleroot}
+ d=${PYTHON_SITEDIR#${EPREFIX}}/${python_moduleroot}
fi
local INSDESTTREE
@@ -569,7 +569,7 @@
insinto "${d}"
doins -r "${@}" || die
- python_optimize "${D}/${d}"
+ python_optimize "${ED}/${d}"
}
_PYTHON_UTILS_R1=1
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-01-05 10:01 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-01-05 10:01 UTC (permalink / raw
To: gentoo-commits
mgorny 13/01/05 10:01:20
Modified: ChangeLog python-utils-r1.eclass
Log:
Support converting files with python2 and python3 shebangs.
Revision Changes Path
1.600 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.600&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.600&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.599&r2=1.600
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.599
retrieving revision 1.600
diff -u -r1.599 -r1.600
--- ChangeLog 5 Jan 2013 10:00:30 -0000 1.599
+++ ChangeLog 5 Jan 2013 10:01:20 -0000 1.600
@@ -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.599 2013/01/05 10:00:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.600 2013/01/05 10:01:20 mgorny Exp $
+
+ 05 Jan 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Support converting files with python2 and python3 shebangs.
05 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Always write split logs, even in non-parallel builds.
1.13 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.12&r2=1.13
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-utils-r1.eclass 2 Jan 2013 21:12:44 -0000 1.12
+++ python-utils-r1.eclass 5 Jan 2013 10:01:20 -0000 1.13
@@ -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-utils-r1.eclass,v 1.12 2013/01/02 21:12:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.13 2013/01/05 10:01:20 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -318,17 +318,33 @@
local f
for f; do
local shebang=$(head -n 1 "${f}")
+ local from
debug-print "${FUNCNAME}: path = ${f}"
debug-print "${FUNCNAME}: shebang = ${shebang}"
- if [[ "${shebang} " != *'python '* ]]; then
+ if [[ "${shebang} " == *'python '* ]]; then
+ from=python
+ elif [[ "${shebang} " == *'python2 '* ]]; then
+ from=python2
+ elif [[ "${shebang} " == *'python3 '* ]]; then
+ from=python3
+ else
eerror "A file does not seem to have a supported shebang:"
eerror " file: ${f}"
eerror " shebang: ${shebang}"
die "${FUNCNAME}: ${f} does not seem to have a valid shebang"
fi
- sed -i -e "1s:python:${impl}:" "${f}" || die
+ if [[ ${from} == python2 && ${impl} == python3*
+ || ${from} == python3 && ${impl} != python3* ]]; then
+ eerror "A file does have shebang not supporting requested impl:"
+ eerror " file: ${f}"
+ eerror " shebang: ${shebang}"
+ eerror " impl: ${impl}"
+ die "${FUNCNAME}: ${f} does have shebang not supporting ${EPYTHON}"
+ fi
+
+ sed -i -e "1s:${from}:${impl}:" "${f}" || die
done
}
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-01-27 16:35 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-01-27 16:35 UTC (permalink / raw
To: gentoo-commits
mgorny 13/01/27 16:35:33
Modified: ChangeLog python-utils-r1.eclass
Log:
Introduce python_doheader(), to install headers specific to a Python implementation.
Revision Changes Path
1.647 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.647&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.647&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.646&r2=1.647
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.646
retrieving revision 1.647
diff -u -r1.646 -r1.647
--- ChangeLog 27 Jan 2013 13:32:44 -0000 1.646
+++ ChangeLog 27 Jan 2013 16:35:33 -0000 1.647
@@ -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.646 2013/01/27 13:32:44 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.647 2013/01/27 16:35:33 mgorny Exp $
+
+ 27 Jan 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Introduce python_doheader(), to install headers specific to a Python
+ implementation.
27 Jan 2013; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
reverted last changes
1.15 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.14&r2=1.15
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- python-utils-r1.eclass 21 Jan 2013 19:28:16 -0000 1.14
+++ python-utils-r1.eclass 27 Jan 2013 16:35:33 -0000 1.15
@@ -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-utils-r1.eclass,v 1.14 2013/01/21 19:28:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.15 2013/01/27 16:35:33 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -618,5 +618,34 @@
python_optimize "${ED}/${d}"
}
+# @FUNCTION: python_doheader
+# @USAGE: <files>...
+# @DESCRIPTION:
+# Install the given headers into the implementation-specific include
+# directory. This function is unconditionally recursive, i.e. you can
+# pass directories instead of files.
+#
+# Example:
+# @CODE
+# src_install() {
+# python_foreach_impl python_doheader foo.h bar.h
+# }
+# @CODE
+python_doheader() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+
+ local d PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR}
+ [[ ${PYTHON_INCLUDEDIR} ]] || python_export PYTHON_INCLUDEDIR
+
+ d=${PYTHON_INCLUDEDIR#${EPREFIX}}
+
+ local INSDESTTREE
+
+ insinto "${d}"
+ doins -r "${@}" || die
+}
+
_PYTHON_UTILS_R1=1
fi
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-01-29 21:12 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-01-29 21:12 UTC (permalink / raw
To: gentoo-commits
mgorny 13/01/29 21:12:33
Modified: ChangeLog python-utils-r1.eclass
Log:
Disable pypy1.8 globally.
Revision Changes Path
1.653 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.653&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.653&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.652&r2=1.653
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.652
retrieving revision 1.653
diff -u -r1.652 -r1.653
--- ChangeLog 27 Jan 2013 23:59:35 -0000 1.652
+++ ChangeLog 29 Jan 2013 21:12:33 -0000 1.653
@@ -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.652 2013/01/27 23:59:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.653 2013/01/29 21:12:33 mgorny Exp $
+
+ 29 Jan 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Disable pypy1.8 globally.
27 Jan 2013; Tim Harder <radhermit@gentoo.org> vim-plugin.eclass:
Remove all hidden files in the main tarball dir.
1.16 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.15&r2=1.16
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- python-utils-r1.eclass 27 Jan 2013 16:35:33 -0000 1.15
+++ python-utils-r1.eclass 29 Jan 2013 21:12:33 -0000 1.16
@@ -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-utils-r1.eclass,v 1.15 2013/01/27 16:35:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.16 2013/01/29 21:12:33 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -42,7 +42,7 @@
# All supported Python implementations, most preferred last.
_PYTHON_ALL_IMPLS=(
jython2_5
- pypy1_8 pypy1_9 pypy2_0
+ pypy1_9 pypy2_0
python3_1 python3_2 python3_3
python2_5 python2_6 python2_7
)
@@ -67,12 +67,12 @@
# keep in sync with _PYTHON_ALL_IMPLS!
# (not using that list because inline patterns shall be faster)
case "${impl}" in
- python2_[567]|python3_[123]|pypy1_[89]|pypy2_0|jython2_5)
+ python2_[567]|python3_[123]|pypy1_9|pypy2_0|jython2_5)
return 0
;;
-# pypy1_8)
-# return 1
-# ;;
+ pypy1_8)
+ return 1
+ ;;
*)
die "Invalid implementation in PYTHON_COMPAT: ${impl}"
esac
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-02-04 13:52 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-02-04 13:52 UTC (permalink / raw
To: gentoo-commits
mgorny 13/02/04 13:52:09
Modified: ChangeLog python-utils-r1.eclass
Log:
Introduce python_newscript(), to install scripts with renaming. Requested in bug #454640.
Revision Changes Path
1.659 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.659&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.659&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.658&r2=1.659
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.658
retrieving revision 1.659
diff -u -r1.658 -r1.659
--- ChangeLog 1 Feb 2013 21:39:50 -0000 1.658
+++ ChangeLog 4 Feb 2013 13:52:09 -0000 1.659
@@ -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.658 2013/02/01 21:39:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.659 2013/02/04 13:52:09 mgorny Exp $
+
+ 04 Feb 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Introduce python_newscript(), to install scripts with renaming. Requested in
+ bug #454640.
01 Feb 2013; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass,
+multilib-build.eclass:
1.17 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.16&r2=1.17
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- python-utils-r1.eclass 29 Jan 2013 21:12:33 -0000 1.16
+++ python-utils-r1.eclass 4 Feb 2013 13:52:09 -0000 1.17
@@ -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-utils-r1.eclass,v 1.16 2013/01/29 21:12:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.17 2013/02/04 13:52:09 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -521,7 +521,34 @@
python_doscript() {
debug-print-function ${FUNCNAME} "${@}"
+ local f
+ for f; do
+ python_newscript "${f}" "${f##*/}"
+ done
+}
+
+# @FUNCTION: python_newscript
+# @USAGE: <path> <new-name>
+# @DESCRIPTION:
+# Install the given script into current python_scriptroot
+# for the current Python implementation (${EPYTHON}), and name it
+# <new-name>.
+#
+# The file must start with a 'python' shebang. The shebang will be
+# converted, the file will be renamed to be EPYTHON-suffixed
+# and a wrapper will be installed in place of the <new-name>.
+#
+# Example:
+# @CODE
+# src_install() {
+# python_foreach_impl python_newscript foo.py foo
+# }
+# @CODE
+python_newscript() {
+ debug-print-function ${FUNCNAME} "${@}"
+
[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+ [[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>"
local d=${python_scriptroot:-${DESTTREE}/bin}
local INSDESTTREE INSOPTIONS
@@ -529,18 +556,17 @@
insinto "${d}"
insopts -m755
- local f
- for f; do
- local oldfn=${f##*/}
- local newfn=${oldfn}-${EPYTHON}
+ local f=${1}
+ local barefn=${2}
- debug-print "${FUNCNAME}: ${oldfn} -> ${newfn}"
- newins "${f}" "${newfn}" || die
- _python_rewrite_shebang "${ED}/${d}/${newfn}"
+ local newfn=${barefn}-${EPYTHON}
- # install the wrapper
- _python_ln_rel "${ED}"/usr/bin/python-exec "${ED}/${d}/${oldfn}" || die
- done
+ debug-print "${FUNCNAME}: ${f} -> ${d}/${newfn}"
+ newins "${f}" "${newfn}" || die
+ _python_rewrite_shebang "${ED}/${d}/${newfn}"
+
+ # install the wrapper
+ _python_ln_rel "${ED}"/usr/bin/python-exec "${ED}/${d}/${barefn}" || die
}
# @ECLASS-VARIABLE: python_moduleroot
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-02-04 13:53 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-02-04 13:53 UTC (permalink / raw
To: gentoo-commits
mgorny 13/02/04 13:53:54
Modified: ChangeLog python-utils-r1.eclass
Log:
Introduce python_get_library_path() to obtain the path to the Python library. Required by dev-python/shiboken.
Revision Changes Path
1.660 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.660&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.660&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.659&r2=1.660
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.659
retrieving revision 1.660
diff -u -r1.659 -r1.660
--- ChangeLog 4 Feb 2013 13:52:09 -0000 1.659
+++ ChangeLog 4 Feb 2013 13:53:54 -0000 1.660
@@ -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.659 2013/02/04 13:52:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.660 2013/02/04 13:53:54 mgorny Exp $
+
+ 04 Feb 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Introduce python_get_library_path() to obtain the path to the Python library.
+ Required by dev-python/shiboken.
04 Feb 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Introduce python_newscript(), to install scripts with renaming. Requested in
1.18 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.17&r2=1.18
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- python-utils-r1.eclass 4 Feb 2013 13:52:09 -0000 1.17
+++ python-utils-r1.eclass 4 Feb 2013 13:53:54 -0000 1.18
@@ -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-utils-r1.eclass,v 1.17 2013/02/04 13:52:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.18 2013/02/04 13:53:54 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -124,6 +124,18 @@
# /usr/include/python2.6
# @CODE
+# @ECLASS-VARIABLE: PYTHON_LIBPATH
+# @DESCRIPTION:
+# The path to Python library.
+#
+# Set and exported on request using python_export().
+# Valid only for CPython.
+#
+# Example value:
+# @CODE
+# /usr/lib64/libpython2.6.so
+# @CODE
+
# @ECLASS-VARIABLE: PYTHON_PKG_DEP
# @DESCRIPTION:
# The complete dependency on a particular Python package as a string.
@@ -219,6 +231,22 @@
export PYTHON_INCLUDEDIR=${EPREFIX}${dir}
debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR = ${PYTHON_INCLUDEDIR}"
;;
+ PYTHON_LIBPATH)
+ local libname
+ case "${impl}" in
+ python*)
+ libname=lib${impl}
+ ;;
+ *)
+ die "${EPYTHON} lacks a dynamic library"
+ ;;
+ esac
+
+ local path=${EPREFIX}/usr/$(get_libdir)
+
+ export PYTHON_LIBPATH=${path}/${libname}$(get_libname)
+ debug-print "${FUNCNAME}: PYTHON_LIBPATH = ${PYTHON_LIBPATH}"
+ ;;
PYTHON_PKG_DEP)
local d
case ${impl} in
@@ -310,6 +338,21 @@
echo "${PYTHON_INCLUDEDIR}"
}
+# @FUNCTION: python_get_library_path
+# @USAGE: [<impl>]
+# @DESCRIPTION:
+# Obtain and print the Python library path for the given implementation.
+# If no implementation is provided, ${EPYTHON} will be used.
+#
+# Please note that this function can be used with CPython only. Use
+# in another implementation will result in a fatal failure.
+python_get_library_path() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ python_export "${@}" PYTHON_LIBPATH
+ echo "${PYTHON_LIBPATH}"
+}
+
# @FUNCTION: _python_rewrite_shebang
# @INTERNAL
# @USAGE: [<EPYTHON>] <path>...
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-03-07 20:58 Tim Harder (radhermit)
0 siblings, 0 replies; 57+ messages in thread
From: Tim Harder (radhermit) @ 2013-03-07 20:58 UTC (permalink / raw
To: gentoo-commits
radhermit 13/03/07 20:58:51
Modified: ChangeLog python-utils-r1.eclass
Log:
Add jython2_7.
Revision Changes Path
1.717 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.717&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.717&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.716&r2=1.717
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.716
retrieving revision 1.717
diff -u -r1.716 -r1.717
--- ChangeLog 5 Mar 2013 19:52:08 -0000 1.716
+++ ChangeLog 7 Mar 2013 20:58:51 -0000 1.717
@@ -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.716 2013/03/05 19:52:08 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.717 2013/03/07 20:58:51 radhermit Exp $
+
+ 07 Mar 2013; Tim Harder <radhermit@gentoo.org> python-utils-r1.eclass:
+ Add jython2_7.
05 Mar 2013; Michael Pagano <mpagano@gentoo.org> kernel-2.eclass:
Force python 2* for USE=deblob as deblob script does not yet support python3.
1.19 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.18&r2=1.19
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- python-utils-r1.eclass 4 Feb 2013 13:53:54 -0000 1.18
+++ python-utils-r1.eclass 7 Mar 2013 20:58:51 -0000 1.19
@@ -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-utils-r1.eclass,v 1.18 2013/02/04 13:53:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.19 2013/03/07 20:58:51 radhermit Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -41,7 +41,7 @@
# @DESCRIPTION:
# All supported Python implementations, most preferred last.
_PYTHON_ALL_IMPLS=(
- jython2_5
+ jython2_5 jython2_7
pypy1_9 pypy2_0
python3_1 python3_2 python3_3
python2_5 python2_6 python2_7
@@ -67,7 +67,7 @@
# keep in sync with _PYTHON_ALL_IMPLS!
# (not using that list because inline patterns shall be faster)
case "${impl}" in
- python2_[567]|python3_[123]|pypy1_9|pypy2_0|jython2_5)
+ python2_[567]|python3_[123]|pypy1_9|pypy2_0|jython2_[57])
return 0
;;
pypy1_8)
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-03-28 12:21 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-03-28 12:21 UTC (permalink / raw
To: gentoo-commits
mgorny 13/03/28 12:21:46
Modified: ChangeLog python-utils-r1.eclass
Log:
Support obtaining CFLAGS and LIBS for the Python implementation (similarly to pkg-config or python-config).
Revision Changes Path
1.756 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.756&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.756&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.755&r2=1.756
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.755
retrieving revision 1.756
diff -u -r1.755 -r1.756
--- ChangeLog 26 Mar 2013 13:49:39 -0000 1.755
+++ ChangeLog 28 Mar 2013 12:21:46 -0000 1.756
@@ -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.755 2013/03/26 13:49:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.756 2013/03/28 12:21:46 mgorny Exp $
+
+ 28 Mar 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Support obtaining CFLAGS and LIBS for the Python implementation (similarly to
+ pkg-config or python-config).
26 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> obs-service.eclass:
Fix hardcoded libexec suse path in scripts.
1.20 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.19&r2=1.20
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- python-utils-r1.eclass 7 Mar 2013 20:58:51 -0000 1.19
+++ python-utils-r1.eclass 28 Mar 2013 12:21:46 -0000 1.20
@@ -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-utils-r1.eclass,v 1.19 2013/03/07 20:58:51 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.20 2013/03/28 12:21:46 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -34,7 +34,7 @@
if [[ ! ${_PYTHON_UTILS_R1} ]]; then
-inherit multilib
+inherit multilib toolchain-funcs
# @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
# @INTERNAL
@@ -136,6 +136,34 @@
# /usr/lib64/libpython2.6.so
# @CODE
+# @ECLASS-VARIABLE: PYTHON_CFLAGS
+# @DESCRIPTION:
+# Proper C compiler flags for building against Python. Obtained from
+# pkg-config or python-config.
+#
+# Set and exported on request using python_export().
+# Valid only for CPython. Requires a proper build-time dependency
+# on the Python implementation and on pkg-config.
+#
+# Example value:
+# @CODE
+# -I/usr/include/python2.7
+# @CODE
+
+# @ECLASS-VARIABLE: PYTHON_LIBS
+# @DESCRIPTION:
+# Proper C compiler flags for linking against Python. Obtained from
+# pkg-config or python-config.
+#
+# Set and exported on request using python_export().
+# Valid only for CPython. Requires a proper build-time dependency
+# on the Python implementation and on pkg-config.
+#
+# Example value:
+# @CODE
+# -lpython2.7
+# @CODE
+
# @ECLASS-VARIABLE: PYTHON_PKG_DEP
# @DESCRIPTION:
# The complete dependency on a particular Python package as a string.
@@ -238,7 +266,7 @@
libname=lib${impl}
;;
*)
- die "${EPYTHON} lacks a dynamic library"
+ die "${impl} lacks a dynamic library"
;;
esac
@@ -247,6 +275,46 @@
export PYTHON_LIBPATH=${path}/${libname}$(get_libname)
debug-print "${FUNCNAME}: PYTHON_LIBPATH = ${PYTHON_LIBPATH}"
;;
+ PYTHON_CFLAGS)
+ local val
+
+ case "${impl}" in
+ python2.5|python2.6)
+ # old versions support python-config only
+ val=$("${impl}-config" --includes)
+ ;;
+ python*)
+ # python-2.7, python-3.2, etc.
+ val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-})
+ ;;
+ *)
+ die "${impl}: obtaining ${var} not supported"
+ ;;
+ esac
+
+ export PYTHON_CFLAGS=${val}
+ debug-print "${FUNCNAME}: PYTHON_CFLAGS = ${PYTHON_CFLAGS}"
+ ;;
+ PYTHON_LIBS)
+ local val
+
+ case "${impl}" in
+ python2.5|python2.6)
+ # old versions support python-config only
+ val=$("${impl}-config" --libs)
+ ;;
+ python*)
+ # python-2.7, python-3.2, etc.
+ val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-})
+ ;;
+ *)
+ die "${impl}: obtaining ${var} not supported"
+ ;;
+ esac
+
+ export PYTHON_LIBS=${val}
+ debug-print "${FUNCNAME}: PYTHON_LIBS = ${PYTHON_LIBS}"
+ ;;
PYTHON_PKG_DEP)
local d
case ${impl} in
@@ -353,6 +421,40 @@
echo "${PYTHON_LIBPATH}"
}
+# @FUNCTION: python_get_CFLAGS
+# @USAGE: [<impl>]
+# @DESCRIPTION:
+# Obtain and print the compiler flags for building against Python,
+# for the given implementation. If no implementation is provided,
+# ${EPYTHON} will be used.
+#
+# Please note that this function can be used with CPython only.
+# It requires Python and pkg-config installed, and therefore proper
+# build-time dependencies need be added to the ebuild.
+python_get_CFLAGS() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ python_export "${@}" PYTHON_CFLAGS
+ echo "${PYTHON_CFLAGS}"
+}
+
+# @FUNCTION: python_get_LIBS
+# @USAGE: [<impl>]
+# @DESCRIPTION:
+# Obtain and print the compiler flags for linking against Python,
+# for the given implementation. If no implementation is provided,
+# ${EPYTHON} will be used.
+#
+# Please note that this function can be used with CPython only.
+# It requires Python and pkg-config installed, and therefore proper
+# build-time dependencies need be added to the ebuild.
+python_get_LIBS() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ python_export "${@}" PYTHON_LIBS
+ echo "${PYTHON_LIBS}"
+}
+
# @FUNCTION: _python_rewrite_shebang
# @INTERNAL
# @USAGE: [<EPYTHON>] <path>...
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-04-14 0:10 Mike Gilbert (floppym)
0 siblings, 0 replies; 57+ messages in thread
From: Mike Gilbert (floppym) @ 2013-04-14 0:10 UTC (permalink / raw
To: gentoo-commits
floppym 13/04/14 00:10:00
Modified: ChangeLog python-utils-r1.eclass
Log:
Remove carriage-return from shebang before validating it, bug 465790 by ikelos.
Revision Changes Path
1.789 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.789&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.789&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.788&r2=1.789
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.788
retrieving revision 1.789
diff -u -r1.788 -r1.789
--- ChangeLog 13 Apr 2013 22:49:21 -0000 1.788
+++ ChangeLog 14 Apr 2013 00:10:00 -0000 1.789
@@ -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.788 2013/04/13 22:49:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.789 2013/04/14 00:10:00 floppym Exp $
+
+ 14 Apr 2013; Mike Gilbert <floppym@gentoo.org> python-utils-r1.eclass:
+ Remove carriage-return from shebang before validating it, bug 465790 by
+ ikelos.
13 Apr 2013; Mike Gilbert <floppym@gentoo.org> systemd.eclass:
Replace basename usage with a shell parameter replacement.
1.22 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.21&r2=1.22
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-utils-r1.eclass 7 Apr 2013 17:02:52 -0000 1.21
+++ python-utils-r1.eclass 14 Apr 2013 00:10:00 -0000 1.22
@@ -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-utils-r1.eclass,v 1.21 2013/04/07 17:02:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.22 2013/04/14 00:10:00 floppym Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -493,7 +493,7 @@
local f
for f; do
- local shebang=$(head -n 1 "${f}")
+ local shebang=$(head -n 1 "${f}" | sed 's/\r$//')
local from
debug-print "${FUNCNAME}: path = ${f}"
debug-print "${FUNCNAME}: shebang = ${shebang}"
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-05-31 17:40 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-05-31 17:40 UTC (permalink / raw
To: gentoo-commits
mgorny 13/05/31 17:40:35
Modified: ChangeLog python-utils-r1.eclass
Log:
Use cat rather than echo for heredoc output :).
Revision Changes Path
1.843 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.843&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.843&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.842&r2=1.843
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.842
retrieving revision 1.843
diff -u -r1.842 -r1.843
--- ChangeLog 30 May 2013 07:15:55 -0000 1.842
+++ ChangeLog 31 May 2013 17:40:35 -0000 1.843
@@ -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.842 2013/05/30 07:15:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.843 2013/05/31 17:40:35 mgorny Exp $
+
+ 31 May 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Use cat rather than echo for heredoc output :).
30 May 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
Add PYTHON_REQUIRED_USE for python-single-r1.
1.25 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.24&r2=1.25
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- python-utils-r1.eclass 10 May 2013 22:03:30 -0000 1.24
+++ python-utils-r1.eclass 31 May 2013 17:40:35 -0000 1.25
@@ -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-utils-r1.eclass,v 1.24 2013/05/10 22:03:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.25 2013/05/31 17:40:35 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -892,7 +892,7 @@
local x
for x in "${nonsupp[@]}"; do
- echo >"${workdir}"/bin/${x} <<__EOF__ || die
+ cat >"${workdir}"/bin/${x} <<__EOF__ || die
#!/bin/sh
echo "${x} is not supported by ${EPYTHON}" >&2
exit 1
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-06-07 1:11 Mike Gilbert (floppym)
0 siblings, 0 replies; 57+ messages in thread
From: Mike Gilbert (floppym) @ 2013-06-07 1:11 UTC (permalink / raw
To: gentoo-commits
floppym 13/06/07 01:11:31
Modified: ChangeLog python-utils-r1.eclass
Log:
Improve docs for PYTHON and EPYTHON.
Revision Changes Path
1.850 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.850&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.850&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.849&r2=1.850
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.849
retrieving revision 1.850
diff -u -r1.849 -r1.850
--- ChangeLog 3 Jun 2013 06:20:53 -0000 1.849
+++ ChangeLog 7 Jun 2013 01:11:31 -0000 1.850
@@ -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.849 2013/06/03 06:20:53 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.850 2013/06/07 01:11:31 floppym Exp $
+
+ 07 Jun 2013; Mike Gilbert <floppym@gentoo.org> python-utils-r1.eclass:
+ Improve docs for PYTHON and EPYTHON.
03 Jun 2013; Davide Pesavento <pesa@gentoo.org> qt4-r2.eclass:
Add support for EQMAKE4_EXCLUDE.
1.27 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.26&r2=1.27
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- python-utils-r1.eclass 31 May 2013 17:50:33 -0000 1.26
+++ python-utils-r1.eclass 7 Jun 2013 01:11:31 -0000 1.27
@@ -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-utils-r1.eclass,v 1.26 2013/05/31 17:50:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.27 2013/06/07 01:11:31 floppym Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -79,10 +79,18 @@
}
# @ECLASS-VARIABLE: PYTHON
+# @DEFAULT_UNSET
# @DESCRIPTION:
# The absolute path to the current Python interpreter.
#
-# Set and exported only in commands run by python_foreach_impl().
+# This variable is set automatically in the following contexts:
+#
+# python-r1: Set in functions called by python_foreach_impl() or after
+# calling python_export_best().
+#
+# python-single-r1: Set after calling python-single-r1_pkg_setup().
+#
+# distutils-r1: Set within any of the python sub-phase functions.
#
# Example value:
# @CODE
@@ -90,12 +98,18 @@
# @CODE
# @ECLASS-VARIABLE: EPYTHON
+# @DEFAULT_UNSET
# @DESCRIPTION:
# The executable name of the current Python interpreter.
#
-# This variable is used consistently with python.eclass.
+# This variable is set automatically in the following contexts:
#
-# Set and exported only in commands run by python_foreach_impl().
+# python-r1: Set in functions called by python_foreach_impl() or after
+# calling python_export_best().
+#
+# python-single-r1: Set after calling python-single-r1_pkg_setup().
+#
+# distutils-r1: Set within any of the python sub-phase functions.
#
# Example value:
# @CODE
@@ -103,6 +117,7 @@
# @CODE
# @ECLASS-VARIABLE: PYTHON_SITEDIR
+# @DEFAULT_UNSET
# @DESCRIPTION:
# The path to Python site-packages directory.
#
@@ -114,6 +129,7 @@
# @CODE
# @ECLASS-VARIABLE: PYTHON_INCLUDEDIR
+# @DEFAULT_UNSET
# @DESCRIPTION:
# The path to Python include directory.
#
@@ -125,6 +141,7 @@
# @CODE
# @ECLASS-VARIABLE: PYTHON_LIBPATH
+# @DEFAULT_UNSET
# @DESCRIPTION:
# The path to Python library.
#
@@ -137,6 +154,7 @@
# @CODE
# @ECLASS-VARIABLE: PYTHON_CFLAGS
+# @DEFAULT_UNSET
# @DESCRIPTION:
# Proper C compiler flags for building against Python. Obtained from
# pkg-config or python-config.
@@ -151,6 +169,7 @@
# @CODE
# @ECLASS-VARIABLE: PYTHON_LIBS
+# @DEFAULT_UNSET
# @DESCRIPTION:
# Proper C compiler flags for linking against Python. Obtained from
# pkg-config or python-config.
@@ -165,6 +184,7 @@
# @CODE
# @ECLASS-VARIABLE: PYTHON_PKG_DEP
+# @DEFAULT_UNSET
# @DESCRIPTION:
# The complete dependency on a particular Python package as a string.
#
@@ -456,8 +476,8 @@
}
# @FUNCTION: _python_rewrite_shebang
-# @INTERNAL
# @USAGE: [<EPYTHON>] <path>...
+# @INTERNAL
# @DESCRIPTION:
# Replaces 'python' executable in the shebang with the executable name
# of the specified interpreter. If no EPYTHON value (implementation) is
@@ -526,8 +546,8 @@
}
# @FUNCTION: _python_ln_rel
-# @INTERNAL
# @USAGE: <from> <to>
+# @INTERNAL
# @DESCRIPTION:
# Create a relative symlink.
_python_ln_rel() {
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-07-11 6:57 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-07-11 6:57 UTC (permalink / raw
To: gentoo-commits
mgorny 13/07/11 06:57:37
Modified: ChangeLog python-utils-r1.eclass
Log:
Fix typo in compileall call.
Revision Changes Path
1.876 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.876&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.876&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.875&r2=1.876
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.875
retrieving revision 1.876
diff -u -r1.875 -r1.876
--- ChangeLog 11 Jul 2013 06:57:18 -0000 1.875
+++ ChangeLog 11 Jul 2013 06:57:37 -0000 1.876
@@ -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.875 2013/07/11 06:57:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.876 2013/07/11 06:57:37 mgorny Exp $
+
+ 11 Jul 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Fix typo in compileall call.
11 Jul 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Add multilib_is_native_abi helper.
1.28 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.27&r2=1.28
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- python-utils-r1.eclass 7 Jun 2013 01:11:31 -0000 1.27
+++ python-utils-r1.eclass 11 Jul 2013 06:57:37 -0000 1.28
@@ -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-utils-r1.eclass,v 1.27 2013/06/07 01:11:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.28 2013/07/11 06:57:37 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -630,7 +630,7 @@
"${PYTHON}" -OO -m compileall -q -f -d "${instpath}" "${d}"
;;
*)
- "${PYTHON}" -m compileall -q -f -d "${instpath}" "${@}"
+ "${PYTHON}" -m compileall -q -f -d "${instpath}" "${d}"
;;
esac
done
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-07-11 7:20 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-07-11 7:20 UTC (permalink / raw
To: gentoo-commits
mgorny 13/07/11 07:20:13
Modified: ChangeLog python-utils-r1.eclass
Log:
Add a safety check for using python_optimize() in pkg_*.
Revision Changes Path
1.877 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.877&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.877&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.876&r2=1.877
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.876
retrieving revision 1.877
diff -u -r1.876 -r1.877
--- ChangeLog 11 Jul 2013 06:57:37 -0000 1.876
+++ ChangeLog 11 Jul 2013 07:20:13 -0000 1.877
@@ -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.876 2013/07/11 06:57:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.877 2013/07/11 07:20:13 mgorny Exp $
+
+ 11 Jul 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Add a safety check for using python_optimize() in pkg_*.
11 Jul 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Fix typo in compileall call.
1.29 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.28&r2=1.29
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- python-utils-r1.eclass 11 Jul 2013 06:57:37 -0000 1.28
+++ python-utils-r1.eclass 11 Jul 2013 07:20:13 -0000 1.29
@@ -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-utils-r1.eclass,v 1.28 2013/07/11 06:57:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.29 2013/07/11 07:20:13 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -594,6 +594,15 @@
python_optimize() {
debug-print-function ${FUNCNAME} "${@}"
+ if [[ ${EBUILD_PHASE} == pre* || ${EBUILD_PHASE} == post* ]]; then
+ eerror "The new Python eclasses expect the compiled Python files to"
+ eerror "be controlled by the Package Manager. For this reason,"
+ eerror "the python_optimize function can be used only during src_* phases"
+ eerror "(src_install most commonly) and not during pkg_* phases."
+ echo
+ die "python_optimize is not to be used in pre/post* phases"
+ fi
+
[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
local PYTHON=${PYTHON}
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-08-28 22:04 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-08-28 22:04 UTC (permalink / raw
To: gentoo-commits
mgorny 13/08/28 22:04:16
Modified: ChangeLog python-utils-r1.eclass
Log:
Introduce python_is_python3() to replace the common checks.
Revision Changes Path
1.941 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.941&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.941&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.940&r2=1.941
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.940
retrieving revision 1.941
diff -u -r1.940 -r1.941
--- ChangeLog 28 Aug 2013 21:28:33 -0000 1.940
+++ ChangeLog 28 Aug 2013 22:04:16 -0000 1.941
@@ -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.940 2013/08/28 21:28:33 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.941 2013/08/28 22:04:16 mgorny Exp $
+
+ 28 Aug 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Introduce python_is_python3() to replace the common checks.
28 Aug 2013; Tom Wijsman <TomWij@gentoo.org> ant-tasks.eclass:
Made ant-tasks.eclass support newer versions of the 1.9 branch.
1.31 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.30&r2=1.31
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- python-utils-r1.eclass 27 Jul 2013 11:17:44 -0000 1.30
+++ python-utils-r1.eclass 28 Aug 2013 22:04:16 -0000 1.31
@@ -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-utils-r1.eclass,v 1.30 2013/07/27 11:17:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.31 2013/08/28 22:04:16 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -532,8 +532,8 @@
die "${FUNCNAME}: ${f} does not seem to have a valid shebang"
fi
- if [[ ${from} == python2 && ${impl} == python3*
- || ${from} == python3 && ${impl} != python3* ]]; then
+ if { [[ ${from} == python2 ]] && python_is_python3 "${impl}"; } \
+ || { [[ ${from} == python3 ]] && ! python_is_python3 "${impl}"; } then
eerror "A file does have shebang not supporting requested impl:"
eerror " file: ${f}"
eerror " shebang: ${shebang}"
@@ -883,9 +883,9 @@
python_export "${impl}" EPYTHON PYTHON
local pyver
- if [[ ${EPYTHON} == python3* ]]; then
+ if python_is_python3; then
pyver=3
- else # includes pypy & jython
+ else
pyver=2
fi
@@ -942,5 +942,19 @@
fi
}
+# @FUNCTION: python_is_python3
+# @USAGE: [<impl>]
+# @DESCRIPTION:
+# Check whether <impl> (or ${EPYTHON}) is a Python3k variant
+# (i.e. uses syntax and stdlib of Python 3.*).
+#
+# Returns 0 (true) if it is, 1 (false) otherwise.
+python_is_python3() {
+ local impl=${1:-${EPYTHON}}
+ [[ ${impl} ]] || die "python_is_python3: no impl nor EPYTHON"
+
+ [[ ${impl} == python3* ]]
+}
+
_PYTHON_UTILS_R1=1
fi
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-09-05 9:59 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-05 9:59 UTC (permalink / raw
To: gentoo-commits
mgorny 13/09/05 09:59:52
Modified: ChangeLog python-utils-r1.eclass
Log:
Disable Python 2.5, 3.1 and PyPy 1.9 in the eclass.
Revision Changes Path
1.945 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.945&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.945&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.944&r2=1.945
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.944
retrieving revision 1.945
diff -u -r1.944 -r1.945
--- ChangeLog 4 Sep 2013 19:16:40 -0000 1.944
+++ ChangeLog 5 Sep 2013 09:59:52 -0000 1.945
@@ -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.944 2013/09/04 19:16:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.945 2013/09/05 09:59:52 mgorny Exp $
+
+ 05 Sep 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Disable Python 2.5, 3.1 and PyPy 1.9 in the eclass.
04 Sep 2013; Ulrich Müller <ulm@gentoo.org> elisp-common.eclass:
Add proper @CODE tags in comments.
1.32 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.31&r2=1.32
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- python-utils-r1.eclass 28 Aug 2013 22:04:16 -0000 1.31
+++ python-utils-r1.eclass 5 Sep 2013 09:59:52 -0000 1.32
@@ -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-utils-r1.eclass,v 1.31 2013/08/28 22:04:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.32 2013/09/05 09:59:52 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -42,9 +42,9 @@
# All supported Python implementations, most preferred last.
_PYTHON_ALL_IMPLS=(
jython2_5 jython2_7
- pypy1_9 pypy2_0
- python3_1 python3_2 python3_3
- python2_5 python2_6 python2_7
+ pypy2_0
+ python3_2 python3_3
+ python2_6 python2_7
)
# @FUNCTION: _python_impl_supported
@@ -67,10 +67,10 @@
# keep in sync with _PYTHON_ALL_IMPLS!
# (not using that list because inline patterns shall be faster)
case "${impl}" in
- python2_[567]|python3_[123]|pypy1_9|pypy2_0|jython2_[57])
+ python2_[67]|python3_[23]|pypy2_0|jython2_[57])
return 0
;;
- pypy1_8)
+ pypy1_[89]|python2_5|python3_1)
return 1
;;
*)
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-09-08 14:54 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-08 14:54 UTC (permalink / raw
To: gentoo-commits
mgorny 13/09/08 14:54:42
Modified: ChangeLog python-utils-r1.eclass
Log:
Do not export PYTHON_INCLUDEDIR on Jython, since it does not install headers.
Revision Changes Path
1.951 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.951&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.951&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.950&r2=1.951
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.950
retrieving revision 1.951
diff -u -r1.950 -r1.951
--- ChangeLog 6 Sep 2013 17:11:52 -0000 1.950
+++ ChangeLog 8 Sep 2013 14:54:42 -0000 1.951
@@ -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.950 2013/09/06 17:11:52 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.951 2013/09/08 14:54:42 mgorny Exp $
+
+ 08 Sep 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Do not export PYTHON_INCLUDEDIR on Jython, since it does not install headers.
06 Sep 2013; Ian Stakenvicius <axs@gentoo.org> cmake-multilib.eclass:
added multilib_*_wrappers calls to cmake-multilib.eclass
1.33 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.32&r2=1.33
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- python-utils-r1.eclass 5 Sep 2013 09:59:52 -0000 1.32
+++ python-utils-r1.eclass 8 Sep 2013 14:54:42 -0000 1.33
@@ -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-utils-r1.eclass,v 1.32 2013/09/05 09:59:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.33 2013/09/08 14:54:42 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -268,12 +268,12 @@
python*)
dir=/usr/include/${impl}
;;
- jython*)
- dir=/usr/share/${impl}/Include
- ;;
pypy*)
dir=/usr/$(get_libdir)/${impl/-c/}/include
;;
+ *)
+ die "${impl} lacks header files"
+ ;;
esac
export PYTHON_INCLUDEDIR=${EPREFIX}${dir}
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-09-08 14:56 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-08 14:56 UTC (permalink / raw
To: gentoo-commits
mgorny 13/09/08 14:56:29
Modified: ChangeLog python-utils-r1.eclass
Log:
Fix PYTHON_SITEDIR for Jython.
Revision Changes Path
1.952 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.952&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.952&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.951&r2=1.952
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.951
retrieving revision 1.952
diff -u -r1.951 -r1.952
--- ChangeLog 8 Sep 2013 14:54:42 -0000 1.951
+++ ChangeLog 8 Sep 2013 14:56:29 -0000 1.952
@@ -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.951 2013/09/08 14:54:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.952 2013/09/08 14:56:29 mgorny Exp $
+
+ 08 Sep 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Fix PYTHON_SITEDIR for Jython.
08 Sep 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Do not export PYTHON_INCLUDEDIR on Jython, since it does not install headers.
1.34 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.33&r2=1.34
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- python-utils-r1.eclass 8 Sep 2013 14:54:42 -0000 1.33
+++ python-utils-r1.eclass 8 Sep 2013 14:56:29 -0000 1.34
@@ -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-utils-r1.eclass,v 1.33 2013/09/08 14:54:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.34 2013/09/08 14:56:29 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -252,7 +252,7 @@
dir=/usr/$(get_libdir)/${impl}
;;
jython*)
- dir=/usr/share/${impl}/Lib
+ dir=/usr/share/${impl/n/n-}/Lib
;;
pypy*)
dir=/usr/$(get_libdir)/${impl/-c/}
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-09-16 17:58 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-16 17:58 UTC (permalink / raw
To: gentoo-commits
mgorny 13/09/16 17:58:15
Modified: ChangeLog python-utils-r1.eclass
Log:
Deprecate python_get_PYTHON and python_get_EPYTHON.
Revision Changes Path
1.966 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.966&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.966&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.965&r2=1.966
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.965
retrieving revision 1.966
diff -u -r1.965 -r1.966
--- ChangeLog 15 Sep 2013 19:29:11 -0000 1.965
+++ ChangeLog 16 Sep 2013 17:58:15 -0000 1.966
@@ -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.965 2013/09/15 19:29:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.966 2013/09/16 17:58:15 mgorny Exp $
+
+ 16 Sep 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Deprecate python_get_PYTHON and python_get_EPYTHON.
15 Sep 2013; Pacho Ramos <pacho@gentoo.org> gnome2-utils.eclass:
Support gtk+-2.24.20 query immodules (#476100)
1.35 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.34&r2=1.35
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- python-utils-r1.eclass 8 Sep 2013 14:56:29 -0000 1.34
+++ python-utils-r1.eclass 16 Sep 2013 17:58:15 -0000 1.35
@@ -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-utils-r1.eclass,v 1.34 2013/09/08 14:56:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.35 2013/09/16 17:58:15 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -34,7 +34,7 @@
if [[ ! ${_PYTHON_UTILS_R1} ]]; then
-inherit multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs
# @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
# @INTERNAL
@@ -377,6 +377,10 @@
python_get_PYTHON() {
debug-print-function ${FUNCNAME} "${@}"
+ eqawarn '$(python_get_PYTHON) is discouraged since all standard environments' >&2
+ eqawarn 'have PYTHON exported anyway. Please use ${PYTHON} instead.' >&2
+ eqawarn 'python_get_PYTHON will be removed on 2013-10-16.' >&2
+
python_export "${@}" PYTHON
echo "${PYTHON}"
}
@@ -391,6 +395,10 @@
python_get_EPYTHON() {
debug-print-function ${FUNCNAME} "${@}"
+ eqawarn '$(python_get_EPYTHON) is discouraged since all standard environments' >&2
+ eqawarn 'have EPYTHON exported anyway. Please use ${EPYTHON} instead.' >&2
+ eqawarn 'python_get_EPYTHON will be removed on 2013-10-16.' >&2
+
python_export "${@}" EPYTHON
echo "${EPYTHON}"
}
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-09-17 13:25 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-17 13:25 UTC (permalink / raw
To: gentoo-commits
mgorny 13/09/17 13:25:58
Modified: ChangeLog python-utils-r1.eclass
Log:
Introduce PYTHON_SCRIPTDIR for python-exec:2 script location.
Revision Changes Path
1.969 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.969&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.969&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.968&r2=1.969
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.968
retrieving revision 1.969
diff -u -r1.968 -r1.969
--- ChangeLog 17 Sep 2013 13:24:39 -0000 1.968
+++ ChangeLog 17 Sep 2013 13:25:58 -0000 1.969
@@ -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.968 2013/09/17 13:24:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.969 2013/09/17 13:25:58 mgorny Exp $
+
+ 17 Sep 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass,
+ tests/python-utils-r1.sh:
+ Introduce PYTHON_SCRIPTDIR for python-exec:2 script location.
17 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass,
python-r1.eclass, python-utils-r1.eclass:
1.37 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.36&r2=1.37
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- python-utils-r1.eclass 17 Sep 2013 13:24:39 -0000 1.36
+++ python-utils-r1.eclass 17 Sep 2013 13:25:58 -0000 1.37
@@ -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-utils-r1.eclass,v 1.36 2013/09/17 13:24:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.37 2013/09/17 13:25:58 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -195,6 +195,18 @@
# dev-lang/python:2.7[xml]
# @CODE
+# @ECLASS-VARIABLE: PYTHON_SCRIPTDIR
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# The location where Python scripts must be installed for current impl.
+#
+# Set and exported on request using python_export().
+#
+# Example value:
+# @CODE
+# /usr/lib/python-exec/python2.7
+# @CODE
+
# @FUNCTION: python_export
# @USAGE: [<impl>] <variables>...
# @DESCRIPTION:
@@ -359,6 +371,11 @@
export PYTHON_PKG_DEP
debug-print "${FUNCNAME}: PYTHON_PKG_DEP = ${PYTHON_PKG_DEP}"
;;
+ PYTHON_SCRIPTDIR)
+ local dir
+ export PYTHON_SCRIPTDIR=${EPREFIX}/usr/lib/python-exec/${impl}
+ debug-print "${FUNCNAME}: PYTHON_SCRIPTDIR = ${PYTHON_SCRIPTDIR}"
+ ;;
*)
die "python_export: unknown variable ${var}"
esac
@@ -483,6 +500,19 @@
echo "${PYTHON_LIBS}"
}
+# @FUNCTION: python_get_scriptdir
+# @USAGE: [<impl>]
+# @DESCRIPTION:
+# Obtain and print the script install path for the given
+# implementation. If no implementation is provided, ${EPYTHON} will
+# be used.
+python_get_scriptdir() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ python_export "${@}" PYTHON_SCRIPTDIR
+ echo "${PYTHON_SCRIPTDIR}"
+}
+
# @FUNCTION: _python_rewrite_shebang
# @USAGE: [<EPYTHON>] <path>...
# @INTERNAL
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-09-17 17:28 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-17 17:28 UTC (permalink / raw
To: gentoo-commits
mgorny 13/09/17 17:28:04
Modified: ChangeLog python-utils-r1.eclass
Log:
Rename variables in _python_ln_rel to make it less confusing.
Revision Changes Path
1.972 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.972&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.972&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.971&r2=1.972
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.971
retrieving revision 1.972
diff -u -r1.971 -r1.972
--- ChangeLog 17 Sep 2013 13:33:55 -0000 1.971
+++ ChangeLog 17 Sep 2013 17:28:04 -0000 1.972
@@ -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.971 2013/09/17 13:33:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.972 2013/09/17 17:28:04 mgorny Exp $
+
+ 17 Sep 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Rename variables in _python_ln_rel to make it less confusing.
17 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass,
python-r1.eclass, python-single-r1.eclass, python-utils-r1.eclass:
1.39 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.38&r2=1.39
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- python-utils-r1.eclass 17 Sep 2013 13:33:55 -0000 1.38
+++ python-utils-r1.eclass 17 Sep 2013 17:28:04 -0000 1.39
@@ -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-utils-r1.eclass,v 1.38 2013/09/17 13:33:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.39 2013/09/17 17:28:04 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -591,36 +591,36 @@
_python_ln_rel() {
debug-print-function ${FUNCNAME} "${@}"
- local from=${1}
- local to=${2}
+ local target=${1}
+ local symname=${2}
- local frpath=${from%/*}/
- local topath=${to%/*}/
+ local tgpath=${target%/*}/
+ local sympath=${symname%/*}/
local rel_path=
- while [[ ${topath} ]]; do
- local frseg= toseg=
+ while [[ ${sympath} ]]; do
+ local tgseg= symseg=
- while [[ ! ${frseg} && ${frpath} ]]; do
- frseg=${frpath%%/*}
- frpath=${frpath#${frseg}/}
+ while [[ ! ${tgseg} && ${tgpath} ]]; do
+ tgseg=${tgpath%%/*}
+ tgpath=${tgpath#${tgseg}/}
done
- while [[ ! ${toseg} && ${topath} ]]; do
- toseg=${topath%%/*}
- topath=${topath#${toseg}/}
+ while [[ ! ${symseg} && ${sympath} ]]; do
+ symseg=${sympath%%/*}
+ sympath=${sympath#${symseg}/}
done
- if [[ ${frseg} != ${toseg} ]]; then
- rel_path=../${rel_path}${frseg:+${frseg}/}
+ if [[ ${tgseg} != ${symseg} ]]; then
+ rel_target=../${rel_target}${tgseg:+${tgseg}/}
fi
done
- rel_path+=${frpath}${from##*/}
+ rel_target+=${tgpath}${target##*/}
- debug-print "${FUNCNAME}: ${from} -> ${to}"
- debug-print "${FUNCNAME}: rel_path = ${rel_path}"
+ debug-print "${FUNCNAME}: ${symname} -> ${target}"
+ debug-print "${FUNCNAME}: rel_target = ${rel_target}"
- ln -fs "${rel_path}" "${to}"
+ ln -fs "${rel_target}" "${symname}"
}
# @FUNCTION: python_optimize
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-09-17 19:40 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-17 19:40 UTC (permalink / raw
To: gentoo-commits
mgorny 13/09/17 19:40:56
Modified: ChangeLog python-utils-r1.eclass
Log:
Fix missing variable replacement in _python_ln_rel.
Revision Changes Path
1.974 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.974&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.974&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.973&r2=1.974
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.973
retrieving revision 1.974
diff -u -r1.973 -r1.974
--- ChangeLog 17 Sep 2013 17:33:39 -0000 1.973
+++ ChangeLog 17 Sep 2013 19:40:56 -0000 1.974
@@ -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.973 2013/09/17 17:33:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.974 2013/09/17 19:40:56 mgorny Exp $
+
+ 17 Sep 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Fix missing variable replacement in _python_ln_rel.
17 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Use einstalldocs.
1.40 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.39&r2=1.40
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- python-utils-r1.eclass 17 Sep 2013 17:28:04 -0000 1.39
+++ python-utils-r1.eclass 17 Sep 2013 19:40:56 -0000 1.40
@@ -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-utils-r1.eclass,v 1.39 2013/09/17 17:28:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.40 2013/09/17 19:40:56 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -596,7 +596,7 @@
local tgpath=${target%/*}/
local sympath=${symname%/*}/
- local rel_path=
+ local rel_target=
while [[ ${sympath} ]]; do
local tgseg= symseg=
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-10-09 17:23 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-10-09 17:23 UTC (permalink / raw
To: gentoo-commits
mgorny 13/10/09 17:23:33
Modified: ChangeLog python-utils-r1.eclass
Log:
Bump dependencies on Python interpreters to require newest stable versions. Bug #463532.
Revision Changes Path
1.1016 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1016&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1016&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1015&r2=1.1016
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1015
retrieving revision 1.1016
diff -u -r1.1015 -r1.1016
--- ChangeLog 9 Oct 2013 17:14:07 -0000 1.1015
+++ ChangeLog 9 Oct 2013 17:23:33 -0000 1.1016
@@ -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.1015 2013/10/09 17:14:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1016 2013/10/09 17:23:33 mgorny Exp $
+
+ 09 Oct 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Bump dependencies on Python interpreters to require newest stable versions.
+ Bug #463532.
09 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Skip submodules that have update=none specified in config. Fixes bug #487262.
1.42 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.41&r2=1.42
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- python-utils-r1.eclass 26 Sep 2013 11:24:30 -0000 1.41
+++ python-utils-r1.eclass 9 Oct 2013 17:23:33 -0000 1.42
@@ -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-utils-r1.eclass,v 1.41 2013/09/26 11:24:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.42 2013/10/09 17:23:33 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -349,19 +349,24 @@
PYTHON_PKG_DEP)
local d
case ${impl} in
- python*)
- PYTHON_PKG_DEP='dev-lang/python';;
- jython*)
- PYTHON_PKG_DEP='dev-java/jython';;
- pypy*)
- PYTHON_PKG_DEP='virtual/pypy';;
+ python2.6)
+ PYTHON_PKG_DEP='>=dev-lang/python-2.6.8-r3:2.6';;
+ python2.7)
+ PYTHON_PKG_DEP='>=dev-lang/python-2.7.5-r2:2.7';;
+ python3.2)
+ PYTHON_PKG_DEP='>=dev-lang/python-3.2.5-r2:3.2';;
+ python3.3)
+ PYTHON_PKG_DEP='>=dev-lang/python-3.3.2-r2:3.3';;
+ pypy-c2.0)
+ PYTHON_PKG_DEP='>=dev-python/pypy-2.0.2:2.0';;
+ jython2.5)
+ PYTHON_PKG_DEP='>=dev-java/jython-2.5.3-r2:2.5';;
+ jython2.7)
+ PYTHON_PKG_DEP='dev-java/jython:2.7';;
*)
die "Invalid implementation: ${impl}"
esac
- # slot
- PYTHON_PKG_DEP+=:${impl##*[a-z-]}
-
# use-dep
if [[ ${PYTHON_REQ_USE} ]]; then
PYTHON_PKG_DEP+=[${PYTHON_REQ_USE}]
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-10-09 19:08 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-10-09 19:08 UTC (permalink / raw
To: gentoo-commits
mgorny 13/10/09 19:08:18
Modified: ChangeLog python-utils-r1.eclass
Log:
Fix pypy dependency.
Revision Changes Path
1.1017 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1017&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1017&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1016&r2=1.1017
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1016
retrieving revision 1.1017
diff -u -r1.1016 -r1.1017
--- ChangeLog 9 Oct 2013 17:23:33 -0000 1.1016
+++ ChangeLog 9 Oct 2013 19:08:18 -0000 1.1017
@@ -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.1016 2013/10/09 17:23:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1017 2013/10/09 19:08:18 mgorny Exp $
+
+ 09 Oct 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Fix pypy dependency.
09 Oct 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Bump dependencies on Python interpreters to require newest stable versions.
1.43 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.42&r2=1.43
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- python-utils-r1.eclass 9 Oct 2013 17:23:33 -0000 1.42
+++ python-utils-r1.eclass 9 Oct 2013 19:08:18 -0000 1.43
@@ -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-utils-r1.eclass,v 1.42 2013/10/09 17:23:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.43 2013/10/09 19:08:18 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -358,7 +358,7 @@
python3.3)
PYTHON_PKG_DEP='>=dev-lang/python-3.3.2-r2:3.3';;
pypy-c2.0)
- PYTHON_PKG_DEP='>=dev-python/pypy-2.0.2:2.0';;
+ PYTHON_PKG_DEP='>=virtual/pypy-2.0.2:2.0';;
jython2.5)
PYTHON_PKG_DEP='>=dev-java/jython-2.5.3-r2:2.5';;
jython2.7)
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2013-10-27 7:27 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2013-10-27 7:27 UTC (permalink / raw
To: gentoo-commits
mgorny 13/10/27 07:27:52
Modified: ChangeLog python-utils-r1.eclass
Log:
Remove deprecated functions.
Revision Changes Path
1.1037 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1037&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1037&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1036&r2=1.1037
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1036
retrieving revision 1.1037
diff -u -r1.1036 -r1.1037
--- ChangeLog 27 Oct 2013 07:21:05 -0000 1.1036
+++ ChangeLog 27 Oct 2013 07:27:52 -0000 1.1037
@@ -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.1036 2013/10/27 07:21:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1037 2013/10/27 07:27:52 mgorny Exp $
+
+ 27 Oct 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Remove deprecated functions.
27 Oct 2013; Michał Górny <mgorny@gentoo.org> flag-o-matic.eclass:
Consider -frecord-gcc-switches a safe flag and do not strip it with
1.44 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.43&r2=1.44
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- python-utils-r1.eclass 9 Oct 2013 19:08:18 -0000 1.43
+++ python-utils-r1.eclass 27 Oct 2013 07:27:52 -0000 1.44
@@ -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-utils-r1.eclass,v 1.43 2013/10/09 19:08:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.44 2013/10/27 07:27:52 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -386,44 +386,6 @@
done
}
-# @FUNCTION: python_get_PYTHON
-# @USAGE: [<impl>]
-# @DESCRIPTION:
-# Obtain and print the path to the Python interpreter for the given
-# implementation. If no implementation is provided, ${EPYTHON} will
-# be used.
-#
-# If you just need to have PYTHON set (and exported), then it is better
-# to use python_export() directly instead.
-python_get_PYTHON() {
- debug-print-function ${FUNCNAME} "${@}"
-
- eqawarn '$(python_get_PYTHON) is discouraged since all standard environments' >&2
- eqawarn 'have PYTHON exported anyway. Please use ${PYTHON} instead.' >&2
- eqawarn 'python_get_PYTHON will be removed on 2013-10-16.' >&2
-
- python_export "${@}" PYTHON
- echo "${PYTHON}"
-}
-
-# @FUNCTION: python_get_EPYTHON
-# @USAGE: <impl>
-# @DESCRIPTION:
-# Obtain and print the EPYTHON value for the given implementation.
-#
-# If you just need to have EPYTHON set (and exported), then it is better
-# to use python_export() directly instead.
-python_get_EPYTHON() {
- debug-print-function ${FUNCNAME} "${@}"
-
- eqawarn '$(python_get_EPYTHON) is discouraged since all standard environments' >&2
- eqawarn 'have EPYTHON exported anyway. Please use ${EPYTHON} instead.' >&2
- eqawarn 'python_get_EPYTHON will be removed on 2013-10-16.' >&2
-
- python_export "${@}" EPYTHON
- echo "${EPYTHON}"
-}
-
# @FUNCTION: python_get_sitedir
# @USAGE: [<impl>]
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-02-22 17:01 Mike Gilbert (floppym)
0 siblings, 0 replies; 57+ messages in thread
From: Mike Gilbert (floppym) @ 2014-02-22 17:01 UTC (permalink / raw
To: gentoo-commits
floppym 14/02/22 17:01:58
Modified: ChangeLog python-utils-r1.eclass
Log:
Add support for python3.4.
Revision Changes Path
1.1145 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1145&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1145&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1144&r2=1.1145
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1144
retrieving revision 1.1145
diff -u -r1.1144 -r1.1145
--- ChangeLog 22 Feb 2014 08:05:45 -0000 1.1144
+++ ChangeLog 22 Feb 2014 17:01:58 -0000 1.1145
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1144 2014/02/22 08:05:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1145 2014/02/22 17:01:58 floppym Exp $
+
+ 22 Feb 2014; Mike Gilbert <floppym@gentoo.org> python-utils-r1.eclass:
+ Add support for python3.4.
22 Feb 2014; Pacho Ramos <pacho@gentoo.org> gnome2-utils.eclass:
Be more friendly with SELinux (#499636 by Luis Ressel)
1.47 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.46&r2=1.47
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- python-utils-r1.eclass 17 Jan 2014 14:35:11 -0000 1.46
+++ python-utils-r1.eclass 22 Feb 2014 17:01:58 -0000 1.47
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.46 2014/01/17 14:35:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.47 2014/02/22 17:01:58 floppym Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -42,7 +42,7 @@
_PYTHON_ALL_IMPLS=(
jython2_5 jython2_7
pypy2_0
- python3_2 python3_3
+ python3_2 python3_3 python3_4
python2_6 python2_7
)
@@ -66,7 +66,7 @@
# keep in sync with _PYTHON_ALL_IMPLS!
# (not using that list because inline patterns shall be faster)
case "${impl}" in
- python2_[67]|python3_[23]|pypy2_0|jython2_[57])
+ python2_[67]|python3_[234]|pypy2_0|jython2_[57])
return 0
;;
pypy1_[89]|python2_5|python3_1)
@@ -357,6 +357,8 @@
PYTHON_PKG_DEP='>=dev-lang/python-3.2.5-r2:3.2';;
python3.3)
PYTHON_PKG_DEP='>=dev-lang/python-3.3.2-r2:3.3';;
+ python*)
+ PYTHON_PKG_DEP="dev-lang/python:${impl#python}";;
pypy-c2.0)
PYTHON_PKG_DEP='>=virtual/pypy-2.0.2:2.0';;
jython2.5)
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-03-12 8:18 Patrick Lauer (patrick)
0 siblings, 0 replies; 57+ messages in thread
From: Patrick Lauer (patrick) @ 2014-03-12 8:18 UTC (permalink / raw
To: gentoo-commits
patrick 14/03/12 08:18:39
Modified: ChangeLog python-utils-r1.eclass
Log:
Modify python-utils-r1 for pypy2.2
Revision Changes Path
1.1171 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1171&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1171&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1170&r2=1.1171
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1170
retrieving revision 1.1171
diff -u -r1.1170 -r1.1171
--- ChangeLog 11 Mar 2014 23:55:44 -0000 1.1170
+++ ChangeLog 12 Mar 2014 08:18:38 -0000 1.1171
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1170 2014/03/11 23:55:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1171 2014/03/12 08:18:38 patrick Exp $
+
+ 12 Mar 2014; Patrick Lauer <patrick@gentoo.org> python-utils-r1.eclass:
+ Modify python-utils-r1 for pypy2.2
11 Mar 2014; Mike Gilbert <floppym@gentoo.org> autotools-utils.eclass:
Indicate that AUTOTOOLS_AUTORECONF should be set before calling inherit.
1.48 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.47&r2=1.48
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- python-utils-r1.eclass 22 Feb 2014 17:01:58 -0000 1.47
+++ python-utils-r1.eclass 12 Mar 2014 08:18:38 -0000 1.48
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.47 2014/02/22 17:01:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.48 2014/03/12 08:18:38 patrick Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -41,7 +41,7 @@
# All supported Python implementations, most preferred last.
_PYTHON_ALL_IMPLS=(
jython2_5 jython2_7
- pypy2_0
+ pypy2_0 pypy2_2
python3_2 python3_3 python3_4
python2_6 python2_7
)
@@ -66,7 +66,7 @@
# keep in sync with _PYTHON_ALL_IMPLS!
# (not using that list because inline patterns shall be faster)
case "${impl}" in
- python2_[67]|python3_[234]|pypy2_0|jython2_[57])
+ python2_[67]|python3_[234]|pypy2_[02]|jython2_[57])
return 0
;;
pypy1_[89]|python2_5|python3_1)
@@ -361,6 +361,8 @@
PYTHON_PKG_DEP="dev-lang/python:${impl#python}";;
pypy-c2.0)
PYTHON_PKG_DEP='>=virtual/pypy-2.0.2:2.0';;
+ pypy-c2.2)
+ PYTHON_PKG_DEP='>=virtual/pypy-2.2.1:2.2';;
jython2.5)
PYTHON_PKG_DEP='>=dev-java/jython-2.5.3-r2:2.5';;
jython2.7)
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-03-12 9:06 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2014-03-12 9:06 UTC (permalink / raw
To: gentoo-commits
mgorny 14/03/12 09:06:06
Modified: ChangeLog python-utils-r1.eclass
Log:
Revert ignorant pypy2_2 commit.
Revision Changes Path
1.1172 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1172&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1172&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1171&r2=1.1172
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1171
retrieving revision 1.1172
diff -u -r1.1171 -r1.1172
--- ChangeLog 12 Mar 2014 08:18:38 -0000 1.1171
+++ ChangeLog 12 Mar 2014 09:06:06 -0000 1.1172
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1171 2014/03/12 08:18:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1172 2014/03/12 09:06:06 mgorny Exp $
+
+ 12 Mar 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Revert ignorant pypy2_2 commit.
12 Mar 2014; Patrick Lauer <patrick@gentoo.org> python-utils-r1.eclass:
Modify python-utils-r1 for pypy2.2
1.49 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.48&r2=1.49
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- python-utils-r1.eclass 12 Mar 2014 08:18:38 -0000 1.48
+++ python-utils-r1.eclass 12 Mar 2014 09:06:06 -0000 1.49
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.48 2014/03/12 08:18:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.49 2014/03/12 09:06:06 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -41,7 +41,7 @@
# All supported Python implementations, most preferred last.
_PYTHON_ALL_IMPLS=(
jython2_5 jython2_7
- pypy2_0 pypy2_2
+ pypy2_0
python3_2 python3_3 python3_4
python2_6 python2_7
)
@@ -66,7 +66,7 @@
# keep in sync with _PYTHON_ALL_IMPLS!
# (not using that list because inline patterns shall be faster)
case "${impl}" in
- python2_[67]|python3_[234]|pypy2_[02]|jython2_[57])
+ python2_[67]|python3_[234]|pypy2_0|jython2_[57])
return 0
;;
pypy1_[89]|python2_5|python3_1)
@@ -361,8 +361,6 @@
PYTHON_PKG_DEP="dev-lang/python:${impl#python}";;
pypy-c2.0)
PYTHON_PKG_DEP='>=virtual/pypy-2.0.2:2.0';;
- pypy-c2.2)
- PYTHON_PKG_DEP='>=virtual/pypy-2.2.1:2.2';;
jython2.5)
PYTHON_PKG_DEP='>=dev-java/jython-2.5.3-r2:2.5';;
jython2.7)
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-03-12 9:23 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2014-03-12 9:23 UTC (permalink / raw
To: gentoo-commits
mgorny 14/03/12 09:23:39
Modified: ChangeLog python-utils-r1.eclass
Log:
Add non-slotted pypy to the eclass.
Revision Changes Path
1.1173 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1173&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1173&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1172&r2=1.1173
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1172
retrieving revision 1.1173
diff -u -r1.1172 -r1.1173
--- ChangeLog 12 Mar 2014 09:06:06 -0000 1.1172
+++ ChangeLog 12 Mar 2014 09:23:39 -0000 1.1173
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1172 2014/03/12 09:06:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1173 2014/03/12 09:23:39 mgorny Exp $
+
+ 12 Mar 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass,
+ tests/python-utils-r1.sh:
+ Add non-slotted pypy to the eclass.
12 Mar 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Revert ignorant pypy2_2 commit.
1.50 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.49&r2=1.50
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- python-utils-r1.eclass 12 Mar 2014 09:06:06 -0000 1.49
+++ python-utils-r1.eclass 12 Mar 2014 09:23:39 -0000 1.50
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.49 2014/03/12 09:06:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.50 2014/03/12 09:23:39 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -41,7 +41,7 @@
# All supported Python implementations, most preferred last.
_PYTHON_ALL_IMPLS=(
jython2_5 jython2_7
- pypy2_0
+ pypy2_0 pypy
python3_2 python3_3 python3_4
python2_6 python2_7
)
@@ -230,6 +230,10 @@
impl=${1/_/.}
shift
;;
+ pypy)
+ impl=${1}
+ shift
+ ;;
pypy-c*)
impl=${1}
shift
@@ -361,6 +365,8 @@
PYTHON_PKG_DEP="dev-lang/python:${impl#python}";;
pypy-c2.0)
PYTHON_PKG_DEP='>=virtual/pypy-2.0.2:2.0';;
+ pypy)
+ PYTHON_PKG_DEP='virtual/pypy:0';;
jython2.5)
PYTHON_PKG_DEP='>=dev-java/jython-2.5.3-r2:2.5';;
jython2.7)
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-03-12 9:29 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2014-03-12 9:29 UTC (permalink / raw
To: gentoo-commits
mgorny 14/03/12 09:29:40
Modified: ChangeLog python-utils-r1.eclass
Log:
Use subslot operator deps on non-slotted PyPy.
Revision Changes Path
1.1174 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1174&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1174&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1173&r2=1.1174
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1173
retrieving revision 1.1174
diff -u -r1.1173 -r1.1174
--- ChangeLog 12 Mar 2014 09:23:39 -0000 1.1173
+++ ChangeLog 12 Mar 2014 09:29:39 -0000 1.1174
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1173 2014/03/12 09:23:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1174 2014/03/12 09:29:39 mgorny Exp $
+
+ 12 Mar 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Use subslot operator deps on non-slotted PyPy.
12 Mar 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass,
tests/python-utils-r1.sh:
1.51 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.50&r2=1.51
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- python-utils-r1.eclass 12 Mar 2014 09:23:39 -0000 1.50
+++ python-utils-r1.eclass 12 Mar 2014 09:29:39 -0000 1.51
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.50 2014/03/12 09:23:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.51 2014/03/12 09:29:39 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -72,6 +72,11 @@
pypy1_[89]|python2_5|python3_1)
return 1
;;
+ pypy)
+ if [[ ${EAPI:-0} == [01234] ]]; then
+ die "PyPy is supported in EAPI 5 and newer only."
+ fi
+ ;;
*)
die "Invalid implementation in PYTHON_COMPAT: ${impl}"
esac
@@ -366,7 +371,7 @@
pypy-c2.0)
PYTHON_PKG_DEP='>=virtual/pypy-2.0.2:2.0';;
pypy)
- PYTHON_PKG_DEP='virtual/pypy:0';;
+ PYTHON_PKG_DEP='virtual/pypy:0=';;
jython2.5)
PYTHON_PKG_DEP='>=dev-java/jython-2.5.3-r2:2.5';;
jython2.7)
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-03-13 8:10 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2014-03-13 8:10 UTC (permalink / raw
To: gentoo-commits
mgorny 14/03/13 08:10:46
Modified: ChangeLog python-utils-r1.eclass
Log:
Add python_doexe() and python_newexe() to handle implementation-specific executables without shebangs.
Revision Changes Path
1.1176 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1176&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1176&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1175&r2=1.1176
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1175
retrieving revision 1.1176
diff -u -r1.1175 -r1.1176
--- ChangeLog 12 Mar 2014 18:54:12 -0000 1.1175
+++ ChangeLog 13 Mar 2014 08:10:46 -0000 1.1176
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1175 2014/03/12 18:54:12 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1176 2014/03/13 08:10:46 mgorny Exp $
+
+ 13 Mar 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Add python_doexe() and python_newexe() to handle implementation-specific
+ executables without shebangs.
12 Mar 2014; Julian Ospald <hasufell@gentoo.org> games.eclass:
fix games.eclass to use games-misc/games-envd
1.52 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.51&r2=1.52
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- python-utils-r1.eclass 12 Mar 2014 09:29:39 -0000 1.51
+++ python-utils-r1.eclass 13 Mar 2014 08:10:46 -0000 1.52
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.51 2014/03/12 09:29:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.52 2014/03/13 08:10:46 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -694,49 +694,32 @@
python_scriptroot=${1}
}
-# @FUNCTION: python_doscript
+# @FUNCTION: python_doexe
# @USAGE: <files>...
# @DESCRIPTION:
-# Install the given scripts into current python_scriptroot,
+# Install the given executables into current python_scriptroot,
# for the current Python implementation (${EPYTHON}).
#
-# All specified files must start with a 'python' shebang. The shebang
-# will be converted, the file will be renamed to be EPYTHON-suffixed
-# and a wrapper will be installed in place of the original name.
-#
-# Example:
-# @CODE
-# src_install() {
-# python_foreach_impl python_doscript ${PN}
-# }
-# @CODE
-python_doscript() {
+# The executable will be wrapped properly for the Python implementation,
+# though no shebang mangling will be performed.
+python_doexe() {
debug-print-function ${FUNCNAME} "${@}"
local f
for f; do
- python_newscript "${f}" "${f##*/}"
+ python_newexe "${f}" "${f##*/}"
done
}
-# @FUNCTION: python_newscript
+# @FUNCTION: python_newexe
# @USAGE: <path> <new-name>
-# @DESCRIPTION:
-# Install the given script into current python_scriptroot
-# for the current Python implementation (${EPYTHON}), and name it
-# <new-name>.
-#
-# The file must start with a 'python' shebang. The shebang will be
-# converted, the file will be renamed to be EPYTHON-suffixed
-# and a wrapper will be installed in place of the <new-name>.
+# Install the given executable into current python_scriptroot,
+# for the current Python implementation (${EPYTHON}).
#
-# Example:
-# @CODE
-# src_install() {
-# python_foreach_impl python_newscript foo.py foo
-# }
-# @CODE
-python_newscript() {
+# The executable will be wrapped properly for the Python implementation,
+# though no shebang mangling will be performed. It will be renamed
+# to <new-name>.
+python_newexe() {
debug-print-function ${FUNCNAME} "${@}"
[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
@@ -763,11 +746,62 @@
exeinto "${d}"
newexe "${f}" "${newfn}" || die
)
- _python_rewrite_shebang "${ED%/}/${d}/${newfn}"
# install the wrapper
_python_ln_rel "${ED%/}"$(_python_get_wrapper_path) \
"${ED%/}/${wrapd}/${barefn}" || die
+
+ # don't use this at home, just call python_doscript() instead
+ if [[ ${_PYTHON_REWRITE_SHEBANG} ]]; then
+ _python_rewrite_shebang "${ED%/}/${d}/${newfn}"
+ fi
+}
+
+# @FUNCTION: python_doscript
+# @USAGE: <files>...
+# @DESCRIPTION:
+# Install the given scripts into current python_scriptroot,
+# for the current Python implementation (${EPYTHON}).
+#
+# All specified files must start with a 'python' shebang. The shebang
+# will be converted, and the files will be wrapped properly
+# for the Python implementation.
+#
+# Example:
+# @CODE
+# src_install() {
+# python_foreach_impl python_doscript ${PN}
+# }
+# @CODE
+python_doscript() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ local _PYTHON_REWRITE_SHEBANG=1
+ python_doexe "${@}"
+}
+
+# @FUNCTION: python_newscript
+# @USAGE: <path> <new-name>
+# @DESCRIPTION:
+# Install the given script into current python_scriptroot
+# for the current Python implementation (${EPYTHON}), and name it
+# <new-name>.
+#
+# The file must start with a 'python' shebang. The shebang will be
+# converted, and the file will be wrapped properly for the Python
+# implementation. It will be renamed to <new-name>.
+#
+# Example:
+# @CODE
+# src_install() {
+# python_foreach_impl python_newscript foo.py foo
+# }
+# @CODE
+python_newscript() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ local _PYTHON_REWRITE_SHEBANG=1
+ python_newexe "${@}"
}
# @ECLASS-VARIABLE: python_moduleroot
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-05-01 13:34 Justin Lecher (jlec)
0 siblings, 0 replies; 57+ messages in thread
From: Justin Lecher (jlec) @ 2014-05-01 13:34 UTC (permalink / raw
To: gentoo-commits
jlec 14/05/01 13:34:02
Modified: ChangeLog python-utils-r1.eclass
Log:
Add missing @DESCRIPTION
Revision Changes Path
1.1235 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1235&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1235&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1234&r2=1.1235
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1234
retrieving revision 1.1235
diff -u -r1.1234 -r1.1235
--- ChangeLog 1 May 2014 09:52:27 -0000 1.1234
+++ ChangeLog 1 May 2014 13:34:02 -0000 1.1235
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1234 2014/05/01 09:52:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1235 2014/05/01 13:34:02 jlec Exp $
+
+ 01 May 2014; Justin Lecher <jlec@gentoo.org> python-utils-r1.eclass:
+ Add missing @DESCRIPTION
01 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Add MULTILIB_COMPAT to limit the supported ABIs for pre-built packages.
1.54 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.53&r2=1.54
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- python-utils-r1.eclass 8 Apr 2014 16:05:30 -0000 1.53
+++ python-utils-r1.eclass 1 May 2014 13:34:02 -0000 1.54
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.53 2014/04/08 16:05:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.54 2014/05/01 13:34:02 jlec Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -699,6 +699,7 @@
# @FUNCTION: python_newexe
# @USAGE: <path> <new-name>
+# @DESCRIPTION:
# Install the given executable into current python_scriptroot,
# for the current Python implementation (${EPYTHON}).
#
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-05-16 7:54 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2014-05-16 7:54 UTC (permalink / raw
To: gentoo-commits
mgorny 14/05/16 07:54:41
Modified: ChangeLog python-utils-r1.eclass
Log:
Accept files with already-rewritten shebangs in _python_rewrite_shebang. Necessary for proper python_doscript().
Revision Changes Path
1.1255 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1255&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1255&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1254&r2=1.1255
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1254
retrieving revision 1.1255
diff -u -r1.1254 -r1.1255
--- ChangeLog 15 May 2014 05:18:33 -0000 1.1254
+++ ChangeLog 16 May 2014 07:54:40 -0000 1.1255
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1254 2014/05/15 05:18:33 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1255 2014/05/16 07:54:40 mgorny Exp $
+
+ 16 May 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Accept files with already-rewritten shebangs in _python_rewrite_shebang.
+ Necessary for proper python_doscript().
15 May 2014; Ryan Hill <rhill@gentoo.org> toolchain.eclass:
Allow parallel profiledbootstrap in newer versions (bug #508878 by Eric F.
1.55 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.54&r2=1.55
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- python-utils-r1.eclass 1 May 2014 13:34:02 -0000 1.54
+++ python-utils-r1.eclass 16 May 2014 07:54:40 -0000 1.55
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.54 2014/05/01 13:34:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.55 2014/05/16 07:54:40 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -522,7 +522,10 @@
debug-print "${FUNCNAME}: path = ${f}"
debug-print "${FUNCNAME}: shebang = ${shebang}"
- if [[ "${shebang} " == *'python '* ]]; then
+ if [[ "${shebang} " == *"${impl} "* ]]; then
+ # skip files with correct impl
+ continue
+ elif [[ "${shebang} " == *'python '* ]]; then
from=python
elif [[ "${shebang} " == *'python2 '* ]]; then
from=python2
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-06-19 15:10 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2014-06-19 15:10 UTC (permalink / raw
To: gentoo-commits
mgorny 14/06/19 15:10:55
Modified: ChangeLog python-utils-r1.eclass
Log:
python_fix_shebang: properly unset local variables in loop iterations.
Revision Changes Path
1.1294 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1294&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1294&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1293&r2=1.1294
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1293
retrieving revision 1.1294
diff -u -r1.1293 -r1.1294
--- ChangeLog 19 Jun 2014 12:54:47 -0000 1.1293
+++ ChangeLog 19 Jun 2014 15:10:55 -0000 1.1294
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1293 2014/06/19 12:54:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1294 2014/06/19 15:10:55 mgorny Exp $
+
+ 19 Jun 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ python_fix_shebang: properly unset local variables in loop iterations.
19 Jun 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Always set up CC, CXX and friends for distutils builds, bug #513664. Thanks
1.58 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.57&r2=1.58
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- python-utils-r1.eclass 19 Jun 2014 08:08:10 -0000 1.57
+++ python-utils-r1.eclass 19 Jun 2014 15:10:55 -0000 1.58
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.57 2014/06/19 08:08:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.58 2014/06/19 15:10:55 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -976,7 +976,7 @@
while IFS= read -r -d '' f; do
local shebang i
- local error from
+ local error= from=
read shebang <"${f}"
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-07-06 11:45 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2014-07-06 11:45 UTC (permalink / raw
To: gentoo-commits
mgorny 14/07/06 11:45:20
Modified: ChangeLog python-utils-r1.eclass
Log:
Disable python2.6 support and clean up the related code.
Revision Changes Path
1.1311 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1311&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1311&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1310&r2=1.1311
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1310
retrieving revision 1.1311
diff -u -r1.1310 -r1.1311
--- ChangeLog 4 Jul 2014 13:02:21 -0000 1.1310
+++ ChangeLog 6 Jul 2014 11:45:20 -0000 1.1311
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1310 2014/07/04 13:02:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1311 2014/07/06 11:45:20 mgorny Exp $
+
+ 06 Jul 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Disable python2.6 support and clean up the related code.
04 Jul 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Declare REQUIRED_USE inside MULTILIB_COMPAT conditional, reported by steev.
1.60 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.59&r2=1.60
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- python-utils-r1.eclass 29 Jun 2014 14:24:22 -0000 1.59
+++ python-utils-r1.eclass 6 Jul 2014 11:45:20 -0000 1.60
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.59 2014/06/29 14:24:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.60 2014/07/06 11:45:20 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -43,7 +43,7 @@
jython2_5 jython2_7
pypy
python3_2 python3_3 python3_4
- python2_6 python2_7
+ python2_7
)
# @FUNCTION: _python_impl_supported
@@ -66,10 +66,10 @@
# keep in sync with _PYTHON_ALL_IMPLS!
# (not using that list because inline patterns shall be faster)
case "${impl}" in
- python2_[67]|python3_[234]|jython2_[57])
+ python2_7|python3_[234]|jython2_[57])
return 0
;;
- pypy1_[89]|pypy2_0|python2_5|python3_1)
+ pypy1_[89]|pypy2_0|python2_[56]|python3_1)
return 1
;;
pypy)
@@ -98,7 +98,7 @@
#
# Example value:
# @CODE
-# /usr/bin/python2.6
+# /usr/bin/python2.7
# @CODE
# @ECLASS-VARIABLE: EPYTHON
@@ -117,7 +117,7 @@
#
# Example value:
# @CODE
-# python2.6
+# python2.7
# @CODE
# @ECLASS-VARIABLE: PYTHON_SITEDIR
@@ -129,7 +129,7 @@
#
# Example value:
# @CODE
-# /usr/lib64/python2.6/site-packages
+# /usr/lib64/python2.7/site-packages
# @CODE
# @ECLASS-VARIABLE: PYTHON_INCLUDEDIR
@@ -141,7 +141,7 @@
#
# Example value:
# @CODE
-# /usr/include/python2.6
+# /usr/include/python2.7
# @CODE
# @ECLASS-VARIABLE: PYTHON_LIBPATH
@@ -154,7 +154,7 @@
#
# Example value:
# @CODE
-# /usr/lib64/libpython2.6.so
+# /usr/lib64/libpython2.7.so
# @CODE
# @ECLASS-VARIABLE: PYTHON_CFLAGS
@@ -307,10 +307,6 @@
local val
case "${impl}" in
- python2.5|python2.6)
- # old versions support python-config only
- val=$("${impl}-config" --includes)
- ;;
python*)
# python-2.7, python-3.2, etc.
val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-})
@@ -327,10 +323,6 @@
local val
case "${impl}" in
- python2.5|python2.6)
- # old versions support python-config only
- val=$("${impl}-config" --libs)
- ;;
python*)
# python-2.7, python-3.2, etc.
val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-})
@@ -346,8 +338,6 @@
PYTHON_PKG_DEP)
local d
case ${impl} in
- python2.6)
- PYTHON_PKG_DEP='>=dev-lang/python-2.6.8-r3:2.6';;
python2.7)
PYTHON_PKG_DEP='>=dev-lang/python-2.7.5-r2:2.7';;
python3.2)
@@ -542,6 +532,7 @@
[[ ${PYTHON} ]] || python_export PYTHON
# Note: python2.6 can't handle passing files to compileall...
+ # TODO: we do not support 2.6 any longer
# default to sys.path
if [[ ${#} -eq 0 ]]; then
@@ -877,20 +868,11 @@
ln -s "${PYTHON}-config" "${workdir}"/bin/python-config || die
# Python 2.6+.
- if [[ ${EPYTHON} != python2.5 ]]; then
- ln -s "${PYTHON/python/2to3-}" "${workdir}"/bin/2to3 || die
- else
- nonsupp+=( 2to3 )
- fi
+ ln -s "${PYTHON/python/2to3-}" "${workdir}"/bin/2to3 || die
# Python 2.7+.
- if [[ ${EPYTHON} != python2.[56] ]]; then
- ln -s "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${EPYTHON/n/n-}.pc \
- "${workdir}"/pkgconfig/python.pc || die
- else
- # XXX?
- ln -s /dev/null "${workdir}"/pkgconfig/python.pc || die
- fi
+ ln -s "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${EPYTHON/n/n-}.pc \
+ "${workdir}"/pkgconfig/python.pc || die
ln -s python.pc "${workdir}"/pkgconfig/python${pyver}.pc || die
else
nonsupp+=( 2to3 python-config )
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-09-04 14:52 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2014-09-04 14:52 UTC (permalink / raw
To: gentoo-commits
mgorny 14/09/04 14:52:58
Modified: ChangeLog python-utils-r1.eclass
Log:
Preserve all whitespace in shebangs, and add regression test for that. Also, prevent filename expansion when word-splitting it. Bug #522080.
Revision Changes Path
1.1366 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1366&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1366&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1365&r2=1.1366
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1365
retrieving revision 1.1366
diff -u -r1.1365 -r1.1366
--- ChangeLog 4 Sep 2014 14:00:43 -0000 1.1365
+++ ChangeLog 4 Sep 2014 14:52:58 -0000 1.1366
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1365 2014/09/04 14:00:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1366 2014/09/04 14:52:58 mgorny Exp $
+
+ 04 Sep 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass,
+ tests/python-utils-r1.sh:
+ Preserve all whitespace in shebangs, and add regression test for that. Also,
+ prevent filename expansion when word-splitting it. Bug #522080.
04 Sep 2014; Michał Górny <mgorny@gentoo.org> tests/python-utils-r1.sh:
Fix tests for python_is_python3.
1.61 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.60&r2=1.61
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- python-utils-r1.eclass 6 Jul 2014 11:45:20 -0000 1.60
+++ python-utils-r1.eclass 4 Sep 2014 14:52:58 -0000 1.61
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.60 2014/07/06 11:45:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.61 2014/09/04 14:52:58 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -960,13 +960,16 @@
local shebang i
local error= from=
- read shebang <"${f}"
+ IFS= read -r shebang <${f}
# First, check if it's shebang at all...
if [[ ${shebang} == '#!'* ]]; then
+ local split_shebang=()
+ read -r -a split_shebang <<<${shebang}
+
# Match left-to-right in a loop, to avoid matching random
# repetitions like 'python2.7 python2'.
- for i in ${shebang}; do
+ for i in "${split_shebang[@]}"; do
case "${i}" in
*"${EPYTHON}")
debug-print "${FUNCNAME}: in file ${f#${D}}"
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-10-18 22:36 Mike Gilbert (floppym)
0 siblings, 0 replies; 57+ messages in thread
From: Mike Gilbert (floppym) @ 2014-10-18 22:36 UTC (permalink / raw
To: gentoo-commits
floppym 14/10/18 22:36:17
Modified: ChangeLog python-utils-r1.eclass
Log:
Improve error messaging when python_export is called without a defined python implementation.
Revision Changes Path
1.1388 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1388&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1388&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1387&r2=1.1388
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1387
retrieving revision 1.1388
diff -u -r1.1387 -r1.1388
--- ChangeLog 17 Oct 2014 21:07:08 -0000 1.1387
+++ ChangeLog 18 Oct 2014 22:36:17 -0000 1.1388
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1387 2014/10/17 21:07:08 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1388 2014/10/18 22:36:17 floppym Exp $
+
+ 18 Oct 2014; Mike Gilbert <floppym@gentoo.org> python-utils-r1.eclass:
+ Improve error messaging when python_export is called without a defined python
+ implementation.
17 Oct 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
mozconfig-v5.33.eclass:
1.62 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.61&r2=1.62
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- python-utils-r1.eclass 4 Sep 2014 14:52:58 -0000 1.61
+++ python-utils-r1.eclass 18 Oct 2014 22:36:17 -0000 1.62
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.61 2014/09/04 14:52:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.62 2014/10/18 22:36:17 floppym Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -241,7 +241,9 @@
;;
*)
impl=${EPYTHON}
- [[ ${impl} ]] || die "python_export: no impl nor EPYTHON"
+ if [[ -z ${impl} ]]; then
+ die "python_export called without a python implementation and EPYTHON is unset"
+ fi
;;
esac
debug-print "${FUNCNAME}: implementation: ${impl}"
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-11-23 16:02 Mike Gilbert (floppym)
0 siblings, 0 replies; 57+ messages in thread
From: Mike Gilbert (floppym) @ 2014-11-23 16:02 UTC (permalink / raw
To: gentoo-commits
floppym 14/11/23 16:02:56
Modified: ChangeLog python-utils-r1.eclass
Log:
Remove python3_2.
Revision Changes Path
1.1441 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1441&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1441&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1440&r2=1.1441
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1440
retrieving revision 1.1441
diff -u -r1.1440 -r1.1441
--- ChangeLog 23 Nov 2014 15:00:44 -0000 1.1440
+++ ChangeLog 23 Nov 2014 16:02:56 -0000 1.1441
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1440 2014/11/23 15:00:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1441 2014/11/23 16:02:56 floppym Exp $
+
+ 23 Nov 2014; Mike Gilbert <floppym@gentoo.org> python-utils-r1.eclass:
+ Remove python3_2.
23 Nov 2014; Michał Górny <mgorny@gentoo.org> gnome2-utils.eclass:
Support multilib for gnome2_query_immodules_gtk3(), needed by
1.65 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.64&r2=1.65
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- python-utils-r1.eclass 9 Nov 2014 22:27:58 -0000 1.64
+++ python-utils-r1.eclass 23 Nov 2014 16:02:56 -0000 1.65
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.64 2014/11/09 22:27:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.65 2014/11/23 16:02:56 floppym Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -42,7 +42,7 @@
_PYTHON_ALL_IMPLS=(
jython2_5 jython2_7
pypy pypy3
- python3_2 python3_3 python3_4
+ python3_3 python3_4
python2_7
)
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-11-23 16:05 Mike Gilbert (floppym)
0 siblings, 0 replies; 57+ messages in thread
From: Mike Gilbert (floppym) @ 2014-11-23 16:05 UTC (permalink / raw
To: gentoo-commits
floppym 14/11/23 16:05:42
Modified: ChangeLog python-utils-r1.eclass
Log:
Adjust _python_impl_supported as well.
Revision Changes Path
1.1442 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1442&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1442&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1441&r2=1.1442
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1441
retrieving revision 1.1442
diff -u -r1.1441 -r1.1442
--- ChangeLog 23 Nov 2014 16:02:56 -0000 1.1441
+++ ChangeLog 23 Nov 2014 16:05:42 -0000 1.1442
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1441 2014/11/23 16:02:56 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1442 2014/11/23 16:05:42 floppym Exp $
+
+ 23 Nov 2014; Mike Gilbert <floppym@gentoo.org> python-utils-r1.eclass:
+ Adjust _python_impl_supported as well.
23 Nov 2014; Mike Gilbert <floppym@gentoo.org> python-utils-r1.eclass:
Remove python3_2.
1.66 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.66&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.66&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.65&r2=1.66
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- python-utils-r1.eclass 23 Nov 2014 16:02:56 -0000 1.65
+++ python-utils-r1.eclass 23 Nov 2014 16:05:42 -0000 1.66
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.65 2014/11/23 16:02:56 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.66 2014/11/23 16:05:42 floppym Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -66,10 +66,10 @@
# keep in sync with _PYTHON_ALL_IMPLS!
# (not using that list because inline patterns shall be faster)
case "${impl}" in
- python2_7|python3_[234]|jython2_[57])
+ python2_7|python3_[34]|jython2_[57])
return 0
;;
- pypy1_[89]|pypy2_0|python2_[56]|python3_1)
+ pypy1_[89]|pypy2_0|python2_[56]|python3_[12])
return 1
;;
pypy|pypy3)
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-11-29 23:03 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2014-11-29 23:03 UTC (permalink / raw
To: gentoo-commits
mgorny 14/11/29 23:03:42
Modified: ChangeLog python-utils-r1.eclass
Log:
Remove leftover code for Python 3.2.
Revision Changes Path
1.1448 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1448&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1448&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1447&r2=1.1448
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1447
retrieving revision 1.1448
diff -u -r1.1447 -r1.1448
--- ChangeLog 28 Nov 2014 17:40:20 -0000 1.1447
+++ ChangeLog 29 Nov 2014 23:03:42 -0000 1.1448
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1447 2014/11/28 17:40:20 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1448 2014/11/29 23:03:42 mgorny Exp $
+
+ 29 Nov 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Remove leftover code for Python 3.2.
28 Nov 2014; Michael Pagano <mpagano@gentoo.org> kernel-2.eclass:
Adjust sparc warning. See bug #529682
1.67 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.66&r2=1.67
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- python-utils-r1.eclass 23 Nov 2014 16:05:42 -0000 1.66
+++ python-utils-r1.eclass 29 Nov 2014 23:03:42 -0000 1.67
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.66 2014/11/23 16:05:42 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.67 2014/11/29 23:03:42 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -342,8 +342,6 @@
case ${impl} in
python2.7)
PYTHON_PKG_DEP='>=dev-lang/python-2.7.5-r2:2.7';;
- python3.2)
- PYTHON_PKG_DEP='>=dev-lang/python-3.2.5-r2:3.2';;
python3.3)
PYTHON_PKG_DEP='>=dev-lang/python-3.3.2-r2:3.3';;
python*)
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-12-27 18:26 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2014-12-27 18:26 UTC (permalink / raw
To: gentoo-commits
mgorny 14/12/27 18:26:21
Modified: ChangeLog python-utils-r1.eclass
Log:
Add die-replacements for python.eclass functions, to help finding mistakes in conversions.
Revision Changes Path
1.1476 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1476&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1476&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1475&r2=1.1476
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1475
retrieving revision 1.1476
diff -u -r1.1475 -r1.1476
--- ChangeLog 27 Dec 2014 18:07:31 -0000 1.1475
+++ ChangeLog 27 Dec 2014 18:26:21 -0000 1.1476
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1475 2014/12/27 18:07:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1476 2014/12/27 18:26:21 mgorny Exp $
+
+ 27 Dec 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Add die-replacements for python.eclass functions, to help finding mistakes in
+ conversions.
27 Dec 2014; Michał Górny <mgorny@gentoo.org> waf-utils.eclass:
Add new API warnings.
1.68 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.67&r2=1.68
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- python-utils-r1.eclass 29 Nov 2014 23:03:42 -0000 1.67
+++ python-utils-r1.eclass 27 Dec 2014 18:26:21 -0000 1.68
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.67 2014/11/29 23:03:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.68 2014/12/27 18:26:21 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -1166,5 +1166,99 @@
return 0
}
+# -- python.eclass functions --
+
+python_pkg_setup() {
+ die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup"
+}
+
+python_convert_shebangs() {
+ die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_convert_shebangs"
+}
+
+python_clean_py-compile_files() {
+ die "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_clean_installation_image() {
+ die "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_execute_function() {
+ die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_execute_function"
+}
+
+python_generate_wrapper_scripts() {
+ die "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_merge_intermediate_installation_images() {
+ die "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_set_active_version() {
+ die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup"
+}
+
+python_need_rebuild() {
+ die "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+PYTHON() {
+ die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#.24.28PYTHON.29.2C_.24.7BEPYTHON.7D"
+}
+
+python_get_implementation() {
+ die "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_get_implementational_package() {
+ die "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_get_libdir() {
+ die "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_get_library() {
+ die "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_get_version() {
+ die "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_get_implementation_and_version() {
+ die "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_execute_nosetests() {
+ die "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_execute_py.test() {
+ die "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_execute_trial() {
+ die "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_enable_pyc() {
+ die "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_disable_pyc() {
+ die "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_mod_optimize() {
+ die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation"
+}
+
+python_mod_cleanup() {
+ die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation"
+}
+
_PYTHON_UTILS_R1=1
fi
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-12-27 19:31 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2014-12-27 19:31 UTC (permalink / raw
To: gentoo-commits
mgorny 14/12/27 19:31:39
Modified: ChangeLog python-utils-r1.eclass
Log:
Add die-checks for python.eclass & distutils.eclass variables.
Revision Changes Path
1.1478 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1478&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1478&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1477&r2=1.1478
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1477
retrieving revision 1.1478
diff -u -r1.1477 -r1.1478
--- ChangeLog 27 Dec 2014 19:00:10 -0000 1.1477
+++ ChangeLog 27 Dec 2014 19:31:39 -0000 1.1478
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1477 2014/12/27 19:00:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1478 2014/12/27 19:31:39 mgorny Exp $
+
+ 27 Dec 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Add die-checks for python.eclass & distutils.eclass variables.
27 Dec 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Add die-replacements for distutils.eclass functions, to help finding mistakes
1.69 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.69&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.69&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.68&r2=1.69
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- python-utils-r1.eclass 27 Dec 2014 18:26:21 -0000 1.68
+++ python-utils-r1.eclass 27 Dec 2014 19:31:39 -0000 1.69
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.68 2014/12/27 18:26:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.69 2014/12/27 19:31:39 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -842,6 +842,8 @@
[[ ${impl} ]] || die "${FUNCNAME}: no impl nor EPYTHON specified."
if [[ ! -x ${workdir}/bin/python ]]; then
+ _python_check_dead_variables
+
mkdir -p "${workdir}"/{bin,pkgconfig} || die
# Clean up, in case we were supposed to do a cheap update.
@@ -1168,6 +1170,35 @@
# -- python.eclass functions --
+_python_check_dead_variables() {
+ local v
+
+ for v in PYTHON_DEPEND PYTHON_USE_WITH{,_OR,_OPT} {RESTRICT,SUPPORT}_PYTHON_ABIS
+ do
+ if [[ ${!v} ]]; then
+ die "${v} is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Ebuild_head"
+ fi
+ done
+
+ for v in PYTHON_TESTS_RESTRICTED_ABIS PYTHON_EXPORT_PHASE_FUNCTIONS \
+ PYTHON_VERSIONED_{SCRIPTS,EXECUTABLES} PYTHON_NONVERSIONED_EXECUTABLES \
+ PYTHON_TEST_VERBOSITY
+ do
+ if [[ ${!v} ]]; then
+ die "${v} is invalid for python-r1 suite"
+ fi
+ done
+
+ for v in DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES DISTUTILS_SETUP_FILES \
+ DISTUTILS_GLOBAL_OPTIONS DISTUTILS_SRC_TEST \
+ DISTUTILS_DISABLE_TEST_DEPENDENCY
+ do
+ if [[ ${!v} ]]; then
+ die "${v} is invalid for distutils-r1"
+ fi
+ done
+}
+
python_pkg_setup() {
die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup"
}
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-12-27 23:22 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2014-12-27 23:22 UTC (permalink / raw
To: gentoo-commits
mgorny 14/12/27 23:22:44
Modified: ChangeLog python-utils-r1.eclass
Log:
Add PYTHON_{CPPFLAGS,CFLAGS,CXXFLAGS,LDFLAGS,MODNAME} to the banned variable list.
Revision Changes Path
1.1480 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1480&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1480&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1479&r2=1.1480
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1479
retrieving revision 1.1480
diff -u -r1.1479 -r1.1480
--- ChangeLog 27 Dec 2014 20:04:21 -0000 1.1479
+++ ChangeLog 27 Dec 2014 23:22:44 -0000 1.1480
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1479 2014/12/27 20:04:21 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1480 2014/12/27 23:22:44 mgorny Exp $
+
+ 27 Dec 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Add PYTHON_{CPPFLAGS,CFLAGS,CXXFLAGS,LDFLAGS,MODNAME} to the banned variable
+ list.
27 Dec 2014; Hans de Graaff <graaff@gentoo.org> ruby-ng.eclass:
Add ruby22 RUBY_TARGET support.
1.70 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.70&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.70&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.69&r2=1.70
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- python-utils-r1.eclass 27 Dec 2014 19:31:39 -0000 1.69
+++ python-utils-r1.eclass 27 Dec 2014 23:22:44 -0000 1.70
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.69 2014/12/27 19:31:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.70 2014/12/27 23:22:44 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -1182,7 +1182,7 @@
for v in PYTHON_TESTS_RESTRICTED_ABIS PYTHON_EXPORT_PHASE_FUNCTIONS \
PYTHON_VERSIONED_{SCRIPTS,EXECUTABLES} PYTHON_NONVERSIONED_EXECUTABLES \
- PYTHON_TEST_VERBOSITY
+ PYTHON_TEST_VERBOSITY PYTHON_{CPPFLAGS,CFLAGS,CXXFLAGS,LDFLAGS}
do
if [[ ${!v} ]]; then
die "${v} is invalid for python-r1 suite"
@@ -1191,7 +1191,7 @@
for v in DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES DISTUTILS_SETUP_FILES \
DISTUTILS_GLOBAL_OPTIONS DISTUTILS_SRC_TEST \
- DISTUTILS_DISABLE_TEST_DEPENDENCY
+ DISTUTILS_DISABLE_TEST_DEPENDENCY PYTHON_MODNAME
do
if [[ ${!v} ]]; then
die "${v} is invalid for distutils-r1"
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-12-27 23:52 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2014-12-27 23:52 UTC (permalink / raw
To: gentoo-commits
mgorny 14/12/27 23:52:24
Modified: ChangeLog python-utils-r1.eclass
Log:
Update banned var docs.
Revision Changes Path
1.1481 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1481&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1481&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1480&r2=1.1481
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1480
retrieving revision 1.1481
diff -u -r1.1480 -r1.1481
--- ChangeLog 27 Dec 2014 23:22:44 -0000 1.1480
+++ ChangeLog 27 Dec 2014 23:52:24 -0000 1.1481
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1480 2014/12/27 23:22:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1481 2014/12/27 23:52:24 mgorny Exp $
+
+ 27 Dec 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Update banned var docs.
27 Dec 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Add PYTHON_{CPPFLAGS,CFLAGS,CXXFLAGS,LDFLAGS,MODNAME} to the banned variable
1.71 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.70&r2=1.71
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- python-utils-r1.eclass 27 Dec 2014 23:22:44 -0000 1.70
+++ python-utils-r1.eclass 27 Dec 2014 23:52:24 -0000 1.71
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.70 2014/12/27 23:22:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.71 2014/12/27 23:52:24 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -1180,9 +1180,16 @@
fi
done
+ for v in PYTHON_{CPPFLAGS,CFLAGS,CXXFLAGS,LDFLAGS}
+ do
+ if [[ ${!v} ]]; then
+ die "${v} is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#PYTHON_CFLAGS"
+ fi
+ done
+
for v in PYTHON_TESTS_RESTRICTED_ABIS PYTHON_EXPORT_PHASE_FUNCTIONS \
PYTHON_VERSIONED_{SCRIPTS,EXECUTABLES} PYTHON_NONVERSIONED_EXECUTABLES \
- PYTHON_TEST_VERBOSITY PYTHON_{CPPFLAGS,CFLAGS,CXXFLAGS,LDFLAGS}
+ PYTHON_TEST_VERBOSITY
do
if [[ ${!v} ]]; then
die "${v} is invalid for python-r1 suite"
@@ -1190,13 +1197,16 @@
done
for v in DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES DISTUTILS_SETUP_FILES \
- DISTUTILS_GLOBAL_OPTIONS DISTUTILS_SRC_TEST \
- DISTUTILS_DISABLE_TEST_DEPENDENCY PYTHON_MODNAME
+ DISTUTILS_GLOBAL_OPTIONS DISTUTILS_SRC_TEST PYTHON_MODNAME
do
if [[ ${!v} ]]; then
- die "${v} is invalid for distutils-r1"
+ die "${v} is invalid for distutils-r1, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#${v}"
fi
done
+
+ if [[ ${DISTUTILS_DISABLE_TEST_DEPENDENCY} ]]; then
+ die "${v} is invalid for distutils-r1, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#DISTUTILS_SRC_TEST"
+ fi
}
python_pkg_setup() {
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-12-28 11:24 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2014-12-28 11:24 UTC (permalink / raw
To: gentoo-commits
mgorny 14/12/28 11:24:15
Modified: ChangeLog python-utils-r1.eclass
Log:
Do not check for PYTHON_TEST_VERBOSITY, it is intended for make.conf.
Revision Changes Path
1.1485 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1485&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1485&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1484&r2=1.1485
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1484
retrieving revision 1.1485
diff -u -r1.1484 -r1.1485
--- ChangeLog 28 Dec 2014 10:56:55 -0000 1.1484
+++ ChangeLog 28 Dec 2014 11:24:15 -0000 1.1485
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1484 2014/12/28 10:56:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1485 2014/12/28 11:24:15 mgorny Exp $
+
+ 28 Dec 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Do not check for PYTHON_TEST_VERBOSITY, it is intended for make.conf.
28 Dec 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass,
python-r1.eclass:
1.72 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.71&r2=1.72
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- python-utils-r1.eclass 27 Dec 2014 23:52:24 -0000 1.71
+++ python-utils-r1.eclass 28 Dec 2014 11:24:15 -0000 1.72
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.71 2014/12/27 23:52:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.72 2014/12/28 11:24:15 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -1188,8 +1188,7 @@
done
for v in PYTHON_TESTS_RESTRICTED_ABIS PYTHON_EXPORT_PHASE_FUNCTIONS \
- PYTHON_VERSIONED_{SCRIPTS,EXECUTABLES} PYTHON_NONVERSIONED_EXECUTABLES \
- PYTHON_TEST_VERBOSITY
+ PYTHON_VERSIONED_{SCRIPTS,EXECUTABLES} PYTHON_NONVERSIONED_EXECUTABLES
do
if [[ ${!v} ]]; then
die "${v} is invalid for python-r1 suite"
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2014-12-28 18:35 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2014-12-28 18:35 UTC (permalink / raw
To: gentoo-commits
mgorny 14/12/28 18:35:07
Modified: ChangeLog python-utils-r1.eclass
Log:
Make the invalid function/variable checks non-fatal for now.
Revision Changes Path
1.1486 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1486&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1486&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1485&r2=1.1486
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1485
retrieving revision 1.1486
diff -u -r1.1485 -r1.1486
--- ChangeLog 28 Dec 2014 11:24:15 -0000 1.1485
+++ ChangeLog 28 Dec 2014 18:35:07 -0000 1.1486
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1485 2014/12/28 11:24:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1486 2014/12/28 18:35:07 mgorny Exp $
+
+ 28 Dec 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Make the invalid function/variable checks non-fatal for now.
28 Dec 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Do not check for PYTHON_TEST_VERBOSITY, it is intended for make.conf.
1.73 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.72&r2=1.73
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- python-utils-r1.eclass 28 Dec 2014 11:24:15 -0000 1.72
+++ python-utils-r1.eclass 28 Dec 2014 18:35:07 -0000 1.73
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.72 2014/12/28 11:24:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.73 2014/12/28 18:35:07 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -1176,14 +1176,14 @@
for v in PYTHON_DEPEND PYTHON_USE_WITH{,_OR,_OPT} {RESTRICT,SUPPORT}_PYTHON_ABIS
do
if [[ ${!v} ]]; then
- die "${v} is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Ebuild_head"
+ eqawarn "${v} is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Ebuild_head"
fi
done
for v in PYTHON_{CPPFLAGS,CFLAGS,CXXFLAGS,LDFLAGS}
do
if [[ ${!v} ]]; then
- die "${v} is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#PYTHON_CFLAGS"
+ eqawarn "${v} is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#PYTHON_CFLAGS"
fi
done
@@ -1191,7 +1191,7 @@
PYTHON_VERSIONED_{SCRIPTS,EXECUTABLES} PYTHON_NONVERSIONED_EXECUTABLES
do
if [[ ${!v} ]]; then
- die "${v} is invalid for python-r1 suite"
+ eqawarn "${v} is invalid for python-r1 suite"
fi
done
@@ -1199,105 +1199,105 @@
DISTUTILS_GLOBAL_OPTIONS DISTUTILS_SRC_TEST PYTHON_MODNAME
do
if [[ ${!v} ]]; then
- die "${v} is invalid for distutils-r1, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#${v}"
+ eqawarn "${v} is invalid for distutils-r1, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#${v}"
fi
done
if [[ ${DISTUTILS_DISABLE_TEST_DEPENDENCY} ]]; then
- die "${v} is invalid for distutils-r1, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#DISTUTILS_SRC_TEST"
+ eqawarn "${v} is invalid for distutils-r1, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#DISTUTILS_SRC_TEST"
fi
}
python_pkg_setup() {
- die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup"
}
python_convert_shebangs() {
- die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_convert_shebangs"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_convert_shebangs"
}
python_clean_py-compile_files() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
}
python_clean_installation_image() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
}
python_execute_function() {
- die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_execute_function"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_execute_function"
}
python_generate_wrapper_scripts() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
}
python_merge_intermediate_installation_images() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
}
python_set_active_version() {
- die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup"
}
python_need_rebuild() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
}
PYTHON() {
- die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#.24.28PYTHON.29.2C_.24.7BEPYTHON.7D"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#.24.28PYTHON.29.2C_.24.7BEPYTHON.7D"
}
python_get_implementation() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
}
python_get_implementational_package() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
}
python_get_libdir() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
}
python_get_library() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
}
python_get_version() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
}
python_get_implementation_and_version() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
}
python_execute_nosetests() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
}
python_execute_py.test() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
}
python_execute_trial() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
}
python_enable_pyc() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
}
python_disable_pyc() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
}
python_mod_optimize() {
- die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation"
}
python_mod_cleanup() {
- die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation"
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation"
}
_PYTHON_UTILS_R1=1
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2015-01-02 0:14 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2015-01-02 0:14 UTC (permalink / raw
To: gentoo-commits
mgorny 15/01/02 00:14:25
Modified: ChangeLog python-utils-r1.eclass
Log:
Add progress overlay-specific commands and variables to the invalid command/variable lists.
Revision Changes Path
1.1493 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1493&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1493&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1492&r2=1.1493
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1492
retrieving revision 1.1493
diff -u -r1.1492 -r1.1493
--- ChangeLog 1 Jan 2015 21:23:03 -0000 1.1492
+++ ChangeLog 2 Jan 2015 00:14:25 -0000 1.1493
@@ -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.1492 2015/01/01 21:23:03 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1493 2015/01/02 00:14:25 mgorny Exp $
+
+ 02 Jan 2015; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Add progress overlay-specific commands and variables to the invalid
+ command/variable lists.
01 Jan 2015; Sergei Trofimovich <slyfox@gentoo.org> ghc-package.eclass,
haskell-cabal.eclass:
1.74 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.73&r2=1.74
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- python-utils-r1.eclass 28 Dec 2014 18:35:07 -0000 1.73
+++ python-utils-r1.eclass 2 Jan 2015 00:14:25 -0000 1.74
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.73 2014/12/28 18:35:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.74 2015/01/02 00:14:25 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -1206,6 +1206,16 @@
if [[ ${DISTUTILS_DISABLE_TEST_DEPENDENCY} ]]; then
eqawarn "${v} is invalid for distutils-r1, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#DISTUTILS_SRC_TEST"
fi
+
+ # python.eclass::progress
+ for v in PYTHON_BDEPEND PYTHON_MULTIPLE_ABIS PYTHON_ABI_TYPE \
+ PYTHON_RESTRICTED_ABIS PYTHON_TESTS_FAILURES_TOLERANT_ABIS \
+ PYTHON_CFFI_MODULES_GENERATION_COMMANDS
+ do
+ if [[ ${!v} ]]; then
+ eqawarn "${v} is invalid for python-r1 suite"
+ fi
+ done
}
python_pkg_setup() {
@@ -1300,5 +1310,31 @@
eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation"
}
+# python.eclass::progress
+
+python_abi_depend() {
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_install_executables() {
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_get_extension_module_suffix() {
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_byte-compile_modules() {
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_clean_byte-compiled_modules() {
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
+python_generate_cffi_modules() {
+ eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+}
+
_PYTHON_UTILS_R1=1
fi
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2015-01-02 0:15 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2015-01-02 0:15 UTC (permalink / raw
To: gentoo-commits
mgorny 15/01/02 00:15:15
Modified: ChangeLog python-utils-r1.eclass
Log:
Make python.eclass commands/variables fatal once again since all in-tree ebuilds seem to have been fixed.
Revision Changes Path
1.1494 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1494&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1494&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1493&r2=1.1494
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1493
retrieving revision 1.1494
diff -u -r1.1493 -r1.1494
--- ChangeLog 2 Jan 2015 00:14:25 -0000 1.1493
+++ ChangeLog 2 Jan 2015 00:15:15 -0000 1.1494
@@ -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.1493 2015/01/02 00:14:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1494 2015/01/02 00:15:15 mgorny Exp $
+
+ 02 Jan 2015; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Make python.eclass commands/variables fatal once again since all in-tree
+ ebuilds seem to have been fixed.
02 Jan 2015; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Add progress overlay-specific commands and variables to the invalid
1.75 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.74&r2=1.75
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- python-utils-r1.eclass 2 Jan 2015 00:14:25 -0000 1.74
+++ python-utils-r1.eclass 2 Jan 2015 00:15:15 -0000 1.75
@@ -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.74 2015/01/02 00:14:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.75 2015/01/02 00:15:15 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -1176,14 +1176,14 @@
for v in PYTHON_DEPEND PYTHON_USE_WITH{,_OR,_OPT} {RESTRICT,SUPPORT}_PYTHON_ABIS
do
if [[ ${!v} ]]; then
- eqawarn "${v} is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Ebuild_head"
+ die "${v} is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Ebuild_head"
fi
done
for v in PYTHON_{CPPFLAGS,CFLAGS,CXXFLAGS,LDFLAGS}
do
if [[ ${!v} ]]; then
- eqawarn "${v} is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#PYTHON_CFLAGS"
+ die "${v} is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#PYTHON_CFLAGS"
fi
done
@@ -1191,7 +1191,7 @@
PYTHON_VERSIONED_{SCRIPTS,EXECUTABLES} PYTHON_NONVERSIONED_EXECUTABLES
do
if [[ ${!v} ]]; then
- eqawarn "${v} is invalid for python-r1 suite"
+ die "${v} is invalid for python-r1 suite"
fi
done
@@ -1199,12 +1199,12 @@
DISTUTILS_GLOBAL_OPTIONS DISTUTILS_SRC_TEST PYTHON_MODNAME
do
if [[ ${!v} ]]; then
- eqawarn "${v} is invalid for distutils-r1, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#${v}"
+ die "${v} is invalid for distutils-r1, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#${v}"
fi
done
if [[ ${DISTUTILS_DISABLE_TEST_DEPENDENCY} ]]; then
- eqawarn "${v} is invalid for distutils-r1, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#DISTUTILS_SRC_TEST"
+ die "${v} is invalid for distutils-r1, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#DISTUTILS_SRC_TEST"
fi
# python.eclass::progress
@@ -1213,127 +1213,127 @@
PYTHON_CFFI_MODULES_GENERATION_COMMANDS
do
if [[ ${!v} ]]; then
- eqawarn "${v} is invalid for python-r1 suite"
+ die "${v} is invalid for python-r1 suite"
fi
done
}
python_pkg_setup() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup"
+ die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup"
}
python_convert_shebangs() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_convert_shebangs"
+ die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_convert_shebangs"
}
python_clean_py-compile_files() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_clean_installation_image() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_execute_function() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_execute_function"
+ die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_execute_function"
}
python_generate_wrapper_scripts() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_merge_intermediate_installation_images() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_set_active_version() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup"
+ die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup"
}
python_need_rebuild() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
PYTHON() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#.24.28PYTHON.29.2C_.24.7BEPYTHON.7D"
+ die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#.24.28PYTHON.29.2C_.24.7BEPYTHON.7D"
}
python_get_implementation() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_get_implementational_package() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_get_libdir() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_get_library() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_get_version() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_get_implementation_and_version() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_execute_nosetests() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_execute_py.test() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_execute_trial() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_enable_pyc() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_disable_pyc() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_mod_optimize() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation"
+ die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation"
}
python_mod_cleanup() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation"
+ die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation"
}
# python.eclass::progress
python_abi_depend() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_install_executables() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_get_extension_module_suffix() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_byte-compile_modules() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_clean_byte-compiled_modules() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
python_generate_cffi_modules() {
- eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
+ die "${FUNCNAME}() is invalid for python-r1 suite"
}
_PYTHON_UTILS_R1=1
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2015-02-21 8:07 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2015-02-21 8:07 UTC (permalink / raw
To: gentoo-commits
mgorny 15/02/21 08:07:30
Modified: ChangeLog python-utils-r1.eclass
Log:
Remove duplicating "using" in EAPI=4 warning message. Spotted by Arfrever.
Revision Changes Path
1.1547 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1547&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1547&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1546&r2=1.1547
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1546
retrieving revision 1.1547
diff -u -r1.1546 -r1.1547
--- ChangeLog 21 Feb 2015 07:20:22 -0000 1.1546
+++ ChangeLog 21 Feb 2015 08:07:30 -0000 1.1547
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1546 2015/02/21 07:20:22 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1547 2015/02/21 08:07:30 mgorny Exp $
+
+ 21 Feb 2015; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Remove duplicating "using" in EAPI=4 warning message. Spotted by Arfrever.
21 Feb 2015; Ben de Groot <yngwin@gentoo.org> font.eclass:
Apply patch from Ryan Hill to font.eclass to support multiple FONT_S
1.81 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.80&r2=1.81
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- python-utils-r1.eclass 20 Feb 2015 17:57:22 -0000 1.80
+++ python-utils-r1.eclass 21 Feb 2015 08:07:30 -0000 1.81
@@ -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.80 2015/02/20 17:57:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.81 2015/02/21 08:07:30 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -1134,7 +1134,7 @@
# a QA warning if it does.
_python_check_EAPI() {
if [[ ${EAPI} == 4 && ! ${_PYTHON_WARNED_EAPI} ]]; then
- eqawarn "This package is using still using EAPI=4. This results in package"
+ eqawarn "This package is still using EAPI=4. This results in package"
eqawarn "dependencies violating PMS and causing issues for package managers."
eqawarn "For this reason, using EAPI=4 in new Python packages will be banned"
eqawarn "on 2015-03-20 (2 years and 6 months after approving EAPI 5)."
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2015-07-25 10:07 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2015-07-25 10:07 UTC (permalink / raw
To: gentoo-commits
mgorny 15/07/25 10:07:36
Modified: ChangeLog python-utils-r1.eclass
Log:
Add missing ||die to "rm -f" calls, i.e. in case we do not have permission to remove the files.
Revision Changes Path
1.1727 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1727&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1727&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1726&r2=1.1727
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1726
retrieving revision 1.1727
diff -u -r1.1726 -r1.1727
--- ChangeLog 23 Jul 2015 15:42:26 -0000 1.1726
+++ ChangeLog 25 Jul 2015 10:07:36 -0000 1.1727
@@ -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.1726 2015/07/23 15:42:26 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1727 2015/07/25 10:07:36 mgorny Exp $
+
+ 25 Jul 2015; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Add missing ||die to "rm -f" calls, i.e. in case we do not have permission to
+ remove the files.
23 Jul 2015; William Hubbs <williamh@gentoo.org> golang-build.eclass:
Add functions to retrieve Go library paths and install Go packages.
1.84 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.84&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.84&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.83&r2=1.84
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- python-utils-r1.eclass 4 Jul 2015 15:26:17 -0000 1.83
+++ python-utils-r1.eclass 25 Jul 2015 10:07:36 -0000 1.84
@@ -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.83 2015/07/04 15:26:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.84 2015/07/25 10:07:36 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -840,9 +840,9 @@
mkdir -p "${workdir}"/{bin,pkgconfig} || die
# Clean up, in case we were supposed to do a cheap update.
- rm -f "${workdir}"/bin/python{,2,3,-config}
- rm -f "${workdir}"/bin/2to3
- rm -f "${workdir}"/pkgconfig/python{,2,3}.pc
+ rm -f "${workdir}"/bin/python{,2,3,-config} || die
+ rm -f "${workdir}"/bin/2to3 || die
+ rm -f "${workdir}"/pkgconfig/python{,2,3}.pc || die
local EPYTHON PYTHON
python_export "${impl}" EPYTHON PYTHON
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2015-07-27 16:32 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2015-07-27 16:32 UTC (permalink / raw
To: gentoo-commits
mgorny 15/07/27 16:32:46
Modified: ChangeLog python-utils-r1.eclass
Log:
python_wrapper_setup(): replace symlinks with shell wrappers to avoid triggering Python 3.4+ magical prefix support.
Revision Changes Path
1.1729 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1729&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1729&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1728&r2=1.1729
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1728
retrieving revision 1.1729
diff -u -r1.1728 -r1.1729
--- ChangeLog 27 Jul 2015 16:31:01 -0000 1.1728
+++ ChangeLog 27 Jul 2015 16:32:46 -0000 1.1729
@@ -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.1728 2015/07/27 16:31:01 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1729 2015/07/27 16:32:46 mgorny Exp $
+
+ 27 Jul 2015; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ python_wrapper_setup(): replace symlinks with shell wrappers to avoid
+ triggering Python 3.4+ magical prefix support.
27 Jul 2015; Mike Gilbert <floppym@gentoo.org> python-r1.eclass:
Drop the USE_PYTHON warning.
1.85 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.85&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.85&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.84&r2=1.85
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- python-utils-r1.eclass 25 Jul 2015 10:07:36 -0000 1.84
+++ python-utils-r1.eclass 27 Jul 2015 16:32:46 -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-utils-r1.eclass,v 1.84 2015/07/25 10:07:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.85 2015/07/27 16:32:46 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -855,14 +855,25 @@
fi
# Python interpreter
- ln -s "${PYTHON}" "${workdir}"/bin/python || die
- ln -s python "${workdir}"/bin/python${pyver} || die
+ # note: we don't use symlinks because python likes to do some
+ # symlink reading magic that breaks stuff
+ # https://bugs.gentoo.org/show_bug.cgi?id=555752
+ cat > "${workdir}/bin/python" <<-_EOF_
+ #!/bin/sh
+ exec "${PYTHON}" "\${@}"
+ _EOF_
+ cp "${workdir}/bin/python" "${workdir}/bin/python${pyver}" || die
+ chmod +x "${workdir}/bin/python" "${workdir}/bin/python${pyver}" || die
local nonsupp=()
# CPython-specific
if [[ ${EPYTHON} == python* ]]; then
- ln -s "${PYTHON}-config" "${workdir}"/bin/python-config || die
+ cat > "${workdir}/bin/python-config" <<-_EOF_
+ #!/bin/sh
+ exec "${PYTHON}-config" "\${@}"
+ _EOF_
+ chmod +x "${workdir}/bin/python-config" || die
# Python 2.6+.
ln -s "${PYTHON/python/2to3-}" "${workdir}"/bin/2to3 || die
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2015-07-27 16:34 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2015-07-27 16:34 UTC (permalink / raw
To: gentoo-commits
mgorny 15/07/27 16:34:10
Modified: ChangeLog python-utils-r1.eclass
Log:
python_wrapper_setup(): wrap pythonN-config as well as suggested by PEP and required by some applications, bug #555594.
Revision Changes Path
1.1730 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1730&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1730&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1729&r2=1.1730
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1729
retrieving revision 1.1730
diff -u -r1.1729 -r1.1730
--- ChangeLog 27 Jul 2015 16:32:46 -0000 1.1729
+++ ChangeLog 27 Jul 2015 16:34:10 -0000 1.1730
@@ -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.1729 2015/07/27 16:32:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1730 2015/07/27 16:34:10 mgorny Exp $
+
+ 27 Jul 2015; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ python_wrapper_setup(): wrap pythonN-config as well as suggested by PEP and
+ required by some applications, bug #555594.
27 Jul 2015; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
python_wrapper_setup(): replace symlinks with shell wrappers to avoid
1.86 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.85&r2=1.86
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- python-utils-r1.eclass 27 Jul 2015 16:32:46 -0000 1.85
+++ python-utils-r1.eclass 27 Jul 2015 16:34:10 -0000 1.86
@@ -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.85 2015/07/27 16:32:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.86 2015/07/27 16:34:10 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -873,7 +873,10 @@
#!/bin/sh
exec "${PYTHON}-config" "\${@}"
_EOF_
- chmod +x "${workdir}/bin/python-config" || die
+ cp "${workdir}/bin/python-config" \
+ "${workdir}/bin/python${pyver}-config" || die
+ chmod +x "${workdir}/bin/python-config" \
+ "${workdir}/bin/python${pyver}-config" || die
# Python 2.6+.
ln -s "${PYTHON/python/2to3-}" "${workdir}"/bin/2to3 || die
@@ -883,7 +886,7 @@
"${workdir}"/pkgconfig/python.pc || die
ln -s python.pc "${workdir}"/pkgconfig/python${pyver}.pc || die
else
- nonsupp+=( 2to3 python-config )
+ nonsupp+=( 2to3 python-config "python${pyver}-config" )
fi
local x
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2015-07-27 16:34 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2015-07-27 16:34 UTC (permalink / raw
To: gentoo-commits
mgorny 15/07/27 16:34:48
Modified: ChangeLog python-utils-r1.eclass
Log:
Ban calling pythonN and pythonN-config when the other version of Python is selected (i.e. ban python2 when python3 is used).
Revision Changes Path
1.1731 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1731&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1731&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1730&r2=1.1731
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1730
retrieving revision 1.1731
diff -u -r1.1730 -r1.1731
--- ChangeLog 27 Jul 2015 16:34:10 -0000 1.1730
+++ ChangeLog 27 Jul 2015 16:34:48 -0000 1.1731
@@ -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.1730 2015/07/27 16:34:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1731 2015/07/27 16:34:48 mgorny Exp $
+
+ 27 Jul 2015; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Ban calling pythonN and pythonN-config when the other version of Python is
+ selected (i.e. ban python2 when python3 is used).
27 Jul 2015; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
python_wrapper_setup(): wrap pythonN-config as well as suggested by PEP and
1.87 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.87&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.87&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.86&r2=1.87
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- python-utils-r1.eclass 27 Jul 2015 16:34:10 -0000 1.86
+++ python-utils-r1.eclass 27 Jul 2015 16:34:48 -0000 1.87
@@ -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.86 2015/07/27 16:34:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.87 2015/07/27 16:34:48 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -847,11 +847,13 @@
local EPYTHON PYTHON
python_export "${impl}" EPYTHON PYTHON
- local pyver
+ local pyver pyother
if python_is_python3; then
pyver=3
+ pyother=2
else
pyver=2
+ pyother=3
fi
# Python interpreter
@@ -865,7 +867,7 @@
cp "${workdir}/bin/python" "${workdir}/bin/python${pyver}" || die
chmod +x "${workdir}/bin/python" "${workdir}/bin/python${pyver}" || die
- local nonsupp=()
+ local nonsupp=( "python${pyother}" "python${pyother}-config" )
# CPython-specific
if [[ ${EPYTHON} == python* ]]; then
^ permalink raw reply [flat|nested] 57+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
@ 2015-07-27 16:35 Michal Gorny (mgorny)
0 siblings, 0 replies; 57+ messages in thread
From: Michal Gorny (mgorny) @ 2015-07-27 16:35 UTC (permalink / raw
To: gentoo-commits
mgorny 15/07/27 16:35:19
Modified: ChangeLog python-utils-r1.eclass
Log:
python_wrapper_setup(): make banned helpers exit with 127.
Revision Changes Path
1.1732 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1732&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1732&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1731&r2=1.1732
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1731
retrieving revision 1.1732
diff -u -r1.1731 -r1.1732
--- ChangeLog 27 Jul 2015 16:34:48 -0000 1.1731
+++ ChangeLog 27 Jul 2015 16:35:19 -0000 1.1732
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1731 2015/07/27 16:34:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1732 2015/07/27 16:35:19 mgorny Exp $
+
+ 27 Jul 2015; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ python_wrapper_setup(): make banned helpers exit with 127.
27 Jul 2015; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Ban calling pythonN and pythonN-config when the other version of Python is
1.88 eclass/python-utils-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.87&r2=1.88
Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- python-utils-r1.eclass 27 Jul 2015 16:34:48 -0000 1.87
+++ python-utils-r1.eclass 27 Jul 2015 16:35:19 -0000 1.88
@@ -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.87 2015/07/27 16:34:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.88 2015/07/27 16:35:19 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -896,7 +896,7 @@
cat >"${workdir}"/bin/${x} <<__EOF__
#!/bin/sh
echo "${x} is not supported by ${EPYTHON}" >&2
-exit 1
+exit 127
__EOF__
chmod +x "${workdir}"/bin/${x} || die
done
^ permalink raw reply [flat|nested] 57+ messages in thread
end of thread, other threads:[~2015-07-27 16:35 UTC | newest]
Thread overview: 57+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-04 13:52 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2015-07-27 16:35 Michal Gorny (mgorny)
2015-07-27 16:34 Michal Gorny (mgorny)
2015-07-27 16:34 Michal Gorny (mgorny)
2015-07-27 16:32 Michal Gorny (mgorny)
2015-07-25 10:07 Michal Gorny (mgorny)
2015-02-21 8:07 Michal Gorny (mgorny)
2015-01-02 0:15 Michal Gorny (mgorny)
2015-01-02 0:14 Michal Gorny (mgorny)
2014-12-28 18:35 Michal Gorny (mgorny)
2014-12-28 11:24 Michal Gorny (mgorny)
2014-12-27 23:52 Michal Gorny (mgorny)
2014-12-27 23:22 Michal Gorny (mgorny)
2014-12-27 19:31 Michal Gorny (mgorny)
2014-12-27 18:26 Michal Gorny (mgorny)
2014-11-29 23:03 Michal Gorny (mgorny)
2014-11-23 16:05 Mike Gilbert (floppym)
2014-11-23 16:02 Mike Gilbert (floppym)
2014-10-18 22:36 Mike Gilbert (floppym)
2014-09-04 14:52 Michal Gorny (mgorny)
2014-07-06 11:45 Michal Gorny (mgorny)
2014-06-19 15:10 Michal Gorny (mgorny)
2014-05-16 7:54 Michal Gorny (mgorny)
2014-05-01 13:34 Justin Lecher (jlec)
2014-03-13 8:10 Michal Gorny (mgorny)
2014-03-12 9:29 Michal Gorny (mgorny)
2014-03-12 9:23 Michal Gorny (mgorny)
2014-03-12 9:06 Michal Gorny (mgorny)
2014-03-12 8:18 Patrick Lauer (patrick)
2014-02-22 17:01 Mike Gilbert (floppym)
2013-10-27 7:27 Michal Gorny (mgorny)
2013-10-09 19:08 Michal Gorny (mgorny)
2013-10-09 17:23 Michal Gorny (mgorny)
2013-09-17 19:40 Michal Gorny (mgorny)
2013-09-17 17:28 Michal Gorny (mgorny)
2013-09-17 13:25 Michal Gorny (mgorny)
2013-09-16 17:58 Michal Gorny (mgorny)
2013-09-08 14:56 Michal Gorny (mgorny)
2013-09-08 14:54 Michal Gorny (mgorny)
2013-09-05 9:59 Michal Gorny (mgorny)
2013-08-28 22:04 Michal Gorny (mgorny)
2013-07-11 7:20 Michal Gorny (mgorny)
2013-07-11 6:57 Michal Gorny (mgorny)
2013-06-07 1:11 Mike Gilbert (floppym)
2013-05-31 17:40 Michal Gorny (mgorny)
2013-04-14 0:10 Mike Gilbert (floppym)
2013-03-28 12:21 Michal Gorny (mgorny)
2013-03-07 20:58 Tim Harder (radhermit)
2013-02-04 13:53 Michal Gorny (mgorny)
2013-01-29 21:12 Michal Gorny (mgorny)
2013-01-27 16:35 Michal Gorny (mgorny)
2013-01-05 10:01 Michal Gorny (mgorny)
2012-12-30 14:17 Michal Gorny (mgorny)
2012-12-27 22:56 Michal Gorny (mgorny)
2012-12-20 6:05 Mike Gilbert (floppym)
2012-12-15 21:30 Michal Gorny (mgorny)
2012-11-26 10:16 Michal Gorny (mgorny)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox