Add upstream links for tracking
Move gentoo specifics downwards