| 1 |
commit: e3d837d79df8136334699020a16b1c39baa255b7 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 11 20:38:14 2012 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 11 20:38:14 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e3d837d7 |
| 7 |
|
| 8 |
Merge commit 'v2.2.0_alpha103' into multilib |
| 9 |
|
| 10 |
|
| 11 |
bin/ebuild.sh | 32 ++++---- |
| 12 |
bin/isolated-functions.sh | 8 +- |
| 13 |
bin/misc-functions.sh | 67 +++++++--------- |
| 14 |
bin/repoman | 21 ++--- |
| 15 |
cnf/make.globals | 7 +- |
| 16 |
doc/package/ebuild/eapi/4-python.docbook | 6 ++ |
| 17 |
man/make.conf.5 | 14 ++-- |
| 18 |
man/repoman.1 | 4 +- |
| 19 |
pym/_emerge/EbuildMetadataPhase.py | 83 +++++++++++++------ |
| 20 |
pym/_emerge/actions.py | 8 +-- |
| 21 |
pym/_emerge/depgraph.py | 15 +++- |
| 22 |
pym/portage/__init__.py | 34 ++++----- |
| 23 |
pym/portage/dbapi/bintree.py | 7 +- |
| 24 |
pym/portage/dbapi/porttree.py | 44 +++------- |
| 25 |
pym/portage/dbapi/vartree.py | 22 +++--- |
| 26 |
pym/portage/dispatch_conf.py | 10 ++- |
| 27 |
pym/portage/glsa.py | 10 +-- |
| 28 |
.../package/ebuild/_config/LocationsManager.py | 1 + |
| 29 |
.../package/ebuild/_config/special_env_vars.py | 5 +- |
| 30 |
pym/portage/package/ebuild/_eapi_invalid.py | 46 +++++++++++ |
| 31 |
pym/portage/package/ebuild/config.py | 3 - |
| 32 |
pym/portage/package/ebuild/doebuild.py | 76 +++++++----------- |
| 33 |
pym/portage/util/__init__.py | 21 +++++- |
| 34 |
pym/portage/util/_desktop_entry.py | 75 ++++++++++++++++++ |
| 35 |
pym/repoman/checks.py | 15 ++-- |
| 36 |
25 files changed, 386 insertions(+), 248 deletions(-) |
| 37 |
|
| 38 |
diff --cc bin/misc-functions.sh |
| 39 |
index ec72a0c,564af85..14684fd |
| 40 |
--- a/bin/misc-functions.sh |
| 41 |
+++ b/bin/misc-functions.sh |
| 42 |
@@@ -151,9 -150,8 +151,9 @@@ prepcompress() |
| 43 |
install_qa_check() { |
| 44 |
local f i qa_var x |
| 45 |
[[ " ${FEATURES} " == *" force-prefix "* ]] || \ |
| 46 |
- case "$EAPI" in 0|1|2) local ED=${D} ;; esac |
| 47 |
+ case "$EAPI" in 0|1|2) local EPREFIX= ED=${D} ;; esac |
| 48 |
|
| 49 |
+ [[ -d "${ED}" ]] || return 0 |
| 50 |
cd "${ED}" || die "cd failed" |
| 51 |
|
| 52 |
# Merge QA_FLAGS_IGNORED and QA_DT_HASH into a single array, since |
Archives