| 1 |
mgorny 12/10/29 09:51:28 |
| 2 |
|
| 3 |
Modified: distutils-r1.eclass python-r1.eclass ChangeLog |
| 4 |
Log: |
| 5 |
Move python-exec dependency to python-r1. That eclass now provides means to create versioned scripts as well. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.11 eclass/distutils-r1.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.11&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.11&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.10&r2=1.11 |
| 13 |
|
| 14 |
Index: distutils-r1.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v |
| 17 |
retrieving revision 1.10 |
| 18 |
retrieving revision 1.11 |
| 19 |
diff -u -r1.10 -r1.11 |
| 20 |
--- distutils-r1.eclass 29 Oct 2012 09:49:54 -0000 1.10 |
| 21 |
+++ distutils-r1.eclass 29 Oct 2012 09:51:27 -0000 1.11 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2012 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.10 2012/10/29 09:49:54 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.11 2012/10/29 09:51:27 mgorny Exp $ |
| 27 |
|
| 28 |
# @ECLASS: distutils-r1 |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -56,8 +56,7 @@ |
| 31 |
|
| 32 |
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install |
| 33 |
|
| 34 |
-RDEPEND="${PYTHON_DEPS} |
| 35 |
- dev-python/python-exec" |
| 36 |
+RDEPEND=${PYTHON_DEPS} |
| 37 |
DEPEND=${PYTHON_DEPS} |
| 38 |
|
| 39 |
# @ECLASS-VARIABLE: PATCHES |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.12 eclass/python-r1.eclass |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.12&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.12&content-type=text/plain |
| 47 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.11&r2=1.12 |
| 48 |
|
| 49 |
Index: python-r1.eclass |
| 50 |
=================================================================== |
| 51 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v |
| 52 |
retrieving revision 1.11 |
| 53 |
retrieving revision 1.12 |
| 54 |
diff -u -r1.11 -r1.12 |
| 55 |
--- python-r1.eclass 29 Oct 2012 09:46:03 -0000 1.11 |
| 56 |
+++ python-r1.eclass 29 Oct 2012 09:51:27 -0000 1.12 |
| 57 |
@@ -1,6 +1,6 @@ |
| 58 |
# Copyright 1999-2012 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.11 2012/10/29 09:46:03 mgorny Exp $ |
| 61 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.12 2012/10/29 09:51:27 mgorny Exp $ |
| 62 |
|
| 63 |
# @ECLASS: python-r1 |
| 64 |
# @MAINTAINER: |
| 65 |
@@ -137,7 +137,14 @@ |
| 66 |
REQUIRED_USE="|| ( ${flags[*]} )" |
| 67 |
PYTHON_USEDEP=${optflags// /,} |
| 68 |
|
| 69 |
- PYTHON_DEPS= |
| 70 |
+ local usestr |
| 71 |
+ [[ ${PYTHON_REQ_USE} ]] && usestr="[${PYTHON_REQ_USE}]" |
| 72 |
+ |
| 73 |
+ # 1) well, python-exec would suffice as an RDEP |
| 74 |
+ # but no point in making this overcomplex, BDEP doesn't hurt anyone |
| 75 |
+ # 2) python-exec should be built with all targets forced anyway |
| 76 |
+ # but if new targets were added, we may need to force a rebuild |
| 77 |
+ PYTHON_DEPS="dev-python/python-exec[${PYTHON_USEDEP}]" |
| 78 |
local i |
| 79 |
for i in "${PYTHON_COMPAT[@]}"; do |
| 80 |
local d |
| 81 |
@@ -153,10 +160,7 @@ |
| 82 |
esac |
| 83 |
|
| 84 |
local v=${i##*[a-z]} |
| 85 |
- local usestr |
| 86 |
- [[ ${PYTHON_REQ_USE} ]] && usestr="[${PYTHON_REQ_USE}]" |
| 87 |
- PYTHON_DEPS+=" python_targets_${i}? ( |
| 88 |
- ${d}:${v/_/.}${usestr} )" |
| 89 |
+ PYTHON_DEPS+=" python_targets_${i}? ( ${d}:${v/_/.}${usestr} )" |
| 90 |
done |
| 91 |
} |
| 92 |
_python_set_globals |
| 93 |
|
| 94 |
|
| 95 |
|
| 96 |
1.480 eclass/ChangeLog |
| 97 |
|
| 98 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.480&view=markup |
| 99 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.480&content-type=text/plain |
| 100 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.479&r2=1.480 |
| 101 |
|
| 102 |
Index: ChangeLog |
| 103 |
=================================================================== |
| 104 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 105 |
retrieving revision 1.479 |
| 106 |
retrieving revision 1.480 |
| 107 |
diff -u -r1.479 -r1.480 |
| 108 |
--- ChangeLog 29 Oct 2012 09:49:54 -0000 1.479 |
| 109 |
+++ ChangeLog 29 Oct 2012 09:51:27 -0000 1.480 |
| 110 |
@@ -1,6 +1,11 @@ |
| 111 |
# ChangeLog for eclass directory |
| 112 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 113 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.479 2012/10/29 09:49:54 mgorny Exp $ |
| 114 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.480 2012/10/29 09:51:27 mgorny Exp $ |
| 115 |
+ |
| 116 |
+ 29 Oct 2012; Michał Górny <mgorny@g.o> distutils-r1.eclass, |
| 117 |
+ python-r1.eclass: |
| 118 |
+ Move python-exec dependency to python-r1. That eclass now provides means to |
| 119 |
+ create versioned scripts as well. |
| 120 |
|
| 121 |
29 Oct 2012; Michał Górny <mgorny@g.o> distutils-r1.eclass: |
| 122 |
Use find instead of hard-coded executable locations list when linking the |
Archives