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

Package-Manager: portage-2.1.3.19

9 files changed, 88 insertions, 74 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/Manifest b/media-plugins/vdr-vompserver/Manifest
index 74c9017722a6..f520c1f517ae 100644
--- a/media-plugins/vdr-vompserver/Manifest
+++ b/media-plugins/vdr-vompserver/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vdr-vompserver-0.2.6-gentoo.diff 597 RMD160 74a61259c067c32a7bb6d8e443d61e9ae62f854c SHA1 e4816447a0480a521be772ccaa9ed4d85a40f39e SHA256 ccb700b83708c6452845bc408e245ead9d1cbf1092a8f012f2efa7e89bf1d035
 MD5 126bd7042d12860ec15439d20ddce9d0 files/vdr-vompserver-0.2.6-gentoo.diff 597
 RMD160 74a61259c067c32a7bb6d8e443d61e9ae62f854c files/vdr-vompserver-0.2.6-gentoo.diff 597
@@ -6,34 +9,39 @@ AUX vdr-vompserver-0.2.6-vdr-1.5.0.diff 779 RMD160 2f3d8d2a7daea06097dce5d2e2315
 MD5 de24e8e17533d2400a6b6f4c842b4880 files/vdr-vompserver-0.2.6-vdr-1.5.0.diff 779
 RMD160 2f3d8d2a7daea06097dce5d2e23150c56470b323 files/vdr-vompserver-0.2.6-vdr-1.5.0.diff 779
 SHA256 187e990dece222bf4e8784ca6e6684e8d332e493b567a2cd759b3d639eb5feea files/vdr-vompserver-0.2.6-vdr-1.5.0.diff 779
-DIST vdr-vompserver-0.2.5.tgz 93335 RMD160 35c10ce32396136ee23f62b5aa5d3af35dcc4a38 SHA1 28f2a1fa29268df0ba3f104dfc488edafd8146da SHA256 f28fefb5b95e565b93e45d72c5f9ddbae911633ec6a9f94b285eba099dd0910f
+AUX vdr-vompserver-0.2.7-gentoo.diff 1494 RMD160 1535c67292ba10c9598ec8932297b694da2a19d5 SHA1 49075b9db1b93f1a0ae3ea2502bd8760c334f008 SHA256 13fdf160f5fd8bf70e611d14ed055b82937b5c99375c514636677513b81543e3
+MD5 ef73ff425918c5f635af6e919530589d files/vdr-vompserver-0.2.7-gentoo.diff 1494
+RMD160 1535c67292ba10c9598ec8932297b694da2a19d5 files/vdr-vompserver-0.2.7-gentoo.diff 1494
+SHA256 13fdf160f5fd8bf70e611d14ed055b82937b5c99375c514636677513b81543e3 files/vdr-vompserver-0.2.7-gentoo.diff 1494
 DIST vdr-vompserver-0.2.6.tgz 41918 RMD160 35bf39cb6288fcf46246915d8a2d6e5ebd0dfd24 SHA1 416cc3679802412346058c6bd66545c32d371c94 SHA256 2650d44b76290d6a973ee4ce4088d4ca82e3e36f67c56dbf7785284dc111515d
-EBUILD vdr-vompserver-0.2.5.ebuild 1080 RMD160 5efb604f7c0e8c0380e8ce113b20112536a88e65 SHA1 1d65bf2e54266da4145b09e94c03e9c11974a5db SHA256 c1b0ce04d22f4ee38ef9a881366f9eb98b75c7c9668d690ca7b1aa19c79a3e17
-MD5 e58c6a66862bcad89f742aa19f0dd1f6 vdr-vompserver-0.2.5.ebuild 1080
-RMD160 5efb604f7c0e8c0380e8ce113b20112536a88e65 vdr-vompserver-0.2.5.ebuild 1080
-SHA256 c1b0ce04d22f4ee38ef9a881366f9eb98b75c7c9668d690ca7b1aa19c79a3e17 vdr-vompserver-0.2.5.ebuild 1080
-EBUILD vdr-vompserver-0.2.6-r1.ebuild 1138 RMD160 112361fc7552aed7089d5ea597bc9150b63c1be2 SHA1 7c80c488bdada444e3a6e31684b6eeab6444d446 SHA256 fce7792f01ed99a9b818f1f790f56acda39b4c169eec4ed8160fff08912884e5
-MD5 dd28a83e2b98dd034ef4b598e113edb2 vdr-vompserver-0.2.6-r1.ebuild 1138
-RMD160 112361fc7552aed7089d5ea597bc9150b63c1be2 vdr-vompserver-0.2.6-r1.ebuild 1138
-SHA256 fce7792f01ed99a9b818f1f790f56acda39b4c169eec4ed8160fff08912884e5 vdr-vompserver-0.2.6-r1.ebuild 1138
-EBUILD vdr-vompserver-0.2.6.ebuild 1101 RMD160 9c6ffa6a9f832b458d6730be0e4783e3e84e9046 SHA1 12806ff393f132c98c680530f126afc33aeed02e SHA256 ce75568415137f31e8bc3e676c5b946aefc5b6db6e6e3094039ac371d13906af
-MD5 18b2da43f3384dfce8993e81e5905796 vdr-vompserver-0.2.6.ebuild 1101
-RMD160 9c6ffa6a9f832b458d6730be0e4783e3e84e9046 vdr-vompserver-0.2.6.ebuild 1101
-SHA256 ce75568415137f31e8bc3e676c5b946aefc5b6db6e6e3094039ac371d13906af vdr-vompserver-0.2.6.ebuild 1101
-MISC ChangeLog 1475 RMD160 1fc546bf0132fa36810015e1c2bd57dd6924cb04 SHA1 a0b7a7fe704dfb6855e2a2fd2682de5aad4d8699 SHA256 0fb3aaf46fde6006c5de5d995ce11df88ad5ebebeb34cf24f64a0cf56ce1f58c
-MD5 5cffc32274b64c15844b63321182b443 ChangeLog 1475
-RMD160 1fc546bf0132fa36810015e1c2bd57dd6924cb04 ChangeLog 1475
-SHA256 0fb3aaf46fde6006c5de5d995ce11df88ad5ebebeb34cf24f64a0cf56ce1f58c ChangeLog 1475
+DIST vdr-vompserver-0.2.7.tgz 45980 RMD160 cd2f09e151f82844cca2e7f59a765b48671887b0 SHA1 b5c7fc21a50ead0975740bf4eefb7e818f857076 SHA256 778a840f90682de94fa5d7e80dc69069c6d5c414f48b26489ae32d07296dfa96
+EBUILD vdr-vompserver-0.2.6-r1.ebuild 1137 RMD160 8c4dc12e87d2320703c5b30ad814fb2695521c72 SHA1 3e4e58360c10d52b9ab3f5935260bafc6fbef1e9 SHA256 89b18151afac2c51cc112fc6477088523bccf8fdf5ff323b90cb40b7f9f45c73
+MD5 3f20f07984060fca108affaf6a876fd3 vdr-vompserver-0.2.6-r1.ebuild 1137
+RMD160 8c4dc12e87d2320703c5b30ad814fb2695521c72 vdr-vompserver-0.2.6-r1.ebuild 1137
+SHA256 89b18151afac2c51cc112fc6477088523bccf8fdf5ff323b90cb40b7f9f45c73 vdr-vompserver-0.2.6-r1.ebuild 1137
+EBUILD vdr-vompserver-0.2.7.ebuild 1102 RMD160 1fbd543ec9d15cc0858bf330a5868c623f949694 SHA1 3f76d68d98fec459f1aa560a4b7d447da65c6ec7 SHA256 0094249201fd94941cc87da095da057930ed36e00e9d3f7aa67bf2564a06fe99
+MD5 39351433ed09f90ff8f0e78505874ee2 vdr-vompserver-0.2.7.ebuild 1102
+RMD160 1fbd543ec9d15cc0858bf330a5868c623f949694 vdr-vompserver-0.2.7.ebuild 1102
+SHA256 0094249201fd94941cc87da095da057930ed36e00e9d3f7aa67bf2564a06fe99 vdr-vompserver-0.2.7.ebuild 1102
+MISC ChangeLog 1823 RMD160 07f70545ebf01b5c526d67d8e65cfb386ecdd7f9 SHA1 033212cfe181e2dd67159a5085078fa198c3c02b SHA256 e3679868aab21d1ae9c4ed0f1b8a6724bd34de5e49d520b54eeb980a2a523b32
+MD5 ae14366b062fe03c32a3451de3628b51 ChangeLog 1823
+RMD160 07f70545ebf01b5c526d67d8e65cfb386ecdd7f9 ChangeLog 1823
+SHA256 e3679868aab21d1ae9c4ed0f1b8a6724bd34de5e49d520b54eeb980a2a523b32 ChangeLog 1823
 MISC metadata.xml 535 RMD160 b26274618c1b5685adfc1e7b4704fc28cb04873e SHA1 d61aa6fc15a1a8a7d3fe07936990354449d51993 SHA256 85d5dba319863605021ca12cd31b3607b16b6d86897a0b0d129c5895ef3e0452
 MD5 2d506c90ccb30de9bc00ebb34fa7e194 metadata.xml 535
 RMD160 b26274618c1b5685adfc1e7b4704fc28cb04873e metadata.xml 535
 SHA256 85d5dba319863605021ca12cd31b3607b16b6d86897a0b0d129c5895ef3e0452 metadata.xml 535
-MD5 71fe940228c287ea75c6994c50d32710 files/digest-vdr-vompserver-0.2.5 250
-RMD160 64a4bfb15a83394c6aff59e5fa7ed35a88f56565 files/digest-vdr-vompserver-0.2.5 250
-SHA256 de2fd08af3c809ae5af01ad5f28ec523410cc016581dd89c01fbfb91b88a73be files/digest-vdr-vompserver-0.2.5 250
-MD5 325f1e1b6f045a5dc8dd72ba42360580 files/digest-vdr-vompserver-0.2.6 250
-RMD160 6b39b4d0ed00f59498202acc6164202f5e3cfda0 files/digest-vdr-vompserver-0.2.6 250
-SHA256 4c5fc41edeed122c97e09cf1a40060049e2b55ba21a8cd5db8da07673d159863 files/digest-vdr-vompserver-0.2.6 250
 MD5 325f1e1b6f045a5dc8dd72ba42360580 files/digest-vdr-vompserver-0.2.6-r1 250
 RMD160 6b39b4d0ed00f59498202acc6164202f5e3cfda0 files/digest-vdr-vompserver-0.2.6-r1 250
 SHA256 4c5fc41edeed122c97e09cf1a40060049e2b55ba21a8cd5db8da07673d159863 files/digest-vdr-vompserver-0.2.6-r1 250
+MD5 c32a7151c3336de9b9df58a140d8b6f0 files/digest-vdr-vompserver-0.2.7 250
+RMD160 ab198493d2678d0b16d286fa48be505b36ff2981 files/digest-vdr-vompserver-0.2.7 250
+SHA256 7b46427222865aa86d268d4caaeb986ebda423a8aa59bf15f9f1fcc86ce0d2fc files/digest-vdr-vompserver-0.2.7 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
+
+iD8DBQFHd8uCdn07HTTCgIoRAnaVAJ0QubOIMFBu3y7PBCZsuwZ/Sxd2/wCglqQc
+nARkn0evY7xP6LKVMxWLUNc=
+=OP0v
+-----END PGP SIGNATURE-----
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"