parameter --epgimages available in rc-script

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x34C2808A

6 files changed, 187 insertions, 10 deletions

diff --git a/media-plugins/vdr-live/ChangeLog b/media-plugins/vdr-live/ChangeLog
index 8640ee33776a..568ce7dd7532 100644
--- a/media-plugins/vdr-live/ChangeLog
+++ b/media-plugins/vdr-live/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-live
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.45 2015/01/21 13:01:35 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.46 2015/01/28 14:56:35 hd_brummy Exp $
+
+*vdr-live-0.3.0_p20130504-r2 (28 Jan 2015)
+
+  28 Jan 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-live-0.3.0_p20130504-r1.ebuild, +vdr-live-0.3.0_p20130504-r2.ebuild,
+  +files/confd-0.3, +files/rc-addon-0.3.sh:
+  parameter --epgimages available in rc-script
 
   21 Jan 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-live-0.3.0_p20130504-r1.ebuild:
diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index ba4c496fbb81..4a88da286f68 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -3,7 +3,9 @@ Hash: SHA256
 
 AUX confd 125 SHA256 949c97e715af8405b47877afe4fa9c93dc3ed04b1ac6b6d7982e41f61ba0d122 SHA512 c69a6b1a99f86e9271b925439bb08acf7ab65ebc75b354197eb2668996af966d047a99b1c712efac6efbc031fd9b61d2c90f45331aed74a9093f24982c307505 WHIRLPOOL 80663e0d719916f208bb2ff26aea6bc81a6e3566c006e6cdf707c2b967161326aa81a47530cc99746bf081af83007f46ed002ca0a6da8dfa579670300385ac08
 AUX confd-0.2 467 SHA256 84d9ccf84024d0c32ceefad53a115f458878b523d74844dfbbaa8e4444305e92 SHA512 bea6f86cb590199def38df9ff4f462c6e0462d0623c5fdb6b416cffb49b9966ccbd7f364a52bfe702e1c638f3a97873e0ac019d246d3c84b88c58060ab004c51 WHIRLPOOL fc2faaa03e588615ae20e1a564d211bfe2839970279387549c4e61191d4cffaea241f2bbd1342fb3ce1c616e1a0f117054d49440a3702e2d7c2ec9d48bb22054
+AUX confd-0.3 594 SHA256 eb2cf74905b0407d851f05ac79e379ae593291742ec7cf19ba73a869a68a4186 SHA512 d2fa96fdbe1a00fa9f1181b36fa43f2fd2f28a1d270671b8f6c422fc8309b625dc64b8425551d9ef9db2b0929d748555bfdca16349126f78f439c4fe366969e0 WHIRLPOOL 5aab8a6e8dee7ff79918753092c51e9926a676d7cf217d6825d1ee46c8d44cbfe1486c886c98216c63235c2001ee5b400f590cb463fe03587c585bf41e8a8a45
 AUX rc-addon-0.2.sh 611 SHA256 70181758e4477c7c364698c2e656c6a14c8cd421fbafc1195f649bedf5f95658 SHA512 d0bf68644f4702d5773a03b7d63b4d6542c0ac0c5593aebc7849d68a2051b8bd7da752efbff61ef4e9df830142822736e520012f79a8a40493b03135ba105ca1 WHIRLPOOL 1842fcb8775c3cda34b8a3b2ef383ccda3e3c2b91e236b1b2d9fe821ac801d7bbed8fdb2cd2a98fda5cd1c5f07962e2850b2760516a0b053a5a2a1cc7931b601
+AUX rc-addon-0.3.sh 741 SHA256 4d2341e2884db37ebba9d3f6a5bb6442acf65821ba4794efbb41c36938324a7d SHA512 f3eee1de5d7fb18e15d5838211abdbe26f7254972b998d968a80562f75165eb067353f7a9c6644d4c2e3ed6c34fada0b9d18d5272b3352613e2980755ace0b48 WHIRLPOOL b0613c98184327def86f16f5780f00645b8d3a16a553a9fc3b6adb35cfac54bb143a0871338682d86a744639169856f9cda83743ef7e4852974a1113536fa74e
 AUX rc-addon.sh 180 SHA256 d9c9eca9f12362c1f8c162a9bb948feebdb8acc87413a611ecf5f52a3092878a SHA512 2bdf0e809148bbeb33ede687d40332b26dfaa2dc8be2e743f7c56cb19f572ff30e88ceac8c80602b8a39e0dc1657cd79f7afa1b8993b37714a400f7b1384f622 WHIRLPOOL 73d8af3cdb68c341473a18b5e5ff7c45f3165259f2716e454e3cc3a28a660ff4d17b2fffea82dee81eed0b49e36072be7a87138c91c19e601d1ca0997124f1d4
 AUX vdr-1.7.28-compatibility.patch 1146 SHA256 52bc7f9315db8102a5531a788e164bc347dae0deb3078c157a6722500b16041a SHA512 c7e48330e5e3dcd09e8bf830748308553a994e46bc89c6633e2a0daf03fd00c2fcaf7272a53b7977a33731b5c8e0e36f1e2f19e0806f0af932300e2dd4d16772 WHIRLPOOL a35b74aebfb763367f88bfbdef351642a193fb9c349d666f30ed26e185e1619456bc1207325bedd680dbbc57b481df42c036d3bd8a375e5d9bded8b96334d917
 AUX vdr-live-0.3.0_p20130504_vdr-2.1.2.diff 2722 SHA256 60ac1cbec3863fedf4620a9c30661139a3c5ee62c843fc809c5f3e53e79370eb SHA512 813e17202fb9dd921e38492127ad8518fc4aa2f6240ce9284990bf3e0a40c04b3b56efcaf667ce5f4aedf9b6e76422e2bb73c3218d124f3d8452b3b7979ba0b2 WHIRLPOOL 0571dbd5fc091aa3eead30179d162186b74a5adaa61a930734159111b61bc2316041b2e96484612742b94fbf6186235aae1f1f5249bfa9a8fed55e4fc48648e4
@@ -11,14 +13,15 @@ AUX vdr-live_pcre.patch 586 SHA256 290fe19ec39c638a78ca4b7f21ab9d337aa85657491e7
 DIST vdr-live-0.2.0.tar.gz 560582 SHA256 30ac64040be4defb75beb9d3a5b0218694fc5b10486926acd989e6eb6c72ca55
 DIST vdr-live-0.3.0_p20130504.tar.bz2 6348021 SHA256 edd577580b9e99de88bcd3794fcf792bee7df7ccc41bfebaeebef22bac5c78a7 SHA512 7a238a4567f90448b7813366dbdb5112ab98079fd5a2c9d59d09273853fd62ad520ca9ad373704a8888eb7c25119772421fe998d87069647c40d6d2d869e09c1 WHIRLPOOL 7f8d7ff69914d90af41d4c550df6f57a658e8263d320167fed84f4990063a5323c1f5d58d44283682807c673af81c8e32cd44e13a9aa57e849e3640b4ecac936
 EBUILD vdr-live-0.2.0.ebuild 1228 SHA256 e68db52ddbb83bc48dc1e9630abb441773c9e40cddbba01bd79b13b8448500cd SHA512 279e7c195e57ffa60322c7f221f9894d0922c29dc718b1c6a867736f3c2e93b5d69e9ba0a71ba99382bef59581436c645b38ba521b722ad19f34bf8321622b50 WHIRLPOOL 1d55af5846f4b84b9cb50b87f5b903b1d145bee16f79de5aadd004c0fe2d0dc425175fdb2768ab39b2b7fb94243880311d1ac0ace9dc85c5e7b5ac431985eadd
-EBUILD vdr-live-0.3.0_p20130504-r1.ebuild 2646 SHA256 b5b3be4026824af285d5cd6f8933c9cb82f13e95476583bc934e2308123093fd SHA512 5b5ec1f8edab07699a5a489f87ae4b9a6549f62bdea486d97fa2c6148b7adc7d52200a2074e050352e9f7e93884f151553a335f6f22cd1d045dd6dc57a80fb14 WHIRLPOOL 31b1f52242be559371fde86b1e7ac7106f9277264fe72fc99b2ae99c7b612cfcf92b6e7d70d39c7f9f9b8199f24df0872624e3ebd1107b8707986125de82fd7a
-MISC ChangeLog 8578 SHA256 5394bd68288528bb583bdbc06b5ad30c677b32a2a31b206b20dc538c7e529e01 SHA512 23e07f8370a89548fec181318df2a6ab327c090770031ddfaad1f553e28e9be6e8e576b8b98d1e6c592d65ffa9c47178a18380e1befb0ab3855126ef488a09b4 WHIRLPOOL 624e620c6f5f06cf79a7de837930f7bc3631f4f8f76fc9ae68170884f5b3bb1ea620080ce415bbaf15998b7b640b20a2b0a38ea7a712593882ddd2b9f6435a2c
+EBUILD vdr-live-0.3.0_p20130504-r1.ebuild 2616 SHA256 2c0622fc241751ac3b8b82f3ac62104792f8569b4303f716700c76a49bafa27d SHA512 a9460ceee7e9abc111dc56552e05700e5a805ae5f34fa1bcbf7920015bffeaaad68a0ee7278fdffcdfd70e6751e5a293b52ac2420bb54a5fb3125b64958a6b70 WHIRLPOOL f574c3392d0023da1d4819f96693b73c8e6059de1553d12388404889d006162c6356bc0b0d8b1b22d06c23160de0ad20f216d3b540715e463cb1c435918a3c84
+EBUILD vdr-live-0.3.0_p20130504-r2.ebuild 2690 SHA256 37574d34d3caccadb3b551e9ab4f78b9e1f25a037f104241335fc35332a2604f SHA512 0cefff792bfe247a0d70eb6930aa12eae989458a43af6c3701692ac31069fbaace4ee48fc3e4e17cc469f0f03db7aa07a08d87150b4fcd98fba23912edaa4e22 WHIRLPOOL 8ed544644104cc075a396f994d6fb1e3b90d3bd848d0e8670c916e2e5f792b8af095dc3dbe3443b0bc7d6bad08ffebe56543c47f1cd4d133f3a96e2e67b57367
+MISC ChangeLog 8844 SHA256 60193ba9f757adc823cfe1ae5e0adaeeb2cbf84bd7fe5905079542a5e5e614f3 SHA512 720678df1728afbf7dd2f689357c6ab6c0f9d734e3569354613ba9a50c76117e6d75e969adbf8ff55290248b234150d3c8f8f15910cb0ff50612f4163ceeedc3 WHIRLPOOL 4803ce58e5710dc09146670bb2dbbb725b237a58cc4acad5db7bb6654079b84c240a2f34f943d47e26c4da039122833a1894989dbb2adbbb731f28ddd09ee3a1
 MISC metadata.xml 251 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f SHA512 8f48311caba6e3069390a1871a0cb9b8731ff57b812b3b8d5a5b5147d4e2b8ad28232d059abb00f049ba78a10570d9326957a57349d2f080624b41b043112056 WHIRLPOOL 2b082e9ef2c0a111b189ec0a020a10fcf8ddb4ea6f2eb5d9627f98ab6edb72cac03a9a04f97ee4624f27852b85bb06f2d662a54b0ee421c777eba10e85e37cbe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFUv6M0dn07HTTCgIoRCNgTAKC9gycupRw5bBzzu//VIxXLrOZnTgCfbu51
-yduiXi74bDX2Lll5id1esJ0=
-=yqpS
+iD8DBQFUyPipdn07HTTCgIoRCMDBAKCosQOtD6IaSRdr3vCDIt5CoGvb6wCfWmLr
+TNyHRlbjBMcNidFJzb9W2Bg=
+=pVZm
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-live/files/confd-0.3 b/media-plugins/vdr-live/files/confd-0.3
new file mode 100644
index 000000000000..cb1dce04dfb5
--- /dev/null
+++ b/media-plugins/vdr-live/files/confd-0.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://<your-ip>: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-0.3.sh b/media-plugins/vdr-live/files/rc-addon-0.3.sh
new file mode 100644
index 000000000000..1ff3b1982cf8
--- /dev/null
+++ b/media-plugins/vdr-live/files/rc-addon-0.3.sh
@@ -0,0 +1,31 @@
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/files/rc-addon-0.3.sh,v 1.1 2015/01/28 14:56:35 hd_brummy Exp $
+#
+# 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 d722d2f65a97..8d10db7c056f 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,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild,v 1.2 2015/01/21 13:01:35 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild,v 1.3 2015/01/28 14:56:35 hd_brummy Exp $
 
 EAPI=5
 
@@ -53,9 +53,7 @@ make_live_cert() {
 }
 
 src_configure() {
-	vdr-plugin-2_src_configure
-
-	# tmp. disabeled gcc -std=c++11, due massiv compile errors
+	# tmp. disabled gcc -std=c++11, due massiv compile errors
 	filter-flags -std=c++11
 }
 
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
new file mode 100644
index 000000000000..5284d043b88b
--- /dev/null
+++ b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild,v 1.1 2015/01/28 14:56:35 hd_brummy Exp $
+
+EAPI=5
+
+inherit vdr-plugin-2 ssl-cert
+
+DESCRIPTION="VDR Plugin: Web Access To Settings"
+HOMEPAGE="http://live.vdr-developer.org"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+		http://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pcre ssl"
+
+DEPEND="media-video/vdr
+	>=dev-libs/tntnet-2.2.1[ssl=]
+	>=dev-libs/cxxtools-2.2.1
+	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"
+
+KEEP_I18NOBJECT="yes"
+
+make_live_cert() {
+	# TODO: still true?
+	# ssl-cert eclass creates a "invalid" cert, create our own one
+	local base=$(get_base 1)
+	local keydir="/etc/vdr/plugins/live"
+
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-VDR Plugin Live}"
+	SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
+
+	echo
+	gen_cnf || return 1
+	echo
+	gen_key 1 || return 1
+	gen_csr 1 || return 1
+	gen_crt 1 || return 1
+	echo
+
+	install -d "${ROOT}${keydir}"
+	install -m0400 "${base}.key" "${ROOT}${keydir}/live-key.pem"
+	install -m0444 "${base}.crt" "${ROOT}${keydir}/live.pem"
+	chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live{,-key}.pem
+}
+
+src_configure() {
+	# tmp. disabled gcc -std=c++11, due massiv compile errors
+	filter-flags -std=c++11
+}
+
+src_prepare() {
+	# 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
+
+	vdr-plugin-2_src_prepare
+
+	epatch "${FILESDIR}/${P}_vdr-2.1.2.diff"
+
+	if ! use pcre; then
+		sed -i "s:^HAVE_LIBPCRECPP:#HAVE_LIBPCRECPP:" Makefile || die
+	fi
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /usr/share/vdr/plugins/live
+	doins -r live/*
+
+	fowners -R vdr:vdr /usr/share/vdr/plugins/live
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	elog "To be able to use all functions of vdr-live"
+	elog "you should emerge and enable"
+	elog "media-plugins/vdr-epgsearch to search the EPG,"
+	elog "media-plugins/vdr-streamdev for Live-TV streaming"
+
+	elog "The default username/password is:"
+	elog "\tadmin:live"
+
+	if use ssl ; then
+		if path_exists -a "${ROOT}"/etc/vdr/plugins/live/live.pem; then
+			einfo "found an existing SSL cert, to create a new SSL cert, run:\n"
+			einfo "emerge --config ${PN}"
+		else
+			einfo "No SSL cert found, creating a default one now"
+			make_live_cert
+		fi
+	fi
+}
+
+pkg_config() {
+	make_live_cert
+}