| 1 |
commit: 60c36c144d304311433dcd19662cc2cc2181c2a7 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 4 11:35:08 2015 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 4 11:35:08 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=60c36c14 |
| 7 |
|
| 8 |
Merge v2.2.19 |
| 9 |
|
| 10 |
NEWS | 9 + |
| 11 |
RELEASE-NOTES | 50 +- |
| 12 |
bin/dispatch-conf | 9 +- |
| 13 |
bin/ebuild-helpers/bsd/sed | 4 +- |
| 14 |
bin/ebuild-helpers/emake | 28 +- |
| 15 |
bin/ebuild-helpers/portageq | 4 +- |
| 16 |
bin/ebuild-helpers/unprivileged/chown | 4 +- |
| 17 |
bin/ebuild-helpers/xattr/install | 14 +- |
| 18 |
bin/ebuild.sh | 10 +- |
| 19 |
bin/emerge-webrsync | 4 +- |
| 20 |
bin/install-qa-check.d/10executable-issues | 12 +- |
| 21 |
bin/install-qa-check.d/90gcc-warnings | 2 +- |
| 22 |
bin/misc-functions.sh | 15 +- |
| 23 |
bin/phase-functions.sh | 12 +- |
| 24 |
bin/phase-helpers.sh | 2 +- |
| 25 |
bin/portageq | 18 +- |
| 26 |
bin/quickpkg | 1 - |
| 27 |
bin/repoman | 58 +- |
| 28 |
cnf/dispatch-conf.conf | 2 +- |
| 29 |
cnf/make.globals | 6 +- |
| 30 |
cnf/repos.conf | 4 + |
| 31 |
man/ebuild.5 | 22 +- |
| 32 |
man/make.conf.5 | 31 + |
| 33 |
man/portage.5 | 8 +- |
| 34 |
pym/_emerge/Binpkg.py | 33 +- |
| 35 |
pym/_emerge/BinpkgExtractorAsync.py | 5 +- |
| 36 |
pym/_emerge/BinpkgFetcher.py | 13 +- |
| 37 |
pym/_emerge/BinpkgPrefetcher.py | 2 +- |
| 38 |
pym/_emerge/BinpkgVerifier.py | 6 +- |
| 39 |
pym/_emerge/EbuildBinpkg.py | 9 +- |
| 40 |
pym/_emerge/EbuildBuild.py | 36 +- |
| 41 |
pym/_emerge/EbuildMerge.py | 3 +- |
| 42 |
pym/_emerge/JobStatusDisplay.py | 4 +- |
| 43 |
pym/_emerge/Package.py | 67 +- |
| 44 |
pym/_emerge/PackageMerge.py | 9 +- |
| 45 |
pym/_emerge/Scheduler.py | 26 +- |
| 46 |
pym/_emerge/actions.py | 5 +- |
| 47 |
pym/_emerge/clear_caches.py | 1 - |
| 48 |
pym/_emerge/depgraph.py | 16 +- |
| 49 |
pym/_emerge/is_valid_package_atom.py | 5 +- |
| 50 |
pym/_emerge/resolver/output.py | 21 +- |
| 51 |
pym/_emerge/search.py | 24 +- |
| 52 |
pym/portage/_emirrordist/Config.py | 6 +- |
| 53 |
pym/portage/_emirrordist/MirrorDistTask.py | 4 +- |
| 54 |
pym/portage/_sets/ProfilePackageSet.py | 3 +- |
| 55 |
pym/portage/_sets/files.py | 5 +- |
| 56 |
pym/portage/_sets/profiles.py | 3 +- |
| 57 |
pym/portage/cache/index/pkg_desc_index.py | 1 + |
| 58 |
pym/portage/checksum.py | 2 +- |
| 59 |
pym/portage/const.py | 5 + |
| 60 |
pym/portage/dbapi/_MergeProcess.py | 9 +- |
| 61 |
pym/portage/dbapi/_VdbMetadataDelta.py | 25 +- |
| 62 |
pym/portage/dbapi/__init__.py | 10 +- |
| 63 |
pym/portage/dbapi/bintree.py | 851 +++++++++++---------- |
| 64 |
pym/portage/dbapi/vartree.py | 63 +- |
| 65 |
pym/portage/dbapi/virtual.py | 113 ++- |
| 66 |
pym/portage/dep/__init__.py | 38 +- |
| 67 |
pym/portage/dispatch_conf.py | 101 ++- |
| 68 |
pym/portage/emaint/modules/binhost/binhost.py | 47 +- |
| 69 |
pym/portage/output.py | 4 +- |
| 70 |
.../package/ebuild/_config/KeywordsManager.py | 3 +- |
| 71 |
.../package/ebuild/_config/LocationsManager.py | 8 +- |
| 72 |
pym/portage/package/ebuild/_config/MaskManager.py | 21 +- |
| 73 |
pym/portage/package/ebuild/_config/UseManager.py | 22 +- |
| 74 |
pym/portage/package/ebuild/config.py | 15 +- |
| 75 |
pym/portage/package/ebuild/doebuild.py | 81 +- |
| 76 |
pym/portage/package/ebuild/fetch.py | 7 +- |
| 77 |
pym/portage/repository/config.py | 4 +- |
| 78 |
pym/portage/sync/controller.py | 9 +- |
| 79 |
pym/portage/sync/modules/squashdelta/README | 124 +++ |
| 80 |
pym/portage/sync/modules/squashdelta/__init__.py | 37 + |
| 81 |
.../sync/modules/squashdelta/squashdelta.py | 237 ++++++ |
| 82 |
pym/portage/sync/modules/webrsync/__init__.py | 4 +- |
| 83 |
pym/portage/sync/modules/webrsync/webrsync.py | 4 + |
| 84 |
pym/portage/tests/dep/test_isvalidatom.py | 8 +- |
| 85 |
pym/portage/tests/resolver/ResolverPlayground.py | 25 +- |
| 86 |
.../resolver/binpkg_multi_instance}/__init__.py | 0 |
| 87 |
.../{soname => binpkg_multi_instance}/__test__.py | 0 |
| 88 |
.../test_build_id_profile_format.py | 134 ++++ |
| 89 |
.../binpkg_multi_instance/test_rebuilt_binaries.py | 101 +++ |
| 90 |
pym/portage/util/__init__.py | 35 +- |
| 91 |
pym/portage/util/_dyn_libs/LinkageMapELF.py | 3 +- |
| 92 |
pym/portage/util/formatter.py | 69 ++ |
| 93 |
pym/portage/util/writeable_check.py | 24 +- |
| 94 |
pym/portage/versions.py | 28 +- |
| 95 |
pym/repoman/utilities.py | 8 +- |
| 96 |
setup.py | 2 +- |
| 97 |
87 files changed, 2192 insertions(+), 725 deletions(-) |
| 98 |
|
| 99 |
diff --cc bin/phase-functions.sh |
| 100 |
index 7537ddc,7bf4d63..6f98569 |
| 101 |
--- a/bin/phase-functions.sh |
| 102 |
+++ b/bin/phase-functions.sh |
| 103 |
@@@ -549,21 -489,6 +549,13 @@@ __dyn_test() |
| 104 |
elif [[ ${EBUILD_FORCE_TEST} != 1 ]] && ! has test ${FEATURES} ; then |
| 105 |
__vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}" |
| 106 |
else |
| 107 |
- # If ${EBUILD_FORCE_TEST} == 1 and USE came from ${T}/environment |
| 108 |
- # then it might not have USE=test like it's supposed to here. |
| 109 |
- if [[ ${EBUILD_FORCE_TEST} == 1 && test =~ ${PORTAGE_IUSE} ]] && \ |
| 110 |
- ! has test ${USE} ; then |
| 111 |
- export USE="${USE} test" |
| 112 |
- fi |
| 113 |
- |
| 114 |
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then |
| 115 |
+ if [ ${PORTAGE_BUILDDIR}/.tested.${LOOP_ABI} -nt "${WORKDIR}" ]; then |
| 116 |
+ echo ">>> It appears that ${PN} is already tested for ABI=${LOOP_ABI}; skipping." |
| 117 |
+ echo ">>> Remove '$PORTAGE_BUILDDIR/.tested.${LOOP_ABI}' to force testing." |
| 118 |
+ continue |
| 119 |
+ fi |
| 120 |
+ fi |
| 121 |
- |
| 122 |
local save_sp=${SANDBOX_PREDICT} |
| 123 |
addpredict / |
| 124 |
__ebuild_phase pre_src_test |
Archives