I did the best I could guess with this updated patch series.
If I missed something you addressed already, please point it
out in a format which is more friendly to read than a mono-patch.

If this series is alright I want to sort the inputs of the
longest packages with the version which is then good to go.

Thanks for taking the time to review!
-- 
ng0
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://n0is.noblogs.org/my-keys
https://www.infotropique.org https://krosos.org