gentoo resync : 03.11.2021

5 files changed, 14 insertions, 17 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 1174130c3829..9b083610effa 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/pdumpfs/Manifest b/app-backup/pdumpfs/Manifest
index bc96723cac51..3d6c54b3a3bc 100644
--- a/app-backup/pdumpfs/Manifest
+++ b/app-backup/pdumpfs/Manifest
@@ -1,5 +1,5 @@
-AUX pdumpfs-in.patch 977 BLAKE2B 5be9f88f6af0dc051c856da71c4cb4fc3d52f610ec0cedb0364b0d59d01925bcda9ab7c5872c0fe87e8aa9ba07a4d284adb90b382d6b92b480aa64cce1a4b00f SHA512 3d45d5ecbf2e3af71ae80de28c8cedc46b5ea2f7d0e9f6ea58c4154e477db8375f21587ebc4cade04b353e5a0552620790a0f8ea13d9f8151b4236e8e2489ee9
-AUX pdumpfs-test.patch 392 BLAKE2B 99b04a1f9667e5996afc294de54eca4d45d51ca36103f661a9c576a823faa85b1fd215e27ae6d1f2d9c02e696f55fceb9b00e55778d56bad0e5560d40aa18a00 SHA512 b7647f51acb30cfc86e80cf5eb5e6d7fa84c6b3ba3c1e6246468baca7835bd08a6d3f3e70dbb55a2c6ef0ffe67b4d10dd78b5a4673ff636c8da74e64f7b827fa
+AUX pdumpfs-in-r3.patch 981 BLAKE2B 75d48b23c23a762535958257ebde41e47e2d9522d4c50390f44ae5dd46de03b0693b48cededf243c7661cfc1d171f5b64d25a874f78aec314128a63c3668f1d9 SHA512 f4a1b9511acdb8b95aada01b36cf9ed9d50d13673a0a69e0f7d94e4aed4420d5489a8c7633bd47dae22c259841febd7a09608e73ab508256fa971b6475e6a5ce
+AUX pdumpfs-test-r3.patch 396 BLAKE2B 760f313823126bc67a80ee3c29a5ff8258d5bd193f650588c67634bfb675378afb1e14f178f8fb902d27e3a11969522f635f43c8136238c69e360ca5effa448c SHA512 f6944f2fc27dfba0bbade0e94bec945aad18e7eba5af24d0d6eba9a1b5cee1ba317176ed963d17dcd14fc2f8b9c8c87a0c8b5938223f26db0473398c9e989d28
 DIST pdumpfs-1.3.tar.gz 68210 BLAKE2B ab5428c0f12ac289ef6efb5ae1b1ebcb047ce48183a36423d6f4b80d2d55da07b6e346e8ebd0ccd6eb85ae132c4367bd806c8106abeb681a9fa6ebffbaef1075 SHA512 1299676982f1981aa55f0601f361ec24ac119067f5ecbbeebcf9f41ccd69df2f18a07ae5a6e77f30ca7606ee49ecfa516d6066a07c1edbb4d4796f34f02508c3
-EBUILD pdumpfs-1.3-r2.ebuild 883 BLAKE2B 1ad7eba98fb1247c887999b1988382aea0aa6744229ce3478b345f5c3d6a59245668108ed2984dbbbe3a2e965eff04d5e75635e085513b4b2228623507df1d01 SHA512 e495b40b45900cabea51ee8320a1fc3b231076a414e22691427687595507a71c358d7a2a56abb17bdd98aa295d9d77c11d5d01530d94c5ceb7690894d9fd29a6
+EBUILD pdumpfs-1.3-r3.ebuild 836 BLAKE2B 11290f4b7dca85165f3eadbe93dfb177eddc40c5479b783bb3a7471d3606b21d0b87a373a9e376ec0bdb825a5e841508f9f46c2d3046e58ff42d7b6965903c85 SHA512 4dceb3f8e222031ad292242c7b7388e37c867186bdb431ad92f5a523589b918be77356ae476ba637da7c2bea2c3cf6673cd3ddb62aa1e11153ffd882e7b0fc2c
 MISC metadata.xml 690 BLAKE2B a83b23cf0a1a39e8d55f6672f1fcf17d5488f64d47cd84bee9fc0d509d1c2e69983dc5ce2e392de302a466607640e69c04d65a02d36930e389540cb653081a34 SHA512 78ace94dd505143837b7d2d5a065083cd41ea907b04f4671166f713655f077789840474ada7eb2c5869dfd8f49cf4fd38e14b04e7db9d9963231272a24a74e3e
diff --git a/app-backup/pdumpfs/files/pdumpfs-in.patch b/app-backup/pdumpfs/files/pdumpfs-in-r3.patch
index cddfb995918a..b00f9bed5755 100644
--- a/app-backup/pdumpfs/files/pdumpfs-in.patch
+++ b/app-backup/pdumpfs/files/pdumpfs-in-r3.patch
@@ -1,7 +1,7 @@
 patch by proxy maintainer, P. Healy, April 2015
 # Bug 509960
---- pdumpfs.in_orig	2004-12-21 02:43:12.000000000 +0000
-+++ pdumpfs.in	2015-04-01 10:58:22.671131947 +0100
+--- a/pdumpfs.in_orig	2004-12-21 02:43:12.000000000 +0000
++++ b/pdumpfs.in	2015-04-01 10:58:22.671131947 +0100
 @@ -48,7 +48,7 @@
  #
  
diff --git a/app-backup/pdumpfs/files/pdumpfs-test.patch b/app-backup/pdumpfs/files/pdumpfs-test-r3.patch
index e81e8b0f2d8a..30cd0292dae7 100644
--- a/app-backup/pdumpfs/files/pdumpfs-test.patch
+++ b/app-backup/pdumpfs/files/pdumpfs-test-r3.patch
@@ -1,7 +1,7 @@
 patch by proxy maintainer, P. Healy, April 2015
 # Bug 509960
---- tests/pdumpfs-test_orig	2004-08-10 07:54:28.000000000 +0100
-+++ tests/pdumpfs-test	2015-04-01 11:24:35.948633870 +0100
+--- a/tests/pdumpfs-test_orig	2004-08-10 07:54:28.000000000 +0100
++++ b/tests/pdumpfs-test	2015-04-01 11:24:35.948633870 +0100
 @@ -17,6 +17,7 @@
  
  ../pdumpfs src dest > tmp.log || exit 1
diff --git a/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild b/app-backup/pdumpfs/pdumpfs-1.3-r3.ebuild
index 224e6c596e42..38091aedbe11 100644
--- a/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild
+++ b/app-backup/pdumpfs/pdumpfs-1.3-r3.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit epatch
+EAPI=8
 
 DESCRIPTION="A daily backup system similar to Plan9's dumpfs"
 HOMEPAGE="http://0xcc.net/pdumpfs/"
@@ -14,13 +12,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="l10n_ja"
 
-DEPEND=">=dev-lang/ruby-2.0.0_p598"
+DEPEND=">=dev-lang/ruby-2.7.4"
 
-src_prepare() {
-	# Bug #509960
-	epatch "${FILESDIR}/${PN}-in.patch" \
-		"${FILESDIR}/${PN}-test.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-in-r3.patch"
+	"${FILESDIR}/${PN}-test-r3.patch"
+)
 
 src_compile() {
 	emake pdumpfs
@@ -36,7 +33,7 @@ src_install() {
 	dobin pdumpfs
 
 	doman man/man8/pdumpfs.8
-	dohtml -r doc/*
+	dodoc -r doc/*
 
 	if use l10n_ja; then
 		insinto /usr/share/man/ja/man8