aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-13 14:51:31 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-13 14:51:31 +0000
commite2dda7cc3775ff29475d99446047bc71c02f97f9 (patch)
treee7406169ddb273d55832273c8de5e0eb04ff17a0
parentbea787945d73807372db96147bdd1e0795b334cc (diff)
downloadpaludis-e2dda7cc3775ff29475d99446047bc71c02f97f9.tar.gz
paludis-e2dda7cc3775ff29475d99446047bc71c02f97f9.tar.xz
Handle cumulative merging at the load ebuild phase, to avoid getting h0rked vdb metadata
-rw-r--r--ebuild/depend.bash6
-rwxr-xr-xebuild/ebuild.bash6
2 files changed, 6 insertions, 6 deletions
diff --git a/ebuild/depend.bash b/ebuild/depend.bash
index 6dad07f..228e9bd 100644
--- a/ebuild/depend.bash
+++ b/ebuild/depend.bash
@@ -25,12 +25,6 @@ ebuild_f_depend()
{
local key
- IUSE="${IUSE} ${E_IUSE}"
- DEPEND="${DEPEND} ${E_DEPEND}"
- RDEPEND="${RDEPEND} ${E_RDEPEND}"
- PDEPEND="${PDEPEND} ${E_PDEPEND}"
- KEYWORDS="${KEYWORDS} ${E_KEYWORDS}"
-
for key in DEPEND RDEPEND PDEPEND IUSE SLOT SRC_URI RESTRICT LICENSE \
KEYWORDS INHERITED PROVIDE EAPI HOMEPAGE DESCRIPTION E_IUSE \
E_DEPEND E_RDEPEND E_PDEPEND E_KEYWORDS ; do
diff --git a/ebuild/ebuild.bash b/ebuild/ebuild.bash
index a23040f..cd932a6 100755
--- a/ebuild/ebuild.bash
+++ b/ebuild/ebuild.bash
@@ -126,6 +126,12 @@ ebuild_load_ebuild()
source ${1} || die "Error sourcing ebuild '${1}'"
fi
[[ ${RDEPEND-unset} == "unset" ]] && RDEPEND="${DEPEND}"
+
+ IUSE="${IUSE} ${E_IUSE}"
+ DEPEND="${DEPEND} ${E_DEPEND}"
+ RDEPEND="${RDEPEND} ${E_RDEPEND}"
+ PDEPEND="${PDEPEND} ${E_PDEPEND}"
+ KEYWORDS="${KEYWORDS} ${E_KEYWORDS}"
}
ebuild_main()