[www-servers/apache] merged upstream
[app-admin/metalog] merged upstream