gentoo resync : 03.03.2021

7 files changed, 34 insertions, 110 deletions

diff --git a/media-plugins/vdr-satip/Manifest b/media-plugins/vdr-satip/Manifest
index cca1addc7d52..004ba93dd2c6 100644
--- a/media-plugins/vdr-satip/Manifest
+++ b/media-plugins/vdr-satip/Manifest
@@ -1,10 +1,6 @@
 AUX confd 2025 BLAKE2B 56f5d7cd65289204c5ca05e9f885110064cef68283dda7619c7efa6e0653db00d82af627c2523d1b732cdf32ab7f3a7202938c59970ec1e8275c5007d83b4020 SHA512 514a4b6a6b920410a83220b8345d8b918f922b096b356d690d771947cfaf8705797fd15498c21c44201a2ecda8cd1aff7deedde4489d24497c7dc3206354b16c
-AUX vdr-satip-2.2.3_c++11.patch 1337 BLAKE2B 30f61831ebf10a040433e231f902c1559c1dbe4243cafa8a6e583ff2d1091739adec7de89fa013687581c0c58bcb48afebed2f46833ff454b8131790709e10cb SHA512 e1c8a4d0e414d886563d8273e46380528e5d67ad02281667cb607f0643cd27c08f00d919a1f62f8de97bbd401317f6dc25a96e4a8c1588a57d691a95e4593210
-AUX vdr-satip-2.2.3_missinginclude.patch 472 BLAKE2B fd2a608deb3edb3dbbfd0cdee01261586b16bf8f7683dcce85e7f019bde6dd1bbb60e5b7dee821a04528fe07f0d62265a4899928cbcb53cb31bb7b339b3ffb79 SHA512 a2e3e56557a91d6a2efe0d236ddde821236a0c94981764eb101545db67da0e437851fee4fe9715b4eec1c49aef082bfd7f3933d1eef1a738bf621b27841e2e20
-DIST vdr-satip-2.2.3.tgz 62722 BLAKE2B 408fe520b4210fa24667d4244560d5132260ce08067d482a50b12446c42c0c34fd922b3429d00c4e3550a7b1dc1d21bfac534cae9de478594751b9cf0f558d52 SHA512 451606b52831c009aaec894f0547c59a9447279d7f96a4b2291614eab09a3539849abcb6974b7c2c4b34e7b43a2f9c782ab1ea6bfd4e35f9747349065fb6a5e7
+DIST vdr-plugin-satip-43b60b1566878104240cbae5b1e322bbacd380e1.tar.gz 74697 BLAKE2B a1e763e1837cf00718469333304a858cec9802bc65ca0e607664ce0bc0594d038586b10fdbe822cb62e8d9d68441bc39b9c4356ce88e328cc08e41a3e7e2c213 SHA512 6447d424d119e738b3dc747b9ec27c24ed15143bee176cca4cbd09d43a9c5cfd03bb1d39fa2c3b4409af583e25489872d5350d32570d0790e2327759a6181b2e
 DIST vdr-satip-2.2.5.tgz 74669 BLAKE2B e586297f0f0c1ca776d4c9f83b46da7f7afe82b80ac7e79ec2da7107c793f5c8a5092590ad23030a435e2d034b084373b9b069bac6ef81822723d33ff6c7fab2 SHA512 3f8ab1d9e84843e71bc6fc8f712d178fa3d304d0959ec977de1b11829e27b575feb78735c6770b15d4dfb8f4fce933aed7df07a6d9ba0b20e937aacd3c643a21
-DIST vdr-satip-2.4.0_p20191027.tar.gz 74205 BLAKE2B 06d847bdec0aa996b5a12df8effcbed1f6cb508664aceda67f6ca415b84646e2f116e329068abd735403c145971146335a004d43e38ede133db03e37ba5b3117 SHA512 087b767583393608995141bf15f02793fb48ee448fe5c3becad34e2e84a4dc8391feb00c1b68fd37377837bd4468f766a8a389e720be375bd2cb6847277e887c
-EBUILD vdr-satip-2.2.3-r2.ebuild 815 BLAKE2B 3eb5ac32d26a1d9fea1d93305c1a696b76f664931ed4db1f62ee754e082c9339a49cbfa2b1db724a2f35f000c10194666f32bda88ded9d421b3c76b784f21ef2 SHA512 96d5d97b75d831c1a33e2e893a7807370aaab66ab6c70bff6d354b8fbaaa64db7f9468d2f132c5b6fdeb1fd68bb4aa3cfe7f3646c79dfbf65a41f416e055b327
-EBUILD vdr-satip-2.2.5.ebuild 780 BLAKE2B 89a68d6ae200ef016abd27f999697520bc1479c7fbaf863e55050b7a9e7c8975bc2702a80acbdb045a16d8574e1f2417a12c2cefae73460ccef60dfdeed559c7 SHA512 977d02ff9e65aee2fd28d4895d3861d45c38f1d1a55a731eae9f14f7624a4e1357f8f10ed301ba09e5debbc4d0aca676440b1444582ab5d18c96fbbfe1557ea2
-EBUILD vdr-satip-2.4.0_p20191027.ebuild 927 BLAKE2B dd4c616ec5347a257e245be3872be5c04ced2e0136d35e413f128398fdeadd5e751232dc518929c624fa809acfc116c74fab36b0df1e86bc950d4840760fe264 SHA512 818ab348d0143e995e0a513b95cae910e3a7016b1e10ca7ab78a7d29aac11fbbabc56b1c3bef39893196fad67fdca0775e789dd57ce2e9200599e703a9c798e5
-MISC metadata.xml 465 BLAKE2B 13cded0da3a72588225358dda5fd14556174ee71474c6b45f1a7e90cdf292febd74d5377ce20ae8a09a76c39ddc558a60d4cca25803131c4c8ca88ed77a5f00f SHA512 8ac89613741c22f977e5d4860aabf70a3b369d2ac8f1ce4015fbbf66e5ef1ea07d6df9f65cc3b625102edc7ab78d96b39e131642629d195c492134912aebf995
+EBUILD vdr-satip-2.2.5.ebuild 797 BLAKE2B 38e3e9ba257e3e7237c6918bf4935d6f50796edad3d04265c4fb0f36f9477e1558093f08deb518c3fde8377ca396a4c24e90ec1fda46a4f19d4d7df2bf7284b8 SHA512 3ced04c065278d0d593a11ee9c2fcbbaeaedaa6fd0586ff5a0ae935c050afdfece801d28dbc73109a0b8592c10b690bb574134763b62ad88ae6350b0134ef64d
+EBUILD vdr-satip-2.4.0_p20210131.ebuild 1067 BLAKE2B 0b2cc81f1718c98a5559310098bf47a9f7028cae7c22e0d7ec13f1fcd067135dca0e1d9225cfe811fb0efec9215a8c84bcc0d8ba621d9b9edd29037df9c247fb SHA512 38e0f6cb84aece67a69e466d8dcab7333a78da01840a59c38ebd0504d0f43a7a23c89e61328efaa6daf5ac42d2be5acc02c04e9615a7430192e59cbc17f87643
+MISC metadata.xml 567 BLAKE2B 4915f7c9f78f6b2c42ad151a32a5aa84b035e1abf87bd5fb5404990298dd9f03ecd9f7ed8af1d45f81366c3489b56ef6f8cadd13052dc89618f1c5f25ba85f98 SHA512 8bcce4b0085a8f4fb5f2d88de85a12babfc2bb8a1d5652f8d186c7beb1888175ddf1050de84c521b82dbc8e137ed2da006a035c204883fa7734261b7ac79c91d
diff --git a/media-plugins/vdr-satip/files/vdr-satip-2.2.3_c++11.patch b/media-plugins/vdr-satip/files/vdr-satip-2.2.3_c++11.patch
deleted file mode 100644
index 102e8e970b97..000000000000
--- a/media-plugins/vdr-satip/files/vdr-satip-2.2.3_c++11.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-common.h still use function typeof,
-this was never defined part of c++ and is
-not supported in c++11 anymore
-so we revert back to gnu++03 as it is not fixed by upstream
-Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2016/aug/01)
-diff -Naur satip-2.2.3.orig/Makefile satip-2.2.3/Makefile
---- satip-2.2.3.orig/Makefile	2016-08-03 23:17:36.769080128 +0200
-+++ satip-2.2.3/Makefile	2016-08-03 23:18:36.399080128 +0200
-@@ -32,6 +32,7 @@
- 
- export CFLAGS   = $(call PKGCFG,cflags)
- export CXXFLAGS = $(call PKGCFG,cxxflags)
-+export CXXFLAGS += -std=gnu++03
- STRIP = true
- 
- ### The version number of VDR's plugin API:
-diff -Naur satip-2.2.3.orig/common.h satip-2.2.3/common.h
---- satip-2.2.3.orig/common.h	2016-08-07 02:54:27.290440336 +0200
-+++ satip-2.2.3/common.h	2016-08-07 02:54:53.193773669 +0200
-@@ -52,7 +52,7 @@
-   do {                                                       \
-      if (exp) {                                              \
-         char tmp[64];                                        \
--        esyslog("[%s,%d]: "errstr": %s", __FILE__, __LINE__, \
-+        esyslog("[%s,%d]: " errstr ": %s", __FILE__, __LINE__, \
-                 strerror_r(errno, tmp, sizeof(tmp)));        \
-         func;                                                \
-         ret;                                                 \
diff --git a/media-plugins/vdr-satip/files/vdr-satip-2.2.3_missinginclude.patch b/media-plugins/vdr-satip/files/vdr-satip-2.2.3_missinginclude.patch
deleted file mode 100644
index 4d0b32329e23..000000000000
--- a/media-plugins/vdr-satip/files/vdr-satip-2.2.3_missinginclude.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fix:  isspace was not declared in this scope
-https://github.com/rofafor/vdr-plugin-satip/commit/c10372bb4f1
-
-Signed-of by: Joerg Bornkessel <hd_brummy@gentoo.org> (03/Sep/2018)
-diff -Naur satip-2.2.3.orig/satip.c satip-2.2.3/satip.c
---- satip-2.2.3.orig/satip.c	2018-09-03 13:00:20.000000000 +0200
-+++ satip-2.2.3/satip.c	2018-09-03 13:00:54.000000000 +0200
-@@ -5,6 +5,7 @@
-  *
-  */
- 
-+#include <ctype.h>
- #include <getopt.h>
- #include <vdr/plugin.h>
- #include "common.h"
diff --git a/media-plugins/vdr-satip/metadata.xml b/media-plugins/vdr-satip/metadata.xml
index 0f020916bb47..35945118910f 100644
--- a/media-plugins/vdr-satip/metadata.xml
+++ b/media-plugins/vdr-satip/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>martin.dummer@gmx.net</email>
-	<name>Martin Dummer</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-<maintainer type="project">
-	<email>vdr@gentoo.org</email>
-	<name>Gentoo VDR Project</name>
-</maintainer>
+	<maintainer type="person">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github"> rofafor/vdr-plugin-satip</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-plugins/vdr-satip/vdr-satip-2.2.3-r2.ebuild b/media-plugins/vdr-satip/vdr-satip-2.2.3-r2.ebuild
deleted file mode 100644
index 805adb773dd9..000000000000
--- a/media-plugins/vdr-satip/vdr-satip-2.2.3-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: integrates SAT>IP network devices seamlessly into VDR"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/${P}.tgz"
-
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2.2.0
-		>=net-misc/curl-7.36
-		|| ( dev-libs/tinyxml
-			dev-libs/pugixml )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	# c++11 compile fix
-	eapply "${FILESDIR}/${P}_c++11.patch"
-
-	#gcc 7 compile fix
-	eapply "${FILESDIR}/${P}_missinginclude.patch"
-
-	if has_version "dev-libs/tinyxml" ; then
-		sed -e "s:#SATIP_USE_TINYXML:SATIP_USE_TINYXML:" -i Makefile
-	fi
-}
diff --git a/media-plugins/vdr-satip/vdr-satip-2.2.5.ebuild b/media-plugins/vdr-satip/vdr-satip-2.2.5.ebuild
index 026fed5a737c..11e7bd6d9b99 100644
--- a/media-plugins/vdr-satip/vdr-satip-2.2.5.ebuild
+++ b/media-plugins/vdr-satip/vdr-satip-2.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit vdr-plugin-2
 
 DESCRIPTION="VDR Plugin: integrates SAT>IP network devices seamlessly into VDR"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/${P}.tgz"
+HOMEPAGE="https://github.com/rofafor/vdr-plugin-satip"
+SRC_URI=" https://github.com/rofafor/vdr-plugin-satip/archive/v${PV}.tar.gz -> ${P}.tgz"
 
 KEYWORDS="~amd64 ~arm ~x86"
 SLOT="0"
diff --git a/media-plugins/vdr-satip/vdr-satip-2.4.0_p20191027.ebuild b/media-plugins/vdr-satip/vdr-satip-2.4.0_p20210131.ebuild
index cd4da2275d45..eb01453dfd26 100644
--- a/media-plugins/vdr-satip/vdr-satip-2.4.0_p20191027.ebuild
+++ b/media-plugins/vdr-satip/vdr-satip-2.4.0_p20210131.ebuild
@@ -1,25 +1,25 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit vdr-plugin-2
 
-GIT_COMMIT="19e3057f34d9c097c8c6bad30188b14d80b7a242"
+GIT_COMMIT="43b60b1566878104240cbae5b1e322bbacd380e1"
 MY_P="vdr-plugin-satip-${GIT_COMMIT}"
 
 DESCRIPTION="VDR Plugin: integrates SAT>IP network devices seamlessly into VDR"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"
-SRC_URI="https://github.com/rofafor/vdr-plugin-satip/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/rofafor/vdr-plugin-satip"
+SRC_URI="https://github.com/rofafor/vdr-plugin-satip/archive/${GIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
-DEPEND=">=media-video/vdr-2.4.0
-		>=net-misc/curl-7.36
-		|| ( dev-libs/pugixml
-		dev-libs/tinyxml )"
+DEPEND="
+	>=media-video/vdr-2.4.0
+	>=net-misc/curl-7.36
+	|| ( dev-libs/tinyxml dev-libs/pugixml )"
 RDEPEND="${DEPEND}"
 
 QA_FLAGS_IGNORED="
@@ -30,7 +30,10 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	vdr-plugin-2_src_prepare
 
-	if has_version "dev-libs/tinyxml" ; then
+	if has_version "dev-libs/tinyxml"; then
 		sed -e "s:#SATIP_USE_TINYXML:SATIP_USE_TINYXML:" -i Makefile || die "sed failed"
 	fi
+
+	local GIT_COMMIT_SHORT=${GIT_COMMIT:0:7}
+	sed -i -e "s:GITTAG  =.*:GITTAG=${GIT_COMMIT_SHORT}:" Makefile || die "Failed to modify Makefile"
 }