only a couple func really are needed

23 files changed, 23 insertions, 23 deletions

diff --git a/gurpmi b/gurpmi
index f44bf66f..fd07c35f 100755
--- a/gurpmi
+++ b/gurpmi
@@ -12,7 +12,7 @@ BEGIN { #- set up a safe path and environment
 
 use Gtk2;
 use gurpmi;
-use urpm::util;
+use urpm::util 'basename';
 
 # For other distros w/o exception support:
 eval { Glib->enable_exceptions2 };
diff --git a/gurpmi.pm b/gurpmi.pm
index fe00c344..30be66ad 100644
--- a/gurpmi.pm
+++ b/gurpmi.pm
@@ -20,7 +20,7 @@ if ($collation_locale) {
 use urpm;
 use strict;
 use Gtk2;
-use urpm::util;
+use urpm::util 'member';
 use urpm::msg;
 use urpm::args;
 use urpm::select;
diff --git a/urpm.pm b/urpm.pm
index de101a0f..8d0fc836 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -7,7 +7,7 @@ use strict;
 use File::Find ();
 use urpm::msg;
 use urpm::download;
-use urpm::util;
+use urpm::util qw(basename begins_with cat_ cat_utf8 dirname file2absolute_file member);
 use urpm::sys;
 use urpm::cfg;
 use urpm::md5sum;
diff --git a/urpm/cdrom.pm b/urpm/cdrom.pm
index 5c816738..7de32e83 100644
--- a/urpm/cdrom.pm
+++ b/urpm/cdrom.pm
@@ -5,7 +5,7 @@ package urpm::cdrom;
 use strict;
 use urpm::msg;
 use urpm::sys;
-use urpm::util;
+use urpm::util qw(basename copy_and_own difference2 remove_internal_name);
 use urpm::get_pkgs;
 use urpm::removable;
 use urpm 'file_from_local_medium';
diff --git a/urpm/cfg.pm b/urpm/cfg.pm
index 7b96cc54..f5f292ba 100644
--- a/urpm/cfg.pm
+++ b/urpm/cfg.pm
@@ -4,7 +4,7 @@ package urpm::cfg;
 
 use strict;
 use warnings;
-use urpm::util;
+use urpm::util qw(any cat_ partition output_safe quotespace unquotespace);
 use urpm::msg 'N';
 
 =head1 NAME
diff --git a/urpm/download.pm b/urpm/download.pm
index 5a4ab8c5..5b1470f1 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -4,7 +4,7 @@ package urpm::download;
 
 use strict;
 use urpm::msg;
-use urpm::util;
+use urpm::util qw(cat_ basename dirname file_size max member output_safe reduce_pathname);
 use bytes ();
 use Cwd;
 use Exporter;
diff --git a/urpm/get_pkgs.pm b/urpm/get_pkgs.pm
index 060b55c6..42ffaf8e 100644
--- a/urpm/get_pkgs.pm
+++ b/urpm/get_pkgs.pm
@@ -5,7 +5,7 @@ package urpm::get_pkgs;
 use strict;
 use urpm::msg;
 use urpm::sys;
-use urpm::util;
+use urpm::util qw(basename put_in_hash);
 use urpm::media;
 use urpm 'file_from_local_url';
 # perl_checker: require urpm::select
diff --git a/urpm/install.pm b/urpm/install.pm
index 316acee2..e6f120d1 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -5,7 +5,7 @@ package urpm::install;
 use strict;
 use urpm;
 use urpm::msg;
-use urpm::util;
+use urpm::util qw(cat_utf8 member);
 
 
 =head1 NAME
diff --git a/urpm/ldap.pm b/urpm/ldap.pm
index 281ad56c..7c5180af 100644
--- a/urpm/ldap.pm
+++ b/urpm/ldap.pm
@@ -5,7 +5,7 @@ package urpm::ldap;
 use strict;
 use warnings;
 use urpm;
-use urpm::util;
+use urpm::util qw(cat_ output_safe);
 use urpm::msg 'N';
 use urpm::media;
 
diff --git a/urpm/lock.pm b/urpm/lock.pm
index d480b25d..73c2c568 100644
--- a/urpm/lock.pm
+++ b/urpm/lock.pm
@@ -4,7 +4,7 @@ package urpm::lock;
 
 use strict;
 use urpm::msg;
-use urpm::util;
+use urpm::util 'cat_';
 
 #- avoid putting a require on Fcntl ':flock' (which is perl and not perl-base).
 my ($LOCK_SH, $LOCK_EX, $LOCK_NB, $LOCK_UN) = (1, 2, 4, 8);
diff --git a/urpm/md5sum.pm b/urpm/md5sum.pm
index 62a21512..67315fe5 100644
--- a/urpm/md5sum.pm
+++ b/urpm/md5sum.pm
@@ -1,7 +1,7 @@
 package urpm::md5sum; # $Id: md5sum.pm 265136 2010-01-22 12:10:01Z misc $
 
 use strict;
-use urpm::util;
+use urpm::util qw(cat_ file_size);
 use urpm::msg;
 
 
diff --git a/urpm/media.pm b/urpm/media.pm
index 5bfd1b38..d69bbcf3 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -5,7 +5,7 @@ package urpm::media;
 use strict;
 use urpm 'file_from_local_medium', 'is_local_medium';
 use urpm::msg;
-use urpm::util;
+use urpm::util qw(any append_to_file basename cat_ difference2 dirname member output_safe begins_with copy_and_own file_size offset_pathname reduce_pathname);
 use urpm::removable;
 use urpm::lock;
 use urpm::md5sum;
diff --git a/urpm/mirrors.pm b/urpm/mirrors.pm
index 3fcf9b13..d44ef6da 100644
--- a/urpm/mirrors.pm
+++ b/urpm/mirrors.pm
@@ -3,7 +3,7 @@ package urpm::mirrors;
 # $Id: $
 
 use strict;
-use urpm::util;
+use urpm::util qw(cat_ find output_safe reduce_pathname);
 use urpm::msg;
 use urpm::download;
 
diff --git a/urpm/msg.pm b/urpm/msg.pm
index 010741a4..94fc1c6e 100644
--- a/urpm/msg.pm
+++ b/urpm/msg.pm
@@ -6,7 +6,7 @@ use strict;
 no warnings;
 use Exporter;
 use URPM;
-use urpm::util;
+use urpm::util 'append_to_file';
 
 my $encoding;
 BEGIN {
diff --git a/urpm/orphans.pm b/urpm/orphans.pm
index 279d001c..48d45754 100644
--- a/urpm/orphans.pm
+++ b/urpm/orphans.pm
@@ -1,7 +1,7 @@
 package urpm::orphans;
 
 use strict;
-use urpm::util;
+use urpm::util qw(add2hash_ append_to_file cat_ output_safe partition put_in_hash uniq wc_l);
 use urpm::msg;
 use urpm;
 
diff --git a/urpm/parallel.pm b/urpm/parallel.pm
index f35843d3..dc842b7d 100644
--- a/urpm/parallel.pm
+++ b/urpm/parallel.pm
@@ -2,7 +2,7 @@ package urpm::parallel; # $Id: parallel.pm 250871 2009-01-06 17:21:05Z pixel $
 
 use strict;
 use urpm;
-use urpm::util;
+use urpm::util qw(any basename cat_);
 use urpm::msg;
 
 
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm
index e28c962b..05cf825f 100644
--- a/urpm/parallel_ka_run.pm
+++ b/urpm/parallel_ka_run.pm
@@ -6,7 +6,7 @@ package urpm::parallel_ka_run;
 #- Copyright (C) 2005-2010 Mandriva SA
 
 use strict;
-use urpm::util;
+use urpm::util 'find';
 use urpm::msg;
 use urpm::parallel;
 
diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm
index ad838fbf..22b3c3d9 100644
--- a/urpm/parallel_ssh.pm
+++ b/urpm/parallel_ssh.pm
@@ -6,7 +6,7 @@ package urpm::parallel_ssh;
 #- Copyright (C) 2005-2010 Mandriva SA
 
 use strict;
-use urpm::util;
+use urpm::util 'dirname';
 use urpm::msg;
 use urpm::parallel;
 
diff --git a/urpm/removable.pm b/urpm/removable.pm
index a157d86b..7da3d687 100644
--- a/urpm/removable.pm
+++ b/urpm/removable.pm
@@ -5,7 +5,7 @@ package urpm::removable;
 use strict;
 use urpm::msg;
 use urpm::sys;
-use urpm::util;
+use urpm::util 'reduce_pathname';
 use urpm 'file_from_local_medium';
 
 
diff --git a/urpm/select.pm b/urpm/select.pm
index 23314753..c2c3fe48 100644
--- a/urpm/select.pm
+++ b/urpm/select.pm
@@ -4,7 +4,7 @@ package urpm::select;
 
 use strict;
 use urpm::msg;
-use urpm::util;
+use urpm::util qw(any intersection member min partition uniq);
 use urpm::sys;
 use URPM;
 
diff --git a/urpm/signature.pm b/urpm/signature.pm
index 7fd90b67..3d3cf606 100644
--- a/urpm/signature.pm
+++ b/urpm/signature.pm
@@ -5,7 +5,7 @@ package urpm::signature;
 use strict;
 use urpm::msg;
 use urpm::media;
-use urpm::util;
+use urpm::util qw(any basename);
 
 
 =head1 NAME
diff --git a/urpm/sys.pm b/urpm/sys.pm
index 42b4c337..c056af73 100644
--- a/urpm/sys.pm
+++ b/urpm/sys.pm
@@ -4,7 +4,7 @@ package urpm::sys;
 
 use strict;
 use warnings;
-use urpm::util;
+use urpm::util 'cat_';
 use urpm::msg;
 use POSIX ();
 
diff --git a/urpmq b/urpmq
index 94b49118..acd3ec44 100755
--- a/urpmq
+++ b/urpmq
@@ -27,7 +27,7 @@ use urpm;
 use urpm::args;
 use urpm::msg;
 use urpm::sys;
-use urpm::util;
+use urpm::util qw(any cat_ put_in_hash uniq_);
 use urpm::media;
 use urpm::select;
 use urpm::get_pkgs;