[gentoo-commits] proj/portage:multilib commit in: /
commit: a5893dcca4aae2fdcccbcb6578bf48c203f5e1d9 Author: Thomas Sachau gentoo org> AuthorDate: Mon Mar 21 11:52:31 2022 + Commit: Thomas Sachau gentoo org> CommitDate: Mon Mar 21 11:52:41 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a5893dcc Merge tag 'portage-3.0.30' into multilib portage-3.0.30 Signed-off-by: Thomas Sachau gentoo.org> DEVELOPING | 19 --- NEWS | 5 + lib/portage/package/ebuild/doebuild.py | 12 +--- setup.py | 2 +- src/portage_util_file_copy_reflink_linux.c | 7 --- 5 files changed, 27 insertions(+), 18 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: c492a43e90013713e05ba3e0ede1de30dc9a48e2
Author: Thomas Sachau gentoo org>
AuthorDate: Mon Mar 21 11:42:33 2022 +
Commit: Thomas Sachau gentoo org>
CommitDate: Mon Mar 21 11:42:55 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c492a43e
Merge tag 'portage-3.0.29' into multilib
Signed-off-by: Thomas Sachau gentoo.org>
.github/workflows/ci.yml | 2 +-
.gitignorerevs | 2 +
NEWS | 10 +++
RELEASE-NOTES | 5 ++
bin/ebuild-ipc.py | 6 +-
bin/ebuild.sh | 39 -
bin/estrip | 99 +-
bin/isolated-functions.sh | 39 +
bin/phase-functions.sh | 4 +-
bin/phase-helpers.sh | 14 ++-
cnf/make.conf.example.riscv.diff | 61 +
cnf/make.globals | 2 +-
lib/_emerge/AbstractEbuildProcess.py | 4 +-
lib/_emerge/Binpkg.py | 15 +++-
lib/_emerge/EbuildBuild.py | 19 -
lib/_emerge/EbuildIpcDaemon.py | 2 +-
lib/_emerge/actions.py | 33 +---
lib/_emerge/create_depgraph_params.py | 2 +-
lib/_emerge/depgraph.py| 27 +++---
lib/_emerge/main.py| 10 +++
lib/portage/const.py | 1 +
lib/portage/dbapi/bintree.py | 9 +-
lib/portage/dep/dep_check.py | 6 +-
lib/portage/output.py | 6 +-
lib/portage/package/ebuild/doebuild.py | 17 +++-
lib/portage/package/ebuild/fetch.py| 7 +-
lib/portage/package/ebuild/prepare_build_dirs.py | 9 ++
lib/portage/process.py | 2 -
lib/portage/tests/ebuild/test_doebuild_spawn.py| 1 +
lib/portage/tests/ebuild/test_ipc_daemon.py| 6 +-
.../tests/resolver/test_unecessary_slot_upgrade.py | 62 ++
lib/portage/util/_dyn_libs/dyn_libs.py | 28 ++
lib/portage/util/_xattr.py | 1 -
lib/portage/util/futures/unix_events.py| 1 -
man/color.map.5| 6 +-
man/emerge.1 | 12 ++-
man/make.conf.5| 7 +-
setup.py | 10 ++-
38 files changed, 434 insertions(+), 152 deletions(-)
diff --cc bin/phase-functions.sh
index f549832e4,5eb031805..32cf85b33
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -312,14 -288,13 +312,14 @@@ __dyn_clean()
fi
if [[ $EMERGE_FROM = binary ]] || ! has keepwork $FEATURES; then
- rm -f
"$PORTAGE_BUILDDIR"/.{ebuild_changed,logid,pretended,setuped,unpacked,prepared}
\
-
"$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged,instprepped} \
+ rm -f
"$PORTAGE_BUILDDIR"/.{ebuild_changed,logid,pretended*,setuped*,unpacked*,prepared*}
\
+
"$PORTAGE_BUILDDIR"/.{configured*,compiled*,tested*,packaged*,instprepped} \
+ "$PORTAGE_BUILDDIR"/.abi \
"$PORTAGE_BUILDDIR"/.die_hooks \
- "$PORTAGE_BUILDDIR"/.ipc_{in,out,lock} \
"$PORTAGE_BUILDDIR"/.exit_status
- rm -rf "${PORTAGE_BUILDDIR}"/{build-info,abi-code}
- rm -rf "${PORTAGE_BUILDDIR}/build-info" \
++ rm -rf "${PORTAGE_BUILDDIR}"/{build-info,abi-code} \
+ "${PORTAGE_BUILDDIR}/.ipc"
rm -rf "${WORKDIR}"
rm -f "${PORTAGE_BUILDDIR}/files"
fi
[gentoo-commits] proj/portage:multilib commit in: /
commit: e2085b63a9063d3a548347ec37f0a8448e6d35e7
Author: Thomas Sachau gentoo org>
AuthorDate: Mon Mar 21 11:33:54 2022 +
Commit: Thomas Sachau gentoo org>
CommitDate: Mon Mar 21 11:33:58 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e2085b63
Merge tag 'portage-3.0.28' into multilib
portage-3.0.28
Signed-off-by: Thomas Sachau gentoo.org>
RELEASE-NOTES| 4 +++
bin/phase-functions.sh | 2 +-
lib/portage/package/ebuild/prepare_build_dirs.py | 35
setup.py | 2 +-
4 files changed, 17 insertions(+), 26 deletions(-)
diff --cc bin/phase-functions.sh
index 4b8adb82c,d3221993d..f549832e4
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -319,9 -294,9 +319,9 @@@ __dyn_clean()
"$PORTAGE_BUILDDIR"/.ipc_{in,out,lock} \
"$PORTAGE_BUILDDIR"/.exit_status
- rm -rf "${PORTAGE_BUILDDIR}/build-info"
+ rm -rf "${PORTAGE_BUILDDIR}"/{build-info,abi-code}
rm -rf "${WORKDIR}"
- rm -rf "${PORTAGE_BUILDDIR}/files"
+ rm -f "${PORTAGE_BUILDDIR}/files"
fi
if [ -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then
[gentoo-commits] proj/portage:multilib commit in: /
commit: a7abb6f0d89a89e5225038909410c2781802adbb Author: Thomas Sachau gentoo org> AuthorDate: Mon Mar 21 11:33:10 2022 + Commit: Thomas Sachau gentoo org> CommitDate: Mon Mar 21 11:33:14 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a7abb6f0 Merge tag 'portage-3.0.27' into multilib portage-3.0.27 Signed-off-by: Thomas Sachau gentoo.org> NEWS | 6 +++ RELEASE-NOTES| 4 ++ bin/install-qa-check.d/10ignored-flags | 4 +- bin/isolated-functions.sh| 50 +++ bin/save-ebuild-env.sh | 18 --- lib/_emerge/resolver/output.py | 2 +- lib/_emerge/resolver/output_helpers.py | 2 + lib/portage/elog/messages.py | 10 ++-- lib/portage/elog/mod_echo.py | 4 +- lib/portage/output.py| 63 lib/portage/package/ebuild/prepare_build_dirs.py | 10 +++- setup.py | 2 +- 12 files changed, 125 insertions(+), 50 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 8ac6d6ca167c003150fa2aea3835042144574f6e Author: Thomas Sachau gentoo org> AuthorDate: Mon Mar 21 11:27:20 2022 + Commit: Thomas Sachau gentoo org> CommitDate: Mon Mar 21 11:27:26 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8ac6d6ca Merge tag 'portage-3.0.26' into multilib portage-3.0.26 Signed-off-by: Thomas Sachau gentoo.org> NEWS | 6 +- RELEASE-NOTES| 2 +- lib/portage/package/ebuild/prepare_build_dirs.py | 3 +-- setup.py | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: b6385d6a20d226f3269841b576b7c8815a7ab2a1 Author: Thomas Sachau gentoo org> AuthorDate: Mon Mar 21 11:24:59 2022 + Commit: Thomas Sachau gentoo org> CommitDate: Mon Mar 21 11:25:53 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b6385d6a Merge tag 'portage-3.0.25' into multilib portage-3.0.25 Signed-off-by: Thomas Sachau gentoo.org> NEWS | 4 RELEASE-NOTES| 7 +++ bin/isolated-functions.sh| 1 + lib/portage/package/ebuild/prepare_build_dirs.py | 13 ++--- setup.py | 2 +- 5 files changed, 23 insertions(+), 4 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: lib/_emerge/
commit: ce24ddf9e0a9ba9e86f9ccf38004559c6367d756 Author: Thomas Sachau gentoo org> AuthorDate: Mon Mar 21 11:15:06 2022 + Commit: Thomas Sachau gentoo org> CommitDate: Mon Mar 21 11:15:06 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ce24ddf9 Re-add _install_exit target Signed-off-by: Thomas Sachau gentoo.org> lib/_emerge/EbuildExecuter.py | 27 +++ 1 file changed, 27 insertions(+) diff --git a/lib/_emerge/EbuildExecuter.py b/lib/_emerge/EbuildExecuter.py index 9f37528ed..7cb90fad7 100644 --- a/lib/_emerge/EbuildExecuter.py +++ b/lib/_emerge/EbuildExecuter.py @@ -98,3 +98,30 @@ class EbuildExecuter(CompositeTask): self._start_task(ebuild_phases, self._install_exit) else: self._start_task(ebuild_phases, self._default_final_exit) + + +def _install_exit(self, install_phase): + +if self._default_exit(install_phase) != os.EX_OK: +self.wait() +return +if not os.path.exists(self.settings["D"]): +pkg = self.pkg +scheduler = self.scheduler +settings = self.settings +cleanup = 1 + +# This initializes PORTAGE_LOG_FILE. +portage.prepare_build_dirs(pkg.root, settings, cleanup) + +setup_phase = EbuildPhase(background=self.background, +phase="setup", scheduler=scheduler, +settings=settings) + +setup_phase.addExitListener(self._setup_exit) +self._current_task = setup_phase +self.scheduler.scheduleSetup(setup_phase) +else: +self.returncode = os.EX_OK +self.wait() +return
[gentoo-commits] proj/portage:multilib commit in: lib/portage/dep/
commit: 35bbe31ed72047d42b9ad85525da5a427b142143
Author: Thomas Sachau gentoo org>
AuthorDate: Mon Mar 21 11:00:39 2022 +
Commit: Thomas Sachau gentoo org>
CommitDate: Mon Mar 21 11:00:39 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=35bbe31e
Fix intend
Signed-off-by: Thomas Sachau gentoo.org>
lib/portage/dep/__init__.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/portage/dep/__init__.py b/lib/portage/dep/__init__.py
index 921483d8d..93ba013f2 100644
--- a/lib/portage/dep/__init__.py
+++ b/lib/portage/dep/__init__.py
@@ -1168,8 +1168,8 @@ class _use_dep:
missing_disabled.add(flag)
else:
if flag in missing_enabled or flag in missing_disabled:
- if flag != "multilib_abi_x86" and flag
!= "multilib_abi_amd64":
-raise InvalidAtom(_("Invalid use dep: '%s'") % (x,))
+if flag != "multilib_abi_x86" and flag !=
"multilib_abi_amd64":
+raise InvalidAtom(_("Invalid use dep: '%s'") % (x,))
no_default.add(flag)
self.tokens = use
[gentoo-commits] proj/portage:multilib commit in: lib/_emerge/
commit: be981440fe0f5064800b92a1d2effa4094b976a2
Author: Thomas Sachau gentoo org>
AuthorDate: Mon Mar 21 10:56:13 2022 +
Commit: Thomas Sachau gentoo org>
CommitDate: Mon Mar 21 10:56:13 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=be981440
Fix intend
Signed-off-by: Thomas Sachau gentoo.org>
lib/_emerge/Package.py | 53 +-
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/lib/_emerge/Package.py b/lib/_emerge/Package.py
index 9018b1e52..171ed3e6f 100644
--- a/lib/_emerge/Package.py
+++ b/lib/_emerge/Package.py
@@ -365,32 +365,33 @@ class Package(Task):
)
self._metadata_exception(k, e)
- 'force-multilib' in self.root_config.settings.features:
- mysettings = self.root_config.settings
- no_auto_flag = frozenset(mysettings.get("NO_AUTO_FLAG",
"").split())
- for i, x in enumerate(validated_atoms):
- if not isinstance(x, Atom):
- continue
- if x.cp in no_auto_flag:
- continue
- multilib_flags = []
- for multilib_abis in
mysettings.get("MULTILIB_ABIS", '').split():
- multilib_flag = 'multilib_abi_' +
multilib_abis
- if x.unevaluated_atom.use is None or \
-
x.unevaluated_atom.use.conditional is None or \
- multilib_flag not in
x.unevaluated_atom.use.conditional.enabled:
-
multilib_flags.append(multilib_flag + '?')
- if multilib_flags:
- if x.unevaluated_atom.use is None:
- use_tokens = []
- else:
- use_tokens =
list(x.unevaluated_atom.use.tokens)
- use_tokens.extend(multilib_flags)
- validated_atoms[i] = Atom(
- x.unevaluated_atom.without_use
+ \
- "[%s]" % (",".join(use_tokens)))
-
-self._validated_atoms = tuple(
+if self.root_config.settings.local_config and \
+'force-multilib' in self.root_config.settings.features:
+mysettings = self.root_config.settings
+no_auto_flag = frozenset(mysettings.get("NO_AUTO_FLAG",
"").split())
+for i, x in enumerate(validated_atoms):
+if not isinstance(x, Atom):
+continue
+if x.cp in no_auto_flag:
+continue
+multilib_flags = []
+for multilib_abis in mysettings.get("MULTILIB_ABIS",
'').split():
+multilib_flag = 'multilib_abi_' + multilib_abis
+if x.unevaluated_atom.use is None or \
+x.unevaluated_atom.use.conditional is None or \
+multilib_flag not in
x.unevaluated_atom.use.conditional.enabled:
+multilib_flags.append(multilib_flag + '?')
+if multilib_flags:
+if x.unevaluated_atom.use is None:
+use_tokens = []
+else:
+use_tokens = list(x.unevaluated_atom.use.tokens)
+use_tokens.extend(multilib_flags)
+validated_atoms[i] = Atom(
+x.unevaluated_atom.without_use + \
+"[%s]" % (",".join(use_tokens)))
+
+self._validated_atoms = tuple(
set(atom for atom in validated_atoms if isinstance(atom, Atom))
)
[gentoo-commits] proj/portage:multilib commit in: lib/portage/package/ebuild/
commit: ade5266cb360226f881513c96ec9604ab6e16756 Author: Thomas Sachau gentoo org> AuthorDate: Mon Mar 21 10:57:56 2022 + Commit: Thomas Sachau gentoo org> CommitDate: Mon Mar 21 10:57:56 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ade5266c Fix intend Signed-off-by: Thomas Sachau gentoo.org> lib/portage/package/ebuild/doebuild.py | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py index 495ca901d..ab158d5bb 100644 --- a/lib/portage/package/ebuild/doebuild.py +++ b/lib/portage/package/ebuild/doebuild.py @@ -2870,10 +2870,10 @@ def _post_src_install_soname_symlinks(mysettings, out): image_dir = mysettings["D"] #only run this function when the installation is actually done and the final - #image_dir exists (workaround for multilib-portage as this is first called - #before all ABIs are done and the image_dir is created) - if not os.path.isdir (image_dir): - return +#image_dir exists (workaround for multilib-portage as this is first called +#before all ABIs are done and the image_dir is created) +if not os.path.isdir (image_dir): +return needed_filename = os.path.join( mysettings["PORTAGE_BUILDDIR"], "build-info", "NEEDED.ELF.2"
[gentoo-commits] proj/portage:multilib commit in: lib/portage/dep/
commit: 9030aa3824269b99fc8e1195ac2e24fe4ff1c77d
Author: Thomas Sachau gentoo org>
AuthorDate: Mon Mar 21 10:40:07 2022 +
Commit: Thomas Sachau gentoo org>
CommitDate: Mon Mar 21 10:40:07 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9030aa38
Fix intend
Signed-off-by: Thomas Sachau gentoo.org>
lib/portage/dep/dep_check.py | 116 +--
1 file changed, 58 insertions(+), 58 deletions(-)
diff --git a/lib/portage/dep/dep_check.py b/lib/portage/dep/dep_check.py
index f75860978..ddd613ea7 100644
--- a/lib/portage/dep/dep_check.py
+++ b/lib/portage/dep/dep_check.py
@@ -126,64 +126,64 @@ def _expand_new_virtuals(
x = x._eval_qa_conditionals(use_mask, use_force)
if 'force-multilib' in mysettings.features:
- if not repoman and x.cp not in
mysettings.get("NO_AUTO_FLAG", "").split():
- multilib_flags = []
- for multilib_abis in
mysettings.get("MULTILIB_ABIS", '').split():
- multilib_flag = 'multilib_abi_' +
multilib_abis
- if x.unevaluated_atom.use is None or \
-
x.unevaluated_atom.use.conditional is None or \
- multilib_flag not in
x.unevaluated_atom.use.conditional.enabled:
-
multilib_flags.append(multilib_flag + '?')
- if multilib_flags:
- if x.unevaluated_atom.use is None:
- use_tokens = []
- else:
- use_tokens =
list(x.unevaluated_atom.use.tokens)
- if 'abi_x86_64' in use_tokens:
-
use_tokens[use_tokens.index('abi_x86_64')] = 'multilib_abi_amd64'
- if 'abi_x86_64(-)' in use_tokens:
-
use_tokens[use_tokens.index('abi_x86_64(-)')] = 'multilib_abi_amd64(-)'
- if 'abi_x86_64(-)?' in use_tokens:
-
use_tokens[use_tokens.index('abi_x86_64(-)?')] = 'multilib_abi_amd64(-)?'
- if 'abi_x86_32' in use_tokens:
-
use_tokens[use_tokens.index('abi_x86_32')] = 'multilib_abi_x86'
- if 'abi_x86_32(-)' in use_tokens:
-
use_tokens[use_tokens.index('abi_x86_32(-)')] = 'multilib_abi_x86(-)'
- if 'abi_x86_32(-)?' in use_tokens:
-
use_tokens[use_tokens.index('abi_x86_32(-)?')] = 'multilib_abi_x86(-)?'
- use_tokens.extend(multilib_flags)
- x = Atom(x.unevaluated_atom.without_use
+
- "[%s]" % (",".join(use_tokens)))
- x = x.evaluate_conditionals(myuse)
- if not repoman and x.cp in
mysettings.get("NO_AUTO_FLAG", "").split():
- if x.unevaluated_atom.use is None:
- use_tokens = []
- else:
- use_tokens =
list(x.unevaluated_atom.use.tokens)
- if 'abi_x86_64' in use_tokens:
- use_tokens.remove('abi_x86_64')
- if 'abi_x86_64(-)' in use_tokens:
- use_tokens.remove('abi_x86_64(-)')
- if 'abi_x86_64(-)?' in use_tokens:
- use_tokens.remove('abi_x86_64(-)?')
- if 'abi_x86_32' in use_tokens:
- use_tokens.remove('abi_x86_32')
- if 'abi_x86_32(-)' in use_tokens:
- use_tokens.remove('abi_x86_32(-)')
- if 'abi_x86_32(-)?' in use_tokens:
- use_tokens.remove('abi_x86_32(-)?')
- if use_tokens:
- x = Atom(x.unevaluated_atom.without_use
+
- "[%s]" % (",".join(use_tokens)))
- else:
- x = x.unevaluated_atom.without_use
- x = x.evaluate_conditionals(myuse)
- mykey = x.cp
- if not mykey.startswith("virtual/
[gentoo-commits] proj/portage:multilib commit in: lib/portage/package/ebuild/
commit: 04a219428f27aaf8ab04950017706b2b833cc1db
Author: Thomas Sachau gentoo org>
AuthorDate: Mon Mar 21 10:41:42 2022 +
Commit: Thomas Sachau gentoo org>
CommitDate: Mon Mar 21 10:41:42 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=04a21942
Fix intend
Signed-off-by: Thomas Sachau gentoo.org>
lib/portage/package/ebuild/doebuild.py | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/portage/package/ebuild/doebuild.py
b/lib/portage/package/ebuild/doebuild.py
index 1829a8209..495ca901d 100644
--- a/lib/portage/package/ebuild/doebuild.py
+++ b/lib/portage/package/ebuild/doebuild.py
@@ -2497,10 +2497,10 @@ def _post_src_install_write_metadata(settings):
for k in metadata_keys:
v = settings.configdict["pkg"].get(k)
- if "force-multilib" in settings.features:
- v = v + " abiwrapper"
- for i in settings.get('MULTILIB_ABIS').split():
- v = v + " multilib_abi_" + i
+if "force-multilib" in settings.features:
+v = v + " abiwrapper"
+for i in settings.get('MULTILIB_ABIS').split():
+v = v + " multilib_abi_" + i
if v is not None:
write_atomic(os.path.join(build_info_dir, k), v + "\n")
[gentoo-commits] proj/portage:multilib commit in: lib/_emerge/
commit: 5fede333061375af42be5fae452edeced6258415
Author: Thomas Sachau gentoo org>
AuthorDate: Mon Mar 21 10:31:54 2022 +
Commit: Thomas Sachau gentoo org>
CommitDate: Mon Mar 21 10:31:54 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5fede333
Fix intend
Signed-off-by: Thomas Sachau gentoo.org>
lib/_emerge/actions.py | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py
index 35c9e4b7f..ee591d659 100644
--- a/lib/_emerge/actions.py
+++ b/lib/_emerge/actions.py
@@ -3417,13 +3417,13 @@ def run_action(emerge_config):
apply_priorities(emerge_config.target_config.settings)
- if 'force-multilib' in emerge_config.target_config.settings.features:
- if emerge_config.target_config.settings.get("NO_AUTO_FLAG", "")
== "":
- writemsg_level(bad("!!! Failed to find vars from extra
profile") + "\n",level=logging.ERROR, noiselevel=-1)
- writemsg_level(bad("!!! Please make sure that you did
follow the instructions and included the extra profile\n"),level=logging.ERROR,
noiselevel=-1)
- writemsg_level(bad("!!!
http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=blob;f=doc/portage-multilib-instructions\n";),level=logging.ERROR,
noiselevel=-1)
- writemsg_level(bad("!!! has some basic instructions for
the setup\n"),level=logging.ERROR, noiselevel=-1)
- return 1
+if 'force-multilib' in emerge_config.target_config.settings.features:
+if emerge_config.target_config.settings.get("NO_AUTO_FLAG", "") == "":
+writemsg_level(bad("!!! Failed to find vars from extra profile") +
"\n",level=logging.ERROR, noiselevel=-1)
+writemsg_level(bad("!!! Please make sure that you did follow the
instructions and included the extra profile\n"),level=logging.ERROR,
noiselevel=-1)
+writemsg_level(bad("!!!
http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=blob;f=doc/portage-multilib-instructions\n";),level=logging.ERROR,
noiselevel=-1)
+writemsg_level(bad("!!! has some basic instructions for the
setup\n"),level=logging.ERROR, noiselevel=-1)
+return 1
if (
"--autounmask-continue" in emerge_config.opts
and emerge_config.opts.get("--autounmask") == "n"
[gentoo-commits] proj/portage:multilib commit in: lib/_emerge/
commit: 8dd8ef42d00b0bc6b90ab27d114e622c341ab609
Author: Thomas Sachau gentoo org>
AuthorDate: Mon Mar 21 10:30:17 2022 +
Commit: Thomas Sachau gentoo org>
CommitDate: Mon Mar 21 10:30:17 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8dd8ef42
Fix intend
Signed-off-by: Thomas Sachau gentoo.org>
lib/_emerge/Package.py | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/_emerge/Package.py b/lib/_emerge/Package.py
index 0ee9bfb8b..9018b1e52 100644
--- a/lib/_emerge/Package.py
+++ b/lib/_emerge/Package.py
@@ -140,12 +140,12 @@ class Package(Task):
implicit_match = db._iuse_implicit_cnstr(self.cpv, self._metadata)
else:
implicit_match = db._repoman_iuse_implicit_cnstr(self.cpv,
self._metadata)
- if 'force-multilib' in self.root_config.settings.features:
- iuse = self._metadata["IUSE"]
- for multilib_abis in
self.root_config.settings.get("MULTILIB_ABIS", '').split():
- iuse += " multilib_abi_" + multilib_abis
- iuse += " abiwrapper"
- self._metadata["IUSE"] = iuse
+if 'force-multilib' in self.root_config.settings.features:
+iuse = self._metadata["IUSE"]
+for multilib_abis in
self.root_config.settings.get("MULTILIB_ABIS", '').split():
+iuse += " multilib_abi_" + multilib_abis
+iuse += " abiwrapper"
+self._metadata["IUSE"] = iuse
usealiases = self.root_config.settings._use_manager.getUseAliases(self)
self.iuse = self._iuse(
self, self._metadata["IUSE"].split(), implicit_match, usealiases,
self.eapi
[gentoo-commits] proj/portage:multilib commit in: lib/_emerge/
commit: daf2bd81b4046d42990b29a0ab716295cbd048cc Author: Thomas Sachau gentoo org> AuthorDate: Mon Mar 21 10:33:03 2022 + Commit: Thomas Sachau gentoo org> CommitDate: Mon Mar 21 10:33:03 2022 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=daf2bd81 Fix intend Signed-off-by: Thomas Sachau gentoo.org> lib/_emerge/EbuildExecuter.py | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/_emerge/EbuildExecuter.py b/lib/_emerge/EbuildExecuter.py index 5a528f432..9f37528ed 100644 --- a/lib/_emerge/EbuildExecuter.py +++ b/lib/_emerge/EbuildExecuter.py @@ -94,7 +94,7 @@ class EbuildExecuter(CompositeTask): ) ) - if 'force-multilib' in self.settings.features: - self._start_task(ebuild_phases, self._install_exit) - else: - self._start_task(ebuild_phases, self._default_final_exit) +if 'force-multilib' in self.settings.features: +self._start_task(ebuild_phases, self._install_exit) +else: +self._start_task(ebuild_phases, self._default_final_exit)
[gentoo-commits] proj/portage:multilib commit in: lib/portage/package/ebuild/
commit: da357458c1ed26ea760314043b1ad718734a0e2b
Author: Thomas Sachau gentoo org>
AuthorDate: Mon Mar 21 10:25:53 2022 +
Commit: Thomas Sachau gentoo org>
CommitDate: Mon Mar 21 10:25:53 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=da357458
Fix intend
Signed-off-by: Thomas Sachau gentoo.org>
lib/portage/package/ebuild/config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/portage/package/ebuild/config.py
b/lib/portage/package/ebuild/config.py
index 93b1e0c59..2e1045f0c 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -2325,7 +2325,7 @@ class config:
if 'force-multilib' in self.features:
for multilib_abis in self.get('MULTILIB_ABIS', '').split():
-iuse_implicit.add("multilib_abi_" + multilib_abis)
+iuse_implicit.add("multilib_abi_" + multilib_abis)
return iuse_implicit
[gentoo-commits] proj/portage:multilib commit in: lib/portage/package/ebuild/
commit: a9129a413cf1d83ee2faf86d1f011c5f8e171261
Author: Thomas Sachau gentoo org>
AuthorDate: Mon Mar 21 10:22:19 2022 +
Commit: Thomas Sachau gentoo org>
CommitDate: Mon Mar 21 10:22:19 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a9129a41
Fix intend
Signed-off-by: Thomas Sachau gentoo.org>
lib/portage/package/ebuild/config.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/portage/package/ebuild/config.py
b/lib/portage/package/ebuild/config.py
index bf3a6ef09..93b1e0c59 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -2324,8 +2324,8 @@ class config:
iuse_implicit.add("bootstrap")
if 'force-multilib' in self.features:
- for multilib_abis in self.get('MULTILIB_ABIS',
'').split():
- iuse_implicit.add("multilib_abi_" +
multilib_abis)
+for multilib_abis in self.get('MULTILIB_ABIS', '').split():
+iuse_implicit.add("multilib_abi_" + multilib_abis)
return iuse_implicit
[gentoo-commits] proj/portage:multilib commit in: lib/portage/package/ebuild/
commit: b66884331d72ca67c5c981c7e4b5973d9840cb89
Author: Thomas Sachau gentoo org>
AuthorDate: Mon Mar 21 10:19:14 2022 +
Commit: Thomas Sachau gentoo org>
CommitDate: Mon Mar 21 10:19:14 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b6688433
Fix intend
Signed-off-by: Thomas Sachau gentoo.org>
lib/portage/package/ebuild/config.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/portage/package/ebuild/config.py
b/lib/portage/package/ebuild/config.py
index 95439dedb..bf3a6ef09 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -1911,8 +1911,8 @@ class config:
if pkg_defaults:
defaults.extend(pkg_defaults)
defaults = " ".join(defaults)
- if self.configdict["defaults"].get("MULTILIB_ABIS", "").count('
') != 0:
- defaults = defaults + " multilib_abi_" +
self.configdict["defaults"].get("DEFAULT_ABI", "")
+if self.configdict["defaults"].get("MULTILIB_ABIS", "").count(' ') !=
0:
+defaults = defaults + " multilib_abi_" +
self.configdict["defaults"].get("DEFAULT_ABI", "")
if defaults != self.configdict["defaults"].get("USE", ""):
self.configdict["defaults"]["USE"] = defaults
has_changed = True
[gentoo-commits] proj/portage:multilib commit in: lib/portage/package/ebuild/
commit: 1410c0796fcb79ccb2cba7427621459dff3001a2
Author: Thomas Sachau gentoo org>
AuthorDate: Mon Mar 21 10:14:19 2022 +
Commit: Thomas Sachau gentoo org>
CommitDate: Mon Mar 21 10:14:19 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1410c079
Fix intend
Signed-off-by: Thomas Sachau gentoo.org>
lib/portage/package/ebuild/config.py | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/portage/package/ebuild/config.py
b/lib/portage/package/ebuild/config.py
index 198c6238e..95439dedb 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -1194,13 +1194,13 @@ class config:
# correct for evaluation of !test? conditionals in RESTRICT.
self.regenerate()
- if 'force-multilib' in self.features:
- #add multilib_abi internally to list of
USE_EXPANDed vars
- self["USE_EXPAND"] = "MULTILIB_ABI" + " " +
self.get("USE_EXPAND", "")
- self.backup_changes("USE_EXPAND")
- default_abi =
self.configdict["defaults"].get('DEFAULT_ABI', '').strip()
- if default_abi:
- self.configdict["defaults"]["USE"] =
self.configdict["defaults"].get("USE", "") + " multilib_abi_" + default_abi
+if 'force-multilib' in self.features:
+#add multilib_abi internally to list of USE_EXPANDed vars
+self["USE_EXPAND"] = "MULTILIB_ABI" + " " +
self.get("USE_EXPAND", "")
+self.backup_changes("USE_EXPAND")
+default_abi = self.configdict["defaults"].get('DEFAULT_ABI',
'').strip()
+if default_abi:
+self.configdict["defaults"]["USE"] =
self.configdict["defaults"].get("USE", "") + " multilib_abi_" + default_abi
if unprivileged:
self.features.add("unprivileged")
[gentoo-commits] proj/portage:multilib commit in: lib/portage/dep/
commit: a7727547b795a3399883a2b7547657d43978d783
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Jan 9 11:41:55 2022 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Jan 9 11:41:55 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a7727547
Remove eclass dependencies for NO_AUTO_FLAG
Signed-off-by: Thomas Sachau gentoo.org>
lib/portage/dep/dep_check.py | 23 +++
1 file changed, 23 insertions(+)
diff --git a/lib/portage/dep/dep_check.py b/lib/portage/dep/dep_check.py
index a1c37bcb9..90f0eefe4 100644
--- a/lib/portage/dep/dep_check.py
+++ b/lib/portage/dep/dep_check.py
@@ -133,6 +133,29 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi,
mysettings, myroot="/",
x = Atom(x.unevaluated_atom.without_use
+
"[%s]" % (",".join(use_tokens)))
x = x.evaluate_conditionals(myuse)
+ if not repoman and x.cp in
mysettings.get("NO_AUTO_FLAG", "").split():
+ if x.unevaluated_atom.use is None:
+ use_tokens = []
+ else:
+ use_tokens =
list(x.unevaluated_atom.use.tokens)
+ if 'abi_x86_64' in use_tokens:
+ use_tokens.remove('abi_x86_64')
+ if 'abi_x86_64(-)' in use_tokens:
+ use_tokens.remove('abi_x86_64(-)')
+ if 'abi_x86_64(-)?' in use_tokens:
+ use_tokens.remove('abi_x86_64(-)?')
+ if 'abi_x86_32' in use_tokens:
+ use_tokens.remove('abi_x86_32')
+ if 'abi_x86_32(-)' in use_tokens:
+ use_tokens.remove('abi_x86_32(-)')
+ if 'abi_x86_32(-)?' in use_tokens:
+ use_tokens.remove('abi_x86_32(-)?')
+ if use_tokens:
+ x = Atom(x.unevaluated_atom.without_use
+
+ "[%s]" % (",".join(use_tokens)))
+ else:
+ x = x.unevaluated_atom.without_use
+ x = x.evaluate_conditionals(myuse)
mykey = x.cp
if not mykey.startswith("virtual/"):
newsplit.append(x)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 4188cc1aa0a247a3d8a93cce13da8a281e3c83df Author: Thomas Sachau gentoo org> AuthorDate: Sat Oct 30 09:34:13 2021 + Commit: Thomas Sachau gentoo org> CommitDate: Sat Oct 30 09:37:05 2021 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4188cc1a Merge tag 'portage-3.0.22' into multilib portage-3.0.22 Signed-off-by: Thomas Sachau gentoo.org> .github/workflows/ci.yml | 4 ++-- MANIFEST.in| 2 ++ NEWS | 9 + bin/estrip | 4 +++- lib/_emerge/resolver/output_helpers.py | 21 +++-- lib/portage/package/ebuild/doebuild.py | 11 ++- man/emerge.1 | 2 +- man/make.conf.5| 3 +-- setup.py | 2 +- tox.ini| 18 +- 10 files changed, 57 insertions(+), 19 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: d3588989ed5cd2abee8dd4bacf6067491eb36096 Author: Thomas Sachau gentoo org> AuthorDate: Sat Oct 30 09:37:49 2021 + Commit: Thomas Sachau gentoo org> CommitDate: Sat Oct 30 09:37:49 2021 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d3588989 Merge tag 'portage-3.0.23' into multilib portage-3.0.23 Signed-off-by: Thomas Sachau gentoo.org> NEWS | 9 + bin/dispatch-conf | 13 ++- bin/ebuild.sh | 8 bin/pid-ns-init| 20 +- lib/_emerge/post_emerge.py | 2 +- lib/portage/dispatch_conf.py | 15 lib/portage/package/ebuild/doebuild.py | 2 +- lib/portage/sync/controller.py | 16 +--- .../util/_dyn_libs/display_preserved_libs.py | 11 -- lib/portage/util/hooks.py | 43 ++ man/dispatch-conf.1| 5 +++ man/make.conf.5| 5 ++- setup.py | 2 +- 13 files changed, 127 insertions(+), 24 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: bin/
commit: be19c869f7ac79ddc79599a857d9d2b0603b13ab
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Aug 22 12:46:36 2021 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Aug 22 12:46:36 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=be19c869
Add some extra code for libgpg-error
Signed-off-by: Thomas Sachau gentoo.org>
bin/auto-multilib.sh | 11 +++
1 file changed, 11 insertions(+)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 103565209..2df2d9b4e 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -283,6 +283,17 @@ _finalize_abi_install() {
ln -s i686-pc-linux-gnu-llvm-config
"${D}"/usr/lib/llvm/"${PV//.*}"/bin/llvm-config-x86
fi
fi
+ if [[ "${PN}" == "libgpg-error" ]] ; then
+ if [[ ${ABI} == ${first_installed_abi} ]] ; then
+ mv
"${D}"/usr/bin/x86_64-pc-linux-gnu-gpg-error-config-amd64
"${D}"/usr/bin/gpg-error-config-amd64 || die
+ rm
"${D}"/usr/bin/{x86_64-pc-linux-gnu-gpg-error-config,gpg-error-config} || die
+ ln -s /bin/abi-wrapper "${D}"/usr/bin/gpg-error-config
|| die
+ ln -s gpg-error-config
"${D}"/usr/bin/x86_64-pc-linux-gnu-gpg-error-config || die
+ else
+ mv
"${D}"/usr/bin/i686-pc-linux-gnu-gpg-error-config-x86
"${D}"/usr/bin/gpg-error-config-x86 || die
+ ln -s gpg-error-config
"${D}"/usr/bin/i686-pc-linux-gnu-gpg-error-config || die
+ fi
+ fi
local noabi=()
for i in ${MULTILIB_ABIS}; do
[gentoo-commits] proj/portage:multilib commit in: /
commit: c0a00cde2d10eda4c207d488e01b48e0bfc75ce9 Author: Thomas Sachau gentoo org> AuthorDate: Sun Jul 25 11:43:19 2021 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jul 25 11:43:22 2021 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c0a00cde Merge tag 'portage-3.0.21' into multilib portage-3.0.21 Signed-off-by: Zac Medico gentoo.org> Signed-off-by: Thomas Sachau gentoo.org> .github/workflows/ci.yml | 2 +- NEWS | 4 ++ README | 2 +- bin/ebuild.sh | 16 +++--- bin/estrip | 14 ++--- bin/install-qa-check.d/10executable-issues | 2 +- bin/install-qa-check.d/10ignored-flags | 4 +- bin/install-qa-check.d/80libraries | 2 +- bin/misc-functions.sh | 2 +- bin/phase-functions.sh | 8 +-- bin/phase-helpers.sh | 2 +- bin/pid-ns-init| 22 +--- lib/_emerge/actions.py | 36 ++--- lib/portage/_sets/dbapi.py | 4 +- lib/portage/package/ebuild/fetch.py| 4 +- man/make.conf.5| 10 +--- setup.py | 84 ++ 17 files changed, 114 insertions(+), 104 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 2be6680750aee41ae5c9eaaade8d8a924e842066 Author: Thomas Sachau gentoo org> AuthorDate: Sun Jul 25 11:43:10 2021 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jul 25 11:43:15 2021 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2be66807 Merge tag 'portage-3.0.20' into multilib portage-3.0.20 Signed-off-by: Zac Medico gentoo.org> Signed-off-by: Thomas Sachau gentoo.org> NEWS | 4 RELEASE-NOTES | 5 bin/ebuild-ipc.py | 6 +++-- bin/ebuild.sh | 6 ++--- bin/misc-functions.sh | 13 ++ bin/phase-functions.sh | 3 ++- bin/pid-ns-init| 22 - bin/portageq | 6 +++-- lib/_emerge/EbuildPhase.py | 5 +++- lib/_emerge/actions.py | 36 +--- lib/portage/dbapi/porttree.py | 8 +-- lib/portage/package/ebuild/doebuild.py | 19 +++ lib/portage/package/ebuild/fetch.py| 21 - man/make.conf.5| 10 +++- repoman/setup.py | 40 +-- setup.py | 43 +++--- 16 files changed, 194 insertions(+), 53 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 6047463bd3782fcc166b46f0dc781a378d626f68 Author: Thomas Sachau gentoo org> AuthorDate: Sun Jul 25 11:42:48 2021 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jul 25 11:43:02 2021 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6047463b Merge tag 'portage-3.0.19' into multilib portage-3.0.19 Signed-off-by: Zac Medico gentoo.org> Signed-off-by: Thomas Sachau gentoo.org> NEWS | 4 + RELEASE-NOTES | 13 ++ bin/eapi.sh| 76 - bin/ebuild-helpers/doconfd | 8 +- bin/ebuild-helpers/doenvd | 8 +- bin/ebuild-helpers/doheader| 8 +- bin/ebuild-helpers/doinitd | 9 +- bin/ebuild-helpers/dosym | 67 +++- bin/ebuild-ipc.py | 20 ++- bin/ebuild.sh | 65 ++-- bin/isolated-functions.sh | 6 +- bin/phase-functions.sh | 16 +- bin/phase-helpers.sh | 60 +-- bin/regenworld | 7 +- cnf/sets/portage.conf | 1 + lib/_emerge/EbuildBuild.py | 25 ++- lib/_emerge/Package.py | 8 +- lib/_emerge/PackageUninstall.py| 2 +- lib/_emerge/Scheduler.py | 36 +++-- lib/_emerge/actions.py | 30 +++- lib/_emerge/depgraph.py| 7 +- lib/_emerge/main.py| 4 +- lib/_emerge/unmerge.py | 19 ++- lib/portage/__init__.py| 4 +- lib/portage/_emirrordist/FetchIterator.py | 68 lib/portage/_sets/dbapi.py | 6 + lib/portage/cache/metadata.py | 4 +- lib/portage/const.py | 4 +- lib/portage/dbapi/bintree.py | 7 +- lib/portage/dbapi/porttree.py | 4 +- lib/portage/dbapi/vartree.py | 2 +- lib/portage/dep/__init__.py| 8 +- lib/portage/dispatch_conf.py | 4 +- lib/portage/eapi.py| 15 +- .../package/ebuild/_config/special_env_vars.py | 7 +- lib/portage/package/ebuild/config.py | 24 ++- lib/portage/package/ebuild/doebuild.py | 15 +- lib/portage/package/ebuild/fetch.py| 66 lib/portage/tests/__init__.py | 127 --- lib/portage/tests/ebuild/test_shell_quote.py | 126 +++ lib/portage/tests/emerge/test_simple.py| 10 +- lib/portage/tests/resolver/ResolverPlayground.py | 39 - lib/portage/tests/resolver/test_unmerge_order.py | 179 + lib/portage/update.py | 17 +- lib/portage/util/_async/PipeLogger.py | 35 ++-- lib/portage/util/env_update.py | 5 + man/ebuild.5 | 33 +++- man/emerge.1 | 2 +- man/make.conf.5| 34 +++- man/portage.5 | 33 +++- repoman/RELEASE-NOTES | 6 + repoman/lib/repoman/argparser.py | 5 +- repoman/lib/repoman/main.py| 2 +- repoman/lib/repoman/modules/scan/module.py | 4 +- repoman/lib/repoman/tests/__init__.py | 18 +-- repoman/lib/repoman/tests/simple/test_simple.py| 6 +- repoman/setup.py | 9 +- setup.py | 2 +- 58 files changed, 1147 insertions(+), 282 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: bin/
commit: 9073e2eabf3e905011d5bd747d2c17a02654bedf
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Jul 25 11:39:12 2021 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Jul 25 11:42:14 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9073e2ea
Update some llvm exceptions
Signed-off-by: Thomas Sachau gentoo.org>
bin/auto-multilib.sh | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index c5e70ada7..103565209 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -269,13 +269,20 @@ _finalize_abi_install() {
if [ "${ABI}" != "${first_installed_abi}" ]; then
__vecho ">>> Removing installed symlinks $(_get_abi_string)"
for i in $(find ${D} -type l) ; do
- [[ -L "${D%/}".${first_installed_abi}/${i/${D}} ]] &&
rm -f ${i}
+ [[ -L "${D%/}".${first_installed_abi}/${i/${D}} ]] &&
[[ "${PN}" != "llvm" ]] && rm -f ${i}
done
fi
# Create wrapper symlink for *-config files
local i=
- prep_ml_binaries $(find "${D}"/usr/bin "${D}"/usr/sbin "${D}"/bin
"${D}"/sbin "${D}"/usr/lib/llvm/*/bin -type f -name '*-config' 2>/dev/null)
+ prep_ml_binaries $(find "${D}"/usr/bin "${D}"/usr/sbin "${D}"/bin
"${D}"/sbin -type f -name '*-config' 2>/dev/null)
+ if [[ "${PN}" == "llvm" ]] ; then
+ if [[ ${ABI} == ${first_installed_abi} ]] ; then
+ prep_ml_binaries "${D}"/usr/lib/llvm/*/bin/llvm-config
+ else
+ ln -s i686-pc-linux-gnu-llvm-config
"${D}"/usr/lib/llvm/"${PV//.*}"/bin/llvm-config-x86
+ fi
+ fi
local noabi=()
for i in ${MULTILIB_ABIS}; do
[gentoo-commits] proj/portage:multilib commit in: /
commit: 639064263dbd0d1a0753d8e754c53ac0ff10768b Author: Thomas Sachau gentoo org> AuthorDate: Sat Apr 3 08:28:06 2021 + Commit: Thomas Sachau gentoo org> CommitDate: Sat Apr 3 08:28:06 2021 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=63906426 Merge tag 'portage-3.0.18' into multilib portage-3.0.18 Signed-off-by: Zac Medico gentoo.org> Signed-off-by: Thomas Sachau gentoo.org> NEWS | 4 + RELEASE-NOTES | 7 + bin/glsa-check | 3 +- lib/_emerge/BlockerCache.py| 6 +- lib/_emerge/help.py| 2 +- lib/_emerge/main.py| 2 + lib/portage/_sets/ProfilePackageSet.py | 9 +- lib/portage/_sets/profiles.py | 10 +- lib/portage/dbapi/_VdbMetadataDelta.py | 11 +- lib/portage/dbapi/vartree.py | 6 +- lib/portage/dep/__init__.py| 7 +- lib/portage/eapi.py| 107 --- lib/portage/emaint/modules/sync/sync.py| 40 +++- lib/portage/locks.py | 4 + .../package/ebuild/_config/KeywordsManager.py | 7 +- .../package/ebuild/_config/LocationsManager.py | 11 +- lib/portage/package/ebuild/_config/MaskManager.py | 7 +- lib/portage/package/ebuild/_config/UseManager.py | 12 +- lib/portage/package/ebuild/config.py | 11 +- lib/portage/repository/config.py | 34 +++- lib/portage/tests/dep/test_isvalidatom.py | 26 ++- lib/portage/tests/resolver/ResolverPlayground.py | 10 +- .../test_build_id_profile_format.py| 14 +- lib/portage/tests/sync/test_sync_local.py | 15 +- man/emerge.1 | 2 +- man/portage.5 | 6 +- repoman/bin/repoman| 4 +- repoman/cnf/qa_data/qa_data.yaml | 1 + repoman/cnf/repository/qa_data.yaml| 1 + repoman/cnf/repository/repository.yaml | 1 + repoman/lib/repoman/actions.py | 1 - repoman/lib/repoman/main.py| 43 - .../repoman/modules/linechecks/phases/__init__.py | 6 + .../lib/repoman/modules/linechecks/phases/phase.py | 132 +- repoman/lib/repoman/repos.py | 8 +- repoman/lib/repoman/tests/simple/test_simple.py| 203 + repoman/man/repoman.1 | 5 +- setup.py | 11 +- 38 files changed, 647 insertions(+), 142 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 8386b1c30385294d1f9e3f982bf3e2cd6fa204ad Author: Thomas Sachau gentoo org> AuthorDate: Sat Apr 3 08:27:55 2021 + Commit: Thomas Sachau gentoo org> CommitDate: Sat Apr 3 08:27:55 2021 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8386b1c3 Merge tag 'portage-3.0.16' into multilib portage-3.0.16 Signed-off-by: Zac Medico gentoo.org> Signed-off-by: Thomas Sachau gentoo.org> NEWS | 3 + RELEASE-NOTES | 9 + bin/shelve-utils | 36 .../_compat_upgrade/binpkg_multi_instance.py | 33 lib/portage/_emirrordist/Config.py | 39 ++-- lib/portage/_emirrordist/ContentDB.py | 196 + lib/portage/_emirrordist/DeletionIterator.py | 25 ++- lib/portage/_emirrordist/DeletionTask.py | 8 + lib/portage/_emirrordist/FetchIterator.py | 3 +- lib/portage/_emirrordist/FetchTask.py | 5 +- lib/portage/_emirrordist/main.py | 15 +- lib/portage/dbapi/bintree.py | 1 + lib/portage/package/ebuild/fetch.py| 12 +- lib/portage/repository/config.py | 2 + lib/portage/tests/ebuild/test_fetch.py | 160 - .../resolver/test_autounmask_use_slot_conflict.py | 51 ++ lib/portage/tests/util/test_shelve.py | 60 +++ lib/portage/util/path.py | 4 +- lib/portage/util/shelve.py | 58 ++ man/emirrordist.1 | 6 +- repoman/cnf/linechecks/linechecks.yaml | 2 +- .../modules/linechecks/deprecated/deprecated.py| 2 +- setup.py | 2 +- 23 files changed, 693 insertions(+), 39 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 0ea03067346adce3e7e825f3a47c1547a5d1856c Author: Thomas Sachau gentoo org> AuthorDate: Sat Apr 3 08:27:48 2021 + Commit: Thomas Sachau gentoo org> CommitDate: Sat Apr 3 08:27:48 2021 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0ea03067 Merge tag 'portage-3.0.15' into multilib portage-3.0.15 Signed-off-by: Zac Medico gentoo.org> Signed-off-by: Thomas Sachau gentoo.org> .github/workflows/ci.yml | 2 +- NEWS | 5 + RELEASE-NOTES | 12 ++ cnf/make.globals | 1 + lib/_emerge/create_depgraph_params.py | 8 +- lib/portage/__init__.py | 4 +- lib/portage/_emirrordist/FetchTask.py | 3 +- lib/portage/emaint/modules/merges/__init__.py | 14 +- lib/portage/emaint/modules/merges/merges.py | 11 +- lib/portage/package/ebuild/config.py | 17 ++- lib/portage/package/ebuild/fetch.py | 195 -- lib/portage/tests/ebuild/test_fetch.py| 182 +++- lib/portage/tests/emerge/test_simple.py | 4 +- lib/portage/tests/resolver/test_autounmask.py | 25 +++- lib/portage/util/_async/PopenProcess.py | 4 +- man/emaint.1 | 6 +- man/emerge.1 | 11 +- man/make.conf.5 | 9 +- setup.py | 4 +- tox.ini | 2 +- 20 files changed, 434 insertions(+), 85 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 76014e501af0bd835a536f968e68df3e1a81f8fe Author: Thomas Sachau gentoo org> AuthorDate: Sat Apr 3 08:28:00 2021 + Commit: Thomas Sachau gentoo org> CommitDate: Sat Apr 3 08:28:00 2021 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=76014e50 Merge tag 'portage-3.0.17' into multilib portage-3.0.17 Signed-off-by: Zac Medico gentoo.org> Signed-off-by: Thomas Sachau gentoo.org> MANIFEST.in|3 + RELEASE-NOTES |5 + bin/chmod-lite | 11 +- bin/ebuild-ipc |9 +- bin/ebuild-pyhelper| 21 + bin/egencache |2 - lib/_emerge/EbuildPhase.py | 28 +- lib/_emerge/Package.py |9 - lib/_emerge/Scheduler.py |2 - lib/_emerge/UseFlagDisplay.py |2 - lib/_emerge/create_depgraph_params.py | 22 +- lib/_emerge/resolver/output.py |2 - lib/portage/__init__.py| 14 +- lib/portage/cache/flat_hash.py |3 - lib/portage/dbapi/vartree.py | 42 +- lib/portage/locks.py | 91 +- .../tests/resolver/test_unpack_dependencies.py | 65 -- lib/portage/tests/resolver/test_use_aliases.py | 131 --- lib/portage/tests/resolver/test_useflags.py| 28 +- lib/portage/tests/unicode/test_string_format.py|9 - lib/portage/util/_async/BuildLogger.py | 12 +- lib/portage/util/_async/PipeLogger.py | 12 +- lib/portage/util/_async/SchedulerInterface.py | 10 +- lib/portage/util/_eventloop/EventLoop.py | 1153 lib/portage/util/_eventloop/PollConstants.py | 17 - lib/portage/util/_eventloop/PollSelectAdapter.py | 74 -- lib/portage/util/_eventloop/asyncio_event_loop.py |7 +- lib/portage/util/bin_entry_point.py| 35 + lib/portage/util/digraph.py|3 - lib/portage/util/futures/_asyncio/__init__.py | 50 +- lib/portage/util/futures/_asyncio/process.py | 116 -- lib/portage/util/futures/_asyncio/streams.py | 13 +- lib/portage/util/futures/_asyncio/tasks.py | 96 -- lib/portage/util/futures/events.py | 186 lib/portage/util/futures/futures.py| 156 +-- lib/portage/util/futures/transports.py | 87 -- lib/portage/util/futures/unix_events.py| 626 +-- lib/portage/versions.py| 10 +- man/emerge.1 |9 +- man/make.conf.5|8 +- pyproject.toml |6 + setup.py | 102 +- 42 files changed, 366 insertions(+), 2921 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 2663f1d5badc58440f289f67c53d7f661b90ee4e Author: Thomas Sachau gentoo org> AuthorDate: Sat Jan 23 09:50:49 2021 + Commit: Thomas Sachau gentoo org> CommitDate: Sat Jan 23 09:52:02 2021 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2663f1d5 Merge tag 'portage-3.0.14' into multilib portage-3.0.14 Signed-off-by: Zac Medico gentoo.org> Signed-off-by: Thomas Sachau gentoo.org> RELEASE-NOTES | 13 + bin/clean_locks| 5 +- bin/dispatch-conf | 17 --- bin/ebuild | 4 +- bin/egencache | 6 +-- bin/emerge | 13 ++--- bin/glsa-check | 5 +- bin/portageq | 18 +++ bin/quickpkg | 10 ++-- bin/regenworld | 6 +-- cnf/sets/portage.conf | 5 ++ doc/config/sets.docbook| 8 +++ lib/portage/__init__.py| 3 +- lib/portage/_sets/dbapi.py | 39 ++- lib/portage/dbapi/bintree.py | 58 ++ lib/portage/dbapi/vartree.py | 8 +-- lib/portage/emaint/modules/move/move.py| 13 - lib/portage/package/ebuild/doebuild.py | 13 +++-- .../repository/storage/hardlink_quarantine.py | 45 +++-- lib/portage/repository/storage/hardlink_rcu.py | 57 - lib/portage/repository/storage/inplace.py | 27 +++--- lib/portage/repository/storage/interface.py| 17 +++ lib/portage/tests/dbapi/test_auxdb.py | 12 ++--- lib/portage/tests/emerge/test_simple.py| 16 +++--- lib/portage/tests/process/test_AsyncFunction.py| 10 ++-- lib/portage/tests/process/test_PipeLogger.py | 22 lib/portage/tests/update/test_move_ent.py | 7 +-- .../util/futures/asyncio/test_child_watcher.py | 10 ++-- .../util/futures/asyncio/test_subprocess_exec.py | 32 ++-- lib/portage/tests/util/futures/test_retry.py | 28 --- lib/portage/tests/util/test_socks5.py | 4 +- lib/portage/util/futures/_sync_decorator.py| 6 +-- lib/portage/util/futures/compat_coroutine.py | 6 +-- lib/portage/util/socks5.py | 9 ++-- man/make.conf.5| 2 +- repoman/lib/repoman/_subprocess.py | 4 -- repoman/lib/repoman/actions.py | 3 +- repoman/lib/repoman/config.py | 5 -- repoman/lib/repoman/gpg.py | 2 - repoman/lib/repoman/main.py| 3 +- repoman/lib/repoman/metadata.py| 1 - repoman/lib/repoman/modules/commit/manifest.py | 1 - repoman/lib/repoman/modules/commit/repochecks.py | 1 - repoman/lib/repoman/modules/linechecks/__init__.py | 1 - .../modules/linechecks/assignment/__init__.py | 3 +- .../repoman/modules/linechecks/depend/__init__.py | 3 +- .../modules/linechecks/deprecated/__init__.py | 3 +- .../modules/linechecks/deprecated/deprecated.py| 2 +- .../lib/repoman/modules/linechecks/do/__init__.py | 3 +- .../repoman/modules/linechecks/eapi/__init__.py| 3 +- .../repoman/modules/linechecks/emake/__init__.py | 3 +- .../modules/linechecks/gentoo_header/__init__.py | 3 +- .../repoman/modules/linechecks/helpers/__init__.py | 3 +- .../repoman/modules/linechecks/helpers/offset.py | 2 +- .../repoman/modules/linechecks/nested/__init__.py | 3 +- .../repoman/modules/linechecks/patches/__init__.py | 3 +- .../repoman/modules/linechecks/patches/patches.py | 3 +- .../repoman/modules/linechecks/phases/__init__.py | 3 +- .../repoman/modules/linechecks/portage/__init__.py | 3 +- .../repoman/modules/linechecks/quotes/__init__.py | 3 +- .../lib/repoman/modules/linechecks/uri/__init__.py | 3 +- repoman/lib/repoman/modules/linechecks/uri/uri.py | 28 +-- .../lib/repoman/modules/linechecks/use/__init__.py | 3 +- .../repoman/modules/linechecks/use/builtwith.py| 2 +- .../repoman/modules/linechecks/useless/__init__.py | 3 +- .../modules/linechecks/whitespace/__init__.py | 3 +- .../modules/linechecks/workaround/__init__.py | 3 +- .../modules/linechecks/workaround/workarounds.py | 2 +- .../lib/repoman/modules/scan/depend/__init__.py| 3 +- .../repoman/modules/scan/depend/_depend_checks.py | 4 +- repoman/lib/repoman/modules/scan/depend/profile.py | 22 .../repoman/modules/scan/directories/__init__.py | 3 +- repoman/lib/repoman/modules/scan/eapi/__init__.py | 3 +- .../lib/repoman/modules/
[gentoo-commits] proj/portage:multilib commit in: bin/
commit: 226639dfaaa4bc329b07bd24d214d7323c9ba6e3
Author: Thomas Sachau gentoo org>
AuthorDate: Sat Jan 23 09:50:23 2021 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sat Jan 23 09:50:23 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=226639df
Avoid sandbox violations for symlinks
Signed-off-by: Thomas Sachau gentoo.org>
bin/auto-multilib.sh | 10 ++
1 file changed, 10 insertions(+)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index e12f2a516..c5e70ada7 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -377,7 +377,17 @@ _finalize_abi_install() {
done
if [[ -d "${D%/}.${DEFAULT_ABI}" ]]; then
cd "${D%/}.${DEFAULT_ABI}"
+ #disable sandbox for symlinks
+ local x=
+ if [[ -n $SANDBOX_ON ]] ; then
+ x=$SANDBOX_ON
+ export SANDBOX_ON=0
+ fi
find . | tar -c -T - -f - | tar -x -P -f - -C "${D}"
+ if [[ -n $x ]] ; then
+ export SANDBOX_ON=$x
+ fi
+ unset x
cd ..
rm -rf "${D%/}.${DEFAULT_ABI}"
fi
[gentoo-commits] proj/portage:multilib commit in: bin/
commit: 2cf0e1224b7d8f4016dda0c197539c85d86ec65c
Author: Thomas Sachau gentoo org>
AuthorDate: Fri Jan 15 17:15:46 2021 +
Commit: Thomas Sachau gentoo org>
CommitDate: Fri Jan 15 17:15:46 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2cf0e122
Dont loop with readonly variables
Signed-off-by: Thomas Sachau gentoo.org>
bin/phase-functions.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 0e87a051c..b74d611d4 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -1164,6 +1164,8 @@ __ebuild_main() {
# >/dev/null = backward compactibility
for prerm/postrm
source "${T}"/environment 2>/dev/null
|| die
fi
+ #dont run more then once with readonly variables
+ grep -q "readonly " "${T}"/environment && break
done
else
export SANDBOX_ON="0"
[gentoo-commits] proj/portage:multilib commit in: /
commit: 688a2012b8e4d5d66406e7d3ee2eb140569a4b20 Author: Thomas Sachau gentoo org> AuthorDate: Fri Jan 15 16:20:22 2021 + Commit: Thomas Sachau gentoo org> CommitDate: Fri Jan 15 16:20:22 2021 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=688a2012 Merge tag 'portage-3.0.13' into multilib portage-3.0.13 Signed-off-by: Zac Medico gentoo.org> Signed-off-by: Thomas Sachau gentoo.org> .github/workflows/ci.yml | 43 + .travis.yml| 26 --- NEWS | 6 + RELEASE-NOTES | 7 + bin/misc-functions.sh | 2 +- lib/_emerge/depgraph.py| 22 +++ lib/portage/__init__.py| 3 +- lib/portage/package/ebuild/fetch.py| 11 +- .../resolver/test_slot_operator_reverse_deps.py| 98 ++- lib/portage/tests/util/futures/test_retry.py | 181 - lib/portage/util/__init__.py | 9 +- lib/portage/util/_eventloop/asyncio_event_loop.py | 30 +++- lib/portage/util/_eventloop/global_event_loop.py | 28 +--- lib/portage/util/env_update.py | 30 ++-- lib/portage/util/futures/_asyncio/__init__.py | 30 +++- lib/portage/util/futures/retry.py | 4 +- man/make.conf.5| 14 +- repoman/runtests | 5 +- runtests | 5 +- setup.py | 2 +- src/portage_util_file_copy_reflink_linux.c | 10 +- src/portage_util_libc.c| 10 +- tox.ini| 15 +- 23 files changed, 402 insertions(+), 189 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 04f0ae199e3cb389f48a99db6b2a981ae7848aa9 Author: Thomas Sachau gentoo org> AuthorDate: Fri Jan 15 16:20:11 2021 + Commit: Thomas Sachau gentoo org> CommitDate: Fri Jan 15 16:20:11 2021 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=04f0ae19 Merge tag 'portage-3.0.11' into multilib portage-3.0.11 Signed-off-by: Zac Medico gentoo.org> Signed-off-by: Thomas Sachau gentoo.org> RELEASE-NOTES | 6 ++ lib/_emerge/depgraph.py| 68 +--- lib/portage/dep/dep_check.py | 31 --- .../tests/resolver/test_circular_choices_rust.py | 94 ++ lib/portage/util/_compare_files.py | 4 +- setup.py | 2 +- 6 files changed, 178 insertions(+), 27 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 82a7f2ce3f7d5084e92a3cb3d87c3b7212a55fc6 Author: Thomas Sachau gentoo org> AuthorDate: Fri Jan 15 16:19:50 2021 + Commit: Thomas Sachau gentoo org> CommitDate: Fri Jan 15 16:19:50 2021 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=82a7f2ce Merge tag 'portage-3.0.9' into multilib Signed-off-by: Thomas Sachau gentoo.org> RELEASE-NOTES | 9 + bin/isolated-functions.sh | 3 +-- bin/phase-helpers.sh | 3 +-- bin/pid-ns-init | 24 ++- cnf/repo.postsync.d/example | 3 ++- cnf/sets/portage.conf | 6 ++ lib/_emerge/actions.py| 19 +++--- lib/_emerge/depgraph.py | 11 +-- lib/_emerge/main.py | 5 + lib/portage/package/ebuild/config.py | 7 ++- lib/portage/tests/emerge/test_simple.py | 8 +++- lib/portage/util/movefile.py | 10 -- man/emerge.1 | 10 -- repoman/RELEASE-NOTES | 5 + repoman/cnf/qa_data/qa_data.yaml | 1 - repoman/cnf/repository/qa_data.yaml | 1 - repoman/lib/repoman/modules/scan/fetch/fetches.py | 7 +-- repoman/man/repoman.1 | 2 +- repoman/setup.py | 2 +- setup.py | 2 +- 20 files changed, 106 insertions(+), 32 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 7909a449f65b354ea061f1e91f92e918ae2a7247 Author: Thomas Sachau gentoo org> AuthorDate: Fri Jan 15 16:20:17 2021 + Commit: Thomas Sachau gentoo org> CommitDate: Fri Jan 15 16:20:17 2021 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7909a449 Merge tag 'portage-3.0.12' into multilib portage-3.0.12 Signed-off-by: Zac Medico gentoo.org> Signed-off-by: Thomas Sachau gentoo.org> RELEASE-NOTES | 6 +++ lib/_emerge/DepPrioritySatisfiedRange.py | 1 + lib/_emerge/depgraph.py | 10 ++-- lib/portage/__init__.py | 4 ++ lib/portage/dbapi/vartree.py | 1 - lib/portage/package/ebuild/doebuild.py| 1 - lib/portage/tests/resolver/test_merge_order.py| 27 ++- lib/portage/util/_eventloop/asyncio_event_loop.py | 6 ++- lib/portage/util/_eventloop/global_event_loop.py | 7 --- lib/portage/util/futures/_asyncio/__init__.py | 59 --- setup.py | 2 +- 11 files changed, 98 insertions(+), 26 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 0905e720dfeb192d27951b8f53d1577b3c45539e Author: Thomas Sachau gentoo org> AuthorDate: Fri Jan 15 16:19:56 2021 + Commit: Thomas Sachau gentoo org> CommitDate: Fri Jan 15 16:19:56 2021 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0905e720 Merge tag 'portage-3.0.10' into multilib portage-3.0.10 Signed-off-by: Zac Medico gentoo.org> Signed-off-by: Thomas Sachau gentoo.org> RELEASE-NOTES | 7 + doc/package/ebuild/eapi/4.docbook | 2 +- lib/_emerge/DepPriorityNormalRange.py | 2 + lib/_emerge/DepPrioritySatisfiedRange.py | 53 +++--- lib/_emerge/depgraph.py| 45 +++-- lib/portage/cache/template.py | 2 +- .../package/ebuild/_config/KeywordsManager.py | 2 +- .../package/ebuild/_config/LocationsManager.py | 30 ++- lib/portage/package/ebuild/_config/UseManager.py | 4 +- lib/portage/package/ebuild/config.py | 2 +- .../package/ebuild/deprecated_profile_check.py | 9 +- lib/portage/tests/resolver/test_merge_order.py | 10 + .../tests/resolver/test_slot_operator_bdeps.py | 209 + lib/portage/util/_compare_files.py | 3 +- lib/portage/util/netlink.py| 2 +- man/make.conf.5| 2 +- setup.py | 2 +- 17 files changed, 325 insertions(+), 61 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: bin/
commit: a0a5b84ed6255e982d3496643566c396e8d7c870
Author: Thomas Sachau gentoo org>
AuthorDate: Fri Jan 15 16:14:30 2021 +
Commit: Thomas Sachau gentoo org>
CommitDate: Fri Jan 15 16:19:22 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a0a5b84e
Preserve symlinks for default abi
Signed-off-by: Thomas Sachau gentoo.org>
bin/auto-multilib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 010ec1cd6..e12f2a516 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -377,7 +377,7 @@ _finalize_abi_install() {
done
if [[ -d "${D%/}.${DEFAULT_ABI}" ]]; then
cd "${D%/}.${DEFAULT_ABI}"
- find . | tar -c -T - -f - | tar -x -f - -C "${D}"
+ find . | tar -c -T - -f - | tar -x -P -f - -C "${D}"
cd ..
rm -rf "${D%/}.${DEFAULT_ABI}"
fi
[gentoo-commits] proj/portage:multilib commit in: lib/_emerge/
commit: 06ad89f7678ba2284636a30db1e27f41450ea1e3
Author: Thomas Sachau gentoo org>
AuthorDate: Fri Oct 30 10:54:01 2020 +
Commit: Thomas Sachau gentoo org>
CommitDate: Fri Oct 30 10:54:01 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=06ad89f7
Fix warning
Signed-off-by: Thomas Sachau gentoo.org>
lib/_emerge/actions.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py
index 8fb07bbd8..0472cb951 100644
--- a/lib/_emerge/actions.py
+++ b/lib/_emerge/actions.py
@@ -2954,7 +2954,7 @@ def run_action(emerge_config):
apply_priorities(emerge_config.target_config.settings)
if 'force-multilib' in emerge_config.target_config.settings.features:
- if emerge_config.target_config.settings.get("NO_AUTO_FLAG", "")
is "":
+ if emerge_config.target_config.settings.get("NO_AUTO_FLAG", "")
== "":
writemsg_level(bad("!!! Failed to find vars from extra
profile") + "\n",level=logging.ERROR, noiselevel=-1)
writemsg_level(bad("!!! Please make sure that you did
follow the instructions and included the extra profile\n"),level=logging.ERROR,
noiselevel=-1)
writemsg_level(bad("!!!
http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=blob;f=doc/portage-multilib-instructions\n";),level=logging.ERROR,
noiselevel=-1)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 06bf06b15d07953e4a18865c1ff6264d908eb652
Author: Thomas Sachau gentoo org>
AuthorDate: Fri Oct 30 10:28:12 2020 +
Commit: Thomas Sachau gentoo org>
CommitDate: Fri Oct 30 10:28:58 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=06bf06b1
Merge tag 'portage-3.0.8' into multilib
portage-3.0.8
Signed-off-by: Zac Medico gentoo.org>
Signed-off-by: Thomas Sachau gentoo.org>
NEWS | 15 ++
RELEASE-NOTES | 39 +
bin/egencache | 122 ---
bin/quickpkg | 2 +-
cnf/repo.postsync.d/example| 19 ++-
lib/_emerge/BinpkgFetcher.py | 29 ++--
lib/_emerge/EbuildBinpkg.py| 4 +-
lib/_emerge/Scheduler.py | 142 -
lib/_emerge/actions.py | 16 +-
lib/_emerge/depgraph.py| 38 +++--
lib/_emerge/main.py| 6 +
lib/_emerge/resolver/backtracking.py | 7 +-
lib/_emerge/search.py | 12 +-
lib/portage/_emirrordist/FetchTask.py | 4 +-
lib/portage/_selinux.py| 16 +-
lib/portage/_sets/dbapi.py | 51 ++
.../{_compat_upgrade => binrepo}/__init__.py | 0
lib/portage/binrepo/config.py | 133
lib/portage/cache/metadata.py | 4 +-
lib/portage/const.py | 2 +
lib/portage/dbapi/bintree.py | 59 +--
lib/portage/dep/soname/multilib_category.py| 11 +-
lib/portage/elog/mod_mail_summary.py | 5 +-
lib/portage/elog/mod_save_summary.py | 2 +-
lib/portage/locks.py | 2 +-
lib/portage/package/ebuild/config.py | 6 +
lib/portage/package/ebuild/doebuild.py | 2 +-
lib/portage/package/ebuild/fetch.py| 8 +-
lib/portage/process.py | 16 +-
lib/portage/sync/modules/git/git.py| 14 +-
lib/portage/sync/modules/mercurial/__init__.py | 39 +
lib/portage/sync/modules/mercurial/mercurial.py| 174 +
lib/portage/sync/modules/rsync/rsync.py| 26 ++-
lib/portage/sync/modules/webrsync/webrsync.py | 4 +-
lib/portage/sync/syncbase.py | 21 +++
lib/portage/tests/emerge/test_simple.py| 14 +-
lib/portage/tests/locks/test_lock_nonblock.py | 1 +
.../resolver/test_slot_change_without_revbump.py | 4 +-
.../tests/resolver/test_slot_conflict_rebuild.py | 61 +++-
.../resolver/test_slot_operator_missed_update.py | 112 +
lib/portage/tests/sync/test_sync_local.py | 67 +++-
.../util/futures/asyncio/test_wakeup_fd_sigchld.py | 2 +-
lib/portage/util/__init__.py | 4 +-
lib/portage/util/_eventloop/EventLoop.py | 6 +-
lib/portage/util/_eventloop/asyncio_event_loop.py | 4 +-
lib/portage/util/_eventloop/global_event_loop.py | 7 +-
lib/portage/util/_urlopen.py | 10 +-
lib/portage/util/env_update.py | 42 -
lib/portage/util/futures/iter_completed.py | 1 -
lib/portage/util/locale.py | 1 +
lib/portage/util/movefile.py | 2 +-
lib/portage/util/socks5.py | 2 +-
lib/portage/xpak.py| 2 +-
man/egencache.1| 12 +-
man/emerge.1 | 12 +-
man/make.conf.5| 11 +-
man/portage.5 | 118 +++---
repoman/RELEASE-NOTES | 5 +
repoman/setup.py | 2 +-
setup.py | 2 +-
60 files changed, 1288 insertions(+), 266 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: lib/portage/dep/
commit: e2dc3cab8c699de77402ad3262847a18ac567b7c
Author: Thomas Sachau gentoo org>
AuthorDate: Fri Oct 30 10:25:01 2020 +
Commit: Thomas Sachau gentoo org>
CommitDate: Fri Oct 30 10:27:12 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e2dc3cab
Convert some more dependencies to multilib-portage variant
Signed-off-by: Thomas Sachau gentoo.org>
lib/portage/dep/__init__.py | 3 ++-
lib/portage/dep/dep_check.py | 8
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/lib/portage/dep/__init__.py b/lib/portage/dep/__init__.py
index 3f0ef7ece..767c24ede 100644
--- a/lib/portage/dep/__init__.py
+++ b/lib/portage/dep/__init__.py
@@ -939,7 +939,8 @@ class _use_dep:
missing_disabled.add(flag)
else:
if flag in missing_enabled or flag in
missing_disabled:
- raise InvalidAtom(_("Invalid use dep:
'%s'") % (x,))
+ if flag != "multilib_abi_x86" and flag
!= "multilib_abi_amd64":
+ raise InvalidAtom(_("Invalid
use dep: '%s'") % (x,))
no_default.add(flag)
self.tokens = use
diff --git a/lib/portage/dep/dep_check.py b/lib/portage/dep/dep_check.py
index 815a4b06b..e5d19f7e5 100644
--- a/lib/portage/dep/dep_check.py
+++ b/lib/portage/dep/dep_check.py
@@ -119,8 +119,16 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi,
mysettings, myroot="/",
use_tokens =
list(x.unevaluated_atom.use.tokens)
if 'abi_x86_64' in use_tokens:
use_tokens[use_tokens.index('abi_x86_64')] = 'multilib_abi_amd64'
+ if 'abi_x86_64(-)' in use_tokens:
+
use_tokens[use_tokens.index('abi_x86_64(-)')] = 'multilib_abi_amd64(-)'
+ if 'abi_x86_64(-)?' in use_tokens:
+
use_tokens[use_tokens.index('abi_x86_64(-)?')] = 'multilib_abi_amd64(-)?'
if 'abi_x86_32' in use_tokens:
use_tokens[use_tokens.index('abi_x86_32')] = 'multilib_abi_x86'
+ if 'abi_x86_32(-)' in use_tokens:
+
use_tokens[use_tokens.index('abi_x86_32(-)')] = 'multilib_abi_x86(-)'
+ if 'abi_x86_32(-)?' in use_tokens:
+
use_tokens[use_tokens.index('abi_x86_32(-)?')] = 'multilib_abi_x86(-)?'
use_tokens.extend(multilib_flags)
x = Atom(x.unevaluated_atom.without_use
+
"[%s]" % (",".join(use_tokens)))
[gentoo-commits] proj/portage:multilib commit in: /
commit: 9ab4d534816dd92345df6c0cc2a1c1343415a6bd Author: Thomas Sachau gentoo org> AuthorDate: Sun Aug 23 12:20:01 2020 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Aug 23 12:22:18 2020 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9ab4d534 Merge portage-3.0.4 Signed-off-by: Thomas Sachau gentoo.org> .editorconfig | 5 +- .travis.yml| 1 - DEVELOPING | 18 +- NEWS | 4 + README | 2 +- RELEASE-NOTES | 45 ++ bin/archive-conf | 4 +- bin/binhost-snapshot | 5 +- bin/check-implicit-pointer-usage.py| 27 +- bin/chmod-lite.py | 11 +- bin/chpathtool.py | 10 +- bin/clean_locks| 4 +- bin/dispatch-conf | 4 +- bin/dohtml.py | 15 +- bin/doins.py | 37 +- bin/ebuild | 19 +- bin/ebuild-ipc.py | 2 +- bin/ecompress | 27 +- bin/egencache | 19 +- bin/emaint | 4 +- bin/emerge | 4 +- bin/env-update | 4 +- bin/filter-bash-environment.py | 11 +- bin/fixpackages| 4 +- bin/glsa-check | 4 +- bin/install.py | 19 +- bin/pid-ns-init| 10 +- bin/portageq | 6 +- bin/quickpkg | 6 +- bin/regenworld | 4 +- bin/socks5-server.py | 2 +- bin/xattr-helper.py| 32 +- cnf/repo.postsync.d/example| 15 +- doc/api/conf.py| 2 +- lib/_emerge/AbstractEbuildProcess.py | 3 +- lib/_emerge/AbstractPollTask.py| 4 +- lib/_emerge/AsynchronousLock.py| 12 +- lib/_emerge/Binpkg.py | 8 +- lib/_emerge/BinpkgEnvExtractor.py | 11 +- lib/_emerge/BinpkgFetcher.py | 11 +- lib/_emerge/BinpkgPrefetcher.py| 1 - lib/_emerge/BlockerCache.py| 29 +- lib/_emerge/BlockerDB.py | 7 +- lib/_emerge/DepPriority.py | 1 - lib/_emerge/DepPriorityNormalRange.py | 2 +- lib/_emerge/DepPrioritySatisfiedRange.py | 2 +- lib/_emerge/Dependency.py | 1 - lib/_emerge/DependencyArg.py | 20 +- lib/_emerge/EbuildBuild.py | 30 +- lib/_emerge/EbuildBuildDir.py | 1 - lib/_emerge/EbuildFetcher.py | 12 +- lib/_emerge/EbuildMetadataPhase.py | 12 +- lib/_emerge/EbuildPhase.py | 19 +- lib/_emerge/FakeVartree.py | 23 +- lib/_emerge/FifoIpcDaemon.py | 33 +- lib/_emerge/JobStatusDisplay.py| 15 +- lib/_emerge/MergeListItem.py | 2 +- lib/_emerge/MetadataRegen.py | 7 +- lib/_emerge/Package.py | 47 +- lib/_emerge/PackageVirtualDbapi.py | 7 +- lib/_emerge/PipeReader.py | 14 +- lib/_emerge/PollScheduler.py | 6 +- lib/_emerge/ProgressHandler.py | 3 +- lib/_emerge/RootConfig.py | 2 +- lib/_emerge/Scheduler.py | 15 +- lib/_emerge/SequentialTaskQueue.py | 8 +- lib/_emerge/SetArg.py | 1 - lib/_emerge/SpawnProcess.py| 43 +- lib/_emerge/SubProcess.py | 9 +- lib/_emerge/TaskSequence.py| 6 +- lib/_emerge/UnmergeDepPriority.py | 1 - lib/_emerge/UseFlagDisplay.py | 16 +- lib/_emerge/UserQuery.py | 23 +- lib/_emerge/_find_deep_system_runtime_deps.py | 1 - lib/_emerge/actions.py | 79 ++-- lib/_emerge/chk_updated_cfg_files.py | 2 - lib/_emerge
[gentoo-commits] proj/portage:multilib commit in: /
commit: 661e707be59a3e3c2973b81ac1cbe376248ed0d9 Author: Thomas Sachau gentoo org> AuthorDate: Sun Jul 5 08:51:15 2020 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jul 5 17:56:29 2020 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=661e707b Merge tag 'portage-2.3.103' into multilib portage-2.3.103 Signed-off-by: Zac Medico gentoo.org> Signed-off-by: Thomas Sachau gentoo.org> .travis.yml| 10 +- MANIFEST.in| 5 + NEWS | 24 + RELEASE-NOTES | 153 ++ bin/eapi.sh| 46 +- bin/ebuild-helpers/dosym | 13 +- bin/ebuild.sh | 23 +- bin/ecompress | 27 +- bin/emerge-webrsync| 1 + bin/isolated-functions.sh | 4 +- bin/misc-functions.sh | 12 +- bin/phase-functions.sh | 8 +- bin/phase-helpers.sh | 12 +- bin/socks5-server.py | 36 +- cnf/make.globals | 9 +- doc/api/.gitignore | 1 + doc/api/Makefile | 32 ++ doc/api/conf.py| 66 +++ doc/api/index.rst | 18 + doc/package/ebuild.docbook | 1 - doc/package/ebuild/eapi/5-hdepend.docbook | 32 -- doc/portage.docbook| 1 - doc/qa.docbook | 98 lib/_emerge/AbstractEbuildProcess.py | 5 +- lib/_emerge/AbstractPollTask.py| 3 - lib/_emerge/AsynchronousTask.py| 75 +-- lib/_emerge/BinpkgFetcher.py | 3 +- lib/_emerge/CompositeTask.py | 7 +- lib/_emerge/EbuildFetcher.py | 15 +- lib/_emerge/EbuildMetadataPhase.py | 3 +- lib/_emerge/EbuildPhase.py | 115 - lib/_emerge/FifoIpcDaemon.py | 3 - lib/_emerge/Package.py | 6 +- lib/_emerge/Scheduler.py | 43 +- lib/_emerge/SequentialTaskQueue.py | 19 +- lib/_emerge/SpawnProcess.py| 69 ++- lib/_emerge/SubProcess.py | 15 +- lib/_emerge/actions.py | 41 +- lib/_emerge/create_world_atom.py | 11 +- lib/_emerge/depgraph.py| 185 --- lib/portage/__init__.py| 3 +- lib/portage/_compat_upgrade/binpkg_compression.py | 40 ++ lib/portage/_emirrordist/FetchTask.py | 9 - lib/portage/_selinux.py| 9 +- lib/portage/cache/ebuild_xattr.py | 5 +- lib/portage/cache/metadata.py | 2 +- lib/portage/cache/template.py | 2 +- lib/portage/const.py | 1 + lib/portage/data.py| 10 - lib/portage/dbapi/_MergeProcess.py | 3 +- lib/portage/dbapi/bintree.py | 7 +- lib/portage/dbapi/cpv_expand.py| 4 +- lib/portage/dbapi/porttree.py | 20 +- lib/portage/dbapi/vartree.py | 11 +- lib/portage/dep/_slot_operator.py | 3 - lib/portage/dep/dep_check.py | 93 ++-- lib/portage/dep/soname/SonameAtom.py | 9 +- lib/portage/dispatch_conf.py | 9 - lib/portage/eapi.py| 18 +- lib/portage/emaint/modules/sync/sync.py| 2 +- lib/portage/locks.py | 67 ++- lib/portage/output.py | 2 +- .../package/ebuild/_config/KeywordsManager.py | 16 +- .../package/ebuild/_config/special_env_vars.py | 16 +- lib/portage/package/ebuild/config.py | 13 +- .../package/ebuild/deprecated_profile_check.py | 2 +- lib/portage/package/ebuild/doebuild.py | 41 +- lib/portage/package/ebuild/fetch.py| 148 -- lib/portage/package/ebuild/prepare_build_dirs.py | 21 +- lib/portage/process.py | 29 +- lib/portage/repository/config.py | 10 +- lib/portage/sync/syncbase.py | 9 +- lib/portage/tests/dbapi/test_auxdb.py | 77 +++ lib/portage/tests/dep/test_soname_atom_pickle.py | 26 + lib/portage/tests/ebuild/test_doebuil
[gentoo-commits] proj/portage:multilib commit in: bin/
commit: d0102f790d48ba22877d8ca0d0c0698e54154efb
Author: Thomas Sachau gentoo org>
AuthorDate: Thu Dec 26 12:36:59 2019 +
Commit: Thomas Sachau gentoo org>
CommitDate: Thu Dec 26 12:36:59 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d0102f79
Fix leftover issues from merge commit
Signed-off-by: Thomas Sachau gentoo.org>
bin/phase-functions.sh | 2 --
bin/phase-helpers.sh | 5 +++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index f98d78f8a..e6c8bc360 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -578,8 +578,6 @@ __dyn_test() {
SANDBOX_PREDICT=${save_sp}
fi
- done
-
trap - SIGINT SIGQUIT
}
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 0a326b7d9..20336b310 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -239,8 +239,8 @@ use() {
# a full profile with IUSE_IMPLICIT and stuff (see bug #456830).
elif declare -f ___in_portage_iuse >/dev/null &&
[[ -n ${EBUILD_PHASE} && -n ${PORTAGE_INTERNAL_CALLER} ]] ; then
- if ( [[ ! " ${FEATURES} " == *" force-multilib "* && $u ==
multilib ]] && \
- if ! ___in_portage_iuse "${u}"; then
+ if ! ___in_portage_iuse "${u}" ]]; then
+ if [[ ! " ${FEATURES} " == *" force-multilib "* && $u ==
multilib ]] ; then
if [[ ${EMERGE_FROM} != binary &&
! ${EAPI} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$
]] ; then
# This is only strict starting with EAPI 5,
since implicit IUSE
@@ -250,6 +250,7 @@ use() {
eqawarn "QA Notice: USE Flag '${u}' not" \
"in IUSE for ${CATEGORY}/${PF}"
fi
+ fi
fi
local IFS=$' \t\n' prev_shopts=$- ret
[gentoo-commits] proj/portage:multilib commit in: /
commit: a757c986855dee5574a1b773f45d3d976d55edd0
Author: Thomas Sachau gentoo org>
AuthorDate: Thu Dec 26 11:49:34 2019 +
Commit: Thomas Sachau gentoo org>
CommitDate: Thu Dec 26 11:55:34 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a757c986
Merge portage-2.3.83
Signed-off-by: Thomas Sachau gentoo.org>
.travis.yml| 15 +-
NEWS | 40 ++
RELEASE-NOTES | 200
bin/dispatch-conf | 11 +-
bin/eapi.sh| 4 +
bin/ebuild | 10 +-
bin/ebuild-helpers/doins | 3 +-
bin/ebuild.sh | 13 +-
bin/emerge-webrsync| 47 +-
bin/estrip | 41 +-
bin/glsa-check | 112 +++--
bin/helper-functions.sh| 7 +-
bin/install-qa-check.d/10ignored-flags | 2 +-
bin/install-qa-check.d/80libraries | 21 +-
bin/install-qa-check.d/95empty-dirs| 4 +-
bin/install.py | 24 +-
bin/isolated-functions.sh | 28 +-
bin/phase-functions.sh | 41 +-
bin/phase-helpers.sh | 119 ++---
bin/pid-ns-init| 2 +-
bin/quickpkg | 34 +-
bin/socks5-server.py | 2 +-
cnf/make.conf.example | 21 +-
cnf/make.globals | 10 +-
cnf/repos.conf | 8 +-
cnf/sets/portage.conf | 12 +-
lib/_emerge/Binpkg.py | 96 ++--
lib/_emerge/BinpkgVerifier.py | 4 +-
lib/_emerge/EbuildExecuter.py | 6 +-
lib/_emerge/EbuildPhase.py | 2 +-
lib/_emerge/PollScheduler.py | 6 +-
lib/_emerge/Scheduler.py | 17 +-
lib/_emerge/actions.py | 46 +-
lib/_emerge/create_depgraph_params.py | 39 ++
lib/_emerge/depgraph.py| 528 +
lib/_emerge/emergelog.py | 2 +-
lib/_emerge/main.py| 32 +-
lib/_emerge/resolver/backtracking.py | 20 +-
lib/_emerge/resolver/slot_collision.py | 17 +-
lib/portage/__init__.py| 31 +-
.../{sync/modules => _compat_upgrade}/__init__.py | 0
lib/portage/_compat_upgrade/default_locations.py | 93
lib/portage/_emirrordist/Config.py | 10 +-
lib/portage/_emirrordist/DeletionIterator.py | 38 +-
lib/portage/_emirrordist/DeletionTask.py | 47 +-
lib/portage/_emirrordist/FetchTask.py | 120 +++--
lib/portage/_emirrordist/main.py | 12 +
lib/portage/_sets/__init__.py | 14 +-
lib/portage/_sets/dbapi.py | 18 +-
lib/portage/cache/flat_hash.py | 4 +-
lib/portage/cache/mappings.py | 30 +-
lib/portage/const.py | 6 +-
lib/portage/dbapi/__init__.py | 9 +-
lib/portage/dbapi/bintree.py | 148 +-
lib/portage/dbapi/porttree.py | 27 +-
lib/portage/dbapi/vartree.py | 250 +-
lib/portage/dep/__init__.py| 244 ++
lib/portage/dep/dep_check.py | 10 +
lib/portage/dep/soname/multilib_category.py| 51 +-
lib/portage/emaint/modules/binhost/binhost.py | 21 +-
lib/portage/emaint/modules/sync/sync.py| 6 +-
lib/portage/exception.py | 6 +-
lib/portage/glsa.py| 15 +-
lib/portage/locks.py | 6 +-
lib/portage/news.py| 5 +-
lib/portage/package/ebuild/_config/helper.py | 4 +-
.../package/ebuild/_config/special_env_vars.py | 9 +-
lib/portage/package/ebuild/_spawn_nofetch.py | 6 +-
lib/portage/package/ebuild/config.py | 41 +-
lib/portage/package/ebuild/doebuild.py | 54 +--
lib/portage/package/ebuild/fetch.py| 381 +--
lib/portage/process.py | 102 +++-
lib/portage/repository/config.py | 29 +-
lib/portage/sync/__init__.py | 5 +-
lib/portage/sync/controller.py | 5
[gentoo-commits] proj/portage:multilib commit in: /
commit: 88a712b0cf17c1bc47de174f8f1219d24912eee6 Author: Thomas Sachau gentoo org> AuthorDate: Sun Mar 17 11:34:05 2019 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Mar 17 11:34:05 2019 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=88a712b0 Merge tag 'portage-2.3.62' into multilib portage-2.3.62 Signed-off-by: Zac Medico gentoo.org> .travis.yml| 7 + NEWS | 9 +- RELEASE-NOTES | 76 +++ bin/ebuild-helpers/bsd/sed | 3 +- bin/ebuild-helpers/portageq| 3 +- bin/ebuild-helpers/unprivileged/chown | 3 +- bin/ebuild-helpers/xattr/install | 3 +- bin/ebuild.sh | 34 ++-- bin/etc-update | 2 +- bin/misc-functions.sh | 34 bin/pid-ns-init| 105 +- bin/postinst-qa-check.d/50gnome2-utils | 64 -- bin/postinst-qa-check.d/50xdg-utils| 54 + bin/preinst-qa-check.d/50gnome2-utils | 1 - bin/socks5-server.py | 8 +- cnf/make.conf.example | 20 +- cnf/make.globals | 14 +- lib/_emerge/AbstractEbuildProcess.py | 9 +- lib/_emerge/SpawnProcess.py| 2 +- lib/_emerge/help.py| 2 +- lib/_emerge/post_emerge.py | 2 +- lib/_emerge/resolver/output.py | 13 +- lib/portage/const.py | 1 + lib/portage/dbapi/porttree.py | 20 +- lib/portage/dbapi/vartree.py | 17 +- lib/portage/elog/mod_echo.py | 2 +- lib/portage/elog/mod_save.py | 4 +- lib/portage/elog/mod_save_summary.py | 4 +- lib/portage/emaint/modules/logs/__init__.py| 2 +- lib/portage/emaint/modules/logs/logs.py| 22 +-- lib/portage/locks.py | 154 --- .../package/ebuild/_config/special_env_vars.py | 5 +- lib/portage/package/ebuild/config.py | 15 +- lib/portage/package/ebuild/doebuild.py | 49 ++--- lib/portage/package/ebuild/prepare_build_dirs.py | 26 +-- lib/portage/process.py | 220 + lib/portage/sync/modules/git/git.py| 10 +- lib/portage/sync/modules/rsync/rsync.py| 11 +- lib/portage/tests/emerge/test_simple.py| 2 +- lib/portage/tests/resolver/ResolverPlayground.py | 49 + lib/portage/tests/sync/test_sync_local.py | 22 ++- lib/portage/tests/util/test_install_mask.py| 36 lib/portage/tests/util/test_socks5.py | 211 lib/portage/util/ExtractKernelVersion.py | 17 +- lib/portage/util/cpuinfo.py| 33 +++- lib/portage/util/futures/compat_coroutine.py | 6 +- lib/portage/util/futures/executor/fork.py | 4 +- lib/portage/util/futures/iter_completed.py | 18 +- lib/portage/util/install_mask.py | 89 - lib/portage/util/socks5.py | 48 - man/ebuild.5 | 2 +- man/emaint.1 | 6 +- man/emerge.1 | 8 +- man/make.conf.5| 52 ++--- man/portage.5 | 2 +- repoman/runtests | 6 +- runtests | 6 +- setup.py | 2 +- tox.ini| 2 +- 59 files changed, 1304 insertions(+), 347 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 533044621a8608b0186ae79eeaa994a0a40a7204 Author: Thomas Sachau gentoo org> AuthorDate: Wed Dec 26 09:50:27 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Wed Dec 26 10:16:35 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=53304462 merge portage-2.3.52 Signed-off-by: Thomas Sachau gentoo.org> RELEASE-NOTES | 32 +++ bin/ebuild-helpers/dodoc | 3 +- bin/ebuild-helpers/ecompress | 161 - bin/ebuild-helpers/ecompressdir| 226 --- bin/ebuild-helpers/fowners | 15 ++ bin/ebuild-helpers/fperms | 15 ++ bin/ebuild-helpers/prepall | 25 +- bin/ebuild-helpers/prepalldocs | 19 +- bin/ebuild-helpers/prepallinfo | 9 +- bin/ebuild-helpers/prepallman | 20 +- bin/ebuild-helpers/prepinfo| 3 +- bin/ebuild-helpers/prepman | 35 +-- bin/ebuild.sh | 8 +- bin/ecompress | 198 bin/ecompress-file | 61 + bin/estrip | 10 +- bin/etc-update | 12 +- bin/helper-functions.sh| 9 +- bin/install-qa-check.d/60pngfix| 13 +- bin/isolated-functions.sh | 24 +- bin/misc-functions.sh | 211 +++-- bin/phase-functions.sh | 2 +- bin/phase-helpers.sh | 7 +- bin/pid-ns-init| 30 +++ bin/portageq | 4 + bin/postinst-qa-check.d/50gnome2-utils | 2 +- bin/postinst-qa-check.d/50xdg-utils| 2 +- cnf/make.globals | 4 +- lib/_emerge/actions.py | 7 - lib/portage/const.py | 6 +- lib/portage/dbapi/porttree.py | 72 -- lib/portage/dbapi/vartree.py | 12 + lib/portage/package/ebuild/doebuild.py | 27 ++- lib/portage/process.py | 73 +- lib/portage/repository/config.py | 148 +--- .../repository/storage}/__init__.py| 2 +- .../repository/storage/hardlink_quarantine.py | 97 lib/portage/repository/storage/hardlink_rcu.py | 251 + lib/portage/repository/storage/inplace.py | 49 lib/portage/repository/storage/interface.py| 87 +++ lib/portage/sync/controller.py | 1 + lib/portage/sync/modules/rsync/rsync.py| 85 ++- lib/portage/sync/syncbase.py | 55 - lib/portage/tests/__init__.py | 36 +-- lib/portage/tests/bin/setup_env.py | 2 +- lib/portage/tests/sync/test_sync_local.py | 40 +++- .../tests/util/futures/test_compat_coroutine.py| 22 +- lib/portage/util/futures/_asyncio/__init__.py | 14 ++ lib/portage/util/futures/_sync_decorator.py| 54 + lib/portage/util/futures/compat_coroutine.py | 14 ++ man/ebuild.1 | 5 + man/ebuild.5 | 6 +- man/emerge.1 | 2 +- man/make.conf.5| 33 ++- man/portage.5 | 35 +++ repoman/RELEASE-NOTES | 18 ++ repoman/bin/repoman| 2 +- repoman/cnf/linechecks/linechecks.yaml | 3 +- repoman/lib/repoman/actions.py | 55 - repoman/lib/repoman/copyrights.py | 18 +- repoman/lib/repoman/main.py| 9 +- repoman/lib/repoman/modules/commit/manifest.py | 11 +- .../modules/linechecks/gentoo_header/header.py | 47 ++-- repoman/lib/repoman/scanner.py | 3 +- repoman/lib/repoman/tests/__init__.py | 34 +-- .../lib/repoman/tests/changelog/test_echangelog.py | 2 +- repoman/lib/repoman/tests/simple/test_simple.py| 14 +- repoman/setup.py | 2 +- setup.py | 4 +- 69 files changed, 1696 insertions(+), 921 deletions(-) diff --cc bin/phase-functions.sh index a1aaea020,d8ebf3d3e..fd17e6377 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@@ -311,9 -287,8 +311,9 @@@ __dyn_clean() fi if [[ $EMERGE_FROM = binary ]] || ! has keepwork
[gentoo-commits] proj/portage:multilib commit in: bin/
commit: 2e1579a9b91f1d03e116d03ceec25614275a75b1
Author: Thomas Sachau gentoo org>
AuthorDate: Sat Sep 1 09:19:08 2018 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sat Sep 1 09:19:08 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2e1579a9
Fix detection for multilib builds
bin/auto-multilib.sh | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index eabef5daf..010ec1cd6 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -275,25 +275,25 @@ _finalize_abi_install() {
# Create wrapper symlink for *-config files
local i=
- prep_ml_binaries $(find "${D}"usr/bin "${D}"usr/sbin "${D}"bin
"${D}"sbin "${D}"usr/lib/llvm/*/bin -type f -name '*-config' 2>/dev/null)
+ prep_ml_binaries $(find "${D}"/usr/bin "${D}"/usr/sbin "${D}"/bin
"${D}"/sbin "${D}"/usr/lib/llvm/*/bin -type f -name '*-config' 2>/dev/null)
local noabi=()
for i in ${MULTILIB_ABIS}; do
noabi+=( ! -name '*-'${i} )
done
if use abiwrapper ; then
- for i in $(find "${D}"usr/bin/ "${D}"usr/sbin "${D}"bin
"${D}"sbin -type f ${noabi[@]} 2>/dev/null); do
+ for i in $(find "${D}"/usr/bin/ "${D}"/usr/sbin "${D}"/bin
"${D}"/sbin -type f ${noabi[@]} 2>/dev/null); do
prep_ml_binaries "${i}"
done
fi
local LIBDIR=$(portage-get_abi_var LIBDIR $1)
#FIXME: better way then hardcoding llvm to work around
/usr/lib/llvm/${LIBDIR}
- if ( [[ -d "${D}${LIBDIR}" ]] || [[ -d "${D}usr/${LIBDIR}" ]] || [[ -d
"${base}" ]] || \
- (shopt -s nullglob dotglob; f=("${D}"usr/bin/*-config);
((${#f[@]}))) || \
- (shopt -s nullglob dotglob;
f=("${D}"usr/lib/llvm/*/bin/*-config); ((${#f[@]}))) || \
+ if ( [[ -d "${D}/${LIBDIR}" ]] || [[ -d "${D}/usr/${LIBDIR}" ]] || [[
-d "${base}" ]] || \
+ (shopt -s nullglob dotglob; f=("${D}"/usr/bin/*-config);
((${#f[@]}))) || \
+ (shopt -s nullglob dotglob;
f=("${D}"/usr/lib/llvm/*/bin/*-config); ((${#f[@]}))) || \
( use abiwrapper && \
- ( [[ -d "${D}"usr/bin ]] || \
- [[ -d "${D}"usr/sbin ]] || [[ -d "${D}"bin ]]
|| [[ -d "${D}"sbin ]])) ); then
+ ( [[ -d "${D}"/usr/bin ]] || \
+ [[ -d "${D}"/usr/sbin ]] || [[ -d "${D}"/bin ]]
|| [[ -d "${D}"/sbin ]])) ); then
mv "${D}" "${D%/}".${ABI} || die
for my_abi in ${ALL_ABIS}; do
[gentoo-commits] proj/portage:multilib commit in: /
commit: cb6737033d90f57168ed12e4b0cec8711b311b36
Author: Thomas Sachau gentoo org>
AuthorDate: Sat Sep 1 09:30:48 2018 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sat Sep 1 09:30:48 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=cb673703
Merge portage-2.3.48
.gitignore | 1 +
.travis.yml| 28 +--
NEWS | 10 +
README | 4 +-
RELEASE-NOTES | 98 +
TEST-NOTES | 6 +-
bin/archive-conf | 2 +-
bin/binhost-snapshot | 2 +-
bin/clean_locks| 2 +-
bin/dispatch-conf | 2 +-
bin/ebuild | 10 +-
bin/ebuild-ipc.py | 2 +-
bin/ebuild.sh | 2 +-
bin/egencache | 2 +-
bin/emaint | 2 +-
bin/emerge | 2 +-
bin/emerge-webrsync| 23 +-
bin/env-update | 2 +-
bin/etc-update | 18 +-
bin/fixpackages| 2 +-
bin/glsa-check | 2 +-
bin/install-qa-check.d/10executable-issues | 6 +-
bin/install-qa-check.d/10ignored-flags | 6 +-
bin/install-qa-check.d/60pngfix| 14 +-
bin/install-qa-check.d/90bad-bin-group-write | 55 +
bin/install-qa-check.d/90bad-bin-owner | 48 +
bin/isolated-functions.sh | 6 +-
bin/misc-functions.sh | 8 +-
bin/phase-functions.sh | 7 +-
bin/portageq | 2 +-
bin/quickpkg | 2 +-
bin/regenworld | 2 +-
cnf/make.conf.example | 8 +-
cnf/make.conf.example.arm64.diff | 37
cnf/make.globals | 2 +-
{pym => lib}/_emerge/AbstractDepPriority.py| 0
{pym => lib}/_emerge/AbstractEbuildProcess.py | 15 +-
{pym => lib}/_emerge/AbstractPollTask.py | 12 +-
{pym => lib}/_emerge/AsynchronousLock.py | 0
{pym => lib}/_emerge/AsynchronousTask.py | 0
{pym => lib}/_emerge/AtomArg.py| 0
{pym => lib}/_emerge/Binpkg.py | 10 +-
{pym => lib}/_emerge/BinpkgEnvExtractor.py | 0
{pym => lib}/_emerge/BinpkgExtractorAsync.py | 0
{pym => lib}/_emerge/BinpkgFetcher.py | 8 +
{pym => lib}/_emerge/BinpkgPrefetcher.py | 0
{pym => lib}/_emerge/BinpkgVerifier.py | 0
{pym => lib}/_emerge/Blocker.py| 0
{pym => lib}/_emerge/BlockerCache.py | 0
{pym => lib}/_emerge/BlockerDB.py | 0
{pym => lib}/_emerge/BlockerDepPriority.py | 0
{pym => lib}/_emerge/CompositeTask.py | 1 +
{pym => lib}/_emerge/DepPriority.py| 0
{pym => lib}/_emerge/DepPriorityNormalRange.py | 0
{pym => lib}/_emerge/DepPrioritySatisfiedRange.py | 0
{pym => lib}/_emerge/Dependency.py | 0
{pym => lib}/_emerge/DependencyArg.py | 0
{pym => lib}/_emerge/EbuildBinpkg.py | 0
{pym => lib}/_emerge/EbuildBuild.py| 34 ++-
{pym => lib}/_emerge/EbuildBuildDir.py | 0
{pym => lib}/_emerge/EbuildExecuter.py | 0
{pym => lib}/_emerge/EbuildFetcher.py | 12 ++
{pym => lib}/_emerge/EbuildFetchonly.py| 5 +-
{pym => lib}/_emerge/EbuildIpcDaemon.py| 0
{pym => lib}/_emerge/EbuildMerge.py| 0
{pym => lib}/_emerge/EbuildMetadataPhase.py| 0
{pym => lib}/_emerge/EbuildPhase.py| 34 ++-
{pym => lib}/_emerge/EbuildProcess.py | 0
{pym => lib}/_emerge/EbuildSpawnProcess.py | 0
{pym => lib}/_emerge/FakeVartree.py| 0
{pym => lib}/_emerge/FifoIpcDaemon.py | 0
{pym => lib}/_emerge/JobStatusDisplay.py | 0
{pym => lib}/_emerge/MergeListItem.py | 0
{pym => lib}/_emerge/MetadataRegen.py | 0
{pym => lib}/_emerge/MiscFunctionsProcess.py | 6 +-
{pym => lib}/_emerge/Package.py| 5 +-
{pym => lib}/_emerge/PackageArg.py | 0
{pym => lib}/_emerge/PackageMerge.py | 0
{pym
[gentoo-commits] proj/portage:multilib commit in: pym/_emerge/
commit: 370a5832a66713a17ff010f137fda7cfc7a26fe3
Author: Thomas Sachau gentoo org>
AuthorDate: Wed May 23 12:46:05 2018 +
Commit: Thomas Sachau gentoo org>
CommitDate: Wed May 23 12:46:05 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=370a5832
Fix build
pym/_emerge/Package.py | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py
index 2be526471..e73c9d9d1 100644
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@ -95,11 +95,11 @@ class Package(Task):
implicit_match = db._iuse_implicit_cnstr(self.cpv,
self._metadata)
if 'force-multilib' in self.root_config.settings.features:
- if self.built is False:
- for multilib_abis in
self.root_config.settings.get("MULTILIB_ABIS", '').split():
- iuse += " multilib_abi_" + multilib_abis
- iuse += " abiwrapper"
- self._metadata["IUSE"] = iuse
+ iuse = self._metadata["IUSE"]
+ for multilib_abis in
self.root_config.settings.get("MULTILIB_ABIS", '').split():
+ iuse += " multilib_abi_" + multilib_abis
+ iuse += " abiwrapper"
+ self._metadata["IUSE"] = iuse
usealiases =
self.root_config.settings._use_manager.getUseAliases(self)
self.iuse = self._iuse(self, self._metadata["IUSE"].split(),
implicit_match, usealiases, self.eapi)
[gentoo-commits] proj/portage:multilib commit in: /
commit: b74e878839a2b1e8d6148776d5a44019d8fffbc1 Author: Thomas Sachau gentoo org> AuthorDate: Wed May 23 12:22:27 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Wed May 23 12:22:27 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b74e8788 Merge portage-2.3.38 .travis.yml| 2 + NEWS | 9 + RELEASE-NOTES | 92 +++ bin/eapi.sh| 18 +- bin/ebuild | 8 +- bin/ebuild-helpers/ecompressdir| 4 +- bin/ebuild-ipc.py | 55 +- bin/ebuild.sh | 3 + bin/egencache | 5 +- bin/emaint | 3 + bin/emerge | 5 + bin/emirrordist| 6 +- bin/estrip | 3 +- bin/etc-update | 31 +- bin/install-qa-check.d/10ignored-flags | 2 +- bin/misc-functions.sh | 2 +- bin/phase-functions.sh | 9 + bin/phase-helpers.sh | 159 ++--- bin/portageq | 6 +- bin/quickpkg | 14 +- cnf/repos.conf | 3 +- man/ebuild.5 | 6 + man/emerge.1 | 38 +- man/portage.5 | 10 +- pym/_emerge/AbstractEbuildProcess.py | 97 ++- pym/_emerge/AbstractPollTask.py| 87 +-- pym/_emerge/AsynchronousLock.py| 76 +-- pym/_emerge/AsynchronousTask.py| 60 +- pym/_emerge/Binpkg.py | 78 ++- pym/_emerge/BinpkgExtractorAsync.py| 16 +- pym/_emerge/BinpkgFetcher.py | 104 ++- pym/_emerge/CompositeTask.py | 46 +- pym/_emerge/EbuildBuild.py | 99 ++- pym/_emerge/EbuildBuildDir.py | 172 +++-- pym/_emerge/EbuildFetcher.py | 135 +++- pym/_emerge/EbuildIpcDaemon.py | 28 +- pym/_emerge/EbuildMerge.py | 26 +- pym/_emerge/EbuildMetadataPhase.py | 55 +- pym/_emerge/EbuildPhase.py | 22 +- pym/_emerge/FifoIpcDaemon.py | 32 +- pym/_emerge/MetadataRegen.py | 14 +- pym/_emerge/Package.py | 54 +- pym/_emerge/PackageUninstall.py| 37 +- pym/_emerge/PipeReader.py | 42 +- pym/_emerge/Scheduler.py | 106 ++-- pym/_emerge/SpawnProcess.py| 23 +- pym/_emerge/SubProcess.py | 123 +--- pym/_emerge/actions.py | 53 +- pym/_emerge/create_world_atom.py | 6 +- pym/_emerge/depgraph.py| 33 +- pym/_emerge/main.py| 13 +- pym/_emerge/resolver/DbapiProvidesIndex.py | 3 +- pym/portage/__init__.py| 8 +- pym/portage/_emirrordist/FetchIterator.py | 323 ++ pym/portage/_emirrordist/FetchTask.py | 2 +- pym/portage/_emirrordist/MirrorDistTask.py | 27 +- pym/portage/_legacy_globals.py | 3 +- pym/portage/const.py | 2 +- pym/portage/dbapi/IndexedVardb.py | 2 +- pym/portage/dbapi/_MergeProcess.py | 47 +- pym/portage/dbapi/__init__.py | 44 +- pym/portage/dbapi/bintree.py | 89 ++- pym/portage/dbapi/porttree.py | 153 - pym/portage/dbapi/vartree.py | 10 +- pym/portage/dbapi/virtual.py | 4 +- pym/portage/eapi.py| 16 +- pym/portage/emaint/modules/binhost/binhost.py | 1 + pym/portage/exception.py | 3 + .../package/ebuild/_config/LocationsManager.py | 25 +- .../package/ebuild/_config/special_env_vars.py | 8 +- pym/portage/package/ebuild/_ipc/QueryCommand.py| 4 +- .../ebuild/_parallel_manifest/ManifestScheduler.py | 25 +- .../ebuild/_parallel_manifest/ManifestTask.py | 24 +- pym/portage/package/ebuild/config.py | 44 +- pym/portage/package/ebuild/doebuild.py | 30 +- pym/portage/package/ebuild/profile_iuse.py | 32 + pym/portage/process.py
[gentoo-commits] proj/portage:multilib commit in: bin/
commit: bc55fa6c10f027ba1eb986d3fc6698cd009eff54
Author: Thomas Sachau gentoo org>
AuthorDate: Sat Apr 14 12:32:19 2018 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sat Apr 14 12:32:19 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=bc55fa6c
Remove remaining else case
bin/phase-functions.sh | 22 ++
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 6c8da017d..65ad0610b 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -806,20 +806,18 @@ __dyn_install() {
>> DEBUGBUILD
fi
- else
- if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
- cd "${PORTAGE_BUILDDIR}"
- if [[ $EMERGE_FROM = binary ]] || ! has keepwork
$FEATURES; then
- rm -f
"$PORTAGE_BUILDDIR"/.{ebuild_changed,exit_status,logid,unpacked,prepared} \
-
"$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged} \
- "$PORTAGE_BUILDDIR"/.die_hooks
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ cd "${PORTAGE_BUILDDIR}"
+ if [[ $EMERGE_FROM = binary ]] || ! has keepwork $FEATURES; then
+ rm -f
"$PORTAGE_BUILDDIR"/.{ebuild_changed,exit_status,logid,unpacked,prepared} \
+
"$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged} \
+ "$PORTAGE_BUILDDIR"/.die_hooks
- rm -rf "${WORKDIR}"
- fi
+ rm -rf "${WORKDIR}"
+ fi
- if [ -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then
- find "${PORTAGE_BUILDDIR}" -type d ! -regex
"^${WORKDIR}" | sort -r | tr "\n" "\0" | $XARGS -0 rmdir &>/dev/null
- fi
+ if [ -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then
+ find "${PORTAGE_BUILDDIR}" -type d ! -regex
"^${WORKDIR}" | sort -r | tr "\n" "\0" | $XARGS -0 rmdir &>/dev/null
fi
fi
trap - SIGINT SIGQUIT
[gentoo-commits] proj/portage:multilib commit in: /
commit: ee29b930b880050eb9a04c06d0f1a0edd0e1fc27
Author: Thomas Sachau gentoo org>
AuthorDate: Sat Apr 14 12:11:15 2018 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sat Apr 14 12:11:15 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ee29b930
Merge portage-2.3.28
.travis.yml|2 +
NEWS |4 +
RELEASE-NOTES | 50 +
bin/eapi.sh| 42 +-
bin/eapi7-ver-funcs.sh | 191
bin/ebuild |2 +
bin/ebuild-helpers/dobin | 16 +-
bin/ebuild-helpers/doconfd | 11 +-
bin/ebuild-helpers/dodir |4 +-
bin/ebuild-helpers/dodoc |2 +-
bin/ebuild-helpers/doenvd | 11 +-
bin/ebuild-helpers/doexe |8 +-
bin/ebuild-helpers/dohard |6 +-
bin/ebuild-helpers/doheader|8 +-
bin/ebuild-helpers/dohtml |7 +-
bin/ebuild-helpers/doinfo |8 +-
bin/ebuild-helpers/doins | 18 +-
bin/ebuild-helpers/dolib | 17 +-
bin/ebuild-helpers/dolib.a |4 +-
bin/ebuild-helpers/dolib.so|4 +-
bin/ebuild-helpers/doman |8 +-
bin/ebuild-helpers/domo| 21 +-
bin/ebuild-helpers/dosbin | 16 +-
bin/ebuild-helpers/dosed |4 +-
bin/ebuild-helpers/dosym |8 +-
bin/ebuild-helpers/ecompressdir| 25 +-
bin/ebuild-helpers/fowners |4 +-
bin/ebuild-helpers/fperms |4 +-
bin/ebuild-helpers/keepdir |6 +-
bin/ebuild-helpers/newins |2 +-
bin/ebuild-helpers/nonfatal| 14 +
bin/ebuild-helpers/prepall |2 +-
bin/ebuild-helpers/prepalldocs |4 +-
bin/ebuild-helpers/prepallinfo |4 +-
bin/ebuild-helpers/prepallstrip|4 +
bin/ebuild-helpers/prepinfo| 12 +-
bin/ebuild-helpers/prepman | 10 +-
bin/ebuild-helpers/prepstrip | 401 +---
bin/ebuild.sh | 47 +-
bin/emerge |1 +
bin/{ebuild-helpers/prepstrip => estrip} | 93 +-
bin/etc-update | 30 +-
bin/filter-bash-environment.py | 47 +-
bin/install-qa-check.d/60udev |6 +-
bin/install-qa-check.d/80libraries | 22 +-
bin/isolated-functions.sh | 40 +-
bin/misc-functions.sh | 131 +--
bin/phase-functions.sh | 50 +-
bin/phase-helpers.sh | 114 ++-
bin/portageq | 18 +-
bin/postinst-qa-check.d/50gnome2-utils |3 +
bin/save-ebuild-env.sh |8 +-
bin/xattr-helper.py| 19 +-
cnf/repos.conf |6 +
man/ebuild.5 | 10 -
man/emerge.1 | 26 +-
man/portage.5 | 29 +-
pym/_emerge/BlockerDB.py |4 +-
pym/_emerge/EbuildPhase.py |7 +
pym/_emerge/Package.py | 32 +-
pym/_emerge/PackagePhase.py| 93 ++
pym/_emerge/actions.py | 16 +-
pym/_emerge/create_depgraph_params.py | 12 +-
pym/_emerge/depgraph.py| 77 +-
pym/_emerge/main.py| 24 +-
pym/_emerge/resolver/output.py |4 +-
pym/_emerge/search.py |4 +
pym/_emerge/show_invalid_depstring_notice.py |4 +-
pym/portage/__init__.py| 58 +-
pym/portage/_sets/base.py | 17 +-
pym/portage/cache/metadata.py |4 +-
pym/portage/const.py |3 +-
pym/portage/dbapi/__init__.py |4 +-
pym/portage/dbapi/bintree.py | 16 +-
pym/portage/dbapi/dep_expand.py|2 +-
pym/portage/dbapi/porttree.py
[gentoo-commits] proj/portage:multilib commit in: /
commit: 3228956aed7ba7cd7a07e48ed6013f73e523 Author: Thomas Sachau gentoo org> AuthorDate: Sat Mar 3 15:17:29 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Sat Mar 3 15:17:29 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3228956a Merge tag 'portage-2.3.24' into multilib portage-2.3.24 NEWS | 4 + RELEASE-NOTES | 46 ++ bin/doins.py | 38 - bin/emerge-webrsync| 11 +- bin/install-qa-check.d/90cmake-warnings| 28 bin/install-qa-check.d/95empty-dirs| 42 ++ cnf/repos.conf | 2 + man/ebuild.5 | 12 +- man/egencache.1| 6 +- man/emaint.1 | 22 +-- man/emerge.1 | 102 ++--- man/make.conf.5| 4 + man/portage.5 | 14 ++ misc/emerge-delta-webrsync | 11 +- pym/_emerge/EbuildExecuter.py | 6 +- pym/_emerge/EbuildPhase.py | 6 +- pym/_emerge/FakeVartree.py | 2 +- pym/_emerge/Scheduler.py | 3 +- pym/_emerge/actions.py | 7 +- pym/_emerge/create_depgraph_params.py | 11 +- pym/_emerge/depgraph.py| 104 +- pym/_emerge/main.py| 13 ++ pym/portage/const.py | 5 +- pym/portage/dep/dep_check.py | 75 +++--- pym/portage/dep/soname/multilib_category.py| 4 +- pym/portage/package/ebuild/config.py | 11 +- pym/portage/package/ebuild/doebuild.py | 42 +- pym/portage/package/ebuild/prepare_build_dirs.py | 31 +++- pym/portage/repository/config.py | 9 +- pym/portage/sync/modules/rsync/__init__.py | 4 +- pym/portage/sync/modules/rsync/rsync.py| 41 +- pym/portage/tests/bin/test_doins.py| 7 +- pym/portage/tests/dep/test_overlap_dnf.py | 2 +- pym/portage/tests/resolver/test_changed_deps.py| 1 + pym/portage/tests/resolver/test_multirepo.py | 4 +- .../tests/resolver/test_or_upgrade_installed.py| 160 + .../resolver/test_virtual_minimize_children.py | 144 ++- pym/portage/tests/resolver/test_virtual_slot.py| 2 +- .../util/_dyn_libs/PreservedLibsRegistry.py| 3 +- pym/portage/util/elf/constants.py | 1 + repoman/man/repoman.1 | 8 ++ repoman/pym/repoman/modules/scan/depend/profile.py | 2 + repoman/pym/repoman/qa_data.py | 8 ++ setup.py | 2 +- 44 files changed, 890 insertions(+), 170 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: bin/
commit: 7db8c8d9e4581031be66896392571f989f3d3a9e
Author: Thomas Sachau gentoo org>
AuthorDate: Sat Mar 3 15:17:08 2018 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sat Mar 3 15:17:08 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7db8c8d9
Fix quoting (did leave some files in the builddir)
bin/phase-functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index e97566d8f..58e0cdc0b 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -306,7 +306,7 @@ __dyn_clean() {
"$PORTAGE_BUILDDIR"/.ipc_{in,out,lock} \
"$PORTAGE_BUILDDIR"/.exit_status
- rm -rf "${PORTAGE_BUILDDIR}/{build-info,abi-code}"
+ rm -rf "${PORTAGE_BUILDDIR}"/{build-info,abi-code}
rm -rf "${WORKDIR}"
rm -f "${PORTAGE_BUILDDIR}/files"
fi
[gentoo-commits] proj/portage:multilib commit in: pym/portage/package/ebuild/
commit: 2186b6acaa669b0bf64312d0e5294050f8aaefd0 Author: Thomas Sachau gentoo org> AuthorDate: Sun Jan 7 14:14:12 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jan 7 14:14:12 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2186b6ac Drop debug prints pym/portage/package/ebuild/doebuild.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 6572d4ace..f54d3202f 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -2273,10 +2273,7 @@ def _post_src_install_soname_symlinks(mysettings, out): #image_dir exists (workaround for multilib-portage as this is first called #before all ABIs are done and the image_dir is created) if not os.path.isdir (image_dir): - print(image_dir+" does not exist") return - else: - print(image_dir+" does exist") needed_filename = os.path.join(mysettings["PORTAGE_BUILDDIR"], "build-info", "NEEDED.ELF.2")
[gentoo-commits] proj/portage:multilib commit in: pym/portage/package/ebuild/
commit: d0ce68b3b8306fb09b629b61ba2199fd57a41198 Author: Thomas Sachau gentoo org> AuthorDate: Sun Jan 7 14:12:55 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jan 7 14:12:55 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d0ce68b3 Dont run multlib checks until the installation is actually done pym/portage/package/ebuild/doebuild.py | 10 ++ 1 file changed, 10 insertions(+) diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 56a51458d..6572d4ace 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -2268,6 +2268,16 @@ def _post_src_install_soname_symlinks(mysettings, out): """ image_dir = mysettings["D"] + + #only run this function when the installation is actually done and the final + #image_dir exists (workaround for multilib-portage as this is first called + #before all ABIs are done and the image_dir is created) + if not os.path.isdir (image_dir): + print(image_dir+" does not exist") + return + else: + print(image_dir+" does exist") + needed_filename = os.path.join(mysettings["PORTAGE_BUILDDIR"], "build-info", "NEEDED.ELF.2")
[gentoo-commits] proj/portage:multilib commit in: /
commit: 4d42c6dde9572c3b9dac7dadf1366420b05f37e3
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Jan 7 10:42:45 2018 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Jan 7 10:42:45 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4d42c6dd
Merge tag 'portage-2.3.17' into multilib
COPYING| 35 ++
NEWS | 5 +
RELEASE-NOTES | 9 +
bin/doins.py | 579 +
bin/ebuild-helpers/doins | 156 ++
bin/phase-helpers.sh | 3 +-
pym/_emerge/Scheduler.py | 36 --
pym/_emerge/depgraph.py| 12 +-
pym/_emerge/main.py| 3 +-
pym/portage/checksum.py| 9 +-
pym/portage/output.py | 2 +-
pym/portage/package/ebuild/config.py | 4 +-
pym/portage/tests/bin/test_doins.py| 352 +
.../resolver/test_disjunctive_depend_order.py | 87
.../tests/resolver/test_onlydeps_minimal.py| 5 +-
pym/portage/tests/versions/test_vercmp.py | 3 -
pym/portage/versions.py| 38 +-
setup.py | 2 +-
18 files changed, 1153 insertions(+), 187 deletions(-)
diff --cc bin/phase-helpers.sh
index 8e3721dba,9b1f6adbe..0a3bcdf1f
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@@ -193,9 -193,9 +193,10 @@@ use()
# a full profile with IUSE_IMPLICIT and stuff (see bug #456830).
elif [[ -n $PORTAGE_IUSE && -n $EBUILD_PHASE &&
-n $PORTAGE_INTERNAL_CALLER ]] ; then
- if [[ ! $u =~ $PORTAGE_IUSE ]] ; then
+ if ( [[ ! " ${FEATURES} " == *" force-multilib "* && $u ==
multilib ]] && \
+ [[ ! $u =~ $PORTAGE_IUSE ]] ) ; then
- if [[ ! ${EAPI} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]]
; then
+ if [[ ${EMERGE_FROM} != binary &&
+ ! ${EAPI} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$
]] ; then
# This is only strict starting with EAPI 5,
since implicit IUSE
# is not well defined for earlier EAPIs (see
bug #449708).
die "USE Flag '${u}' not in IUSE for
${CATEGORY}/${PF}"
[gentoo-commits] proj/portage:multilib commit in: /
commit: 86232affabdb17a0526dc1d03e4a693800d69008 Author: Thomas Sachau gentoo org> AuthorDate: Sun Jan 7 10:39:33 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jan 7 10:39:33 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=86232aff Merge tag 'portage-2.3.10' into multilib RELEASE-NOTES | 7 +++ bin/postinst-qa-check.d/50gnome2-utils | 13 - bin/postinst-qa-check.d/50xdg-utils| 26 -- setup.py | 2 +- 4 files changed, 32 insertions(+), 16 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 252b6373d6716a503f990856f0e3619f2afc3fd7 Author: Thomas Sachau gentoo org> AuthorDate: Sun Jan 7 10:39:14 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jan 7 10:39:14 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=252b6373 Merge tag 'portage-2.3.9' into multilib NEWS | 2 + RELEASE-NOTES | 19 + bin/clean_locks| 2 +- bin/dispatch-conf | 2 +- bin/ebuild | 2 +- bin/ebuild.sh | 9 +++ bin/emaint | 2 +- bin/env-update | 2 +- bin/isolated-functions.sh | 4 ++ bin/misc-functions.sh | 59 ++- bin/phase-functions.sh | 53 -- bin/portageq | 2 +- bin/postinst-qa-check.d/50gnome2-utils | 52 ++ bin/postinst-qa-check.d/50xdg-utils| 83 ++ bin/quickpkg | 25 --- pym/_emerge/AsynchronousLock.py| 6 +- pym/portage/dbapi/vartree.py | 5 +- pym/portage/elog/mod_echo.py | 13 +++- .../package/ebuild/_config/special_env_vars.py | 4 +- pym/portage/package/ebuild/doebuild.py | 5 +- pym/portage/repository/config.py | 4 +- pym/portage/sync/syncbase.py | 8 +-- pym/portage/tests/locks/test_asynchronous_lock.py | 8 ++- pym/portage/util/digraph.py| 12 ++-- repoman/man/repoman.1 | 18 +++-- repoman/pym/repoman/actions.py | 17 ++--- setup.py | 2 +- tabcheck.py| 2 +- 28 files changed, 362 insertions(+), 60 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 9aff2af7bd5b5d2a851e7619b9bf8f5ee35a7b93
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Jan 7 10:42:54 2018 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Jan 7 10:42:54 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9aff2af7
Merge tag 'portage-2.3.18' into multilib
portage-2.3.18
RELEASE-NOTES | 9 +
bin/doins.py | 6 +-
bin/phase-functions.sh| 2 +-
cnf/make.globals | 5 -
pym/_emerge/BinpkgExtractorAsync.py | 4 ++--
pym/_emerge/Package.py| 32 +++
pym/portage/dbapi/__init__.py | 5 +
pym/portage/package/ebuild/config.py | 6 ++
pym/portage/tests/dbapi/test_fakedbapi.py | 20 +++
setup.py | 2 +-
10 files changed, 85 insertions(+), 6 deletions(-)
diff --cc pym/_emerge/Package.py
index 23abb4fe8,cebfd8281..5f3de3175
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@@ -82,17 -83,14 +83,21 @@@ class Package(Task)
if eapi_attrs.iuse_effective:
implicit_match =
self.root_config.settings._iuse_effective_match
+ if self.built:
+ implicit_match = functools.partial(
+ self._built_iuse_effective_match,
+ implicit_match,
frozenset(self._metadata['USE'].split()))
else:
implicit_match =
self.root_config.settings._iuse_implicit_match
+ iuse = self._metadata["IUSE"]
+ if 'force-multilib' in self.root_config.settings.features:
+ if self.built is False:
+ for multilib_abis in
self.root_config.settings.get("MULTILIB_ABIS", '').split():
+ iuse += " multilib_abi_" + multilib_abis
+ iuse += " abiwrapper"
+ self._metadata["IUSE"] = iuse
usealiases =
self.root_config.settings._use_manager.getUseAliases(self)
- self.iuse = self._iuse(self, self._metadata["IUSE"].split(),
implicit_match,
+ self.iuse = self._iuse(self, iuse.split(), implicit_match,
usealiases, self.eapi)
if (self.iuse.enabled or self.iuse.disabled) and \
[gentoo-commits] proj/portage:multilib commit in: /
commit: e54d9bf70ed9310a7ccda6aba93234abee3c1e75 Author: Thomas Sachau gentoo org> AuthorDate: Sun Jan 7 10:42:58 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jan 7 10:42:58 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e54d9bf7 Merge tag 'portage-2.3.19' into multilib portage-2.3.19 RELEASE-NOTES | 7 +++ bin/ebuild-helpers/doins | 2 +- setup.py | 2 +- src/portage_util_file_copy_reflink_linux.c | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: a3ffba07f7d4b8a583bd58ff3c42b0a580317b1a Author: Thomas Sachau gentoo org> AuthorDate: Sun Jan 7 10:40:11 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jan 7 10:40:11 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a3ffba07 Merge tag 'portage-2.3.15' into multilib portage-2.3.15 RELEASE-NOTES| 9 +++ bin/quickpkg | 15 +++-- pym/portage/dbapi/bintree.py | 80 ++-- pym/portage/manifest.py | 2 +- pym/portage/package/ebuild/_config/UseManager.py | 5 +- pym/portage/util/__init__.py | 6 +- repoman/RELEASE-NOTES| 12 repoman/pym/repoman/tests/simple/test_simple.py | 15 - repoman/setup.py | 24 ++- setup.py | 10 ++- 10 files changed, 115 insertions(+), 63 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: dfc32ac920fa86c8f0b25321a73ec99022ee7591 Author: Thomas Sachau gentoo org> AuthorDate: Sun Jan 7 10:40:01 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jan 7 10:40:01 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=dfc32ac9 Merge tag 'portage-2.3.13' into multilib portage-2.3.13 .travis.yml| 2 + RELEASE-NOTES | 9 +++ bin/misc-functions.sh | 18 +++--- bin/postinst-qa-check.d/50gnome2-utils | 6 ++ bin/postinst-qa-check.d/50xdg-utils| 12 bin/preinst-qa-check.d/50gnome2-utils | 1 + bin/preinst-qa-check.d/50xdg-utils | 1 + doc/config/bashrc.docbook | 15 + man/ebuild.5 | 76 +-- pym/portage/checksum.py| 17 - pym/portage/package/ebuild/doebuild.py | 1 + pym/portage/sync/modules/rsync/rsync.py| 6 +- repoman/RELEASE-NOTES | 5 ++ repoman/setup.py | 2 +- setup.py | 2 +- src/portage_util_file_copy_reflink_linux.c | 99 ++ 16 files changed, 144 insertions(+), 128 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 6326008f9b4faac9e5e984b67a6d0a1a176cbf0a Author: Thomas Sachau gentoo org> AuthorDate: Sun Jan 7 10:39:38 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jan 7 10:39:38 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6326008f Merge tag 'portage-2.3.11' into multilib portage-2.3.11 RELEASE-NOTES | 14 bin/postinst-qa-check.d/50gnome2-utils | 8 +- bin/postinst-qa-check.d/50xdg-utils| 12 +-- pym/_emerge/depgraph.py| 38 -- pym/_emerge/search.py | 8 +- .../resolver/test_autounmask_use_backtrack.py | 86 ++ .../tests/resolver/test_slot_conflict_update.py| 2 +- setup.py | 2 +- 8 files changed, 152 insertions(+), 18 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: d8c91b341ffad9d2e2199ad90633ae9762825477 Author: Thomas Sachau gentoo org> AuthorDate: Sun Jan 7 10:40:15 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jan 7 10:40:15 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d8c91b34 Merge tag 'portage-2.3.16' into multilib portage-2.3.16 RELEASE-NOTES | 7 +++ pym/portage/dbapi/bintree.py | 9 +++-- pym/portage/emaint/modules/binhost/binhost.py | 10 +- pym/portage/sync/modules/git/git.py | 2 +- pym/portage/sync/modules/rsync/rsync.py | 2 +- pym/portage/tests/sync/test_sync_local.py | 2 +- setup.py | 2 +- 7 files changed, 23 insertions(+), 11 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 4d099159120c927f18a23c8775636370da1d8793 Author: Thomas Sachau gentoo org> AuthorDate: Sun Jan 7 10:40:06 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jan 7 10:40:06 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4d099159 Merge tag 'portage-2.3.14' into multilib portage-2.3.14 NEWS | 5 + RELEASE-NOTES | 8 ++ man/portage.5 | 13 +- pym/portage/_emirrordist/FetchTask.py | 2 +- pym/portage/const.py | 29 +--- pym/portage/dbapi/vartree.py | 42 +- pym/portage/dep/_dnf.py| 90 + pym/portage/dep/dep_check.py | 147 +++-- pym/portage/manifest.py| 35 ++--- pym/portage/package/ebuild/digestgen.py| 7 +- pym/portage/package/ebuild/doebuild.py | 17 ++- pym/portage/repository/config.py | 45 +-- pym/portage/tests/dep/test_dnf_convert.py | 48 +++ pym/portage/tests/dep/test_overlap_dnf.py | 28 pym/portage/tests/ebuild/test_config.py| 1 + .../tests/resolver/test_or_downgrade_installed.py | 97 ++ .../resolver/test_virtual_minimize_children.py | 145 repoman/pym/repoman/repos.py | 17 ++- setup.py | 2 +- 19 files changed, 701 insertions(+), 77 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 2acb493dac53adbd860a992f4bbf4f10b46bba9a Author: Thomas Sachau gentoo org> AuthorDate: Sun Jan 7 10:39:53 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jan 7 10:39:53 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2acb493d Merge tag 'portage-2.3.12' into multilib portage-2.3.12 NEWS| 7 ++ RELEASE-NOTES | 12 bin/ebuild-helpers/prepstrip| 20 -- bin/install-qa-check.d/10ignored-flags | 5 +- man/ebuild.5| 2 +- man/emerge.1| 2 +- man/make.conf.5 | 4 +- man/portage.5 | 14 ++-- pym/_emerge/BinpkgExtractorAsync.py | 26 --- pym/_emerge/depgraph.py | 45 +++- pym/_emerge/resolver/package_tracker.py | 87 +- pym/portage/dbapi/porttree.py | 123 pym/portage/elog/mod_echo.py| 4 +- setup.py| 2 +- 14 files changed, 292 insertions(+), 61 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 16fcf4998f4b55f1697e4358c7b232e3cab56a11
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Jan 7 10:38:27 2018 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Jan 7 10:38:27 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=16fcf499
Merge tag 'portage-2.3.7' into multilib
.editorconfig | 14 +++
.travis.yml| 4 +-
NEWS | 15 +++
RELEASE-NOTES | 16 ++-
bin/ebuild-helpers/doman | 1 +
bin/install-qa-check.d/80multilib-strict | 7 +-
bin/misc-functions.sh | 6 +-
bin/phase-helpers.sh | 45 +---
bin/quickpkg | 62 ---
cnf/make.globals | 3 +-
man/emerge.1 | 7 ++
man/make.conf.5| 25 +
man/portage.5 | 27 -
pym/_emerge/BinpkgExtractorAsync.py| 43 +++-
pym/_emerge/actions.py | 15 +++
pym/_emerge/depgraph.py| 117 +
pym/_emerge/main.py| 9 ++
pym/_emerge/search.py | 24 -
pym/portage/const.py | 3 +-
pym/portage/dbapi/bintree.py | 18 ++--
pym/portage/dep/dep_check.py | 6 +-
pym/portage/localization.py| 2 +-
.../package/ebuild/_config/KeywordsManager.py | 4 +-
pym/portage/package/ebuild/_config/UseManager.py | 5 +-
.../package/ebuild/_config/special_env_vars.py | 3 +-
pym/portage/package/ebuild/config.py | 27 +
pym/portage/package/ebuild/doebuild.py | 34 +-
pym/portage/sync/modules/git/__init__.py | 8 +-
pym/portage/sync/modules/git/git.py| 37 ++-
pym/portage/sync/modules/rsync/__init__.py | 3 +-
pym/portage/sync/modules/rsync/rsync.py| 12 +++
pym/portage/sync/syncbase.py | 5 +-
pym/portage/tests/emerge/test_simple.py| 5 +-
.../tests/resolver/test_autounmask_binpkg_use.py | 64 +++
.../resolver/test_autounmask_keep_keywords.py | 72 +
pym/portage/util/_urlopen.py | 12 +++
pym/portage/util/compression_probe.py | 45 ++--
repoman/RELEASE-NOTES | 12 +++
repoman/bin/repoman| 4 +-
repoman/man/repoman.1 | 20 +++-
repoman/pym/repoman/actions.py | 55 --
repoman/pym/repoman/argparser.py | 16 ++-
repoman/pym/repoman/main.py| 4 +-
repoman/pym/repoman/modules/scan/ebuild/checks.py | 5 +
.../pym/repoman/modules/scan/keywords/keywords.py | 26 -
.../repoman/modules/scan/metadata/pkgmetadata.py | 10 ++
repoman/pym/repoman/qa_data.py | 1 +
repoman/pym/repoman/scanner.py | 2 +-
repoman/pym/repoman/tests/runTests.py | 4 +-
repoman/runtests | 4 +-
repoman/setup.py | 2 +-
setup.py | 8 +-
52 files changed, 844 insertions(+), 134 deletions(-)
diff --cc pym/_emerge/actions.py
index 6f6646b34,3c6c265f7..d9647dd9a
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@@ -2862,13 -2872,11 +2872,18 @@@ def run_action(emerge_config)
adjust_configs(emerge_config.opts, emerge_config.trees)
apply_priorities(emerge_config.target_config.settings)
+ if 'force-multilib' in emerge_config.target_config.settings.features:
+ if emerge_config.target_config.settings.get("NO_AUTO_FLAG", "")
is "":
+ writemsg_level(bad("!!! Failed to find vars from extra
profile") + "\n",level=logging.ERROR, noiselevel=-1)
+ writemsg_level(bad("!!! Please make sure that you did
follow the instructions and included the extra profile\n"),level=logging.ERROR,
noiselevel=-1)
+ writemsg_level(bad("!!!
http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=blob;f=doc/portage-multilib-instructions\n";),level=logging.ERROR,
noiselevel=-1)
+ writemsg_level(bad("!!! has some basic instructions for
the setup\n"),level=logging.ERROR, noiselevel=-1)
+ return 1
+ if ("--autounmask-continue" in emerge_config.opts and
+ emerge_config.opts.get("--autounmask") == "n"):
+ writemsg_level(
+
[gentoo-commits] proj/portage:multilib commit in: /
commit: d6db617338b7764db3ad8eeb62907ec048a91ff4
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Jan 7 10:30:28 2018 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Jan 7 10:30:28 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d6db6173
Merge tag 'portage-2.3.4' into multilib
version bump
.gitignore | 2 +
.travis.yml| 1 +
RELEASE-NOTES | 35 +
bin/check-implicit-pointer-usage.py| 22 +--
bin/dispatch-conf | 4 +-
bin/etc-update | 19 ++-
bin/glsa-check | 19 ++-
bin/helper-functions.sh| 9 +-
bin/portageq | 7 +
bin/save-ebuild-env.sh | 2 +-
bin/socks5-server.py | 5 +
cnf/make.conf.example | 18 +--
cnf/make.conf.example.alpha.diff | 2 +-
cnf/make.conf.example.amd64-fbsd.diff | 2 +-
cnf/make.conf.example.amd64.diff | 2 +-
cnf/make.conf.example.arm.diff | 2 +-
cnf/make.conf.example.hppa.diff| 2 +-
cnf/make.conf.example.ia64.diff| 2 +-
cnf/make.conf.example.m68k.diff| 2 +-
cnf/make.conf.example.mips.diff| 2 +-
cnf/make.conf.example.ppc.diff | 2 +-
cnf/make.conf.example.ppc64.diff | 2 +-
cnf/make.conf.example.s390.diff| 2 +-
cnf/make.conf.example.sh.diff | 2 +-
cnf/make.conf.example.sparc-fbsd.diff | 2 +-
cnf/make.conf.example.sparc.diff | 2 +-
cnf/make.conf.example.x86-fbsd.diff| 2 +-
cnf/make.conf.example.x86.diff | 2 +-
man/emaint.1 | 8 +-
man/emerge.1 | 8 +-
man/portage.5 | 11 +-
pym/_emerge/actions.py | 17 ++-
pym/_emerge/depgraph.py| 24 ++--
pym/_emerge/main.py| 4 +-
pym/_emerge/post_emerge.py | 6 +-
pym/_emerge/resolver/slot_collision.py | 37 -
pym/portage/__init__.py| 4 +-
pym/portage/checksum.py| 78 ---
pym/portage/const.py | 6 +-
pym/portage/cvstree.py | 6 +-
pym/portage/dbapi/bintree.py | 33 -
pym/portage/dbapi/vartree.py | 15 +-
pym/portage/emaint/main.py | 12 +-
pym/portage/emaint/modules/binhost/binhost.py | 8 +-
pym/portage/emaint/modules/config/config.py| 14 +-
pym/portage/emaint/modules/logs/logs.py| 55
pym/portage/emaint/modules/merges/merges.py| 18 ++-
pym/portage/emaint/modules/move/move.py| 15 +-
pym/portage/emaint/modules/resume/resume.py| 5 +-
pym/portage/emaint/modules/sync/sync.py| 156 +++--
pym/portage/emaint/modules/world/world.py | 10 +-
pym/portage/glsa.py| 12 +-
pym/portage/news.py| 4 +-
pym/portage/package/ebuild/fetch.py| 4 +-
pym/portage/process.py | 4 +
pym/portage/repository/config.py | 16 ++-
pym/portage/sync/controller.py | 13 +-
pym/portage/sync/modules/git/__init__.py | 16 +--
pym/portage/sync/modules/git/git.py| 11 +-
pym/portage/tests/emerge/test_simple.py| 1 +
.../resolver/test_imagemagick_graphicsmagick.py| 104 ++
pym/portage/tests/{bin => sets}/__test__.py| 0
pym/portage/tests/{bin => sync}/__test__.py| 0
pym/portage/tests/sync/test_sync_local.py | 23 ++-
pym/portage/tests/util/test_getconfig.py | 4 +-
pym/portage/tests/util/test_varExpand.py | 4 +-
pym/portage/util/__init__.py | 13 +-
pym/portage/util/_async/PopenProcess.py| 9 +-
pym/portage/util/_dyn_libs/LinkageMapELF.py| 33 -
pym/portage/util/compression_probe.py | 5 +-
pym/portage/util/env_update.py | 10 +-
pym/portage/util/lafilefixer.py| 8 +-
pym/portage/versions.py| 8 +-
pym/portage/xml/metadata.py| 4 +-
repoman/MANIFEST.in| 1 +
repoman/RELEASE-N
[gentoo-commits] proj/portage:multilib commit in: /
commit: c7938eca955a49b2fc7c7ce714bf0ab6d1a53c7b
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Jan 7 10:32:31 2018 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Jan 7 10:32:31 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c7938eca
Merge tag 'portage-2.3.6' into multilib
RELEASE-NOTES | 29 +++
bin/ebuild-helpers/dosym | 17 +-
bin/emirrordist| 8 +
bin/phase-functions.sh | 5 +-
bin/phase-helpers.sh | 8 +-
man/ebuild.5 | 6 +-
man/emerge.1 | 19 +-
pym/_emerge/AsynchronousLock.py| 89 +++-
pym/_emerge/EbuildBuild.py | 23 +-
pym/_emerge/EbuildPhase.py | 14 +-
pym/_emerge/PollScheduler.py | 57 +++--
pym/_emerge/Scheduler.py | 10 +-
pym/_emerge/SpawnProcess.py| 3 +-
pym/_emerge/SubProcess.py | 23 +-
pym/_emerge/UseFlagDisplay.py | 19 +-
pym/_emerge/actions.py | 17 +-
pym/_emerge/depgraph.py| 202 ++---
pym/_emerge/main.py| 12 ++
pym/portage/_emirrordist/FetchIterator.py | 21 ++
pym/portage/_emirrordist/MirrorDistTask.py | 47 ++--
pym/portage/dbapi/bintree.py | 19 +-
pym/portage/dbapi/vartree.py | 22 +-
pym/portage/package/ebuild/_spawn_nofetch.py | 106 +
pym/portage/package/ebuild/config.py | 3 -
pym/portage/package/ebuild/doebuild.py | 2 +-
pym/portage/package/ebuild/prepare_build_dirs.py | 13 ++
pym/portage/tests/ebuild/test_ipc_daemon.py| 3 +-
pym/portage/tests/locks/test_asynchronous_lock.py | 15 +-
pym/portage/tests/resolver/test_autounmask.py | 57 -
.../tests/resolver/test_autounmask_use_breakage.py | 40
.../resolver/test_binary_pkg_ebuild_visibility.py | 144 +
.../tests/resolver/test_onlydeps_minimal.py| 47
.../test_slot_conflict_unsatisfied_deep_deps.py| 61 ++
...ask.py => test_slot_operator_complete_graph.py} | 23 +-
.../resolver/test_slot_operator_exclusive_slots.py | 39
.../modules => tests/util/eventloop}/__init__.py | 0
.../tests/{bin => util/eventloop}/__test__.py | 0
.../tests/util/eventloop/test_call_soon_fifo.py| 30 +++
.../modules => tests/util/futures}/__init__.py | 0
.../tests/{bin => util/futures}/__test__.py| 0
.../tests/util/futures/test_done_callback.py | 35 +++
pym/portage/tests/util/test_digraph.py | 6 +-
pym/portage/util/_async/AsyncScheduler.py | 16 +-
pym/portage/util/_async/SchedulerInterface.py | 6 +-
pym/portage/util/_eventloop/EventLoop.py | 99 -
pym/portage/util/digraph.py| 35 ++-
pym/portage/util/futures/futures.py| 238 ++---
repoman/man/repoman.1 | 4 +
repoman/pym/repoman/modules/scan/ebuild/checks.py | 13 ++
repoman/pym/repoman/qa_data.py | 4 +
setup.py | 7 +-
src/portage_util_file_copy_reflink_linux.c | 19 +-
52 files changed, 1433 insertions(+), 302 deletions(-)
diff --cc bin/phase-functions.sh
index 5633d6313,dfd8733c8..b98023702
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -306,8 -281,9 +306,9 @@@ __dyn_clean()
"$PORTAGE_BUILDDIR"/.ipc_{in,out,lock} \
"$PORTAGE_BUILDDIR"/.exit_status
- rm -rf "${PORTAGE_BUILDDIR}"/{build-info,abi-code}
- rm -rf "${WORKDIR}"*
- rm -rf "${PORTAGE_BUILDDIR}/build-info"
++ rm -rf "${PORTAGE_BUILDDIR}/{build-info,abi-code}"
+ rm -rf "${WORKDIR}"
+ rm -f "${PORTAGE_BUILDDIR}/files"
fi
if [ -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then
[gentoo-commits] proj/portage:multilib commit in: /
commit: 6154d2d5738bf2b554edcf507a419d931244ad5f Author: Thomas Sachau gentoo org> AuthorDate: Sun Jan 7 10:30:21 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jan 7 10:30:21 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6154d2d5 Merge tag 'portage-2.3.3' into multilib new release NEWS | 10 RELEASE-NOTES | 28 +++- bin/ebuild| 25 +++--- bin/egencache | 76 ++- bin/phase-helpers.sh | 7 ++- man/portage.5 | 9 +++- pym/_emerge/depgraph.py | 23 -- pym/portage/dbapi/vartree.py | 14 ++ pym/portage/dep/__init__.py | 16 +-- pym/portage/dep/dep_check.py | 41 + pym/portage/manifest.py | 6 ++- pym/portage/package/ebuild/config.py | 5 -- pym/portage/package/ebuild/digestcheck.py | 2 +- pym/portage/package/ebuild/doebuild.py| 9 ++-- pym/portage/repository/config.py | 18 ++-- pym/portage/sync/modules/git/git.py | 33 +- pym/portage/util/changelog.py | 69 pym/portage/versions.py | 23 +- pym/portage/xml/metadata.py | 28 +++- setup.py | 2 +- 20 files changed, 287 insertions(+), 157 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 284eeaaa4b2ded1a16313b1951489aadcbb68bc9
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Jan 7 10:30:33 2018 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Jan 7 10:30:33 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=284eeaaa
Merge tag 'portage-2.3.5' into multilib
new release
.travis.yml| 9 +-
NEWS | 7 +
RELEASE-NOTES | 18 +
man/emerge.1 | 37 +-
pym/_emerge/create_depgraph_params.py | 5 +
pym/_emerge/depgraph.py| 119 +--
pym/_emerge/main.py| 5 +
pym/portage/_emirrordist/FetchTask.py | 2 +-
pym/portage/checksum.py| 340 +++---
pym/portage/const.py | 3 +-
pym/portage/dbapi/bintree.py | 4 +-
pym/portage/dep/__init__.py| 4 +-
pym/portage/eclass_cache.py| 2 +-
pym/portage/manifest.py| 4 +-
pym/portage/package/ebuild/config.py | 7 +-
pym/portage/package/ebuild/fetch.py| 11 +-
pym/portage/tests/resolver/ResolverPlayground.py | 5 +
.../soname/test_slot_conflict_reinstall.py | 16 +-
pym/portage/tests/resolver/test_bdeps.py | 215
pym/portage/tests/resolver/test_slot_abi.py| 12 +-
.../tests/resolver/test_slot_conflict_rebuild.py | 8 +-
.../resolver/test_slot_operator_exclusive_slots.py | 109 ++
.../test_slot_operator_runtime_pkg_mask.py | 136
.../modules => tests/util/file_copy}/__init__.py | 0
.../tests/{bin => util/file_copy}/__test__.py | 0
pym/portage/tests/util/file_copy/test_copyfile.py | 71
pym/portage/tests/util/test_checksum.py| 106 ++
pym/portage/util/file_copy/__init__.py | 36 ++
pym/portage/util/movefile.py | 5 +-
repoman/pym/repoman/actions.py | 21 +-
repoman/pym/repoman/modules/scan/ebuild/checks.py | 26 ++
repoman/pym/repoman/modules/scan/ebuild/errors.py | 2 +
repoman/pym/repoman/qa_data.py | 4 +-
repoman/pym/repoman/utilities.py | 39 ++-
setup.py | 11 +-
src/portage_util_file_copy_reflink_linux.c | 385 +
36 files changed, 1573 insertions(+), 211 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 676927062dc65324ca68d72690114cff36265d1d Author: Brian Dolbec gentoo org> AuthorDate: Fri Jan 6 17:14:54 2017 + Commit: Thomas Sachau gentoo org> CommitDate: Fri Jan 6 17:14:54 2017 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=67692706 Merge Coacher:extend-rdepend-suspect repoman updates commit '021199792ce55bdc0f99bc7791a2b31ba1533d2e' repoman/pym/repoman/qa_data.py | 3 +++ 1 file changed, 3 insertions(+)
[gentoo-commits] proj/portage:multilib commit in: /
commit: c4fc96e0cc3f6f0cc6443373d9374df32a54d856 Author: Thomas Sachau gentoo org> AuthorDate: Sun Jan 7 10:29:49 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jan 7 10:29:49 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c4fc96e0 Merge tag 'portage-2.3.2' into multilib .travis.yml | 1 + README| 19 RELEASE-NOTES | 13 - bin/ebuild.sh | 11 +++-- bin/phase-functions.sh| 12 +++-- bin/phase-helpers.sh | 2 +- doc/custom.xsl| 2 +- doc/portage.docbook | 2 +- pym/portage/cache/fs_template.py | 2 +- pym/portage/locks.py | 59 --- pym/portage/package/ebuild/doebuild.py| 9 ++-- pym/portage/package/ebuild/prepare_build_dirs.py | 6 --- pym/portage/sync/modules/git/git.py | 14 -- repoman/pym/repoman/main.py | 2 +- repoman/pym/repoman/modules/scan/fetch/fetches.py | 6 +++ setup.py | 23 - 16 files changed, 147 insertions(+), 36 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 0e3b0c33b73dd0a2b5331106baeb54b8628dae7c Author: Thomas Sachau gentoo org> AuthorDate: Sun Jan 7 10:08:35 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jan 7 10:08:35 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0e3b0c33 Merge tag 'portage-2.3.1' into multilib New Release NEWS | 6 ++ RELEASE-NOTES | 28 - bin/chpathtool.py | 2 +- bin/install-qa-check.d/10executable-issues | 4 +- bin/install-qa-check.d/80libraries | 2 +- bin/install-qa-check.d/90gcc-warnings | 4 +- cnf/make.conf.example | 2 +- cnf/make.conf.example.arm.diff | 2 +- cnf/make.conf.example.sh.diff | 2 +- cnf/make.conf.example.sparc.diff | 6 +- doc/config/sets.docbook| 4 +- doc/custom.xsl | 2 +- doc/package/ebuild/eapi/4-python.docbook | 2 +- doc/package/ebuild/eapi/5-progress.docbook | 2 +- doc/portage.docbook| 2 +- doc/qa.docbook | 12 +-- man/color.map.5| 2 +- man/dispatch-conf.1| 2 +- man/ebuild.1 | 2 +- man/ebuild.5 | 10 +- man/egencache.1| 2 +- man/emaint.1 | 2 +- man/emerge.1 | 32 +- man/emirrordist.1 | 2 +- man/env-update.1 | 2 +- man/etc-update.1 | 2 +- man/fixpackages.1 | 2 +- man/make.conf.5| 20 ++-- man/portage.5 | 12 +-- man/quickpkg.1 | 2 +- man/ru/color.map.5 | 2 +- man/ru/dispatch-conf.1 | 2 +- man/ru/ebuild.1| 2 +- man/ru/env-update.1| 2 +- man/ru/etc-update.1| 2 +- man/ru/fixpackages.1 | 2 +- pym/_emerge/EbuildPhase.py | 2 +- pym/_emerge/Scheduler.py | 15 ++- pym/_emerge/actions.py | 43 ++-- pym/_emerge/depgraph.py| 111 +++- pym/_emerge/main.py| 41 +++- pym/_emerge/search.py | 26 - pym/portage/__init__.py| 10 +- pym/portage/_emirrordist/FetchTask.py | 2 +- pym/portage/_selinux.py| 24 +++-- pym/portage/cache/anydbm.py| 4 +- pym/portage/cache/ebuild_xattr.py | 2 +- pym/portage/cache/flat_hash.py | 53 +- pym/portage/cache/mappings.py | 4 +- pym/portage/cache/sqlite.py| 4 +- pym/portage/cache/template.py | 36 ++- pym/portage/data.py| 2 +- pym/portage/dbapi/_SyncfsProcess.py| 2 +- pym/portage/dbapi/vartree.py | 4 +- pym/portage/dispatch_conf.py | 2 +- pym/portage/metadata.py| 2 +- pym/portage/news.py| 76 +- pym/portage/package/ebuild/config.py | 20 +++- pym/portage/package/ebuild/doebuild.py | 4 +- pym/portage/sync/modules/git/git.py| 27 - .../tests/ebuild/test_array_fromfile_eof.py| 2 +- pym/portage/tests/ebuild/test_ipc_daemon.py| 23 +++-- pym/portage/tests/emerge/test_simple.py| 15 +++ pym/portage/tests/news/test_NewsItem.py| 1 + pym/portage/tests/process/test_poll.py | 2 +- .../soname/test_slot_conflict_reinstall.py | 1 + .../resolver/test_runtime_cycle_merge_order.py | 72 + .../tests/resolver/test_slot_conflict_rebuild.py | 2 +- .../resolver/test_slot_operator_reverse_deps.py| 113 + pym/portage/util/__init__.py | 2 +- pym/portage/util/_desktop_entry.py | 2 +- pym/portage/util/_eventloop/EventLoop.py | 17 +++- pym/portage/util/locale.py | 20 ++-- pym/portage/util/writeable_check.py| 28 - pym/portage/xml/me
[gentoo-commits] proj/portage:multilib commit in: /
commit: e69902fbc9c41f0470461561258f596535d9f5c7
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Jan 7 09:48:55 2018 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Jan 7 09:48:55 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e69902fb
Merge tag 'portage-2.3.0' into multilib
Final release
.gitignore | 2 +
.travis.yml| 13 +-
MANIFEST.in| 1 -
NEWS | 10 +
RELEASE-NOTES | 32 +
bin/dispatch-conf | 15 +-
bin/eapi.sh| 4 -
bin/ebuild.sh | 30 +-
bin/egencache | 17 +-
bin/install-qa-check.d/10executable-issues | 20 +-
bin/install-qa-check.d/60openrc| 8 +-
bin/install-qa-check.d/90gcc-warnings | 10 +-
bin/phase-helpers.sh | 9 +-
bin/portageq | 6 +-
cnf/make.globals | 4 +-
cnf/metadata.dtd | 102 ---
pym/_emerge/EbuildBuild.py | 22 +-
pym/_emerge/MiscFunctionsProcess.py| 3 +-
pym/_emerge/Scheduler.py | 9 +-
pym/_emerge/actions.py | 2 +-
pym/_emerge/depgraph.py| 20 +-
pym/_emerge/resolver/output.py | 5 +-
pym/_emerge/resolver/output_helpers.py | 11 +
pym/portage/__init__.py| 9 -
pym/portage/_sets/__init__.py | 37 +-
pym/portage/const.py | 2 +-
pym/portage/dbapi/bintree.py | 7 +-
pym/portage/dbapi/porttree.py | 4 +-
pym/portage/dbapi/vartree.py | 117 +++-
pym/portage/emaint/modules/binhost/__init__.py | 1 +
pym/portage/emaint/modules/config/__init__.py | 1 +
pym/portage/emaint/modules/logs/__init__.py| 1 +
pym/portage/emaint/modules/merges/__init__.py | 1 +
pym/portage/emaint/modules/move/__init__.py| 2 +
pym/portage/emaint/modules/resume/__init__.py | 1 +
pym/portage/emaint/modules/sync/__init__.py| 1 +
pym/portage/emaint/modules/world/__init__.py | 1 +
pym/portage/localization.py| 6 +-
pym/portage/manifest.py| 17 +-
pym/portage/module.py | 15 +-
pym/portage/news.py| 7 +-
pym/portage/output.py | 2 +-
pym/portage/package/ebuild/doebuild.py | 6 +-
pym/portage/package/ebuild/prepare_build_dirs.py | 5 +-
pym/portage/repository/config.py | 47 +-
pym/portage/sync/modules/cvs/__init__.py | 1 +
pym/portage/sync/modules/cvs/cvs.py| 4 +-
pym/portage/sync/modules/git/__init__.py | 1 +
pym/portage/sync/modules/git/git.py| 4 +-
pym/portage/sync/modules/rsync/__init__.py | 1 +
pym/portage/sync/modules/rsync/rsync.py| 4 +-
pym/portage/sync/modules/svn/__init__.py | 1 +
pym/portage/sync/modules/svn/svn.py| 6 +-
pym/portage/sync/modules/webrsync/__init__.py | 1 +
pym/portage/sync/modules/webrsync/webrsync.py | 2 +-
...bi.py => test_emerge_blocker_file_collision.py} | 101 ++-
pym/portage/tests/emerge/test_simple.py| 2 -
pym/portage/tests/resolver/ResolverPlayground.py | 24 +-
pym/portage/tests/util/test_getconfig.py | 4 +-
pym/portage/util/__init__.py | 6 +-
pym/portage/util/_desktop_entry.py | 25 +-
pym/portage/util/_dyn_libs/LinkageMapELF.py| 5 +-
pym/portage/util/configparser.py | 76 +++
pym/{repoman => portage/util/futures}/__init__.py | 0
pym/portage/util/futures/extendedfutures.py| 73 ++
pym/portage/util/futures/futures.py| 118
pym/portage/xml/metadata.py| 59 +-
pym/repoman/_xml.py| 106 ---
pym/repoman/checks/ebuilds/eclasses/live.py| 39 --
pym/repoman/checks/ebuilds/isebuild.py | 71 --
pym/repoman/checks/ebuilds/manifests.py| 102 ---
pym/repoman/checks/ebuilds/misc.py | 57 --
pym/repoman/checks/ebuilds/pkgmetadata.py | 177 -
pym/repoman/checks/ebuilds/thirdpartymirrors.py| 39 --
pym/repoman/checks/ebuilds/variables/eapi.py | 44 --
pym/repoman/checks/ebuilds/variables/license.py| 47 --
pym/repoman/checks/herd
[gentoo-commits] proj/portage:multilib commit in: /
commit: f89c3c5cd8d1da1e40d9a94a016b3002df237237 Author: Thomas Sachau gentoo org> AuthorDate: Sun Jan 7 09:32:44 2018 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Jan 7 09:32:44 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f89c3c5c Merge tag 'v2.2.28' into multilib New Release .travis.yml | 3 +++ RELEASE-NOTES| 20 +++ bin/isolated-functions.sh| 11 ++- bin/misc-functions.sh| 2 +- bin/phase-functions.sh | 7 +-- bin/phase-helpers.sh | 7 ++- bin/portageq | 33 ++-- man/emerge.1 | 3 ++- man/make.conf.5 | 6 +++--- man/portage.5| 6 ++ pym/_emerge/BinpkgFetcher.py | 7 +++ pym/_emerge/UserQuery.py | 15 +++ pym/_emerge/chk_updated_cfg_files.py | 8 pym/_emerge/depgraph.py | 7 +-- pym/portage/_legacy_globals.py | 2 +- pym/portage/dbapi/bintree.py | 2 +- pym/portage/dbapi/porttree.py| 3 ++- pym/portage/news.py | 2 +- pym/portage/package/ebuild/config.py | 4 ++-- pym/portage/package/ebuild/doebuild.py | 2 +- pym/portage/sync/modules/git/__init__.py | 5 - pym/portage/sync/modules/git/git.py | 4 pym/portage/tests/repoman/test_simple.py | 9 +++-- pym/repoman/_xml.py | 2 ++ pym/repoman/actions.py | 29 +++- pym/repoman/checks/ebuilds/checks.py | 3 ++- pym/repoman/checks/ebuilds/misc.py | 2 ++ pym/repoman/checks/herds/herdbase.py | 2 +- pym/repoman/errors.py| 2 ++ pym/repoman/metadata.py | 2 ++ pym/repoman/scanner.py | 7 +-- runtests | 4 ++-- setup.py | 2 +- 33 files changed, 143 insertions(+), 80 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: bin/
commit: cc9000526ff239994ae2050c2df9f2e6f6512055
Author: Thomas Sachau gentoo org>
AuthorDate: Sat May 27 08:45:01 2017 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sat May 27 08:45:01 2017 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=cc900052
Check for symlink instead of existing target (of symlink)
bin/auto-multilib.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index c17c2e8e8..b5043e041 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -269,12 +269,12 @@ _finalize_abi_install() {
if [ "${ABI}" != "${first_installed_abi}" ]; then
__vecho ">>> Removing installed symlinks $(_get_abi_string)"
for i in $(find ${D} -type l) ; do
- [[ -e "${D%/}".${first_installed_abi}/${i/${D}} ]] &&
rm -f ${i}
+ [[ -L "${D%/}".${first_installed_abi}/${i/${D}} ]] &&
rm -f ${i}
done
fi
# Create wrapper symlink for *-config files
- local i=
+ local i=
prep_ml_binaries $(find "${D}"usr/bin "${D}"usr/sbin "${D}"bin
"${D}"sbin -type f -name '*-config' 2>/dev/null)
local noabi=()
[gentoo-commits] proj/portage:multilib commit in: bin/
commit: 0bfcb49daadf993b26c6b782b5121fe4a6017eea
Author: Thomas Sachau gentoo org>
AuthorDate: Mon Sep 25 15:57:39 2017 +
Commit: Thomas Sachau gentoo org>
CommitDate: Mon Sep 25 15:57:39 2017 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0bfcb49d
Add workarounds for llvm
bin/auto-multilib.sh | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index b5043e041..eabef5daf 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -275,7 +275,7 @@ _finalize_abi_install() {
# Create wrapper symlink for *-config files
local i=
- prep_ml_binaries $(find "${D}"usr/bin "${D}"usr/sbin "${D}"bin
"${D}"sbin -type f -name '*-config' 2>/dev/null)
+ prep_ml_binaries $(find "${D}"usr/bin "${D}"usr/sbin "${D}"bin
"${D}"sbin "${D}"usr/lib/llvm/*/bin -type f -name '*-config' 2>/dev/null)
local noabi=()
for i in ${MULTILIB_ABIS}; do
@@ -287,8 +287,10 @@ _finalize_abi_install() {
done
fi
local LIBDIR=$(portage-get_abi_var LIBDIR $1)
+ #FIXME: better way then hardcoding llvm to work around
/usr/lib/llvm/${LIBDIR}
if ( [[ -d "${D}${LIBDIR}" ]] || [[ -d "${D}usr/${LIBDIR}" ]] || [[ -d
"${base}" ]] || \
- (shopt -s nullglob dotglob; f=("${D}"usr/bin/*-config);
((${#f[@]}))) || \
+ (shopt -s nullglob dotglob; f=("${D}"usr/bin/*-config);
((${#f[@]}))) || \
+ (shopt -s nullglob dotglob;
f=("${D}"usr/lib/llvm/*/bin/*-config); ((${#f[@]}))) || \
( use abiwrapper && \
( [[ -d "${D}"usr/bin ]] || \
[[ -d "${D}"usr/sbin ]] || [[ -d "${D}"bin ]]
|| [[ -d "${D}"sbin ]])) ); then
[gentoo-commits] proj/portage:multilib commit in: bin/
commit: d288acc2d1413a8739e74b2c20050dc2cc3bc69c
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Feb 28 12:57:19 2016 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Feb 28 12:57:19 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d288acc2
Drop accidently added check for .setuped
bin/phase-functions.sh | 6 --
1 file changed, 6 deletions(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 858f713..420c9af 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -222,12 +222,6 @@ __dyn_pretend() {
}
__dyn_setup() {
- if [[ -e $PORTAGE_BUILDDIR/.setuped ]] ; then
- __vecho ">>> It appears that '$PF' is already setup; skipping."
- __vecho ">>> Remove '$PORTAGE_BUILDDIR/.setuped' to force
setup."
- return
- fi
-
if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
if ! is_auto-multilib && ! use multilib_abi_"${DEFAULT_ABI}" ;
then
ewarn
[gentoo-commits] proj/portage:multilib commit in: /
commit: 0cf294d33a466f4a3c537aa82d385ec7f87c7bf3 Author: Brian Dolbec gentoo org> AuthorDate: Thu Nov 12 19:26:42 2015 + Commit: Thomas Sachau gentoo org> CommitDate: Thu Nov 12 19:26:42 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0cf294d3 Merge branch 'master' of git+ssh://git.gentoo.org/proj/portage bin/egencache| 70 +++- bin/install-qa-check.d/60openrc | 2 +- bin/save-ebuild-env.sh | 2 +- man/portage.5| 7 +++- misc/emerge-delta-webrsync | 2 +- pym/portage/emaint/modules/sync/sync.py | 57 ++ pym/portage/repository/config.py | 6 ++- pym/portage/sync/controller.py | 18 +--- pym/portage/sync/modules/git/git.py | 11 - pym/portage/sync/modules/rsync/rsync.py | 17 pym/portage/util/_async/AsyncFunction.py | 5 ++- 11 files changed, 139 insertions(+), 58 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 58fb9ace0cb1bf49df2ce68b13999d303fa25756
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Feb 28 12:35:46 2016 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Feb 28 12:35:46 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=58fb9ace
merge v2.2.27
NEWS | 6 +++
RELEASE-NOTES | 25 +
bin/ebuild | 20 ---
bin/ebuild.sh | 25 -
bin/egencache | 20 +--
bin/misc-functions.sh | 3 +-
bin/phase-functions.sh | 36 +
bin/portageq | 16 --
bin/socks5-server.py | 9 +++-
cnf/make.globals | 2 +-
man/ebuild.5 | 4 +-
man/egencache.1| 10 +---
man/emerge.1 | 6 +++
man/emirrordist.1 | 10 +---
pym/_emerge/actions.py | 61 --
pym/_emerge/depgraph.py| 18 +--
pym/_emerge/main.py| 11
pym/portage/_emirrordist/Config.py | 10 +++-
pym/portage/_emirrordist/main.py | 23 +---
pym/portage/_sets/__init__.py | 4 ++
pym/portage/cache/anydbm.py| 3 ++
pym/portage/cache/flat_hash.py | 5 ++
pym/portage/cache/sqlite.py| 9 +++-
pym/portage/cache/template.py | 61 +-
pym/portage/dbapi/porttree.py | 20 +++
pym/portage/dep/dep_check.py | 6 ++-
pym/portage/elog/mod_save.py | 3 +-
pym/portage/emaint/modules/merges/__init__.py | 2 +-
pym/portage/exception.py | 5 +-
pym/portage/manifest.py| 52 +-
.../package/ebuild/_config/LicenseManager.py | 4 +-
.../package/ebuild/_config/special_env_vars.py | 2 +-
pym/portage/package/ebuild/config.py | 41 ++-
pym/portage/package/ebuild/doebuild.py | 27 ++
pym/portage/package/ebuild/fetch.py| 9 ++--
pym/portage/repository/config.py | 21 +++-
pym/portage/sync/controller.py | 6 +--
pym/portage/tests/dbapi/test_portdb_cache.py | 3 +-
pym/portage/tests/ebuild/test_config.py| 4 +-
pym/portage/tests/ebuild/test_doebuild_fd_pipes.py | 37 ++---
pym/portage/tests/ebuild/test_doebuild_spawn.py| 3 +-
pym/portage/tests/ebuild/test_ipc_daemon.py| 3 +-
pym/portage/tests/emerge/test_config_protect.py| 3 +-
pym/portage/tests/emerge/test_emerge_slot_abi.py | 3 +-
pym/portage/tests/emerge/test_simple.py| 3 +-
pym/portage/tests/repoman/test_simple.py | 3 +-
pym/portage/tests/sync/test_sync_local.py | 3 +-
pym/portage/xml/metadata.py| 3 ++
pym/repoman/_xml.py| 10 ++--
pym/repoman/checks/ebuilds/checks.py | 10
pym/repoman/checks/ebuilds/pkgmetadata.py | 6 ++-
pym/repoman/qa_data.py | 1 +
pym/repoman/scanner.py | 20 +--
pym/repoman/vcs/vcsstatus.py | 2 +-
setup.py | 2 +-
55 files changed, 445 insertions(+), 269 deletions(-)
diff --cc pym/_emerge/actions.py
index 9f2ef29,59626ad..e0c8afd
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@@ -2809,15 -2814,7 +2814,15 @@@ def run_action(emerge_config)
adjust_configs(emerge_config.opts, emerge_config.trees)
apply_priorities(emerge_config.target_config.settings)
+ if 'force-multilib' in emerge_config.target_config.settings.features:
+ if emerge_config.target_config.settings.get("NO_AUTO_FLAG", "")
is "":
+ writemsg_level(bad("!!! Failed to find vars from extra
profile") + "\n",level=logging.ERROR, noiselevel=-1)
+ writemsg_level(bad("!!! Please make sure that you did
follow the instructions and included the extra profile\n"),level=logging.ERROR,
noiselevel=-1)
+ writemsg_level(bad("!!!
http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=blob;f=doc/portage-multilib-instructions\n";),level=logging.ERROR,
noiselevel=-1)
+ writemsg_level(bad("!!! has some basic instructions for
the setup\n"),level=logging.ERROR, noiselevel=-1)
+ return 1
+
[gentoo-commits] proj/portage:multilib commit in: /
commit: 3a63f58d0993f66975cd324eb85f4a2340d4f7c3
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Feb 28 12:24:26 2016 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Feb 28 12:24:26 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3a63f58d
Merge tag 'v2.2.23' into multilib
New release
.travis.yml | 1 +
README | 10 +--
RELEASE-NOTES | 14
bin/cgroup-release-agent| 2 +
bin/{ebuild-ipc => chmod-lite} | 6 +-
bin/chmod-lite.py | 30
bin/dohtml.py | 47 +---
bin/phase-helpers.sh| 4 +-
man/make.conf.5 | 3 +
pym/_emerge/AbstractEbuildProcess.py| 14 ++--
pym/_emerge/Scheduler.py| 30
pym/portage/checksum.py | 4 +-
pym/portage/const.py| 1 +
pym/portage/data.py | 2 +-
pym/portage/dbapi/__init__.py | 23 +++---
pym/portage/dbapi/porttree.py | 18 +++--
pym/portage/package/ebuild/doebuild.py | 14 ++--
pym/portage/sync/controller.py | 39 +-
pym/portage/util/__init__.py| 97 ++---
pym/repoman/_subprocess.py | 1 +
pym/repoman/_xml.py | 1 +
pym/repoman/actions.py | 3 +-
pym/repoman/argparser.py| 4 +
pym/repoman/check_missingslot.py| 1 +
pym/repoman/checks/directories/files.py | 1 +
pym/repoman/checks/ebuilds/checks.py| 1 +
pym/repoman/checks/ebuilds/errors.py| 1 +
pym/repoman/checks/ebuilds/fetches.py | 1 +
pym/repoman/checks/ebuilds/isebuild.py | 1 +
pym/repoman/checks/ebuilds/keywords.py | 1 +
pym/repoman/checks/ebuilds/manifests.py | 1 +
pym/repoman/checks/ebuilds/misc.py | 1 +
pym/repoman/checks/ebuilds/pkgmetadata.py | 1 +
pym/repoman/checks/ebuilds/thirdpartymirrors.py | 1 +
pym/repoman/checks/ebuilds/use_flags.py | 1 +
pym/repoman/checks/herds/metadata.py| 1 +
pym/repoman/copyrights.py | 1 +
pym/repoman/ebuild.py | 1 +
pym/repoman/errors.py | 1 +
pym/repoman/gpg.py | 1 +
pym/repoman/main.py | 1 +
pym/repoman/metadata.py | 1 +
pym/repoman/modules/commit/repochecks.py| 1 +
pym/repoman/profile.py | 1 +
pym/repoman/qa_data.py | 1 +
pym/repoman/repos.py| 3 +-
pym/repoman/scan.py | 4 +-
pym/repoman/scanner.py | 29 ++--
pym/repoman/utilities.py| 1 +
pym/repoman/vcs/vcs.py | 1 +
pym/repoman/vcs/vcsstatus.py| 1 +
setup.py| 2 +-
52 files changed, 304 insertions(+), 127 deletions(-)
diff --cc pym/portage/const.py
index 6b03017,6c4f613..20cf40e
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@@ -147,9 -146,9 +147,10 @@@ SUPPORTED_FEATURES = frozenset(
"fakeroot",
"fixlafiles",
"force-mirror",
+ "force-multilib",
"force-prefix",
"getbinpkg",
+ "icecream",
"installsources",
"ipc-sandbox",
"keeptemp",
[gentoo-commits] proj/portage:multilib commit in: /
commit: 4b760f60a70b9af4dce6c894226ebe72485f5495
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Feb 28 12:27:00 2016 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Feb 28 12:27:00 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4b760f60
merge v2.2.25
NEWS | 5 ++
RELEASE-NOTES| 13 +++
bin/eapi.sh | 8 ++
bin/ebuild.sh| 43 ++
bin/egencache| 125 ---
bin/install-qa-check.d/60openrc | 2 +-
bin/phase-helpers.sh | 78 -
bin/save-ebuild-env.sh | 9 +-
man/portage.5| 7 +-
misc/emerge-delta-webrsync | 2 +-
pym/_emerge/actions.py | 3 +
pym/_emerge/main.py | 15 +++-
pym/portage/const.py | 2 +-
pym/portage/eapi.py | 11 ++-
pym/portage/emaint/modules/sync/sync.py | 57 +++--
pym/portage/package/ebuild/config.py | 16
pym/portage/repository/config.py | 6 +-
pym/portage/sync/controller.py | 18 ++--
pym/portage/sync/modules/git/git.py | 11 ++-
pym/portage/sync/modules/rsync/rsync.py | 17 ++--
pym/portage/util/_async/AsyncFunction.py | 5 +-
pym/portage/util/locale.py | 141 +++
pym/repoman/checks/ebuilds/checks.py | 7 +-
pym/repoman/vcs/vcs.py | 20 +++--
setup.py | 2 +-
25 files changed, 513 insertions(+), 110 deletions(-)
diff --cc bin/ebuild.sh
index 9d83477,4319a17..0dd971b
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@@ -6,12 -6,50 +6,54 @@@
# Make sure it's before everything so we don't mess aliases that follow.
unalias -a
+ # Make sure this isn't exported to scripts we execute.
+ unset BASH_COMPAT
+
source "${PORTAGE_BIN_PATH}/isolated-functions.sh" || exit 1
+if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ source "${PORTAGE_BIN_PATH}/auto-multilib.sh" || exit 1
+fi
+
+ # Set up the bash version compatibility level. This does not disable
+ # features when running with a newer version, but makes it so that when
+ # bash changes behavior in an incompatible way, the older behavior is
+ # used instead.
+ __check_bash_version() {
+ # Figure out which min version of bash we require.
+ local maj min
+ if ___eapi_bash_3_2 ; then
+ maj=3 min=2
+ elif ___eapi_bash_4_2 ; then
+ maj=4 min=2
+ else
+ return
+ fi
+
+ # Make sure the active bash is sane.
+ if [[ ${BASH_VERSINFO[0]} -lt ${maj} ]] ||
+ [[ ${BASH_VERSINFO[0]} -eq ${maj} && ${BASH_VERSINFO[1]} -lt ${min}
]] ; then
+ die ">=bash-${maj}.${min} is required"
+ fi
+
+ # Set the compat level in case things change with newer ones. We must
not
+ # export this into the env otherwise we might break other shell
scripts we
+ # execute (e.g. ones in /usr/bin).
+ BASH_COMPAT="${maj}.${min}"
+
+ # The variable above is new to bash-4.3. For older versions, we have
to use
+ # a compat knob. Further, the compat knob only exists with older
versions
+ # (e.g. bash-4.3 has compat42 but not compat43). This means we only
need to
+ # turn the knob with older EAPIs, and only when running newer bash
versions:
+ # there is no bash-3.3 (it went 3.2 to 4.0), and when requiring
bash-4.2, the
+ # var works with bash-4.3+, and you don't need to set compat to 4.2
when you
+ # are already running 4.2.
+ if ___eapi_bash_3_2 && [[ ${BASH_VERSINFO[0]} -gt 3 ]] ; then
+ shopt -s compat32
+ fi
+ }
+ __check_bash_version
+
if [[ $EBUILD_PHASE != depend ]] ; then
source "${PORTAGE_BIN_PATH}/phase-functions.sh" || die
source "${PORTAGE_BIN_PATH}/save-ebuild-env.sh" || die
[gentoo-commits] proj/portage:multilib commit in: /
commit: fa253ca6f939b075c380e6c208a3283bcbaab0c5 Author: Thomas Sachau gentoo org> AuthorDate: Sun Feb 28 12:25:01 2016 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Feb 28 12:25:01 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=fa253ca6 Merge tag 'v2.2.24' into multilib Version 2.2.24 RELEASE-NOTES | 19 ++ bin/binhost-snapshot | 4 +- bin/cgroup-release-agent | 2 +- bin/chpathtool.py | 45 - bin/ebuild | 4 +- bin/egencache | 33 +++--- bin/fixpackages| 4 +- bin/glsa-check | 4 +- bin/install.py | 4 +- bin/portageq | 6 +- bin/quickpkg | 4 +- bin/xattr-helper.py| 4 +- bin/xpak-helper.py | 4 +- man/egencache.1| 10 +++ man/emerge.1 | 7 ++ pym/_emerge/AbstractEbuildProcess.py | 18 ++ pym/_emerge/Binpkg.py | 24 +++ pym/_emerge/BinpkgFetcher.py | 2 +- pym/_emerge/EbuildBuild.py | 21 +++--- pym/_emerge/SpawnProcess.py| 4 +- pym/_emerge/actions.py | 74 -- pym/_emerge/main.py| 4 +- pym/portage/_emirrordist/main.py | 4 +- pym/portage/dbapi/vartree.py | 8 ++- pym/portage/emaint/main.py | 6 +- .../package/ebuild/_config/KeywordsManager.py | 35 -- pym/portage/repository/config.py | 7 +- pym/portage/sync/controller.py | 1 - pym/portage/tests/__init__.py | 4 +- pym/portage/tests/resolver/test_depclean.py| 10 ++- pym/portage/util/_argparse.py | 42 pym/repoman/argparser.py | 4 +- pym/repoman/checks/ebuilds/checks.py | 5 +- pym/repoman/qa_data.py | 3 +- pym/repoman/scanner.py | 10 +++ runtests | 48 +- setup.py | 21 +++--- 37 files changed, 291 insertions(+), 218 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 2988e14465a24de9db00f5899239cb739e5de083
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Feb 28 12:32:23 2016 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Feb 28 12:32:23 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2988e144
merge v2.2.26
RELEASE-NOTES | 12 ++
bin/egencache | 6 +--
bin/phase-functions.sh | 13 ++-
bin/phase-helpers.sh | 17 +
pym/_emerge/SpawnProcess.py| 37 +--
pym/_emerge/depgraph.py| 35 +-
pym/portage/repository/config.py | 14 ++-
pym/portage/sync/controller.py | 7
pym/portage/sync/modules/cvs/__init__.py | 4 +-
.../tests/resolver/test_autounmask_parent.py | 43 ++
pym/portage/util/locale.py | 7 ++--
setup.py | 2 +-
12 files changed, 164 insertions(+), 33 deletions(-)
diff --cc bin/phase-functions.sh
index 6f98569,042e242..96ed339
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -222,32 -219,13 +222,38 @@@ __dyn_pretend()
}
__dyn_setup() {
+ if [[ -e $PORTAGE_BUILDDIR/.setuped ]] ; then
+ __vecho ">>> It appears that '$PF' is already setup; skipping."
+ __vecho ">>> Remove '$PORTAGE_BUILDDIR/.setuped' to force
setup."
- return 0
++ return
++ fi
++
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ if ! is_auto-multilib && ! use multilib_abi_"${DEFAULT_ABI}" ;
then
+ ewarn
+ ewarn "You disabled all ABIs"
+ ewarn "You should enable at least one ABI"
+ ewarn "Enabling the default ABI now"
+ ewarn
+ fi
fi
+ for LOOP_ABI in $(get_abi_list); do
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+ set_abi ${LOOP_ABI}
+ rm -f "${T}"/environment
+ if [[ -e $PORTAGE_BUILDDIR/.setuped.${ABI} ]] ; then
+ __vecho ">>> It appears that '$PF' is already
setup; skipping."
+ __vecho ">>> Remove
'$PORTAGE_BUILDDIR/.setuped.${ABI}' to force setup."
+ return 0
+ fi
+ fi
__ebuild_phase pre_pkg_setup
__ebuild_phase pkg_setup
+ >> "$PORTAGE_BUILDDIR/.setuped.${ABI}" || \
+ die "Failed to create $PORTAGE_BUILDDIR/.setuped"
+
+ done
+
>> "$PORTAGE_BUILDDIR/.setuped" || \
die "Failed to create $PORTAGE_BUILDDIR/.setuped"
__ebuild_phase post_pkg_setup
@@@ -270,7 -246,7 +276,7 @@@ __dyn_unpack()
>> "$PORTAGE_BUILDDIR/.unpacked" || \
die "Failed to create $PORTAGE_BUILDDIR/.unpacked"
__vecho ">>> Source unpacked in ${WORKDIR}"
-- __ebuild_phase post_src_unpack
++__ebuild_phase post_src_unpack
}
__dyn_clean() {
@@@ -406,11 -372,14 +412,16 @@@ __dyn_prepare()
trap __abort_prepare SIGINT SIGQUIT
__ebuild_phase pre_src_prepare
- __vecho ">>> Preparing source in $PWD ..."
+ __vecho ">>> Preparing source in $PWD$(_get_abi_string) ..."
__ebuild_phase src_prepare
+ done
+
+ # keep path in eapply_user in sync!
+ if ___eapi_has_eapply_user && [[ ! -f
${T}/.portage_user_patches_applied ]]; then
+ die "eapply_user (or default) must be called in src_prepare()!"
+ fi
+
>> "$PORTAGE_BUILDDIR/.prepared" || \
die "Failed to create $PORTAGE_BUILDDIR/.prepared"
__vecho ">>> Source prepared."
[gentoo-commits] proj/portage:multilib commit in: pym/portage/dep/
commit: 259272b9ffcf2c3d813487bf0119f761f32476e6
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Oct 4 13:23:22 2015 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Oct 4 13:23:22 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=259272b9
Convert forced flags from new multilib eclass to the matching ones from
multilib-portage
pym/portage/dep/dep_check.py | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py
index dab6961..4e97ffa 100644
--- a/pym/portage/dep/dep_check.py
+++ b/pym/portage/dep/dep_check.py
@@ -84,11 +84,14 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi,
mysettings, myroot="/",
use_tokens = []
else:
use_tokens =
list(x.unevaluated_atom.use.tokens)
+ if 'abi_x86_64' in use_tokens:
+
use_tokens[use_tokens.index('abi_x86_64')] = 'multilib_abi_amd64'
+ if 'abi_x86_32' in use_tokens:
+
use_tokens[use_tokens.index('abi_x86_32')] = 'multilib_abi_x86'
use_tokens.extend(multilib_flags)
x = Atom(x.unevaluated_atom.without_use
+
"[%s]" % (",".join(use_tokens)))
x = x.evaluate_conditionals(myuse)
-
mykey = x.cp
if not mykey.startswith("virtual/"):
newsplit.append(x)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 80edd8061fe4571eb8749bba1f3c452ac0a22042 Author: Thomas Sachau gentoo org> AuthorDate: Sun Oct 4 11:35:31 2015 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Oct 4 11:35:31 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=80edd806 Merge tag 'v2.2.20' into multilib Release 2.2.20 NEWS | 6 + RELEASE-NOTES | 11 + bin/ebuild-helpers/doconfd | 5 +- bin/ebuild-helpers/dodoc | 5 +- bin/ebuild-helpers/doenvd | 5 +- bin/ebuild-helpers/doheader| 5 +- bin/ebuild-helpers/doinitd | 5 +- bin/ebuild-helpers/dolib.a | 3 +- bin/ebuild-helpers/dolib.so| 3 +- bin/egencache | 17 +- bin/repoman| 9 +- cnf/make.conf.example | 6 +- man/make.conf.5| 4 +- man/repoman.1 | 5 +- pym/portage/dbapi/bintree.py | 7 +- pym/portage/repository/config.py | 12 ++ pym/portage/sync/modules/rsync/rsync.py| 13 +- pym/portage/sync/modules/squashdelta/README| 124 --- pym/portage/sync/modules/squashdelta/__init__.py | 37 .../sync/modules/squashdelta/squashdelta.py| 237 - setup.py | 2 +- 21 files changed, 81 insertions(+), 440 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 60c36c144d304311433dcd19662cc2cc2181c2a7 Author: Thomas Sachau gentoo org> AuthorDate: Sun Oct 4 11:35:08 2015 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Oct 4 11:35:08 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=60c36c14 Merge v2.2.19 NEWS | 9 + RELEASE-NOTES | 50 +- bin/dispatch-conf | 9 +- bin/ebuild-helpers/bsd/sed | 4 +- bin/ebuild-helpers/emake | 28 +- bin/ebuild-helpers/portageq| 4 +- bin/ebuild-helpers/unprivileged/chown | 4 +- bin/ebuild-helpers/xattr/install | 14 +- bin/ebuild.sh | 10 +- bin/emerge-webrsync| 4 +- bin/install-qa-check.d/10executable-issues | 12 +- bin/install-qa-check.d/90gcc-warnings | 2 +- bin/misc-functions.sh | 15 +- bin/phase-functions.sh | 12 +- bin/phase-helpers.sh | 2 +- bin/portageq | 18 +- bin/quickpkg | 1 - bin/repoman| 58 +- cnf/dispatch-conf.conf | 2 +- cnf/make.globals | 6 +- cnf/repos.conf | 4 + man/ebuild.5 | 22 +- man/make.conf.5| 31 + man/portage.5 | 8 +- pym/_emerge/Binpkg.py | 33 +- pym/_emerge/BinpkgExtractorAsync.py| 5 +- pym/_emerge/BinpkgFetcher.py | 13 +- pym/_emerge/BinpkgPrefetcher.py| 2 +- pym/_emerge/BinpkgVerifier.py | 6 +- pym/_emerge/EbuildBinpkg.py| 9 +- pym/_emerge/EbuildBuild.py | 36 +- pym/_emerge/EbuildMerge.py | 3 +- pym/_emerge/JobStatusDisplay.py| 4 +- pym/_emerge/Package.py | 67 +- pym/_emerge/PackageMerge.py| 9 +- pym/_emerge/Scheduler.py | 26 +- pym/_emerge/actions.py | 5 +- pym/_emerge/clear_caches.py| 1 - pym/_emerge/depgraph.py| 16 +- pym/_emerge/is_valid_package_atom.py | 5 +- pym/_emerge/resolver/output.py | 21 +- pym/_emerge/search.py | 24 +- pym/portage/_emirrordist/Config.py | 6 +- pym/portage/_emirrordist/MirrorDistTask.py | 4 +- pym/portage/_sets/ProfilePackageSet.py | 3 +- pym/portage/_sets/files.py | 5 +- pym/portage/_sets/profiles.py | 3 +- pym/portage/cache/index/pkg_desc_index.py | 1 + pym/portage/checksum.py| 2 +- pym/portage/const.py | 5 + pym/portage/dbapi/_MergeProcess.py | 9 +- pym/portage/dbapi/_VdbMetadataDelta.py | 25 +- pym/portage/dbapi/__init__.py | 10 +- pym/portage/dbapi/bintree.py | 851 +++-- pym/portage/dbapi/vartree.py | 63 +- pym/portage/dbapi/virtual.py | 113 ++- pym/portage/dep/__init__.py| 38 +- pym/portage/dispatch_conf.py | 101 ++- pym/portage/emaint/modules/binhost/binhost.py | 47 +- pym/portage/output.py | 4 +- .../package/ebuild/_config/KeywordsManager.py | 3 +- .../package/ebuild/_config/LocationsManager.py | 8 +- pym/portage/package/ebuild/_config/MaskManager.py | 21 +- pym/portage/package/ebuild/_config/UseManager.py | 22 +- pym/portage/package/ebuild/config.py | 15 +- pym/portage/package/ebuild/doebuild.py | 81 +- pym/portage/package/ebuild/fetch.py| 7 +- pym/portage/repository/config.py | 4 +- pym/portage/sync/controller.py | 9 +- pym/portage/sync/modules/squashdelta/README| 124 +++ pym/portage/sync/modules/squashdelta/__init__.py | 37 + .../sync/modules/squashdelta/squashdelta.py| 237 ++ pym/portage/sync/modules/webrsync/__init__.py | 4 +- pym/portage/sync/modules/webrsync/webrsync.py | 4 + pym/portage/tests/dep/test_isvalidatom.py | 8 +- pym/portage/tests/resolver/ResolverPlayground.py | 25 +- .../resolver/binpkg_multi_instance}
[gentoo-commits] proj/portage:multilib commit in: /
commit: d41a3639f9e8adb6684d3800adf1b1b2ae40f843 Author: Thomas Sachau gentoo org> AuthorDate: Sun Oct 4 11:37:13 2015 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Oct 4 11:37:13 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d41a3639 Merge v2.2.21 .travis.yml | 2 - DEVELOPING| 10 +- README| 2 +- RELEASE-NOTES | 39 bin/ebuild-helpers/die| 2 +- bin/ebuild-helpers/dobin | 2 +- bin/ebuild-helpers/doconfd| 2 +- bin/ebuild-helpers/dodir | 2 +- bin/ebuild-helpers/dodoc | 2 +- bin/ebuild-helpers/doenvd | 2 +- bin/ebuild-helpers/doexe | 2 +- bin/ebuild-helpers/dohard | 2 +- bin/ebuild-helpers/doheader | 2 +- bin/ebuild-helpers/dohtml | 6 +- bin/ebuild-helpers/doinfo | 2 +- bin/ebuild-helpers/doinitd| 2 +- bin/ebuild-helpers/doins | 2 +- bin/ebuild-helpers/dolib | 2 +- bin/ebuild-helpers/doman | 2 +- bin/ebuild-helpers/domo | 2 +- bin/ebuild-helpers/dosbin | 2 +- bin/ebuild-helpers/dosed | 2 +- bin/ebuild-helpers/dosym | 2 +- bin/ebuild-helpers/ecompress | 2 +- bin/ebuild-helpers/ecompressdir | 2 +- bin/ebuild-helpers/elog | 2 +- bin/ebuild-helpers/emake | 2 +- bin/ebuild-helpers/fowners| 2 +- bin/ebuild-helpers/fperms | 2 +- bin/ebuild-helpers/keepdir| 2 +- bin/ebuild-helpers/newins | 2 +- bin/ebuild-helpers/portageq | 4 +- bin/ebuild-helpers/prepall| 2 +- bin/ebuild-helpers/prepalldocs| 2 +- bin/ebuild-helpers/prepallinfo| 2 +- bin/ebuild-helpers/prepallman | 2 +- bin/ebuild-helpers/prepallstrip | 2 +- bin/ebuild-helpers/prepinfo | 2 +- bin/ebuild-helpers/prepman| 2 +- bin/ebuild-helpers/prepstrip | 3 +- bin/ebuild-helpers/unprivileged/chown | 4 +- bin/ebuild-helpers/xattr/install | 2 - bin/ebuild-ipc| 4 +- bin/ebuild.sh | 3 - bin/egencache | 20 +++ bin/helper-functions.sh | 2 +- bin/install-qa-check.d/10executable-issues| 248 +- bin/install-qa-check.d/80libraries| 130 +++--- bin/isolated-functions.sh | 3 +- bin/misc-functions.sh | 18 +- bin/phase-helpers.sh | 4 +- bin/quickpkg | 18 +- bin/xattr-helper.py | 11 +- doc/qa.docbook| 3 +- man/portage.5 | 11 ++ man/repoman.1 | 5 +- pym/_emerge/AbstractEbuildProcess.py | 21 ++- pym/_emerge/BlockerDB.py | 5 +- pym/_emerge/PackageVirtualDbapi.py| 4 +- pym/_emerge/Scheduler.py | 10 +- pym/_emerge/actions.py| 7 +- pym/_emerge/depgraph.py | 55 -- pym/_emerge/main.py | 19 +- pym/_emerge/resolver/circular_dependency.py | 21 ++- pym/_emerge/resolver/slot_collision.py| 11 +- pym/_emerge/search.py | 3 +- pym/portage/dbapi/IndexedPortdb.py| 4 +- pym/portage/dbapi/IndexedVardb.py | 6 +- pym/portage/dbapi/__init__.py | 4 +- pym/portage/dbapi/bintree.py | 4 +- pym/portage/dbapi/porttree.py | 6 +- pym/portage/dbapi/vartree.py | 22 ++- pym/portage/dbapi/virtual.py | 4 +- pym/portage/dep/__init__.py | 7 +- pym/portage/dep/soname/multilib_category.py | 2 +- pym/portage/emaint/modules/sync/sync.py | 148 +-- pym/portage/manifest.py | 35 pym/portage/package/ebuild/config.py | 3 +- pym/portage/proxy/lazyimport.py | 17 +- pym/portage/repository/config.py | 44 +++-- pym/portage/sync/__init__.py | 20 ++- pym/portage/sync/controller.py| 31 +++- pym/portage/sync/modules/cvs/__i
[gentoo-commits] proj/portage:multilib commit in: /
commit: b0547d42cce2be3442cef58316e95684d64b471e Author: Thomas Sachau gentoo org> AuthorDate: Sun Oct 4 11:35:51 2015 + Commit: Thomas Sachau gentoo org> CommitDate: Sun Oct 4 11:35:51 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b0547d42 Merge tag 'v2.2.20.1' into multilib New version bin/egencache| 2 -- bin/repoman | 9 +++-- cnf/sets/portage.conf| 2 +- man/egencache.1 | 2 +- man/emaint.1 | 4 ++-- man/make.conf.5 | 44 man/repoman.1| 4 ++-- pym/portage/const.py | 1 + pym/repoman/checks.py| 7 +++ pym/repoman/errors.py| 2 +- pym/repoman/utilities.py | 7 +-- setup.py | 2 +- 12 files changed, 60 insertions(+), 26 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: /
commit: 0c879b950b70c54cd672ddc0541744d7785ee04b
Author: Thomas Sachau gentoo org>
AuthorDate: Sun Oct 4 11:37:24 2015 +
Commit: Thomas Sachau gentoo org>
CommitDate: Sun Oct 4 11:37:24 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0c879b95
Merge tag 'v2.2.22' into multilib
New Release
NEWS |6 +
RELEASE-NOTES | 11 +
bin/egencache |4 +-
bin/repoman| 3164 +---
man/ebuild.5 |9 +-
pym/portage/dbapi/virtual.py |8 +-
pym/portage/repository/config.py |2 +-
pym/portage/sync/controller.py |8 +-
pym/portage/tests/repoman/test_simple.py |6 +-
pym/repoman/_portage.py| 25 +
pym/repoman/_subprocess.py | 82 +
pym/repoman/_xml.py| 101 +
pym/repoman/actions.py | 835 ++
pym/repoman/argparser.py | 221 ++
pym/repoman/check_missingslot.py |6 +-
pym/repoman/{ => checks}/__init__.py |0
pym/repoman/{ => checks/directories}/__init__.py |0
pym/repoman/checks/directories/files.py| 80 +
pym/repoman/{ => checks/ebuilds}/__init__.py |0
pym/repoman/{ => checks/ebuilds}/checks.py | 188 +-
.../{ => checks/ebuilds/eclasses}/__init__.py |0
pym/repoman/checks/ebuilds/eclasses/live.py| 39 +
pym/repoman/checks/ebuilds/eclasses/ruby.py| 32 +
pym/repoman/checks/ebuilds/errors.py | 48 +
pym/repoman/checks/ebuilds/fetches.py | 134 +
pym/repoman/checks/ebuilds/isebuild.py | 70 +
pym/repoman/checks/ebuilds/keywords.py | 121 +
pym/repoman/checks/ebuilds/manifests.py| 101 +
pym/repoman/checks/ebuilds/misc.py | 54 +
pym/repoman/checks/ebuilds/pkgmetadata.py | 174 ++
pym/repoman/checks/ebuilds/thirdpartymirrors.py| 38 +
pym/repoman/checks/ebuilds/use_flags.py| 89 +
.../{ => checks/ebuilds/variables}/__init__.py |0
.../checks/ebuilds/variables/description.py| 32 +
pym/repoman/checks/ebuilds/variables/eapi.py | 44 +
pym/repoman/checks/ebuilds/variables/license.py| 47 +
pym/repoman/checks/ebuilds/variables/restrict.py | 41 +
pym/repoman/{ => checks/herds}/__init__.py |0
pym/repoman/{ => checks/herds}/herdbase.py | 26 +-
pym/repoman/checks/herds/metadata.py | 25 +
pym/repoman/copyrights.py | 119 +
pym/repoman/ebuild.py | 28 +
pym/repoman/errors.py | 42 +-
pym/repoman/gpg.py | 81 +
pym/repoman/main.py| 168 ++
pym/repoman/metadata.py| 150 +
pym/repoman/{ => modules}/__init__.py |0
pym/repoman/{ => modules/commit}/__init__.py |0
pym/repoman/modules/commit/repochecks.py | 34 +
pym/repoman/{ => modules/fix}/__init__.py |0
pym/repoman/{ => modules/full}/__init__.py |0
pym/repoman/{ => modules/manifest}/__init__.py |0
pym/repoman/{ => modules/scan}/__init__.py |0
pym/repoman/profile.py | 86 +
pym/repoman/qa_data.py | 438 +++
pym/repoman/qa_tracker.py | 45 +
pym/repoman/repos.py | 306 ++
pym/repoman/scan.py| 170 ++
pym/repoman/scanner.py | 717 +
pym/repoman/utilities.py | 568 +---
pym/repoman/{ => vcs}/__init__.py |0
pym/repoman/vcs/vcs.py | 276 ++
pym/repoman/vcs/vcsstatus.py | 113 +
setup.py |2 +-
64 files changed, 5492 insertions(+), 3722 deletions(-)
[gentoo-commits] proj/portage:multilib commit in: bin/
commit: cf7284cba66a1d6e747ce916de24a5c25b5654f8
Author: Thomas Sachau gentoo org>
AuthorDate: Tue May 5 13:25:26 2015 +
Commit: Thomas Sachau gentoo org>
CommitDate: Tue May 5 13:25:26 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=cf7284cb
Fix build, removed a bit too much
bin/auto-multilib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 73f1574..c17c2e8 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -139,7 +139,7 @@ get_abi_list() {
for my_abi in $(get_abi_order); do
[[ -e "${D%/}".${my_abi} ]] || break
done
-
+ echo ${my_abi}
else
echo "default"
fi
[gentoo-commits] proj/portage:multilib commit in: bin/
commit: 12311d395bd80db466b80c582877a60ab1dc67ff
Author: Thomas Sachau gentoo org>
AuthorDate: Tue May 5 11:58:41 2015 +
Commit: Thomas Sachau gentoo org>
CommitDate: Tue May 5 11:58:41 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=12311d39
Update exception list for no multilib actions when abi_x86_32 is enabled
bin/auto-multilib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 1386cd9..0b7a635 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -101,7 +101,7 @@ has_multilib_profile() {
}
is_auto-multilib() {
- if has_multilib_profile && ! has multilib-native ${INHERITED} && ! use
multilib; then
+ if has_multilib_profile && ! has multilib-native ${INHERITED} && ! use
multilib && ! use abi_x86_32; then
for i in ${MULTILIB_ABIS} ; do
use multilib_abi_"${i}" && [[ "${i}" !=
"${DEFAULT_ABI}" ]] && return 0
done
[gentoo-commits] proj/portage:multilib commit in: bin/
commit: 47c39606998a29f78056f077b7a8a29e0bf20c86
Author: Thomas Sachau gentoo org>
AuthorDate: Tue May 5 12:07:57 2015 +
Commit: Thomas Sachau gentoo org>
CommitDate: Tue May 5 12:07:57 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=47c39606
Removed unused conditions for is_ebuild
bin/auto-multilib.sh | 34 +++-
bin/phase-functions.sh | 53 +-
2 files changed, 4 insertions(+), 83 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index 0b7a635..73f1574 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -109,10 +109,6 @@ is_auto-multilib() {
return 1
}
-is_ebuild() {
- [[ ${PORTAGE_CALLER} == ebuild ]] && return 0 || return 1
-}
-
get_abi_order() {
if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
local order=
@@ -140,13 +136,10 @@ get_abi_order() {
get_abi_list() {
if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
- if ! is_ebuild; then
- for my_abi in $(get_abi_order); do
- [[ -e "${D%/}".${my_abi} ]] || break
- done
- fi
+ for my_abi in $(get_abi_order); do
+ [[ -e "${D%/}".${my_abi} ]] || break
+ done
- is_ebuild && echo $(get_abi_order) || echo ${my_abi}
else
echo "default"
fi
@@ -166,17 +159,6 @@ set_abi() {
unset ABI_SAVE
fi
- if is_ebuild; then
- if [ -d "${WORKDIR}" ]; then
- _unset_abi_dir
- fi
-
- if [ -d "${WORKDIR}.${abi}" ]; then
- # If it doesn't exist, then we're making it soon in
dyn_unpack
- mv ${WORKDIR}.${abi} ${WORKDIR} || die "IO Failure --
Failed to 'mv work.${abi} work'"
- fi
- fi
-
echo "${abi}" > ${PORTAGE_BUILDDIR}/.abi || die "IO Failure -- Failed
to create .abi."
[[ $UID == 0 ]] && chown portage:portage ${PORTAGE_BUILDDIR}/.abi
@@ -210,9 +192,6 @@ _unset_abi_dir() {
unset_abi() {
is_auto-multilib || return 0;
- if is_ebuild; then
- _unset_abi_dir
- fi
_save_abi_env "${ABI}"
export ABI=${DEFAULT_ABI}
if [[ -f ${PORTAGE_BUILDDIR}/abi-code/environment."${ABI}" ]]; then
@@ -318,13 +297,6 @@ _finalize_abi_install() {
for my_abi in ${ALL_ABIS}; do
[[ -e "${D%/}".${my_abi} ]] || return 0
done
- else
- if is_ebuild; then
- mv "${D}" "${D%/}".${ABI} || die
- for my_abi in ${ALL_ABIS}; do
- [[ -e "${D%/}".${my_abi} ]] || return 0
- done
- fi
fi
mkdir -p "${D}"
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 79a86cf..7537ddc 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -234,11 +234,7 @@ __dyn_setup() {
for LOOP_ABI in $(get_abi_list); do
if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
set_abi ${LOOP_ABI}
- if is_ebuild; then
- source "${T}"/environment || die
- else
- rm -f "${T}"/environment
- fi
+ rm -f "${T}"/environment
if [[ -e $PORTAGE_BUILDDIR/.setuped.${ABI} ]] ; then
__vecho ">>> It appears that '$PF' is already
setup; skipping."
__vecho ">>> Remove
'$PORTAGE_BUILDDIR/.setuped.${ABI}' to force setup."
@@ -250,14 +246,12 @@ __dyn_setup() {
>> "$PORTAGE_BUILDDIR/.setuped.${ABI}" || \
die "Failed to create $PORTAGE_BUILDDIR/.setuped"
- [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && {
unset_abi; source "${T}"/environment || die ; }
done
>> "$PORTAGE_BUILDDIR/.setuped" || \
die "Failed to create $PORTAGE_BUILDDIR/.setuped"
__ebuild_phase post_pkg_setup
- [[ " ${FEATURES} " == *" force-multilib "* ]] && is_ebuild && { rm
"${T}"/environment || die ; }
}
__dyn_unpack() {
@@ -273,14 +267,6 @@ __dyn_unpack() {
__vecho ">>> Unpacking source$(_get_abi_string)..."
__ebuild_phase src_unpack
- if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
- if is_auto-multilib && is_ebuild; then
- >> "$PORTAGE_BUILDDIR"/.unpacked."${LOOP_ABI}"
|| die "IO Failure -- Failed to 'touch .unpacked.${LOOP_ABI}'"
- fi
- is_ebuild && { unset_abi; source "${T}"/environment ||
die ; }
-
-
[gentoo-commits] proj/portage:multilib commit in: /
commit: 600cb1fd9daed3b01d8f51b38c29f000376b6513 Author: Thomas Sachau gentoo org> AuthorDate: Tue May 5 11:30:56 2015 + Commit: Thomas Sachau gentoo org> CommitDate: Tue May 5 11:30:56 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=600cb1fd Merge tag 'v2.2.18' into multilib Portage-2.2.18 release NEWS | 11 + RELEASE-NOTES | 69 ++ bin/chpathtool.py | 22 +- bin/eapi.sh| 114 +- bin/ebuild |1 + bin/ebuild-helpers/dohtml |4 + bin/ebuild.sh | 13 +- bin/egencache | 38 +- bin/emerge-webrsync|4 +- bin/isolated-functions.sh | 21 +- bin/phase-functions.sh | 13 +- bin/phase-helpers.sh | 315 +- bin/portageq | 16 +- bin/regenworld |4 +- bin/repoman| 15 +- bin/save-ebuild-env.sh |5 +- bin/socks5-server.py | 227 cnf/make.conf.example |2 +- cnf/repo.postsync.d/example| 51 + cnf/repos.conf |1 + cnf/sets/portage.conf | 12 +- doc/config/sets.docbook| 47 +- man/ebuild.5 | 21 +- man/egencache.1| 15 +- man/emaint.1 | 71 +- man/emerge.1 | 91 +- man/make.conf.5| 14 +- man/portage.5 | 232 - man/repoman.1 |2 +- pym/_emerge/AbstractPollTask.py| 52 +- pym/_emerge/BinpkgExtractorAsync.py| 25 +- pym/_emerge/FakeVartree.py | 16 +- pym/_emerge/Package.py | 58 +- pym/_emerge/Scheduler.py |1 + pym/_emerge/actions.py | 1095 ++-- pym/_emerge/create_depgraph_params.py | 22 + pym/_emerge/create_world_atom.py |6 +- pym/_emerge/depgraph.py| 550 +++--- pym/_emerge/help.py|2 +- pym/_emerge/main.py| 81 +- pym/_emerge/resolver/DbapiProvidesIndex.py | 101 ++ pym/_emerge/resolver/output.py | 19 +- pym/_emerge/resolver/output_helpers.py | 19 +- pym/_emerge/resolver/package_tracker.py| 42 +- pym/_emerge/resolver/slot_collision.py | 35 +- pym/_emerge/search.py | 188 ++-- pym/portage/__init__.py|4 +- pym/portage/_sets/ProfilePackageSet.py | 34 + pym/portage/_sets/__init__.py | 19 +- pym/portage/_sets/files.py | 157 ++- pym/portage/_sets/profiles.py | 27 +- pym/portage/cache/index/IndexStreamIterator.py | 27 + .../sync => portage/cache/index}/__init__.py |2 +- pym/portage/cache/index/pkg_desc_index.py | 59 ++ pym/portage/dbapi/DummyTree.py | 16 + pym/portage/dbapi/IndexedPortdb.py | 171 +++ pym/portage/dbapi/IndexedVardb.py | 114 ++ pym/portage/dbapi/_VdbMetadataDelta.py | 153 +++ pym/portage/dbapi/bintree.py | 38 +- pym/portage/dbapi/vartree.py | 72 +- pym/portage/dep/__init__.py| 31 +- pym/portage/dep/_slot_operator.py | 13 + pym/portage/dep/dep_check.py | 16 +- pym/portage/dep/soname/SonameAtom.py | 72 ++ .../resolver => portage/dep/soname}/__init__.py|2 +- pym/portage/dep/soname/multilib_category.py| 114 ++ pym/portage/dep/soname/parse.py| 47 + pym/portage/dispatch_conf.py | 68 +- pym/portage/eapi.py|2 +- pym/portage/emaint/main.py | 33 +- pym/portage/emaint/modules/merges/merges.py| 15 +- pym/portage/emaint/modules/sync/__init__.py| 55 + pym/portage/emaint/modules/sync/sync.py| 289 ++ pym/portage/locks.py |2 +- pym/portage/metadata.py
[gentoo-commits] proj/portage:multilib commit in: /
commit: 6a8389a3a9f6af80bbb4108d5bb6f4b847b44577
Author: Thomas Sachau gentoo org>
AuthorDate: Fri Dec 12 20:22:45 2014 +
Commit: Thomas Sachau gentoo org>
CommitDate: Fri Dec 12 20:22:45 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6a8389a3
Merge tag 'v2.2.15' into multilib
Portage-2.2.15 release
RELEASE-NOTES | 52 +++
bin/bashrc-functions.sh| 7 +-
bin/dispatch-conf | 63 ++--
bin/ebuild | 6 +-
bin/ebuild.sh | 85 +++--
bin/etc-update | 164 +-
bin/install-qa-check.d/05double-D | 9 +-
bin/install-qa-check.d/90world-writable| 27 +-
bin/install.py | 2 +-
bin/isolated-functions.sh | 68
bin/misc-functions.sh | 71 ++--
bin/phase-functions.sh | 2 +-
bin/portageq | 14 +-
bin/quickpkg | 4 +-
bin/save-ebuild-env.sh | 4 +-
cnf/make.globals | 3 +-
man/ebuild.5 | 7 +-
man/emerge.1 | 28 +-
man/make.conf.5| 6 +
man/portage.5 | 30 +-
pym/_emerge/Package.py | 18 +-
pym/_emerge/actions.py | 103 +-
pym/_emerge/create_depgraph_params.py | 5 +
pym/_emerge/depgraph.py| 232 ++---
pym/_emerge/main.py| 13 +-
pym/_emerge/sync/old_tree_timestamp.py | 5 +-
pym/_emerge/unmerge.py | 42 ++-
pym/portage/__init__.py| 27 ++
pym/portage/_global_updates.py | 4 +-
pym/portage/_selinux.py| 14 +-
pym/portage/cache/fs_template.py | 25 +-
pym/portage/const.py | 2 +
pym/portage/data.py| 134 ++--
.../dbapi/_ContentsCaseSensitivityManager.py | 93 ++
pym/portage/dbapi/bintree.py | 28 ++
pym/portage/dbapi/vartree.py | 361 -
pym/portage/dep/dep_check.py | 53 ++-
pym/portage/dispatch_conf.py | 157 +++--
pym/portage/exception.py | 1 +
pym/portage/locks.py | 9 +-
pym/portage/news.py| 9 +-
.../package/ebuild/_config/LocationsManager.py | 11 +-
.../package/ebuild/_config/special_env_vars.py | 4 +-
pym/portage/package/ebuild/config.py | 110 +--
pym/portage/package/ebuild/doebuild.py | 24 +-
pym/portage/package/ebuild/prepare_build_dirs.py | 9 +-
pym/portage/repository/config.py | 2 +-
pym/portage/tests/__init__.py | 4 +-
.../tests/ebuild/test_use_expand_incremental.py| 132
pym/portage/tests/emerge/test_config_protect.py| 292 +
pym/portage/tests/emerge/test_simple.py| 10 +-
pym/portage/tests/resolver/ResolverPlayground.py | 10 +
.../tests/resolver/test_onlydeps_circular.py | 51 +++
pym/portage/tests/resolver/test_or_choices.py | 59 +++-
..._slot_operator_update_probe_parent_downgrade.py | 68
pym/portage/tests/resolver/test_virtual_slot.py| 75 +
pym/portage/tests/resolver/test_with_test_deps.py | 44 +++
pym/portage/update.py | 6 +-
pym/portage/util/__init__.py | 49 ++-
pym/portage/util/movefile.py | 2 +-
pym/portage/util/path.py | 48 +++
pym/portage/util/writeable_check.py| 2 +-
setup.py | 25 +-
63 files changed, 2524 insertions(+), 500 deletions(-)
diff --cc bin/misc-functions.sh
index 416e2bf,e08c228..22ab339
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -170,18 -168,21 +170,22 @@@ install_qa_check()
local EPREFIX= ED=${D}
fi
+ [[ -d "${ED}" ]] || return 0
cd "${ED}" || die "cd failed"
- # Run QA checks from install-qa-check.d.
- # Note: checks need to be run *before* stripping.
- local f
- # TODO: handle nullglob-like
- for f in "${PORTAGE_BIN_PATH}"/install-qa-check.d/*; do
- # Run in a subshell to treat it like external script,
- # but use 'source'
