From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 24 Dec 2018 14:11:38 +0000
Subject: gentoo resync : 24.12.2018

---
 dev-util/kbuild/Manifest           |  2 +-
 dev-util/kbuild/kbuild-9999.ebuild | 31 +++++++++++++++++--------------
 2 files changed, 18 insertions(+), 15 deletions(-)

(limited to 'dev-util/kbuild')

diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 657afc98096e..41191b06de94 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -5,5 +5,5 @@ AUX kbuild-0.1.9998_pre20171020-gold.patch 619 BLAKE2B e4bab6276b521752a60b94ae7
 AUX kbuild-unknown-configure-opt.patch 355 BLAKE2B 78c170c4d34d76a07925c08580245afef9859281c3d59cec1e675f19a2c3a86e9936773c62c78197d4d150ba8afd70ed7f100bcfa9fab950462224088d7aa2fa SHA512 26ae63facf7133be4fba606ad0b9488ea4c2ad2290a1e33a0f0c3283e0c8267eaae41bde6efaa52895b444178ec101a800ad580d2d85d0e69c56dc7db32b1105
 DIST kbuild-0.1.9998.3149-src.tar.xz 2314792 BLAKE2B 84aa1dbbaefc64a3ecc954c383d0516d88efd1a1791180164dd7bc3b26cd82a4a8c35c4b308e9fc960f114c40e77ea4a27acd94b62883c379acefb324a7c3f72 SHA512 74808e6279c01739170535655edbbffb73809f60b18c7ee63a110af7af651628789b9e5d253821f5685f8e8c072890c4669493e64886f53587b810ea0f67826c
 EBUILD kbuild-0.1.9998.3149.ebuild 1792 BLAKE2B ffd6f02476b9f7a160e670b9d2d1af31a33803a2c26c2b6881c22f485c295c3e39ac4436b1f610faca4878326fa46f49231a21469e6a0d3eb8f6d1288ab83905 SHA512 01b1a7205a2066808642a61ab5ec067a99f3c631e75a715b434f92ce2e86bff8d0cf23a27236330c31e9bab751bde7c735177736ecc66b6a916994cb2287c351
-EBUILD kbuild-9999.ebuild 866 BLAKE2B c14fc7ecf01de63d6812800b52cd61607826a5c52efd11387b818af1c88c2d88c72992fe49490c4cd549b06d75b3487167669bdcba382d32ef3cfda756b61965 SHA512 eed52912df838735e25196dc2b836b7af459dcdd68338c8501c16dd534050c6650f9d973a41d694862d189d0a30ce12ebedf9793f3a5ddde3d9304d7bc78c999
+EBUILD kbuild-9999.ebuild 977 BLAKE2B 75187d2839087938c7da5e1f134f78040bcde9714957cff4b5ab90574f9b2164f9bce48e34a6b310afa2f03095d200f80320015350cc02e2fc935d09fbd34445 SHA512 bdf1b80acbc2a936aad71d5971410390f2ce5129d8110b0ac40528a1b8ff3c53fde6f02f664d773ce99afee41c0b057b04f6c71e6e07efafcbf99f533067ebcc
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild
index 5df4852ffb28..ccbf4507612e 100644
--- 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"
 }
-- 
cgit v1.2.3