diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-06-08 10:39:53 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-06-08 10:39:53 +0000 |
| commit | 39c065996cfb70ecf418b9f532a6e2a38bcb6744 (patch) | |
| tree | d21e1e97bd1b9b5cab3bfdf0015208b2c0061b18 /eclass | |
| parent | Version bump #135953 by Arthur Koziel. (diff) | |
| download | gentoo-2-39c065996cfb70ecf418b9f532a6e2a38bcb6744.tar.gz gentoo-2-39c065996cfb70ecf418b9f532a6e2a38bcb6744.tar.bz2 gentoo-2-39c065996cfb70ecf418b9f532a6e2a38bcb6744.zip | |
Don't add arts dependency for arts itself. Thanks to Ciaran McCreesh in bug #136022 for reporting.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/kde.eclass b/eclass/kde.eclass index 1a13e1a8c43d..ed66b5b9fc86 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.162 2006/05/31 15:58:29 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.163 2006/06/08 10:39:53 flameeyes Exp $ # # Author Dan Armak <danarmak@gentoo.org> # @@ -12,7 +12,7 @@ DESCRIPTION="Based on the $ECLASS eclass" HOMEPAGE="http://www.kde.org/" IUSE="debug xinerama" -if [[ ${ARTS_REQUIRED} != "yes" && ${ARTS_REQUIRED} != "never" ]]; then +if [[ ${ARTS_REQUIRED} != "yes" && ${ARTS_REQUIRED} != "never" && ${PN} != "arts" ]]; then IUSE="${IUSE} arts" fi @@ -45,7 +45,7 @@ RDEPEND="~kde-base/kde-env-3 if [[ ${ARTS_REQUIRED} == "yes" ]]; then DEPEND="${DEPEND} kde-base/arts" RDEPEND="${RDEPEND} kde-base/arts" -elif [[ ${ARTS_REQUIRED} != "never" ]]; then +elif [[ ${ARTS_REQUIRED} != "never" && ${PN} != "arts" ]]; then DEPEND="${DEPEND} arts? ( kde-base/arts )" RDEPEND="${RDEPEND} arts? ( kde-base/arts )" fi @@ -183,7 +183,7 @@ kde_src_compile() { fi if [[ ${ARTS_REQUIRED} == "never" ]]; then myconf="$myconf --without-arts" - elif [[ ${ARTS_REQUIRED} != 'yes' ]]; then + elif [[ ${ARTS_REQUIRED} != 'yes' && ${PN} != "arts" ]]; then # This might break some external package until # ARTS_REQUIRED="yes" is set on them, KDE 3.2 is no more # supported anyway. |