--- Gentoo/Portage.pm	2010-03-24 21:58:46.000000000 +0100
+++ Gentoo/Portage.pm	2010-04-10 17:51:44.000000000 +0200
@@ -58,7 +58,7 @@
     $importer->run();
     if (defined($ENV{$envvar}) && ($ENV{$envvar} =~ m{\W*}))
     { 
-        my $tm = strip_env($ENV{$envvar}); 
+        my $tm = strip_env($envvar); 
         $importer->restore_env; 
         return $tm;
     }
@@ -69,20 +69,11 @@
 
 sub strip_env {
     my $key = shift;
-    return $key unless defined($key);
-    if (defined($ENV{$key})) {
-        $ENV{$key} =~ s{\\n}{ }gxms;
-        $ENV{$key} =~ s{\\|\'|\\'|\$|\s*$}{}gmxs;
-        $key =~ s{\s+}{ }gmxs;
-        return $ENV{$key};
-    }
-    else
-    {
-        $key =~ s{\\n}{ }gxms;
-        $key =~ s{(\'|\\|\\'|\$|\s*$)}{}gmxs;
-        $key =~ s{\s+}{ }gmxs;
-        return $key;
-    }
+    return unless defined $key && defined $ENV{$key};
+    my $val = $ENV{$key};
+    $val =~ s{\\n}{ }gxms;
+    $val =~ s{(\'|\\|\\'|\$|\s*$)}{}gmxs;
+    return $val;
 }
 # Description:
 # @listOfEbuilds = getAvailableEbuilds($PORTDIR, category/packagename);
@@ -306,8 +297,8 @@
                         $e_import->shellobj->envcmd('set');
                         $e_import->run();
                         $e_import->env_import();
-                        $self->{'portage'}{lc($find_ebuild)}{'DESCRIPTION'} = strip_env($ENV{DESCRIPTION});
-                        $self->{'portage'}{lc($find_ebuild)}{'HOMEPAGE'} = strip_env($ENV{HOMEPAGE});
+                        $self->{'portage'}{lc($find_ebuild)}{'DESCRIPTION'} = strip_env('DESCRIPTION');
+                        $self->{'portage'}{lc($find_ebuild)}{'HOMEPAGE'} = strip_env('HOMEPAGE');
                         $e_import->restore_env;
 
                     }