Few modifications and upgrades
Added the upgraded ebuilds