xf86-input-wacom-0.36.0 was released last month. It contains a bug fix for Cintiq 22HD.
x11-drivers/xf86-input-wacom-0.36.0 is in the tree already, please sync.