--- /usr/portage/media-video/bombono-dvd/bombono-dvd-1.2.0.ebuild	2011-12-03 00:01:18.000000000 +0400
+++ bombono-dvd-1.2.0.ebuild	2011-12-06 03:48:24.000000000 +0400
@@ -3,8 +3,9 @@
 # $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/bombono-dvd-1.2.0.ebuild,v 1.2 2011/12/02 19:36:13 dilfridge Exp $
 
 EAPI=4
+SCONS_MIN_VERSION="0.96.1"
 
-inherit base scons-utils toolchain-funcs flag-o-matic
+inherit base scons-utils toolchain-funcs virtualx
 
 DESCRIPTION="GUI DVD authoring program"
 HOMEPAGE="http://www.bombono.org/"
@@ -35,22 +36,35 @@
 	gnome?	( gnome-base/gvfs )
 "
 DEPEND="${COMMONDEPEND}
-	>=dev-util/scons-0.96.1
+	dev-util/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.0.1-cflags.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.1-cflags.patch"
+	"${FILESDIR}/${P}-libav.patch"
+)
+
+src_configure() {
+	myesconsargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		CFLAGS="${CFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+		CPPFLAGS='-UBOOST_SYSTEM_NO_DEPRECATED -DBOOST_FILESYSTEM_VERSION=2'
+		USE_EXT_BOOST=1
+		PREFIX="${EPREFIX}/usr"
+	)
+}
 
 src_compile() {
-	append-flags -DBOOST_FILESYSTEM_VERSION=2
-
-	tc-export CC CXX
+	escons
+}
 
-	nonfatal escons CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-		DESTDIR="${D}" PREFIX="/usr" \
-		CPPFLAGS='-UBOOST_SYSTEM_NO_DEPRECATED' USE_EXT_BOOST=1 \
-		|| die 'Please add "${S}/config.opts" when filing bugs reports!'
+src_test() {
+	nonfatal VIRTUALX_COMMAND="escons TEST=1" virtualmake || ewarn "Some tests failed"
 }
 
 src_install() {
-	nonfatal escons install || die 'Please add "${S}/config.opts" when filing bugs reports!'
+	escons DESTDIR="${D}" install
 }