added fix for non parallel makefile, moved some files and added merge-logic for config

(Portage version: 2.1_pre3-r1)

4 files changed, 28 insertions, 13 deletions

diff --git a/media-plugins/vdr-image/ChangeLog b/media-plugins/vdr-image/ChangeLog
index 0676570cd9c8..a21735174070 100644
--- a/media-plugins/vdr-image/ChangeLog
+++ b/media-plugins/vdr-image/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-image
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.1 2006/01/04 17:03:52 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.2 2006/01/06 01:36:26 zzam Exp $
+
+  06 Jan 2006; Matthias Schwarzott <zzam@gentoo.org> files/rc-addon.sh,
+  vdr-image-0.2.4.ebuild:
+  added fix for non parallel makefile, moved some files and added merge-logic
+  for config
 
 *vdr-image-0.2.4 (04 Jan 2006)
 
diff --git a/media-plugins/vdr-image/Manifest b/media-plugins/vdr-image/Manifest
index e3e408ff8de9..7bda2e16409f 100644
--- a/media-plugins/vdr-image/Manifest
+++ b/media-plugins/vdr-image/Manifest
@@ -1,6 +1,6 @@
 MD5 f128096361063336c49810735a11d49b ChangeLog 479
 MD5 adae2ccfe37f39d4a68bc1d959716d0e files/digest-vdr-image-0.2.4 67
-MD5 953f38ffced2f409f60bcd7103094de3 files/rc-addon.sh 445
+MD5 7d241ce2cbf7a7f8b67b6fb36322b6fa files/rc-addon.sh 563
 MD5 f2dfff6d98dce8de321be81a251c45ac files/vdr-image-0.2.4-gentoo.diff 3468
 MD5 e7055a92958497a9a028c06b8223f110 metadata.xml 439
-MD5 7f072d3ba636129385eedc88666a150d vdr-image-0.2.4.ebuild 893
+MD5 b155d4a3fb06a36ff331dea404c52a81 vdr-image-0.2.4.ebuild 1083
diff --git a/media-plugins/vdr-image/files/rc-addon.sh b/media-plugins/vdr-image/files/rc-addon.sh
index 52bc0985ad0b..2c2d4eb5968c 100644
--- a/media-plugins/vdr-image/files/rc-addon.sh
+++ b/media-plugins/vdr-image/files/rc-addon.sh
@@ -1,20 +1,22 @@
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/files/rc-addon.sh,v 1.1 2006/01/04 17:03:52 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/files/rc-addon.sh,v 1.2 2006/01/06 01:36:26 zzam Exp $
 #
 # rc-addon plugin-startup-skript for vdr-image
 #
 
-IMAGE_MOUNT="/usr/bin/mount-image.sh"
-IMAGE_CONVERT="/usr/bin/imageplugin.sh"
+: ${IMAGE_MOUNT:=/usr/share/vdr/image/bin/mount-image.sh}
+: ${IMAGE_CONVERT:=/usr/share/vdr/image/bin/imageplugin.sh}
 
 plugin_pre_vdr_start() {
-
 	add_plugin_param "-m ${IMAGE_MOUNT}"
 	add_plugin_param "-C ${IMAGE_CONVERT}"
-
+	
+	[[ -f /usr/lib/vdr/inc/commands-functions.sh ]] || return
+	
+	source /usr/lib/vdr/inc/commands-functions.sh
+	merge_commands_conf /etc/vdr/imagecmds /etc/vdr/plugins/image/imagecmds.conf "${ORDER_IMAGECMDS}"
 }
 
-
-# for compatibility
 if [[ ${SCRIPT_API:-1} -lt 2 ]]; then
-    plugin_pre_vdr_start
+	plugin_pre_vdr_start
 fi
+
diff --git a/media-plugins/vdr-image/vdr-image-0.2.4.ebuild b/media-plugins/vdr-image/vdr-image-0.2.4.ebuild
index d50d1d4586e1..42d235980a4d 100644
--- a/media-plugins/vdr-image/vdr-image-0.2.4.ebuild
+++ b/media-plugins/vdr-image/vdr-image-0.2.4.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-plugins/vdr-image/vdr-image-0.2.4.ebuild,v 1.1 2006/01/04 17:03:52 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.2.4.ebuild,v 1.2 2006/01/06 01:36:26 zzam Exp $
 
 inherit vdr-plugin
 
@@ -17,6 +17,9 @@ DEPEND=">=media-video/vdr-1.3.20
 	>=media-video/ffmpeg-0.4.8
 	>=media-libs/netpbm-10.0"
 
+
+VDRPLUGIN_MAKE_TARGET="all -j1"
+
 src_unpack() {
 vdr-plugin_src_unpack
 
@@ -27,9 +30,14 @@ vdr-plugin_src_unpack
 src_install() {
 vdr-plugin_src_install
 
+	keepdir /etc/vdr/imagecmds
+	insinto /etc/vdr/imagecmds
+	newins examples/imagecmds.conf imagecmds.example.conf
+
 	insinto /etc/vdr/plugins/image
-	doins examples/*
+	doins examples/imagesources.conf
 
+	into /usr/share/vdr/image
 	dobin scripts/imageplugin.sh
 	newbin scripts/mount.sh mount-image.sh
 }