I just imported emacs22. I called it emacs22, because there is no reason to change it to "emacs". Some people will want emacs21, other emacs22.
The default package stays with the athena tk. I just added the gtk flavor, and the no_x11 flavor remains, of course. What emacs23 will be is not relevant. emacs-el stays a subpackage because it is really heavy and mostly useless. Eric.