As per summary.
Created attachment 19609 [details, diff] Renewed patch 0127 to work with current sources As per description.
Thanks, I neglected to check all the different USE combinations. Fixed in CVS. Changing to normal since there's an easy workaround.