I've revised my Emacs 21 and Leim 21 package attempts.
They are available via:

  http://mashin.nanoyo.net:81/pkgsrc/emacs.tgz
  http://mashin.nanoyo.net:81/pkgsrc/leim.tgz

These are intended as replacements for the existing editors/emacs and
editors/leim packages.  If replacement is the path to follow, other
packages may also require modification (see earlier message for hints
on how many others).