Fix make.conf location
Merge branch 'hotfix/fix-make.conf-location'
Apply udept.default-use.patch from https://bugs.gentoo.org/show_bug.cgi?id=172611#c9
Merge branch 'hotfix/udept.default-use.patch'
Apply udept.svn-1638.patch from https://bugs.gentoo.org/show_bug.cgi?id=172611#c10
Merge branch 'hotfix/udept.svn-1638.patch'
Fix make.conf location
Merge branch 'hotfix/new-fix-make.conf-location'