gentoo new year resync : 01.01.2021

5 files changed, 16 insertions, 26 deletions

diff --git a/app-text/rman/Manifest b/app-text/rman/Manifest
index 004d5ab7f3b5..b70403c5f1c5 100644
--- a/app-text/rman/Manifest
+++ b/app-text/rman/Manifest
@@ -1,6 +1,6 @@
-AUX rman-3.2-format-security.patch 458 BLAKE2B 85807cbc0ffa292c56794f61f371333813283abce2eceee7485849ac60bed91c6c5e336c27a53049ec891bbaeb0cfc2253002fba487a79b713f91ec983519ceb SHA512 1994555d399656f9d22586464f1ee46f67d279c1d93184b69e551b87d9fb393ba24ad7dc6ea62dda1288fe605dedca1e4bdc20eb333acedc535f1063e2f62aab
-AUX rman-3.2-gentoo.diff 560 BLAKE2B 7f63625d37971f537c44667a05ec5b65c7c2216c05b5cc447fc802be3a35df365def1c8a95aebd5ed2f462eeced80cd1c106fb2708c231568a7666d1fa7335d4 SHA512 528b2e7385882620ecaa0374a65579e0fe56803aa6991277ea1279d18d65a4331ebbfc2374a711bda2f5722a5fcc236681f9c4dfb3c0abed1e931ff986cbf74e
-AUX rman-3.2-ldflags.patch 451 BLAKE2B ee44bfca1a15b8a52a42c703ca749722257f8ded019fa3119687f0808ad85ae696096bc29d5a7b04c4527382ad1f3f9d8d2d3e3bfb72005a167be3e95693a4b3 SHA512 936c9fb92e3f018ec0006370ea61f010b61469171a22a9f52a6773f32ef3ab01764b726573aa30548b1c9ea6db3893302a45d20c06bc19f7e272b5e531bec433
+AUX rman-3.2-format-security.patch 336 BLAKE2B 04ec15b8d7e20293d3b5da4c85107b20957661a5a249541ad7eefd8937fbfe64806afc386ee241deee1e53bf26c752107f66582682ae21c2c11f7e4e6a268179 SHA512 4f21e07f887b509b12dda37d30dbce6f599671cb6b300934a180f9dca8661a55734e7a116f39d2d877cab38d66d3a54ad12f842693b8abf0d7448700c96ba86c
+AUX rman-3.2-gentoo.patch 418 BLAKE2B bb7385f95e443a175e86c7c8c19871cfd8682b037487b6a73f3010e50d1e177929ef89e02041b70dc575a55aa5144cec99b2c13942f87ddf9f31c1c327ad8b36 SHA512 267896a7db4dc559e3162c66996bde552c655f8dd32ee3f1a23520d1df8728fad83e783fa898159e0aa96730b03092be516f711091f58a4f1b9228d24a4bc87c
+AUX rman-3.2-ldflags.patch 339 BLAKE2B fa4e72627e79841e2650025d9772953834907a41f06e3a18d8a0bcae83cf104724cf29023d128ec272656d4ba9696b05243466372299f20b796ee8d3cd495fdd SHA512 ed9350878621a90aea9467afcf0fe1110c9b876c236c314e0d7566ee6c5674663c47457f8acac76517b0409f3eccff91dd3e869de1c3d1002a671610fb1e38af
 DIST rman-3.2.tar.gz 79397 BLAKE2B 2be1c60f77c3b2c4fa73a59c5a8965da1c8b1f3b569e7e4d5716a372228bacb81c5421f4bbf330781aa231835393c915ed14057c717cb1e8ed57101f7febb37d SHA512 a70aea0af1510088fd88a736e63a6dab9200040be5eb89912ede4f50e3de97d423574841bbb66e90fb12934f3834dac0acefe78ff1c73a78a79c95c3dd6fa5ae
-EBUILD rman-3.2-r1.ebuild 799 BLAKE2B c64d65ddb5a36cd4d5292fd02f9c61e766b0c110be3c833670ec85a01a317846df8da6ec6fc47313227d7bafa85edd75baabc051b0c57e97cb0d8c8662b7c58b SHA512 cbcdf6a685eee2981ebb533812f17df3f65c04c41d7df60a547a88ba77f690980838bbbcbcec43490a1ac5dfc53d8952216756b23945b99521682878b9afaecc
+EBUILD rman-3.2-r1.ebuild 763 BLAKE2B 1a5d86ef604cb2fc0ab91b3c3590dac92f008837e6012a6be2df1828f4339cf3775599a9d6dd06f1003eedddc4c98de1670b1393bf274fc5f3cd372f77966b2c SHA512 4ad491f64f73afa3be772e2c238f3625f21edc1c8af2d388ce4ee32894552efc7c000a1c2e5f37345e47298206726686b00dbea99fd43527e7fe6980009ef6eb
 MISC metadata.xml 334 BLAKE2B f3759592bab3b3f8426acb5a0fff5d5d7efb5618c951e2c0a26dcc119f609702f45327dcc47de6132befee7064536413006e77a09ab67415c041b0697129df6c SHA512 29d5b70060964469ce308fed8bc01e09bb74b3d2ac0605760d88f7dbd19a1cdd6517cdbab76f4269188454112837e0d27b32bbf3c5b9ecd5bb4d3ea4f862188c
diff --git a/app-text/rman/files/rman-3.2-format-security.patch b/app-text/rman/files/rman-3.2-format-security.patch
index 77070026bdb9..4ea7740a6822 100644
--- a/app-text/rman/files/rman-3.2-format-security.patch
+++ b/app-text/rman/files/rman-3.2-format-security.patch
@@ -1,8 +1,3 @@
- rman.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rman.c b/rman.c
-index d09e547..e5fc88d 100644
 --- a/rman.c
 +++ b/rman.c
 @@ -1372,7 +1372,7 @@ HTML(enum command cmd) {
diff --git a/app-text/rman/files/rman-3.2-gentoo.diff b/app-text/rman/files/rman-3.2-gentoo.patch
index ece1e3807e66..676d555ce375 100644
--- a/app-text/rman/files/rman-3.2-gentoo.diff
+++ b/app-text/rman/files/rman-3.2-gentoo.patch
@@ -1,6 +1,5 @@
-diff -urN rman-3.2.orig/Makefile rman-3.2/Makefile
---- rman-3.2.orig/Makefile	2003-07-26 12:15:00.000000000 -0700
-+++ rman-3.2/Makefile	2005-07-12 01:01:37.000000000 -0700
+--- a/Makefile
++++ b/Makefile
 @@ -15,13 +15,8 @@
  #    this must be a directory that's in your bin PATH.
  # MANDIR holds the man page.
diff --git a/app-text/rman/files/rman-3.2-ldflags.patch b/app-text/rman/files/rman-3.2-ldflags.patch
index 4a6f5f5d9eab..7f0745b2e0f2 100644
--- a/app-text/rman/files/rman-3.2-ldflags.patch
+++ b/app-text/rman/files/rman-3.2-ldflags.patch
@@ -1,7 +1,5 @@
-Index: rman-3.2/Makefile
-===================================================================
---- rman-3.2.orig/Makefile
-+++ rman-3.2/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -102,7 +102,7 @@ all:  rman
  
  # everyone but me zaps assertions with the -DNDEBUG flag
diff --git a/app-text/rman/rman-3.2-r1.ebuild b/app-text/rman/rman-3.2-r1.ebuild
index d57e0cb0ab0d..486e973975b8 100644
--- a/app-text/rman/rman-3.2-r1.ebuild
+++ b/app-text/rman/rman-3.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="PolyGlotMan man page translator AKA RosettaMan"
 HOMEPAGE="https://sourceforge.net/projects/polyglotman/"
@@ -11,17 +11,15 @@ SRC_URI="mirror://sourceforge/polyglotman/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RESTRICT="test"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.diff \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-format-security.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-format-security.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"