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 82A02138359 for ; Thu, 17 Sep 2020 23:04:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCA58E0821; Thu, 17 Sep 2020 23:04:06 +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 A06A0E0821 for ; Thu, 17 Sep 2020 23:04:06 +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 33BC3335C39 for ; Thu, 17 Sep 2020 23:04:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD5BD33A for ; Thu, 17 Sep 2020 23:04:03 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1600383837.c6dbc4964c08640dd3de343748cd8cc4145cb0d0.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/dvhtool/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild X-VCS-Directories: sys-boot/dvhtool/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: c6dbc4964c08640dd3de343748cd8cc4145cb0d0 X-VCS-Branch: master Date: Thu, 17 Sep 2020 23:04:03 +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: 608ab87d-67ab-4be9-8b37-0f589a82ed9e X-Archives-Hash: ef68fe9d84f04359d765f48ac27cda81 commit: c6dbc4964c08640dd3de343748cd8cc4145cb0d0 Author: Aaron Bauman gentoo org> AuthorDate: Thu Sep 17 22:46:40 2020 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Thu Sep 17 23:03:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6dbc496 sys-boot/dvhtool: port to EAPI=7 * Fix other various QA issues Closes: https://bugs.gentoo.org/742125 Signed-off-by: Aaron Bauman gentoo.org> sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild b/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild index 784aecf4b35..01c70dd3d89 100644 --- a/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild +++ b/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit autotools eutils toolchain-funcs +inherit autotools toolchain-funcs DESCRIPTION="Tool to copy kernel(s) into the volume header on SGI MIPS-based workstations" HOMEPAGE="http://packages.debian.org/unstable/utils/dvhtool" @@ -12,23 +12,27 @@ SRC_URI="mirror://debian/pool/main/d/dvhtool/dvhtool_1.0.1.orig.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~mips ~x86" + IUSE="" DEPEND="" RDEPEND="" S="${S}.orig" -src_prepare() { - # several applicable hunks from a debian patch - epatch "${FILESDIR}"/${P}-debian.diff +PATCHES=( + "${FILESDIR}/${P}-debian.diff" + "${FILESDIR}/${P}-debian-warn_type_guess.diff" + "${FILESDIR}/${P}-debian-xopen_source.diff" + "${FILESDIR}/${P}-add-raid-lvm-parttypes.patch" +) - # Newer minor patches from Debian - epatch "${FILESDIR}"/${P}-debian-warn_type_guess.diff - epatch "${FILESDIR}"/${P}-debian-xopen_source.diff +src_prepare() { + default - # Allow dvhtool to recognize Linux RAID and Linux LVM partitions - epatch "${FILESDIR}"/${P}-add-raid-lvm-parttypes.patch + # Fix automake warning + mv configure.{in,ac} || die + eapply_user eautoreconf }