gentoo resync : 17.02.2020

5 files changed, 8 insertions, 31 deletions

diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index 13834b35f9de..cb0a3dfc4f6c 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -1,12 +1,10 @@
-AUX confd 125 BLAKE2B 798765df74a0f41989d1d937600239760383470b52a0498c81f583c488de58d27c8ab2e0b1cbb3dfc346b86a4a3efccf9f73c0eb416c23454fa0c7c147758f9f SHA512 c69a6b1a99f86e9271b925439bb08acf7ab65ebc75b354197eb2668996af966d047a99b1c712efac6efbc031fd9b61d2c90f45331aed74a9093f24982c307505
 AUX confd-0.2 467 BLAKE2B e827ae5ec7cdeb9211574f4402885aa487ba969e6ecf74f4c6e807b1eae78aa85fea236e682a83e9643c2154ed827ace4e9651dfa8332f918ae0f4eacd0d4854 SHA512 bea6f86cb590199def38df9ff4f462c6e0462d0623c5fdb6b416cffb49b9966ccbd7f364a52bfe702e1c638f3a97873e0ac019d246d3c84b88c58060ab004c51
 AUX confd-2.3 594 BLAKE2B e4e342ce5e7379d0a84ce67644a4011c2978140488f9f1a71c135bb769c8547d6362481526d7f51509e00250a10bb9e4d4a03fee64fa97db1819c5b45243a9db SHA512 d2fa96fdbe1a00fa9f1181b36fa43f2fd2f28a1d270671b8f6c422fc8309b625dc64b8425551d9ef9db2b0929d748555bfdca16349126f78f439c4fe366969e0
 AUX rc-addon-0.2.sh 489 BLAKE2B 770e03cb0dd21a66589a1838f19785d22378ea5fa6c9206c6ad0d0ec9a5bb86089d6b157758fa7d3d43532e2ffbe81853bdc62f0ecd51ec68940d1486d7b707b SHA512 f42c6e6e03ba33e15c02fc3b42faa15b822d78944c4e29432c230fbc75e636cac6ce64efbed0521965a4fc4054a1a9c9ced0e25a5e8b44fd16332dc5c5269ff2
 AUX rc-addon-2.3.sh 619 BLAKE2B a6d994ef6476f17ba558a778ce13a4a72d6c513d10cd2ce43dee8a7ea598682bbd83e27759f1e53644b7f4046274559cf5cc9614775c5d1b05934819b6262604 SHA512 c07a13a91f6f0d2f5ad990545875adac161a61d944053c19cf43e1252c18e9e98127cafc704d5a729dcbc887576f83ce78413deac8c35fad5962f1e769c36b93
-AUX rc-addon.sh 180 BLAKE2B b8df7fdcd9377997d7ac4906b365de30f6ed7642dd6b48d5e3410f87fcb3cc3121888e61d42fbaed483f38f4d73449b2f4eaecafe9e5f045cb061d2edd76c301 SHA512 2bdf0e809148bbeb33ede687d40332b26dfaa2dc8be2e743f7c56cb19f572ff30e88ceac8c80602b8a39e0dc1657cd79f7afa1b8993b37714a400f7b1384f622
 AUX vdr-live-0.3.0_p20130504_vdr-2.1.2.diff 2722 BLAKE2B 021d4470ec84e7912b57b79a706c977ddb1b5ce67880dbdcf0b4bbc5cce7ad3646d05e89d2b31791f91a4af137e8a3e5995ff79580a8db7d5347b7c5a69ceaf1 SHA512 813e17202fb9dd921e38492127ad8518fc4aa2f6240ce9284990bf3e0a40c04b3b56efcaf667ce5f4aedf9b6e76422e2bb73c3218d124f3d8452b3b7979ba0b2
-DIST release_2-3-1.tar.bz2 703327 BLAKE2B 70724894a4abf2f94d682602d722b3d015cefefa7c9daf2dae35fc84bff1d950539c916d6d97e39565e87e8e7d841277ad14e137238026b25f73b1b288fa18f5 SHA512 f943c2aa477ca943b2015eb0b49a650e5c9e5cc124549b68d36b56a0ae6344a8d32ac3c4f213ab3cb91794ae569d3ed14a84168f45bf395e90536992078bce41
 DIST vdr-live-0.3.0_p20130504.tar.bz2 6348021 BLAKE2B 64567a037dd283d005727b993053609e7c46784de67bcbd9afb4f68edd03cec494e6eca6c497ac578928de92c1d21b2519867c014cfd11ace79e957fc5d487d1 SHA512 7a238a4567f90448b7813366dbdb5112ab98079fd5a2c9d59d09273853fd62ad520ca9ad373704a8888eb7c25119772421fe998d87069647c40d6d2d869e09c1
-EBUILD vdr-live-0.3.0_p20130504-r1.ebuild 2472 BLAKE2B 2eb1baaeee70bee4e9eeff77fbfe1e9c72239ba3fe8cee61dfefce5a10947df8cf071b7360b8e12b771f9685b0fb4fb5c7724753793b36a5b096683ff147fd76 SHA512 eb9d16b2b2dbf5d76f289ccc6ee33cfab4c92543bb27771590e84d34a51a38c5887c414811135f8550bc0f18b5343534a7a142d11153318946a0ed3e5777240e
-EBUILD vdr-live-2.3.1.ebuild 2345 BLAKE2B 9adbf74f2696f1952f1d519930d9277ab3e031c87089d75de38834cbebe7fc026011917cc2abe025796e60aa9d0ba13deff5bed4dd2f0603bdd8f681750de15e SHA512 9e41e251e2c43737c9ae74b1018f21db5b3e5bd33823ab4f58a30d6b85df5834e6f76c3609300a5fb0cc699214be4f95f645cf202cab5abfc06d2738f29d0994
+DIST vdr-live-2.3.1.tar.bz2 703327 BLAKE2B 70724894a4abf2f94d682602d722b3d015cefefa7c9daf2dae35fc84bff1d950539c916d6d97e39565e87e8e7d841277ad14e137238026b25f73b1b288fa18f5 SHA512 f943c2aa477ca943b2015eb0b49a650e5c9e5cc124549b68d36b56a0ae6344a8d32ac3c4f213ab3cb91794ae569d3ed14a84168f45bf395e90536992078bce41
+EBUILD vdr-live-0.3.0_p20130504-r1.ebuild 2473 BLAKE2B 1a10be6dc3f4800d1e3f3e4c8d341242af455885a8886369cf006d23210c1c3e82bbf8d8250dc58e582e7a90f561802b3e7df4d8e1a7f0850a4c016ccb05b9e7 SHA512 2bae33a64c2089e90761cbdad31a068fc1361972c783e4a5b7051586486907d0312d1cd1fa2a32272b64fb1499e80162023de8837e66c315a48911f98542d232
+EBUILD vdr-live-2.3.1.ebuild 2352 BLAKE2B 6460630ff44ad6a8116fe26f0248d3092b321c9f5ab1376d230ba6fdd21713d1568844b69b84cbf4fa77cb49159eb9354bc6b9f096c4f5fae00d329dc4d9da88 SHA512 2b36ef5c6aea1c43a9a6cf5a69daac89c39e394b59520f0620268691b186c6c574e84325b2bdd6acc45cc33fa0fccfa11522dec66703072040221feceb8b66a8
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-live/files/confd b/media-plugins/vdr-live/files/confd
deleted file mode 100644
index b96f0696c08a..000000000000
--- a/media-plugins/vdr-live/files/confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# configuration of vdr-live
-
-# use this portnumber
-LIVE_PORT="8008"
-
-# bind to these IP addresses
-LIVE_BIND_IPS="127.0.0.1"
-
diff --git a/media-plugins/vdr-live/files/rc-addon.sh b/media-plugins/vdr-live/files/rc-addon.sh
deleted file mode 100644
index f637736d49b2..000000000000
--- a/media-plugins/vdr-live/files/rc-addon.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-plugin_pre_vdr_start() {
-	if [ -n "${LIVE_PORT}" ]; then
-		add_plugin_param "-p ${LIVE_PORT}"
-	fi
-
-	local ip
-	for ip in ${LIVE_BIND_IPS}; do
-		add_plugin_param "-i ${ip}"
-	done
-}
-
diff --git a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
index 24ec6897b14f..b42687574dc8 100644
--- a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
+++ b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="http://live.vdr-developer.org"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 		https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 RSA"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="pcre ssl"
diff --git a/media-plugins/vdr-live/vdr-live-2.3.1.ebuild b/media-plugins/vdr-live/vdr-live-2.3.1.ebuild
index 6a0ea6d24b88..965fe62f8ffa 100644
--- a/media-plugins/vdr-live/vdr-live-2.3.1.ebuild
+++ b/media-plugins/vdr-live/vdr-live-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,9 +9,9 @@ MY_P="release_2-3-1"
 
 DESCRIPTION="VDR Plugin: Web Access To Settings"
 HOMEPAGE="http://live.vdr-developer.org"
-SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-live.git/snapshot/${MY_P}.tar.bz2"
+SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-live.git/snapshot/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 RSA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="pcre ssl"
@@ -53,8 +53,6 @@ make_live_cert() {
 }
 
 src_prepare() {
-	default
-
 	# remove untranslated language files
 	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pt_PT,ro_RO,sl_SI,tr_TR}.po