| 1 |
commit: 80bfb6e67bb021d8b4cee741666570709ce12446 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 29 12:50:48 2012 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 29 12:50:48 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=80bfb6e6 |
| 7 |
|
| 8 |
Merge v2.2.0_alpha134 |
| 9 |
|
| 10 |
|
| 11 |
bin/eapi.sh | 113 ++++++++++ |
| 12 |
bin/ebuild-helpers/dobin | 7 +- |
| 13 |
bin/ebuild-helpers/dodir | 7 +- |
| 14 |
bin/ebuild-helpers/dodoc | 23 +-- |
| 15 |
bin/ebuild-helpers/doexe | 7 +- |
| 16 |
bin/ebuild-helpers/dohard | 19 +- |
| 17 |
bin/ebuild-helpers/doheader | 8 +- |
| 18 |
bin/ebuild-helpers/doinfo | 7 +- |
| 19 |
bin/ebuild-helpers/doins | 18 +- |
| 20 |
bin/ebuild-helpers/dolib | 7 +- |
| 21 |
bin/ebuild-helpers/doman | 7 +- |
| 22 |
bin/ebuild-helpers/domo | 7 +- |
| 23 |
bin/ebuild-helpers/dosbin | 7 +- |
| 24 |
bin/ebuild-helpers/dosed | 19 +- |
| 25 |
bin/ebuild-helpers/dosym | 5 +- |
| 26 |
bin/ebuild-helpers/ecompressdir | 7 +- |
| 27 |
bin/ebuild-helpers/fowners | 5 +- |
| 28 |
bin/ebuild-helpers/fperms | 7 +- |
| 29 |
bin/ebuild-helpers/newins | 17 +- |
| 30 |
bin/ebuild-helpers/prepall | 7 +- |
| 31 |
bin/ebuild-helpers/prepalldocs | 17 +- |
| 32 |
bin/ebuild-helpers/prepallinfo | 7 +- |
| 33 |
bin/ebuild-helpers/prepallman | 9 +- |
| 34 |
bin/ebuild-helpers/prepallstrip | 9 +- |
| 35 |
bin/ebuild-helpers/prepinfo | 9 +- |
| 36 |
bin/ebuild-helpers/preplib | 7 +- |
| 37 |
bin/ebuild-helpers/prepman | 9 +- |
| 38 |
bin/ebuild-helpers/prepstrip | 5 +- |
| 39 |
bin/ebuild.sh | 58 +++-- |
| 40 |
bin/isolated-functions.sh | 17 +- |
| 41 |
bin/misc-functions.sh | 80 ++++---- |
| 42 |
bin/phase-functions.sh | 55 ++--- |
| 43 |
bin/phase-helpers.sh | 155 ++++++-------- |
| 44 |
bin/portageq | 6 +- |
| 45 |
bin/repoman | 80 ++++---- |
| 46 |
bin/save-ebuild-env.sh | 9 +- |
| 47 |
doc/package/ebuild.docbook | 1 + |
| 48 |
doc/package/ebuild/eapi/5-hdepend.docbook | 32 +++ |
| 49 |
doc/portage.docbook | 1 + |
| 50 |
man/ebuild.5 | 68 +++++- |
| 51 |
man/emerge.1 | 10 +- |
| 52 |
man/make.conf.5 | 12 +- |
| 53 |
man/repoman.1 | 72 ++----- |
| 54 |
pym/_emerge/BlockerDB.py | 5 +- |
| 55 |
pym/_emerge/FakeVartree.py | 4 +- |
| 56 |
pym/_emerge/Package.py | 15 +- |
| 57 |
pym/_emerge/actions.py | 4 +- |
| 58 |
pym/_emerge/depgraph.py | 63 +++--- |
| 59 |
pym/_emerge/main.py | 1 - |
| 60 |
pym/_emerge/resolver/circular_dependency.py | 4 +- |
| 61 |
pym/portage/__init__.py | 4 +- |
| 62 |
pym/portage/_global_updates.py | 14 +- |
| 63 |
pym/portage/cache/flat_list.py | 134 ------------ |
| 64 |
pym/portage/cache/metadata.py | 3 +- |
| 65 |
pym/portage/cache/sqlite.py | 9 +- |
| 66 |
pym/portage/dbapi/__init__.py | 3 +- |
| 67 |
pym/portage/dbapi/bintree.py | 12 +- |
| 68 |
pym/portage/dbapi/porttree.py | 3 +- |
| 69 |
pym/portage/dbapi/vartree.py | 2 +- |
| 70 |
pym/portage/dep/_slot_operator.py | 23 ++- |
| 71 |
pym/portage/eapi.py | 11 +- |
| 72 |
pym/portage/emaint/modules/move/move.py | 4 +- |
| 73 |
.../package/ebuild/_config/LocationsManager.py | 7 +- |
| 74 |
pym/portage/package/ebuild/_config/UseManager.py | 20 ++- |
| 75 |
.../package/ebuild/_config/special_env_vars.py | 3 +- |
| 76 |
pym/portage/package/ebuild/config.py | 13 +- |
| 77 |
pym/portage/package/ebuild/doebuild.py | 6 +- |
| 78 |
pym/portage/tests/dbapi/test_portdb_cache.py | 15 -- |
| 79 |
pym/portage/tests/ebuild/test_ipc_daemon.py | 4 +- |
| 80 |
pym/portage/tests/emerge/test_emerge_slot_abi.py | 22 -- |
| 81 |
pym/portage/tests/emerge/test_simple.py | 17 -- |
| 82 |
pym/portage/tests/resolver/ResolverPlayground.py | 228 +++++++++----------- |
| 83 |
pym/portage/tests/resolver/test_targetroot.py | 85 ++++++++ |
| 84 |
pym/portage/util/__init__.py | 16 +- |
| 85 |
pym/portage/util/_eventloop/EventLoop.py | 30 ++-- |
| 86 |
pym/portage/util/_eventloop/PollSelectAdapter.py | 2 +- |
| 87 |
76 files changed, 945 insertions(+), 873 deletions(-) |
| 88 |
|
| 89 |
diff --cc bin/misc-functions.sh |
| 90 |
index a067642,986264e..2cf71a8 |
| 91 |
--- a/bin/misc-functions.sh |
| 92 |
+++ b/bin/misc-functions.sh |
| 93 |
@@@ -17,9 -17,9 +17,11 @@@ shift $ |
| 94 |
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}/ebuild.sh" |
| 95 |
|
| 96 |
install_symlink_html_docs() { |
| 97 |
+ [[ " ${FEATURES} " == *" force-prefix "* ]] || \ |
| 98 |
- case "$EAPI" in 0|1|2) local ED=${D} ;; esac |
| 99 |
+ if ! ___eapi_has_prefix_variables; then |
| 100 |
+ local ED=${D} |
| 101 |
+ fi |
| 102 |
+ [[ -e "${ED}" ]] || return 0 |
| 103 |
cd "${ED}" || die "cd failed" |
| 104 |
#symlink the html documentation (if DOC_SYMLINKS_DIR is set in make.conf) |
| 105 |
if [ -n "${DOC_SYMLINKS_DIR}" ] ; then |
| 106 |
@@@ -150,14 -164,12 +166,13 @@@ prepcompress() |
| 107 |
|
| 108 |
install_qa_check() { |
| 109 |
local f i qa_var x |
| 110 |
- [[ " ${FEATURES} " == *" force-prefix "* ]] || \ |
| 111 |
- case "$EAPI" in 0|1|2) local EPREFIX= ED=${D} ;; esac |
| 112 |
+ if ! ___eapi_has_prefix_variables; then |
| 113 |
+ local EPREFIX= ED=${D} |
| 114 |
+ fi |
| 115 |
|
| 116 |
+ [[ -d "${ED}" ]] || return 0 |
| 117 |
cd "${ED}" || die "cd failed" |
| 118 |
|
| 119 |
- # Merge QA_FLAGS_IGNORED and QA_DT_HASH into a single array, since |
| 120 |
- # QA_DT_HASH is deprecated. |
| 121 |
qa_var="QA_FLAGS_IGNORED_${ARCH/-/_}" |
| 122 |
eval "[[ -n \${!qa_var} ]] && QA_FLAGS_IGNORED=(\"\${${qa_var}[@]}\")" |
| 123 |
if [[ ${#QA_FLAGS_IGNORED[@]} -eq 1 ]] ; then |
| 124 |
diff --cc bin/phase-functions.sh |
| 125 |
index 1afa45e,7a0baf4..f80781f |
| 126 |
--- a/bin/phase-functions.sh |
| 127 |
+++ b/bin/phase-functions.sh |
| 128 |
@@@ -401,19 -356,9 +395,19 @@@ __dyn_prepare() |
| 129 |
return 0 |
| 130 |
fi |
| 131 |
|
| 132 |
+ for LOOP_ABI in $(get_abi_list); do |
| 133 |
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then |
| 134 |
+ is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; } |
| 135 |
+ |
| 136 |
+ if [ "${PORTAGE_BUILDDIR}"/.prepared.${LOOP_ABI} -nt "${WORKDIR}" ]; then |
| 137 |
+ echo ">>> It appears that ${PN} is already prepared for ABI=${LOOP_ABI}; skipping." |
| 138 |
+ echo ">>> Remove '$PORTAGE_BUILDDIR/.prepared.${LOOP_ABI}' to force prepare." |
| 139 |
+ continue |
| 140 |
+ fi |
| 141 |
+ fi |
| 142 |
if [[ -d $S ]] ; then |
| 143 |
cd "${S}" |
| 144 |
- elif has $EAPI 0 1 2 3 ; then |
| 145 |
+ elif ___eapi_has_S_WORKDIR_fallback; then |
| 146 |
cd "${WORKDIR}" |
| 147 |
elif [[ -z ${A} ]] && ! __has_phase_defined_up_to prepare; then |
| 148 |
cd "${WORKDIR}" |
| 149 |
@@@ -452,19 -387,9 +446,19 @@@ __dyn_configure() |
| 150 |
return 0 |
| 151 |
fi |
| 152 |
|
| 153 |
+ for LOOP_ABI in $(get_abi_list); do |
| 154 |
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then |
| 155 |
+ is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; } |
| 156 |
+ |
| 157 |
+ if [ ${PORTAGE_BUILDDIR}/.configured.${LOOP_ABI} -nt "${WORKDIR}" ]; then |
| 158 |
+ echo ">>> It appears that ${PN} is already configured for ABI=${LOOP_ABI}; skipping." |
| 159 |
+ echo ">>> Remove '$PORTAGE_BUILDDIR/.configured.${LOOP_ABI}' to force configuration." |
| 160 |
+ continue |
| 161 |
+ fi |
| 162 |
+ fi |
| 163 |
if [[ -d $S ]] ; then |
| 164 |
cd "${S}" |
| 165 |
- elif has $EAPI 0 1 2 3 ; then |
| 166 |
+ elif ___eapi_has_S_WORKDIR_fallback; then |
| 167 |
cd "${WORKDIR}" |
| 168 |
elif [[ -z ${A} ]] && ! __has_phase_defined_up_to configure; then |
| 169 |
cd "${WORKDIR}" |
| 170 |
@@@ -504,19 -420,9 +498,19 @@@ __dyn_compile() |
| 171 |
return 0 |
| 172 |
fi |
| 173 |
|
| 174 |
+ for LOOP_ABI in $(get_abi_list); do |
| 175 |
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then |
| 176 |
+ is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; } |
| 177 |
+ |
| 178 |
+ if [ ${PORTAGE_BUILDDIR}/.compiled.${LOOP_ABI} -nt "${WORKDIR}" ]; then |
| 179 |
+ echo ">>> It appears that ${PN} is already compiled for ABI=${LOOP_ABI}; skipping." |
| 180 |
+ echo ">>> Remove '$PORTAGE_BUILDDIR/.compiled.${LOOP_ABI}' to force compilation." |
| 181 |
+ continue |
| 182 |
+ fi |
| 183 |
+ fi |
| 184 |
if [[ -d $S ]] ; then |
| 185 |
cd "${S}" |
| 186 |
- elif has $EAPI 0 1 2 3 ; then |
| 187 |
+ elif ___eapi_has_S_WORKDIR_fallback; then |
| 188 |
cd "${WORKDIR}" |
| 189 |
elif [[ -z ${A} ]] && ! __has_phase_defined_up_to compile; then |
| 190 |
cd "${WORKDIR}" |
| 191 |
@@@ -628,15 -504,14 +622,17 @@@ __dyn_install() |
| 192 |
trap "__abort_install" SIGINT SIGQUIT |
| 193 |
__ebuild_phase pre_src_install |
| 194 |
|
| 195 |
- _x=${ED} |
| 196 |
- [[ " ${FEATURES} " == *" force-prefix "* ]] || \ |
| 197 |
- case "$EAPI" in 0|1|2) _x=${D} ;; esac |
| 198 |
+ if ___eapi_has_prefix_variables; then |
| 199 |
+ _x=${ED} |
| 200 |
+ else |
| 201 |
+ _x=${D} |
| 202 |
+ fi |
| 203 |
rm -rf "${D}" |
| 204 |
+ [[ " ${FEATURES} " == *" force-multilib "* ]] && is_auto-multilib && rm -rf "${D}".${ABI} |
| 205 |
mkdir -p "${_x}" |
| 206 |
unset _x |
| 207 |
+ for LOOP_ABI in $(get_abi_list); do |
| 208 |
+ [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { set_abi ${LOOP_ABI}; source "${T}"/environment || die ; } |
| 209 |
|
| 210 |
if [[ -d $S ]] ; then |
| 211 |
cd "${S}" |
Archives