diff --git a/dev-libs/liblist/liblist-2.1-r1.ebuild b/dev-libs/liblist/liblist-9999.ebuild
copy from dev-libs/liblist/liblist-2.1-r1.ebuild
copy to dev-libs/liblist/liblist-9999.ebuild
--- a/dev-libs/liblist/liblist-2.1-r1.ebuild
+++ b/dev-libs/liblist/liblist-9999.ebuild
@@ -2,54 +2,56 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/liblist/liblist-2.1-r1.ebuild,v 1.1 2009/12/05 22:32:30 nerdboy Exp $
 
-inherit eutils toolchain-funcs
+EAPI="2"
+
+inherit eutils mercurial toolchain-funcs
 
 DESCRIPTION="This package provides generic linked-list manipulation routines, plus queues and stacks."
-HOMEPAGE="http://www.gentoogeek.org/viewvc/C/liblist/"
-SRC_URI="http://www.gentoogeek.org/files/${P}.tar.gz"
+HOMEPAGE="http://ohnopub.net/hg/liblist/-unbased"
+SRC_URI=""
+EHG_REPO_URI="http://ohnopub.net/hg/liblist-unbased"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS=""
 IUSE="doc examples"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+S=${WORKDIR}/${PN}-unbased
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sharedlib.patch
 	sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" Makefile \
-	    examples/cache/Makefile || die "sed 1 failed"
-	epatch "${FILESDIR}"/${P}-sharedlib.patch
+		examples/cache/Makefile || die "sed 1 failed"
 }
 
 src_compile() {
 	make CC="$(tc-getCC)" LD="$(tc-getCC)" \
-	    || die "make failed"
+		|| die "make failed"
 }
 
 src_install() {
-	newman list.3 llist.3
-	newman stack.man lstack.3
-	newman queue.man lqueue.3
-	dolib.a ${PN}.a
-	dolib.so ${PN}.so*
+	newman list.3 llist.3 || die
+	newman stack.3 lstack.3 || die
+	newman queue.3 lqueue.3 || die
+	dolib.a ${PN}.a || die
+	dolib.so ${PN}.so* || die
 	insinto /usr/include
-	doins list.h queue.h stack.h
-	dodoc README
+	doins list.h queue.h stack.h || die
+	dodoc README || die
 
 	if use examples; then
-	    dolib.a examples/cache/libcache.a
-	    dobin examples/cache/cachetest
-	    newman cache.3 lcache.3
-	    insinto /usr/share/doc/${P}/examples
-	    doins examples/{*.c,Makefile,README}
-	    insinto /usr/share/doc/${P}/examples/cache
-	    doins examples/cache/{*.c,Makefile,README}
-	    doins
+		dolib.a examples/cache/libcache.a || die
+		dobin examples/cache/cachetest || die
+		newman cache.3 lcache.3 || die
+		insinto /usr/share/doc/${P}/examples
+		doins examples/{*.c,Makefile,README} || die
+		insinto /usr/share/doc/${P}/examples/cache
+		doins examples/cache/{*.c,Makefile,README} || die
 	fi
 
 	if use doc; then
-	    insinto /usr/share/doc/${P}
-	    doins paper/paper.ps
+		insinto /usr/share/doc/${P}
+		doins paper/paper.ps || die
 	fi
 }