Version bump, some cleanup and minor ebuild fixes

Package-Manager: portage-2.2.0_alpha109/cvs/Linux x86_64

7 files changed, 129 insertions, 206 deletions

diff --git a/media-plugins/vdr-live/ChangeLog b/media-plugins/vdr-live/ChangeLog
index 9aac727ddc2e..4a3e329d6a67 100644
--- a/media-plugins/vdr-live/ChangeLog
+++ b/media-plugins/vdr-live/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-live
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.31 2012/04/02 20:30:50 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.32 2012/06/04 01:08:59 idl0r Exp $
+
+*vdr-live-0.2.0_p20120325 (04 Jun 2012)
+
+  04 Jun 2012; Christian Ruppert <idl0r@gentoo.org>
+  +vdr-live-0.2.0_p20120325.ebuild, -vdr-live-0.2.0.20110419-r1.ebuild,
+  -vdr-live-0.2.0.20120114-r1.ebuild, -files/vdr-1.7.27-compatibility.patch,
+  +files/vdr-1.7.28-compatibility.patch, +files/vdr-live_pcre.patch:
+  Version bump, some cleanup and minor ebuild fixes
 
 *vdr-live-0.2.0.20120114-r1 (02 Apr 2012)
 
diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index a4fdac1a2730..0a40b17be0d6 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -5,23 +5,22 @@ AUX confd 125 RMD160 f9b80ed1c08301c7cdab9c4fe20c0e933a977db1 SHA1 3b8ef982bbfa6
 AUX confd-0.2 468 RMD160 3ee305c163c134820c7285647ba7c6332468106f SHA1 88b65b954be6ae749c14752166f00830fc69af65 SHA256 bf4f4a961212ba6847fb0456bdc9cafd9f82d930324fb9c45adcbffdff267488
 AUX rc-addon-0.2.sh 607 RMD160 9ed2ade55523ec30951f32f2616cbc34471ef127 SHA1 fffdc2702378b53528c25817ba8bdddfecc645cb SHA256 af62d925e3fc2de3990868de6acb830896aa04052dc95ca0ec8627eac3055fbe
 AUX rc-addon.sh 180 RMD160 cd41dc99aed6f463dce1d22ca028317fc23a99e1 SHA1 153dc6a11f59195659628ed86f677755b71090f9 SHA256 d9c9eca9f12362c1f8c162a9bb948feebdb8acc87413a611ecf5f52a3092878a
-AUX vdr-1.7.27-compatibility.patch 1193 RMD160 234924f4894259709bda1fcf0049ddf7f2473c99 SHA1 5af920fa985a7978a0ff34c618d5918006481c08 SHA256 c3752db0093e245776449e575ed1bebf7465fb16d02e5c30d4df3d9a59c3786a
-DIST vdr-live-0.2.0.20110419.tar.gz 1987984 RMD160 7740af3b6fb91e5b9fdde305094563e9fec3a7e3 SHA1 fffe8c2a86c628df8d56129580aee4dd7905e4aa SHA256 b3c2263e10f97b35f071a707b651922173b21b2b88f651cf4c788b330ca5fa2a
-DIST vdr-live-0.2.0.20120114.tar.gz 1993095 RMD160 3b982ba64171a458e530cfd388185ce20959f129 SHA1 28d1a3669d24a9ed3cbb41e4c21900dd96936fbd SHA256 fb1a931f282aa8282d6fa1a5ebac6a97cdfd59574b29b9413e7f498ea2723449
+AUX vdr-1.7.28-compatibility.patch 1146 RMD160 ddb802847812b489f38878e53156e2b21b5b2437 SHA1 115ea312b233163afe07fa0263576ef3bd88b225 SHA256 52bc7f9315db8102a5531a788e164bc347dae0deb3078c157a6722500b16041a
+AUX vdr-live_pcre.patch 586 RMD160 46f89179e4b82dd1a870201d902d608ae281b779 SHA1 ada12dbd1eaeed3c815eb698be5c30f0c969ca8d SHA256 290fe19ec39c638a78ca4b7f21ab9d337aa85657491e77871fbf0ab175873c94
 DIST vdr-live-0.2.0.tar.gz 560582 RMD160 10f7196ecaaa99280a6032f5d8d80a6c73a1f8d6 SHA1 b9687db0c913026ae4d29d99cbc6f031f4f32d34 SHA256 30ac64040be4defb75beb9d3a5b0218694fc5b10486926acd989e6eb6c72ca55
-EBUILD vdr-live-0.2.0.20110419-r1.ebuild 2752 RMD160 0a042ddca4740d94dea35003ada80e167407a84a SHA1 cbfd214a6fd15733e6cc5d78c2c2197732beb193 SHA256 c3e5b37ffd3f4b7c92dac9cad9b633c779e4688cec9fa1284143085da5c30cbb
-EBUILD vdr-live-0.2.0.20120114-r1.ebuild 2748 RMD160 3d1996f07ffb4d45f8f699b254a27aadc2a48264 SHA1 cc20d7b30dc95c3e2c50e554f0c8293016cd2fe9 SHA256 e9e320daf5efd4385409421d72f67103087887e06dfa214ac512cede91ea9574
+DIST vdr-live-0.2.0_p20120325.tar.bz2 1992249 RMD160 422dca268cfc724e58ebce3b5b0960ff8d8d95f4 SHA1 0b30f815df95cd26a8b92e9c02d7a4f61b91abc4 SHA256 c73873d810d154ec7ebc167fad727e892ddabc523a601447b180ddd6f298a138
 EBUILD vdr-live-0.2.0.ebuild 1222 RMD160 cd71347d9e29a14b82aad793f52d71529ed3030a SHA1 3696794eafbf52282a7a9a4f80ea4e872268d0c2 SHA256 25f86271282802d7a92f13cdf91b728b74d1d4a04f6344a103422fd968246d41
-MISC ChangeLog 5991 RMD160 7e5a06a5c2f45b8d88d05b61d6b16cee3478a43a SHA1 dccc46946795c7ad6f13a07af9069f950796531c SHA256 0995f8f32f0d45e3b3913497559981c848abb3e30d32779142fb499c7d583595
+EBUILD vdr-live-0.2.0_p20120325.ebuild 2548 RMD160 ba6fe8fb2ea5f0570089e004cae49256c10aec82 SHA1 94ddf50877dd5820a1d60560fcaf2248d0730162 SHA256 b6b9d6f0b3f158c8d961891682a31c85d9889628f095be812ee725baee739825
+MISC ChangeLog 6355 RMD160 cb74b09c51ac43c62a24c9e369ce1314f11aa360 SHA1 91de4f593c37ef721c473914515d569221879bcf SHA256 d4ad0acf8389e4e2989ba347c8cd8cf705ef0843717a4778649efdc6de3ffaae
 MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJPegx/AAoJEMOx0zmdw4Z16pIH/3sXty3+HMrgobOwqcCb5Wko
-bKn6oIzrKsU6RcxJq5TCzjh5nxFlcEBBWSt2BHJX1jodPa51fUW+jgL4IjutOHyW
-ft0PwqyhPi0AqERkZrWlhOOYAeWm80X+N5I7DkSKR6O38FX7ccbsh4YfrDn8dtwd
-48W6DCoL/QXkVeZDCeeExIUeIyCbG8XvrWwG58rLJwykJswndQPAa4Oohs3UqFIO
-QXDTTOVNUK8o/IvZdX/AD00q8FGDuQwyUqqqPMn7SQJpZ+repbH4FhapzooQO97P
-yw1WWdj8i0Cs7C6b6lR+xRJ3A4THQpKdPYQZyDw2YNJqkd+WzocEnlzYnaYqT20=
-=5LZZ
+iQEcBAEBCAAGBQJPzAq1AAoJEMOx0zmdw4Z158gIAJciT4EARn0fbtdlnX6Fpk2/
+7iXgyfkSuxEQhsXAUb+Bue0C8ZfLV8YJk6CWWjEjlsrZaMDEoQUGc4VJt4zFxW9R
+YKzsJUV6AhEmVJ4c4KjJnqqUsUGM33ioDWiGeTstRycXs7Mz72IwwmB5FfmD35yN
+tKC6DTz0rEH5+PZLUo6ER7ifjpO9tUFQyIShmzEeQM7qHU4lnQVcpCcAoF+4mSgn
+/8eovjkHmJSIN7PrgYYRFlLP1y8n0PiSCSqUtYS8saxmFbaaf6FmMFNOKOZSyT7v
+FhGZkMhHVy/5DKLv9wNsSYLPuQO7xXqK9/zGOs+EYpHR1GGpSaJlfZvSa9b943I=
+=OM4F
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-live/files/vdr-1.7.27-compatibility.patch b/media-plugins/vdr-live/files/vdr-1.7.27-compatibility.patch
deleted file mode 100644
index 4eb296676621..000000000000
--- a/media-plugins/vdr-live/files/vdr-1.7.27-compatibility.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit 94a0a210a485ce1fc95c47a6bc67c4c16c89a0f9
-Author: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
-Date:   Sun Mar 25 16:42:12 2012 +0200
-
-    Updated LIVE to latest changes in vdr 1.7.27
-    - Do not use the direct access to cRecoding members any more.
-
-diff --git a/epg_events.cpp b/epg_events.cpp
-index a514769..cd4996e 100644
---- a/epg_events.cpp
-+++ b/epg_events.cpp
-@@ -182,12 +182,20 @@ namespace vdrlive
- 
- 	time_t EpgRecording::GetStartTime() const
- 	{
-+#if VDRVERSNUM < 10726
- 		return m_recording ? m_recording->start : 0;
-+#else
-+		return m_recording ? m_recording->Start() : 0;
-+#endif
- 	}
- 
- 	time_t EpgRecording::GetEndTime() const
- 	{
-+#if VDRVERSNUM < 10726
- 		return m_recording ? m_recording->start : 0;
-+#else
-+		return m_recording ? m_recording->Start() : 0;
-+#endif
- 	}
- 
- 	const string EpgRecording::Name() const
-diff --git a/recman.cpp b/recman.cpp
-index fb315d2..6a2fc00 100644
---- a/recman.cpp
-+++ b/recman.cpp
-@@ -383,7 +383,11 @@ namespace vdrlive {
- 
- 	time_t RecordingsItemRec::StartTime() const
- 	{
-+#if VDRVERSNUM < 10726
- 		return m_recording->start;
-+#else
-+		return m_recording->Start();
-+#endif
- 	}
- 
- 	long RecordingsItemRec::Duration() const
diff --git a/media-plugins/vdr-live/files/vdr-1.7.28-compatibility.patch b/media-plugins/vdr-live/files/vdr-1.7.28-compatibility.patch
new file mode 100644
index 000000000000..d95ebd748c73
--- /dev/null
+++ b/media-plugins/vdr-live/files/vdr-1.7.28-compatibility.patch
@@ -0,0 +1,44 @@
+From e154fec60a27d5a74e6940941f789e17d7169d54 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Mon, 4 Jun 2012 01:42:31 +0200
+Subject: [PATCH] Compile fix for >=vdr-1.7.28
+
+---
+ tasks.cpp |   10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/tasks.cpp b/tasks.cpp
+index 9f20190..2a2b8d5 100644
+--- a/tasks.cpp
++++ b/tasks.cpp
+@@ -60,9 +60,15 @@ void PlayRecordingTask::Action()
+ 
+ 	const char *current = NowReplaying();
+ 	if (!current || (0 != strcmp(current, recording->FileName()))) {
++#if VDRVERSNUM >= 10728
++		cReplayControl::SetRecording( 0 );
++		cControl::Shutdown();
++		cReplayControl::SetRecording( recording->FileName() );
++#else
+ 		cReplayControl::SetRecording( 0, 0 );
+ 		cControl::Shutdown();
+ 		cReplayControl::SetRecording( recording->FileName(), recording->Title() );
++#endif
+ 		cControl::Launch( new cReplayControl );
+ 		cControl::Attach();
+ 	}
+@@ -122,7 +128,11 @@ void StopRecordingTask::Action()
+ 		return;
+ 	}
+ 
++#if VDRVERSNUM >= 10728
++	cReplayControl::SetRecording( 0 );
++#else
+ 	cReplayControl::SetRecording( 0, 0 );
++#endif
+ 	cControl::Shutdown();
+ }
+ 
+-- 
+1.7.3.4
+
diff --git a/media-plugins/vdr-live/files/vdr-live_pcre.patch b/media-plugins/vdr-live/files/vdr-live_pcre.patch
new file mode 100644
index 000000000000..9767cca173a5
--- /dev/null
+++ b/media-plugins/vdr-live/files/vdr-live_pcre.patch
@@ -0,0 +1,26 @@
+From 6b2965a86a20c885fc1fae8d4dea24b29b38805e Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Mon, 4 Jun 2012 02:29:55 +0200
+Subject: [PATCH] Make PCRE optional
+
+---
+ pages/recordings.ecpp |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
+index ebd57e0..8bdad66 100644
+--- a/pages/recordings.ecpp
++++ b/pages/recordings.ecpp
+@@ -1,6 +1,9 @@
+ <%pre>
+ #include <string>
++
++#ifdef HAVE_LIBPCRECPP
+ #include <pcrecpp.h>
++#endif
+ 
+ #include <vdr/plugin.h>
+ #include <vdr/config.h>
+-- 
+1.7.3.4
+
diff --git a/media-plugins/vdr-live/vdr-live-0.2.0.20110419-r1.ebuild b/media-plugins/vdr-live/vdr-live-0.2.0.20110419-r1.ebuild
deleted file mode 100644
index 340974bb1707..000000000000
--- a/media-plugins/vdr-live/vdr-live-0.2.0.20110419-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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.20110419-r1.ebuild,v 1.1 2011/07/10 03:40:52 hd_brummy Exp $
-
-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="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-DEPEND="media-video/vdr
-	>=dev-libs/tntnet-2.0[ssl=,sdk]
-	>=dev-libs/cxxtools-2.0
-	>=dev-libs/libpcre-8.12[cxx]"
-
-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
-
-	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
-}
-
-src_prepare() {
-	vdr-plugin_src_prepare
-
-	#make it work with /bin/sh as indicated in the file header
-	sed -e "18s/==/=/" -i  buildutil/version-util
-
-	sed -e "s/ERROR:/WARNING:/" -i tntconfig.cpp
-
-	sed -i "s:^HAVE_LIBPCRECPP:#HAVE_LIBPCRECPP:" Makefile
-
-	if ! has_version ">=media-video/vdr-1.7.13"; then
-	sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile
-	fi
-}
-
-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"
-	elog "=media-plugins/vdr-epgsearch-0.9.25_beta* to search the EPG,"
-	elog "media-plugins/vdr-streamdev-0.5.0 for Live-TV streaming"
-	echo
-	elog "On first install use login:pass"
-	elog "\tadmin:live"
-	echo
-	ewarn "\t\tWARNiNG!!!"
-	einfo "\tBe carefull on testing the new feature:"
-	einfo "\tedit/rename/move recordings"
-	echo
-	ewarn "This is a developer snapshot"
-	einfo "On problems, use the stable amd64, x86 versions of"
-	einfo "dev-libs/tntnet dev-libs/cxxtools media-plugins/vdr-live"
-	echo
-	# Do not install live.{key,crt) SSL certificates if they already exist
-	if use ssl && [[ ! -f "${ROOT}"/etc/vdr/plugins/live/live.key \
-		&& ! -f "${ROOT}"/etc/vdr/plugins/live/live.crt ]] ; then
-			make_live_cert
-			local base=$(get_base 1)
-			local keydir="/etc/vdr/plugins/live"
-			install -d "${ROOT}${keydir}"
-			install -m0400 "${base}.key" "${ROOT}${keydir}/live.key"
-			install -m0444 "${base}.crt" "${ROOT}${keydir}/live.crt"
-			chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live.*
-	fi
-}
diff --git a/media-plugins/vdr-live/vdr-live-0.2.0.20120114-r1.ebuild b/media-plugins/vdr-live/vdr-live-0.2.0_p20120325.ebuild
index 7fd065149b03..fec09cf63e0c 100644
--- a/media-plugins/vdr-live/vdr-live-0.2.0.20120114-r1.ebuild
+++ b/media-plugins/vdr-live/vdr-live-0.2.0_p20120325.ebuild
@@ -1,34 +1,36 @@
 # Copyright 1999-2012 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.20120114-r1.ebuild,v 1.1 2012/04/02 20:30:50 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.2.0_p20120325.ebuild,v 1.1 2012/06/04 01:08:59 idl0r Exp $
 
 EAPI="4"
 
-inherit vdr-plugin ssl-cert
+inherit vdr-plugin-2 ssl-cert toolchain-funcs
 
 DESCRIPTION="VDR Plugin: Web Access To Settings"
 HOMEPAGE="http://live.vdr-developer.org"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
+IUSE="pcre ssl"
 
 DEPEND="media-video/vdr
 	>=dev-libs/tntnet-2.0[ssl=,sdk]
 	>=dev-libs/cxxtools-2.0
-	>=dev-libs/libpcre-8.12[cxx]"
-
+	pcre? ( >=dev-libs/libpcre-8.12[cxx] )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${VDRPLUGIN}"
-
 VDR_CONFD_FILE="${FILESDIR}/confd-0.2"
 VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.2.sh"
 
+S="${WORKDIR}/${P}"
+
 make_live_cert() {
-	# ssl-cert eclass create invalide cert, create my own
+	# 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`}"
@@ -40,73 +42,66 @@ make_live_cert() {
 	gen_csr 1 || return 1
 	gen_crt 1 || return 1
 	echo
+
+	install -d "${ROOT}${keydir}"
+	install -m0400 "${base}.key" "${ROOT}${keydir}/live.key"
+	install -m0444 "${base}.crt" "${ROOT}${keydir}/live.crt"
+	chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live.*
 }
 
-src_prepare() {
-	vdr-plugin_src_prepare
+pkg_setup() {
+	vdr-plugin-2_pkg_setup
 
-	#make it work with /bin/sh as indicated in the file header
-	sed -e "18s/==/=/" -i  buildutil/version-util
+	tc-export CXX AR
+}
 
-	sed -e "s/ERROR:/WARNING:/" -i tntconfig.cpp
+src_prepare() {
+	vdr-plugin-2_src_prepare
 
-	sed -i "s:^HAVE_LIBPCRECPP:#HAVE_LIBPCRECPP:" Makefile
+	if ! use pcre; then
+		sed -i "s:^HAVE_LIBPCRECPP:#HAVE_LIBPCRECPP:" Makefile || die
+	fi
 
 	if ! has_version ">=media-video/vdr-1.7.13"; then
-	sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile
+		sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile || die
 	fi
 
-	epatch "${FILESDIR}/vdr-1.7.27-compatibility.patch"
+	epatch "${FILESDIR}/vdr-1.7.28-compatibility.patch"
+	epatch "${FILESDIR}/vdr-live_pcre.patch"
 }
 
 src_install() {
-	vdr-plugin_src_install
+	vdr-plugin-2_src_install
 
-	cd "${S}/live"
 	insinto /etc/vdr/plugins/live
-	doins -r *
+	doins -r live/*
 
-	chown vdr:vdr -R "${D}"/etc/vdr/plugins/live
+	fowners -R vdr:vdr /etc/vdr/plugins/live
 }
 
 pkg_postinst() {
-	vdr-plugin_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-0.9.25_beta* to search the EPG,"
-	elog "media-plugins/vdr-streamdev-0.5.0 for Live-TV streaming"
+	elog "media-plugins/vdr-epgsearch to search the EPG,"
+	elog "media-plugins/vdr-streamdev for Live-TV streaming"
 
-	elog "On first install use login:pass"
+	elog "The default username/password is:"
 	elog "\tadmin:live"
 
-	ewarn "\t\tWARNING!!!"
-	ewarn "This is a developer snapshot"
-	einfo "On problems, use the stable amd64, x86 versions of"
-	einfo "dev-libs/tntnet dev-libs/cxxtools media-plugins/vdr-live"
-
 	if use ssl ; then
 		if path_exists -a "${ROOT}"/etc/vdr/plugins/live/live.key; then
-			einfo "found SSL cert"
-			einfo ""
-			einfo "to create a new SSL cert, run:"
+			einfo "found an existing SSL cert, to create a new SSL cert, run:"
 			einfo ""
 			einfo "emerge --config ${PN}"
 		else
-			einfo "NO SSL cert found"
-			einfo ""
-			einfo "Create SSL cert, now ..."
-			pkg_config
+			einfo "No SSL cert found, creating a default one now"
+			make_live_cert
 		fi
 	fi
 }
 
 pkg_config() {
 	make_live_cert
-	local base=$(get_base 1)
-	local keydir="/etc/vdr/plugins/live"
-	install -d "${ROOT}${keydir}"
-	install -m0400 "${base}.key" "${ROOT}${keydir}/live.key"
-	install -m0444 "${base}.crt" "${ROOT}${keydir}/live.crt"
-	chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live.*
 }