Fix typo, bug #105054

diff --git a/eclass/ELT-patches/portage/1.3.0c b/eclass/ELT-patches/portage/1.3.0c
index d2166f13a841cedc1df779dd5382db45c880b051..e862f835ad43f68f8f6ada089704bfdf7d0ad4fd 100644 (file)
--- 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 3809fb815e87c803ff325ba977d2c19091d6cf39..8dab92914e9116d495f69c59002d74a0da89f3bf 100644 (file)
--- 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 3809fb815e87c803ff325ba977d2c19091d6cf39..8dab92914e9116d495f69c59002d74a0da89f3bf 100644 (file)
--- 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 a49f33329f93f2291c3d119a7e72cfaf5f812cb3..6152dfd6fe4b7a9c169b02817b49032c9f09a206 100644 (file)
--- 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 a49f33329f93f2291c3d119a7e72cfaf5f812cb3..6152dfd6fe4b7a9c169b02817b49032c9f09a206 100644 (file)
--- 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 f19e8ec2ee351eb7e13f5d7edbf5984d3ec01abe..24a7fd73b7d4397cdac597473f430da78550f46c 100644 (file)
--- 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