summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-03-22 03:00:23 +0000
committerSam James <sam@gentoo.org>2021-03-22 03:29:53 +0000
commit8f6a3e1753874b736ba0838f5b25526f4caec094 (patch)
tree2b421be8cdf6a6380cb0a2cc7a666ecb0ad3b30e /dev-util/wiggle
parentnet-analyzer/nagios-plugins-2.3.3: version bump (diff)
downloadgentoo-8f6a3e1753874b736ba0838f5b25526f4caec094.tar.gz
gentoo-8f6a3e1753874b736ba0838f5b25526f4caec094.tar.bz2
gentoo-8f6a3e1753874b736ba0838f5b25526f4caec094.zip
dev-util/wiggle: port to EAPI 7
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util/wiggle')
-rw-r--r--dev-util/wiggle/wiggle-0.9-r1.ebuild16
-rw-r--r--dev-util/wiggle/wiggle-1.0.ebuild12
2 files changed, 17 insertions, 11 deletions
diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild
index d21acc98e25b..64d1a7ad863f 100644
--- a/dev-util/wiggle/wiggle-0.9-r1.ebuild
+++ b/dev-util/wiggle/wiggle-0.9-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit eutils fixheadtails flag-o-matic toolchain-funcs
+inherit fixheadtails flag-o-matic toolchain-funcs
DESCRIPTION="tool for applying patches that patch cannot apply because of conflicting changes"
HOMEPAGE="https://neil.brown.name/wiggle https://neil.brown.name/git?p=wiggle"
@@ -30,12 +30,16 @@ RDEPEND="
sys-apps/coreutils
sys-devel/patch
sys-libs/ncurses:0=
- "
-DEPEND="${RDEPEND}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-apps/groff
- test? ( sys-process/time )"
+ test? ( sys-process/time )
+"
src_prepare() {
+ default
+
# Fix the reference to the help file so `p help' works
sed -i "s:\$0.help:${EPREFIX}/usr/share/wiggle/p.help:" p || die "sed failed on p"
diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 2ae059f746e4..7aeb69528db8 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-1.0.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 fixheadtails toolchain-funcs
@@ -30,11 +30,13 @@ RDEPEND="
sys-apps/coreutils
sys-devel/patch
sys-libs/ncurses:0=
- "
-DEPEND="${RDEPEND}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-apps/groff
virtual/pkgconfig
- test? ( sys-process/time )"
+ test? ( sys-process/time )
+"
PATCHES=( "${FILESDIR}"/${P}-cflags.patch )