I dropped x86-fbsd from dev-java/commons-fileupload-1.2.1 because now it depends on servlet-api-2.4 (previously servlet-api-2.3) which is not keyworded x86-fbsd. Please re-add this keyword to the ebuild and servlet-api-2.4. Thank you.
seems -r1 is keyworded and servlet-api 2.5 too -> fixed