commit: c6dbc4964c08640dd3de343748cd8cc4145cb0d0 Author: Aaron Bauman <bman <AT> gentoo <DOT> org> AuthorDate: Thu Sep 17 22:46:40 2020 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> 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 <bman <AT> 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 }
