--- /usr/portage/dev-util/kbuild/kbuild-0.1.5-r1.ebuild	2009-11-09 13:09:14.000000000 +0000
+++ overlay/dev-util/kbuild/kbuild-0.1.5-r1.ebuild	2010-04-26 17:37:05.349157965 +0100
@@ -1,51 +1,37 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/kbuild-0.1.5-r1.ebuild,v 1.5 2009/11/09 13:06:05 maekke Exp $
+# $Header: $
 
 EAPI=2
 
-WANT_AUTOMAKE=1.9
+inherit eutils
 
-inherit eutils autotools
-
-MY_P=kBuild-${PV}-src-20090221
+MY_P=kBuild-${PV}-p2-src
 DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
 HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
-SRC_URI="http://gentoo.zerodev.it/files/${MY_P}.tar.bz2"
+SRC_URI="ftp://ftp.netlabs.org/pub/kbuild/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="dev-util/cvs
-	dev-util/subversion
-	sys-devel/gettext"
-RDEPEND=""
+DEPEND=""
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P/-src-20090221}
+S=${WORKDIR}/${MY_P/-src}
 
 src_prepare() {
-		rm -rf "${S}/kBuild/bin"
-
-		cd "${S}/src/kmk"
-		eautoreconf
-		cd "${S}/src/sed"
-		eautoreconf
-		cd "${S}"
-		epatch "${FILESDIR}/${PN}-unknown-configure-opt.patch"
-		epatch "${FILESDIR}/${PN}-glibc-2.10.patch"
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-glibc-2.10.patch
 }
 
 src_compile() {
-		kBuild/env.sh --full \
-		make -f bootstrap.gmk AUTORECONF=true \
-		|| die "bootstrap failed"
+	kBuild/env.sh --full make -f bootstrap.gmk \
+	|| die "bootstrap failed"
 }
 
 src_install() {
-		kBuild/env.sh kmk \
-		NIX_INSTALL_DIR=/usr \
-		PATH_INS="${D}" \
-		install || die "install failed"
+	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
+	|| die "install failed"
 }