From: idl0r <idl0r@gentoo.org>
Date: Sat, 3 Jul 2010 09:53:46 +0000 (-0000)
Subject: Revert last commit.
X-Git-Tag: gentoolkit-dev-0.2.7~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=19827fe8ece88c99b9c4e7d0b6834fbcfa72e03c;p=gentoolkit.git

Revert last commit.

svn path=/trunk/gentoolkit-dev/; revision=794
---

diff --git a/src/ekeyword/ekeyword b/src/ekeyword/ekeyword
index 6e75e22..9528911 100755
--- a/src/ekeyword/ekeyword
+++ b/src/ekeyword/ekeyword
@@ -150,15 +150,22 @@ for my $f (@ARGV) {
 
 						# 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;