--- qdvdauthor-1.11.1.ebuild	2009-11-07 18:37:51.000000000 +0100
+++ qdvdauthor-2.1.0.ebuild	2010-01-12 19:27:27.000000000 +0100
@@ -4,7 +4,7 @@
 
 EAPI=2
 
-inherit eutils flag-o-matic qt4 qt3
+inherit eutils flag-o-matic qt3 qt4
 
 DESCRIPTION="'Q' DVD-Author is a GUI frontend for dvdauthor written in Qt"
 HOMEPAGE="http://qdvdauthor.sourceforge.net/"
@@ -16,6 +16,7 @@
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="mplayer +xine plugins cdr templates debug"
+#IUSE="mplayer vlc +xine plugins cdr templates debug"
 
 DEPEND="media-video/dvdauthor
 	media-gfx/jhead
@@ -28,7 +29,7 @@
 	x11-libs/qt-gui:4
 	x11-libs/libX11
 	templates? ( app-text/convmv )"
-
+#	vlc? ( media-video/vlc )
 RDEPEND="${DEPEND}
 	app-cdr/dvdisaster
 	media-libs/netpbm
@@ -44,41 +45,60 @@
 TEMPLATES="${WORKDIR}"/${PN}-templates-1.10.0
 
 pkg_setup() {
+#	if ! use xine && ! use mplayer && ! use vlc ; then
 	if ! use xine && ! use mplayer ; then
 		eerror "You have to enable at least one of the use flags xine or \
 			mplayer"
+#		eerror "You have to enable at least one of the use flags xine,"
+#		eerror "mplayer or vlc."
 		die "xine and mplayer flag unset."
 	fi
 }
 
 src_prepare() {
-	sed -i -e 's:backround:background:g' qdvdauthor/qdvdauthor.pro \
-		|| die "sed failed"
+	if use templates ; then
+		mv "${WORKDIR}"/masks ${TEMPLATES}
 
-	mv "${WORKDIR}"/masks ${TEMPLATES}
+		# remove spaces in filenames
+		local OIFS IFS i
+		OIFS=${IFS}; IFS=$'\n'
+		for i in $(find ${TEMPLATES} -depth -name '* *') ; do
+			mv ${i} $(dirname ${i})/$(basename ${i// /-})
+		done
+		IFS=${OIFS}
 
-	# remove spaces in filenames
-	local OIFS IFS i
-	OIFS=${IFS}; IFS=$'\n'
-	for i in $(find ${TEMPLATES} -depth -name '* *') ; do
-		mv ${i} $(dirname ${i})/$(basename ${i// /-})
-	done
-	IFS=${OIFS}
+		# fix filename encoding
+		convmv --notest -r -f iso-8859-15 -t utf8 ${TEMPLATES}/buttons 1>>/dev/null 2>&1
+	fi
 
-	# fix filename encoding
-	convmv --notest -r -f iso-8859-15 -t utf8 ${TEMPLATES}/buttons 1>>/dev/null 2>&1
+	sed -i -e "/^CONFIG/s|debug||" qdvdauthor/qdvdauthor.pro || die
 }
 
 src_configure() {
 	if use xine ; then
 		export WITH_XINE_SUPPORT=1
+		export XINE_CONFIG=`which xine-config 2>/dev/null`
+	else
+		export WITH_XINE_SUPPORT=0
 	fi
 
 	if use mplayer ; then
 		export WITH_MPLAYER_SUPPORT=1
+	else
+		export WITH_MPLAYER_SUPPORT=0
 	fi
 
-	export WITH_VLC_SUPPORT=0
+#	if use vlc ; then
+#		export WITH_VLC_SUPPORT=1
+#	else
+		export WITH_VLC_SUPPORT=0
+#	fi
+
+	if use debug ; then
+		export DEBUG_QDVDAUTHOR=debug
+	else
+		export DEBUG_QDVDAUTHOR=release
+	fi
 
 	eqmake3 all.pro
 
@@ -100,60 +120,62 @@
 
 	cd "${S}"/qrender
 	eqmake4 qrender.pro
+
+#	cd "${S}"
+#	eqmake4 all.pro
 }
 
 src_compile() {
 	cd "${S}"/qdvdauthor
-	emake || die "emake failed"
+	emake || die
 
 	cd "${S}"/qdvdauthor/qplayer
-	emake || die "emake failed"
+	emake || die
 
 	if use plugins ; then
 		for i in simpledvd complexdvd menuslide testplugs; do
 			cd "${S}"/qdvdauthor/plugins/${i}
-			emake || die "emake failed"
+			emake || die
 			eqmake3 ${i}.pro
 		done
 	fi
 
 	cd "${S}"/addons/jhead/libjhead
-	emake || die "emake failed"
+	emake || die
 	eqmake3 interface.pro -o Makefile.interface
 
 	cd "${S}"/qrender
-	emake || die "emake failed"
+	emake || die
 }
 
 src_install() {
 	cd "${S}"/qdvdauthor
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	emake INSTALL_ROOT="${D}" install || die
 
 	cd "${S}"/qdvdauthor/qplayer
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	emake INSTALL_ROOT="${D}" install || die
 
 	if use plugins ; then
 		for i in simpledvd complexdvd; do
 			cd "${S}"/qdvdauthor/plugins/${i}
-			emake INSTALL_ROOT="${D}" install || die "emake install failed"
+			emake INSTALL_ROOT="${D}" install || die
 		done
 	fi
 
 	cd "${S}"/addons/jhead/libjhead
-	emake INSTALL_ROOT="${D}" -f Makefile.interface install || \
-		die "emake install failed"
+	emake INSTALL_ROOT="${D}" -f Makefile.interface install || die
 
 	cd "${S}"/qrender
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	emake INSTALL_ROOT="${D}" install || die
 
-	cd "${TEMPLATES}"
 	if use templates ; then
+		cd "${TEMPLATES}"
 		insinto /usr/share/qdvdauthor
-		doins -r animated buttons masks slideshow static
+		doins -r animated buttons masks slideshow static || die
 	fi
 
 	cd "${S}"
-	dodoc CHANGELOG README
-	domenu qdvdauthor.desktop
-	doicon qdvdauthor.png
+	dodoc CHANGELOG README || die
+	domenu qdvdauthor.desktop || die
+	doicon qdvdauthor.png || die
 }