| 1 |
zlin 08/01/26 23:21:04 |
| 2 |
|
| 3 |
Modified: kde.eclass |
| 4 |
Log: |
| 5 |
Don't call use arts unless arts is in IUSE when built_with_use check fails. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.203 eclass/kde.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?rev=1.203&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?rev=1.203&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?r1=1.202&r2=1.203 |
| 13 |
|
| 14 |
Index: kde.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v |
| 17 |
retrieving revision 1.202 |
| 18 |
retrieving revision 1.203 |
| 19 |
diff -u -r1.202 -r1.203 |
| 20 |
--- kde.eclass 2 Jan 2008 15:55:55 -0000 1.202 |
| 21 |
+++ kde.eclass 26 Jan 2008 23:21:03 -0000 1.203 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2004 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.202 2008/01/02 15:55:55 keytoaster Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.203 2008/01/26 23:21:03 zlin Exp $ |
| 27 |
# |
| 28 |
# Author Dan Armak <danarmak@g.o> |
| 29 |
# |
| 30 |
@@ -56,14 +56,18 @@ |
| 31 |
if [[ ${ARTS_REQUIRED} == 'yes' ]] || \ |
| 32 |
( [[ ${ARTS_REQUIRED} != "never" ]] && use arts ) ; then |
| 33 |
if ! built_with_use =kde-base/kdelibs-3.5* arts ; then |
| 34 |
- use arts && \ |
| 35 |
- eerror "You are trying to compile ${CATEGORY}/${PF} with the \"arts\" USE flag enabled." || \ |
| 36 |
+ if has arts ${IUSE} && use arts; then |
| 37 |
+ eerror "You are trying to compile ${CATEGORY}/${PF} with the \"arts\" USE flag enabled." |
| 38 |
+ else |
| 39 |
eerror "The package ${CATEGORY}/${PF} you're trying to merge requires aRTs." |
| 40 |
+ fi |
| 41 |
eerror "However, $(best_version =kde-base/kdelibs-3.5*) was compiled with the arts USE flag disabled." |
| 42 |
eerror |
| 43 |
- use arts && \ |
| 44 |
- eerror "You must either disable this USE flag, or recompile" || \ |
| 45 |
+ if has arts ${IUSE} && use arts; then |
| 46 |
+ eerror "You must either disable this USE flag, or recompile" |
| 47 |
+ else |
| 48 |
eerror "To build this package you have to recompile" |
| 49 |
+ fi |
| 50 |
eerror "$(best_version =kde-base/kdelibs-3.5*) with the arts USE flag enabled." |
| 51 |
die "kdelibs missing arts" |
| 52 |
fi |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
-- |
| 57 |
gentoo-commits@l.g.o mailing list |
Archives