--- /usr/portage/x11-wm/icewm/icewm-1.2.37.ebuild	2009-03-07 08:05:06.000000000 -0300
+++ /alt/portage.local/x11-wm/icewm/icewm-1.2.37.ebuild	2009-07-05 13:36:05.000000000 -0300
@@ -11,14 +11,15 @@
 #fix for icewm preversion package names
 S=${WORKDIR}/${P/_}
 
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz
+	xdg? ( http://lostclus.linux.kiev.ua/scripts/icewm-xdg-menu )"
 
 LICENSE="GPL-2"
 SLOT="0"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="esd imlib nls spell truetype xinerama minimal debug uclibc"
+IUSE="esd imlib nls spell truetype xinerama minimal debug uclibc gnome xdg"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXrandr
@@ -33,7 +34,9 @@
 	imlib? ( >=media-libs/imlib-1.9.10-r1 )
 	nls? ( sys-devel/gettext )
 	truetype? ( >=media-libs/freetype-2.0.9 )
-	media-libs/giflib"
+	media-libs/giflib
+	gnome? ( gnome-base/gnome-desktop gnome-base/libgnomeui gnome-base/gnome-vfs:2 )
+	xdg? ( dev-python/pyxdg x11-misc/xdg-utils )"
 
 DEPEND="${RDEPEND}
 	x11-proto/xproto
@@ -55,6 +58,13 @@
 
 	use uclibc && epatch "${FILESDIR}/icewm-uclibc.patch"
 
+	cd "${S}"
+	epatch "${FILESDIR}/icewm-configure.patch"
+	epatch "${FILESDIR}/icewm-menu.patch"
+	epatch "${FILESDIR}/icewm-toolbar.patch"
+	epatch "${FILESDIR}/icewm-keys.patch"
+	epatch "${FILESDIR}/icewm-desktop.patch"
+
 	echo "#!/bin/sh" > "$T/icewm"
 	echo "/usr/bin/icewm-session" >> "$T/icewm"
 }
@@ -63,7 +73,7 @@
 
 	if use truetype
 	then
-		myconf="${myconf} --enable-gradients --enable-shape --enable-movesize-fx --enable-shaped-decorations"
+		myconf="${myconf} --enable-gradients --enable-antialiasing --enable-shape --enable-movesize-fx --enable-shaped-decorations"
 	else
 		myconf="${myconf} --disable-xfreetype --enable-corefonts
 			$(use_enable minimal lite)"
@@ -80,6 +90,7 @@
 		$(use_enable spell GtkSpell)
 		$(use_enable x86 x86-asm)
 		$(use_enable xinerama)
+		$(use_enable gnome menus-gnome2)
 		$(use_enable debug)"
 
 	CXXFLAGS="${CXXFLAGS}" econf ${myconf} || die "configure failed"
@@ -93,12 +104,18 @@
 src_install(){
 	emake DESTDIR="${D}" install || die "make install failed"
 
+	newman doc/icewm.1.man icewm.1
+
 	dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION
 	dohtml -a html,sgml doc/*
 
+	if use xdg; then
+		dobin "${DISTDIR}/icewm-xdg-menu"
+	fi
+
 	exeinto /etc/X11/Sessions
-	doexe "$T/icewm"
+	doexe "${T}/icewm"
 
 	insinto /usr/share/xsessions
-	doins "${FILESDIR}/IceWM.desktop"
+	doins lib/IceWM.desktop
 }