From: Fabian Groffen <grobian@gentoo.org>
Date: Fri, 23 Sep 2011 18:06:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0f77e9560148a3671e03e180af32c22a2636e09c;p=portage.git

Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
---

0f77e9560148a3671e03e180af32c22a2636e09c
diff --cc bin/misc-functions.sh
index c51652042,a54ce2b79..cf72deef9
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
diff --cc pym/portage/package/ebuild/doebuild.py
index 113302727,9939e9cc2..62750e6aa
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@@ -1433,10 -1393,10 +1433,11 @@@ _post_phase_cmds = 
  
  	"install" : [
  		"install_qa_check",
- 		"install_symlink_html_docs"],
+ 		"install_symlink_html_docs",
+ 		"install_hooks"],
  
  	"preinst" : [
 +		"preinst_aix",
  		"preinst_sfperms",
  		"preinst_selinux_labels",
  		"preinst_suid_scan",