gentoo resync : 04.01.2022

6 files changed, 10 insertions, 103 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 3c2aea4b40c8..d2dfe707ff84 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 48f261f073b5..e161f4db4647 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,6 +1,5 @@
-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-r3.ebuild 8532 BLAKE2B 1f2d7b54c7cebc61b7fbef87aabf423e57590030957642d172e692ad9fe4361382e9ecf4395edeea59eeb952c9b5eaa5d0077dbc840bdf38e8779a163d5669cf SHA512 5fc3afdc2eeb32aa570f36c6164ff32053b408c383f78a239f859872f4192c94f63e8a048f0ae591a53a904c27f4b286190637097dbad006c6bf918d1f34738d
-EBUILD cdrtools-3.02_alpha09-r4.ebuild 8976 BLAKE2B 0a1e0a464891b395c307879b147f4fa0a1c428edacfca89fcdaffafd23baf7c468ea03127c636a46561a6e4c92eba2cc020e0555475b93704c992f2e18c643af SHA512 7519a96a0cb796e7aee9ca6e32abb092801b0e319f7010b5bf82ce05ae093a0129027bd80a347744e9b66d8376a19cc7720cf3fa9c0f8fcf49a4b82f03872c61
-EBUILD cdrtools-3.02_alpha09.ebuild 8236 BLAKE2B 99d3f9a6c0fc5de0aa400ef78fcbf0cc0c3ae10588746809bfa5c3fdae4324591469283f5a30b363a7b5cfa9d404187b923248f654d878a3ea2e11b5d7d3af8e SHA512 691e96a7f6bf86bf65c4535556836f2c44db63107e7b38fc5282e38a457dfeef1c6a0af452107c870add82f666b5bd52b9241e122c073ea0a0265048040279dd
+EBUILD cdrtools-3.02_alpha09-r3.ebuild 8173 BLAKE2B 190449712525437fc7c95e633454e7df33d8e9c6a1c7600012adbf25fe4a3827a86732bdf6eb570113839a0e81564b7cd354be206b81a46eaba9a16ab9e19c8c SHA512 83915ab1c34a908868585cd44f7d79a8139c9e694e235d65a1d43e2e9deb3684100f41bffacd98b94fa3e363a0836960afd9a6b84734919aede80a0c7b38f966
+EBUILD cdrtools-3.02_alpha09-r4.ebuild 8617 BLAKE2B 2354ada2471f0899967fa25d0706d9086db4344ef36820967f5cc68a858cbf5bd9cedb9b805ceb96c6f477d16bafa74d38d15f004fc094b0a83da15640db4710 SHA512 80cffa29bb69af76540d53511e8413678f036f917152a83fb35df655bcf274972859f91c4624f00d7096da3046d7dd14faf1ea9ba0eb9b63772e96d1622e94b8
+EBUILD cdrtools-3.02_alpha09.ebuild 7877 BLAKE2B f17ef5dccacc490ace542c9d76df52998623ba25a649814d06a50e359ae1adee23b81a31fe4d1bf0ece4367901c8719d92715187db2945fcf1359e0f900030ec SHA512 8968ef6bc7a9f030cee3eb93a21ed9334148de742ce80bcd4b8032fefbff3faed50798ca96881e8ec60a291de9dbb6772c35b64532772a8136c2ece7b9142a59
 MISC metadata.xml 445 BLAKE2B 43f12bca87633d1b039beed2fb401b652eafb937afc8a27d9d84885d306636bc29978beb17426dc782cb7c2e7ba9333b9346b6455fa72db2b778800f39995476 SHA512 c552eae00d8560d482fcb02799f064f5481e67ec12107760c841620db2d3023826377e186f5dc1b3555eea9b40964b4c7020b1deb82574ff1ff3ad7fd957bde9
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
index 124eaa59a097..425a7139ca91 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit fcaps multilib toolchain-funcs flag-o-matic gnuconfig
+inherit fcaps toolchain-funcs flag-o-matic gnuconfig
 
 MY_P="${P/_alpha/a}"
 
@@ -24,7 +24,6 @@ RDEPEND="
 	acl? ( virtual/acl )
 	caps? ( sys-libs/libcap )
 	nls? ( virtual/libintl )
-	!app-cdr/cdrkit
 	selinux? ( sec-policy/selinux-cdrecord )
 "
 DEPEND="
@@ -42,7 +41,6 @@ FILECAPS=(
 cdrtools_os() {
 	local os="linux"
 	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
-	[[ ${CHOST} == *-freebsd* ]] && os="freebsd"
 	echo "${os}"
 }
 
@@ -51,12 +49,6 @@ src_prepare() {
 
 	gnuconfig_update
 
-	# This fixes a clash with clone() on uclibc.  Upstream isn't
-	# 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 && 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/cdrtools-3.02_alpha09-r4.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild
index 34da04ffdca0..6d509d8f5364 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit fcaps multilib toolchain-funcs flag-o-matic gnuconfig
+inherit fcaps toolchain-funcs flag-o-matic gnuconfig
 
 MY_P="${P/_alpha/a}"
 
@@ -24,7 +24,6 @@ RDEPEND="
 	acl? ( virtual/acl )
 	caps? ( sys-libs/libcap )
 	nls? ( virtual/libintl )
-	!app-cdr/cdrkit
 	selinux? ( sec-policy/selinux-cdrecord )
 "
 DEPEND="
@@ -42,7 +41,6 @@ FILECAPS=(
 cdrtools_os() {
 	local os="linux"
 	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
-	[[ ${CHOST} == *-freebsd* ]] && os="freebsd"
 	echo "${os}"
 }
 
@@ -51,12 +49,6 @@ src_prepare() {
 
 	gnuconfig_update
 
-	# This fixes a clash with clone() on uclibc.  Upstream isn't
-	# 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 && 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/cdrtools-3.02_alpha09.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
index 7a64693f19ea..60454053d67b 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit fcaps multilib toolchain-funcs flag-o-matic gnuconfig
+inherit fcaps toolchain-funcs flag-o-matic gnuconfig
 
 MY_P="${P/_alpha/a}"
 
@@ -18,8 +18,7 @@ IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
 	caps? ( sys-libs/libcap )
-	nls? ( virtual/libintl )
-	!app-cdr/cdrkit"
+	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	x11-misc/makedepend
 	nls? ( >=sys-devel/gettext-0.18.1.1 )"
@@ -35,7 +34,6 @@ FILECAPS=(
 cdrtools_os() {
 	local os="linux"
 	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
-	[[ ${CHOST} == *-freebsd* ]] && os="freebsd"
 	echo "${os}"
 }
 
@@ -44,12 +42,6 @@ src_prepare() {
 
 	gnuconfig_update
 
-	# This fixes a clash with clone() on uclibc.  Upstream isn't
-	# 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 && 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
deleted file mode 100644
index 4ba244bf32b7..000000000000
--- a/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/readcd/readcd.c
-+++ b/readcd/readcd.c
-@@ -257,7 +257,7 @@
- BOOL	pifscan;
- BOOL	plot;
- BOOL	fulltoc;
--BOOL	clone;
-+BOOL	clonetoc;
- BOOL	edc_corr;
- BOOL	noerror;
- BOOL	nocorr;
-@@ -294,7 +294,7 @@
- 	error(_("\t-plot		Print data suitable for gnuplot\n"));
- #ifdef	CLONE_WRITE
- 	error(_("\t-fulltoc	Retrieve the full TOC\n"));
--	error(_("\t-clone		Retrieve the full TOC and all data\n"));
-+	error(_("\t-clonetoc		Retrieve the full TOC and all data\n"));
- 	error(_("\t-edc-corr	Try to do user level Reed Solomon repair (experimental)\n"));
- #endif
- 	error(_("\ttimeout=#	set the default SCSI command timeout to #.\n"));
-@@ -320,7 +320,7 @@
- }
- 
- /* CSTYLED */
--char	opts[]   = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,scgopts*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clone,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#";
-+char	opts[]   = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,scgopts*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clonetoc,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#";
- 
- EXPORT int
- main(ac, av)
-@@ -397,7 +397,7 @@
- 			&scanbus, &dev, &scgopts, &sectors, &do_write,
- 			&c2scan, &cxscan, &pi8scan, &pifscan,
- 			&plot,
--			&fulltoc, &clone,
-+			&fulltoc, &clonetoc,
- 			&edc_corr,
- 			&noerror, &nocorr,
- 			&notrunc, &retries, &do_factor, &filename,
-@@ -679,7 +679,7 @@
- 
- 	if (filename || sectors || c2scan || cxscan || pi8scan || pifscan ||
- 	    meshpoints || fulltoc ||
--	    clone || edc_corr) {
-+	    clonetoc || edc_corr) {
- 		dorw(scgp, filename, sectors);
- 	} else {
- 		doit(scgp);
-@@ -894,9 +894,9 @@
- 		if (params.name == NULL)
- 			params.name = "/dev/null";
- 		read_ftoc(scgp, &params, FALSE);
--	} else if (clone || edc_corr) {
-+	} else if (clonetoc || edc_corr) {
- 		if (!is_mmc(scgp, NULL, NULL))
--			comerrno(EX_BAD, _("Unsupported device for clone mode.\n"));
-+			comerrno(EX_BAD, _("Unsupported device for clonetoc mode.\n"));
- 		if (!edc_corr)
- 			noerror = TRUE;
- 		if (retries == MAX_RETRY)
-@@ -904,7 +904,7 @@
- 		if (params.name == NULL)
- 			params.name = "/dev/null";
- 
--		if (clone)
-+		if (clonetoc)
- 		if (read_ftoc(scgp, &params, TRUE) < 0)
- 			comerrno(EX_BAD, _("Read fulltoc problems.\n"));
- 		readcd_disk(scgp, &params);