From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6F77A138334 for ; Wed, 21 Nov 2018 14:22:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B4D7E08B0; Wed, 21 Nov 2018 14:22:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44FC4E08B0 for ; Wed, 21 Nov 2018 14:22:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D71F4335C7F for ; Wed, 21 Nov 2018 14:22:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8928F463 for ; Wed, 21 Nov 2018 14:22:20 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1542810135.7f0e99251be74d712e9a8bb8cc04341cfc04c887.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/kbuild/kbuild-9999.ebuild X-VCS-Directories: dev-util/kbuild/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 7f0e99251be74d712e9a8bb8cc04341cfc04c887 X-VCS-Branch: master Date: Wed, 21 Nov 2018 14:22:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4cc15248-ae69-4cb2-804f-2c21501395ef X-Archives-Hash: 4743b466b9fcdd14c8deb7b75b1543ea commit: 7f0e99251be74d712e9a8bb8cc04341cfc04c887 Author: Lars Wendler gentoo org> AuthorDate: Wed Nov 21 14:22:03 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Nov 21 14:22:15 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f0e9925 dev-util/kbuild: live ebuild improvements Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> dev-util/kbuild/kbuild-9999.ebuild | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild index 5df4852ffb2..ccbf4507612 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" }