summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2006-01-13 18:47:52 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2006-01-13 18:47:52 +0000
commitd31cd2cf73d3f11348abff902ab997674233ff79 (patch)
tree9b860afbc1ac2856fce4cdabe4fff9bb803c915b /eclass
parentmarking stable sparc x86 (diff)
downloadhistorical-d31cd2cf73d3f11348abff902ab997674233ff79.tar.gz
historical-d31cd2cf73d3f11348abff902ab997674233ff79.tar.bz2
historical-d31cd2cf73d3f11348abff902ab997674233ff79.zip
util-macros shouldn't DEPEND on itself. Makes it a tad difficult to install with a correct dep resolver. Reported by ciaranm.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/x-modular.eclass10
1 files changed, 7 insertions, 3 deletions
diff --git a/eclass/x-modular.eclass b/eclass/x-modular.eclass
index 2a47bf323790..6b16fb6993f9 100644
--- a/eclass/x-modular.eclass
+++ b/eclass/x-modular.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.38 2006/01/05 07:24:03 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.39 2006/01/13 18:47:52 spyderous Exp $
#
# Author: Donnie Berkholz <spyderous@gentoo.org>
#
@@ -109,8 +109,12 @@ if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]];
fi
DEPEND="${DEPEND}
- >=dev-util/pkgconfig-0.18
- >=x11-misc/util-macros-0.99.2"
+ >=dev-util/pkgconfig-0.18"
+
+if [[ "${PN/util-macros}" != "${PN}" ]]; then
+ DEPEND="${DEPEND}
+ >=x11-misc/util-macros-0.99.2"
+fi
# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
RDEPEND="${RDEPEND}