gentoo (leap year) resync : 29.02.2020

3 files changed, 34 insertions, 31 deletions

diff --git a/media-plugins/vdr-loadepg/Manifest b/media-plugins/vdr-loadepg/Manifest
index cad716ac1158..b72cfa4b2589 100644
--- a/media-plugins/vdr-loadepg/Manifest
+++ b/media-plugins/vdr-loadepg/Manifest
@@ -1,5 +1,5 @@
 AUX rc-addon.sh 237 BLAKE2B d5360013da99daf2a15f5502f962fd676ed10bda6f9a6a63a307282bf33d1ffee0afa00cc135d507dde3cccd1253755630a56fe3aee13898ff82e1f67c8554aa SHA512 bd9baeb3617a6f4891d39813ddbe9f7b3f0576b144c8bd4a6afdf3eade962ed15491ce0ce312b275c056c50769961fbae03b88db808b621d195832ab30bfefca
-AUX vdr-loadepg-0.2.5_asprintf.patch 3207 BLAKE2B 3bbb85568602e515d04a7aa090e15652748e26470207cf845fa646be6641b22c7f49ff3cd2cb4a169c44182a592625e3213f5445af43c88d00cf44327229dc06 SHA512 73efcce5b64208046421946158c4da33aa0c2df69db3c1137487d141e110ea197ec4ddaef1bf76f0c139af5246b519bcc9075ae900e6e833dff7dc6d65518b59
-DIST vdr-loadepg-0.2.5.tgz 54958 BLAKE2B 42fac197ec3708659665d503c91b1db53268b63f3a11eaab17632a445300cf9566d6bfb0a72ab728ae74df09b1af3f5b27f2298287db8702fa035614cd0d6750 SHA512 193fdd3298a547c4a503f0a64553e28611f3920743c3b224fd5bb3f57b88c4345859e3127e0f7e7aa968b32f1a7f1d5ceed6ce29414cbfe700c1f14efe889adb
-EBUILD vdr-loadepg-0.2.5.ebuild 795 BLAKE2B 9fcb5132c864e27d678904ca6cf1be1728193c6214771553b4fa09cb65ea5e4f35d9247bfb1ac3d8613a65b4d28c05863776301e38e346f2e1b20fb680ac32cb SHA512 5660788136541257cd7d852ac5eefb89bc47368859fbf2b85742b6747ede7e121c6f35a26a73010610a753363e766e55153de1749c6b191255b8425a0d4cd8a7
+AUX vdr-loadepg-0.2.7_asprintf.patch 3368 BLAKE2B 9f515641a5b58788898c1936ce850e6db336c8a33417343dc7432378d3a708976840022077edd4e56ff048015e4f9f7b8f2452db74bcff26464b5b3fe257d852 SHA512 4dc4d59c1ae833c4e5ffbc3d1bfbdd8f4346a2d84770fd66d6b3179ab332a7be40b25b731ab297965f19fc3ca44dd8a7d4673f5a91b82f1edc0642ac09520645
+DIST vdr-loadepg-0.2.7.tgz 55847 BLAKE2B 6bd61ef1af71928b57f4ac964b01df7f66de6dcf8dcb804e62725a204decd7b1440e602ceda5fc01806c42383fe51829419dae4a449c74ae5f9335086e68cb5b SHA512 4bd10c6289e6013afe020476844a2b3f446f6c37e8273316987e1591e0da0e79dbfe00a7667ca8a905b868045fcb32931d5b2b8f8cd14097e6f3246c05b5bc66
+EBUILD vdr-loadepg-0.2.7.ebuild 829 BLAKE2B b15c5698cc41d5cd5ea21a1adc631f249f5183b1c2967d21f5272af6bd9286049016bc76a69bb7c3cbf9bd1082e5b57397da5d82990a102c0301885b65b26bd7 SHA512 b6b48967b3eef196d7207d6fd8e59487fc7d0a959f0a03612cf3ea3319f5e944c210c4c4100c82237c6cd97eb08c1abf8ac7c0d77b4ace67929b1832a2bb503b
 MISC metadata.xml 498 BLAKE2B cf0a8fbd4e28315fef9cfcd95fc8c841450e64accf23e456bc930759cd8bc496fc17fdefecc543cce20b300541dd6aa01ca34ef71aadd18c8d7f52c195535548 SHA512 2fdfed4c2bd048cb52361a5c4f91d7a87d9376085c92e63a18422f39f403b7712e82b69e597f581e4457b6f99c83d6360cf82ea1a4b80b16b9c6374427b560d4
diff --git a/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch b/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.7_asprintf.patch
index c650ff61d7c3..92a8b76f8e02 100644
--- a/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch
+++ b/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.7_asprintf.patch
@@ -3,58 +3,58 @@ https://bugs.gentoo.org/663348
 compile fix for  invalid conversion from char to const char*
 thx to Michael Brakemeier for point this out
 
-Signed-of-by: Joerg Bornkessel <hd_brummy@astrali.de> (17 Nov 2019)
-diff -Naur loadepg-0.2.5.orig/loadepg.c loadepg-0.2.5/loadepg.c
---- loadepg-0.2.5.orig/loadepg.c	2019-11-17 14:49:27.637235533 +0100
-+++ loadepg-0.2.5/loadepg.c	2019-11-17 14:50:23.690235533 +0100
-@@ -159,7 +159,7 @@
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (29 Feb 2020)
+diff -Naur vdr-loadepg-0.2.7.orig/loadepg.c vdr-loadepg-0.2.7/loadepg.c
+--- vdr-loadepg-0.2.7.orig/loadepg.c	2020-02-28 14:08:35.713790460 +0100
++++ vdr-loadepg-0.2.7/loadepg.c	2020-02-28 14:11:05.457790460 +0100
+@@ -162,7 +162,7 @@
              (lProviders + nProviders)->SourceId = cSource::FromString(string2);
              asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);
              asprintf(&(lProviders + nProviders)->Parm2, "%s", string3);
--            asprintf(&(lProviders + nProviders)->Parm3, '\0');
-+            asprintf(&(lProviders + nProviders)->Parm3, "");
+-            asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0');
++            asprintf(&(lProviders + nProviders)->Parm3, (char *) "");
              nProviders ++;
              IsSkyThemesNull = true;
            }
-@@ -169,8 +169,8 @@
+@@ -172,8 +172,8 @@
              (lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_1;
              (lProviders + nProviders)->SourceId = cSource::FromString(string2);
              asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);
--            asprintf(&(lProviders + nProviders)->Parm2, '\0');
--            asprintf(&(lProviders + nProviders)->Parm3, '\0');
-+            asprintf(&(lProviders + nProviders)->Parm2, "");
-+            asprintf(&(lProviders + nProviders)->Parm3, "");
+-            asprintf(&(lProviders + nProviders)->Parm2, (char *) '\0');
+-            asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0');
++            asprintf(&(lProviders + nProviders)->Parm2, (char *) "");
++            asprintf(&(lProviders + nProviders)->Parm3, (char *) "");
              nProviders ++;
            }
            else if(sscanf(Line, "MHW_2=%[^:] :%i :%c :%[^:] :%i ", string1, &int1, &char1, string2, &int2) == 5)
-@@ -179,8 +179,8 @@
+@@ -182,8 +182,8 @@
              (lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_2;
              (lProviders + nProviders)->SourceId = cSource::FromString(string2);
              asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);
--            asprintf(&(lProviders + nProviders)->Parm2, '\0');
--            asprintf(&(lProviders + nProviders)->Parm3, '\0');
-+            asprintf(&(lProviders + nProviders)->Parm2, "");
-+            asprintf(&(lProviders + nProviders)->Parm3, "");
+-            asprintf(&(lProviders + nProviders)->Parm2, (char *) '\0');
+-            asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0');
++            asprintf(&(lProviders + nProviders)->Parm2, (char *) "");
++            asprintf(&(lProviders + nProviders)->Parm3, (char *) "");
              nProviders ++;
            }
            else if(sscanf(Line, "FILE=%[^:] :%s ", string1, string2) == 2)
-@@ -189,8 +189,8 @@
+@@ -192,8 +192,8 @@
              (lProviders + nProviders)->DataFormat = DATA_FORMAT_FILE;
              (lProviders + nProviders)->SourceId = 0;
              asprintf(&(lProviders + nProviders)->Parm1, "%s", string2);
--            asprintf(&(lProviders + nProviders)->Parm2, '\0');
--            asprintf(&(lProviders + nProviders)->Parm3, '\0');
-+            asprintf(&(lProviders + nProviders)->Parm2, "");
-+            asprintf(&(lProviders + nProviders)->Parm3, "");
+-            asprintf(&(lProviders + nProviders)->Parm2, (char *) '\0');
+-            asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0');
++            asprintf(&(lProviders + nProviders)->Parm2, (char *) "");
++            asprintf(&(lProviders + nProviders)->Parm3, (char *) "");
              nProviders ++;
            }
            else if(sscanf(Line, "SCRIPT=%[^:] :%[^:] :%s ", string1, string2, string3) == 3)
-@@ -200,7 +200,7 @@
+@@ -203,7 +203,7 @@
              (lProviders + nProviders)->SourceId = 0;
              asprintf(&(lProviders + nProviders)->Parm1, "%s", string2);
              asprintf(&(lProviders + nProviders)->Parm2, "%s", string3);
--            asprintf(&(lProviders + nProviders)->Parm3, '\0');
-+            asprintf(&(lProviders + nProviders)->Parm3, "");
+-            asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0');
++            asprintf(&(lProviders + nProviders)->Parm3, (char *) "");
              nProviders ++;
            }
          }
diff --git a/media-plugins/vdr-loadepg/vdr-loadepg-0.2.5.ebuild b/media-plugins/vdr-loadepg/vdr-loadepg-0.2.7.ebuild
index 813116671ac6..ebf8317197a9 100644
--- a/media-plugins/vdr-loadepg/vdr-loadepg-0.2.5.ebuild
+++ b/media-plugins/vdr-loadepg/vdr-loadepg-0.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,19 +12,22 @@ SRC_URI="http://lukkinosat.altervista.org/${P}.tgz"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE=""
 
 DEPEND="media-video/vdr"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}"
 
 src_prepare() {
 	# remove untranslated po files
-	rm "${S}/po/{ca_ES,cs_CZ,da_DK,el_GR,et_EE,fr_FR,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po"
+	rm "${S}"/po/{ca_ES,cs_CZ,da_DK,el_GR,et_EE,fr_FR,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
 
 	vdr-plugin-2_src_prepare
 
 	fix_vdr_libsi_include loadepg.h
 
 	eapply "${FILESDIR}/${P}_asprintf.patch"
+
 }
 
 src_install() {