1 |
commit: f11d2f64ff8af00bc4ac13e6d74f46c598334a91 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 10 20:06:15 2013 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 1 05:58:06 2015 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f11d2f64 |
7 |
|
8 |
Fix a bug that portage didn't get rebuilt with changed use flags |
9 |
|
10 |
If clst_PGKCACHE is defined, --newuse was not being added to clst_myemergeopts, so then portage was not being rebuilt if portage was already up to date. |
11 |
|
12 |
Conflicts: |
13 |
targets/support/chroot-functions.sh |
14 |
|
15 |
--- |
16 |
targets/support/chroot-functions.sh | 5 +++-- |
17 |
1 file changed, 3 insertions(+), 2 deletions(-) |
18 |
|
19 |
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
20 |
index ee820ed..3b7f77b 100755 |
21 |
--- a/targets/support/chroot-functions.sh |
22 |
+++ b/targets/support/chroot-functions.sh |
23 |
@@ -170,14 +170,15 @@ setup_pkgmgr(){ |
24 |
# portage to avoid frying our /etc/portage/make.conf file. Otherwise, we could |
25 |
# just let emerge @system could merge it. |
26 |
# Use --update or portage might just waste time/cycles and reinstall the same version. |
27 |
+ # Use --newuse to make sure it rebuilds with any changed use flags. |
28 |
if [ -n "$1" ];then |
29 |
echo "Adding USE='${USE} $1' to make.conf for portage build" |
30 |
[ -e /etc/portage/make.conf ] && echo 'USE="${USE} $1"' >> /etc/portage/make.conf |
31 |
- run_merge --oneshot --update sys-apps/portage |
32 |
+ run_merge --oneshot --update --newuse sys-apps/portage |
33 |
sed -i '/USE="${USE} $1"/d' /etc/portage/make.conf |
34 |
else |
35 |
echo "Updating portage with USE='${USE}'" |
36 |
- run_merge --oneshot --update sys-apps/portage |
37 |
+ run_merge --oneshot --update --newuse sys-apps/portage |
38 |
fi |
39 |
} |