gentoo resync : 28.04.2021

5 files changed, 10 insertions, 11 deletions

diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 3ad84cbfad42..e1202bd7d986 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,6 +1,6 @@
-AUX cdrtools-fix-clone-uclibc.patch 2582 BLAKE2B dfa564f67e15dfcdab9e654572c95f89787fded558e88edecde89237ea5097b6a6cc0233b5950f0df460490af415255a56130d27b7198b3c1fee279e288835f9 SHA512 23031747c1d7bc0292beb754f059381df1f1ac7851c9fdb7f296c933f3a9d7c4e52848f90ab50c459432628d74a7546752b299d74199259d84eb89ce92ae0077
+AUX cdrtools-fix-clone-uclibc.patch 2405 BLAKE2B 6fe443e87aafee2a6e4b9ef5d6d6e9b01f8b77095ce7e6b249338264b75adf6b600afd1c4758fb1d684f01fdbd30b9285bac132064df21cca52e6ed644d69c4e SHA512 17c184d90f10f7ebde0c621b349255eb284f9b940ec6cd63427249a9bd6e16d998f06a8eab930fa03afb4ed1589421b6e57f0b183e3d4aa837c0ad65ad413727
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
-EBUILD cdrtools-3.02_alpha09-r2.ebuild 8297 BLAKE2B 65e19383adf285dbd5c17198980065b72ae68b1d3fb0230bdf24c99dd75d676a8be7bbbe8341c4b1f8524c8fd2df924415e5449827a7f4b8b1550b27b0237ceb SHA512 18a54a75aa91f13f264d7727838185bf416bdc6eafff2c2eca8114135e049811252640a5b11a676456009700ac4e4152e890d3b565c8dd8213de559612ed436f
-EBUILD cdrtools-3.02_alpha09-r3.ebuild 8390 BLAKE2B 6d52220fe1cb9167b30046a5867633a861065dbde79be6f94c248e0aa2f00fcd3141b53ce4fc9b4238f50c7d489720eb7ff85a0963164b373846a23967835bdb SHA512 3ef7fb1d5eac6b11794c381926d81c4923d3bc4ff4883dcbd9b5e2add1159b870166bc3d9251150a5603ea426f954c69e3774942260800eada6eabe4133d7aae
-EBUILD cdrtools-3.02_alpha09.ebuild 8228 BLAKE2B 3098d78b8e24cbfd05561414efad292df734be83ce43467ba42f4f55e228d25591a3edf5d99c78536d78ee555d4dc43d552b8ebfdde04dd8bfc5cf72b47db318 SHA512 6249c073bba824c75157ed1fa951264dda8aa00ed59311f037a3f146705f6009640dbf903fd53ede517310ccb9420343ef5772f91454c5552b605cac134a015e
+EBUILD cdrtools-3.02_alpha09-r2.ebuild 8298 BLAKE2B 92eaf5035bec31a10ffaed49138f4de28a75f5ccf0a3ff6401d6e3f84e0f098966318091782174814e97ef5c7199d1caef643dffae4edfe820960413b680e852 SHA512 c01148b8575d22082db7149a9d35df2d882af4914e93913fddca96c8ccc90a0dad9a2a34e54d5ede8ad923fa1c095794c6d11714001310a8e2893d02fe0ea12e
+EBUILD cdrtools-3.02_alpha09-r3.ebuild 8384 BLAKE2B 4fc7ae83367d37e6826baefd0d82269ee51b8fba295b3c2e05d45a45908f81f791d56141b0a77360084db8b3330b8e68c00985843cde466c52a8d0376122ee9f SHA512 8657702c20daafbb779c9b9993e67ccb394bad99bdf9d969e0ac4789bf4bfce9065f8c0c000a41ed58a80472ce67b861797c60e992eb22d1151d303e8e9b0c7e
+EBUILD cdrtools-3.02_alpha09.ebuild 8229 BLAKE2B 4fca2a03eeadcbd6601401ef93c26df3ee5896c1a1b11e865f49f14d4252ada0b9006e5191cfac24efdb4dcad1e4e9212f77c8886653929a92704acc79b757bf SHA512 560007695b98ed541e35fdb9d1a97de494cefe7c10e0bb95bcc9d59abd3b295a286d16de92239a32714e006fed8899038f0d191e70cc32ea01097c020b8d8a3b
 MISC metadata.xml 444 BLAKE2B 4d6375fb99e7751846883ef73422767522b2d43c9d48869a9babac90e507b90e076a80b6cb9e920869c07000d64168b1cd1b75c1d7655e9b06c0a4a2bd957fdd SHA512 0945a0d302bd8c16b1512a8b63250bd39b7685121fb26dc9677b6c4fb1c81bee41b104df07fa77f83cb8a8461ccf408a0ce2a3cd979bb943935109f4b664b020
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
index b86d95dc2ee5..5ff3221ef76d 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode selinux"
 
 BDEPEND="
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
index 38f39f61459a..fddb123d5e83 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode selinux"
 
 BDEPEND="
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
index bc2a268925bd..f11ca585ee0f 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
@@ -48,7 +48,7 @@ src_prepare() {
 	# going to include this so let's try to carry it forward.
 	# Contact me if it needs updating.  Bug #486782.
 	# Anthony G. Basile <blueness@gentoo.org>.
-	use elibc_uclibc && epatch "${FILESDIR}"/${PN}-fix-clone-uclibc.patch
+	use elibc_uclibc && eapply "${FILESDIR}"/${PN}-fix-clone-uclibc.patch
 
 	# Remove profiled make files.
 	find -name '*_p.mk' -delete || die "delete *_p.mk"
diff --git a/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch b/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch
index 9ffd28a5ba5c..4ba244bf32b7 100644
--- a/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch
+++ b/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch
@@ -1,6 +1,5 @@
-diff -Naur cdrtools-3.02.orig/readcd/readcd.c cdrtools-3.02/readcd/readcd.c
---- cdrtools-3.02.orig/readcd/readcd.c	2016-01-24 11:15:19.000000000 -0500
-+++ cdrtools-3.02/readcd/readcd.c	2016-04-09 12:29:54.727635502 -0400
+--- a/readcd/readcd.c
++++ b/readcd/readcd.c
 @@ -257,7 +257,7 @@
  BOOL	pifscan;
  BOOL	plot;