From: Fabian Groffen <grobian@gentoo.org>
Date: Tue, 24 Aug 2010 19:58:24 +0000 (+0200)
Subject: Merge remote branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8df04ae3a1090aed27f6c3ca837e8e608235780a;p=portage.git

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

Conflicts:
	bin/misc-functions.sh
	mkrelease.sh
---

8df04ae3a1090aed27f6c3ca837e8e608235780a
diff --cc bin/misc-functions.sh
index 11c26bf64,d8754cd3a..73da1696a
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -586,40 -542,11 +586,11 @@@ install_qa_check_misc() 
  		fi
  	fi
  
- 	f=$(find "${ED}" -name '*.py[co]' | sed "s:${D}:/:")
- 	if [[ -n ${f} ]] ; then
- 		vecho -ne '\a\n'
- 		eqawarn "QA Notice: Byte-compiled Python modules have been found. python_mod_optimize()"
- 		eqawarn "           and python_mod_cleanup() functions from python.eclass should be used"
- 		eqawarn "           to handle byte-compiled Python modules."
- 		eqawarn "${f}"
- 		vecho -ne '\a\n'
- 	fi
- 
- 	f=$(find "${D}"usr/lib*/python*/site-packages -name '*.a' 2>/dev/null | sed "s:${D}:/:")
- 	if [[ -n ${f} ]] ; then
- 		vecho -ne '\a\n'
- 		eqawarn "QA Notice: Static libraries have been found in Python site-packages"
- 		eqawarn "           directories. Build system should be modified to not generate"
- 		eqawarn "           these files and object files generated only for these files."
- 		eqawarn "${f}"
- 		vecho -ne '\a\n'
- 	fi
- 
- 	f=$(find "${D}"usr/lib*/python*/site-packages -name '*.la' 2>/dev/null | sed "s:${D}:/:")
- 	if [[ -n ${f} ]] ; then
- 		vecho -ne '\a\n'
- 		eqawarn "QA Notice: Libtool libraries have been found in Python site-packages"
- 		eqawarn "           directories. These files should not be installed."
- 		eqawarn "${f}"
- 		vecho -ne '\a\n'
- 	fi
- 
  	# Portage regenerates this on the installed system.
 -	rm -f "${D}"/usr/share/info/dir{,.gz,.bz2}
 +	rm -f "${ED}"/usr/share/info/dir{,.gz,.bz2}
  
  	if hasq multilib-strict ${FEATURES} && \
 -	   [[ -x /usr/bin/file && -x /usr/bin/find ]] && \
 +	   [[ -x ${EPREFIX}/usr/bin/file && -x ${EPREFIX}/usr/bin/find ]] && \
  	   [[ -n ${MULTILIB_STRICT_DIRS} && -n ${MULTILIB_STRICT_DENY} ]]
  	then
  		local abort=no dir file firstrun=yes