gentoo resync : 15.12.2019

4 files changed, 21 insertions, 27 deletions

diff --git a/media-plugins/vdr-radio/Manifest b/media-plugins/vdr-radio/Manifest
index 609282e1b364..416c8fd654e1 100644
--- a/media-plugins/vdr-radio/Manifest
+++ b/media-plugins/vdr-radio/Manifest
@@ -1,5 +1,4 @@
-AUX rc-addon.sh 280 BLAKE2B 4df8263736d12b3719fc4c63385651de283a571c22331ff3ac2d647c8c949feeffc7fcd305a7d658f9fb189d902ebed6a71a37b557b4061b795797b386186b10 SHA512 2b4b66c5a5443b5c7211d4280716c191b577f76149c06205f19240c869aef0681865b647dc058b05420c58bf23bd2439b4f1a1f2a29fa02b1da42f3cc829c918
-AUX rc-addon.sh-0.2.0 358 BLAKE2B 354c7fa74f9b2bcaf71fd00e54aab0513b6df35baf76eeaaf31367446f37c79989f7aee64e5943e71a8271cfafa781dc778685d4687b813a545dc469182c9f14 SHA512 a23b44d6c7436faefc499b8413f2122fecdd0f07c8d0badc71d50fffe2a2490e97265400ebd6024ed293e88cfd242d9c9a856770a3dc0b015ace9bf1ae756bd5
+AUX rc-addon.sh 568 BLAKE2B f68a7df410ff0cd59053b16883b93f17ba232f71c56226f7df1a76e076f949f01afb80a134ba8fe5815996c7e14695018610913566305011c10cc3dfe680a65f SHA512 ef7e4b36803f17af17fa9864321bbfb1fd5c96803fef9e4b64b91c5b009634194dfb6312228e4ba178811de23ad2a5221967a5b60b8b7406d25d36650b9ef41b
 DIST vdr-radio-0.9.1.tgz 353414 BLAKE2B ff0d735188e6972e029256599b2832d4eea9bed377721966f2b956b5a750f47a34b474492addba0bb3f8964188611f2f10a3a47db3aa60101c851e1db43955f0 SHA512 81ab0d92ee390eecbbce73bc035714dda6157dc1f0781b6f8765603f65707e1711af64a48168923e2a78b77e0d869471fa313656d517cba27a3104e483085f43
-EBUILD vdr-radio-0.9.1.ebuild 865 BLAKE2B 3140600d3f56ecf5be0667d3a1c7fa0f637711a179ea52c5cb2b21a541b27db5962e69d4b37163f68019763eafce09c4ed274a04fc87f438b2ed6214c4fabcad SHA512 3eed12cd2d46c5df9d695a3fd5e1d998efdbea5e7ef7fb20e1353b32171e38a5acc7202657c75dded24d80a6735aaaa04d9865093dc8628689ec835739afa771
+EBUILD vdr-radio-0.9.1.ebuild 819 BLAKE2B e063b404a939f577237c2fd3371be2492badc0a967409735354ab49404db58bb6c8cbe014c38d7289179001582af313a17f7adcefe0b46e5c69a384f6b515097 SHA512 2d7ce1e315991eabde04fd342cbdccdd39fff52635c188bef9cd61d105ec84a478c9220e56265022b235d638e3c04515b5a4b8334ffaf4fc557c73dba8e05968
 MISC metadata.xml 415 BLAKE2B 0c1083061fdddb9e0d38a06575afb157ecb194ae86dadd7c0ad10ebda224d368a2a4a35ce135548040369003dfd7cf00b5eed08846139627ea5fcae8f0167b7b SHA512 9e138f70ce66f65cdb94cc1a10e44692238fd4dae0a14a1af71e64a8defa054d95c14ee790a1adf9ea555a040d1022789ba1f56c026fe051e2661b78b728e652
diff --git a/media-plugins/vdr-radio/files/rc-addon.sh b/media-plugins/vdr-radio/files/rc-addon.sh
index fbd4d6e94b3d..9c21c7835301 100644
--- a/media-plugins/vdr-radio/files/rc-addon.sh
+++ b/media-plugins/vdr-radio/files/rc-addon.sh
@@ -2,12 +2,25 @@
 # rc-addon plugin-startup-skript for vdr-radio
 # 
 # This sript is called by gentoo-vdr-scripts on start of VDR
+#
+# Joerg Bornkessel <hd_brummy@astrali.de>
 
 # Set default DIR to the background picture
 RADIO_BACKGROUND_DIR=/usr/share/vdr/radio
+# Set default DIR for cache
+RADIO_TMP_DIR=/var/cache/vdr-radio
 
-plugin_pre_vdr_start() {
+_make_cachedir() {
+	if [ ! -e "${RADIO_TMP_DIR}" ]; then
+		mkdir "${RADIO_TMP_DIR}"
+		chown -R vdr:vdr "${RADIO_TMP_DIR}"
+	fi
+}
 
-    add_plugin_param "-f ${RADIO_BACKGROUND_DIR}"
+_make_cachedir
+
+plugin_pre_vdr_start() {
 
+	add_plugin_param "-f ${RADIO_BACKGROUND_DIR}"
+	add_plugin_param "-d ${RADIO_TMP_DIR}"
 }
diff --git a/media-plugins/vdr-radio/files/rc-addon.sh-0.2.0 b/media-plugins/vdr-radio/files/rc-addon.sh-0.2.0
deleted file mode 100644
index ce83253073a7..000000000000
--- a/media-plugins/vdr-radio/files/rc-addon.sh-0.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# rc-addon plugin-startup-skript for vdr-radio
-# 
-# This sript is called by gentoo-vdr-scripts on start of VDR
-
-# Set default DIR to the background picture
-RADIO_BACKGROUND_DIR=/usr/share/vdr/radio
-RADIO_TMP_DIR=/var/cache/vdr-radio
-
-plugin_pre_vdr_start() {
-
-    add_plugin_param "-f ${RADIO_BACKGROUND_DIR}"
-    add_plugin_param "-d ${RADIO_TMP_DIR}"
-
-}
diff --git a/media-plugins/vdr-radio/vdr-radio-0.9.1.ebuild b/media-plugins/vdr-radio/vdr-radio-0.9.1.ebuild
index 1ea94e5f574e..b91b2138f6d9 100644
--- a/media-plugins/vdr-radio/vdr-radio-0.9.1.ebuild
+++ b/media-plugins/vdr-radio/vdr-radio-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,15 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=media-video/vdr-1.7.34"
+RDEPEND="media-video/vdr"
 DEPEND="${RDEPEND}"
 
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon.sh-0.2.0"
+VDR_RCADDON_FILE="${FILESDIR}/rc-addon.sh"
 
 src_install() {
 	vdr-plugin-2_src_install
 
-	cd "${S}"/config
+	cd "${S}"/config || die "Can't enter source folder"
 
 	insinto /usr/share/vdr/radio
 	doins mpegstill/rtext*
@@ -31,7 +31,4 @@ src_install() {
 
 	exeinto /usr/share/vdr/radio
 	doexe scripts/radioinfo*
-
-	diropts -m 755 -o vdr -g vdr
-	keepdir "/var/cache/vdr-radio"
 }