--- /media/system/repositories/portage/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild	2009-11-20 11:06:46.000000000 +0100
+++ vdr-xineliboutput-1.0.4_p20091118.ebuild	2009-12-09 18:27:30.000000000 +0100
@@ -24,12 +24,9 @@
 # still depends need some cleanup
 COMMON_DEPEND="
 	vdr? ( >=media-video/vdr-1.4.0 )
-
 	xine? ( >=media-libs/xine-lib-1.1.1 )
-
 	media-libs/jpeg
 	libextractor? ( >=media-libs/libextractor-0.5.20 )
-
 	X? (
 		x11-libs/libX11
 		x11-libs/libXv
@@ -37,7 +34,6 @@
 		x11-libs/libXrender
 		xinerama? ( x11-libs/libXinerama )
 	)"
-
 DEPEND="${COMMON_DEPEND}
 	sys-kernel/linux-headers
 	X? (
@@ -47,13 +43,10 @@
 		x11-proto/renderproto
 		xinerama? ( x11-proto/xineramaproto )
 	)"
-
 RDEPEND="${COMMON_DEPEND}"
 
 S=${WORKDIR}/${MY_P#vdr-}
 
-VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
-
 pkg_setup() {
 	vdr-plugin_pkg_setup
 
@@ -83,8 +76,6 @@
 src_prepare() {
 	vdr-plugin_src_prepare
 
-#	epatch "${FILESDIR}/${PN}-1.0.4_p20090810-compile-fix.diff"
-
 	if use xine; then
 		XINE_PLUGIN_DIR=$(xine-config --plugindir)
 		if [[ ${XINE_PLUGIN_DIR} = "" ]]; then
@@ -96,7 +87,7 @@
 	# stop some automagic overwriting of the stuff we set
 	sed -e '/XINELIBOUTPUT_VDRPLUGIN = 1/s/^/#/' \
 		-e '/HAVE_EXTRACTOR_H = 1/s/^/#/' \
-		-i Makefile
+		-i Makefile || die "sed failed"
 
 	cat >>Make.config <<-EOF
 		XINELIBOUTPUT_XINEPLUGIN = $(use_onoff xine)
@@ -116,8 +107,9 @@
 	# work in the sandbox
 	sed -i Makefile \
 		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:" \
-		-e 's:VDRINCDIR.*=.*:VDRINCDIR ?= /usr/include:'
-	mkdir -p "${WORKDIR}/lib"
+		-e 's:VDRINCDIR.*=.*:VDRINCDIR ?= /usr/include:' \
+		|| die "sed failed"
+	mkdir -p "${WORKDIR}/lib" || die "mkdir failed"
 }
 
 src_configure() { :; }
@@ -128,30 +120,31 @@
 		vdr-plugin_src_install
 
 		# version number that the sources contain
-		local SO_VERSION="$(grep 'static const char \*VERSION *=' xineliboutput.c |\
-						cut	-d'"' -f2)"
-	echo SO_VERSION=$SO_VERSION
+		local SO_VERSION="$(grep 'static const char \*VERSION *=' \
+			xineliboutput.c | cut -d'"' -f2)"
+		echo SO_VERSION=$SO_VERSION
 		insinto ${VDR_PLUGIN_DIR}
 		if use fbcon; then
-			doins libxineliboutput-fbfe.so.${SO_VERSION} || die "doins failed"
+			doins libxineliboutput-fbfe.so.${SO_VERSION} \
+			|| die "doins failed"
 		fi
 		if use X; then
-			doins libxineliboutput-sxfe.so.${SO_VERSION} || die "doins failed"
+			doins libxineliboutput-sxfe.so.${SO_VERSION} \
+			|| die "doins failed"
 		fi
 	fi
 
 	if use xine; then
 		# install xine-plugins
 		insinto "${XINE_PLUGIN_DIR}"
-		doins xineplug_inp_*.so
+		doins xineplug_inp_*.so || die "doins failed"
 
 		insinto "${XINE_PLUGIN_DIR}"/post
-		doins xineplug_post_*.so
+		doins xineplug_post_*.so || die "doins failed"
 
 		# install xine-based frontends
-		use fbcon && dobin vdr-fbfe
-		use X && dobin vdr-sxfe
-
+		use fbcon && dobin vdr-fbfe || die "doins failed"
+		use X && dobin vdr-sxfe || die "doins failed"
 	fi
 }