--- /usr/portage/sci-electronics/gtkwave/gtkwave-3.1.9.ebuild	2008-04-23 10:34:09.000000000 +0200
+++ ./gtkwave-3.2.0_rc3.ebuild	2009-01-13 08:22:35.000000000 +0100
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/gtkwave-3.1.9.ebuild,v 1.1 2008/04/23 08:34:09 calchan Exp $
 
-DOC_VERSION="3.1.5"
 DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
-HOMEPAGE="http://home.nc.rr.com/gtkwave/"
-SRC_URI="http://home.nc.rr.com/gtkwave/${P}.tar.gz
-	doc? ( http://home.nc.rr.com/gtkwave/${PN}-doc-${DOC_VERSION}.tar.gz )"
+HOMEPAGE="http://gtkwave.sourceforge.net/"
+MY_PV=${PV/_rc/RC}
+
+SRC_URI="http://downloads.sourceforge.net/gtkwave/${PN}-${MY_PV}.tar.gz"
 
 IUSE="doc examples"
 LICENSE="GPL-2 MIT"
@@ -21,12 +21,14 @@
 	dev-util/pkgconfig
 	dev-util/gperf"
 
+S="${WORKDIR}/${PN}-${MY_PV}"
+
 src_install() {
 	emake DESTDIR="${D}" install || die "Installation failed"
 	dodoc ANALOG_README.TXT CHANGELOG.TXT
 	if use doc ; then
 		insinto /usr/share/doc/${PF}
-		doins "${WORKDIR}/${PN}.pdf" || die "Failed to install documentation."
+		doins "doc/${PN}.odt" || die "Failed to install documentation."
 	fi
 	if use examples ; then
 		insinto /usr/share/doc/${PF}