Bump to EAPI=6

6 files changed, 11 insertions, 27 deletions

diff --git a/dev-util/ccache/ccache-99999999-r3.ebuild b/dev-util/ccache/ccache-99999999.ebuild
index 0d9fed91..e4fbbe38 100644
--- a/dev-util/ccache/ccache-99999999-r3.ebuild
+++ b/dev-util/ccache/ccache-99999999.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-
+EAPI=6
 WANT_LIBTOOL=none
+EGIT_MIN_CLONE_TYPE=single
 EGIT_REPO_URI="git://git.samba.org/ccache.git"
-inherit autotools eutils git-r3 readme.gentoo
+inherit autotools git-r3 readme.gentoo
 
 DESCRIPTION="fast compiler cache"
 HOMEPAGE="http://ccache.samba.org/"
@@ -25,12 +25,11 @@ RDEPEND="${DEPEND}
 src_prepare() {
 	# make sure we always use system zlib
 	rm -rf zlib || die
-	epatch "${FILESDIR}"/${PN}-3.1.7-no-perl.patch #421609
-	epatch "${FILESDIR}"/${PN}-3.1.10-size-on-disk.patch #456178
+	eapply "${FILESDIR}"/${PN}-3.1.10-size-on-disk.patch #456178
 	sed \
 		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
 		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-	epatch_user
+	eapply_user
 	eautoreconf
 }
 
diff --git a/dev-util/ccache/files/ccache-3.1.7-no-perl.patch b/dev-util/ccache/files/ccache-3.1.7-no-perl.patch
deleted file mode 100644
index 5abd15e1..00000000
--- a/dev-util/ccache/files/ccache-3.1.7-no-perl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-avoid weak perl usage in tests
-
-https://bugs.gentoo.org/421609
-
---- a/test.sh
-+++ b/test.sh
-@@ -1466,7 +1466,7 @@
-     mkdir -p $dir
-     i=0
-     while [ $i -lt 10 ]; do
--        perl -e 'print "A" x 4017' >$dir/result$i-4017.o
-+        printf '%4017s' '' | tr ' ' 'A' >$dir/result$i-4017.o
-         touch $dir/result$i-4017.stderr
-         touch $dir/result$i-4017.d
-         if [ $i -gt 5 ]; then
diff --git a/dev-util/diffhelp/Manifest b/dev-util/diffhelp/Manifest
index 86306f98..dd4bcc12 100644
--- a/dev-util/diffhelp/Manifest
+++ b/dev-util/diffhelp/Manifest
@@ -1 +1 @@
-DIST diffhelp-1.9.tar.gz 1974 SHA256 b01883002d797c3d9d7e1268b66e24ef36e02642339151c3ad05645da5b69a06 SHA512 ea2ffa07041a28545facd6a626ab49c1853f2e32e64f05ba52cbb7afe8243f60474c48f46b853e99008d20fc4bebea70ee6516bfc794a9c601b786fa006dd0d1 WHIRLPOOL af924437aef7f58282606ed294c45d526fb7022f500cae9eb3acb9e589c7499b5a49ccff62f18f10548c4e3f70b95bbc13f0f5d67d18aa09aef06f322be38812
+DIST diffhelp-1.9.tar.gz 1974 SHA256 b01883002d797c3d9d7e1268b66e24ef36e02642339151c3ad05645da5b69a06
diff --git a/dev-util/mv_perl/Manifest b/dev-util/mv_perl/Manifest
index b4a530e5..06ad68d1 100644
--- a/dev-util/mv_perl/Manifest
+++ b/dev-util/mv_perl/Manifest
@@ -1 +1 @@
-DIST mv_perl-2.50.tar.gz 66977 SHA256 e6ee7e3b8319f573e1d4e19d7b75892a229650776b4d2feab11db0ba1e7c9e7f SHA512 d19ffcee5d2c5a096a3a694f89a38b298efcfc23d6beaa9125ea20a9b04d9946f7ebbf7e247c3e0329d0eb0c640bbf5986a5a06eaf07f6b83a5f1f7e56beaff4 WHIRLPOOL 62bf6ee1fc35abf7be6e0cea23accd6f54a436aa89a34db078e2004ececfbe6fba92562142a87b04465da1e691c17e0b8655f9216f58756e9a25c1eadb42e026
+DIST mv_perl-2.50.tar.gz 66977 SHA256 e6ee7e3b8319f573e1d4e19d7b75892a229650776b4d2feab11db0ba1e7c9e7f
diff --git a/dev-util/pyrep/Manifest b/dev-util/pyrep/Manifest
index 516923ed..e3dc8122 100644
--- a/dev-util/pyrep/Manifest
+++ b/dev-util/pyrep/Manifest
@@ -1 +1 @@
-DIST pyrep-1.4.tar.gz 8622 SHA256 8051593becdd43ceaa3e0602f4d20c02f85b70233d443147ffbbb9ab715451f4 SHA512 9038b6368930628488f5e47a08262c9a51aec20172e8528d199d113653e445d37a69d4f07c00087cc8359e04fcf864ea72c749d9552b580d8f38ff62d8ec55f7 WHIRLPOOL 7a752cde3c1e84d2900dd3704ef2bdfb72ae06741c801cbcc6c3b11decf88674a108dce704dd4038a5e9c9b21c6b45d37a9e10fadc9853748f8c0bfb0f121fe9
+DIST pyrep-1.4.tar.gz 8622 SHA256 8051593becdd43ceaa3e0602f4d20c02f85b70233d443147ffbbb9ab715451f4
diff --git a/dev-util/pyrep/pyrep-1.4-r1.ebuild b/dev-util/pyrep/pyrep-1.4-r1.ebuild
index c10ea901..2a6ac3b0 100644
--- a/dev-util/pyrep/pyrep-1.4-r1.ebuild
+++ b/dev-util/pyrep/pyrep-1.4-r1.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 RESTRICT="mirror"
 PYTHON_COMPAT=( jython2_7 pypy{,3} python{2_7,3_{4,5}} )
-inherit eutils python-single-r1
+inherit python-single-r1
 
 DESCRIPTION="Search and/or replace regular expressions within many files interactively"
 HOMEPAGE="https://github.com/vaeth/pyrep/"
@@ -24,7 +24,7 @@ src_prepare() {
 	use prefix || sed -i \
 		-e '1s"^#!/usr/bin/env python$"#!'"${EPREFIX}/usr/bin/python"'"' \
 		-- "${PN}" || die
-	epatch_user
+	eapply_user
 }
 
 src_install() {