diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-09-10 13:41:46 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-09-10 13:41:46 +0000 |
| commit | dfcd3e805f48ae60ea11ec0284d2265c61098aa8 (patch) | |
| tree | 78b34b5fd87ac178602f8572ae4ba58d06715845 /eclass | |
| parent | Fix typo in portage patch (diff) | |
| download | gentoo-2-dfcd3e805f48ae60ea11ec0284d2265c61098aa8.tar.gz gentoo-2-dfcd3e805f48ae60ea11ec0284d2265c61098aa8.tar.bz2 gentoo-2-dfcd3e805f48ae60ea11ec0284d2265c61098aa8.zip | |
Fix typo, bug #105054
Diffstat (limited to 'eclass')
| -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.3.4 | 4 | ||||
| -rw-r--r-- | eclass/ELT-patches/portage/1.4.0 | 4 | ||||
| -rw-r--r-- | eclass/ELT-patches/portage/1.4.1 | 4 | ||||
| -rw-r--r-- | eclass/ELT-patches/portage/1.5.10 | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/eclass/ELT-patches/portage/1.3.0c b/eclass/ELT-patches/portage/1.3.0c index d2166f13a841..e862f835ad43 100644 --- a/eclass/ELT-patches/portage/1.3.0c +++ b/eclass/ELT-patches/portage/1.3.0c @@ -29,10 +29,10 @@ + fi + # We do not want portage's build root ($S) present. + my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` -+ if test -n "$my_little_ninja_foo_2" && test "$S"; then -+ mynewdependency_lib="" + # We do not want portage's install root ($D) present. + my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` ++ if test -n "$my_little_ninja_foo_2" && test "$S"; then ++ mynewdependency_lib="" + elif test -n "$my_little_ninja_foo_3" && test "$D"; then + eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` + else diff --git a/eclass/ELT-patches/portage/1.3.3 b/eclass/ELT-patches/portage/1.3.3 index 3809fb815e87..8dab92914e91 100644 --- a/eclass/ELT-patches/portage/1.3.3 +++ b/eclass/ELT-patches/portage/1.3.3 @@ -39,10 +39,10 @@ + fi + # We do not want portage's build root ($S) present. + my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` -+ if test -n "$my_little_ninja_foo_2" && test "$S"; then -+ mynewdependency_lib="" + # We do not want portage's install root ($D) present. + my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` ++ if test -n "$my_little_ninja_foo_2" && test "$S"; then ++ mynewdependency_lib="" + elif test -n "$my_little_ninja_foo_3" && test "$D"; then + eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` + else diff --git a/eclass/ELT-patches/portage/1.3.4 b/eclass/ELT-patches/portage/1.3.4 index 3809fb815e87..8dab92914e91 100644 --- a/eclass/ELT-patches/portage/1.3.4 +++ b/eclass/ELT-patches/portage/1.3.4 @@ -39,10 +39,10 @@ + fi + # We do not want portage's build root ($S) present. + my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` -+ if test -n "$my_little_ninja_foo_2" && test "$S"; then -+ mynewdependency_lib="" + # We do not want portage's install root ($D) present. + my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` ++ if test -n "$my_little_ninja_foo_2" && test "$S"; then ++ mynewdependency_lib="" + elif test -n "$my_little_ninja_foo_3" && test "$D"; then + eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` + else diff --git a/eclass/ELT-patches/portage/1.4.0 b/eclass/ELT-patches/portage/1.4.0 index a49f33329f93..6152dfd6fe4b 100644 --- a/eclass/ELT-patches/portage/1.4.0 +++ b/eclass/ELT-patches/portage/1.4.0 @@ -37,10 +37,10 @@ name should be bumped, but the patch content should stay fairly the same. + fi + # We do not want portage's build root ($S) present. + my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` -+ if test -n "$my_little_ninja_foo_2" && test "$S"; then -+ mynewdependency_lib="" + # We do not want portage's install root ($D) present. + my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` ++ if test -n "$my_little_ninja_foo_2" && test "$S"; then ++ mynewdependency_lib="" + elif test -n "$my_little_ninja_foo_3" && test "$D"; then + eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` + else diff --git a/eclass/ELT-patches/portage/1.4.1 b/eclass/ELT-patches/portage/1.4.1 index a49f33329f93..6152dfd6fe4b 100644 --- a/eclass/ELT-patches/portage/1.4.1 +++ b/eclass/ELT-patches/portage/1.4.1 @@ -37,10 +37,10 @@ name should be bumped, but the patch content should stay fairly the same. + fi + # We do not want portage's build root ($S) present. + my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` -+ if test -n "$my_little_ninja_foo_2" && test "$S"; then -+ mynewdependency_lib="" + # We do not want portage's install root ($D) present. + my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` ++ if test -n "$my_little_ninja_foo_2" && test "$S"; then ++ mynewdependency_lib="" + elif test -n "$my_little_ninja_foo_3" && test "$D"; then + eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` + else diff --git a/eclass/ELT-patches/portage/1.5.10 b/eclass/ELT-patches/portage/1.5.10 index f19e8ec2ee35..24a7fd73b7d4 100644 --- a/eclass/ELT-patches/portage/1.5.10 +++ b/eclass/ELT-patches/portage/1.5.10 @@ -40,10 +40,10 @@ name should be bumped, but the patch content should stay fairly the same. + fi + # We do not want portage's build root ($S) present. + my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` -+ if test -n "$my_little_ninja_foo_2" && test "$S"; then -+ mynewdependency_lib="" + # We do not want portage's install root ($D) present. + my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` ++ if test -n "$my_little_ninja_foo_2" && test "$S"; then ++ mynewdependency_lib="" + elif test -n "$my_little_ninja_foo_3" && test "$D"; then + eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` + else |