diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-12-03 19:55:18 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-12-03 22:32:42 -0800 |
| commit | 39bb54aee7123a2087657c296d10a80c78beebfc (patch) | |
| tree | 5e4f47d4a86c562015d627499b8a7e63987cda5e /bin | |
| parent | d5ab3d0413bb401245738ae27a4bd4658b6527db (diff) | |
| download | portage-39bb54aee7123a2087657c296d10a80c78beebfc.tar.gz portage-39bb54aee7123a2087657c296d10a80c78beebfc.tar.bz2 portage-39bb54aee7123a2087657c296d10a80c78beebfc.zip | |
EAPI 4: Support MERGE_TYPE (bug #347351)
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild.sh | 3 |
1 files changed, 2 insertions, 1 deletions
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 \ |