gentoo resync : 15.01.2020

6 files changed, 83 insertions, 45 deletions

diff --git a/media-plugins/vdr-skinelchi/Manifest b/media-plugins/vdr-skinelchi/Manifest
index 4b0907102c0b..c68c35d63fda 100644
--- a/media-plugins/vdr-skinelchi/Manifest
+++ b/media-plugins/vdr-skinelchi/Manifest
@@ -1,4 +1,5 @@
-AUX rc-addon-0.1.1_pre2-r1.sh 515 BLAKE2B 64bb503cb99ed2ef0c30c56cc999081bd2a378d817ef57085c0d054a00d9dfc26f0a602d0d2503ad07851da6c6d376c6816a78bc54f9ce5b338304a75c5a5f5b SHA512 5d8eed7492add54122bf6d4a3a18f6be004f0c78815fe05c27df818fc68f221460178ba9b3936072ba1f433b1d65dafa766a6c9f488c4fa8ad851d1441d09af6
+AUX vdr-skinelchi-0.3.0_min_max_from_stl.patch 887 BLAKE2B 8f54521791e59a970fe61a0a66a4989ded5edb06893f685cf18060b04bc95f2ea7569e8389083d839fcff4a826598cba8e43154ac256bed0a13d614b67c6b643 SHA512 021f9a13d1898aafe436d877bce6b9eb3d0e3303012eba8ce244071f8529f4ad931c20af0a5db257dc817b0cad61916eb6934c81fa01a6a54a10efcc9abee6da
 DIST vdr-skinelchi-0.3.0.tar.bz2 78806 BLAKE2B b2f9e94484e6e8e9829fbc4a53485c8fa094563aab9a090b1dc0b1f55b769d416d21bba8fac81297740eb72cfed4110cbf545a2faf9e0542cf8b3e75f31e533d SHA512 28ffaf956435b8f5caf84b1562b1450214cfc96906dfce3455093627e1f1807a6c3bc37aaf1055148a719debd8b0a6a8c860a869a42850a61f0c6a1551294c8f
-EBUILD vdr-skinelchi-0.3.0.ebuild 1082 BLAKE2B f0c7e9e985ca3d5294e55efa1d3f85250874d6e89d8d8e9613cdd63135ea6da55d07d3ee44db577cff80bef3b46fe1a507db412e4ebd635a475e1f1d6e11a9f0 SHA512 c2e0e95ab17be23712a6b76e094d1c21165a9f8258817c0d73fdf901b9d82a9e1ad62748a4428d44e312e1695f867adaf922709411344549c2a1ef3ae4709368
-MISC metadata.xml 328 BLAKE2B b8a05db00f77a984e9b580144c99289528d6f42d9c871e69c8626c43b3b7c8b2116d4be77e0bb4fc78e270fb5670ef2c1142129713178a3a18eb7822c8c65a20 SHA512 0e3a0afd1065619a448bf317183ff69fba885f12bb5db47ce08a8b66e2cb2ce84504eff8ddcfc89a02968e6f6507d91acbe7415e6e3b0c543f67666df3873ef0
+EBUILD vdr-skinelchi-0.3.0-r1.ebuild 943 BLAKE2B 4318b6bdb0b159f6006730299ef659b11a60bf4ba47ad8ee9f098893df3e8d505871753b271bffda84bdf3585212b26255e89c950b7cb9bb9e4186ffb70d5303 SHA512 5b3c2cec0d1c3f9a7140977428fd89fe156cdc496a504ab58a227edd2d82f6a676b64ce9f0c36195a02f4b8159c61ab72b189b4933d7dd63d80ba4f294b47c31
+EBUILD vdr-skinelchi-0.3.0-r2.ebuild 991 BLAKE2B f3e099feb234328ce33ddb94933fc43b735446316acc3c784f38629dbc91f67a16bc285d24251e010d41ab1f9871a457d313c3a03d962fd68f91de99526fb3ac SHA512 60be2dd7e6d245d9dc6d57864daa7df84c51bb55975c0413f2ad8f3f437977e0bbf9fa83223027120e7ea3240e16e850f79b12215cfc2eed66c38074978e696c
+MISC metadata.xml 428 BLAKE2B 2ed768c50e4a1445a31d521bdfd93698d6610676f4669481af83c8d49c22ebdab2ac3f5c36367e5468802cfa2e6ed124d58729c7f81713cc2044109cbf377b8b SHA512 31851c49e8cbe7d898c861e0ae20b198d0e6aab47312785ca5c73364be4894a0f891be3c9898b3dff6cff836059ac4a96ea95ce5771bac5cd12a667834a3248a
diff --git a/media-plugins/vdr-skinelchi/files/rc-addon-0.1.1_pre2-r1.sh b/media-plugins/vdr-skinelchi/files/rc-addon-0.1.1_pre2-r1.sh
deleted file mode 100644
index 1798eade4531..000000000000
--- a/media-plugins/vdr-skinelchi/files/rc-addon-0.1.1_pre2-r1.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# rc-addon plugin-startup-skript for vdr-skinelchi
-#
-# This sript is called by gentoo-vdr-scripts on start of VDR
-
-# Check on dxr-3 and set default logo DIR
-plugin_pre_vdr_start() {
-
-# Next lines commented, not supported yet, remove this if dxr3 logo support is available
-#	if [ "${PLUGINS#*dxr3}" != "${PLUGINS}" ] ; then
-#		: ${SKINELCHI_LOGOS_DIR:=/usr/share/vdr/channel-logos/logos-dxr3}
-#	else
-		: ${SKINELCHI_LOGOS_DIR:=/usr/share/vdr/channel-logos}
-#	fi
-  
-	add_plugin_param "-l ${SKINELCHI_LOGOS_DIR}"
-
-}
diff --git a/media-plugins/vdr-skinelchi/files/vdr-skinelchi-0.3.0_min_max_from_stl.patch b/media-plugins/vdr-skinelchi/files/vdr-skinelchi-0.3.0_min_max_from_stl.patch
new file mode 100644
index 000000000000..123d0e4d5575
--- /dev/null
+++ b/media-plugins/vdr-skinelchi/files/vdr-skinelchi-0.3.0_min_max_from_stl.patch
@@ -0,0 +1,18 @@
+taken from debian vdr repo
+this will fix
+https://bugs.gentoo.org/703994
+
+Reviewed-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 2020 Jan 05 )
+Index: b/DisplayChannel.c
+===================================================================
+--- a/DisplayChannel.c
++++ b/DisplayChannel.c
+@@ -724,7 +724,7 @@
+       }
+       else {
+          time_t t = time(NULL);
+-         int seen = max(0, min(y9 - y6a - 1, int((y9 - y6a) * double(t - Present->StartTime()) / Present->Duration())));
++         int seen = std::max(0, std::min(y9 - y6a - 1, int((y9 - y6a) * double(t - Present->StartTime()) / Present->Duration())));
+          osd->DrawRectangle(x4 + Gap, y6a + seen, x4 + Gap + ScrollWidth - 1, y9 - 1, Theme.Color(clrChannelTimebarRest));
+          osd->DrawRectangle(x4 + Gap, y6a, x4 + Gap + ScrollWidth - 1, y6a + seen - 1, Theme.Color(clrChannelTimebarSeen));
+          changed = true;
diff --git a/media-plugins/vdr-skinelchi/metadata.xml b/media-plugins/vdr-skinelchi/metadata.xml
index a4ac816157a0..2aa794fd515f 100644
--- a/media-plugins/vdr-skinelchi/metadata.xml
+++ b/media-plugins/vdr-skinelchi/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer type="person">
+	<email>hd_brummy@gentoo.org</email>
+	<name>Joerg Bornkessel</name>
+</maintainer>
 <maintainer type="project">
-    <email>vdr@gentoo.org</email>
-    <name>Gentoo VDR Project</name>
+	<email>vdr@gentoo.org</email>
+	<name>Gentoo VDR Project</name>
 </maintainer>
-    <longdescription>Video Disk Recorder (VDR) skin plugin</longdescription>
+	<longdescription>Video Disk Recorder (VDR) skin plugin</longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..81062648c1c9
--- /dev/null
+++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic vdr-plugin-2
+
+DESCRIPTION="VDR Skin Plugin: skinelchi"
+HOMEPAGE="http://firefly.vdr-developer.org/skinelchi"
+SRC_URI="http://firefly.vdr-developer.org/skinelchi/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-video/vdr"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	#bug #599148
+	append-cxxflags -std=gnu++11
+
+	# disable imagemagick support, broken ...
+	sed -i "${S}"/Makefile -e \
+		"s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 0:" || die
+
+	sed -i "${S}"/DisplayChannel.c \
+		-e "s:/hqlogos::" \
+		-e "s:/logos::" || die
+
+	# wrong sed in vdr-plugin-2.eclass?
+	sed -e "s:INCLUDES += -I\$(VDRINCDIR):INCLUDES += -I\$(VDRINCDIR)/include:" \
+		-i Makefile || die
+
+	# gcc-6 warnings
+	sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h || die
+}
diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0.ebuild b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
index 23c1f70613a8..2dbe08a9b7bc 100644
--- a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0.ebuild
+++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit vdr-plugin-2
 
-MY_P=${P/_pre/pre}
-
 DESCRIPTION="VDR Skin Plugin: skinelchi"
 HOMEPAGE="http://firefly.vdr-developer.org/skinelchi"
 SRC_URI="http://firefly.vdr-developer.org/skinelchi/${P}.tar.bz2"
@@ -14,34 +12,30 @@ SRC_URI="http://firefly.vdr-developer.org/skinelchi/${P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE="imagemagick"
-
-DEPEND=">=media-video/vdr-1.6
-		imagemagick? ( media-gfx/imagemagick )"
-
-RDEPEND="x11-themes/vdr-channel-logos"
 
-S=${WORKDIR}/${MY_P#vdr-}
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.1.1_pre2-r1.sh"
+DEPEND="media-video/vdr"
 
 src_prepare() {
 	vdr-plugin-2_src_prepare
 
-	if ! use imagemagick; then
-		einfo "Disabling imagemagick-support."
-		sed -i "${S}"/Makefile \
-			-e '/^[[:space:]]*SKINELCHI_HAVE_IMAGEMAGICK = 1/s/^/#/'
-	fi
+	#bug #599148
+	append-cxxflags -std=gnu++11
+
+	# disable imagemagick support, broken ...
+	sed -i "${S}"/Makefile -e \
+		"s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 0:" || die
 
 	sed -i "${S}"/DisplayChannel.c \
 		-e "s:/hqlogos::" \
-		-e "s:/logos::"
+		-e "s:/logos::" || die
 
 	# wrong sed in vdr-plugin-2.eclass?
 	sed -e "s:INCLUDES += -I\$(VDRINCDIR):INCLUDES += -I\$(VDRINCDIR)/include:" \
-		-i Makefile
+		-i Makefile || die
 
 	# gcc-6 warnings
-	sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h
+	sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h || die
+
+	# wrt bug 703994
+	eapply "${FILESDIR}/${P}_min_max_from_stl.patch"
 }