--- workrave-1.8.4.ebuild	2007-07-12 05:35:38.000000000 +0200
+++ workrave-1.8.5.ebuild	2008-05-07 11:11:52.000000000 +0200
@@ -4,11 +4,11 @@
 
 inherit eutils gnome2
 
 DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
 HOMEPAGE="http://workrave.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-2.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="arts dbus distribution gnome kde nls xml"
@@ -30,51 +30,43 @@
 		>=sys-apps/dbus-0.92
 		dev-libs/dbus-glib )
 	xml? ( dev-libs/gdome2 )
 	kde? (
 		=x11-libs/qt-3*
-		kde-base/kdelibs )
+		=kde-base/kdelibs-3* )
 	arts? ( kde-base/arts )
-
 	x11-libs/libX11
-	x11-libs/libXt
 	x11-libs/libXmu"
 
 DEPEND="${RDEPEND}
+	x11-libs/libXt
 	x11-proto/xproto
 	x11-proto/inputproto
 	x11-proto/recordproto
-
 	nls? ( sys-devel/gettext )
 	>=dev-util/pkgconfig-0.9"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 DOCS="AUTHORS NEWS README TODO"
 
 pkg_setup() {
-	G2CONF="--enable-gconf \
-		$(use_enable dbus)          \
-		$(use_enable distribution)  \
-		$(use_enable gnome)         \
-		$(use_enable gnome gnomemm) \
-		$(use_enable kde)           \
-		$(use_enable nls)           \
-		$(use_enable xml)           \
+	G2CONF="--enable-gconf
+		$(use_enable dbus)
+		$(use_enable distribution)
+		$(use_enable gnome)
+		$(use_enable gnome gnomemm)
+		$(use_enable kde)
+		$(use_enable nls)
+		$(use_enable xml)
 		$(use_with arts)"
 }
 
 src_unpack() {
 	gnome2_src_unpack
-
-	# Removes a few broken macros. See bug #86939.
-	epatch "${FILESDIR}/${P}-nls_macros.patch"
-
-	# Fix compilation with USE=-gnome
-	epatch "${FILESDIR}/${P}-no_gnome.patch"
-
-	# File missing from the tarball
-	cp "${FILESDIR}"/org.workrave.Workrave.service.in ${S}/backend/src
+	epatch "${FILESDIR}/${PN}-1.8.4-nls_macros.patch" \
+		"${FILESDIR}/${P}-gcc43.patch" \
+		"${FILESDIR}/${P}-libsigc++-2.2.2.patch"
 }
 
 src_compile() {
 	if use kde; then
 		addwrite "/usr/qt/3/etc/settings"