From: vapier <vapier@gentoo.org>
Date: Wed, 7 Jan 2009 05:40:13 +0000 (-0000)
Subject: convert whitespace to tabs
X-Git-Tag: gentoolkit-0.2.4.3^2~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=96ee96bcdd1bbc39974e53ff3b4fa4132757970e;p=gentoolkit.git

convert whitespace to tabs

svn path=/; revision=535
---

diff --git a/trunk/src/ekeyword/ekeyword b/trunk/src/ekeyword/ekeyword
index 306a761..4f8bb05 100755
--- a/trunk/src/ekeyword/ekeyword
+++ b/trunk/src/ekeyword/ekeyword
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright 2003-2004, Gentoo Foundation
+# Copyright 2003-2009, Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # Written by Aron Griffis <agriffis@gentoo.org>
 #
@@ -18,98 +18,97 @@ my (@kw);
 
 # make sure the cmdline consists of keywords and ebuilds
 unless (@ARGV > 0) {
-    die "syntax: ekeyword { arch | ~[arch] | -[arch] } ebuild...\n" 
+	die "syntax: ekeyword { arch | ~[arch] | -[arch] } ebuild...\n" 
 }
 for my $a (@ARGV) {
-    $a = '~all' if $a eq '~' or $a eq $ENV{'HOME'};	# for vapier
-    next if $a =~ /$kw_re/o;				# keyword
-    next if $a =~ /^\S+\.ebuild$/;			# ebuild
-    die "I don't understand $a\n";
+	$a = '~all' if $a eq '~' or $a eq $ENV{'HOME'};	# for vapier
+	next if $a =~ /$kw_re/o;				# keyword
+	next if $a =~ /^\S+\.ebuild$/;			# ebuild
+	die "I don't understand $a\n";
 }
 
 my $files = 0;
 for my $f (@ARGV) {
-    if ($f =~ /$kw_re/o) {
-	push @kw, $f;
-	next;
-    }
+	if ($f =~ /$kw_re/o) {
+		push @kw, $f;
+		next;
+	}
 
-    print "$f\n";
+	print "$f\n";
 
-    open I, "<$f"       or die "Can't read $f: $!\n";
-    open O, ">$f.new"   or die "Can't create $f.new: $!\n";
-    select O;
+	open I, "<$f"       or die "Can't read $f: $!\n";
+	open O, ">$f.new"   or die "Can't create $f.new: $!\n";
+	select O;
 
-    while (<I>) {
-	/^\s*KEYWORDS=/ or print, next;
+	while (<I>) {
+		/^\s*KEYWORDS=/ or print, next;
 
-	# extract the quoted section from KEYWORDS
-	(my $quoted = $_) =~ s/^.*?["'](.*?)["'].*/$1/s;
+		# extract the quoted section from KEYWORDS
+		(my $quoted = $_) =~ s/^.*?["'](.*?)["'].*/$1/s;
 
-	# replace -* with -STAR for our convenience below
-	$quoted =~ s/-\*/-STAR/;
+		# replace -* with -STAR for our convenience below
+		$quoted =~ s/-\*/-STAR/;
 
-	for my $k (@kw) {
-	    my ($leader, $arch, $star) = ($k =~ /$kw_re/o);
+		for my $k (@kw) {
+			my ($leader, $arch, $star) = ($k =~ /$kw_re/o);
 
-	    # handle -* and ^*
-	    if (defined $star) {
-		$leader = substr $star,0,1;
-		$arch = 'STAR';
-	    }
+			# handle -* and ^*
+			if (defined $star) {
+				$leader = substr $star,0,1;
+				$arch = 'STAR';
+			}
 
-	    # remove keywords
-	    if ($leader eq '^') {
-		if ($arch eq 'all') {
-		    $quoted = '';
-		} else {
-		    $quoted =~ s/[-~]?\Q$arch\E\b//;
-		}
-	    }
-
-	    # add or modify keywords
-	    else {
-		if ($arch eq 'all') {
-		    # modify all non-masked keywords in the list
-		    $quoted =~ s/(^|\s)~?(?=\w)/$1$leader/g;
-		} else {
-		    # modify or add keyword
-		    unless ($quoted =~ s/[-~]?\Q$arch\E(\s|$)/$leader$arch$1/) {
-			# modification failed, need to add
-			if ($arch eq 'STAR') {
-			    $quoted = "$leader$arch $quoted";
+			# remove keywords
+			if ($leader eq '^') {
+				if ($arch eq 'all') {
+					$quoted = '';
+				} else {
+					$quoted =~ s/[-~]?\Q$arch\E\b//;
+				}
+
+			# add or modify keywords
 			} else {
-			    $quoted .= " $leader$arch";
+				if ($arch eq 'all') {
+					# modify all non-masked keywords in the list
+					$quoted =~ s/(^|\s)~?(?=\w)/$1$leader/g;
+				} else {
+					# modify or add keyword
+					unless ($quoted =~ s/[-~]?\Q$arch\E(\s|$)/$leader$arch$1/) {
+						# modification failed, need to add
+						if ($arch eq 'STAR') {
+							$quoted = "$leader$arch $quoted";
+						} else {
+							$quoted .= " $leader$arch";
+						}
+					}
+				}
 			}
-		    }
 		}
-	    }
-	}
 
-	# replace -STAR with -*
-	$quoted =~ s/-STAR\b/-*/;
+		# replace -STAR with -*
+		$quoted =~ s/-STAR\b/-*/;
 
-	# sort keywords and fix spacing
-	$quoted = join " ", sort {
-	    (my $sa = $a) =~ s/^\W//;
-	    (my $sb = $b) =~ s/^\W//;
-	    return -1 if $sa eq '*';
-	    return +1 if $sb eq '*';
-	    $sa cmp $sb;
-	} split " ", $quoted;
+		# sort keywords and fix spacing
+		$quoted = join " ", sort {
+			(my $sa = $a) =~ s/^\W//;
+			(my $sb = $b) =~ s/^\W//;
+			return -1 if $sa eq '*';
+			return +1 if $sb eq '*';
+			$sa cmp $sb;
+		} split " ", $quoted;
 
-	# re-insert quoted to KEYWORDS
-	s/(["']).*?["']/$1$quoted$1/;
+		# re-insert quoted to KEYWORDS
+		s/(["']).*?["']/$1$quoted$1/;
 
-	print $_ or die "Can't write $f.new: $!\n";
-    }
+		print $_ or die "Can't write $f.new: $!\n";
+	}
 
-    close I;
-    close O;
-    select STDOUT;
+	close I;
+	close O;
+	select STDOUT;
 
-    system "diff -U 0 $f $f.new | sed -n '/KEYWORDS=/s:^:  :p'";
-    rename "$f.new", "$f"       or die "Can't rename: $!\n";
+	system "diff -U 0 $f $f.new | sed -n '/KEYWORDS=/s:^:  :p'";
+	rename "$f.new", "$f" or die "Can't rename: $!\n";
     $files++;
 }
 
@@ -117,4 +116,4 @@ if ($files == 0) {
     die "No ebuilds processed!";
 }
 
-# vim:ts=8 sw=4
+# vim:ts=4 sw=4