Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/dvhtool/
Date: Thu, 17 Sep 2020 23:04:07
Message-Id: 1600383837.c6dbc4964c08640dd3de343748cd8cc4145cb0d0.bman@gentoo
1 commit: c6dbc4964c08640dd3de343748cd8cc4145cb0d0
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 17 22:46:40 2020 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 17 23:03:57 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6dbc496
7
8 sys-boot/dvhtool: port to EAPI=7
9
10 * Fix other various QA issues
11
12 Closes: https://bugs.gentoo.org/742125
13 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
14
15 sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild | 26 +++++++++++++++-----------
16 1 file changed, 15 insertions(+), 11 deletions(-)
17
18 diff --git a/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild b/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
19 index 784aecf4b35..01c70dd3d89 100644
20 --- a/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
21 +++ b/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
22 @@ -1,9 +1,9 @@
23 -# Copyright 1999-2014 Gentoo Foundation
24 +# Copyright 1999-2020 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 -EAPI=4
28 +EAPI=7
29
30 -inherit autotools eutils toolchain-funcs
31 +inherit autotools toolchain-funcs
32
33 DESCRIPTION="Tool to copy kernel(s) into the volume header on SGI MIPS-based workstations"
34 HOMEPAGE="http://packages.debian.org/unstable/utils/dvhtool"
35 @@ -12,23 +12,27 @@ SRC_URI="mirror://debian/pool/main/d/dvhtool/dvhtool_1.0.1.orig.tar.gz"
36 LICENSE="GPL-2"
37 SLOT="0"
38 KEYWORDS="~amd64 ~mips ~x86"
39 +
40 IUSE=""
41 DEPEND=""
42 RDEPEND=""
43
44 S="${S}.orig"
45
46 -src_prepare() {
47 - # several applicable hunks from a debian patch
48 - epatch "${FILESDIR}"/${P}-debian.diff
49 +PATCHES=(
50 + "${FILESDIR}/${P}-debian.diff"
51 + "${FILESDIR}/${P}-debian-warn_type_guess.diff"
52 + "${FILESDIR}/${P}-debian-xopen_source.diff"
53 + "${FILESDIR}/${P}-add-raid-lvm-parttypes.patch"
54 +)
55
56 - # Newer minor patches from Debian
57 - epatch "${FILESDIR}"/${P}-debian-warn_type_guess.diff
58 - epatch "${FILESDIR}"/${P}-debian-xopen_source.diff
59 +src_prepare() {
60 + default
61
62 - # Allow dvhtool to recognize Linux RAID and Linux LVM partitions
63 - epatch "${FILESDIR}"/${P}-add-raid-lvm-parttypes.patch
64 + # Fix automake warning
65 + mv configure.{in,ac} || die
66
67 + eapply_user
68 eautoreconf
69 }