gentoo resync : 20.03.2021

4 files changed, 140 insertions, 2 deletions

diff --git a/app-cdr/dvd+rw-tools/Manifest b/app-cdr/dvd+rw-tools/Manifest
index 2aa50dedc649..4cd0872a9eea 100644
--- a/app-cdr/dvd+rw-tools/Manifest
+++ b/app-cdr/dvd+rw-tools/Manifest
@@ -6,8 +6,10 @@ AUX dvd+rw-tools-7.0-wctomb-r1.patch 374 BLAKE2B 670740ca45a6d6bf9e054bedd8c105a
 AUX dvd+rw-tools-7.0-wexit.patch 382 BLAKE2B d07a8e54fff49ef4dd6f36bd3beba94920bc7a7278f03787d2c6cfaade36d8d39f804885839de1bac7755e9a075143de75081d18fb0733cfa6661726a0958d5f SHA512 d98a66ea2e08b14683377c3aff491fb2ee6cd2742e42191c1f7d47fe3474c2ce5f940ba82bce46e557886adbb1fd94431531f7aa73a572a7d41ee227428576fd
 AUX dvd+rw-tools-7.1-bluray_pow_freespace.patch 512 BLAKE2B ca65ce1389dfb0be7b28882897c5711d8f98edd5f72be5f333703af9c42acfb655c711aa7edd7c0bc0bbe1a1af8f0e2e19eae1a3246deefa1a968ad69f3e7958 SHA512 61125ad2fcaa23172132499159cb66c44ba90513328f547c33776cd878d0afdb6927679396290450ab8cb3bbd5819528fd340b1b48bf6632b00d74e3b6357e72
 AUX dvd+rw-tools-7.1-bluray_srm+pow.patch 427 BLAKE2B 5caea4e6afd1af9b0afd33e9cf344e40a191fdfdbd0f7ac9af91b2d346fbfcdf73a2e957c1f5a3aca6bd133054d0a8a89553da2ff3e3e5661241390b0358fdd0 SHA512 d585302680f094eaecbc5ad7d4bfdaf91ad61d621c4c87965c2a9172ab8c2044ad929ff58470f2908949f90c6e227d43778a99e86880acc32c13d305d88505d6
+AUX dvd+rw-tools-7.1-clang.patch 2341 BLAKE2B 752850357de4e38d1f3ba992720834b131367ff3c2d75507356f4734612f7c584241ae3c1b6561e7e81b767fef3d94f45300d790d952eeeea883f2728663ea40 SHA512 f97a12cec230554488c7d666c0134f7594f97c924052382615061e3c25c2dc44c5403432ef87375bee73a35b52a87be4473e00f3be47883dce4a7d6f73f0c054
 AUX dvd+rw-tools-7.1-lastshort.patch 593 BLAKE2B e24b41b6eb39961568133f91a110afc87b26597ead0b623deb22bff11a40638bd5faca1de75b8289484889d2d2768077fd637dfe57fdb8bc9f61c1ddd6bed91d SHA512 554b1eb09a00e6bba38acc6ab983f3e0e810b919eb2205f9ee6473d83edd0fdd524e29b844f4c5a55f8044bb72457b2896a24488d691773a00aa355dd1be9975
 AUX dvd+rw-tools-7.1-noevent.patch 783 BLAKE2B 78f27d65759b98607ac6e3eb29ce44c2d88029f7fdaffd3a6d305166b82a069c8a8621b2c680bfbb3a9a2e6585370bc6c1503b4107e903f69099565bfdc0de8d SHA512 0df88a56b3b776934fea0caca1ac247b5b5416fa4985601ac7996633a833b4d264b334d6bb9c5d7587227529ee36a7f2087fad9f6851b4cde8918204d8718b47
 DIST dvd+rw-tools-7.1.tar.gz 140846 BLAKE2B e456be6ee8d1863e78abc6d494a1ce08a49e3aec9b45533408c33ff4620dfc450b968280ce0453b0c0d966f3afca0d23e1ed7e3497caee8216561ad85599b138 SHA512 938f9ec5597158af275c7bf63002696ba362f6f22a219108c6a1df28792f0485046a7af5ce57e41695aaaa0d69543bd66cbbeb4415df5c0e0a902a3f1d278a31
 EBUILD dvd+rw-tools-7.1-r3.ebuild 1536 BLAKE2B 079c22093d821610304c2b687b14feb4e15d70c50acf897c97c40a3d99c9783174feabd7ab08029e85a4011a33ff759d607429b04889f0a56938c37c22919e08 SHA512 e9eeacdc4c4ef38eca0195b90ad1fc6a5e8722c637fb5dcc608a131cc496efdc7f37ac5e2180276e65337834bc1a8dca18c46e3e3624e9447cedcf90f6a0c376
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD dvd+rw-tools-7.1-r4.ebuild 1628 BLAKE2B dc497c09d4ae3784da38654f6e511002b8ee742a5d44b612ff03a86fdf5e1a767578c323fbeb0b1bfbe3e96a99b8d08b67a9b54c6758770665b05ece9c92f1d8 SHA512 5a085d7ef7bcebee36f28db72b4e04e3603f715b4df0dac166ddca6a7f7636698f7025348ed64ec4ff2c06e2a28840b3fb723ee3ab28bdcd8b6836c12a9c10c8
+MISC metadata.xml 402 BLAKE2B ce7dad4fc9e57a354e4cbd49d7c2ba2beb8c0c8e5163ef846e51f6bfe329cb2368857bf027f0c8e01f3722ca956ed809e539ec665cf48254022efa4b0cd50519 SHA512 a69578f7391678865fdedb982b780dcf8733096a1ca36219e9045708e9643e9c5a1638f59dffeace89cdc12b0ec58c7dbea271a04b8214b8cc58034e0598b29e
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
new file mode 100644
index 000000000000..6e8c6a487ec5
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A set of tools for DVD+RW/-RW drives"
+HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/"
+SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="app-cdr/cdrtools"
+DEPEND="${RDEPEND}
+	sys-devel/m4"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0-sysmacros.patch
+	"${FILESDIR}"/${PN}-7.0-wctomb-r1.patch
+	"${FILESDIR}"/${PN}-7.0-glibc2.6.90.patch
+	"${FILESDIR}"/${PN}-7.0-dvddl-r1.patch
+	"${FILESDIR}"/${PN}-7.0-wexit.patch
+	"${FILESDIR}"/${PN}-7.0-reload.patch
+	"${FILESDIR}"/${PN}-7.1-noevent.patch
+	"${FILESDIR}"/${PN}-7.1-lastshort.patch
+	"${FILESDIR}"/${PN}-7.1-bluray_srm+pow.patch
+	"${FILESDIR}"/${PN}-7.1-bluray_pow_freespace.patch
+	"${FILESDIR}"/${PN}-7.1-clang.patch
+)
+
+# this is a text file, not html
+DOCS=( index.html )
+
+src_prepare() {
+	# Linux compiler flags only include -O2 and are incremental.
+	sed -i '/FLAGS/s:-O2::' Makefile.m4 || die "failed to sed out FLAGS"
+	default
+}
+
+src_compile() {
+	emake SHELL="${EPREFIX}"/bin/bash CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake SHELL="${EPREFIX}"/bin/bash prefix="${ED}/usr" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog 'If you receive an error, "unable to anonymously mmap...'
+		elog 'Resource temporarily unavailable" when running growisofs,'
+		elog 'then you may need to run "ulimit -l unlimited".'
+	fi
+}
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-clang.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-clang.patch
new file mode 100644
index 000000000000..430d535ed622
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-clang.patch
@@ -0,0 +1,71 @@
+--- a/dvd+rw-booktype.cpp	2006-06-24 12:21:48.000000000 +0300
++++ b/dvd+rw-booktype.cpp	2021-03-14 10:16:02.533741829 +0200
+@@ -398,7 +398,7 @@
+ 		break;
+ 	case OPT_MEDIA:
+ 		if (profile!=0x1A && profile!=0x14 && profile!=13)
+-		{   fprintf (stderr,":-( action is applicable to DVD±RW only\n");
++		{   fprintf (stderr,":-( action is applicable to DVD\xb1RW only\n");
+ 		    break;
+ 		}
+ 
+@@ -759,7 +759,7 @@
+ 	    }
+ 	}
+ 
+-	delete list;
++	delete[] list;
+     }
+ 
+     profile=buf[6]<<8|buf[7];
+--- a/dvd+rw-mediainfo.cpp	2006-09-23 20:46:57.000000000 +0300
++++ b/dvd+rw-mediainfo.cpp	2021-03-14 10:16:02.533741829 +0200
+@@ -621,7 +621,7 @@
+ 	if (phys_end>0)	phys_end -= phys_start;
+ 	if (phys_end>0) phys_end += 1;
+ 
+-	printf (" %s    %u*2KB=%"LLU"\n",
++	printf (" %s    %u*2KB=%" LLU "\n",
+ 		dvd_dash>=0?"Legacy lead-out at:":"Last border-out at:",
+ 		phys_end,phys_end*2048LL);
+ 
+@@ -941,14 +941,14 @@
+ 	    printf(" %s:\t\t%u*%u=",type[formats[8]&3],
+ 	        capacity=formats[4]<<24|formats[5]<<16|formats[6]<<8|formats[7],
+ 		blocksize);
+-	    printf("%"LLU"\n",(unsigned long long)capacity*blocksize);
++	    printf("%" LLU "\n",(unsigned long long)capacity*blocksize);
+ 
+ 	    for(i=12;i<len;i+=8)
+ 	    {	printf(" %02Xh(%x):\t\t%u*%u=",formats[i+4]>>2,
+ 			formats[i+5]<<16|formats[i+6]<<8|formats[i+7],
+ 	    		capacity=formats[i]<<24|formats[i+1]<<16|formats[i+2]<<8|formats[i+3],
+ 			blocksize);
+-		printf("%"LLU"\n",(unsigned long long)capacity*blocksize);
++		printf("%" LLU "\n",(unsigned long long)capacity*blocksize);
+ 	    }
+ 	    break;
+ 	}
+@@ -1121,7 +1121,7 @@
+ 	if (ccity) ccity++;
+ 	bsize = header[4]<<24|header[5]<<16|header[6]<<8|header[7];
+ 
+-	printf ("READ CAPACITY:          %u*%u=%"LLU"\n",
++	printf ("READ CAPACITY:          %u*%u=%" LLU "\n",
+ 					ccity,bsize,
+ 					(unsigned long long)ccity*bsize);
+     } while (0);
+--- a/transport.hxx	2021-03-14 10:17:54.353626017 +0200
++++ b/transport.hxx	2021-03-14 10:16:44.180365362 +0200
+@@ -127,9 +127,9 @@
+ 	char str[MB_LEN_MAX];
+     public:
+ 	__plusminus()	{   setlocale(LC_CTYPE,ENV_LOCALE);
+-			    int l = wctomb(str,(wchar_t)(unsigned char)'±');
++			    int l = wctomb(str,(wchar_t)'\xb1');
+ 			    if (l>0)	str[l]='\0';
+-			    else	str[0]='±',str[1]='\0';
++			    else	str[0]='\xb1',str[1]='\0';
+ 			}
+ 	~__plusminus()	{ }
+ 	operator char*(){ return str; }
diff --git a/app-cdr/dvd+rw-tools/metadata.xml b/app-cdr/dvd+rw-tools/metadata.xml
index 6f49eba8f496..6eb1c692fd55 100644
--- a/app-cdr/dvd+rw-tools/metadata.xml
+++ b/app-cdr/dvd+rw-tools/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>ceamac.paragon@gmail.com</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>