[gentoo-commits] gentoolkit r794 - trunk/gentoolkit-dev/src/ekeyword

[Christian Ruppert (idl0r)]

Author: idl0r
Date: 2010-07-03 09:53:46 +0000 (Sat, 03 Jul 2010)
New Revision: 794

Modified:
   trunk/gentoolkit-dev/src/ekeyword/ekeyword
Log:
Revert last commit.

Modified: trunk/gentoolkit-dev/src/ekeyword/ekeyword
===================================================================
--- trunk/gentoolkit-dev/src/ekeyword/ekeyword	2010-07-03 09:45:21 UTC (rev 793)
+++ trunk/gentoolkit-dev/src/ekeyword/ekeyword	2010-07-03 09:53:46 UTC (rev 794)
@@ -150,15 +150,22 @@
 
 						# Don't add stable keywords for != stable architectures
 						if(length($leader) eq 0) {
+							my @new;
 							foreach my $tmp (split(/\s/, $quoted)) {
-								my (undef, $_arch, undef) = ($tmp =~ m/$kw_re/o);
+								my ($_leader, $_arch, undef) = ($tmp =~ m/$kw_re/o);
+								$_leader = "" if !defined($_leader);
+								$_arch = "" if !defined($_arch);
 
-								if($ARCH{$_arch} and $ARCH{$_arch} eq 3) {
-									# [^-] to ignore ~arch-foo in case just arch shall
-									# be stabilized, bug 304133#c11
-									$quoted =~ s/\Q~${_arch}\E[^-]/${_arch}/;
+								if($_leader eq "~" && ($ARCH{$_arch} && $ARCH{$_arch} eq 3) ) {
+									push(@new, $_arch);
+									next;
 								}
+								else {
+									push(@new, "${_leader}${_arch}");
+									next;
+								}
 							}
+							$quoted = join(" ", @new);
 						}
 						else {
 							$quoted =~ s/(^|\s)~?(?=\w)/$1$leader/g;