version bump, thanks to P.Frank on bug 203708; cleanup; 0.2.6-r1 stable on x86

(Portage version: 2.1.3.19)

8 files changed, 57 insertions, 51 deletions

diff --git a/media-plugins/vdr-vompserver/ChangeLog b/media-plugins/vdr-vompserver/ChangeLog
index a400dd8152da..2c894ec82fe6 100644
--- a/media-plugins/vdr-vompserver/ChangeLog
+++ b/media-plugins/vdr-vompserver/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-vompserver
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/ChangeLog,v 1.8 2007/06/24 12:37:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/ChangeLog,v 1.9 2007/12/30 16:47:09 hd_brummy Exp $
+
+*vdr-vompserver-0.2.7 (30 Dec 2007)
+
+  30 Dec 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-vompserver-0.2.7-gentoo.diff, -vdr-vompserver-0.2.5.ebuild,
+  -vdr-vompserver-0.2.6.ebuild, vdr-vompserver-0.2.6-r1.ebuild,
+  +vdr-vompserver-0.2.7.ebuild:
+  version bump, thanks to P.Frank on bug 203708; cleanup; 0.2.6-r1 stable on x86
 
 *vdr-vompserver-0.2.6-r1 (24 Jun 2007)
 
diff --git a/media-plugins/vdr-vompserver/files/digest-vdr-vompserver-0.2.5 b/media-plugins/vdr-vompserver/files/digest-vdr-vompserver-0.2.5
deleted file mode 100644
index ce3038a71e66..000000000000
--- a/media-plugins/vdr-vompserver/files/digest-vdr-vompserver-0.2.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 87ffbdfd4fda55b6d6d8caf2c22afb26 vdr-vompserver-0.2.5.tgz 93335
-RMD160 35c10ce32396136ee23f62b5aa5d3af35dcc4a38 vdr-vompserver-0.2.5.tgz 93335
-SHA256 f28fefb5b95e565b93e45d72c5f9ddbae911633ec6a9f94b285eba099dd0910f vdr-vompserver-0.2.5.tgz 93335
diff --git a/media-plugins/vdr-vompserver/files/digest-vdr-vompserver-0.2.6 b/media-plugins/vdr-vompserver/files/digest-vdr-vompserver-0.2.6
deleted file mode 100644
index b0168f7caa51..000000000000
--- a/media-plugins/vdr-vompserver/files/digest-vdr-vompserver-0.2.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6971a843ad7b92c296b0a60de9af589a vdr-vompserver-0.2.6.tgz 41918
-RMD160 35bf39cb6288fcf46246915d8a2d6e5ebd0dfd24 vdr-vompserver-0.2.6.tgz 41918
-SHA256 2650d44b76290d6a973ee4ce4088d4ca82e3e36f67c56dbf7785284dc111515d vdr-vompserver-0.2.6.tgz 41918
diff --git a/media-plugins/vdr-vompserver/files/digest-vdr-vompserver-0.2.7 b/media-plugins/vdr-vompserver/files/digest-vdr-vompserver-0.2.7
new file mode 100644
index 000000000000..1603d515bd0c
--- /dev/null
+++ b/media-plugins/vdr-vompserver/files/digest-vdr-vompserver-0.2.7
@@ -0,0 +1,3 @@
+MD5 0f3f661bcf1b7045a7c88ecf92632435 vdr-vompserver-0.2.7.tgz 45980
+RMD160 cd2f09e151f82844cca2e7f59a765b48671887b0 vdr-vompserver-0.2.7.tgz 45980
+SHA256 778a840f90682de94fa5d7e80dc69069c6d5c414f48b26489ae32d07296dfa96 vdr-vompserver-0.2.7.tgz 45980
diff --git a/media-plugins/vdr-vompserver/files/vdr-vompserver-0.2.7-gentoo.diff b/media-plugins/vdr-vompserver/files/vdr-vompserver-0.2.7-gentoo.diff
new file mode 100644
index 000000000000..673767bf05c8
--- /dev/null
+++ b/media-plugins/vdr-vompserver/files/vdr-vompserver-0.2.7-gentoo.diff
@@ -0,0 +1,41 @@
+change config Path for more overview if you have a lot plugins installed
+Update: place vonp.conf into vomp plugin subdir also
+
+Petric Frank <pfrank@gmx.de> 28 Dec 2007
+
+based on vdr-vompsever-0.2.6-gentoo.diff from Joerg Bornkessel <hd_brummy@gentoo.org> 17 Feb 2007
+
+diff -Naur vompserver-0.2.7.old/bootpd.c vompserver-0.2.7/bootpd.c
+--- vompserver-0.2.7.old/bootpd.c	2007-11-05 22:05:30.000000000 +0100
++++ vompserver-0.2.7/bootpd.c	2007-12-28 01:54:44.000000000 +0100
+@@ -99,7 +99,7 @@
+ 
+   // Open a config file for the given MAC
+ 
+-  const char* configDir = cPlugin::ConfigDirectory();
++  const char* configDir = cPlugin::ConfigDirectory( "vomp" );
+ //  char* configDir = "/opt/dvb/vdr-config-1.3/plugins";
+   if (!configDir)
+   {
+diff -Naur vompserver-0.2.7.old/vompserver.c vompserver-0.2.7/vompserver.c
+--- vompserver-0.2.7.old/vompserver.c	2007-11-07 21:28:28.000000000 +0100
++++ vompserver-0.2.7/vompserver.c	2007-12-28 02:15:22.000000000 +0100
+@@ -27,6 +27,8 @@
+ static const char *VERSION        = "0.2.7";
+ static const char *DESCRIPTION    = "VDR on MVP plugin by Chris Tallon";
+ 
++static char *PLUGIN_CONFIG_SUBDIR = "vomp";
++
+ class cPluginVompserver : public cPlugin
+ {
+ public:
+@@ -61,7 +63,7 @@
+ bool cPluginVompserver::Start(void)
+ {
+   // Start any background activities the plugin shall perform.
+-  int success = mvpserver.run(configDir);
++  int success = mvpserver.run(configDir ? configDir : PLUGIN_CONFIG_SUBDIR);
+   if (success) return true;
+   else return false;
+ }
+
diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.2.5.ebuild b/media-plugins/vdr-vompserver/vdr-vompserver-0.2.5.ebuild
deleted file mode 100644
index 143c1a0b8610..000000000000
--- a/media-plugins/vdr-vompserver/vdr-vompserver-0.2.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.2.5.ebuild,v 1.3 2007/01/05 17:02:26 hd_brummy Exp $
-
-IUSE=""
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR Plugin: server part for MediaMVP device"
-#HOMEPAGE="http://vomp.sourceforge.net"
-HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Vompserver-plugin"
-SRC_URI="mirror://gentoo/${P}.tgz mirror://vdrfiles/${PN}/${P}.tgz"
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND=">=media-video/vdr-1.2.6
-	"
-
-src_install() {
-	vdr-plugin_src_install
-
-	dodoc README HISTORY COPYING
-	newdoc remux/README README.remux
-
-	insinto /etc/vdr/plugins
-	newins vomp.conf.sample vomp.conf
-	newins vomp-00-00-00-00-00-00.conf.sample vomp-00-00-00-00-00-00.conf
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "Have a look to the VOMP sample files in /etc/vdr/plugins."
-	echo
-	elog "You have to download the dongle file (i.e. firmware) and adapt"
-	elog "the vomp configuration files accordingly."
-	echo
-}
diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.2.6-r1.ebuild b/media-plugins/vdr-vompserver/vdr-vompserver-0.2.6-r1.ebuild
index 3d7c50c25e9d..55a24c29639f 100644
--- a/media-plugins/vdr-vompserver/vdr-vompserver-0.2.6-r1.ebuild
+++ b/media-plugins/vdr-vompserver/vdr-vompserver-0.2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.2.6-r1.ebuild,v 1.2 2007/07/10 23:09:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.2.6-r1.ebuild,v 1.3 2007/12/30 16:47:09 hd_brummy Exp $
 
 inherit vdr-plugin
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.loggytronic.com/dl/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.2.6"
diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.2.6.ebuild b/media-plugins/vdr-vompserver/vdr-vompserver-0.2.7.ebuild
index 159ba6d5758b..108b05618c1c 100644
--- a/media-plugins/vdr-vompserver/vdr-vompserver-0.2.6.ebuild
+++ b/media-plugins/vdr-vompserver/vdr-vompserver-0.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.2.6.ebuild,v 1.4 2007/07/10 23:09:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.2.7.ebuild,v 1.1 2007/12/30 16:47:09 hd_brummy Exp $
 
 inherit vdr-plugin
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.loggytronic.com/dl/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.2.6"