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 93C8E139368 for ; Fri, 13 Aug 2021 13:22:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CC4DE0827; Fri, 13 Aug 2021 13:22:57 +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 4F051E0827 for ; Fri, 13 Aug 2021 13:22:57 +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 05CCD342A71 for ; Fri, 13 Aug 2021 13:22:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98DE37DC for ; Fri, 13 Aug 2021 13:22:54 +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: <1628860956.5640462aca8e127a04d6cf13696b83c16bc0a763.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/memtest86+/memtest86+-5.31b.ebuild X-VCS-Directories: sys-apps/memtest86+/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 5640462aca8e127a04d6cf13696b83c16bc0a763 X-VCS-Branch: master Date: Fri, 13 Aug 2021 13:22:54 +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: 7b6370f5-9e81-4780-94ac-a0a01a846d7a X-Archives-Hash: 7c885da8c4d988f11199cd21580b5d29 commit: 5640462aca8e127a04d6cf13696b83c16bc0a763 Author: Lars Wendler gentoo org> AuthorDate: Fri Aug 13 13:21:46 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Aug 13 13:22:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5640462a sys-apps/memtest86+: update EAPI 6 -> 7 Minor ebuild tweaks Signed-off-by: Lars Wendler gentoo.org> sys-apps/memtest86+/memtest86+-5.31b.ebuild | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sys-apps/memtest86+/memtest86+-5.31b.ebuild b/sys-apps/memtest86+/memtest86+-5.31b.ebuild index 5e14a51127a..8397e450b0d 100644 --- a/sys-apps/memtest86+/memtest86+-5.31b.ebuild +++ b/sys-apps/memtest86+/memtest86+-5.31b.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit mount-boot eutils toolchain-funcs @@ -19,7 +19,8 @@ QA_PRESTRIPPED="${BOOTDIR}/memtest /usr/share/${PN}/memtest" QA_FLAGS_IGNORED="${BOOTDIR}/memtest /usr/share/${PN}/memtest" RDEPEND="floppy? ( sys-fs/mtools )" -DEPEND="iso? ( app-cdr/cdrtools )" +DEPEND="${RDEPEND}" +BDEPEND="iso? ( app-cdr/cdrtools )" PATCHES=( "${FILESDIR}/${P}-gcc-473.patch" @@ -38,10 +39,8 @@ src_prepare() { sed -i 's:genisoimage:mkisofs:' makeiso.sh || die if use serial ; then - sed -i \ - -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \ - config.h \ - || die "sed failed" + sed -i -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \ + config.h || die "sed failed" fi default } @@ -61,7 +60,7 @@ src_compile() { src_test() { :; } src_install() { - if use boot; then + if use boot ; then insinto "${BOOTDIR}" doins memtest memtest.bin fi