diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
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 > |