detect PORTDIR & PORTDIR_OVERLAY by Portage::Q get_repos/get_repo_path

if they not comes from env this commit should fix gentoo bug #581490 and fix gentoo-perl#26 (github)
bor · Nov 11, 2016 · d520137 · d520137
1 parent 346f374
commit d520137
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/lib/App/gcpan.pm b/lib/App/gcpan.pm
@@ -63,6 +63,15 @@ sub setup_env {
  PORTDIR_OVERLAY => $portageq->envvar('PORTDIR_OVERLAY'),
  );
 
+ # retrive PORTDIR & PORTDIR_OVERLAY from repos.conf if they not set in make.conf
+ $env{PORTDIR} ||= $portageq->get_repo_path( $portageq->envvar('EROOT'), 'gentoo' );
+ unless ( $env{PORTDIR_OVERLAY} ) {
+ my $eroot = $portageq->envvar('EROOT');
+ my $repos = $portageq->get_repos($eroot);
+ $env{PORTDIR_OVERLAY} = join ' ',
+ map { $portageq->get_repo_path( $eroot, $_ ) } grep { $_ ne 'gentoo' } @$repos;
+ }
+
  return \%env;
 }