sync ebuild updates

merged:

  cbl: 6cf69e94472c3983c187d78139b6abfb7c98abf1
  cb-ports: d707cfceebb87903dc1cb32f2a6b6ae34b6b746f