fixed depend to right version; new rc-addon, conf files

(Portage version: 2.1.9.25/cvs/Linux i686)

7 files changed, 68 insertions, 134 deletions

diff --git a/media-plugins/vdr-live/ChangeLog b/media-plugins/vdr-live/ChangeLog
index 995930e93fc6..dd0093ad7c43 100644
--- a/media-plugins/vdr-live/ChangeLog
+++ b/media-plugins/vdr-live/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/vdr-live
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.23 2011/01/21 00:04:54 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.24 2011/01/27 17:58:10 hd_brummy Exp $
+
+*vdr-live-0.2.0.20110118-r1 (27 Jan 2011)
+
+  27 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-live-0.1.0.20080316.ebuild, -vdr-live-0.1.0.20080330.ebuild,
+  -vdr-live-0.1.0.20080407.ebuild, +files/confd-0.2,
+  -vdr-live-0.2.0.20110118.ebuild, +vdr-live-0.2.0.20110118-r1.ebuild,
+  +files/rc-addon-0.2.sh:
+  fixed depend to right version; new rc-addon, conf files
 
   21 Jan 2011; Christian Ruppert <idl0r@gentoo.org>
   -vdr-live-0.1.0.20071111.ebuild, vdr-live-0.2.0.20110118.ebuild:
diff --git a/media-plugins/vdr-live/files/confd-0.2 b/media-plugins/vdr-live/files/confd-0.2
new file mode 100644
index 000000000000..c5df276f736d
--- /dev/null
+++ b/media-plugins/vdr-live/files/confd-0.2
@@ -0,0 +1,23 @@
+# 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"
diff --git a/media-plugins/vdr-live/files/rc-addon-0.2.sh b/media-plugins/vdr-live/files/rc-addon-0.2.sh
new file mode 100644
index 000000000000..22e1948cc73e
--- /dev/null
+++ b/media-plugins/vdr-live/files/rc-addon-0.2.sh
@@ -0,0 +1,26 @@
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/files/rc-addon-0.2.sh,v 1.1 2011/01/27 17:58:11 hd_brummy Exp $
+#
+# zzam@g.o
+# hd_brummy@g.o
+
+
+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.crt"
+		add_plugin_param "--key=/etc/vdr/plugins/live/live.key"
+
+	else
+		if [ -n "${LIVE_PORT}" ]; then
+			add_plugin_param "-p ${LIVE_PORT}"
+		fi
+	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.1.0.20080316.ebuild b/media-plugins/vdr-live/vdr-live-0.1.0.20080316.ebuild
deleted file mode 100644
index fd3a5fb4b3f6..000000000000
--- a/media-plugins/vdr-live/vdr-live-0.1.0.20080316.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 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.1.0.20080316.ebuild,v 1.3 2009/03/21 17:43:15 zzam Exp $
-
-inherit vdr-plugin versionator
-
-MY_PV=$(get_version_component_range 4)
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="VDR Plugin: Web Access To Settings"
-HOMEPAGE="http://live.vdr-developer.org"
-#SRC_URI="http://live.vdr-developer.org/downloads/${MY_PP}.tar.gz"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="media-video/vdr
-	>=dev-libs/boost-1.33.0
-	dev-libs/tntnet
-	>=dev-libs/cxxtools-1.4.3"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${VDRPLUGIN}"
-
-src_install() {
-	vdr-plugin_src_install
-
-	cd "${S}/live"
-	insinto /etc/vdr/plugins/live
-	doins -r *
-
-	chown vdr:vdr -R "${D}"/etc/vdr/plugins/live
-}
diff --git a/media-plugins/vdr-live/vdr-live-0.1.0.20080330.ebuild b/media-plugins/vdr-live/vdr-live-0.1.0.20080330.ebuild
deleted file mode 100644
index 643f9043d358..000000000000
--- a/media-plugins/vdr-live/vdr-live-0.1.0.20080330.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 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.1.0.20080330.ebuild,v 1.3 2009/03/21 17:43:15 zzam Exp $
-
-inherit vdr-plugin versionator
-
-MY_PV=$(get_version_component_range 4)
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="VDR Plugin: Web Access To Settings"
-HOMEPAGE="http://live.vdr-developer.org"
-#SRC_URI="http://live.vdr-developer.org/downloads/${MY_PP}.tar.gz"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="media-video/vdr
-	>=dev-libs/boost-1.33.0
-	dev-libs/tntnet
-	>=dev-libs/cxxtools-1.4.3"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${VDRPLUGIN}"
-
-src_install() {
-	vdr-plugin_src_install
-
-	cd "${S}/live"
-	insinto /etc/vdr/plugins/live
-	doins -r *
-
-	chown vdr:vdr -R "${D}"/etc/vdr/plugins/live
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	elog "To be able to use all functions of vdr-live"
-	elog "you should emerge and enable vdr-epgsearch"
-	elog
-	elog "\temerge vdr-epgsearch"
-	elog "\teselect vdr-plugin enable epgsearch"
-}
diff --git a/media-plugins/vdr-live/vdr-live-0.1.0.20080407.ebuild b/media-plugins/vdr-live/vdr-live-0.1.0.20080407.ebuild
deleted file mode 100644
index dfb9a57ad02d..000000000000
--- a/media-plugins/vdr-live/vdr-live-0.1.0.20080407.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 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.1.0.20080407.ebuild,v 1.2 2009/03/21 17:43:15 zzam Exp $
-
-inherit vdr-plugin versionator
-
-MY_PV=$(get_version_component_range 4)
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="VDR Plugin: Web Access To Settings"
-HOMEPAGE="http://live.vdr-developer.org"
-#SRC_URI="http://live.vdr-developer.org/downloads/${MY_PP}.tar.gz"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-video/vdr
-	>=dev-libs/boost-1.33.0
-	dev-libs/tntnet
-	>=dev-libs/cxxtools-1.4.3"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${VDRPLUGIN}"
-
-src_install() {
-	vdr-plugin_src_install
-
-	cd "${S}/live"
-	insinto /etc/vdr/plugins/live
-	doins -r *
-
-	chown vdr:vdr -R "${D}"/etc/vdr/plugins/live
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	elog "To be able to use all functions of vdr-live"
-	elog "you should emerge and enable vdr-epgsearch"
-	elog
-	elog "\temerge vdr-epgsearch"
-	elog "\teselect vdr-plugin enable epgsearch"
-}
diff --git a/media-plugins/vdr-live/vdr-live-0.2.0.20110118.ebuild b/media-plugins/vdr-live/vdr-live-0.2.0.20110118-r1.ebuild
index 7f9eb2007d56..0542ed80b9ac 100644
--- a/media-plugins/vdr-live/vdr-live-0.2.0.20110118.ebuild
+++ b/media-plugins/vdr-live/vdr-live-0.2.0.20110118-r1.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2011 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.2.0.20110118.ebuild,v 1.2 2011/01/21 00:04:54 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.2.0.20110118-r1.ebuild,v 1.1 2011/01/27 17:58:10 hd_brummy Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit vdr-plugin ssl-cert
 
 DESCRIPTION="VDR Plugin: Web Access To Settings"
 HOMEPAGE="http://live.vdr-developer.org"
 #SRC_URI="http://live.vdr-developer.org/downloads/${P}.tar.gz"
-SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+		http://vdr.websitec.de/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,13 +18,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE="ssl"
 
 DEPEND="media-video/vdr
-	>=dev-libs/tntnet-1.6.0.6[ssl=,sdk]
-	>=dev-libs/cxxtools-1.4.3"
+	>=dev-libs/tntnet-2.0[ssl=,sdk]
+	>=dev-libs/cxxtools-2.0"
 
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${VDRPLUGIN}"
 
+VDR_CONFD_FILE="${FILESDIR}/confd-0.2"
+VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.2.sh"
+
 make_live_cert() {
 	# ssl-cert eclass create invalide cert, create my own