1 |
commit: d41a3639f9e8adb6684d3800adf1b1b2ae40f843 |
2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 4 11:37:13 2015 +0000 |
4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 4 11:37:13 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d41a3639 |
7 |
|
8 |
Merge v2.2.21 |
9 |
|
10 |
.travis.yml | 2 - |
11 |
DEVELOPING | 10 +- |
12 |
README | 2 +- |
13 |
RELEASE-NOTES | 39 ++++ |
14 |
bin/ebuild-helpers/die | 2 +- |
15 |
bin/ebuild-helpers/dobin | 2 +- |
16 |
bin/ebuild-helpers/doconfd | 2 +- |
17 |
bin/ebuild-helpers/dodir | 2 +- |
18 |
bin/ebuild-helpers/dodoc | 2 +- |
19 |
bin/ebuild-helpers/doenvd | 2 +- |
20 |
bin/ebuild-helpers/doexe | 2 +- |
21 |
bin/ebuild-helpers/dohard | 2 +- |
22 |
bin/ebuild-helpers/doheader | 2 +- |
23 |
bin/ebuild-helpers/dohtml | 6 +- |
24 |
bin/ebuild-helpers/doinfo | 2 +- |
25 |
bin/ebuild-helpers/doinitd | 2 +- |
26 |
bin/ebuild-helpers/doins | 2 +- |
27 |
bin/ebuild-helpers/dolib | 2 +- |
28 |
bin/ebuild-helpers/doman | 2 +- |
29 |
bin/ebuild-helpers/domo | 2 +- |
30 |
bin/ebuild-helpers/dosbin | 2 +- |
31 |
bin/ebuild-helpers/dosed | 2 +- |
32 |
bin/ebuild-helpers/dosym | 2 +- |
33 |
bin/ebuild-helpers/ecompress | 2 +- |
34 |
bin/ebuild-helpers/ecompressdir | 2 +- |
35 |
bin/ebuild-helpers/elog | 2 +- |
36 |
bin/ebuild-helpers/emake | 2 +- |
37 |
bin/ebuild-helpers/fowners | 2 +- |
38 |
bin/ebuild-helpers/fperms | 2 +- |
39 |
bin/ebuild-helpers/keepdir | 2 +- |
40 |
bin/ebuild-helpers/newins | 2 +- |
41 |
bin/ebuild-helpers/portageq | 4 +- |
42 |
bin/ebuild-helpers/prepall | 2 +- |
43 |
bin/ebuild-helpers/prepalldocs | 2 +- |
44 |
bin/ebuild-helpers/prepallinfo | 2 +- |
45 |
bin/ebuild-helpers/prepallman | 2 +- |
46 |
bin/ebuild-helpers/prepallstrip | 2 +- |
47 |
bin/ebuild-helpers/prepinfo | 2 +- |
48 |
bin/ebuild-helpers/prepman | 2 +- |
49 |
bin/ebuild-helpers/prepstrip | 3 +- |
50 |
bin/ebuild-helpers/unprivileged/chown | 4 +- |
51 |
bin/ebuild-helpers/xattr/install | 2 - |
52 |
bin/ebuild-ipc | 4 +- |
53 |
bin/ebuild.sh | 3 - |
54 |
bin/egencache | 20 +++ |
55 |
bin/helper-functions.sh | 2 +- |
56 |
bin/install-qa-check.d/10executable-issues | 248 +++++++++++++------------- |
57 |
bin/install-qa-check.d/80libraries | 130 +++++++------- |
58 |
bin/isolated-functions.sh | 3 +- |
59 |
bin/misc-functions.sh | 18 +- |
60 |
bin/phase-helpers.sh | 4 +- |
61 |
bin/quickpkg | 18 +- |
62 |
bin/xattr-helper.py | 11 +- |
63 |
doc/qa.docbook | 3 +- |
64 |
man/portage.5 | 11 ++ |
65 |
man/repoman.1 | 5 +- |
66 |
pym/_emerge/AbstractEbuildProcess.py | 21 ++- |
67 |
pym/_emerge/BlockerDB.py | 5 +- |
68 |
pym/_emerge/PackageVirtualDbapi.py | 4 +- |
69 |
pym/_emerge/Scheduler.py | 10 +- |
70 |
pym/_emerge/actions.py | 7 +- |
71 |
pym/_emerge/depgraph.py | 55 ++++-- |
72 |
pym/_emerge/main.py | 19 +- |
73 |
pym/_emerge/resolver/circular_dependency.py | 21 ++- |
74 |
pym/_emerge/resolver/slot_collision.py | 11 +- |
75 |
pym/_emerge/search.py | 3 +- |
76 |
pym/portage/dbapi/IndexedPortdb.py | 4 +- |
77 |
pym/portage/dbapi/IndexedVardb.py | 6 +- |
78 |
pym/portage/dbapi/__init__.py | 4 +- |
79 |
pym/portage/dbapi/bintree.py | 4 +- |
80 |
pym/portage/dbapi/porttree.py | 6 +- |
81 |
pym/portage/dbapi/vartree.py | 22 ++- |
82 |
pym/portage/dbapi/virtual.py | 4 +- |
83 |
pym/portage/dep/__init__.py | 7 +- |
84 |
pym/portage/dep/soname/multilib_category.py | 2 +- |
85 |
pym/portage/emaint/modules/sync/sync.py | 148 +++++++++++++-- |
86 |
pym/portage/manifest.py | 35 ++++ |
87 |
pym/portage/package/ebuild/config.py | 3 +- |
88 |
pym/portage/proxy/lazyimport.py | 17 +- |
89 |
pym/portage/repository/config.py | 44 +++-- |
90 |
pym/portage/sync/__init__.py | 20 ++- |
91 |
pym/portage/sync/controller.py | 31 +++- |
92 |
pym/portage/sync/modules/cvs/__init__.py | 3 +- |
93 |
pym/portage/sync/modules/cvs/cvs.py | 2 +- |
94 |
pym/portage/sync/modules/git/__init__.py | 1 + |
95 |
pym/portage/sync/modules/git/git.py | 20 ++- |
96 |
pym/portage/sync/modules/rsync/__init__.py | 4 + |
97 |
pym/portage/sync/modules/rsync/rsync.py | 17 +- |
98 |
pym/portage/sync/modules/svn/__init__.py | 1 + |
99 |
pym/portage/sync/modules/webrsync/__init__.py | 1 + |
100 |
pym/portage/sync/syncbase.py | 2 +- |
101 |
pym/portage/tests/dep/test_match_from_list.py | 21 ++- |
102 |
pym/portage/tests/sync/test_sync_local.py | 79 +++++++- |
103 |
pym/portage/tests/util/test_xattr.py | 178 ++++++++++++++++++ |
104 |
pym/portage/util/_async/AsyncFunction.py | 67 +++++++ |
105 |
pym/portage/util/_dyn_libs/LinkageMapELF.py | 2 +- |
106 |
pym/portage/util/_xattr.py | 228 +++++++++++++++++++++++ |
107 |
pym/portage/util/movefile.py | 102 +++-------- |
108 |
runtests | 156 ++++++++++++++++ |
109 |
runtests.sh | 109 ----------- |
110 |
setup.py | 2 +- |
111 |
101 files changed, 1538 insertions(+), 588 deletions(-) |
112 |
|
113 |
diff --cc bin/misc-functions.sh |
114 |
index 5038ff1,c2ff70a..84f01c1 |
115 |
--- a/bin/misc-functions.sh |
116 |
+++ b/bin/misc-functions.sh |
117 |
@@@ -14,10 -14,9 +14,10 @@@ |
118 |
MISC_FUNCTIONS_ARGS="$@" |
119 |
shift $# |
120 |
|
121 |
- source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}/ebuild.sh" |
122 |
+ source "${PORTAGE_BIN_PATH}/ebuild.sh" || exit 1 |
123 |
|
124 |
install_symlink_html_docs() { |
125 |
+ [[ " ${FEATURES} " == *" force-prefix "* ]] || \ |
126 |
if ! ___eapi_has_prefix_variables; then |
127 |
local ED=${D} |
128 |
fi |