diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-07 11:53:16 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-07 11:53:16 +0000 |
| commit | 4e463ffb6c4d373eeeba6dbf8c538ce1a7549729 (patch) | |
| tree | 02a0086962bf43883ecc9299519b3530a9c13a88 /eclass | |
| parent | Add ~x86-fbsd keyword. (diff) | |
| download | gentoo-2-4e463ffb6c4d373eeeba6dbf8c538ce1a7549729.tar.gz gentoo-2-4e463ffb6c4d373eeeba6dbf8c538ce1a7549729.tar.bz2 gentoo-2-4e463ffb6c4d373eeeba6dbf8c538ce1a7549729.zip | |
Don't add kdexdeltas keyword and the xdelta dependency if it's not going to be used.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde-meta.eclass | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/eclass/kde-meta.eclass b/eclass/kde-meta.eclass index 2f500a503ce4..fe6b04aacb48 100644 --- a/eclass/kde-meta.eclass +++ b/eclass/kde-meta.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-meta.eclass,v 1.70 2006/04/02 13:36:42 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v 1.71 2006/04/07 11:53:16 flameeyes Exp $ # # Author Dan Armak <danarmak@gentoo.org> # Simone Gotti <motaboy@gentoo.org> @@ -8,7 +8,6 @@ # This is the kde-meta eclass which supports broken-up kde-base packages. inherit kde multilib -IUSE="kdexdeltas" # only broken-up ebuilds can use this eclass if [[ -z "$KMNAME" ]]; then @@ -124,6 +123,12 @@ fi # Common xdelta code if [[ -n "$XDELTA_BASE" ]]; then # depends on $PV only, so is safe to modify SRC_URI inside it + IUSE="${IUSE} kdexdeltas" + + # Necessary dep for xdeltas. Hope like hell it doesn't worm its way into RDEPEND + # through the sneaky eclass dep mangling portage does. + DEPEND="$DEPEND kdexdeltas? ( dev-util/xdelta )" + SRC_URI="$SRC_URI kdexdeltas? ( $XDELTA_BASE " for x in $XDELTA_DELTA; do SRC_URI="$SRC_URI $x" @@ -135,10 +140,6 @@ fi debug-print "$ECLASS: finished, SRC_URI=$SRC_URI" -# Necessary dep for xdeltas. Hope like hell it doesn't worm its way into RDEPEND -# through the sneaky eclass dep mangling portage does. -DEPEND="$DEPEND kdexdeltas? ( dev-util/xdelta )" - # END adapted from kde-dist.eclass # Add a blocking dep on the package we're derived from |