From bfb3363e00cf8a5658f2e7f4b35d27c812abc50d Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 8 Mar 2006 08:18:09 +0000
Subject: Move PKG_INSTALL_MASK functionality (see bug #81025) from dyn_install
 to dyn_package because we don't want PKG_INSTALL_MASK to affect the install
 phase (INSTALL_MASK is in dyn_preinst).

svn path=/main/trunk/; revision=2826
---
 bin/ebuild.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 546182ee4..f7931b63f 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1001,6 +1001,7 @@ dyn_compile() {
 dyn_package() {
 	trap "abort_package" SIGINT SIGQUIT
 	cd "${PORTAGE_BUILDDIR}/image"
+	install_mask "${PORTAGE_BUILDDIR}/image" ${PKG_INSTALL_MASK}
 	tar cpvf - ./ | bzip2 -f > ../bin.tar.bz2 || die "Failed to create tarball"
 	cd ..
 	xpak build-info inf.xpak
@@ -1069,9 +1070,6 @@ dyn_install() {
 	prepall
 	cd "${D}"
 
-	# Allow user to remove unwanted files.
-	install_mask "${D}" ${PKG_INSTALL_MASK}
-
 	declare -i UNSAFE=0
 	for i in $(find "${D}/" -type f -perm -2002); do
 		((UNSAFE++))
-- 
cgit v1.2.3-1-g7c22