--- gnome-applets-2.32.0.ebuild	2010-11-01 22:10:20.000000000 -0400
+++ gnome-applets-2.32.0-r1.ebuild	2010-11-13 01:29:19.391816905 -0500
@@ -6,7 +6,7 @@ EAPI="3"
 GCONF_DEBUG="no"
 PYTHON_DEPEND="2:2.4"
 
-inherit eutils gnome2 python
+inherit autotools eutils gnome2 python
 
 DESCRIPTION="Applets for the GNOME Desktop and Panel"
 HOMEPAGE="http://www.gnome.org/"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="battstat gnome gstreamer hal ipv6 networkmanager policykit"
+IUSE="battstat gnome gstreamer hal ipv6 networkmanager policykit +bonobo"
 
 # TODO: configure says python stuff is optional
 HALDEPEND=" hal? ( >=sys-apps/hal-0.5.3 ) "
@@ -52,7 +52,8 @@ RDEPEND=">=x11-libs/gtk+-2.20:2
 			>=media-plugins/gst-plugins-alsa-0.10.14
 			>=media-plugins/gst-plugins-oss-0.10.14 ) )
 	networkmanager? ( >=net-misc/networkmanager-0.7.0 )
-	policykit? ( >=sys-auth/polkit-0.92 )"
+	policykit? ( >=sys-auth/polkit-0.92 )
+	bonobo? ( >=gnome-base/gnome-panel-2.31.2[bonobo] )"
 
 DEPEND="${RDEPEND}
 	>=app-text/scrollkeeper-0.1.4
@@ -70,7 +71,8 @@ pkg_setup() {
 		$(use_enable gstreamer mixer-applet)
 		$(use_enable ipv6)
 		$(use_enable networkmanager)
-		$(use_enable policykit polkit)"
+		$(use_enable policykit polkit)
+		$(use_enable bonobo null-applet)"
 
 	if use battstat; then
 		G2CONF="${G2CONF} $(use_with hal)"
@@ -93,6 +95,10 @@ src_prepare() {
 		invest-applet/invest/Makefile.in || die "disabling invest tests failed"
 
 	python_convert_shebangs -r 2 .
+
+	# Optional Null Applet
+	epatch "${FILESDIR}/${PN}-2.32.0-optional-null-applet.patch"
+	eautoreconf
 }
 
 src_test() {