From 8553b7bcb4b0bef2973774c22cc2fa84682c464b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 3 Dec 2010 19:55:18 -0800 Subject: EAPI 4: Support MERGE_TYPE (bug #347351) --- bin/ebuild.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bin/ebuild.sh') diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 04330262e..491301f7a 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1678,7 +1678,8 @@ PORTAGE_READONLY_METADATA="DEFINED_PHASES DEPEND DESCRIPTION PDEPEND PROVIDE RDEPEND RESTRICT SLOT SRC_URI" PORTAGE_READONLY_VARS="D EBUILD EBUILD_PHASE \ - EBUILD_SH_ARGS ECLASSDIR EMERGE_FROM FILESDIR PM_EBUILD_HOOK_DIR \ + EBUILD_SH_ARGS ECLASSDIR EMERGE_FROM FILESDIR MERGE_TYPE \ + PM_EBUILD_HOOK_DIR \ PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST PORTAGE_BASHRC \ PORTAGE_BINPKG_FILE PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE \ PORTAGE_BIN_PATH PORTAGE_BUILDDIR PORTAGE_BUNZIP2_COMMAND \ -- cgit v1.2.3-1-g7c22