KeyArcher: integrate changes from svn 97214

https://trac.macports.org/changeset/97214