Attaching a patch.
Created attachment 74449 [details, diff] hb-portage-diverttree.xml.diff This is mostly cosmetic...
Fixed.