Merge pull request #1 from bor/master

try to fix bugs like #355619 & update copyright years in ebuild