distro-import leaves an unnaturally curtailed entire
The distro-importer generates entire based on all the consolidations listed in its inputs (either IPS or SVR4). Because OI isn't building every consolidation, the entire it creates will be forshortened, and not suitably constrain the unbuilt consolidations.
I suspect what should be done is that for every consolidation OI is not building, an entry should be added to distro-import/Makefile matching those for the consolidations delivering IPS packages natively, such that the importer treats them correctly in entire, etc.
An example, totally untested, is attached. You would follow the same pattern for all the other non-built consolidations, so REF_URIS ended up matching that from pkg-gate again. You should verify this actually works, of course...