| 1 |
mpagano 13/03/05 19:52:08 |
| 2 |
|
| 3 |
Modified: ChangeLog kernel-2.eclass |
| 4 |
Log: |
| 5 |
Force python 2* for USE=deblob as deblob script does not yet support python3. Thanks to Arfrever. See bug #458032 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.716 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.716&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.716&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.715&r2=1.716 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.715 |
| 18 |
retrieving revision 1.716 |
| 19 |
diff -u -r1.715 -r1.716 |
| 20 |
--- ChangeLog 5 Mar 2013 19:06:19 -0000 1.715 |
| 21 |
+++ ChangeLog 5 Mar 2013 19:52:08 -0000 1.716 |
| 22 |
@@ -1,6 +1,10 @@ |
| 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.715 2013/03/05 19:06:19 pesa Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.716 2013/03/05 19:52:08 mpagano Exp $ |
| 27 |
+ |
| 28 |
+ 05 Mar 2013; Michael Pagano <mpagano@g.o> kernel-2.eclass: |
| 29 |
+ Force python 2* for USE=deblob as deblob script does not yet support python3. |
| 30 |
+ Thanks to Arfrever. See bug #458032 |
| 31 |
|
| 32 |
05 Mar 2013; Davide Pesavento <pesa@g.o> qt4-r2.eclass: |
| 33 |
eqmake4: override also QMAKE_LINK_C, used by packages with |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.278 eclass/kernel-2.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.278&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.278&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.277&r2=1.278 |
| 42 |
|
| 43 |
Index: kernel-2.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v |
| 46 |
retrieving revision 1.277 |
| 47 |
retrieving revision 1.278 |
| 48 |
diff -u -r1.277 -r1.278 |
| 49 |
--- kernel-2.eclass 24 Jun 2012 17:52:38 -0000 1.277 |
| 50 |
+++ kernel-2.eclass 5 Mar 2013 19:52:08 -0000 1.278 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
-# Copyright 1999-2012 Gentoo Foundation |
| 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/kernel-2.eclass,v 1.277 2012/06/24 17:52:38 mpagano Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.278 2013/03/05 19:52:08 mpagano Exp $ |
| 57 |
|
| 58 |
# Description: kernel.eclass rewrite for a clean base regarding the 2.6 |
| 59 |
# series of kernel with back-compatibility for 2.4 |
| 60 |
@@ -458,6 +458,7 @@ |
| 61 |
DEBLOB_URI="${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/${DEBLOB_A}" |
| 62 |
HOMEPAGE="${HOMEPAGE} ${DEBLOB_HOMEPAGE}" |
| 63 |
|
| 64 |
+ DEPEND+=" deblob? ( =dev-lang/python-2* )" |
| 65 |
KERNEL_URI="${KERNEL_URI} |
| 66 |
deblob? ( |
| 67 |
${DEBLOB_URI} |
| 68 |
@@ -1165,8 +1166,7 @@ |
| 69 |
|
| 70 |
if [[ $K_DEBLOB_AVAILABLE == 1 ]] && use deblob ; then |
| 71 |
echo ">>> Running deblob script ..." |
| 72 |
- sh "${T}/${DEBLOB_A}" --force || \ |
| 73 |
- die "Deblob script failed to run!!!" |
| 74 |
+ EPYTHON="python2" sh "${T}/${DEBLOB_A}" --force || die "Deblob script failed to run!!!" |
| 75 |
fi |
| 76 |
} |
Archives