From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0E080138334 for ; Fri, 6 Jul 2018 13:15:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DBDFE0AD6; Fri, 6 Jul 2018 13:15:17 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1188E0AD6 for ; Fri, 6 Jul 2018 13:15:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 92D40335C9B for ; Fri, 6 Jul 2018 13:15:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 173AD354 for ; Fri, 6 Jul 2018 13:15:12 +0000 (UTC) From: "Joerg Bornkessel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joerg Bornkessel" Message-ID: <1530882867.ada3ec53323baed59a476820958dfb753caf5e0e.hd_brummy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-live/files/, media-plugins/vdr-live/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-plugins/vdr-live/Manifest media-plugins/vdr-live/files/confd-2.3 media-plugins/vdr-live/files/rc-addon-2.3.sh media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild media-plugins/vdr-live/vdr-live-2.3.1.ebuild X-VCS-Directories: media-plugins/vdr-live/files/ media-plugins/vdr-live/ X-VCS-Committer: hd_brummy X-VCS-Committer-Name: Joerg Bornkessel X-VCS-Revision: ada3ec53323baed59a476820958dfb753caf5e0e X-VCS-Branch: master Date: Fri, 6 Jul 2018 13:15:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5cb7af7c-560d-435f-822b-40585b86c60b X-Archives-Hash: af83be11117680cc56e8b798e786c7e3 commit: ada3ec53323baed59a476820958dfb753caf5e0e Author: Joerg Bornkessel gentoo org> AuthorDate: Fri Jul 6 13:14:27 2018 +0000 Commit: Joerg Bornkessel gentoo org> CommitDate: Fri Jul 6 13:14:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ada3ec53 media-plugins/vdr-live: version bump, fixed deprecated eapi Package-Manager: Portage-2.3.41, Repoman-2.3.9 media-plugins/vdr-live/Manifest | 1 + media-plugins/vdr-live/files/confd-2.3 | 29 +++++++++++++++++++++ media-plugins/vdr-live/files/rc-addon-2.3.sh | 30 ++++++++++++++++++++++ .../vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild | 4 +-- .../vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild | 4 +-- ...0_p20130504-r2.ebuild => vdr-live-2.3.1.ebuild} | 27 +++++++------------ 6 files changed, 73 insertions(+), 22 deletions(-) diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest index f260557b639..0178f3d83f6 100644 --- a/media-plugins/vdr-live/Manifest +++ b/media-plugins/vdr-live/Manifest @@ -1 +1,2 @@ +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 diff --git a/media-plugins/vdr-live/files/confd-2.3 b/media-plugins/vdr-live/files/confd-2.3 new file mode 100644 index 00000000000..cb1dce04dfb --- /dev/null +++ b/media-plugins/vdr-live/files/confd-2.3 @@ -0,0 +1,29 @@ +# configuration of media-plugins/vdr-live + +# for people who want more secure +# with ssl access. +# on usage, you have to install vdr-live +# with USE="ssl" +# +# SSL ADDRESS --> https://:8443/ +# +# allowed values: yes no +# default: no +#LIVE_USE_SSL="yes" + +# default given portnumber +# only changes needed on problems +# +#LIVE_PORT="8008" +#LIVE_SSL_PORT="8443" + +# bind to these IP addresses +# default, your IP will automaticly detected +# +LIVE_BIND_IPS="127.0.0.1" + +# for people who have epgimges +# default: /var/cache/vdr/epgimges +# +# set this to your own path, if needed +#EPGIMAGES_DIR=" " diff --git a/media-plugins/vdr-live/files/rc-addon-2.3.sh b/media-plugins/vdr-live/files/rc-addon-2.3.sh new file mode 100644 index 00000000000..1372e09d56f --- /dev/null +++ b/media-plugins/vdr-live/files/rc-addon-2.3.sh @@ -0,0 +1,30 @@ +# +# zzam@g.o +# hd_brummy@g.o + +EPGIMAGES_DIR="/var/cache/vdr/epgimages" + +plugin_pre_vdr_start() { + if [ "${LIVE_USE_SSL:=no}" = "yes" ]; then + if [ -n "${LIVE_SSL_PORT}" ]; then + add_plugin_param "-s ${LIVE_SSL_PORT}" + fi + + add_plugin_param "--cert=/etc/vdr/plugins/live/live.pem" + add_plugin_param "--key=/etc/vdr/plugins/live/live-key.pem" + + else + if [ -n "${LIVE_PORT}" ]; then + add_plugin_param "-p ${LIVE_PORT}" + fi + fi + + if [ -d ${EPGIMAGES_DIR} ]; then + add_plugin_param "--epgimages=${EPGIMAGES_DIR}" + fi + + local ip + for ip in ${LIVE_BIND_IPS:=`hostname -i`}; 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 41c00b51519..6041faafd99 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,7 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 inherit vdr-plugin-2 ssl-cert 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 index 9d7f6bdbaf5..0dbcc0a0473 100644 --- 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 @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 inherit vdr-plugin-2 ssl-cert 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 similarity index 81% copy from media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild copy to media-plugins/vdr-live/vdr-live-2.3.1.ebuild index 9d7f6bdbaf5..ef19ad4ee49 100644 --- a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild +++ b/media-plugins/vdr-live/vdr-live-2.3.1.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 inherit vdr-plugin-2 ssl-cert +MY_P="release_2-3-1" + DESCRIPTION="VDR Plugin: Web Access To Settings" HOMEPAGE="http://live.vdr-developer.org" -SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2" +SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-live.git/snapshot/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -21,17 +22,10 @@ DEPEND="media-video/vdr pcre? ( >=dev-libs/libpcre-8.12[cxx] )" RDEPEND="${DEPEND}" -S="${WORKDIR}/${P}" - -VDR_CONFD_FILE="${FILESDIR}/confd-0.3" -VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.3.sh" +S="${WORKDIR}/${MY_P}" -KEEP_I18NOBJECT="yes" - -PATCHES=( - "${FILESDIR}"/${P}_vdr-2.1.2.diff - "${FILESDIR}"/${P}-c++11.patch -) +VDR_CONFD_FILE="${FILESDIR}/confd-2.3" +VDR_RCADDON_FILE="${FILESDIR}/rc-addon-2.3.sh" make_live_cert() { # TODO: still true? @@ -59,11 +53,8 @@ make_live_cert() { src_prepare() { default - # new Makefile handling ToDp -# cp "${FILESDIR}/live.mk" "${S}/Makefile" - # 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,ru_RU,sl_SI,sv_SE,tr_TR}.po + 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 vdr-plugin-2_src_prepare