--- /usr/portage/tree/mail-client/balsa/balsa-2.5.2-r1.ebuild	2016-11-27 06:20:18.000000000 -0500
+++ /usr/local/portage/mail-client/balsa/balsa-2.5.3.ebuild	2016-12-11 17:35:36.000000000 -0500
@@ -20,8 +20,8 @@
 
 # TODO: esmtp can be optional, do we want it?
 RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.4.0:3
+	>=dev-libs/glib-2.40:2
+	>=x11-libs/gtk+-3.10.0:3
 	dev-libs/gmime:2.6
 	>=net-libs/libesmtp-1.0.3:=
 	net-mail/mailbase
@@ -57,10 +57,10 @@
 	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
 
 	# https://bugzilla.gnome.org/show_bug.cgi?id=750516
-	sed -i -e 's/@TOOLKIT_CATEGORIES@//' balsa-mailto-handler.desktop.in.in || die
+#	sed -i -e 's/@TOOLKIT_CATEGORIES@//' balsa-mailto-handler.desktop.in.in || die
 
 	# https://bugzilla.gnome.org/show_bug.cgi?id=750515
-	echo "src/balsa-print-object.c" >> po/POTFILES.in || die
+#	echo "src/balsa-print-object.c" >> po/POTFILES.in || die
 
 	gnome2_src_prepare
 }
@@ -84,6 +84,9 @@
 		myconf+=" --with-html-widget=no"
 	fi
 
+	# the osmo requirement needs a use flag, but the required version
+	# is not yet in portage, so I make it look, but it should fail unless
+	# it has been manually installed
 	gnome2_src_configure \
 		--disable-pcre \
 		--enable-gregex \
@@ -97,6 +100,7 @@
 		$(use_with kerberos gss) \
 		$(use_with ldap) \
 		$(use_with libnotify) \
+		--with-osmo \
 		$(use_with rubrica) \
 		$(use_with sqlite) \
 		$(use_with ssl) \