diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-30 01:03:36 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-30 01:03:36 +0000 |
| commit | 54e84fd8c5df1f8c1d2b6193e5d5e8ace0f149bb (patch) | |
| tree | 26ed32a5d7e465645143f526c59a87f8210f52c3 /eclass | |
| parent | Add ARTS_REQUIRED variable to make ebuilds declare when they _require_ arts. ... (diff) | |
| download | gentoo-2-54e84fd8c5df1f8c1d2b6193e5d5e8ace0f149bb.tar.gz gentoo-2-54e84fd8c5df1f8c1d2b6193e5d5e8ace0f149bb.tar.bz2 gentoo-2-54e84fd8c5df1f8c1d2b6193e5d5e8ace0f149bb.zip | |
Clearify error message.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde.eclass | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/eclass/kde.eclass b/eclass/kde.eclass index d0521c095daa..d771732f6495 100644 --- a/eclass/kde.eclass +++ b/eclass/kde.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.159 2006/05/30 00:59:03 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.160 2006/05/30 01:03:36 flameeyes Exp $ # # Author Dan Armak <danarmak@gentoo.org> # @@ -57,12 +57,16 @@ kde_pkg_setup() { if [[ ${PN} != "arts" ]] && [[ ${PN} != "kdelibs" ]] ; then if [ ${ARTS_REQUIRED} == 'yes' ] || use arts ; then if ! built_with_use kde-base/kdelibs arts ; then - eerror "You are trying to compile ${CATEGORY}/${P} with the \"arts\" USE flag enabled." - eerror "However, $(best_version kde-base/kdelibs) was compiled with this flag disabled." + use arts && \ + eerror "You are trying to compile ${CATEGORY}/${PF} with the \"arts\" USE flag enabled." || \ + eerror "The package ${CATEGORY}/${PF} you're trying to merge requires aRTs." + eerror "However, $(best_version kde-base/kdelibs) was compiled with arts flag disabled." eerror - eerror "You must either disable this use flag, or recompile" - eerror "$(best_version kde-base/kdelibs) with this use flag enabled." - die + use arts && \ + eerror "You must either disable this use flag, or recompile" || \ + eerror "To build this package you have to recompile" + eerror "$(best_version kde-base/kdelibs) with this arts use flag enabled." + die "kdelibs missing arts" fi fi fi |