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 16E5313997D for ; Wed, 13 Nov 2019 06:53:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4055FE08D0; Wed, 13 Nov 2019 06:53:32 +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 85B45E08CD for ; Wed, 13 Nov 2019 06:53:31 +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 27E5E34CD23 for ; Wed, 13 Nov 2019 06:53:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B101D8AE for ; Wed, 13 Nov 2019 06:53:27 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1573627994.fb58e8da0267a7e72ffdcf20b2ba48c92ea1b2d6.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/aboot/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild X-VCS-Directories: sys-boot/aboot/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: fb58e8da0267a7e72ffdcf20b2ba48c92ea1b2d6 X-VCS-Branch: master Date: Wed, 13 Nov 2019 06:53:27 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 722d6ea7-0be2-49bb-9fb8-c919ba4d1d80 X-Archives-Hash: 93f978b3e3aa42086fa86ebbbd417362 commit: fb58e8da0267a7e72ffdcf20b2ba48c92ea1b2d6 Author: Matt Turner gentoo org> AuthorDate: Wed Nov 13 06:51:25 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Nov 13 06:53:14 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb58e8da sys-boot/aboot: Port to EAPI=7 Closes: https://bugs.gentoo.org/697182 Signed-off-by: Matt Turner gentoo.org> sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild index d6c38443b2c..cba6251a37a 100644 --- a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild +++ b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=0 +EAPI=7 inherit eutils toolchain-funcs @@ -30,18 +30,20 @@ src_unpack() { cd "${S}"/include ln -s asm-alpha asm || die touch linux/config.h || die - cd "${S}" - epatch "${FILESDIR}/aboot-gcc-3.4.patch" - epatch "${FILESDIR}/aboot-pt_note.patch" +} + +src_prepare() { + eapply "${FILESDIR}/aboot-gcc-3.4.patch" + eapply "${FILESDIR}/aboot-pt_note.patch" # Bug 364697 - epatch "${FILESDIR}/aboot-define_stat_only_in_userspace.patch" - epatch "${FILESDIR}"/aboot-respect-AR.patch - epatch "${FILESDIR}"/aboot-gnu90.patch + eapply "${FILESDIR}/aboot-define_stat_only_in_userspace.patch" + eapply "${FILESDIR}"/aboot-respect-AR.patch + eapply "${FILESDIR}"/aboot-gnu90.patch # Modified patch from Debian to add netboot support - epatch "${WORKDIR}"/aboot_gentoo.diff + eapply "${WORKDIR}"/aboot_gentoo.diff - epatch_user + eapply_user } src_compile() {