added config-file for setup-patch

(Portage version: 2.1_pre4-r1)

4 files changed, 116 insertions, 16 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 1d65573d8cf2..8398da45dd3b 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.45 2006/02/04 16:15:50 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.46 2006/02/04 20:59:35 zzam Exp $
+
+  04 Feb 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-setup-menu-0.2.3.xml, vdr-1.3.41.ebuild:
+  added config-file for setup-patch
 
   04 Feb 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-1.3.41.ebuild:
   updated patchset, includes newer bugfixes and an updated setup-patch
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 1c66e59a8a88..58c6b6977eae 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5a08650c6ce4f58b855972f365a46c6d ChangeLog 6819
 RMD160 fbfa50993c32d6857ee04479e2e3a0c47261f223 ChangeLog 6819
 SHA256 92ec6995faa2a42aa643831d9f1766833dd97867645deb4ebc6bd926bcd7c064 ChangeLog 6819
@@ -70,6 +67,9 @@ SHA256 f4484f9930871adf4909c5e61c866038417ad400d9c51f03190e92321a8f7b6e files/vd
 MD5 215c4255801a77d38d3c16e762a3185e files/vdr-add-svdrp-down-0.1.diff 2601
 RMD160 9dbc8092f6506417175b489f2e9df52998043035 files/vdr-add-svdrp-down-0.1.diff 2601
 SHA256 34cb437cb38b7728a1cc5cdfe07de65cca9d1cae2880a982d2133a10e962cc60 files/vdr-add-svdrp-down-0.1.diff 2601
+MD5 628f5a7c342cde03dd7e1c814252dd6b files/vdr-setup-menu-0.2.3.xml 2846
+RMD160 4849032c4d29e5f23ef0d51054483817d0dbc66f files/vdr-setup-menu-0.2.3.xml 2846
+SHA256 487d380f3fe8cb9efff272e9bfffacde0c6f90bcb1d8522ef9533eabfaca5965 files/vdr-setup-menu-0.2.3.xml 2846
 MD5 a973dfa1638779880ca99f1c1435cac7 metadata.xml 259
 RMD160 cc3cadd479ce9fb1e22948ac9f01f5725da33fa6 metadata.xml 259
 SHA256 313f79a460281914a7f72cb73e91eec5f5cfec67c79f657743d49036d04951fe metadata.xml 259
@@ -100,13 +100,6 @@ SHA256 4d92b009fa6e0af7bfb0c63935572526fead7f3763deb11a8481ec950be8c42f vdr-1.3.
 MD5 fc877f5af6daffeec70f1e60a4de19ae vdr-1.3.36.ebuild 4720
 RMD160 015d231b0c6667fcc983ecda3194f47c2fcdd5f0 vdr-1.3.36.ebuild 4720
 SHA256 47822fc12f71cea5411bf54a4939bda27f3f90a44d25da0b5f420bf450036f13 vdr-1.3.36.ebuild 4720
-MD5 842ac296c609e1d1205ad791c9560c6a vdr-1.3.41.ebuild 4624
-RMD160 10331562d4178a71da4fc7b0d34c6a0c6652c978 vdr-1.3.41.ebuild 4624
-SHA256 6f6a76ba428c6cfa657304df8ffe2a0a71611e954921168a859b4f07038e98b8 vdr-1.3.41.ebuild 4624
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD5NNcZfSl1Kp5KmoRAlt3AKDg1TFsktBXHTPZJ3XL8LZJYcadOACbBsA2
-Lf/NIyur2HysR3dAnpSeX9I=
-=1GIA
------END PGP SIGNATURE-----
+MD5 af3296bd3fd95a7adf2154bd9fdf5944 vdr-1.3.41.ebuild 4717
+RMD160 7bdde1ffc50a4e8f32f953f212a1393976c0fe4d vdr-1.3.41.ebuild 4717
+SHA256 2a3f45f2157606d03e2b357ae5c17f9ea804c42ff874b3af0a2e17e4b8b8eab9 vdr-1.3.41.ebuild 4717
diff --git a/media-video/vdr/files/vdr-setup-menu-0.2.3.xml b/media-video/vdr/files/vdr-setup-menu-0.2.3.xml
new file mode 100644
index 000000000000..2657411ab6ef
--- /dev/null
+++ b/media-video/vdr/files/vdr-setup-menu-0.2.3.xml
@@ -0,0 +1,100 @@
+<!--
+-   VDR Menu-Configuration File
+-
+-
+-   Example:
+-
+ <menus>
+    <system name="Schedule" />
+    <system name="Channels" />
+    <system name="Timers" />
+    <system name="Recordings" />
+    <menu name="System">
+        <system name="Setup" />
+        <system name="Commands" />
+        <plugin name="setup" />
+        <command name="myCommand1" execute="/usr/bin/mycommand1" />
+        <command name="myCommand2" execute="/usr/bin/mycommand2" confirm="yes" />
+        <plugin name="epgsearch" />
+        <menu name="mySubSubMenu">
+            ...
+        </menu>
+    </menu>
+     <menu name="Suche">
+        <plugin name="epgsearch" />
+        ...
+    </menu>
+ </menus>
+-->
+<menus>
+    <system name="Schedule" />
+    <system name="Channels" />
+    <system name="Timers" />
+    <system name="Recordings" />
+    <menu name="Video/Audio">
+        <plugin name="radio" />
+        <plugin name="playlist" />
+        <plugin name="mp3" />
+	<plugin name="mp3ng" />
+        <plugin name="mplayer" />
+        <menu name="CD/DVD">
+            <plugin name="burn" />
+            <plugin name="dvdselect" />
+	    	<plugin name="dvdswitch" />
+            <plugin name="dvd" />
+            <plugin name="vdrcd" />
+            <plugin name="vcd" />
+        </menu>
+        <menu name="Bilder">
+            <plugin name="image" />
+            <plugin name="osdimage" />
+            <plugin name="screenshot" />
+        </menu>
+    </menu>
+    <menu name="Suche/Info">
+        <plugin name="epgsearch" />
+        <plugin name="pilot" />
+        <plugin name="newsticker" />
+        <plugin name="tvtv" />
+        <plugin name="tvonscreen" />
+        <plugin name="yaepg" />
+		<plugin name="nordlichtsepg" />
+        <plugin name="osdpip" />
+        <plugin name="timeline" />
+        <plugin name="osdteletext" />
+        <plugin name="prefermenu" />
+        <plugin name="director" />
+		<plugin name="weatherng" />
+    </menu>
+    <menu name="Timer">
+        <plugin name="autotimeredit" />
+		<plugin name="xxvautotimer" />
+        <plugin name="sleeptimer" />
+		<plugin name="eggtimer" />
+    </menu>
+    <menu name="Spiele">
+        <plugin name="games" />
+		<plugin name="sudoku" />
+        <plugin name="solitaire" />
+        <plugin name="freecell" />
+    </menu>
+    <menu name="Sonstiges">
+        <plugin name="clock" />
+        <plugin name="vbox" />
+        <plugin name="pim" />
+        <plugin name="taste" />
+        <plugin name="undelete" />
+    </menu>
+    <menu name="System">
+        <plugin name="setup" />
+        <system name="Commands" />
+        <plugin name="vdrc" />
+        <plugin name="text2skin" />
+        <plugin name="graphlcd" />
+        <plugin name="sysinfo" />
+        <plugin name="console" />
+        <plugin name="femon" />
+        <plugin name="rotor" />
+        <plugin name="streamdev-server" />
+    </menu>
+</menus>
diff --git a/media-video/vdr/vdr-1.3.41.ebuild b/media-video/vdr/vdr-1.3.41.ebuild
index 2fe960161551..42e5f08db23a 100644
--- a/media-video/vdr/vdr-1.3.41.ebuild
+++ b/media-video/vdr/vdr-1.3.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.3.41.ebuild,v 1.2 2006/02/04 16:15:50 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.3.41.ebuild,v 1.3 2006/02/04 20:59:35 zzam Exp $
 
 inherit eutils
 
@@ -174,7 +174,6 @@ src_install() {
 	insinto ${CONF_DIR}
 	doins *.conf channels.conf.*
 
-	chown -R vdr:vdr ${D}/${CONF_DIR}
 	keepdir "${PLUGIN_LIB_DIR}"
 
 	doman vdr.1 vdr.5
@@ -196,7 +195,11 @@ src_install() {
 	if use setup-plugin; then
 		insinto /usr/share/vdr/setup
 		doins ${S}/menu.c
+
+		insinto /etc/vdr/plugins/setup
+		newins ${FILESDIR}/vdr-setup-menu-0.2.3.xml vdr-menu.xml
 	fi
+	chown -R vdr:vdr ${D}/${CONF_DIR}
 }
 
 pkg_postinst() {