It looks good, thanks for working on this, and for listening to my nitpicking on IRC. If it successfully builds in a sandbox and the remaining pkglint problems are fixed I think this is ready for commit.