portage-2.3.6-r1: simplify ebuild, patch by Arfrever