Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Joerg Bornkessel <hd_brummy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-live/files/, media-plugins/vdr-live/
Date: Fri, 06 Jul 2018 13:15:18
Message-Id: 1530882867.ada3ec53323baed59a476820958dfb753caf5e0e.hd_brummy@gentoo
1 commit: ada3ec53323baed59a476820958dfb753caf5e0e
2 Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 6 13:14:27 2018 +0000
4 Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 6 13:14:27 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ada3ec53
7
8 media-plugins/vdr-live: version bump, fixed deprecated eapi
9
10 Package-Manager: Portage-2.3.41, Repoman-2.3.9
11
12 media-plugins/vdr-live/Manifest | 1 +
13 media-plugins/vdr-live/files/confd-2.3 | 29 +++++++++++++++++++++
14 media-plugins/vdr-live/files/rc-addon-2.3.sh | 30 ++++++++++++++++++++++
15 .../vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild | 4 +--
16 .../vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild | 4 +--
17 ...0_p20130504-r2.ebuild => vdr-live-2.3.1.ebuild} | 27 +++++++------------
18 6 files changed, 73 insertions(+), 22 deletions(-)
19
20 diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
21 index f260557b639..0178f3d83f6 100644
22 --- a/media-plugins/vdr-live/Manifest
23 +++ b/media-plugins/vdr-live/Manifest
24 @@ -1 +1,2 @@
25 +DIST release_2-3-1.tar.bz2 703327 BLAKE2B 70724894a4abf2f94d682602d722b3d015cefefa7c9daf2dae35fc84bff1d950539c916d6d97e39565e87e8e7d841277ad14e137238026b25f73b1b288fa18f5 SHA512 f943c2aa477ca943b2015eb0b49a650e5c9e5cc124549b68d36b56a0ae6344a8d32ac3c4f213ab3cb91794ae569d3ed14a84168f45bf395e90536992078bce41
26 DIST vdr-live-0.3.0_p20130504.tar.bz2 6348021 BLAKE2B 64567a037dd283d005727b993053609e7c46784de67bcbd9afb4f68edd03cec494e6eca6c497ac578928de92c1d21b2519867c014cfd11ace79e957fc5d487d1 SHA512 7a238a4567f90448b7813366dbdb5112ab98079fd5a2c9d59d09273853fd62ad520ca9ad373704a8888eb7c25119772421fe998d87069647c40d6d2d869e09c1
27
28 diff --git a/media-plugins/vdr-live/files/confd-2.3 b/media-plugins/vdr-live/files/confd-2.3
29 new file mode 100644
30 index 00000000000..cb1dce04dfb
31 --- /dev/null
32 +++ b/media-plugins/vdr-live/files/confd-2.3
33 @@ -0,0 +1,29 @@
34 +# configuration of media-plugins/vdr-live
35 +
36 +# for people who want more secure
37 +# with ssl access.
38 +# on usage, you have to install vdr-live
39 +# with USE="ssl"
40 +#
41 +# SSL ADDRESS --> https://<your-ip>:8443/
42 +#
43 +# allowed values: yes no
44 +# default: no
45 +#LIVE_USE_SSL="yes"
46 +
47 +# default given portnumber
48 +# only changes needed on problems
49 +#
50 +#LIVE_PORT="8008"
51 +#LIVE_SSL_PORT="8443"
52 +
53 +# bind to these IP addresses
54 +# default, your IP will automaticly detected
55 +#
56 +LIVE_BIND_IPS="127.0.0.1"
57 +
58 +# for people who have epgimges
59 +# default: /var/cache/vdr/epgimges
60 +#
61 +# set this to your own path, if needed
62 +#EPGIMAGES_DIR=" "
63
64 diff --git a/media-plugins/vdr-live/files/rc-addon-2.3.sh b/media-plugins/vdr-live/files/rc-addon-2.3.sh
65 new file mode 100644
66 index 00000000000..1372e09d56f
67 --- /dev/null
68 +++ b/media-plugins/vdr-live/files/rc-addon-2.3.sh
69 @@ -0,0 +1,30 @@
70 +#
71 +# zzam@g.o
72 +# hd_brummy@g.o
73 +
74 +EPGIMAGES_DIR="/var/cache/vdr/epgimages"
75 +
76 +plugin_pre_vdr_start() {
77 + if [ "${LIVE_USE_SSL:=no}" = "yes" ]; then
78 + if [ -n "${LIVE_SSL_PORT}" ]; then
79 + add_plugin_param "-s ${LIVE_SSL_PORT}"
80 + fi
81 +
82 + add_plugin_param "--cert=/etc/vdr/plugins/live/live.pem"
83 + add_plugin_param "--key=/etc/vdr/plugins/live/live-key.pem"
84 +
85 + else
86 + if [ -n "${LIVE_PORT}" ]; then
87 + add_plugin_param "-p ${LIVE_PORT}"
88 + fi
89 + fi
90 +
91 + if [ -d ${EPGIMAGES_DIR} ]; then
92 + add_plugin_param "--epgimages=${EPGIMAGES_DIR}"
93 + fi
94 +
95 + local ip
96 + for ip in ${LIVE_BIND_IPS:=`hostname -i`}; do
97 + add_plugin_param "-i ${ip}"
98 + done
99 +}
100
101 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
102 index 41c00b51519..6041faafd99 100644
103 --- a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
104 +++ b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
105 @@ -1,7 +1,7 @@
106 -# Copyright 1999-2015 Gentoo Foundation
107 +# Copyright 1999-2018 Gentoo Foundation
108 # Distributed under the terms of the GNU General Public License v2
109
110 -EAPI=5
111 +EAPI=6
112
113 inherit vdr-plugin-2 ssl-cert
114
115
116 diff --git a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild
117 index 9d7f6bdbaf5..0dbcc0a0473 100644
118 --- a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild
119 +++ b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild
120 @@ -1,7 +1,7 @@
121 -# Copyright 1999-2017 Gentoo Foundation
122 +# Copyright 1999-2018 Gentoo Foundation
123 # Distributed under the terms of the GNU General Public License v2
124
125 -EAPI=5
126 +EAPI=6
127
128 inherit vdr-plugin-2 ssl-cert
129
130
131 diff --git a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild b/media-plugins/vdr-live/vdr-live-2.3.1.ebuild
132 similarity index 81%
133 copy from media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild
134 copy to media-plugins/vdr-live/vdr-live-2.3.1.ebuild
135 index 9d7f6bdbaf5..ef19ad4ee49 100644
136 --- a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild
137 +++ b/media-plugins/vdr-live/vdr-live-2.3.1.ebuild
138 @@ -1,14 +1,15 @@
139 -# Copyright 1999-2017 Gentoo Foundation
140 +# Copyright 1999-2018 Gentoo Foundation
141 # Distributed under the terms of the GNU General Public License v2
142
143 -EAPI=5
144 +EAPI=6
145
146 inherit vdr-plugin-2 ssl-cert
147
148 +MY_P="release_2-3-1"
149 +
150 DESCRIPTION="VDR Plugin: Web Access To Settings"
151 HOMEPAGE="http://live.vdr-developer.org"
152 -SRC_URI="mirror://gentoo/${P}.tar.bz2
153 - https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
154 +SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-live.git/snapshot/${MY_P}.tar.bz2"
155
156 LICENSE="GPL-2"
157 SLOT="0"
158 @@ -21,17 +22,10 @@ DEPEND="media-video/vdr
159 pcre? ( >=dev-libs/libpcre-8.12[cxx] )"
160 RDEPEND="${DEPEND}"
161
162 -S="${WORKDIR}/${P}"
163 -
164 -VDR_CONFD_FILE="${FILESDIR}/confd-0.3"
165 -VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.3.sh"
166 +S="${WORKDIR}/${MY_P}"
167
168 -KEEP_I18NOBJECT="yes"
169 -
170 -PATCHES=(
171 - "${FILESDIR}"/${P}_vdr-2.1.2.diff
172 - "${FILESDIR}"/${P}-c++11.patch
173 -)
174 +VDR_CONFD_FILE="${FILESDIR}/confd-2.3"
175 +VDR_RCADDON_FILE="${FILESDIR}/rc-addon-2.3.sh"
176
177 make_live_cert() {
178 # TODO: still true?
179 @@ -59,11 +53,8 @@ make_live_cert() {
180 src_prepare() {
181 default
182
183 - # new Makefile handling ToDp
184 -# cp "${FILESDIR}/live.mk" "${S}/Makefile"
185 -
186 # remove untranslated language files
187 - rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
188 + 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
189
190 vdr-plugin-2_src_prepare
Report Message
Find on MARC Find on Google Groups