diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2014-01-18 14:53:07 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2014-01-18 14:53:07 +0000 |
| commit | d7dce8efa6cb7cbd3607e1b2dc91f4520debcfc8 (patch) | |
| tree | 8579f8f1d4bf880be010d3e8d2247ed4c5f3118b /eclass | |
| parent | Keyword ~ppc for bug #488674 (diff) | |
| download | gentoo-2-d7dce8efa6cb7cbd3607e1b2dc91f4520debcfc8.tar.gz gentoo-2-d7dce8efa6cb7cbd3607e1b2dc91f4520debcfc8.tar.bz2 gentoo-2-d7dce8efa6cb7cbd3607e1b2dc91f4520debcfc8.zip | |
Convert to python-any-r1.eclass
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/kernel-2.eclass | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index d6aadc16447d..81707b31384d 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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.1123 2014/01/18 00:43:03 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1124 2014/01/18 14:53:07 floppym Exp $ + + 18 Jan 2014; Mike Gilbert <floppym@gentoo.org> kernel-2.eclass: + Convert to python-any-r1.eclass 18 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> kde4-base.eclass: Sync from kde overlay, adds subslot diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index cca5ddb555be..83f84ef0da37 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -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/kernel-2.eclass,v 1.293 2014/01/17 19:05:05 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.294 2014/01/18 14:53:07 floppym Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -80,7 +80,9 @@ # If you do change them, there is a chance that we will not fix resulting bugs; # that of course does not mean we're not willing to help. -inherit eutils toolchain-funcs versionator multilib python +PYTHON_COMPAT=( python{2_6,2_7} ) + +inherit eutils toolchain-funcs versionator multilib python-any-r1 EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm # Added by Daniel Ostrow <dostrow@gentoo.org> @@ -461,11 +463,14 @@ if [[ ${ETYPE} == sources ]]; then kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \ K_DEBLOB_AVAILABLE=1 if [[ ${K_DEBLOB_AVAILABLE} == "1" ]] ; then - IUSE="${IUSE} deblob python" + IUSE="${IUSE} deblob" + # Reflect that kernels contain firmware blobs unless otherwise # stripped LICENSE="${LICENSE} !deblob? ( freedist )" + DEPEND+=" deblob? ( ${PYTHON_DEPS} )" + if [[ -n KV_MINOR ]]; then DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" else @@ -488,10 +493,6 @@ if [[ ${ETYPE} == sources ]]; then DEBLOB_URI="${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/${DEBLOB_A}" HOMEPAGE="${HOMEPAGE} ${DEBLOB_HOMEPAGE}" - #deblob script currently only works with python-2 - PYTHON_DEPEND="python? 2" - PYTHON_USE_WITH_OPT="python" - KERNEL_URI="${KERNEL_URI} deblob? ( ${DEBLOB_URI} @@ -1228,6 +1229,7 @@ kernel-2_src_compile() { if [[ $K_DEBLOB_AVAILABLE == 1 ]] && use deblob ; then echo ">>> Running deblob script ..." + python_setup sh "${T}/${DEBLOB_A}" --force || die "Deblob script failed to run!!!" fi } |