--- builds_bin/update_repos	2007/11/23 16:45:36	1.29
+++ builds_bin/update_repos	2007/12/11 00:04:40	1.30
@@ -6,539 +6,456 @@ use RPM2;
 use File::Find;
 use File::Basename;
 use Getopt::Std;
-use Term::ANSIColor;
 use Data::Dumper;
 
 delete $ENV{PATH};
 my $HOME=$ENV{HOME};
 umask 002;
+$| = 1;
+
+my %opts;
+getopts( 'otr:', \%opts );
+$opts{r} ||= '';
 
 my $rpm_flags = RPM2->vsf_nosha1header | RPM2->vsf_nomd5header | RPM2->vsf_nodsaheader | RPM2->vsf_norsaheader;
 $rpm_flags |= RPM2->vsf_nosha1 | RPM2->vsf_nomd5 | RPM2->vsf_nodsa | RPM2->vsf_norsa;
 
-$Term::ANSIColor::AUTORESET = 1;
-$| = 1;
-
 my @archs = ( 'i386', 'x86_64' );
 
-my $repos = { 'smeos'              => { prio => 18, inc => 1, ver => 1, rel => 1, os => 1 },
-	      'smeupdates'         => { prio => 17, inc => 1, ver => 1, rel => 1 },
-	      'smeupdates-testing' => { prio => 16, inc => 1, ver => 1, rel => 1 },
-	      'smeextras'          => { prio => 15, inc => 0, ver => 1, rel => 1 },
-	      'smeaddons'          => { prio => 14, inc => 0, ver => 1, rel => 1 },
-	      'smecontribs'        => { prio => 13, inc => 0, ver => 1, rel => 2, contribs => 1 },
-	      'smetest'            => { prio => 12, inc => 0, ver => 2, rel => 2, devel => 2 },
-	      'smedev'             => { prio => 11, inc => 0, ver => 2, rel => 2, devel => 1 },
-	      'centos'             => { prio => 10, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
-	      'fedora/epel'        => { prio =>  9, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
-	      'fedora/extras'      => { prio =>  8, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
-	      'rpmforge'           => { prio =>  7, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
-	      'atrpms'             => { prio =>  6, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
-	      'fedora/core'        => { prio =>  5, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
-	      'base'               => { prio =>  4, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
-	      'builds'             => { prio =>  3, inc => 0, ver => 0, rel => 0, orig => 1 },
-	      'contribs'           => { prio =>  2, inc => 0, ver => 0, rel => 0, orig => 1 },
-	      'stage'              => { prio =>  1, inc => 0, ver => 0, rel => 0, stage => 1, os => 1 },
-	    };
-
 my $distrepo = { '7' => { active   => 1,
 			  centos   => 4,
 			  fedora   => 3,
 			  repo     => '/releases/7/',
-			  os       => 'SME/RPMS/',
+			  os       => 'RPMS/',
 			  builds   => '/builds/smeserver-7-core/',
 			  contribs => '/builds/smeserver-7-contribs/',
+			  qa       => '/builds/smeserver-7-qa/',
 			  stage    => '/stage/7/',
 			},
 		 '8' => { active   => 1,
 			  centos   => 5,
 			  fedora   => 6,
 			  repo     => '/releases/testing/8/',
-			  os       => 'SME/',
+			  os       => '',
 			  builds   => '/builds/smeserver-8-core/',
 			  contribs => '/builds/smeserver-8-contribs/',
+			  qa       => '/builds/smeserver-8-qa/',
 			  stage    => '/stage/8/',
 			},
 	       };
 
-my @baserepo = ( ( map { "/mirrors/centos/~C/$_/" } ('os','updates','fasttrack','extras') ),
-		 ( map { "/mirrors/fedora/epel$_/~C/" } ('','/testing') ),
-		 '/mirrors/fedora/extras/~F/',
-		 '/mirrors/rpmforge/dag/redhat/el~C/en/~A/RPMS.dag/',
-		 '/mirrors/rpmforge/dag/source/',
-		 ( map { "/mirrors/atrpms$_/el~C-~A/atrpms/stable/" } ('','/src') ),
-		 ( map { "/mirrors/atrpms$_/el~C-~A/atrpms/testing/" } ('','/src') ),
-		 ( map {"/mirrors/fedora/core$_/~F/" } ('','/updates') ),
-	       );
-
-my $skippkg = { '7' => { 'centos'           => ['horde','imp-h3','ingo-h3','turba-h3','vim'],
-			 'fedora/epel'      => ['perl-Razor-Agent'],
-			 'rpmforge'         => ['perl-Test-Inline'],
-			 'atrpms'           => ['dovecot','yum'],
+my $repos = { 'smeos'              => { prio => 18, inc => 1, ver => 1, rel => 1, os => 1 },
+	      'smeupdates'         => { prio => 17, inc => 1, ver => 1, rel => 1 },
+	      'smeupdates-testing' => { prio => 16, inc => 1, ver => 1, rel => 1 },
+	      'smeextras'          => { prio => 15, inc => 0, ver => 1, rel => 1 },
+	      'smeaddons'          => { prio => 14, inc => 0, ver => 1, rel => 1 },
+	      'smecontribs'        => { prio => 13, inc => 0, ver => 1, rel => 2 },
+	      'smetest'            => { prio => 12, inc => 0, ver => 2, rel => 2, devel => 2 },
+	      'smedev'             => { prio => 11, inc => 0, ver => 2, rel => 2, devel => 1 },
+	      'centos'             => { prio => 10, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
+	      'epel'               => { prio =>  9, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
+	      'fedora-extras'      => { prio =>  8, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
+	      'rpmforge'           => { prio =>  7, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
+	      'atrpms'             => { prio =>  6, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
+	      'fedora'             => { prio =>  5, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
+	      'builds'             => { prio =>  4, inc => 0, ver => 0, rel => 0, orig => 1 },
+	      'contribs'           => { prio =>  2, inc => 0, ver => 0, rel => 0, orig => 1 },
+	      'stage'              => { prio =>  1, inc => 0, ver => 0, rel => 0, stage => 1, os => 1 },
+	    };
+
+my $baserepo = { '~Ssmeos/~A/SME/~O' => 'smeos',
+		 '~Ssmeupdates/~A/RPMS/' => 'smeupdates',
+		 '~Ssmeupdates-testing/~A/RPMS/' => 'smeupdates-testing',
+		 '~Ssmeextras/~A/RPMS/' => 'smeextras',
+		 '~Ssmeaddons/~A/RPMS/' => 'smeaddons',
+		 '~Ssmecontribs/~A/RPMS/' => 'smecontribs',
+		 '~Ssmetest/~A/RPMS/' => 'smetest',
+		 '~Ssmedev/~A/RPMS/' => 'smedev',
+		 '/stage/~s/~A/SME/~O' => 'stage',
+		 '/mirrors/centos/~C/fasttrack/~A/RPMS/' => 'centos',
+		 '/mirrors/centos/~C/updates/~A/RPMS/' => 'centos',
+		 '/mirrors/centos/~C/os/~A/CentOS/~O' => 'centos',
+		 '/mirrors/centos/~C/extras/~A/RPMS/' => 'centos',
+		 '/mirrors/centos-qa/CentOS/~C/fasttrack/~A/RPMS/' => 'centos',
+		 '/mirrors/centos-qa/CentOS/~C/updates/~A/RPMS/' => 'centos',
+		 '/mirrors/centos-qa/CentOS/~C/os/~A/CentOS/~O' => 'centos',
+		 '/mirrors/centos-qa/CentOS/~C/extras/~A/RPMS/' => 'centos',
+		 '/mirrors/fedora/epel/~C/~A/' => 'epel',
+		 '/mirrors/fedora/epel/testing/~C/~A/' => 'epel',
+		 '/mirrors/fedora/extras/~F/~A/' => 'fedora-extras',
+		 '/mirrors/rpmforge/dag/redhat/el~C/en/~A/dag/RPMS/' => 'rpmforge',
+		 '/mirrors/rpmforge/dag/source/' => 'rpmforge',
+		 '/mirrors/atrpms/el~C-~A/atrpms/stable/' => 'atrpms',
+		 '/mirrors/atrpms/el~C-~A/atrpms/testing/' => 'atrpms',
+		 '/mirrors/atrpms/src/el~C-~A/atrpms/stable/' => 'atrpms',
+		 '/mirrors/atrpms/src/el~C-~A/atrpms/testing/' => 'atrpms',
+		 '/mirrors/fedora/core/~F/~A/os/Fedora/RPMS/' => 'fedora',
+		 '/mirrors/fedora/core/updates/~F/~A/' => 'fedora',
+	       };
+
+my $skippkg = { '7' => { 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3', 'vim' ) },
+			 'epel'          => { map { $_ => 1 } ( 'perl-Razor-Agent' ) },
+			 'rpmforge'      => { map { $_ => 1 } ( 'perl-Test-Inline' ) },
+			 'atrpms'        => { map { $_ => 1 } ( 'dovecot', 'trac', 'yum' ) },
 		       },
-		'8' => { 'centos'           => ['horde','imp-h3','ingo-h3','turba-h3'],
-			 'fedora/epel'      => ['perl-Razor-Agent','smolt'],
-			 'fedora/extras'    => ['dstat','gocr','horde','oidentd','perl-Test-Inline','perl-Razor-Agent','smolt'],
-			 'rpmforge'         => ['perl-Test-Inline'],
-			 'atrpms'           => [],
-			 'fedora/core'      => [],
+		'8' => { 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
+			 'fedora'        => { map { $_ => 1 } ( 'kernel-xen' ) },
+			 'epel'          => { map { $_ => 1 } ( 'perl-Razor-Agent', 'smolt' ) },
+			 'fedora-extras' => { map { $_ => 1 } ( 'dstat', 'gocr', 'horde', 'oidentd', 'perl-Test-Inline', 'perl-Razor-Agent', 'smolt' ) },
+			 'rpmforge'      => { map { $_ => 1 } ( 'perl-Test-Inline' ) },
 		       },
 	      };
 
-my %opts;
-getopts( 'dtvr:', \%opts );
-$opts{r} ||= '';
-
+my ($stage) = sort { $repos->{$a}->{stage} <=> $repos->{$b}->{stage} } grep { $repos->{$_}->{stage} } keys %$repos;
 my ($devel1, $devel2) = sort { $repos->{$a}->{devel} <=> $repos->{$b}->{devel} } grep { $repos->{$_}->{devel} } keys %$repos;
 $devel2 ||= $devel1;
-my ($contribs) = sort { $repos->{$a}->{contribs} <=> $repos->{$b}->{contribs} } grep { $repos->{$_}->{contribs} } keys %$repos;
-my ($stage) = sort { $repos->{$a}->{stage} <=> $repos->{$b}->{stage} } grep { $repos->{$_}->{stage} } keys %$repos;
 
-my ($rel, @rpms, %latest, %sources, $archs, $rebuild, $newline);
-foreach my $smever ( sort { $a <=> $b } grep { $distrepo->{$_}->{active} } keys %$distrepo ) {
-    $rel = $smever;
+my ($rpms, %base, %latest, %sources);
+foreach my $smever ( sort { $a <=> $b } keys %$distrepo ) {
+    next unless $distrepo->{$smever}->{active};
+    my %repochg = ();
+    $rpms = ();
     %latest = ();
     %sources = ();
-    @rpms = ();
-    $rebuild = ();
+    %base = ();
 
-    # Load distro packages
-    find( { wanted => \&loadpkg, no_chdir => 1, follow_fast => 1 },  map { $distrepo->{$smever}->{$_} } ('repo','builds','contribs','stage') );
-    printline('white', 0, "Distro (SME Server $rel) packages loaded.\n");
-
-    # Load base packages
-    foreach my $base ( @baserepo ) {
-	my $bdir = $base;
+    foreach my $dir  ( sort { $repos->{$baserepo->{$b}}->{prio} <=> $repos->{$baserepo->{$a}}->{prio} || $a cmp $b } keys %$baserepo ) {
+	my $bdir = $dir;
+	$bdir =~ s/~O/$distrepo->{$smever}->{os}/;
+	$bdir =~ s/~S/$distrepo->{$smever}->{repo}/;
+	$bdir =~ s/~s/$smever/;
 	$bdir =~ s/~C/$distrepo->{$smever}->{centos}/;
 	$bdir =~ s/~F/$distrepo->{$smever}->{fedora}/;
-	if ( $bdir =~ m{~A} ) {
-	    for my $arch ( @archs ) {
-		my $basearch = $bdir;
-		$basearch =~ s/~A/$arch/;
-		find( { wanted => \&loadbase, no_chdir => 1, follow_fast => 1 }, $basearch ) if -r $basearch;
-	    }
-	} else {
-	    find( { wanted => \&loadbase, no_chdir => 1, follow_fast => 1 }, $bdir ) if -r $bdir;
+	for my $arch ( @archs, 'SRPMS/' ) {
+	    my $adir = $bdir;
+	    if ( $arch eq 'SRPMS/' ) {
+		$adir =~ s/~A.*/$arch/ if $arch eq 'SRPMS/';
+	    } else {
+		$adir =~ s/~A/$arch/;
+	    }
+	    opendir DIR, $adir or next;
+	    next unless -d $adir;
+	    process_rpm("$adir$_", $smever, $baserepo->{$dir}) foreach readdir DIR;
+	    closedir DIR;
+	    last unless $dir =~ m{~A};
 	}
     }
-    printline('white', 0, 'Base (Centos: ', $distrepo->{$smever}->{centos}, ', Fedora: ', $distrepo->{$smever}->{fedora}, ") packages loaded.\n");
+    find( { wanted => sub { process_rpm($_, $smever, 'builds'); }, no_chdir => 1, follow_fast => 1 }, ( $distrepo->{$smever}->{'builds'}, $distrepo->{$smever}->{'qa'} ) );
+    find( { wanted => sub { process_rpm($_, $smever, 'contribs'); }, no_chdir => 1, follow_fast => 1 }, $distrepo->{$smever}->{'contribs'} );
 
-    %latest = ();
-    foreach my $name ( sort keys %{{ map { $_->{base} => 1 } @rpms }} ) {
-	printline('white', 0, "Processing: $name");
-	my @pkgs = sort pkgsrt grep { $_->{base} eq $name } @rpms;
+    foreach my $base ( sort keys %$rpms ) {
+	my %track = ();
 	my %seen = ();
-	my $count = ();
-	$archs = ();
-
-	foreach my $pkg ( @pkgs ) {
-	    next if $pkg->{done} || $pkg->{obsolete} || $pkg->{rpm}->is_source_package || ! $repos->{$pkg->{repo}};
-	    printline('bold black', 1, ' - ', $pkg->{rpm}->filename) if $opts{d};
-	    my $orig = 0;
-
-	    # Find names of packages in same or higher repos
-	    my %names = names($pkg, @pkgs);
-
-	    # Stage packages should never be most current
-	    if ( rprop($pkg, 'stage') ) {
-		printline('dark blue', 1, '    - checking stage') if $opts{d};
-		tagpkg($pkg, 'obsolete');
-		next;
-	    }
-
-	    # Move packages from base/builds to correct area
-	    elsif ( rprop($pkg, 'orig') ) {
-		printline('dark blue', 1, '    - checking base/builds/contribs') if $opts{d};
-		my $repo = $names{$pkg->{name}} > 1 ? $devel2 : $devel1;
-		$repo = $contribs if $pkg->{repo} eq 'contribs';
-		if ( $pkg->{nonbase} ) {
-		    foreach my $up ( @pkgs ) {
-			next if rprop($up, 'orig');
-			next if $up->{name} ne $pkg->{name} || ! $up->{obsolete} || $up->{rpm} ge $pkg->{rpm};
-			$repo = $up->{repo};
-			last;
-		    }
-		} 
-		movepkg($pkg, $repo);
-		%names = names($pkg, @pkgs);
-		$seen{$pkg->{nvra}}++;
-		$orig++;
-	    }
-
-	    # Check version/release counts
-	    unless ( $pkg->{nonbase} ) {
-		printline('dark blue', 1, '    - checking version/release counts') if $opts{d};
-		$count->{$pkg->{repo}}->{$pkg->{version}}->{$pkg->{release}}++;
-		if ( rprop($pkg, 'ver') && scalar keys %{$count->{$pkg->{repo}}} > rprop($pkg, 'ver') ) {
-		    movepkg($_, 'delete') foreach grep { $_->{rpm} eq $pkg->{rpm} } @pkgs;
-		    next;
+	my %counts = ();
+	my $acnt = ();
+	my $print = 0;
+	%latest = ();
+
+	foreach my $pkg ( sort { $b->{rpm} cmp $a->{rpm} } @{$rpms->{$base}->{rpms}} ) {
+	    next if $pkg->{done};
+
+	    if ( $rpms->{$base}->{vers}->{$pkg->{svr}} ) {
+		foreach my $tmp ( @{$rpms->{$base}->{vers}->{$pkg->{svr}}} ) {
+		    $tmp->{svr} = $pkg->{svr};
+		    push @{$rpms->{$base}->{rpms}}, $tmp;
 		}
-		if ( rprop($pkg, 'rel') && scalar keys %{$count->{$pkg->{repo}}->{$pkg->{version}}} > rprop($pkg, 'rel') ) {
-		    movepkg($_, 'delete') foreach grep { $_->{rpm} eq $pkg->{rpm} } @pkgs;
-		    next;
+	    } else {
+		my $tmp = $pkg->{svr};
+		($tmp = $pkg->{svr}) =~ s{\.el\d\.at$}{}	         && $rpms->{$base}->{vers}->{$tmp} && last;
+		($tmp = $pkg->{svr}) =~ s{\.el\d(\.rf)$}{$1}	         && $rpms->{$base}->{vers}->{$tmp} && last;
+		($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+\.el\d(\.rf)$}{$1$2} && $rpms->{$base}->{vers}->{$tmp} && last;
+		($tmp = $pkg->{svr}) =~ s{\.el\d\.rf$}{.dag}	         && $rpms->{$base}->{vers}->{$tmp} && last;
+		($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+\.el\d\.rf$}{$1.dag} && $rpms->{$base}->{vers}->{$tmp} && last;
+		($tmp = $pkg->{svr}) =~ s{\.el\d$}{}		         && $rpms->{$base}->{vers}->{$tmp} && last;
+		($tmp = $pkg->{svr}) =~ s{(-\d+)\.\d+\.el\d$}{$1}        && $rpms->{$base}->{vers}->{$tmp} && last;
+		($tmp = $pkg->{svr}) =~ s{\.centos\d$}{}	         && $rpms->{$base}->{vers}->{$tmp} && last;
+		($tmp = $pkg->{svr}) =~ s{\.el\d\.sme$}{}	         && $rpms->{$base}->{vers}->{$tmp} && last;
+		if ( $rpms->{$base}->{vers}->{$tmp} ) {
+		    foreach $tmp ( @{$rpms->{$base}->{vers}->{$tmp}} ) {
+			$tmp->{svr} = $pkg->{svr};
+			push @{$rpms->{$base}->{rpms}}, $tmp;
+		    }
 		}
 	    }
 
-	    foreach my $cmp ( grep { $_->{rpm}->is_source_package || ( ! $_->{done} && $_->{rpm} le $pkg->{rpm} && rprop($_, 'prio') <= rprop($pkg, 'prio') ) } @pkgs ) {
-		printline('dark blue', 1, '    - ', $cmp->{rpm}->filename) if $opts{d};
-		if ( $cmp->{rpm}->is_source_package ) {
-		    if ( $cmp->{name} eq $pkg->{base} ) {
-			if ( $cmp->{rpm} eq $pkg->{rpm} ) {
-			    if ( $pkg->{repo} eq $cmp->{repo} || ! $pkg->{srpm} || $pkg->{srpm}->{rpm} ne $pkg->{rpm} ) {
-				delete $pkg->{srpm}->{latest} if $pkg->{latest} && $pkg->{srpm} && $pkg->{srpm}->{latest};
-				$pkg->{srpm} = $cmp;
-				$pkg->{srpm}->{latest}++ if $pkg->{latest};
-			    }
-			    if ( $pkg->{latest} && rprop($cmp, 'stage') ) {
-				tagpkg($cmp, 'inuse');
-				$pkg->{srpm}->{latest}++;
-			    }
-			    if ( $pkg->{repo} eq $cmp->{repo} || ( $cmp->{oldrepo} && $pkg->{repo} eq $cmp->{oldrepo} ) || rprop($cmp, 'orig') ) {
-				tagpkg($cmp, 'inuse')
-			    }
-			}
-			next if $pkg->{srpm} && $pkg->{srpm}->{rpm} eq $pkg->{rpm};
-
-			my $src = $pkg->{rpm}->sourcerpm;
-			my $source = basename $cmp->{rpm}->filename;
-			SRC: {
-			    $src eq $source && last SRC;
-			    ($src = $pkg->{rpm}->sourcerpm) =~ s{\.el\d\.at(\.src)}{$1}                 && $src eq $source && last SRC;
-			    ($src = $pkg->{rpm}->sourcerpm) =~ s{\.el\d(\.rf\.src)}{$1}                 && $src eq $source && last SRC;
-			    ($src = $pkg->{rpm}->sourcerpm) =~ s{(\d+)\.\d+\.el\d(\.rf\.src)}{$1$2}     && $src eq $source && last SRC;
-			    ($src = $pkg->{rpm}->sourcerpm) =~ s{\.el\d\.rf(\.src)}{.dag$1}             && $src eq $source && last SRC;
-			    ($src = $pkg->{rpm}->sourcerpm) =~ s{(\d+)\.\d+\.el\d\.rf(\.src)}{$1.dag$2} && $src eq $source && last SRC;
-			    ($src = $pkg->{rpm}->sourcerpm) =~ s{\.el\d(\.src)}{$1}                     && $src eq $source && last SRC;
-			    ($src = $pkg->{rpm}->sourcerpm) =~ s{(-\d+)\.\d+\.el\d(\.src)}{$1$2}        && $src eq $source && last SRC;
-			    ($src = $pkg->{rpm}->sourcerpm) =~ s{\.centos\d(\.src)}{$1}                 && $src eq $source && last SRC;
-			    ($src = $pkg->{rpm}->sourcerpm) =~ s{\.el\d\.sme(\.src)}{$1}                && $src eq $source && last SRC;
-			    $src = '';
+	    my %orig = ();
+	    my %pkgs = ();
+	    my %reposrc = ();
+	    my $srpm = undef;
+	    foreach my $cmp ( sort { $repos->{$b->{repo}}->{prio} <=> $repos->{$a->{repo}}->{prio} || $a->{src} <=> $b->{src} } @{$rpms->{$base}->{rpms}} ) {
+		next unless $cmp->{svr} eq $pkg->{svr};
+
+		if ( ! $track{repo} || $repos->{$cmp->{repo}}->{prio} > $repos->{$track{repo}}->{prio} ) {
+		    $track{repo} = $cmp->{repo};
+		    $track{svr} = $cmp->{svr};
+		}
+		if ( $cmp->{svr} eq $track{svr} ) {
+		    if ( $cmp->{src} ) {
+			$srpm = $cmp unless $srpm;
+			if ( $reposrc{$cmp->{repo}} ) {
+			    $reposrc{$cmp->{repo}}->{srpm} = $cmp;
+			    $cmp->{latest}++ if $reposrc{$cmp->{repo}}->{latest};
+			} elsif ( ! $repos->{$cmp->{repo}}->{base} ) {
+			    $cmp->{delete}++;
 			}
-			if ( $src eq $source && ( ! $pkg->{srpm} || $pkg->{srpm}->{rpm} eq $cmp->{rpm} ) ) {
-			    if ( ! $pkg->{srpm} || $pkg->{repo} eq $cmp->{repo} ) {
-				delete $pkg->{srpm}->{latest} if $pkg->{latest} && $pkg->{srpm} && $pkg->{srpm}->{latest};
-				$pkg->{srpm} = $cmp;
-				$pkg->{srpm}->{latest}++ if $pkg->{latest};
+		    } elsif ( $seen{$cmp->{nvra}} ) {
+			if ( $track{repo} ne $cmp->{repo} ) {
+			    if ($repos->{$cmp->{repo}}->{stage} ) {
+				if ( $seen{$cmp->{nvra}}->{latest} ) {
+				    $seen{$cmp->{nvra}}->{latest}++;
+				} else {
+				    $cmp->{delete}++;
+				}
+			    } elsif ( $repos->{$cmp->{repo}}->{orig}) {
+				$orig{$cmp->{nvra}}++;
+			    } elsif ( $seen{$cmp->{nvra}}->{repo} ne $cmp->{repo} ) {
+				$cmp->{delete}++;
 			    }
-			    if ( $pkg->{latest} && rprop($cmp, 'stage') ) {
-				tagpkg($cmp, 'inuse');
-				$pkg->{srpm}->{latest}++;
+			}
+		    } elsif ($repos->{$cmp->{repo}}->{stage} ) {
+			$cmp->{delete}++;
+		    } else {
+			my $dest = $repos->{$track{repo}}->{prio} > $repos->{$devel2}->{prio} ? $track{repo} : $devel2;
+			$dest = pkgdest($cmp, $devel1, $dest, $rpms->{$base}->{rpms});
+			$dest = $devel1 if verrel($cmp, $dest, \%counts);
+			if ( $cmp->{repo} ne $dest ) {
+			    push @{$cmp->{repos}}, $dest;
+			    if ( $repos->{$cmp->{repo}}->{orig} ) {
+				$orig{$cmp->{nvra}}++;
+			    } else {
+				$cmp->{delete}++;
 			    }
-			    tagpkg($cmp, 'inuse') if $pkg->{repo} eq $cmp->{repo} || rprop($cmp, 'orig');
+			    $cmp->{oldrepo} = $cmp->{repo} unless $cmp->{oldrepo};
+			    $cmp->{repo} = $dest;
 			}
 		    }
-		} elsif ( $cmp->{rpm} eq $pkg->{rpm} ) {
-		    if ( $names{$cmp->{name}} ) {
-			if ( $pkg->{repo} eq $cmp->{repo} ) {
-			    tagpkg($cmp, 'correct', 1);
-			    $seen{$cmp->{nvra}}++;
-			} elsif ( $seen{$cmp->{nvra}} && rprop($cmp, 'stage') && $pkg->{latest} ) {
-			    $_->{latest}++ foreach grep { $_->{nvra} eq $cmp->{nvra} && $_->{latest} && $_->{done} } @pkgs;
-			    tagpkg($cmp, 'correct', 1);
-			} elsif ( $seen{$cmp->{nvra}} ) {
-			    $orig++ if rprop($cmp, 'orig');
-			    movepkg($cmp, 'delete', 1);
+		} else {
+		    if ( $track{repo} eq $cmp->{repo} ) {
+			if ( verrel($cmp, $cmp->{repo}, \%counts) ) {
+			    $cmp->{delete}++ unless $repos->{$cmp->{repo}}->{base};
 			} else {
-			    unless ( $pkg->{repo} eq $devel1 && $devel1 ne $devel2 && $names{$cmp->{name}} > 1 ) {
-				movepkg($cmp, $pkg->{repo}, 1, 1);
-				$seen{$cmp->{nvra}}++;
-			    }
+			    $track{svr} = $cmp->{svr};
 			}
-		    } else {
-			tagpkg($cmp, 'nonbase');
+		    } elsif ( ! $repos->{$cmp->{repo}}->{base} ) {
+			$cmp->{delete}++;
 		    }
-		} elsif ( rprop($cmp, 'prio') < rprop($pkg, 'prio') ) {
-		    tagpkg($cmp, 'obsolete');
 		}
+		$reposrc{$cmp->{repo}} = $cmp unless $reposrc{$cmp->{repo}} || $cmp->{delete} || $repos->{$cmp->{repo}}->{base};
+		unless ( $repos->{$cmp->{repo}}->{orig} || ( $cmp->{delete} && ! $cmp->{repos} ) ) {
+		    $pkgs{$cmp->{nvra}}++;
+		    $latest{$cmp->{base}} = $cmp->{svr} if $repos->{$cmp->{repo}}->{inc} && ! $latest{$cmp->{base}};
+		    unless ( $seen{$cmp->{nvra}} ) {
+			$seen{$cmp->{nvra}} = $cmp;
+			$cmp->{latest}++ if $latest{$cmp->{base}} && $cmp->{svr} eq $latest{$cmp->{base}} && $repos->{$cmp->{repo}}->{inc};
+		    }
+		    push @{$acnt->{$cmp->{repo}}->{$cmp->{rpm}->as_nvre}->{$cmp->{src} ? 'src' : $cmp->{rpm}->arch}}, $cmp;
+		}
+		$cmp->{done}++;
 	    }
-	    printline('dark blue', 1, '    - checking source packages') if $opts{d};
-	    if ( ! $pkg->{srpm} ) {
-		printline('bold yellow on_red', 1, ' - ', $pkg->{rpm}->filename, ' (missing source ', $pkg->{rpm}->sourcerpm, ')');
-	    } elsif ( $pkg->{srpm}->{repo} ne $pkg->{repo} && ( ! $pkg->{srpm}->{oldrepo} || $pkg->{srpm}->{oldrepo} ne $pkg->{repo} ) ) {
-		movepkg($pkg->{srpm}, $pkg->{repo}, 0);
-	    }
-	    unless ( $orig ) {
-		foreach ( grep { $_->{base} eq $pkg->{base} && $_->{repo} eq $pkg->{repo} } @pkgs ) {
-		    printline('bold yellow on_red', 1, ' - ', $_->{rpm}->filename, ' (missing original)'); 
+	    if ( $srpm ) {
+		foreach my $r ( keys %reposrc ) {
+		    next if $repos->{$r}->{orig};
+		    unless ( $reposrc{$r}->{srpm} ) {
+			push @{$srpm->{repos}}, $r;
+			$pkgs{$srpm->{nvra}}++;
+			$orig{$srpm->{nvra}}++ if $repos->{$srpm->{repo}}->{orig};
+			$srpm->{oldrepo} = $srpm->{repo} unless $srpm->{oldrepo};
+			$srpm->{repo} = $r;
+			$reposrc{$r}->{srpm} = $srpm;
+		    }
 		}
+	    } elsif ( scalar keys %pkgs ) {
+		print "\n * missing source (", $pkg->{svr}, ")\n";
 	    }
+	    print "\n * missing originals (", $pkg->{svr}, ")\n" if $opts{o} && scalar keys %orig != scalar keys %pkgs;
 	}
-	printline('bold black', 1, ' - arch count check') if $opts{d};
-	foreach my $r ( keys %$archs ) {
-	    foreach my $p ( keys %{$archs->{$r}} ) {
-		foreach my $a ( keys %{$archs->{$r}->{$p}} ) {
-		    my $p2 = ${$archs->{$r}->{$p}->{$a}}[0];
+
+	foreach my $r ( keys %$acnt ) {
+	    foreach my $p ( keys %{$acnt->{$r}} ) {
+		foreach my $a ( keys %{$acnt->{$r}->{$p}} ) {
 		    if ( $a eq 'noarch' ) {
-			movepkg($p2, $p2->{repo}, 0) if ! $p2->{repos} && scalar @{$archs->{$r}->{$p}->{$a}} != scalar @archs;
-		    } elsif ( scalar @{$archs->{$r}->{$p}->{$a}} != 1 ) {
-			printline('bold yellow on_red', 1, ' - ', $p2->{rpm}->filename, ' (many arch)');
+			my $p2 = ${$acnt->{$r}->{$p}->{$a}}[0];
+			if ( ! $p2->{repos} && scalar @{$acnt->{$r}->{$p}->{$a}} != scalar @archs ) {
+			    $p2->{oldrepo} = $p2->{repo};
+			    push @{$p2->{repos}}, $p2->{repo};
+			}
+		    } elsif ( scalar @{$acnt->{$r}->{$p}->{$a}} != 1 ) {
+			print "\n * many packages ($r, $a, $p)\n";
 		    }
 		}
 	    }
 	}
 
-	printline('bold black', 1, ' - missing stage packages') if $opts{d};
-	movepkg($_, $stage, 0) foreach grep { $_->{latest} && $_->{latest} == 1 } @pkgs;
-
-	printline('bold black', 1, ' - obsolete packages') if $opts{d};
-	movepkg($_, 'delete') foreach grep { ! rprop($_, 'base') && ! $_->{done} && ( $_->{obsolete} || ( $_->{rpm}->is_source_package && ! $_->{inuse} ) ) } @pkgs;
-    }
-    printline('white', 0, "Finished processing.\n");
+	foreach my $pkg ( sort { $a->{nvra} cmp $b->{nvra} } @{$rpms->{$base}->{rpms}} ) {
+	    if ( $pkg->{latest} && $pkg->{latest} == 1 ) {
+		$pkg->{oldrepo} = $pkg->{repo} unless $pkg->{oldrepo};
+		$pkg->{repo} = $stage;
+		push @{$pkg->{repos}}, $stage;
+	    }
+	    if ( ! $print && ($pkg->{delete} || $pkg->{repos} || $pkg->{nosig} ) ) {
+		print "\n$base (sme$smever)\n", "=" x length("$base (sme$smever)"), "\n";
+		$print++;
+	    }
 
-    unless ( $opts{t} || $opts{r} ) {
-	my %repochg = ();
-	# Move / Copy / Delete packages and tag repo for rebuild.
-	foreach my $pkg ( grep { $_->{oldrepo} } @rpms ) {
-	    printline('white', 0, 'Copy/move: ', $pkg->{rpm}->filename);
 	    my $src = $pkg->{rpm}->filename;
+	    if ( $pkg->{nosig} ) {
+		print "sign package (", basename($pkg->{rpm}->filename), ")\n";
+		unless ( $opts{t} ) {
+		    qx(cat $HOME/.rpmpass | setsid rpm --addsign $src >& /dev/null);
+		    if ($?) {
+			print " * failed to sign package\n";
+			next;
+		    }
+		}
+	    }
 
-	    qx(cat $HOME/.rpmpass | setsid rpm --addsign $src >& /dev/null) if $pkg->{nosig};
 	    if ( $pkg->{repos} ) {
-		foreach my $dest ( dest($pkg, @{$pkg->{repos}}) ) {
-		    qx(cp --preserve=timestamps $src $dest) unless -f "$dest";
+		foreach my $repo ( @{$pkg->{repos}} ) {
+		    if ( $pkg->{delete} ) { 
+			print "move from ", $pkg->{oldrepo}, " to $repo (", basename($pkg->{rpm}->filename), ")\n";
+			$pkg->{delete} = 0;
+			$repochg{$pkg->{oldrepo}}++ unless $repos->{$pkg->{oldrepo}}->{base} || $repos->{$pkg->{oldrepo}}->{stage};
+		    } elsif ( $pkg->{oldrepo} eq $repo ) {
+			print "distribute noarch in $repo (", basename($pkg->{rpm}->filename), ")\n";
+		    } else {
+			print "copy from ", $pkg->{oldrepo}, " to $repo (", basename($pkg->{rpm}->filename), ")\n";
+		    }
+		    $repochg{$repo}++ unless $repos->{$repo}->{base} || $repos->{$repo}->{stage};
+		    $pkg->{oldrepo} = $repo unless $pkg->{oldrepo} eq ${$pkg->{repos}}[0];
+
+		    my @d = ();
+		    my $head = $distrepo->{$smever}->{repo} . $repo . '/';
+		    $head = $distrepo->{$smever}->{stage} if $repos->{$repo}->{stage};
+		    my $tail = $repos->{$repo}->{os} ? 'SME/' . $distrepo->{$smever}->{os} : 'RPMS/';
+		    if ( $pkg->{src} ) {
+			push @d, "${head}SRPMS/" . basename($pkg->{rpm}->filename);
+		    } elsif ( $pkg->{rpm}->arch eq 'noarch' ) {
+			push @d, map { "${head}$_/$tail" . basename($pkg->{rpm}->filename) } @archs;
+		    } elsif ( $pkg->{rpm}->arch =~ m{^(i[356]86)$} ) {
+			push @d, "${head}i386/$tail" . basename($pkg->{rpm}->filename);
+		    } else {
+			push @d, $head . $pkg->{rpm}->arch . "/$tail" . basename($pkg->{rpm}->filename);
+		    }
+		    foreach my $dest ( @d ) {
+			qx(cp --preserve=timestamps $src $dest) unless $opts{t} || -f "$dest";
+		    }
+
 		}
-		$repochg{$_}++ foreach @{$pkg->{repos}};
-	    }
-	    if ( $pkg->{remove} ) {
+		qx(rm -f $src) if exists $pkg->{delete} && ! $opts{t};
+	    } elsif ( $pkg->{delete} ) {
+		print "delete from ", $pkg->{repo}, " (", basename($pkg->{rpm}->filename), ")\n";
 		qx(rm -f $src);
-		$repochg{$pkg->{oldrepo}}++;
+		$repochg{$pkg->{repo}}++ unless $repos->{$pkg->{repo}}->{base} || $repos->{$pkg->{repo}}->{stage};
 	    }
 	}
-	finddepth(sub{rmdir}, $distrepo->{$rel}->{builds});
-	finddepth(sub{rmdir}, $distrepo->{$rel}->{contribs});
-	printline('white', 0, "Finished copying/moving.\n");
-
-	foreach my $repo ( sort keys %repochg ) {
-	    next if ! $repos->{$repo} || $repos->{$repo}->{orig} || $repos->{$repo}->{stage};
-	    foreach my $arch ( @archs ) {
-		my $dir = $distrepo->{$rel}->{repo} . "$repo/$arch";
-		$dir = qx(readlink -f $dir);
-		chomp $dir;
-		printline('white', 0, "Createrepo: $repo/$arch");
-		qx(createrepo $dir);
-		printline('white', 0, "Repoview: $repo/$arch");
+    }
+
+    if ( %repochg ) {
+	print "\nrebuild repo (sme$smever)\n", "=" x length("rebuild repo (sme$smever)"), "\n";
+    }
+    foreach my $repo ( sort { $repos->{$b}->{prio} <=> $repos->{$a}->{prio} } keys %repochg ) {
+	next if $repos->{$repo}->{orig} || $repos->{$repo}->{stage};
+	foreach my $arch ( @archs ) {
+	    my $dir = $distrepo->{$smever}->{repo} . "$repo/$arch";
+	    $dir = qx(readlink -f $dir);
+	    chomp $dir;
+	    print "rebuild $repo/$arch\n";
+	    unless ( $opts{t} ) {
+		if ( -f "$dir/repodata/comps.xml" ) {
+		    qx(createrepo -g $dir/repodata/comps.xml $dir);
+		} else {
+		    qx(createrepo $dir);
+		}
 		qx(repoview $dir);
 		qx(rm -rf $dir/.olddata) if -d "$dir/.olddata";
 		qx(rm -rf $dir/.repodata) if -d "$dir/.repodata";
 	    }
 	}
-	printline('white', 0, "Finished rebuilding repos.\n");
     }
-
-    print "\n================================================================================\n\n";
-}
-
-sub pkgsrt {
-    return $a->{rpm}->is_source_package <=> $b->{rpm}->is_source_package || $b->{rpm} cmp $a->{rpm} || rprop($b, 'prio') <=> rprop($a, 'prio');
-}
-
-sub rprop {
-    my ($pkg, $prop) = @_;
-    return $repos->{$pkg->{repo}} ? $repos->{$pkg->{repo}}->{$prop} : 0;
-}
-
-sub names {
-    my $pkg = shift;
-    my @rpms = @_;
-    return map { $_->{name} => rprop($_, 'inc') ? 2 : 1 } grep { $_->{base} eq $pkg->{base} && 
-								 rprop($_, 'prio') >= rprop($pkg, 'prio') && 
-								 ! rprop($_, 'orig') &&
-								 ! $_->{rpm}->is_source_package
-							       } @rpms;
-}
-
-sub dest {
-    my ($pkg, @repos) = @_;
-    my @d = ();
-    foreach my $repo ( @repos ) {
-	my $base = $distrepo->{$rel}->{repo} . $repo;
-	$base = $distrepo->{$rel}->{stage} if $repos->{$repo}->{stage};
-	if ( $pkg->{arch} eq 'noarch' ) {
-	    push @d, "$base/i386/" . 
-		     ( $repos->{$repo}->{os} ? $distrepo->{$rel}->{os} : 'RPMS/' ) . 
-		     basename $pkg->{rpm}->filename;
-	    push @d, "$base/x86_64/" . 
-		     ( $repos->{$repo}->{os} ? $distrepo->{$rel}->{os} : 'RPMS/' ) . 
-		     basename $pkg->{rpm}->filename;
-	} elsif ( $pkg->{arch} =~ m{^(i[356]86)$} ) {
-	    push @d, "$base/i386/" . 
-		     ( $repos->{$repo}->{os} ? $distrepo->{$rel}->{os} : 'RPMS/' ) . 
-		     basename $pkg->{rpm}->filename;
-	} elsif ( $pkg->{arch} eq 'x86_64' ) {
-	    push @d, "$base/x86_64/" . 
-		     ( $repos->{$repo}->{os} ? $distrepo->{$rel}->{os} : 'RPMS/' ) . 
-		     basename $pkg->{rpm}->filename;
-	} elsif ( $pkg->{arch} eq 'zsrc' ) {
-	    push @d, "$base/SRPMS/" . 
-		     basename $pkg->{rpm}->filename;
-	} else {
-	    printline('bold yellow on_red', 1, ' - ', $pkg->{rpm}->filename, ' (bad arch: ', $pkg->{arch}, ')');
-	}
+    unless ( $opts{t} ) {
+	finddepth(sub{rmdir}, $distrepo->{$smever}->{$_}) foreach ('builds','contribs','qa');
     }
-    return @d;
 }
 
-sub movepkg {
-    my ($pkg, $repo, $done, $remove) = @_;
-    defined $done or $done = 2;
-    defined $remove or $remove = 0;
-    $remove = 0 if rprop($pkg, 'orig');
-    $remove = 1 if $repo eq 'delete';
-
-    if ( $repo eq 'delete' && ( rprop($pkg, 'base') || (  rprop($pkg, 'orig') && $done == 1 ) ) ) {
-	tagpkg($pkg, 'inuse', 1);
-    } else {
-	printline('bold magenta', 1, "       - ($repo) ", $pkg->{rpm}->filename) if $opts{d};
-	my $color = 'bold white';
-	$color = 'bold yellow' if rprop($pkg, 'orig');
-	$color = 'dark green' if $repos->{$repo} && $repos->{$repo}->{devel};
-	$color = 'dark red' if $repo eq 'delete';
-	push @{$pkg->{repos}}, $repo unless $repo eq 'delete';
-	$pkg->{oldrepo} = $pkg->{repo} unless $pkg->{oldrepo};
-	$pkg->{repo} = $repo;
-	$pkg->{remove}++ if $remove;
-	printline($color, 1, ' - ', $pkg->{rpm}->filename, ' (', $pkg->{oldrepo}, " to $repo)") if $opts{v} || $opts{d};
-	done($pkg) if $done;
-    }
-}
+sub verrel {
+    my $pkg = shift;
+    my $repo = shift;
+    my $counts = shift;
 
-sub tagpkg {
-    my ($pkg, $tag, $done) = @_;
-    defined $done or $done = 0;
-
-    printline('bold magenta', 1, "       - ($tag) ", $pkg->{rpm}->filename) if $opts{d};
-    delete $pkg->{obsolete} if $pkg->{obsolete};
-    $pkg->{$tag}++;
-    done($pkg) if $done;
+    $counts->{$repo}->{$pkg->{ver}}->{$pkg->{rel}}++;
+    return 1 if $repos->{$repo}->{ver} && scalar keys %{$counts->{$repo}} > $repos->{$repo}->{ver};
+    return 1 if $repos->{$repo}->{rel} && scalar keys %{$counts->{$repo}->{$pkg->{ver}}} > $repos->{$repo}->{rel};
+    return 0;
 }
 
-sub done {
+sub pkgdest {
     my $pkg = shift;
-    printline('bold yellow on_red', 1, " - ", $pkg->{rpm}->filename, " (already processed)") if $pkg->{done};
-    $pkg->{done}++;
-    delete $pkg->{obsolete} if $pkg->{obsolete};
-
-    if ( $repos->{$pkg->{repo}} && ! rprop($pkg, 'orig') ) {
-	# FIXME: Nasty hack for comps package
-	if ( $pkg->{name} eq 'comps' ) {
-	    if ( ! $latest{$pkg->{name}.'.'.$pkg->{arch}} || $latest{$pkg->{name}.'.'.$pkg->{arch}}->{rpm} eq $pkg->{rpm} ) { 
-		if ( rprop($pkg, 'inc') && ! $pkg->{rpm}->is_source_package ) {
-		    $latest{$pkg->{name}.'.'.$pkg->{arch}} = $pkg if ! $latest{$pkg->{name}.'.'.$pkg->{arch}};
-		    $pkg->{latest}++;
-		}
-	    }
-	} elsif ( ! $latest{$pkg->{name}} || $latest{$pkg->{name}}->{rpm} eq $pkg->{rpm} ) { 
-	    if ( rprop($pkg, 'inc') && ! $pkg->{rpm}->is_source_package ) {
-		$latest{$pkg->{name}} = $pkg if ! $latest{$pkg->{name}};
-		$pkg->{latest}++;
-	    }
-	}
-	unless ( $pkg->{oldrepo} ) {
-	    my $goodarch = 0;
-	    $goodarch++ if $pkg->{rpm}->filename =~ m{/(i386|x86_64)/.*\.noarch\.rpm$};
-	    $goodarch++ if $pkg->{rpm}->filename =~ m{/i386/.*\.(i[56]86)\.rpm$};
-	    $goodarch++ if $pkg->{rpm}->filename =~ m{/(noarch|i[356]86|x86_64)/.*\.\1\.rpm$};
-	    printline('bold yellow on_red', 1, ' - ', $pkg->{rpm}->filename, ' (wrong arch)') unless $goodarch;
+    my $dest = shift;
+    my $hirepo = shift;
+    my $pkgs = shift;
+
+    foreach my $cmp ( @$pkgs ) {
+	next if $cmp->{src} || $cmp->{name} ne $pkg->{name} || $repos->{$cmp->{repo}}->{prio} <= $repos->{$dest}->{prio};
+	if ( $repos->{$cmp->{repo}}->{prio} > $repos->{$hirepo}->{prio} ) {
+	    $dest = $hirepo;
+	    last;
+	} else {
+	    $dest = $cmp->{repo};
 	}
-	push @{$archs->{$pkg->{repo}}->{$pkg->{rpm}->as_nvre}->{$pkg->{rpm}->is_source_package ? 'src' : $pkg->{rpm}->arch}}, $pkg;
     }
+    return $dest;
 }
 
-sub printline {
-    my $color = shift;
-    my $nline = shift;
-    my $string = join '', @_;
-
-    if ( $nline ) {
-	print "\n" unless $newline;
-	$newline++; 
-    } else {
-	$newline = 0;
-	print "\r\e[0K";
-    }
-    print color $color;
-    print $string;
-    print color 'reset';
-    print "\n" if $nline;
-}
-
-sub loadpkg {
-    printline('white', 0, "Loading: $_") if -d _;
-    return unless m{/([^/]*)-[^-]+-[^-]+\.\w+\.rpm$} && ( ! $opts{r} || $1 =~ m{$opts{r}} );
+sub process_rpm {
+    my $rpm = shift;
+    my $smever = shift;
+    my $repo = shift;
+    return unless $rpm =~ m{/([^/]*)-[^-]+-[^-]+\.\w+\.rpm$};
+    my $base = $1;
+    return unless ! $opts{r} || $base =~ m[$opts{r}];
+    return unless $latest{$base} || $sources{$base} || ! $repos->{$repo}->{base};
 
     my $pkg;
-    eval { $pkg = RPM2->open_package($_, $rpm_flags); };
-    if ($@) { printline('bold yellow on_red', 1, "Corrupt package $_"); return; }
+    eval { $pkg = RPM2->open_package($rpm, $rpm_flags); };
+    if ($@) { print " * corrupt package ($rpm)\n"; return; }
     eval { my $sig = $pkg->siggpg };
     my $nosig = ! $@;
     
-    my ($srcname, $version, $release) = ($pkg->is_source_package ? basename $pkg->filename : $pkg->sourcerpm) =~ m{^([^/]*)-([^-]+)-([^-]+)\.\w+\.rpm$};
-    foreach my $repo ( keys %{$skippkg->{$rel}} ) { return if (dirname $pkg->filename) =~ m{/$repo/} && grep { $_ eq $srcname } @{$skippkg->{$rel}->{$repo}}; }
-    my $reponame = 'unknown';
-    if ( substr($_, 0, length($distrepo->{$rel}->{builds})) eq $distrepo->{$rel}->{builds} ) {
-	$reponame = 'builds';
-    } elsif ( substr($_, 0, length($distrepo->{$rel}->{contribs})) eq $distrepo->{$rel}->{contribs} ) {
-	$reponame = 'contribs';
-    } elsif ( substr($_, 0, length($distrepo->{$rel}->{stage})) eq $distrepo->{$rel}->{stage} ) {
-	$reponame = 'stage';
-    } elsif ( (dirname $pkg->filename) =~ m{\d/(sme[^/]+)/} ) {
-	$reponame = $1;
-    }
-    if ( $nosig && ( ! -f "$HOME/.rpmpass" || ! $repos->{$reponame}->{orig} ) ) {
-	printline('bold yellow on_red', 1, ' - ', $pkg->filename, ' (missing signature)');
-	return;
-    }
-    push @rpms, { base    => $srcname,
-		  name    => $pkg->name,
-		  repo    => $reponame,
-		  nvra    => $pkg->name.'-'.$pkg->version.'-'.$pkg->release.'.'.( $pkg->is_source_package ? 'src' : $pkg->tag('ARCH') ),
-		  arch    => $pkg->is_source_package ? 'zsrc' : $pkg->tag('ARCH'),
-		  version => $version,
-		  release => $release,
-		  rpm     => $pkg,
-		  nosig   => $nosig,
-		};
-    $sources{$srcname}++;
-    if ( ! $pkg->is_source_package && ! $repos->{$reponame}->{stage} ) {
-	$latest{$pkg->name} = $rpms[$#rpms] if ! $latest{$pkg->name} || $pkg gt $latest{$pkg->name}->{rpm};
-    }
-}
-
-sub loadbase {
-    printline('white', 0, "Loading: $_") if -d _;
-    return unless m{/([^/]*)-[^-]+-[^-]+\.\w+\.rpm$} && ($latest{$1} || $sources{$1});
-
-    my $pkg;
-    eval { $pkg = RPM2->open_package($_, $rpm_flags); };
-    if ($@) { printline('bold yellow on_red', 1, "Corrupt package $_"); return; }
-    eval { my $sig = $pkg->siggpg };
-    unless ($@) { printline('bold yellow on_red', 1, ' - ', $pkg->filename, ' (missing signature)'); return; }
-
     my $cmp = $latest{$pkg->name};
-    my ($srcname, $version, $release) = ($pkg->is_source_package ? basename $pkg->filename : $pkg->sourcerpm) =~ m{^([^/]*)-([^-]+)-([^-]+)\.\w+\.rpm$};
-    my $pkgrepo = 'base';
-    foreach my $repo ( keys %{$skippkg->{$rel}} ) { 
-	if ( (dirname $pkg->filename) =~ m{/$repo/} ) {
-	    return if grep { $_ eq $srcname } @{$skippkg->{$rel}->{$repo}}; 
-	    $pkgrepo = $repo;
-	    return unless $pkg->is_source_package || $cmp;
-	    return if ! $pkg->is_source_package && $pkg ge $cmp->{rpm} && rprop($cmp, 'base') && rprop($cmp, 'prio') > $repos->{$pkgrepo}->{prio};
-	    last;
-	}
+    if ( $repos->{$repo}->{base} && ! $pkg->is_source_package ) {
+	return unless $cmp;
+	return if $repos->{$cmp->{repo}}->{base} && $repos->{$cmp->{repo}}->{prio} > $repos->{$repo}->{prio} && $pkg ge $cmp->{rpm};
+    }
+    my ($src, $version, $release) = ($pkg->is_source_package ? $pkg->filename : $pkg->sourcerpm) =~ m{(?:^|/)([^/]*)-([^-]+)-([^-]+)\.\w+\.rpm$};
+    return if $skippkg->{$smever}->{$repo} && $skippkg->{$smever}->{$repo}->{$src};
+    return if $repos->{$repo}->{base} && $nosig;
+    if ( $nosig && ! -f "$HOME/.rpmpass" ) { print " * missing signature (" .$pkg->filename . ")\n"; return; }
+
+    my $rpmhash = { base  => $src,
+		    name  => $pkg->name,
+		    repo  => $repo,
+		    nvra  => $pkg->name.'-'.$pkg->version.'-'.$pkg->release.'.'.( $pkg->is_source_package ? 'src' : $pkg->tag('ARCH') ),
+		    svr   => $src.'-'.$version.'-'.$release,
+		    src   => $pkg->is_source_package,
+		    ver   => $version,
+		    rel   => $release,
+		    rpm   => $pkg,
+		    nosig => $nosig,
+		  };
+    if ( $pkg->is_source_package ) {
+	push @{$rpms->{$src}->{srpms}}, $rpmhash;
+	push @{$rpms->{$src}->{vers}->{$rpmhash->{svr}}}, $rpmhash;
+    } else {
+	push @{$rpms->{$src}->{rpms}}, $rpmhash;
     }
+    $sources{$src}++;
 
-    push @rpms, { base    => $srcname,
-		  name    => $pkg->name,
-		  repo    => $pkgrepo,
-		  nvra    => $pkg->name.'-'.$pkg->version.'-'.$pkg->release.'.'.( $pkg->is_source_package ? 'src' : $pkg->tag('ARCH') ),
-		  arch    => $pkg->is_source_package ? 'zsrc' : $pkg->tag('ARCH'),
-		  version => $version,
-		  release => $release,
-		  rpm     => $pkg,
-		  nosig   => 0,
-		};
-    if ( ! $pkg->is_source_package && $pkg ge $cmp->{rpm} && ( $repos->{$pkgrepo}->{prio} >= rprop($cmp, 'prio') || ! rprop($cmp, 'base') ) ) {
-	$latest{$pkg->name} = $rpms[$#rpms];
+    return if $pkg->is_source_package || $repos->{$repo}->{stage};
+    if ( ! $repos->{$repo}->{base} ) {
+	if ( ! $cmp || $pkg gt $cmp->{rpm} ) {
+	    $latest{$pkg->name} = $rpmhash;
+	}
+    } elsif ( ( $repos->{$repo}->{prio} >= $repos->{$cmp->{repo}}->{prio} || ! $repos->{$cmp->{repo}}->{base} ) && $pkg ge $cmp->{rpm} ) {
+	$latest{$pkg->name} = $rpmhash;
     }
 }
-