--- /usr/portage/dev-tcltk/itcl/itcl-3.3-r1.ebuild	2006-05-24 22:40:45.000000000 +0200
+++ itcl-9999.ebuild	2008-02-20 17:51:40.000000000 +0100
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-3.3-r1.ebuild,v 1.6 2006/05/24 20:15:44 hansmi Exp $
 
-inherit eutils
+inherit autotools cvs eutils
 
-MY_P="${PN}${PV}"
+MY_P="${PN}"
 DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
 HOMEPAGE="http://incrtcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/incrtcl/${MY_P}.tar.gz"
+SRC_URI=""
 
 IUSE=""
 SLOT="0"
@@ -16,13 +16,20 @@ KEYWORDS="alpha amd64 ia64 ppc sparc x86
 
 DEPEND="dev-lang/tcl"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/incrTcl"
 
 src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s/relid'/relid/" configure tclconfig/tcl.m4 || die
+	ECVS_SERVER="incrtcl.cvs.sourceforge.net:/cvsroot/incrtcl"
+	ECVS_USER="anonymous"
+	ECVS_PASS=""
+	ECVS_AUTH="pserver"
+	ECVS_MODULE="incrTcl"
+	ECVS_TOP_DIR="${DISTDIR}/cvs-src/${ECVS_MODULE}"
+	cvs_src_unpack
+	cd ${S}
+	sed -i -e "s/relid'/relid/" configure || die
+	eaclocal
+	eautoconf
 }
 
 src_compile() {