new snapshot, cleanup

Package-Manager: portage-2.1.10.11/cvs/Linux i686
RepoMan-Options: --force

4 files changed, 46 insertions, 130 deletions

diff --git a/media-plugins/vdr-live/ChangeLog b/media-plugins/vdr-live/ChangeLog
index c76a864d0971..376c50cbb690 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.28 2011/07/10 03:40:52 hd_brummy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.29 2012/03/09 00:35:58 hd_brummy Exp $
+
+*vdr-live-0.2.0.20120114 (09 Mar 2012)
+
+  09 Mar 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-live-0.2.0.20110118-r1.ebuild, -vdr-live-0.2.0.20110213.ebuild,
+  +vdr-live-0.2.0.20120114.ebuild:
+  new snapshot, cleanup
 
 *vdr-live-0.2.0.20110419-r1 (10 Jul 2011)
 
diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index ac7d8a1df8b1..2e73d7264373 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -5,21 +5,19 @@ 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
-DIST vdr-live-0.2.0.20110118.tar.gz 1798034 RMD160 2abd45cf13a9a526642045f29fd955e90aaa5b51 SHA1 dab4805f4ffadda314245a9fcdadfd4ec854f415 SHA256 f9f2b3b403ab072b96dfc984b6e02c1712e2fe6398d2876d0c9f08264a62b819
-DIST vdr-live-0.2.0.20110213.tar.gz 1880603 RMD160 2617f8e4db1846521449635076b84bca9d81e1b0 SHA1 19ee05c068c3aa696a3de0893a5ba5826092d33a SHA256 b626470abbfbc67139c54dbb1820ce88c9e59f30bdb72898a726f3c35843847f
 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
 DIST vdr-live-0.2.0.tar.gz 560582 RMD160 10f7196ecaaa99280a6032f5d8d80a6c73a1f8d6 SHA1 b9687db0c913026ae4d29d99cbc6f031f4f32d34 SHA256 30ac64040be4defb75beb9d3a5b0218694fc5b10486926acd989e6eb6c72ca55
-EBUILD vdr-live-0.2.0.20110118-r1.ebuild 2592 RMD160 79da5351a2f86b5b6ce149bcdb0daee0290d6f21 SHA1 27b64c0abcce44aa5ab3f457dda3180dd5720367 SHA256 36fcb3dde2723782eb63326c9231449e7694140f258ecdf0ef546e4fee386685
-EBUILD vdr-live-0.2.0.20110213.ebuild 2714 RMD160 82253911e803fbc8dbe0541fe4875c50e7547f52 SHA1 a42a8a272a814e4b9e86df6080086e43316b2708 SHA256 cec5001efd0d2e180bf8bd2eabaa3d8cffd0c9479a06ea69a3b1ad3531011c23
 EBUILD vdr-live-0.2.0.20110419-r1.ebuild 2752 RMD160 0a042ddca4740d94dea35003ada80e167407a84a SHA1 cbfd214a6fd15733e6cc5d78c2c2197732beb193 SHA256 c3e5b37ffd3f4b7c92dac9cad9b633c779e4688cec9fa1284143085da5c30cbb
+EBUILD vdr-live-0.2.0.20120114.ebuild 2676 RMD160 802ed0a0dcbbf4a2d1a58d967189986a8d143000 SHA1 08bb29b980bea44a81495cd104e669e491705bf4 SHA256 eaaf7fcc6fa47b8f4d156acc5a3f7a9b99ca1a446c6be41209c1f3b1b44db233
 EBUILD vdr-live-0.2.0.ebuild 1222 RMD160 cd71347d9e29a14b82aad793f52d71529ed3030a SHA1 3696794eafbf52282a7a9a4f80ea4e872268d0c2 SHA256 25f86271282802d7a92f13cdf91b728b74d1d4a04f6344a103422fd968246d41
-MISC ChangeLog 5366 RMD160 bde3e226d6e8716468c75b46ad5fef16d58ffdc5 SHA1 96a8d6508980bed955157787a7414f9d92a0c0d9 SHA256 4dd8d1786cb3f335607f00ba0b0e11ceb1d911c239fe792dd6462b47830b0f8a
+MISC ChangeLog 5592 RMD160 f368bd1c0ae64a224e1d13ca8d35d6cdcc03a9b6 SHA1 73fedb18b16f7f086704a48223aa1d4cd5d5e75f SHA256 a4933f9a08599bd362ed0fc070ec79e6bb889357b3b7cd4af118fdffce4c90b4
 MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFOGR9Zdn07HTTCgIoRAkP5AJ9LLRTVUWDX1yiWwOzOoK8U5kWdHQCeKDFN
-kOxzjK3sBiQxMPtEC9GDNLc=
-=Mfve
+iD8DBQFPWVF6dn07HTTCgIoRAm91AJ9mLUqFSZOqKbQtbXZ+XgdXweSw2ACfegoD
+/zpNOXNlJX0HlQVs2ZVq27E=
+=FdvN
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-live/vdr-live-0.2.0.20110213.ebuild b/media-plugins/vdr-live/vdr-live-0.2.0.20110213.ebuild
deleted file mode 100644
index cf8325c6c834..000000000000
--- a/media-plugins/vdr-live/vdr-live-0.2.0.20110213.ebuild
+++ /dev/null
@@ -1,99 +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.20110213.ebuild,v 1.1 2011/02/13 13:19:23 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
-		http://vdr.websitec.de/download/${PN}/${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"
-
-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
-
-	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.20110118-r1.ebuild b/media-plugins/vdr-live/vdr-live-0.2.0.20120114.ebuild
index 2ec8471d4871..b27fbc159f48 100644
--- a/media-plugins/vdr-live/vdr-live-0.2.0.20110118-r1.ebuild
+++ b/media-plugins/vdr-live/vdr-live-0.2.0.20120114.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.20110118-r1.ebuild,v 1.2 2011/02/07 22:21:51 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.2.0.20120114.ebuild,v 1.1 2012/03/09 00:35:58 hd_brummy Exp $
 
-EAPI="3"
+EAPI="4"
 
 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
-		http://vdr.websitec.de/download/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,7 +17,8 @@ IUSE="ssl"
 
 DEPEND="media-video/vdr
 	>=dev-libs/tntnet-2.0[ssl=,sdk]
-	>=dev-libs/cxxtools-2.0"
+	>=dev-libs/cxxtools-2.0
+	>=dev-libs/libpcre-8.12[cxx]"
 
 RDEPEND="${DEPEND}"
 
@@ -51,6 +50,8 @@ src_prepare() {
 
 	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
@@ -67,29 +68,38 @@ src_install() {
 }
 
 pkg_postinst() {
-	vdr-plugin_pkg_postinst
+
+	if use ssl ; then
+		if path_exists -a "${ROOT}"/etc/vdr/plugins/live/live.key; then
+			einfo "SSL cert exists"
+			einfo ""
+			einfo "simply to create a new SSL cert remove:"
+			einfo "/etc/vdr/plugins/live/{live.key,live.crt}"
+			einfo "and reinstall ${P}"
+		else
+			einfo "Create SSL cert"
+			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
+	fi
 
 	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!!!"
 	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"
 
-	# 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
+	vdr-plugin_pkg_postinst
 }