| 1 |
mgorny 13/07/27 11:16:48 |
| 2 |
|
| 3 |
Modified: ChangeLog python-any-r1.eclass |
| 4 |
Log: |
| 5 |
Use PYTHON_PKG_DEP for generating deps. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.897 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.897&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.897&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.896&r2=1.897 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.896 |
| 18 |
retrieving revision 1.897 |
| 19 |
diff -u -r1.896 -r1.897 |
| 20 |
--- ChangeLog 27 Jul 2013 10:36:55 -0000 1.896 |
| 21 |
+++ ChangeLog 27 Jul 2013 11:16:48 -0000 1.897 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.896 2013/07/27 10:36:55 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.897 2013/07/27 11:16:48 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 27 Jul 2013; Michał Górny <mgorny@g.o> python-any-r1.eclass: |
| 29 |
+ Use PYTHON_PKG_DEP for generating deps. |
| 30 |
|
| 31 |
27 Jul 2013; Michał Górny <mgorny@g.o> systemd.eclass: |
| 32 |
Introduce systemd_is_booted() to allow ebuilds to warn consistently for |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.12 eclass/python-any-r1.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-any-r1.eclass?rev=1.12&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-any-r1.eclass?rev=1.12&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-any-r1.eclass?r1=1.11&r2=1.12 |
| 41 |
|
| 42 |
Index: python-any-r1.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v |
| 45 |
retrieving revision 1.11 |
| 46 |
retrieving revision 1.12 |
| 47 |
diff -u -r1.11 -r1.12 |
| 48 |
--- python-any-r1.eclass 10 May 2013 22:03:30 -0000 1.11 |
| 49 |
+++ python-any-r1.eclass 27 Jul 2013 11:16:48 -0000 1.12 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2013 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v 1.11 2013/05/10 22:03:30 mgorny Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v 1.12 2013/07/27 11:16:48 mgorny Exp $ |
| 55 |
|
| 56 |
# @ECLASS: python-any-r1 |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -118,25 +118,13 @@ |
| 59 |
[[ ${PYTHON_REQ_USE} ]] && usestr="[${PYTHON_REQ_USE}]" |
| 60 |
|
| 61 |
PYTHON_DEPS= |
| 62 |
- local i |
| 63 |
+ local i PYTHON_PKG_DEP |
| 64 |
for i in "${_PYTHON_ALL_IMPLS[@]}"; do |
| 65 |
- if has "${i}" "${PYTHON_COMPAT[@]}" |
| 66 |
- then |
| 67 |
- local d |
| 68 |
- case ${i} in |
| 69 |
- python*) |
| 70 |
- d='dev-lang/python';; |
| 71 |
- jython*) |
| 72 |
- d='dev-java/jython';; |
| 73 |
- pypy*) |
| 74 |
- d='dev-python/pypy';; |
| 75 |
- *) |
| 76 |
- die "Invalid implementation: ${i}" |
| 77 |
- esac |
| 78 |
+ has "${i}" "${PYTHON_COMPAT[@]}" || continue |
| 79 |
|
| 80 |
- local v=${i##*[a-z]} |
| 81 |
- PYTHON_DEPS="${d}:${v/_/.}${usestr} ${PYTHON_DEPS}" |
| 82 |
- fi |
| 83 |
+ python_export "${i}" PYTHON_PKG_DEP |
| 84 |
+ |
| 85 |
+ PYTHON_DEPS="${PYTHON_PKG_DEP} ${PYTHON_DEPS}" |
| 86 |
done |
| 87 |
PYTHON_DEPS="|| ( ${PYTHON_DEPS})" |
| 88 |
} |
Archives