gentoo resync : 27.03.2021

3 files changed, 31 insertions, 3 deletions

diff --git a/media-plugins/vdr-extrecmenu/Manifest b/media-plugins/vdr-extrecmenu/Manifest
index 66867d98245f..bf4c4a97780b 100644
--- a/media-plugins/vdr-extrecmenu/Manifest
+++ b/media-plugins/vdr-extrecmenu/Manifest
@@ -1,9 +1,10 @@
 AUX dvdarchive-2.3-beta-configfile.patch 302 BLAKE2B c3466202e7199d7cc7c4e090efd8ec329e3871729a0f53ede82393e44b58bffff3c6857dd3f71a82f01ba2fbd31f2aa28ad9ba857229e8716049607d07712e44 SHA512 59c113d672580c34b08a1a314b4104bb6400e18fa2855f02a70583975c5fd675de672006d057e1f207919aab488cf42505072fa57a61f931a58d4c1f84756ea5
 AUX dvdarchive.conf 633 BLAKE2B 1b70f19dcc9f94d1d3124773d4338c799cfabad2c0cbb0665d1e7f9cb07c914eb7a87cee4a11d77fb49d3d05cff2f7f641d210c5120c27a57c63eababcc35989 SHA512 1b4f7c68f83617d861277a491dbddfdd76b92fbf342d1cfda7cbb958cc77ce19291b8223d65774aafcd22cfcb273913c1122821eb0be97e7423b4842e9237fd0
 AUX extrecmenu.mk 3323 BLAKE2B e9446a2dc3b29bf69e314455b1b033932c6f14bdee4b4e2ec07b2bb8ab98d5d4ee795a9acdcd6906653dc6319ceb4f2979204b89e537529d5189330b9b1c5b9f SHA512 b16dad6d7be92e9a5483fa7aad8ac2a25bd26bf2d14d50bb3e2fefdd4eef8c837277747030f1403e5248d1c6c0a18530bb55521976656e8a5c2ac26f2d1827d9
+AUX vdr-extrecmenu-1.2.4_c++11.patch 1424 BLAKE2B 00e015a7a5dc9bafc1dd2393c82bd7b229273bfbb6a7999e90c53d4cfb88b4b39b5d4df43b353384a3e496c951ce3e58a8e1545f627fc2dcd5c68d4e4152fa07 SHA512 632b4608275a55cf19ca8dd3debf9b5f5db9e13cd6d7ddbc831b3603be0fc3fe7d690121462715ca66005b8d14cb2d7f892f47ef5ddc3d2ab50a07a0266e067b
 DIST dvdarchive-2.3-beta.sh.gz 3412 BLAKE2B aca97b4c7abcc907f1242482f0f0550cb38fcd357acb9ec6ebc4c978a8f50e9c63fe6fcc2932e426c5d7301f0eaccc5e2f8726e72abafe504e5503528ce782e9 SHA512 18262b1e6749961bae37894649f518f88ad2ca100b83965eb48ce7344bbf4f7bfac9d36c9b9d91744281c00c4b89fa49209cc98ca5d848b46225facf4ef7a48f
-DIST vdr-extrecmenu-1.2.4-r1.tar.gz 729966 BLAKE2B 2ec2790cc57db3a9f1d12cdc43eea3e70076ef14d9f0392eb9ab4cda4bf30999a163526416276e661430bf9b684f7d313f5f7193997118e061bf5352c5bbe39a SHA512 d3103e5bc65f968bc4f512195eaa25b04fb5261281d79c7c486fe2532656b8ee7ddc00648d46e92c468b33f95e77c6ce3b2ca67a2debcc0c7021a4b525ac0aa4
+DIST vdr-extrecmenu-1.2.4-r2.tar.gz 729966 BLAKE2B 2ec2790cc57db3a9f1d12cdc43eea3e70076ef14d9f0392eb9ab4cda4bf30999a163526416276e661430bf9b684f7d313f5f7193997118e061bf5352c5bbe39a SHA512 d3103e5bc65f968bc4f512195eaa25b04fb5261281d79c7c486fe2532656b8ee7ddc00648d46e92c468b33f95e77c6ce3b2ca67a2debcc0c7021a4b525ac0aa4
 DIST vdr-extrecmenu-1.2.4.tgz 731823 BLAKE2B a226aadb843480b62798e2c4226af8bbb5bba41946f14222616ec43eec94a1b45150661ceb9ecb85e714673f408ab01849b6d55b6572da8028e6b47f9991916d SHA512 a750c6ad244e2afd3f04cafe634ec3c58baf4a38a809121a7c9045c327b4f10cb28b7aab4b7bd0e86d0b7febf85cc7fbc258bdd83386a60ddfe748347192f592
-EBUILD vdr-extrecmenu-1.2.4-r1.ebuild 1063 BLAKE2B 7764fb26b2589c394dfb276c0c546c3adccd577acf196058ecda39db9f5e4136c9811070480376eb32c8d1fb736ebac56b7fd34ebdf0757bb1899ee7663cb4d7 SHA512 13a1bd0103cadfae6f8965796c4d74c15d24582a6b14d8a407a97d26046a1f0ba9fc6d89f49de9d02d550c9d1ca480e1dc7cab70a8f4371bcec38127145907a5
+EBUILD vdr-extrecmenu-1.2.4-r2.ebuild 1098 BLAKE2B 90e947b247b944d3d2d9e6b0139a0a75a3f9b09d46b632dd421500fd7eb390cfa07300d34cb7ba10f209319ea7a00620e4a01189b8aec20508e911c15f9409cf SHA512 017cddfe0c29191f8582a14ad548694820cf30531cdc9fd96f87aa649868c60f50676e34f4a9c13045f88a86fb5f10dc993fea35b87bded404ad1529ed30e9ac
 EBUILD vdr-extrecmenu-1.2.4.ebuild 971 BLAKE2B dc21e6f6257e60c5908639dcffbd2a030262decba1bebfabc9bc31dbbfcc2da33ae19274db5ff04a18fd2ef31c2b62d110ee8ff72ecc3dc98ecbb18954abfd40 SHA512 3a77be9edbb717937019724446722a8cfc30fd88b67699c8cae6b2854411381662abe97152b35078b3dbb107dc5ee916bbf5335c4a0015d3f8305248e7438b29
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.4_c++11.patch b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.4_c++11.patch
new file mode 100644
index 000000000000..91df23911a42
--- /dev/null
+++ b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.4_c++11.patch
@@ -0,0 +1,25 @@
+C++11 requires a space between literal and identifier
+https://bugs.gentoo.org/740282
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org>
+diff -Naur vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b.orig/mymenueditrecording.c vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b/mymenueditrecording.c
+--- vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b.orig/mymenueditrecording.c	2021-03-21 17:25:40.260078140 +0100
++++ vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b/mymenueditrecording.c	2021-03-21 17:26:15.560078140 +0100
+@@ -626,7 +626,7 @@
+ { //This has been taken from remotetimers-0.1.5, written by Frank Schmirler <vdrdev@schmirler.de>
+ 
+ #if VDRVERSNUM > 10713
+-  cString InfoFileName=cString::sprintf(Recording->IsPesRecording()?"%s/"INFOFILE_PES:"%s/"INFOFILE_TS,Recording->FileName());
++  cString InfoFileName=cString::sprintf(Recording->IsPesRecording()?"%s/" INFOFILE_PES:"%s/" INFOFILE_TS,Recording->FileName());
+ 	FILE *f = fopen(InfoFileName, "a");
+ 	if (f)
+ 	{
+@@ -641,7 +641,7 @@
+ 	else
+ 		esyslog("[extrecmenu] writing to '%s' failed: %m", *InfoFileName);
+ #else
+-  cString InfoFileName=cString::sprintf("%s/"INFOFILE_PES,Recording->FileName());
++  cString InfoFileName=cString::sprintf("%s/" INFOFILE_PES,Recording->FileName());
+   // check for write access as cRecording::WriteInfo() always returns true
+   if(access(InfoFileName,W_OK)==0)
+   {
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r1.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r2.ebuild
index 5139180dea0a..9292fd19242c 100644
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r1.ebuild
+++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,6 +25,8 @@ S="${WORKDIR}/vdr-plugin-extrecmenu-${GIT_VERSION}"
 src_prepare() {
 	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po || die
 
+	eapply "${FILESDIR}/${P}_c++11.patch"
+
 	cd "${WORKDIR}" || die
 	eapply -p0 "${FILESDIR}/${DVDARCHIVE%.sh}-configfile.patch"