gentoo resync : 15.01.2020

4 files changed, 44 insertions, 229 deletions

diff --git a/media-plugins/vdr-extrecmenu/Manifest b/media-plugins/vdr-extrecmenu/Manifest
index 26f1ee7e5f74..bd2d83dd5f99 100644
--- a/media-plugins/vdr-extrecmenu/Manifest
+++ b/media-plugins/vdr-extrecmenu/Manifest
@@ -1,10 +1,9 @@
 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.2_vdr-2.1.2.diff 5354 BLAKE2B b6e664cb6deb4c9fd443311efdf6238b889adddc0bf991848b5a3b758a95bee4e4650ebd2ddd71db9780d780e19e85abe0c4e7ae9d786034abe1c1ff2ce17a9a SHA512 ac98098a48890651c5c98aa9659f7ba495facdbd647be9d735fcfe4e7e20ca12c2f32ef25c723a4684144e98ae0446c7c1a4a61c2c4a7c96ad354347f819fa13
 DIST dvdarchive-2.3-beta.sh.gz 3412 BLAKE2B aca97b4c7abcc907f1242482f0f0550cb38fcd357acb9ec6ebc4c978a8f50e9c63fe6fcc2932e426c5d7301f0eaccc5e2f8726e72abafe504e5503528ce782e9 SHA512 18262b1e6749961bae37894649f518f88ad2ca100b83965eb48ce7344bbf4f7bfac9d36c9b9d91744281c00c4b89fa49209cc98ca5d848b46225facf4ef7a48f
-DIST vdr-extrecmenu-1.2.2.tgz 734012 BLAKE2B 0598447cbcd8337f08722503743f8cfb38d8ea9533d0e4b4ea281ca6cc0cf6e9fbfc439ab1243b749007838b0640398a895715124382ca73abf8965c81762c8e SHA512 071fd3c1d44afe17081ff2cdd747555d4218cffa2fd101ffa9c77b81376114af829bf58ce2f70f74eb7eb1090699b6a85a8e7105e3bf748ee7e8cb39ebee4f3c
+DIST vdr-extrecmenu-1.2.4-r1.tar.gz 729966 BLAKE2B 2ec2790cc57db3a9f1d12cdc43eea3e70076ef14d9f0392eb9ab4cda4bf30999a163526416276e661430bf9b684f7d313f5f7193997118e061bf5352c5bbe39a SHA512 d3103e5bc65f968bc4f512195eaa25b04fb5261281d79c7c486fe2532656b8ee7ddc00648d46e92c468b33f95e77c6ce3b2ca67a2debcc0c7021a4b525ac0aa4
 DIST vdr-extrecmenu-1.2.4.tgz 731823 BLAKE2B a226aadb843480b62798e2c4226af8bbb5bba41946f14222616ec43eec94a1b45150661ceb9ecb85e714673f408ab01849b6d55b6572da8028e6b47f9991916d SHA512 a750c6ad244e2afd3f04cafe634ec3c58baf4a38a809121a7c9045c327b4f10cb28b7aab4b7bd0e86d0b7febf85cc7fbc258bdd83386a60ddfe748347192f592
-EBUILD vdr-extrecmenu-1.2.2-r2.ebuild 1366 BLAKE2B 316940a462d525ee60d81ab76905b2bc736840c0a70321a82df49b930eb7e02cab231f1ff22ede2dda7272250577aca0b707aca5c9ddf756ab31df9c1362a3a8 SHA512 62e3b589eeda57554c0a03e0cd92dbf85e464fc72109eb75b43ea72b0e280a028f84193fe37620164b990740546f24199221cff34b455fd102aa89dc026bec63
+EBUILD vdr-extrecmenu-1.2.4-r1.ebuild 1063 BLAKE2B 7764fb26b2589c394dfb276c0c546c3adccd577acf196058ecda39db9f5e4136c9811070480376eb32c8d1fb736ebac56b7fd34ebdf0757bb1899ee7663cb4d7 SHA512 13a1bd0103cadfae6f8965796c4d74c15d24582a6b14d8a407a97d26046a1f0ba9fc6d89f49de9d02d550c9d1ca480e1dc7cab70a8f4371bcec38127145907a5
 EBUILD vdr-extrecmenu-1.2.4.ebuild 971 BLAKE2B dc21e6f6257e60c5908639dcffbd2a030262decba1bebfabc9bc31dbbfcc2da33ae19274db5ff04a18fd2ef31c2b62d110ee8ff72ecc3dc98ecbb18954abfd40 SHA512 3a77be9edbb717937019724446722a8cfc30fd88b67699c8cae6b2854411381662abe97152b35078b3dbb107dc5ee916bbf5335c4a0015d3f8305248e7438b29
 MISC metadata.xml 321 BLAKE2B 8db922a52a70940c07786766b9ae2e76d51c13fb68dd79ab9fe84f841a71592757c2a7d72a1943cee54d54b4e9bcd11f5ebc10b6ff21c2c22338591279b8369f SHA512 1bfa4279dd2502d0aa29b160da234cea71acb09d6b4775c65c11b83f38e56f69b71d96076f516a54ce4ac7b84790f0a2b5822d0d54fd65e9afd7c905a2f7f7ce
diff --git a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.2_vdr-2.1.2.diff b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.2_vdr-2.1.2.diff
deleted file mode 100644
index b1f4d391a44a..000000000000
--- a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.2_vdr-2.1.2.diff
+++ /dev/null
@@ -1,167 +0,0 @@
-diff -Naur extrecmenu-1.2.2.orig/mymenueditrecording.c extrecmenu-1.2.2/mymenueditrecording.c
---- extrecmenu-1.2.2.orig/mymenueditrecording.c	2013-10-23 13:14:38.010071212 +0200
-+++ extrecmenu-1.2.2/mymenueditrecording.c	2013-10-23 13:21:12.560096164 +0200
-@@ -76,7 +76,11 @@
- 
-       if(isdir)
-       {
-+#if APIVERSNUM > 20101
-+        if(-1==asprintf(&oldname,"%s%s%s/%s",cVideoDirectory::Name(),tmppath?"/":"",dirbase?dirbase:"",dirname))
-+#else
-         if(-1==asprintf(&oldname,"%s%s%s/%s",VideoDirectory,tmppath?"/":"",dirbase?dirbase:"",dirname))
-+#endif
-           oldname=NULL;
-       }
-       else
-@@ -84,7 +88,11 @@
- 
-       if(oldname)
-       {
-+#if APIVERSNUM > 20101
-+        if(-1==asprintf(&newname,"%s%s%s/%s%s",cVideoDirectory::Name(),tmppath?"/":"",tmppath?tmppath:"",tmpname,isdir?"":strrchr(recording->FileName(),'/')))
-+#else
-         if(-1==asprintf(&newname,"%s%s%s/%s%s",VideoDirectory,tmppath?"/":"",tmppath?tmppath:"",tmpname,isdir?"":strrchr(recording->FileName(),'/')))
-+#endif
-           newname=NULL;
- 
-         if(newname)
-@@ -305,7 +313,11 @@
- 
-   if(dirname)
-   {
-+#if APIVERSNUM > 20101
-+    if(-1==asprintf(&oldname,"%s%s%s/%s",cVideoDirectory::Name(),dirbase?"/":"",tmpdirbase?tmpdirbase:"",tmpdirname))
-+#else
-     if(-1==asprintf(&oldname,"%s%s%s/%s",VideoDirectory,dirbase?"/":"",tmpdirbase?tmpdirbase:"",tmpdirname))
-+#endif
-       oldname=NULL;
-   }
-   else
-@@ -357,7 +369,11 @@
-     if(dir)
-       dir=ExchangeChars(dir,true);
- 
-+#if APIVERSNUM > 20101
-+    if(-1==asprintf(&_newname,"%s%s%s%s",cVideoDirectory::Name(),dir?"/":"",dir?dir:"",strrchr(dirname?oldname:recording->FileName(),'/')))
-+#else
-     if(-1==asprintf(&_newname,"%s%s%s%s",VideoDirectory,dir?"/":"",dir?dir:"",strrchr(dirname?oldname:recording->FileName(),'/')))
-+#endif
-       _newname=NULL;
- 
-     if(_newname)
-@@ -424,7 +440,11 @@
-                 {
-                   if(!strncmp(oldname,rec->FileName(),strlen(oldname)))
-                   {
-+#if APIVERSNUM > 20101
-+                    char *_buf=ExchangeChars(strdup(oldname+strlen(cVideoDirectory::Name())+1),false);
-+#else
-                     char *_buf=ExchangeChars(strdup(oldname+strlen(VideoDirectory)+1),false);
-+#endif
- 
-                     if(strcmp(rec->Name(),_buf))
-                     {
-diff -Naur extrecmenu-1.2.2.orig/mymenurecordings.c extrecmenu-1.2.2/mymenurecordings.c
---- extrecmenu-1.2.2.orig/mymenurecordings.c	2013-10-23 13:14:38.010071212 +0200
-+++ extrecmenu-1.2.2/mymenurecordings.c	2013-10-23 13:27:17.916785937 +0200
-@@ -590,7 +590,11 @@
- {
-   if(mysetup.FileSystemFreeMB)
-   {
-+#if APIVERSNUM > 20101
-+    string path=cVideoDirectory::Name();
-+#else
-     string path=VideoDirectory;
-+#endif
-     path+="/";
-     char *tmpbase=base?ExchangeChars(strdup(base),true):NULL;
-     if(base)
-@@ -634,7 +638,11 @@
-   else
-   {
-     int freemb;
-+#if APIVERSNUM > 20101
-+    cVideoDirectory::VideoDiskSpace(&freemb);
-+#else
-     VideoDiskSpace(&freemb);
-+#endif
-     return freemb;
-   }
- 
-@@ -747,7 +755,11 @@
-   for(cRecording *recording=Recordings.First();recording;recording=Recordings.Next(recording))
-     list->Add(new myRecListItem(recording));
-   // sort my recordings list
-+#if APIVERSNUM > 20101
-+  string path=cVideoDirectory::Name();
-+#else
-   string path=VideoDirectory;
-+#endif
-   path+="/";
-   if(base)
-     path+=base;
-@@ -1211,7 +1223,11 @@
-       {
-         char *strBase=base?ExchangeChars(strdup(base), true):NULL;
-         char *strName=ExchangeChars(strdup(item->Name()), true);
-+#if APIVERSNUM > 20101
-+        if(-1==asprintf(&parameter,"\"%s/%s/%s\"",cVideoDirectory::Name(),strBase?strBase:"", strName))
-+#else
-         if(-1==asprintf(&parameter,"\"%s/%s/%s\"",VideoDirectory,strBase?strBase:"", strName))
-+#endif
-           parameter=NULL;
-         free(strBase);
-         free(strName);
-@@ -1235,7 +1251,11 @@
- // change sorting
- eOSState myMenuRecordings::ChangeSorting()
- {
-+#if APIVERSNUM > 20101
-+  string path=cVideoDirectory::Name();
-+#else
-   string path=VideoDirectory;
-+#endif
-   path+="/";
-   if(base)
-     path+=base;
-diff -Naur extrecmenu-1.2.2.orig/tools.c extrecmenu-1.2.2/tools.c
---- extrecmenu-1.2.2.orig/tools.c	2013-10-23 13:14:38.010071212 +0200
-+++ extrecmenu-1.2.2/tools.c	2013-10-23 13:36:56.026822499 +0200
-@@ -152,7 +152,11 @@
-     {
-       if(!strncmp(OldName,item->recording->FileName(),strlen(OldName)))
-       {
-+#if APIVERSNUM > 20101
-+        buf=strdup(OldName+strlen(cVideoDirectory::Name())+1);
-+#else
-         buf=strdup(OldName+strlen(VideoDirectory)+1);
-+#endif
-         if(buf)
-         {
-           buf=ExchangeChars(buf,false);
-@@ -240,8 +244,13 @@
- {
-   myRecListItem *item=(myRecListItem*)&ListObject;
- 
-+#if APIVERSNUM > 20101
-+ char *s1=StripEpisodeName(strdup(filename+strlen(cVideoDirectory::Name())));
-+ char *s2=StripEpisodeName(strdup(item->filename+strlen(cVideoDirectory::Name())));
-+#else
-   char *s1=StripEpisodeName(strdup(filename+strlen(VideoDirectory)));
-   char *s2=StripEpisodeName(strdup(item->filename+strlen(VideoDirectory)));
-+#endif
- 
-   int compare;
-   if(mysetup.DescendSorting)
-@@ -699,7 +708,11 @@
- 
-                   isyslog("[extrecmenu] moving canceled");
- 
-+#if APIVERSNUM > 20101
-+                  cVideoDirectory::RemoveVideoFile(To.c_str());
-+#else
-                   RemoveVideoFile(To.c_str());
-+#endif
- 
-                   return true;
-                 }
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild
deleted file mode 100644
index 68be40df19ff..000000000000
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-VERSION="936" #every bump, new version
-
-DVDARCHIVE="dvdarchive-2.3-beta.sh"
-
-DESCRIPTION="VDR Plugin: Extended recordings menu"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-extrecmenu"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
-	mirror://gentoo/${DVDARCHIVE}.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.6.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${DVDARCHIVE%.sh}-configfile.patch"
-
-	cd "${S}"
-	if grep -q fskProtection /usr/include/vdr/timers.h; then
-		einfo "Enabling parentalrating option"
-		sed -i "s:#WITHPINPLUGIN:WITHPINPLUGIN:" Makefile
-	fi
-
-	vdr-plugin-2_src_prepare
-
-	if has_version ">=media-video/vdr-1.7.28"; then
-		sed -i "s:SetRecording(recording->FileName(),recording->Title:SetRecording(recording->FileName:" mymenurecordings.c
-	fi
-
-	if has_version ">=media-video/vdr-1.7.32"; then
-		export EXTRECMENU_USE_VDR_CUTTER=1
-		einfo "disabled plugin cutter"
-		einfo "plugin use now the vdr included cutter"
-	fi
-
-	epatch "${FILESDIR}/${P}_vdr-2.1.2.diff"
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	cd "${WORKDIR}"
-	newbin ${DVDARCHIVE} dvdarchive.sh
-
-	insinto /etc/vdr
-	doins "${FILESDIR}"/dvdarchive.conf
-}
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r1.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..5139180dea0a
--- /dev/null
+++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+GIT_VERSION="77d10faec3c7b0abe25ba3b161dc3b4e2cad042b"
+
+DVDARCHIVE="dvdarchive-2.3-beta.sh"
+
+DESCRIPTION="VDR Plugin: Extended recordings menu"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-extrecmenu"
+SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-extrecmenu.git/snapshot/vdr-plugin-extrecmenu-${GIT_VERSION}.tar.gz -> ${PF}.tar.gz
+	mirror://gentoo/${DVDARCHIVE}.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="media-video/vdr"
+
+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
+
+	cd "${WORKDIR}" || die
+	eapply -p0 "${FILESDIR}/${DVDARCHIVE%.sh}-configfile.patch"
+
+	vdr-plugin-2_src_prepare
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	cd "${WORKDIR}"
+	newbin ${DVDARCHIVE} dvdarchive.sh
+
+	insinto /etc/vdr
+	doins "${FILESDIR}"/dvdarchive.conf
+}