dev-php/hhvm{-pgsql}: update for master again