diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-02-21 16:11:52 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-21 16:11:52 +0000 |
| commit | c290dcb7e4c0609b0134dc91a67fff265e20914e (patch) | |
| tree | b997ca659578f2e947c7d196f9f9fa109275bfb3 | |
| parent | Restrict Jython ABIs. Fix installation (bug #355837). (diff) | |
| download | gentoo-2-c290dcb7e4c0609b0134dc91a67fff265e20914e.tar.gz gentoo-2-c290dcb7e4c0609b0134dc91a67fff265e20914e.tar.bz2 gentoo-2-c290dcb7e4c0609b0134dc91a67fff265e20914e.zip | |
Replace references to undocumented PWORKDIR variable with the
documented WORKDIR variable. The behavior should not change, since
nothing else references this PWORKDIR variable, and portage exports
PWORKDIR=$WORKDIR.
| -rw-r--r-- | eclass/ELT-patches/portage/1.3.0c | 4 | ||||
| -rw-r--r-- | eclass/ELT-patches/portage/1.3.3 | 4 | ||||
| -rw-r--r-- | eclass/ELT-patches/portage/1.4.0 | 4 | ||||
| -rw-r--r-- | eclass/ELT-patches/portage/1.5.10 | 4 | ||||
| -rw-r--r-- | eclass/ELT-patches/portage/2.2 | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/eclass/ELT-patches/portage/1.3.0c b/eclass/ELT-patches/portage/1.3.0c index e862f835ad43..ad071aed2f08 100644 --- a/eclass/ELT-patches/portage/1.3.0c +++ b/eclass/ELT-patches/portage/1.3.0c @@ -24,8 +24,8 @@ + if test "$installed" = yes; then + # Rather use S=WORKDIR if our version of portage supports it. + # This is because some ebuild (gcc) do not use $S as buildroot. -+ if test "$PWORKDIR"; then -+ S="$PWORKDIR" ++ if test "$WORKDIR"; then ++ S="$WORKDIR" + fi + # We do not want portage's build root ($S) present. + my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` diff --git a/eclass/ELT-patches/portage/1.3.3 b/eclass/ELT-patches/portage/1.3.3 index 8dab92914e91..731076bce485 100644 --- a/eclass/ELT-patches/portage/1.3.3 +++ b/eclass/ELT-patches/portage/1.3.3 @@ -34,8 +34,8 @@ + if test "$installed" = yes; then + # Rather use S=WORKDIR if our version of portage supports it. + # This is because some ebuild (gcc) do not use $S as buildroot. -+ if test "$PWORKDIR"; then -+ S="$PWORKDIR" ++ if test "$WORKDIR"; then ++ S="$WORKDIR" + fi + # We do not want portage's build root ($S) present. + my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` diff --git a/eclass/ELT-patches/portage/1.4.0 b/eclass/ELT-patches/portage/1.4.0 index 6152dfd6fe4b..5566a39af49a 100644 --- a/eclass/ELT-patches/portage/1.4.0 +++ b/eclass/ELT-patches/portage/1.4.0 @@ -32,8 +32,8 @@ name should be bumped, but the patch content should stay fairly the same. + if test "$installed" = yes; then + # Rather use S=WORKDIR if our version of portage supports it. + # This is because some ebuild (gcc) do not use $S as buildroot. -+ if test "$PWORKDIR"; then -+ S="$PWORKDIR" ++ if test "$WORKDIR"; then ++ S="$WORKDIR" + fi + # We do not want portage's build root ($S) present. + my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` diff --git a/eclass/ELT-patches/portage/1.5.10 b/eclass/ELT-patches/portage/1.5.10 index 56a19c731a81..f33d906ed519 100644 --- a/eclass/ELT-patches/portage/1.5.10 +++ b/eclass/ELT-patches/portage/1.5.10 @@ -35,8 +35,8 @@ name should be bumped, but the patch content should stay fairly the same. + if test "$installed" = yes; then + # Rather use S=WORKDIR if our version of portage supports it. + # This is because some ebuild (gcc) do not use $S as buildroot. -+ if test "$PWORKDIR"; then -+ S="$PWORKDIR" ++ if test "$WORKDIR"; then ++ S="$WORKDIR" + fi + # We do not want portage's build root ($S) present. + my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` diff --git a/eclass/ELT-patches/portage/2.2 b/eclass/ELT-patches/portage/2.2 index cafb150d7b87..1f724e7984eb 100644 --- a/eclass/ELT-patches/portage/2.2 +++ b/eclass/ELT-patches/portage/2.2 @@ -27,8 +27,8 @@ + if test "$installed" = yes; then + # Rather use S=WORKDIR if our version of portage supports it. + # This is because some ebuild (gcc) do not use $S as buildroot. -+ if test "$PWORKDIR"; then -+ S="$PWORKDIR" ++ if test "$WORKDIR"; then ++ S="$WORKDIR" + fi + # We do not want portage's build root ($S) present. + my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` |