From: "Michal Gorny (mgorny)" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-r1.eclass
Date: Sat, 19 Apr 2014 10:29:06 +0000 (UTC) [thread overview]
Message-ID: <20140419102906.86E9C2004B@flycatcher.gentoo.org> (raw)
mgorny 14/04/19 10:29:06
Modified: ChangeLog python-r1.eclass
Log:
Support substituting ${PYTHON_USEDEP} in python_gen_cond_dep().
Revision Changes Path
1.1213 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1213&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1213&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1212&r2=1.1213
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1212
retrieving revision 1.1213
diff -u -r1.1212 -r1.1213
--- ChangeLog 17 Apr 2014 20:28:37 -0000 1.1212
+++ ChangeLog 19 Apr 2014 10:29:06 -0000 1.1213
@@ -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.1212 2014/04/17 20:28:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1213 2014/04/19 10:29:06 mgorny Exp $
+
+ 19 Apr 2014; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
+ Support substituting ${PYTHON_USEDEP} in python_gen_cond_dep().
17 Apr 2014; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Automatically switch to EGIT_CLONE_TYPE=single+tags for Google Code.
1.72 eclass/python-r1.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.71&r2=1.72
Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- python-r1.eclass 9 Apr 2014 21:34:10 -0000 1.71
+++ python-r1.eclass 19 Apr 2014 10:29:06 -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-r1.eclass,v 1.71 2014/04/09 21:34:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.72 2014/04/19 10:29:06 mgorny Exp $
# @ECLASS: python-r1
# @MAINTAINER:
@@ -340,20 +340,24 @@
# of Python implementations which are both in PYTHON_COMPAT and match
# any of the patterns passed as the remaining parameters.
#
-# Please note that USE constraints on the package need to be enforced
-# separately. Therefore, the dependency usually needs to use
-# python_gen_usedep as well.
+# In order to enforce USE constraints on the packages, verbatim
+# '${PYTHON_USEDEP}' (quoted!) may be placed in the dependency
+# specification. It will get expanded within the function into a proper
+# USE dependency string.
#
# Example:
# @CODE
# PYTHON_COMPAT=( python{2_5,2_6,2_7} )
-# RDEPEND="$(python_gen_cond_dep dev-python/unittest2 python{2_5,2_6})"
+# RDEPEND="$(python_gen_cond_dep \
+# 'dev-python/unittest2[${PYTHON_USEDEP}]' python{2_5,2_6})"
# @CODE
#
# It will cause the variable to look like:
# @CODE
-# RDEPEND="python_targets_python2_5? ( dev-python/unittest2 )
-# python_targets_python2_6? ( dev-python/unittest2 )"
+# RDEPEND="python_targets_python2_5? (
+# dev-python/unittest2[python_targets_python2_5?] )
+# python_targets_python2_6? (
+# dev-python/unittest2[python_targets_python2_6?] )"
# @CODE
python_gen_cond_dep() {
debug-print-function ${FUNCNAME} "${@}"
@@ -364,6 +368,12 @@
local dep=${1}
shift
+ # substitute ${PYTHON_USEDEP} if used
+ if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then
+ local PYTHON_USEDEP=$(python_gen_usedep "${@}")
+ dep=${dep//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
+ fi
+
for impl in "${PYTHON_COMPAT[@]}"; do
_python_impl_supported "${impl}" || continue
next reply other threads:[~2014-04-19 10:29 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-19 10:29 Michal Gorny (mgorny) [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-07-27 16:31 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-r1.eclass Mike Gilbert (floppym)
2015-07-04 15:22 Manuel Rueger (mrueg)
2015-01-13 21:35 Michal Gorny (mgorny)
2015-01-13 21:34 Michal Gorny (mgorny)
2014-12-28 22:45 Michal Gorny (mgorny)
2014-11-22 2:38 Sebastian Pipping (sping)
2014-08-18 8:56 Michal Gorny (mgorny)
2014-07-06 14:41 Michal Gorny (mgorny)
2014-04-09 21:34 Michal Gorny (mgorny)
2014-04-09 21:20 Michal Gorny (mgorny)
2014-04-09 21:15 Michal Gorny (mgorny)
2014-04-05 20:56 Michal Gorny (mgorny)
2013-12-29 18:19 Michal Gorny (mgorny)
2013-08-27 18:47 Michal Gorny (mgorny)
2013-08-04 8:24 Michal Gorny (mgorny)
2013-03-30 12:56 Mike Gilbert (floppym)
2013-03-20 19:01 Michal Gorny (mgorny)
2013-03-20 19:00 Michal Gorny (mgorny)
2013-03-09 13:52 Michal Gorny (mgorny)
2013-03-09 13:51 Michal Gorny (mgorny)
2013-03-04 19:27 Michal Gorny (mgorny)
2013-02-26 14:35 Michal Gorny (mgorny)
2013-02-26 14:32 Michal Gorny (mgorny)
2013-01-27 16:40 Michal Gorny (mgorny)
2013-01-27 16:36 Michal Gorny (mgorny)
2013-01-04 1:26 Mike Gilbert (floppym)
2012-12-31 13:10 Michal Gorny (mgorny)
2012-12-27 22:56 Michal Gorny (mgorny)
2012-12-19 9:22 Michal Gorny (mgorny)
2012-12-14 8:41 Michal Gorny (mgorny)
2012-11-21 9:04 Michal Gorny (mgorny)
2012-11-21 9:01 Michal Gorny (mgorny)
2012-11-04 15:16 Michal Gorny (mgorny)
2012-11-01 21:43 Michal Gorny (mgorny)
2012-10-29 11:27 Michal Gorny (mgorny)
2012-10-29 9:25 Michal Gorny (mgorny)
2012-10-29 9:22 Michal Gorny (mgorny)
2012-10-27 1:14 Mike Gilbert (floppym)
2012-10-25 16:47 Michal Gorny (mgorny)
2012-10-14 10:51 Michal Gorny (mgorny)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140419102906.86E9C2004B@flycatcher.gentoo.org \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox