--- fluxbox-1.3.5.ebuild	2015-01-12 03:01:20.000000000 -0800
+++ fluxbox-1.3.5-fixed.ebuild	2015-01-22 12:25:54.965989153 -0800
@@ -46,6 +46,7 @@
 	eprefixify util/fluxbox-generate_menu.in
 
 	epatch "${FILESDIR}"/osx-has-otool.patch
+	epatch "${FILESDIR}"/fluxbox-generate_menu-printf-fix.patch
 
 	# Add in the Gentoo -r number to fluxbox -version output.
 	if [[ "${PR}" == "r0" ]] ; then
@@ -67,6 +68,7 @@
 		$(use_enable nls) \
 		$(use_enable slit ) \
 		$(use_enable toolbar ) \
+		$(use_enable toolbar systray ) \
 		$(use_enable truetype xft) \
 		$(use_enable xinerama) \
 		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
@@ -78,31 +80,32 @@
 
 	ebegin "Creating a menu file (may take a while)"
 	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
+	# Call fluxbox-generate_menu through bash since it lacks +x
+	# chmod 744 may be an equal fix
 	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
 		CHECKINIT="no. go away." HOME="${T}/home" \
-		"${S}/util/fluxbox-generate_menu" -is -ds \
+		bash "${S}/util/fluxbox-generate_menu" -is -ds \
 		|| die "menu generation failed"
 	eend $?
 }
 
 src_install() {
-	dodir /usr/share/fluxbox
 	emake DESTDIR="${D}" STRIP="" install
 	dodoc README* AUTHORS TODO* ChangeLog NEWS
 
-	dodir /usr/share/xsessions
+	# Install the generated menu
+	insinto /usr/share/fluxbox
+	doins data/menu
+
 	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
+	doins "${FILESDIR}"/${PN}.desktop
 
 	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}/${PN}.xsession" fluxbox
-
-	dodir /usr/share/fluxbox/menu.d
+	newexe "${FILESDIR}"/${PN}.xsession fluxbox
 
 	# Styles menu framework
-	dodir /usr/share/fluxbox/menu.d/styles
 	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}/styles-menu-fluxbox"
-	doins "${FILESDIR}/styles-menu-commonbox"
-	doins "${FILESDIR}/styles-menu-user"
+	doins "${FILESDIR}"/styles-menu-fluxbox
+	doins "${FILESDIR}"/styles-menu-commonbox
+	doins "${FILESDIR}"/styles-menu-user
 }