After discussion, the compat @pkgpath entries shall not be deleted. I don't think that's really a problem for just testing this update, though. I'll submit another diff soon.
Ciao, -- Jérémie Courrèges-Anglas GPG Key fingerprint: 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494