[gentoo-commits] proj/portage:master commit in: cnf/, man/, lib/portage/tests/emerge/

[gentoo-commits] proj/portage:master commit in: cnf/, man/, lib/portage/tests/emerge/

[Zac Medico]

commit:     bba152098af82e5bc2686d9facb3c0a88bcbdba0
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 12:37:56 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 12:55:48 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=bba15209

make.globals: default enable FEATURES=binpkg-multi-instance

Bug: https://bugs.gentoo.org/715112
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 cnf/make.globals                        | 1 +
 lib/portage/tests/emerge/test_simple.py | 4 ++--
 man/make.conf.5                         | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index dd3f28f70..b8bc90ae0 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -54,6 +54,7 @@ FETCHCOMMAND_SFTP="bash -c \"x=\\\${2#sftp://} ; host=\\\${x%%/*} ; port=\\\${ho
 
 # Default user options
 FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs
+          binpkg-multi-instance
           config-protect-if-modified distlocks ebuild-locks
           fixlafiles ipc-sandbox merge-sync multilib-strict
           network-sandbox news parallel-fetch pid-sandbox

diff --git a/lib/portage/tests/emerge/test_simple.py b/lib/portage/tests/emerge/test_simple.py
index d26146aa9..6e282337f 100644
--- a/lib/portage/tests/emerge/test_simple.py
+++ b/lib/portage/tests/emerge/test_simple.py
@@ -322,11 +322,11 @@ call_has_and_best_version() {
 			rm_cmd + ("-rf", cachedir),
 			emerge_cmd + ("--oneshot", "virtual/foo"),
 			lambda: self.assertFalse(os.path.exists(
-				os.path.join(pkgdir, "virtual", "foo-0.tbz2"))),
+				os.path.join(pkgdir, "virtual", "foo", "foo-0-1.xpak"))),
 			({"FEATURES" : "unmerge-backup"},) + \
 				emerge_cmd + ("--unmerge", "virtual/foo"),
 			lambda: self.assertTrue(os.path.exists(
-				os.path.join(pkgdir, "virtual", "foo-0.tbz2"))),
+				os.path.join(pkgdir, "virtual", "foo", "foo-0-1.xpak"))),
 			emerge_cmd + ("--pretend", "dev-libs/A"),
 			ebuild_cmd + (test_ebuild, "manifest", "clean", "package", "merge"),
 			emerge_cmd + ("--pretend", "--tree", "--complete-graph", "dev-libs/A"),

diff --git a/man/make.conf.5 b/man/make.conf.5
index 76e0ac155..e78751c16 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -316,6 +316,7 @@ BUILD_TIME metadata to select the latest builds.
 The \fBeclean\-pkg\fR command can be used to prune old builds from PKGDIR.
 It is also possible to remove packages manually, and then run
 \(aqemaint \-\-fix binhost' to update the ${PKGDIR}/Packages index.
+This feature is enabled by default.
 .TP
 .B buildpkg
 Binary packages will be created for all packages that are merged. Also see