Well, my plan was:

leave the installed default stuff in place, i.e. don't necessarily mess with the non-free stuff,

compile all needed free parts and install them in parallel with http://kumatux.org/

This allows you to have a number of versions of the same tools for instance installed in parallel without the system being messed up...