version bump; rm unnedded patch

(Portage version: 2.1.4.4)

3 files changed, 42 insertions, 101 deletions

diff --git a/media-plugins/vdr-live/ChangeLog b/media-plugins/vdr-live/ChangeLog
index a981cc524930..93083edbe06d 100644
--- a/media-plugins/vdr-live/ChangeLog
+++ b/media-plugins/vdr-live/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-live
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.11 2008/01/23 21:31:26 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.12 2008/03/16 21:42:07 hd_brummy Exp $
+
+*vdr-live-0.1.0.20080316 (16 Mar 2008)
+
+  16 Mar 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/vdr-live-content-type.diff, +vdr-live-0.1.0.20080316.ebuild:
+  version bump; rm unnedded patch
 
   23 Jan 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-live-0.1.0.20071111.ebuild:
diff --git a/media-plugins/vdr-live/files/vdr-live-content-type.diff b/media-plugins/vdr-live/files/vdr-live-content-type.diff
deleted file mode 100644
index 264988781b51..000000000000
--- a/media-plugins/vdr-live/files/vdr-live-content-type.diff
+++ /dev/null
@@ -1,100 +0,0 @@
-Index: live-20070704/tntconfig.cpp
-===================================================================
---- live-20070704.orig/tntconfig.cpp
-+++ live-20070704/tntconfig.cpp
-@@ -57,6 +57,8 @@ void TntConfig::WriteConfig()
- 	file << "PropertyFile " << m_propertiesPath << endl;
- 	file << "SessionTimeout 86400" << endl;
- 
-+	file << "DefaultContentType \"text/html; charset=" << encoding << "\"" << endl;
-+
- 	Setup::IpList const& ips = LiveSetup().GetServerIps();
- 	int port = LiveSetup().GetServerPort();
- 	for ( Setup::IpList::const_iterator ip = ips.begin(); ip != ips.end(); ++ip ) {
-Index: live-20070704/pages/xmlresponse.ecpp
-===================================================================
---- live-20070704.orig/pages/xmlresponse.ecpp
-+++ live-20070704/pages/xmlresponse.ecpp
-@@ -2,6 +2,12 @@
- #include <string>
- 
- using namespace std;
-+namespace vdrlive {
-+extern const char * encoding;
-+};
-+
-+std::string xml_head_1 = "<?xml version=\"1.0\" encoding=\"";
-+std::string xml_head_2 = "\"?>";
- </%pre>
- 
- <# ------------------------------------------------------------------------- #>
-@@ -14,7 +20,7 @@ using namespace std;
- 	bool result;
- 	string error;
- </%args>
--<?xml version="1.0" encoding="ISO-8859-1"?>
-+<$$ xml_head_1 $><$ vdrlive::encoding $><$$ xml_head_2 $>
- <service>
-   <request name="<$ name $>">
-      <param name="<$ pname $>"><$ value $></param>
-@@ -38,7 +44,7 @@ using namespace std;
- 	string prev_chan;
- 	string next_chan;
- </%args>
--<?xml version="1.0" encoding="ISO-8859-1"?>
-+<$$ xml_head_1 $><$ vdrlive::encoding $><$$ xml_head_2 $>
- <service>
-   <request name="ibox">
- 	<param name="update"><$ update $></param>
-Index: live-20070704/thread.cpp
-===================================================================
---- live-20070704.orig/thread.cpp
-+++ live-20070704/thread.cpp
-@@ -1,8 +1,10 @@
- #include <cstdlib>
- #include <iostream>
- #include <stdexcept>
-+#include <vdr/config.h>
- #include <vdr/tools.h>
- #include <tnt/tntnet.h>
-+#include <vdr/i18n.h>
- #include "thread.h"
- #include "tntconfig.h"
- 
-@@ -23,6 +25,8 @@ private:
- 	char* m_string;
- };
- 
-+const char* encoding = NULL;
-+
- ServerThread::ServerThread()
- {
- }
-@@ -43,6 +47,14 @@ void ServerThread::Stop()
- void ServerThread::Action()
- {
- 	try {
-+#if VDRVERSNUM >= 10503
-+		if ( cCharSetConv::SystemCharacterTable() )
-+			encoding = cCharSetConv::SystemCharacterTable();
-+		else
-+			encoding = "UTF-8";
-+#else
-+		encoding = I18nCharSets()[::Setup.OSDLanguage];
-+#endif
- 		ProtectedCString configPath( TntConfig::Get().GetConfigPath().c_str() );
- 
- 		char* argv[] = { const_cast< char* >( "tntnet" ), const_cast< char* >( "-c" ), configPath };
-Index: live-20070704/thread.h
-===================================================================
---- live-20070704.orig/thread.h
-+++ live-20070704/thread.h
-@@ -22,6 +22,8 @@ private:
- 	std::auto_ptr< tnt::Tntnet > m_server;
- };
- 
-+extern const char *encoding;
-+
- } // namespace vdrlive
- 
- #endif // VDR_LIVE_THREAD_H
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
new file mode 100644
index 000000000000..6beb31c24e88
--- /dev/null
+++ b/media-plugins/vdr-live/vdr-live-0.1.0.20080316.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2008 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.1 2008/03/16 21:42:07 hd_brummy 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-1.6.1
+	>=dev-libs/cxxtools-1.4.3"
+
+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
+}