devel/geany: Update to 2.1
Geany now includes theme files, so remove the options to depend in devel/geany-themse and add conflict