diff options
| author |   Carsten Lohrke <carlo@gentoo.org> | 2006-01-04 20:54:43 +0000 |
|---|---|---|
| committer | Carsten Lohrke <carlo@gentoo.org> | 2006-01-04 20:54:43 +0000 |
| commit | 958067d860275562a9ff1ea6c3b3f577fbacffd4 (patch) | |
| tree | 07aaa8cd092a38b7da6ec913ebdca27737d0d464 /eclass | |
| parent | Security fixes for infra-red and rose hardware. Hopefully the last 2.6.14 rel... (diff) | |
| download | gentoo-2-958067d860275562a9ff1ea6c3b3f577fbacffd4.tar.gz gentoo-2-958067d860275562a9ff1ea6c3b3f577fbacffd4.tar.bz2 gentoo-2-958067d860275562a9ff1ea6c3b3f577fbacffd4.zip | |
Store correct RDEPENDs with need-kde().
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde-functions.eclass | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index fe11acf974c1..cb455baa1f3b 100644 --- a/eclass/kde-functions.eclass +++ b/eclass/kde-functions.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-functions.eclass,v 1.128 2006/01/01 01:14:59 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.129 2006/01/04 20:54:43 carlo Exp $ # # Author Dan Armak <danarmak@gentoo.org> # @@ -677,6 +677,11 @@ need-kde() { ;; esac + if [ "${RDEPEND-unset}" != "unset" ] ; then + x_DEPEND="${RDEPEND}" + else + x_DEPEND="${DEPEND}" + fi if [ -n "${KDEBASE}" ]; then # If we're a kde-base package, we need at least our own version of kdelibs. # Also, split kde-base ebuilds are not updated with every KDE release, and so @@ -687,16 +692,16 @@ need-kde() { # we break packages relying on portage copying RDEPEND from DEPEND. if [ -n "${KM_DEPRANGE}" ]; then DEPEND="${DEPEND} $(deprange ${KM_DEPRANGE} kde-base/kdelibs)" - [ "${RDEPEND-unset}" != "unset" ] && RDEPEND="${RDEPEND} $(deprange ${KM_DEPRANGE} kde-base/kdelibs)" + RDEPEND="${x_DEPEND} $(deprange ${KM_DEPRANGE} kde-base/kdelibs)" else DEPEND="${DEPEND} ~kde-base/kdelibs-$PV" - [ "${RDEPEND-unset}" != "unset" ] && RDEPEND="${RDEPEND} ~kde-base/kdelibs-${PV}" + RDEPEND="${x_DEPEND} ~kde-base/kdelibs-${PV}" fi else # Things outside kde-base only need a minimum version min-kde-ver ${KDEVER} DEPEND="${DEPEND} >=kde-base/kdelibs-${selected_version}" - [ "${RDEPEND-unset}" != "unset" ] && RDEPEND="${RDEPEND} >=kde-base/kdelibs-${selected_version}" + RDEPEND="${x_DEPEND} >=kde-base/kdelibs-${selected_version}" fi qtver-from-kdever ${KDEVER} |