dev-util/kbuild: live ebuild improvements

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild
index 5df4852ffb28e89156444afac72ec75ef02136a8..ccbf4507612e1dfdef8b2c5e1319c83407e9cc90 100644 (file)
--- a/dev-util/kbuild/kbuild-9999.ebuild
+++ b/dev-util/kbuild/kbuild-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-WANT_AUTOMAKE=1.9
-
-inherit autotools eutils subversion
+inherit autotools subversion
 
 DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
 HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
@@ -23,24 +21,29 @@ RDEPEND=""
 S="${WORKDIR}/${MY_P/-src}"
 
 src_prepare() {
-               default
-               rm -rf "${S}/kBuild/bin" || die
+       default
+       rm -rf "${S}/kBuild/bin" || die
+
+       # bootstrapping breaks because of missing po/Makefile.in.in
+       sed '/^AC_CONFIG_FILES/s@ po/Makefile\.in@@' \
+               -i src/kmk/configure.ac || die
 
-               cd "${S}/src/kmk" || die
-               eautoreconf
-               cd "${S}/src/sed" || die
-               eautoreconf
+       cd "${S}/src/kmk" || die
+       eautoreconf
+       cd "${S}/src/sed" || die
+       eautoreconf
 }
 
 src_compile() {
-               kBuild/env.sh --full \
-               make -f bootstrap.gmk AUTORECONF=true \
+       kBuild/env.sh --full \
+               emake -f bootstrap.gmk AUTORECONF=true \
                || die "bootstrap failed"
 }
 
 src_install() {
-               kBuild/env.sh kmk \
+       kBuild/env.sh kmk \
                NIX_INSTALL_DIR=/usr \
                PATH_INS="${D}" \
-               install || die "install failed"
+               install \
+               || die "install failed"
 }