version bump; rm unnedded patch

Package-Manager: portage-2.1.4.4

4 files changed, 56 insertions, 103 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/Manifest b/media-plugins/vdr-live/Manifest
index dfb67ae078a3..ac96f19a6d06 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX confd 125 RMD160 f9b80ed1c08301c7cdab9c4fe20c0e933a977db1 SHA1 3b8ef982bbfa64811176379c629ca3b7f1a08778 SHA256 949c97e715af8405b47877afe4fa9c93dc3ed04b1ac6b6d7982e41f61ba0d122
 AUX rc-addon.sh 180 RMD160 cd41dc99aed6f463dce1d22ca028317fc23a99e1 SHA1 153dc6a11f59195659628ed86f677755b71090f9 SHA256 d9c9eca9f12362c1f8c162a9bb948feebdb8acc87413a611ecf5f52a3092878a
-AUX vdr-live-content-type.diff 2947 RMD160 6535db3dff27001e04e5c5a85696cd6664c99e56 SHA1 d3abadca79cfaffaf429529f086c38aa7389f17b SHA256 7de6392dd1d0a896c9a01e06f672c929253d1811bf29dbfbf55b56147ebb1049
 DIST vdr-live-20071111.tar.gz 526778 RMD160 b7dcdd25ef2c4914327696e22552bd43cd94c230 SHA1 a5857aa0af540bfba34a92dca91ab5b38b2d99a6 SHA256 83a39fbb3a813acc10b04619aac563e0abb4c01ff3e164fce4029af26408793b
+DIST vdr-live-20080316.tar.gz 546425 RMD160 f3b1f6493fc4a16694017445fe6f15de1981718b SHA1 863c93154745b0cf24c3fcec0c8b264b44cea9ae SHA256 a02d68bb818c35369849a2bd7a7204778bccfbfb8e5d55663d3a9e9e05276876
 EBUILD vdr-live-0.1.0.20071111.ebuild 869 RMD160 2ed9a993687dca53d02b5b862d3136e5b15ab76b SHA1 0baa1a25153127925fae324821f74c4de3a055f6 SHA256 c73f711d1fc9db88134149b4efbe22f367b660ae88dee6054288b8f94aa1c242
-MISC ChangeLog 2366 RMD160 337043bbe5a012b3ccbdf9595638ed3ae88927e1 SHA1 4004efb03cb7c05c78b6849598b209ee7deb7f07 SHA256 184cabac9ac6c2fb48e707fe7a69f7f4d0db8fbd7fdcfbb6a3a5a6659b628c86
+EBUILD vdr-live-0.1.0.20080316.ebuild 869 RMD160 86de311e0dfce722b4a7c848b9a5e7b25e4f0bb6 SHA1 deb23ba7489c470a8fa1cc2a8fe83cce56a0af6f SHA256 dfc1a875212a4fc59298babc762015a66cfc396b24d005d7a5c2d06926c67e78
+MISC ChangeLog 2566 RMD160 7d0e96b23b1033b32a022f16290914748f5d9f6c SHA1 e759474a4e61bbb2d7f83e5a91cb3ef9f6c56554 SHA256 e0bd927dc78bdc4bf6a2999a4e8fa5840952483e6acb6d566e3246b3b90f9e37
 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
+
+iD8DBQFH3ZRgdn07HTTCgIoRAqjKAKCvZlzMlvbtl3YEKiGTSHAKVxQLcgCgrMzb
+ySh0d8Twe94jJjE4FukGawE=
+=rURM
+-----END PGP SIGNATURE-----
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
+}