| 1 |
floppym 13/11/30 17:57:11 |
| 2 |
|
| 3 |
Modified: ChangeLog python-r1.eclass python-single-r1.eclass |
| 4 |
Log: |
| 5 |
Depend on dev-lang/python-exec:0 if _PYTHON_WANT_PYTHON_EXEC2 is 0, bug 489646. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1073 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1073&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1073&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1072&r2=1.1073 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1072 |
| 18 |
retrieving revision 1.1073 |
| 19 |
diff -u -r1.1072 -r1.1073 |
| 20 |
--- ChangeLog 25 Nov 2013 23:22:57 -0000 1.1072 |
| 21 |
+++ ChangeLog 30 Nov 2013 17:57:11 -0000 1.1073 |
| 22 |
@@ -1,6 +1,11 @@ |
| 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.1072 2013/11/25 23:22:57 mabi Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1073 2013/11/30 17:57:11 floppym Exp $ |
| 27 |
+ |
| 28 |
+ 30 Nov 2013; Mike Gilbert <floppym@g.o> python-r1.eclass, |
| 29 |
+ python-single-r1.eclass: |
| 30 |
+ Depend on dev-lang/python-exec:0 if _PYTHON_WANT_PYTHON_EXEC2 is 0, bug |
| 31 |
+ 489646. |
| 32 |
|
| 33 |
26 Nov 2013; Matti Bickel <mabi@g.o> php-pear-r1.eclass: |
| 34 |
export pkg_setup and default PHP_PEAR_CHANNEL to ${FILESDIR}/channel.xml (all |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.65 eclass/python-r1.eclass |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.65&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.65&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.64&r2=1.65 |
| 43 |
|
| 44 |
Index: python-r1.eclass |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v |
| 47 |
retrieving revision 1.64 |
| 48 |
retrieving revision 1.65 |
| 49 |
diff -u -r1.64 -r1.65 |
| 50 |
--- python-r1.eclass 30 Oct 2013 19:14:02 -0000 1.64 |
| 51 |
+++ python-r1.eclass 30 Nov 2013 17:57:11 -0000 1.65 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2013 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.64 2013/10/30 19:14:02 mgorny Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.65 2013/11/30 17:57:11 floppym Exp $ |
| 57 |
|
| 58 |
# @ECLASS: python-r1 |
| 59 |
# @MAINTAINER: |
| 60 |
@@ -205,7 +205,9 @@ |
| 61 |
# but if new targets were added, we may need to force a rebuild |
| 62 |
# 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4, |
| 63 |
# just fix :2 since := deps are not supported. |
| 64 |
- if [[ ${EAPI} != 4 ]]; then |
| 65 |
+ if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then |
| 66 |
+ PYTHON_DEPS+="dev-lang/python-exec:0[${PYTHON_USEDEP}]" |
| 67 |
+ elif [[ ${EAPI} != 4 ]]; then |
| 68 |
PYTHON_DEPS+="dev-lang/python-exec:=[${PYTHON_USEDEP}]" |
| 69 |
else |
| 70 |
PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]" |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.25 eclass/python-single-r1.eclass |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.25&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.25&content-type=text/plain |
| 78 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?r1=1.24&r2=1.25 |
| 79 |
|
| 80 |
Index: python-single-r1.eclass |
| 81 |
=================================================================== |
| 82 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v |
| 83 |
retrieving revision 1.24 |
| 84 |
retrieving revision 1.25 |
| 85 |
diff -u -r1.24 -r1.25 |
| 86 |
--- python-single-r1.eclass 30 Oct 2013 19:14:02 -0000 1.24 |
| 87 |
+++ python-single-r1.eclass 30 Nov 2013 17:57:11 -0000 1.25 |
| 88 |
@@ -1,6 +1,6 @@ |
| 89 |
# Copyright 1999-2013 Gentoo Foundation |
| 90 |
# Distributed under the terms of the GNU General Public License v2 |
| 91 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.24 2013/10/30 19:14:02 mgorny Exp $ |
| 92 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.25 2013/11/30 17:57:11 floppym Exp $ |
| 93 |
|
| 94 |
# @ECLASS: python-single-r1 |
| 95 |
# @MAINTAINER: |
| 96 |
@@ -194,7 +194,9 @@ |
| 97 |
# but if new targets were added, we may need to force a rebuild |
| 98 |
# 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4, |
| 99 |
# just fix :2 since := deps are not supported. |
| 100 |
- if [[ ${EAPI} != 4 ]]; then |
| 101 |
+ if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then |
| 102 |
+ PYTHON_DEPS+="dev-lang/python-exec:0[${PYTHON_USEDEP}]" |
| 103 |
+ elif [[ ${EAPI} != 4 ]]; then |
| 104 |
PYTHON_DEPS+="dev-lang/python-exec:=[${PYTHON_USEDEP}]" |
| 105 |
else |
| 106 |
PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]" |
Archives