diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch |
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch')
-rw-r--r-- | dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch b/dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch new file mode 100644 index 000000000000..a9968cd7e79e --- /dev/null +++ b/dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch @@ -0,0 +1,86 @@ +diff -ur PortageXS-0.02.10.orig/lib/PortageXS/Core.pm PortageXS-0.02.10/lib/PortageXS/Core.pm +--- PortageXS-0.02.10.orig/lib/PortageXS/Core.pm 2013-01-03 09:32:10.477597366 +0100 ++++ PortageXS-0.02.10/lib/PortageXS/Core.pm 2013-01-03 09:32:12.707534858 +0100 +@@ -94,7 +94,7 @@ + my $self = shift; + my $param = shift; + my @files = (); +- my @etcfiles = qw(/etc/make.globals /etc/make.conf); ++ my @etcfiles = qw(/usr/share/portage/config/make.globals /etc/portage/make.conf); + my @profilefiles = (); + my $v = ''; + my $parent = ''; +@@ -166,7 +166,7 @@ + return $self->{'PORTDIR'}; + } + else { +- $self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('/etc/make.globals').$self->getFileContents('/etc/make.conf'),'PORTDIR','lastseen'); ++ $self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/portage/make.conf'),'PORTDIR','lastseen'); + return $self->{'PORTDIR'}; + } + } +@@ -183,7 +183,7 @@ + my $self = shift; + my $forcereload = shift; + +- return split(/ /,$self->getParamFromFile($self->getFileContents('/etc/make.globals').$self->getFileContents('/etc/make.conf'),'PORTDIR_OVERLAY','lastseen')); ++ return split(/ /,$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/portage/make.conf'),'PORTDIR_OVERLAY','lastseen')); + } + + # Description: +diff -ur PortageXS-0.02.10.orig/lib/PortageXS/examples/getParamFromFile.pl PortageXS-0.02.10/lib/PortageXS/examples/getParamFromFile.pl +--- PortageXS-0.02.10.orig/lib/PortageXS/examples/getParamFromFile.pl 2013-01-03 09:32:10.477597366 +0100 ++++ PortageXS-0.02.10/lib/PortageXS/examples/getParamFromFile.pl 2013-01-03 09:32:12.707534858 +0100 +@@ -8,4 +8,5 @@ + + my $pxs=PortageXS->new(); + print "CFLAGS are set to: "; +-print join(' ',$pxs->getParamFromFile($pxs->getFileContents('/etc/make.globals').$pxs->getFileContents('/etc/make.conf'),'CFLAGS','lastseen'))."\n"; ++print join(' ++',$pxs->getParamFromFile($pxs->getFileContents('/usr/share/portage/config/make.globals').$pxs->getFileContents('/etc/portage/make.conf'),'CFLAGS','lastseen'))."\n"; +diff -ur PortageXS-0.02.10.orig/lib/PortageXS.pm PortageXS-0.02.10/lib/PortageXS.pm +--- PortageXS-0.02.10.orig/lib/PortageXS.pm 2013-01-03 09:32:10.478597338 +0100 ++++ PortageXS-0.02.10/lib/PortageXS.pm 2013-01-03 09:32:29.710057966 +0100 +@@ -77,7 +77,7 @@ + + $self->{'PORTAGEXS_ETC_DIR'} = '/etc/pxs/'; + $self->{'ETC_DIR'} = '/etc/'; +- $self->{'MAKE_PROFILE_PATH'} = '/etc/make.profile'; ++ $self->{'MAKE_PROFILE_PATH'} = '/etc/portage/make.profile'; + + # - init colors > + $self->{'COLORS'}{'YELLOW'} = color('bold yellow'); +@@ -89,7 +89,7 @@ + $self->{'COLORS'}{'BLUE'} = color('bold blue'); + $self->{'COLORS'}{'RESET'} = color('reset'); + +- if (lc($self->getParamFromFile($self->getFileContents('/etc/make.conf'),'NOCOLOR','lastseen')) eq 'true') { ++ if (lc($self->getParamFromFile($self->getFileContents('/etc/portage/make.conf'),'NOCOLOR','lastseen')) eq 'true') { + $self->{'COLORS'}{'YELLOW'} = ''; + $self->{'COLORS'}{'GREEN'} = ''; + $self->{'COLORS'}{'LIGHTGREEN'} = ''; +diff -ur PortageXS-0.02.10.orig/t/01_Core.t PortageXS-0.02.10/t/01_Core.t +--- PortageXS-0.02.10.orig/t/01_Core.t 2013-01-03 09:32:10.476597394 +0100 ++++ PortageXS-0.02.10/t/01_Core.t 2013-01-03 09:32:12.707534858 +0100 +@@ -14,8 +14,8 @@ + + # - getFileContents > + { +- my $content = $pxs->getFileContents('/etc/make.conf'); +- ok($content ne '','getFileContents of /etc/make.conf'); ++ my $content = $pxs->getFileContents('/etc/portage/make.conf'); ++ ok($content ne '','getFileContents of /etc/portage/make.conf'); + } + + # - searchInstalledPackage > +@@ -26,8 +26,8 @@ + + # - getParamFromFile > + { +- my $param = $pxs->getParamFromFile($pxs->getFileContents('/etc/make.conf'),'CFLAGS','lastseen'); +- ok($param ne '','getParamFromFile /etc/make.conf - CFLAGS: '.$param); ++ my $param = $pxs->getParamFromFile($pxs->getFileContents('/etc/portage/make.conf'),'CFLAGS','lastseen'); ++ ok($param ne '','getParamFromFile /etc/portage/make.conf - CFLAGS: '.$param); + } + + # - getUseSettingsOfInstalledPackage > |