diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-10-30 19:14:02 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-10-30 19:14:02 +0000 |
| commit | d9901f6dc33f1f6792b9bae290c4ec8183453547 (patch) | |
| tree | 941156cee79d1409700b4127135986f4d1ba7ac3 /eclass | |
| parent | Replace dev-python/python-exec with virtual compatibility ebuilds. (diff) | |
| download | gentoo-2-d9901f6dc33f1f6792b9bae290c4ec8183453547.tar.gz gentoo-2-d9901f6dc33f1f6792b9bae290c4ec8183453547.tar.bz2 gentoo-2-d9901f6dc33f1f6792b9bae290c4ec8183453547.zip | |
Switch the eclasses to use dev-lang/python-exec.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/python-r1.eclass | 10 | ||||
| -rw-r--r-- | eclass/python-single-r1.eclass | 8 | ||||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 4 |
4 files changed, 16 insertions, 12 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index d5117209109e..e0d317976f13 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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.1039 2013/10/27 13:44:35 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1040 2013/10/30 19:14:02 mgorny Exp $ + + 30 Oct 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass, + python-single-r1.eclass, python-utils-r1.eclass: + Switch the eclasses to use dev-lang/python-exec. 27 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass: Create a fake ".git" directory inside the checkout to satisfy git rev-parse diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index 41bf7f9d4f8c..7d9f3b5c4dd0 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -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-r1.eclass,v 1.63 2013/10/22 15:16:56 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.64 2013/10/30 19:14:02 mgorny Exp $ # @ECLASS: python-r1 # @MAINTAINER: @@ -122,7 +122,7 @@ fi # # Example value: # @CODE -# dev-python/python-exec:= +# dev-lang/python-exec:= # python_targets_python2_6? ( dev-lang/python:2.6[gdbm] ) # python_targets_python2_7? ( dev-lang/python:2.7[gdbm] ) # @CODE @@ -206,9 +206,9 @@ _python_set_globals() { # 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4, # just fix :2 since := deps are not supported. if [[ ${EAPI} != 4 ]]; then - PYTHON_DEPS+="dev-python/python-exec:=[${PYTHON_USEDEP}]" + PYTHON_DEPS+="dev-lang/python-exec:=[${PYTHON_USEDEP}]" else - PYTHON_DEPS+="dev-python/python-exec:2[${PYTHON_USEDEP}]" + PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]" fi } _python_set_globals @@ -418,7 +418,7 @@ _python_check_USE_PYTHON() { _PYTHON_USE_PYTHON_CHECKED=1 # python-exec has profile-forced flags. - if [[ ${CATEGORY}/${PN} == dev-python/python-exec ]]; then + if [[ ${CATEGORY}/${PN} == dev-lang/python-exec ]]; then return fi diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index 435f6c6eb535..113ccd8a8e2d 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-r1.eclass @@ -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-single-r1.eclass,v 1.23 2013/10/22 15:16:56 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.24 2013/10/30 19:14:02 mgorny Exp $ # @ECLASS: python-single-r1 # @MAINTAINER: @@ -109,7 +109,7 @@ fi # # Example value: # @CODE -# dev-python/python-exec:0 +# dev-lang/python-exec:= # python_single_target_python2_6? ( dev-lang/python:2.6[gdbm] ) # python_single_target_python2_7? ( dev-lang/python:2.7[gdbm] ) # @CODE @@ -195,9 +195,9 @@ _python_single_set_globals() { # 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4, # just fix :2 since := deps are not supported. if [[ ${EAPI} != 4 ]]; then - PYTHON_DEPS+="dev-python/python-exec:=[${PYTHON_USEDEP}]" + PYTHON_DEPS+="dev-lang/python-exec:=[${PYTHON_USEDEP}]" else - PYTHON_DEPS+="dev-python/python-exec:2[${PYTHON_USEDEP}]" + PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]" fi } _python_single_set_globals diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 7387f94b06d2..49caff618c10 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -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.44 2013/10/27 07:27:52 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.45 2013/10/30 19:14:02 mgorny Exp $ # @ECLASS: python-utils-r1 # @MAINTAINER: @@ -981,7 +981,7 @@ _python_want_python_exec2() { # Check if we cached the result, or someone put an override. if [[ ! ${_PYTHON_WANT_PYTHON_EXEC2+1} ]]; then - has_version 'dev-python/python-exec:2' + has_version 'dev-lang/python-exec:2' _PYTHON_WANT_PYTHON_EXEC2=$(( ! ${?} )) fi |