--- /media/system/repositories/portage/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild	2009-12-08 21:05:57.000000000 +0100
+++ vdr-xineliboutput-9999.ebuild	2009-12-09 18:28:21.000000000 +0100
@@ -8,30 +8,24 @@
 
 inherit vdr-plugin eutils multilib versionator cvs
 
-MY_PV=${PV#*_p}
-MY_P=${PN}
-
 DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
 HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
 
 ECVS_SERVER="xineliboutput.cvs.sourceforge.net:/cvsroot/xineliboutput"
-ECVS_MODULE="vdr-xineliboutput"
+ECVS_MODULE="${PN}"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="+vdr +xine fbcon X libextractor xinerama"
 
 # both vdr plugin or vdr-sxfe can use X11
 # 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
@@ -39,7 +33,6 @@
 		x11-libs/libXrender
 		xinerama? ( x11-libs/libXinerama )
 	)"
-
 DEPEND="${COMMON_DEPEND}
 	sys-kernel/linux-headers
 	X? (
@@ -49,10 +42,9 @@
 		x11-proto/renderproto
 		xinerama? ( x11-proto/xineramaproto )
 	)"
-
 RDEPEND="${COMMON_DEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${PN}
 
 pkg_setup() {
 	vdr-plugin_pkg_setup
@@ -81,7 +73,6 @@
 }
 
 src_prepare() {
-	cvs_src_unpack
 	vdr-plugin_src_prepare
 
 	if use xine; then
@@ -95,7 +86,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)
@@ -115,8 +106,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() { :; }
@@ -127,30 +119,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
 }