patch to use own plugin config DIR added

Package-Manager: portage-2.1.2.2

4 files changed, 51 insertions, 17 deletions

diff --git a/media-plugins/vdr-streamdev-server/ChangeLog b/media-plugins/vdr-streamdev-server/ChangeLog
index 9449cd8b7afe..fbb6b55055c1 100644
--- a/media-plugins/vdr-streamdev-server/ChangeLog
+++ b/media-plugins/vdr-streamdev-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-streamdev-server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/ChangeLog,v 1.15 2007/05/10 14:36:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/ChangeLog,v 1.16 2007/05/10 15:45:27 hd_brummy Exp $
+
+  10 May 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-streamdev-server-0.3.3_pre20070510-gentoo.diff,
+  vdr-streamdev-server-0.3.3_pre20070510.ebuild:
+  patch to use own plugin config DIR added
 
 *vdr-streamdev-server-0.3.3_pre20070510 (10 May 2007)
 
diff --git a/media-plugins/vdr-streamdev-server/Manifest b/media-plugins/vdr-streamdev-server/Manifest
index 1605ad6bd596..66a850edc794 100644
--- a/media-plugins/vdr-streamdev-server/Manifest
+++ b/media-plugins/vdr-streamdev-server/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX vdr-streamdev-server-0.3.3_pre20070510-gentoo.diff 689 RMD160 8475e71ed31ff31a071e6f99abe8bc2b9b4cb269 SHA1 3a063976d2556afb22f9b66ea3adc2f3229844a7 SHA256 71bfb5afd04a96eba5942ca57f155fe00252ce47d02a730045ea0c7156953d9d
+MD5 a722ea7f2557042da8c721af9b4821bf files/vdr-streamdev-server-0.3.3_pre20070510-gentoo.diff 689
+RMD160 8475e71ed31ff31a071e6f99abe8bc2b9b4cb269 files/vdr-streamdev-server-0.3.3_pre20070510-gentoo.diff 689
+SHA256 71bfb5afd04a96eba5942ca57f155fe00252ce47d02a730045ea0c7156953d9d files/vdr-streamdev-server-0.3.3_pre20070510-gentoo.diff 689
 AUX vdr-streamdev-server-20060502-old-vdr-headers.diff 1183 RMD160 c98e70689cf0fb83484bd2f2bf0e6f1dc7c15b0d SHA1 7c48fa4fa9f583a3269086c6a9297cffd34f97cc SHA256 6608d265a9c96d48856b84a6573234da4e8c26d7f3dd1655292ef77577fb9a60
 MD5 76eeb01cf75ac90c3599d77be0da63a7 files/vdr-streamdev-server-20060502-old-vdr-headers.diff 1183
 RMD160 c98e70689cf0fb83484bd2f2bf0e6f1dc7c15b0d files/vdr-streamdev-server-20060502-old-vdr-headers.diff 1183
@@ -16,14 +20,14 @@ EBUILD vdr-streamdev-server-0.3.3_pre20061206.ebuild 1612 RMD160 44921cb92e390a7
 MD5 9dbf4b97215ece093987538a42d5c8c8 vdr-streamdev-server-0.3.3_pre20061206.ebuild 1612
 RMD160 44921cb92e390a7f45753cafad45f8229d463d6b vdr-streamdev-server-0.3.3_pre20061206.ebuild 1612
 SHA256 4a9253d3ca636d0d5e591826001ce08fa33092b0ca5fa56f6d0c88731fe9501f vdr-streamdev-server-0.3.3_pre20061206.ebuild 1612
-EBUILD vdr-streamdev-server-0.3.3_pre20070510.ebuild 1658 RMD160 c177df9fde0ac1330035d4572a695d8441034c38 SHA1 da8bced94cbf92ce64ade6cd701f23e0e1228b6d SHA256 638457593006d7fce137ef2a80aad6f2f452148bc022cd7fd98210fb14d86970
-MD5 ab24d9f90e223d4abccd8b205675d61b vdr-streamdev-server-0.3.3_pre20070510.ebuild 1658
-RMD160 c177df9fde0ac1330035d4572a695d8441034c38 vdr-streamdev-server-0.3.3_pre20070510.ebuild 1658
-SHA256 638457593006d7fce137ef2a80aad6f2f452148bc022cd7fd98210fb14d86970 vdr-streamdev-server-0.3.3_pre20070510.ebuild 1658
-MISC ChangeLog 2965 RMD160 28b84f755def3071d769690c2ed72029c05af241 SHA1 fa4485014430396b516520b502522fe70b4cb231 SHA256 88a21079d99ba4aab46a347a1060c53272f4ebb7f0575b2a6ad765e9d307b1b8
-MD5 2b2b03a8707a787c642014dd950bc619 ChangeLog 2965
-RMD160 28b84f755def3071d769690c2ed72029c05af241 ChangeLog 2965
-SHA256 88a21079d99ba4aab46a347a1060c53272f4ebb7f0575b2a6ad765e9d307b1b8 ChangeLog 2965
+EBUILD vdr-streamdev-server-0.3.3_pre20070510.ebuild 2034 RMD160 fe6dc0288daec31361d1e852c3ba56228e0e8202 SHA1 8e8a998b862093e965d5eea21f78f61b0301121d SHA256 a10c9b133497e5c8717a8f526b40b91225e2749c3e5f022b0bf6c9fe0bdd4c0b
+MD5 e46fd823cdcbe6264c786ce875f0a415 vdr-streamdev-server-0.3.3_pre20070510.ebuild 2034
+RMD160 fe6dc0288daec31361d1e852c3ba56228e0e8202 vdr-streamdev-server-0.3.3_pre20070510.ebuild 2034
+SHA256 a10c9b133497e5c8717a8f526b40b91225e2749c3e5f022b0bf6c9fe0bdd4c0b vdr-streamdev-server-0.3.3_pre20070510.ebuild 2034
+MISC ChangeLog 3179 RMD160 df46cfc5b8ac5412cd5918bd5bd9c3400e1ecb35 SHA1 6036fcb319d9e7d5c59d0d809ab34e87866d7af4 SHA256 f207342cbe06596ea74ceb916cb4c08fc31f5e3765f46e9440a457b571a39f79
+MD5 7653955891a75cdbf40242ac2d6f925f ChangeLog 3179
+RMD160 df46cfc5b8ac5412cd5918bd5bd9c3400e1ecb35 ChangeLog 3179
+SHA256 f207342cbe06596ea74ceb916cb4c08fc31f5e3765f46e9440a457b571a39f79 ChangeLog 3179
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
@@ -38,9 +42,10 @@ MD5 6c743b27107fd3d5ebdb4fe31094fbb0 files/digest-vdr-streamdev-server-0.3.3_pre
 RMD160 78e84a01ea71710a93853348762277e2f8821b9a files/digest-vdr-streamdev-server-0.3.3_pre20070510 271
 SHA256 6613f96fe9955c28f16bb8d87091d1617029b7c3bb8cf933f7e53dd7f1662952 files/digest-vdr-streamdev-server-0.3.3_pre20070510 271
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFGQy37t2vP6XvVdOcRAp40AKDipvOVqPNbPUWOQxGhcBfOW1tWTACaA5Pg
-6d2m+0MjyoQg8ZzHl4PMRMM=
-=k6qF
+iD8DBQFGQz4kdn07HTTCgIoRAlYMAKCsQwR3+m/LzYBqF2rr38gR29yyugCgm1re
+xwDlVL1BJ/vMMP0vpCP7RJg=
+=Nu0x
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-streamdev-server/files/vdr-streamdev-server-0.3.3_pre20070510-gentoo.diff b/media-plugins/vdr-streamdev-server/files/vdr-streamdev-server-0.3.3_pre20070510-gentoo.diff
new file mode 100644
index 000000000000..3fbbed1d399d
--- /dev/null
+++ b/media-plugins/vdr-streamdev-server/files/vdr-streamdev-server-0.3.3_pre20070510-gentoo.diff
@@ -0,0 +1,16 @@
+will change config dir to /etc/vdr/plugins/${pluginname}
+
+Joerg Bornkessel <hd_brummy@gentoo.org> 10 May 2007
+
+diff -Naur streamdev-20070510.orig/server/server.h streamdev-20070510/server/server.h
+--- streamdev-20070510.orig/server/server.h	2007-05-10 17:02:45.084274870 +0200
++++ streamdev-20070510/server/server.h	2007-05-10 17:10:32.652139993 +0200
+@@ -10,7 +10,7 @@
+ #include "server/component.h"
+ #include "server/connection.h"
+ 
+-#define STREAMDEVHOSTSPATH (*AddDirectory(cPlugin::ConfigDirectory(), "streamdevhosts.conf"))
++#define STREAMDEVHOSTSPATH (*AddDirectory(cPlugin::ConfigDirectory( "plugin" ), "streamdevhosts.conf"))
+ 
+ class cStreamdevServer: public cThread {
+ private:
diff --git a/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20070510.ebuild b/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20070510.ebuild
index e5c7a60e145f..8f697bcd780d 100644
--- a/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20070510.ebuild
+++ b/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20070510.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-streamdev-server/vdr-streamdev-server-0.3.3_pre20070510.ebuild,v 1.1 2007/05/10 14:36:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20070510.ebuild,v 1.2 2007/05/10 15:45:27 hd_brummy Exp $
 
 inherit vdr-plugin eutils
 
@@ -10,7 +10,8 @@ MY_P=${VDRPLUGIN_BASE}-${MY_PV}
 
 DESCRIPTION="Video Disk Recorder Client/Server streaming plugin"
 HOMEPAGE="http://www.magoa.net/linux/"
-SRC_URI="mirror://gentoo/vdr-${MY_P}.tar.bz2"
+SRC_URI="mirror://gentoo/vdr-${MY_P}.tar.bz2
+		http://dev.gentoo.org/~zzam/distfiles/vdr-${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,6 +22,8 @@ DEPEND=">=media-video/vdr-1.3.24"
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES="${FILESDIR}/${P}-gentoo.diff"
+
 VDRPLUGIN_MAKE_TARGET="libvdr-${VDRPLUGIN}.so"
 
 EXTERNREMUX_PATH=/usr/share/vdr/streamdev/externremux.sh
@@ -51,7 +54,7 @@ src_install() {
 	vdr-plugin_src_install
 
 	cd ${S}
-	insinto /etc/vdr/plugins
+	insinto /etc/vdr/plugins/streamdev
 	newins streamdevhosts.conf.example streamdevhosts.conf
 	chown vdr:vdr ${D}/etc/vdr -R
 }
@@ -60,5 +63,10 @@ pkg_postinst() {
 	vdr-plugin_pkg_postinst
 	elog "If you want to use the externremux-feature, then put"
 	elog "your custom script as ${EXTERNREMUX_PATH}."
-}
 
+	if [ ! -e ${ROOT}/etc/vdr/plugins/streamdev/streamdevhosts.conf ]; then
+		einfo "move config file to new config DIR ${ROOT}/etc/vdr/plugins/streamdev/"
+		mv ${ROOT}/etc/vdr/plugins/streamdevhosts.conf ${ROOT}/etc/vdr/plugins/streamdev/streamdevhosts.conf
+	fi
+
+}