Re: [PATCH] remove obsolete functions

[dana <dana@xxxxxxx>]

here are the removals and renames as discussed, minus the contrib part

- _arg_compile is included but if this needs further debate lmk
- we agreed on irc that _totd should go after all (the project survives but the
  specific command it completes does not)
- i included _rebootin but not _urpmi for now (mageia 10 just came out the other
  day and the release notes confirm that it's still in use)
- if the mondorescue site ever comes back i'll consider notifying them
- i'll look at _gqview and _mozilla later
- i'll probably add a note to README after merging
- i won't back-port to 5.9

dana


diff --git a/Completion/BSD/Command/_csup b/Completion/BSD/Command/_csup
deleted file mode 100644
index 69e13f3d1..000000000
diff --git a/Completion/BSD/Command/_portaudit b/Completion/BSD/Command/_portaudit
deleted file mode 100644
index 788248d7f..000000000
diff --git a/Completion/Base/Utility/_arg_compile b/Completion/Base/Utility/_arg_compile
deleted file mode 100644
index e37c869ee..000000000
diff --git a/Completion/Debian/Command/_auto-apt b/Completion/Debian/Command/_auto-apt
deleted file mode 100644
index 2e6dccbc1..000000000
diff --git a/Completion/Debian/Command/_git-buildpackage b/Completion/Debian/Command/_git-buildpackage
deleted file mode 100644
index 7c81e0ff2..000000000
diff --git a/Completion/Linux/Command/_mondo b/Completion/Linux/Command/_mondo
deleted file mode 100644
index 047a04129..000000000
diff --git a/Completion/Mandriva/Command/_rebootin b/Completion/Mandriva/Command/_rebootin
deleted file mode 100644
index 284ff08f1..000000000
diff --git a/Completion/Unix/Command/_aap b/Completion/Unix/Command/_aap
deleted file mode 100644
index 38e50f1fc..000000000
diff --git a/Completion/Unix/Command/_baz b/Completion/Unix/Command/_baz
deleted file mode 100644
index 0acdc4639..000000000
diff --git a/Completion/Unix/Command/_bittorrent b/Completion/Unix/Command/_bittorrent
deleted file mode 100644
index 1fbab35ef..000000000
diff --git a/Completion/Unix/Command/_clay b/Completion/Unix/Command/_clay
deleted file mode 100644
index 581338b8b..000000000
diff --git a/Completion/Unix/Command/_cplay b/Completion/Unix/Command/_cplay
deleted file mode 100644
index f1755c1a1..000000000
diff --git a/Completion/Unix/Command/_fsh b/Completion/Unix/Command/_fsh
deleted file mode 100644
index c39373117..000000000
diff --git a/Completion/Unix/Command/_initctl b/Completion/Unix/Command/_initctl
deleted file mode 100644
index b60bdbc5b..000000000
diff --git a/Completion/Unix/Command/_monotone b/Completion/Unix/Command/_monotone
deleted file mode 100644
index bcaab87f0..000000000
diff --git a/Completion/Unix/Command/_moosic b/Completion/Unix/Command/_moosic
deleted file mode 100644
index 475a0c75c..000000000
diff --git a/Completion/Unix/Command/_pump b/Completion/Unix/Command/_pump
deleted file mode 100644
index 08ec026ed..000000000
diff --git a/Completion/Unix/Command/_tla b/Completion/Unix/Command/_tla
deleted file mode 100644
index ec7e76d44..000000000
diff --git a/Completion/Unix/Command/_totd b/Completion/Unix/Command/_totd
deleted file mode 100644
index 4d55d29bb..000000000
diff --git a/Completion/Unix/Command/_twidge b/Completion/Unix/Command/_twidge
deleted file mode 100644
index d8b3b3def..000000000
diff --git a/Completion/Unix/Type/_arch_archives b/Completion/Unix/Type/_arch_archives
deleted file mode 100644
index 9ffd7e3d3..000000000
diff --git a/Completion/Unix/Type/_arch_namespace b/Completion/Unix/Type/_arch_namespace
deleted file mode 100644
index 171293887..000000000
diff --git a/Completion/X/Command/_acroread b/Completion/X/Command/_acroread
deleted file mode 100644
index 4a5cb5cb8..000000000
diff --git a/Completion/X/Command/_dcop b/Completion/X/Command/_dcop
deleted file mode 100644
index a0329e110..000000000
diff --git a/Completion/X/Command/_netscape b/Completion/X/Command/_netscape
deleted file mode 100644
index 78b2da649..000000000
diff --git a/Completion/openSUSE/Command/_SUSEconfig b/Completion/openSUSE/Command/_SUSEconfig
deleted file mode 100644
index 737a80b17..000000000


diff --git a/Completion/Unix/Command/_ip b/Completion/Linux/Command/_ip
similarity index 100%
rename from Completion/Unix/Command/_ip
rename to Completion/Linux/Command/_ip
diff --git a/Completion/Unix/Command/_loadkeys b/Completion/Linux/Command/_kbd
similarity index 100%
rename from Completion/Unix/Command/_loadkeys
rename to Completion/Linux/Command/_kbd
diff --git a/Completion/Linux/Command/_modutils b/Completion/Linux/Command/_kmod
similarity index 100%
rename from Completion/Linux/Command/_modutils
rename to Completion/Linux/Command/_kmod
diff --git a/Completion/Linux/Command/_analyseplugin b/Completion/Linux/Command/_ladspa
similarity index 100%
rename from Completion/Linux/Command/_analyseplugin
rename to Completion/Linux/Command/_ladspa
diff --git a/Completion/Unix/Command/_pkgadd b/Completion/Solaris/Command/_pkgadd
similarity index 100%
rename from Completion/Unix/Command/_pkgadd
rename to Completion/Solaris/Command/_pkgadd
diff --git a/Completion/Unix/Command/_pkginfo b/Completion/Solaris/Command/_pkginfo
similarity index 100%
rename from Completion/Unix/Command/_pkginfo
rename to Completion/Solaris/Command/_pkginfo
diff --git a/Completion/Unix/Command/_pkgrm b/Completion/Solaris/Command/_pkgrm
similarity index 100%
rename from Completion/Unix/Command/_pkgrm
rename to Completion/Solaris/Command/_pkgrm
diff --git a/Completion/Linux/Command/_htop b/Completion/Unix/Command/_htop
similarity index 100%
rename from Completion/Linux/Command/_htop
rename to Completion/Unix/Command/_htop


diff --git a/Completion/Solaris/Command/_pkgadd b/Completion/Solaris/Command/_pkgadd
index 7adc18a2a..09e6a06d0 100644
--- a/Completion/Solaris/Command/_pkgadd
+++ b/Completion/Solaris/Command/_pkgadd
@@ -23,10 +23,10 @@ _pkgadd() {
 	'-R[root path]:root path:_files -/' \
 	'-r[response file]:response file:_files' \
 	'-V[alternate vfstab file]:vfstab file:_files' \
-	'*:package instance:_pkg_instance --_opts uninstalled:-d' \
+	'*:package instance:_pkg_instances --_opts uninstalled:-d' \
 	- set2 \
 	'-s[spool package]:spool directory:_files -/' \
-	'*:package instance:_pkg_instance --_opts uninstalled:-d'
+	'*:package instance:_pkg_instances --_opts uninstalled:-d'
 }
 
 _pkgadd "$@"
diff --git a/Completion/Solaris/Command/_pkginfo b/Completion/Solaris/Command/_pkginfo
index eca9e057e..26a5a866b 100644
--- a/Completion/Solaris/Command/_pkginfo
+++ b/Completion/Solaris/Command/_pkginfo
@@ -12,7 +12,7 @@ _arguments -s \
   '(-p)-i[select completely installed packages]' \
   '(-i)-p[select partially installed packages]' \
   '-R[root path]:root path:_files -/' \
-  '*:package instance:_pkg_instance --_opts installed:set1--R' \
+  '*:package instance:_pkg_instances --_opts installed:set1--R' \
   - set2 \
   '-d[device]:device file:_files' \
-  '*:package instance:_pkg_instance --_opts uninstalled:set2--d'
+  '*:package instance:_pkg_instances --_opts uninstalled:set2--d'
diff --git a/Completion/Solaris/Command/_pkgrm b/Completion/Solaris/Command/_pkgrm
index 1191a2d1f..19fbc4409 100644
--- a/Completion/Solaris/Command/_pkgrm
+++ b/Completion/Solaris/Command/_pkgrm
@@ -10,7 +10,7 @@ _arguments -s \
   "-M[don't use vfstab file]" \
   '-R[root path]:root path:_files -/' \
   '-V[alternate vfstab file]:vfstab file:_files' \
-  '*:package instance:_pkg_instance --_opts installed:set1--R' \
+  '*:package instance:_pkg_instances --_opts installed:set1--R' \
   - set2 \
   '-s[spool package]:spool directory:_files -/' \
-  '*:package instance:_pkg_instance --_opts spooled:set2--s'
+  '*:package instance:_pkg_instances --_opts spooled:set2--s'
diff --git a/Completion/Unix/Command/_pkg_instance b/Completion/Solaris/Type/_pkg_instances
similarity index 100%
rename from Completion/Unix/Command/_pkg_instance
rename to Completion/Solaris/Type/_pkg_instances