diff options
| author |   Sven Eden <sven.eden@gmx.de> | 2013-02-09 21:08:38 +0100 |
|---|---|---|
| committer | Sven Eden <sven.eden@gmx.de> | 2013-02-09 21:08:38 +0100 |
| commit | ea1fee406abce71515ebacfbeac8e16b417d89ce (patch) | |
| tree | 29511f15ea71ed3d8dd7a5c0c45db910d013b534 /Portage.pm | |
| parent | Updated some information and changed IUSE usage to manipulate "default" value... (diff) | |
| download | ufed-ea1fee406abce71515ebacfbeac8e16b417d89ce.tar.gz ufed-ea1fee406abce71515ebacfbeac8e16b417d89ce.tar.bz2 ufed-ea1fee406abce71515ebacfbeac8e16b417d89ce.zip | |
Save information of /etc/portage/package.use in a new hash area "pkguse". It will later complete the 'C' column instead of 'P', which is reserved for profile settings now.
Diffstat (limited to 'Portage.pm')
| -rw-r--r-- | Portage.pm | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -76,7 +76,8 @@ my $_use_template = { forced => 0, installed => 0, masked => 0, - "package" => 0 + "package" => 0, + pkguse => 0, }; # --- public methods --- @@ -126,8 +127,8 @@ INIT { or die("Sorry, USE_ORDER without make.conf overriding global" . " USE flags are not currently supported by ufed.\n"); - _read_packages; _read_make_defaults; + _read_packages; _read_use_force; ## Must be before _read_use_mask to not _read_use_mask; ## unintentionally unmask explicitly masked flags. _read_archs; @@ -568,6 +569,7 @@ sub _read_make_defaults { # package.use files are parsed next, finished by /etc/portage/package.use for my $dir(@_profiles, "${_EPREFIX}/etc/portage") { + my $tgt = $dir eq "${_EPREFIX}/etc/portage" ? "pkguse" : "package"; for(_noncomments("$dir/package.use") ) { my($pkg, @flags) = split; @@ -586,9 +588,9 @@ sub _read_make_defaults { _add_temp($flag, $pkg); if ($state) { - $_use_temp->{$flag}{"local"}{$pkg}{"package"} = -1; ## explicitly disabled + $_use_temp->{$flag}{"local"}{$pkg}{$tgt} = -1; ## explicitly disabled } else { - $_use_temp->{$flag}{"local"}{$pkg}{"package"} = 1; ## explicitly enabled + $_use_temp->{$flag}{"local"}{$pkg}{$tgt} = 1; ## explicitly enabled } } } @@ -651,8 +653,8 @@ sub _read_packages { _add_temp($flag, "global"); _add_temp($flag, $pkg); - $_use_temp->{$flag}{"local"}{$pkg}{"default"} = $eState ? 1 : $dState ? -1 : 0; - $_use_temp->{$flag}{"local"}{$pkg}{installed} = 1; + $_use_temp->{$flag}{"local"}{$pkg}{"default"} = $eState ? 1 : $dState ? -1 : 0; + $_use_temp->{$flag}{"local"}{$pkg}{installed} = 1; $_use_temp->{$flag}{global}{installed} = 1; } ## End of looping IUSE |